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.*;
....@@ -110,7 +111,11 @@
110111 //private Mat4f spotlightTransform = new Mat4f();
111112 //private Mat4f spotlightInverseTransform = new Mat4f();
112113 static GLContext glcontext = null;
113
- /*static*/ com.sun.opengl.util.texture.Texture cubemap;
114
+ /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
115
+ /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
116
+ /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
117
+ boolean transformMode;
118
+
114119 boolean reverseUP = false;
115120 static boolean frozen = false;
116121 boolean enablebackspace = false; // patch for back buffer refresh
....@@ -130,7 +135,7 @@
130135 static boolean ZOOMBOXMODE = false;
131136 static boolean BOXMODE = false;
132137 static boolean IMAGEFLIP = false;
133
-static boolean SMOOTHFOCUS = false;
138
+static boolean SMOOTHFOCUS = true; // false;
134139 static boolean SPEAKERMOCAP = true; // jan 2014 false;
135140 static boolean SPEAKERCAMERA = false;
136141 static boolean SPEAKERFOCUS = false;
....@@ -164,16 +169,16 @@
164169
165170
166171 // OPTIONS
167
- boolean Skinshader = true;
172
+ boolean Skinshader = false; // true;
168173 boolean cameraLight = false;
169174 boolean UVdebug = false;
170175 boolean Udebug = false;
171176 boolean Vdebug = false;
172177 boolean NORMALdebug = false;
173
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
178
+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
174179 boolean anisotropy = true;
175180 boolean softshadow = true; // slower but better false;
176
- boolean opacityhalo = false;
181
+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177182
178183 boolean macromode = false;
179184
....@@ -188,15 +193,16 @@
188193
189194 private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190195
191
- public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
196
+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192197 {
193198 try
194199 {
195
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
200
+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196201 } catch (IOException e)
197202 {
198203 System.out.println("NAME = " + name);
199204 e.printStackTrace(); // throw new RuntimeException(e);
205
+ return null;
200206 }
201207 }
202208
....@@ -216,10 +222,10 @@
216222 cameras = new Camera[2];
217223 targetLookAts = new cVector[2];
218224
219
- SetCamera(cam);
225
+ SetCamera(cam, true);
220226
221227 // Warning: not used.
222
- SetLight(new Camera(new cVector(15, 10, -20)));
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
223229
224230 object = o;
225231
....@@ -537,7 +543,8 @@
537543 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
538544 LA.vecCross(obj.v0, obj.v1, obj.v2);
539545 LA.vecNormalize(obj.v2);
540
- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
546
+
547
+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
541548 }
542549
543550 // P
....@@ -559,7 +566,7 @@
559566 y += ny * obj.NORMALPUSH;
560567 z += nz * obj.NORMALPUSH;
561568
562
- gl.glNormal3f(nx, ny, nz);
569
+ SetGLNormal(gl, nx, ny, nz);
563570 }
564571 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
565572 SetColor(obj, pv);
....@@ -591,7 +598,7 @@
591598 y += ny * obj.NORMALPUSH;
592599 z += nz * obj.NORMALPUSH;
593600
594
- gl.glNormal3f(nx, ny, nz);
601
+ SetGLNormal(gl, nx, ny, nz);
595602 }
596603 //System.out.println("vertexq = " + qv.s + ", " + qv.t);
597604 // boolean locked = false;
....@@ -639,7 +646,7 @@
639646 y += ny * obj.NORMALPUSH;
640647 z += nz * obj.NORMALPUSH;
641648
642
- gl.glNormal3f(nx, ny, nz);
649
+ SetGLNormal(gl, nx, ny, nz);
643650 }
644651
645652 // if ((dot&4) == 0)
....@@ -875,7 +882,7 @@
875882 //// tris.postdraw(this);
876883 }
877884
878
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
879886 static cVector from = new cVector();
880887 static cVector to = new cVector();
881888
....@@ -884,7 +891,7 @@
884891 CameraPane cp = this;
885892
886893 Camera keep = cp.RenderCamera();
887
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
888895
889896 if (br.trimmed)
890897 {
....@@ -902,7 +909,7 @@
902909 br.positions[i3 + 2] + br.normals[i3 + 2]);
903910 LA.xformPos(from, transform, from);
904911 LA.xformPos(to, transform, to); // RIGID ONLY
905
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
906913
907914 CameraPane.occlusionbuffer.display();
908915
....@@ -936,7 +943,7 @@
936943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
937944 LA.xformPos(from, transform, from);
938945 LA.xformPos(to, transform, to); // RIGID ONLY
939
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
940947
941948 CameraPane.occlusionbuffer.display();
942949
....@@ -1245,10 +1252,10 @@
12451252 {
12461253 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12471254 {
1248
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1255
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12491256 } else
12501257 {
1251
- gl.glNormal3f(0, 0, 1);
1258
+ SetGLNormal(gl, 0, 0, 1);
12521259 }
12531260
12541261 if (c != null)
....@@ -1272,10 +1279,10 @@
12721279 {
12731280 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12741281 {
1275
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1282
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12761283 } else
12771284 {
1278
- gl.glNormal3f(0, 0, 1);
1285
+ SetGLNormal(gl, 0, 0, 1);
12791286 }
12801287 if (c != null)
12811288 {
....@@ -1300,10 +1307,10 @@
13001307 {
13011308 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
13021309 {
1303
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1310
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
13041311 } else
13051312 {
1306
- gl.glNormal3f(0, 0, 1);
1313
+ SetGLNormal(gl, 0, 0, 1);
13071314 }
13081315 if (c != null)
13091316 {
....@@ -1485,7 +1492,7 @@
14851492 {
14861493 if (!selectmode)
14871494 {
1488
- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1495
+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
14891496 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14901497
14911498 if (flipV)
....@@ -1814,7 +1821,7 @@
18141821
18151822 display.modelParams7[0] = 0;
18161823 display.modelParams7[1] = 1000;
1817
- display.modelParams7[2] = 0;
1824
+ display.modelParams7[2] = material.parallax;
18181825 display.modelParams7[3] = 0;
18191826
18201827 //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2047,9 +2054,9 @@
20472054 switch(viewcode)
20482055 {
20492056 case 0: return "main";
2050
- case 1: return "one";
2051
- case 2: return "two";
2052
- case 3: return "three";
2057
+ case 1: return "Red";
2058
+ case 2: return "Green";
2059
+ case 3: return "Blue";
20532060 case 4: return "light";
20542061 }
20552062
....@@ -2058,7 +2065,7 @@
20582065
20592066 static int camerachangeframe;
20602067
2061
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
20622069 {
20632070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
20642071 // return false;
....@@ -2076,7 +2083,8 @@
20762083
20772084 camerachangeframe = Globals.framecount;
20782085
2079
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20802088
20812089 cameras[0] = cam;
20822090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2086,11 +2094,14 @@
20862094 {
20872095 cameras[i] = new Camera(cam.viewCode);
20882096 }
2089
-
2090
- cameras[i].setAim(cam.location, cam.lookAt);
2091
- cameras[i].shaper_fovy = cam.shaper_fovy;
2092
- cameras[i].UP.set(cam.UP);
2093
- 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
+ }
20942105 }
20952106 cameracount = 0;
20962107 targetLookAt = targetLookAts[cameracount];
....@@ -2099,7 +2110,7 @@
20992110 // Start with free camera
21002111 SwitchCameras(true);
21012112
2102
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
21032114
21042115 if (TRACKONCE)
21052116 {
....@@ -2286,18 +2297,6 @@
22862297 public void ToggleTrack()
22872298 {
22882299 TRACK ^= true;
2289
- if (TRACK)
2290
- {
2291
- if (object.selection != null &&
2292
- object.selection.size() > 0 &&
2293
- object.selection.elementAt(0) != null &&
2294
- !(object.selection.elementAt(0) instanceof Camera) &&
2295
- !(object.selection.elementAt(0) instanceof ScriptNode))
2296
- {
2297
- trackedobject = object.selection.elementAt(0);
2298
- repaint();
2299
- }
2300
- }
23012300
23022301 repaint();
23032302 }
....@@ -2389,7 +2388,8 @@
23892388 {
23902389 //System.out.println("PROTECTION = " + cam.hAspect);
23912390 //assert (cam.hAspect == 0);
2392
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23932393 lightCamera = cam;
23942394 }
23952395
....@@ -2470,6 +2470,18 @@
24702470 return CreateBim(bytes, width, height);
24712471 }
24722472
2473
+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
2474
+ {
2475
+ gl.glNormal3f(nx, ny, nz);
2476
+
2477
+ if (ny > 0.9 || ny < -0.9)
2478
+ // Ground or ceiling
2479
+ gl.glVertexAttrib3f(4, 1, 0, 0);
2480
+ else
2481
+ // Walls
2482
+ gl.glVertexAttrib3f(4, 0, 1, 0);
2483
+ }
2484
+
24732485 /**/
24742486 class CacheTexture
24752487 {
....@@ -2512,7 +2524,7 @@
25122524 com.sun.opengl.util.texture.TextureIO.newTextureData(
25132525 getClass().getClassLoader().getResourceAsStream(name),
25142526 true,
2515
- com.sun.opengl.util.texture.TextureIO.PNG);
2527
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
25162528 } catch (java.io.IOException e)
25172529 {
25182530 throw new javax.media.opengl.GLException(e);
....@@ -3578,6 +3590,8 @@
35783590 };
35793591 /**/
35803592
3593
+ static Object3D lastObject;
3594
+
35813595 //com.sun.opengl.util.texture.Texture
35823596 TextureData
35833597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3614,6 +3628,8 @@
36143628 // return null;
36153629 //if (i == 2)
36163630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
36173633 e.printStackTrace();
36183634 name = name.split("\\.tif")[0] + ".jpg";
36193635 }
....@@ -6946,30 +6962,30 @@
69466962 short residu = 0;
69476963
69486964 // wraparound workarounds
6949
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
69506966 /*
6951
- residu += (fuck%2);
6952
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
69536969 {
6954
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
69556971 if(residu == 2)
69566972 residu = 0;
69576973 }
69586974 else
69596975 {
69606976 residu = 0;
6961
- fuck /= 2;
6977
+ ww /= 2;
69626978 }
69636979 */
6964
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
69656981 {
6966
- fuck /= 2;
6982
+ ww /= 2;
69676983 } else
69686984 {
6969
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
69706986 }
69716987
6972
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
69736989 }
69746990 //System.out.print(bytes[i] + " ");
69756991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -8358,7 +8374,7 @@
83588374 // else
83598375 // if (!texname.startsWith("/"))
83608376 // texname = "/Users/nbriere/Textures/" + texname;
8361
- if (!FileExists(texname))
8377
+ if (!FileExists(texname) && !texname.startsWith("@"))
83628378 {
83638379 texname = fallbackTextureName;
83648380 }
....@@ -8436,7 +8452,16 @@
84368452 {
84378453 // texturecache = textures.get(texname); // suspicious
84388454 if (texturecache == null)
8439
- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8455
+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
8456
+ else
8457
+ new Exception().printStackTrace();
8458
+ } else
8459
+ {
8460
+ if (texname.startsWith("@") && textureon)
8461
+ {
8462
+ // texturecache = textures.get(texname); // suspicious
8463
+ if (texturecache == null)
8464
+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
84408465 else
84418466 new Exception().printStackTrace();
84428467 } else
....@@ -8500,6 +8525,7 @@
85008525 texturecache = new CacheTexture(texturedata,resolution);
85018526 //texture = GetTexture(tex, bump);
85028527 }
8528
+ }
85038529 }
85048530 //}
85058531 }
....@@ -8614,7 +8640,9 @@
86148640 {
86158641 tex.bw = texturecache.texturedata.getWidth();
86168642 tex.bh = texturecache.texturedata.getHeight();
8617
- 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);
86188646 }
86198647 }
86208648 }
....@@ -8768,10 +8796,12 @@
87688796
87698797 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
87708798 MAXSTACK = temp[0];
8771
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
87728801 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
87738802 MAXSTACK = temp[0];
8774
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8803
+ if (Globals.DEBUG)
8804
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
87758805
87768806 // Use debug pipeline
87778807 //drawable.setGL(new DebugGL(gl)); //
....@@ -8779,7 +8809,8 @@
87798809 gl = drawable.getGL(); //
87808810
87818811 GL gl3 = getGL();
8782
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8812
+ if (Globals.DEBUG)
8813
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
87838814
87848815
87858816 //float pos[] = { 100, 100, 100, 0 };
....@@ -9220,6 +9251,8 @@
92209251
92219252 void LoadEnvy(int which)
92229253 {
9254
+ assert(false);
9255
+
92239256 String name;
92249257 String ext;
92259258
....@@ -9807,7 +9840,10 @@
98079840 DrawSkyBox(gl, (float)rati);
98089841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
98099842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9810
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
98119847 ratio,
98129848 //near_plane, far_plane,
98139849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10670,9 +10706,18 @@
1067010706 static boolean init = false;
1067110707
1067210708 double[][] matrix = LA.newMatrix();
10709
+
10710
+ // This is to refresh the UI of the material panel.
10711
+ ObjEditor patchMaterial;
1067310712
1067410713 public void display(GLAutoDrawable drawable)
1067510714 {
10715
+ if (patchMaterial.patchMaterial)
10716
+ {
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
1067610721 if (Grafreed.savesound && Grafreed.hassound)
1067710722 {
1067810723 Grafreed.wav.save();
....@@ -10768,6 +10813,112 @@
1076810813
1076910814 if (DrawMode() == DEFAULT)
1077010815 {
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
+
1077110922 currentlydrawing = true;
1077210923 }
1077310924
....@@ -10841,7 +10992,7 @@
1084110992
1084210993 if (wait)
1084310994 {
10844
- Sleep(500);
10995
+ Sleep(200); // blocks everything
1084510996
1084610997 wait = false;
1084710998 }
....@@ -11064,18 +11215,34 @@
1106411215 //
1106511216 // newenvy = -1;
1106611217
11067
- if (object.skyboxname != null)
11218
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1106811219 {
11069
- if (!object.skyboxname.equals(this.loadedskyboxname))
11220
+ if (cubemaprgb == null)
1107011221 {
11071
- LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072
- loadedskyboxname = object.skyboxname;
11222
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1107311223 }
11224
+
11225
+ cubemap = cubemaprgb;
1107411226 }
1107511227 else
1107611228 {
11077
- cubemap = null;
11078
- loadedskyboxname = null;
11229
+ if (object.skyboxname != null)
11230
+ {
11231
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11232
+ {
11233
+ if (cubemap != null && cubemap != cubemaprgb)
11234
+ cubemap.dispose();
11235
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11236
+ loadedskyboxname = object.skyboxname;
11237
+ }
11238
+ }
11239
+ else
11240
+ {
11241
+ cubemapcustom = null;
11242
+ loadedskyboxname = null;
11243
+ }
11244
+
11245
+ cubemap = cubemapcustom;
1107911246 }
1108011247
1108111248 ratio = ((double) getWidth()) / getHeight();
....@@ -11276,9 +11443,9 @@
1127611443
1127711444 gl.glMatrixMode(GL.GL_MODELVIEW);
1127811445
11279
-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11280
-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11281
-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);
1128211449 } else
1128311450 {
1128411451 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11339,7 +11506,10 @@
1133911506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1134011507 } else
1134111508 {
11342
- 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());
1134311513 }
1134411514 }
1134511515
....@@ -11695,8 +11865,11 @@
1169511865 repaint();
1169611866 }
1169711867
11698
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1169911871 repaint();
11872
+ }
1170011873
1170111874 displaydone = true;
1170211875 }
....@@ -11771,9 +11944,23 @@
1177111944 //GL gl = getGL();
1177211945 if ((TRACK || SHADOWTRACK) || zoomonce)
1177311946 {
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
+ }
1177411961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1177511962 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11776
- pingthread.StepToTarget(true); // true);
11963
+ pingthread.StepToTarget(); // true);
1177711964 // zoomonce = false;
1177811965 }
1177911966
....@@ -12456,8 +12643,9 @@
1245612643 String programmin =
1245712644 // Min shader
1245812645 "!!ARBfp1.0\n" +
12459
- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12460
- "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 };" +
1246112649 "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1246212650 "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
1246312651 "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
....@@ -12472,10 +12660,11 @@
1247212660 "TEMP eye;" +
1247312661 "TEMP pos;" +
1247412662
12475
- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12663
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
1247612664 Normalize("normal") +
1247712665 "MOV light, state.light[0].position;" +
1247812666 "DP3 ndotl.x, light, normal;" +
12667
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
1247912668
1248012669 // shadow
1248112670 "MOV pos, fragment.texcoord[1];" +
....@@ -12491,7 +12680,7 @@
1249112680 "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1249212681
1249312682 // Backlit
12494
- "MOV pos.w, zero123.y;" +
12683
+ "MOV pos.w, zero12t.y;" + // one
1249512684 "DP4 eye.x, pos, light2cam0;" +
1249612685 "DP4 eye.y, pos, light2cam1;" +
1249712686 "DP4 eye.z, pos, light2cam2;" +
....@@ -12499,24 +12688,28 @@
1249912688
1250012689 "DP3 ndotl.y, -eye, normal;" +
1250112690 //"MUL ndotl.y, ndotl.y, pow2.x;" +
12502
- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12503
- "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
1250412694 //"SUB ndotl.y, zero123.y, ndotl.y;" +
1250512695 //"MUL ndotl.y, ndotl.y, pow2.z;" +
12696
+ "ADD ndotl.y, ndotl.y, one.x;" +
12697
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
1250612698
1250712699 //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
1250812700 //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
1250912701
1251012702 // Pigment
1251112703 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12512
- "LRP temp, zero123.w, temp, one;" + // texture proportion
12513
- "MUL temp, temp, ndotl.x;" +
12514
-
12515
- "MUL temp, temp, zero123.z;" +
12704
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12705
+ "MUL temp, temp, zero12t.w;" + // Times x
1251612706
1251712707 //"MUL temp, temp, ndotl.y;" +
12708
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
1251812709
12519
- "MOV temp.w, zero123.y;" + // reset alpha
12710
+ "MUL temp, temp, ndotl.x;" + // lambert
12711
+
12712
+ "MOV temp.w, zero12t.y;" + // reset alpha
1252012713 "MOV result.color, temp;" +
1252112714 "END";
1252212715
....@@ -12548,7 +12741,7 @@
1254812741 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1254912742 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1255012743 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12551
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12744
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1255212745 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1255312746 "PARAM options1 = program.env[62];" + // fog rgb color
1255412747 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12793,7 +12986,7 @@
1279312986 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1279412987 // mar 2013 ??? "KIL alpha.a;" +
1279512988 "MOV alpha, texSamp.aaaa;" + // y;" +
12796
- "KIL alpha.a;" +
12989
+ "KIL alpha.a;" + // not sure with parallax mapping
1279712990 /*
1279812991 "MUL temp.xy, temp, two;" +
1279912992 "TXB bump, temp, texture[0], 2D;" +
....@@ -12879,11 +13072,6 @@
1287913072 "SUB bump0, bump0, half;" +
1288013073 "ADD bump, bump, bump0;" +
1288113074
12882
- "MOV temp.x, texSamp.a;" +
12883
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12884
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12885
- "MOV texSamp.a, temp.x;" +
12886
-
1288713075 // double-sided
1288813076 /**/
1288913077 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12893,26 +13081,73 @@
1289313081 "ADD temp.x, temp.x, one.x;" +
1289413082 "MUL normal, normal, temp.xxxx;":""
1289513083 ) +
12896
- /**/
12897
-//// Normalize("normal") +
12898
-//// "MAX normal.z, eps.x, normal.z;" +
12899
-// Normalize("normal") +
12900
- "MOV normald, normal;" +
12901
- "MOV normals, normal;" +
13084
+ /**/
13085
+
13086
+ "MOV temp, fragment.texcoord[4];" +
1290213087
1290313088 // UV base
1290413089 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1290513090 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1290613091 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12907
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12908
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12909
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
13092
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
13093
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
13094
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
13095
+ Normalize("UP") +
13096
+
1291013097 "XPD V, normal, UP;" +
1291113098 Normalize("V") +
1291213099 "XPD U, V, normal;" +
1291313100 Normalize("U") +
1291413101
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
+
1291513113 // parallax mapping
13114
+
13115
+ "DP3 temp2.x, V, eye;" +
13116
+ "DP3 temp2.y, U, eye;" +
13117
+ "DP3 temp2.z, normal, eye;" +
13118
+ "RCP temp2.z, temp2.z;" +
13119
+
13120
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
13121
+ "RSQ temp2.w, temp2.w;" +
13122
+ "RCP temp2.w, temp2.w;" +
13123
+
13124
+ "SUB temp2.w, temp2.w, half;" +
13125
+ // "SGE temp.x, temp2.w, eps.x;" +
13126
+ // "MUL temp2.w, temp2.w, temp.x;" +
13127
+
13128
+ // "MOV texSamp, U;" +
13129
+
13130
+ "MUL temp2.z, temp2.z, temp2.w;" +
13131
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
13132
+
13133
+ "MUL temp2, temp2, temp2.z;" +
13134
+
13135
+ "SUB temp, temp, temp2;" +
13136
+
13137
+ "TEX temp, temp, texture[0], 2D;" +
13138
+ "POW temp.a, temp.a, params6.w;" + // punch through
13139
+
13140
+ "ADD texSamp, temp, texSamp;" +
13141
+ "MUL texSamp.xyz, half, texSamp;" +
13142
+
13143
+ "MOV alpha, texSamp.aaaa;" +
13144
+
13145
+// parallax mapping
13146
+
13147
+ "MOV temp.x, texSamp.a;" +
13148
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13149
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
13150
+ "MOV texSamp.a, temp.x;" +
1291613151
1291713152 //"MOV temp, fragment.texcoord[0];" +
1291813153 //
....@@ -13383,8 +13618,12 @@
1338313618 program = programmin;
1338413619 }
1338513620
13386
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13387
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13621
+ if (Globals.DEBUG)
13622
+ {
13623
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13624
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13625
+ }
13626
+
1338813627 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1338913628
1339013629 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13431,7 +13670,8 @@
1343113670 "\n" +
1343213671 "END\n";
1343313672
13434
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13673
+ if (Globals.DEBUG)
13674
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1343513675 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1343613676
1343713677 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13689,7 +13929,7 @@
1368913929 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1369013930 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1369113931 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13692
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13932
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1369313933
1369413934 //Object3D.cVector2[] vector2buffer;
1369513935
....@@ -13856,7 +14096,7 @@
1385614096 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1385714097 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1385814098 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13859
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14099
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1386014100 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1386114101 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1386214102 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13917,7 +14157,7 @@
1391714157 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1391814158 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1391914159 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13920
- //"MOV result.texcoord, vertex.texcoord;" +
14160
+ //"MOV result.texcoord, vertex.fogcoord;" +
1392114161 "MOV result.texcoord, temp;" +
1392214162 // border fade
1392314163 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13964,7 +14204,9 @@
1396414204
1396514205 //"ADD temp.z, temp.z, one;" +
1396614206
13967
- "MOV result.color, temp;"
14207
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14208
+
14209
+ "MOV result.color, temp;" // Normal
1396814210 : "MOV result.color, vertex.color;") +
1396914211 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1397014212 : "") +
....@@ -14099,10 +14341,13 @@
1409914341 public void mouseClicked(MouseEvent e)
1410014342 {
1410114343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1410214345 }
1410314346
1410414347 public void mousePressed(MouseEvent e)
1410514348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1410614351 //System.out.println("mousePressed: " + e);
1410714352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1410814353 }
....@@ -14137,10 +14382,12 @@
1413714382 return;
1413814383 }
1413914384
14140
- 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;
1414114388
1414214389 // TIMER
14143
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1414414391 {
1414514392 keepboxmode = BOXMODE;
1414614393 keepsupport = SUPPORT;
....@@ -14181,7 +14428,7 @@
1418114428 //}
1418214429
1418314430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
14184
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1418514432 anchorX = ax;
1418614433 anchorY = ay;
1418714434 prevX = px;
....@@ -14276,8 +14523,9 @@
1427614523 // fev 2014???
1427714524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
1427814525 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14279
- pingthread.StepToTarget(true); // true);
14526
+ pingthread.StepToTarget(); // true);
1428014527 }
14528
+
1428114529 // if (!LIVE)
1428214530 super.repaint();
1428314531 }
....@@ -14372,8 +14620,8 @@
1437214620
1437314621 //if (drawing)
1437414622 //return;
14375
- if ((e.getModifiersEx() & CTRL) != 0
14376
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1437714625 {
1437814626 //System.out.println("mouseDragged: " + e);
1437914627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14397,9 +14645,17 @@
1439714645 return targetLookAt;
1439814646 }
1439914647
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
+
1440014653 class PingThread extends Thread
1440114654 {
1440214655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute;
1440314659
1440414660 // void JumpToTarget()
1440514661 // {
....@@ -14415,6 +14671,88 @@
1441514671 // only one thread!? synchronized
1441614672 void StepToTarget(boolean jump)
1441714673 {
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
+
1441814756 tmp.set(targetLookAt);
1441914757 tmp.sub(manipCamera.lookAt); // june 2014
1442014758
....@@ -14452,7 +14790,7 @@
1445214790
1445314791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1445414792 {
14455
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1445614794 }
1445714795
1445814796 if (OEILONCE && OEIL)
....@@ -14487,7 +14825,10 @@
1448714825 if (tmp.dot(tmp) < 0.00001)
1448814826 {
1448914827 zoomonce = false;
14828
+ live = false;
1449014829 }
14830
+ else
14831
+ live = true;
1449114832
1449214833 tmp.mul(step > step2 ? step : step2);
1449314834 }
....@@ -14514,7 +14855,7 @@
1451414855 {
1451514856 if (LOOKAT)
1451614857 manipCamera.lookAt.add(tmp);
14517
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1451814859 manipCamera.location.add(tmp);
1451914860
1452014861 {
....@@ -14529,7 +14870,10 @@
1452914870 lightCamera.computeTransform();
1453014871 }
1453114872 }
14532
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1453314877 }
1453414878 // ?????? mouseDown = true;
1453514879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14622,49 +14966,107 @@
1462214966 }
1462314967 }
1462414968 }
14969
+
1462514970 PingThread pingthread = new PingThread();
14626
- int delta = 5;
14627
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1462814974 boolean autorepeat = false;
1462914975
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
+
1463014995 void GoDown(int mod)
1463114996 {
1463214997 MODIFIERS |= COMMAND;
14998
+ boolean isVR = (mouseMode&VR)!=0;
1463314999 /**/
1463415000 if((mod&SHIFT) == SHIFT)
14635
- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14636
- else
14637
- manipCamera.RotatePosition(0, -speed);
14638
- /**/
14639
- if ((mod & SHIFT) == SHIFT)
1464015001 {
14641
- mouseMode = mouseMode; // VR??
14642
- } else
14643
- {
14644
- mouseMode |= BACKFORTH;
15002
+// if (isVR)
15003
+// manipCamera.RotateInterest(0, speed);
15004
+// else
15005
+ if (isVR)
15006
+ ViewAngle(-speed*delta);
15007
+ else
15008
+ manipCamera.Translate(0, -speed*delta, getWidth());
1464515009 }
15010
+ else
15011
+ {
15012
+ if (isVR)
15013
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15014
+ else
15015
+ manipCamera.RotatePosition(0, -speed);
15016
+ }
15017
+
15018
+ /**/
15019
+// if ((mod & SHIFT) == SHIFT)
15020
+// {
15021
+// mouseMode = mouseMode; // VR??
15022
+// } else
15023
+// {
15024
+// mouseMode |= BACKFORTH;
15025
+// }
1464615026
15027
+ targetLookAt.set(manipCamera.lookAt);
15028
+
1464715029 //prevX = X = anchorX;
1464815030 prevY = Y = anchorY - (int) (renderCamera.Distance());
1464915031 }
1465015032
1465115033 void GoUp(int mod)
1465215034 {
15035
+ RigidBody.justclicked = true;
15036
+
1465315037 MODIFIERS |= COMMAND;
1465415038 /**/
15039
+ boolean isVR = (mouseMode&VR)!=0;
15040
+
1465515041 if((mod&SHIFT) == SHIFT)
14656
- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14657
- else
14658
- manipCamera.RotatePosition(0, speed);
14659
- /**/
14660
- if ((mod & SHIFT) == SHIFT)
1466115042 {
14662
- mouseMode = mouseMode;
14663
- } else
14664
- {
14665
- mouseMode |= BACKFORTH;
15043
+// if (isVR)
15044
+// manipCamera.RotateInterest(0, -speed);
15045
+// else
15046
+ if (isVR)
15047
+ ViewAngle(speed*delta);
15048
+ else
15049
+ manipCamera.Translate(0, speed*delta, getWidth());
1466615050 }
15051
+ else
15052
+ {
15053
+ if (isVR)
15054
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15055
+ else
15056
+ manipCamera.RotatePosition(0, speed);
15057
+ }
15058
+
15059
+ /**/
15060
+// if ((mod & SHIFT) == SHIFT)
15061
+// {
15062
+// mouseMode = mouseMode;
15063
+// } else
15064
+// {
15065
+// mouseMode |= BACKFORTH;
15066
+// }
1466715067
15068
+ targetLookAt.set(manipCamera.lookAt);
15069
+
1466815070 //prevX = X = anchorX;
1466915071 prevY = Y = anchorY + (int) (renderCamera.Distance());
1467015072 }
....@@ -14674,18 +15076,29 @@
1467415076 MODIFIERS |= COMMAND;
1467515077 /**/
1467615078 if((mod&SHIFT) == SHIFT)
14677
- manipCamera.Translate(speed*delta, 0, getWidth());
15079
+ manipCamera.Translate(speed, 0, getWidth());
1467815080 else
14679
- manipCamera.RotatePosition(speed, 0);
15081
+ {
15082
+ if ((mouseMode&VR)!=0)
15083
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
15084
+ else
15085
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
15086
+ }
15087
+
1468015088 /**/
14681
- if ((mod & SHIFT) == SHIFT)
14682
- {
14683
- mouseMode = mouseMode;
14684
- } else
14685
- {
14686
- mouseMode |= ROTATE;
14687
- } // TRANSLATE;
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1468815096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
15100
+ targetLookAt.set(manipCamera.lookAt);
15101
+
1468915102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1469015103 prevY = Y = anchorY;
1469115104 }
....@@ -14695,18 +15108,26 @@
1469515108 MODIFIERS |= COMMAND;
1469615109 /**/
1469715110 if((mod&SHIFT) == SHIFT)
14698
- manipCamera.Translate(-speed*delta, 0, getWidth());
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1469915112 else
14700
- manipCamera.RotatePosition(-speed, 0);
15113
+ {
15114
+ if ((mouseMode&VR)!=0)
15115
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
15116
+ else
15117
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
15118
+ }
15119
+
1470115120 /**/
14702
- if ((mod & SHIFT) == SHIFT)
14703
- {
14704
- mouseMode = mouseMode;
14705
- } else
14706
- {
14707
- mouseMode |= ROTATE;
14708
- } // TRANSLATE;
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1470915128
15129
+ targetLookAt.set(manipCamera.lookAt);
15130
+
1471015131 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1471115132 prevY = Y = anchorY;
1471215133 }
....@@ -14840,6 +15261,11 @@
1484015261 if ((mouseMode & ZOOM) != 0)
1484115262 {
1484215263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1484315269 if ((mouseMode & VR) != 0)
1484415270 manipCamera.BackForth(dx, dy, getWidth());
1484515271 else
....@@ -14910,6 +15336,9 @@
1491015336
1491115337 public void mouseMoved(MouseEvent e)
1491215338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1491315342 //System.out.println("mouseMoved: " + e);
1491415343 if (isRenderer)
1491515344 return;
....@@ -15094,8 +15523,10 @@
1509415523 mouseMode |= ZOOM;
1509515524 }
1509615525
15097
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15098
- 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)
1509915530 {
1510015531 mouseMode |= VR; // BACKFORTH;
1510115532 }
....@@ -15107,7 +15538,8 @@
1510715538 {
1510815539 mouseMode |= SELECT;
1510915540 }
15110
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1511115543 {
1511215544 mouseMode &= ~VR;
1511315545 mouseMode |= TRANSLATE;
....@@ -15151,8 +15583,18 @@
1515115583 float SATPOW = 1; // 2; // 0.5f;
1515215584 float BRIPOW = 1; // 0.5f; // 0.5f;
1515315585
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
+
1515415592 public void keyPressed(int key)
1515515593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1515615598 if (key >= '0' && key <= '5')
1515715599 clampbit = (key-'0');
1515815600
....@@ -15209,8 +15651,8 @@
1520915651 case 'K':
1521015652 KOMPACTTEXTURE ^= true;
1521115653 //textures.clear();
15212
- break;
15213
- case 'P': // Texture Projection macros
15654
+ // break;
15655
+ //case 'P': // Texture Projection macros
1521415656 // SAVETEXTURE ^= true;
1521515657 macromode = true;
1521615658 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15311,8 +15753,8 @@
1531115753 RevertCamera();
1531215754 repaint();
1531315755 break;
15314
- case 'l':
15315
- //case 'L':
15756
+ //case 'l':
15757
+ case 'L':
1531615758 if (lightMode)
1531715759 {
1531815760 lightMode = false;
....@@ -15331,7 +15773,7 @@
1533115773 targetLookAt.set(manipCamera.lookAt);
1533215774 repaint();
1533315775 break;
15334
- case 'p':
15776
+ case 'P': // p':
1533515777 // c'est quoi ca au juste? spherical ^= true;
1533615778 Skinshader ^= true; programInitialized = false;
1533715779 repaint();
....@@ -15342,7 +15784,8 @@
1534215784 break;
1534315785 case 'm':
1534415786 {
15345
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1534615789 break;
1534715790 }
1534815791 case 'M':
....@@ -15369,9 +15812,9 @@
1536915812 repaint();
1537015813 break;
1537115814 case 'O':
15372
- Globals.drawMode = OCCLUSION; // WARNING
15373
- repaint();
15374
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1537515818 case 'o':
1537615819 OCCLUSION_CULLING ^= true;
1537715820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
....@@ -15463,7 +15906,21 @@
1546315906 // kompactbit = 6;
1546415907 // break;
1546515908 case ' ':
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
1546615913 lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
1546715924 Globals.lighttouched = true;
1546815925 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1546915926 targetLookAt.set(manipCamera.lookAt);
....@@ -15471,6 +15928,10 @@
1547115928 break;
1547215929 //case '`' :
1547315930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1547415935 RENDERPROGRAM += 1;
1547515936 RENDERPROGRAM %= 3;
1547615937
....@@ -15509,6 +15970,10 @@
1550915970 case ENTER:
1551015971 // object.editWindow.ScreenFit(); // Edit();
1551115972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1551215977 break;
1551315978 case DELETE:
1551415979 ClearSelection();
....@@ -15545,17 +16010,23 @@
1554516010 object.GetWindow().refreshContents(true);
1554616011 break;
1554716012 case '{':
15548
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1554916016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1555016017 repaint();
1555116018 break;
1555216019 case '}':
15553
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1555416023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1555516024 repaint();
1555616025 break;
1555716026 case '[':
15558
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1555916030 if (false) //manipCamera.hAspect == 0)
1556016031 {
1556116032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15571,7 +16042,9 @@
1557116042 break;
1557216043 case ']':
1557316044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15574
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1557516048 if (false) //manipCamera.hAspect == 0)
1557616049 {
1557716050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15609,98 +16082,113 @@
1560916082 }
1561016083 }
1561116084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1561216089 public void processKeyEvent(KeyEvent e)
1561316090 {
1561416091 switch (e.getID())
1561516092 {
1561616093 case KeyEvent.KEY_PRESSED:
15617
- if (!autorepeat)
15618
- {
15619
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15620
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15621
- }
15622
- if (manipCamera == lightCamera)
15623
- {
15624
- switch (e.getKeyCode())
15625
- {
15626
- case DOWN_ARROW:
15627
- lightCamera.DECAL /= 2;
15628
- repaint();
15629
- break;
15630
- case UP_ARROW:
15631
- lightCamera.DECAL *= 2;
15632
- repaint();
15633
- break;
15634
- case LEFT_ARROW:
15635
- lightCamera.SCALE /= 2;
15636
- repaint();
15637
- break;
15638
- case RIGHT_ARROW:
15639
- lightCamera.SCALE *= 2;
15640
- repaint();
15641
- break;
15642
- default:
15643
- break;
15644
- }
15645
-
15646
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15647
- } else
15648
- {
15649
- if (true) // !autorepeat)
15650
- {
15651
- boolean reset = true;
15652
-
15653
- switch (e.getKeyCode())
15654
- {
15655
- case DOWN_ARROW:
15656
- GoDown(e.getModifiersEx());
15657
- repaint();
15658
- break;
15659
- case UP_ARROW:
15660
- GoUp(e.getModifiersEx());
15661
- repaint();
15662
- break;
15663
- case LEFT_ARROW:
15664
- GoLeft(e.getModifiersEx());
15665
- repaint();
15666
- break;
15667
- case RIGHT_ARROW:
15668
- GoRight(e.getModifiersEx());
15669
- repaint();
15670
- break;
15671
- default:
15672
- reset = false;
15673
- break;
15674
- }
15675
-
15676
- if (reset)
15677
- {
15678
- autorepeat = true;
15679
-
15680
- targetLookAt.set(manipCamera.lookAt);
15681
- }
15682
- }
15683
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1568416099 break;
15685
- case KeyEvent.KEY_TYPED:
15686
- 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;
1568716170 case KeyEvent.KEY_RELEASED:
15688
- {
15689
- switch (e.getKeyCode())
15690
- {
15691
- case DOWN_ARROW:
15692
- case UP_ARROW:
15693
- case LEFT_ARROW:
15694
- case RIGHT_ARROW:
15695
- MODIFIERS &= ~COMMAND;
15696
- autorepeat = false;
15697
- break;
15698
- default:
15699
- break;
15700
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1570116173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1570216175 break;
15703
- }
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
+// }
1570416192 default:
1570516193 break;
1570616194 }
....@@ -16091,7 +16579,7 @@
1609116579 {
1609216580 switch (hitSomething)
1609316581 {
16094
- case Object3D.hitCenter: gr.setColor(Color.pink);
16582
+ case Object3D.hitCenter: gr.setColor(Color.white);
1609516583 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1609616584 break;
1609716585 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16117,7 +16605,7 @@
1611716605 if (hasMarquee)
1611816606 {
1611916607 gr.setXORMode(Color.white);
16120
- gr.setColor(Color.red);
16608
+ gr.setColor(Color.white);
1612116609 if (!firstime)
1612216610 {
1612316611 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16276,7 +16764,8 @@
1627616764
1627716765 public boolean mouseDrag(Event evt, int x, int y)
1627816766 {
16279
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1628016769 /*
1628116770 drag = true;
1628216771 //System.out.println("Mouse DRAG");
....@@ -16395,6 +16884,7 @@
1639516884 public boolean mouseUp(Event evt, int x, int y)
1639616885 {
1639716886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1639816888 /*
1639916889 locked = false;
1640016890 if (isRenderer)
....@@ -16657,6 +17147,7 @@
1665717147 private void DrawSkyBox(GL gl, float ratio)
1665817148 {
1665917149 if (//envyoff ||
17150
+ WIREFRAME ||
1666017151 cubemap == null)
1666117152 {
1666217153 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
....@@ -16755,7 +17246,8 @@
1675517246 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1675617247
1675717248 cubemap.disable();
16758
- ////cubemap.unbind();
17249
+ //cubemap.dispose();
17250
+
1675917251 if (CULLFACE)
1676017252 {
1676117253 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16811,7 +17303,7 @@
1681117303 gl.glScalef(1.0f, -1.0f, 1.0f);
1681217304 }
1681317305
16814
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17306
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1681517307
1681617308 float step = 2; // 0.1666f; //0.25f;
1681717309 float stepv = 2; // step * 1652 / 998;
....@@ -17100,7 +17592,7 @@
1710017592
1710117593 float depth = depths[y * TEX_SIZE + x];
1710217594
17103
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1710417596 {
1710517597 pointselection = false;
1710617598
....@@ -17291,6 +17783,7 @@
1729117783
1729217784 public void init(GLAutoDrawable drawable)
1729317785 {
17786
+ if (Globals.DEBUG)
1729417787 System.out.println("shadow buffer init");
1729517788
1729617789 GL gl = drawable.getGL();
....@@ -17519,10 +18012,14 @@
1751918012 gl.glFlush();
1752018013
1752118014 /**/
17522
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
18015
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1752318016
17524
- float[] pixels = occlusionsizebuffer.array();
18017
+ float[] depths = occlusiondepthbuffer.array();
1752518018
18019
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
18020
+
18021
+ int[] pixels = selectsizebuffer.array();
18022
+
1752618023 double r = 0, g = 0, b = 0;
1752718024
1752818025 double count = 0;
....@@ -17533,7 +18030,7 @@
1753318030
1753418031 double FACTOR = 1;
1753518032
17536
- for (int i = 0; i < pixels.length; i++)
18033
+ for (int i = 0; i < depths.length; i++)
1753718034 {
1753818035 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1753918036 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17616,7 +18113,7 @@
1761618113
1761718114 double scale = ray.z; // 1; // cos
1761818115
17619
- float depth = pixels[newindex];
18116
+ float depth = depths[newindex];
1762018117
1762118118 /*
1762218119 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17759,6 +18256,11 @@
1775918256 static boolean DEBUG_SELECTION = false;
1776018257 boolean OCCLUSION_CULLING = false; //true;
1776118258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1776218264 static public int indexcount = 0;
1776318265 /*static*/ cColor vertexOcclusion = new cColor();
1776418266 //private int selection_view = -1;
....@@ -17813,11 +18315,14 @@
1781318315 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1781418316 static IntBuffer bigAAbuffer;
1781518317 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17816
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18318
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1781718319 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781818320 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781918321 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17820
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18322
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18323
+
18324
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18325
+
1782118326 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1782218327 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1782318328 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();