blame | history | patch | commit | commitdiff
Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e 
 CameraPane.java
....@@ -150,6 +150,8 @@
150150         defaultcaps.setAccumAlphaBits(16);
151151     }
152152     
153
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154
+    
153155     void SetAsGLRenderer(boolean b)
154156     {
155157         isRenderer = b;
....@@ -462,10 +464,12 @@
462464         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463465         {
464466             //gl.glBegin(gl.GL_TRIANGLES);
465
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
467
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
468
+                    // TEST LIVE NORMALS && !obj.dontselect
469
+                    ;
466470             if (!hasnorm)
467471             {
468
-           //     System.out.println("FUCK!!");
472
+           //     System.out.println("Mesh normal");
469473                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470474                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471475                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1190,10 +1194,12 @@
11901194                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911195                                 }
11921196                             }
1197
+                            
11931198                             if (flipV)
11941199                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951200                             else
11961201                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1202
+                            
11971203                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981204                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991205 
....@@ -1213,10 +1219,12 @@
12131219                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141220                                 }
12151221                             }
1222
+                            
12161223                             if (flipV)
12171224                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181225                             else
12191226                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1227
+                            
12201228                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211229                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221230 
....@@ -1244,8 +1252,10 @@
12441252                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451253                                 else
12461254                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1255
+                                
12471256                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481257                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1258
+                                
12491259                                 count2 += 2;
12501260                                 count3 += 3;
12511261                             }
....@@ -1628,7 +1638,7 @@
16281638             
16291639         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301640 
1631
-        float[] colorV = GrafreeD.colorV;
1641
+        float[] colorV = Grafreed.colorV;
16321642 
16331643         /**/
16341644         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1888,7 +1898,7 @@
18881898     void PushMatrix(double[][] matrix)
18891899     {
18901900     //    GrafreeD.tracein(matrix);
1891
-        PushMatrix(matrix,1);
1901
+        PushMatrix(matrix, 1);
18921902     }
18931903     
18941904     void PushMatrix()
....@@ -2140,7 +2150,7 @@
21402150         System.err.println("LIVE = " + Globals.isLIVE());
21412151         
21422152         if (!Globals.isLIVE()) // save sound
2143
-            GrafreeD.savesound = true; // wav.save();
2153
+            Grafreed.savesound = true; // wav.save();
21442154      //   else
21452155             repaint(); // start loop // may 2013
21462156     }
....@@ -2265,7 +2275,7 @@
22652275         LOOKAT ^= true;
22662276     }
22672277 
2268
-    void ToggleRandom()
2278
+    void ToggleSwitch()
22692279     {
22702280         SWITCH ^= true;
22712281     }
....@@ -2374,7 +2384,7 @@
23742384     {
23752385         return currentGL;
23762386     }
2377
-    
2387
+
23782388     /**/
23792389     class CacheTexture
23802390     {
....@@ -7919,6 +7929,64 @@
79197929         ReleaseTexture(pigment, false);
79207930     }
79217931     
7932
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7933
+    {
7934
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7935
+        {
7936
+            return;
7937
+        }
7938
+
7939
+        if (tex == null)
7940
+        {
7941
+            ReleaseTexture(null, false);
7942
+            return;
7943
+        }
7944
+        
7945
+        String pigment = Object3D.GetPigment(tex);
7946
+
7947
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948
+        {
7949
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7950
+        //    System.out.println("; bump = " + bump);
7951
+        }
7952
+        
7953
+        if (pigment.equals(""))
7954
+        {
7955
+            pigment = null;
7956
+        }
7957
+        
7958
+        ReleaseTexture(pigment, false);
7959
+    }
7960
+    
7961
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7962
+    {
7963
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7964
+        {
7965
+            return;
7966
+        }
7967
+
7968
+        if (tex == null)
7969
+        {
7970
+            ReleaseTexture(null, true);
7971
+            return;
7972
+        }
7973
+        
7974
+        String bump = Object3D.GetBump(tex);
7975
+
7976
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977
+        {
7978
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7979
+        //    System.out.println("; bump = " + bump);
7980
+        }
7981
+        
7982
+        if (bump.equals(""))
7983
+        {
7984
+            bump = null;
7985
+        }
7986
+        
7987
+        ReleaseTexture(bump, true);
7988
+    }
7989
+    
79227990     void ReleaseTexture(String tex, boolean bump)
79237991     {
79247992         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8022,7 +8090,7 @@
80228090         }
80238091     }
80248092 
8025
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8093
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80268094     {
80278095         if (// DrawMode() != 0 || /*tex == null ||*/
80288096                 ambientOcclusion ) // || !textureon)
....@@ -8067,7 +8135,94 @@
80678135         return; // true;
80688136     }
80698137     
8070
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8138
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8139
+    {
8140
+        if (// DrawMode() != 0 || /*tex == null ||*/
8141
+                ambientOcclusion ) // || !textureon)
8142
+        {
8143
+            return; // false;
8144
+        }
8145
+
8146
+        if (tex == null)
8147
+        {
8148
+            BindTexture(null,false,resolution);
8149
+            return;
8150
+        }
8151
+        
8152
+        String pigment = Object3D.GetPigment(tex);
8153
+
8154
+        usedtextures.put(pigment, pigment);
8155
+        
8156
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157
+        {
8158
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8159
+        //    System.out.println("; bump = " + bump);
8160
+        }
8161
+        
8162
+        if (pigment.equals(""))
8163
+        {
8164
+            pigment = null;
8165
+        }
8166
+        
8167
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168
+        BindTexture(pigment, false, resolution);
8169
+    }
8170
+    
8171
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8172
+    {
8173
+        if (// DrawMode() != 0 || /*tex == null ||*/
8174
+                ambientOcclusion ) // || !textureon)
8175
+        {
8176
+            return; // false;
8177
+        }
8178
+
8179
+        if (tex == null)
8180
+        {
8181
+            BindTexture(null,true,resolution);
8182
+            return;
8183
+        }
8184
+        
8185
+        String bump = Object3D.GetBump(tex);
8186
+
8187
+        usedtextures.put(bump, bump);
8188
+        
8189
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190
+        {
8191
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8192
+        //    System.out.println("; bump = " + bump);
8193
+        }
8194
+        
8195
+        if (bump.equals(""))
8196
+        {
8197
+            bump = null;
8198
+        }
8199
+        
8200
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201
+        BindTexture(bump, true, resolution);
8202
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203
+    }
8204
+    
8205
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8206
+    
8207
+    private boolean FileExists(String tex)
8208
+    {
8209
+        if (missingTextures.contains(tex))
8210
+        {
8211
+            return false;
8212
+        }
8213
+        
8214
+        boolean fileExists = new File(tex).exists();
8215
+        
8216
+        if (!fileExists)
8217
+        {
8218
+            // If file exists, the "new File()" is not executed sgain
8219
+            missingTextures.add(tex);
8220
+        }
8221
+        
8222
+        return fileExists;
8223
+    }
8224
+    
8225
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718226     {
80728227         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80738228         
....@@ -8075,15 +8230,17 @@
80758230         {
80768231             String texname = tex;
80778232             
8233
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234
+                
80788235 //            String[] split = tex.split("Textures");
80798236 //            if (split.length > 1)
80808237 //                texname = "/Users/nbriere/Textures" + split[split.length-1];
80818238 //            else
80828239 //                if (!texname.startsWith("/"))
80838240 //                    texname = "/Users/nbriere/Textures/" + texname;
8084
-            if (!new File(tex).exists())
8241
+            if (!FileExists(tex))
80858242             {
8086
-                    texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8243
+                    texname = fallbackTextureName;
80878244             }
80888245             
80898246             if (CACHETEXTURE)
....@@ -8153,7 +8310,7 @@
81538310                                     }
81548311                                 
81558312                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156
-                                    if (!new File(cachename).exists())
8313
+                                    if (!FileExists(cachename))
81578314                                         cachename = texname;
81588315                                     else
81598316                                         processbump = false; // don't process bump map again
....@@ -8175,7 +8332,7 @@
81758332                                     }
81768333                                 
81778334                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178
-                                    if (!new File(cachename).exists())
8335
+                                    if (!FileExists(cachename))
81798336                                         cachename = texname;
81808337                                     else
81818338                                         processbump = false; // don't process bump map again
....@@ -8184,7 +8341,9 @@
81848341                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81858342                                 
81868343                                 
8187
-                                if (texturedata != null)
8344
+                                if (texturedata == null)
8345
+                                    throw new Exception();
8346
+                                    
81888347                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81898348         //texture = GetTexture(tex, bump);
81908349                             }
....@@ -8306,7 +8465,7 @@
83068465         return texture;
83078466     }
83088467     
8309
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8468
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
83108469     {
83118470         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83128471                 
....@@ -8324,14 +8483,14 @@
83248483         return texture!=null?texture.texture:null;
83258484     }
83268485     
8327
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8486
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83288487     {
83298488         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83308489                 
83318490         return texture!=null?texture.texturedata:null;
83328491     }
83338492     
8334
-    boolean BindTexture(String tex, boolean bump, int resolution)
8493
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83358494     {
83368495         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83378496         {
....@@ -9308,8 +9467,8 @@
93089467         assert (parentcam != renderCamera);
93099468         
93109469         if (renderCamera != lightCamera)
9311
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9312
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9470
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9471
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93139472         
93149473 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93159474             
....@@ -9324,8 +9483,8 @@
93249483             LA.matCopy(renderCamera.fromScreen, matrix);
93259484             
93269485         if (renderCamera != lightCamera)
9327
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9328
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9486
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9487
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93299488 
93309489 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93319490             
....@@ -9542,7 +9701,7 @@
95429701             
95439702             if (!BOXMODE)
95449703             {
9545
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9704
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95469705             }
95479706     
95489707             if (!BOXMODE)
....@@ -9580,7 +9739,7 @@
95809739             ABORTED = false;
95819740         }
95829741         else
9583
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9742
+            Grafreed.wav.cursor += 735 * ACSIZE;
95849743         
95859744         if (false)
95869745         {
....@@ -10243,11 +10402,11 @@
1024310402 
1024410403     public void display(GLAutoDrawable drawable)
1024510404     {
10246
-        if (GrafreeD.savesound && GrafreeD.hassound)
10405
+        if (Grafreed.savesound && Grafreed.hassound)
1024710406         {
10248
-            GrafreeD.wav.save();
10249
-            GrafreeD.savesound = false;
10250
-            GrafreeD.hassound = false;
10407
+            Grafreed.wav.save();
10408
+            Grafreed.savesound = false;
10409
+            Grafreed.hassound = false;
1025110410         }
1025210411 //        if (DEBUG_SELECTION)
1025310412 //        {
....@@ -10377,7 +10536,7 @@
1037710536             Object3D theobject = object;
1037810537             Object3D theparent = object.parent;
1037910538             object.parent = null;
10380
-            object = (Object3D)GrafreeD.clone(object);
10539
+            object = (Object3D)Grafreed.clone(object);
1038110540             object.Stripify();
1038210541             if (theobject.selection == null || theobject.selection.Size() == 0)
1038310542                 theobject.PreprocessOcclusion(this);
....@@ -10390,13 +10549,13 @@
1039010549             ambientOcclusion = false;
1039110550         }
1039210551 
10393
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10552
+        if (Globals.lighttouched && 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,8 +11451,8 @@
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     }
....@@ -11354,7 +11522,14 @@
1135411522 
1135511523                 usedtextures.clear();
1135611524             
11357
-                BindTextures(DEFAULT_TEXTURES, 2);
11525
+    try
11526
+    {
11527
+        BindTextures(DEFAULT_TEXTURES, 2);
11528
+    }
11529
+    catch (Exception e)
11530
+    {
11531
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11532
+    }
1135811533             }
1135911534             //System.out.println("--> " + stackdepth);
1136011535 //            GrafreeD.traceon();
....@@ -11445,7 +11620,14 @@
1144511620             if (checker != null && DrawMode() == DEFAULT)
1144611621             {
1144711622                 //BindTexture(IMMORTAL_TEXTURE);
11448
-                BindTextures(checker.GetTextures(), checker.texres);
11623
+    try
11624
+    {
11625
+        BindTextures(checker.GetTextures(), checker.texres);
11626
+    }
11627
+    catch (Exception e)
11628
+    {
11629
+        System.err.println("FAILED: " + checker.GetTextures());
11630
+    }
1144911631                 // NEAREST
1145011632                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145111633                 DrawChecker(gl);
....@@ -11527,7 +11709,7 @@
1152711709             return;
1152811710         }
1152911711 
11530
-        String string = obj.GetToolTip();
11712
+        String string = obj.toString(); //.GetToolTip();
1153111713         
1153211714         GL gl = GetGL();
1153311715         
....@@ -11844,8 +12026,8 @@
1184412026             //obj.TransformToWorld(light, light);
1184512027             for (int i = tp.size(); --i >= 0;)
1184612028             {
11847
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848
-                    LA.xformPos(light, tp.get(i).toParent, light);
12029
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1184912031             }
1185012032 
1185112033 
....@@ -11862,8 +12044,8 @@
1186212044                 parentcam = cameras[0];
1186312045             }
1186412046             
11865
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11866
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12047
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12048
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186712049 
1186812050             LA.xformPos(light, renderCamera.toScreen, light);
1186912051             
....@@ -12477,8 +12659,8 @@
1247712659 
1247812660            // display shadow only (bump == 0)
1247912661          "SUB temp.x, half.x, shadow.x;" +
12480
-         "MOV temp.y, -params6.x;" +
12481
-         "SLT temp.z, temp.y, zero.x;" +
12662
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12663
+         "SLT temp.z, temp.y, -one2048th.x;" +
1248212664          "SUB temp.y, one.x, temp.z;" +
1248312665          "MUL temp.x, temp.x, temp.y;" +
1248412666          "KIL temp.x;" +
....@@ -12809,7 +12991,7 @@
1280912991             //once = true;
1281012992         }
1281112993 
12812
-        System.out.print("Program #" + mode + "; length = " + program.length());
12994
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1281312995         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1281412996         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281512997 
....@@ -12942,12 +13124,16 @@
1294213124 
1294313125                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294413126                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13127
+                
13128
+                // Compare fragment depth in light space with shadowmap.
1294513129                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294613130                 "SGE temp.y, temp.x, zero.x;" +
12947
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13131
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13132
+                
13133
+                // Reverse comparison
1294813134                 "SUB temp.x, one.x, temp.x;" +
1294913135                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12950
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13136
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1295113137                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1295213138 
1295313139                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12961,6 +13147,10 @@
1296113147                 // No shadow for backface
1296213148                 "DP3 temp.x, normal, lightd;" +
1296313149                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13150
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13151
+
13152
+                // No shadow when out of frustrum
13153
+                "SGE temp.x, " + depth + ".z, one.z;" +
1296413154                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296513155                 "";
1296613156     }
....@@ -13519,7 +13709,7 @@
1351913709     public void mousePressed(MouseEvent e)
1352013710     {
1352113711         //System.out.println("mousePressed: " + e);
13522
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13712
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1352313713     }
1352413714 
1352513715     static long prevtime = 0;
....@@ -13595,8 +13785,8 @@
1359513785       //      mode |= META;
1359613786         //}
1359713787         
13598
-        SetMouseMode(WHEEL | e.getModifiersEx());
13599
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13788
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13789
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1360013790         anchorX = ax;
1360113791         anchorY = ay;
1360213792         prevX = px;
....@@ -13656,6 +13846,10 @@
1365613846 //            wasliveok = true;
1365713847 //            waslive = false;
1365813848             
13849
+            // May 2019 Forget it:
13850
+            if (true)
13851
+                    return;
13852
+            
1365913853             // source == timer
1366013854             if (mouseDown)
1366113855             {
....@@ -13694,7 +13888,7 @@
1369413888     
1369513889     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1369613890 
13697
-    void clickStart(int x, int y, int modifiers)
13891
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1369813892     {
1369913893         if (!wasliveok)
1370013894             return;
....@@ -13711,7 +13905,7 @@
1371113905 //        touched = true; // main DL
1371213906         if (isRenderer)
1371313907         {
13714
-            SetMouseMode(modifiers);
13908
+            SetMouseMode(modifiers, modifiersex);
1371513909         }
1371613910 
1371713911         selectX = anchorX = x;
....@@ -13724,7 +13918,7 @@
1372413918         clicked = true;
1372513919         hold = false;
1372613920 
13727
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13921
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1372813922         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1372913923         {
1373013924       //  System.out.println("RESTART II " + modifiers);
....@@ -13755,7 +13949,7 @@
1375513949             info.camera = renderCamera;
1375613950             info.x = x;
1375713951             info.y = y;
13758
-            info.modifiers = modifiers;
13952
+            info.modifiers = modifiersex;
1375913953             editObj = object.doEditClick(info, 0);
1376013954             if (!editObj)
1376113955             {
....@@ -13772,9 +13966,12 @@
1377213966     
1377313967     public void mouseDragged(MouseEvent e)
1377413968     {
13969
+        Globals.MOUSEDRAGGED = true;
13970
+        
1377513971         //System.out.println("mouseDragged: " + e);
1377613972         if (isRenderer)
1377713973             movingcamera = true;
13974
+        
1377813975         //if (drawing)
1377913976         //return;
1378013977         if ((e.getModifiersEx() & CTRL) != 0
....@@ -13784,7 +13981,7 @@
1378413981             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1378513982         }
1378613983         else
13787
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13984
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1378813985         
1378913986     //try { Thread.sleep(1); } catch (Exception ex) {}
1379013987     }
....@@ -14021,7 +14218,7 @@
1402114218                     {
1402214219                         Globals.lighttouched = true;
1402314220                     }
14024
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14221
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1402514222                 }
1402614223             //else
1402714224             }
....@@ -14121,7 +14318,7 @@
1412114318     int X, Y;
1412214319     boolean SX, SY;
1412314320 
14124
-    void drag(int x, int y, int modifiers)
14321
+    void drag(int x, int y, int modifiers, int modifiersex)
1412514322     {
1412614323         if (IsFrozen())
1412714324         {
....@@ -14130,17 +14327,17 @@
1413014327 
1413114328         drag = true; // NEW
1413214329         
14133
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14330
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1413414331 
1413514332         X = x;
1413614333         Y = y;
1413714334         // floating state for animation
14138
-        MODIFIERS = modifiers;
14139
-        modifiers &= ~1024;
14335
+        MODIFIERS = modifiersex;
14336
+        modifiersex &= ~1024;
1414014337         if (false) // modifiers != 0)
1414114338         {
1414214339             //new Exception().printStackTrace();
14143
-            System.out.println("mouseDragged: " + modifiers);
14340
+            System.out.println("mouseDragged: " + modifiersex);
1414414341             System.out.println("SHIFT = " + SHIFT);
1414514342             System.out.println("CONTROL = " + COMMAND);
1414614343             System.out.println("META = " + META);
....@@ -14160,7 +14357,7 @@
1416014357                 info.camera = renderCamera;
1416114358                 info.x = x;
1416214359                 info.y = y;
14163
-                object.editWindow.copy.doEditDrag(info);
14360
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416414361             } else
1416514362             {
1416614363                 if (x < startX)
....@@ -14336,7 +14533,10 @@
1433614533 
1433714534     public void mouseReleased(MouseEvent e)
1433814535     {
14536
+        Globals.MOUSEDRAGGED = false;
14537
+        
1433914538         movingcamera = false;
14539
+        X = Y = 0;
1434014540         //System.out.println("mouseReleased: " + e);
1434114541         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1434214542     }
....@@ -14359,9 +14559,9 @@
1435914559         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1436014560         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1436114561         
14362
-        if (control || command || IsFrozen())
14562
+// No delay        if (control || command || IsFrozen())
1436314563             timeout = true;
14364
-        else
14564
+// ?? May 2019        else
1436514565        // timer.setDelay((modifiers & 128) != 0?0:350);
1436614566         mouseDown = false;
1436714567     if (!control && !command) // june 2013
....@@ -14471,7 +14671,7 @@
1447114671         System.out.println("keyReleased: " + e);
1447214672     }
1447314673 
14474
-    void SetMouseMode(int modifiers)
14674
+    void SetMouseMode(int modifiers, int modifiersex)
1447514675     {
1447614676         //System.out.println("SetMouseMode = " + modifiers);
1447714677         //modifiers &= ~1024;
....@@ -14483,7 +14683,7 @@
1448314683         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1448414684         //	return;
1448514685         //System.out.println("SetMode = " + modifiers);
14486
-        if ((modifiers & WHEEL) == WHEEL)
14686
+        if ((modifiersex & WHEEL) == WHEEL)
1448714687         {
1448814688             mouseMode |= ZOOM;
1448914689         }
....@@ -14493,15 +14693,15 @@
1449314693         {
1449414694             mouseMode |= VR; // BACKFORTH;
1449514695         }
14496
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14696
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1449714697         {
1449814698             mouseMode |= SELECT;
1449914699         }
14500
-        if ((modifiers & COMMAND) == COMMAND)
14700
+        if ((modifiersex & COMMAND) == COMMAND)
1450114701         {
1450214702             mouseMode |= SELECT;
1450314703         }
14504
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14704
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450514705         {
1450614706             mouseMode &= ~VR;
1450714707             mouseMode |= TRANSLATE;
....@@ -14530,7 +14730,7 @@
1453014730 
1453114731         if (isRenderer) //
1453214732         {
14533
-            SetMouseMode(modifiers);
14733
+            SetMouseMode(0, modifiers);
1453414734         }
1453514735 
1453614736         Globals.theRenderer.keyPressed(key);
....@@ -14866,7 +15066,7 @@
1486615066                 //RESIZETEXTURE ^= true;
1486715067                 //break;
1486815068             case 'z':
14869
-                RENDERSHADOW ^= true;
15069
+                Globals.RENDERSHADOW ^= true;
1487015070                 Globals.lighttouched = true;
1487115071                 repaint();
1487215072                 break;
....@@ -14990,7 +15190,7 @@
1499015190         //mode = ROTATE;
1499115191         if ((MODIFIERS & COMMAND) == 0) // VR??
1499215192         {
14993
-            SetMouseMode(modifiers);
15193
+            SetMouseMode(0, modifiers);
1499415194         }
1499515195     }
1499615196 
....@@ -15345,7 +15545,9 @@
1534515545         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1534615546         //Image img = CreateImage(width, height);
1534715547         //System.out.println("width = " + width + "; height = " + height + "\n");
15548
+        
1534815549         Graphics gr = g; // img.getGraphics();
15550
+        
1534915551         if (!hasMarquee)
1535015552         {
1535115553             if (Xmin < Xmax) // !locked)
....@@ -15443,14 +15645,33 @@
1544315645             if (!isRenderer)
1544415646             {
1544515647                 object.drawEditHandles(info, 0);
15648
+                
15649
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15650
+                {
15651
+                    switch (object.selection.get(0).hitSomething)
15652
+                    {
15653
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15654
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15655
+                            break;
15656
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15657
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15658
+                        break;
15659
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15660
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15661
+                        break;
15662
+                    }
15663
+                    
15664
+                }
1544615665             }
1544715666         }
15667
+        
1544815668         if (isRenderer)
1544915669         {
1545015670         //gr.setColor(Color.black);
1545115671         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1545215672         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1545315673         }
15674
+        
1545415675         if (hasMarquee)
1545515676         {
1545615677             gr.setXORMode(Color.white);
....@@ -15563,6 +15784,7 @@
1556315784     public boolean mouseDown(Event evt, int x, int y)
1556415785     {
1556515786         System.out.println("mouseDown: " + evt);
15787
+        System.exit(0);
1556615788         /*
1556715789         locked = true;
1556815790         drag = false;
....@@ -15606,7 +15828,7 @@
1560615828         {
1560715829             keyPressed(0, modifiers);
1560815830         }
15609
-        clickStart(x, y, modifiers);
15831
+ //       clickStart(x, y, modifiers);
1561015832         return true;
1561115833     }
1561215834 
....@@ -15724,7 +15946,7 @@
1572415946         {
1572515947             keyReleased(0, 0);
1572615948         }
15727
-        drag(x, y, modifiers);
15949
+        drag(x, y, 0, modifiers);
1572815950         return true;
1572915951     }
1573015952 
....@@ -15856,7 +16078,7 @@
1585616078     Object3D object;
1585716079     static Object3D trackedobject;
1585816080     Camera renderCamera; // Light or Eye (or Occlusion)
15859
-    /*static*/ Camera manipCamera; // Light or Eye
16081
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1586016082 	/*static*/ Camera eyeCamera;
1586116083     /*static*/ Camera lightCamera;
1586216084     int cameracount;
....@@ -16422,16 +16644,16 @@
1642216644                             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]));
1642316645                         }
1642416646                         
16425
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16647
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1642616648                     }
1642716649                 }
1642816650                 
1642916651                 if (!movingcamera && !PAINTMODE)
1643016652                     object.editWindow.ScreenFitPoint(); // fev 2014
1643116653                 
16432
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16654
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643316655                 {
16434
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16656
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1643516657                     
1643616658                     Object3D group = new Object3D("inst" + paintcount++);
1643716659                     
....@@ -16587,7 +16809,7 @@
1658716809                 gl.glDisable(gl.GL_CULL_FACE);
1658816810             }
1658916811 
16590
-            if (!RENDERSHADOW)
16812
+            if (!Globals.RENDERSHADOW)
1659116813                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659216814 
1659316815             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16597,7 +16819,7 @@
1659716819             //gl.glColorMask(false, false, false, false);
1659816820 
1659916821             //render_scene_from_light_view(gl, drawable, 0, 0);
16600
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16822
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660116823             {
1660216824                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660316825