blame | history | patch | commit | commitdiff
Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314 
 CameraPane.java
....@@ -113,6 +113,8 @@
113113     /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
114114     /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
115115     /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
116
+    boolean transformMode;
117
+    
116118     boolean reverseUP = false;
117119     static boolean frozen = false;
118120     boolean enablebackspace = false; // patch for back buffer refresh
....@@ -166,7 +168,7 @@
166168 
167169     
168170     // OPTIONS
169
-    boolean Skinshader = true;
171
+    boolean Skinshader = false; // true;
170172     boolean cameraLight = false;
171173     boolean UVdebug = false;
172174     boolean Udebug = false;
....@@ -540,7 +542,8 @@
540542                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
541543                 LA.vecCross(obj.v0, obj.v1, obj.v2);
542544                 LA.vecNormalize(obj.v2);
543
-                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);
544547             }
545548 
546549             // P
....@@ -562,7 +565,7 @@
562565                 y += ny * obj.NORMALPUSH;
563566                 z += nz * obj.NORMALPUSH;
564567                 
565
-                gl.glNormal3f(nx, ny, nz);
568
+                SetGLNormal(gl, nx, ny, nz);
566569             }
567570             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
568571             SetColor(obj, pv);
....@@ -594,7 +597,7 @@
594597                 y += ny * obj.NORMALPUSH;
595598                 z += nz * obj.NORMALPUSH;
596599                 
597
-                gl.glNormal3f(nx, ny, nz);
600
+                SetGLNormal(gl, nx, ny, nz);
598601             }
599602             //System.out.println("vertexq = " + qv.s + ", " + qv.t);
600603         //    boolean locked = false;
....@@ -642,7 +645,7 @@
642645                 y += ny * obj.NORMALPUSH;
643646                 z += nz * obj.NORMALPUSH;
644647                 
645
-                gl.glNormal3f(nx, ny, nz);
648
+                SetGLNormal(gl, nx, ny, nz);
646649             }
647650             
648651         //    if ((dot&4) == 0)
....@@ -878,7 +881,7 @@
878881 ////        tris.postdraw(this);
879882     }
880883 
881
-    static Camera localcamera = new Camera();
884
+    static Camera localAOcamera = new Camera();
882885     static cVector from = new cVector();
883886     static cVector to = new cVector();
884887     
....@@ -887,7 +890,7 @@
887890                 CameraPane cp = this;
888891 
889892                 Camera keep = cp.RenderCamera();
890
-                cp.renderCamera = localcamera;
893
+                cp.renderCamera = localAOcamera;
891894 
892895                 if (br.trimmed)
893896                 {
....@@ -905,7 +908,7 @@
905908                                 br.positions[i3 + 2] + br.normals[i3 + 2]);
906909                         LA.xformPos(from, transform, from);
907910                         LA.xformPos(to, transform, to); // RIGID ONLY
908
-                        localcamera.setAim(from, to);
911
+                        localAOcamera.setAim(from, to);
909912 
910913                         CameraPane.occlusionbuffer.display();
911914 
....@@ -939,7 +942,7 @@
939942                         to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
940943                         LA.xformPos(from, transform, from);
941944                         LA.xformPos(to, transform, to); // RIGID ONLY
942
-                        localcamera.setAim(from, to);
945
+                        localAOcamera.setAim(from, to);
943946 
944947                         CameraPane.occlusionbuffer.display();
945948 
....@@ -1248,10 +1251,10 @@
12481251                             {
12491252                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12501253                                 {
1251
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1254
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12521255                                 } else
12531256                                 {
1254
-                                    gl.glNormal3f(0, 0, 1);
1257
+                                    SetGLNormal(gl, 0, 0, 1);
12551258                                 }
12561259 
12571260                                 if (c != null)
....@@ -1275,10 +1278,10 @@
12751278                             {
12761279                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12771280                                 {
1278
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1281
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12791282                                 } else
12801283                                 {
1281
-                                    gl.glNormal3f(0, 0, 1);
1284
+                                    SetGLNormal(gl, 0, 0, 1);
12821285                                 }
12831286                                 if (c != null)
12841287                                 {
....@@ -1303,10 +1306,10 @@
13031306                                 {
13041307                                     if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
13051308                                     {
1306
-                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1309
+                                        SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
13071310                                     } else
13081311                                     {
1309
-                                        gl.glNormal3f(0, 0, 1);
1312
+                                        SetGLNormal(gl, 0, 0, 1);
13101313                                     }
13111314                                     if (c != null)
13121315                                     {
....@@ -1488,7 +1491,7 @@
14881491     {
14891492         if (!selectmode)
14901493         {
1491
-            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);
14921495             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14931496             
14941497             if (flipV)
....@@ -1817,7 +1820,7 @@
18171820 
18181821         display.modelParams7[0] = 0;
18191822         display.modelParams7[1] = 1000;
1820
-        display.modelParams7[2] = 0;
1823
+        display.modelParams7[2] = material.parallax;
18211824         display.modelParams7[3] = 0;
18221825 
18231826         //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2050,9 +2053,9 @@
20502053         switch(viewcode)
20512054         {
20522055             case 0: return "main";
2053
-            case 1: return "one";
2054
-            case 2: return "two";
2055
-            case 3: return "three";
2056
+            case 1: return "Red";
2057
+            case 2: return "Green";
2058
+            case 3: return "Blue";
20562059             case 4: return "light";
20572060         }
20582061         
....@@ -2473,6 +2476,18 @@
24732476         return CreateBim(bytes, width, height);
24742477     }
24752478 
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
+
24762491     /**/
24772492     class CacheTexture
24782493     {
....@@ -2515,7 +2530,7 @@
25152530                     com.sun.opengl.util.texture.TextureIO.newTextureData(
25162531                     getClass().getClassLoader().getResourceAsStream(name),
25172532                     true,
2518
-                    com.sun.opengl.util.texture.TextureIO.PNG);
2533
+                    GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
25192534         } catch (java.io.IOException e)
25202535         {
25212536             throw new javax.media.opengl.GLException(e);
....@@ -10688,9 +10703,18 @@
1068810703     static boolean init = false;
1068910704     
1069010705     double[][] matrix = LA.newMatrix();
10706
+    
10707
+    // This is to refresh the UI of the material panel.
10708
+    ObjEditor patchMaterial;
1069110709 
1069210710     public void display(GLAutoDrawable drawable)
1069310711     {
10712
+        if (patchMaterial.patchMaterial)
10713
+        {
10714
+            patchMaterial.patchMaterial = false;
10715
+            patchMaterial.objectPanel.setSelectedIndex(1);
10716
+        }
10717
+        
1069410718         if (Grafreed.savesound && Grafreed.hassound)
1069510719         {
1069610720             Grafreed.wav.save();
....@@ -11082,11 +11106,11 @@
1108211106 //
1108311107 //        newenvy = -1;
1108411108         
11085
-        if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11109
+        if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1108611110         {
1108711111             if (cubemaprgb == null)
1108811112             {
11089
-                cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11113
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1109011114             }
1109111115             
1109211116             cubemap = cubemaprgb;
....@@ -11097,6 +11121,8 @@
1109711121             {
1109811122                 if (!object.skyboxname.equals(this.loadedskyboxname))
1109911123                 {
11124
+                    if (cubemap != null && cubemap != cubemaprgb)
11125
+                        cubemap.dispose();
1110011126                     cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
1110111127                     loadedskyboxname = object.skyboxname;
1110211128                 }
....@@ -12488,8 +12514,9 @@
1248812514         String programmin =
1248912515                 // Min shader
1249012516                 "!!ARBfp1.0\n" +
12491
-                "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
12492
-                "PARAM pow2      = { 0.5, 0.25, 0.125, 0.0 };" +
12517
+                "PARAM zero12t      = { 0.0, 1.0, 2, 1.25 };" +
12518
+                "PARAM pow_2      = { 0.5, 0.25, 0.125, 0.0 };" +
12519
+                "PARAM pow2      = { 2, 4, 8, 0.0 };" +
1249312520                 "PARAM one      = { 1.0, 1.0, 1.0, 1.0 };" +
1249412521                 "PARAM eps      = { 0.001, 0.001, 0.001, 1.0 };" +
1249512522                 "PARAM infinity  = { 100000000, 100000000, 100000000, 1.0 };" +
....@@ -12504,10 +12531,11 @@
1250412531                 "TEMP eye;" +
1250512532                 "TEMP pos;" +
1250612533                 
12507
-                "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12534
+                "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
1250812535                 Normalize("normal") +
1250912536                 "MOV light, state.light[0].position;" +
1251012537                 "DP3 ndotl.x, light, normal;" +
12538
+                "MAX ndotl.x, ndotl.x, zero12t.x;" +
1251112539 
1251212540                 // shadow
1251312541                 "MOV pos, fragment.texcoord[1];" +
....@@ -12523,7 +12551,7 @@
1252312551                 "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1252412552                 
1252512553                 // Backlit
12526
-                "MOV pos.w, zero123.y;" +
12554
+                "MOV pos.w, zero12t.y;" + // one
1252712555                 "DP4 eye.x, pos, light2cam0;" +
1252812556                 "DP4 eye.y, pos, light2cam1;" +
1252912557                 "DP4 eye.z, pos, light2cam2;" +
....@@ -12531,24 +12559,28 @@
1253112559                 
1253212560                 "DP3 ndotl.y, -eye, normal;" +
1253312561                 //"MUL ndotl.y, ndotl.y, pow2.x;" +
12534
-                "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12535
-                "SUB ndotl.y, zero123.y, ndotl.y;" +
12562
+                "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12563
+                "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12564
+                //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
1253612565                 //"SUB ndotl.y, zero123.y, ndotl.y;" +
1253712566                 //"MUL ndotl.y, ndotl.y, pow2.z;" +
12567
+                "ADD ndotl.y, ndotl.y, one.x;" +
12568
+                "MUL ndotl.y, ndotl.y, pow_2.x;" +
1253812569                 
1253912570                 //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
1254012571                 //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
1254112572                 
1254212573                 // Pigment
1254312574                 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12544
-                "LRP temp, zero123.w, temp, one;" + // texture proportion
12545
-                "MUL temp, temp, ndotl.x;" +
12546
-                
12547
-                "MUL temp, temp, zero123.z;" +
12575
+                "LRP temp, zero12t.w, temp, one;" + // texture proportion
12576
+                "MUL temp, temp, zero12t.w;" + // Times x
1254812577                 
1254912578                 //"MUL temp, temp, ndotl.y;" +
12579
+                "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
1255012580                 
12551
-                "MOV temp.w, zero123.y;" + // reset alpha
12581
+                "MUL temp, temp, ndotl.x;" + // lambert
12582
+                
12583
+                "MOV temp.w, zero12t.y;" + // reset alpha
1255212584                 "MOV result.color, temp;" +
1255312585                 "END";
1255412586         
....@@ -12580,7 +12612,7 @@
1258012612                 "PARAM params4   = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1258112613                 "PARAM params5   = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1258212614                 "PARAM params6   = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12583
-                "PARAM params7   = program.env[7];" + // noise power, opacity power
12615
+                "PARAM params7   = program.env[7];" + // noise power, opacity power, parallax
1258412616                 "PARAM options0   = program.env[63];" + // fog density, intensity, elevation
1258512617                 "PARAM options1   = program.env[62];" + // fog rgb color
1258612618                 "PARAM options2   = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12825,7 +12857,7 @@
1282512857        "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1282612858 // mar 2013 ???                "KIL alpha.a;" +
1282712859                 "MOV alpha, texSamp.aaaa;" + // y;" +
12828
-         "KIL alpha.a;" +
12860
+         "KIL alpha.a;" + // not sure with parallax mapping
1282912861                 /*
1283012862                 "MUL temp.xy, temp, two;" +
1283112863                 "TXB bump, temp, texture[0], 2D;" +
....@@ -12911,11 +12943,6 @@
1291112943                 "SUB bump0, bump0, half;" +
1291212944                 "ADD bump, bump, bump0;" +
1291312945                 
12914
-                "MOV temp.x, texSamp.a;" +
12915
-                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12916
-                //"LRP texSamp0, params5.x, texSamp0, one;" +
12917
-                "MOV texSamp.a, temp.x;" +
12918
-
1291912946                 // double-sided
1292012947                 /**/
1292112948 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12932,19 +12959,62 @@
1293212959                 "MOV normald, normal;" +
1293312960                 "MOV normals, normal;" +
1293412961                 
12962
+                "MOV temp, fragment.texcoord[4];" +
12963
+                
1293512964                 // UV base		
1293612965                 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1293712966                 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1293812967                 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12939
-                "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12940
-                "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12941
-                "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
12968
+                "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
12969
+                "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
12970
+                "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
12971
+                Normalize("UP") +
12972
+                
1294212973                 "XPD V, normal, UP;" +
1294312974                 Normalize("V") +
1294412975                 "XPD U, V, normal;" +
1294512976                 Normalize("U") +
1294612977                 
1294712978 // parallax mapping
12979
+
12980
+                "DP3 temp2.x, V, eye;" +
12981
+                "DP3 temp2.y, U, eye;" +
12982
+                "DP3 temp2.z, normal, eye;" +
12983
+                "RCP temp2.z, temp2.z;" +
12984
+                
12985
+                "DP3 temp2.w, texSamp, texSamp;" + // Height
12986
+                "RSQ temp2.w, temp2.w;" +
12987
+                "RCP temp2.w, temp2.w;" +
12988
+                
12989
+                "SUB temp2.w, temp2.w, half;" +
12990
+//                "SGE temp.x, temp2.w, eps.x;" +
12991
+//                "MUL temp2.w, temp2.w, temp.x;" +
12992
+                
12993
+                //"MOV texSamp, U;" +
12994
+                
12995
+                "MUL temp2.z, temp2.z, temp2.w;" +
12996
+                "MUL temp2.z, temp2.z, params7.z;" + // parallax
12997
+                
12998
+                "MUL temp2, temp2, temp2.z;" +
12999
+                
13000
+                "MOV temp, fragment.texcoord[0];" +
13001
+                
13002
+                "SUB temp, temp, temp2;" +
13003
+                
13004
+                "TEX temp, temp, texture[0], 2D;" +
13005
+                "POW temp.a, temp.a, params6.w;" + // punch through
13006
+                
13007
+                "ADD texSamp, temp, texSamp;" +
13008
+                "MUL texSamp.xyz, half, texSamp;" +
13009
+                
13010
+                "MOV alpha, texSamp.aaaa;" +
13011
+                
13012
+// parallax mapping
13013
+                
13014
+                "MOV temp.x, texSamp.a;" +
13015
+                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13016
+                //"LRP texSamp0, params5.x, texSamp0, one;" +
13017
+                "MOV texSamp.a, temp.x;" +
1294813018 
1294913019 //"MOV temp, fragment.texcoord[0];" +
1295013020 //                
....@@ -13415,8 +13485,12 @@
1341513485             program = programmin;
1341613486         }
1341713487         
13418
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13419
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13488
+        if (Globals.DEBUG)
13489
+        {
13490
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13491
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13492
+        }
13493
+        
1342013494         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1342113495 
1342213496     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13463,7 +13537,8 @@
1346313537                 "\n" +
1346413538                 "END\n";
1346513539 
13466
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13540
+        if (Globals.DEBUG)
13541
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1346713542         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1346813543 
1346913544     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13721,7 +13796,7 @@
1372113796     /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1372213797     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1372313798     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13724
-    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13799
+    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1372513800     
1372613801     //Object3D.cVector2[] vector2buffer;
1372713802 
....@@ -13888,7 +13963,7 @@
1388813963                 "PARAM p[4]    = { state.matrix.projection };     # modelview projection matrix\n" +
1388913964                 "PARAM zero    = { 0.0, 0.0, 0.0, 1.0 };" +
1389013965                 "PARAM half    = { 0.5, 0.5, 0.5, 1.0 };" +
13891
-                "PARAM one     = { 1.0, 1.0, 1.0, 0.0 };" +
13966
+                "PARAM one     = { 1.0, 1.0, 1.0, 1.0 };" +
1389213967                 "PARAM two     = { 2.0, 2.0, 2.0, 1.0 };" +
1389313968                 "PARAM third   = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1389413969                 //"PARAM v256    = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13949,7 +14024,7 @@
1394914024                 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1395014025                 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1395114026                 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13952
-                //"MOV result.texcoord, vertex.texcoord;" +
14027
+                //"MOV result.texcoord, vertex.fogcoord;" +
1395314028                 "MOV result.texcoord, temp;" +
1395414029                 // border fade
1395514030                 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13996,7 +14071,9 @@
1399614071 
1399714072                 //"ADD temp.z, temp.z, one;" +
1399814073 
13999
-                "MOV result.color, temp;"
14074
+                "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14075
+                
14076
+                "MOV result.color, temp;" // Normal
1400014077                 : "MOV result.color, vertex.color;") +
1400114078                 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1400214079                 : "") +
....@@ -14662,11 +14739,17 @@
1466214739     void GoDown(int mod)
1466314740     {
1466414741         MODIFIERS |= COMMAND;
14742
+        boolean isVR = (mouseMode&VR)!=0;
1466514743         /**/
1466614744         if((mod&SHIFT) == SHIFT)
14667
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14745
+        {
14746
+            if (isVR)
14747
+                manipCamera.RotateInterest(0, -speed);
14748
+            else
14749
+                manipCamera.RotatePosition(0, -speed);
14750
+        }
1466814751         else
14669
-        manipCamera.RotatePosition(0, -speed);
14752
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1467014753         /**/
1467114754         if ((mod & SHIFT) == SHIFT)
1467214755         {
....@@ -14676,6 +14759,8 @@
1467614759             mouseMode |= BACKFORTH;
1467714760         }
1467814761 
14762
+        targetLookAt.set(manipCamera.lookAt);
14763
+        
1467914764         //prevX = X = anchorX;
1468014765         prevY = Y = anchorY - (int) (renderCamera.Distance());
1468114766     }
....@@ -14684,10 +14769,17 @@
1468414769     {
1468514770         MODIFIERS |= COMMAND;
1468614771         /**/
14772
+        boolean isVR = (mouseMode&VR)!=0;
14773
+        
1468714774         if((mod&SHIFT) == SHIFT)
14688
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14775
+        {
14776
+            if (isVR)
14777
+                manipCamera.RotateInterest(0, speed);
14778
+            else
14779
+                manipCamera.RotatePosition(0, speed);
14780
+        }
1468914781         else
14690
-        manipCamera.RotatePosition(0, speed);
14782
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1469114783         /**/
1469214784         if ((mod & SHIFT) == SHIFT)
1469314785         {
....@@ -14697,6 +14789,8 @@
1469714789             mouseMode |= BACKFORTH;
1469814790         }
1469914791 
14792
+        targetLookAt.set(manipCamera.lookAt);
14793
+        
1470014794         //prevX = X = anchorX;
1470114795         prevY = Y = anchorY + (int) (renderCamera.Distance());
1470214796     }
....@@ -14706,9 +14800,14 @@
1470614800         MODIFIERS |= COMMAND;
1470714801         /**/
1470814802         if((mod&SHIFT) == SHIFT)
14709
-        manipCamera.Translate(speed*delta, 0, getWidth());
14803
+            manipCamera.Translate(speed*delta, 0, getWidth());
1471014804         else
14711
-        manipCamera.RotatePosition(speed, 0);
14805
+        {
14806
+            if ((mouseMode&VR)!=0)
14807
+                manipCamera.RotateInterest(-speed, 0);
14808
+            else
14809
+                manipCamera.RotatePosition(speed, 0);
14810
+        }
1471214811         /**/
1471314812         if ((mod & SHIFT) == SHIFT)
1471414813         {
....@@ -14718,6 +14817,8 @@
1471814817             mouseMode |= ROTATE;
1471914818         } // TRANSLATE;
1472014819 
14820
+        targetLookAt.set(manipCamera.lookAt);
14821
+        
1472114822         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1472214823         prevY = Y = anchorY;
1472314824     }
....@@ -14727,9 +14828,15 @@
1472714828         MODIFIERS |= COMMAND;
1472814829         /**/
1472914830         if((mod&SHIFT) == SHIFT)
14730
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14831
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1473114832         else
14732
-        manipCamera.RotatePosition(-speed, 0);
14833
+        {
14834
+            if ((mouseMode&VR)!=0)
14835
+                manipCamera.RotateInterest(speed, 0);
14836
+            else
14837
+                manipCamera.RotatePosition(-speed, 0);
14838
+        }
14839
+        
1473314840         /**/
1473414841         if ((mod & SHIFT) == SHIFT)
1473514842         {
....@@ -14739,6 +14846,8 @@
1473914846             mouseMode |= ROTATE;
1474014847         } // TRANSLATE;
1474114848 
14849
+        targetLookAt.set(manipCamera.lookAt);
14850
+        
1474214851         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1474314852         prevY = Y = anchorY;
1474414853     }
....@@ -15241,8 +15350,8 @@
1524115350             case 'K':
1524215351                 KOMPACTTEXTURE ^= true;
1524315352                 //textures.clear();
15244
-                break;
15245
-            case 'P': // Texture Projection macros
15353
+            //    break;
15354
+            //case 'P': // Texture Projection macros
1524615355 //                SAVETEXTURE ^= true;
1524715356                 macromode = true;
1524815357                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15363,7 +15472,7 @@
1536315472                 targetLookAt.set(manipCamera.lookAt);
1536415473                 repaint();
1536515474                 break;
15366
-            case 'p':
15475
+            case 'P': // p':
1536715476        // c'est quoi ca au juste?         spherical ^= true;
1536815477                 Skinshader ^= true; programInitialized = false; 
1536915478                 repaint();
....@@ -15401,7 +15510,7 @@
1540115510                 repaint();
1540215511                 break;
1540315512             case 'O':
15404
-                Globals.drawMode = OCCLUSION; // WARNING
15513
+                // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
1540515514                 repaint();
1540615515                 break;
1540715516             case 'o':
....@@ -16123,7 +16232,7 @@
1612316232                     {
1612416233                         switch (hitSomething)
1612516234                         {
16126
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16235
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1612716236                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1612816237                                 break;
1612916238                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16149,7 +16258,7 @@
1614916258         if (hasMarquee)
1615016259         {
1615116260             gr.setXORMode(Color.white);
16152
-            gr.setColor(Color.red);
16261
+            gr.setColor(Color.white);
1615316262             if (!firstime)
1615416263             {
1615516264                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16788,7 +16897,8 @@
1678816897         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1678916898 
1679016899         cubemap.disable();
16791
-        ////cubemap.unbind();
16900
+        //cubemap.dispose();
16901
+        
1679216902         if (CULLFACE)
1679316903         {
1679416904             gl.glEnable(gl.GL_CULL_FACE);
....@@ -16844,7 +16954,7 @@
1684416954             gl.glScalef(1.0f, -1.0f, 1.0f);
1684516955         }
1684616956 
16847
-        gl.glNormal3f(0.0f, 0.0f, 1.0f);
16957
+        SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1684816958             
1684916959         float step = 2; // 0.1666f; //0.25f;
1685016960         float stepv = 2; // step * 1652 / 998;
....@@ -17324,6 +17434,7 @@
1732417434 
1732517435         public void init(GLAutoDrawable drawable)
1732617436         {
17437
+        if (Globals.DEBUG)
1732717438             System.out.println("shadow buffer init");
1732817439 
1732917440             GL gl = drawable.getGL();