Prepare bimtexture.

Normand Briere

2019-07-21 40f408aaee14abd85d391008b4d22977dc586b50

 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
..
..
@@ -881,7 +927,7 @@
881
927
         
882
928
         if (marked && Globals.isLIVE() && live &&
883
929
                 //TEMP21aug2018
884
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
930
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885
931
                 currentframe != Globals.framecount)
886
932
         {
887
933
             currentframe = Globals.framecount;
..
..
@@ -893,7 +939,8 @@
893
939
             
894
940
             boolean changedir = random && Math.random() < 0.01; // && !link2master;
895
941
 
896
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
942
+            if (transformcount*factor >= maxcount && (rewind || random) ||
943
+                    (step == 1 && changedir))
897
944
             {
898
945
                 countdown = 1;
899
946
                 delay = speedup?8:1;
..
..
@@ -965,6 +1012,7 @@
965
1012
         if (material == null || material.multiply)
966
1013
             return true;
967
1014
         
1015
+        // Transparent objects are dynamic because we have to sort the triangles.
968
1016
         return material.opacity > 0.99;
969
1017
     }
970
1018
     
..
..
@@ -1365,6 +1413,7 @@
1365
1413
                     toParent = LA.newMatrix();
1366
1414
                     fromParent = LA.newMatrix();
1367
1415
                 }
1416
+                
1368
1417
                 LA.matCopy(other.toParent, toParent);
1369
1418
                 LA.matCopy(other.fromParent, fromParent);
1370
1419
                 
..
..
@@ -2386,6 +2435,10 @@
2386
2435
         }
2387
2436
          */
2388
2437
         }
2438
+        else
2439
+        {
2440
+            //((ObjEditor)editWindow).SetupUI2(null);
2441
+        }
2389
2442
     }
2390
2443
 
2391
2444
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -2427,6 +2480,14 @@
2427
2480
         {
2428
2481
             editWindow.refreshContents();
2429
2482
         }
2483
+        else
2484
+        {
2485
+            if (manipWindow != null)
2486
+            {
2487
+                manipWindow.refreshContents();
2488
+            }
2489
+        }
2490
+                
2430
2491
     //if (parent != null)
2431
2492
     //parent.refreshEditWindow();
2432
2493
     }
..
..
@@ -3057,7 +3118,7 @@
3057
3118
     {
3058
3119
         if (bRep != null)
3059
3120
         {
3060
-            bRep.GenerateNormalsMINE();
3121
+            bRep.MergeNormals(); //.GenerateNormalsMINE();
3061
3122
             Touch();
3062
3123
         }
3063
3124
     }
..
..
@@ -3503,7 +3564,8 @@
3503
3564
         if (blockloop)
3504
3565
             return;
3505
3566
         
3506
-        if (marked || (bRep != null && material != null)) // borderline...
3567
+        if (//marked || // does not make sense
3568
+                (bRep != null || material != null)) // borderline...
3507
3569
             live = h;
3508
3570
         
3509
3571
         for (int i = 0; i < Size(); i++)
..
..
@@ -3524,7 +3586,8 @@
3524
3586
             return;
3525
3587
         
3526
3588
         //if (bRep != null)
3527
-        if (marked || (bRep != null && material != null)) // borderline...
3589
+        if (//marked || // does not make sense
3590
+                (bRep != null || material != null)) // borderline...
3528
3591
             link2master = h;
3529
3592
         
3530
3593
         for (int i = 0; i < Size(); i++)
..
..
@@ -3544,7 +3607,8 @@
3544
3607
         if (blockloop)
3545
3608
             return;
3546
3609
         
3547
-        if (marked || (bRep != null && material != null)) // borderline...
3610
+        if (//marked || // does not make sense
3611
+                (bRep != null || material != null)) // borderline...
3548
3612
             hide = h;
3549
3613
         
3550
3614
         for (int i = 0; i < Size(); i++)
..
..
@@ -3564,7 +3628,7 @@
3564
3628
         if (blockloop)
3565
3629
             return;
3566
3630
         
3567
-        if (bRep != null && material != null) // borderline...
3631
+        if (bRep != null || material != null) // borderline...
3568
3632
             marked = h;
3569
3633
         
3570
3634
         for (int i = 0; i < Size(); i++)
..
..
@@ -3574,6 +3638,46 @@
3574
3638
                 continue;
3575
3639
             blockloop = true;
3576
3640
             child.MarkLeaves(h);
