Maze

Normand Briere

2019-11-17 cb37a129d1adb403019c96e798e86e2da9667f15

 Mocap.java
..
..
@@ -998,7 +998,7 @@
998
998
         
999
999
         get(0).link2master = path.size() > 1; // hip orientation
1000
1000
         
1001
-        if (get(0).link2master)
1001
+        if (get(0).Link2Support())
1002
1002
         {
1003
1003
             rotateonce = 2;
1004
1004
         }
..
..
@@ -1427,7 +1427,7 @@
1427
1427
         double w = 0.00015;
1428
1428
 
1429
1429
         //if (!sourcenode.link2master) // strong pin on floor
1430
-        if (parent.link2master) // strong pin on floor
1430
+        if (parent.Link2Support()) // strong pin on floor
1431
1431
         {
1432
1432
             w = 0.005; // .001;
1433
1433
         }
..
..
@@ -1641,7 +1641,7 @@
1641
1641
 //            sourcenode.parent.toParent[3][1] = ground - floor.y;
1642
1642
 //            sourcenode.parent.toParent[3][2] += groundz - floor.z;
1643
1643
 //            sourcenode.parent.toParent[3][1] = K * (ground - floor.y) + (1 - K) * oldposy;
1644
-            if (footcontact && (sourcenode.parent != null && !sourcenode.parent.link2master)) // strong pin on floor
1644
+            if (footcontact && (sourcenode.parent != null && !sourcenode.parent.Link2Support())) // strong pin on floor
1645
1645
             {
1646
1646
         v0.x = groundx - floor.x;
1647
1647
         v0.y = 0; // groundx - floor.x;
..
..
@@ -2006,7 +2006,7 @@
2006
2006
 //        if (sourcenode.link2master)
2007
2007
 //        if (goalx != 0 || goalz != 0)
2008
2008
 //            K = 0.02; // .0625;
2009
-        if (parent.link2master) // strong pin on floor
2009
+        if (parent.Link2Support()) // strong pin on floor
2010
2010
         {
2011
2011
             K = 0.05; // 0.02;
2012
2012
         }
..
..
@@ -2423,9 +2423,9 @@
2423
2423
 //            SetBreakPoint(get(0).toParent[0], 0);
2424
2424
 //        }
2425
2425
         
2426
-        boolean setrotation = get(0).link2master && !firsttimeafterload && frame > 0;
2426
+        boolean setrotation = get(0).Link2Support() && !firsttimeafterload && frame > 0;
2427
2427
         boolean setposition = sourcenode != null && // sourcenode.parent != null && // july 2014
2428
-                              sourcenode./*parent.*/link2master && !firsttimeafterload && frame > 0;
2428
+                              sourcenode./*parent.*/Link2Support() && !firsttimeafterload && frame > 0;
2429
2429
         
2430
2430
 //        cVector centroid = new cVector();
2431
2431
 //        cVector floor = new cVector();
..
..
@@ -2858,7 +2858,7 @@
2858
2858
 
2859
2859
                 // set translation
2860
2860
                 // (currently only possible for root bone! see mocapdata.com data)
2861
-                if (bone._isRoot && link2master) // && !GetFileRoot().link2master)
2861
+                if (bone._isRoot && Link2Support()) // && !GetFileRoot().link2master)
2862
2862
                 {
2863
2863
                     if (hasTranslation) // && _translationEnabled)
2864
2864
                     {
..
..
@@ -3924,6 +3924,8 @@
3924
3924
             restarted = true;
3925
3925
         //System.err.println("restarted = true");
3926
3926
             Step();
3927
+            
3928
+            Globals.lighttouched = true;
3927
3929
         }
3928
3930
         else
3929
3931
         {
..
..
@@ -3992,6 +3994,11 @@
3992
3994
      //   GetObject().release(i);
3993
3995
     }
3994
3996
     
3997
+    boolean HasBigData()
3998
+    {
3999
+        return skeleton != null;
4000
+    }
4001
+    
3995
4002
     public Object3D get(int i)
3996
4003
     {
3997
4004
         if (i != 0)