Replace/restore buttons.

Normand Briere

2019-07-17 a5580a47d246c1272b10adba68070f6e13da5e41

 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[] = new byte[100][];
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,24 @@
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
+        
223
+        if (this.support != null)
200
224
         {
201
-            o.transientrep = this.bRep.support;
202
-            o.bRep.support = null;
225
+            if (o.transientrep != null)
226
+                Grafreed.Assert(o.transientrep == this.support.bRep);
227
+
228
+            o.transientrep = this.support.bRep;
229
+            this.support.bRep = null;
203
230
         }
204
231
         
205
232
         //    o.support = this.support;
..
..
@@ -223,19 +250,32 @@
223
250
 
224
251
         RestoreBigData(o);
225
252
 
226
-        hashtable.remove(GetUUID());
253
+        if (blockloop)
254
+            return;
255
+
256
+        blockloop = true;
257
+
258
+        //hashtable.remove(GetUUID());
227
259
 
228
260
         for (int i=0; i<Size(); i++)
229
261
         {
230
262
             get(i).RestoreBigData(hashtable);
231
263
         }
264
+        
265
+        blockloop = false;
232
266
     }
233
267
 
234
268
     void RestoreBigData(Object3D o)
235
269
     {
236
270
         this.bRep = o.bRep;
237
-        if (this.bRep != null)
238
-            this.bRep.support = o.transientrep;
271
+        if (this.support != null && o.transientrep != null)
272
+        {
273
+            this.support.bRep = o.transientrep;
274
+        }
275
+        
276
+        this.selection = o.selection;
277
+// July 2019        if (this.bRep != null)
278
+//            this.bRep.support = o.transientrep;
239
279
     //    this.support = o.support;
240
280
     //    this.fileparent = o.fileparent;
241
281
     }
..
..
@@ -881,7 +921,7 @@
881
921
         
882
922
         if (marked && Globals.isLIVE() && live &&
883
923
                 //TEMP21aug2018
884
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
924
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885
925
                 currentframe != Globals.framecount)
886
926
         {
887
927
             currentframe = Globals.framecount;
..
..
@@ -893,7 +933,8 @@
893
933
             
894
934
             boolean changedir = random && Math.random() < 0.01; // && !link2master;
895
935
 
896
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
936
+            if (transformcount*factor >= maxcount && (rewind || random) ||
937
+                    (step == 1 && changedir))
897
938
             {
898
939
                 countdown = 1;
899
940
                 delay = speedup?8:1;
..
..
@@ -965,6 +1006,7 @@
965
1006
         if (material == null || material.multiply)
966
1007
             return true;
967
1008
         
1009
+        // Transparent objects are dynamic because we have to sort the triangles.
968
1010
         return material.opacity > 0.99;
969
1011
     }
970
1012
     
..
..
@@ -1365,6 +1407,7 @@
1365
1407
                     toParent = LA.newMatrix();
1366
1408
                     fromParent = LA.newMatrix();
1367
1409
                 }
1410
+                
1368
1411
                 LA.matCopy(other.toParent, toParent);
1369
1412
                 LA.matCopy(other.fromParent, fromParent);
1370
1413
                 
..
..
@@ -2386,6 +2429,10 @@
2386
2429
         }
2387
2430
          */
2388
2431
         }
2432
+        else
2433
+        {
2434
+            //((ObjEditor)editWindow).SetupUI2(null);
2435
+        }
2389
2436
     }
2390
2437
 
2391
2438
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -2427,6 +2474,14 @@
2427
2474
         {
2428
2475
             editWindow.refreshContents();
2429
2476
         }
2477
+        else
2478
+        {
2479
+            if (manipWindow != null)
2480
+            {
2481
+                manipWindow.refreshContents();
2482
+            }
2483
+        }
2484
+                
2430
2485
     //if (parent != null)
2431
2486
     //parent.refreshEditWindow();
2432
2487
     }
..
..
@@ -3503,7 +3558,8 @@
3503
3558
         if (blockloop)
3504
3559
             return;
3505
3560
         
3506
-        if (marked || (bRep != null && material != null)) // borderline...
3561
+        if (//marked || // does not make sense
3562
+                (bRep != null || material != null)) // borderline...
3507
3563
             live = h;
3508
3564
         
3509
3565
         for (int i = 0; i < Size(); i++)
..
..
@@ -3524,7 +3580,8 @@
3524
3580
             return;
3525
3581
         
3526
3582
         //if (bRep != null)
3527
-        if (marked || (bRep != null && material != null)) // borderline...
3583
+        if (//marked || // does not make sense
3584
+                (bRep != null || material != null)) // borderline...
3528
3585
             link2master = h;
3529
3586
         
3530
3587
         for (int i = 0; i < Size(); i++)
..
..
@@ -3544,7 +3601,8 @@
3544
3601
         if (blockloop)
3545
3602
             return;
3546
3603
         
