.. | .. |
---|
41 | 41 | |
---|
42 | 42 | java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>(); |
---|
43 | 43 | |
---|
44 | | - int tabIndex; |
---|
| 44 | + transient int tabIndex; // Tabs can change between sessions. |
---|
45 | 45 | |
---|
46 | 46 | ScriptNode scriptnode; |
---|
47 | 47 | |
---|
.. | .. |
---|
1142 | 1142 | (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) && |
---|
1143 | 1143 | currentframe != Globals.framecount) |
---|
1144 | 1144 | { |
---|
| 1145 | + Globals.lighttouched = true; |
---|
| 1146 | + |
---|
1145 | 1147 | currentframe = Globals.framecount; |
---|
1146 | 1148 | |
---|
1147 | 1149 | // System.err.println("transformcount = " + transformcount); |
---|
.. | .. |
---|
3419 | 3421 | } |
---|
3420 | 3422 | } |
---|
3421 | 3423 | |
---|
3422 | | - public void Scale(int scale) |
---|
| 3424 | + public void Scale(float scale) |
---|
3423 | 3425 | { |
---|
3424 | 3426 | Object3D obj = this; |
---|
3425 | 3427 | |
---|
.. | .. |
---|
6200 | 6202 | // System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame); |
---|
6201 | 6203 | } |
---|
6202 | 6204 | |
---|
6203 | | - if (live && Link2Support() && support == null && !this.marked) // project on ground |
---|
| 6205 | + if (false) // live && Link2Support() && support == null && !this.marked) // project on ground |
---|
6204 | 6206 | { |
---|
6205 | 6207 | getBounds(minima, maxima, true); |
---|
6206 | 6208 | center.x = (minima.x + maxima.x) / 2; |
---|
.. | .. |
---|
6301 | 6303 | |
---|
6302 | 6304 | if (!selectmode && //display.DrawMode() != display.SELECTION && |
---|
6303 | 6305 | //(touched || (bRep != null && bRep.displaylist <= 0))) |
---|
6304 | | - (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0))) |
---|
| 6306 | + ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0))) |
---|
6305 | 6307 | { |
---|
6306 | 6308 | Globals.lighttouched = true; |
---|
6307 | 6309 | } // all panes... |
---|
.. | .. |
---|
6856 | 6858 | |
---|
6857 | 6859 | //javax.media.opengl.GL gl = display.GetGL(); |
---|
6858 | 6860 | |
---|
6859 | | - if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera) |
---|
| 6861 | + if (CameraPane.BOXMODE && //!Link2Support()) // |
---|
| 6862 | + !selected) // || CameraPane.movingcamera) |
---|
6860 | 6863 | { |
---|
6861 | 6864 | int fc = bRep.FaceCount(); |
---|
6862 | 6865 | int vc = bRep.VertexCount(); |
---|