blame | history | patch | commit | commitdiff
Normand Briere
2019-06-23 8088590686a45e71278f9a52bb9cc37943dc0c37 
 CameraPane.java
....@@ -37,7 +37,6 @@
3737     static boolean[] selectedstack = new boolean[65536];
3838     static int materialdepth = 0;
3939 
40
-    static boolean DEBUG = false;
4140     static boolean FRUSTUM = false; // still bogus true; // frustum culling
4241 
4342     // camera change fix
....@@ -56,8 +55,6 @@
5655     static int CURRENTANTIALIAS = 0; // 1;
5756 	/*static*/ boolean RENDERSHADOW = true;
5857     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
6158     
6259     boolean DISPLAYTEXT = false;
6360     //boolean REDUCETEXTURE = true;
....@@ -86,7 +83,7 @@
8683 static    boolean FULLSCREEN = false;
8784 static    boolean SUPPORT = true;
8885 static    boolean INERTIA = true;
89
-static    boolean FAST = true; // false;
86
+static    boolean FAST = false;
9087 static    boolean SLOWPOSE = false;
9188 static    boolean FOOTCONTACT = true;
9289 
....@@ -108,7 +105,7 @@
108105 static    boolean OEIL = true;
109106 static    boolean OEILONCE = false; // do oeilon then oeiloff
110107 static    boolean LOOKAT = true;
111
-static    boolean RANDOM = true; // false;
108
+static    boolean SWITCH = true; // false;
112109 static    boolean HANDLES = false; // selection doesn't work!!
113110 static  boolean PAINTMODE = false;
114111 
....@@ -151,6 +148,8 @@
151148         defaultcaps.setAccumBlueBits(16);
152149         defaultcaps.setAccumAlphaBits(16);
153150     }
151
+    
152
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154153     
155154     void SetAsGLRenderer(boolean b)
156155     {
....@@ -464,10 +463,12 @@
464463         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465464         {
466465             //gl.glBegin(gl.GL_TRIANGLES);
467
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
466
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
467
+                    // TEST LIVE NORMALS && !obj.dontselect
468
+                    ;
468469             if (!hasnorm)
469470             {
470
-           //     System.out.println("FUCK!!");
471
+           //     System.out.println("Mesh normal");
471472                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
472473                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
473474                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1192,10 +1193,12 @@
11921193                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11931194                                 }
11941195                             }
1196
+                            
11951197                             if (flipV)
11961198                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11971199                             else
11981200                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+                            
11991202                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12001203                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12011204 
....@@ -1215,10 +1218,12 @@
12151218                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12161219                                 }
12171220                             }
1221
+                            
12181222                             if (flipV)
12191223                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12201224                             else
12211225                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+                            
12221227                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12231228                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12241229 
....@@ -1246,8 +1251,10 @@
12461251                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12471252                                 else
12481253                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+                                
12491255                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12501256                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+                                
12511258                                 count2 += 2;
12521259                                 count3 += 3;
12531260                             }
....@@ -1630,7 +1637,7 @@
16301637             
16311638         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16321639 
1633
-        float[] colorV = GrafreeD.colorV;
1640
+        float[] colorV = Grafreed.colorV;
16341641 
16351642         /**/
16361643         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1890,7 +1897,7 @@
18901897     void PushMatrix(double[][] matrix)
18911898     {
18921899     //    GrafreeD.tracein(matrix);
1893
-        PushMatrix(matrix,1);
1900
+        PushMatrix(matrix, 1);
18941901     }
18951902     
18961903     void PushMatrix()
....@@ -2142,7 +2149,7 @@
21422149         System.err.println("LIVE = " + Globals.isLIVE());
21432150         
21442151         if (!Globals.isLIVE()) // save sound
2145
-            GrafreeD.savesound = true; // wav.save();
2152
+            Grafreed.savesound = true; // wav.save();
21462153      //   else
21472154             repaint(); // start loop // may 2013
21482155     }
....@@ -2259,7 +2266,7 @@
22592266     
22602267     void ToggleDebug()
22612268     {
2262
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22632270     }
22642271 
22652272     void ToggleLookAt()
....@@ -2267,9 +2274,9 @@
22672274         LOOKAT ^= true;
22682275     }
22692276 
2270
-    void ToggleRandom()
2277
+    void ToggleSwitch()
22712278     {
2272
-        RANDOM ^= true;
2279
+        SWITCH ^= true;
22732280     }
22742281 
22752282     void ToggleHandles()
....@@ -2376,7 +2383,7 @@
23762383     {
23772384         return currentGL;
23782385     }
2379
-    
2386
+
23802387     /**/
23812388     class CacheTexture
23822389     {
....@@ -7921,6 +7928,64 @@
79217928         ReleaseTexture(pigment, false);
79227929     }
79237930     
7931
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7932
+    {
7933
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7934
+        {
7935
+            return;
7936
+        }
7937
+
7938
+        if (tex == null)
7939
+        {
7940
+            ReleaseTexture(null, false);
7941
+            return;
7942
+        }
7943
+        
7944
+        String pigment = Object3D.GetPigment(tex);
7945
+
7946
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947
+        {
7948
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7949
+        //    System.out.println("; bump = " + bump);
7950
+        }
7951
+        
7952
+        if (pigment.equals(""))
7953
+        {
7954
+            pigment = null;
7955
+        }
7956
+        
7957
+        ReleaseTexture(pigment, false);
7958
+    }
7959
+    
7960
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7961
+    {
7962
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7963
+        {
7964
+            return;
7965
+        }
7966
+
7967
+        if (tex == null)
7968
+        {
7969
+            ReleaseTexture(null, true);
7970
+            return;
7971
+        }
7972
+        
7973
+        String bump = Object3D.GetBump(tex);
7974
+
7975
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976
+        {
7977
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7978
+        //    System.out.println("; bump = " + bump);
7979
+        }
7980
+        
7981
+        if (bump.equals(""))
7982
+        {
7983
+            bump = null;
7984
+        }
7985
+        
7986
+        ReleaseTexture(bump, true);
7987
+    }
7988
+    
79247989     void ReleaseTexture(String tex, boolean bump)
79257990     {
79267991         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8024,7 +8089,7 @@
80248089         }
80258090     }
80268091 
8027
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80288093     {
80298094         if (// DrawMode() != 0 || /*tex == null ||*/
80308095                 ambientOcclusion ) // || !textureon)
....@@ -8069,7 +8134,94 @@
80698134         return; // true;
80708135     }
80718136     
8072
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8137
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8138
+    {
8139
+        if (// DrawMode() != 0 || /*tex == null ||*/
8140
+                ambientOcclusion ) // || !textureon)
8141
+        {
8142
+            return; // false;
8143
+        }
8144
+
8145
+        if (tex == null)
8146
+        {
8147
+            BindTexture(null,false,resolution);
8148
+            return;
8149
+        }
8150
+        
8151
+        String pigment = Object3D.GetPigment(tex);
8152
+
8153
+        usedtextures.put(pigment, pigment);
8154
+        
8155
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156
+        {
8157
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8158
+        //    System.out.println("; bump = " + bump);
8159
+        }
8160
+        
8161
+        if (pigment.equals(""))
8162
+        {
8163
+            pigment = null;
8164
+        }
8165
+        
8166
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167
+        BindTexture(pigment, false, resolution);
8168
+    }
8169
+    
8170
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8171
+    {
8172
+        if (// DrawMode() != 0 || /*tex == null ||*/
8173
+                ambientOcclusion ) // || !textureon)
8174
+        {
8175
+            return; // false;
8176
+        }
8177
+
8178
+        if (tex == null)
8179
+        {
8180
+            BindTexture(null,true,resolution);
8181
+            return;
8182
+        }
8183
+        
8184
+        String bump = Object3D.GetBump(tex);
8185
+
8186
+        usedtextures.put(bump, bump);
8187
+        
8188
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189
+        {
8190
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8191
+        //    System.out.println("; bump = " + bump);
8192
+        }
8193
+        
8194
+        if (bump.equals(""))
8195
+        {
8196
+            bump = null;
8197
+        }
8198
+        
8199
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200
+        BindTexture(bump, true, resolution);
8201
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202
+    }
8203
+    
8204
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8205
+    
8206
+    private boolean FileExists(String tex)
8207
+    {
8208
+        if (missingTextures.contains(tex))
8209
+        {
8210
+            return false;
8211
+        }
8212
+        
8213
+        boolean fileExists = new File(tex).exists();
8214
+        
8215
+        if (!fileExists)
8216
+        {
8217
+            // If file exists, the "new File()" is not executed sgain
8218
+            missingTextures.add(tex);
8219
+        }
8220
+        
8221
+        return fileExists;
8222
+    }
8223
+    
8224
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80738225     {
80748226         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80758227         
....@@ -8077,12 +8229,18 @@
80778229         {
80788230             String texname = tex;
80798231             
8080
-            String[] split = tex.split("Textures");
8081
-            if (split.length > 1)
8082
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
8083
-            else
8084
-                if (!texname.startsWith("/"))
8085
-                    texname = "/Users/nbriere/Textures/" + texname;
8232
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233
+                
8234
+//            String[] split = tex.split("Textures");
8235
+//            if (split.length > 1)
8236
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8237
+//            else
8238
+//                if (!texname.startsWith("/"))
8239
+//                    texname = "/Users/nbriere/Textures/" + texname;
8240
+            if (!FileExists(tex))
8241
+            {
8242
+                    texname = fallbackTextureName;
8243
+            }
80868244             
80878245             if (CACHETEXTURE)
80888246                 texture = textures.get(texname); // TEXTURE CACHE
....@@ -8151,7 +8309,7 @@
81518309                                     }
81528310                                 
81538311                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8154
-                                    if (!new File(cachename).exists())
8312
+                                    if (!FileExists(cachename))
81558313                                         cachename = texname;
81568314                                     else
81578315                                         processbump = false; // don't process bump map again
....@@ -8173,7 +8331,7 @@
81738331                                     }
81748332                                 
81758333                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8176
-                                    if (!new File(cachename).exists())
8334
+                                    if (!FileExists(cachename))
81778335                                         cachename = texname;
81788336                                     else
81798337                                         processbump = false; // don't process bump map again
....@@ -8182,7 +8340,9 @@
81828340                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81838341                                 
81848342                                 
8185
-                                if (texturedata != null)
8343
+                                if (texturedata == null)
8344
+                                    throw new Exception();
8345
+                                    
81868346                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81878347         //texture = GetTexture(tex, bump);
81888348                             }
....@@ -8304,7 +8464,7 @@
83048464         return texture;
83058465     }
83068466     
8307
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8467
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
83088468     {
83098469         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83108470                 
....@@ -8322,14 +8482,14 @@
83228482         return texture!=null?texture.texture:null;
83238483     }
83248484     
8325
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8485
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83268486     {
83278487         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83288488                 
83298489         return texture!=null?texture.texturedata:null;
83308490     }
83318491     
8332
-    boolean BindTexture(String tex, boolean bump, int resolution)
8492
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83338493     {
83348494         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83358495         {
....@@ -9306,8 +9466,8 @@
93069466         assert (parentcam != renderCamera);
93079467         
93089468         if (renderCamera != lightCamera)
9309
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9310
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93119471         
93129472 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93139473             
....@@ -9322,8 +9482,8 @@
93229482             LA.matCopy(renderCamera.fromScreen, matrix);
93239483             
93249484         if (renderCamera != lightCamera)
9325
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9326
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93279487 
93289488 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93299489             
....@@ -9395,7 +9555,7 @@
93959555             //gl.glFlush();
93969556             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93979557 
9398
-            if (ANIMATION && ABORTED)
9558
+            if (Globals.ANIMATION && ABORTED)
93999559             {
94009560     System.err.println("    ABORTED FRAME");
94019561                 break;
....@@ -9425,7 +9585,7 @@
94259585         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94269586 
94279587         // save image
9428
-        if (ANIMATION && !ABORTED)
9588
+        if (Globals.ANIMATION && !ABORTED)
94299589         {
94309590             VPwidth = viewport[2];
94319591             VPheight = viewport[3];
....@@ -9536,11 +9696,11 @@
95369696             
95379697 //            imagecount++;
95389698             
9539
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9699
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
95409700             
95419701             if (!BOXMODE)
95429702             {
9543
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9703
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95449704             }
95459705     
95469706             if (!BOXMODE)
....@@ -9578,7 +9738,7 @@
95789738             ABORTED = false;
95799739         }
95809740         else
9581
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+            Grafreed.wav.cursor += 735 * ACSIZE;
95829742         
95839743         if (false)
95849744         {
....@@ -10241,11 +10401,11 @@
1024110401 
1024210402     public void display(GLAutoDrawable drawable)
1024310403     {
10244
-        if (GrafreeD.savesound && GrafreeD.hassound)
10404
+        if (Grafreed.savesound && Grafreed.hassound)
1024510405         {
10246
-            GrafreeD.wav.save();
10247
-            GrafreeD.savesound = false;
10248
-            GrafreeD.hassound = false;
10406
+            Grafreed.wav.save();
10407
+            Grafreed.savesound = false;
10408
+            Grafreed.hassound = false;
1024910409         }
1025010410 //        if (DEBUG_SELECTION)
1025110411 //        {
....@@ -10375,7 +10535,7 @@
1037510535             Object3D theobject = object;
1037610536             Object3D theparent = object.parent;
1037710537             object.parent = null;
10378
-            object = (Object3D)GrafreeD.clone(object);
10538
+            object = (Object3D)Grafreed.clone(object);
1037910539             object.Stripify();
1038010540             if (theobject.selection == null || theobject.selection.Size() == 0)
1038110541                 theobject.PreprocessOcclusion(this);
....@@ -10388,13 +10548,13 @@
1038810548             ambientOcclusion = false;
1038910549         }
1039010550 
10391
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039210552         {
1039310553             //if (RENDERSHADOW) // ?
1039410554             if (!IsFrozen())
1039510555             {
1039610556                 // dec 2012
10397
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10557
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1039810558                 {
1039910559             Globals.framecount++;
1040010560                     shadowbuffer.display();
....@@ -10521,8 +10681,8 @@
1052110681             
1052210682 //        if (parentcam != renderCamera) // not a light
1052310683         if (cam != lightCamera)
10524
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10525
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10684
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10685
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052610686             
1052710687             for (int j = 0; j < 4; j++)
1052810688             {
....@@ -10536,8 +10696,8 @@
1053610696             
1053710697 //        if (parentcam != renderCamera) // not a light
1053810698         if (cam != lightCamera)
10539
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10540
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10699
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10700
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054110701         
1054210702             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054310703             
....@@ -10796,7 +10956,16 @@
1079610956             // Bump noise
1079710957             gl.glActiveTexture(GL.GL_TEXTURE6);
1079810958             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10799
-            BindTexture(NOISE_TEXTURE, false, 2);
10959
+            
10960
+    try
10961
+    {
10962
+        BindTexture(NOISE_TEXTURE, false, 2);
10963
+    }
10964
+    catch (Exception e)
10965
+    {
10966
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10967
+    }
10968
+           
1080010969 
1080110970             gl.glActiveTexture(GL.GL_TEXTURE0);
1080210971             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10921,8 +11090,8 @@
1092111090                 System.err.println("parentcam != renderCamera");
1092211091 
1092311092 //            if (cam != lightCamera)
10924
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10925
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11093
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11094
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1092611095         }
1092711096         
1092811097         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10943,8 +11112,8 @@
1094311112             if (true) // TODO
1094411113             {
1094511114                 if (cam != lightCamera)
10946
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10947
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11115
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11116
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1094811117             }
1094911118             
1095011119             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11260,8 +11429,14 @@
1126011429     {
1126111430             renderpass++;
1126211431 //        System.out.println("Draw object... ");
11432
+        STEP = 1;
1126311433         if (FAST) // in case there is no script
11264
-            STEP = 16;
11434
+            STEP = 8;
11435
+            
11436
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11437
+        {
11438
+            STEP *= 4;
11439
+        }
1126511440             
1126611441         //object.FullInvariants();
1126711442         
....@@ -11275,13 +11450,31 @@
1127511450             e.printStackTrace();
1127611451         }
1127711452         
11278
-        if (GrafreeD.RENDERME > 0)
11279
-            GrafreeD.RENDERME--; // mechante magouille
11453
+        if (Grafreed.RENDERME > 0)
11454
+            Grafreed.RENDERME--; // mechante magouille
1128011455         
1128111456         Globals.ONESTEP = false;
1128211457     }
1128311458 
1128411459     static boolean zoomonce = false;
11460
+    
11461
+    void CreateSelectedPoint()
11462
+    {
11463
+        if (selectedpoint == null)
11464
+        {
11465
+            debugpointG = new Sphere();
11466
+            debugpointP = new Sphere();
11467
+            debugpointC = new Sphere();
11468
+            debugpointR = new Sphere();
11469
+            
11470
+            selectedpoint = new Superellipsoid();
11471
+            
11472
+            for (int i=0; i<8; i++)
11473
+            {
11474
+                debugpoints[i] = new Sphere();
11475
+            }
11476
+        }
11477
+    }
1128511478     
1128611479     void DrawObject(GL gl, boolean draw)
1128711480     {
....@@ -11346,7 +11539,14 @@
1134611539 
1134711540                 usedtextures.clear();
1134811541             
11349
-                BindTextures(DEFAULT_TEXTURES, 2);
11542
+    try
11543
+    {
11544
+        BindTextures(DEFAULT_TEXTURES, 2);
11545
+    }
11546
+    catch (Exception e)
11547
+    {
11548
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11549
+    }
1135011550             }
1135111551             //System.out.println("--> " + stackdepth);
1135211552 //            GrafreeD.traceon();
....@@ -11356,8 +11556,9 @@
1135611556             
1135711557             if (DrawMode() == DEFAULT)
1135811558             {
11359
-                if (DEBUG)
11559
+                if (Globals.DEBUG)
1136011560                 {
11561
+                    CreateSelectedPoint();
1136111562                     float radius = 0.05f;
1136211563                     if (selectedpoint.radius != radius)
1136311564                     {
....@@ -11437,7 +11638,14 @@
1143711638             if (checker != null && DrawMode() == DEFAULT)
1143811639             {
1143911640                 //BindTexture(IMMORTAL_TEXTURE);
11440
-                BindTextures(checker.GetTextures(), checker.texres);
11641
+    try
11642
+    {
11643
+        BindTextures(checker.GetTextures(), checker.texres);
11644
+    }
11645
+    catch (Exception e)
11646
+    {
11647
+        System.err.println("FAILED: " + checker.GetTextures());
11648
+    }
1144111649                 // NEAREST
1144211650                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1144311651                 DrawChecker(gl);
....@@ -11519,7 +11727,7 @@
1151911727             return;
1152011728         }
1152111729 
11522
-        String string = obj.GetToolTip();
11730
+        String string = obj.toString(); //.GetToolTip();
1152311731         
1152411732         GL gl = GetGL();
1152511733         
....@@ -11836,8 +12044,8 @@
1183612044             //obj.TransformToWorld(light, light);
1183712045             for (int i = tp.size(); --i >= 0;)
1183812046             {
11839
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11840
-                    LA.xformPos(light, tp.get(i).toParent, light);
12047
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12048
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1184112049             }
1184212050 
1184312051 
....@@ -11854,8 +12062,8 @@
1185412062                 parentcam = cameras[0];
1185512063             }
1185612064             
11857
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11858
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12065
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12066
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1185912067 
1186012068             LA.xformPos(light, renderCamera.toScreen, light);
1186112069             
....@@ -12469,8 +12677,8 @@
1246912677 
1247012678            // display shadow only (bump == 0)
1247112679          "SUB temp.x, half.x, shadow.x;" +
12472
-         "MOV temp.y, -params6.x;" +
12473
-         "SLT temp.z, temp.y, zero.x;" +
12680
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12681
+         "SLT temp.z, temp.y, -one2048th.x;" +
1247412682          "SUB temp.y, one.x, temp.z;" +
1247512683          "MUL temp.x, temp.x, temp.y;" +
1247612684          "KIL temp.x;" +
....@@ -12599,8 +12807,10 @@
1259912807             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1260012808                 
1260112809                 "SUB temp.x, one.x, ndotl.x;" +
12602
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12603
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12810
+                // Tuning for default skin
12811
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12812
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12813
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1260412814                 "MUL temp.x, temp.x, temp.y;" +
1260512815                                 
1260612816                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12748,7 +12958,7 @@
1274812958               "MUL final.y, fragment.texcoord[0].x, c256;" +
1274912959               "FLR final.x, final.y;" +
1275012960               "SUB final.y, final.y, final.x;" +
12751
-              //"MUL final.x, final.x, c256i;" +
12961
+              "MUL final.x, final.x, c256i;" +
1275212962               "MOV final.z, zero.x;" +
1275312963               "MOV final.a, one.w;":""
1275412964               ) +
....@@ -12756,7 +12966,7 @@
1275612966               "MUL final.y, fragment.texcoord[0].y, c256;" +
1275712967               "FLR final.x, final.y;" +
1275812968               "SUB final.y, final.y, final.x;" +
12759
-              //"MUL final.x, final.x, c256i;" +
12969
+              "MUL final.x, final.x, c256i;" +
1276012970               "MOV final.z, zero.x;" +
1276112971               "MOV final.a, one.w;":""
1276212972               ) +
....@@ -12799,7 +13009,7 @@
1279913009             //once = true;
1280013010         }
1280113011 
12802
-        System.out.print("Program #" + mode + "; length = " + program.length());
13012
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1280313013         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1280413014         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1280513015 
....@@ -12932,12 +13142,16 @@
1293213142 
1293313143                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1293413144                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13145
+                
13146
+                // Compare fragment depth in light space with shadowmap.
1293513147                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1293613148                 "SGE temp.y, temp.x, zero.x;" +
12937
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13149
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13150
+                
13151
+                // Reverse comparison
1293813152                 "SUB temp.x, one.x, temp.x;" +
1293913153                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12940
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13154
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1294113155                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1294213156 
1294313157                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12951,6 +13165,10 @@
1295113165                 // No shadow for backface
1295213166                 "DP3 temp.x, normal, lightd;" +
1295313167                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13168
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13169
+
13170
+                // No shadow when out of frustrum
13171
+                "SGE temp.x, " + depth + ".z, one.z;" +
1295413172                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1295513173                 "";
1295613174     }
....@@ -13509,7 +13727,7 @@
1350913727     public void mousePressed(MouseEvent e)
1351013728     {
1351113729         //System.out.println("mousePressed: " + e);
13512
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13730
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1351313731     }
1351413732 
1351513733     static long prevtime = 0;
....@@ -13585,8 +13803,8 @@
1358513803       //      mode |= META;
1358613804         //}
1358713805         
13588
-        SetMouseMode(WHEEL | e.getModifiersEx());
13589
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13806
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13807
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1359013808         anchorX = ax;
1359113809         anchorY = ay;
1359213810         prevX = px;
....@@ -13646,6 +13864,10 @@
1364613864 //            wasliveok = true;
1364713865 //            waslive = false;
1364813866             
13867
+            // May 2019 Forget it:
13868
+            if (true)
13869
+                    return;
13870
+            
1364913871             // source == timer
1365013872             if (mouseDown)
1365113873             {
....@@ -13684,7 +13906,7 @@
1368413906     
1368513907     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1368613908 
13687
-    void clickStart(int x, int y, int modifiers)
13909
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1368813910     {
1368913911         if (!wasliveok)
1369013912             return;
....@@ -13701,7 +13923,7 @@
1370113923 //        touched = true; // main DL
1370213924         if (isRenderer)
1370313925         {
13704
-            SetMouseMode(modifiers);
13926
+            SetMouseMode(modifiers, modifiersex);
1370513927         }
1370613928 
1370713929         selectX = anchorX = x;
....@@ -13714,7 +13936,7 @@
1371413936         clicked = true;
1371513937         hold = false;
1371613938 
13717
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13939
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1371813940         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1371913941         {
1372013942       //  System.out.println("RESTART II " + modifiers);
....@@ -13745,7 +13967,7 @@
1374513967             info.camera = renderCamera;
1374613968             info.x = x;
1374713969             info.y = y;
13748
-            info.modifiers = modifiers;
13970
+            info.modifiers = modifiersex;
1374913971             editObj = object.doEditClick(info, 0);
1375013972             if (!editObj)
1375113973             {
....@@ -13762,9 +13984,12 @@
1376213984     
1376313985     public void mouseDragged(MouseEvent e)
1376413986     {
13987
+        Globals.MOUSEDRAGGED = true;
13988
+        
1376513989         //System.out.println("mouseDragged: " + e);
1376613990         if (isRenderer)
1376713991             movingcamera = true;
13992
+        
1376813993         //if (drawing)
1376913994         //return;
1377013995         if ((e.getModifiersEx() & CTRL) != 0
....@@ -13774,7 +13999,7 @@
1377413999             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1377514000         }
1377614001         else
13777
-            drag(e.getX(), e.getY(), e.getModifiersEx());
14002
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1377814003         
1377914004     //try { Thread.sleep(1); } catch (Exception ex) {}
1378014005     }
....@@ -14011,7 +14236,7 @@
1401114236                     {
1401214237                         Globals.lighttouched = true;
1401314238                     }
14014
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14239
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1401514240                 }
1401614241             //else
1401714242             }
....@@ -14111,7 +14336,7 @@
1411114336     int X, Y;
1411214337     boolean SX, SY;
1411314338 
14114
-    void drag(int x, int y, int modifiers)
14339
+    void drag(int x, int y, int modifiers, int modifiersex)
1411514340     {
1411614341         if (IsFrozen())
1411714342         {
....@@ -14120,17 +14345,17 @@
1412014345 
1412114346         drag = true; // NEW
1412214347         
14123
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14348
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1412414349 
1412514350         X = x;
1412614351         Y = y;
1412714352         // floating state for animation
14128
-        MODIFIERS = modifiers;
14129
-        modifiers &= ~1024;
14353
+        MODIFIERS = modifiersex;
14354
+        modifiersex &= ~1024;
1413014355         if (false) // modifiers != 0)
1413114356         {
1413214357             //new Exception().printStackTrace();
14133
-            System.out.println("mouseDragged: " + modifiers);
14358
+            System.out.println("mouseDragged: " + modifiersex);
1413414359             System.out.println("SHIFT = " + SHIFT);
1413514360             System.out.println("CONTROL = " + COMMAND);
1413614361             System.out.println("META = " + META);
....@@ -14150,7 +14375,7 @@
1415014375                 info.camera = renderCamera;
1415114376                 info.x = x;
1415214377                 info.y = y;
14153
-                object.editWindow.copy.doEditDrag(info);
14378
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1415414379             } else
1415514380             {
1415614381                 if (x < startX)
....@@ -14326,7 +14551,10 @@
1432614551 
1432714552     public void mouseReleased(MouseEvent e)
1432814553     {
14554
+        Globals.MOUSEDRAGGED = false;
14555
+        
1432914556         movingcamera = false;
14557
+        X = Y = 0;
1433014558         //System.out.println("mouseReleased: " + e);
1433114559         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1433214560     }
....@@ -14349,9 +14577,9 @@
1434914577         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1435014578         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1435114579         
14352
-        if (control || command || IsFrozen())
14580
+// No delay        if (control || command || IsFrozen())
1435314581             timeout = true;
14354
-        else
14582
+// ?? May 2019        else
1435514583        // timer.setDelay((modifiers & 128) != 0?0:350);
1435614584         mouseDown = false;
1435714585     if (!control && !command) // june 2013
....@@ -14461,7 +14689,7 @@
1446114689         System.out.println("keyReleased: " + e);
1446214690     }
1446314691 
14464
-    void SetMouseMode(int modifiers)
14692
+    void SetMouseMode(int modifiers, int modifiersex)
1446514693     {
1446614694         //System.out.println("SetMouseMode = " + modifiers);
1446714695         //modifiers &= ~1024;
....@@ -14473,25 +14701,25 @@
1447314701         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1447414702         //	return;
1447514703         //System.out.println("SetMode = " + modifiers);
14476
-        if ((modifiers & WHEEL) == WHEEL)
14704
+        if ((modifiersex & WHEEL) == WHEEL)
1447714705         {
1447814706             mouseMode |= ZOOM;
1447914707         }
1448014708         
1448114709         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482
-        if (capsLocked || (modifiers & META) == META)
14710
+        if (capsLocked) // || (modifiers & META) == META)
1448314711         {
1448414712             mouseMode |= VR; // BACKFORTH;
1448514713         }
14486
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14714
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1448714715         {
1448814716             mouseMode |= SELECT;
1448914717         }
14490
-        if ((modifiers & COMMAND) == COMMAND)
14718
+        if ((modifiersex & COMMAND) == COMMAND)
1449114719         {
1449214720             mouseMode |= SELECT;
1449314721         }
14494
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14722
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1449514723         {
1449614724             mouseMode &= ~VR;
1449714725             mouseMode |= TRANSLATE;
....@@ -14520,7 +14748,7 @@
1452014748 
1452114749         if (isRenderer) //
1452214750         {
14523
-            SetMouseMode(modifiers);
14751
+            SetMouseMode(0, modifiers);
1452414752         }
1452514753 
1452614754         Globals.theRenderer.keyPressed(key);
....@@ -14692,8 +14920,14 @@
1469214920                 RevertCamera();
1469314921                 repaint();
1469414922                 break;
14695
-            case 'L':
1469614923             case 'l':
14924
+                lightMode ^= true;
14925
+                Globals.lighttouched = true;
14926
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14927
+                targetLookAt.set(manipCamera.lookAt);
14928
+                repaint();
14929
+                break;
14930
+            case 'L':
1469714931                 if (lightMode)
1469814932                 {
1469914933                     lightMode = false;
....@@ -14840,23 +15074,21 @@
1484015074                 kompactbit = 6;
1484115075                 break;
1484215076             case ' ':
14843
-                lightMode ^= true;
14844
-                Globals.lighttouched = true;
14845
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14846
-                targetLookAt.set(manipCamera.lookAt);
15077
+                ObjEditor.theFrame.ToggleFullScreen();
1484715078                 repaint();
1484815079                 break;
1484915080             //case '`' :
1485015081             case ESC:
1485115082                 RENDERPROGRAM += 1;
1485215083                 RENDERPROGRAM %= 3;
15084
+
1485315085                 repaint();
1485415086                 break;
1485515087             case 'Z':
1485615088                 //RESIZETEXTURE ^= true;
1485715089                 //break;
1485815090             case 'z':
14859
-                RENDERSHADOW ^= true;
15091
+                Globals.RENDERSHADOW ^= true;
1486015092                 Globals.lighttouched = true;
1486115093                 repaint();
1486215094                 break;
....@@ -14980,7 +15212,7 @@
1498015212         //mode = ROTATE;
1498115213         if ((MODIFIERS & COMMAND) == 0) // VR??
1498215214         {
14983
-            SetMouseMode(modifiers);
15215
+            SetMouseMode(0, modifiers);
1498415216         }
1498515217     }
1498615218 
....@@ -15116,7 +15348,7 @@
1511615348     {
1511715349         //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1511815350         //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119
-        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15351
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1512015352         {
1512115353             mouseMoved(e);
1512215354         } else
....@@ -15335,7 +15567,9 @@
1533515567         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1533615568         //Image img = CreateImage(width, height);
1533715569         //System.out.println("width = " + width + "; height = " + height + "\n");
15570
+        
1533815571         Graphics gr = g; // img.getGraphics();
15572
+        
1533915573         if (!hasMarquee)
1534015574         {
1534115575             if (Xmin < Xmax) // !locked)
....@@ -15433,14 +15667,33 @@
1543315667             if (!isRenderer)
1543415668             {
1543515669                 object.drawEditHandles(info, 0);
15670
+                
15671
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15672
+                {
15673
+                    switch (object.selection.get(0).hitSomething)
15674
+                    {
15675
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15676
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15677
+                            break;
15678
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15679
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15680
+                        break;
15681
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15682
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15683
+                        break;
15684
+                    }
15685
+                    
15686
+                }
1543615687             }
1543715688         }
15689
+        
1543815690         if (isRenderer)
1543915691         {
1544015692         //gr.setColor(Color.black);
1544115693         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1544215694         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1544315695         }
15696
+        
1544415697         if (hasMarquee)
1544515698         {
1544615699             gr.setXORMode(Color.white);
....@@ -15553,6 +15806,7 @@
1555315806     public boolean mouseDown(Event evt, int x, int y)
1555415807     {
1555515808         System.out.println("mouseDown: " + evt);
15809
+        System.exit(0);
1555615810         /*
1555715811         locked = true;
1555815812         drag = false;
....@@ -15596,7 +15850,7 @@
1559615850         {
1559715851             keyPressed(0, modifiers);
1559815852         }
15599
-        clickStart(x, y, modifiers);
15853
+ //       clickStart(x, y, modifiers);
1560015854         return true;
1560115855     }
1560215856 
....@@ -15714,7 +15968,7 @@
1571415968         {
1571515969             keyReleased(0, 0);
1571615970         }
15717
-        drag(x, y, modifiers);
15971
+        drag(x, y, 0, modifiers);
1571815972         return true;
1571915973     }
1572015974 
....@@ -15846,7 +16100,7 @@
1584616100     Object3D object;
1584716101     static Object3D trackedobject;
1584816102     Camera renderCamera; // Light or Eye (or Occlusion)
15849
-    /*static*/ Camera manipCamera; // Light or Eye
16103
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1585016104 	/*static*/ Camera eyeCamera;
1585116105     /*static*/ Camera lightCamera;
1585216106     int cameracount;
....@@ -16412,16 +16666,16 @@
1641216666                             System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
1641316667                         }
1641416668                         
16415
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16669
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1641616670                     }
1641716671                 }
1641816672                 
1641916673                 if (!movingcamera && !PAINTMODE)
1642016674                     object.editWindow.ScreenFitPoint(); // fev 2014
1642116675                 
16422
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16676
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1642316677                 {
16424
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16678
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1642516679                     
1642616680                     Object3D group = new Object3D("inst" + paintcount++);
1642716681                     
....@@ -16577,7 +16831,7 @@
1657716831                 gl.glDisable(gl.GL_CULL_FACE);
1657816832             }
1657916833 
16580
-            if (!RENDERSHADOW)
16834
+            if (!Globals.RENDERSHADOW)
1658116835                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1658216836 
1658316837             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16587,7 +16841,7 @@
1658716841             //gl.glColorMask(false, false, false, false);
1658816842 
1658916843             //render_scene_from_light_view(gl, drawable, 0, 0);
16590
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16844
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1659116845             {
1659216846                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659316847 
....@@ -17003,23 +17257,15 @@
1700317257     int AAbuffersize = 0;
1700417258     
1700517259     //double[] selectedpoint = new double[3];
17006
-    static Superellipsoid selectedpoint = new Superellipsoid();
17260
+    static Superellipsoid selectedpoint;
1700717261     static Sphere previousselectedpoint = null;
17008
-    static Sphere debugpointG = new Sphere();
17009
-    static Sphere debugpointP = new Sphere();
17010
-    static Sphere debugpointC = new Sphere();
17011
-    static Sphere debugpointR = new Sphere();
17262
+    static Sphere debugpointG;
17263
+    static Sphere debugpointP;
17264
+    static Sphere debugpointC;
17265
+    static Sphere debugpointR;
1701217266     
1701317267     static Sphere debugpoints[] = new Sphere[8];
1701417268  
17015
-    static
17016
-    {
17017
-        for (int i=0; i<8; i++)
17018
-        {
17019
-            debugpoints[i] = new Sphere();
17020
-        }
17021
-    }
17022
-    
1702317269     static void InitPoints(float radius)
1702417270     {
1702517271         for (int i=0; i<8; i++)