Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
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;" +
....@@ -12936,19 +12959,62 @@
1293612959 "MOV normald, normal;" +
1293712960 "MOV normals, normal;" +
1293812961
12962
+ "MOV temp, fragment.texcoord[4];" +
12963
+
1293912964 // UV base
1294012965 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1294112966 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1294212967 //"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;" +
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
+
1294612973 "XPD V, normal, UP;" +
1294712974 Normalize("V") +
1294812975 "XPD U, V, normal;" +
1294912976 Normalize("U") +
1295012977
1295112978 // 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;" +
1295213018
1295313019 //"MOV temp, fragment.texcoord[0];" +
1295413020 //
....@@ -13419,8 +13485,12 @@
1341913485 program = programmin;
1342013486 }
1342113487
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 " : ""));
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
+
1342413494 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1342513495
1342613496 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13467,7 +13537,8 @@
1346713537 "\n" +
1346813538 "END\n";
1346913539
13470
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13540
+ if (Globals.DEBUG)
13541
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1347113542 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1347213543
1347313544 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13725,7 +13796,7 @@
1372513796 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1372613797 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1372713798 /*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
13799
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1372913800
1373013801 //Object3D.cVector2[] vector2buffer;
1373113802
....@@ -13892,7 +13963,7 @@
1389213963 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1389313964 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1389413965 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13895
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
13966
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1389613967 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1389713968 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1389813969 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13953,7 +14024,7 @@
1395314024 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1395414025 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1395514026 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13956
- //"MOV result.texcoord, vertex.texcoord;" +
14027
+ //"MOV result.texcoord, vertex.fogcoord;" +
1395714028 "MOV result.texcoord, temp;" +
1395814029 // border fade
1395914030 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -14000,7 +14071,9 @@
1400014071
1400114072 //"ADD temp.z, temp.z, one;" +
1400214073
14003
- "MOV result.color, temp;"
14074
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14075
+
14076
+ "MOV result.color, temp;" // Normal
1400414077 : "MOV result.color, vertex.color;") +
1400514078 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1400614079 : "") +
....@@ -14666,11 +14739,17 @@
1466614739 void GoDown(int mod)
1466714740 {
1466814741 MODIFIERS |= COMMAND;
14742
+ boolean isVR = (mouseMode&VR)!=0;
1466914743 /**/
1467014744 if((mod&SHIFT) == SHIFT)
14671
- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14745
+ {
14746
+ if (isVR)
14747
+ manipCamera.RotateInterest(0, -speed);
14748
+ else
14749
+ manipCamera.RotatePosition(0, -speed);
14750
+ }
1467214751 else
14673
- manipCamera.RotatePosition(0, -speed);
14752
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1467414753 /**/
1467514754 if ((mod & SHIFT) == SHIFT)
1467614755 {
....@@ -14680,6 +14759,8 @@
1468014759 mouseMode |= BACKFORTH;
1468114760 }
1468214761
14762
+ targetLookAt.set(manipCamera.lookAt);
14763
+
1468314764 //prevX = X = anchorX;
1468414765 prevY = Y = anchorY - (int) (renderCamera.Distance());
1468514766 }
....@@ -14688,10 +14769,17 @@
1468814769 {
1468914770 MODIFIERS |= COMMAND;
1469014771 /**/
14772
+ boolean isVR = (mouseMode&VR)!=0;
14773
+
1469114774 if((mod&SHIFT) == SHIFT)
14692
- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14775
+ {
14776
+ if (isVR)
14777
+ manipCamera.RotateInterest(0, speed);
14778
+ else
14779
+ manipCamera.RotatePosition(0, speed);
14780
+ }
1469314781 else
14694
- manipCamera.RotatePosition(0, speed);
14782
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1469514783 /**/
1469614784 if ((mod & SHIFT) == SHIFT)
1469714785 {
....@@ -14701,6 +14789,8 @@
1470114789 mouseMode |= BACKFORTH;
1470214790 }
1470314791
14792
+ targetLookAt.set(manipCamera.lookAt);
14793
+
1470414794 //prevX = X = anchorX;
1470514795 prevY = Y = anchorY + (int) (renderCamera.Distance());
1470614796 }
....@@ -14710,9 +14800,14 @@
1471014800 MODIFIERS |= COMMAND;
1471114801 /**/
1471214802 if((mod&SHIFT) == SHIFT)
14713
- manipCamera.Translate(speed*delta, 0, getWidth());
14803
+ manipCamera.Translate(speed*delta, 0, getWidth());
1471414804 else
14715
- manipCamera.RotatePosition(speed, 0);
14805
+ {
14806
+ if ((mouseMode&VR)!=0)
14807
+ manipCamera.RotateInterest(-speed, 0);
14808
+ else
14809
+ manipCamera.RotatePosition(speed, 0);
14810
+ }
1471614811 /**/
1471714812 if ((mod & SHIFT) == SHIFT)
1471814813 {
....@@ -14722,6 +14817,8 @@
1472214817 mouseMode |= ROTATE;
1472314818 } // TRANSLATE;
1472414819
14820
+ targetLookAt.set(manipCamera.lookAt);
14821
+
1472514822 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1472614823 prevY = Y = anchorY;
1472714824 }
....@@ -14731,9 +14828,15 @@
1473114828 MODIFIERS |= COMMAND;
1473214829 /**/
1473314830 if((mod&SHIFT) == SHIFT)
14734
- manipCamera.Translate(-speed*delta, 0, getWidth());
14831
+ manipCamera.Translate(-speed*delta, 0, getWidth());
1473514832 else
14736
- manipCamera.RotatePosition(-speed, 0);
14833
+ {
14834
+ if ((mouseMode&VR)!=0)
14835
+ manipCamera.RotateInterest(speed, 0);
14836
+ else
14837
+ manipCamera.RotatePosition(-speed, 0);
14838
+ }
14839
+
1473714840 /**/
1473814841 if ((mod & SHIFT) == SHIFT)
1473914842 {
....@@ -14743,6 +14846,8 @@
1474314846 mouseMode |= ROTATE;
1474414847 } // TRANSLATE;
1474514848
14849
+ targetLookAt.set(manipCamera.lookAt);
14850
+
1474614851 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1474714852 prevY = Y = anchorY;
1474814853 }
....@@ -15245,8 +15350,8 @@
1524515350 case 'K':
1524615351 KOMPACTTEXTURE ^= true;
1524715352 //textures.clear();
15248
- break;
15249
- case 'P': // Texture Projection macros
15353
+ // break;
15354
+ //case 'P': // Texture Projection macros
1525015355 // SAVETEXTURE ^= true;
1525115356 macromode = true;
1525215357 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15367,7 +15472,7 @@
1536715472 targetLookAt.set(manipCamera.lookAt);
1536815473 repaint();
1536915474 break;
15370
- case 'p':
15475
+ case 'P': // p':
1537115476 // c'est quoi ca au juste? spherical ^= true;
1537215477 Skinshader ^= true; programInitialized = false;
1537315478 repaint();
....@@ -15405,7 +15510,7 @@
1540515510 repaint();
1540615511 break;
1540715512 case 'O':
15408
- Globals.drawMode = OCCLUSION; // WARNING
15513
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
1540915514 repaint();
1541015515 break;
1541115516 case 'o':
....@@ -16127,7 +16232,7 @@
1612716232 {
1612816233 switch (hitSomething)
1612916234 {
16130
- case Object3D.hitCenter: gr.setColor(Color.pink);
16235
+ case Object3D.hitCenter: gr.setColor(Color.white);
1613116236 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1613216237 break;
1613316238 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16153,7 +16258,7 @@
1615316258 if (hasMarquee)
1615416259 {
1615516260 gr.setXORMode(Color.white);
16156
- gr.setColor(Color.red);
16261
+ gr.setColor(Color.white);
1615716262 if (!firstime)
1615816263 {
1615916264 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16849,7 +16954,7 @@
1684916954 gl.glScalef(1.0f, -1.0f, 1.0f);
1685016955 }
1685116956
16852
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
16957
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1685316958
1685416959 float step = 2; // 0.1666f; //0.25f;
1685516960 float stepv = 2; // step * 1652 / 998;
....@@ -17329,6 +17434,7 @@
1732917434
1733017435 public void init(GLAutoDrawable drawable)
1733117436 {
17437
+ if (Globals.DEBUG)
1733217438 System.out.println("shadow buffer init");
1733317439
1733417440 GL gl = drawable.getGL();