blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577 
 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     {
....@@ -327,7 +326,7 @@
327326                 cStatic.objectstack[materialdepth++] = obj;
328327                 //System.out.println("material " + material);
329328                 //Applet3D.tracein(this, selected);
330
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
331330                 if (obj instanceof Camera)
332331                 {
333332                     display.options1[0] = material.shift;
....@@ -359,7 +358,7 @@
359358                 /**/
360359                 } else
361360                 {
362
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
363362                 }
364363             } else
365364             {
....@@ -383,8 +382,8 @@
383382             cStatic.objectstack[materialdepth++] = obj;
384383             //System.out.println("material " + material);
385384             //Applet3D.tracein("selected ", selected);
386
-            display.vector2buffer = obj.projectedVertices;
387
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
388387         }
389388     }
390389     
....@@ -401,8 +400,8 @@
401400                 materialdepth -= 1;
402401                 if (materialdepth > 0)
403402                 {
404
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405
-                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
403
+                    //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
+                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406405                 }
407406             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408407             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -422,8 +421,8 @@
422421             materialdepth -= 1;
423422             if (materialdepth > 0)
424423             {
425
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426
-                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
424
+                //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
+                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427426             }
428427         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429428         //else
....@@ -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                             }
....@@ -1603,7 +1610,7 @@
16031610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16041611     }
16051612     
1606
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16071614     {
16081615             CameraPane display = this;
16091616         //new Exception().printStackTrace();
....@@ -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)
....@@ -1638,7 +1645,7 @@
16381645             colorV[0] = display.modelParams0[0] * material.diffuse;
16391646             colorV[1] = display.modelParams0[1] * material.diffuse;
16401647             colorV[2] = display.modelParams0[2] * material.diffuse;
1641
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16421649 
16431650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16441651             //System.out.println("Opacity = " + opacity);
....@@ -1746,9 +1753,9 @@
17461753         display.modelParams7[2] = 0;
17471754         display.modelParams7[3] = 0;
17481755 
1749
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17501757         
1751
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17521759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17531760         {
17541761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -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     {
....@@ -4208,6 +4215,7 @@
42084215     
42094216     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
42104217     {
4218
+                new Exception().printStackTrace();
42114219         System.exit(0);
42124220         com.sun.opengl.util.texture.Texture texture = null;
42134221 
....@@ -7920,6 +7928,64 @@
79207928         ReleaseTexture(pigment, false);
79217929     }
79227930     
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
+    
79237989     void ReleaseTexture(String tex, boolean bump)
79247990     {
79257991         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8023,7 +8089,7 @@
80238089         }
80248090     }
80258091 
8026
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80278093     {
80288094         if (// DrawMode() != 0 || /*tex == null ||*/
80298095                 ambientOcclusion ) // || !textureon)
....@@ -8068,7 +8134,94 @@
80688134         return; // true;
80698135     }
80708136     
8071
-    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
80728225     {
80738226         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80748227         
....@@ -8076,12 +8229,18 @@
80768229         {
80778230             String texname = tex;
80788231             
8079
-            String[] split = tex.split("Textures");
8080
-            if (split.length > 1)
8081
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
8082
-            else
8083
-                if (!texname.startsWith("/"))
8084
-                    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
+            }
80858244             
80868245             if (CACHETEXTURE)
80878246                 texture = textures.get(texname); // TEXTURE CACHE
....@@ -8150,7 +8309,7 @@
81508309                                     }
81518310                                 
81528311                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153
-                                    if (!new File(cachename).exists())
8312
+                                    if (!FileExists(cachename))
81548313                                         cachename = texname;
81558314                                     else
81568315                                         processbump = false; // don't process bump map again
....@@ -8172,7 +8331,7 @@
81728331                                     }
81738332                                 
81748333                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175
-                                    if (!new File(cachename).exists())
8334
+                                    if (!FileExists(cachename))
81768335                                         cachename = texname;
81778336                                     else
81788337                                         processbump = false; // don't process bump map again
....@@ -8181,7 +8340,9 @@
81818340                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81828341                                 
81838342                                 
8184
-                                if (texturedata != null)
8343
+                                if (texturedata == null)
8344
+                                    throw new Exception();
8345
+                                    
81858346                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81868347         //texture = GetTexture(tex, bump);
81878348                             }
....@@ -8303,7 +8464,7 @@
83038464         return texture;
83048465     }
83058466     
8306
-    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
83078468     {
83088469         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83098470                 
....@@ -8321,14 +8482,14 @@
83218482         return texture!=null?texture.texture:null;
83228483     }
83238484     
8324
-    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
83258486     {
83268487         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83278488                 
83288489         return texture!=null?texture.texturedata:null;
83298490     }
83308491     
8331
-    boolean BindTexture(String tex, boolean bump, int resolution)
8492
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83328493     {
83338494         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83348495         {
....@@ -9305,8 +9466,8 @@
93059466         assert (parentcam != renderCamera);
93069467         
93079468         if (renderCamera != lightCamera)
9308
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9309
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93109471         
93119472 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93129473             
....@@ -9321,8 +9482,8 @@
93219482             LA.matCopy(renderCamera.fromScreen, matrix);
93229483             
93239484         if (renderCamera != lightCamera)
9324
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9325
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93269487 
93279488 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93289489             
....@@ -9394,7 +9555,7 @@
93949555             //gl.glFlush();
93959556             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93969557 
9397
-            if (ANIMATION && ABORTED)
9558
+            if (Globals.ANIMATION && ABORTED)
93989559             {
93999560     System.err.println("    ABORTED FRAME");
94009561                 break;
....@@ -9424,7 +9585,7 @@
94249585         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94259586 
94269587         // save image
9427
-        if (ANIMATION && !ABORTED)
9588
+        if (Globals.ANIMATION && !ABORTED)
94289589         {
94299590             VPwidth = viewport[2];
94309591             VPheight = viewport[3];
....@@ -9535,11 +9696,11 @@
95359696             
95369697 //            imagecount++;
95379698             
9538
-            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;
95399700             
95409701             if (!BOXMODE)
95419702             {
9542
-                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) + ")");
95439704             }
95449705     
95459706             if (!BOXMODE)
....@@ -9577,7 +9738,7 @@
95779738             ABORTED = false;
95789739         }
95799740         else
9580
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+            Grafreed.wav.cursor += 735 * ACSIZE;
95819742         
95829743         if (false)
95839744         {
....@@ -10240,11 +10401,11 @@
1024010401 
1024110402     public void display(GLAutoDrawable drawable)
1024210403     {
10243
-        if (GrafreeD.savesound && GrafreeD.hassound)
10404
+        if (Grafreed.savesound && Grafreed.hassound)
1024410405         {
10245
-            GrafreeD.wav.save();
10246
-            GrafreeD.savesound = false;
10247
-            GrafreeD.hassound = false;
10406
+            Grafreed.wav.save();
10407
+            Grafreed.savesound = false;
10408
+            Grafreed.hassound = false;
1024810409         }
1024910410 //        if (DEBUG_SELECTION)
1025010411 //        {
....@@ -10320,6 +10481,7 @@
1032010481                     ANTIALIAS = 0;
1032110482                     //System.out.println("RESTART");
1032210483                     AAtimer.restart();
10484
+                    Globals.TIMERRUNNING = true;
1032310485                 }
1032410486             }
1032510487         }
....@@ -10374,7 +10536,7 @@
1037410536             Object3D theobject = object;
1037510537             Object3D theparent = object.parent;
1037610538             object.parent = null;
10377
-            object = (Object3D)GrafreeD.clone(object);
10539
+            object = (Object3D)Grafreed.clone(object);
1037810540             object.Stripify();
1037910541             if (theobject.selection == null || theobject.selection.Size() == 0)
1038010542                 theobject.PreprocessOcclusion(this);
....@@ -10387,13 +10549,14 @@
1038710549             ambientOcclusion = false;
1038810550         }
1038910551 
10390
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10552
+        if (//Globals.lighttouched &&
10553
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039110554         {
1039210555             //if (RENDERSHADOW) // ?
1039310556             if (!IsFrozen())
1039410557             {
1039510558                 // dec 2012
10396
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10559
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1039710560                 {
1039810561             Globals.framecount++;
1039910562                     shadowbuffer.display();
....@@ -10520,8 +10683,8 @@
1052010683             
1052110684 //        if (parentcam != renderCamera) // not a light
1052210685         if (cam != lightCamera)
10523
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10524
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10686
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10687
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052510688             
1052610689             for (int j = 0; j < 4; j++)
1052710690             {
....@@ -10535,8 +10698,8 @@
1053510698             
1053610699 //        if (parentcam != renderCamera) // not a light
1053710700         if (cam != lightCamera)
10538
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10539
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10701
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10702
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054010703         
1054110704             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054210705             
....@@ -10795,7 +10958,16 @@
1079510958             // Bump noise
1079610959             gl.glActiveTexture(GL.GL_TEXTURE6);
1079710960             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798
-            BindTexture(NOISE_TEXTURE, false, 2);
10961
+            
10962
+    try
10963
+    {
10964
+        BindTexture(NOISE_TEXTURE, false, 2);
10965
+    }
10966
+    catch (Exception e)
10967
+    {
10968
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10969
+    }
10970
+           
1079910971 
1080010972             gl.glActiveTexture(GL.GL_TEXTURE0);
1080110973             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10920,8 +11092,8 @@
1092011092                 System.err.println("parentcam != renderCamera");
1092111093 
1092211094 //            if (cam != lightCamera)
10923
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10924
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11095
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11096
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1092511097         }
1092611098         
1092711099         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10942,8 +11114,8 @@
1094211114             if (true) // TODO
1094311115             {
1094411116                 if (cam != lightCamera)
10945
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10946
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11117
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11118
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1094711119             }
1094811120             
1094911121             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11259,8 +11431,14 @@
1125911431     {
1126011432             renderpass++;
1126111433 //        System.out.println("Draw object... ");
11434
+        STEP = 1;
1126211435         if (FAST) // in case there is no script
11263
-            STEP = 16;
11436
+            STEP = 8;
11437
+            
11438
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11439
+        {
11440
+            STEP *= 4;
11441
+        }
1126411442             
1126511443         //object.FullInvariants();
1126611444         
....@@ -11274,13 +11452,31 @@
1127411452             e.printStackTrace();
1127511453         }
1127611454         
11277
-        if (GrafreeD.RENDERME > 0)
11278
-            GrafreeD.RENDERME--; // mechante magouille
11455
+        if (Grafreed.RENDERME > 0)
11456
+            Grafreed.RENDERME--; // mechante magouille
1127911457         
1128011458         Globals.ONESTEP = false;
1128111459     }
1128211460 
1128311461     static boolean zoomonce = false;
11462
+    
11463
+    static void CreateSelectedPoint()
11464
+    {
11465
+        if (selectedpoint == null)
11466
+        {
11467
+            debugpointG = new Sphere();
11468
+            debugpointP = new Sphere();
11469
+            debugpointC = new Sphere();
11470
+            debugpointR = new Sphere();
11471
+            
11472
+            selectedpoint = new Superellipsoid();
11473
+            
11474
+            for (int i=0; i<8; i++)
11475
+            {
11476
+                debugpoints[i] = new Sphere();
11477
+            }
11478
+        }
11479
+    }
1128411480     
1128511481     void DrawObject(GL gl, boolean draw)
1128611482     {
....@@ -11345,7 +11541,14 @@
1134511541 
1134611542                 usedtextures.clear();
1134711543             
11348
-                BindTextures(DEFAULT_TEXTURES, 2);
11544
+    try
11545
+    {
11546
+        BindTextures(DEFAULT_TEXTURES, 2);
11547
+    }
11548
+    catch (Exception e)
11549
+    {
11550
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11551
+    }
1134911552             }
1135011553             //System.out.println("--> " + stackdepth);
1135111554 //            GrafreeD.traceon();
....@@ -11355,8 +11558,9 @@
1135511558             
1135611559             if (DrawMode() == DEFAULT)
1135711560             {
11358
-                if (DEBUG)
11561
+                if (Globals.DEBUG)
1135911562                 {
11563
+                    CreateSelectedPoint();
1136011564                     float radius = 0.05f;
1136111565                     if (selectedpoint.radius != radius)
1136211566                     {
....@@ -11436,7 +11640,14 @@
1143611640             if (checker != null && DrawMode() == DEFAULT)
1143711641             {
1143811642                 //BindTexture(IMMORTAL_TEXTURE);
11439
-                BindTextures(checker.GetTextures(), checker.texres);
11643
+    try
11644
+    {
11645
+        BindTextures(checker.GetTextures(), checker.texres);
11646
+    }
11647
+    catch (Exception e)
11648
+    {
11649
+        System.err.println("FAILED: " + checker.GetTextures());
11650
+    }
1144011651                 // NEAREST
1144111652                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1144211653                 DrawChecker(gl);
....@@ -11518,7 +11729,7 @@
1151811729             return;
1151911730         }
1152011731 
11521
-        String string = obj.GetToolTip();
11732
+        String string = obj.toString(); //.GetToolTip();
1152211733         
1152311734         GL gl = GetGL();
1152411735         
....@@ -11835,8 +12046,8 @@
1183512046             //obj.TransformToWorld(light, light);
1183612047             for (int i = tp.size(); --i >= 0;)
1183712048             {
11838
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839
-                    LA.xformPos(light, tp.get(i).toParent, light);
12049
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12050
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1184012051             }
1184112052 
1184212053 
....@@ -11853,8 +12064,8 @@
1185312064                 parentcam = cameras[0];
1185412065             }
1185512066             
11856
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11857
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12067
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12068
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1185812069 
1185912070             LA.xformPos(light, renderCamera.toScreen, light);
1186012071             
....@@ -12468,8 +12679,8 @@
1246812679 
1246912680            // display shadow only (bump == 0)
1247012681          "SUB temp.x, half.x, shadow.x;" +
12471
-         "MOV temp.y, -params6.x;" +
12472
-         "SLT temp.z, temp.y, zero.x;" +
12682
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12683
+         "SLT temp.z, temp.y, -one2048th.x;" +
1247312684          "SUB temp.y, one.x, temp.z;" +
1247412685          "MUL temp.x, temp.x, temp.y;" +
1247512686          "KIL temp.x;" +
....@@ -12598,8 +12809,10 @@
1259812809             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1259912810                 
1260012811                 "SUB temp.x, one.x, ndotl.x;" +
12601
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12812
+                // Tuning for default skin
12813
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12814
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12815
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1260312816                 "MUL temp.x, temp.x, temp.y;" +
1260412817                                 
1260512818                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12798,7 +13011,7 @@
1279813011             //once = true;
1279913012         }
1280013013 
12801
-        System.out.print("Program #" + mode + "; length = " + program.length());
13014
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1280213015         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1280313016         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1280413017 
....@@ -12931,12 +13144,16 @@
1293113144 
1293213145                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1293313146                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13147
+                
13148
+                // Compare fragment depth in light space with shadowmap.
1293413149                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1293513150                 "SGE temp.y, temp.x, zero.x;" +
12936
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13151
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13152
+                
13153
+                // Reverse comparison
1293713154                 "SUB temp.x, one.x, temp.x;" +
1293813155                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12939
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13156
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1294013157                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1294113158 
1294213159                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12950,6 +13167,10 @@
1295013167                 // No shadow for backface
1295113168                 "DP3 temp.x, normal, lightd;" +
1295213169                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13170
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13171
+
13172
+                // No shadow when out of frustrum
13173
+                "SGE temp.x, " + depth + ".z, one.z;" +
1295313174                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1295413175                 "";
1295513176     }
....@@ -13096,7 +13317,8 @@
1309613317     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1309713318     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1309813319     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099
-    Object3D.cVector2[] vector2buffer;
13320
+    
13321
+    //Object3D.cVector2[] vector2buffer;
1310013322 
1310113323     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1310213324     // OUT : diff, spec
....@@ -13508,7 +13730,7 @@
1350813730     public void mousePressed(MouseEvent e)
1350913731     {
1351013732         //System.out.println("mousePressed: " + e);
13511
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13733
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1351213734     }
1351313735 
1351413736     static long prevtime = 0;
....@@ -13584,8 +13806,8 @@
1358413806       //      mode |= META;
1358513807         //}
1358613808         
13587
-        SetMouseMode(WHEEL | e.getModifiersEx());
13588
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13809
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13810
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1358913811         anchorX = ax;
1359013812         anchorY = ay;
1359113813         prevX = px;
....@@ -13619,6 +13841,7 @@
1361913841         else
1362013842         if (evt.getSource() == AAtimer)
1362113843         {
13844
+                    Globals.TIMERRUNNING = false;
1362213845             if (mouseDown)
1362313846             {
1362413847             //new Exception().printStackTrace();
....@@ -13644,6 +13867,10 @@
1364413867 //            LIVE = waslive;
1364513868 //            wasliveok = true;
1364613869 //            waslive = false;
13870
+            
13871
+            // May 2019 Forget it:
13872
+            if (true)
13873
+                    return;
1364713874             
1364813875             // source == timer
1364913876             if (mouseDown)
....@@ -13683,12 +13910,13 @@
1368313910     
1368413911     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1368513912 
13686
-    void clickStart(int x, int y, int modifiers)
13913
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1368713914     {
1368813915         if (!wasliveok)
1368913916             return;
1369013917         
1369113918         AAtimer.restart(); // 
13919
+        Globals.TIMERRUNNING = true;
1369213920 
1369313921 //        waslive = LIVE;
1369413922 //        LIVE = false;
....@@ -13700,7 +13928,7 @@
1370013928 //        touched = true; // main DL
1370113929         if (isRenderer)
1370213930         {
13703
-            SetMouseMode(modifiers);
13931
+            SetMouseMode(modifiers, modifiersex);
1370413932         }
1370513933 
1370613934         selectX = anchorX = x;
....@@ -13713,7 +13941,7 @@
1371313941         clicked = true;
1371413942         hold = false;
1371513943 
13716
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13944
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1371713945         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1371813946         {
1371913947       //  System.out.println("RESTART II " + modifiers);
....@@ -13744,7 +13972,7 @@
1374413972             info.camera = renderCamera;
1374513973             info.x = x;
1374613974             info.y = y;
13747
-            info.modifiers = modifiers;
13975
+            info.modifiers = modifiersex;
1374813976             editObj = object.doEditClick(info, 0);
1374913977             if (!editObj)
1375013978             {
....@@ -13761,9 +13989,12 @@
1376113989     
1376213990     public void mouseDragged(MouseEvent e)
1376313991     {
13992
+        Globals.MOUSEDRAGGED = true;
13993
+        
1376413994         //System.out.println("mouseDragged: " + e);
1376513995         if (isRenderer)
1376613996             movingcamera = true;
13997
+        
1376713998         //if (drawing)
1376813999         //return;
1376914000         if ((e.getModifiersEx() & CTRL) != 0
....@@ -13773,7 +14004,7 @@
1377314004             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1377414005         }
1377514006         else
13776
-            drag(e.getX(), e.getY(), e.getModifiersEx());
14007
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1377714008         
1377814009     //try { Thread.sleep(1); } catch (Exception ex) {}
1377914010     }
....@@ -13946,6 +14177,7 @@
1394614177         
1394714178         public void run()
1394814179         {
14180
+                new Exception().printStackTrace();
1394914181             System.exit(0);
1395014182             for (;;)
1395114183             {
....@@ -14009,7 +14241,7 @@
1400914241                     {
1401014242                         Globals.lighttouched = true;
1401114243                     }
14012
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14244
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1401314245                 }
1401414246             //else
1401514247             }
....@@ -14109,7 +14341,7 @@
1410914341     int X, Y;
1411014342     boolean SX, SY;
1411114343 
14112
-    void drag(int x, int y, int modifiers)
14344
+    void drag(int x, int y, int modifiers, int modifiersex)
1411314345     {
1411414346         if (IsFrozen())
1411514347         {
....@@ -14118,17 +14350,17 @@
1411814350 
1411914351         drag = true; // NEW
1412014352         
14121
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14353
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1412214354 
1412314355         X = x;
1412414356         Y = y;
1412514357         // floating state for animation
14126
-        MODIFIERS = modifiers;
14127
-        modifiers &= ~1024;
14358
+        MODIFIERS = modifiersex;
14359
+        modifiersex &= ~1024;
1412814360         if (false) // modifiers != 0)
1412914361         {
1413014362             //new Exception().printStackTrace();
14131
-            System.out.println("mouseDragged: " + modifiers);
14363
+            System.out.println("mouseDragged: " + modifiersex);
1413214364             System.out.println("SHIFT = " + SHIFT);
1413314365             System.out.println("CONTROL = " + COMMAND);
1413414366             System.out.println("META = " + META);
....@@ -14148,7 +14380,8 @@
1414814380                 info.camera = renderCamera;
1414914381                 info.x = x;
1415014382                 info.y = y;
14151
-                object.editWindow.copy.doEditDrag(info);
14383
+                object.GetWindow().copy
14384
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1415214385             } else
1415314386             {
1415414387                 if (x < startX)
....@@ -14312,7 +14545,9 @@
1431214545         ci.camera = renderCamera;
1431314546         if (!isRenderer)
1431414547         {
14315
-            if (object.editWindow.copy.doEditClick(ci, 0))
14548
+            //ObjEditor editWindow = object.editWindow;
14549
+            //Object3D copy = editWindow.copy;
14550
+            if (object.doEditClick(ci, 0))
1431614551             {
1431714552                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1431814553             } else
....@@ -14324,7 +14559,10 @@
1432414559 
1432514560     public void mouseReleased(MouseEvent e)
1432614561     {
14562
+        Globals.MOUSEDRAGGED = false;
14563
+        
1432714564         movingcamera = false;
14565
+        X = Y = 0;
1432814566         //System.out.println("mouseReleased: " + e);
1432914567         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1433014568     }
....@@ -14347,9 +14585,9 @@
1434714585         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1434814586         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1434914587         
14350
-        if (control || command || IsFrozen())
14588
+// No delay        if (control || command || IsFrozen())
1435114589             timeout = true;
14352
-        else
14590
+// ?? May 2019        else
1435314591        // timer.setDelay((modifiers & 128) != 0?0:350);
1435414592         mouseDown = false;
1435514593     if (!control && !command) // june 2013
....@@ -14459,7 +14697,7 @@
1445914697         System.out.println("keyReleased: " + e);
1446014698     }
1446114699 
14462
-    void SetMouseMode(int modifiers)
14700
+    void SetMouseMode(int modifiers, int modifiersex)
1446314701     {
1446414702         //System.out.println("SetMouseMode = " + modifiers);
1446514703         //modifiers &= ~1024;
....@@ -14471,25 +14709,25 @@
1447114709         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1447214710         //	return;
1447314711         //System.out.println("SetMode = " + modifiers);
14474
-        if ((modifiers & WHEEL) == WHEEL)
14712
+        if ((modifiersex & WHEEL) == WHEEL)
1447514713         {
1447614714             mouseMode |= ZOOM;
1447714715         }
1447814716         
1447914717         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480
-        if (capsLocked || (modifiers & META) == META)
14718
+        if (capsLocked) // || (modifiers & META) == META)
1448114719         {
1448214720             mouseMode |= VR; // BACKFORTH;
1448314721         }
14484
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14722
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1448514723         {
1448614724             mouseMode |= SELECT;
1448714725         }
14488
-        if ((modifiers & COMMAND) == COMMAND)
14726
+        if ((modifiersex & COMMAND) == COMMAND)
1448914727         {
1449014728             mouseMode |= SELECT;
1449114729         }
14492
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14730
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1449314731         {
1449414732             mouseMode &= ~VR;
1449514733             mouseMode |= TRANSLATE;
....@@ -14518,7 +14756,7 @@
1451814756 
1451914757         if (isRenderer) //
1452014758         {
14521
-            SetMouseMode(modifiers);
14759
+            SetMouseMode(0, modifiers);
1452214760         }
1452314761 
1452414762         Globals.theRenderer.keyPressed(key);
....@@ -14690,8 +14928,14 @@
1469014928                 RevertCamera();
1469114929                 repaint();
1469214930                 break;
14693
-            case 'L':
1469414931             case 'l':
14932
+                lightMode ^= true;
14933
+                Globals.lighttouched = true;
14934
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14935
+                targetLookAt.set(manipCamera.lookAt);
14936
+                repaint();
14937
+                break;
14938
+            case 'L':
1469514939                 if (lightMode)
1469614940                 {
1469714941                     lightMode = false;
....@@ -14838,23 +15082,21 @@
1483815082                 kompactbit = 6;
1483915083                 break;
1484015084             case ' ':
14841
-                lightMode ^= true;
14842
-                Globals.lighttouched = true;
14843
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14844
-                targetLookAt.set(manipCamera.lookAt);
15085
+                ObjEditor.theFrame.ToggleFullScreen();
1484515086                 repaint();
1484615087                 break;
1484715088             //case '`' :
1484815089             case ESC:
1484915090                 RENDERPROGRAM += 1;
1485015091                 RENDERPROGRAM %= 3;
15092
+
1485115093                 repaint();
1485215094                 break;
1485315095             case 'Z':
1485415096                 //RESIZETEXTURE ^= true;
1485515097                 //break;
1485615098             case 'z':
14857
-                RENDERSHADOW ^= true;
15099
+                Globals.RENDERSHADOW ^= true;
1485815100                 Globals.lighttouched = true;
1485915101                 repaint();
1486015102                 break;
....@@ -14978,7 +15220,7 @@
1497815220         //mode = ROTATE;
1497915221         if ((MODIFIERS & COMMAND) == 0) // VR??
1498015222         {
14981
-            SetMouseMode(modifiers);
15223
+            SetMouseMode(0, modifiers);
1498215224         }
1498315225     }
1498415226 
....@@ -15114,7 +15356,7 @@
1511415356     {
1511515357         //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1511615358         //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117
-        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15359
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1511815360         {
1511915361             mouseMoved(e);
1512015362         } else
....@@ -15139,11 +15381,12 @@
1513915381         }
1514015382          */
1514115383 
15142
-        object.editWindow.EditSelection();
15384
+        object.editWindow.EditSelection(false);
1514315385     }
1514415386 
1514515387     void SelectParent()
1514615388     {
15389
+                new Exception().printStackTrace();
1514715390         System.exit(0);
1514815391         Composite group = (Composite) object;
1514915392         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -15167,6 +15410,7 @@
1516715410 
1516815411     void SelectChildren()
1516915412     {
15413
+                new Exception().printStackTrace();
1517015414         System.exit(0);
1517115415         /*
1517215416         Composite group = (Composite) object;
....@@ -15331,7 +15575,9 @@
1533115575         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1533215576         //Image img = CreateImage(width, height);
1533315577         //System.out.println("width = " + width + "; height = " + height + "\n");
15578
+        
1533415579         Graphics gr = g; // img.getGraphics();
15580
+        
1533515581         if (!hasMarquee)
1533615582         {
1533715583             if (Xmin < Xmax) // !locked)
....@@ -15429,14 +15675,33 @@
1542915675             if (!isRenderer)
1543015676             {
1543115677                 object.drawEditHandles(info, 0);
15678
+                
15679
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15680
+                {
15681
+                    switch (object.selection.get(0).hitSomething)
15682
+                    {
15683
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15684
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
+                            break;
15686
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15687
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
+                        break;
15689
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15690
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15691
+                        break;
15692
+                    }
15693
+                    
15694
+                }
1543215695             }
1543315696         }
15697
+        
1543415698         if (isRenderer)
1543515699         {
1543615700         //gr.setColor(Color.black);
1543715701         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1543815702         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1543915703         }
15704
+        
1544015705         if (hasMarquee)
1544115706         {
1544215707             gr.setXORMode(Color.white);
....@@ -15549,6 +15814,7 @@
1554915814     public boolean mouseDown(Event evt, int x, int y)
1555015815     {
1555115816         System.out.println("mouseDown: " + evt);
15817
+        System.exit(0);
1555215818         /*
1555315819         locked = true;
1555415820         drag = false;
....@@ -15592,7 +15858,7 @@
1559215858         {
1559315859             keyPressed(0, modifiers);
1559415860         }
15595
-        clickStart(x, y, modifiers);
15861
+ //       clickStart(x, y, modifiers);
1559615862         return true;
1559715863     }
1559815864 
....@@ -15710,7 +15976,7 @@
1571015976         {
1571115977             keyReleased(0, 0);
1571215978         }
15713
-        drag(x, y, modifiers);
15979
+        drag(x, y, 0, modifiers);
1571415980         return true;
1571515981     }
1571615982 
....@@ -15842,7 +16108,7 @@
1584216108     Object3D object;
1584316109     static Object3D trackedobject;
1584416110     Camera renderCamera; // Light or Eye (or Occlusion)
15845
-    /*static*/ Camera manipCamera; // Light or Eye
16111
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1584616112 	/*static*/ Camera eyeCamera;
1584716113     /*static*/ Camera lightCamera;
1584816114     int cameracount;
....@@ -16127,16 +16393,16 @@
1612716393                 cStatic.objectstack[materialdepth++] = checker;
1612816394                 //System.out.println("material " + material);
1612916395                 //Applet3D.tracein(this, selected);
16130
-                vector2buffer = checker.projectedVertices;
16396
+                //vector2buffer = checker.projectedVertices;
1613116397 
1613216398         //checker.GetMaterial().Draw(this, false); // true);
16133
-        DrawMaterial(checker.GetMaterial(), false); // true);
16399
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1613416400 
1613516401                 materialdepth -= 1;
1613616402                 if (materialdepth > 0)
1613716403                 {
16138
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16404
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16405
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1614016406                 }
1614116407         //checker.GetMaterial().opacity = 1f;
1614216408         ////checker.GetMaterial().ambient = 1f;
....@@ -16280,6 +16546,7 @@
1628016546         {
1628116547             if (!selection)
1628216548             {
16549
+                new Exception().printStackTrace();
1628316550                 System.exit(0);
1628416551                 return;
1628516552             }
....@@ -16359,6 +16626,8 @@
1635916626 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1636016627 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1636116628                 
16629
+                CreateSelectedPoint();
16630
+                
1636216631                 // Will fit the mesh !!!
1636316632                 selectedpoint.toParent[0][0] = 0.0001;
1636416633                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16407,16 +16676,16 @@
1640716676                             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]));
1640816677                         }
1640916678                         
16410
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16679
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1641116680                     }
1641216681                 }
1641316682                 
1641416683                 if (!movingcamera && !PAINTMODE)
1641516684                     object.editWindow.ScreenFitPoint(); // fev 2014
1641616685                 
16417
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16686
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1641816687                 {
16419
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16688
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1642016689                     
1642116690                     Object3D group = new Object3D("inst" + paintcount++);
1642216691                     
....@@ -16572,7 +16841,7 @@
1657216841                 gl.glDisable(gl.GL_CULL_FACE);
1657316842             }
1657416843 
16575
-            if (!RENDERSHADOW)
16844
+            if (!Globals.RENDERSHADOW)
1657616845                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1657716846 
1657816847             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16582,7 +16851,7 @@
1658216851             //gl.glColorMask(false, false, false, false);
1658316852 
1658416853             //render_scene_from_light_view(gl, drawable, 0, 0);
16585
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16854
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1658616855             {
1658716856                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1658816857 
....@@ -16998,23 +17267,15 @@
1699817267     int AAbuffersize = 0;
1699917268     
1700017269     //double[] selectedpoint = new double[3];
17001
-    static Superellipsoid selectedpoint = new Superellipsoid();
17270
+    static Superellipsoid selectedpoint;
1700217271     static Sphere previousselectedpoint = null;
17003
-    static Sphere debugpointG = new Sphere();
17004
-    static Sphere debugpointP = new Sphere();
17005
-    static Sphere debugpointC = new Sphere();
17006
-    static Sphere debugpointR = new Sphere();
17272
+    static Sphere debugpointG;
17273
+    static Sphere debugpointP;
17274
+    static Sphere debugpointC;
17275
+    static Sphere debugpointR;
1700717276     
1700817277     static Sphere debugpoints[] = new Sphere[8];
1700917278  
17010
-    static
17011
-    {
17012
-        for (int i=0; i<8; i++)
17013
-        {
17014
-            debugpoints[i] = new Sphere();
17015
-        }
17016
-    }
17017
-    
1701817279     static void InitPoints(float radius)
1701917280     {
1702017281         for (int i=0; i<8; i++)