3547
-        if (marked || (bRep != null && material != null)) // borderline...
3604
+        if (//marked || // does not make sense
3605
+                (bRep != null || material != null)) // borderline...
3548
3606
             hide = h;
3549
3607
         
3550
3608
         for (int i = 0; i < Size(); i++)
..
..
@@ -3564,7 +3622,7 @@
3564
3622
         if (blockloop)
3565
3623
             return;
3566
3624
         
3567
-        if (bRep != null && material != null) // borderline...
3625
+        if (bRep != null || material != null) // borderline...
3568
3626
             marked = h;
3569
3627
         
3570
3628
         for (int i = 0; i < Size(); i++)
..
..
@@ -3574,6 +3632,46 @@
3574
3632
                 continue;
3575
3633
             blockloop = true;
3576
3634
             child.MarkLeaves(h);
3635
+            blockloop = false;
3636
+         //   release(i);
3637
+        }
3638
+    }
3639
+    
3640
+    void RewindLeaves(boolean h)
3641
+    {
3642
+        if (blockloop)
3643
+            return;
3644
+        
3645
+        if (bRep != null || material != null) // borderline...
3646
+            rewind = h;
3647
+        
3648
+        for (int i = 0; i < Size(); i++)
3649
+        {
3650
+            Object3D child = (Object3D) get(i); // reserve(i);
3651
+            if (child == null)
3652
+                continue;
3653
+            blockloop = true;
3654
+            child.RewindLeaves(h);
3655
+            blockloop = false;
3656
+         //   release(i);
3657
+        }
3658
+    }
3659
+    
3660
+    void RandomLeaves(boolean h)
3661
+    {
3662
+        if (blockloop)
3663
+            return;
3664
+        
3665
+        if (bRep != null || material != null) // borderline...
3666
+            random = h;
3667
+        
3668
+        for (int i = 0; i < Size(); i++)
3669
+        {
3670
+            Object3D child = (Object3D) get(i); // reserve(i);
3671
+            if (child == null)
3672
+                continue;
3673
+            blockloop = true;
3674
+            child.RandomLeaves(h);
3577
3675
             blockloop = false;
3578
3676
          //   release(i);
3579
3677
         }
..
..
@@ -4351,6 +4449,55 @@
4351
4449
         }
4352
4450
     }
4353
4451
     
4452
+    void RepairSOV()
4453
+    {
4454
+        if (blockloop)
4455
+            return;
4456
+
4457
+        String texname = this.GetPigmentTexture();
4458
+        
4459
+        if (texname.startsWith("sov"))
4460
+        {
4461
+            String[] s = texname.split("/");
4462
+
4463
+            String[] sname = s[1].split("Color.pn");
4464
+            
4465
+            texname = sname[0];
4466
+            
4467
+            if (sname.length > 1)
4468
+            {
4469
+                texname += "Color.jpg";
4470
+            }
4471
+            
4472
+            this.SetPigmentTexture("sov/" + texname);
4473
+        }
4474
+                
4475
+        texname = this.GetBumpTexture();
4476
+        
4477
+        if (texname.startsWith("sov"))
4478
+        {
4479
+            String[] s = texname.split("/");
4480
+
4481
+            String[] sname = s[1].split("Bump.pn");
4482
+            
4483
+            texname = sname[0];
4484
+            
4485
+            if (sname.length > 1)
4486
+            {
4487
+                texname += "Bump.jpg";
4488
+            }
4489
+            
4490
+            this.SetBumpTexture("sov/" + texname);
4491
+        }
4492
+                
4493
+        for (int i=0; i<Size(); i++)
4494
+        {               
4495
+                blockloop = true;
4496
+            get(i).RepairSOV();
4497
+                blockloop = false;
4498
+        }
4499
+    }
4500
+    
4354
4501
     void RepairTexture()
4355
4502
     {
4356
4503
         if (this instanceof FileObject || blockloop)
..
..
@@ -4865,6 +5012,14 @@
4865
5012
         }
4866
5013
     }
4867
5014
     
5015
+    ObjEditor GetWindow()
5016
+    {
5017
+        if (editWindow != null)
5018
+            return editWindow;
5019
+        
5020
+        return manipWindow;
5021
+    }
5022
+    
4868
5023
     cTreePath Select(int indexcount, boolean deselect)
