Skip to content

Unity 5 Fix #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dharengo wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Unity 5 Fix #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5ee5da
Merge pull request #8 from bonus2113/develop
mythgarr Jun 25, 2014
719bd38
Merge pull request #9 from bonus2113/ZIndex-Animation-Fix
mythgarr Jun 26, 2014
8450f15
preserve animation events
ankurs Jan 19, 2015
cf1d909
Merge pull request #10 from ankurs/master
mythgarr Feb 1, 2015
07e38b2
Unity 5 compatibility
Feb 22, 2015
804a5fe
Unity 5 compatibility
Feb 22, 2015
7d0fc93
Fixed duplicate BindingFlags
alaa-eddine Feb 23, 2015
23b956f
Merge pull request #13 from alaa-eddine/master
mythgarr Feb 25, 2015
c6a6035
Bindingflags only needed in Unity < 5
Mar 16, 2015
f363aad
Merge pull request #14 from alaa-eddine/master
mythgarr Mar 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Assets/ThirdParty/Spriter2Unity/Editor/Unity/AnimationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ public List<AnimationClip> BuildAnimationClips(GameObject root, Entity entity, s
if (originalAnimClip != null)
{
Debug.Log("Replacing animation clip " + animClip.name);
AnimationEvent[] events = AnimationUtility.GetAnimationEvents(originalAnimClip);
AnimationUtility.SetAnimationEvents(animClip, events);
EditorUtility.CopySerialized(animClip, originalAnimClip);
allAnimClips.Remove(originalAnimClip);
}
Expand Down Expand Up @@ -100,8 +102,12 @@ public AnimationClip MakeAnimationClip(GameObject root, Animation animation, str
var animClip = new AnimationClip();
animClip.name = animation.Name;

#if UNITY_5
//Not needed in Unity 5 ??
#else
//Set clip to Generic type
AnimationUtility.SetAnimationType(animClip, ModelImporterAnimationType.Generic);
#endif

//Populate the animation curves & events
MakeAnimationCurves(root, animClip, animation);
Expand Down
6 changes: 5 additions & 1 deletion Assets/ThirdParty/Spriter2Unity/Editor/Unity/ScmlPostProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ static void ImportScml(string assetPath)
{
if (animationClip)
{
AnimatorController.AddAnimationClipToController(controller, animationClip);
#if UNITY_5
controller.AddMotion(animationClip);
#else
AnimatorController.AddAnimationClipToController(controller, animationClip);
#endif
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion Assets/ThirdParty/Spriter2Unity/Editor/Utils/AnimationCurveUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,15 @@ public static void AddKeyIfChanged(this AnimationCurve curve, Keyframe keyframe)
public static void SetAnimationSettings(this AnimationClip animClip, AnimationClipSettings settings)
{
//Use reflection to get the internal method
BindingFlags bindingFlags = BindingFlags.Static | BindingFlags.NonPublic;

#if UNITY_5
AnimationUtility.SetAnimationClipSettings(animClip, settings);
#else
BindingFlags bindingFlags = BindingFlags.Static | BindingFlags.NonPublic;
MethodInfo mInfo = typeof(AnimationUtility).GetMethod("SetAnimationClipSettings", bindingFlags);
mInfo.Invoke(null, new object[] { animClip, settings });
#endif

}
}
}
Expand Down