Version slider

Normand Briere

2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1

 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,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
     }
..
..
@@ -881,7 +926,7 @@
881
926
         
882
927
         if (marked && Globals.isLIVE() && live &&
883
928
                 //TEMP21aug2018
884
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
929
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885
930
                 currentframe != Globals.framecount)
886
931
         {
887
932
             currentframe = Globals.framecount;
..
..
@@ -893,7 +938,8 @@
893
938
             
894
939
             boolean changedir = random && Math.random() < 0.01; // && !link2master;
895
940
 
896
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
941
+            if (transformcount*factor >= maxcount && (rewind || random) ||
942
+                    (step == 1 && changedir))
897
943
             {
898
944
                 countdown = 1;
899
945
                 delay = speedup?8:1;
..
..
@@ -965,6 +1011,7 @@
965
1011
         if (material == null || material.multiply)
966
1012
             return true;
967
1013
         
1014
+        // Transparent objects are dynamic because we have to sort the triangles.
968
1015
         return material.opacity > 0.99;
969
1016
     }
970
1017
     
..
..
@@ -1365,6 +1412,7 @@
1365
1412
                     toParent = LA.newMatrix();
1366
1413
                     fromParent = LA.newMatrix();
1367
1414
                 }
1415
+                
1368
1416
                 LA.matCopy(other.toParent, toParent);
1369
1417
                 LA.matCopy(other.fromParent, fromParent);
1370
1418
                 
..
..
@@ -2386,6 +2434,10 @@
2386
2434
         }
2387
2435
          */
2388
2436
         }
2437
+        else
2438
+        {
2439
+            //((ObjEditor)editWindow).SetupUI2(null);
2440
+        }
2389
2441
     }
2390
2442
 
2391
2443
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -2427,6 +2479,14 @@
2427
2479
         {
2428
2480
             editWindow.refreshContents();
2429
2481
         }
2482
+        else
2483
+        {
2484
+            if (manipWindow != null)
2485
+            {
2486
+                manipWindow.refreshContents();
2487
+            }
2488
+        }
2489
+                
2430
2490
     //if (parent != null)
2431
2491
     //parent.refreshEditWindow();
2432
2492
     }
..
..
@@ -3503,7 +3563,8 @@
3503
3563
         if (blockloop)
3504
3564
             return;
3505
3565
         
3506
-        if (marked || (bRep != null && material != null)) // borderline...
3566
+        if (//marked || // does not make sense
3567
+                (bRep != null || material != null)) // borderline...
3507
3568
             live = h;
3508
3569
         
3509
3570
         for (int i = 0; i < Size(); i++)
..
..
@@ -3524,7 +3585,8 @@
3524
3585
             return;
3525
3586
         
3526
3587
         //if (bRep != null)
3527
-        if (marked || (bRep != null && material != null)) // borderline...
3588
+        if (//marked || // does not make sense
3589
+                (bRep != null || material != null)) // borderline...
3528
3590
             link2master = h;
3529
3591
         
3530
3592
         for (int i = 0; i < Size(); i++)
..
..
@@ -3544,7 +3606,8 @@
3544
3606
         if (blockloop)
3545
3607
             return;
3546
3608
         
3547
-        if (marked || (bRep != null && material != null)) // borderline...
3609
+        if (//marked || // does not make sense
3610
+                (bRep != null || material != null)) // borderline...
3548
3611
             hide = h;
3549
3612
         
3550
3613
         for (int i = 0; i < Size(); i++)
..
..
@@ -3564,7 +3627,7 @@
3564
3627
         if (blockloop)
3565
3628
             return;
3566
3629
         
3567
-        if (bRep != null && material != null) // borderline...
3630
+        if (bRep != null || material != null) // borderline...
3568
3631
             marked = h;
3569
3632
         
3570
3633
         for (int i = 0; i < Size(); i++)
..
..
@@ -3574,6 +3637,46 @@
3574
3637
                 continue;
3575
3638
             blockloop = true;
3576
3639
             child.MarkLeaves(h);
