Fix camera up and skybox AO

Normand Briere

2019-10-06 ce660a4b6ba367bd162dd2cff26d02c80a34c912

 Mocap.java
..
..
@@ -261,6 +261,8 @@
261
261
         
262
262
 //    LA.matConcat(toParent, hip.get(0).toParent, toParent);
263
263
         
264
+        CameraPane.CreateSelectedPoint();
265
+        
264
266
         CameraPane.debugpointG.toParent[3][0] = poship.x;
265
267
         CameraPane.debugpointG.toParent[3][1] = poship.y;
266
268
         CameraPane.debugpointG.toParent[3][2] = poship.z;        
..
..
@@ -649,8 +651,8 @@
649
651
     {
650
652
         super.ExtractBigData(o);
651
653
         
652
-        o.bvh = this.bvh;
653
-        o.skeleton = this.skeleton;
654
+        o.savebvh = this.bvh;
655
+        o.saveskeleton = this.skeleton;
654
656
         this.bvh = null;
655
657
         this.skeleton = null;
656
658
     }
..
..
@@ -659,8 +661,8 @@
659
661
     {
660
662
         super.RestoreBigData(o);
661
663
         
662
-        this.bvh = o.bvh;
663
-        this.skeleton = o.skeleton;
664
+        this.bvh = o.savebvh;
665
+        this.skeleton = o.saveskeleton;
664
666
     }
665
667
     
666
668
     boolean smoothed;
..
..
@@ -996,7 +998,7 @@
996
998
         
997
999
         get(0).link2master = path.size() > 1; // hip orientation
998
1000
         
999
-        if (get(0).link2master)
1001
+        if (get(0).Link2Support())
1000
1002
         {
1001
1003
             rotateonce = 2;
1002
1004
         }
..
..
@@ -1425,7 +1427,7 @@
1425
1427
         double w = 0.00015;
1426
1428
 
1427
1429
         //if (!sourcenode.link2master) // strong pin on floor
1428
-        if (parent.link2master) // strong pin on floor
1430
+        if (parent.Link2Support()) // strong pin on floor
1429
1431
         {
1430
1432
             w = 0.005; // .001;
1431
1433
         }
..
..
@@ -1639,7 +1641,7 @@
1639
1641
 //            sourcenode.parent.toParent[3][1] = ground - floor.y;
1640
1642
 //            sourcenode.parent.toParent[3][2] += groundz - floor.z;
1641
1643
 //            sourcenode.parent.toParent[3][1] = K * (ground - floor.y) + (1 - K) * oldposy;
1642
-            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
1643
1645
             {
1644
1646
         v0.x = groundx - floor.x;
1645
1647
         v0.y = 0; // groundx - floor.x;
..
..
@@ -2004,7 +2006,7 @@
2004
2006
 //        if (sourcenode.link2master)
2005
2007
 //        if (goalx != 0 || goalz != 0)
2006
2008
 //            K = 0.02; // .0625;
2007
-        if (parent.link2master) // strong pin on floor
2009
+        if (parent.Link2Support()) // strong pin on floor
2008
2010
         {
2009
2011
             K = 0.05; // 0.02;
2010
2012
         }
..
..
@@ -2421,9 +2423,9 @@
2421
2423
 //            SetBreakPoint(get(0).toParent[0], 0);
2422
2424
 //        }
2423
2425
         
2424
-        boolean setrotation = get(0).link2master && !firsttimeafterload && frame > 0;
2426
+        boolean setrotation = get(0).Link2Support() && !firsttimeafterload && frame > 0;
2425
2427
         boolean setposition = sourcenode != null && // sourcenode.parent != null && // july 2014
2426
-                              sourcenode./*parent.*/link2master && !firsttimeafterload && frame > 0;
2428
+                              sourcenode./*parent.*/Link2Support() && !firsttimeafterload && frame > 0;
2427
2429
         
2428
2430
 //        cVector centroid = new cVector();
2429
2431
 //        cVector floor = new cVector();
..
..
@@ -2856,7 +2858,7 @@
2856
2858
 
2857
2859
                 // set translation
2858
2860
                 // (currently only possible for root bone! see mocapdata.com data)
2859
-                if (bone._isRoot && link2master) // && !GetFileRoot().link2master)
2861
+                if (bone._isRoot && Link2Support()) // && !GetFileRoot().link2master)
2860
2862
                 {
2861
2863
                     if (hasTranslation) // && _translationEnabled)
2862
2864
                     {
..
..
@@ -3922,6 +3924,8 @@
3922
3924
             restarted = true;
3923
3925
         //System.err.println("restarted = true");
3924
3926
             Step();
3927
+            
3928
+            Globals.lighttouched = true;
3925
3929
         }
3926
3930
         else
3927
3931
         {
..
..
@@ -3990,6 +3994,11 @@
3990
3994
      //   GetObject().release(i);
3991
3995
     }
3992
3996
     
3997
+    boolean HasBigData()
3998
+    {
3999
+        return skeleton != null;
4000
+    }
4001
+    
3993
4002
     public Object3D get(int i)
3994
4003
     {
3995
4004
         if (i != 0)