Fix camera and hip height.

Normand Briere

2018-07-01 bb87fae3b097ddd5c5039bf1ab48d3718b900b08

Fix camera and hip height.

 CameraPane.java
..
..
@@ -7693,7 +7693,7 @@
7693
7693
         
7694
7694
         if (renderCamera != lightCamera)
7695
7695
         for (int count = parentcam.GetTransformCount(); --count>=0;)
7696
-            LA.matConcat(parentcam.toParent, matrix, matrix);
7696
+            LA.matConcat(matrix, parentcam.toParent, matrix);
7697
7697
         
7698
7698
 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7699
7699
             
..
..
@@ -7709,7 +7709,7 @@
7709
7709
             
7710
7710
         if (renderCamera != lightCamera)
7711
7711
         for (int count = parentcam.GetTransformCount(); --count>=0;)
7712
-            LA.matConcat(matrix, parentcam.fromParent, matrix);
7712
+            LA.matConcat(parentcam.fromParent, matrix, matrix);
7713
7713
 
7714
7714
 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7715
7715
             
..
..
@@ -8915,7 +8915,7 @@
8915
8915
 //        if (parentcam != renderCamera) // not a light
8916
8916
         if (cam != lightCamera)
8917
8917
             for (int count = parentcam.GetTransformCount(); --count>=0;)
8918
-                LA.matConcat(parentcam.toParent, matrix, matrix);
8918
+                LA.matConcat(matrix, parentcam.toParent, matrix);
8919
8919
             
8920
8920
             for (int j = 0; j < 4; j++)
8921
8921
             {
..
..
@@ -8930,7 +8930,7 @@
8930
8930
 //        if (parentcam != renderCamera) // not a light
8931
8931
         if (cam != lightCamera)
8932
8932
             for (int count = parentcam.GetTransformCount(); --count>=0;)
8933
-                LA.matConcat(matrix, parentcam.fromParent, matrix);
8933
+                LA.matConcat(parentcam.fromParent, matrix, matrix);
8934
8934
         
8935
8935
             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8936
8936
             
 Mocap.java
..
..
@@ -3056,8 +3056,8 @@
3056
3056
     
3057
3057
     void Reset()
3058
3058
     {
3059
-        if (fullname != null)
3060
-            ReadBVH();
3059
+//        if (fullname != null)
3060
+//            ReadBVH();
3061
3061
         
3062
3062
         Object3D hip = get(0);
3063
3063
         
 mocap/reader/BVHReader.java
..
..
@@ -180,8 +180,12 @@
180
180
             b.setParent(parent);
181
181
 // EXTRA JOINTS
182
182
 //                        parent.attachGeom(n.offset, maxRadius, joints);
183
+            
184
+            b.setBaseTranslation(n.offset);
183
185
         }
184
-        b.setBaseTranslation(n.offset);
186
+        else
187
+            // Not for hip because the height is already factored in the mocap data.
188
+            b.setBaseTranslation(new Vector3d());
185
189
 
186
190
         // for horse
187
191
 //        if (n.name.equals("tail1"))