4869
5024
     {
4870
5025
         if (hide || dontselect)
..
..
@@ -4901,10 +5056,11 @@
4901
5056
                 if (leaf != null)
4902
5057
                 {
4903
5058
                     cTreePath tp = new cTreePath(this, leaf);
4904
-                    if (editWindow != null)
5059
+                    ObjEditor window = GetWindow();
5060
+                    if (window != null)
4905
5061
                     {
4906
5062
                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4907
-                        editWindow.Select(tp, deselect, true);
5063
+                        window.Select(tp, deselect, true);
4908
5064
                     }
4909
5065
 
4910
5066
                     return tp;
..
..
@@ -4921,6 +5077,7 @@
4921
5077
 
4922
5078
             if (child == null)
4923
5079
                 continue;
5080
+            
4924
5081
             if (child.HasTransparency() && child.size() != 0)
4925
5082
             {
4926
5083
                 cTreePath leaf = child.Select(indexcount, deselect);
..
..
@@ -4930,9 +5087,10 @@
4930
5087
                 if (leaf != null)
4931
5088
                 {
4932
5089
                     cTreePath tp = new cTreePath(this, leaf);
4933
-                    if (editWindow != null)
5090
+                    ObjEditor window = GetWindow();
5091
+                    if (window != null)
4934
5092
                     {
4935
-                        editWindow.Select(tp, deselect, true);
5093
+                        window.Select(tp, deselect, true);
4936
5094
                     }
4937
5095
 
4938
5096
                     return tp;
..
..
@@ -5653,7 +5811,7 @@
5653
5811
             support = support;
5654
5812
         
5655
5813
         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5656
-        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5814
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5657
5815
         
5658
5816
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659
5817
         {
..
..
@@ -5674,7 +5832,7 @@
5674
5832
         
5675
5833
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676
5834
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5677
-                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
5835
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
5678
5836
         {
5679
5837
             Globals.lighttouched = true;
5680
5838
         } // all panes...
..
..
@@ -5806,6 +5964,7 @@
5806
5964
             if (GetBRep() != null)
5807
5965
             {
5808
5966
                 display.NextIndex();
5967
+                
5809
5968
                 // vertex color conflict : gl.glCallList(list);
5810
5969
                 DrawNode(display, root, selected);
5811
5970
                 if (this instanceof BezierPatch)
..
..
@@ -5846,16 +6005,27 @@
5846
6005
         tex = GetTextures();
5847
6006
     }
5848
6007
 
5849
-    boolean failed = false;
6008
+    boolean failedPigment = false;
6009
+    boolean failedBump = false;
5850
6010
     
5851
6011
     try
5852
6012
     {
5853
-        display.BindTextures(tex, texres);
6013
+        display.BindPigmentTexture(tex, texres);
5854
6014
     }
5855
6015
     catch (Exception e)
5856
6016
     {
5857
6017
         System.err.println("FAILED: " + this);
5858
-        failed = true;
6018
+        failedPigment = true;
6019
+    }
6020
+           
6021
+    try
6022
+    {
6023
+        display.BindBumpTexture(tex, texres);
6024
+    }
6025
+    catch (Exception e)
6026
+    {
6027
+        //System.err.println("FAILED: " + this);
6028
+        failedBump = true;
5859
6029
     }
5860
6030
            
5861
6031
             if (!compiled)
..
..
@@ -5878,8 +6048,11 @@
5878
6048
                 }
5879
6049
             }
5880
6050
 
5881
-    if (!failed)
5882
-        display.ReleaseTextures(tex);
6051
+    if (!failedBump)
6052
+        display.ReleaseBumpTexture(tex);
6053
+
6054
+    if (!failedPigment)
6055
+        display.ReleasePigmentTexture(tex);
5883
6056
 
5884
6057
     display.PopMaterial(this, selected);
5885
6058
         }
..
..
@@ -6252,6 +6425,11 @@
6252
6425
                 // dec 2012
6253
6426
                 new Exception().printStackTrace();
6254
6427
                 return;
6428
+            }
6429
+            
6430
+            if (dontselect)
6431
+            {
6432
+                //bRep.GenerateNormalsMINE();
6255
6433
             }
6256
6434
             
6257
6435
             display.DrawGeometry(bRep, flipV, selectmode);
..
..
@@ -7144,8 +7322,8 @@
7144
7322
 //            {
7145
7323
 //                CameraPane.Ymax = spoth;
7146
7324
 //            }
7147
-            info.g.drawArc(boundary.x, boundary.y,
7148
-                    boundary.width, boundary.height, 0, 360);
7325
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7326
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7149
7327
             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150
7328
 //            if (CameraPane.Xmin > boundary.x)
7151
7329
 //            {
..
..
@@ -7689,6 +7867,10 @@
7689
7867
             editWindow = null;
7690
7868
         } // ?
7691
7869
         }
7870
+        else
7871
+        {
7872
+            //editWindow.closeUI();
7873
+        }
7692
7874
     }
7693
7875
     
7694
7876
     boolean root; // patch for edit windows
..
..
@@ -7846,6 +8028,10 @@
7846
8028
     }
7847
8029
     
7848
8030
     transient ObjEditor editWindow;
8031
+    transient ObjEditor manipWindow;
8032
+    
8033
+    transient boolean pinned;
8034
+    
7849
8035
     transient ObjectUI objectUI;
7850
8036
     public static int povDepth = 0;
7851
8037
     private static cVector tbMin = new cVector();