Edit panel pin state.

Normand Briere

2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1

 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];
..
..
@@ -495,6 +501,7 @@
495
501
         centroid.z = matrix[3][2];
496
502
 //        this.getCentroid(centroid, true);
497
503
         
504
+        CameraPane.CreateSelectedPoint();
498
505
         CameraPane.debugpointG.name = "";
499
506
         CameraPane.debugpointG.toParent[3][0] = mocaporigin.x;
500
507
         CameraPane.debugpointG.toParent[3][1] = mocaporigin.y;
..
..
@@ -638,6 +645,24 @@
638
645
 //    transient // aout 2013
639
646
             Object3D skeleton;
640
647
     
648
+    void ExtractBigData(Object3D o)
649
+    {
650
+        super.ExtractBigData(o);
651
+        
652
+        o.bvh = this.bvh;
653
+        o.skeleton = this.skeleton;
654
+        this.bvh = null;
655
+        this.skeleton = null;
656
+    }
657
+
658
+    void RestoreBigData(Object3D o)
659
+    {
660
+        super.RestoreBigData(o);
661
+        
662
+        this.bvh = o.bvh;
663
+        this.skeleton = o.skeleton;
664
+    }
665
+    
641
666
     boolean smoothed;
642
667
     
643
668
     //boolean touched;
..
..
@@ -664,8 +689,8 @@
664
689
     double targetdirx;
665
690
     double targetdirz;
666
691
     
667
-    double goalposx = -20;
668
-    double goalposz = -10;
692
+    double goalposx = 0; // -20;
693
+    double goalposz = 0; // -10;
669
694
     
670
695
     boolean followpath;
671
696
     
..
..
@@ -921,7 +946,7 @@
921
946
 //                    //GetFileRoot();
922
947
                   
923
948
                     // sept 2014: //
924
-                    GrafreeD.RENDERME = 3; // patch for Merge objects
949
+                    Grafreed.RENDERME = 3; // patch for Merge objects
925
950
                     float[] thedata = bvh.animation.getBoneData(0);
926
951
                     
927
952
                     os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
..
..
@@ -1566,7 +1591,7 @@
1566
1591
 
1567
1592
                         lastsoundtime = Globals.framecount;
1568
1593
                         
1569
-                        GrafreeD.hassound = true;
1594
+                        Grafreed.hassound = true;
1570
1595
                     }
1571
1596
 //                    else
1572
1597
 //                        System.out.println("skipped");
..
..
@@ -2797,7 +2822,8 @@
2797
2822
                 //if (bone._rotationEnabled)
2798
2823
                 if (//frame > 0 &&
2799
2824
                     !bone.skipmocap &&
2800
-                    !bone.name.contains("head") // &&
2825
+                    !bone.name.contains("head") &&
2826
+                    !bone.name.contains("Head") // &&
2801
2827
                  //   !bone.name.contains("rFoot") &&
2802
2828
                  //   !bone.name.contains("lFoot") &&
2803
2829
 //                    !bone.name.contains("Pinky") &&
..
..
@@ -3233,8 +3259,8 @@
3233
3259
         
3234
3260
 // aout 2013        endframe = 0; // june 2013
3235
3261
         
3236
-        //ResetZero();
3237
-        setPose(frame);
3262
+        ResetZero();
3263
+        //setPose(frame);
3238
3264
     }
3239
3265
     
3240
3266
     static int mocapsupport = 0;
..
..
@@ -3300,7 +3326,7 @@
3300
3326
             {
3301
3327
                 if (support == null)
3302
3328
                 {
3303
-                    if (new File(fullname).exists())
3329
+                    if (bvh == null && new File(fullname).exists())
3304
3330
                             ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3305
3331
                     else
3306
3332
                     {
..
..
@@ -3889,17 +3915,22 @@
3889
3915
      //   if (firstframe)
3890
3916
      //       return;
3891
3917
         
3892
-        if (!restarted && /*display.restartframe &&*/
3893
-                Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
3918
+        if (//!restarted && /*display.restartframe &&*/
3919
+                Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE))
3894
3920
         {
3895
3921
             //display.restartframe = false;
3896
3922
             restarted = true;
3923
+        //System.err.println("restarted = true");
3897
3924
             Step();
3898
3925
         }
3899
3926
         else
3900
3927
         {
3901
-            if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
3928
+        //System.err.println("restarted");
3929
+            if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
3930
+            {
3902
3931
                 restarted = false;
3932
+        //System.err.println("restarted = false");
3933
+            }
3903
3934
         }
3904
3935
         
3905
3936
         super.drawSelf(display, root, selected, blocked);