blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 47cd0f0a3870d843cb758535316060d30f15c811 
 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;
....@@ -357,7 +358,7 @@
357358                 /**/
358359                 } else
359360                 {
360
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
361362                 }
362363             } else
363364             {
....@@ -381,8 +382,8 @@
381382             cStatic.objectstack[materialdepth++] = obj;
382383             //System.out.println("material " + material);
383384             //Applet3D.tracein("selected ", selected);
384
-            display.vector2buffer = obj.projectedVertices;
385
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
386387         }
387388     }
388389     
....@@ -399,8 +400,8 @@
399400                 materialdepth -= 1;
400401                 if (materialdepth > 0)
401402                 {
402
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403
-                    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);
404405                 }
405406             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406407             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -420,8 +421,8 @@
420421             materialdepth -= 1;
421422             if (materialdepth > 0)
422423             {
423
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424
-                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);
425426             }
426427         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427428         //else
....@@ -462,10 +463,12 @@
462463         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463464         {
464465             //gl.glBegin(gl.GL_TRIANGLES);
465
-            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
+                    ;
466469             if (!hasnorm)
467470             {
468
-           //     System.out.println("FUCK!!");
471
+           //     System.out.println("Mesh normal");
469472                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470473                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471474                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1190,10 +1193,12 @@
11901193                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911194                                 }
11921195                             }
1196
+                            
11931197                             if (flipV)
11941198                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951199                             else
11961200                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+                            
11971202                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981203                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991204 
....@@ -1213,10 +1218,12 @@
12131218                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141219                                 }
12151220                             }
1221
+                            
12161222                             if (flipV)
12171223                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181224                             else
12191225                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+                            
12201227                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211228                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221229 
....@@ -1244,8 +1251,10 @@
12441251                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451252                                 else
12461253                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+                                
12471255                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481256                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+                                
12491258                                 count2 += 2;
12501259                                 count3 += 3;
12511260                             }
....@@ -1601,7 +1610,7 @@
16011610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16021611     }
16031612     
1604
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16051614     {
16061615             CameraPane display = this;
16071616         //new Exception().printStackTrace();
....@@ -1628,7 +1637,7 @@
16281637             
16291638         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301639 
1631
-        float[] colorV = GrafreeD.colorV;
1640
+        float[] colorV = Grafreed.colorV;
16321641 
16331642         /**/
16341643         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1636,7 +1645,7 @@
16361645             colorV[0] = display.modelParams0[0] * material.diffuse;
16371646             colorV[1] = display.modelParams0[1] * material.diffuse;
16381647             colorV[2] = display.modelParams0[2] * material.diffuse;
1639
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16401649 
16411650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16421651             //System.out.println("Opacity = " + opacity);
....@@ -1744,9 +1753,9 @@
17441753         display.modelParams7[2] = 0;
17451754         display.modelParams7[3] = 0;
17461755 
1747
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17481757         
1749
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17501759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17511760         {
17521761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1888,7 +1897,7 @@
18881897     void PushMatrix(double[][] matrix)
18891898     {
18901899     //    GrafreeD.tracein(matrix);
1891
-        PushMatrix(matrix,1);
1900
+        PushMatrix(matrix, 1);
18921901     }
18931902     
18941903     void PushMatrix()
....@@ -2140,7 +2149,7 @@
21402149         System.err.println("LIVE = " + Globals.isLIVE());
21412150         
21422151         if (!Globals.isLIVE()) // save sound
2143
-            GrafreeD.savesound = true; // wav.save();
2152
+            Grafreed.savesound = true; // wav.save();
21442153      //   else
21452154             repaint(); // start loop // may 2013
21462155     }
....@@ -2257,7 +2266,7 @@
22572266     
22582267     void ToggleDebug()
22592268     {
2260
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22612270     }
22622271 
22632272     void ToggleLookAt()
....@@ -2265,7 +2274,7 @@
22652274         LOOKAT ^= true;
22662275     }
22672276 
2268
-    void ToggleRandom()
2277
+    void ToggleSwitch()
22692278     {
22702279         SWITCH ^= true;
22712280     }
....@@ -2374,7 +2383,7 @@
23742383     {
23752384         return currentGL;
23762385     }
2377
-    
2386
+
23782387     /**/
23792388     class CacheTexture
23802389     {
....@@ -7919,6 +7928,64 @@
79197928         ReleaseTexture(pigment, false);
79207929     }
79217930     
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
+    
79227989     void ReleaseTexture(String tex, boolean bump)
79237990     {
79247991         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8022,7 +8089,7 @@
80228089         }
80238090     }
80248091 
8025
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80268093     {
80278094         if (// DrawMode() != 0 || /*tex == null ||*/
80288095                 ambientOcclusion ) // || !textureon)
....@@ -8067,7 +8134,94 @@
80678134         return; // true;
80688135     }
80698136     
8070
-    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
80718225     {
80728226         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80738227         
....@@ -8075,15 +8229,17 @@
80758229         {
80768230             String texname = tex;
80778231             
8232
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233
+                
80788234 //            String[] split = tex.split("Textures");
80798235 //            if (split.length > 1)
80808236 //                texname = "/Users/nbriere/Textures" + split[split.length-1];
80818237 //            else
80828238 //                if (!texname.startsWith("/"))
80838239 //                    texname = "/Users/nbriere/Textures/" + texname;
8084
-            if (!new File(tex).exists())
8240
+            if (!FileExists(tex))
80858241             {
8086
-                    texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8242
+                    texname = fallbackTextureName;
80878243             }
80888244             
80898245             if (CACHETEXTURE)
....@@ -8153,7 +8309,7 @@
81538309                                     }
81548310                                 
81558311                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156
-                                    if (!new File(cachename).exists())
8312
+                                    if (!FileExists(cachename))
81578313                                         cachename = texname;
81588314                                     else
81598315                                         processbump = false; // don't process bump map again
....@@ -8175,7 +8331,7 @@
81758331                                     }
81768332                                 
81778333                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178
-                                    if (!new File(cachename).exists())
8334
+                                    if (!FileExists(cachename))
81798335                                         cachename = texname;
81808336                                     else
81818337                                         processbump = false; // don't process bump map again
....@@ -8184,7 +8340,9 @@
81848340                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81858341                                 
81868342                                 
8187
-                                if (texturedata != null)
8343
+                                if (texturedata == null)
8344
+                                    throw new Exception();
8345
+                                    
81888346                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81898347         //texture = GetTexture(tex, bump);
81908348                             }
....@@ -8306,7 +8464,7 @@
83068464         return texture;
83078465     }
83088466     
8309
-    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
83108468     {
83118469         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83128470                 
....@@ -8324,14 +8482,14 @@
83248482         return texture!=null?texture.texture:null;
83258483     }
83268484     
8327
-    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
83288486     {
83298487         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83308488                 
83318489         return texture!=null?texture.texturedata:null;
83328490     }
83338491     
8334
-    boolean BindTexture(String tex, boolean bump, int resolution)
8492
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83358493     {
83368494         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83378495         {
....@@ -9308,8 +9466,8 @@
93089466         assert (parentcam != renderCamera);
93099467         
93109468         if (renderCamera != lightCamera)
9311
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9312
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93139471         
93149472 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93159473             
....@@ -9324,8 +9482,8 @@
93249482             LA.matCopy(renderCamera.fromScreen, matrix);
93259483             
93269484         if (renderCamera != lightCamera)
9327
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9328
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93299487 
93309488 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93319489             
....@@ -9542,7 +9700,7 @@
95429700             
95439701             if (!BOXMODE)
95449702             {
9545
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9703
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95469704             }
95479705     
95489706             if (!BOXMODE)
....@@ -9580,7 +9738,7 @@
95809738             ABORTED = false;
95819739         }
95829740         else
9583
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+            Grafreed.wav.cursor += 735 * ACSIZE;
95849742         
95859743         if (false)
95869744         {
....@@ -10243,11 +10401,11 @@
1024310401 
1024410402     public void display(GLAutoDrawable drawable)
1024510403     {
10246
-        if (GrafreeD.savesound && GrafreeD.hassound)
10404
+        if (Grafreed.savesound && Grafreed.hassound)
1024710405         {
10248
-            GrafreeD.wav.save();
10249
-            GrafreeD.savesound = false;
10250
-            GrafreeD.hassound = false;
10406
+            Grafreed.wav.save();
10407
+            Grafreed.savesound = false;
10408
+            Grafreed.hassound = false;
1025110409         }
1025210410 //        if (DEBUG_SELECTION)
1025310411 //        {
....@@ -10377,7 +10535,7 @@
1037710535             Object3D theobject = object;
1037810536             Object3D theparent = object.parent;
1037910537             object.parent = null;
10380
-            object = (Object3D)GrafreeD.clone(object);
10538
+            object = (Object3D)Grafreed.clone(object);
1038110539             object.Stripify();
1038210540             if (theobject.selection == null || theobject.selection.Size() == 0)
1038310541                 theobject.PreprocessOcclusion(this);
....@@ -10390,13 +10548,14 @@
1039010548             ambientOcclusion = false;
1039110549         }
1039210550 
10393
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+        if (//Globals.lighttouched &&
10552
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039410553         {
1039510554             //if (RENDERSHADOW) // ?
1039610555             if (!IsFrozen())
1039710556             {
1039810557                 // dec 2012
10399
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10558
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1040010559                 {
1040110560             Globals.framecount++;
1040210561                     shadowbuffer.display();
....@@ -10523,8 +10682,8 @@
1052310682             
1052410683 //        if (parentcam != renderCamera) // not a light
1052510684         if (cam != lightCamera)
10526
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10685
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10686
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052810687             
1052910688             for (int j = 0; j < 4; j++)
1053010689             {
....@@ -10538,8 +10697,8 @@
1053810697             
1053910698 //        if (parentcam != renderCamera) // not a light
1054010699         if (cam != lightCamera)
10541
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10542
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10700
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10701
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054310702         
1054410703             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054510704             
....@@ -10798,7 +10957,16 @@
1079810957             // Bump noise
1079910958             gl.glActiveTexture(GL.GL_TEXTURE6);
1080010959             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
-            BindTexture(NOISE_TEXTURE, false, 2);
10960
+            
10961
+    try
10962
+    {
10963
+        BindTexture(NOISE_TEXTURE, false, 2);
10964
+    }
10965
+    catch (Exception e)
10966
+    {
10967
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10968
+    }
10969
+           
1080210970 
1080310971             gl.glActiveTexture(GL.GL_TEXTURE0);
1080410972             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10923,8 +11091,8 @@
1092311091                 System.err.println("parentcam != renderCamera");
1092411092 
1092511093 //            if (cam != lightCamera)
10926
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10927
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11094
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11095
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1092811096         }
1092911097         
1093011098         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10945,8 +11113,8 @@
1094511113             if (true) // TODO
1094611114             {
1094711115                 if (cam != lightCamera)
10948
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10949
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11116
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11117
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1095011118             }
1095111119             
1095211120             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11283,13 +11451,31 @@
1128311451             e.printStackTrace();
1128411452         }
1128511453         
11286
-        if (GrafreeD.RENDERME > 0)
11287
-            GrafreeD.RENDERME--; // mechante magouille
11454
+        if (Grafreed.RENDERME > 0)
11455
+            Grafreed.RENDERME--; // mechante magouille
1128811456         
1128911457         Globals.ONESTEP = false;
1129011458     }
1129111459 
1129211460     static boolean zoomonce = false;
11461
+    
11462
+    static void CreateSelectedPoint()
11463
+    {
11464
+        if (selectedpoint == null)
11465
+        {
11466
+            debugpointG = new Sphere();
11467
+            debugpointP = new Sphere();
11468
+            debugpointC = new Sphere();
11469
+            debugpointR = new Sphere();
11470
+            
11471
+            selectedpoint = new Superellipsoid();
11472
+            
11473
+            for (int i=0; i<8; i++)
11474
+            {
11475
+                debugpoints[i] = new Sphere();
11476
+            }
11477
+        }
11478
+    }
1129311479     
1129411480     void DrawObject(GL gl, boolean draw)
1129511481     {
....@@ -11354,7 +11540,14 @@
1135411540 
1135511541                 usedtextures.clear();
1135611542             
11357
-                BindTextures(DEFAULT_TEXTURES, 2);
11543
+    try
11544
+    {
11545
+        BindTextures(DEFAULT_TEXTURES, 2);
11546
+    }
11547
+    catch (Exception e)
11548
+    {
11549
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11550
+    }
1135811551             }
1135911552             //System.out.println("--> " + stackdepth);
1136011553 //            GrafreeD.traceon();
....@@ -11364,8 +11557,9 @@
1136411557             
1136511558             if (DrawMode() == DEFAULT)
1136611559             {
11367
-                if (DEBUG)
11560
+                if (Globals.DEBUG)
1136811561                 {
11562
+                    CreateSelectedPoint();
1136911563                     float radius = 0.05f;
1137011564                     if (selectedpoint.radius != radius)
1137111565                     {
....@@ -11445,7 +11639,14 @@
1144511639             if (checker != null && DrawMode() == DEFAULT)
1144611640             {
1144711641                 //BindTexture(IMMORTAL_TEXTURE);
11448
-                BindTextures(checker.GetTextures(), checker.texres);
11642
+    try
11643
+    {
11644
+        BindTextures(checker.GetTextures(), checker.texres);
11645
+    }
11646
+    catch (Exception e)
11647
+    {
11648
+        System.err.println("FAILED: " + checker.GetTextures());
11649
+    }
1144911650                 // NEAREST
1145011651                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145111652                 DrawChecker(gl);
....@@ -11527,7 +11728,7 @@
1152711728             return;
1152811729         }
1152911730 
11530
-        String string = obj.GetToolTip();
11731
+        String string = obj.toString(); //.GetToolTip();
1153111732         
1153211733         GL gl = GetGL();
1153311734         
....@@ -11844,8 +12045,8 @@
1184412045             //obj.TransformToWorld(light, light);
1184512046             for (int i = tp.size(); --i >= 0;)
1184612047             {
11847
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848
-                    LA.xformPos(light, tp.get(i).toParent, light);
12048
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1184912050             }
1185012051 
1185112052 
....@@ -11862,8 +12063,8 @@
1186212063                 parentcam = cameras[0];
1186312064             }
1186412065             
11865
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11866
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12066
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12067
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186712068 
1186812069             LA.xformPos(light, renderCamera.toScreen, light);
1186912070             
....@@ -12477,8 +12678,8 @@
1247712678 
1247812679            // display shadow only (bump == 0)
1247912680          "SUB temp.x, half.x, shadow.x;" +
12480
-         "MOV temp.y, -params6.x;" +
12481
-         "SLT temp.z, temp.y, zero.x;" +
12681
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12682
+         "SLT temp.z, temp.y, -one2048th.x;" +
1248212683          "SUB temp.y, one.x, temp.z;" +
1248312684          "MUL temp.x, temp.x, temp.y;" +
1248412685          "KIL temp.x;" +
....@@ -12809,7 +13010,7 @@
1280913010             //once = true;
1281013011         }
1281113012 
12812
-        System.out.print("Program #" + mode + "; length = " + program.length());
13013
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1281313014         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1281413015         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281513016 
....@@ -12942,12 +13143,16 @@
1294213143 
1294313144                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294413145                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13146
+                
13147
+                // Compare fragment depth in light space with shadowmap.
1294513148                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294613149                 "SGE temp.y, temp.x, zero.x;" +
12947
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13150
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13151
+                
13152
+                // Reverse comparison
1294813153                 "SUB temp.x, one.x, temp.x;" +
1294913154                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12950
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13155
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1295113156                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1295213157 
1295313158                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12961,6 +13166,10 @@
1296113166                 // No shadow for backface
1296213167                 "DP3 temp.x, normal, lightd;" +
1296313168                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13169
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13170
+
13171
+                // No shadow when out of frustrum
13172
+                "SGE temp.x, " + depth + ".z, one.z;" +
1296413173                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296513174                 "";
1296613175     }
....@@ -13107,7 +13316,8 @@
1310713316     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1310813317     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1310913318     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110
-    Object3D.cVector2[] vector2buffer;
13319
+    
13320
+    //Object3D.cVector2[] vector2buffer;
1311113321 
1311213322     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1311313323     // OUT : diff, spec
....@@ -13656,6 +13866,10 @@
1365613866 //            wasliveok = true;
1365713867 //            waslive = false;
1365813868             
13869
+            // May 2019 Forget it:
13870
+            if (true)
13871
+                    return;
13872
+            
1365913873             // source == timer
1366013874             if (mouseDown)
1366113875             {
....@@ -13772,9 +13986,12 @@
1377213986     
1377313987     public void mouseDragged(MouseEvent e)
1377413988     {
13989
+        Globals.MOUSEDRAGGED = true;
13990
+        
1377513991         //System.out.println("mouseDragged: " + e);
1377613992         if (isRenderer)
1377713993             movingcamera = true;
13994
+        
1377813995         //if (drawing)
1377913996         //return;
1378013997         if ((e.getModifiersEx() & CTRL) != 0
....@@ -14160,7 +14377,8 @@
1416014377                 info.camera = renderCamera;
1416114378                 info.x = x;
1416214379                 info.y = y;
14163
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14380
+                object.GetWindow().copy
14381
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416414382             } else
1416514383             {
1416614384                 if (x < startX)
....@@ -14324,7 +14542,9 @@
1432414542         ci.camera = renderCamera;
1432514543         if (!isRenderer)
1432614544         {
14327
-            if (object.editWindow.copy.doEditClick(ci, 0))
14545
+            //ObjEditor editWindow = object.editWindow;
14546
+            //Object3D copy = editWindow.copy;
14547
+            if (object.doEditClick(ci, 0))
1432814548             {
1432914549                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1433014550             } else
....@@ -14336,7 +14556,10 @@
1433614556 
1433714557     public void mouseReleased(MouseEvent e)
1433814558     {
14559
+        Globals.MOUSEDRAGGED = false;
14560
+        
1433914561         movingcamera = false;
14562
+        X = Y = 0;
1434014563         //System.out.println("mouseReleased: " + e);
1434114564         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1434214565     }
....@@ -14359,7 +14582,7 @@
1435914582         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1436014583         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1436114584         
14362
-        if (control || command || IsFrozen())
14585
+// No delay        if (control || command || IsFrozen())
1436314586             timeout = true;
1436414587 // ?? May 2019        else
1436514588        // timer.setDelay((modifiers & 128) != 0?0:350);
....@@ -14702,8 +14925,14 @@
1470214925                 RevertCamera();
1470314926                 repaint();
1470414927                 break;
14705
-            case 'L':
1470614928             case 'l':
14929
+                lightMode ^= true;
14930
+                Globals.lighttouched = true;
14931
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14932
+                targetLookAt.set(manipCamera.lookAt);
14933
+                repaint();
14934
+                break;
14935
+            case 'L':
1470714936                 if (lightMode)
1470814937                 {
1470914938                     lightMode = false;
....@@ -14850,23 +15079,21 @@
1485015079                 kompactbit = 6;
1485115080                 break;
1485215081             case ' ':
14853
-                lightMode ^= true;
14854
-                Globals.lighttouched = true;
14855
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14856
-                targetLookAt.set(manipCamera.lookAt);
15082
+                ObjEditor.theFrame.ToggleFullScreen();
1485715083                 repaint();
1485815084                 break;
1485915085             //case '`' :
1486015086             case ESC:
1486115087                 RENDERPROGRAM += 1;
1486215088                 RENDERPROGRAM %= 3;
15089
+
1486315090                 repaint();
1486415091                 break;
1486515092             case 'Z':
1486615093                 //RESIZETEXTURE ^= true;
1486715094                 //break;
1486815095             case 'z':
14869
-                RENDERSHADOW ^= true;
15096
+                Globals.RENDERSHADOW ^= true;
1487015097                 Globals.lighttouched = true;
1487115098                 repaint();
1487215099                 break;
....@@ -15151,7 +15378,7 @@
1515115378         }
1515215379          */
1515315380 
15154
-        object.editWindow.EditSelection();
15381
+        object.editWindow.EditSelection(false);
1515515382     }
1515615383 
1515715384     void SelectParent()
....@@ -15345,7 +15572,9 @@
1534515572         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1534615573         //Image img = CreateImage(width, height);
1534715574         //System.out.println("width = " + width + "; height = " + height + "\n");
15575
+        
1534815576         Graphics gr = g; // img.getGraphics();
15577
+        
1534915578         if (!hasMarquee)
1535015579         {
1535115580             if (Xmin < Xmax) // !locked)
....@@ -15443,14 +15672,33 @@
1544315672             if (!isRenderer)
1544415673             {
1544515674                 object.drawEditHandles(info, 0);
15675
+                
15676
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15677
+                {
15678
+                    switch (object.selection.get(0).hitSomething)
15679
+                    {
15680
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15681
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15682
+                            break;
15683
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15684
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
+                        break;
15686
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15687
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
+                        break;
15689
+                    }
15690
+                    
15691
+                }
1544615692             }
1544715693         }
15694
+        
1544815695         if (isRenderer)
1544915696         {
1545015697         //gr.setColor(Color.black);
1545115698         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1545215699         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1545315700         }
15701
+        
1545415702         if (hasMarquee)
1545515703         {
1545615704             gr.setXORMode(Color.white);
....@@ -15857,7 +16105,7 @@
1585716105     Object3D object;
1585816106     static Object3D trackedobject;
1585916107     Camera renderCamera; // Light or Eye (or Occlusion)
15860
-    /*static*/ Camera manipCamera; // Light or Eye
16108
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1586116109 	/*static*/ Camera eyeCamera;
1586216110     /*static*/ Camera lightCamera;
1586316111     int cameracount;
....@@ -16142,16 +16390,16 @@
1614216390                 cStatic.objectstack[materialdepth++] = checker;
1614316391                 //System.out.println("material " + material);
1614416392                 //Applet3D.tracein(this, selected);
16145
-                vector2buffer = checker.projectedVertices;
16393
+                //vector2buffer = checker.projectedVertices;
1614616394 
1614716395         //checker.GetMaterial().Draw(this, false); // true);
16148
-        DrawMaterial(checker.GetMaterial(), false); // true);
16396
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1614916397 
1615016398                 materialdepth -= 1;
1615116399                 if (materialdepth > 0)
1615216400                 {
16153
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16154
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16401
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16402
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1615516403                 }
1615616404         //checker.GetMaterial().opacity = 1f;
1615716405         ////checker.GetMaterial().ambient = 1f;
....@@ -16375,6 +16623,8 @@
1637516623 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1637616624 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1637716625                 
16626
+                CreateSelectedPoint();
16627
+                
1637816628                 // Will fit the mesh !!!
1637916629                 selectedpoint.toParent[0][0] = 0.0001;
1638016630                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16423,16 +16673,16 @@
1642316673                             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]));
1642416674                         }
1642516675                         
16426
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16676
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1642716677                     }
1642816678                 }
1642916679                 
1643016680                 if (!movingcamera && !PAINTMODE)
1643116681                     object.editWindow.ScreenFitPoint(); // fev 2014
1643216682                 
16433
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16683
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643416684                 {
16435
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16685
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1643616686                     
1643716687                     Object3D group = new Object3D("inst" + paintcount++);
1643816688                     
....@@ -16588,7 +16838,7 @@
1658816838                 gl.glDisable(gl.GL_CULL_FACE);
1658916839             }
1659016840 
16591
-            if (!RENDERSHADOW)
16841
+            if (!Globals.RENDERSHADOW)
1659216842                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659316843 
1659416844             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16598,7 +16848,7 @@
1659816848             //gl.glColorMask(false, false, false, false);
1659916849 
1660016850             //render_scene_from_light_view(gl, drawable, 0, 0);
16601
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16851
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660216852             {
1660316853                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660416854 
....@@ -17014,23 +17264,15 @@
1701417264     int AAbuffersize = 0;
1701517265     
1701617266     //double[] selectedpoint = new double[3];
17017
-    static Superellipsoid selectedpoint = new Superellipsoid();
17267
+    static Superellipsoid selectedpoint;
1701817268     static Sphere previousselectedpoint = null;
17019
-    static Sphere debugpointG = new Sphere();
17020
-    static Sphere debugpointP = new Sphere();
17021
-    static Sphere debugpointC = new Sphere();
17022
-    static Sphere debugpointR = new Sphere();
17269
+    static Sphere debugpointG;
17270
+    static Sphere debugpointP;
17271
+    static Sphere debugpointC;
17272
+    static Sphere debugpointR;
1702317273     
1702417274     static Sphere debugpoints[] = new Sphere[8];
1702517275  
17026
-    static
17027
-    {
17028
-        for (int i=0; i<8; i++)
17029
-        {
17030
-            debugpoints[i] = new Sphere();
17031
-        }
17032
-    }
17033
-    
1703417276     static void InitPoints(float radius)
1703517277     {
1703617278         for (int i=0; i<8; i++)