Fix extract big data.

Normand Briere

2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c

 Object3D.java
..
..
@@ -24,9 +24,9 @@
24
24
     
25
25
     private UUID uuid = UUID.randomUUID();
26
26
     
27
-    // TEMPORARY for mocap undo
28
-    mocap.reader.BVHReader.BVHResult bvh;
29
-    Object3D skeleton;
27
+    // TEMPORARY for mocap undo. No need to be transient.
28
+    mocap.reader.BVHReader.BVHResult savebvh;
29
+    Object3D saveskeleton;
30
30
     //
31
31
     
32
32
     ScriptNode scriptnode;
..
..
@@ -170,24 +170,35 @@
170
170
 
171
171
     void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
172
     {
173
+        Object3D o;
174
+        
173
175
         if (hashtable.containsKey(GetUUID()))
174
176
         {
175
-            Object3D o = hashtable.get(GetUUID());
177
+            o = hashtable.get(GetUUID());
176
178
 
177
179
             Grafreed.Assert(this.bRep == o.bRep);
178
-            if (this.bRep != null)
179
-                assert(this.bRep.support == o.transientrep);
180
+            //if (this.bRep != null)
181
+            //    assert(this.bRep.support == o.transientrep);
182
+            if (this.support != null)
183
+                assert(this.support.bRep == o.transientrep);
184
+        }
185
+        else
186
+        {
187
+            o = new Object3D("copy of " + this.name);
180
188
 
181
-            return;
189
+            hashtable.put(GetUUID(), o);
182
190
         }
183
191
 
184
-        Object3D o = new Object3D();
185
-
186
-        hashtable.put(GetUUID(), o);
187
-
188
-        for (int i=0; i<Size(); i++)
192
+        if (!blockloop)
189
193
         {
190
-            get(i).ExtractBigData(hashtable);
194
+            blockloop = true;
195
+
196
+            for (int i=0; i<Size(); i++)
197
+            {
198
+                get(i).ExtractBigData(hashtable);
199
+            }
200
+
201
+            blockloop = false;
191
202
         }
192
203
         
193
204
         ExtractBigData(o);
..
..
@@ -195,11 +206,23 @@
195
206
 
196
207
     void ExtractBigData(Object3D o)
197
208
     {
209
+        if (o.bRep != null)
210
+            Grafreed.Assert(o.bRep == this.bRep);
211
+        
198
212
         o.bRep = this.bRep;
199
-        if (this.bRep != null)
213
+// July 2019       if (this.bRep != null)
214
+//        {
215
+//            o.transientrep = this.bRep.support;
216
+//            o.bRep.support = null;
217
+//        }
218
+        
219
+        if (this.support != null)
200
220
         {
201
-            o.transientrep = this.bRep.support;
202
-            o.bRep.support = null;
221
+            if (o.transientrep != null)
222
+                Grafreed.Assert(o.transientrep == this.support.bRep);
223
+
224
+            o.transientrep = this.support.bRep;
225
+            this.support.bRep = null;
203
226
         }
204
227
         
205
228
         //    o.support = this.support;
..
..
@@ -223,19 +246,30 @@
223
246
 
224
247
         RestoreBigData(o);
225
248
 
226
-        hashtable.remove(GetUUID());
249
+        if (blockloop)
250
+            return;
251
+
252
+        blockloop = true;
253
+
254
+        //hashtable.remove(GetUUID());
227
255
 
228
256
         for (int i=0; i<Size(); i++)
229
257
         {
230
258
             get(i).RestoreBigData(hashtable);
231
259
         }
260
+        
261
+        blockloop = false;
232
262
     }
233
263
 
234
264
     void RestoreBigData(Object3D o)
235
265
     {
236
266
         this.bRep = o.bRep;
237
-        if (this.bRep != null)
238
-            this.bRep.support = o.transientrep;
267
+        if (this.support != null && o.transientrep != null)
268
+        {
269
+            this.support.bRep = o.transientrep;
270
+        }
271
+// July 2019        if (this.bRep != null)
272
+//            this.bRep.support = o.transientrep;
239
273
     //    this.support = o.support;
240
274
     //    this.fileparent = o.fileparent;
241
275
     }
..
..
@@ -1367,6 +1401,7 @@
1367
1401
                     toParent = LA.newMatrix();
1368
1402
                     fromParent = LA.newMatrix();
1369
1403
                 }
