Normand Briere
2019-10-06 9cf2c36d644d0aaa28797f57a3e71591d8e66973
Object3D.java
....@@ -41,6 +41,8 @@
4141
4242 java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
4343
44
+ transient int tabIndex; // Tabs can change between sessions.
45
+
4446 ScriptNode scriptnode;
4547
4648 void deepCopyNode(Object3D other)
....@@ -1140,6 +1142,8 @@
11401142 (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
11411143 currentframe != Globals.framecount)
11421144 {
1145
+ Globals.lighttouched = true;
1146
+
11431147 currentframe = Globals.framecount;
11441148
11451149 // System.err.println("transformcount = " + transformcount);
....@@ -3417,7 +3421,7 @@
34173421 }
34183422 }
34193423
3420
- public void Scale(int scale)
3424
+ public void Scale(float scale)
34213425 {
34223426 Object3D obj = this;
34233427
....@@ -6198,7 +6202,7 @@
61986202 // System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
61996203 }
62006204
6201
- if (live && Link2Support() && support == null && !this.marked) // project on ground
6205
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
62026206 {
62036207 getBounds(minima, maxima, true);
62046208 center.x = (minima.x + maxima.x) / 2;
....@@ -6299,7 +6303,7 @@
62996303
63006304 if (!selectmode && //display.DrawMode() != display.SELECTION &&
63016305 //(touched || (bRep != null && bRep.displaylist <= 0)))
6302
- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
6306
+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
63036307 {
63046308 Globals.lighttouched = true;
63056309 } // all panes...
....@@ -6854,7 +6858,8 @@
68546858
68556859 //javax.media.opengl.GL gl = display.GetGL();
68566860
6857
- if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera)
6861
+ if (CameraPane.BOXMODE && //!Link2Support()) //
6862
+ !selected) // || CameraPane.movingcamera)
68586863 {
68596864 int fc = bRep.FaceCount();
68606865 int vc = bRep.VertexCount();