blame | history | patch | commit | commitdiff
Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a 
 Object3D.java
....@@ -22,6 +22,7 @@
2222     //static final long serialVersionUID = -607422624994562685L;
2323     static final long serialVersionUID = 5022536242724664900L;
2424     
25
+    // Use GetUUID for backward compatibility with null.
2526     private UUID uuid = UUID.randomUUID();
2627     
2728     // TEMPORARY for mocap undo. No need to be transient.
....@@ -29,11 +30,29 @@
2930     Object3D saveskeleton;
3031     //
3132     
32
-    byte[] versions[];
33
+    String skyboxname;
34
+    String skyboxext;
35
+    
36
+    Object3D versionlist[];
3337     int versionindex = -1;    
3438         
39
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
40
+    
3541     ScriptNode scriptnode;
3642 
43
+    int VersionCount()
44
+    {
45
+        int count = 0;
46
+        
47
+        for (int i = versionlist.length; --i >= 0;)
48
+        {
49
+            if (versionlist[i] != null)
50
+                count++;
51
+        }
52
+        
53
+        return count;
54
+    }
55
+    
3756         void InitOthers()
3857         {
3958                 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -219,7 +238,7 @@
219238 //            o.bRep.support = null;
220239 //        }
221240         o.selection = this.selection;
222
-        o.versions = this.versions;
241
+        o.versionlist = this.versionlist;
223242         o.versionindex = this.versionindex;
224243         
225244         if (this.support != null)
....@@ -241,6 +260,73 @@
241260     //        this.bRep.support = null;
242261     //    this.support = null;
243262     //    this.fileparent = null;
263
+    }
264
+
265
+//    Object3D GetObject(java.util.UUID uuid)
266
+//    {
267
+//        if (this.uuid.equals(uuid))
268
+//            return this;
269
+//            
270
+//        if (blockloop)
271
+//            return null;
272
+//
273
+//        blockloop = true;
274
+//
275
+//        for (int i=0; i<Size(); i++)
276
+//        {
277
+//            Object3D o = get(i).GetObject(uuid);
278
+//            
279
+//            if (o != null)
280
+//                return o;
281
+//        }
282
+//        
283
+//        blockloop = false;
284
+//        
285
+//        return null;
286
+//    }
287
+    
288
+    transient boolean tag;
289
+
290
+    void TagObjects(Object3D o, boolean tag)
291
+    {
292
+        if (blockloop)
293
+            return;
294
+
295
+        o.tag = tag;
296
+        
297
+        if (o == this)
298
+            return;
299
+        
300
+        blockloop = true;
301
+
302
+        for (int i=0; i<Size(); i++)
303
+        {
304
+            get(i).TagObjects(o, tag);
305
+        }
306
+        
307
+        blockloop = false;
308
+    }
309
+
310
+    boolean HasTags()
311
+    {
312
+        if (blockloop)
313
+            return false;
314
+
315
+        blockloop = true;
316
+
317
+        boolean hasTags = false;
318
+        
319
+        for (int i=0; i<Size(); i++)
320
+        {
321
+            hasTags |= get(i).tag || get(i).HasTags();
322
+            
323
+            if (hasTags)
324
+                break;
325
+        }
326
+        
327
+        blockloop = false;
328
+        
329
+        return hasTags;
244330     }
245331 
246332     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
....@@ -277,7 +363,7 @@
277363         
278364         this.selection = o.selection;
279365         
280
-        this.versions = o.versions;
366
+        this.versionlist = o.versionlist;
281367         this.versionindex = o.versionindex;
282368 // July 2019        if (this.bRep != null)
283369 //            this.bRep.support = o.transientrep;
....@@ -495,11 +581,11 @@
495581         }
496582     }
497583     
498
-    int memorysize;
584
+    transient int memorysize; // needs to be transient, dunno why
499585     
500586     int MemorySize()
501587     {
502
-        if (true) // memorysize == 0)
588
+        if (memorysize == 0)
503589         {
504590             try
505591             {
....@@ -614,7 +700,7 @@
614700         {
615701             if (maxcount != 1)
616702             {
617
-                new Exception().printStackTrace();
703
+                //new Exception().printStackTrace();
618704             }
619705             
620706             toParentMarked = LA.newMatrix();
....@@ -1011,6 +1097,9 @@
10111097         
10121098         if (material == null || material.multiply)
10131099             return true;
1100
+        
1101
+        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1102
+            return false;
10141103         
10151104         // Transparent objects are dynamic because we have to sort the triangles.
10161105         return material.opacity > 0.99;
....@@ -2293,11 +2382,6 @@
22932382             
22942383             InitOthers();
22952384             
2296
-            if (this instanceof Camera)
2297
-            {
2298
-                material.shift = 90;
2299
-            }
2300
-
23012385             material.multiply = multiply;
23022386             
23032387             if (multiply)
....@@ -2438,6 +2522,11 @@
24382522         else
24392523         {
24402524             //((ObjEditor)editWindow).SetupUI2(null);
2525
+            if (objectUI != null)
2526
+                ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2527
+            else
2528
+                //new Exception().printStackTrace();
2529
+                System.err.println("objectUI is null");
24412530         }
24422531     }
24432532 
....@@ -3188,6 +3277,93 @@
31883277     blockloop = false;
31893278 }
31903279             
3280
+    public void ResetTransform(int mask)
3281
+    {
3282
+        Object3D obj = this;
3283
+        
3284
+        if (mask == -1)
3285
+        {
3286
+            if (obj instanceof Camera) // jan 2014
3287
+            {
3288
+                LA.matIdentity(obj.toParent);
3289
+                LA.matIdentity(obj.fromParent);
3290
+            }
3291
+            else
3292
+            {
3293
+                obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3294
+                obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3295
+            }
3296
+            return;
3297
+        }
3298
+        
3299
+        if ((mask&2) != 0) // Scale/rotation
3300
+        {
3301
+            obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3302
+            obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3303
+            obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3304
+            obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3305
+            obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3306
+            obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3307
+        }
3308
+        if ((mask&1) != 0) // Translation
3309
+        {
3310
+            if (obj.toParent != null)
3311
+            {
3312
+                obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3313
+                obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3314
+            }
3315
+        }
3316
+    }
3317
+    
3318
+    public void TextureRatioTransform(int axis)
3319
+    {
3320
+        cTexture tex = GetTextures();
3321
+
3322
+        com.sun.opengl.util.texture.TextureData texturedata = null;
3323
+
3324
+        try
3325
+        {
3326
+            texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
3327
+        }
3328
+        catch (Exception e)
3329
+        {
3330
+            System.err.println("FAIL TextureRatio: " + this);
3331
+        }
3332
+        
3333
+        LA.matIdentity(Object3D.mat);
3334
+        Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
3335
+
3336
+        if (toParent == null)
3337
+        {
3338
+            toParent = LA.newMatrix();
3339
+            fromParent = LA.newMatrix();
3340
+        }
3341
+
3342
+        ResetTransform(2);
3343
+        
3344
+        LA.matConcat(Object3D.mat, fromParent, fromParent);
3345
+        LA.matInvert(fromParent, toParent);
3346
+    }
3347
+
3348
+    void TextureRatio(int axis)
3349
+    {
3350
+        if (blockloop)
3351
+            return;
3352
+
3353
+        blockloop = true;
3354
+        
3355
+        TextureRatioTransform(axis);
3356
+        
3357
+        for (int i=Size(); --i>=0;)
3358
+        {
3359
+            Object3D v = get(i);
3360
+
3361
+            v.TextureRatio(axis);
3362
+        }
3363
+
3364
+        blockloop = false;
3365
+    }
3366
+
31913367     void TransformChildren()
31923368     {
31933369         if (toParent != null)
....@@ -3541,15 +3717,47 @@
35413717 
35423718     void ClearMaterials()
35433719     {
3720
+        if (blockloop)
3721
+            return;
3722
+        
3723
+        blockloop = true;
3724
+        
35443725         ClearMaterial();
3545
-        for (int i = 0; i < size(); i++)
3726
+        for (int i = 0; i < Size(); i++)
35463727         {
3547
-            Object3D child = (Object3D) reserve(i);
3728
+            Object3D child = (Object3D) get(i);
35483729             if (child == null)
35493730                 continue;
35503731             child.ClearMaterials();
3551
-            release(i);
35523732         }
3733
+        
3734
+        blockloop = false;
3735
+    }
3736
+    
3737
+    void ClearVersionList()
3738
+    {
3739
+        this.versionlist = null;
3740
+        this.versionindex = -1;
3741
+        this.versiontable = null;
3742
+    }
3743
+    
3744
+    void ClearVersions()
3745
+    {
3746
+        if (blockloop)
3747
+            return;
3748
+        
3749
+        blockloop = true;
3750
+        
3751
+        ClearVersionList();
3752
+        for (int i = 0; i < Size(); i++)
3753
+        {
3754
+            Object3D child = (Object3D) get(i);
3755
+            if (child == null)
3756
+                continue;
3757
+            child.ClearVersions();
3758
+        }
3759
+        
3760
+        blockloop = false;
35533761     }
35543762     
35553763     void FlipV(boolean flip)
....@@ -5539,6 +5747,11 @@
55395747         if (fullname == null)
55405748             return "";
55415749         
5750
+        if (fullname.pigment != null)
5751
+        {
5752
+            return fullname.pigment;
5753
+        }
5754
+        
55425755    //     System.out.println("Fullname = " + fullname);
55435756         
55445757         // Does not work on Windows due to C:
....@@ -5551,7 +5764,7 @@
55515764         
55525765         if (split.length == 0)
55535766         {
5554
-                return "";
5767
+                return fullname.pigment = "";
55555768         }
55565769         
55575770         if (split.length <= 2)
....@@ -5559,22 +5772,27 @@
55595772                 if (fullname.name.endsWith(":"))
55605773                 {
55615774                         // Windows
5562
-                        return fullname.name.substring(0, fullname.name.length()-1);
5775
+                        return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
55635776                 }
55645777                 
5565
-                return split[0];
5778
+                return fullname.pigment = split[0];
55665779         }
55675780         
55685781         // Windows
55695782         assert(split.length == 4);
55705783         
5571
-        return split[0] + ":" + split[1];
5784
+        return fullname.pigment = split[0] + ":" + split[1];
55725785     }
55735786     
55745787     static String GetBump(cTexture fullname)
55755788     {
55765789         if (fullname == null)
55775790             return "";
5791
+        
5792
+        if (fullname.bump != null)
5793
+        {
5794
+            return fullname.bump;
5795
+        }
55785796         
55795797   //      System.out.println("Fullname = " + fullname);
55805798         // Does not work on Windows due to C:
....@@ -5586,12 +5804,12 @@
55865804         
55875805         if (split.length == 0)
55885806         {
5589
-                return "";
5807
+                return fullname.bump = "";
55905808         }
55915809         
55925810         if (split.length == 1)
55935811         {
5594
-                return "";
5812
+                return fullname.bump = "";
55955813         }
55965814         
55975815         if (split.length == 2)
....@@ -5599,16 +5817,16 @@
55995817                 if (fullname.name.endsWith(":"))
56005818                 {
56015819                         // Windows
5602
-                        return "";
5820
+                        return fullname.bump = "";
56035821                 }
56045822                 
5605
-                return split[1];
5823
+                return fullname.bump = split[1];
56065824         }
56075825         
56085826         // Windows
56095827         assert(split.length == 4);
56105828         
5611
-        return split[2] + ":" + split[3];
5829
+        return fullname.bump = split[2] + ":" + split[3];
56125830     }
56135831     
56145832     String GetPigmentTexture()
....@@ -5691,6 +5909,9 @@
56915909             texname = "";
56925910         
56935911         GetTextures().name = texname + ":" + GetBump(GetTextures());
5912
+
5913
+        GetTextures().pigment = null;
5914
+        
56945915         Touch();
56955916     }
56965917 
....@@ -5763,6 +5984,8 @@
57635984             texname = "";
57645985         
57655986         GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5987
+        
5988
+        GetTextures().bump = null;
57665989         
57675990         Touch();
57685991     }
....@@ -5846,6 +6069,11 @@
58466069         return parent.IsLive();
58476070     }
58486071     
6072
+    boolean IsDynamic()
6073
+    {
6074
+        return live && bRep != null;
6075
+    }
6076
+    
58496077     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
58506078     {
58516079         Invariants(); // june 2013
....@@ -5906,8 +6134,11 @@
59066134         if (support != null)
59076135             support = support;
59086136         
5909
-        //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5910
-        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6137
+        boolean usecalllists = !IsDynamic() &&
6138
+                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6139
+        //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6140
+        
6141
+        //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
59116142         
59126143         if (!usecalllists && bRep != null && bRep.displaylist > 0)
59136144         {
....@@ -5917,8 +6148,9 @@
59176148    //     usecalllists &= !(parent instanceof RandomNode);
59186149    //     usecalllists = false;
59196150 
5920
-        if (GetBRep() != null)
5921
-            usecalllists = usecalllists;
6151
+        if (display.DrawMode() == display.SHADOW)
6152
+            //GetBRep() != null)
6153
+            usecalllists = !!usecalllists;
59226154         //System.out.println("draw " + this);
59236155         //new Exception().printStackTrace();
59246156 
....@@ -5940,7 +6172,7 @@
59406172             if (!(this instanceof Composite))
59416173                 touched = false;
59426174             //if (displaylist == -1 && usecalllists)
5943
-            if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
6175
+            if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
59446176             {
59456177                 bRep.displaylist = display.GenList();
59466178                 assert(bRep.displaylist != 0);
....@@ -5951,7 +6183,7 @@
59516183 
59526184             //System.out.println("\tnew list " + list);
59536185             //gl.glDrawBuffer(gl.GL_NONE);
5954
-            if (usecalllists)
6186
+            if (usecalllists && bRep.displaylist > 0)
59556187             {
59566188 //            System.err.println("new list " + bRep.displaylist + " for " + this);
59576189                 display.NewList(bRep.displaylist);
....@@ -5960,7 +6192,7 @@
59606192             CallList(display, root, selected, blocked);
59616193             
59626194           //  compiled = true;
5963
-            if (usecalllists)
6195
+            if (usecalllists && bRep.displaylist > 0)
59646196             {
59656197 //            System.err.println("end list " + bRep.displaylist + " for " + this);
59666198                 display.EndList();
....@@ -7364,7 +7596,7 @@
73647596             boundary.y = spot.y - 30;
73657597             boundary.width = spot.width + 60;
73667598             boundary.height = spot.height + 60;
7367
-            clickInfo.g.setColor(Color.red);
7599
+            clickInfo.g.setColor(Color.white);
73687600             int spotw = spot.x + spot.width;
73697601             int spoth = spot.y + spot.height;
73707602             clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
....@@ -7384,7 +7616,29 @@
73847616 //            {
73857617 //                CameraPane.Ymax = spoth;
73867618 //            }
7387
-            spot.translate(32, 32);
7619
+//            if (CameraPane.Xmin > spot.x)
7620
+//            {
7621
+//                CameraPane.Xmin = spot.x;
7622
+//            }
7623
+//            if (CameraPane.Xmax < spotw)
7624
+//            {
7625
+//                CameraPane.Xmax = spotw;
7626
+//            }
7627
+//            if (CameraPane.Ymin > spot.y)
7628
+//            {
7629
+//                CameraPane.Ymin = spot.y;
7630
+//            }
7631
+//            if (CameraPane.Ymax < spoth)
7632
+//            {
7633
+//                CameraPane.Ymax = spoth;
7634
+//            }
7635
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7636
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7637
+            spot.translate(32, 0);
7638
+            clickInfo.g.setColor(Color.yellow);
7639
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7640
+            
7641
+            spot.translate(32, 64);
73887642             spotw = spot.x + spot.width;
73897643             spoth = spot.y + spot.height;
73907644             clickInfo.g.setColor(Color.cyan);
....@@ -7405,28 +7659,7 @@
74057659 //            {
74067660 //                CameraPane.Ymax = spoth;
74077661 //            }
7408
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7409
-            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7410
-            spot.translate(0, -32);
7411
-            clickInfo.g.setColor(Color.yellow);
7412
-            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
74137662             clickInfo.g.setColor(Color.green);
7414
-//            if (CameraPane.Xmin > spot.x)
7415
-//            {
7416
-//                CameraPane.Xmin = spot.x;
7417
-//            }
7418
-//            if (CameraPane.Xmax < spotw)
7419
-//            {
7420
-//                CameraPane.Xmax = spotw;
7421
-//            }
7422
-//            if (CameraPane.Ymin > spot.y)
7423
-//            {
7424
-//                CameraPane.Ymin = spot.y;
7425
-//            }
7426
-//            if (CameraPane.Ymax < spoth)
7427
-//            {
7428
-//                CameraPane.Ymax = spoth;
7429
-//            }
74307663             clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
74317664                     (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
74327665             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
....@@ -7485,12 +7718,14 @@
74857718             retval = true;
74867719         }
74877720         spot.translate(0, 32);
7721
+        spot.translate(32, 0);
7722
+        spot.translate(0, 32);
74887723         if (spot.contains(clickInfo.x, clickInfo.y))
74897724         {
74907725             hitSomething = hitScale;
74917726             
74927727         double scale = 0.005f * clickInfo.camera.Distance();
7493
-                double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
7728
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
74947729                 double sign = 1;
74957730                 if (hScale < 0)
74967731                 {
....@@ -7502,7 +7737,7 @@
75027737                     //hScale = 0.01;
75037738                 }
75047739                 
7505
-                double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
7740
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
75067741                 sign = 1;
75077742                 if (vScale < 0)
75087743                 {
....@@ -7582,7 +7817,9 @@
75827817                 
75837818                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
75847819                 
7585
-                if (modified || opposite)
7820
+                // Modified could snap
7821
+                if (//modified ||
7822
+                        opposite)
75867823                 {
75877824                     //assert(false);
75887825                             /*
....@@ -7676,7 +7913,7 @@
76767913 
76777914                 if (modified)
76787915                 {
7679
-                    // Rotate 90 degrees
7916
+                    // Rotate 45 degrees
76807917                     angle /= (Math.PI / 4);
76817918                     angle = Math.floor(angle + 0.5);
76827919                     angle *= (Math.PI / 4);
....@@ -7717,7 +7954,7 @@
77177954                 break;
77187955 
77197956             case hitScale: // scale
7720
-                double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
7957
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
77217958                 double sign = 1;
77227959                 if (hScale < 0)
77237960                 {
....@@ -7729,7 +7966,7 @@
77297966                     //hScale = 0.01;
77307967                 }
77317968                 
7732
-                double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
7969
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
77337970                 sign = 1;
77347971                 if (vScale < 0)
77357972                 {
....@@ -7762,21 +7999,27 @@
77627999                     case 3: // '\001'
77638000                         if (modified || opposite)
77648001                         {
8002
+                            if (modified) // && opposite)
8003
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
8004
+                            else
77658005                             //LA.matScale(toParent, 1, hScale, vScale);
7766
-                            LA.matScale(toParent, totalScale, 1, 1);
8006
+                                LA.matScale(toParent, totalScale, 1, 1);
77678007                         } // vScale, 1);
77688008                         else
77698009                         {
77708010                             // EXCEPTION!
7771
-                            LA.matScale(toParent, totalScale, totalScale, totalScale);
8011
+                            LA.matScale(toParent, 1, totalScale, totalScale);
77728012                         } // vScale, 1);
77738013                         break;
77748014 
77758015                     case 2: // '\002'
77768016                         if (modified || opposite)
77778017                         {
7778
-                            //LA.matScale(toParent, hScale, 1, vScale);
7779
-                            LA.matScale(toParent, 1, totalScale, 1);
8018
+                            if (modified) // && opposite)
8019
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
8020
+                            else
8021
+                                //LA.matScale(toParent, hScale, 1, vScale);
8022
+                                LA.matScale(toParent, 1, totalScale, 1);
77808023                         } else
77818024                         {
77828025                             LA.matScale(toParent, totalScale, 1, totalScale);
....@@ -7786,8 +8029,11 @@
77868029                     case 1: // '\003'
77878030                         if (modified || opposite)
77888031                         {
7789
-                            //LA.matScale(toParent, hScale, vScale, 1);
7790
-                            LA.matScale(toParent, 1, 1, totalScale);
8032
+                            if (modified) // && opposite)
8033
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
8034
+                            else
8035
+                                //LA.matScale(toParent, hScale, vScale, 1);
8036
+                                LA.matScale(toParent, 1, 1, totalScale);
77918037                         } else
77928038                         {
77938039                             LA.matScale(toParent, totalScale, totalScale, 1);
....@@ -7935,10 +8181,10 @@
79358181         } //  + super.toString();
79368182     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
79378183         
7938
-        if (!Globals.ADVANCED)
7939
-            return objname;
8184
+//        if (!Globals.ADVANCED)
8185
+//            return objname;
79408186         
7941
-        return objname + " " + System.identityHashCode(this);
8187
+        return objname + " " + System.identityHashCode(this); // + GetUUID()
79428188     }
79438189 
79448190     public int hashCode()