Pin button.

Normand Briere

2019-08-07 59de607850161a26863f92961d53caae7a2dabc8

 Object3D.java
..
..
@@ -22,6 +22,7 @@
22
22
     //static final long serialVersionUID = -607422624994562685L;
23
23
     static final long serialVersionUID = 5022536242724664900L;
24
24
     
25
+    // Use GetUUID for backward compatibility with null.
25
26
     private UUID uuid = UUID.randomUUID();
26
27
     
27
28
     // TEMPORARY for mocap undo. No need to be transient.
..
..
@@ -32,7 +33,7 @@
32
33
     String skyboxname;
33
34
     String skyboxext;
34
35
     
35
-    byte[] versions[];
36
+    Object3D versionlist[];
36
37
     int versionindex = -1;    
37
38
         
38
39
     ScriptNode scriptnode;
..
..
@@ -222,7 +223,7 @@
222
223
 //            o.bRep.support = null;
223
224
 //        }
224
225
         o.selection = this.selection;
225
-        o.versions = this.versions;
226
+        o.versionlist = this.versionlist;
226
227
         o.versionindex = this.versionindex;
227
228
         
228
229
         if (this.support != null)
..
..
@@ -245,6 +246,29 @@
245
246
     //    this.support = null;
246
247
     //    this.fileparent = null;
247
248
     }
249
+
250
+//    Object3D GetObject(java.util.UUID uuid)
251
+//    {
252
+//        if (this.uuid.equals(uuid))
253
+//            return this;
254
+//            
255
+//        if (blockloop)
256
+//            return null;
257
+//
258
+//        blockloop = true;
259
+//
260
+//        for (int i=0; i<Size(); i++)
261
+//        {
262
+//            Object3D o = get(i).GetObject(uuid);
263
+//            
264
+//            if (o != null)
265
+//                return o;
266
+//        }
267
+//        
268
+//        blockloop = false;
269
+//        
270
+//        return null;
271
+//    }
248
272
 
249
273
     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
250
274
     {
..
..
@@ -280,7 +304,7 @@
280
304
         
281
305
         this.selection = o.selection;
282
306
         
283
-        this.versions = o.versions;
307
+        this.versionlist = o.versionlist;
284
308
         this.versionindex = o.versionindex;
285
309
 // July 2019        if (this.bRep != null)
286
310
 //            this.bRep.support = o.transientrep;
..
..
@@ -1014,6 +1038,9 @@
1014
1038
         
1015
1039
         if (material == null || material.multiply)
1016
1040
             return true;
1041
+        
1042
+        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1043
+            return false;
1017
1044
         
1018
1045
         // Transparent objects are dynamic because we have to sort the triangles.
1019
1046
         return material.opacity > 0.99;
..
..
@@ -2441,6 +2468,7 @@
2441
2468
         else
2442
2469
         {
2443
2470
             //((ObjEditor)editWindow).SetupUI2(null);
2471
+            ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2444
2472
         }
2445
2473
     }
2446
2474
 
..
..
@@ -5909,8 +5937,10 @@
5909
5937
         if (support != null)
5910
5938
             support = support;
5911
5939
         
5912
-        //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5913
-        boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5940
+        boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5941
+        //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5942
+        
5943
+        //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5914
5944
         
5915
5945
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5916
5946
         {
..
..
@@ -5920,8 +5950,9 @@
5920
5950
    //     usecalllists &= !(parent instanceof RandomNode);
5921
5951
    //     usecalllists = false;
5922
5952
 
5923
-        if (GetBRep() != null)
5924
-            usecalllists = usecalllists;
5953
+        if (display.DrawMode() == display.SHADOW)
5954
+            //GetBRep() != null)
5955
+            usecalllists = !!usecalllists;
5925
5956
         //System.out.println("draw " + this);
5926
5957
         //new Exception().printStackTrace();
5927
5958
 
..
..
@@ -5943,7 +5974,7 @@
5943
5974
             if (!(this instanceof Composite))
5944
5975
                 touched = false;
5945
5976
             //if (displaylist == -1 && usecalllists)
5946
-            if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5977
+            if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5947
5978
             {
5948
5979
                 bRep.displaylist = display.GenList();
5949
5980
                 assert(bRep.displaylist != 0);
..
..
@@ -5954,7 +5985,7 @@
5954
5985
 
5955
5986
             //System.out.println("\tnew list " + list);
5956
5987
             //gl.glDrawBuffer(gl.GL_NONE);
5957
-            if (usecalllists)
5988
+            if (usecalllists && bRep.displaylist > 0)
5958
5989
             {
5959
5990
 //            System.err.println("new list " + bRep.displaylist + " for " + this);
5960
5991
                 display.NewList(bRep.displaylist);
..
..
@@ -5963,7 +5994,7 @@
5963
5994
             CallList(display, root, selected, blocked);
5964
5995
             
5965
5996
           //  compiled = true;
5966
-            if (usecalllists)
5997
+            if (usecalllists && bRep.displaylist > 0)
5967
5998
             {
5968
5999
 //            System.err.println("end list " + bRep.displaylist + " for " + this);
5969
6000
                 display.EndList();