Browse Source

fix scaling and make spinebase Vector3.Zero

Kenkart 2 years ago
parent
commit
7a1c7da05d

+ 18 - 12
Assets/KinectView/Scripts/BodySourceView.cs

@@ -328,24 +328,30 @@ public class BodySourceView : MonoBehaviour
     {
         Vector3[] rescaledJoints = new Vector3[25];
 
-        rescaledJoints[(int)Kinect.JointType.FootLeft] = initJoints[(int)Kinect.JointType.FootLeft];
-        rescaledJoints[(int)Kinect.JointType.FootRight] = initJoints[(int)Kinect.JointType.FootRight];
-        rescaledJoints[(int)Kinect.JointType.AnkleLeft] = initJoints[(int)Kinect.JointType.AnkleLeft];
-        rescaledJoints[(int)Kinect.JointType.AnkleRight] = initJoints[(int)Kinect.JointType.AnkleRight];
+        rescaledJoints[(int)Kinect.JointType.SpineBase] = Vector3.zero;
+
+        // Lower part
+        rescaledJoints[(int)Kinect.JointType.HipLeft] = GetTargetJointWithDesiredLength(
+            initJoints[(int)Kinect.JointType.SpineBase], initJoints[(int)Kinect.JointType.HipLeft], 0.08f) + rescaledJoints[(int)Kinect.JointType.SpineBase];
+        rescaledJoints[(int)Kinect.JointType.HipRight] = GetTargetJointWithDesiredLength(
+            initJoints[(int)Kinect.JointType.SpineBase], initJoints[(int)Kinect.JointType.HipRight], 0.08f) + rescaledJoints[(int)Kinect.JointType.SpineBase];
 
         rescaledJoints[(int)Kinect.JointType.KneeLeft] = GetTargetJointWithDesiredLength(
-            initJoints[(int)Kinect.JointType.AnkleLeft], initJoints[(int)Kinect.JointType.KneeLeft], 0.4f) + rescaledJoints[(int)Kinect.JointType.AnkleLeft];
+            initJoints[(int)Kinect.JointType.HipLeft], initJoints[(int)Kinect.JointType.KneeLeft], 0.25f) + rescaledJoints[(int)Kinect.JointType.HipLeft];
         rescaledJoints[(int)Kinect.JointType.KneeRight] = GetTargetJointWithDesiredLength(
-            initJoints[(int)Kinect.JointType.AnkleRight], initJoints[(int)Kinect.JointType.KneeRight], 0.4f) + rescaledJoints[(int)Kinect.JointType.AnkleRight];
+            initJoints[(int)Kinect.JointType.HipRight], initJoints[(int)Kinect.JointType.KneeRight], 0.25f) + rescaledJoints[(int)Kinect.JointType.HipRight];
 
-        rescaledJoints[(int)Kinect.JointType.HipLeft] = GetTargetJointWithDesiredLength(
-            initJoints[(int)Kinect.JointType.KneeLeft], initJoints[(int)Kinect.JointType.HipLeft], 0.25f) + rescaledJoints[(int)Kinect.JointType.KneeLeft];
-        rescaledJoints[(int)Kinect.JointType.HipRight] = GetTargetJointWithDesiredLength(
-            initJoints[(int)Kinect.JointType.KneeRight], initJoints[(int)Kinect.JointType.HipRight], 0.25f) + rescaledJoints[(int)Kinect.JointType.KneeRight];
+        rescaledJoints[(int)Kinect.JointType.AnkleLeft] = GetTargetJointWithDesiredLength(
+            initJoints[(int)Kinect.JointType.KneeLeft], initJoints[(int)Kinect.JointType.AnkleLeft], 0.4f) + rescaledJoints[(int)Kinect.JointType.KneeLeft];
+        rescaledJoints[(int)Kinect.JointType.AnkleRight] = GetTargetJointWithDesiredLength(
+            initJoints[(int)Kinect.JointType.KneeRight], initJoints[(int)Kinect.JointType.AnkleRight], 0.4f) + rescaledJoints[(int)Kinect.JointType.KneeRight];
 
