Edit panel

Normand Briere

2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df

 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];
..
..
@@ -638,6 +644,24 @@
638
644
 //    transient // aout 2013
639
645
             Object3D skeleton;
640
646
     
647
+    void ExtractBigData(Object3D o)
648
+    {
649
+        super.ExtractBigData(o);
650
+        
651
+        o.bvh = this.bvh;
652
+        o.skeleton = this.skeleton;
653
+        this.bvh = null;
654
+        this.skeleton = null;
655
+    }
656
+
657
+    void RestoreBigData(Object3D o)
658
+    {
659
+        super.RestoreBigData(o);
660
+        
661
+        this.bvh = o.bvh;
662
+        this.skeleton = o.skeleton;
663
+    }
664
+    
641
665
     boolean smoothed;
642
666
     
643
667
     //boolean touched;
..
..
@@ -664,8 +688,8 @@
664
688
     double targetdirx;
665
689
     double targetdirz;
666
690
     
667
-    double goalposx = -20;
668
-    double goalposz = -10;
691
+    double goalposx = 0; // -20;
692
+    double goalposz = 0; // -10;
669
693
     
670
694
     boolean followpath;
671
695
     
..
..
@@ -921,7 +945,7 @@
921
945
 //                    //GetFileRoot();
922
946
                   
923
947
                     // sept 2014: //
924
-                    GrafreeD.RENDERME = 3; // patch for Merge objects
948
+                    Grafreed.RENDERME = 3; // patch for Merge objects
925
949
                     float[] thedata = bvh.animation.getBoneData(0);
926
950
                     
927
951
                     os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
..
..
@@ -1566,7 +1590,7 @@
1566
1590
 
1567
1591
                         lastsoundtime = Globals.framecount;
1568
1592
                         
1569
-                        GrafreeD.hassound = true;
1593
+                        Grafreed.hassound = true;
1570
1594
                     }
1571
1595
 //                    else
1572
1596
 //                        System.out.println("skipped");
..
..
@@ -2797,7 +2821,8 @@
2797
2821
                 //if (bone._rotationEnabled)
2798
2822
                 if (//frame > 0 &&
2799
2823
                     !bone.skipmocap &&
2800
-                    !bone.name.contains("head") // &&
2824
+                    !bone.name.contains("head") &&
2825
+                    !bone.name.contains("Head") // &&
2801
2826
                  //   !bone.name.contains("rFoot") &&
2802
2827
                  //   !bone.name.contains("lFoot") &&
2803
2828
 //                    !bone.name.contains("Pinky") &&
..
..
@@ -3233,8 +3258,8 @@
3233
3258
         
3234
3259
 // aout 2013        endframe = 0; // june 2013
3235
3260
         
3236
-        //ResetZero();
3237
-        setPose(frame);
3261
+        ResetZero();
3262
+        //setPose(frame);
3238
3263
     }
3239
3264
     
3240
3265
     static int mocapsupport = 0;
..
..
@@ -3299,23 +3324,40 @@
3299
3324
 //            SetPositionDelta(false, true, false); // ?? false);
3300
3325
             {
3301
3326
                 if (support == null)
3302
-                    ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3327
+                {
3328
+                    if (bvh == null && new File(fullname).exists())
3329
+                            ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3330
+                    else
3331
+                    {
3332
+                            SetGlobalTransform();
3333
+                            Rewind();
3334
+                            Fade();
3335
+                    }
3336
+                }
3303
3337
                 else
3304
3338
                 {
3305
-                    try
3306
-                    {
3339
+//                    try
3340
+//                    {
3307
3341
                         bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
3308
3342
 
3309
3343
                         // SetPositionDelta(false, true, true, true);
3310
3344
                         LoadData();
3311
3345
                         Rewind();
3312
3346
                         Fade();
3313
-                    }
3314
-                    catch (Exception e)
3315
-                    {
3316
-                        e.printStackTrace();
3317
-                        ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3318
-                    }
3347
+//                    }
3348
+//                    catch (Exception e)
3349
+//                    {
3350
+//                            System.err.println("An error occured while loading data. Use fallback by loading the file.");
3351
+//                        //e.printStackTrace();
3352
+//                            try
3353
+//                            {
3354
+//                                    ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
3355
+//                            }
3356
+//                            catch (Exception e2)
3357
+//                            {
3358
+//                                    System.err.println("Motion file not found: " + fullname);
3359
+//                            }
3360
+//                    }
3319
3361
                 }
3320
3362
             }
3321
3363
             
..
..
@@ -3872,17 +3914,22 @@
3872
3914
      //   if (firstframe)
3873
3915
      //       return;
3874
3916
         
3875
-        if (!restarted && /*display.restartframe &&*/
3876
-                Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
3917
+        if (//!restarted && /*display.restartframe &&*/
3918
+                Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW))
3877
3919
         {
3878
3920
             //display.restartframe = false;
3879
3921
             restarted = true;
3922
+        //System.err.println("restarted = true");
3880
3923
             Step();
3881
3924
         }
3882
3925
         else
3883
3926
         {
3884
-            if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
3927
+        //System.err.println("restarted");
3928
+            if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
3929
+            {
3885
3930
                 restarted = false;
3931
+        //System.err.println("restarted = false");
3932
+            }
3886
3933
         }
3887
3934
         
3888
3935
         super.drawSelf(display, root, selected, blocked);