Normand Briere
2019-09-25 51e45bf615e1e2b4aca2edf9f7333b687c7d015e
CameraPane.java
....@@ -1,4 +1,5 @@
11
2
+import com.bulletphysics.dynamics.RigidBody;
23 import java.awt.*;
34 import java.awt.event.*;
45 import java.awt.image.*;
....@@ -134,7 +135,7 @@
134135 static boolean ZOOMBOXMODE = false;
135136 static boolean BOXMODE = false;
136137 static boolean IMAGEFLIP = false;
137
-static boolean SMOOTHFOCUS = false;
138
+static boolean SMOOTHFOCUS = true; // false;
138139 static boolean SPEAKERMOCAP = true; // jan 2014 false;
139140 static boolean SPEAKERCAMERA = false;
140141 static boolean SPEAKERFOCUS = false;
....@@ -174,7 +175,7 @@
174175 boolean Udebug = false;
175176 boolean Vdebug = false;
176177 boolean NORMALdebug = false;
177
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
178
+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
178179 boolean anisotropy = true;
179180 boolean softshadow = true; // slower but better false;
180181 boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
....@@ -221,10 +222,10 @@
221222 cameras = new Camera[2];
222223 targetLookAts = new cVector[2];
223224
224
- SetCamera(cam);
225
+ SetCamera(cam, true);
225226
226227 // Warning: not used.
227
- SetLight(new Camera(new cVector(15, 10, -20)));
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
228229
229230 object = o;
230231
....@@ -881,7 +882,7 @@
881882 //// tris.postdraw(this);
882883 }
883884
884
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
885886 static cVector from = new cVector();
886887 static cVector to = new cVector();
887888
....@@ -890,7 +891,7 @@
890891 CameraPane cp = this;
891892
892893 Camera keep = cp.RenderCamera();
893
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
894895
895896 if (br.trimmed)
896897 {
....@@ -908,7 +909,7 @@
908909 br.positions[i3 + 2] + br.normals[i3 + 2]);
909910 LA.xformPos(from, transform, from);
910911 LA.xformPos(to, transform, to); // RIGID ONLY
911
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
912913
913914 CameraPane.occlusionbuffer.display();
914915
....@@ -942,7 +943,7 @@
942943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
943944 LA.xformPos(from, transform, from);
944945 LA.xformPos(to, transform, to); // RIGID ONLY
945
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
946947
947948 CameraPane.occlusionbuffer.display();
948949
....@@ -2064,7 +2065,7 @@
20642065
20652066 static int camerachangeframe;
20662067
2067
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
20682069 {
20692070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
20702071 // return false;
....@@ -2082,7 +2083,8 @@
20822083
20832084 camerachangeframe = Globals.framecount;
20842085
2085
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20862088
20872089 cameras[0] = cam;
20882090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2092,11 +2094,14 @@
20922094 {
20932095 cameras[i] = new Camera(cam.viewCode);
20942096 }
2095
-
2096
- cameras[i].setAim(cam.location, cam.lookAt);
2097
- cameras[i].shaper_fovy = cam.shaper_fovy;
2098
- cameras[i].UP.set(cam.UP);
2099
- targetLookAts[i] = new cVector(cameras[i].lookAt);
2097
+
2098
+ if (set)
2099
+ {
2100
+ cameras[i].setAim(cam.location, cam.lookAt);
2101
+ cameras[i].shaper_fovy = cam.shaper_fovy;
2102
+ cameras[i].UP.set(cam.UP);
2103
+ targetLookAts[i] = new cVector(cameras[i].lookAt);
2104
+ }
21002105 }
21012106 cameracount = 0;
21022107 targetLookAt = targetLookAts[cameracount];
....@@ -2105,7 +2110,7 @@
21052110 // Start with free camera
21062111 SwitchCameras(true);
21072112
2108
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
21092114
21102115 if (TRACKONCE)
21112116 {
....@@ -2292,18 +2297,6 @@
22922297 public void ToggleTrack()
22932298 {
22942299 TRACK ^= true;
2295
- if (TRACK)
2296
- {
2297
- if (object.selection != null &&
2298
- object.selection.size() > 0 &&
2299
- object.selection.elementAt(0) != null &&
2300
- !(object.selection.elementAt(0) instanceof Camera) &&
2301
- !(object.selection.elementAt(0) instanceof ScriptNode))
2302
- {
2303
- trackedobject = object.selection.elementAt(0);
2304
- repaint();
2305
- }
2306
- }
23072300
23082301 repaint();
23092302 }
....@@ -2395,7 +2388,8 @@
23952388 {
23962389 //System.out.println("PROTECTION = " + cam.hAspect);
23972390 //assert (cam.hAspect == 0);
2398
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23992393 lightCamera = cam;
24002394 }
24012395
....@@ -3596,6 +3590,8 @@
35963590 };
35973591 /**/
35983592
3593
+ static Object3D lastObject;
3594
+
35993595 //com.sun.opengl.util.texture.Texture
36003596 TextureData
36013597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3632,6 +3628,8 @@
36323628 // return null;
36333629 //if (i == 2)
36343630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
36353633 e.printStackTrace();
36363634 name = name.split("\\.tif")[0] + ".jpg";
36373635 }
....@@ -6964,30 +6962,30 @@
69646962 short residu = 0;
69656963
69666964 // wraparound workarounds
6967
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
69686966 /*
6969
- residu += (fuck%2);
6970
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
69716969 {
6972
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
69736971 if(residu == 2)
69746972 residu = 0;
69756973 }
69766974 else
69776975 {
69786976 residu = 0;
6979
- fuck /= 2;
6977
+ ww /= 2;
69806978 }
69816979 */
6982
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
69836981 {
6984
- fuck /= 2;
6982
+ ww /= 2;
69856983 } else
69866984 {
6987
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
69886986 }
69896987
6990
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
69916989 }
69926990 //System.out.print(bytes[i] + " ");
69936991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -8454,12 +8452,12 @@
84548452 {
84558453 // texturecache = textures.get(texname); // suspicious
84568454 if (texturecache == null)
8457
- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8455
+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
84588456 else
84598457 new Exception().printStackTrace();
84608458 } else
84618459 {
8462
- if (texname.startsWith("@"))
8460
+ if (texname.startsWith("@") && textureon)
84638461 {
84648462 // texturecache = textures.get(texname); // suspicious
84658463 if (texturecache == null)
....@@ -8642,7 +8640,9 @@
86428640 {
86438641 tex.bw = texturecache.texturedata.getWidth();
86448642 tex.bh = texturecache.texturedata.getHeight();
8645
- tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
8643
+ tex.bumpdata = //CompressJPEG(CreateBim(
8644
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8645
+ //, tex.bw, tex.bh), 0.5f);
86468646 }
86478647 }
86488648 }
....@@ -9840,7 +9840,10 @@
98409840 DrawSkyBox(gl, (float)rati);
98419841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
98429842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9843
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
98449847 ratio,
98459848 //near_plane, far_plane,
98469849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10712,7 +10715,7 @@
1071210715 if (patchMaterial.patchMaterial)
1071310716 {
1071410717 patchMaterial.patchMaterial = false;
10715
- patchMaterial.objectPanel.setSelectedIndex(1);
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
1071610719 }
1071710720
1071810721 if (Grafreed.savesound && Grafreed.hassound)
....@@ -10810,6 +10813,112 @@
1081010813
1081110814 if (DrawMode() == DEFAULT)
1081210815 {
10816
+ if (manipCamera == lightCamera)
10817
+ {
10818
+// switch (e.getKeyCode())
10819
+// {
10820
+// case DOWN_ARROW:
10821
+// lightCamera.DECAL /= 2;
10822
+// repaint();
10823
+// break;
10824
+// case UP_ARROW:
10825
+// lightCamera.DECAL *= 2;
10826
+// repaint();
10827
+// break;
10828
+// case LEFT_ARROW:
10829
+// lightCamera.SCALE /= 2;
10830
+// repaint();
10831
+// break;
10832
+// case RIGHT_ARROW:
10833
+// lightCamera.SCALE *= 2;
10834
+// repaint();
10835
+// break;
10836
+// default:
10837
+// break;
10838
+ if (keys[DOWN_ARROW])
10839
+ {
10840
+ lightCamera.DECAL /= 2;
10841
+ }
10842
+
10843
+ if (keys[UP_ARROW])
10844
+ {
10845
+ lightCamera.DECAL *= 2;
10846
+ }
10847
+
10848
+ if (keys[LEFT_ARROW])
10849
+ {
10850
+ lightCamera.SCALE /= 2;
10851
+ }
10852
+
10853
+ if (keys[RIGHT_ARROW])
10854
+ {
10855
+ lightCamera.SCALE *= 2;
10856
+ }
10857
+ }
10858
+ else
10859
+ {
10860
+ //pingthread.mute = true;
10861
+
10862
+ boolean keyon = false;
10863
+
10864
+ if (keys[DOWN_ARROW])
10865
+ {
10866
+ speed = ++speedkey[DOWN_ARROW];
10867
+ if (speed > 20)
10868
+ speed = 20;
10869
+ GoDown(modifiers);
10870
+ keyon = true;
10871
+ }
10872
+ else
10873
+ speedkey[DOWN_ARROW] = 0;
10874
+
10875
+ if (keys[UP_ARROW])
10876
+ {
10877
+ speed = ++speedkey[UP_ARROW];
10878
+ if (speed > 20)
10879
+ speed = 20;
10880
+ GoUp(modifiers);
10881
+ keyon = true;
10882
+ }
10883
+ else
10884
+ speedkey[UP_ARROW] = 0;
10885
+
10886
+ if (keys[LEFT_ARROW])
10887
+ {
10888
+ speed = ++speedkey[LEFT_ARROW];
10889
+ if (speed > 20)
10890
+ speed = 20;
10891
+ GoLeft(modifiers);
10892
+ keyon = true;
10893
+ }
10894
+ else
10895
+ speedkey[LEFT_ARROW] = 0;
10896
+
10897
+ if (keys[RIGHT_ARROW])
10898
+ {
10899
+ speed = ++speedkey[RIGHT_ARROW];
10900
+ if (speed > 20)
10901
+ speed = 20;
10902
+ GoRight(modifiers);
10903
+ keyon = true;
10904
+ }
10905
+ else
10906
+ speedkey[RIGHT_ARROW] = 0;
10907
+
10908
+ if (Globals.WALK && capsLocked)
10909
+ {
10910
+ Walk();
10911
+ keyon = true;
10912
+ }
10913
+
10914
+ if (keyon)
10915
+ {
10916
+ repaint();
10917
+ }
10918
+
10919
+ //pingthread.mute = false;
10920
+ }
10921
+
1081310922 currentlydrawing = true;
1081410923 }
1081510924
....@@ -11334,9 +11443,9 @@
1133411443
1133511444 gl.glMatrixMode(GL.GL_MODELVIEW);
1133611445
11337
-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11338
-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11339
-gl.glEnable(gl.GL_MULTISAMPLE);
11446
+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11447
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11448
+//gl.glEnable(gl.GL_MULTISAMPLE);
1134011449 } else
1134111450 {
1134211451 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11397,7 +11506,10 @@
1139711506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1139811507 } else
1139911508 {
11400
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11509
+ boolean vr = capsLocked && !lightMode;
11510
+
11511
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11512
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1140111513 }
1140211514 }
1140311515
....@@ -11753,8 +11865,11 @@
1175311865 repaint();
1175411866 }
1175511867
11756
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1175711871 repaint();
11872
+ }
1175811873
1175911874 displaydone = true;
1176011875 }
....@@ -11829,9 +11944,23 @@
1182911944 //GL gl = getGL();
1183011945 if ((TRACK || SHADOWTRACK) || zoomonce)
1183111946 {
11947
+ if (TRACK)
11948
+ {
11949
+ if (object.selection != null &&
11950
+ object.selection.size() > 0 &&
11951
+ object.selection.elementAt(0) != null &&
11952
+ !(object.selection.elementAt(0) instanceof Camera) &&
11953
+ !(object.selection.elementAt(0) instanceof ScriptNode))
11954
+ {
11955
+ trackedobject = object.selection.elementAt(0);
11956
+ //repaint();
11957
+ }
11958
+ else
11959
+ trackedobject = null;
11960
+ }
1183211961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1183311962 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11834
- pingthread.StepToTarget(true); // true);
11963
+ pingthread.StepToTarget(); // true);
1183511964 // zoomonce = false;
1183611965 }
1183711966
....@@ -12514,8 +12643,9 @@
1251412643 String programmin =
1251512644 // Min shader
1251612645 "!!ARBfp1.0\n" +
12517
- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12518
- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
12646
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
12647
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
12648
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
1251912649 "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1252012650 "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
1252112651 "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
....@@ -12530,10 +12660,11 @@
1253012660 "TEMP eye;" +
1253112661 "TEMP pos;" +
1253212662
12533
- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12663
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
1253412664 Normalize("normal") +
1253512665 "MOV light, state.light[0].position;" +
1253612666 "DP3 ndotl.x, light, normal;" +
12667
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
1253712668
1253812669 // shadow
1253912670 "MOV pos, fragment.texcoord[1];" +
....@@ -12549,7 +12680,7 @@
1254912680 "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1255012681
1255112682 // Backlit
12552
- "MOV pos.w, zero123.y;" +
12683
+ "MOV pos.w, zero12t.y;" + // one
1255312684 "DP4 eye.x, pos, light2cam0;" +
1255412685 "DP4 eye.y, pos, light2cam1;" +
1255512686 "DP4 eye.z, pos, light2cam2;" +
....@@ -12557,24 +12688,28 @@
1255712688
1255812689 "DP3 ndotl.y, -eye, normal;" +
1255912690 //"MUL ndotl.y, ndotl.y, pow2.x;" +
12560
- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12561
- "SUB ndotl.y, zero123.y, ndotl.y;" +
12691
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12692
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12693
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
1256212694 //"SUB ndotl.y, zero123.y, ndotl.y;" +
1256312695 //"MUL ndotl.y, ndotl.y, pow2.z;" +
12696
+ "ADD ndotl.y, ndotl.y, one.x;" +
12697
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
1256412698
1256512699 //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
1256612700 //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
1256712701
1256812702 // Pigment
1256912703 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12570
- "LRP temp, zero123.w, temp, one;" + // texture proportion
12571
- "MUL temp, temp, ndotl.x;" +
12572
-
12573
- "MUL temp, temp, zero123.z;" +
12704
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12705
+ "MUL temp, temp, zero12t.w;" + // Times x
1257412706
1257512707 //"MUL temp, temp, ndotl.y;" +
12708
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
1257612709
12577
- "MOV temp.w, zero123.y;" + // reset alpha
12710
+ "MUL temp, temp, ndotl.x;" + // lambert
12711
+
12712
+ "MOV temp.w, zero12t.y;" + // reset alpha
1257812713 "MOV result.color, temp;" +
1257912714 "END";
1258012715
....@@ -12946,12 +13081,7 @@
1294613081 "ADD temp.x, temp.x, one.x;" +
1294713082 "MUL normal, normal, temp.xxxx;":""
1294813083 ) +
12949
- /**/
12950
-//// Normalize("normal") +
12951
-//// "MAX normal.z, eps.x, normal.z;" +
12952
-// Normalize("normal") +
12953
- "MOV normald, normal;" +
12954
- "MOV normals, normal;" +
13084
+ /**/
1295513085
1295613086 "MOV temp, fragment.texcoord[4];" +
1295713087
....@@ -12969,6 +13099,17 @@
1296913099 "XPD U, V, normal;" +
1297013100 Normalize("U") +
1297113101
13102
+ "MOV temp, fragment.texcoord[0];" +
13103
+
13104
+// "MAD normal, -temp.x, U, normal;" +
13105
+// "MAD normal, -temp.y, V, normal;" +
13106
+// Normalize("normal") +
13107
+
13108
+//// "MAX normal.z, eps.x, normal.z;" +
13109
+// Normalize("normal") +
13110
+ "MOV normald, normal;" +
13111
+ "MOV normals, normal;" +
13112
+
1297213113 // parallax mapping
1297313114
1297413115 "DP3 temp2.x, V, eye;" +
....@@ -12981,17 +13122,15 @@
1298113122 "RCP temp2.w, temp2.w;" +
1298213123
1298313124 "SUB temp2.w, temp2.w, half;" +
12984
-// "SGE temp.x, temp2.w, eps.x;" +
12985
-// "MUL temp2.w, temp2.w, temp.x;" +
13125
+ // "SGE temp.x, temp2.w, eps.x;" +
13126
+ // "MUL temp2.w, temp2.w, temp.x;" +
1298613127
12987
- //"MOV texSamp, U;" +
13128
+ // "MOV texSamp, U;" +
1298813129
1298913130 "MUL temp2.z, temp2.z, temp2.w;" +
1299013131 "MUL temp2.z, temp2.z, params7.z;" + // parallax
1299113132
1299213133 "MUL temp2, temp2, temp2.z;" +
12993
-
12994
- "MOV temp, fragment.texcoord[0];" +
1299513134
1299613135 "SUB temp, temp, temp2;" +
1299713136
....@@ -12999,7 +13138,7 @@
1299913138 "POW temp.a, temp.a, params6.w;" + // punch through
1300013139
1300113140 "ADD texSamp, temp, texSamp;" +
13002
- "MUL temp.xyz, half, texSamp;" +
13141
+ "MUL texSamp.xyz, half, texSamp;" +
1300313142
1300413143 "MOV alpha, texSamp.aaaa;" +
1300513144
....@@ -14202,10 +14341,13 @@
1420214341 public void mouseClicked(MouseEvent e)
1420314342 {
1420414343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1420514345 }
1420614346
1420714347 public void mousePressed(MouseEvent e)
1420814348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1420914351 //System.out.println("mousePressed: " + e);
1421014352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1421114353 }
....@@ -14240,10 +14382,12 @@
1424014382 return;
1424114383 }
1424214384
14243
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14385
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14386
+
14387
+ boolean vr = capsLocked && !lightMode;
1424414388
1424514389 // TIMER
14246
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1424714391 {
1424814392 keepboxmode = BOXMODE;
1424914393 keepsupport = SUPPORT;
....@@ -14284,7 +14428,7 @@
1428414428 //}
1428514429
1428614430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
14287
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1428814432 anchorX = ax;
1428914433 anchorY = ay;
1429014434 prevX = px;
....@@ -14379,8 +14523,9 @@
1437914523 // fev 2014???
1438014524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
1438114525 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14382
- pingthread.StepToTarget(true); // true);
14526
+ pingthread.StepToTarget(); // true);
1438314527 }
14528
+
1438414529 // if (!LIVE)
1438514530 super.repaint();
1438614531 }
....@@ -14475,8 +14620,8 @@
1447514620
1447614621 //if (drawing)
1447714622 //return;
14478
- if ((e.getModifiersEx() & CTRL) != 0
14479
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1448014625 {
1448114626 //System.out.println("mouseDragged: " + e);
1448214627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14500,9 +14645,17 @@
1450014645 return targetLookAt;
1450114646 }
1450214647
14648
+ javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
14649
+ javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
14650
+ javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
14651
+
14652
+
1450314653 class PingThread extends Thread
1450414654 {
1450514655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute;
1450614659
1450714660 // void JumpToTarget()
1450814661 // {
....@@ -14518,6 +14671,88 @@
1451814671 // only one thread!? synchronized
1451914672 void StepToTarget(boolean jump)
1452014673 {
14674
+ RigidBody.pos.x = 0;
14675
+ RigidBody.pos.y = 0;
14676
+ RigidBody.pos.z = 0;
14677
+ if (RigidBody.justclicked)
14678
+ {
14679
+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+ RigidBody.wind.set(RigidBody.pos);
14683
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14684
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14685
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14686
+ RigidBody.wind.normalize();
14687
+ }
14688
+
14689
+ if (mute)
14690
+ return;
14691
+
14692
+ if (capsLocked && manipCamera.viewCode == 0)
14693
+ {
14694
+ eye.x = manipCamera.location.x;
14695
+ eye.y = manipCamera.location.y + 0.25;
14696
+ eye.z = manipCamera.location.z;
14697
+
14698
+ dir.y = -1;
14699
+
14700
+ Ray ray = new Ray(eye, dir);
14701
+
14702
+ IntersectResult res = new IntersectResult();
14703
+ res.t = Double.POSITIVE_INFINITY;
14704
+
14705
+ tmp.set(targetLookAt);
14706
+ tmp.sub(manipCamera.location);
14707
+
14708
+ double dist = tmp.length();
14709
+
14710
+ tmp.normalize();
14711
+
14712
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
14713
+ eye2.y = manipCamera.location.y + 0.25;
14714
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
14715
+
14716
+ Ray ray2 = new Ray(eye2, dir);
14717
+
14718
+ IntersectResult res2 = new IntersectResult();
14719
+ res2.t = Double.POSITIVE_INFINITY;
14720
+
14721
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14722
+ {
14723
+ //tmp.set(manipCamera.location);
14724
+
14725
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14726
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14727
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14728
+
14729
+ //tmp.sub(manipCamera.location);
14730
+
14731
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14732
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14733
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14734
+
14735
+ targetLookAt.sub(manipCamera.location);
14736
+ targetLookAt.normalize();
14737
+ targetLookAt.mul(dist);
14738
+ targetLookAt.add(manipCamera.location);
14739
+
14740
+ //if (tmp.dot(tmp) > 0.000001)
14741
+ // System.out.println("INTERSECTION " + manipCamera.location);
14742
+
14743
+ manipCamera.lookAt.set(targetLookAt);
14744
+
14745
+ tmp.x = res.n.x;
14746
+ tmp.y = res.n.y;
14747
+ tmp.z = res.n.z;
14748
+ tmp.x += res2.n.x;
14749
+ tmp.y += res2.n.y;
14750
+ tmp.z += res2.n.z;
14751
+ tmp.normalize();
14752
+ manipCamera.UP.set(tmp);
14753
+ }
14754
+ }
14755
+
1452114756 tmp.set(targetLookAt);
1452214757 tmp.sub(manipCamera.lookAt); // june 2014
1452314758
....@@ -14555,7 +14790,7 @@
1455514790
1455614791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1455714792 {
14558
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1455914794 }
1456014795
1456114796 if (OEILONCE && OEIL)
....@@ -14590,7 +14825,10 @@
1459014825 if (tmp.dot(tmp) < 0.00001)
1459114826 {
1459214827 zoomonce = false;
14828
+ live = false;
1459314829 }
14830
+ else
14831
+ live = true;
1459414832
1459514833 tmp.mul(step > step2 ? step : step2);
1459614834 }
....@@ -14617,7 +14855,7 @@
1461714855 {
1461814856 if (LOOKAT)
1461914857 manipCamera.lookAt.add(tmp);
14620
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1462114859 manipCamera.location.add(tmp);
1462214860
1462314861 {
....@@ -14632,7 +14870,10 @@
1463214870 lightCamera.computeTransform();
1463314871 }
1463414872 }
14635
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1463614877 }
1463714878 // ?????? mouseDown = true;
1463814879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14725,11 +14966,32 @@
1472514966 }
1472614967 }
1472714968 }
14969
+
1472814970 PingThread pingthread = new PingThread();
14729
- int delta = 5;
14730
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1473114974 boolean autorepeat = false;
1473214975
14976
+ void Walk()
14977
+ {
14978
+ manipCamera.BackForth(0, walk, 1000);
14979
+
14980
+ targetLookAt.set(manipCamera.lookAt);
14981
+ }
14982
+
14983
+ void ViewAngle(float dy)
14984
+ {
14985
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14986
+
14987
+ if (manipCamera.shaper_fovy * factor > 1 &&
14988
+ manipCamera.shaper_fovy * factor < 150)
14989
+ {
14990
+ manipCamera.shaper_fovy *= factor;
14991
+ //System.out.println("fovy = " + shaper_fovy);
14992
+ }
14993
+ }
14994
+
1473314995 void GoDown(int mod)
1473414996 {
1473514997 MODIFIERS |= COMMAND;
....@@ -14737,21 +14999,30 @@
1473714999 /**/
1473815000 if((mod&SHIFT) == SHIFT)
1473915001 {
15002
+// if (isVR)
15003
+// manipCamera.RotateInterest(0, speed);
15004
+// else
1474015005 if (isVR)
14741
- manipCamera.RotateInterest(0, -speed);
15006
+ ViewAngle(-speed*delta);
15007
+ else
15008
+ manipCamera.Translate(0, -speed*delta, getWidth());
15009
+ }
15010
+ else
15011
+ {
15012
+ if (isVR)
15013
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1474215014 else
1474315015 manipCamera.RotatePosition(0, -speed);
1474415016 }
14745
- else
14746
- manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15017
+
1474715018 /**/
14748
- if ((mod & SHIFT) == SHIFT)
14749
- {
14750
- mouseMode = mouseMode; // VR??
14751
- } else
14752
- {
14753
- mouseMode |= BACKFORTH;
14754
- }
15019
+// if ((mod & SHIFT) == SHIFT)
15020
+// {
15021
+// mouseMode = mouseMode; // VR??
15022
+// } else
15023
+// {
15024
+// mouseMode |= BACKFORTH;
15025
+// }
1475515026
1475615027 targetLookAt.set(manipCamera.lookAt);
1475715028
....@@ -14761,27 +15032,38 @@
1476115032
1476215033 void GoUp(int mod)
1476315034 {
15035
+ RigidBody.justclicked = true;
15036
+
1476415037 MODIFIERS |= COMMAND;
1476515038 /**/
1476615039 boolean isVR = (mouseMode&VR)!=0;
1476715040
1476815041 if((mod&SHIFT) == SHIFT)
1476915042 {
15043
+// if (isVR)
15044
+// manipCamera.RotateInterest(0, -speed);
15045
+// else
1477015046 if (isVR)
14771
- manipCamera.RotateInterest(0, speed);
15047
+ ViewAngle(speed*delta);
15048
+ else
15049
+ manipCamera.Translate(0, speed*delta, getWidth());
15050
+ }
15051
+ else
15052
+ {
15053
+ if (isVR)
15054
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1477215055 else
1477315056 manipCamera.RotatePosition(0, speed);
1477415057 }
14775
- else
14776
- manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15058
+
1477715059 /**/
14778
- if ((mod & SHIFT) == SHIFT)
14779
- {
14780
- mouseMode = mouseMode;
14781
- } else
14782
- {
14783
- mouseMode |= BACKFORTH;
14784
- }
15060
+// if ((mod & SHIFT) == SHIFT)
15061
+// {
15062
+// mouseMode = mouseMode;
15063
+// } else
15064
+// {
15065
+// mouseMode |= BACKFORTH;
15066
+// }
1478515067
1478615068 targetLookAt.set(manipCamera.lookAt);
1478715069
....@@ -14794,23 +15076,27 @@
1479415076 MODIFIERS |= COMMAND;
1479515077 /**/
1479615078 if((mod&SHIFT) == SHIFT)
14797
- manipCamera.Translate(speed*delta, 0, getWidth());
15079
+ manipCamera.Translate(speed, 0, getWidth());
1479815080 else
1479915081 {
1480015082 if ((mouseMode&VR)!=0)
14801
- manipCamera.RotateInterest(-speed, 0);
15083
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
1480215084 else
14803
- manipCamera.RotatePosition(speed, 0);
15085
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
1480415086 }
15087
+
1480515088 /**/
14806
- if ((mod & SHIFT) == SHIFT)
14807
- {
14808
- mouseMode = mouseMode;
14809
- } else
14810
- {
14811
- mouseMode |= ROTATE;
14812
- } // TRANSLATE;
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1481315096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
1481415100 targetLookAt.set(manipCamera.lookAt);
1481515101
1481615102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
....@@ -14822,23 +15108,23 @@
1482215108 MODIFIERS |= COMMAND;
1482315109 /**/
1482415110 if((mod&SHIFT) == SHIFT)
14825
- manipCamera.Translate(-speed*delta, 0, getWidth());
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1482615112 else
1482715113 {
1482815114 if ((mouseMode&VR)!=0)
14829
- manipCamera.RotateInterest(speed, 0);
15115
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
1483015116 else
14831
- manipCamera.RotatePosition(-speed, 0);
15117
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
1483215118 }
1483315119
1483415120 /**/
14835
- if ((mod & SHIFT) == SHIFT)
14836
- {
14837
- mouseMode = mouseMode;
14838
- } else
14839
- {
14840
- mouseMode |= ROTATE;
14841
- } // TRANSLATE;
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1484215128
1484315129 targetLookAt.set(manipCamera.lookAt);
1484415130
....@@ -14975,6 +15261,11 @@
1497515261 if ((mouseMode & ZOOM) != 0)
1497615262 {
1497715263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1497815269 if ((mouseMode & VR) != 0)
1497915270 manipCamera.BackForth(dx, dy, getWidth());
1498015271 else
....@@ -15045,6 +15336,9 @@
1504515336
1504615337 public void mouseMoved(MouseEvent e)
1504715338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1504815342 //System.out.println("mouseMoved: " + e);
1504915343 if (isRenderer)
1505015344 return;
....@@ -15229,8 +15523,10 @@
1522915523 mouseMode |= ZOOM;
1523015524 }
1523115525
15232
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15233
- if (capsLocked) // || (modifiers & META) == META)
15526
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15527
+ boolean vr = capsLocked && !lightMode;
15528
+
15529
+ if (vr) // || (modifiers & META) == META)
1523415530 {
1523515531 mouseMode |= VR; // BACKFORTH;
1523615532 }
....@@ -15242,7 +15538,8 @@
1524215538 {
1524315539 mouseMode |= SELECT;
1524415540 }
15245
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1524615543 {
1524715544 mouseMode &= ~VR;
1524815545 mouseMode |= TRANSLATE;
....@@ -15286,8 +15583,18 @@
1528615583 float SATPOW = 1; // 2; // 0.5f;
1528715584 float BRIPOW = 1; // 0.5f; // 0.5f;
1528815585
15586
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15587
+
15588
+// Create a new blank cursor.
15589
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15590
+ cursorImg, new Point(0, 0), "blank cursor");
15591
+
1528915592 public void keyPressed(int key)
1529015593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1529115598 if (key >= '0' && key <= '5')
1529215599 clampbit = (key-'0');
1529315600
....@@ -15446,8 +15753,8 @@
1544615753 RevertCamera();
1544715754 repaint();
1544815755 break;
15449
- case 'l':
15450
- //case 'L':
15756
+ //case 'l':
15757
+ case 'L':
1545115758 if (lightMode)
1545215759 {
1545315760 lightMode = false;
....@@ -15477,7 +15784,8 @@
1547715784 break;
1547815785 case 'm':
1547915786 {
15480
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1548115789 break;
1548215790 }
1548315791 case 'M':
....@@ -15504,9 +15812,9 @@
1550415812 repaint();
1550515813 break;
1550615814 case 'O':
15507
- Globals.drawMode = OCCLUSION; // WARNING
15508
- repaint();
15509
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1551015818 case 'o':
1551115819 OCCLUSION_CULLING ^= true;
1551215820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
....@@ -15598,7 +15906,21 @@
1559815906 // kompactbit = 6;
1559915907 // break;
1560015908 case ' ':
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
1560115913 lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
1560215924 Globals.lighttouched = true;
1560315925 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1560415926 targetLookAt.set(manipCamera.lookAt);
....@@ -15606,6 +15928,10 @@
1560615928 break;
1560715929 //case '`' :
1560815930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1560915935 RENDERPROGRAM += 1;
1561015936 RENDERPROGRAM %= 3;
1561115937
....@@ -15644,6 +15970,10 @@
1564415970 case ENTER:
1564515971 // object.editWindow.ScreenFit(); // Edit();
1564615972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1564715977 break;
1564815978 case DELETE:
1564915979 ClearSelection();
....@@ -15680,17 +16010,23 @@
1568016010 object.GetWindow().refreshContents(true);
1568116011 break;
1568216012 case '{':
15683
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1568416016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1568516017 repaint();
1568616018 break;
1568716019 case '}':
15688
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1568916023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1569016024 repaint();
1569116025 break;
1569216026 case '[':
15693
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1569416030 if (false) //manipCamera.hAspect == 0)
1569516031 {
1569616032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15706,7 +16042,9 @@
1570616042 break;
1570716043 case ']':
1570816044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15709
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1571016048 if (false) //manipCamera.hAspect == 0)
1571116049 {
1571216050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15744,98 +16082,113 @@
1574416082 }
1574516083 }
1574616084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1574716089 public void processKeyEvent(KeyEvent e)
1574816090 {
1574916091 switch (e.getID())
1575016092 {
1575116093 case KeyEvent.KEY_PRESSED:
15752
- if (!autorepeat)
15753
- {
15754
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15755
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15756
- }
15757
- if (manipCamera == lightCamera)
15758
- {
15759
- switch (e.getKeyCode())
15760
- {
15761
- case DOWN_ARROW:
15762
- lightCamera.DECAL /= 2;
15763
- repaint();
15764
- break;
15765
- case UP_ARROW:
15766
- lightCamera.DECAL *= 2;
15767
- repaint();
15768
- break;
15769
- case LEFT_ARROW:
15770
- lightCamera.SCALE /= 2;
15771
- repaint();
15772
- break;
15773
- case RIGHT_ARROW:
15774
- lightCamera.SCALE *= 2;
15775
- repaint();
15776
- break;
15777
- default:
15778
- break;
15779
- }
15780
-
15781
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15782
- } else
15783
- {
15784
- if (true) // !autorepeat)
15785
- {
15786
- boolean reset = true;
15787
-
15788
- switch (e.getKeyCode())
15789
- {
15790
- case DOWN_ARROW:
15791
- GoDown(e.getModifiersEx());
15792
- repaint();
15793
- break;
15794
- case UP_ARROW:
15795
- GoUp(e.getModifiersEx());
15796
- repaint();
15797
- break;
15798
- case LEFT_ARROW:
15799
- GoLeft(e.getModifiersEx());
15800
- repaint();
15801
- break;
15802
- case RIGHT_ARROW:
15803
- GoRight(e.getModifiersEx());
15804
- repaint();
15805
- break;
15806
- default:
15807
- reset = false;
15808
- break;
15809
- }
15810
-
15811
- if (reset)
15812
- {
15813
- autorepeat = true;
15814
-
15815
- targetLookAt.set(manipCamera.lookAt);
15816
- }
15817
- }
15818
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1581916099 break;
15820
- case KeyEvent.KEY_TYPED:
15821
- break;
16100
+// if (!autorepeat)
16101
+// {
16102
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
16103
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
16104
+// }
16105
+// if (manipCamera == lightCamera)
16106
+// {
16107
+// switch (e.getKeyCode())
16108
+// {
16109
+// case DOWN_ARROW:
16110
+// lightCamera.DECAL /= 2;
16111
+// repaint();
16112
+// break;
16113
+// case UP_ARROW:
16114
+// lightCamera.DECAL *= 2;
16115
+// repaint();
16116
+// break;
16117
+// case LEFT_ARROW:
16118
+// lightCamera.SCALE /= 2;
16119
+// repaint();
16120
+// break;
16121
+// case RIGHT_ARROW:
16122
+// lightCamera.SCALE *= 2;
16123
+// repaint();
16124
+// break;
16125
+// default:
16126
+// break;
16127
+// }
16128
+//
16129
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16130
+// } else
16131
+// {
16132
+// if (true) // !autorepeat)
16133
+// {
16134
+// boolean reset = true;
16135
+//
16136
+// switch (e.getKeyCode())
16137
+// {
16138
+// case DOWN_ARROW:
16139
+// GoDown(e.getModifiersEx());
16140
+// repaint();
16141
+// break;
16142
+// case UP_ARROW:
16143
+// GoUp(e.getModifiersEx());
16144
+// repaint();
16145
+// break;
16146
+// case LEFT_ARROW:
16147
+// GoLeft(e.getModifiersEx());
16148
+// repaint();
16149
+// break;
16150
+// case RIGHT_ARROW:
16151
+// GoRight(e.getModifiersEx());
16152
+// repaint();
16153
+// break;
16154
+// default:
16155
+// reset = false;
16156
+// break;
16157
+// }
16158
+//
16159
+// if (reset)
16160
+// {
16161
+// autorepeat = true;
16162
+//
16163
+// targetLookAt.set(manipCamera.lookAt);
16164
+// }
16165
+// }
16166
+// }
16167
+// break;
16168
+// case KeyEvent.KEY_TYPED:
16169
+// break;
1582216170 case KeyEvent.KEY_RELEASED:
15823
- {
15824
- switch (e.getKeyCode())
15825
- {
15826
- case DOWN_ARROW:
15827
- case UP_ARROW:
15828
- case LEFT_ARROW:
15829
- case RIGHT_ARROW:
15830
- MODIFIERS &= ~COMMAND;
15831
- autorepeat = false;
15832
- break;
15833
- default:
15834
- break;
15835
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1583616173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1583716175 break;
15838
- }
16176
+// {
16177
+// switch (e.getKeyCode())
16178
+// {
16179
+// case DOWN_ARROW:
16180
+// case UP_ARROW:
16181
+// case LEFT_ARROW:
16182
+// case RIGHT_ARROW:
16183
+// MODIFIERS &= ~COMMAND;
16184
+// autorepeat = false;
16185
+// break;
16186
+// default:
16187
+// break;
16188
+// }
16189
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
16190
+// break;
16191
+// }
1583916192 default:
1584016193 break;
1584116194 }
....@@ -16411,7 +16764,8 @@
1641116764
1641216765 public boolean mouseDrag(Event evt, int x, int y)
1641316766 {
16414
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1641516769 /*
1641616770 drag = true;
1641716771 //System.out.println("Mouse DRAG");
....@@ -16530,6 +16884,7 @@
1653016884 public boolean mouseUp(Event evt, int x, int y)
1653116885 {
1653216886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1653316888 /*
1653416889 locked = false;
1653516890 if (isRenderer)
....@@ -17237,7 +17592,7 @@
1723717592
1723817593 float depth = depths[y * TEX_SIZE + x];
1723917594
17240
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1724117596 {
1724217597 pointselection = false;
1724317598
....@@ -17901,6 +18256,11 @@
1790118256 static boolean DEBUG_SELECTION = false;
1790218257 boolean OCCLUSION_CULLING = false; //true;
1790318258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1790418264 static public int indexcount = 0;
1790518265 /*static*/ cColor vertexOcclusion = new cColor();
1790618266 //private int selection_view = -1;