blame | history | patch | commit | commitdiff
Normand Briere
2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1 
 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
....@@ -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     {
....@@ -325,7 +326,7 @@
325326                 cStatic.objectstack[materialdepth++] = obj;
326327                 //System.out.println("material " + material);
327328                 //Applet3D.tracein(this, selected);
328
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
329330                 if (obj instanceof Camera)
330331                 {
331332                     display.options1[0] = material.shift;
....@@ -334,14 +335,28 @@
334335                     display.options1[2] = material.shadowbias;
335336                     display.options1[3] = material.aniso;
336337                     display.options1[4] = material.anisoV;
338
+//                System.out.println("display.options1[0] " + display.options1[0]);
339
+//                System.out.println("display.options1[1] " + display.options1[1]);
340
+//                System.out.println("display.options1[2] " + display.options1[2]);
341
+//                System.out.println("display.options1[3] " + display.options1[3]);
342
+//                System.out.println("display.options1[4] " + display.options1[4]);
337343                     display.options2[0] = material.opacity;
338344                     display.options2[1] = material.diffuse;
339345                     display.options2[2] = material.factor;
346
+//                System.out.println("display.options2[0] " + display.options2[0]);
347
+//                System.out.println("display.options2[1] " + display.options2[1]);
348
+//                System.out.println("display.options2[2] " + display.options2[2]);
340349 
341350                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
351
+//                System.out.println("display.options3[0] " + display.options3[0]);
352
+//                System.out.println("display.options3[1] " + display.options3[1]);
353
+//                System.out.println("display.options3[2] " + display.options3[2]);
342354                     display.options4[0] = material.cameralight/0.2f;
343355                     display.options4[1] = material.subsurface;
344356                     display.options4[2] = material.sheen;
357
+//                System.out.println("display.options4[0] " + display.options4[0]);
358
+//                System.out.println("display.options4[1] " + display.options4[1]);
359
+//                System.out.println("display.options4[2] " + display.options4[2]);
345360                     
346361                  //   if (display.CURRENTANTIALIAS > 0)
347362                  //       display.options3[3] /= 4;
....@@ -357,7 +372,7 @@
357372                 /**/
358373                 } else
359374                 {
360
-                    DrawMaterial(material, selected);
375
+                    DrawMaterial(material, selected, obj.projectedVertices);
361376                 }
362377             } else
363378             {
....@@ -381,8 +396,8 @@
381396             cStatic.objectstack[materialdepth++] = obj;
382397             //System.out.println("material " + material);
383398             //Applet3D.tracein("selected ", selected);
384
-            display.vector2buffer = obj.projectedVertices;
385
-            display.DrawMaterial(material, selected);
399
+            //display.vector2buffer = obj.projectedVertices;
400
+            display.DrawMaterial(material, selected, obj.projectedVertices);
386401         }
387402     }
388403     
....@@ -399,8 +414,8 @@
399414                 materialdepth -= 1;
400415                 if (materialdepth > 0)
401416                 {
402
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403
-                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
417
+                    //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
418
+                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404419                 }
405420             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406421             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -420,8 +435,8 @@
420435             materialdepth -= 1;
421436             if (materialdepth > 0)
422437             {
423
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424
-                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
438
+                //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
439
+                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425440             }
426441         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427442         //else
....@@ -462,10 +477,12 @@
462477         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463478         {
464479             //gl.glBegin(gl.GL_TRIANGLES);
465
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
480
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
481
+                    // TEST LIVE NORMALS && !obj.dontselect
482
+                    ;
466483             if (!hasnorm)
467484             {
468
-           //     System.out.println("FUCK!!");
485
+           //     System.out.println("Mesh normal");
469486                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470487                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471488                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1190,10 +1207,12 @@
11901207                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911208                                 }
11921209                             }
1210
+                            
11931211                             if (flipV)
11941212                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951213                             else
11961214                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1215
+                            
11971216                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981217                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991218 
....@@ -1213,10 +1232,12 @@
12131232                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141233                                 }
12151234                             }
1235
+                            
12161236                             if (flipV)
12171237                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181238                             else
12191239                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1240
+                            
12201241                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211242                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221243 
....@@ -1244,8 +1265,10 @@
12441265                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451266                                 else
12461267                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1268
+                                
12471269                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481270                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1271
+                                
12491272                                 count2 += 2;
12501273                                 count3 += 3;
12511274                             }
....@@ -1601,7 +1624,7 @@
16011624 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16021625     }
16031626     
1604
-    void DrawMaterial(cMaterial material, boolean selected)
1627
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16051628     {
16061629             CameraPane display = this;
16071630         //new Exception().printStackTrace();
....@@ -1636,7 +1659,7 @@
16361659             colorV[0] = display.modelParams0[0] * material.diffuse;
16371660             colorV[1] = display.modelParams0[1] * material.diffuse;
16381661             colorV[2] = display.modelParams0[2] * material.diffuse;
1639
-            colorV[3] = material.opacity;
1662
+            colorV[3] = 1; // material.opacity;
16401663 
16411664             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16421665             //System.out.println("Opacity = " + opacity);
....@@ -1744,9 +1767,9 @@
17441767         display.modelParams7[2] = 0;
17451768         display.modelParams7[3] = 0;
17461769 
1747
-        display.modelParams6[0] = 100; // criss de bug de bump
1770
+        //display.modelParams6[0] = 100; // criss de bug de bump
17481771         
1749
-        Object3D.cVector2[] extparams = display.vector2buffer;
1772
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17501773         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17511774         {
17521775             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1888,7 +1911,7 @@
18881911     void PushMatrix(double[][] matrix)
18891912     {
18901913     //    GrafreeD.tracein(matrix);
1891
-        PushMatrix(matrix,1);
1914
+        PushMatrix(matrix, 1);
18921915     }
18931916     
18941917     void PushMatrix()
....@@ -2257,7 +2280,7 @@
22572280     
22582281     void ToggleDebug()
22592282     {
2260
-        DEBUG ^= true;
2283
+        Globals.DEBUG ^= true;
22612284     }
22622285 
22632286     void ToggleLookAt()
....@@ -2265,7 +2288,7 @@
22652288         LOOKAT ^= true;
22662289     }
22672290 
2268
-    void ToggleRandom()
2291
+    void ToggleSwitch()
22692292     {
22702293         SWITCH ^= true;
22712294     }
....@@ -2374,7 +2397,7 @@
23742397     {
23752398         return currentGL;
23762399     }
2377
-    
2400
+
23782401     /**/
23792402     class CacheTexture
23802403     {
....@@ -7919,6 +7942,64 @@
79197942         ReleaseTexture(pigment, false);
79207943     }
79217944     
7945
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7946
+    {
7947
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7948
+        {
7949
+            return;
7950
+        }
7951
+
7952
+        if (tex == null)
7953
+        {
7954
+            ReleaseTexture(null, false);
7955
+            return;
7956
+        }
7957
+        
7958
+        String pigment = Object3D.GetPigment(tex);
7959
+
7960
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7961
+        {
7962
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7963
+        //    System.out.println("; bump = " + bump);
7964
+        }
7965
+        
7966
+        if (pigment.equals(""))
7967
+        {
7968
+            pigment = null;
7969
+        }
7970
+        
7971
+        ReleaseTexture(pigment, false);
7972
+    }
7973
+    
7974
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7975
+    {
7976
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7977
+        {
7978
+            return;
7979
+        }
7980
+
7981
+        if (tex == null)
7982
+        {
7983
+            ReleaseTexture(null, true);
7984
+            return;
7985
+        }
7986
+        
7987
+        String bump = Object3D.GetBump(tex);
7988
+
7989
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7990
+        {
7991
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7992
+        //    System.out.println("; bump = " + bump);
7993
+        }
7994
+        
7995
+        if (bump.equals(""))
7996
+        {
7997
+            bump = null;
7998
+        }
7999
+        
8000
+        ReleaseTexture(bump, true);
8001
+    }
8002
+    
79228003     void ReleaseTexture(String tex, boolean bump)
79238004     {
79248005         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8022,7 +8103,7 @@
80228103         }
80238104     }
80248105 
8025
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8106
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80268107     {
80278108         if (// DrawMode() != 0 || /*tex == null ||*/
80288109                 ambientOcclusion ) // || !textureon)
....@@ -8067,7 +8148,94 @@
80678148         return; // true;
80688149     }
80698150     
8070
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8151
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8152
+    {
8153
+        if (// DrawMode() != 0 || /*tex == null ||*/
8154
+                ambientOcclusion ) // || !textureon)
8155
+        {
8156
+            return; // false;
8157
+        }
8158
+
8159
+        if (tex == null)
8160
+        {
8161
+            BindTexture(null,false,resolution);
8162
+            return;
8163
+        }
8164
+        
8165
+        String pigment = Object3D.GetPigment(tex);
8166
+
8167
+        usedtextures.put(pigment, pigment);
8168
+        
8169
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8170
+        {
8171
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8172
+        //    System.out.println("; bump = " + bump);
8173
+        }
8174
+        
8175
+        if (pigment.equals(""))
8176
+        {
8177
+            pigment = null;
8178
+        }
8179
+        
8180
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8181
+        BindTexture(pigment, false, resolution);
8182
+    }
8183
+    
8184
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8185
+    {
8186
+        if (// DrawMode() != 0 || /*tex == null ||*/
8187
+                ambientOcclusion ) // || !textureon)
8188
+        {
8189
+            return; // false;
8190
+        }
8191
+
8192
+        if (tex == null)
8193
+        {
8194
+            BindTexture(null,true,resolution);
8195
+            return;
8196
+        }
8197
+        
8198
+        String bump = Object3D.GetBump(tex);
8199
+
8200
+        usedtextures.put(bump, bump);
8201
+        
8202
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8203
+        {
8204
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8205
+        //    System.out.println("; bump = " + bump);
8206
+        }
8207
+        
8208
+        if (bump.equals(""))
8209
+        {
8210
+            bump = null;
8211
+        }
8212
+        
8213
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8214
+        BindTexture(bump, true, resolution);
8215
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8216
+    }
8217
+    
8218
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8219
+    
8220
+    private boolean FileExists(String tex)
8221
+    {
8222
+        if (missingTextures.contains(tex))
8223
+        {
8224
+            return false;
8225
+        }
8226
+        
8227
+        boolean fileExists = new File(tex).exists();
8228
+        
8229
+        if (!fileExists)
8230
+        {
8231
+            // If file exists, the "new File()" is not executed sgain
8232
+            missingTextures.add(tex);
8233
+        }
8234
+        
8235
+        return fileExists;
8236
+    }
8237
+    
8238
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718239     {
80728240         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80738241         
....@@ -8075,15 +8243,17 @@
80758243         {
80768244             String texname = tex;
80778245             
8246
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8247
+                
80788248 //            String[] split = tex.split("Textures");
80798249 //            if (split.length > 1)
80808250 //                texname = "/Users/nbriere/Textures" + split[split.length-1];
80818251 //            else
80828252 //                if (!texname.startsWith("/"))
80838253 //                    texname = "/Users/nbriere/Textures/" + texname;
8084
-            if (!new File(tex).exists())
8254
+            if (!FileExists(tex))
80858255             {
8086
-                    texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8256
+                    texname = fallbackTextureName;
80878257             }
80888258             
80898259             if (CACHETEXTURE)
....@@ -8153,7 +8323,7 @@
81538323                                     }
81548324                                 
81558325                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156
-                                    if (!new File(cachename).exists())
8326
+                                    if (!FileExists(cachename))
81578327                                         cachename = texname;
81588328                                     else
81598329                                         processbump = false; // don't process bump map again
....@@ -8175,7 +8345,7 @@
81758345                                     }
81768346                                 
81778347                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178
-                                    if (!new File(cachename).exists())
8348
+                                    if (!FileExists(cachename))
81798349                                         cachename = texname;
81808350                                     else
81818351                                         processbump = false; // don't process bump map again
....@@ -8184,7 +8354,9 @@
81848354                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81858355                                 
81868356                                 
8187
-                                if (texturedata != null)
8357
+                                if (texturedata == null)
8358
+                                    throw new Exception();
8359
+                                    
81888360                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81898361         //texture = GetTexture(tex, bump);
81908362                             }
....@@ -8306,7 +8478,7 @@
83068478         return texture;
83078479     }
83088480     
8309
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8481
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
83108482     {
83118483         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83128484                 
....@@ -8324,14 +8496,14 @@
83248496         return texture!=null?texture.texture:null;
83258497     }
83268498     
8327
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8499
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83288500     {
83298501         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83308502                 
83318503         return texture!=null?texture.texturedata:null;
83328504     }
83338505     
8334
-    boolean BindTexture(String tex, boolean bump, int resolution)
8506
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83358507     {
83368508         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83378509         {
....@@ -9208,11 +9380,35 @@
92089380         jy8[3] = 0.5f;
92099381     }
92109382     
9211
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9383
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
92129384     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
92139385     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
92149386     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
92159387 
9388
+    void ResetOptions()
9389
+    {
9390
+        options1[0] = 100;
9391
+        options1[1] = 0.025f;
9392
+        options1[2] = 0.01f;
9393
+        options1[3] = 0;
9394
+        options1[4] = 0;
9395
+        
9396
+        options2[0] = 0;
9397
+        options2[1] = 0.75f;
9398
+        options2[2] = 0;
9399
+        options2[3] = 0;
9400
+        
9401
+        options3[0] = 1;
9402
+        options3[1] = 1;
9403
+        options3[2] = 1;
9404
+        options3[3] = 0;
9405
+        
9406
+        options4[0] = 1;
9407
+        options4[1] = 0;
9408
+        options4[2] = 1;
9409
+        options4[3] = 0;
9410
+    }
9411
+    
92169412     static int imagecount = 0; // movie generation
92179413     
92189414     static int jitter = 0;
....@@ -9308,8 +9504,8 @@
93089504         assert (parentcam != renderCamera);
93099505         
93109506         if (renderCamera != lightCamera)
9311
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9312
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9507
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9508
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93139509         
93149510 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93159511             
....@@ -9324,8 +9520,8 @@
93249520             LA.matCopy(renderCamera.fromScreen, matrix);
93259521             
93269522         if (renderCamera != lightCamera)
9327
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9328
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9523
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9524
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93299525 
93309526 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93319527             
....@@ -10323,6 +10519,7 @@
1032310519                     ANTIALIAS = 0;
1032410520                     //System.out.println("RESTART");
1032510521                     AAtimer.restart();
10522
+                    Globals.TIMERRUNNING = true;
1032610523                 }
1032710524             }
1032810525         }
....@@ -10390,13 +10587,14 @@
1039010587             ambientOcclusion = false;
1039110588         }
1039210589 
10393
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10590
+        if (//Globals.lighttouched &&
10591
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039410592         {
1039510593             //if (RENDERSHADOW) // ?
1039610594             if (!IsFrozen())
1039710595             {
1039810596                 // dec 2012
10399
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10597
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1040010598                 {
1040110599             Globals.framecount++;
1040210600                     shadowbuffer.display();
....@@ -10523,8 +10721,8 @@
1052310721             
1052410722 //        if (parentcam != renderCamera) // not a light
1052510723         if (cam != lightCamera)
10526
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10724
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10725
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052810726             
1052910727             for (int j = 0; j < 4; j++)
1053010728             {
....@@ -10538,8 +10736,8 @@
1053810736             
1053910737 //        if (parentcam != renderCamera) // not a light
1054010738         if (cam != lightCamera)
10541
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10542
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10739
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10740
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054310741         
1054410742             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054510743             
....@@ -10798,7 +10996,16 @@
1079810996             // Bump noise
1079910997             gl.glActiveTexture(GL.GL_TEXTURE6);
1080010998             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
-            BindTexture(NOISE_TEXTURE, false, 2);
10999
+            
11000
+    try
11001
+    {
11002
+        BindTexture(NOISE_TEXTURE, false, 2);
11003
+    }
11004
+    catch (Exception e)
11005
+    {
11006
+        System.err.println("FAILED: " + NOISE_TEXTURE);
11007
+    }
11008
+           
1080211009 
1080311010             gl.glActiveTexture(GL.GL_TEXTURE0);
1080411011             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10923,8 +11130,8 @@
1092311130                 System.err.println("parentcam != renderCamera");
1092411131 
1092511132 //            if (cam != lightCamera)
10926
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10927
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11133
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11134
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1092811135         }
1092911136         
1093011137         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10945,8 +11152,8 @@
1094511152             if (true) // TODO
1094611153             {
1094711154                 if (cam != lightCamera)
10948
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10949
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11155
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11156
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1095011157             }
1095111158             
1095211159             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11291,8 +11498,29 @@
1129111498 
1129211499     static boolean zoomonce = false;
1129311500     
11501
+    static void CreateSelectedPoint()
11502
+    {
11503
+        if (selectedpoint == null)
11504
+        {
11505
+            debugpointG = new Sphere();
11506
+            debugpointP = new Sphere();
11507
+            debugpointC = new Sphere();
11508
+            debugpointR = new Sphere();
11509
+            
11510
+            selectedpoint = new Superellipsoid();
11511
+            
11512
+            for (int i=0; i<8; i++)
11513
+            {
11514
+                debugpoints[i] = new Sphere();
11515
+            }
11516
+        }
11517
+    }
11518
+    
1129411519     void DrawObject(GL gl, boolean draw)
1129511520     {
11521
+        // To clear camera values
11522
+        ResetOptions();
11523
+        
1129611524         //System.out.println("DRAW OBJECT " + mouseDown);
1129711525 //        DrawMode() = SELECTION;
1129811526         //GL gl = getGL();
....@@ -11354,7 +11582,14 @@
1135411582 
1135511583                 usedtextures.clear();
1135611584             
11357
-                BindTextures(DEFAULT_TEXTURES, 2);
11585
+    try
11586
+    {
11587
+        BindTextures(DEFAULT_TEXTURES, 2);
11588
+    }
11589
+    catch (Exception e)
11590
+    {
11591
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11592
+    }
1135811593             }
1135911594             //System.out.println("--> " + stackdepth);
1136011595 //            GrafreeD.traceon();
....@@ -11364,8 +11599,9 @@
1136411599             
1136511600             if (DrawMode() == DEFAULT)
1136611601             {
11367
-                if (DEBUG)
11602
+                if (Globals.DEBUG)
1136811603                 {
11604
+                    CreateSelectedPoint();
1136911605                     float radius = 0.05f;
1137011606                     if (selectedpoint.radius != radius)
1137111607                     {
....@@ -11445,7 +11681,14 @@
1144511681             if (checker != null && DrawMode() == DEFAULT)
1144611682             {
1144711683                 //BindTexture(IMMORTAL_TEXTURE);
11448
-                BindTextures(checker.GetTextures(), checker.texres);
11684
+    try
11685
+    {
11686
+        BindTextures(checker.GetTextures(), checker.texres);
11687
+    }
11688
+    catch (Exception e)
11689
+    {
11690
+        System.err.println("FAILED: " + checker.GetTextures());
11691
+    }
1144911692                 // NEAREST
1145011693                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145111694                 DrawChecker(gl);
....@@ -11527,7 +11770,7 @@
1152711770             return;
1152811771         }
1152911772 
11530
-        String string = obj.GetToolTip();
11773
+        String string = obj.toString(); //.GetToolTip();
1153111774         
1153211775         GL gl = GetGL();
1153311776         
....@@ -11844,8 +12087,8 @@
1184412087             //obj.TransformToWorld(light, light);
1184512088             for (int i = tp.size(); --i >= 0;)
1184612089             {
11847
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848
-                    LA.xformPos(light, tp.get(i).toParent, light);
12090
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12091
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1184912092             }
1185012093 
1185112094 
....@@ -11862,8 +12105,8 @@
1186212105                 parentcam = cameras[0];
1186312106             }
1186412107             
11865
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11866
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12108
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12109
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186712110 
1186812111             LA.xformPos(light, renderCamera.toScreen, light);
1186912112             
....@@ -12477,8 +12720,8 @@
1247712720 
1247812721            // display shadow only (bump == 0)
1247912722          "SUB temp.x, half.x, shadow.x;" +
12480
-         "MOV temp.y, -params6.x;" +
12481
-         "SLT temp.z, temp.y, zero.x;" +
12723
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12724
+         "SLT temp.z, temp.y, -one2048th.x;" +
1248212725          "SUB temp.y, one.x, temp.z;" +
1248312726          "MUL temp.x, temp.x, temp.y;" +
1248412727          "KIL temp.x;" +
....@@ -12809,7 +13052,7 @@
1280913052             //once = true;
1281013053         }
1281113054 
12812
-        System.out.print("Program #" + mode + "; length = " + program.length());
13055
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1281313056         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1281413057         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281513058 
....@@ -12942,12 +13185,16 @@
1294213185 
1294313186                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294413187                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13188
+                
13189
+                // Compare fragment depth in light space with shadowmap.
1294513190                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294613191                 "SGE temp.y, temp.x, zero.x;" +
12947
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13192
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13193
+                
13194
+                // Reverse comparison
1294813195                 "SUB temp.x, one.x, temp.x;" +
1294913196                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12950
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13197
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1295113198                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1295213199 
1295313200                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12961,6 +13208,10 @@
1296113208                 // No shadow for backface
1296213209                 "DP3 temp.x, normal, lightd;" +
1296313210                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13211
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13212
+
13213
+                // No shadow when out of frustrum
13214
+                "SGE temp.x, " + depth + ".z, one.z;" +
1296413215                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296513216                 "";
1296613217     }
....@@ -13107,7 +13358,8 @@
1310713358     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1310813359     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1310913360     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110
-    Object3D.cVector2[] vector2buffer;
13361
+    
13362
+    //Object3D.cVector2[] vector2buffer;
1311113363 
1311213364     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1311313365     // OUT : diff, spec
....@@ -13630,6 +13882,7 @@
1363013882         else
1363113883         if (evt.getSource() == AAtimer)
1363213884         {
13885
+                    Globals.TIMERRUNNING = false;
1363313886             if (mouseDown)
1363413887             {
1363513888             //new Exception().printStackTrace();
....@@ -13704,6 +13957,7 @@
1370413957             return;
1370513958         
1370613959         AAtimer.restart(); // 
13960
+        Globals.TIMERRUNNING = true;
1370713961 
1370813962 //        waslive = LIVE;
1370913963 //        LIVE = false;
....@@ -13776,9 +14030,12 @@
1377614030     
1377714031     public void mouseDragged(MouseEvent e)
1377814032     {
14033
+        Globals.MOUSEDRAGGED = true;
14034
+        
1377914035         //System.out.println("mouseDragged: " + e);
1378014036         if (isRenderer)
1378114037             movingcamera = true;
14038
+        
1378214039         //if (drawing)
1378314040         //return;
1378414041         if ((e.getModifiersEx() & CTRL) != 0
....@@ -14164,7 +14421,8 @@
1416414421                 info.camera = renderCamera;
1416514422                 info.x = x;
1416614423                 info.y = y;
14167
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14424
+                object.GetWindow().copy
14425
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416814426             } else
1416914427             {
1417014428                 if (x < startX)
....@@ -14328,7 +14586,9 @@
1432814586         ci.camera = renderCamera;
1432914587         if (!isRenderer)
1433014588         {
14331
-            if (object.editWindow.copy.doEditClick(ci, 0))
14589
+            //ObjEditor editWindow = object.editWindow;
14590
+            //Object3D copy = editWindow.copy;
14591
+            if (object.doEditClick(ci, 0))
1433214592             {
1433314593                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1433414594             } else
....@@ -14340,7 +14600,10 @@
1434014600 
1434114601     public void mouseReleased(MouseEvent e)
1434214602     {
14603
+        Globals.MOUSEDRAGGED = false;
14604
+        
1434314605         movingcamera = false;
14606
+        X = Y = 0;
1434414607         //System.out.println("mouseReleased: " + e);
1434514608         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1434614609     }
....@@ -14706,8 +14969,14 @@
1470614969                 RevertCamera();
1470714970                 repaint();
1470814971                 break;
14709
-            case 'L':
1471014972             case 'l':
14973
+                lightMode ^= true;
14974
+                Globals.lighttouched = true;
14975
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14976
+                targetLookAt.set(manipCamera.lookAt);
14977
+                repaint();
14978
+                break;
14979
+            case 'L':
1471114980                 if (lightMode)
1471214981                 {
1471314982                     lightMode = false;
....@@ -14854,23 +15123,21 @@
1485415123                 kompactbit = 6;
1485515124                 break;
1485615125             case ' ':
14857
-                lightMode ^= true;
14858
-                Globals.lighttouched = true;
14859
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14860
-                targetLookAt.set(manipCamera.lookAt);
15126
+                ObjEditor.theFrame.ToggleFullScreen();
1486115127                 repaint();
1486215128                 break;
1486315129             //case '`' :
1486415130             case ESC:
1486515131                 RENDERPROGRAM += 1;
1486615132                 RENDERPROGRAM %= 3;
15133
+
1486715134                 repaint();
1486815135                 break;
1486915136             case 'Z':
1487015137                 //RESIZETEXTURE ^= true;
1487115138                 //break;
1487215139             case 'z':
14873
-                RENDERSHADOW ^= true;
15140
+                Globals.RENDERSHADOW ^= true;
1487415141                 Globals.lighttouched = true;
1487515142                 repaint();
1487615143                 break;
....@@ -15155,7 +15422,7 @@
1515515422         }
1515615423          */
1515715424 
15158
-        object.editWindow.EditSelection();
15425
+        object.editWindow.EditSelection(false);
1515915426     }
1516015427 
1516115428     void SelectParent()
....@@ -15349,7 +15616,9 @@
1534915616         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1535015617         //Image img = CreateImage(width, height);
1535115618         //System.out.println("width = " + width + "; height = " + height + "\n");
15619
+        
1535215620         Graphics gr = g; // img.getGraphics();
15621
+        
1535315622         if (!hasMarquee)
1535415623         {
1535515624             if (Xmin < Xmax) // !locked)
....@@ -15447,14 +15716,33 @@
1544715716             if (!isRenderer)
1544815717             {
1544915718                 object.drawEditHandles(info, 0);
15719
+                
15720
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15721
+                {
15722
+                    switch (object.selection.get(0).hitSomething)
15723
+                    {
15724
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15725
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15726
+                            break;
15727
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15728
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15729
+                        break;
15730
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15731
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15732
+                        break;
15733
+                    }
15734
+                    
15735
+                }
1545015736             }
1545115737         }
15738
+        
1545215739         if (isRenderer)
1545315740         {
1545415741         //gr.setColor(Color.black);
1545515742         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1545615743         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1545715744         }
15745
+        
1545815746         if (hasMarquee)
1545915747         {
1546015748             gr.setXORMode(Color.white);
....@@ -15861,7 +16149,7 @@
1586116149     Object3D object;
1586216150     static Object3D trackedobject;
1586316151     Camera renderCamera; // Light or Eye (or Occlusion)
15864
-    /*static*/ Camera manipCamera; // Light or Eye
16152
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1586516153 	/*static*/ Camera eyeCamera;
1586616154     /*static*/ Camera lightCamera;
1586716155     int cameracount;
....@@ -16146,16 +16434,16 @@
1614616434                 cStatic.objectstack[materialdepth++] = checker;
1614716435                 //System.out.println("material " + material);
1614816436                 //Applet3D.tracein(this, selected);
16149
-                vector2buffer = checker.projectedVertices;
16437
+                //vector2buffer = checker.projectedVertices;
1615016438 
1615116439         //checker.GetMaterial().Draw(this, false); // true);
16152
-        DrawMaterial(checker.GetMaterial(), false); // true);
16440
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1615316441 
1615416442                 materialdepth -= 1;
1615516443                 if (materialdepth > 0)
1615616444                 {
16157
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16158
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16445
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16446
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1615916447                 }
1616016448         //checker.GetMaterial().opacity = 1f;
1616116449         ////checker.GetMaterial().ambient = 1f;
....@@ -16379,6 +16667,8 @@
1637916667 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1638016668 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1638116669                 
16670
+                CreateSelectedPoint();
16671
+                
1638216672                 // Will fit the mesh !!!
1638316673                 selectedpoint.toParent[0][0] = 0.0001;
1638416674                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16592,7 +16882,7 @@
1659216882                 gl.glDisable(gl.GL_CULL_FACE);
1659316883             }
1659416884 
16595
-            if (!RENDERSHADOW)
16885
+            if (!Globals.RENDERSHADOW)
1659616886                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659716887 
1659816888             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16602,7 +16892,7 @@
1660216892             //gl.glColorMask(false, false, false, false);
1660316893 
1660416894             //render_scene_from_light_view(gl, drawable, 0, 0);
16605
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16895
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660616896             {
1660716897                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660816898 
....@@ -17018,23 +17308,15 @@
1701817308     int AAbuffersize = 0;
1701917309     
1702017310     //double[] selectedpoint = new double[3];
17021
-    static Superellipsoid selectedpoint = new Superellipsoid();
17311
+    static Superellipsoid selectedpoint;
1702217312     static Sphere previousselectedpoint = null;
17023
-    static Sphere debugpointG = new Sphere();
17024
-    static Sphere debugpointP = new Sphere();
17025
-    static Sphere debugpointC = new Sphere();
17026
-    static Sphere debugpointR = new Sphere();
17313
+    static Sphere debugpointG;
17314
+    static Sphere debugpointP;
17315
+    static Sphere debugpointC;
17316
+    static Sphere debugpointR;
1702717317     
1702817318     static Sphere debugpoints[] = new Sphere[8];
1702917319  
17030
-    static
17031
-    {
17032
-        for (int i=0; i<8; i++)
17033
-        {
17034
-            debugpoints[i] = new Sphere();
17035
-        }
17036
-    }
17037
-    
1703817320     static void InitPoints(float radius)
1703917321     {
1704017322         for (int i=0; i<8; i++)