03-14-2014, 04:35 PM
I don't expect the process to be that much automated for this to be a problem. It'll be more like this:
1. The export tool generates a piece of C++ code
2. The dev pastes the code in the appropriate source file
3. The dev adds additional meta-information to the code - such as the connections, available rotations etc.
4. The file gets checked into git.
This shouldn't produce too many merge conflicts, unless we fully automate that process, and even that it can be automated to behave reasonably - sorting the individual prefabs by their DB IDs will provide a reasonable order in the code.
Also, since the Gallery server is running on my computer, I don't expect anyone else to be actually doing any modifications to those sources
1. The export tool generates a piece of C++ code
2. The dev pastes the code in the appropriate source file
3. The dev adds additional meta-information to the code - such as the connections, available rotations etc.
4. The file gets checked into git.
This shouldn't produce too many merge conflicts, unless we fully automate that process, and even that it can be automated to behave reasonably - sorting the individual prefabs by their DB IDs will provide a reasonable order in the code.
Also, since the Gallery server is running on my computer, I don't expect anyone else to be actually doing any modifications to those sources