Restore bind texture

Normand Briere

2019-07-21 5a546232b84ce65d8779d29e9171e7e2df013614

 Object3D.java
..
..
@@ -24,11 +24,14 @@
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
+    byte[] versions[];
33
+    int versionindex = -1;    
34
+        
32
35
     ScriptNode scriptnode;
33
36
 
34
37
         void InitOthers()
..
..
@@ -170,24 +173,35 @@
170
173
 
171
174
     void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
175
     {
176
+        Object3D o;
177
+        
173
178
         if (hashtable.containsKey(GetUUID()))
174
179
         {
175
-            Object3D o = hashtable.get(GetUUID());
180
+            o = hashtable.get(GetUUID());
176
181
 
177
182
             Grafreed.Assert(this.bRep == o.bRep);
178
-            if (this.bRep != null)
179
-                assert(this.bRep.support == o.transientrep);
183
+            //if (this.bRep != null)
184
+            //    assert(this.bRep.support == o.transientrep);
185
+            if (this.support != null)
186
+                assert(this.support.bRep == o.transientrep);
187
+        }
188
+        else
189
+        {
190
+            o = new Object3D("copy of " + this.name);
180
191
 
181
-            return;
192
+            hashtable.put(GetUUID(), o);
182
193
         }
183
194
 
184
-        Object3D o = new Object3D();
185
-
186
-        hashtable.put(GetUUID(), o);
187
-
188
-        for (int i=0; i<Size(); i++)
195
+        if (!blockloop)
189
196
         {
190
-            get(i).ExtractBigData(hashtable);
197
+            blockloop = true;
198
+
199
+            for (int i=0; i<Size(); i++)
200
+            {
201
+                get(i).ExtractBigData(hashtable);
202
+            }
203
+
204
+            blockloop = false;
191
205
         }
192
206
         
193
207
         ExtractBigData(o);
..
..
@@ -195,11 +209,26 @@
195
209
 
196
210
     void ExtractBigData(Object3D o)
197
211
     {
212
+        if (o.bRep != null)
213
+            Grafreed.Assert(o.bRep == this.bRep);
214
+        
198
215
         o.bRep = this.bRep;
199
-        if (this.bRep != null)
216
+// July 2019       if (this.bRep != null)
217
+//        {
218
+//            o.transientrep = this.bRep.support;
219
+//            o.bRep.support = null;
220
+//        }
221
+        o.selection = this.selection;
222
+        o.versions = this.versions;
223
+        o.versionindex = this.versionindex;
224
+        
225
+        if (this.support != null)
200
226
         {
201
-            o.transientrep = this.bRep.support;
202
-            o.bRep.support = null;
227
+            if (o.transientrep != null)
228
+                Grafreed.Assert(o.transientrep == this.support.bRep);
229
+
230
+            o.transientrep = this.support.bRep;
231
+            this.support.bRep = null;
203
232
         }
204
233
         
205
234
         //    o.support = this.support;
..
..
@@ -223,19 +252,35 @@
223
252
 
224
253
         RestoreBigData(o);
225
254
 
226
-        hashtable.remove(GetUUID());
255
+        if (blockloop)
256
+            return;
257
+
258
+        blockloop = true;
259
+
260
+        //hashtable.remove(GetUUID());
227
261
 
228
262
         for (int i=0; i<Size(); i++)
229
263
         {
230
264
             get(i).RestoreBigData(hashtable);
231
265
         }
266
+        
267
+        blockloop = false;
232
268
     }
233
269
 
234
270
     void RestoreBigData(Object3D o)
235
271
     {
236
272
         this.bRep = o.bRep;
237
-        if (this.bRep != null)
238
-            this.bRep.support = o.transientrep;
273
+        if (this.support != null && o.transientrep != null)
274
+        {
275
+            this.support.bRep = o.transientrep;
276
+        }
277
+        
278
+        this.selection = o.selection;
279
+        
280
+        this.versions = o.versions;
281
+        this.versionindex = o.versionindex;
282
+// July 2019        if (this.bRep != null)
283
+//            this.bRep.support = o.transientrep;
239
284
     //    this.support = o.support;
240
285
     //    this.fileparent = o.fileparent;
241
286
     }
..
..
@@ -381,6 +426,7 @@
381
426
         }
382
427
         
383
428
     boolean live = false;
429
+    transient boolean keepdontselect;
384
430
     boolean dontselect = false;
385
431
     boolean hide = false;
386
432
     boolean link2master = false; // performs reset support/master at each frame
..
..
@@ -1367,6 +1413,7 @@
1367
1413
                     toParent = LA.newMatrix();
1368
1414
                     fromParent = LA.newMatrix();
1369
1415
                 }
1416
+                
1370
1417
                 LA.matCopy(other.toParent, toParent);
1371
1418
                 LA.matCopy(other.fromParent, fromParent);
1372
1419
                 
..
..
@@ -2433,6 +2480,14 @@
2433
2480
         {
2434
2481
             editWindow.refreshContents();
2435
2482
         }
2483
+        else
2484
+        {
2485
+            if (manipWindow != null)
2486
+            {
2487
+                manipWindow.refreshContents();
2488
+            }
2489
+        }
2490
+                
2436
2491
     //if (parent != null)
2437
2492
     //parent.refreshEditWindow();
