Reset transform, fix loop versioning.

Normand Briere

2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009

 Object3D.java
..
..
@@ -36,6 +36,8 @@
36
36
     Object3D versionlist[];
37
37
     int versionindex = -1;    
38
38
         
39
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
40
+    
39
41
     ScriptNode scriptnode;
40
42
 
41
43
         void InitOthers()
..
..
@@ -269,6 +271,50 @@
269
271
 //        
270
272
 //        return null;
271
273
 //    }
274
+    
275
+    transient boolean tag;
276
+
277
+    void TagObjects(Object3D o, boolean tag)
278
+    {
279
+        if (blockloop)
280
+            return;
281
+
282
+        o.tag = tag;
283
+        
284
+        if (o == this)
285
+            return;
286
+        
287
+        blockloop = true;
288
+
289
+        for (int i=0; i<Size(); i++)
290
+        {
291
+            get(i).TagObjects(o, tag);
292
+        }
293
+        
294
+        blockloop = false;
295
+    }
296
+
297
+    boolean HasTags()
298
+    {
299
+        if (blockloop)
300
+            return false;
301
+
302
+        blockloop = true;
303
+
304
+        boolean hasTags = false;
305
+        
306
+        for (int i=0; i<Size(); i++)
307
+        {
308
+            hasTags |= get(i).tag || get(i).HasTags();
309
+            
310
+            if (hasTags)
311
+                break;
312
+        }
313
+        
314
+        blockloop = false;
315
+        
316
+        return hasTags;
317
+    }
272
318
 
273
319
     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
274
320
     {
..
..
@@ -7417,7 +7463,7 @@
7417
7463
             boundary.y = spot.y - 30;
7418
7464
             boundary.width = spot.width + 60;
7419
7465
             boundary.height = spot.height + 60;
7420
-            clickInfo.g.setColor(Color.red);
7466
+            clickInfo.g.setColor(Color.white);
7421
7467
             int spotw = spot.x + spot.width;
7422
7468
             int spoth = spot.y + spot.height;
7423
7469
             clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..
..
@@ -7818,21 +7864,27 @@
7818
7864
                     case 3: // '\001'
7819
7865
                         if (modified || opposite)
7820
7866
                         {
7867
+                            if (modified && opposite)
7868
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
7869
+                            else
7821
7870
                             //LA.matScale(toParent, 1, hScale, vScale);
7822
-                            LA.matScale(toParent, totalScale, 1, 1);
7871
+                                LA.matScale(toParent, totalScale, 1, 1);
7823
7872
                         } // vScale, 1);
7824
7873
                         else
7825
7874
                         {
7826
7875
                             // EXCEPTION!
7827
-                            LA.matScale(toParent, totalScale, totalScale, totalScale);
7876
+                            LA.matScale(toParent, 1, totalScale, totalScale);
7828
7877
                         } // vScale, 1);
7829
7878
                         break;
7830
7879
 
7831
7880
                     case 2: // '\002'
7832
7881
                         if (modified || opposite)
7833
7882
                         {
7834
-                            //LA.matScale(toParent, hScale, 1, vScale);
7835
-                            LA.matScale(toParent, 1, totalScale, 1);
7883
+                            if (modified && opposite)
7884
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
7885
+                            else
7886
+                                //LA.matScale(toParent, hScale, 1, vScale);
7887
+                                LA.matScale(toParent, 1, totalScale, 1);
7836
7888
                         } else
7837
7889
                         {
7838
7890
                             LA.matScale(toParent, totalScale, 1, totalScale);
..
..
@@ -7842,8 +7894,11 @@
7842
7894
                     case 1: // '\003'
7843
7895
                         if (modified || opposite)
7844
7896
                         {
7845
-                            //LA.matScale(toParent, hScale, vScale, 1);
7846
-                            LA.matScale(toParent, 1, 1, totalScale);
7897
+                            if (modified && opposite)
7898
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
7899
+                            else
7900
+                                //LA.matScale(toParent, hScale, vScale, 1);
7901
+                                LA.matScale(toParent, 1, 1, totalScale);
7847
7902
                         } else
7848
7903
                         {
7849
7904
                             LA.matScale(toParent, totalScale, totalScale, 1);