blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 ecff440ceef3ad352aa64cedbb913107ec4863a5 
 CameraPane.java
....@@ -37,7 +37,6 @@
3737     static boolean[] selectedstack = new boolean[65536];
3838     static int materialdepth = 0;
3939 
40
-    static boolean DEBUG = false;
4140     static boolean FRUSTUM = false; // still bogus true; // frustum culling
4241 
4342     // camera change fix
....@@ -149,6 +148,8 @@
149148         defaultcaps.setAccumBlueBits(16);
150149         defaultcaps.setAccumAlphaBits(16);
151150     }
151
+    
152
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152153     
153154     void SetAsGLRenderer(boolean b)
154155     {
....@@ -325,7 +326,7 @@
325326                 cStatic.objectstack[materialdepth++] = obj;
326327                 //System.out.println("material " + material);
327328                 //Applet3D.tracein(this, selected);
328
-                display.vector2buffer = obj.projectedVertices;
329
+                //display.vector2buffer = obj.projectedVertices;
329330                 if (obj instanceof Camera)
330331                 {
331332                     display.options1[0] = material.shift;
....@@ -357,7 +358,7 @@
357358                 /**/
358359                 } else
359360                 {
360
-                    DrawMaterial(material, selected);
361
+                    DrawMaterial(material, selected, obj.projectedVertices);
361362                 }
362363             } else
363364             {
....@@ -381,8 +382,8 @@
381382             cStatic.objectstack[materialdepth++] = obj;
382383             //System.out.println("material " + material);
383384             //Applet3D.tracein("selected ", selected);
384
-            display.vector2buffer = obj.projectedVertices;
385
-            display.DrawMaterial(material, selected);
385
+            //display.vector2buffer = obj.projectedVertices;
386
+            display.DrawMaterial(material, selected, obj.projectedVertices);
386387         }
387388     }
388389     
....@@ -399,8 +400,8 @@
399400                 materialdepth -= 1;
400401                 if (materialdepth > 0)
401402                 {
402
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403
-                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
403
+                    //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
+                    display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404405                 }
405406             //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406407             } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -420,8 +421,8 @@
420421             materialdepth -= 1;
421422             if (materialdepth > 0)
422423             {
423
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424
-                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
424
+                //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
+                display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425426             }
426427         //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427428         //else
....@@ -462,10 +463,12 @@
462463         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463464         {
464465             //gl.glBegin(gl.GL_TRIANGLES);
465
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
466
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
467
+                    // TEST LIVE NORMALS && !obj.dontselect
468
+                    ;
466469             if (!hasnorm)
467470             {
468
-           //     System.out.println("FUCK!!");
471
+           //     System.out.println("Mesh normal");
469472                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470473                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471474                 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1190,10 +1193,12 @@
11901193                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911194                                 }
11921195                             }
1196
+                            
11931197                             if (flipV)
11941198                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951199                             else
11961200                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+                            
11971202                             //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981203                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991204 
....@@ -1213,10 +1218,12 @@
12131218                                     gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141219                                 }
12151220                             }
1221
+                            
12161222                             if (flipV)
12171223                                 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181224                             else
12191225                                 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+                            
12201227                             //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211228                             gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221229 
....@@ -1244,8 +1251,10 @@
12441251                                     gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451252                                 else
12461253                                     gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+                                
12471255                                 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481256                                 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+                                
12491258                                 count2 += 2;
12501259                                 count3 += 3;
12511260                             }
....@@ -1601,7 +1610,7 @@
16011610 //        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16021611     }
16031612     
1604
-    void DrawMaterial(cMaterial material, boolean selected)
1613
+    void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16051614     {
16061615             CameraPane display = this;
16071616         //new Exception().printStackTrace();
....@@ -1636,7 +1645,7 @@
16361645             colorV[0] = display.modelParams0[0] * material.diffuse;
16371646             colorV[1] = display.modelParams0[1] * material.diffuse;
16381647             colorV[2] = display.modelParams0[2] * material.diffuse;
1639
-            colorV[3] = material.opacity;
1648
+            colorV[3] = 1; // material.opacity;
16401649 
16411650             gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16421651             //System.out.println("Opacity = " + opacity);
....@@ -1744,9 +1753,9 @@
17441753         display.modelParams7[2] = 0;
17451754         display.modelParams7[3] = 0;
17461755 
1747
-        display.modelParams6[0] = 100; // criss de bug de bump
1756
+        //display.modelParams6[0] = 100; // criss de bug de bump
17481757         
1749
-        Object3D.cVector2[] extparams = display.vector2buffer;
1758
+        Object3D.cVector2[] extparams = others; // display.vector2buffer;
17501759         if (extparams != null && extparams.length > 0 && extparams[0] != null)
17511760         {
17521761             display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1888,7 +1897,7 @@
18881897     void PushMatrix(double[][] matrix)
18891898     {
18901899     //    GrafreeD.tracein(matrix);
1891
-        PushMatrix(matrix,1);
1900
+        PushMatrix(matrix, 1);
18921901     }
18931902     
18941903     void PushMatrix()
....@@ -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 ||*/
....@@ -8067,6 +8134,93 @@
80678134         return; // true;
80688135     }
80698136     
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
+    
80708224     CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718225     {
80728226         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
....@@ -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
....@@ -9210,11 +9366,35 @@
92109366         jy8[3] = 0.5f;
92119367     }
92129368     
9213
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9369
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
92149370     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
92159371     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
92169372     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
92179373 
9374
+    void ResetOptions()
9375
+    {
9376
+        options1[0] = 100;
9377
+        options1[1] = 0.00001f;
9378
+        options1[2] = 20;
9379
+        options1[3] = 0;
9380
+        options1[4] = 0;
9381
+        
9382
+        options2[0] = 0;
9383
+        options2[1] = 1;
9384
+        options2[2] = 0;
9385
+        options2[3] = 0;
9386
+        
9387
+        options3[0] = 1;
9388
+        options3[1] = 1;
9389
+        options3[2] = 1;
9390
+        options3[3] = 0;
9391
+        
9392
+        options4[0] = 1;
9393
+        options4[1] = 0;
9394
+        options4[2] = 1;
9395
+        options4[3] = 0;
9396
+    }
9397
+    
92189398     static int imagecount = 0; // movie generation
92199399     
92209400     static int jitter = 0;
....@@ -9310,8 +9490,8 @@
93109490         assert (parentcam != renderCamera);
93119491         
93129492         if (renderCamera != lightCamera)
9313
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9314
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9493
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9494
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93159495         
93169496 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93179497             
....@@ -9326,8 +9506,8 @@
93269506             LA.matCopy(renderCamera.fromScreen, matrix);
93279507             
93289508         if (renderCamera != lightCamera)
9329
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
9330
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9509
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9510
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93319511 
93329512 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93339513             
....@@ -10325,6 +10505,7 @@
1032510505                     ANTIALIAS = 0;
1032610506                     //System.out.println("RESTART");
1032710507                     AAtimer.restart();
10508
+                    Globals.TIMERRUNNING = true;
1032810509                 }
1032910510             }
1033010511         }
....@@ -10392,13 +10573,14 @@
1039210573             ambientOcclusion = false;
1039310574         }
1039410575 
10395
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10576
+        if (//Globals.lighttouched &&
10577
+                DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039610578         {
1039710579             //if (RENDERSHADOW) // ?
1039810580             if (!IsFrozen())
1039910581             {
1040010582                 // dec 2012
10401
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10583
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1040210584                 {
1040310585             Globals.framecount++;
1040410586                     shadowbuffer.display();
....@@ -10525,8 +10707,8 @@
1052510707             
1052610708 //        if (parentcam != renderCamera) // not a light
1052710709         if (cam != lightCamera)
10528
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10529
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10710
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10711
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1053010712             
1053110713             for (int j = 0; j < 4; j++)
1053210714             {
....@@ -10540,8 +10722,8 @@
1054010722             
1054110723 //        if (parentcam != renderCamera) // not a light
1054210724         if (cam != lightCamera)
10543
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10544
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10725
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10726
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054510727         
1054610728             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054710729             
....@@ -10934,8 +11116,8 @@
1093411116                 System.err.println("parentcam != renderCamera");
1093511117 
1093611118 //            if (cam != lightCamera)
10937
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10938
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11119
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11120
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1093911121         }
1094011122         
1094111123         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10956,8 +11138,8 @@
1095611138             if (true) // TODO
1095711139             {
1095811140                 if (cam != lightCamera)
10959
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10960
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11141
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11142
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1096111143             }
1096211144             
1096311145             LA.xformPos(light0, cam.toScreen, light0);
....@@ -11302,8 +11484,29 @@
1130211484 
1130311485     static boolean zoomonce = false;
1130411486     
11487
+    static void CreateSelectedPoint()
11488
+    {
11489
+        if (selectedpoint == null)
11490
+        {
11491
+            debugpointG = new Sphere();
11492
+            debugpointP = new Sphere();
11493
+            debugpointC = new Sphere();
11494
+            debugpointR = new Sphere();
11495
+            
11496
+            selectedpoint = new Superellipsoid();
11497
+            
11498
+            for (int i=0; i<8; i++)
11499
+            {
11500
+                debugpoints[i] = new Sphere();
11501
+            }
11502
+        }
11503
+    }
11504
+    
1130511505     void DrawObject(GL gl, boolean draw)
1130611506     {
11507
+        // To clear camera values
11508
+        ResetOptions();
11509
+        
1130711510         //System.out.println("DRAW OBJECT " + mouseDown);
1130811511 //        DrawMode() = SELECTION;
1130911512         //GL gl = getGL();
....@@ -11382,8 +11585,9 @@
1138211585             
1138311586             if (DrawMode() == DEFAULT)
1138411587             {
11385
-                if (DEBUG)
11588
+                if (Globals.DEBUG)
1138611589                 {
11590
+                    CreateSelectedPoint();
1138711591                     float radius = 0.05f;
1138811592                     if (selectedpoint.radius != radius)
1138911593                     {
....@@ -11552,7 +11756,7 @@
1155211756             return;
1155311757         }
1155411758 
11555
-        String string = obj.GetToolTip();
11759
+        String string = obj.toString(); //.GetToolTip();
1155611760         
1155711761         GL gl = GetGL();
1155811762         
....@@ -11869,8 +12073,8 @@
1186912073             //obj.TransformToWorld(light, light);
1187012074             for (int i = tp.size(); --i >= 0;)
1187112075             {
11872
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873
-                    LA.xformPos(light, tp.get(i).toParent, light);
12076
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12077
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1187412078             }
1187512079 
1187612080 
....@@ -11887,8 +12091,8 @@
1188712091                 parentcam = cameras[0];
1188812092             }
1188912093             
11890
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11891
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12094
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12095
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1189212096 
1189312097             LA.xformPos(light, renderCamera.toScreen, light);
1189412098             
....@@ -12502,8 +12706,8 @@
1250212706 
1250312707            // display shadow only (bump == 0)
1250412708          "SUB temp.x, half.x, shadow.x;" +
12505
-         "MOV temp.y, -params6.x;" +
12506
-         "SLT temp.z, temp.y, zero.x;" +
12709
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12710
+         "SLT temp.z, temp.y, -one2048th.x;" +
1250712711          "SUB temp.y, one.x, temp.z;" +
1250812712          "MUL temp.x, temp.x, temp.y;" +
1250912713          "KIL temp.x;" +
....@@ -12834,7 +13038,7 @@
1283413038             //once = true;
1283513039         }
1283613040 
12837
-        System.out.print("Program #" + mode + "; length = " + program.length());
13041
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1283813042         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1283913043         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1284013044 
....@@ -12967,12 +13171,16 @@
1296713171 
1296813172                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1296913173                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13174
+                
13175
+                // Compare fragment depth in light space with shadowmap.
1297013176                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1297113177                 "SGE temp.y, temp.x, zero.x;" +
12972
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13178
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13179
+                
13180
+                // Reverse comparison
1297313181                 "SUB temp.x, one.x, temp.x;" +
1297413182                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12975
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13183
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1297613184                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1297713185 
1297813186                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12986,6 +13194,10 @@
1298613194                 // No shadow for backface
1298713195                 "DP3 temp.x, normal, lightd;" +
1298813196                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13197
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13198
+
13199
+                // No shadow when out of frustrum
13200
+                "SGE temp.x, " + depth + ".z, one.z;" +
1298913201                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1299013202                 "";
1299113203     }
....@@ -13132,7 +13344,8 @@
1313213344     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1313313345     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1313413346     /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13135
-    Object3D.cVector2[] vector2buffer;
13347
+    
13348
+    //Object3D.cVector2[] vector2buffer;
1313613349 
1313713350     // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1313813351     // OUT : diff, spec
....@@ -13655,6 +13868,7 @@
1365513868         else
1365613869         if (evt.getSource() == AAtimer)
1365713870         {
13871
+                    Globals.TIMERRUNNING = false;
1365813872             if (mouseDown)
1365913873             {
1366013874             //new Exception().printStackTrace();
....@@ -13729,6 +13943,7 @@
1372913943             return;
1373013944         
1373113945         AAtimer.restart(); // 
13946
+        Globals.TIMERRUNNING = true;
1373213947 
1373313948 //        waslive = LIVE;
1373413949 //        LIVE = false;
....@@ -13801,9 +14016,12 @@
1380114016     
1380214017     public void mouseDragged(MouseEvent e)
1380314018     {
14019
+        Globals.MOUSEDRAGGED = true;
14020
+        
1380414021         //System.out.println("mouseDragged: " + e);
1380514022         if (isRenderer)
1380614023             movingcamera = true;
14024
+        
1380714025         //if (drawing)
1380814026         //return;
1380914027         if ((e.getModifiersEx() & CTRL) != 0
....@@ -14189,7 +14407,8 @@
1418914407                 info.camera = renderCamera;
1419014408                 info.x = x;
1419114409                 info.y = y;
14192
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14410
+                object.GetWindow().copy
14411
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1419314412             } else
1419414413             {
1419514414                 if (x < startX)
....@@ -14353,7 +14572,9 @@
1435314572         ci.camera = renderCamera;
1435414573         if (!isRenderer)
1435514574         {
14356
-            if (object.editWindow.copy.doEditClick(ci, 0))
14575
+            //ObjEditor editWindow = object.editWindow;
14576
+            //Object3D copy = editWindow.copy;
14577
+            if (object.doEditClick(ci, 0))
1435714578             {
1435814579                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1435914580             } else
....@@ -14365,7 +14586,10 @@
1436514586 
1436614587     public void mouseReleased(MouseEvent e)
1436714588     {
14589
+        Globals.MOUSEDRAGGED = false;
14590
+        
1436814591         movingcamera = false;
14592
+        X = Y = 0;
1436914593         //System.out.println("mouseReleased: " + e);
1437014594         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1437114595     }
....@@ -14731,8 +14955,14 @@
1473114955                 RevertCamera();
1473214956                 repaint();
1473314957                 break;
14734
-            case 'L':
1473514958             case 'l':
14959
+                lightMode ^= true;
14960
+                Globals.lighttouched = true;
14961
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14962
+                targetLookAt.set(manipCamera.lookAt);
14963
+                repaint();
14964
+                break;
14965
+            case 'L':
1473614966                 if (lightMode)
1473714967                 {
1473814968                     lightMode = false;
....@@ -14879,16 +15109,14 @@
1487915109                 kompactbit = 6;
1488015110                 break;
1488115111             case ' ':
14882
-                lightMode ^= true;
14883
-                Globals.lighttouched = true;
14884
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14885
-                targetLookAt.set(manipCamera.lookAt);
15112
+                ObjEditor.theFrame.ToggleFullScreen();
1488615113                 repaint();
1488715114                 break;
1488815115             //case '`' :
1488915116             case ESC:
1489015117                 RENDERPROGRAM += 1;
1489115118                 RENDERPROGRAM %= 3;
15119
+
1489215120                 repaint();
1489315121                 break;
1489415122             case 'Z':
....@@ -15180,7 +15408,7 @@
1518015408         }
1518115409          */
1518215410 
15183
-        object.editWindow.EditSelection();
15411
+        object.editWindow.EditSelection(false);
1518415412     }
1518515413 
1518615414     void SelectParent()
....@@ -15374,7 +15602,9 @@
1537415602         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1537515603         //Image img = CreateImage(width, height);
1537615604         //System.out.println("width = " + width + "; height = " + height + "\n");
15605
+        
1537715606         Graphics gr = g; // img.getGraphics();
15607
+        
1537815608         if (!hasMarquee)
1537915609         {
1538015610             if (Xmin < Xmax) // !locked)
....@@ -15472,14 +15702,33 @@
1547215702             if (!isRenderer)
1547315703             {
1547415704                 object.drawEditHandles(info, 0);
15705
+                
15706
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15707
+                {
15708
+                    switch (object.selection.get(0).hitSomething)
15709
+                    {
15710
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15711
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15712
+                            break;
15713
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15714
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15715
+                        break;
15716
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15717
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15718
+                        break;
15719
+                    }
15720
+                    
15721
+                }
1547515722             }
1547615723         }
15724
+        
1547715725         if (isRenderer)
1547815726         {
1547915727         //gr.setColor(Color.black);
1548015728         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1548115729         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1548215730         }
15731
+        
1548315732         if (hasMarquee)
1548415733         {
1548515734             gr.setXORMode(Color.white);
....@@ -15886,7 +16135,7 @@
1588616135     Object3D object;
1588716136     static Object3D trackedobject;
1588816137     Camera renderCamera; // Light or Eye (or Occlusion)
15889
-    /*static*/ Camera manipCamera; // Light or Eye
16138
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1589016139 	/*static*/ Camera eyeCamera;
1589116140     /*static*/ Camera lightCamera;
1589216141     int cameracount;
....@@ -16171,16 +16420,16 @@
1617116420                 cStatic.objectstack[materialdepth++] = checker;
1617216421                 //System.out.println("material " + material);
1617316422                 //Applet3D.tracein(this, selected);
16174
-                vector2buffer = checker.projectedVertices;
16423
+                //vector2buffer = checker.projectedVertices;
1617516424 
1617616425         //checker.GetMaterial().Draw(this, false); // true);
16177
-        DrawMaterial(checker.GetMaterial(), false); // true);
16426
+        DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1617816427 
1617916428                 materialdepth -= 1;
1618016429                 if (materialdepth > 0)
1618116430                 {
16182
-                    vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16183
-                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16431
+                    //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16432
+                    DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1618416433                 }
1618516434         //checker.GetMaterial().opacity = 1f;
1618616435         ////checker.GetMaterial().ambient = 1f;
....@@ -16403,6 +16652,8 @@
1640316652 //                System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1640416653 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1640516654 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16655
+                
16656
+                CreateSelectedPoint();
1640616657                 
1640716658                 // Will fit the mesh !!!
1640816659                 selectedpoint.toParent[0][0] = 0.0001;
....@@ -17043,23 +17294,15 @@
1704317294     int AAbuffersize = 0;
1704417295     
1704517296     //double[] selectedpoint = new double[3];
17046
-    static Superellipsoid selectedpoint = new Superellipsoid();
17297
+    static Superellipsoid selectedpoint;
1704717298     static Sphere previousselectedpoint = null;
17048
-    static Sphere debugpointG = new Sphere();
17049
-    static Sphere debugpointP = new Sphere();
17050
-    static Sphere debugpointC = new Sphere();
17051
-    static Sphere debugpointR = new Sphere();
17299
+    static Sphere debugpointG;
17300
+    static Sphere debugpointP;
17301
+    static Sphere debugpointC;
17302
+    static Sphere debugpointR;
1705217303     
1705317304     static Sphere debugpoints[] = new Sphere[8];
1705417305  
17055
-    static
17056
-    {
17057
-        for (int i=0; i<8; i++)
17058
-        {
17059
-            debugpoints[i] = new Sphere();
17060
-        }
17061
-    }
17062
-    
1706317306     static void InitPoints(float radius)
1706417307     {
1706517308         for (int i=0; i<8; i++)