Undo/redo

Normand Briere

2019-06-09 79d0f9a45d36656051a77a7b0837aa0318f81ee5

 Mocap.java
..
..
@@ -484,6 +484,12 @@
484
484
     {
485
485
         Object3D hip = get(0);
486
486
         
487
+        if (toParent == null)
488
+        {
489
+            toParent = LA.newMatrix();
490
+            fromParent = LA.newMatrix();
491
+        }
492
+        
487
493
         LA.matConcat(toParent, hip.get(0).toParent, matrix);
488
494
         
489
495
         mocaporigin.x = matrix[3][0];
..
..
@@ -664,8 +670,8 @@
664
670
     double targetdirx;
665
671
     double targetdirz;
666
672
     
667
-    double goalposx = -20;
668
-    double goalposz = -10;
673
+    double goalposx = 0; // -20;
674
+    double goalposz = 0; // -10;
669
675
     
670
676
     boolean followpath;
671
677
     
..
..
@@ -921,7 +927,7 @@
921
927
 //                    //GetFileRoot();
922
928
                   
923
929
                     // sept 2014: //
924
-                    GrafreeD.RENDERME = 3; // patch for Merge objects
930
+                    Grafreed.RENDERME = 3; // patch for Merge objects
925
931
                     float[] thedata = bvh.animation.getBoneData(0);
926
932
                     
927
933
                     os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
..
..
@@ -1566,7 +1572,7 @@
1566
1572
 
1567
1573
                         lastsoundtime = Globals.framecount;
1568
1574
                         
1569
-                        GrafreeD.hassound = true;
1575
+                        Grafreed.hassound = true;
1570
1576
                     }
1571
1577
 //                    else
1572
1578
 //                        System.out.println("skipped");
..
..
@@ -2797,7 +2803,8 @@
2797
2803
                 //if (bone._rotationEnabled)
2798
2804
                 if (//frame > 0 &&
2799
2805
                     !bone.skipmocap &&
2800
-                    !bone.name.contains("head") // &&
2806
+                    !bone.name.contains("head") &&
2807
+                    !bone.name.contains("Head") // &&
2801
2808
                  //   !bone.name.contains("rFoot") &&
2802
2809
                  //   !bone.name.contains("lFoot") &&
2803
2810
 //                    !bone.name.contains("Pinky") &&
..
..
@@ -3233,8 +3240,8 @@
3233
3240
         
3234
3241
 // aout 2013        endframe = 0; // june 2013
3235
3242
         
3236
-        //ResetZero();
3237
-        setPose(frame);
3243
+        ResetZero();
3244
+        //setPose(frame);
3238
3245
     }
3239
3246
     
3240
3247
     static int mocapsupport = 0;
..
..
@@ -3300,7 +3307,7 @@
3300
3307
             {
3301
3308
                 if (support == null)
3302
3309
                 {
3303
-                    if (new File(fullname).exists())
3310
+                    if (bvh == null && new File(fullname).exists())
3304
3311
                             ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3305
3312
                     else
3306
3313
                     {
..
..
@@ -3889,17 +3896,22 @@
3889
3896
      //   if (firstframe)
3890
3897
      //       return;
3891
3898
         
3892
-        if (!restarted && /*display.restartframe &&*/
3893
-                Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
3899
+        if (//!restarted && /*display.restartframe &&*/
3900
+                Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW))
3894
3901
         {
3895
3902
             //display.restartframe = false;
3896
3903
             restarted = true;
3904
+        //System.err.println("restarted = true");
3897
3905
             Step();
3898
3906
         }
3899
3907
         else
3900
3908
         {
3901
-            if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
3909
+        //System.err.println("restarted");
3910
+            if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
3911
+            {
3902
3912
                 restarted = false;
3913
+        //System.err.println("restarted = false");
3914
+            }
3903
3915
         }
3904
3916
         
3905
3917
         super.drawSelf(display, root, selected, blocked);