Fix animation and fast mode.

Normand Briere

2019-05-01 20c1a07b76c39462594aedfedfe6e6adb17cd552

 Mocap.java
..
..
@@ -1519,7 +1519,7 @@
1519
1519
 //            mywave = currentwave++;
1520
1520
 //        }
1521
1521
                     // sound
1522
-                    cVector eye = CameraPane.theRenderer.eyeCamera.location;
1522
+                    cVector eye = Globals.theRenderer.EyeCamera().location;
1523
1523
 
1524
1524
 //                    if (sourcenode.parent.parent != null)
1525
1525
 //                        sourcenode.parent.parent.TransformToWorld(floor, tmp);
..
..
@@ -1564,7 +1564,7 @@
1564
1564
                         //GraphreeD.
1565
1565
                             wav.play(volume * usedvolume); //, mywave);
1566
1566
 
1567
-                        lastsoundtime = CameraPane.framecount;
1567
+                        lastsoundtime = Globals.framecount;
1568
1568
                         
1569
1569
                         GrafreeD.hassound = true;
1570
1570
                     }
..
..
@@ -2267,7 +2267,7 @@
2267
2267
             }
2268
2268
 
2269
2269
             if (!smoothed)
2270
-                for (int i=0; --i>=0;)
2270
+                for (int i=10; --i>=0;)
2271
2271
                     SmoothAnimData(); // much reduces shakiness
2272
2272
 
2273
2273
             smoothed = true;
..
..
@@ -3252,12 +3252,13 @@
3252
3252
         
3253
3253
         int step = 1;
3254
3254
         
3255
+        // patch for running hare
3255
3256
         if (speedup) // fev 2014
3256
3257
             step *= 2; // 4;
3257
3258
         if (rewind) // mars 2014
3258
3259
             step *= 4;
3259
3260
 
3260
-        if (CameraPane.FAST) // && !CameraPane.HOLD)
3261
+        //if (CameraPane.FAST) // && !CameraPane.HOLD)
3261
3262
             step *= CameraPane.STEP;
3262
3263
         
3263
3264
         //System.err.println("Step Mocap frame # " + frame);
..
..
@@ -3289,7 +3290,7 @@
3289
3290
                                "; fullname = " + fullname);
3290
3291
             
3291
3292
             //int delta = frame - baseframe;
3292
-            if (CameraPane.CROWD)
3293
+            if (Globals.CROWD)
3293
3294
             {
3294
3295
                 baseframe = GetFirstFrame(); // 0 initial point
3295
3296
             }
..
..
@@ -3496,6 +3497,7 @@
3496
3497
     // filters out bad input data
3497
3498
     void FilterAnimData()
3498
3499
     {
3500
+                new Exception().printStackTrace();
3499
3501
         System.exit(0);
3500
3502
         
3501
3503
         float[] data; // = bvh.animation.getBoneData(0);
..
..
@@ -3853,7 +3855,7 @@
3853
3855
     
3854
3856
     transient boolean restarted; // CROWD issue?
3855
3857
     
3856
-    void drawSelf(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
3858
+    void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
3857
3859
     {
3858
3860
         //System.err.println("drawSelf Mocap frame # " + frame);
3859
3861
         //System.err.println("drawSelf Mocap baseframe # " + baseframe);
..
..
@@ -3871,7 +3873,7 @@
3871
3873
      //       return;
3872
3874
         
3873
3875
         if (!restarted && /*display.restartframe &&*/
3874
-                display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
3876
+                Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
3875
3877
         {
3876
3878
             //display.restartframe = false;
3877
3879
             restarted = true;
..
..
@@ -3879,7 +3881,7 @@
3879
3881
         }
3880
3882
         else
3881
3883
         {
3882
-            if (display.isLIVE() && live && display.drawMode != display.SHADOW)
3884
+            if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
3883
3885
                 restarted = false;
3884
3886
         }
3885
3887