blame | history | patch | commit | commitdiff
Normand Briere
2019-07-21 d32f24f147068e6cbecb31c7f98047f68bc8b58a 
 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[];
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 
177182             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);
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,26 @@
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
+        o.versions = this.versions;
223
+        o.versionindex = this.versionindex;
224
+        
225
+        if (this.support != null)
200226         {
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;
203232         }
204233         
205234         //    o.support = this.support;
....@@ -223,19 +252,35 @@
223252 
224253         RestoreBigData(o);
225254 
226
-        hashtable.remove(GetUUID());
255
+        if (blockloop)
256
+            return;
257
+
258
+        blockloop = true;
259
+
260
+        //hashtable.remove(GetUUID());
227261 
228262         for (int i=0; i<Size(); i++)
229263         {
230264             get(i).RestoreBigData(hashtable);
231265         }
266
+        
267
+        blockloop = false;
232268     }
233269 
234270     void RestoreBigData(Object3D o)
235271     {
236272         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;
239284     //    this.support = o.support;
240285     //    this.fileparent = o.fileparent;
241286     }
....@@ -381,6 +426,7 @@
381426         }
382427         
383428     boolean live = false;
429
+    transient boolean keepdontselect;
384430     boolean dontselect = false;
385431     boolean hide = false;
386432     boolean link2master = false; // performs reset support/master at each frame
....@@ -881,7 +927,7 @@
881927         
882928         if (marked && Globals.isLIVE() && live &&
883929                 //TEMP21aug2018
884
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
930
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885931                 currentframe != Globals.framecount)
886932         {
887933             currentframe = Globals.framecount;
....@@ -966,6 +1012,7 @@
9661012         if (material == null || material.multiply)
9671013             return true;
9681014         
1015
+        // Transparent objects are dynamic because we have to sort the triangles.
9691016         return material.opacity > 0.99;
9701017     }
9711018     
....@@ -1366,6 +1413,7 @@
13661413                     toParent = LA.newMatrix();
13671414                     fromParent = LA.newMatrix();
13681415                 }
1416
+                
13691417                 LA.matCopy(other.toParent, toParent);
13701418                 LA.matCopy(other.fromParent, fromParent);
13711419                 
....@@ -2387,6 +2435,10 @@
23872435         }
23882436          */
23892437         }
2438
+        else
2439
+        {
2440
+            //((ObjEditor)editWindow).SetupUI2(null);
2441
+        }
23902442     }
23912443 
23922444     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2428,6 +2480,14 @@
24282480         {
24292481             editWindow.refreshContents();
24302482         }
2483
+        else
2484
+        {
2485
+            if (manipWindow != null)
2486
+            {
2487
+                manipWindow.refreshContents();
2488
+            }
2489
+        }
2490
+                
24312491     //if (parent != null)
24322492     //parent.refreshEditWindow();
24332493     }
....@@ -3058,7 +3118,7 @@
30583118     {
30593119         if (bRep != null)
30603120         {
3061
-            bRep.GenerateNormalsMINE();
3121
+            bRep.MergeNormals(); //.GenerateNormalsMINE();
30623122             Touch();
30633123         }
30643124     }
....@@ -4958,6 +5018,14 @@
49585018         }
49595019     }
49605020     
5021
+    ObjEditor GetWindow()
5022
+    {
5023
+        if (editWindow != null)
5024
+            return editWindow;
5025
+        
5026
+        return manipWindow;
5027
+    }
5028
+    
49615029     cTreePath Select(int indexcount, boolean deselect)
49625030     {
49635031         if (hide || dontselect)
....@@ -4994,10 +5062,11 @@
49945062                 if (leaf != null)
49955063                 {
49965064                     cTreePath tp = new cTreePath(this, leaf);
4997
-                    if (editWindow != null)
5065
+                    ObjEditor window = GetWindow();
5066
+                    if (window != null)
49985067                     {
49995068                         //System.out.println("editWindow = " + editWindow + " vs " + this);
5000
-                        editWindow.Select(tp, deselect, true);
5069
+                        window.Select(tp, deselect, true);
50015070                     }
50025071 
50035072                     return tp;
....@@ -5014,6 +5083,7 @@
50145083 
50155084             if (child == null)
50165085                 continue;
5086
+            
50175087             if (child.HasTransparency() && child.size() != 0)
50185088             {
50195089                 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -5023,9 +5093,10 @@
50235093                 if (leaf != null)
50245094                 {
50255095                     cTreePath tp = new cTreePath(this, leaf);
5026
-                    if (editWindow != null)
5096
+                    ObjEditor window = GetWindow();
5097
+                    if (window != null)
50275098                     {
5028
-                        editWindow.Select(tp, deselect, true);
5099
+                        window.Select(tp, deselect, true);
50295100                     }
50305101 
50315102                     return tp;
....@@ -5350,6 +5421,51 @@
53505421         blockloop = false;
53515422     }
53525423 
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();
5464
+        }
5465
+        
5466
+        blockloop = false;
5467
+    }
5468
+
53535469     boolean IsSelected()
53545470     {
53555471         if (parent == null)
....@@ -5659,6 +5775,27 @@
56595775         }
56605776     }
56615777     
5778
+    void EmbedTextures()
5779
+    {
5780
+        if (blockloop)
5781
+            return;
5782
+        
5783
+        CameraPane.EmbedTextures(texture);
5784
+        
5785
+        int nb = Size();
5786
+        for (int i = 0; i < nb; i++)
5787
+        {
5788
+            Object3D child = (Object3D) get(i);
5789
+
5790
+            if (child == null)
5791
+                continue;
5792
+
5793
+            blockloop = true;
5794
+            child.EmbedTextures();
5795
+            blockloop = false;
5796
+        }
5797
+    }
5798
+    
56625799     void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
56635800     {
56645801         Draw(display, root, selected, blocked);
....@@ -5746,7 +5883,7 @@
57465883             support = support;
57475884         
57485885         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749
-        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5886
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
57505887         
57515888         if (!usecalllists && bRep != null && bRep.displaylist > 0)
57525889         {
....@@ -5767,7 +5904,7 @@
57675904         
57685905         if (!selectmode && //display.DrawMode() != display.SELECTION &&
57695906                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5770
-                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
5907
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
57715908         {
57725909             Globals.lighttouched = true;
57735910         } // all panes...
....@@ -5899,6 +6036,7 @@
58996036             if (GetBRep() != null)
59006037             {
59016038                 display.NextIndex();
6039
+                
59026040                 // vertex color conflict : gl.glCallList(list);
59036041                 DrawNode(display, root, selected);
59046042                 if (this instanceof BezierPatch)
....@@ -6359,6 +6497,11 @@
63596497                 // dec 2012
63606498                 new Exception().printStackTrace();
63616499                 return;
6500
+            }
6501
+            
6502
+            if (dontselect)
6503
+            {
6504
+                //bRep.GenerateNormalsMINE();
63626505             }
63636506             
63646507             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7251,8 +7394,8 @@
72517394 //            {
72527395 //                CameraPane.Ymax = spoth;
72537396 //            }
7254
-            info.g.drawArc(boundary.x, boundary.y,
7255
-                    boundary.width, boundary.height, 0, 360);
7397
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7398
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
72567399             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
72577400 //            if (CameraPane.Xmin > boundary.x)
72587401 //            {
....@@ -7796,6 +7939,10 @@
77967939             editWindow = null;
77977940         } // ?
77987941         }
7942
+        else
7943
+        {
7944
+            //editWindow.closeUI();
7945
+        }
77997946     }
78007947     
78017948     boolean root; // patch for edit windows
....@@ -7953,6 +8100,10 @@
79538100     }
79548101     
79558102     transient ObjEditor editWindow;
8103
+    transient ObjEditor manipWindow;
8104
+    
8105
+    transient boolean pinned;
8106
+    
79568107     transient ObjectUI objectUI;
79578108     public static int povDepth = 0;
79588109     private static cVector tbMin = new cVector();