Upgrading to Unity5 and adding support for merging multiple meshes prior to export#6
Open
samuelcadieux wants to merge 16 commits intoocto-code:masterfrom
Open
Upgrading to Unity5 and adding support for merging multiple meshes prior to export#6samuelcadieux wants to merge 16 commits intoocto-code:masterfrom
samuelcadieux wants to merge 16 commits intoocto-code:masterfrom
Conversation
…e RecalculateTangents()
|
Has this project been abandoned? |
Author
|
I guess so, I've since switched to this library: https://github.com/gradientspace/geometry3Sharp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also note that I've restructured the repo on my end so the repo can be integrated within another unity project without the ProjectSettings and other polluting files.
There is a unity branch which is integrated into master using subtrees.
If you're not familiar with those (I wasn't; after a fresh fork, I clone my fork and did the following:
git subtree split --prefix=unity/Assets/OBJ-IO -b unity
git push origin unity
git rm -rf unity/Assets/OBJ-IO
git add -A
git commit -m "Preparing branch to welcome unity subtree"
git subtree add --prefix=unity/Assets/OBJ-IO origin unity
Later if I do changes into unity branch I can easily integrate those into master via:
git subtree pull --prefix=unity/Assets/OBJ-IO origin unity
It works the other way to, if you make a change in master it can be pushed into unity via:
git subtree push --prefix=unity/Assets/OBJ-IO origin unity
Alternatively you could use submodules but I didn't since I didn't want to disturb the structure of the repo too much.