Fix perfo Venice (shadow).

Normand Briere

2019-06-27 1807e7752960ac229cddd34b100e92cadbac9459

 Object3D.java
..
..
@@ -181,7 +181,7 @@
181
181
             return;
182
182
         }
183
183
 
184
-        Object3D o = new Object3D();
184
+        Object3D o = new Object3D("copy of " + this.name);
185
185
 
186
186
         hashtable.put(GetUUID(), o);
187
187
 
..
..
@@ -219,16 +219,23 @@
219
219
         if (!hashtable.containsKey(GetUUID()))
220
220
             return;
221
221
 
222
+        if (blockloop)
223
+            return;
224
+
225
+        blockloop = true;
226
+
222
227
         Object3D o = hashtable.get(GetUUID());
223
228
 
224
229
         RestoreBigData(o);
225
230
 
226
-        hashtable.remove(GetUUID());
231
+        //hashtable.remove(GetUUID());
227
232
 
228
233
         for (int i=0; i<Size(); i++)
229
234
         {
230
235
             get(i).RestoreBigData(hashtable);
231
236
         }
237
+        
238
+        blockloop = false;
232
239
     }
233
240
 
234
241
     void RestoreBigData(Object3D o)
..
..
@@ -881,7 +888,7 @@
881
888
         
882
889
         if (marked && Globals.isLIVE() && live &&
883
890
                 //TEMP21aug2018
884
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
891
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885
892
                 currentframe != Globals.framecount)
886
893
         {
887
894
             currentframe = Globals.framecount;
..
..
@@ -966,6 +973,7 @@
966
973
         if (material == null || material.multiply)
967
974
             return true;
968
975
         
976
+        // Transparent objects are dynamic because we have to sort the triangles.
969
977
         return material.opacity > 0.99;
970
978
     }
971
979
     
..
..
@@ -2432,6 +2440,14 @@
2432
2440
         {
2433
2441
             editWindow.refreshContents();
2434
2442
         }
2443
+        else
2444
+        {
2445
+            if (manipWindow != null)
2446
+            {
2447
+                manipWindow.refreshContents();
2448
+            }
2449
+        }
2450
+                
2435
2451
     //if (parent != null)
2436
2452
     //parent.refreshEditWindow();
2437
2453
     }
..
..
@@ -4962,6 +4978,14 @@
4962
4978
         }
4963
4979
     }
4964
4980
     
4981
+    ObjEditor GetWindow()
4982
+    {
4983
+        if (editWindow != null)
4984
+            return editWindow;
4985
+        
4986
+        return manipWindow;
4987
+    }
4988
+    
4965
4989
     cTreePath Select(int indexcount, boolean deselect)
4966
4990
     {
4967
4991
         if (hide || dontselect)
..
..
@@ -4998,10 +5022,11 @@
4998
5022
                 if (leaf != null)
4999
5023
                 {
5000
5024
                     cTreePath tp = new cTreePath(this, leaf);
5001
-                    if (editWindow != null)
5025
+                    ObjEditor window = GetWindow();
5026
+                    if (window != null)
5002
5027
                     {
5003
5028
                         //System.out.println("editWindow = " + editWindow + " vs " + this);
5004
-                        editWindow.Select(tp, deselect, true);
5029
+                        window.Select(tp, deselect, true);
5005
5030
                     }
5006
5031
 
5007
5032
                     return tp;
..
..
@@ -5018,6 +5043,7 @@
5018
5043
 
5019
5044
             if (child == null)
5020
5045
                 continue;
5046
+            
5021
5047
             if (child.HasTransparency() && child.size() != 0)
5022
5048
             {
5023
5049
                 cTreePath leaf = child.Select(indexcount, deselect);
..
..
@@ -5027,9 +5053,10 @@
5027
5053
                 if (leaf != null)
5028
5054
                 {
5029
5055
                     cTreePath tp = new cTreePath(this, leaf);
5030
-                    if (editWindow != null)
5056
+                    ObjEditor window = GetWindow();
5057
+                    if (window != null)
5031
5058
                     {
5032
-                        editWindow.Select(tp, deselect, true);
5059
+                        window.Select(tp, deselect, true);
5033
5060
                     }
5034
5061
 
5035
5062
                     return tp;
..
..
@@ -5750,7 +5777,7 @@
5750
5777
             support = support;
5751
5778
         
5752
5779
         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5753
-        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754
5781
         
5755
5782
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5756
5783
         {
..
..
@@ -5771,7 +5798,7 @@
5771
5798
         
5772
5799
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5773
5800
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5774
-                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
5801
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
5775
5802
         {
5776
5803
             Globals.lighttouched = true;
5777
5804
         } // all panes...
..
..
@@ -5903,6 +5930,7 @@
5903
5930
             if (GetBRep() != null)
5904
5931
             {
5905
5932
                 display.NextIndex();
5933
+                
5906
5934
                 // vertex color conflict : gl.glCallList(list);
5907
5935
                 DrawNode(display, root, selected);
5908
5936
                 if (this instanceof BezierPatch)
..
..
@@ -7966,6 +7994,10 @@
7966
7994
     }
7967
7995
     
7968
7996
     transient ObjEditor editWindow;
7997
+    transient ObjEditor manipWindow;
7998
+    
7999
+    transient boolean pinned;
8000
+    
7969
8001
     transient ObjectUI objectUI;
7970
8002
     public static int povDepth = 0;
7971
8003
     private static cVector tbMin = new cVector();