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.
....@@ -32,11 +33,26 @@
3233     String skyboxname;
3334     String skyboxext;
3435     
35
-    Object3D versions[];
36
+    Object3D versionlist[];
3637     int versionindex = -1;    
3738         
39
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
40
+    
3841     ScriptNode scriptnode;
3942 
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
+    
4056         void InitOthers()
4157         {
4258                 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -222,7 +238,7 @@
222238 //            o.bRep.support = null;
223239 //        }
224240         o.selection = this.selection;
225
-        o.versions = this.versions;
241
+        o.versionlist = this.versionlist;
226242         o.versionindex = this.versionindex;
227243         
228244         if (this.support != null)
....@@ -244,6 +260,73 @@
244260     //        this.bRep.support = null;
245261     //    this.support = null;
246262     //    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;
247330     }
248331 
249332     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
....@@ -280,7 +363,7 @@
280363         
281364         this.selection = o.selection;
282365         
283
-        this.versions = o.versions;
366
+        this.versionlist = o.versionlist;
284367         this.versionindex = o.versionindex;
285368 // July 2019        if (this.bRep != null)
286369 //            this.bRep.support = o.transientrep;
....@@ -498,11 +581,11 @@
498581         }
499582     }
500583     
501
-    int memorysize;
584
+    transient int memorysize; // needs to be transient, dunno why
502585     
503586     int MemorySize()
504587     {
505
-        if (true) // memorysize == 0)
588
+        if (memorysize == 0)
506589         {
507590             try
508591             {
....@@ -617,7 +700,7 @@
617700         {
618701             if (maxcount != 1)
619702             {
620
-                new Exception().printStackTrace();
703
+                //new Exception().printStackTrace();
621704             }
622705             
623706             toParentMarked = LA.newMatrix();
....@@ -2299,11 +2382,6 @@
22992382             
23002383             InitOthers();
23012384             
2302
-            if (this instanceof Camera)
2303
-            {
2304
-                material.shift = 90;
2305
-            }
2306
-
23072385             material.multiply = multiply;
23082386             
23092387             if (multiply)
....@@ -2444,6 +2522,11 @@
24442522         else
24452523         {
24462524             //((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");
24472530         }
24482531     }
24492532 
....@@ -3194,6 +3277,93 @@
31943277     blockloop = false;
31953278 }
31963279             
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
+
31973367     void TransformChildren()
31983368     {
31993369         if (toParent != null)
....@@ -3547,15 +3717,47 @@
35473717 
35483718     void ClearMaterials()
35493719     {
3720
+        if (blockloop)
3721
+            return;
3722
+        
3723
+        blockloop = true;
3724
+        
35503725         ClearMaterial();
3551
-        for (int i = 0; i < size(); i++)
3726
+        for (int i = 0; i < Size(); i++)
35523727         {
3553
-            Object3D child = (Object3D) reserve(i);
3728
+            Object3D child = (Object3D) get(i);
35543729             if (child == null)
35553730                 continue;
35563731             child.ClearMaterials();
3557
-            release(i);
35583732         }
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;
35593761     }
35603762     
35613763     void FlipV(boolean flip)
....@@ -5545,6 +5747,11 @@
55455747         if (fullname == null)
55465748             return "";
55475749         
5750
+        if (fullname.pigment != null)
5751
+        {
5752
+            return fullname.pigment;
5753
+        }
5754
+        
55485755    //     System.out.println("Fullname = " + fullname);
55495756         
55505757         // Does not work on Windows due to C:
....@@ -5557,7 +5764,7 @@
55575764         
55585765         if (split.length == 0)
55595766         {
5560
-                return "";
5767
+                return fullname.pigment = "";
55615768         }
55625769         
55635770         if (split.length <= 2)
....@@ -5565,22 +5772,27 @@
55655772                 if (fullname.name.endsWith(":"))
55665773                 {
55675774                         // Windows
5568
-                        return fullname.name.substring(0, fullname.name.length()-1);
5775
+                        return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
55695776                 }
55705777                 
5571
-                return split[0];
5778
+                return fullname.pigment = split[0];
55725779         }
55735780         
55745781         // Windows
55755782         assert(split.length == 4);
55765783         
5577
-        return split[0] + ":" + split[1];
5784
+        return fullname.pigment = split[0] + ":" + split[1];
55785785     }
55795786     
55805787     static String GetBump(cTexture fullname)
55815788     {
55825789         if (fullname == null)
55835790             return "";
5791
+        
5792
+        if (fullname.bump != null)
5793
+        {
5794
+            return fullname.bump;
5795
+        }
55845796         
55855797   //      System.out.println("Fullname = " + fullname);
55865798         // Does not work on Windows due to C:
....@@ -5592,12 +5804,12 @@
55925804         
55935805         if (split.length == 0)
55945806         {
5595
-                return "";
5807
+                return fullname.bump = "";
55965808         }
55975809         
55985810         if (split.length == 1)
55995811         {
5600
-                return "";
5812
+                return fullname.bump = "";
56015813         }
56025814         
56035815         if (split.length == 2)
....@@ -5605,16 +5817,16 @@
56055817                 if (fullname.name.endsWith(":"))
56065818                 {
56075819                         // Windows
5608
-                        return "";
5820
+                        return fullname.bump = "";
56095821                 }
56105822                 
5611
-                return split[1];
5823
+                return fullname.bump = split[1];
56125824         }
56135825         
56145826         // Windows
56155827         assert(split.length == 4);
56165828         
5617
-        return split[2] + ":" + split[3];
5829
+        return fullname.bump = split[2] + ":" + split[3];
56185830     }
56195831     
56205832     String GetPigmentTexture()
....@@ -5697,6 +5909,9 @@
56975909             texname = "";
56985910         
56995911         GetTextures().name = texname + ":" + GetBump(GetTextures());
5912
+
5913
+        GetTextures().pigment = null;
5914
+        
57005915         Touch();
57015916     }
57025917 
....@@ -5769,6 +5984,8 @@
57695984             texname = "";
57705985         
57715986         GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5987
+        
5988
+        GetTextures().bump = null;
57725989         
57735990         Touch();
57745991     }
....@@ -5852,6 +6069,11 @@
58526069         return parent.IsLive();
58536070     }
58546071     
6072
+    boolean IsDynamic()
6073
+    {
6074
+        return live && bRep != null;
6075
+    }
6076
+    
58556077     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
58566078     {
58576079         Invariants(); // june 2013
....@@ -5912,7 +6134,8 @@
59126134         if (support != null)
59136135             support = support;
59146136         
5915
-        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);
59166139         //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
59176140         
59186141         //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -7373,7 +7596,7 @@
73737596             boundary.y = spot.y - 30;
73747597             boundary.width = spot.width + 60;
73757598             boundary.height = spot.height + 60;
7376
-            clickInfo.g.setColor(Color.red);
7599
+            clickInfo.g.setColor(Color.white);
73777600             int spotw = spot.x + spot.width;
73787601             int spoth = spot.y + spot.height;
73797602             clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
....@@ -7393,7 +7616,29 @@
73937616 //            {
73947617 //                CameraPane.Ymax = spoth;
73957618 //            }
7396
-            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);
73977642             spotw = spot.x + spot.width;
73987643             spoth = spot.y + spot.height;
73997644             clickInfo.g.setColor(Color.cyan);
....@@ -7414,28 +7659,7 @@
74147659 //            {
74157660 //                CameraPane.Ymax = spoth;
74167661 //            }
7417
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7418
-            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7419
-            spot.translate(0, -32);
7420
-            clickInfo.g.setColor(Color.yellow);
7421
-            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
74227662             clickInfo.g.setColor(Color.green);
7423
-//            if (CameraPane.Xmin > spot.x)
7424
-//            {
7425
-//                CameraPane.Xmin = spot.x;
7426
-//            }
7427
-//            if (CameraPane.Xmax < spotw)
7428
-//            {
7429
-//                CameraPane.Xmax = spotw;
7430
-//            }
7431
-//            if (CameraPane.Ymin > spot.y)
7432
-//            {
7433
-//                CameraPane.Ymin = spot.y;
7434
-//            }
7435
-//            if (CameraPane.Ymax < spoth)
7436
-//            {
7437
-//                CameraPane.Ymax = spoth;
7438
-//            }
74397663             clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
74407664                     (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
74417665             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
....@@ -7494,12 +7718,14 @@
74947718             retval = true;
74957719         }
74967720         spot.translate(0, 32);
7721
+        spot.translate(32, 0);
7722
+        spot.translate(0, 32);
74977723         if (spot.contains(clickInfo.x, clickInfo.y))
74987724         {
74997725             hitSomething = hitScale;
75007726             
75017727         double scale = 0.005f * clickInfo.camera.Distance();
7502
-                double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7728
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
75037729                 double sign = 1;
75047730                 if (hScale < 0)
75057731                 {
....@@ -7511,7 +7737,7 @@
75117737                     //hScale = 0.01;
75127738                 }
75137739                 
7514
-                double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7740
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
75157741                 sign = 1;
75167742                 if (vScale < 0)
75177743                 {
....@@ -7591,7 +7817,9 @@
75917817                 
75927818                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
75937819                 
7594
-                if (modified || opposite)
7820
+                // Modified could snap
7821
+                if (//modified ||
7822
+                        opposite)
75957823                 {
75967824                     //assert(false);
75977825                             /*
....@@ -7685,7 +7913,7 @@
76857913 
76867914                 if (modified)
76877915                 {
7688
-                    // Rotate 90 degrees
7916
+                    // Rotate 45 degrees
76897917                     angle /= (Math.PI / 4);
76907918                     angle = Math.floor(angle + 0.5);
76917919                     angle *= (Math.PI / 4);
....@@ -7726,7 +7954,7 @@
77267954                 break;
77277955 
77287956             case hitScale: // scale
7729
-                double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7957
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
77307958                 double sign = 1;
77317959                 if (hScale < 0)
77327960                 {
....@@ -7738,7 +7966,7 @@
77387966                     //hScale = 0.01;
77397967                 }
77407968                 
7741
-                double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7969
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
77427970                 sign = 1;
77437971                 if (vScale < 0)
77447972                 {
....@@ -7771,21 +7999,27 @@
77717999                     case 3: // '\001'
77728000                         if (modified || opposite)
77738001                         {
8002
+                            if (modified) // && opposite)
8003
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
8004
+                            else
77748005                             //LA.matScale(toParent, 1, hScale, vScale);
7775
-                            LA.matScale(toParent, totalScale, 1, 1);
8006
+                                LA.matScale(toParent, totalScale, 1, 1);
77768007                         } // vScale, 1);
77778008                         else
77788009                         {
77798010                             // EXCEPTION!
7780
-                            LA.matScale(toParent, totalScale, totalScale, totalScale);
8011
+                            LA.matScale(toParent, 1, totalScale, totalScale);
77818012                         } // vScale, 1);
77828013                         break;
77838014 
77848015                     case 2: // '\002'
77858016                         if (modified || opposite)
77868017                         {
7787
-                            //LA.matScale(toParent, hScale, 1, vScale);
7788
-                            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);
77898023                         } else
77908024                         {
77918025                             LA.matScale(toParent, totalScale, 1, totalScale);
....@@ -7795,8 +8029,11 @@
77958029                     case 1: // '\003'
77968030                         if (modified || opposite)
77978031                         {
7798
-                            //LA.matScale(toParent, hScale, vScale, 1);
7799
-                            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);
78008037                         } else
78018038                         {
78028039                             LA.matScale(toParent, totalScale, totalScale, 1);
....@@ -7944,10 +8181,10 @@
79448181         } //  + super.toString();
79458182     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
79468183         
7947
-        if (!Globals.ADVANCED)
7948
-            return objname;
8184
+//        if (!Globals.ADVANCED)
8185
+//            return objname;
79498186         
7950
-        return objname + " " + System.identityHashCode(this);
8187
+        return objname + " " + System.identityHashCode(this); // + GetUUID()
79518188     }
79528189 
79538190     public int hashCode()