Transform children

Normand Briere

2019-05-13 f924d3e00db476c06f55f3d5aaef307e17575340

 Object3D.java
..
..
@@ -797,7 +797,7 @@
797
797
         
798
798
         if (marked && Globals.isLIVE() && live &&
799
799
                 //TEMP21aug2018
800
-                Globals.DrawMode() == iCameraPane.SHADOW &&
800
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
801
801
                 currentframe != Globals.framecount)
802
802
         {
803
803
             currentframe = Globals.framecount;
..
..
@@ -912,6 +912,11 @@
912
912
         fromParent = null; // LA.newMatrix();
913
913
         bRep = null; // new BoundaryRep();
914
914
 
915
+        if (oname != null && oname.equals("LeftHand"))
916
+        {
917
+            name = oname;
918
+        }
919
+        
915
920
         /*
916
921
         float hue = (float)Math.random();
917
922
         Color col;
..
..
@@ -1470,7 +1475,7 @@
1470
1475
             BoundaryRep.SEUIL = other.material.cameralight;
1471
1476
 
1472
1477
             // Set default to 0.1
1473
-            BoundaryRep.SEUIL /= 2;
1478
+            BoundaryRep.SEUIL /= 4; // 2;
1474
1479
             System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475
1480
         }
1476
1481
         
..
..
@@ -2983,6 +2988,31 @@
2983
2988
     blockloop = false;
2984
2989
 }
2985
2990
             
2991
+    void TransformChildren()
2992
+    {
2993
+        if (toParent != null)
2994
+        {
2995
+            for (int i=Size(); --i>=0;)
2996
+            {
2997
+                Object3D v = get(i);
2998
+
2999
+                if (v.toParent == null)
3000
+                {
3001
+                    v.toParent = LA.newMatrix();
3002
+                    v.fromParent = LA.newMatrix();
3003
+                }
3004
+
3005
+                LA.matConcat(v.toParent, toParent, v.toParent);
3006
+                LA.matConcat(fromParent, v.fromParent, v.fromParent);
3007
+            }
3008
+
3009
+            toParent = null; // LA.matIdentity(toParent);
3010
+            fromParent = null; // LA.matIdentity(fromParent);
3011
+
3012
+            Touch();
3013
+        }
3014
+    }
3015
+    
2986
3016
     void TransformGeometry()
2987
3017
     {
2988
3018
         Object3D obj = this;
..
..
@@ -5379,7 +5409,7 @@
5379
5409
         return
5380
5410
                 CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5381
5411
                  // PROBLEM with CROWD!!
5382
-                    && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5412
+                    && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
5383
5413
     }
5384
5414
     
5385
5415
     static boolean DEBUG_SELECTION = false;
..
..
@@ -7368,14 +7398,22 @@
7368
7398
         //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369
7399
         //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370
7400
         //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7401
+        
7402
+        String objname;
7403
+        
7371
7404
         if (false) //parent != null)
7372
7405
         {
7373
-            return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7406
+            objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374
7407
         } else
7375
7408
         {
7376
-            return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7409
+            objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
7377
7410
         } //  + super.toString();
7378
7411
     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7412
+        
7413
+        if (!Globals.ADVANCED)
7414
+            return objname;
7415
+        
7416
+        return objname + " " + System.identityHashCode(this);
7379
7417
     }
7380
7418
 
7381
7419
     public int hashCode()