blame | history | patch | commit | commitdiff
Normand Briere
2019-07-17 a5580a47d246c1272b10adba68070f6e13da5e41 
 Object3D.java
....@@ -24,11 +24,14 @@
2424     
2525     private UUID uuid = UUID.randomUUID();
2626     
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;
3030     //
3131     
32
+    byte[] versions[] = new byte[100][];
33
+    int versionindex = -1;    
34
+        
3235     ScriptNode scriptnode;
3336 
3437         void InitOthers()
....@@ -170,24 +173,35 @@
170173 
171174     void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172175     {
176
+        Object3D o;
177
+        
173178         if (hashtable.containsKey(GetUUID()))
174179         {
175
-            Object3D o = hashtable.get(GetUUID());
180
+            o = hashtable.get(GetUUID());
176181 
177
-            assert(this.bRep == o.bRep);
178
-            if (this.bRep != null)
179
-                assert(this.bRep.support == o.transientrep);
182
+            Grafreed.Assert(this.bRep == o.bRep);
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);
180191 
181
-            return;
192
+            hashtable.put(GetUUID(), o);
182193         }
183194 
184
-        Object3D o = new Object3D();
185
-
186
-        hashtable.put(GetUUID(), o);
187
-
188
-        for (int i=0; i<Size(); i++)
195
+        if (!blockloop)
189196         {
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;
191205         }
192206         
193207         ExtractBigData(o);
....@@ -195,11 +209,24 @@
195209 
196210     void ExtractBigData(Object3D o)
197211     {
212
+        if (o.bRep != null)
213
+            Grafreed.Assert(o.bRep == this.bRep);
214
+        
198215         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)
200224         {
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;
203230         }
204231         
205232         //    o.support = this.support;
....@@ -223,19 +250,32 @@
223250 
224251         RestoreBigData(o);
225252 
226
-        hashtable.remove(GetUUID());
253
+        if (blockloop)
254
+            return;
255
+
256
+        blockloop = true;
257
+
258
+        //hashtable.remove(GetUUID());
227259 
228260         for (int i=0; i<Size(); i++)
229261         {
230262             get(i).RestoreBigData(hashtable);
231263         }
264
+        
265
+        blockloop = false;
232266     }
233267 
234268     void RestoreBigData(Object3D o)
235269     {
236270         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;
239279     //    this.support = o.support;
240280     //    this.fileparent = o.fileparent;
241281     }
....@@ -563,12 +603,14 @@
563603             toParent = LA.newMatrix();
564604             fromParent = LA.newMatrix();
565605         }
606
+        
566607         if (toParentMarked == null)
567608         {
568609             if (maxcount != 1)
569610             {
570611                 new Exception().printStackTrace();
571612             }
613
+            
572614             toParentMarked = LA.newMatrix();
573615             fromParentMarked = LA.newMatrix();
574616         }
....@@ -879,7 +921,7 @@
879921         
880922         if (marked && Globals.isLIVE() && live &&
881923                 //TEMP21aug2018
882
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
924
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
883925                 currentframe != Globals.framecount)
884926         {
885927             currentframe = Globals.framecount;
....@@ -891,7 +933,8 @@
891933             
892934             boolean changedir = random && Math.random() < 0.01; // && !link2master;
893935 
894
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
936
+            if (transformcount*factor >= maxcount && (rewind || random) ||
937
+                    (step == 1 && changedir))
895938             {
896939                 countdown = 1;
897940                 delay = speedup?8:1;
....@@ -963,6 +1006,7 @@
9631006         if (material == null || material.multiply)
9641007             return true;
9651008         
1009
+        // Transparent objects are dynamic because we have to sort the triangles.
9661010         return material.opacity > 0.99;
9671011     }
9681012     
....@@ -1363,6 +1407,7 @@
13631407                     toParent = LA.newMatrix();
13641408                     fromParent = LA.newMatrix();
13651409                 }
1410
+                
13661411                 LA.matCopy(other.toParent, toParent);
13671412                 LA.matCopy(other.fromParent, fromParent);
13681413                 
....@@ -2384,6 +2429,10 @@
23842429         }
23852430          */
23862431         }
2432
+        else
2433
+        {
2434
+            //((ObjEditor)editWindow).SetupUI2(null);
2435
+        }
23872436     }
23882437 
23892438     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2425,6 +2474,14 @@
24252474         {
24262475             editWindow.refreshContents();
24272476         }
2477
+        else
2478
+        {
2479
+            if (manipWindow != null)
2480
+            {
2481
+                manipWindow.refreshContents();
2482
+            }
2483
+        }
2484
+                
24282485     //if (parent != null)
24292486     //parent.refreshEditWindow();
24302487     }
....@@ -3501,7 +3558,8 @@
35013558         if (blockloop)
35023559             return;
35033560         
3504
-        if (marked || (bRep != null && material != null)) // borderline...
3561
+        if (//marked || // does not make sense
3562
+                (bRep != null || material != null)) // borderline...
35053563             live = h;
35063564         
35073565         for (int i = 0; i < Size(); i++)
....@@ -3522,7 +3580,8 @@
35223580             return;
35233581         
35243582         //if (bRep != null)
3525
-        if (marked || (bRep != null && material != null)) // borderline...
3583
+        if (//marked || // does not make sense
3584
+                (bRep != null || material != null)) // borderline...
35263585             link2master = h;
35273586         
35283587         for (int i = 0; i < Size(); i++)
....@@ -3542,7 +3601,8 @@
35423601         if (blockloop)
35433602             return;
35443603         
3545
-        if (marked || (bRep != null && material != null)) // borderline...
3604
+        if (//marked || // does not make sense
3605
+                (bRep != null || material != null)) // borderline...
35463606             hide = h;
35473607         
35483608         for (int i = 0; i < Size(); i++)
....@@ -3562,7 +3622,7 @@
35623622         if (blockloop)
35633623             return;
35643624         
3565
-        if (bRep != null && material != null) // borderline...
3625
+        if (bRep != null || material != null) // borderline...
35663626             marked = h;
35673627         
35683628         for (int i = 0; i < Size(); i++)
....@@ -3572,6 +3632,46 @@
35723632                 continue;
35733633             blockloop = true;
35743634             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);
35753675             blockloop = false;
35763676          //   release(i);
35773677         }
....@@ -4349,6 +4449,55 @@
43494449         }
43504450     }
43514451     
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
+    
43524501     void RepairTexture()
43534502     {
43544503         if (this instanceof FileObject || blockloop)
....@@ -4863,6 +5012,14 @@
48635012         }
48645013     }
48655014     
5015
+    ObjEditor GetWindow()
5016
+    {
5017
+        if (editWindow != null)
5018
+            return editWindow;
5019
+        
5020
+        return manipWindow;
5021
+    }
5022
+    
48665023     cTreePath Select(int indexcount, boolean deselect)
48675024     {
48685025         if (hide || dontselect)
....@@ -4899,10 +5056,11 @@
48995056                 if (leaf != null)
49005057                 {
49015058                     cTreePath tp = new cTreePath(this, leaf);
4902
-                    if (editWindow != null)
5059
+                    ObjEditor window = GetWindow();
5060
+                    if (window != null)
49035061                     {
49045062                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4905
-                        editWindow.Select(tp, deselect, true);
5063
+                        window.Select(tp, deselect, true);
49065064                     }
49075065 
49085066                     return tp;
....@@ -4919,6 +5077,7 @@
49195077 
49205078             if (child == null)
49215079                 continue;
5080
+            
49225081             if (child.HasTransparency() && child.size() != 0)
49235082             {
49245083                 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4928,9 +5087,10 @@
49285087                 if (leaf != null)
49295088                 {
49305089                     cTreePath tp = new cTreePath(this, leaf);
4931
-                    if (editWindow != null)
5090
+                    ObjEditor window = GetWindow();
5091
+                    if (window != null)
49325092                     {
4933
-                        editWindow.Select(tp, deselect, true);
5093
+                        window.Select(tp, deselect, true);
49345094                     }
49355095 
49365096                     return tp;
....@@ -5572,12 +5732,23 @@
55725732     boolean NeedSupport()
55735733     {
55745734         return
5575
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5735
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55765736                  // PROBLEM with CROWD!!
55775737                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55785738     }
55795739     
55805740     static boolean DEBUG_SELECTION = false;
5741
+    
5742
+    boolean IsLive()
5743
+    {
5744
+        if (live)
5745
+            return true;
5746
+        
5747
+        if (parent == null)
5748
+            return false;
5749
+        
5750
+        return parent.IsLive();
5751
+    }
55815752     
55825753     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55835754     {
....@@ -5640,7 +5811,7 @@
56405811             support = support;
56415812         
56425813         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643
-        boolean usecalllists = false; // 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);
56445815         
56455816         if (!usecalllists && bRep != null && bRep.displaylist > 0)
56465817         {
....@@ -5660,10 +5831,12 @@
56605831         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56615832         
56625833         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5834
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5835
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
56645836         {
56655837             Globals.lighttouched = true;
56665838         } // all panes...
5839
+        
56675840         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56685841         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56695842                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5791,6 +5964,7 @@
57915964             if (GetBRep() != null)
57925965             {
57935966                 display.NextIndex();
5967
+                
57945968                 // vertex color conflict : gl.glCallList(list);
57955969                 DrawNode(display, root, selected);
57965970                 if (this instanceof BezierPatch)
....@@ -5831,16 +6005,27 @@
58316005         tex = GetTextures();
58326006     }
58336007 
5834
-    boolean failed = false;
6008
+    boolean failedPigment = false;
6009
+    boolean failedBump = false;
58356010     
58366011     try
58376012     {
5838
-        display.BindTextures(tex, texres);
6013
+        display.BindPigmentTexture(tex, texres);
58396014     }
58406015     catch (Exception e)
58416016     {
58426017         System.err.println("FAILED: " + this);
5843
-        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;
58446029     }
58456030            
58466031             if (!compiled)
....@@ -5863,8 +6048,11 @@
58636048                 }
58646049             }
58656050 
5866
-    if (!failed)
5867
-        display.ReleaseTextures(tex);
6051
+    if (!failedBump)
6052
+        display.ReleaseBumpTexture(tex);
6053
+
6054
+    if (!failedPigment)
6055
+        display.ReleasePigmentTexture(tex);
58686056 
58696057     display.PopMaterial(this, selected);
58706058         }
....@@ -6237,6 +6425,11 @@
62376425                 // dec 2012
62386426                 new Exception().printStackTrace();
62396427                 return;
6428
+            }
6429
+            
6430
+            if (dontselect)
6431
+            {
6432
+                //bRep.GenerateNormalsMINE();
62406433             }
62416434             
62426435             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7089,7 +7282,7 @@
70897282             spot.translate(32, 32);
70907283             spotw = spot.x + spot.width;
70917284             spoth = spot.y + spot.height;
7092
-            info.g.setColor(Color.blue);
7285
+            info.g.setColor(Color.cyan);
70937286             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70947287 //            if (CameraPane.Xmin > spot.x)
70957288 //            {
....@@ -7107,11 +7300,12 @@
71077300 //            {
71087301 //                CameraPane.Ymax = spoth;
71097302 //            }
7110
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7303
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7304
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
71127305             spot.translate(0, -32);
7113
-            info.g.setColor(Color.green);
7306
+            info.g.setColor(Color.yellow);
71147307             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7308
+            info.g.setColor(Color.green);
71157309 //            if (CameraPane.Xmin > spot.x)
71167310 //            {
71177311 //                CameraPane.Xmin = spot.x;
....@@ -7128,8 +7322,8 @@
71287322 //            {
71297323 //                CameraPane.Ymax = spoth;
71307324 //            }
7131
-            info.g.drawArc(boundary.x, boundary.y,
7132
-                    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);
71337327             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
71347328 //            if (CameraPane.Xmin > boundary.x)
71357329 //            {
....@@ -7429,19 +7623,20 @@
74297623                 switch (info.pane.RenderCamera().viewCode)
74307624                 {
74317625                     case 3: // '\001'
7432
-                        if (modified)
7626
+                        if (modified || opposite)
74337627                         {
74347628                             //LA.matScale(toParent, 1, hScale, vScale);
74357629                             LA.matScale(toParent, totalScale, 1, 1);
74367630                         } // vScale, 1);
74377631                         else
74387632                         {
7633
+                            // EXCEPTION!
74397634                             LA.matScale(toParent, totalScale, totalScale, totalScale);
74407635                         } // vScale, 1);
74417636                         break;
74427637 
74437638                     case 2: // '\002'
7444
-                        if (modified)
7639
+                        if (modified || opposite)
74457640                         {
74467641                             //LA.matScale(toParent, hScale, 1, vScale);
74477642                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7452,7 +7647,7 @@
74527647                         break;
74537648 
74547649                     case 1: // '\003'
7455
-                        if (modified)
7650
+                        if (modified || opposite)
74567651                         {
74577652                             //LA.matScale(toParent, hScale, vScale, 1);
74587653                             LA.matScale(toParent, 1, 1, totalScale);
....@@ -7672,6 +7867,10 @@
76727867             editWindow = null;
76737868         } // ?
76747869         }
7870
+        else
7871
+        {
7872
+            //editWindow.closeUI();
7873
+        }
76757874     }
76767875     
76777876     boolean root; // patch for edit windows
....@@ -7829,6 +8028,10 @@
78298028     }
78308029     
78318030     transient ObjEditor editWindow;
8031
+    transient ObjEditor manipWindow;
8032
+    
8033
+    transient boolean pinned;
8034
+    
78328035     transient ObjectUI objectUI;
78338036     public static int povDepth = 0;
78348037     private static cVector tbMin = new cVector();