2438
2493
     }
..
..
@@ -3063,7 +3118,7 @@
3063
3118
     {
3064
3119
         if (bRep != null)
3065
3120
         {
3066
-            bRep.GenerateNormalsMINE();
3121
+            bRep.MergeNormals(); //.GenerateNormalsMINE();
3067
3122
             Touch();
3068
3123
         }
3069
3124
     }
..
..
@@ -4963,6 +5018,14 @@
4963
5018
         }
4964
5019
     }
4965
5020
     
5021
+    ObjEditor GetWindow()
5022
+    {
5023
+        if (editWindow != null)
5024
+            return editWindow;
5025
+        
5026
+        return manipWindow;
5027
+    }
5028
+    
4966
5029
     cTreePath Select(int indexcount, boolean deselect)
4967
5030
     {
4968
5031
         if (hide || dontselect)
..
..
@@ -4999,10 +5062,11 @@
4999
5062
                 if (leaf != null)
5000
5063
                 {
5001
5064
                     cTreePath tp = new cTreePath(this, leaf);
5002
-                    if (editWindow != null)
5065
+                    ObjEditor window = GetWindow();
5066
+                    if (window != null)
5003
5067
                     {
5004
5068
                         //System.out.println("editWindow = " + editWindow + " vs " + this);
5005
-                        editWindow.Select(tp, deselect, true);
5069
+                        window.Select(tp, deselect, true);
5006
5070
                     }
5007
5071
 
5008
5072
                     return tp;
..
..
@@ -5019,6 +5083,7 @@
5019
5083
 
5020
5084
             if (child == null)
5021
5085
                 continue;
5086
+            
5022
5087
             if (child.HasTransparency() && child.size() != 0)
5023
5088
             {
5024
5089
                 cTreePath leaf = child.Select(indexcount, deselect);
..
..
@@ -5028,9 +5093,10 @@
5028
5093
                 if (leaf != null)
5029
5094
                 {
5030
5095
                     cTreePath tp = new cTreePath(this, leaf);
5031
-                    if (editWindow != null)
5096
+                    ObjEditor window = GetWindow();
5097
+                    if (window != null)
5032
5098
                     {
5033
-                        editWindow.Select(tp, deselect, true);
5099
+                        window.Select(tp, deselect, true);
5034
5100
                     }
5035
5101
 
5036
5102
                     return tp;
..
..
@@ -5350,6 +5416,51 @@
5350
5416
                 continue;
5351
5417
             child.ResetDisplayList();
5352
5418
         //    release(i);
5419
+        }
5420
+        
5421
+        blockloop = false;
5422
+    }
5423
+
5424
+    void ResetSelectable()
5425
+    {
5426
+        if (blockloop)
5427
+            return;
5428
+        
5429
+        blockloop = true;
5430
+
5431
+        keepdontselect = dontselect;
5432
+        dontselect = true;
5433
+        
5434
+        Object3D child;
5435
+        int nb = Size();
5436
+        for (int i = 0; i < nb; i++)
5437
+        {
5438
+            child = (Object3D) get(i);
5439
+            if (child == null)
5440
+                continue;
5441
+            child.ResetSelectable();
5442
+        }
5443
+        
5444
+        blockloop = false;
5445
+    }
5446
+
5447
+    void RestoreSelectable()
5448
+    {
5449
+        if (blockloop)
5450
+            return;
5451
+        
5452
+        blockloop = true;
5453
+
5454
+        dontselect = keepdontselect;
5455
+        
5456
+        Object3D child;
5457
+        int nb = Size();
5458
+        for (int i = 0; i < nb; i++)
5459
+        {
5460
+            child = (Object3D) get(i);
5461
+            if (child == null)
5462
+                continue;
5463
+            child.RestoreSelectable();
5353
5464
         }
5354
5465
         
5355
5466
         blockloop = false;
..
..
@@ -5772,7 +5883,7 @@
5772
5883
         
5773
5884
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774
5885
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5775
-                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
5886
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
5776
5887
         {
5777
5888
             Globals.lighttouched = true;
5778
5889
         } // all panes...
..
..
@@ -5904,6 +6015,7 @@
5904
6015
             if (GetBRep() != null)
5905
6016
             {
5906
6017
                 display.NextIndex();
6018
+                
5907
6019
                 // vertex color conflict : gl.glCallList(list);
5908
6020
                 DrawNode(display, root, selected);
5909
6021
                 if (this instanceof BezierPatch)
..
..
@@ -7261,8 +7373,8 @@
7261
7373
 //            {
7262
7374
 //                CameraPane.Ymax = spoth;
7263
7375
 //            }
7264
-            info.g.drawArc(boundary.x, boundary.y,
7265
-                    boundary.width, boundary.height, 0, 360);
7376
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7377
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7266
7378
             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267
7379
 //            if (CameraPane.Xmin > boundary.x)
7268
7380
 //            {
..
..
@@ -7967,6 +8079,10 @@
7967
8079
     }
7968
8080
     
7969
8081
     transient ObjEditor editWindow;
8082
+    transient ObjEditor manipWindow;
8083
+    
8084
+    transient boolean pinned;
8085
+    
7970
8086
     transient ObjectUI objectUI;
7971
8087
     public static int povDepth = 0;
7972
8088
     private static cVector tbMin = new cVector();