blame | history | patch | commit | commitdiff
Normand Briere
2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df 
 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     {
....@@ -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                             }
....@@ -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)
....@@ -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,13 @@
1039010548             ambientOcclusion = false;
1039110549         }
1039210550 
10393
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039410552         {
1039510553             //if (RENDERSHADOW) // ?
1039610554             if (!IsFrozen())
1039710555             {
1039810556                 // dec 2012
10399
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10557
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1040010558                 {
1040110559             Globals.framecount++;
1040210560                     shadowbuffer.display();
....@@ -10523,8 +10681,8 @@
1052310681             
1052410682 //        if (parentcam != renderCamera) // not a light
1052510683         if (cam != lightCamera)
10526
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10684
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10685
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052810686             
1052910687             for (int j = 0; j < 4; j++)
1053010688             {
....@@ -10538,8 +10696,8 @@
1053810696             
1053910697 //        if (parentcam != renderCamera) // not a light
1054010698         if (cam != lightCamera)
10541
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10542
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10699
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10700
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054310701         
1054410702             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054510703             
....@@ -10798,7 +10956,16 @@
1079810956             // Bump noise
1079910957             gl.glActiveTexture(GL.GL_TEXTURE6);
1080010958             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
-            BindTexture(NOISE_TEXTURE, false, 2);
10959
+            
10960
+    try
10961
+    {
10962
+        BindTexture(NOISE_TEXTURE, false, 2);
10963
+    }
10964
+    catch (Exception e)
10965
+    {
10966
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10967
+    }
10968
+           
1080210969 
1080310970             gl.glActiveTexture(GL.GL_TEXTURE0);
1080410971             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10923,8 +11090,8 @@
1092311090                 System.err.println("parentcam != renderCamera");
1092411091 
1092511092 //            if (cam != lightCamera)
10926
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10927
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11093
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11094
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1092811095         }
1092911096         
1093011097         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10945,8 +11112,8 @@
1094511112             if (true) // TODO
1094611113             {
1094711114                 if (cam != lightCamera)
10948
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10949
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11115
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11116
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1095011117             }
1095111118             
1095211119             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11283,13 +11450,31 @@
1128311450             e.printStackTrace();
1128411451         }
1128511452         
11286
-        if (GrafreeD.RENDERME > 0)
11287
-            GrafreeD.RENDERME--; // mechante magouille
11453
+        if (Grafreed.RENDERME > 0)
11454
+            Grafreed.RENDERME--; // mechante magouille
1128811455         
1128911456         Globals.ONESTEP = false;
1129011457     }
1129111458 
1129211459     static boolean zoomonce = false;
11460
+    
11461
+    void CreateSelectedPoint()
11462
+    {
11463
+        if (selectedpoint == null)
11464
+        {
11465
+            debugpointG = new Sphere();
11466
+            debugpointP = new Sphere();
11467
+            debugpointC = new Sphere();
11468
+            debugpointR = new Sphere();
11469
+            
11470
+            selectedpoint = new Superellipsoid();
11471
+            
11472
+            for (int i=0; i<8; i++)
11473
+            {
11474
+                debugpoints[i] = new Sphere();
11475
+            }
11476
+        }
11477
+    }
1129311478     
1129411479     void DrawObject(GL gl, boolean draw)
1129511480     {
....@@ -11354,7 +11539,14 @@
1135411539 
1135511540                 usedtextures.clear();
1135611541             
11357
-                BindTextures(DEFAULT_TEXTURES, 2);
11542
+    try
11543
+    {
11544
+        BindTextures(DEFAULT_TEXTURES, 2);
11545
+    }
11546
+    catch (Exception e)
11547
+    {
11548
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11549
+    }
1135811550             }
1135911551             //System.out.println("--> " + stackdepth);
1136011552 //            GrafreeD.traceon();
....@@ -11364,8 +11556,9 @@
1136411556             
1136511557             if (DrawMode() == DEFAULT)
1136611558             {
11367
-                if (DEBUG)
11559
+                if (Globals.DEBUG)
1136811560                 {
11561
+                    CreateSelectedPoint();
1136911562                     float radius = 0.05f;
1137011563                     if (selectedpoint.radius != radius)
1137111564                     {
....@@ -11445,7 +11638,14 @@
1144511638             if (checker != null && DrawMode() == DEFAULT)
1144611639             {
1144711640                 //BindTexture(IMMORTAL_TEXTURE);
11448
-                BindTextures(checker.GetTextures(), checker.texres);
11641
+    try
11642
+    {
11643
+        BindTextures(checker.GetTextures(), checker.texres);
11644
+    }
11645
+    catch (Exception e)
11646
+    {
11647
+        System.err.println("FAILED: " + checker.GetTextures());
11648
+    }
1144911649                 // NEAREST
1145011650                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145111651                 DrawChecker(gl);
....@@ -11527,7 +11727,7 @@
1152711727             return;
1152811728         }
1152911729 
11530
-        String string = obj.GetToolTip();
11730
+        String string = obj.toString(); //.GetToolTip();
1153111731         
1153211732         GL gl = GetGL();
1153311733         
....@@ -11844,8 +12044,8 @@
1184412044             //obj.TransformToWorld(light, light);
1184512045             for (int i = tp.size(); --i >= 0;)
1184612046             {
11847
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848
-                    LA.xformPos(light, tp.get(i).toParent, light);
12047
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12048
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1184912049             }
1185012050 
1185112051 
....@@ -11862,8 +12062,8 @@
1186212062                 parentcam = cameras[0];
1186312063             }
1186412064             
11865
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11866
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12065
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12066
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186712067 
1186812068             LA.xformPos(light, renderCamera.toScreen, light);
1186912069             
....@@ -12477,8 +12677,8 @@
1247712677 
1247812678            // display shadow only (bump == 0)
1247912679          "SUB temp.x, half.x, shadow.x;" +
12480
-         "MOV temp.y, -params6.x;" +
12481
-         "SLT temp.z, temp.y, zero.x;" +
12680
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12681
+         "SLT temp.z, temp.y, -one2048th.x;" +
1248212682          "SUB temp.y, one.x, temp.z;" +
1248312683          "MUL temp.x, temp.x, temp.y;" +
1248412684          "KIL temp.x;" +
....@@ -12809,7 +13009,7 @@
1280913009             //once = true;
1281013010         }
1281113011 
12812
-        System.out.print("Program #" + mode + "; length = " + program.length());
13012
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1281313013         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1281413014         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281513015 
....@@ -12942,12 +13142,16 @@
1294213142 
1294313143                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294413144                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13145
+                
13146
+                // Compare fragment depth in light space with shadowmap.
1294513147                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294613148                 "SGE temp.y, temp.x, zero.x;" +
12947
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13149
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13150
+                
13151
+                // Reverse comparison
1294813152                 "SUB temp.x, one.x, temp.x;" +
1294913153                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12950
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13154
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1295113155                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1295213156 
1295313157                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12961,6 +13165,10 @@
1296113165                 // No shadow for backface
1296213166                 "DP3 temp.x, normal, lightd;" +
1296313167                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13168
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13169
+
13170
+                // No shadow when out of frustrum
13171
+                "SGE temp.x, " + depth + ".z, one.z;" +
1296413172                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296513173                 "";
1296613174     }
....@@ -13519,7 +13727,7 @@
1351913727     public void mousePressed(MouseEvent e)
1352013728     {
1352113729         //System.out.println("mousePressed: " + e);
13522
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13730
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1352313731     }
1352413732 
1352513733     static long prevtime = 0;
....@@ -13595,8 +13803,8 @@
1359513803       //      mode |= META;
1359613804         //}
1359713805         
13598
-        SetMouseMode(WHEEL | e.getModifiersEx());
13599
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13806
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13807
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1360013808         anchorX = ax;
1360113809         anchorY = ay;
1360213810         prevX = px;
....@@ -13656,6 +13864,10 @@
1365613864 //            wasliveok = true;
1365713865 //            waslive = false;
1365813866             
13867
+            // May 2019 Forget it:
13868
+            if (true)
13869
+                    return;
13870
+            
1365913871             // source == timer
1366013872             if (mouseDown)
1366113873             {
....@@ -13694,7 +13906,7 @@
1369413906     
1369513907     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1369613908 
13697
-    void clickStart(int x, int y, int modifiers)
13909
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1369813910     {
1369913911         if (!wasliveok)
1370013912             return;
....@@ -13711,7 +13923,7 @@
1371113923 //        touched = true; // main DL
1371213924         if (isRenderer)
1371313925         {
13714
-            SetMouseMode(modifiers);
13926
+            SetMouseMode(modifiers, modifiersex);
1371513927         }
1371613928 
1371713929         selectX = anchorX = x;
....@@ -13724,7 +13936,7 @@
1372413936         clicked = true;
1372513937         hold = false;
1372613938 
13727
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13939
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1372813940         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1372913941         {
1373013942       //  System.out.println("RESTART II " + modifiers);
....@@ -13755,7 +13967,7 @@
1375513967             info.camera = renderCamera;
1375613968             info.x = x;
1375713969             info.y = y;
13758
-            info.modifiers = modifiers;
13970
+            info.modifiers = modifiersex;
1375913971             editObj = object.doEditClick(info, 0);
1376013972             if (!editObj)
1376113973             {
....@@ -13772,9 +13984,12 @@
1377213984     
1377313985     public void mouseDragged(MouseEvent e)
1377413986     {
13987
+        Globals.MOUSEDRAGGED = true;
13988
+        
1377513989         //System.out.println("mouseDragged: " + e);
1377613990         if (isRenderer)
1377713991             movingcamera = true;
13992
+        
1377813993         //if (drawing)
1377913994         //return;
1378013995         if ((e.getModifiersEx() & CTRL) != 0
....@@ -13784,7 +13999,7 @@
1378413999             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1378514000         }
1378614001         else
13787
-            drag(e.getX(), e.getY(), e.getModifiersEx());
14002
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1378814003         
1378914004     //try { Thread.sleep(1); } catch (Exception ex) {}
1379014005     }
....@@ -14021,7 +14236,7 @@
1402114236                     {
1402214237                         Globals.lighttouched = true;
1402314238                     }
14024
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14239
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1402514240                 }
1402614241             //else
1402714242             }
....@@ -14121,7 +14336,7 @@
1412114336     int X, Y;
1412214337     boolean SX, SY;
1412314338 
14124
-    void drag(int x, int y, int modifiers)
14339
+    void drag(int x, int y, int modifiers, int modifiersex)
1412514340     {
1412614341         if (IsFrozen())
1412714342         {
....@@ -14130,17 +14345,17 @@
1413014345 
1413114346         drag = true; // NEW
1413214347         
14133
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14348
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1413414349 
1413514350         X = x;
1413614351         Y = y;
1413714352         // floating state for animation
14138
-        MODIFIERS = modifiers;
14139
-        modifiers &= ~1024;
14353
+        MODIFIERS = modifiersex;
14354
+        modifiersex &= ~1024;
1414014355         if (false) // modifiers != 0)
1414114356         {
1414214357             //new Exception().printStackTrace();
14143
-            System.out.println("mouseDragged: " + modifiers);
14358
+            System.out.println("mouseDragged: " + modifiersex);
1414414359             System.out.println("SHIFT = " + SHIFT);
1414514360             System.out.println("CONTROL = " + COMMAND);
1414614361             System.out.println("META = " + META);
....@@ -14160,7 +14375,7 @@
1416014375                 info.camera = renderCamera;
1416114376                 info.x = x;
1416214377                 info.y = y;
14163
-                object.editWindow.copy.doEditDrag(info);
14378
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416414379             } else
1416514380             {
1416614381                 if (x < startX)
....@@ -14336,7 +14551,10 @@
1433614551 
1433714552     public void mouseReleased(MouseEvent e)
1433814553     {
14554
+        Globals.MOUSEDRAGGED = false;
14555
+        
1433914556         movingcamera = false;
14557
+        X = Y = 0;
1434014558         //System.out.println("mouseReleased: " + e);
1434114559         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1434214560     }
....@@ -14359,9 +14577,9 @@
1435914577         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1436014578         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1436114579         
14362
-        if (control || command || IsFrozen())
14580
+// No delay        if (control || command || IsFrozen())
1436314581             timeout = true;
14364
-        else
14582
+// ?? May 2019        else
1436514583        // timer.setDelay((modifiers & 128) != 0?0:350);
1436614584         mouseDown = false;
1436714585     if (!control && !command) // june 2013
....@@ -14471,7 +14689,7 @@
1447114689         System.out.println("keyReleased: " + e);
1447214690     }
1447314691 
14474
-    void SetMouseMode(int modifiers)
14692
+    void SetMouseMode(int modifiers, int modifiersex)
1447514693     {
1447614694         //System.out.println("SetMouseMode = " + modifiers);
1447714695         //modifiers &= ~1024;
....@@ -14483,7 +14701,7 @@
1448314701         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1448414702         //	return;
1448514703         //System.out.println("SetMode = " + modifiers);
14486
-        if ((modifiers & WHEEL) == WHEEL)
14704
+        if ((modifiersex & WHEEL) == WHEEL)
1448714705         {
1448814706             mouseMode |= ZOOM;
1448914707         }
....@@ -14493,15 +14711,15 @@
1449314711         {
1449414712             mouseMode |= VR; // BACKFORTH;
1449514713         }
14496
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14714
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1449714715         {
1449814716             mouseMode |= SELECT;
1449914717         }
14500
-        if ((modifiers & COMMAND) == COMMAND)
14718
+        if ((modifiersex & COMMAND) == COMMAND)
1450114719         {
1450214720             mouseMode |= SELECT;
1450314721         }
14504
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14722
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450514723         {
1450614724             mouseMode &= ~VR;
1450714725             mouseMode |= TRANSLATE;
....@@ -14530,7 +14748,7 @@
1453014748 
1453114749         if (isRenderer) //
1453214750         {
14533
-            SetMouseMode(modifiers);
14751
+            SetMouseMode(0, modifiers);
1453414752         }
1453514753 
1453614754         Globals.theRenderer.keyPressed(key);
....@@ -14702,8 +14920,14 @@
1470214920                 RevertCamera();
1470314921                 repaint();
1470414922                 break;
14705
-            case 'L':
1470614923             case 'l':
14924
+                lightMode ^= true;
14925
+                Globals.lighttouched = true;
14926
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14927
+                targetLookAt.set(manipCamera.lookAt);
14928
+                repaint();
14929
+                break;
14930
+            case 'L':
1470714931                 if (lightMode)
1470814932                 {
1470914933                     lightMode = false;
....@@ -14850,23 +15074,21 @@
1485015074                 kompactbit = 6;
1485115075                 break;
1485215076             case ' ':
14853
-                lightMode ^= true;
14854
-                Globals.lighttouched = true;
14855
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14856
-                targetLookAt.set(manipCamera.lookAt);
15077
+                ObjEditor.theFrame.ToggleFullScreen();
1485715078                 repaint();
1485815079                 break;
1485915080             //case '`' :
1486015081             case ESC:
1486115082                 RENDERPROGRAM += 1;
1486215083                 RENDERPROGRAM %= 3;
15084
+
1486315085                 repaint();
1486415086                 break;
1486515087             case 'Z':
1486615088                 //RESIZETEXTURE ^= true;
1486715089                 //break;
1486815090             case 'z':
14869
-                RENDERSHADOW ^= true;
15091
+                Globals.RENDERSHADOW ^= true;
1487015092                 Globals.lighttouched = true;
1487115093                 repaint();
1487215094                 break;
....@@ -14990,7 +15212,7 @@
1499015212         //mode = ROTATE;
1499115213         if ((MODIFIERS & COMMAND) == 0) // VR??
1499215214         {
14993
-            SetMouseMode(modifiers);
15215
+            SetMouseMode(0, modifiers);
1499415216         }
1499515217     }
1499615218 
....@@ -15345,7 +15567,9 @@
1534515567         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1534615568         //Image img = CreateImage(width, height);
1534715569         //System.out.println("width = " + width + "; height = " + height + "\n");
15570
+        
1534815571         Graphics gr = g; // img.getGraphics();
15572
+        
1534915573         if (!hasMarquee)
1535015574         {
1535115575             if (Xmin < Xmax) // !locked)
....@@ -15443,14 +15667,33 @@
1544315667             if (!isRenderer)
1544415668             {
1544515669                 object.drawEditHandles(info, 0);
15670
+                
15671
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15672
+                {
15673
+                    switch (object.selection.get(0).hitSomething)
15674
+                    {
15675
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15676
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15677
+                            break;
15678
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15679
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15680
+                        break;
15681
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15682
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15683
+                        break;
15684
+                    }
15685
+                    
15686
+                }
1544615687             }
1544715688         }
15689
+        
1544815690         if (isRenderer)
1544915691         {
1545015692         //gr.setColor(Color.black);
1545115693         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1545215694         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1545315695         }
15696
+        
1545415697         if (hasMarquee)
1545515698         {
1545615699             gr.setXORMode(Color.white);
....@@ -15563,6 +15806,7 @@
1556315806     public boolean mouseDown(Event evt, int x, int y)
1556415807     {
1556515808         System.out.println("mouseDown: " + evt);
15809
+        System.exit(0);
1556615810         /*
1556715811         locked = true;
1556815812         drag = false;
....@@ -15606,7 +15850,7 @@
1560615850         {
1560715851             keyPressed(0, modifiers);
1560815852         }
15609
-        clickStart(x, y, modifiers);
15853
+ //       clickStart(x, y, modifiers);
1561015854         return true;
1561115855     }
1561215856 
....@@ -15724,7 +15968,7 @@
1572415968         {
1572515969             keyReleased(0, 0);
1572615970         }
15727
-        drag(x, y, modifiers);
15971
+        drag(x, y, 0, modifiers);
1572815972         return true;
1572915973     }
1573015974 
....@@ -15856,7 +16100,7 @@
1585616100     Object3D object;
1585716101     static Object3D trackedobject;
1585816102     Camera renderCamera; // Light or Eye (or Occlusion)
15859
-    /*static*/ Camera manipCamera; // Light or Eye
16103
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1586016104 	/*static*/ Camera eyeCamera;
1586116105     /*static*/ Camera lightCamera;
1586216106     int cameracount;
....@@ -16422,16 +16666,16 @@
1642216666                             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]));
1642316667                         }
1642416668                         
16425
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16669
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1642616670                     }
1642716671                 }
1642816672                 
1642916673                 if (!movingcamera && !PAINTMODE)
1643016674                     object.editWindow.ScreenFitPoint(); // fev 2014
1643116675                 
16432
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16676
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643316677                 {
16434
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16678
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1643516679                     
1643616680                     Object3D group = new Object3D("inst" + paintcount++);
1643716681                     
....@@ -16587,7 +16831,7 @@
1658716831                 gl.glDisable(gl.GL_CULL_FACE);
1658816832             }
1658916833 
16590
-            if (!RENDERSHADOW)
16834
+            if (!Globals.RENDERSHADOW)
1659116835                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659216836 
1659316837             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16597,7 +16841,7 @@
1659716841             //gl.glColorMask(false, false, false, false);
1659816842 
1659916843             //render_scene_from_light_view(gl, drawable, 0, 0);
16600
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16844
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660116845             {
1660216846                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660316847 
....@@ -17013,23 +17257,15 @@
1701317257     int AAbuffersize = 0;
1701417258     
1701517259     //double[] selectedpoint = new double[3];
17016
-    static Superellipsoid selectedpoint = new Superellipsoid();
17260
+    static Superellipsoid selectedpoint;
1701717261     static Sphere previousselectedpoint = null;
17018
-    static Sphere debugpointG = new Sphere();
17019
-    static Sphere debugpointP = new Sphere();
17020
-    static Sphere debugpointC = new Sphere();
17021
-    static Sphere debugpointR = new Sphere();
17262
+    static Sphere debugpointG;
17263
+    static Sphere debugpointP;
17264
+    static Sphere debugpointC;
17265
+    static Sphere debugpointR;
1702217266     
1702317267     static Sphere debugpoints[] = new Sphere[8];
1702417268  
17025
-    static
17026
-    {
17027
-        for (int i=0; i<8; i++)
17028
-        {
17029
-            debugpoints[i] = new Sphere();
17030
-        }
17031
-    }
17032
-    
1703317269     static void InitPoints(float radius)
1703417270     {
1703517271         for (int i=0; i<8; i++)