3641
+            blockloop = false;
3642
+         //   release(i);
3643
+        }
3644
+    }
3645
+    
3646
+    void RewindLeaves(boolean h)
3647
+    {
3648
+        if (blockloop)
3649
+            return;
3650
+        
3651
+        if (bRep != null || material != null) // borderline...
3652
+            rewind = h;
3653
+        
3654
+        for (int i = 0; i < Size(); i++)
3655
+        {
3656
+            Object3D child = (Object3D) get(i); // reserve(i);
3657
+            if (child == null)
3658
+                continue;
3659
+            blockloop = true;
3660
+            child.RewindLeaves(h);
3661
+            blockloop = false;
3662
+         //   release(i);
3663
+        }
3664
+    }
3665
+    
3666
+    void RandomLeaves(boolean h)
3667
+    {
3668
+        if (blockloop)
3669
+            return;
3670
+        
3671
+        if (bRep != null || material != null) // borderline...
3672
+            random = h;
3673
+        
3674
+        for (int i = 0; i < Size(); i++)
3675
+        {
3676
+            Object3D child = (Object3D) get(i); // reserve(i);
3677
+            if (child == null)
3678
+                continue;
3679
+            blockloop = true;
3680
+            child.RandomLeaves(h);
3577
3681
             blockloop = false;
3578
3682
          //   release(i);
3579
3683
         }
..
..
@@ -4351,6 +4455,55 @@
4351
4455
         }
4352
4456
     }
4353
4457
     
4458
+    void RepairSOV()
4459
+    {
4460
+        if (blockloop)
4461
+            return;
4462
+
4463
+        String texname = this.GetPigmentTexture();
4464
+        
4465
+        if (texname.startsWith("sov"))
4466
+        {
4467
+            String[] s = texname.split("/");
4468
+
4469
+            String[] sname = s[1].split("Color.pn");
4470
+            
4471
+            texname = sname[0];
4472
+            
4473
+            if (sname.length > 1)
4474
+            {
4475
+                texname += "Color.jpg";
4476
+            }
4477
+            
4478
+            this.SetPigmentTexture("sov/" + texname);
4479
+        }
4480
+                
4481
+        texname = this.GetBumpTexture();
4482
+        
4483
+        if (texname.startsWith("sov"))
4484
+        {
4485
+            String[] s = texname.split("/");
4486
+
4487
+            String[] sname = s[1].split("Bump.pn");
4488
+            
4489
+            texname = sname[0];
4490
+            
4491
+            if (sname.length > 1)
4492
+            {
4493
+                texname += "Bump.jpg";
4494
+            }
4495
+            
4496
+            this.SetBumpTexture("sov/" + texname);
4497
+        }
4498
+                
4499
+        for (int i=0; i<Size(); i++)
4500
+        {               
4501
+                blockloop = true;
4502
+            get(i).RepairSOV();
4503
+                blockloop = false;
4504
+        }
4505
+    }
4506
+    
4354
4507
     void RepairTexture()
4355
4508
     {
4356
4509
         if (this instanceof FileObject || blockloop)
..
..
@@ -4865,6 +5018,14 @@
4865
5018
         }
4866
5019
     }
4867
5020
     
5021
+    ObjEditor GetWindow()
5022
+    {
5023
+        if (editWindow != null)
5024
+            return editWindow;
5025
+        
5026
+        return manipWindow;
5027
+    }
5028
+    
4868
5029
     cTreePath Select(int indexcount, boolean deselect)
