blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 914255f70cf047897212839cbf3a6722703f4457 
 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;
....@@ -92,6 +89,8 @@
9289 
9390 static    int tickcount = 0; // slow pose issue
9491 
92
+static    boolean BUTTONLESSWHEEL = false;
93
+static    boolean ZOOMBOXMODE = false;
9594 static    boolean BOXMODE = false;
9695 static    boolean IMAGEFLIP = false;
9796 static    boolean SMOOTHFOCUS = false;
....@@ -106,7 +105,7 @@
106105 static    boolean OEIL = true;
107106 static    boolean OEILONCE = false; // do oeilon then oeiloff
108107 static    boolean LOOKAT = true;
109
-static    boolean RANDOM = true; // false;
108
+static    boolean SWITCH = true; // false;
110109 static    boolean HANDLES = false; // selection doesn't work!!
111110 static  boolean PAINTMODE = false;
112111 
....@@ -149,6 +148,8 @@
149148         defaultcaps.setAccumBlueBits(16);
150149         defaultcaps.setAccumAlphaBits(16);
151150     }
151
+    
152
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152153     
153154     void SetAsGLRenderer(boolean b)
154155     {
....@@ -223,6 +224,11 @@
223224     public boolean IsBoxMode()
224225     {
225226             return BOXMODE;
227
+    }
228
+    
229
+    public boolean IsZoomBoxMode()
230
+    {
231
+            return ZOOMBOXMODE;
226232     }
227233     
228234     public void ClearDepth()
....@@ -320,7 +326,7 @@
320326                 cStatic.objectstack[materialdepth++] = obj;
321327                 //System.out.println("material " + material);
322328                 //Applet3D.tracein(this, selected);
323
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
324330                 if (obj instanceof Camera)
325331                 {
326332                     display.options1[0] = material.shift;
....@@ -352,7 +358,7 @@
352358                 /**/
353359                 } else
354360                 {
355
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
356362                 }
357363             } else
358364             {
....@@ -376,8 +382,8 @@
376382             cStatic.objectstack[materialdepth++] = obj;
377383             //System.out.println("material " + material);
378384             //Applet3D.tracein("selected ", selected);
379
-            display.vector2buffer = obj.projectedVertices;
380
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
381387         }
382388     }
383389     
....@@ -394,8 +400,8 @@
394400                 materialdepth -= 1;
395401                 if (materialdepth > 0)
396402                 {
397
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398
-                    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);
399405                 }
400406             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401407             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -415,8 +421,8 @@
415421             materialdepth -= 1;
416422             if (materialdepth > 0)
417423             {
418
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419
-                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);
420426             }
421427         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422428         //else
....@@ -457,10 +463,12 @@
457463         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458464         {
459465             //gl.glBegin(gl.GL_TRIANGLES);
460
-            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
+                    ;
461469             if (!hasnorm)
462470             {
463
-           //     System.out.println("FUCK!!");
471
+           //     System.out.println("Mesh normal");
464472                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
465473                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
466474                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1185,10 +1193,12 @@
11851193                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11861194                                 }
11871195                             }
1196
+                            
11881197                             if (flipV)
11891198                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11901199                             else
11911200                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+                            
11921202                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11931203                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11941204 
....@@ -1208,10 +1218,12 @@
12081218                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12091219                                 }
12101220                             }
1221
+                            
12111222                             if (flipV)
12121223                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12131224                             else
12141225                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+                            
12151227                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12161228                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12171229 
....@@ -1239,8 +1251,10 @@
12391251                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12401252                                 else
12411253                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+                                
12421255                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12431256                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+                                
12441258                                 count2 += 2;
12451259                                 count3 += 3;
12461260                             }
....@@ -1596,7 +1610,7 @@
15961610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
15971611     }
15981612     
1599
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16001614     {
16011615             CameraPane display = this;
16021616         //new Exception().printStackTrace();
....@@ -1612,18 +1626,18 @@
16121626         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
16131627         if (!material.multiply)
16141628         {
1615
-            display.color = color;
1629
+            display.color = material.color;
16161630             display.saturation = material.modulation;
16171631         }
16181632         else
16191633         {
1620
-            display.color *= color*2;
1634
+            display.color *= material.color*2;
16211635             display.saturation *= material.modulation*2;
16221636         }
16231637             
16241638         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16251639 
1626
-        float[] colorV = GrafreeD.colorV;
1640
+        float[] colorV = Grafreed.colorV;
16271641 
16281642         /**/
16291643         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1631,7 +1645,7 @@
16311645             colorV[0] = display.modelParams0[0] * material.diffuse;
16321646             colorV[1] = display.modelParams0[1] * material.diffuse;
16331647             colorV[2] = display.modelParams0[2] * material.diffuse;
1634
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16351649 
16361650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16371651             //System.out.println("Opacity = " + opacity);
....@@ -1739,9 +1753,9 @@
17391753         display.modelParams7[2] = 0;
17401754         display.modelParams7[3] = 0;
17411755 
1742
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17431757         
1744
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17451759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17461760         {
17471761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1883,7 +1897,7 @@
18831897     void PushMatrix(double[][] matrix)
18841898     {
18851899     //    GrafreeD.tracein(matrix);
1886
-        PushMatrix(matrix,1);
1900
+        PushMatrix(matrix, 1);
18871901     }
18881902     
18891903     void PushMatrix()
....@@ -2135,7 +2149,7 @@
21352149         System.err.println("LIVE = " + Globals.isLIVE());
21362150         
21372151         if (!Globals.isLIVE()) // save sound
2138
-            GrafreeD.savesound = true; // wav.save();
2152
+            Grafreed.savesound = true; // wav.save();
21392153      //   else
21402154             repaint(); // start loop // may 2013
21412155     }
....@@ -2168,6 +2182,11 @@
21682182     public void ToggleBoxMode()
21692183     {
21702184         BOXMODE ^= true;
2185
+    }
2186
+
2187
+    public void ToggleZoomBoxMode()
2188
+    {
2189
+        ZOOMBOXMODE ^= true;
21712190     }
21722191 
21732192     public void ToggleSmoothFocus()
....@@ -2247,7 +2266,7 @@
22472266     
22482267     void ToggleDebug()
22492268     {
2250
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22512270     }
22522271 
22532272     void ToggleLookAt()
....@@ -2255,9 +2274,9 @@
22552274         LOOKAT ^= true;
22562275     }
22572276 
2258
-    void ToggleRandom()
2277
+    void ToggleSwitch()
22592278     {
2260
-        RANDOM ^= true;
2279
+        SWITCH ^= true;
22612280     }
22622281 
22632282     void ToggleHandles()
....@@ -2364,7 +2383,7 @@
23642383     {
23652384         return currentGL;
23662385     }
2367
-    
2386
+
23682387     /**/
23692388     class CacheTexture
23702389     {
....@@ -4196,6 +4215,7 @@
41964215     
41974216     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
41984217     {
4218
+                new Exception().printStackTrace();
41994219         System.exit(0);
42004220         com.sun.opengl.util.texture.Texture texture = null;
42014221 
....@@ -7908,6 +7928,64 @@
79087928         ReleaseTexture(pigment, false);
79097929     }
79107930     
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
+    
79117989     void ReleaseTexture(String tex, boolean bump)
79127990     {
79137991         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8011,7 +8089,7 @@
80118089         }
80128090     }
80138091 
8014
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80158093     {
80168094         if (// DrawMode() != 0 || /*tex == null ||*/
80178095                 ambientOcclusion ) // || !textureon)
....@@ -8056,7 +8134,94 @@
80568134         return; // true;
80578135     }
80588136     
8059
-    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
80608225     {
80618226         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80628227         
....@@ -8064,12 +8229,18 @@
80648229         {
80658230             String texname = tex;
80668231             
8067
-            String[] split = tex.split("Textures");
8068
-            if (split.length > 1)
8069
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
8070
-            else
8071
-                if (!texname.startsWith("/"))
8072
-                    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
+            }
80738244             
80748245             if (CACHETEXTURE)
80758246                 texture = textures.get(texname); // TEXTURE CACHE
....@@ -8138,7 +8309,7 @@
81388309                                     }
81398310                                 
81408311                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141
-                                    if (!new File(cachename).exists())
8312
+                                    if (!FileExists(cachename))
81428313                                         cachename = texname;
81438314                                     else
81448315                                         processbump = false; // don't process bump map again
....@@ -8160,7 +8331,7 @@
81608331                                     }
81618332                                 
81628333                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163
-                                    if (!new File(cachename).exists())
8334
+                                    if (!FileExists(cachename))
81648335                                         cachename = texname;
81658336                                     else
81668337                                         processbump = false; // don't process bump map again
....@@ -8169,7 +8340,9 @@
81698340                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81708341                                 
81718342                                 
8172
-                                if (texturedata != null)
8343
+                                if (texturedata == null)
8344
+                                    throw new Exception();
8345
+                                    
81738346                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81748347         //texture = GetTexture(tex, bump);
81758348                             }
....@@ -8291,7 +8464,7 @@
82918464         return texture;
82928465     }
82938466     
8294
-    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
82958468     {
82968469         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
82978470                 
....@@ -8309,14 +8482,14 @@
83098482         return texture!=null?texture.texture:null;
83108483     }
83118484     
8312
-    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
83138486     {
83148487         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83158488                 
83168489         return texture!=null?texture.texturedata:null;
83178490     }
83188491     
8319
-    boolean BindTexture(String tex, boolean bump, int resolution)
8492
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83208493     {
83218494         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83228495         {
....@@ -9293,8 +9466,8 @@
92939466         assert (parentcam != renderCamera);
92949467         
92959468         if (renderCamera != lightCamera)
9296
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9297
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
92989471         
92999472 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93009473             
....@@ -9309,8 +9482,8 @@
93099482             LA.matCopy(renderCamera.fromScreen, matrix);
93109483             
93119484         if (renderCamera != lightCamera)
9312
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9313
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93149487 
93159488 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93169489             
....@@ -9382,7 +9555,7 @@
93829555             //gl.glFlush();
93839556             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93849557 
9385
-            if (ANIMATION && ABORTED)
9558
+            if (Globals.ANIMATION && ABORTED)
93869559             {
93879560     System.err.println("    ABORTED FRAME");
93889561                 break;
....@@ -9412,7 +9585,7 @@
94129585         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94139586 
94149587         // save image
9415
-        if (ANIMATION && !ABORTED)
9588
+        if (Globals.ANIMATION && !ABORTED)
94169589         {
94179590             VPwidth = viewport[2];
94189591             VPheight = viewport[3];
....@@ -9523,11 +9696,11 @@
95239696             
95249697 //            imagecount++;
95259698             
9526
-            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;
95279700             
95289701             if (!BOXMODE)
95299702             {
9530
-                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) + ")");
95319704             }
95329705     
95339706             if (!BOXMODE)
....@@ -9565,7 +9738,7 @@
95659738             ABORTED = false;
95669739         }
95679740         else
9568
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+            Grafreed.wav.cursor += 735 * ACSIZE;
95699742         
95709743         if (false)
95719744         {
....@@ -10228,11 +10401,11 @@
1022810401 
1022910402     public void display(GLAutoDrawable drawable)
1023010403     {
10231
-        if (GrafreeD.savesound && GrafreeD.hassound)
10404
+        if (Grafreed.savesound && Grafreed.hassound)
1023210405         {
10233
-            GrafreeD.wav.save();
10234
-            GrafreeD.savesound = false;
10235
-            GrafreeD.hassound = false;
10406
+            Grafreed.wav.save();
10407
+            Grafreed.savesound = false;
10408
+            Grafreed.hassound = false;
1023610409         }
1023710410 //        if (DEBUG_SELECTION)
1023810411 //        {
....@@ -10362,7 +10535,7 @@
1036210535             Object3D theobject = object;
1036310536             Object3D theparent = object.parent;
1036410537             object.parent = null;
10365
-            object = (Object3D)GrafreeD.clone(object);
10538
+            object = (Object3D)Grafreed.clone(object);
1036610539             object.Stripify();
1036710540             if (theobject.selection == null || theobject.selection.Size() == 0)
1036810541                 theobject.PreprocessOcclusion(this);
....@@ -10375,13 +10548,14 @@
1037510548             ambientOcclusion = false;
1037610549         }
1037710550 
10378
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+        if (//Globals.lighttouched &&
10552
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1037910553         {
1038010554             //if (RENDERSHADOW) // ?
1038110555             if (!IsFrozen())
1038210556             {
1038310557                 // dec 2012
10384
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10558
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1038510559                 {
1038610560             Globals.framecount++;
1038710561                     shadowbuffer.display();
....@@ -10508,8 +10682,8 @@
1050810682             
1050910683 //        if (parentcam != renderCamera) // not a light
1051010684         if (cam != lightCamera)
10511
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10512
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10685
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10686
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1051310687             
1051410688             for (int j = 0; j < 4; j++)
1051510689             {
....@@ -10523,8 +10697,8 @@
1052310697             
1052410698 //        if (parentcam != renderCamera) // not a light
1052510699         if (cam != lightCamera)
10526
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10700
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10701
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1052810702         
1052910703             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1053010704             
....@@ -10783,7 +10957,16 @@
1078310957             // Bump noise
1078410958             gl.glActiveTexture(GL.GL_TEXTURE6);
1078510959             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786
-            BindTexture(NOISE_TEXTURE, false, 2);
10960
+            
10961
+    try
10962
+    {
10963
+        BindTexture(NOISE_TEXTURE, false, 2);
10964
+    }
10965
+    catch (Exception e)
10966
+    {
10967
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10968
+    }
10969
+           
1078710970 
1078810971             gl.glActiveTexture(GL.GL_TEXTURE0);
1078910972             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10908,8 +11091,8 @@
1090811091                 System.err.println("parentcam != renderCamera");
1090911092 
1091011093 //            if (cam != lightCamera)
10911
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10912
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11094
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11095
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1091311096         }
1091411097         
1091511098         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10930,8 +11113,8 @@
1093011113             if (true) // TODO
1093111114             {
1093211115                 if (cam != lightCamera)
10933
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11116
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11117
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1093511118             }
1093611119             
1093711120             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11247,8 +11430,14 @@
1124711430     {
1124811431             renderpass++;
1124911432 //        System.out.println("Draw object... ");
11433
+        STEP = 1;
1125011434         if (FAST) // in case there is no script
11251
-            STEP = 16;
11435
+            STEP = 8;
11436
+            
11437
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11438
+        {
11439
+            STEP *= 4;
11440
+        }
1125211441             
1125311442         //object.FullInvariants();
1125411443         
....@@ -11262,13 +11451,31 @@
1126211451             e.printStackTrace();
1126311452         }
1126411453         
11265
-        if (GrafreeD.RENDERME > 0)
11266
-            GrafreeD.RENDERME--; // mechante magouille
11454
+        if (Grafreed.RENDERME > 0)
11455
+            Grafreed.RENDERME--; // mechante magouille
1126711456         
1126811457         Globals.ONESTEP = false;
1126911458     }
1127011459 
1127111460     static boolean zoomonce = false;
11461
+    
11462
+    static void CreateSelectedPoint()
11463
+    {
11464
+        if (selectedpoint == null)
11465
+        {
11466
+            debugpointG = new Sphere();
11467
+            debugpointP = new Sphere();
11468
+            debugpointC = new Sphere();
11469
+            debugpointR = new Sphere();
11470
+            
11471
+            selectedpoint = new Superellipsoid();
11472
+            
11473
+            for (int i=0; i<8; i++)
11474
+            {
11475
+                debugpoints[i] = new Sphere();
11476
+            }
11477
+        }
11478
+    }
1127211479     
1127311480     void DrawObject(GL gl, boolean draw)
1127411481     {
....@@ -11333,7 +11540,14 @@
1133311540 
1133411541                 usedtextures.clear();
1133511542             
11336
-                BindTextures(DEFAULT_TEXTURES, 2);
11543
+    try
11544
+    {
11545
+        BindTextures(DEFAULT_TEXTURES, 2);
11546
+    }
11547
+    catch (Exception e)
11548
+    {
11549
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11550
+    }
1133711551             }
1133811552             //System.out.println("--> " + stackdepth);
1133911553 //            GrafreeD.traceon();
....@@ -11343,8 +11557,9 @@
1134311557             
1134411558             if (DrawMode() == DEFAULT)
1134511559             {
11346
-                if (DEBUG)
11560
+                if (Globals.DEBUG)
1134711561                 {
11562
+                    CreateSelectedPoint();
1134811563                     float radius = 0.05f;
1134911564                     if (selectedpoint.radius != radius)
1135011565                     {
....@@ -11424,7 +11639,14 @@
1142411639             if (checker != null && DrawMode() == DEFAULT)
1142511640             {
1142611641                 //BindTexture(IMMORTAL_TEXTURE);
11427
-                BindTextures(checker.GetTextures(), checker.texres);
11642
+    try
11643
+    {
11644
+        BindTextures(checker.GetTextures(), checker.texres);
11645
+    }
11646
+    catch (Exception e)
11647
+    {
11648
+        System.err.println("FAILED: " + checker.GetTextures());
11649
+    }
1142811650                 // NEAREST
1142911651                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1143011652                 DrawChecker(gl);
....@@ -11506,7 +11728,7 @@
1150611728             return;
1150711729         }
1150811730 
11509
-        String string = obj.GetToolTip();
11731
+        String string = obj.toString(); //.GetToolTip();
1151011732         
1151111733         GL gl = GetGL();
1151211734         
....@@ -11823,8 +12045,8 @@
1182312045             //obj.TransformToWorld(light, light);
1182412046             for (int i = tp.size(); --i >= 0;)
1182512047             {
11826
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827
-                    LA.xformPos(light, tp.get(i).toParent, light);
12048
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1182812050             }
1182912051 
1183012052 
....@@ -11841,8 +12063,8 @@
1184112063                 parentcam = cameras[0];
1184212064             }
1184312065             
11844
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11845
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12066
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12067
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1184612068 
1184712069             LA.xformPos(light, renderCamera.toScreen, light);
1184812070             
....@@ -12456,8 +12678,8 @@
1245612678 
1245712679            // display shadow only (bump == 0)
1245812680          "SUB temp.x, half.x, shadow.x;" +
12459
-         "MOV temp.y, -params6.x;" +
12460
-         "SLT temp.z, temp.y, zero.x;" +
12681
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12682
+         "SLT temp.z, temp.y, -one2048th.x;" +
1246112683          "SUB temp.y, one.x, temp.z;" +
1246212684          "MUL temp.x, temp.x, temp.y;" +
1246312685          "KIL temp.x;" +
....@@ -12586,8 +12808,10 @@
1258612808             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1258712809                 
1258812810                 "SUB temp.x, one.x, ndotl.x;" +
12589
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12811
+                // Tuning for default skin
12812
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12813
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12814
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1259112815                 "MUL temp.x, temp.x, temp.y;" +
1259212816                                 
1259312817                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12786,7 +13010,7 @@
1278613010             //once = true;
1278713011         }
1278813012 
12789
-        System.out.print("Program #" + mode + "; length = " + program.length());
13013
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1279013014         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1279113015         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1279213016 
....@@ -12919,12 +13143,16 @@
1291913143 
1292013144                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1292113145                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13146
+                
13147
+                // Compare fragment depth in light space with shadowmap.
1292213148                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1292313149                 "SGE temp.y, temp.x, zero.x;" +
12924
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13150
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13151
+                
13152
+                // Reverse comparison
1292513153                 "SUB temp.x, one.x, temp.x;" +
1292613154                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12927
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13155
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1292813156                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1292913157 
1293013158                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12938,6 +13166,10 @@
1293813166                 // No shadow for backface
1293913167                 "DP3 temp.x, normal, lightd;" +
1294013168                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13169
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13170
+
13171
+                // No shadow when out of frustrum
13172
+                "SGE temp.x, " + depth + ".z, one.z;" +
1294113173                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1294213174                 "";
1294313175     }
....@@ -13084,7 +13316,8 @@
1308413316     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1308513317     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1308613318     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087
-    Object3D.cVector2[] vector2buffer;
13319
+    
13320
+    //Object3D.cVector2[] vector2buffer;
1308813321 
1308913322     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1309013323     // OUT : diff, spec
....@@ -13496,7 +13729,7 @@
1349613729     public void mousePressed(MouseEvent e)
1349713730     {
1349813731         //System.out.println("mousePressed: " + e);
13499
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13732
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1350013733     }
1350113734 
1350213735     static long prevtime = 0;
....@@ -13523,6 +13756,7 @@
1352313756 	
1352413757         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1352513758             
13759
+        if (BUTTONLESSWHEEL)
1352613760 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1352713761 	{
1352813762             return;
....@@ -13531,7 +13765,7 @@
1353113765         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1353213766         
1353313767         // TIMER
13534
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13768
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1353513769         {
1353613770             keepboxmode = BOXMODE;
1353713771             keepsupport = SUPPORT;
....@@ -13571,8 +13805,8 @@
1357113805       //      mode |= META;
1357213806         //}
1357313807         
13574
-        SetMouseMode(WHEEL | e.getModifiersEx());
13575
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13808
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13809
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1357613810         anchorX = ax;
1357713811         anchorY = ay;
1357813812         prevX = px;
....@@ -13632,6 +13866,10 @@
1363213866 //            wasliveok = true;
1363313867 //            waslive = false;
1363413868             
13869
+            // May 2019 Forget it:
13870
+            if (true)
13871
+                    return;
13872
+            
1363513873             // source == timer
1363613874             if (mouseDown)
1363713875             {
....@@ -13670,7 +13908,7 @@
1367013908     
1367113909     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1367213910 
13673
-    void clickStart(int x, int y, int modifiers)
13911
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1367413912     {
1367513913         if (!wasliveok)
1367613914             return;
....@@ -13687,7 +13925,7 @@
1368713925 //        touched = true; // main DL
1368813926         if (isRenderer)
1368913927         {
13690
-            SetMouseMode(modifiers);
13928
+            SetMouseMode(modifiers, modifiersex);
1369113929         }
1369213930 
1369313931         selectX = anchorX = x;
....@@ -13700,7 +13938,7 @@
1370013938         clicked = true;
1370113939         hold = false;
1370213940 
13703
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13941
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1370413942         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1370513943         {
1370613944       //  System.out.println("RESTART II " + modifiers);
....@@ -13731,7 +13969,7 @@
1373113969             info.camera = renderCamera;
1373213970             info.x = x;
1373313971             info.y = y;
13734
-            info.modifiers = modifiers;
13972
+            info.modifiers = modifiersex;
1373513973             editObj = object.doEditClick(info, 0);
1373613974             if (!editObj)
1373713975             {
....@@ -13748,11 +13986,14 @@
1374813986     
1374913987     public void mouseDragged(MouseEvent e)
1375013988     {
13989
+        Globals.MOUSEDRAGGED = true;
13990
+        
13991
+        //System.out.println("mouseDragged: " + e);
1375113992         if (isRenderer)
1375213993             movingcamera = true;
13994
+        
1375313995         //if (drawing)
1375413996         //return;
13755
-        //System.out.println("mouseDragged: " + e);
1375613997         if ((e.getModifiersEx() & CTRL) != 0
1375713998             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1375813999         {
....@@ -13760,7 +14001,7 @@
1376014001             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1376114002         }
1376214003         else
13763
-            drag(e.getX(), e.getY(), e.getModifiersEx());
14004
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1376414005         
1376514006     //try { Thread.sleep(1); } catch (Exception ex) {}
1376614007     }
....@@ -13933,6 +14174,7 @@
1393314174         
1393414175         public void run()
1393514176         {
14177
+                new Exception().printStackTrace();
1393614178             System.exit(0);
1393714179             for (;;)
1393814180             {
....@@ -13996,7 +14238,7 @@
1399614238                     {
1399714239                         Globals.lighttouched = true;
1399814240                     }
13999
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14241
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1400014242                 }
1400114243             //else
1400214244             }
....@@ -14096,7 +14338,7 @@
1409614338     int X, Y;
1409714339     boolean SX, SY;
1409814340 
14099
-    void drag(int x, int y, int modifiers)
14341
+    void drag(int x, int y, int modifiers, int modifiersex)
1410014342     {
1410114343         if (IsFrozen())
1410214344         {
....@@ -14105,17 +14347,17 @@
1410514347 
1410614348         drag = true; // NEW
1410714349         
14108
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14350
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1410914351 
1411014352         X = x;
1411114353         Y = y;
1411214354         // floating state for animation
14113
-        MODIFIERS = modifiers;
14114
-        modifiers &= ~1024;
14355
+        MODIFIERS = modifiersex;
14356
+        modifiersex &= ~1024;
1411514357         if (false) // modifiers != 0)
1411614358         {
1411714359             //new Exception().printStackTrace();
14118
-            System.out.println("mouseDragged: " + modifiers);
14360
+            System.out.println("mouseDragged: " + modifiersex);
1411914361             System.out.println("SHIFT = " + SHIFT);
1412014362             System.out.println("CONTROL = " + COMMAND);
1412114363             System.out.println("META = " + META);
....@@ -14135,7 +14377,8 @@
1413514377                 info.camera = renderCamera;
1413614378                 info.x = x;
1413714379                 info.y = y;
14138
-                object.editWindow.copy.doEditDrag(info);
14380
+                object.manipWindow.copy
14381
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1413914382             } else
1414014383             {
1414114384                 if (x < startX)
....@@ -14287,7 +14530,6 @@
1428714530     public void mouseMoved(MouseEvent e)
1428814531     {
1428914532         //System.out.println("mouseMoved: " + e);
14290
-
1429114533         if (isRenderer)
1429214534             return;
1429314535         
....@@ -14300,7 +14542,9 @@
1430014542         ci.camera = renderCamera;
1430114543         if (!isRenderer)
1430214544         {
14303
-            if (object.editWindow.copy.doEditClick(ci, 0))
14545
+            //ObjEditor editWindow = object.editWindow;
14546
+            //Object3D copy = editWindow.copy;
14547
+            if (object.doEditClick(ci, 0))
1430414548             {
1430514549                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1430614550             } else
....@@ -14312,7 +14556,10 @@
1431214556 
1431314557     public void mouseReleased(MouseEvent e)
1431414558     {
14559
+        Globals.MOUSEDRAGGED = false;
14560
+        
1431514561         movingcamera = false;
14562
+        X = Y = 0;
1431614563         //System.out.println("mouseReleased: " + e);
1431714564         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1431814565     }
....@@ -14335,9 +14582,9 @@
1433514582         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1433614583         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1433714584         
14338
-        if (control || command || IsFrozen())
14585
+// No delay        if (control || command || IsFrozen())
1433914586             timeout = true;
14340
-        else
14587
+// ?? May 2019        else
1434114588        // timer.setDelay((modifiers & 128) != 0?0:350);
1434214589         mouseDown = false;
1434314590     if (!control && !command) // june 2013
....@@ -14447,7 +14694,7 @@
1444714694         System.out.println("keyReleased: " + e);
1444814695     }
1444914696 
14450
-    void SetMouseMode(int modifiers)
14697
+    void SetMouseMode(int modifiers, int modifiersex)
1445114698     {
1445214699         //System.out.println("SetMouseMode = " + modifiers);
1445314700         //modifiers &= ~1024;
....@@ -14459,25 +14706,25 @@
1445914706         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1446014707         //	return;
1446114708         //System.out.println("SetMode = " + modifiers);
14462
-        if ((modifiers & WHEEL) == WHEEL)
14709
+        if ((modifiersex & WHEEL) == WHEEL)
1446314710         {
1446414711             mouseMode |= ZOOM;
1446514712         }
1446614713         
1446714714         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468
-        if (capsLocked || (modifiers & META) == META)
14715
+        if (capsLocked) // || (modifiers & META) == META)
1446914716         {
1447014717             mouseMode |= VR; // BACKFORTH;
1447114718         }
14472
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14719
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1447314720         {
1447414721             mouseMode |= SELECT;
1447514722         }
14476
-        if ((modifiers & COMMAND) == COMMAND)
14723
+        if ((modifiersex & COMMAND) == COMMAND)
1447714724         {
1447814725             mouseMode |= SELECT;
1447914726         }
14480
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14727
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1448114728         {
1448214729             mouseMode &= ~VR;
1448314730             mouseMode |= TRANSLATE;
....@@ -14506,7 +14753,7 @@
1450614753 
1450714754         if (isRenderer) //
1450814755         {
14509
-            SetMouseMode(modifiers);
14756
+            SetMouseMode(0, modifiers);
1451014757         }
1451114758 
1451214759         Globals.theRenderer.keyPressed(key);
....@@ -14678,8 +14925,14 @@
1467814925                 RevertCamera();
1467914926                 repaint();
1468014927                 break;
14681
-            case 'L':
1468214928             case 'l':
14929
+                lightMode ^= true;
14930
+                Globals.lighttouched = true;
14931
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14932
+                targetLookAt.set(manipCamera.lookAt);
14933
+                repaint();
14934
+                break;
14935
+            case 'L':
1468314936                 if (lightMode)
1468414937                 {
1468514938                     lightMode = false;
....@@ -14826,23 +15079,21 @@
1482615079                 kompactbit = 6;
1482715080                 break;
1482815081             case ' ':
14829
-                lightMode ^= true;
14830
-                Globals.lighttouched = true;
14831
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14832
-                targetLookAt.set(manipCamera.lookAt);
15082
+                ObjEditor.theFrame.ToggleFullScreen();
1483315083                 repaint();
1483415084                 break;
1483515085             //case '`' :
1483615086             case ESC:
1483715087                 RENDERPROGRAM += 1;
1483815088                 RENDERPROGRAM %= 3;
15089
+
1483915090                 repaint();
1484015091                 break;
1484115092             case 'Z':
1484215093                 //RESIZETEXTURE ^= true;
1484315094                 //break;
1484415095             case 'z':
14845
-                RENDERSHADOW ^= true;
15096
+                Globals.RENDERSHADOW ^= true;
1484615097                 Globals.lighttouched = true;
1484715098                 repaint();
1484815099                 break;
....@@ -14966,7 +15217,7 @@
1496615217         //mode = ROTATE;
1496715218         if ((MODIFIERS & COMMAND) == 0) // VR??
1496815219         {
14969
-            SetMouseMode(modifiers);
15220
+            SetMouseMode(0, modifiers);
1497015221         }
1497115222     }
1497215223 
....@@ -15100,8 +15351,9 @@
1510015351 
1510115352     protected void processMouseMotionEvent(MouseEvent e)
1510215353     {
15103
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
15104
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15354
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15355
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15356
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1510515357         {
1510615358             mouseMoved(e);
1510715359         } else
....@@ -15131,6 +15383,7 @@
1513115383 
1513215384     void SelectParent()
1513315385     {
15386
+                new Exception().printStackTrace();
1513415387         System.exit(0);
1513515388         Composite group = (Composite) object;
1513615389         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -15154,6 +15407,7 @@
1515415407 
1515515408     void SelectChildren()
1515615409     {
15410
+                new Exception().printStackTrace();
1515715411         System.exit(0);
1515815412         /*
1515915413         Composite group = (Composite) object;
....@@ -15318,7 +15572,9 @@
1531815572         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1531915573         //Image img = CreateImage(width, height);
1532015574         //System.out.println("width = " + width + "; height = " + height + "\n");
15575
+        
1532115576         Graphics gr = g; // img.getGraphics();
15577
+        
1532215578         if (!hasMarquee)
1532315579         {
1532415580             if (Xmin < Xmax) // !locked)
....@@ -15416,14 +15672,33 @@
1541615672             if (!isRenderer)
1541715673             {
1541815674                 object.drawEditHandles(info, 0);
15675
+                
15676
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15677
+                {
15678
+                    switch (object.selection.get(0).hitSomething)
15679
+                    {
15680
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15681
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15682
+                            break;
15683
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15684
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
+                        break;
15686
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15687
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
+                        break;
15689
+                    }
15690
+                    
15691
+                }
1541915692             }
1542015693         }
15694
+        
1542115695         if (isRenderer)
1542215696         {
1542315697         //gr.setColor(Color.black);
1542415698         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1542515699         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1542615700         }
15701
+        
1542715702         if (hasMarquee)
1542815703         {
1542915704             gr.setXORMode(Color.white);
....@@ -15536,6 +15811,7 @@
1553615811     public boolean mouseDown(Event evt, int x, int y)
1553715812     {
1553815813         System.out.println("mouseDown: " + evt);
15814
+        System.exit(0);
1553915815         /*
1554015816         locked = true;
1554115817         drag = false;
....@@ -15579,7 +15855,7 @@
1557915855         {
1558015856             keyPressed(0, modifiers);
1558115857         }
15582
-        clickStart(x, y, modifiers);
15858
+ //       clickStart(x, y, modifiers);
1558315859         return true;
1558415860     }
1558515861 
....@@ -15697,7 +15973,7 @@
1569715973         {
1569815974             keyReleased(0, 0);
1569915975         }
15700
-        drag(x, y, modifiers);
15976
+        drag(x, y, 0, modifiers);
1570115977         return true;
1570215978     }
1570315979 
....@@ -15829,7 +16105,7 @@
1582916105     Object3D object;
1583016106     static Object3D trackedobject;
1583116107     Camera renderCamera; // Light or Eye (or Occlusion)
15832
-    /*static*/ Camera manipCamera; // Light or Eye
16108
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1583316109 	/*static*/ Camera eyeCamera;
1583416110     /*static*/ Camera lightCamera;
1583516111     int cameracount;
....@@ -16114,16 +16390,16 @@
1611416390                 cStatic.objectstack[materialdepth++] = checker;
1611516391                 //System.out.println("material " + material);
1611616392                 //Applet3D.tracein(this, selected);
16117
-                vector2buffer = checker.projectedVertices;
16393
+                //vector2buffer = checker.projectedVertices;
1611816394 
1611916395         //checker.GetMaterial().Draw(this, false); // true);
16120
-        DrawMaterial(checker.GetMaterial(), false); // true);
16396
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1612116397 
1612216398                 materialdepth -= 1;
1612316399                 if (materialdepth > 0)
1612416400                 {
16125
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16401
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16402
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1612716403                 }
1612816404         //checker.GetMaterial().opacity = 1f;
1612916405         ////checker.GetMaterial().ambient = 1f;
....@@ -16267,6 +16543,7 @@
1626716543         {
1626816544             if (!selection)
1626916545             {
16546
+                new Exception().printStackTrace();
1627016547                 System.exit(0);
1627116548                 return;
1627216549             }
....@@ -16346,6 +16623,8 @@
1634616623 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1634716624 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1634816625                 
16626
+                CreateSelectedPoint();
16627
+                
1634916628                 // Will fit the mesh !!!
1635016629                 selectedpoint.toParent[0][0] = 0.0001;
1635116630                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16394,16 +16673,16 @@
1639416673                             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]));
1639516674                         }
1639616675                         
16397
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16676
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1639816677                     }
1639916678                 }
1640016679                 
1640116680                 if (!movingcamera && !PAINTMODE)
1640216681                     object.editWindow.ScreenFitPoint(); // fev 2014
1640316682                 
16404
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16683
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1640516684                 {
16406
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16685
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1640716686                     
1640816687                     Object3D group = new Object3D("inst" + paintcount++);
1640916688                     
....@@ -16559,7 +16838,7 @@
1655916838                 gl.glDisable(gl.GL_CULL_FACE);
1656016839             }
1656116840 
16562
-            if (!RENDERSHADOW)
16841
+            if (!Globals.RENDERSHADOW)
1656316842                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1656416843 
1656516844             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16569,7 +16848,7 @@
1656916848             //gl.glColorMask(false, false, false, false);
1657016849 
1657116850             //render_scene_from_light_view(gl, drawable, 0, 0);
16572
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16851
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1657316852             {
1657416853                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1657516854 
....@@ -16985,23 +17264,15 @@
1698517264     int AAbuffersize = 0;
1698617265     
1698717266     //double[] selectedpoint = new double[3];
16988
-    static Superellipsoid selectedpoint = new Superellipsoid();
17267
+    static Superellipsoid selectedpoint;
1698917268     static Sphere previousselectedpoint = null;
16990
-    static Sphere debugpointG = new Sphere();
16991
-    static Sphere debugpointP = new Sphere();
16992
-    static Sphere debugpointC = new Sphere();
16993
-    static Sphere debugpointR = new Sphere();
17269
+    static Sphere debugpointG;
17270
+    static Sphere debugpointP;
17271
+    static Sphere debugpointC;
17272
+    static Sphere debugpointR;
1699417273     
1699517274     static Sphere debugpoints[] = new Sphere[8];
1699617275  
16997
-    static
16998
-    {
16999
-        for (int i=0; i<8; i++)
17000
-        {
17001
-            debugpoints[i] = new Sphere();
17002
-        }
17003
-    }
17004
-    
1700517276     static void InitPoints(float radius)
1700617277     {
1700717278         for (int i=0; i<8; i++)