1404
+                
1370
1405
                 LA.matCopy(other.toParent, toParent);
1371
1406
                 LA.matCopy(other.fromParent, fromParent);
1372
1407
                 
..
..
@@ -2433,6 +2468,14 @@
2433
2468
         {
2434
2469
             editWindow.refreshContents();
2435
2470
         }
2471
+        else
2472
+        {
2473
+            if (manipWindow != null)
2474
+            {
2475
+                manipWindow.refreshContents();
2476
+            }
2477
+        }
2478
+                
2436
2479
     //if (parent != null)
2437
2480
     //parent.refreshEditWindow();
2438
2481
     }
..
..
@@ -4963,6 +5006,14 @@
4963
5006
         }
4964
5007
     }
4965
5008
     
5009
+    ObjEditor GetWindow()
5010
+    {
5011
+        if (editWindow != null)
5012
+            return editWindow;
5013
+        
5014
+        return manipWindow;
5015
+    }
5016
+    
4966
5017
     cTreePath Select(int indexcount, boolean deselect)
4967
5018
     {
4968
5019
         if (hide || dontselect)
..
..
@@ -4999,10 +5050,11 @@
4999
5050
                 if (leaf != null)
5000
5051
                 {
5001
5052
                     cTreePath tp = new cTreePath(this, leaf);
5002
-                    if (editWindow != null)
5053
+                    ObjEditor window = GetWindow();
5054
+                    if (window != null)
5003
5055
                     {
5004
5056
                         //System.out.println("editWindow = " + editWindow + " vs " + this);
5005
-                        editWindow.Select(tp, deselect, true);
5057
+                        window.Select(tp, deselect, true);
5006
5058
                     }
5007
5059
 
5008
5060
                     return tp;
..
..
@@ -5019,6 +5071,7 @@
5019
5071
 
5020
5072
             if (child == null)
5021
5073
                 continue;
5074
+            
5022
5075
             if (child.HasTransparency() && child.size() != 0)
5023
5076
             {
5024
5077
                 cTreePath leaf = child.Select(indexcount, deselect);
..
..
@@ -5028,9 +5081,10 @@
5028
5081
                 if (leaf != null)
5029
5082
                 {
5030
5083
                     cTreePath tp = new cTreePath(this, leaf);
5031
-                    if (editWindow != null)
5084
+                    ObjEditor window = GetWindow();
5085
+                    if (window != null)
5032
5086
                     {
5033
-                        editWindow.Select(tp, deselect, true);
5087
+                        window.Select(tp, deselect, true);
5034
5088
                     }
5035
5089
 
5036
5090
                     return tp;
..
..
@@ -5772,7 +5826,7 @@
5772
5826
         
5773
5827
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774
5828
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5775
-                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
5829
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
5776
5830
         {
5777
5831
             Globals.lighttouched = true;
5778
5832
         } // all panes...
..
..
@@ -5904,6 +5958,7 @@
5904
5958
             if (GetBRep() != null)
5905
5959
             {
5906
5960
                 display.NextIndex();
5961
+                
5907
5962
                 // vertex color conflict : gl.glCallList(list);
5908
5963
                 DrawNode(display, root, selected);
5909
5964
                 if (this instanceof BezierPatch)
..
..
@@ -7261,8 +7316,8 @@
7261
7316
 //            {
7262
7317
 //                CameraPane.Ymax = spoth;
7263
7318
 //            }
7264
-            info.g.drawArc(boundary.x, boundary.y,
7265
-                    boundary.width, boundary.height, 0, 360);
7319
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7320
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7266
7321
             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267
7322
 //            if (CameraPane.Xmin > boundary.x)
7268
7323
 //            {
..
..
@@ -7967,6 +8022,10 @@
7967
8022
     }
7968
8023
     
7969
8024
     transient ObjEditor editWindow;
8025
+    transient ObjEditor manipWindow;
8026
+    
8027
+    transient boolean pinned;
8028
+    
7970
8029
     transient ObjectUI objectUI;
7971
8030
     public static int povDepth = 0;
7972
8031
     private static cVector tbMin = new cVector();