blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 21104baa536c6b3d3d0f9ecb7231222ed706f0e8 
 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         {
....@@ -9193,11 +9366,35 @@
91939366         jy8[3] = 0.5f;
91949367     }
91959368     
9196
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9369
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
91979370     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
91989371     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
91999372     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
92009373 
9374
+    void ResetOptions()
9375
+    {
9376
+        options1[0] = 100;
9377
+        options1[1] = 0.00001f;
9378
+        options1[2] = 20;
9379
+        options1[3] = 0;
9380
+        options1[4] = 0;
9381
+        
9382
+        options2[0] = 0;
9383
+        options2[1] = 1;
9384
+        options2[2] = 0;
9385
+        options2[3] = 0;
9386
+        
9387
+        options3[0] = 1;
9388
+        options3[1] = 1;
9389
+        options3[2] = 1;
9390
+        options3[3] = 0;
9391
+        
9392
+        options4[0] = 1;
9393
+        options4[1] = 0;
9394
+        options4[2] = 1;
9395
+        options4[3] = 0;
9396
+    }
9397
+    
92019398     static int imagecount = 0; // movie generation
92029399     
92039400     static int jitter = 0;
....@@ -9293,8 +9490,8 @@
92939490         assert (parentcam != renderCamera);
92949491         
92959492         if (renderCamera != lightCamera)
9296
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9297
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9493
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9494
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
92989495         
92999496 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93009497             
....@@ -9309,8 +9506,8 @@
93099506             LA.matCopy(renderCamera.fromScreen, matrix);
93109507             
93119508         if (renderCamera != lightCamera)
9312
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9313
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9509
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9510
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93149511 
93159512 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93169513             
....@@ -9382,7 +9579,7 @@
93829579             //gl.glFlush();
93839580             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93849581 
9385
-            if (ANIMATION && ABORTED)
9582
+            if (Globals.ANIMATION && ABORTED)
93869583             {
93879584     System.err.println("    ABORTED FRAME");
93889585                 break;
....@@ -9412,7 +9609,7 @@
94129609         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94139610 
94149611         // save image
9415
-        if (ANIMATION && !ABORTED)
9612
+        if (Globals.ANIMATION && !ABORTED)
94169613         {
94179614             VPwidth = viewport[2];
94189615             VPheight = viewport[3];
....@@ -9523,11 +9720,11 @@
95239720             
95249721 //            imagecount++;
95259722             
9526
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9723
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
95279724             
95289725             if (!BOXMODE)
95299726             {
9530
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9727
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95319728             }
95329729     
95339730             if (!BOXMODE)
....@@ -9565,7 +9762,7 @@
95659762             ABORTED = false;
95669763         }
95679764         else
9568
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9765
+            Grafreed.wav.cursor += 735 * ACSIZE;
95699766         
95709767         if (false)
95719768         {
....@@ -10228,11 +10425,11 @@
1022810425 
1022910426     public void display(GLAutoDrawable drawable)
1023010427     {
10231
-        if (GrafreeD.savesound && GrafreeD.hassound)
10428
+        if (Grafreed.savesound && Grafreed.hassound)
1023210429         {
10233
-            GrafreeD.wav.save();
10234
-            GrafreeD.savesound = false;
10235
-            GrafreeD.hassound = false;
10430
+            Grafreed.wav.save();
10431
+            Grafreed.savesound = false;
10432
+            Grafreed.hassound = false;
1023610433         }
1023710434 //        if (DEBUG_SELECTION)
1023810435 //        {
....@@ -10308,6 +10505,7 @@
1030810505                     ANTIALIAS = 0;
1030910506                     //System.out.println("RESTART");
1031010507                     AAtimer.restart();
10508
+                    Globals.TIMERRUNNING = true;
1031110509                 }
1031210510             }
1031310511         }
....@@ -10362,7 +10560,7 @@
1036210560             Object3D theobject = object;
1036310561             Object3D theparent = object.parent;
1036410562             object.parent = null;
10365
-            object = (Object3D)GrafreeD.clone(object);
10563
+            object = (Object3D)Grafreed.clone(object);
1036610564             object.Stripify();
1036710565             if (theobject.selection == null || theobject.selection.Size() == 0)
1036810566                 theobject.PreprocessOcclusion(this);
....@@ -10375,13 +10573,14 @@
1037510573             ambientOcclusion = false;
1037610574         }
1037710575 
10378
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10576
+        if (//Globals.lighttouched &&
10577
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1037910578         {
1038010579             //if (RENDERSHADOW) // ?
1038110580             if (!IsFrozen())
1038210581             {
1038310582                 // dec 2012
10384
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10583
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1038510584                 {
1038610585             Globals.framecount++;
1038710586                     shadowbuffer.display();
....@@ -10508,8 +10707,8 @@
1050810707             
1050910708 //        if (parentcam != renderCamera) // not a light
1051010709         if (cam != lightCamera)
10511
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10512
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10710
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10711
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1051310712             
1051410713             for (int j = 0; j < 4; j++)
1051510714             {
....@@ -10523,8 +10722,8 @@
1052310722             
1052410723 //        if (parentcam != renderCamera) // not a light
1052510724         if (cam != lightCamera)
10526
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10725
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10726
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1052810727         
1052910728             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1053010729             
....@@ -10783,7 +10982,16 @@
1078310982             // Bump noise
1078410983             gl.glActiveTexture(GL.GL_TEXTURE6);
1078510984             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786
-            BindTexture(NOISE_TEXTURE, false, 2);
10985
+            
10986
+    try
10987
+    {
10988
+        BindTexture(NOISE_TEXTURE, false, 2);
10989
+    }
10990
+    catch (Exception e)
10991
+    {
10992
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10993
+    }
10994
+           
1078710995 
1078810996             gl.glActiveTexture(GL.GL_TEXTURE0);
1078910997             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10908,8 +11116,8 @@
1090811116                 System.err.println("parentcam != renderCamera");
1090911117 
1091011118 //            if (cam != lightCamera)
10911
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10912
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11119
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11120
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1091311121         }
1091411122         
1091511123         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10930,8 +11138,8 @@
1093011138             if (true) // TODO
1093111139             {
1093211140                 if (cam != lightCamera)
10933
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11141
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11142
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1093511143             }
1093611144             
1093711145             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11247,8 +11455,14 @@
1124711455     {
1124811456             renderpass++;
1124911457 //        System.out.println("Draw object... ");
11458
+        STEP = 1;
1125011459         if (FAST) // in case there is no script
11251
-            STEP = 16;
11460
+            STEP = 8;
11461
+            
11462
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11463
+        {
11464
+            STEP *= 4;
11465
+        }
1125211466             
1125311467         //object.FullInvariants();
1125411468         
....@@ -11262,16 +11476,37 @@
1126211476             e.printStackTrace();
1126311477         }
1126411478         
11265
-        if (GrafreeD.RENDERME > 0)
11266
-            GrafreeD.RENDERME--; // mechante magouille
11479
+        if (Grafreed.RENDERME > 0)
11480
+            Grafreed.RENDERME--; // mechante magouille
1126711481         
1126811482         Globals.ONESTEP = false;
1126911483     }
1127011484 
1127111485     static boolean zoomonce = false;
1127211486     
11487
+    static void CreateSelectedPoint()
11488
+    {
11489
+        if (selectedpoint == null)
11490
+        {
11491
+            debugpointG = new Sphere();
11492
+            debugpointP = new Sphere();
11493
+            debugpointC = new Sphere();
11494
+            debugpointR = new Sphere();
11495
+            
11496
+            selectedpoint = new Superellipsoid();
11497
+            
11498
+            for (int i=0; i<8; i++)
11499
+            {
11500
+                debugpoints[i] = new Sphere();
11501
+            }
11502
+        }
11503
+    }
11504
+    
1127311505     void DrawObject(GL gl, boolean draw)
1127411506     {
11507
+        // To clear camera values
11508
+        ResetOptions();
11509
+        
1127511510         //System.out.println("DRAW OBJECT " + mouseDown);
1127611511 //        DrawMode() = SELECTION;
1127711512         //GL gl = getGL();
....@@ -11333,7 +11568,14 @@
1133311568 
1133411569                 usedtextures.clear();
1133511570             
11336
-                BindTextures(DEFAULT_TEXTURES, 2);
11571
+    try
11572
+    {
11573
+        BindTextures(DEFAULT_TEXTURES, 2);
11574
+    }
11575
+    catch (Exception e)
11576
+    {
11577
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11578
+    }
1133711579             }
1133811580             //System.out.println("--> " + stackdepth);
1133911581 //            GrafreeD.traceon();
....@@ -11343,8 +11585,9 @@
1134311585             
1134411586             if (DrawMode() == DEFAULT)
1134511587             {
11346
-                if (DEBUG)
11588
+                if (Globals.DEBUG)
1134711589                 {
11590
+                    CreateSelectedPoint();
1134811591                     float radius = 0.05f;
1134911592                     if (selectedpoint.radius != radius)
1135011593                     {
....@@ -11424,7 +11667,14 @@
1142411667             if (checker != null && DrawMode() == DEFAULT)
1142511668             {
1142611669                 //BindTexture(IMMORTAL_TEXTURE);
11427
-                BindTextures(checker.GetTextures(), checker.texres);
11670
+    try
11671
+    {
11672
+        BindTextures(checker.GetTextures(), checker.texres);
11673
+    }
11674
+    catch (Exception e)
11675
+    {
11676
+        System.err.println("FAILED: " + checker.GetTextures());
11677
+    }
1142811678                 // NEAREST
1142911679                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1143011680                 DrawChecker(gl);
....@@ -11506,7 +11756,7 @@
1150611756             return;
1150711757         }
1150811758 
11509
-        String string = obj.GetToolTip();
11759
+        String string = obj.toString(); //.GetToolTip();
1151011760         
1151111761         GL gl = GetGL();
1151211762         
....@@ -11823,8 +12073,8 @@
1182312073             //obj.TransformToWorld(light, light);
1182412074             for (int i = tp.size(); --i >= 0;)
1182512075             {
11826
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827
-                    LA.xformPos(light, tp.get(i).toParent, light);
12076
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12077
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1182812078             }
1182912079 
1183012080 
....@@ -11841,8 +12091,8 @@
1184112091                 parentcam = cameras[0];
1184212092             }
1184312093             
11844
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11845
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12094
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12095
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1184612096 
1184712097             LA.xformPos(light, renderCamera.toScreen, light);
1184812098             
....@@ -12456,8 +12706,8 @@
1245612706 
1245712707            // display shadow only (bump == 0)
1245812708          "SUB temp.x, half.x, shadow.x;" +
12459
-         "MOV temp.y, -params6.x;" +
12460
-         "SLT temp.z, temp.y, zero.x;" +
12709
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12710
+         "SLT temp.z, temp.y, -one2048th.x;" +
1246112711          "SUB temp.y, one.x, temp.z;" +
1246212712          "MUL temp.x, temp.x, temp.y;" +
1246312713          "KIL temp.x;" +
....@@ -12586,8 +12836,10 @@
1258612836             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1258712837                 
1258812838                 "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
12839
+                // Tuning for default skin
12840
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12841
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12842
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1259112843                 "MUL temp.x, temp.x, temp.y;" +
1259212844                                 
1259312845                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12786,7 +13038,7 @@
1278613038             //once = true;
1278713039         }
1278813040 
12789
-        System.out.print("Program #" + mode + "; length = " + program.length());
13041
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1279013042         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1279113043         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1279213044 
....@@ -12919,12 +13171,16 @@
1291913171 
1292013172                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1292113173                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13174
+                
13175
+                // Compare fragment depth in light space with shadowmap.
1292213176                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1292313177                 "SGE temp.y, temp.x, zero.x;" +
12924
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13178
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13179
+                
13180
+                // Reverse comparison
1292513181                 "SUB temp.x, one.x, temp.x;" +
1292613182                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12927
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13183
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1292813184                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1292913185 
1293013186                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12938,6 +13194,10 @@
1293813194                 // No shadow for backface
1293913195                 "DP3 temp.x, normal, lightd;" +
1294013196                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13197
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13198
+
13199
+                // No shadow when out of frustrum
13200
+                "SGE temp.x, " + depth + ".z, one.z;" +
1294113201                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1294213202                 "";
1294313203     }
....@@ -13084,7 +13344,8 @@
1308413344     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1308513345     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1308613346     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087
-    Object3D.cVector2[] vector2buffer;
13347
+    
13348
+    //Object3D.cVector2[] vector2buffer;
1308813349 
1308913350     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1309013351     // OUT : diff, spec
....@@ -13496,7 +13757,7 @@
1349613757     public void mousePressed(MouseEvent e)
1349713758     {
1349813759         //System.out.println("mousePressed: " + e);
13499
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13760
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1350013761     }
1350113762 
1350213763     static long prevtime = 0;
....@@ -13523,6 +13784,7 @@
1352313784 	
1352413785         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1352513786             
13787
+        if (BUTTONLESSWHEEL)
1352613788 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1352713789 	{
1352813790             return;
....@@ -13531,7 +13793,7 @@
1353113793         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1353213794         
1353313795         // TIMER
13534
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13796
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1353513797         {
1353613798             keepboxmode = BOXMODE;
1353713799             keepsupport = SUPPORT;
....@@ -13571,8 +13833,8 @@
1357113833       //      mode |= META;
1357213834         //}
1357313835         
13574
-        SetMouseMode(WHEEL | e.getModifiersEx());
13575
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13836
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13837
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1357613838         anchorX = ax;
1357713839         anchorY = ay;
1357813840         prevX = px;
....@@ -13606,6 +13868,7 @@
1360613868         else
1360713869         if (evt.getSource() == AAtimer)
1360813870         {
13871
+                    Globals.TIMERRUNNING = false;
1360913872             if (mouseDown)
1361013873             {
1361113874             //new Exception().printStackTrace();
....@@ -13631,6 +13894,10 @@
1363113894 //            LIVE = waslive;
1363213895 //            wasliveok = true;
1363313896 //            waslive = false;
13897
+            
13898
+            // May 2019 Forget it:
13899
+            if (true)
13900
+                    return;
1363413901             
1363513902             // source == timer
1363613903             if (mouseDown)
....@@ -13670,12 +13937,13 @@
1367013937     
1367113938     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1367213939 
13673
-    void clickStart(int x, int y, int modifiers)
13940
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1367413941     {
1367513942         if (!wasliveok)
1367613943             return;
1367713944         
1367813945         AAtimer.restart(); // 
13946
+        Globals.TIMERRUNNING = true;
1367913947 
1368013948 //        waslive = LIVE;
1368113949 //        LIVE = false;
....@@ -13687,7 +13955,7 @@
1368713955 //        touched = true; // main DL
1368813956         if (isRenderer)
1368913957         {
13690
-            SetMouseMode(modifiers);
13958
+            SetMouseMode(modifiers, modifiersex);
1369113959         }
1369213960 
1369313961         selectX = anchorX = x;
....@@ -13700,7 +13968,7 @@
1370013968         clicked = true;
1370113969         hold = false;
1370213970 
13703
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13971
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1370413972         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1370513973         {
1370613974       //  System.out.println("RESTART II " + modifiers);
....@@ -13731,7 +13999,7 @@
1373113999             info.camera = renderCamera;
1373214000             info.x = x;
1373314001             info.y = y;
13734
-            info.modifiers = modifiers;
14002
+            info.modifiers = modifiersex;
1373514003             editObj = object.doEditClick(info, 0);
1373614004             if (!editObj)
1373714005             {
....@@ -13748,11 +14016,14 @@
1374814016     
1374914017     public void mouseDragged(MouseEvent e)
1375014018     {
14019
+        Globals.MOUSEDRAGGED = true;
14020
+        
14021
+        //System.out.println("mouseDragged: " + e);
1375114022         if (isRenderer)
1375214023             movingcamera = true;
14024
+        
1375314025         //if (drawing)
1375414026         //return;
13755
-        //System.out.println("mouseDragged: " + e);
1375614027         if ((e.getModifiersEx() & CTRL) != 0
1375714028             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1375814029         {
....@@ -13760,7 +14031,7 @@
1376014031             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1376114032         }
1376214033         else
13763
-            drag(e.getX(), e.getY(), e.getModifiersEx());
14034
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1376414035         
1376514036     //try { Thread.sleep(1); } catch (Exception ex) {}
1376614037     }
....@@ -13933,6 +14204,7 @@
1393314204         
1393414205         public void run()
1393514206         {
14207
+                new Exception().printStackTrace();
1393614208             System.exit(0);
1393714209             for (;;)
1393814210             {
....@@ -13996,7 +14268,7 @@
1399614268                     {
1399714269                         Globals.lighttouched = true;
1399814270                     }
13999
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14271
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1400014272                 }
1400114273             //else
1400214274             }
....@@ -14096,7 +14368,7 @@
1409614368     int X, Y;
1409714369     boolean SX, SY;
1409814370 
14099
-    void drag(int x, int y, int modifiers)
14371
+    void drag(int x, int y, int modifiers, int modifiersex)
1410014372     {
1410114373         if (IsFrozen())
1410214374         {
....@@ -14105,17 +14377,17 @@
1410514377 
1410614378         drag = true; // NEW
1410714379         
14108
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14380
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1410914381 
1411014382         X = x;
1411114383         Y = y;
1411214384         // floating state for animation
14113
-        MODIFIERS = modifiers;
14114
-        modifiers &= ~1024;
14385
+        MODIFIERS = modifiersex;
14386
+        modifiersex &= ~1024;
1411514387         if (false) // modifiers != 0)
1411614388         {
1411714389             //new Exception().printStackTrace();
14118
-            System.out.println("mouseDragged: " + modifiers);
14390
+            System.out.println("mouseDragged: " + modifiersex);
1411914391             System.out.println("SHIFT = " + SHIFT);
1412014392             System.out.println("CONTROL = " + COMMAND);
1412114393             System.out.println("META = " + META);
....@@ -14135,7 +14407,8 @@
1413514407                 info.camera = renderCamera;
1413614408                 info.x = x;
1413714409                 info.y = y;
14138
-                object.editWindow.copy.doEditDrag(info);
14410
+                object.GetWindow().copy
14411
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1413914412             } else
1414014413             {
1414114414                 if (x < startX)
....@@ -14287,7 +14560,6 @@
1428714560     public void mouseMoved(MouseEvent e)
1428814561     {
1428914562         //System.out.println("mouseMoved: " + e);
14290
-
1429114563         if (isRenderer)
1429214564             return;
1429314565         
....@@ -14300,7 +14572,9 @@
1430014572         ci.camera = renderCamera;
1430114573         if (!isRenderer)
1430214574         {
14303
-            if (object.editWindow.copy.doEditClick(ci, 0))
14575
+            //ObjEditor editWindow = object.editWindow;
14576
+            //Object3D copy = editWindow.copy;
14577
+            if (object.doEditClick(ci, 0))
1430414578             {
1430514579                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1430614580             } else
....@@ -14312,7 +14586,10 @@
1431214586 
1431314587     public void mouseReleased(MouseEvent e)
1431414588     {
14589
+        Globals.MOUSEDRAGGED = false;
14590
+        
1431514591         movingcamera = false;
14592
+        X = Y = 0;
1431614593         //System.out.println("mouseReleased: " + e);
1431714594         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1431814595     }
....@@ -14335,9 +14612,9 @@
1433514612         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1433614613         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1433714614         
14338
-        if (control || command || IsFrozen())
14615
+// No delay        if (control || command || IsFrozen())
1433914616             timeout = true;
14340
-        else
14617
+// ?? May 2019        else
1434114618        // timer.setDelay((modifiers & 128) != 0?0:350);
1434214619         mouseDown = false;
1434314620     if (!control && !command) // june 2013
....@@ -14447,7 +14724,7 @@
1444714724         System.out.println("keyReleased: " + e);
1444814725     }
1444914726 
14450
-    void SetMouseMode(int modifiers)
14727
+    void SetMouseMode(int modifiers, int modifiersex)
1445114728     {
1445214729         //System.out.println("SetMouseMode = " + modifiers);
1445314730         //modifiers &= ~1024;
....@@ -14459,25 +14736,25 @@
1445914736         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1446014737         //	return;
1446114738         //System.out.println("SetMode = " + modifiers);
14462
-        if ((modifiers & WHEEL) == WHEEL)
14739
+        if ((modifiersex & WHEEL) == WHEEL)
1446314740         {
1446414741             mouseMode |= ZOOM;
1446514742         }
1446614743         
1446714744         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468
-        if (capsLocked || (modifiers & META) == META)
14745
+        if (capsLocked) // || (modifiers & META) == META)
1446914746         {
1447014747             mouseMode |= VR; // BACKFORTH;
1447114748         }
14472
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14749
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1447314750         {
1447414751             mouseMode |= SELECT;
1447514752         }
14476
-        if ((modifiers & COMMAND) == COMMAND)
14753
+        if ((modifiersex & COMMAND) == COMMAND)
1447714754         {
1447814755             mouseMode |= SELECT;
1447914756         }
14480
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14757
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1448114758         {
1448214759             mouseMode &= ~VR;
1448314760             mouseMode |= TRANSLATE;
....@@ -14506,7 +14783,7 @@
1450614783 
1450714784         if (isRenderer) //
1450814785         {
14509
-            SetMouseMode(modifiers);
14786
+            SetMouseMode(0, modifiers);
1451014787         }
1451114788 
1451214789         Globals.theRenderer.keyPressed(key);
....@@ -14678,8 +14955,14 @@
1467814955                 RevertCamera();
1467914956                 repaint();
1468014957                 break;
14681
-            case 'L':
1468214958             case 'l':
14959
+                lightMode ^= true;
14960
+                Globals.lighttouched = true;
14961
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14962
+                targetLookAt.set(manipCamera.lookAt);
14963
+                repaint();
14964
+                break;
14965
+            case 'L':
1468314966                 if (lightMode)
1468414967                 {
1468514968                     lightMode = false;
....@@ -14826,23 +15109,21 @@
1482615109                 kompactbit = 6;
1482715110                 break;
1482815111             case ' ':
14829
-                lightMode ^= true;
14830
-                Globals.lighttouched = true;
14831
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14832
-                targetLookAt.set(manipCamera.lookAt);
15112
+                ObjEditor.theFrame.ToggleFullScreen();
1483315113                 repaint();
1483415114                 break;
1483515115             //case '`' :
1483615116             case ESC:
1483715117                 RENDERPROGRAM += 1;
1483815118                 RENDERPROGRAM %= 3;
15119
+
1483915120                 repaint();
1484015121                 break;
1484115122             case 'Z':
1484215123                 //RESIZETEXTURE ^= true;
1484315124                 //break;
1484415125             case 'z':
14845
-                RENDERSHADOW ^= true;
15126
+                Globals.RENDERSHADOW ^= true;
1484615127                 Globals.lighttouched = true;
1484715128                 repaint();
1484815129                 break;
....@@ -14966,7 +15247,7 @@
1496615247         //mode = ROTATE;
1496715248         if ((MODIFIERS & COMMAND) == 0) // VR??
1496815249         {
14969
-            SetMouseMode(modifiers);
15250
+            SetMouseMode(0, modifiers);
1497015251         }
1497115252     }
1497215253 
....@@ -15100,8 +15381,9 @@
1510015381 
1510115382     protected void processMouseMotionEvent(MouseEvent e)
1510215383     {
15103
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
15104
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15384
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15385
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15386
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1510515387         {
1510615388             mouseMoved(e);
1510715389         } else
....@@ -15126,11 +15408,12 @@
1512615408         }
1512715409          */
1512815410 
15129
-        object.editWindow.EditSelection();
15411
+        object.editWindow.EditSelection(false);
1513015412     }
1513115413 
1513215414     void SelectParent()
1513315415     {
15416
+                new Exception().printStackTrace();
1513415417         System.exit(0);
1513515418         Composite group = (Composite) object;
1513615419         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -15154,6 +15437,7 @@
1515415437 
1515515438     void SelectChildren()
1515615439     {
15440
+                new Exception().printStackTrace();
1515715441         System.exit(0);
1515815442         /*
1515915443         Composite group = (Composite) object;
....@@ -15318,7 +15602,9 @@
1531815602         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1531915603         //Image img = CreateImage(width, height);
1532015604         //System.out.println("width = " + width + "; height = " + height + "\n");
15605
+        
1532115606         Graphics gr = g; // img.getGraphics();
15607
+        
1532215608         if (!hasMarquee)
1532315609         {
1532415610             if (Xmin < Xmax) // !locked)
....@@ -15416,14 +15702,33 @@
1541615702             if (!isRenderer)
1541715703             {
1541815704                 object.drawEditHandles(info, 0);
15705
+                
15706
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15707
+                {
15708
+                    switch (object.selection.get(0).hitSomething)
15709
+                    {
15710
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15711
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15712
+                            break;
15713
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15714
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15715
+                        break;
15716
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15717
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15718
+                        break;
15719
+                    }
15720
+                    
15721
+                }
1541915722             }
1542015723         }
15724
+        
1542115725         if (isRenderer)
1542215726         {
1542315727         //gr.setColor(Color.black);
1542415728         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1542515729         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1542615730         }
15731
+        
1542715732         if (hasMarquee)
1542815733         {
1542915734             gr.setXORMode(Color.white);
....@@ -15536,6 +15841,7 @@
1553615841     public boolean mouseDown(Event evt, int x, int y)
1553715842     {
1553815843         System.out.println("mouseDown: " + evt);
15844
+        System.exit(0);
1553915845         /*
1554015846         locked = true;
1554115847         drag = false;
....@@ -15579,7 +15885,7 @@
1557915885         {
1558015886             keyPressed(0, modifiers);
1558115887         }
15582
-        clickStart(x, y, modifiers);
15888
+ //       clickStart(x, y, modifiers);
1558315889         return true;
1558415890     }
1558515891 
....@@ -15697,7 +16003,7 @@
1569716003         {
1569816004             keyReleased(0, 0);
1569916005         }
15700
-        drag(x, y, modifiers);
16006
+        drag(x, y, 0, modifiers);
1570116007         return true;
1570216008     }
1570316009 
....@@ -15829,7 +16135,7 @@
1582916135     Object3D object;
1583016136     static Object3D trackedobject;
1583116137     Camera renderCamera; // Light or Eye (or Occlusion)
15832
-    /*static*/ Camera manipCamera; // Light or Eye
16138
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1583316139 	/*static*/ Camera eyeCamera;
1583416140     /*static*/ Camera lightCamera;
1583516141     int cameracount;
....@@ -16114,16 +16420,16 @@
1611416420                 cStatic.objectstack[materialdepth++] = checker;
1611516421                 //System.out.println("material " + material);
1611616422                 //Applet3D.tracein(this, selected);
16117
-                vector2buffer = checker.projectedVertices;
16423
+                //vector2buffer = checker.projectedVertices;
1611816424 
1611916425         //checker.GetMaterial().Draw(this, false); // true);
16120
-        DrawMaterial(checker.GetMaterial(), false); // true);
16426
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1612116427 
1612216428                 materialdepth -= 1;
1612316429                 if (materialdepth > 0)
1612416430                 {
16125
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16431
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16432
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1612716433                 }
1612816434         //checker.GetMaterial().opacity = 1f;
1612916435         ////checker.GetMaterial().ambient = 1f;
....@@ -16267,6 +16573,7 @@
1626716573         {
1626816574             if (!selection)
1626916575             {
16576
+                new Exception().printStackTrace();
1627016577                 System.exit(0);
1627116578                 return;
1627216579             }
....@@ -16346,6 +16653,8 @@
1634616653 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1634716654 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1634816655                 
16656
+                CreateSelectedPoint();
16657
+                
1634916658                 // Will fit the mesh !!!
1635016659                 selectedpoint.toParent[0][0] = 0.0001;
1635116660                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16394,16 +16703,16 @@
1639416703                             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]));
1639516704                         }
1639616705                         
16397
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16706
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1639816707                     }
1639916708                 }
1640016709                 
1640116710                 if (!movingcamera && !PAINTMODE)
1640216711                     object.editWindow.ScreenFitPoint(); // fev 2014
1640316712                 
16404
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16713
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1640516714                 {
16406
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16715
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1640716716                     
1640816717                     Object3D group = new Object3D("inst" + paintcount++);
1640916718                     
....@@ -16559,7 +16868,7 @@
1655916868                 gl.glDisable(gl.GL_CULL_FACE);
1656016869             }
1656116870 
16562
-            if (!RENDERSHADOW)
16871
+            if (!Globals.RENDERSHADOW)
1656316872                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1656416873 
1656516874             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16569,7 +16878,7 @@
1656916878             //gl.glColorMask(false, false, false, false);
1657016879 
1657116880             //render_scene_from_light_view(gl, drawable, 0, 0);
16572
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16881
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1657316882             {
1657416883                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1657516884 
....@@ -16985,23 +17294,15 @@
1698517294     int AAbuffersize = 0;
1698617295     
1698717296     //double[] selectedpoint = new double[3];
16988
-    static Superellipsoid selectedpoint = new Superellipsoid();
17297
+    static Superellipsoid selectedpoint;
1698917298     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();
17299
+    static Sphere debugpointG;
17300
+    static Sphere debugpointP;
17301
+    static Sphere debugpointC;
17302
+    static Sphere debugpointR;
1699417303     
1699517304     static Sphere debugpoints[] = new Sphere[8];
1699617305  
16997
-    static
16998
-    {
16999
-        for (int i=0; i<8; i++)
17000
-        {
17001
-            debugpoints[i] = new Sphere();
17002
-        }
17003
-    }
17004
-    
1700517306     static void InitPoints(float radius)
1700617307     {
1700717308         for (int i=0; i<8; i++)