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
....@@ -56,8 +55,6 @@
5655     static int CURRENTANTIALIAS = 0; // 1;
5756 	/*static*/ boolean RENDERSHADOW = true;
5857     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
6158     
6259     boolean DISPLAYTEXT = false;
6360     //boolean REDUCETEXTURE = true;
....@@ -92,6 +89,8 @@
9289 
9390 static    int tickcount = 0; // slow pose issue
9491 
92
+static    boolean BUTTONLESSWHEEL = false;
93
+static    boolean ZOOMBOXMODE = false;
9594 static    boolean BOXMODE = false;
9695 static    boolean IMAGEFLIP = false;
9796 static    boolean SMOOTHFOCUS = false;
....@@ -106,7 +105,7 @@
106105 static    boolean OEIL = true;
107106 static    boolean OEILONCE = false; // do oeilon then oeiloff
108107 static    boolean LOOKAT = true;
109
-static    boolean RANDOM = true; // false;
108
+static    boolean SWITCH = true; // false;
110109 static    boolean HANDLES = false; // selection doesn't work!!
111110 static  boolean PAINTMODE = false;
112111 
....@@ -149,6 +148,8 @@
149148         defaultcaps.setAccumBlueBits(16);
150149         defaultcaps.setAccumAlphaBits(16);
151150     }
151
+    
152
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152153     
153154     void SetAsGLRenderer(boolean b)
154155     {
....@@ -223,6 +224,11 @@
223224     public boolean IsBoxMode()
224225     {
225226             return BOXMODE;
227
+    }
228
+    
229
+    public boolean IsZoomBoxMode()
230
+    {
231
+            return ZOOMBOXMODE;
226232     }
227233     
228234     public void ClearDepth()
....@@ -457,10 +463,12 @@
457463         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458464         {
459465             //gl.glBegin(gl.GL_TRIANGLES);
460
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
466
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
467
+                    // TEST LIVE NORMALS && !obj.dontselect
468
+                    ;
461469             if (!hasnorm)
462470             {
463
-           //     System.out.println("FUCK!!");
471
+           //     System.out.println("Mesh normal");
464472                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
465473                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
466474                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1185,10 +1193,12 @@
11851193                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11861194                                 }
11871195                             }
1196
+                            
11881197                             if (flipV)
11891198                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11901199                             else
11911200                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+                            
11921202                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11931203                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11941204 
....@@ -1208,10 +1218,12 @@
12081218                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12091219                                 }
12101220                             }
1221
+                            
12111222                             if (flipV)
12121223                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12131224                             else
12141225                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+                            
12151227                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12161228                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12171229 
....@@ -1239,8 +1251,10 @@
12391251                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12401252                                 else
12411253                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+                                
12421255                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12431256                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+                                
12441258                                 count2 += 2;
12451259                                 count3 += 3;
12461260                             }
....@@ -1612,18 +1626,18 @@
16121626         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
16131627         if (!material.multiply)
16141628         {
1615
-            display.color = color;
1629
+            display.color = material.color;
16161630             display.saturation = material.modulation;
16171631         }
16181632         else
16191633         {
1620
-            display.color *= color*2;
1634
+            display.color *= material.color*2;
16211635             display.saturation *= material.modulation*2;
16221636         }
16231637             
16241638         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16251639 
1626
-        float[] colorV = GrafreeD.colorV;
1640
+        float[] colorV = Grafreed.colorV;
16271641 
16281642         /**/
16291643         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1883,7 +1897,7 @@
18831897     void PushMatrix(double[][] matrix)
18841898     {
18851899     //    GrafreeD.tracein(matrix);
1886
-        PushMatrix(matrix,1);
1900
+        PushMatrix(matrix, 1);
18871901     }
18881902     
18891903     void PushMatrix()
....@@ -2135,7 +2149,7 @@
21352149         System.err.println("LIVE = " + Globals.isLIVE());
21362150         
21372151         if (!Globals.isLIVE()) // save sound
2138
-            GrafreeD.savesound = true; // wav.save();
2152
+            Grafreed.savesound = true; // wav.save();
21392153      //   else
21402154             repaint(); // start loop // may 2013
21412155     }
....@@ -2168,6 +2182,11 @@
21682182     public void ToggleBoxMode()
21692183     {
21702184         BOXMODE ^= true;
2185
+    }
2186
+
2187
+    public void ToggleZoomBoxMode()
2188
+    {
2189
+        ZOOMBOXMODE ^= true;
21712190     }
21722191 
21732192     public void ToggleSmoothFocus()
....@@ -2247,7 +2266,7 @@
22472266     
22482267     void ToggleDebug()
22492268     {
2250
-        DEBUG ^= true;
2269
+        Globals.DEBUG ^= true;
22512270     }
22522271 
22532272     void ToggleLookAt()
....@@ -2255,9 +2274,9 @@
22552274         LOOKAT ^= true;
22562275     }
22572276 
2258
-    void ToggleRandom()
2277
+    void ToggleSwitch()
22592278     {
2260
-        RANDOM ^= true;
2279
+        SWITCH ^= true;
22612280     }
22622281 
22632282     void ToggleHandles()
....@@ -2364,7 +2383,7 @@
23642383     {
23652384         return currentGL;
23662385     }
2367
-    
2386
+
23682387     /**/
23692388     class CacheTexture
23702389     {
....@@ -4196,6 +4215,7 @@
41964215     
41974216     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
41984217     {
4218
+                new Exception().printStackTrace();
41994219         System.exit(0);
42004220         com.sun.opengl.util.texture.Texture texture = null;
42014221 
....@@ -7908,6 +7928,64 @@
79087928         ReleaseTexture(pigment, false);
79097929     }
79107930     
7931
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7932
+    {
7933
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7934
+        {
7935
+            return;
7936
+        }
7937
+
7938
+        if (tex == null)
7939
+        {
7940
+            ReleaseTexture(null, false);
7941
+            return;
7942
+        }
7943
+        
7944
+        String pigment = Object3D.GetPigment(tex);
7945
+
7946
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947
+        {
7948
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7949
+        //    System.out.println("; bump = " + bump);
7950
+        }
7951
+        
7952
+        if (pigment.equals(""))
7953
+        {
7954
+            pigment = null;
7955
+        }
7956
+        
7957
+        ReleaseTexture(pigment, false);
7958
+    }
7959
+    
7960
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7961
+    {
7962
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7963
+        {
7964
+            return;
7965
+        }
7966
+
7967
+        if (tex == null)
7968
+        {
7969
+            ReleaseTexture(null, true);
7970
+            return;
7971
+        }
7972
+        
7973
+        String bump = Object3D.GetBump(tex);
7974
+
7975
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976
+        {
7977
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7978
+        //    System.out.println("; bump = " + bump);
7979
+        }
7980
+        
7981
+        if (bump.equals(""))
7982
+        {
7983
+            bump = null;
7984
+        }
7985
+        
7986
+        ReleaseTexture(bump, true);
7987
+    }
7988
+    
79117989     void ReleaseTexture(String tex, boolean bump)
79127990     {
79137991         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8011,7 +8089,7 @@
80118089         }
80128090     }
80138091 
8014
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80158093     {
80168094         if (// DrawMode() != 0 || /*tex == null ||*/
80178095                 ambientOcclusion ) // || !textureon)
....@@ -8056,7 +8134,94 @@
80568134         return; // true;
80578135     }
80588136     
8059
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8137
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8138
+    {
8139
+        if (// DrawMode() != 0 || /*tex == null ||*/
8140
+                ambientOcclusion ) // || !textureon)
8141
+        {
8142
+            return; // false;
8143
+        }
8144
+
8145
+        if (tex == null)
8146
+        {
8147
+            BindTexture(null,false,resolution);
8148
+            return;
8149
+        }
8150
+        
8151
+        String pigment = Object3D.GetPigment(tex);
8152
+
8153
+        usedtextures.put(pigment, pigment);
8154
+        
8155
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156
+        {
8157
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8158
+        //    System.out.println("; bump = " + bump);
8159
+        }
8160
+        
8161
+        if (pigment.equals(""))
8162
+        {
8163
+            pigment = null;
8164
+        }
8165
+        
8166
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167
+        BindTexture(pigment, false, resolution);
8168
+    }
8169
+    
8170
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8171
+    {
8172
+        if (// DrawMode() != 0 || /*tex == null ||*/
8173
+                ambientOcclusion ) // || !textureon)
8174
+        {
8175
+            return; // false;
8176
+        }
8177
+
8178
+        if (tex == null)
8179
+        {
8180
+            BindTexture(null,true,resolution);
8181
+            return;
8182
+        }
8183
+        
8184
+        String bump = Object3D.GetBump(tex);
8185
+
8186
+        usedtextures.put(bump, bump);
8187
+        
8188
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189
+        {
8190
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8191
+        //    System.out.println("; bump = " + bump);
8192
+        }
8193
+        
8194
+        if (bump.equals(""))
8195
+        {
8196
+            bump = null;
8197
+        }
8198
+        
8199
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200
+        BindTexture(bump, true, resolution);
8201
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202
+    }
8203
+    
8204
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8205
+    
8206
+    private boolean FileExists(String tex)
8207
+    {
8208
+        if (missingTextures.contains(tex))
8209
+        {
8210
+            return false;
8211
+        }
8212
+        
8213
+        boolean fileExists = new File(tex).exists();
8214
+        
8215
+        if (!fileExists)
8216
+        {
8217
+            // If file exists, the "new File()" is not executed sgain
8218
+            missingTextures.add(tex);
8219
+        }
8220
+        
8221
+        return fileExists;
8222
+    }
8223
+    
8224
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80608225     {
80618226         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80628227         
....@@ -8064,12 +8229,18 @@
80648229         {
80658230             String texname = tex;
80668231             
8067
-            String[] split = tex.split("Textures");
8068
-            if (split.length > 1)
8069
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
8070
-            else
8071
-                if (!texname.startsWith("/"))
8072
-                    texname = "/Users/nbriere/Textures/" + texname;
8232
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233
+                
8234
+//            String[] split = tex.split("Textures");
8235
+//            if (split.length > 1)
8236
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8237
+//            else
8238
+//                if (!texname.startsWith("/"))
8239
+//                    texname = "/Users/nbriere/Textures/" + texname;
8240
+            if (!FileExists(tex))
8241
+            {
8242
+                    texname = fallbackTextureName;
8243
+            }
80738244             
80748245             if (CACHETEXTURE)
80758246                 texture = textures.get(texname); // TEXTURE CACHE
....@@ -8138,7 +8309,7 @@
81388309                                     }
81398310                                 
81408311                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141
-                                    if (!new File(cachename).exists())
8312
+                                    if (!FileExists(cachename))
81428313                                         cachename = texname;
81438314                                     else
81448315                                         processbump = false; // don't process bump map again
....@@ -8160,7 +8331,7 @@
81608331                                     }
81618332                                 
81628333                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163
-                                    if (!new File(cachename).exists())
8334
+                                    if (!FileExists(cachename))
81648335                                         cachename = texname;
81658336                                     else
81668337                                         processbump = false; // don't process bump map again
....@@ -8169,7 +8340,9 @@
81698340                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81708341                                 
81718342                                 
8172
-                                if (texturedata != null)
8343
+                                if (texturedata == null)
8344
+                                    throw new Exception();
8345
+                                    
81738346                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81748347         //texture = GetTexture(tex, bump);
81758348                             }
....@@ -8291,7 +8464,7 @@
82918464         return texture;
82928465     }
82938466     
8294
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8467
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
82958468     {
82968469         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
82978470                 
....@@ -8309,14 +8482,14 @@
83098482         return texture!=null?texture.texture:null;
83108483     }
83118484     
8312
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8485
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83138486     {
83148487         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83158488                 
83168489         return texture!=null?texture.texturedata:null;
83178490     }
83188491     
8319
-    boolean BindTexture(String tex, boolean bump, int resolution)
8492
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83208493     {
83218494         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83228495         {
....@@ -9293,8 +9466,8 @@
92939466         assert (parentcam != renderCamera);
92949467         
92959468         if (renderCamera != lightCamera)
9296
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9297
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
92989471         
92999472 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93009473             
....@@ -9309,8 +9482,8 @@
93099482             LA.matCopy(renderCamera.fromScreen, matrix);
93109483             
93119484         if (renderCamera != lightCamera)
9312
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9313
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93149487 
93159488 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93169489             
....@@ -9382,7 +9555,7 @@
93829555             //gl.glFlush();
93839556             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93849557 
9385
-            if (ANIMATION && ABORTED)
9558
+            if (Globals.ANIMATION && ABORTED)
93869559             {
93879560     System.err.println("    ABORTED FRAME");
93889561                 break;
....@@ -9412,7 +9585,7 @@
94129585         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94139586 
94149587         // save image
9415
-        if (ANIMATION && !ABORTED)
9588
+        if (Globals.ANIMATION && !ABORTED)
94169589         {
94179590             VPwidth = viewport[2];
94189591             VPheight = viewport[3];
....@@ -9523,11 +9696,11 @@
95239696             
95249697 //            imagecount++;
95259698             
9526
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9699
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
95279700             
95289701             if (!BOXMODE)
95299702             {
9530
-                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) + ")");
95319704             }
95329705     
95339706             if (!BOXMODE)
....@@ -9565,7 +9738,7 @@
95659738             ABORTED = false;
95669739         }
95679740         else
9568
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+            Grafreed.wav.cursor += 735 * ACSIZE;
95699742         
95709743         if (false)
95719744         {
....@@ -10228,11 +10401,11 @@
1022810401 
1022910402     public void display(GLAutoDrawable drawable)
1023010403     {
10231
-        if (GrafreeD.savesound && GrafreeD.hassound)
10404
+        if (Grafreed.savesound && Grafreed.hassound)
1023210405         {
10233
-            GrafreeD.wav.save();
10234
-            GrafreeD.savesound = false;
10235
-            GrafreeD.hassound = false;
10406
+            Grafreed.wav.save();
10407
+            Grafreed.savesound = false;
10408
+            Grafreed.hassound = false;
1023610409         }
1023710410 //        if (DEBUG_SELECTION)
1023810411 //        {
....@@ -10362,7 +10535,7 @@
1036210535             Object3D theobject = object;
1036310536             Object3D theparent = object.parent;
1036410537             object.parent = null;
10365
-            object = (Object3D)GrafreeD.clone(object);
10538
+            object = (Object3D)Grafreed.clone(object);
1036610539             object.Stripify();
1036710540             if (theobject.selection == null || theobject.selection.Size() == 0)
1036810541                 theobject.PreprocessOcclusion(this);
....@@ -10375,13 +10548,13 @@
1037510548             ambientOcclusion = false;
1037610549         }
1037710550 
10378
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1037910552         {
1038010553             //if (RENDERSHADOW) // ?
1038110554             if (!IsFrozen())
1038210555             {
1038310556                 // dec 2012
10384
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10557
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1038510558                 {
1038610559             Globals.framecount++;
1038710560                     shadowbuffer.display();
....@@ -10508,8 +10681,8 @@
1050810681             
1050910682 //        if (parentcam != renderCamera) // not a light
1051010683         if (cam != lightCamera)
10511
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10512
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10684
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10685
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1051310686             
1051410687             for (int j = 0; j < 4; j++)
1051510688             {
....@@ -10523,8 +10696,8 @@
1052310696             
1052410697 //        if (parentcam != renderCamera) // not a light
1052510698         if (cam != lightCamera)
10526
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10699
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10700
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1052810701         
1052910702             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1053010703             
....@@ -10783,7 +10956,16 @@
1078310956             // Bump noise
1078410957             gl.glActiveTexture(GL.GL_TEXTURE6);
1078510958             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786
-            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
+           
1078710969 
1078810970             gl.glActiveTexture(GL.GL_TEXTURE0);
1078910971             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10908,8 +11090,8 @@
1090811090                 System.err.println("parentcam != renderCamera");
1090911091 
1091011092 //            if (cam != lightCamera)
10911
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10912
-                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
1091311095         }
1091411096         
1091511097         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10930,8 +11112,8 @@
1093011112             if (true) // TODO
1093111113             {
1093211114                 if (cam != lightCamera)
10933
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
-                   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
1093511117             }
1093611118             
1093711119             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11247,8 +11429,14 @@
1124711429     {
1124811430             renderpass++;
1124911431 //        System.out.println("Draw object... ");
11432
+        STEP = 1;
1125011433         if (FAST) // in case there is no script
11251
-            STEP = 16;
11434
+            STEP = 8;
11435
+            
11436
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11437
+        {
11438
+            STEP *= 4;
11439
+        }
1125211440             
1125311441         //object.FullInvariants();
1125411442         
....@@ -11262,13 +11450,31 @@
1126211450             e.printStackTrace();
1126311451         }
1126411452         
11265
-        if (GrafreeD.RENDERME > 0)
11266
-            GrafreeD.RENDERME--; // mechante magouille
11453
+        if (Grafreed.RENDERME > 0)
11454
+            Grafreed.RENDERME--; // mechante magouille
1126711455         
1126811456         Globals.ONESTEP = false;
1126911457     }
1127011458 
1127111459     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
+    }
1127211478     
1127311479     void DrawObject(GL gl, boolean draw)
1127411480     {
....@@ -11333,7 +11539,14 @@
1133311539 
1133411540                 usedtextures.clear();
1133511541             
11336
-                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
+    }
1133711550             }
1133811551             //System.out.println("--> " + stackdepth);
1133911552 //            GrafreeD.traceon();
....@@ -11343,8 +11556,9 @@
1134311556             
1134411557             if (DrawMode() == DEFAULT)
1134511558             {
11346
-                if (DEBUG)
11559
+                if (Globals.DEBUG)
1134711560                 {
11561
+                    CreateSelectedPoint();
1134811562                     float radius = 0.05f;
1134911563                     if (selectedpoint.radius != radius)
1135011564                     {
....@@ -11424,7 +11638,14 @@
1142411638             if (checker != null && DrawMode() == DEFAULT)
1142511639             {
1142611640                 //BindTexture(IMMORTAL_TEXTURE);
11427
-                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
+    }
1142811649                 // NEAREST
1142911650                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1143011651                 DrawChecker(gl);
....@@ -11506,7 +11727,7 @@
1150611727             return;
1150711728         }
1150811729 
11509
-        String string = obj.GetToolTip();
11730
+        String string = obj.toString(); //.GetToolTip();
1151011731         
1151111732         GL gl = GetGL();
1151211733         
....@@ -11823,8 +12044,8 @@
1182312044             //obj.TransformToWorld(light, light);
1182412045             for (int i = tp.size(); --i >= 0;)
1182512046             {
11826
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827
-                    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);
1182812049             }
1182912050 
1183012051 
....@@ -11841,8 +12062,8 @@
1184112062                 parentcam = cameras[0];
1184212063             }
1184312064             
11844
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11845
-            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
1184612067 
1184712068             LA.xformPos(light, renderCamera.toScreen, light);
1184812069             
....@@ -12456,8 +12677,8 @@
1245612677 
1245712678            // display shadow only (bump == 0)
1245812679          "SUB temp.x, half.x, shadow.x;" +
12459
-         "MOV temp.y, -params6.x;" +
12460
-         "SLT temp.z, temp.y, zero.x;" +
12680
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12681
+         "SLT temp.z, temp.y, -one2048th.x;" +
1246112682          "SUB temp.y, one.x, temp.z;" +
1246212683          "MUL temp.x, temp.x, temp.y;" +
1246312684          "KIL temp.x;" +
....@@ -12586,8 +12807,10 @@
1258612807             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1258712808                 
1258812809                 "SUB temp.x, one.x, ndotl.x;" +
12589
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12810
+                // Tuning for default skin
12811
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12812
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12813
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1259112814                 "MUL temp.x, temp.x, temp.y;" +
1259212815                                 
1259312816                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12786,7 +13009,7 @@
1278613009             //once = true;
1278713010         }
1278813011 
12789
-        System.out.print("Program #" + mode + "; length = " + program.length());
13012
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1279013013         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1279113014         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1279213015 
....@@ -12919,12 +13142,16 @@
1291913142 
1292013143                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1292113144                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13145
+                
13146
+                // Compare fragment depth in light space with shadowmap.
1292213147                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1292313148                 "SGE temp.y, temp.x, zero.x;" +
12924
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13149
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13150
+                
13151
+                // Reverse comparison
1292513152                 "SUB temp.x, one.x, temp.x;" +
1292613153                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12927
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13154
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1292813155                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1292913156 
1293013157                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12938,6 +13165,10 @@
1293813165                 // No shadow for backface
1293913166                 "DP3 temp.x, normal, lightd;" +
1294013167                 "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;" +
1294113172                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1294213173                 "";
1294313174     }
....@@ -13496,7 +13727,7 @@
1349613727     public void mousePressed(MouseEvent e)
1349713728     {
1349813729         //System.out.println("mousePressed: " + e);
13499
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13730
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1350013731     }
1350113732 
1350213733     static long prevtime = 0;
....@@ -13523,6 +13754,7 @@
1352313754 	
1352413755         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1352513756             
13757
+        if (BUTTONLESSWHEEL)
1352613758 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1352713759 	{
1352813760             return;
....@@ -13531,7 +13763,7 @@
1353113763         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1353213764         
1353313765         // TIMER
13534
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13766
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1353513767         {
1353613768             keepboxmode = BOXMODE;
1353713769             keepsupport = SUPPORT;
....@@ -13571,8 +13803,8 @@
1357113803       //      mode |= META;
1357213804         //}
1357313805         
13574
-        SetMouseMode(WHEEL | e.getModifiersEx());
13575
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13806
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13807
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1357613808         anchorX = ax;
1357713809         anchorY = ay;
1357813810         prevX = px;
....@@ -13632,6 +13864,10 @@
1363213864 //            wasliveok = true;
1363313865 //            waslive = false;
1363413866             
13867
+            // May 2019 Forget it:
13868
+            if (true)
13869
+                    return;
13870
+            
1363513871             // source == timer
1363613872             if (mouseDown)
1363713873             {
....@@ -13670,7 +13906,7 @@
1367013906     
1367113907     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1367213908 
13673
-    void clickStart(int x, int y, int modifiers)
13909
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1367413910     {
1367513911         if (!wasliveok)
1367613912             return;
....@@ -13687,7 +13923,7 @@
1368713923 //        touched = true; // main DL
1368813924         if (isRenderer)
1368913925         {
13690
-            SetMouseMode(modifiers);
13926
+            SetMouseMode(modifiers, modifiersex);
1369113927         }
1369213928 
1369313929         selectX = anchorX = x;
....@@ -13700,7 +13936,7 @@
1370013936         clicked = true;
1370113937         hold = false;
1370213938 
13703
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13939
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1370413940         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1370513941         {
1370613942       //  System.out.println("RESTART II " + modifiers);
....@@ -13731,7 +13967,7 @@
1373113967             info.camera = renderCamera;
1373213968             info.x = x;
1373313969             info.y = y;
13734
-            info.modifiers = modifiers;
13970
+            info.modifiers = modifiersex;
1373513971             editObj = object.doEditClick(info, 0);
1373613972             if (!editObj)
1373713973             {
....@@ -13748,11 +13984,14 @@
1374813984     
1374913985     public void mouseDragged(MouseEvent e)
1375013986     {
13987
+        Globals.MOUSEDRAGGED = true;
13988
+        
13989
+        //System.out.println("mouseDragged: " + e);
1375113990         if (isRenderer)
1375213991             movingcamera = true;
13992
+        
1375313993         //if (drawing)
1375413994         //return;
13755
-        //System.out.println("mouseDragged: " + e);
1375613995         if ((e.getModifiersEx() & CTRL) != 0
1375713996             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1375813997         {
....@@ -13760,7 +13999,7 @@
1376013999             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1376114000         }
1376214001         else
13763
-            drag(e.getX(), e.getY(), e.getModifiersEx());
14002
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1376414003         
1376514004     //try { Thread.sleep(1); } catch (Exception ex) {}
1376614005     }
....@@ -13933,6 +14172,7 @@
1393314172         
1393414173         public void run()
1393514174         {
14175
+                new Exception().printStackTrace();
1393614176             System.exit(0);
1393714177             for (;;)
1393814178             {
....@@ -13996,7 +14236,7 @@
1399614236                     {
1399714237                         Globals.lighttouched = true;
1399814238                     }
13999
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14239
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1400014240                 }
1400114241             //else
1400214242             }
....@@ -14096,7 +14336,7 @@
1409614336     int X, Y;
1409714337     boolean SX, SY;
1409814338 
14099
-    void drag(int x, int y, int modifiers)
14339
+    void drag(int x, int y, int modifiers, int modifiersex)
1410014340     {
1410114341         if (IsFrozen())
1410214342         {
....@@ -14105,17 +14345,17 @@
1410514345 
1410614346         drag = true; // NEW
1410714347         
14108
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14348
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1410914349 
1411014350         X = x;
1411114351         Y = y;
1411214352         // floating state for animation
14113
-        MODIFIERS = modifiers;
14114
-        modifiers &= ~1024;
14353
+        MODIFIERS = modifiersex;
14354
+        modifiersex &= ~1024;
1411514355         if (false) // modifiers != 0)
1411614356         {
1411714357             //new Exception().printStackTrace();
14118
-            System.out.println("mouseDragged: " + modifiers);
14358
+            System.out.println("mouseDragged: " + modifiersex);
1411914359             System.out.println("SHIFT = " + SHIFT);
1412014360             System.out.println("CONTROL = " + COMMAND);
1412114361             System.out.println("META = " + META);
....@@ -14135,7 +14375,7 @@
1413514375                 info.camera = renderCamera;
1413614376                 info.x = x;
1413714377                 info.y = y;
14138
-                object.editWindow.copy.doEditDrag(info);
14378
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1413914379             } else
1414014380             {
1414114381                 if (x < startX)
....@@ -14287,7 +14527,6 @@
1428714527     public void mouseMoved(MouseEvent e)
1428814528     {
1428914529         //System.out.println("mouseMoved: " + e);
14290
-
1429114530         if (isRenderer)
1429214531             return;
1429314532         
....@@ -14312,7 +14551,10 @@
1431214551 
1431314552     public void mouseReleased(MouseEvent e)
1431414553     {
14554
+        Globals.MOUSEDRAGGED = false;
14555
+        
1431514556         movingcamera = false;
14557
+        X = Y = 0;
1431614558         //System.out.println("mouseReleased: " + e);
1431714559         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1431814560     }
....@@ -14335,9 +14577,9 @@
1433514577         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1433614578         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1433714579         
14338
-        if (control || command || IsFrozen())
14580
+// No delay        if (control || command || IsFrozen())
1433914581             timeout = true;
14340
-        else
14582
+// ?? May 2019        else
1434114583        // timer.setDelay((modifiers & 128) != 0?0:350);
1434214584         mouseDown = false;
1434314585     if (!control && !command) // june 2013
....@@ -14447,7 +14689,7 @@
1444714689         System.out.println("keyReleased: " + e);
1444814690     }
1444914691 
14450
-    void SetMouseMode(int modifiers)
14692
+    void SetMouseMode(int modifiers, int modifiersex)
1445114693     {
1445214694         //System.out.println("SetMouseMode = " + modifiers);
1445314695         //modifiers &= ~1024;
....@@ -14459,25 +14701,25 @@
1445914701         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1446014702         //	return;
1446114703         //System.out.println("SetMode = " + modifiers);
14462
-        if ((modifiers & WHEEL) == WHEEL)
14704
+        if ((modifiersex & WHEEL) == WHEEL)
1446314705         {
1446414706             mouseMode |= ZOOM;
1446514707         }
1446614708         
1446714709         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468
-        if (capsLocked || (modifiers & META) == META)
14710
+        if (capsLocked) // || (modifiers & META) == META)
1446914711         {
1447014712             mouseMode |= VR; // BACKFORTH;
1447114713         }
14472
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14714
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1447314715         {
1447414716             mouseMode |= SELECT;
1447514717         }
14476
-        if ((modifiers & COMMAND) == COMMAND)
14718
+        if ((modifiersex & COMMAND) == COMMAND)
1447714719         {
1447814720             mouseMode |= SELECT;
1447914721         }
14480
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14722
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1448114723         {
1448214724             mouseMode &= ~VR;
1448314725             mouseMode |= TRANSLATE;
....@@ -14506,7 +14748,7 @@
1450614748 
1450714749         if (isRenderer) //
1450814750         {
14509
-            SetMouseMode(modifiers);
14751
+            SetMouseMode(0, modifiers);
1451014752         }
1451114753 
1451214754         Globals.theRenderer.keyPressed(key);
....@@ -14678,8 +14920,14 @@
1467814920                 RevertCamera();
1467914921                 repaint();
1468014922                 break;
14681
-            case 'L':
1468214923             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':
1468314931                 if (lightMode)
1468414932                 {
1468514933                     lightMode = false;
....@@ -14826,23 +15074,21 @@
1482615074                 kompactbit = 6;
1482715075                 break;
1482815076             case ' ':
14829
-                lightMode ^= true;
14830
-                Globals.lighttouched = true;
14831
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14832
-                targetLookAt.set(manipCamera.lookAt);
15077
+                ObjEditor.theFrame.ToggleFullScreen();
1483315078                 repaint();
1483415079                 break;
1483515080             //case '`' :
1483615081             case ESC:
1483715082                 RENDERPROGRAM += 1;
1483815083                 RENDERPROGRAM %= 3;
15084
+
1483915085                 repaint();
1484015086                 break;
1484115087             case 'Z':
1484215088                 //RESIZETEXTURE ^= true;
1484315089                 //break;
1484415090             case 'z':
14845
-                RENDERSHADOW ^= true;
15091
+                Globals.RENDERSHADOW ^= true;
1484615092                 Globals.lighttouched = true;
1484715093                 repaint();
1484815094                 break;
....@@ -14966,7 +15212,7 @@
1496615212         //mode = ROTATE;
1496715213         if ((MODIFIERS & COMMAND) == 0) // VR??
1496815214         {
14969
-            SetMouseMode(modifiers);
15215
+            SetMouseMode(0, modifiers);
1497015216         }
1497115217     }
1497215218 
....@@ -15100,8 +15346,9 @@
1510015346 
1510115347     protected void processMouseMotionEvent(MouseEvent e)
1510215348     {
15103
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
15104
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15349
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15350
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15351
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1510515352         {
1510615353             mouseMoved(e);
1510715354         } else
....@@ -15131,6 +15378,7 @@
1513115378 
1513215379     void SelectParent()
1513315380     {
15381
+                new Exception().printStackTrace();
1513415382         System.exit(0);
1513515383         Composite group = (Composite) object;
1513615384         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -15154,6 +15402,7 @@
1515415402 
1515515403     void SelectChildren()
1515615404     {
15405
+                new Exception().printStackTrace();
1515715406         System.exit(0);
1515815407         /*
1515915408         Composite group = (Composite) object;
....@@ -15318,7 +15567,9 @@
1531815567         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1531915568         //Image img = CreateImage(width, height);
1532015569         //System.out.println("width = " + width + "; height = " + height + "\n");
15570
+        
1532115571         Graphics gr = g; // img.getGraphics();
15572
+        
1532215573         if (!hasMarquee)
1532315574         {
1532415575             if (Xmin < Xmax) // !locked)
....@@ -15416,14 +15667,33 @@
1541615667             if (!isRenderer)
1541715668             {
1541815669                 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
+                }
1541915687             }
1542015688         }
15689
+        
1542115690         if (isRenderer)
1542215691         {
1542315692         //gr.setColor(Color.black);
1542415693         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1542515694         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1542615695         }
15696
+        
1542715697         if (hasMarquee)
1542815698         {
1542915699             gr.setXORMode(Color.white);
....@@ -15536,6 +15806,7 @@
1553615806     public boolean mouseDown(Event evt, int x, int y)
1553715807     {
1553815808         System.out.println("mouseDown: " + evt);
15809
+        System.exit(0);
1553915810         /*
1554015811         locked = true;
1554115812         drag = false;
....@@ -15579,7 +15850,7 @@
1557915850         {
1558015851             keyPressed(0, modifiers);
1558115852         }
15582
-        clickStart(x, y, modifiers);
15853
+ //       clickStart(x, y, modifiers);
1558315854         return true;
1558415855     }
1558515856 
....@@ -15697,7 +15968,7 @@
1569715968         {
1569815969             keyReleased(0, 0);
1569915970         }
15700
-        drag(x, y, modifiers);
15971
+        drag(x, y, 0, modifiers);
1570115972         return true;
1570215973     }
1570315974 
....@@ -15829,7 +16100,7 @@
1582916100     Object3D object;
1583016101     static Object3D trackedobject;
1583116102     Camera renderCamera; // Light or Eye (or Occlusion)
15832
-    /*static*/ Camera manipCamera; // Light or Eye
16103
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1583316104 	/*static*/ Camera eyeCamera;
1583416105     /*static*/ Camera lightCamera;
1583516106     int cameracount;
....@@ -16267,6 +16538,7 @@
1626716538         {
1626816539             if (!selection)
1626916540             {
16541
+                new Exception().printStackTrace();
1627016542                 System.exit(0);
1627116543                 return;
1627216544             }
....@@ -16394,16 +16666,16 @@
1639416666                             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]));
1639516667                         }
1639616668                         
16397
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16669
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1639816670                     }
1639916671                 }
1640016672                 
1640116673                 if (!movingcamera && !PAINTMODE)
1640216674                     object.editWindow.ScreenFitPoint(); // fev 2014
1640316675                 
16404
-                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)
1640516677                 {
16406
-                    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);
1640716679                     
1640816680                     Object3D group = new Object3D("inst" + paintcount++);
1640916681                     
....@@ -16559,7 +16831,7 @@
1655916831                 gl.glDisable(gl.GL_CULL_FACE);
1656016832             }
1656116833 
16562
-            if (!RENDERSHADOW)
16834
+            if (!Globals.RENDERSHADOW)
1656316835                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1656416836 
1656516837             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16569,7 +16841,7 @@
1656916841             //gl.glColorMask(false, false, false, false);
1657016842 
1657116843             //render_scene_from_light_view(gl, drawable, 0, 0);
16572
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16844
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1657316845             {
1657416846                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1657516847 
....@@ -16985,23 +17257,15 @@
1698517257     int AAbuffersize = 0;
1698617258     
1698717259     //double[] selectedpoint = new double[3];
16988
-    static Superellipsoid selectedpoint = new Superellipsoid();
17260
+    static Superellipsoid selectedpoint;
1698917261     static Sphere previousselectedpoint = null;
16990
-    static Sphere debugpointG = new Sphere();
16991
-    static Sphere debugpointP = new Sphere();
16992
-    static Sphere debugpointC = new Sphere();
16993
-    static Sphere debugpointR = new Sphere();
17262
+    static Sphere debugpointG;
17263
+    static Sphere debugpointP;
17264
+    static Sphere debugpointC;
17265
+    static Sphere debugpointR;
1699417266     
1699517267     static Sphere debugpoints[] = new Sphere[8];
1699617268  
16997
-    static
16998
-    {
16999
-        for (int i=0; i<8; i++)
17000
-        {
17001
-            debugpoints[i] = new Sphere();
17002
-        }
17003
-    }
17004
-    
1700517269     static void InitPoints(float radius)
1700617270     {
1700717271         for (int i=0; i<8; i++)