blame | history | patch | commit | commitdiff
Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a 
 CameraPane.java
....@@ -168,7 +168,7 @@
168168 
169169     
170170     // OPTIONS
171
-    boolean Skinshader = true;
171
+    boolean Skinshader = false; // true;
172172     boolean cameraLight = false;
173173     boolean UVdebug = false;
174174     boolean Udebug = false;
....@@ -542,7 +542,8 @@
542542                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
543543                 LA.vecCross(obj.v0, obj.v1, obj.v2);
544544                 LA.vecNormalize(obj.v2);
545
-                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);
546547             }
547548 
548549             // P
....@@ -564,7 +565,7 @@
564565                 y += ny * obj.NORMALPUSH;
565566                 z += nz * obj.NORMALPUSH;
566567                 
567
-                gl.glNormal3f(nx, ny, nz);
568
+                SetGLNormal(gl, nx, ny, nz);
568569             }
569570             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
570571             SetColor(obj, pv);
....@@ -596,7 +597,7 @@
596597                 y += ny * obj.NORMALPUSH;
597598                 z += nz * obj.NORMALPUSH;
598599                 
599
-                gl.glNormal3f(nx, ny, nz);
600
+                SetGLNormal(gl, nx, ny, nz);
600601             }
601602             //System.out.println("vertexq = " + qv.s + ", " + qv.t);
602603         //    boolean locked = false;
....@@ -644,7 +645,7 @@
644645                 y += ny * obj.NORMALPUSH;
645646                 z += nz * obj.NORMALPUSH;
646647                 
647
-                gl.glNormal3f(nx, ny, nz);
648
+                SetGLNormal(gl, nx, ny, nz);
648649             }
649650             
650651         //    if ((dot&4) == 0)
....@@ -880,7 +881,7 @@
880881 ////        tris.postdraw(this);
881882     }
882883 
883
-    static Camera localcamera = new Camera();
884
+    static Camera localAOcamera = new Camera();
884885     static cVector from = new cVector();
885886     static cVector to = new cVector();
886887     
....@@ -889,7 +890,7 @@
889890                 CameraPane cp = this;
890891 
891892                 Camera keep = cp.RenderCamera();
892
-                cp.renderCamera = localcamera;
893
+                cp.renderCamera = localAOcamera;
893894 
894895                 if (br.trimmed)
895896                 {
....@@ -907,7 +908,7 @@
907908                                 br.positions[i3 + 2] + br.normals[i3 + 2]);
908909                         LA.xformPos(from, transform, from);
909910                         LA.xformPos(to, transform, to); // RIGID ONLY
910
-                        localcamera.setAim(from, to);
911
+                        localAOcamera.setAim(from, to);
911912 
912913                         CameraPane.occlusionbuffer.display();
913914 
....@@ -941,7 +942,7 @@
941942                         to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
942943                         LA.xformPos(from, transform, from);
943944                         LA.xformPos(to, transform, to); // RIGID ONLY
944
-                        localcamera.setAim(from, to);
945
+                        localAOcamera.setAim(from, to);
945946 
946947                         CameraPane.occlusionbuffer.display();
947948 
....@@ -1250,10 +1251,10 @@
12501251                             {
12511252                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12521253                                 {
1253
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1254
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12541255                                 } else
12551256                                 {
1256
-                                    gl.glNormal3f(0, 0, 1);
1257
+                                    SetGLNormal(gl, 0, 0, 1);
12571258                                 }
12581259 
12591260                                 if (c != null)
....@@ -1277,10 +1278,10 @@
12771278                             {
12781279                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12791280                                 {
1280
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1281
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12811282                                 } else
12821283                                 {
1283
-                                    gl.glNormal3f(0, 0, 1);
1284
+                                    SetGLNormal(gl, 0, 0, 1);
12841285                                 }
12851286                                 if (c != null)
12861287                                 {
....@@ -1305,10 +1306,10 @@
13051306                                 {
13061307                                     if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
13071308                                     {
1308
-                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1309
+                                        SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
13091310                                     } else
13101311                                     {
1311
-                                        gl.glNormal3f(0, 0, 1);
1312
+                                        SetGLNormal(gl, 0, 0, 1);
13121313                                     }
13131314                                     if (c != null)
13141315                                     {
....@@ -1490,7 +1491,7 @@
14901491     {
14911492         if (!selectmode)
14921493         {
1493
-            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);
14941495             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14951496             
14961497             if (flipV)
....@@ -1819,7 +1820,7 @@
18191820 
18201821         display.modelParams7[0] = 0;
18211822         display.modelParams7[1] = 1000;
1822
-        display.modelParams7[2] = 0;
1823
+        display.modelParams7[2] = material.parallax;
18231824         display.modelParams7[3] = 0;
18241825 
18251826         //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2052,9 +2053,9 @@
20522053         switch(viewcode)
20532054         {
20542055             case 0: return "main";
2055
-            case 1: return "one";
2056
-            case 2: return "two";
2057
-            case 3: return "three";
2056
+            case 1: return "Red";
2057
+            case 2: return "Green";
2058
+            case 3: return "Blue";
20582059             case 4: return "light";
20592060         }
20602061         
....@@ -2473,6 +2474,18 @@
24732474         byte[] bytes = bytebuf.array();
24742475         
24752476         return CreateBim(bytes, width, height);
2477
+    }
2478
+
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);
24762489     }
24772490 
24782491     /**/
....@@ -10690,9 +10703,18 @@
1069010703     static boolean init = false;
1069110704     
1069210705     double[][] matrix = LA.newMatrix();
10706
+    
10707
+    // This is to refresh the UI of the material panel.
10708
+    ObjEditor patchMaterial;
1069310709 
1069410710     public void display(GLAutoDrawable drawable)
1069510711     {
10712
+        if (patchMaterial.patchMaterial)
10713
+        {
10714
+            patchMaterial.patchMaterial = false;
10715
+            patchMaterial.objectPanel.setSelectedIndex(1);
10716
+        }
10717
+        
1069610718         if (Grafreed.savesound && Grafreed.hassound)
1069710719         {
1069810720             Grafreed.wav.save();
....@@ -11088,7 +11110,7 @@
1108811110         {
1108911111             if (cubemaprgb == null)
1109011112             {
11091
-                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
11113
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1109211114             }
1109311115             
1109411116             cubemap = cubemaprgb;
....@@ -12492,8 +12514,9 @@
1249212514         String programmin =
1249312515                 // Min shader
1249412516                 "!!ARBfp1.0\n" +
12495
-                "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
12496
-                "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 };" +
1249712520                 "PARAM one      = { 1.0, 1.0, 1.0, 1.0 };" +
1249812521                 "PARAM eps      = { 0.001, 0.001, 0.001, 1.0 };" +
1249912522                 "PARAM infinity  = { 100000000, 100000000, 100000000, 1.0 };" +
....@@ -12508,10 +12531,11 @@
1250812531                 "TEMP eye;" +
1250912532                 "TEMP pos;" +
1251012533                 
12511
-                "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12534
+                "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
1251212535                 Normalize("normal") +
1251312536                 "MOV light, state.light[0].position;" +
1251412537                 "DP3 ndotl.x, light, normal;" +
12538
+                "MAX ndotl.x, ndotl.x, zero12t.x;" +
1251512539 
1251612540                 // shadow
1251712541                 "MOV pos, fragment.texcoord[1];" +
....@@ -12527,7 +12551,7 @@
1252712551                 "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1252812552                 
1252912553                 // Backlit
12530
-                "MOV pos.w, zero123.y;" +
12554
+                "MOV pos.w, zero12t.y;" + // one
1253112555                 "DP4 eye.x, pos, light2cam0;" +
1253212556                 "DP4 eye.y, pos, light2cam1;" +
1253312557                 "DP4 eye.z, pos, light2cam2;" +
....@@ -12535,24 +12559,28 @@
1253512559                 
1253612560                 "DP3 ndotl.y, -eye, normal;" +
1253712561                 //"MUL ndotl.y, ndotl.y, pow2.x;" +
12538
-                "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12539
-                "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
1254012565                 //"SUB ndotl.y, zero123.y, ndotl.y;" +
1254112566                 //"MUL ndotl.y, ndotl.y, pow2.z;" +
12567
+                "ADD ndotl.y, ndotl.y, one.x;" +
12568
+                "MUL ndotl.y, ndotl.y, pow_2.x;" +
1254212569                 
1254312570                 //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
1254412571                 //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
1254512572                 
1254612573                 // Pigment
1254712574                 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12548
-                "LRP temp, zero123.w, temp, one;" + // texture proportion
12549
-                "MUL temp, temp, ndotl.x;" +
12550
-                
12551
-                "MUL temp, temp, zero123.z;" +
12575
+                "LRP temp, zero12t.w, temp, one;" + // texture proportion
12576
+                "MUL temp, temp, zero12t.w;" + // Times x
1255212577                 
1255312578                 //"MUL temp, temp, ndotl.y;" +
12579
+                "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
1255412580                 
12555
-                "MOV temp.w, zero123.y;" + // reset alpha
12581
+                "MUL temp, temp, ndotl.x;" + // lambert
12582
+                
12583
+                "MOV temp.w, zero12t.y;" + // reset alpha
1255612584                 "MOV result.color, temp;" +
1255712585                 "END";
1255812586         
....@@ -12584,7 +12612,7 @@
1258412612                 "PARAM params4   = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1258512613                 "PARAM params5   = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1258612614                 "PARAM params6   = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12587
-                "PARAM params7   = program.env[7];" + // noise power, opacity power
12615
+                "PARAM params7   = program.env[7];" + // noise power, opacity power, parallax
1258812616                 "PARAM options0   = program.env[63];" + // fog density, intensity, elevation
1258912617                 "PARAM options1   = program.env[62];" + // fog rgb color
1259012618                 "PARAM options2   = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12829,7 +12857,7 @@
1282912857        "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1283012858 // mar 2013 ???                "KIL alpha.a;" +
1283112859                 "MOV alpha, texSamp.aaaa;" + // y;" +
12832
-         "KIL alpha.a;" +
12860
+         "KIL alpha.a;" + // not sure with parallax mapping
1283312861                 /*
1283412862                 "MUL temp.xy, temp, two;" +
1283512863                 "TXB bump, temp, texture[0], 2D;" +
....@@ -12915,11 +12943,6 @@
1291512943                 "SUB bump0, bump0, half;" +
1291612944                 "ADD bump, bump, bump0;" +
1291712945                 
12918
-                "MOV temp.x, texSamp.a;" +
12919
-                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12920
-                //"LRP texSamp0, params5.x, texSamp0, one;" +
12921
-                "MOV texSamp.a, temp.x;" +
12922
-
1292312946                 // double-sided
1292412947                 /**/
1292512948 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12929,26 +12952,73 @@
1292912952                 "ADD temp.x, temp.x, one.x;" +
1293012953                 "MUL normal, normal, temp.xxxx;":""
1293112954               ) +
12932
-                 /**/
12933
-////      Normalize("normal") +
12934
-////      "MAX normal.z, eps.x, normal.z;" +
12935
-//                Normalize("normal") +
12936
-                "MOV normald, normal;" +
12937
-                "MOV normals, normal;" +
12955
+                /**/
12956
+                
12957
+                "MOV temp, fragment.texcoord[4];" +
1293812958                 
1293912959                 // UV base		
1294012960                 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1294112961                 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1294212962                 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12943
-                "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12944
-                "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12945
-                "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
12963
+                "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
12964
+                "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
12965
+                "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
12966
+                Normalize("UP") +
12967
+                
1294612968                 "XPD V, normal, UP;" +
1294712969                 Normalize("V") +
1294812970                 "XPD U, V, normal;" +
1294912971                 Normalize("U") +
1295012972                 
12973
+                "MOV temp, fragment.texcoord[0];" +
12974
+                
12975
+//                "MAD normal, -temp.x, U, normal;" +
12976
+//                "MAD normal, -temp.y, V, normal;" +
12977
+//                Normalize("normal") +
12978
+                
12979
+////      "MAX normal.z, eps.x, normal.z;" +
12980
+//                Normalize("normal") +
12981
+                "MOV normald, normal;" +
12982
+                "MOV normals, normal;" +
12983
+                
1295112984 // parallax mapping
12985
+
12986
+                "DP3 temp2.x, V, eye;" +
12987
+                "DP3 temp2.y, U, eye;" +
12988
+                "DP3 temp2.z, normal, eye;" +
12989
+                "RCP temp2.z, temp2.z;" +
12990
+                
12991
+                "DP3 temp2.w, texSamp, texSamp;" + // Height
12992
+                "RSQ temp2.w, temp2.w;" +
12993
+                "RCP temp2.w, temp2.w;" +
12994
+                
12995
+                "SUB temp2.w, temp2.w, half;" +
12996
+                // "SGE temp.x, temp2.w, eps.x;" +
12997
+                // "MUL temp2.w, temp2.w, temp.x;" +
12998
+                
12999
+                // "MOV texSamp, U;" +
13000
+                
13001
+                "MUL temp2.z, temp2.z, temp2.w;" +
13002
+                "MUL temp2.z, temp2.z, params7.z;" + // parallax
13003
+                
13004
+                "MUL temp2, temp2, temp2.z;" +
13005
+                
13006
+                "SUB temp, temp, temp2;" +
13007
+                
13008
+                "TEX temp, temp, texture[0], 2D;" +
13009
+                "POW temp.a, temp.a, params6.w;" + // punch through
13010
+                
13011
+                "ADD texSamp, temp, texSamp;" +
13012
+                "MUL texSamp.xyz, half, texSamp;" +
13013
+                
13014
+                "MOV alpha, texSamp.aaaa;" +
13015
+                
13016
+// parallax mapping
13017
+                
13018
+                "MOV temp.x, texSamp.a;" +
13019
+                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13020
+                //"LRP texSamp0, params5.x, texSamp0, one;" +
13021
+                "MOV texSamp.a, temp.x;" +
1295213022 
1295313023 //"MOV temp, fragment.texcoord[0];" +
1295413024 //                
....@@ -13419,8 +13489,12 @@
1341913489             program = programmin;
1342013490         }
1342113491         
13422
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13423
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13492
+        if (Globals.DEBUG)
13493
+        {
13494
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13495
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13496
+        }
13497
+        
1342413498         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1342513499 
1342613500     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13467,7 +13541,8 @@
1346713541                 "\n" +
1346813542                 "END\n";
1346913543 
13470
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13544
+        if (Globals.DEBUG)
13545
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1347113546         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1347213547 
1347313548     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13725,7 +13800,7 @@
1372513800     /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1372613801     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1372713802     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13728
-    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13803
+    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1372913804     
1373013805     //Object3D.cVector2[] vector2buffer;
1373113806 
....@@ -13892,7 +13967,7 @@
1389213967                 "PARAM p[4]    = { state.matrix.projection };     # modelview projection matrix\n" +
1389313968                 "PARAM zero    = { 0.0, 0.0, 0.0, 1.0 };" +
1389413969                 "PARAM half    = { 0.5, 0.5, 0.5, 1.0 };" +
13895
-                "PARAM one     = { 1.0, 1.0, 1.0, 0.0 };" +
13970
+                "PARAM one     = { 1.0, 1.0, 1.0, 1.0 };" +
1389613971                 "PARAM two     = { 2.0, 2.0, 2.0, 1.0 };" +
1389713972                 "PARAM third   = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1389813973                 //"PARAM v256    = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13953,7 +14028,7 @@
1395314028                 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1395414029                 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1395514030                 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13956
-                //"MOV result.texcoord, vertex.texcoord;" +
14031
+                //"MOV result.texcoord, vertex.fogcoord;" +
1395714032                 "MOV result.texcoord, temp;" +
1395814033                 // border fade
1395914034                 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -14000,7 +14075,9 @@
1400014075 
1400114076                 //"ADD temp.z, temp.z, one;" +
1400214077 
14003
-                "MOV result.color, temp;"
14078
+                "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14079
+                
14080
+                "MOV result.color, temp;" // Normal
1400414081                 : "MOV result.color, vertex.color;") +
1400514082                 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1400614083                 : "") +
....@@ -14659,18 +14736,24 @@
1465914736         }
1466014737         }
1466114738     PingThread pingthread = new PingThread();
14662
-    int delta = 5;
14663
-    int speed = 5;
14739
+    int delta = 2;
14740
+    int speed = 10;
1466414741     boolean autorepeat = false;
1466514742 
1466614743     void GoDown(int mod)
1466714744     {
1466814745         MODIFIERS |= COMMAND;
14746
+        boolean isVR = (mouseMode&VR)!=0;
1466914747         /**/
1467014748         if((mod&SHIFT) == SHIFT)
14671
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14749
+        {
14750
+            if (isVR)
14751
+                manipCamera.RotateInterest(0, -speed);
14752
+            else
14753
+                manipCamera.RotatePosition(0, -speed);
14754
+        }
1467214755         else
14673
-        manipCamera.RotatePosition(0, -speed);
14756
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1467414757         /**/
1467514758         if ((mod & SHIFT) == SHIFT)
1467614759         {
....@@ -14680,6 +14763,8 @@
1468014763             mouseMode |= BACKFORTH;
1468114764         }
1468214765 
14766
+        targetLookAt.set(manipCamera.lookAt);
14767
+        
1468314768         //prevX = X = anchorX;
1468414769         prevY = Y = anchorY - (int) (renderCamera.Distance());
1468514770     }
....@@ -14688,10 +14773,17 @@
1468814773     {
1468914774         MODIFIERS |= COMMAND;
1469014775         /**/
14776
+        boolean isVR = (mouseMode&VR)!=0;
14777
+        
1469114778         if((mod&SHIFT) == SHIFT)
14692
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14779
+        {
14780
+            if (isVR)
14781
+                manipCamera.RotateInterest(0, speed);
14782
+            else
14783
+                manipCamera.RotatePosition(0, speed);
14784
+        }
1469314785         else
14694
-        manipCamera.RotatePosition(0, speed);
14786
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1469514787         /**/
1469614788         if ((mod & SHIFT) == SHIFT)
1469714789         {
....@@ -14701,6 +14793,8 @@
1470114793             mouseMode |= BACKFORTH;
1470214794         }
1470314795 
14796
+        targetLookAt.set(manipCamera.lookAt);
14797
+        
1470414798         //prevX = X = anchorX;
1470514799         prevY = Y = anchorY + (int) (renderCamera.Distance());
1470614800     }
....@@ -14710,9 +14804,14 @@
1471014804         MODIFIERS |= COMMAND;
1471114805         /**/
1471214806         if((mod&SHIFT) == SHIFT)
14713
-        manipCamera.Translate(speed*delta, 0, getWidth());
14807
+            manipCamera.Translate(speed*delta, 0, getWidth());
1471414808         else
14715
-        manipCamera.RotatePosition(speed, 0);
14809
+        {
14810
+            if ((mouseMode&VR)!=0)
14811
+                manipCamera.RotateInterest(-speed, 0);
14812
+            else
14813
+                manipCamera.RotatePosition(speed, 0);
14814
+        }
1471614815         /**/
1471714816         if ((mod & SHIFT) == SHIFT)
1471814817         {
....@@ -14722,6 +14821,8 @@
1472214821             mouseMode |= ROTATE;
1472314822         } // TRANSLATE;
1472414823 
14824
+        targetLookAt.set(manipCamera.lookAt);
14825
+        
1472514826         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1472614827         prevY = Y = anchorY;
1472714828     }
....@@ -14731,9 +14832,15 @@
1473114832         MODIFIERS |= COMMAND;
1473214833         /**/
1473314834         if((mod&SHIFT) == SHIFT)
14734
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14835
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1473514836         else
14736
-        manipCamera.RotatePosition(-speed, 0);
14837
+        {
14838
+            if ((mouseMode&VR)!=0)
14839
+                manipCamera.RotateInterest(speed, 0);
14840
+            else
14841
+                manipCamera.RotatePosition(-speed, 0);
14842
+        }
14843
+        
1473714844         /**/
1473814845         if ((mod & SHIFT) == SHIFT)
1473914846         {
....@@ -14743,6 +14850,8 @@
1474314850             mouseMode |= ROTATE;
1474414851         } // TRANSLATE;
1474514852 
14853
+        targetLookAt.set(manipCamera.lookAt);
14854
+        
1474614855         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1474714856         prevY = Y = anchorY;
1474814857     }
....@@ -15245,8 +15354,8 @@
1524515354             case 'K':
1524615355                 KOMPACTTEXTURE ^= true;
1524715356                 //textures.clear();
15248
-                break;
15249
-            case 'P': // Texture Projection macros
15357
+            //    break;
15358
+            //case 'P': // Texture Projection macros
1525015359 //                SAVETEXTURE ^= true;
1525115360                 macromode = true;
1525215361                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15367,7 +15476,7 @@
1536715476                 targetLookAt.set(manipCamera.lookAt);
1536815477                 repaint();
1536915478                 break;
15370
-            case 'p':
15479
+            case 'P': // p':
1537115480        // c'est quoi ca au juste?         spherical ^= true;
1537215481                 Skinshader ^= true; programInitialized = false; 
1537315482                 repaint();
....@@ -15405,7 +15514,7 @@
1540515514                 repaint();
1540615515                 break;
1540715516             case 'O':
15408
-                Globals.drawMode = OCCLUSION; // WARNING
15517
+                // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
1540915518                 repaint();
1541015519                 break;
1541115520             case 'o':
....@@ -16127,7 +16236,7 @@
1612716236                     {
1612816237                         switch (hitSomething)
1612916238                         {
16130
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16239
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1613116240                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1613216241                                 break;
1613316242                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16153,7 +16262,7 @@
1615316262         if (hasMarquee)
1615416263         {
1615516264             gr.setXORMode(Color.white);
16156
-            gr.setColor(Color.red);
16265
+            gr.setColor(Color.white);
1615716266             if (!firstime)
1615816267             {
1615916268                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16849,7 +16958,7 @@
1684916958             gl.glScalef(1.0f, -1.0f, 1.0f);
1685016959         }
1685116960 
16852
-        gl.glNormal3f(0.0f, 0.0f, 1.0f);
16961
+        SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1685316962             
1685416963         float step = 2; // 0.1666f; //0.25f;
1685516964         float stepv = 2; // step * 1652 / 998;
....@@ -17329,6 +17438,7 @@
1732917438 
1733017439         public void init(GLAutoDrawable drawable)
1733117440         {
17441
+        if (Globals.DEBUG)
1733217442             System.out.println("shadow buffer init");
1733317443 
1733417444             GL gl = drawable.getGL();