Save image helper.

Normand Briere

2019-10-06 9cf2c36d644d0aaa28797f57a3e71591d8e66973

 Object3D.java
..
..
@@ -41,6 +41,8 @@
41
41
         
42
42
     java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
43
43
     
44
+    transient int tabIndex; // Tabs can change between sessions.
45
+    
44
46
     ScriptNode scriptnode;
45
47
 
46
48
     void deepCopyNode(Object3D other)
..
..
@@ -100,7 +102,7 @@
100
102
         other.softtouched = softtouched;
101
103
         
102
104
         other.random = random;
103
-        other.link2master = link2master;
105
+        other.link2master = Link2Support();
104
106
         other.transformcount = transformcount;
105
107
         other.marked = marked;
106
108
         other.skip = skip;
..
..
@@ -220,7 +222,7 @@
220
222
             return;
221
223
 
222
224
         transientsupport = support;
223
-        transientlink2master = link2master;
225
+        transientlink2master = Link2Support();
224
226
 
225
227
         support = null;
226
228
         link2master = false;
..
..
@@ -633,7 +635,10 @@
633
635
     transient boolean keepdontselect;
634
636
     boolean dontselect = false;
635
637
     boolean hide = false;
638
+    
636
639
     boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
640
+    boolean link2support = false; // (cannot rename due to serialization)
641
+    
637
642
     boolean marked = false; // animation node
638
643
     boolean skip = false; // centroid issue
639
644
     boolean skipmocap = false; // mocap data
..
..
@@ -1137,6 +1142,8 @@
1137
1142
                 (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
1138
1143
                 currentframe != Globals.framecount)
1139
1144
         {
1145
+            Globals.lighttouched = true;
1146
+            
1140
1147
             currentframe = Globals.framecount;
1141
1148
             
1142
1149
 //            System.err.println("transformcount = " + transformcount);
..
..
@@ -3414,7 +3421,7 @@
3414
3421
         }
3415
3422
     }
3416
3423
     
3417
-    public void Scale(int scale)
3424
+    public void Scale(float scale)
3418
3425
     {
3419
3426
         Object3D obj = this;
3420
3427
         
..
..
@@ -6154,7 +6161,7 @@
6154
6161
     boolean NeedSupport()
6155
6162
     {
6156
6163
         return
6157
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
6164
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /*live &&*/ support != null
6158
6165
                  // PROBLEM with CROWD!!
6159
6166
                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
6160
6167
     }
..
..
@@ -6177,6 +6184,11 @@
6177
6184
         return live && bRep != null;
6178
6185
     }
6179
6186
     
6187
+    boolean Link2Support()
6188
+    {
6189
+        return link2master || link2support;
6190
+    }
6191
+    
6180
6192
     static cVector minima = new cVector();
6181
6193
     static cVector maxima = new cVector();
6182
6194
     static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
..
..
@@ -6190,7 +6202,7 @@
6190
6202
         //    System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
6191
6203
         }
6192
6204
         
6193
-        if (live && link2master && support == null && !this.marked) // project on ground
6205
+        if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
6194
6206
         {
6195
6207
             getBounds(minima, maxima, true);
6196
6208
             center.x = (minima.x + maxima.x) / 2;
..
..
@@ -6265,7 +6277,7 @@
6265
6277
             support = support;
6266
6278
         
6267
6279
         boolean usecalllists = !IsDynamic() &&
6268
-                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6280
+                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6269
6281
         //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6270
6282
         
6271
6283
         //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..
..
@@ -6276,7 +6288,8 @@
6276
6288
             bRep.displaylist = 0;
6277
6289
         }
6278
6290
    //     usecalllists &= !(parent instanceof RandomNode);
6279
-   //     usecalllists = false;
6291
+        if (CameraPane.BOXMODE) // Too dynamic
6292
+            usecalllists = false;
6280
6293
 
6281
6294
         if (display.DrawMode() == display.SHADOW)
6282
6295
             //GetBRep() != null)
..
..
@@ -6290,7 +6303,7 @@
6290
6303
         
6291
6304
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
6292
6305
                 //(touched || (bRep != null && bRep.displaylist <= 0)))
6293
-                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
6306
+                ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
6294
6307
         {
6295
6308
             Globals.lighttouched = true;
6296
6309
         } // all panes...
..
..
@@ -6372,7 +6385,7 @@
6372
6385
         {
6373
6386
             if (display.DrawMode() == iCameraPane.SHADOW)
6374
6387
             {
6375
-                if (!link2master // tricky to cull in shadow mode.
6388
+                if (!Link2Support() // tricky to cull in shadow mode.
6376
6389
                          && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6377
6390
                 {
6378
6391
                     //System.out.print("CULLED");
..
..
@@ -6845,7 +6858,8 @@
6845
6858
 
6846
6859
         //javax.media.opengl.GL gl = display.GetGL();
6847
6860
 
6848
-        if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
6861
+        if (CameraPane.BOXMODE && //!Link2Support()) //
6862
+                                !selected) // || CameraPane.movingcamera)
6849
6863
         {
6850
6864
             int fc = bRep.FaceCount();
6851
6865
             int vc = bRep.VertexCount();
..
..
@@ -8916,7 +8930,7 @@
8916
8930
         
8917
8931
         boolean touch = false;
8918
8932
         
8919
-        if (bRep != null && link2master)
8933
+        if (bRep != null && Link2Support())
8920
8934
         {
8921
8935
             if (bbox == null)
8922
8936
             {