4869
5030
     {
4870
5031
         if (hide || dontselect)
..
..
@@ -4901,10 +5062,11 @@
4901
5062
                 if (leaf != null)
4902
5063
                 {
4903
5064
                     cTreePath tp = new cTreePath(this, leaf);
4904
-                    if (editWindow != null)
5065
+                    ObjEditor window = GetWindow();
5066
+                    if (window != null)
4905
5067
                     {
4906
5068
                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4907
-                        editWindow.Select(tp, deselect, true);
5069
+                        window.Select(tp, deselect, true);
4908
5070
                     }
4909
5071
 
4910
5072
                     return tp;
..
..
@@ -4921,6 +5083,7 @@
4921
5083
 
4922
5084
             if (child == null)
4923
5085
                 continue;
5086
+            
4924
5087
             if (child.HasTransparency() && child.size() != 0)
4925
5088
             {
4926
5089
                 cTreePath leaf = child.Select(indexcount, deselect);
..
..
@@ -4930,9 +5093,10 @@
4930
5093
                 if (leaf != null)
4931
5094
                 {
4932
5095
                     cTreePath tp = new cTreePath(this, leaf);
4933
-                    if (editWindow != null)
5096
+                    ObjEditor window = GetWindow();
5097
+                    if (window != null)
4934
5098
                     {
4935
-                        editWindow.Select(tp, deselect, true);
5099
+                        window.Select(tp, deselect, true);
4936
5100
                     }
4937
5101
 
4938
5102
                     return tp;
..
..
@@ -5252,6 +5416,51 @@
5252
5416
                 continue;
5253
5417
             child.ResetDisplayList();
5254
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();
5255
5464
         }
5256
5465
         
5257
5466
         blockloop = false;
..
..
@@ -5653,7 +5862,7 @@
5653
5862
             support = support;
5654
5863
         
5655
5864
         //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);
5865
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5657
5866
         
5658
5867
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659
5868
         {
..
..
@@ -5674,7 +5883,7 @@
5674
5883
         
5675
5884
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676
5885
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5677
-                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
5886
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
5678
5887
         {
5679
5888
             Globals.lighttouched = true;
5680
5889
         } // all panes...
..
..
@@ -5806,6 +6015,7 @@
5806
6015
             if (GetBRep() != null)
5807
6016
             {
5808
6017
                 display.NextIndex();
6018
+                
5809
6019
                 // vertex color conflict : gl.glCallList(list);
5810
6020
                 DrawNode(display, root, selected);
5811
6021
                 if (this instanceof BezierPatch)
..
..
@@ -5846,16 +6056,27 @@
5846
6056
         tex = GetTextures();
5847
6057
     }
5848
6058
 
5849
-    boolean failed = false;
6059
+    boolean failedPigment = false;
6060
+    boolean failedBump = false;
5850
6061
     
5851
6062
     try
5852
6063
     {
5853
-        display.BindTextures(tex, texres);
6064
+        display.BindPigmentTexture(tex, texres);
5854
6065
     }
5855
6066
     catch (Exception e)
5856
6067
     {
5857
6068
         System.err.println("FAILED: " + this);
5858
-        failed = true;
6069
+        failedPigment = true;
6070
+    }
6071
+           
6072
+    try
6073
+    {
6074
+        display.BindBumpTexture(tex, texres);
6075
+    }
6076
+    catch (Exception e)
6077
+    {
6078
+        //System.err.println("FAILED: " + this);
6079
+        failedBump = true;
5859
6080
     }
5860
6081
            
5861
6082
             if (!compiled)
..
..
@@ -5878,8 +6099,11 @@
5878
6099
                 }
5879
6100
             }
5880
6101
 
5881
-    if (!failed)
5882
-        display.ReleaseTextures(tex);
6102
+    if (!failedBump)
6103
+        display.ReleaseBumpTexture(tex);
6104
+
6105
+    if (!failedPigment)
6106
+        display.ReleasePigmentTexture(tex);
5883
6107
 
5884
6108
     display.PopMaterial(this, selected);
5885
6109
         }
..
..
@@ -6252,6 +6476,11 @@
6252
6476
                 // dec 2012
6253
6477
                 new Exception().printStackTrace();
6254
6478
                 return;
6479
+            }
6480
+            
6481
+            if (dontselect)
6482
+            {
6483
+                //bRep.GenerateNormalsMINE();
6255
6484
             }
6256
6485
             
6257
6486
             display.DrawGeometry(bRep, flipV, selectmode);
..
..
@@ -7144,8 +7373,8 @@
7144
7373
 //            {
7145
7374
 //                CameraPane.Ymax = spoth;
7146
7375
 //            }
7147
-            info.g.drawArc(boundary.x, boundary.y,
7148
-                    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);
7149
7378
             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150
7379
 //            if (CameraPane.Xmin > boundary.x)
7151
7380
 //            {
..
..
@@ -7689,6 +7918,10 @@
7689
7918
             editWindow = null;
7690
7919
         } // ?
7691
7920
         }
7921
+        else
7922
+        {
7923
+            //editWindow.closeUI();
7924
+        }
7692
7925
     }
7693
7926
     
7694
7927
     boolean root; // patch for edit windows
..
..
@@ -7846,6 +8079,10 @@
7846
8079
     }
7847
8080
     
7848
8081
     transient ObjEditor editWindow;
8082
+    transient ObjEditor manipWindow;
8083
+    
8084
+    transient boolean pinned;
8085
+    
7849
8086
     transient ObjectUI objectUI;
7850
8087
     public static int povDepth = 0;
7851
8088
     private static cVector tbMin = new cVector();