Merge pull request chengkehan#12 from chengkehan/v0.2.2p3

Compatible with unity5.6
fucunjun · May 18, 2017 · 8ee313c · 8ee313c
2 parents 1dc1e7a + f2bc6fb
commit 8ee313c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/Assets/GPUSkinning/Scripts/GPUSkinningPlayerResources.cs b/Assets/GPUSkinning/Scripts/GPUSkinningPlayerResources.cs
@@ -276,6 +276,7 @@ public void InitMaterial(Material originalMaterial, HideFlags hideFlags)
             mtrls[i] = new GPUSkinningMaterial() { material = new Material(originalMaterial) };
             mtrls[i].material.name = keywords[i];
             mtrls[i].material.hideFlags = hideFlags;
+            mtrls[i].material.enableInstancing = true; // enable instancing in Unity 5.6
             EnableKeywords(i, mtrls[i]);
         }
     }

diff --git a/Assets/GPUSkinning/Scripts/GPUSkinningSampler.cs b/Assets/GPUSkinning/Scripts/GPUSkinningSampler.cs
@@ -244,11 +244,6 @@ public void StartSample()
         gpuSkinningClip.rootMotionEnabled = rootMotionEnabled[samplingClipIndex];
         gpuSkinningClip.individualDifferenceEnabled = individualDifferenceEnabled[samplingClipIndex];
 
-        if(animator != null)
-        {
-            animator.applyRootMotion = gpuSkinningClip.rootMotionEnabled;
-        }
-
         if(gpuSkinningAnimation.clips == null)
         {
             gpuSkinningAnimation.clips = new GPUSkinningClip[] { gpuSkinningClip };
@@ -268,6 +263,7 @@ public void StartSample()
         }
 
         SetCurrentAnimationClip();
+        PrepareRecordAnimator();
 
         isSampling = true;
     }
@@ -303,6 +299,25 @@ private void GenerateBonesGUID(GPUSkinningBone[] bones)
         }
     }
 
+    private void PrepareRecordAnimator()
+    {
+        if (animator != null)
+        {
+            int numFrames = (int)(gpuSkinningClip.fps * gpuSkinningClip.length);
+
+            animator.applyRootMotion = gpuSkinningClip.rootMotionEnabled;
+            animator.Rebind();
+            animator.recorderStartTime = 0;
+            animator.StartRecording(numFrames);
+            for (int i = 0; i < numFrames; ++i)
+            {
+                animator.Update(1.0f / gpuSkinningClip.fps);
+            }
+            animator.StopRecording();
+            animator.StartPlayback();
+        }
+    }
+
     private void SetCurrentAnimationClip()
     {
         if (animation == null)
@@ -641,6 +656,11 @@ private void Update()
 
         if (samplingFrameIndex >= totalFrams)
         {
+            if(animator != null)
+            {
+                animator.StopPlayback();
+            }
+
             string savePath = null;
             if (anim == null)
             {
@@ -707,9 +727,8 @@ private void Update()
         frame.matrices = new Matrix4x4[gpuSkinningAnimation.bones.Length];
         if (animation == null)
         {
-            animator.speed = 0;
-            animator.SetTime(time);
-            animator.speed = 1;
+            animator.playbackTime = time;
+            animator.Update(0);
         }
         else
         {