Compressed undo stack.

Normand Briere

2019-06-11 4113164b3be1e50251ac40d6fd65660f0a6c2e63

 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]);
..
..
@@ -1519,7 +1525,7 @@
1519
1525
 //            mywave = currentwave++;
1520
1526
 //        }
1521
1527
                     // sound
1522
-                    cVector eye = CameraPane.theRenderer.EyeCamera().location;
1528
+                    cVector eye = Globals.theRenderer.EyeCamera().location;
1523
1529
 
1524
1530
 //                    if (sourcenode.parent.parent != null)
1525
1531
 //                        sourcenode.parent.parent.TransformToWorld(floor, tmp);
..
..
@@ -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");
..
..
@@ -2267,7 +2273,7 @@
2267
2273
             }
2268
2274
 
2269
2275
             if (!smoothed)
2270
-                for (int i=0; --i>=0;)
2276
+                for (int i=10; --i>=0;)
2271
2277
                     SmoothAnimData(); // much reduces shakiness
2272
2278
 
2273
2279
             smoothed = true;
..
..
@@ -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;
..
..
@@ -3252,12 +3259,13 @@
3252
3259
         
3253
3260
         int step = 1;
3254
3261
         
3262
+        // patch for running hare
3255
3263
         if (speedup) // fev 2014
3256
3264
             step *= 2; // 4;
3257
3265
         if (rewind) // mars 2014
3258
3266
             step *= 4;
3259
3267
 
3260
-        if (CameraPane.FAST) // && !CameraPane.HOLD)
3268
+        //if (CameraPane.FAST) // && !CameraPane.HOLD)
3261
3269
             step *= CameraPane.STEP;
3262
3270
         
3263
3271
         //System.err.println("Step Mocap frame # " + frame);
..
..
@@ -3298,23 +3306,40 @@
3298
3306
 //            SetPositionDelta(false, true, false); // ?? false);
3299
3307
             {
3300
3308
                 if (support == null)
3301
-                    ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3309
+                {
3310
+                    if (bvh == null && new File(fullname).exists())
3311
+                            ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3312
+                    else
3313
+                    {
3314
+                            SetGlobalTransform();
3315
+                            Rewind();
3316
+                            Fade();
3317
+                    }
3318
+                }
3302
3319
                 else
3303
3320
                 {
3304
-                    try
3305
-                    {
3321
+//                    try
3322
+//                    {
3306
3323
                         bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
3307
3324
 
3308
3325
                         // SetPositionDelta(false, true, true, true);
3309
3326
                         LoadData();
3310
3327
                         Rewind();
3311
3328
                         Fade();
3312
-                    }
3313
-                    catch (Exception e)
3314
-                    {
3315
-                        e.printStackTrace();
3316
-                        ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3317
-                    }
3329
+//                    }
3330
+//                    catch (Exception e)
3331
+//                    {
3332
+//                            System.err.println("An error occured while loading data. Use fallback by loading the file.");
3333
+//                        //e.printStackTrace();
3334
+//                            try
3335
+//                            {
3336
+//                                    ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3337
+//                            }
3338
+//                            catch (Exception e2)
3339
+//                            {
3340
+//                                    System.err.println("Motion file not found: " + fullname);
3341
+//                            }
3342
+//                    }
3318
3343
                 }
3319
3344
             }
3320
3345
             
..
..
@@ -3496,6 +3521,7 @@
3496
3521
     // filters out bad input data
3497
3522
     void FilterAnimData()
3498
3523
     {
3524
+                new Exception().printStackTrace();
3499
3525
         System.exit(0);
3500
3526
         
3501
3527
         float[] data; // = bvh.animation.getBoneData(0);
..
..
@@ -3870,17 +3896,22 @@
3870
3896
      //   if (firstframe)
3871
3897
      //       return;
3872
3898
         
3873
-        if (!restarted && /*display.restartframe &&*/
3874
-                Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
3899
+        if (//!restarted && /*display.restartframe &&*/
3900
+                Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW))
3875
3901
         {
3876
3902
             //display.restartframe = false;
3877
3903
             restarted = true;
3904
+        //System.err.println("restarted = true");
3878
3905
             Step();
3879
3906
         }
3880
3907
         else
3881
3908
         {
3882
-            if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
3909
+        //System.err.println("restarted");
3910
+            if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
3911
+            {
3883
3912
                 restarted = false;
3913
+        //System.err.println("restarted = false");
3914
+            }
3884
3915
         }
3885
3916
         
3886
3917
         super.drawSelf(display, root, selected, blocked);