3640
+            blockloop = false;
3641
+         //   release(i);
3642
+        }
3643
+    }
3644
+    
3645
+    void RewindLeaves(boolean h)
3646
+    {
3647
+        if (blockloop)
3648
+            return;
3649
+        
3650
+        if (bRep != null || material != null) // borderline...
3651
+            rewind = h;
3652
+        
3653
+        for (int i = 0; i < Size(); i++)
3654
+        {
3655
+            Object3D child = (Object3D) get(i); // reserve(i);
3656
+            if (child == null)
3657
+                continue;
3658
+            blockloop = true;
3659
+            child.RewindLeaves(h);
3660
+            blockloop = false;
3661
+         //   release(i);
3662
+        }
3663
+    }
3664
+    
3665
+    void RandomLeaves(boolean h)
3666
+    {
3667
+        if (blockloop)
3668
+            return;
3669
+        
3670
+        if (bRep != null || material != null) // borderline...
3671
+            random = h;
3672
+        
3673
+        for (int i = 0; i < Size(); i++)
3674
+        {
3675
+            Object3D child = (Object3D) get(i); // reserve(i);
3676
+            if (child == null)
3677
+                continue;
3678
+            blockloop = true;
3679
+            child.RandomLeaves(h);
3577
3680
             blockloop = false;
3578
3681
          //   release(i);
3579
3682
         }
..
..
@@ -4351,6 +4454,55 @@
4351
4454
         }
4352
4455
     }
4353
4456
     
4457
+    void RepairSOV()
4458
+    {
4459
+        if (blockloop)
4460
+            return;
4461
+
4462
+        String texname = this.GetPigmentTexture();
4463
+        
4464
+        if (texname.startsWith("sov"))
4465
+        {
4466
+            String[] s = texname.split("/");
4467
+
4468
+            String[] sname = s[1].split("Color.pn");
4469
+            
4470
+            texname = sname[0];
4471
+            
4472
+            if (sname.length > 1)
4473
+            {
4474
+                texname += "Color.jpg";
4475
+            }
4476
+            
4477
+            this.SetPigmentTexture("sov/" + texname);
4478
+        }
4479
+                
4480
+        texname = this.GetBumpTexture();
4481
+        
4482
+        if (texname.startsWith("sov"))
4483
+        {
4484
+            String[] s = texname.split("/");
4485
+
4486
+            String[] sname = s[1].split("Bump.pn");
4487
+            
4488
+            texname = sname[0];
4489
+            
4490
+            if (sname.length > 1)
4491
+            {
4492
+                texname += "Bump.jpg";
4493
+            }
4494
+            
4495
+            this.SetBumpTexture("sov/" + texname);
4496
+        }
4497
+                
4498
+        for (int i=0; i<Size(); i++)
4499
+        {               
4500
+                blockloop = true;
4501
+            get(i).RepairSOV();
4502
+                blockloop = false;
4503
+        }
4504
+    }
4505
+    
4354
4506
     void RepairTexture()
4355
4507
     {
4356
4508
         if (this instanceof FileObject || blockloop)
..
..
@@ -4865,6 +5017,14 @@
4865
5017
         }
4866
5018
     }
4867
5019
     
5020
+    ObjEditor GetWindow()
5021
+    {
5022
+        if (editWindow != null)
5023
+            return editWindow;
5024
+        
5025
+        return manipWindow;
5026
+    }
5027
+    
4868
5028
     cTreePath Select(int indexcount, boolean deselect)