-        rescaledJoints[(int)Kinect.JointType.SpineBase] = GetTargetJointWithDesiredLength(
-            initJoints[(int)Kinect.JointType.HipLeft], initJoints[(int)Kinect.JointType.SpineBase], 0.08f) + rescaledJoints[(int)Kinect.JointType.HipLeft];
+        rescaledJoints[(int)Kinect.JointType.FootLeft] = GetTargetJointWithDesiredLength(
+            initJoints[(int)Kinect.JointType.AnkleLeft], initJoints[(int)Kinect.JointType.FootLeft], 0.1f) + rescaledJoints[(int)Kinect.JointType.AnkleLeft];
+        rescaledJoints[(int)Kinect.JointType.FootRight] = GetTargetJointWithDesiredLength(
+            initJoints[(int)Kinect.JointType.AnkleRight], initJoints[(int)Kinect.JointType.FootRight], 0.1f) + rescaledJoints[(int)Kinect.JointType.AnkleRight];
 
+        // Upper part
         rescaledJoints[(int)Kinect.JointType.SpineMid] = GetTargetJointWithDesiredLength(
             initJoints[(int)Kinect.JointType.SpineBase], initJoints[(int)Kinect.JointType.SpineMid], 0.3f) + rescaledJoints[(int)Kinect.JointType.SpineBase];
 

+ 39 - 41
Assets/Scenes/Main.unity

@@ -271,11 +271,11 @@ PrefabInstance:
     - target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 1803293755}
+      objectReference: {fileID: 591780787}
     - target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
       propertyPath: m_Mesh
       value: 
-      objectReference: {fileID: 900512339}
+      objectReference: {fileID: 952151337}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
 --- !u!4 &110216683 stripped
@@ -320,7 +320,6 @@ MonoBehaviour:
   modeController: {fileID: 815386528}
   wristLeftLate: 0
   wristRightLate: 0
-  scale: 1
 --- !u!4 &189736996
 Transform:
   m_ObjectHideFlags: 0
@@ -380,6 +379,41 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &591780787
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Sprites/Default
+  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - PixelSnap: 0
+    - _EnableExternalAlpha: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
 --- !u!1 &815386527
 GameObject:
   m_ObjectHideFlags: 0
@@ -409,7 +443,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d71a394b8fb98e4fa49bede70070e0d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  perspective: 0
+  perspective: 1
   feedback: 1
 --- !u!4 &815386529
 Transform:
@@ -643,7 +677,6 @@ MonoBehaviour:
   modeController: {fileID: 0}
   wristLeftLate: 0
   wristRightLate: 0
-  scale: 1
 --- !u!1001 &841858134
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -705,7 +738,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4f35fa249b5008c44ac2998be6f82d4d, type: 3}
---- !u!43 &900512339
+--- !u!43 &952151337
 Mesh:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1010,41 +1043,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 50, y: -135, z: 0}
---- !u!21 &1803293755
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Sprites/Default
-  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _AlphaTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - PixelSnap: 0
-    - _EnableExternalAlpha: 0
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Flip: {r: 1, g: 1, b: 1, a: 1}
-    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
-  m_BuildTextureStacks: []
 --- !u!1 &1865471484
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/Visualizer_FadeInSeries.cs

@@ -129,7 +129,7 @@ public class Visualizer_FadeInSeries : MonoBehaviour
                 jointObj.transform.parent = body.transform;
 
                 // Set alpha depends on i
-                Color newColor = new Color(1, 1, 0, Mathf.Lerp(0, 1, (float) (i + 1) / jointsDataSeries.Count));
+                Color newColor = new Color(0.8f, 1, 0, Mathf.Lerp(0, 1, (float) (i + 1) / jointsDataSeries.Count));
                 jointObj.GetComponent<MeshRenderer>().material.color = newColor;
                 jointObj.GetComponent<LineRenderer>().startColor = newColor;
                 jointObj.GetComponent<LineRenderer>().endColor = newColor;

BIN
Assets/joints.sav