Version slider

Normand Briere

2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1

 Mocap.java
..
..
@@ -261,6 +261,8 @@
261
261
         
262
262
 //    LA.matConcat(toParent, hip.get(0).toParent, toParent);
263
263
         
264
+        CameraPane.CreateSelectedPoint();
265
+        
264
266
         CameraPane.debugpointG.toParent[3][0] = poship.x;
265
267
         CameraPane.debugpointG.toParent[3][1] = poship.y;
266
268
         CameraPane.debugpointG.toParent[3][2] = poship.z;        
..
..
@@ -501,6 +503,7 @@
501
503
         centroid.z = matrix[3][2];
502
504
 //        this.getCentroid(centroid, true);
503
505
         
506
+        CameraPane.CreateSelectedPoint();
504
507
         CameraPane.debugpointG.name = "";
505
508
         CameraPane.debugpointG.toParent[3][0] = mocaporigin.x;
506
509
         CameraPane.debugpointG.toParent[3][1] = mocaporigin.y;
..
..
@@ -648,8 +651,8 @@
648
651
     {
649
652
         super.ExtractBigData(o);
650
653
         
651
-        o.bvh = this.bvh;
652
-        o.skeleton = this.skeleton;
654
+        o.savebvh = this.bvh;
655
+        o.saveskeleton = this.skeleton;
653
656
         this.bvh = null;
654
657
         this.skeleton = null;
655
658
     }
..
..
@@ -658,8 +661,8 @@
658
661
     {
659
662
         super.RestoreBigData(o);
660
663
         
661
-        this.bvh = o.bvh;
662
-        this.skeleton = o.skeleton;
664
+        this.bvh = o.savebvh;
665
+        this.skeleton = o.saveskeleton;
663
666
     }
664
667
     
665
668
     boolean smoothed;
..
..
@@ -3915,7 +3918,7 @@
3915
3918
      //       return;
3916
3919
         
3917
3920
         if (//!restarted && /*display.restartframe &&*/
3918
-                Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW))
3921
+                Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE))
3919
3922
         {
3920
3923
             //display.restartframe = false;
3921
3924
             restarted = true;