blame | history | patch | commit | commitdiff
Normand Briere
2019-08-21 7ac1b01c591ed65743676b1181d60eb17c5cb69d 
 CameraPane.java
....@@ -110,7 +110,11 @@
110110     //private Mat4f spotlightTransform = new Mat4f();
111111     //private Mat4f spotlightInverseTransform = new Mat4f();
112112     static GLContext glcontext = null;
113
-    /*static*/ com.sun.opengl.util.texture.Texture cubemap;
113
+    /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
114
+    /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
115
+    /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
116
+    boolean transformMode;
117
+    
114118     boolean reverseUP = false;
115119     static boolean frozen = false;
116120     boolean enablebackspace = false; // patch for back buffer refresh
....@@ -164,7 +168,7 @@
164168 
165169     
166170     // OPTIONS
167
-    boolean Skinshader = true;
171
+    boolean Skinshader = false; // true;
168172     boolean cameraLight = false;
169173     boolean UVdebug = false;
170174     boolean Udebug = false;
....@@ -188,15 +192,16 @@
188192     
189193     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190194 
191
-    public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
195
+    public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192196     {
193197         try
194198         {
195
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
199
+            return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196200         } catch (IOException e)
197201         {
198202             System.out.println("NAME = " + name);
199203             e.printStackTrace(); // throw new RuntimeException(e);
204
+            return null;
200205         }
201206     }
202207     
....@@ -537,7 +542,8 @@
537542                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
538543                 LA.vecCross(obj.v0, obj.v1, obj.v2);
539544                 LA.vecNormalize(obj.v2);
540
-                gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
545
+                
546
+                SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
541547             }
542548 
543549             // P
....@@ -559,7 +565,7 @@
559565                 y += ny * obj.NORMALPUSH;
560566                 z += nz * obj.NORMALPUSH;
561567                 
562
-                gl.glNormal3f(nx, ny, nz);
568
+                SetGLNormal(gl, nx, ny, nz);
563569             }
564570             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
565571             SetColor(obj, pv);
....@@ -591,7 +597,7 @@
591597                 y += ny * obj.NORMALPUSH;
592598                 z += nz * obj.NORMALPUSH;
593599                 
594
-                gl.glNormal3f(nx, ny, nz);
600
+                SetGLNormal(gl, nx, ny, nz);
595601             }
596602             //System.out.println("vertexq = " + qv.s + ", " + qv.t);
597603         //    boolean locked = false;
....@@ -639,7 +645,7 @@
639645                 y += ny * obj.NORMALPUSH;
640646                 z += nz * obj.NORMALPUSH;
641647                 
642
-                gl.glNormal3f(nx, ny, nz);
648
+                SetGLNormal(gl, nx, ny, nz);
643649             }
644650             
645651         //    if ((dot&4) == 0)
....@@ -1245,10 +1251,10 @@
12451251                             {
12461252                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12471253                                 {
1248
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1254
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12491255                                 } else
12501256                                 {
1251
-                                    gl.glNormal3f(0, 0, 1);
1257
+                                    SetGLNormal(gl, 0, 0, 1);
12521258                                 }
12531259 
12541260                                 if (c != null)
....@@ -1272,10 +1278,10 @@
12721278                             {
12731279                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12741280                                 {
1275
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1281
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12761282                                 } else
12771283                                 {
1278
-                                    gl.glNormal3f(0, 0, 1);
1284
+                                    SetGLNormal(gl, 0, 0, 1);
12791285                                 }
12801286                                 if (c != null)
12811287                                 {
....@@ -1300,10 +1306,10 @@
13001306                                 {
13011307                                     if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
13021308                                     {
1303
-                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1309
+                                        SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
13041310                                     } else
13051311                                     {
1306
-                                        gl.glNormal3f(0, 0, 1);
1312
+                                        SetGLNormal(gl, 0, 0, 1);
13071313                                     }
13081314                                     if (c != null)
13091315                                     {
....@@ -1485,7 +1491,7 @@
14851491     {
14861492         if (!selectmode)
14871493         {
1488
-            gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1494
+            SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
14891495             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14901496             
14911497             if (flipV)
....@@ -1814,7 +1820,7 @@
18141820 
18151821         display.modelParams7[0] = 0;
18161822         display.modelParams7[1] = 1000;
1817
-        display.modelParams7[2] = 0;
1823
+        display.modelParams7[2] = material.parallax;
18181824         display.modelParams7[3] = 0;
18191825 
18201826         //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2047,9 +2053,9 @@
20472053         switch(viewcode)
20482054         {
20492055             case 0: return "main";
2050
-            case 1: return "one";
2051
-            case 2: return "two";
2052
-            case 3: return "three";
2056
+            case 1: return "Red";
2057
+            case 2: return "Green";
2058
+            case 3: return "Blue";
20532059             case 4: return "light";
20542060         }
20552061         
....@@ -2470,6 +2476,18 @@
24702476         return CreateBim(bytes, width, height);
24712477     }
24722478 
2479
+    private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
2480
+    {
2481
+        gl.glNormal3f(nx, ny, nz);
2482
+
2483
+        if (ny > 0.9 || ny < -0.9)
2484
+            // Ground or ceiling
2485
+            gl.glVertexAttrib3f(4, 1, 0, 0);
2486
+        else
2487
+            // Walls
2488
+            gl.glVertexAttrib3f(4, 0, 1, 0);
2489
+    }
2490
+
24732491     /**/
24742492     class CacheTexture
24752493     {
....@@ -2512,7 +2530,7 @@
25122530                     com.sun.opengl.util.texture.TextureIO.newTextureData(
25132531                     getClass().getClassLoader().getResourceAsStream(name),
25142532                     true,
2515
-                    com.sun.opengl.util.texture.TextureIO.PNG);
2533
+                    GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
25162534         } catch (java.io.IOException e)
25172535         {
25182536             throw new javax.media.opengl.GLException(e);
....@@ -9233,6 +9251,8 @@
92339251 
92349252     void LoadEnvy(int which)
92359253     {
9254
+        assert(false);
9255
+        
92369256         String name;
92379257         String ext;
92389258 
....@@ -10683,9 +10703,18 @@
1068310703     static boolean init = false;
1068410704     
1068510705     double[][] matrix = LA.newMatrix();
10706
+    
10707
+    // This is to refresh the UI of the material panel.
10708
+    ObjEditor patchMaterial;
1068610709 
1068710710     public void display(GLAutoDrawable drawable)
1068810711     {
10712
+        if (patchMaterial.patchMaterial)
10713
+        {
10714
+            patchMaterial.patchMaterial = false;
10715
+            patchMaterial.objectPanel.setSelectedIndex(1);
10716
+        }
10717
+        
1068910718         if (Grafreed.savesound && Grafreed.hassound)
1069010719         {
1069110720             Grafreed.wav.save();
....@@ -11077,18 +11106,34 @@
1107711106 //
1107811107 //        newenvy = -1;
1107911108         
11080
-        if (object.skyboxname != null)
11109
+        if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1108111110         {
11082
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11111
+            if (cubemaprgb == null)
1108311112             {
11084
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11085
-                loadedskyboxname = object.skyboxname;
11113
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1108611114             }
11115
+            
11116
+            cubemap = cubemaprgb;
1108711117         }
1108811118         else
1108911119         {
11090
-            cubemap = null;
11091
-            loadedskyboxname = null;
11120
+            if (object.skyboxname != null)
11121
+            {
11122
+                if (!object.skyboxname.equals(this.loadedskyboxname))
11123
+                {
11124
+                    if (cubemap != null && cubemap != cubemaprgb)
11125
+                        cubemap.dispose();
11126
+                    cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11127
+                    loadedskyboxname = object.skyboxname;
11128
+                }
11129
+            }
11130
+            else
11131
+            {
11132
+                cubemapcustom = null;
11133
+                loadedskyboxname = null;
11134
+            }
11135
+            
11136
+            cubemap = cubemapcustom;
1109211137         }
1109311138         
1109411139         ratio = ((double) getWidth()) / getHeight();
....@@ -12561,7 +12606,7 @@
1256112606                 "PARAM params4   = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1256212607                 "PARAM params5   = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1256312608                 "PARAM params6   = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12564
-                "PARAM params7   = program.env[7];" + // noise power, opacity power
12609
+                "PARAM params7   = program.env[7];" + // noise power, opacity power, parallax
1256512610                 "PARAM options0   = program.env[63];" + // fog density, intensity, elevation
1256612611                 "PARAM options1   = program.env[62];" + // fog rgb color
1256712612                 "PARAM options2   = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12806,7 +12851,7 @@
1280612851        "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1280712852 // mar 2013 ???                "KIL alpha.a;" +
1280812853                 "MOV alpha, texSamp.aaaa;" + // y;" +
12809
-         "KIL alpha.a;" +
12854
+         "KIL alpha.a;" + // not sure with parallax mapping
1281012855                 /*
1281112856                 "MUL temp.xy, temp, two;" +
1281212857                 "TXB bump, temp, texture[0], 2D;" +
....@@ -12892,11 +12937,6 @@
1289212937                 "SUB bump0, bump0, half;" +
1289312938                 "ADD bump, bump, bump0;" +
1289412939                 
12895
-                "MOV temp.x, texSamp.a;" +
12896
-                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12897
-                //"LRP texSamp0, params5.x, texSamp0, one;" +
12898
-                "MOV texSamp.a, temp.x;" +
12899
-
1290012940                 // double-sided
1290112941                 /**/
1290212942 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12913,19 +12953,62 @@
1291312953                 "MOV normald, normal;" +
1291412954                 "MOV normals, normal;" +
1291512955                 
12956
+                "MOV temp, fragment.texcoord[4];" +
12957
+                
1291612958                 // UV base		
1291712959                 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1291812960                 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1291912961                 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12920
-                "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12921
-                "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12922
-                "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
12962
+                "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
12963
+                "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
12964
+                "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
12965
+                Normalize("UP") +
12966
+                
1292312967                 "XPD V, normal, UP;" +
1292412968                 Normalize("V") +
1292512969                 "XPD U, V, normal;" +
1292612970                 Normalize("U") +
1292712971                 
1292812972 // parallax mapping
12973
+
12974
+                "DP3 temp2.x, V, eye;" +
12975
+                "DP3 temp2.y, U, eye;" +
12976
+                "DP3 temp2.z, normal, eye;" +
12977
+                "RCP temp2.z, temp2.z;" +
12978
+                
12979
+                "DP3 temp2.w, texSamp, texSamp;" + // Height
12980
+                "RSQ temp2.w, temp2.w;" +
12981
+                "RCP temp2.w, temp2.w;" +
12982
+                
12983
+                "SUB temp2.w, temp2.w, half;" +
12984
+//                "SGE temp.x, temp2.w, eps.x;" +
12985
+//                "MUL temp2.w, temp2.w, temp.x;" +
12986
+                
12987
+                //"MOV texSamp, U;" +
12988
+                
12989
+                "MUL temp2.z, temp2.z, temp2.w;" +
12990
+                "MUL temp2.z, temp2.z, params7.z;" + // parallax
12991
+                
12992
+                "MUL temp2, temp2, temp2.z;" +
12993
+                
12994
+                "MOV temp, fragment.texcoord[0];" +
12995
+                
12996
+                "SUB temp, temp, temp2;" +
12997
+                
12998
+                "TEX temp, temp, texture[0], 2D;" +
12999
+                "POW temp.a, temp.a, params6.w;" + // punch through
13000
+                
13001
+                "ADD texSamp, temp, texSamp;" +
13002
+                "MUL temp.xyz, half, texSamp;" +
13003
+                
13004
+                "MOV alpha, texSamp.aaaa;" +
13005
+                
13006
+// parallax mapping
13007
+                
13008
+                "MOV temp.x, texSamp.a;" +
13009
+                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13010
+                //"LRP texSamp0, params5.x, texSamp0, one;" +
13011
+                "MOV texSamp.a, temp.x;" +
1292913012 
1293013013 //"MOV temp, fragment.texcoord[0];" +
1293113014 //                
....@@ -13396,8 +13479,12 @@
1339613479             program = programmin;
1339713480         }
1339813481         
13399
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13400
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13482
+        if (Globals.DEBUG)
13483
+        {
13484
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13485
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13486
+        }
13487
+        
1340113488         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1340213489 
1340313490     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13444,7 +13531,8 @@
1344413531                 "\n" +
1344513532                 "END\n";
1344613533 
13447
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13534
+        if (Globals.DEBUG)
13535
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1344813536         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1344913537 
1345013538     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13702,7 +13790,7 @@
1370213790     /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1370313791     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1370413792     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13705
-    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13793
+    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1370613794     
1370713795     //Object3D.cVector2[] vector2buffer;
1370813796 
....@@ -13869,7 +13957,7 @@
1386913957                 "PARAM p[4]    = { state.matrix.projection };     # modelview projection matrix\n" +
1387013958                 "PARAM zero    = { 0.0, 0.0, 0.0, 1.0 };" +
1387113959                 "PARAM half    = { 0.5, 0.5, 0.5, 1.0 };" +
13872
-                "PARAM one     = { 1.0, 1.0, 1.0, 0.0 };" +
13960
+                "PARAM one     = { 1.0, 1.0, 1.0, 1.0 };" +
1387313961                 "PARAM two     = { 2.0, 2.0, 2.0, 1.0 };" +
1387413962                 "PARAM third   = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1387513963                 //"PARAM v256    = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13930,7 +14018,7 @@
1393014018                 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1393114019                 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1393214020                 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13933
-                //"MOV result.texcoord, vertex.texcoord;" +
14021
+                //"MOV result.texcoord, vertex.fogcoord;" +
1393414022                 "MOV result.texcoord, temp;" +
1393514023                 // border fade
1393614024                 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13977,7 +14065,9 @@
1397714065 
1397814066                 //"ADD temp.z, temp.z, one;" +
1397914067 
13980
-                "MOV result.color, temp;"
14068
+                "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14069
+                
14070
+                "MOV result.color, temp;" // Normal
1398114071                 : "MOV result.color, vertex.color;") +
1398214072                 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1398314073                 : "") +
....@@ -14643,11 +14733,17 @@
1464314733     void GoDown(int mod)
1464414734     {
1464514735         MODIFIERS |= COMMAND;
14736
+        boolean isVR = (mouseMode&VR)!=0;
1464614737         /**/
1464714738         if((mod&SHIFT) == SHIFT)
14648
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14739
+        {
14740
+            if (isVR)
14741
+                manipCamera.RotateInterest(0, -speed);
14742
+            else
14743
+                manipCamera.RotatePosition(0, -speed);
14744
+        }
1464914745         else
14650
-        manipCamera.RotatePosition(0, -speed);
14746
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1465114747         /**/
1465214748         if ((mod & SHIFT) == SHIFT)
1465314749         {
....@@ -14657,6 +14753,8 @@
1465714753             mouseMode |= BACKFORTH;
1465814754         }
1465914755 
14756
+        targetLookAt.set(manipCamera.lookAt);
14757
+        
1466014758         //prevX = X = anchorX;
1466114759         prevY = Y = anchorY - (int) (renderCamera.Distance());
1466214760     }
....@@ -14665,10 +14763,17 @@
1466514763     {
1466614764         MODIFIERS |= COMMAND;
1466714765         /**/
14766
+        boolean isVR = (mouseMode&VR)!=0;
14767
+        
1466814768         if((mod&SHIFT) == SHIFT)
14669
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14769
+        {
14770
+            if (isVR)
14771
+                manipCamera.RotateInterest(0, speed);
14772
+            else
14773
+                manipCamera.RotatePosition(0, speed);
14774
+        }
1467014775         else
14671
-        manipCamera.RotatePosition(0, speed);
14776
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1467214777         /**/
1467314778         if ((mod & SHIFT) == SHIFT)
1467414779         {
....@@ -14678,6 +14783,8 @@
1467814783             mouseMode |= BACKFORTH;
1467914784         }
1468014785 
14786
+        targetLookAt.set(manipCamera.lookAt);
14787
+        
1468114788         //prevX = X = anchorX;
1468214789         prevY = Y = anchorY + (int) (renderCamera.Distance());
1468314790     }
....@@ -14687,9 +14794,14 @@
1468714794         MODIFIERS |= COMMAND;
1468814795         /**/
1468914796         if((mod&SHIFT) == SHIFT)
14690
-        manipCamera.Translate(speed*delta, 0, getWidth());
14797
+            manipCamera.Translate(speed*delta, 0, getWidth());
1469114798         else
14692
-        manipCamera.RotatePosition(speed, 0);
14799
+        {
14800
+            if ((mouseMode&VR)!=0)
14801
+                manipCamera.RotateInterest(-speed, 0);
14802
+            else
14803
+                manipCamera.RotatePosition(speed, 0);
14804
+        }
1469314805         /**/
1469414806         if ((mod & SHIFT) == SHIFT)
1469514807         {
....@@ -14699,6 +14811,8 @@
1469914811             mouseMode |= ROTATE;
1470014812         } // TRANSLATE;
1470114813 
14814
+        targetLookAt.set(manipCamera.lookAt);
14815
+        
1470214816         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1470314817         prevY = Y = anchorY;
1470414818     }
....@@ -14708,9 +14822,15 @@
1470814822         MODIFIERS |= COMMAND;
1470914823         /**/
1471014824         if((mod&SHIFT) == SHIFT)
14711
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14825
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1471214826         else
14713
-        manipCamera.RotatePosition(-speed, 0);
14827
+        {
14828
+            if ((mouseMode&VR)!=0)
14829
+                manipCamera.RotateInterest(speed, 0);
14830
+            else
14831
+                manipCamera.RotatePosition(-speed, 0);
14832
+        }
14833
+        
1471414834         /**/
1471514835         if ((mod & SHIFT) == SHIFT)
1471614836         {
....@@ -14720,6 +14840,8 @@
1472014840             mouseMode |= ROTATE;
1472114841         } // TRANSLATE;
1472214842 
14843
+        targetLookAt.set(manipCamera.lookAt);
14844
+        
1472314845         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1472414846         prevY = Y = anchorY;
1472514847     }
....@@ -15222,8 +15344,8 @@
1522215344             case 'K':
1522315345                 KOMPACTTEXTURE ^= true;
1522415346                 //textures.clear();
15225
-                break;
15226
-            case 'P': // Texture Projection macros
15347
+            //    break;
15348
+            //case 'P': // Texture Projection macros
1522715349 //                SAVETEXTURE ^= true;
1522815350                 macromode = true;
1522915351                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15344,7 +15466,7 @@
1534415466                 targetLookAt.set(manipCamera.lookAt);
1534515467                 repaint();
1534615468                 break;
15347
-            case 'p':
15469
+            case 'P': // p':
1534815470        // c'est quoi ca au juste?         spherical ^= true;
1534915471                 Skinshader ^= true; programInitialized = false; 
1535015472                 repaint();
....@@ -16104,7 +16226,7 @@
1610416226                     {
1610516227                         switch (hitSomething)
1610616228                         {
16107
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16229
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1610816230                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1610916231                                 break;
1611016232                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16130,7 +16252,7 @@
1613016252         if (hasMarquee)
1613116253         {
1613216254             gr.setXORMode(Color.white);
16133
-            gr.setColor(Color.red);
16255
+            gr.setColor(Color.white);
1613416256             if (!firstime)
1613516257             {
1613616258                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16769,7 +16891,8 @@
1676916891         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1677016892 
1677116893         cubemap.disable();
16772
-        ////cubemap.unbind();
16894
+        //cubemap.dispose();
16895
+        
1677316896         if (CULLFACE)
1677416897         {
1677516898             gl.glEnable(gl.GL_CULL_FACE);
....@@ -16825,7 +16948,7 @@
1682516948             gl.glScalef(1.0f, -1.0f, 1.0f);
1682616949         }
1682716950 
16828
-        gl.glNormal3f(0.0f, 0.0f, 1.0f);
16951
+        SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1682916952             
1683016953         float step = 2; // 0.1666f; //0.25f;
1683116954         float stepv = 2; // step * 1652 / 998;
....@@ -17305,6 +17428,7 @@
1730517428 
1730617429         public void init(GLAutoDrawable drawable)
1730717430         {
17431
+        if (Globals.DEBUG)
1730817432             System.out.println("shadow buffer init");
1730917433 
1731017434             GL gl = drawable.getGL();