4869
5029
     {
4870
5030
         if (hide || dontselect)
..
..
@@ -4901,10 +5061,11 @@
4901
5061
                 if (leaf != null)
4902
5062
                 {
4903
5063
                     cTreePath tp = new cTreePath(this, leaf);
4904
-                    if (editWindow != null)
5064
+                    ObjEditor window = GetWindow();
5065
+                    if (window != null)
4905
5066
                     {
4906
5067
                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4907
-                        editWindow.Select(tp, deselect, true);
5068
+                        window.Select(tp, deselect, true);
4908
5069
                     }
4909
5070
 
4910
5071
                     return tp;
..
..
@@ -4921,6 +5082,7 @@
4921
5082
 
4922
5083
             if (child == null)
4923
5084
                 continue;
5085
+            
4924
5086
             if (child.HasTransparency() && child.size() != 0)
4925
5087
             {
4926
5088
                 cTreePath leaf = child.Select(indexcount, deselect);
..
..
@@ -4930,9 +5092,10 @@
4930
5092
                 if (leaf != null)
4931
5093
                 {
4932
5094
                     cTreePath tp = new cTreePath(this, leaf);
4933
-                    if (editWindow != null)
5095
+                    ObjEditor window = GetWindow();
5096
+                    if (window != null)
4934
5097
                     {
4935
-                        editWindow.Select(tp, deselect, true);
5098
+                        window.Select(tp, deselect, true);
4936
5099
                     }
4937
5100
 
4938
5101
                     return tp;
..
..
@@ -5653,7 +5816,7 @@
5653
5816
             support = support;
5654
5817
         
5655
5818
         //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);
5819
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5657
5820
         
5658
5821
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659
5822
         {
..
..
@@ -5674,7 +5837,7 @@
5674
5837
         
5675
5838
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676
5839
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5677
-                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
5840
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
5678
5841
         {
5679
5842
             Globals.lighttouched = true;
5680
5843
         } // all panes...
..
..
@@ -5806,6 +5969,7 @@
5806
5969
             if (GetBRep() != null)
5807
5970
             {
5808
5971
                 display.NextIndex();
5972
+                
5809
5973
                 // vertex color conflict : gl.glCallList(list);
5810
5974
                 DrawNode(display, root, selected);
5811
5975
                 if (this instanceof BezierPatch)
..
..
@@ -5846,16 +6010,27 @@
5846
6010
         tex = GetTextures();
5847
6011
     }
5848
6012
 
5849
-    boolean failed = false;
6013
+    boolean failedPigment = false;
6014
+    boolean failedBump = false;
5850
6015
     
5851
6016
     try
5852
6017
     {
5853
-        display.BindTextures(tex, texres);
6018
+        display.BindPigmentTexture(tex, texres);
5854
6019
     }
5855
6020
     catch (Exception e)
5856
6021
     {
5857
6022
         System.err.println("FAILED: " + this);
5858
-        failed = true;
6023
+        failedPigment = true;
6024
+    }
6025
+           
6026
+    try
6027
+    {
6028
+        display.BindBumpTexture(tex, texres);
6029
+    }
6030
+    catch (Exception e)
6031
+    {
6032
+        //System.err.println("FAILED: " + this);
6033
+        failedBump = true;
5859
6034
     }
5860
6035
            
5861
6036
             if (!compiled)
..
..
@@ -5878,8 +6053,11 @@
5878
6053
                 }
5879
6054
             }
5880
6055
 
5881
-    if (!failed)
5882
-        display.ReleaseTextures(tex);
6056
+    if (!failedBump)
6057
+        display.ReleaseBumpTexture(tex);
6058
+
6059
+    if (!failedPigment)
6060
+        display.ReleasePigmentTexture(tex);
5883
6061
 
5884
6062
     display.PopMaterial(this, selected);
5885
6063
         }
..
..
@@ -6252,6 +6430,11 @@
6252
6430
                 // dec 2012
6253
6431
                 new Exception().printStackTrace();
6254
6432
                 return;
6433
+            }
6434
+            
6435
+            if (dontselect)
6436
+            {
6437
+                //bRep.GenerateNormalsMINE();
6255
6438
             }
6256
6439
             
6257
6440
             display.DrawGeometry(bRep, flipV, selectmode);
..
..
@@ -7144,8 +7327,8 @@
7144
7327
 //            {
7145
7328
 //                CameraPane.Ymax = spoth;
7146
7329
 //            }
7147
-            info.g.drawArc(boundary.x, boundary.y,
7148
-                    boundary.width, boundary.height, 0, 360);
7330
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7331
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7149
7332
             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150
7333
 //            if (CameraPane.Xmin > boundary.x)
7151
7334
 //            {
..
..
@@ -7452,7 +7635,8 @@
7452
7635
                         } // vScale, 1);
7453
7636
                         else
7454
7637
                         {
7455
-                            LA.matScale(toParent, 1, totalScale, totalScale);
7638
+                            // EXCEPTION!
7639
+                            LA.matScale(toParent, totalScale, totalScale, totalScale);
7456
7640
                         } // vScale, 1);
7457
7641
                         break;
7458
7642
 
..
..
@@ -7688,6 +7872,10 @@
7688
7872
             editWindow = null;
7689
7873
         } // ?
7690
7874
         }
7875
+        else
7876
+        {
7877
+            //editWindow.closeUI();
7878
+        }
7691
7879
     }
7692
7880
     
7693
7881
     boolean root; // patch for edit windows
..
..
@@ -7845,6 +8033,10 @@
7845
8033
     }
7846
8034
     
7847
8035
     transient ObjEditor editWindow;
8036
+    transient ObjEditor manipWindow;
8037
+    
8038
+    transient boolean pinned;
8039
+    
7848
8040
     transient ObjectUI objectUI;
7849
8041
     public static int povDepth = 0;
7850
8042
     private static cVector tbMin = new cVector();