Normand Briere
2019-10-04 57c5b6cd8d12ffdaa3e0b099451e3c031012750a
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
....@@ -119,7 +124,7 @@
119124 static boolean LOCALTRANSFORM = false;
120125 static boolean FULLSCREEN = false;
121126 static boolean SUPPORT = true;
122
-static boolean INERTIA = true;
127
+static boolean INERTIA = false; // true;
123128 static boolean FAST = false;
124129 static boolean SLOWPOSE = false;
125130 static boolean FOOTCONTACT = true;
....@@ -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
....@@ -187,6 +192,19 @@
187192 }
188193
189194 private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
195
+
196
+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
197
+ {
198
+ try
199
+ {
200
+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
201
+ } catch (IOException e)
202
+ {
203
+ System.out.println("NAME = " + name);
204
+ e.printStackTrace(); // throw new RuntimeException(e);
205
+ return null;
206
+ }
207
+ }
190208
191209 void SetAsGLRenderer(boolean b)
192210 {
....@@ -204,9 +222,10 @@
204222 cameras = new Camera[2];
205223 targetLookAts = new cVector[2];
206224
207
- SetCamera(cam);
225
+ SetCamera(cam, true);
208226
209
- SetLight(new Camera(new cVector(10, 10, -20)));
227
+ // Warning: not used.
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
210229
211230 object = o;
212231
....@@ -231,7 +250,7 @@
231250
232251 public javax.media.opengl.GL GetGL0()
233252 {
234
- return null;
253
+ return currentGL;
235254 }
236255
237256 public int GenList()
....@@ -524,7 +543,8 @@
524543 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
525544 LA.vecCross(obj.v0, obj.v1, obj.v2);
526545 LA.vecNormalize(obj.v2);
527
- 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);
528548 }
529549
530550 // P
....@@ -546,7 +566,7 @@
546566 y += ny * obj.NORMALPUSH;
547567 z += nz * obj.NORMALPUSH;
548568
549
- gl.glNormal3f(nx, ny, nz);
569
+ SetGLNormal(gl, nx, ny, nz);
550570 }
551571 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
552572 SetColor(obj, pv);
....@@ -578,7 +598,7 @@
578598 y += ny * obj.NORMALPUSH;
579599 z += nz * obj.NORMALPUSH;
580600
581
- gl.glNormal3f(nx, ny, nz);
601
+ SetGLNormal(gl, nx, ny, nz);
582602 }
583603 //System.out.println("vertexq = " + qv.s + ", " + qv.t);
584604 // boolean locked = false;
....@@ -626,7 +646,7 @@
626646 y += ny * obj.NORMALPUSH;
627647 z += nz * obj.NORMALPUSH;
628648
629
- gl.glNormal3f(nx, ny, nz);
649
+ SetGLNormal(gl, nx, ny, nz);
630650 }
631651
632652 // if ((dot&4) == 0)
....@@ -862,7 +882,7 @@
862882 //// tris.postdraw(this);
863883 }
864884
865
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
866886 static cVector from = new cVector();
867887 static cVector to = new cVector();
868888
....@@ -871,7 +891,7 @@
871891 CameraPane cp = this;
872892
873893 Camera keep = cp.RenderCamera();
874
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
875895
876896 if (br.trimmed)
877897 {
....@@ -889,7 +909,7 @@
889909 br.positions[i3 + 2] + br.normals[i3 + 2]);
890910 LA.xformPos(from, transform, from);
891911 LA.xformPos(to, transform, to); // RIGID ONLY
892
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
893913
894914 CameraPane.occlusionbuffer.display();
895915
....@@ -923,7 +943,7 @@
923943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
924944 LA.xformPos(from, transform, from);
925945 LA.xformPos(to, transform, to); // RIGID ONLY
926
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
927947
928948 CameraPane.occlusionbuffer.display();
929949
....@@ -1232,10 +1252,10 @@
12321252 {
12331253 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12341254 {
1235
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1255
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12361256 } else
12371257 {
1238
- gl.glNormal3f(0, 0, 1);
1258
+ SetGLNormal(gl, 0, 0, 1);
12391259 }
12401260
12411261 if (c != null)
....@@ -1259,10 +1279,10 @@
12591279 {
12601280 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12611281 {
1262
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1282
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12631283 } else
12641284 {
1265
- gl.glNormal3f(0, 0, 1);
1285
+ SetGLNormal(gl, 0, 0, 1);
12661286 }
12671287 if (c != null)
12681288 {
....@@ -1287,10 +1307,10 @@
12871307 {
12881308 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12891309 {
1290
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1310
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12911311 } else
12921312 {
1293
- gl.glNormal3f(0, 0, 1);
1313
+ SetGLNormal(gl, 0, 0, 1);
12941314 }
12951315 if (c != null)
12961316 {
....@@ -1472,7 +1492,7 @@
14721492 {
14731493 if (!selectmode)
14741494 {
1475
- 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);
14761496 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14771497
14781498 if (flipV)
....@@ -1484,6 +1504,8 @@
14841504 gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14851505 }
14861506
1507
+ float[] colorV = new float[4];
1508
+
14871509 void SetColor(Object3D obj, Vertex p0)
14881510 {
14891511 CameraPane display = this;
....@@ -1508,7 +1530,7 @@
15081530 }
15091531 }
15101532 float b = 0;
1511
- if (obj.support != null && obj.link2master)
1533
+ if (obj.support != null && obj.Link2Support())
15121534 {
15131535 b = 1;
15141536 }
....@@ -1551,8 +1573,6 @@
15511573 {
15521574 return;
15531575 }
1554
-
1555
- float[] colorV = new float[3];
15561576
15571577 if (false) // marked)
15581578 {
....@@ -1801,7 +1821,7 @@
18011821
18021822 display.modelParams7[0] = 0;
18031823 display.modelParams7[1] = 1000;
1804
- display.modelParams7[2] = 0;
1824
+ display.modelParams7[2] = material.parallax;
18051825 display.modelParams7[3] = 0;
18061826
18071827 //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2034,9 +2054,9 @@
20342054 switch(viewcode)
20352055 {
20362056 case 0: return "main";
2037
- case 1: return "one";
2038
- case 2: return "two";
2039
- case 3: return "three";
2057
+ case 1: return "Red";
2058
+ case 2: return "Green";
2059
+ case 3: return "Blue";
20402060 case 4: return "light";
20412061 }
20422062
....@@ -2045,7 +2065,7 @@
20452065
20462066 static int camerachangeframe;
20472067
2048
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
20492069 {
20502070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
20512071 // return false;
....@@ -2063,7 +2083,8 @@
20632083
20642084 camerachangeframe = Globals.framecount;
20652085
2066
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20672088
20682089 cameras[0] = cam;
20692090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2073,11 +2094,14 @@
20732094 {
20742095 cameras[i] = new Camera(cam.viewCode);
20752096 }
2076
-
2077
- cameras[i].setAim(cam.location, cam.lookAt);
2078
- cameras[i].shaper_fovy = cam.shaper_fovy;
2079
- cameras[i].UP.set(cam.UP);
2080
- 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
+ }
20812105 }
20822106 cameracount = 0;
20832107 targetLookAt = targetLookAts[cameracount];
....@@ -2086,7 +2110,7 @@
20862110 // Start with free camera
20872111 SwitchCameras(true);
20882112
2089
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
20902114
20912115 if (TRACKONCE)
20922116 {
....@@ -2273,18 +2297,6 @@
22732297 public void ToggleTrack()
22742298 {
22752299 TRACK ^= true;
2276
- if (TRACK)
2277
- {
2278
- if (object.selection != null &&
2279
- object.selection.size() > 0 &&
2280
- object.selection.elementAt(0) != null &&
2281
- !(object.selection.elementAt(0) instanceof Camera) &&
2282
- !(object.selection.elementAt(0) instanceof ScriptNode))
2283
- {
2284
- trackedobject = object.selection.elementAt(0);
2285
- repaint();
2286
- }
2287
- }
22882300
22892301 repaint();
22902302 }
....@@ -2376,7 +2388,8 @@
23762388 {
23772389 //System.out.println("PROTECTION = " + cam.hAspect);
23782390 //assert (cam.hAspect == 0);
2379
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23802393 lightCamera = cam;
23812394 }
23822395
....@@ -2457,6 +2470,18 @@
24572470 return CreateBim(bytes, width, height);
24582471 }
24592472
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
+
24602485 /**/
24612486 class CacheTexture
24622487 {
....@@ -2499,7 +2524,7 @@
24992524 com.sun.opengl.util.texture.TextureIO.newTextureData(
25002525 getClass().getClassLoader().getResourceAsStream(name),
25012526 true,
2502
- com.sun.opengl.util.texture.TextureIO.PNG);
2527
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
25032528 } catch (java.io.IOException e)
25042529 {
25052530 throw new javax.media.opengl.GLException(e);
....@@ -3565,6 +3590,8 @@
35653590 };
35663591 /**/
35673592
3593
+ static Object3D lastObject;
3594
+
35683595 //com.sun.opengl.util.texture.Texture
35693596 TextureData
35703597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3601,6 +3628,8 @@
36013628 // return null;
36023629 //if (i == 2)
36033630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
36043633 e.printStackTrace();
36053634 name = name.split("\\.tif")[0] + ".jpg";
36063635 }
....@@ -6933,30 +6962,30 @@
69336962 short residu = 0;
69346963
69356964 // wraparound workarounds
6936
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
69376966 /*
6938
- residu += (fuck%2);
6939
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
69406969 {
6941
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
69426971 if(residu == 2)
69436972 residu = 0;
69446973 }
69456974 else
69466975 {
69476976 residu = 0;
6948
- fuck /= 2;
6977
+ ww /= 2;
69496978 }
69506979 */
6951
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
69526981 {
6953
- fuck /= 2;
6982
+ ww /= 2;
69546983 } else
69556984 {
6956
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
69576986 }
69586987
6959
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
69606989 }
69616990 //System.out.print(bytes[i] + " ");
69626991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -8345,7 +8374,7 @@
83458374 // else
83468375 // if (!texname.startsWith("/"))
83478376 // texname = "/Users/nbriere/Textures/" + texname;
8348
- if (!FileExists(texname))
8377
+ if (!FileExists(texname) && !texname.startsWith("@"))
83498378 {
83508379 texname = fallbackTextureName;
83518380 }
....@@ -8423,7 +8452,16 @@
84238452 {
84248453 // texturecache = textures.get(texname); // suspicious
84258454 if (texturecache == null)
8426
- 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);
84278465 else
84288466 new Exception().printStackTrace();
84298467 } else
....@@ -8487,6 +8525,7 @@
84878525 texturecache = new CacheTexture(texturedata,resolution);
84888526 //texture = GetTexture(tex, bump);
84898527 }
8528
+ }
84908529 }
84918530 //}
84928531 }
....@@ -8601,7 +8640,9 @@
86018640 {
86028641 tex.bw = texturecache.texturedata.getWidth();
86038642 tex.bh = texturecache.texturedata.getHeight();
8604
- 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);
86058646 }
86068647 }
86078648 }
....@@ -8755,10 +8796,12 @@
87558796
87568797 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
87578798 MAXSTACK = temp[0];
8758
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
87598801 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
87608802 MAXSTACK = temp[0];
8761
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8803
+ if (Globals.DEBUG)
8804
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
87628805
87638806 // Use debug pipeline
87648807 //drawable.setGL(new DebugGL(gl)); //
....@@ -8766,7 +8809,8 @@
87668809 gl = drawable.getGL(); //
87678810
87688811 GL gl3 = getGL();
8769
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8812
+ if (Globals.DEBUG)
8813
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
87708814
87718815
87728816 //float pos[] = { 100, 100, 100, 0 };
....@@ -8931,7 +8975,7 @@
89318975
89328976 if (cubemap == null)
89338977 {
8934
- LoadEnvy(5);
8978
+ //LoadEnvy(1);
89358979 }
89368980
89378981 //cubemap.enable();
....@@ -9207,6 +9251,8 @@
92079251
92089252 void LoadEnvy(int which)
92099253 {
9254
+ assert(false);
9255
+
92109256 String name;
92119257 String ext;
92129258
....@@ -9218,37 +9264,58 @@
92189264 cubemap = null;
92199265 return;
92209266 case 1:
9221
- name = "cubemaps/box_";
9222
- ext = "png";
9267
+ name = "cubemaps/rgb/";
9268
+ ext = "jpg";
92239269 reverseUP = false;
92249270 break;
92259271 case 2:
9226
- name = "cubemaps/uffizi_";
9227
- ext = "png";
9228
- break; // reverseUP = true; break;
9272
+ name = "cubemaps/uffizi/";
9273
+ ext = "jpg";
9274
+ reverseUP = false;
9275
+ break;
92299276 case 3:
9230
- name = "cubemaps/CloudyHills_";
9231
- ext = "tga";
9277
+ name = "cubemaps/CloudyHills/";
9278
+ ext = "jpg";
92329279 reverseUP = false;
92339280 break;
92349281 case 4:
9235
- name = "cubemaps/cornell_";
9282
+ name = "cubemaps/cornell/";
92369283 ext = "png";
92379284 reverseUP = false;
92389285 break;
9286
+ case 5:
9287
+ name = "cubemaps/skycube/";
9288
+ ext = "jpg";
9289
+ reverseUP = false;
9290
+ break;
9291
+ case 6:
9292
+ name = "cubemaps/SaintLazarusChurch3/";
9293
+ ext = "jpg";
9294
+ reverseUP = false;
9295
+ break;
9296
+ case 7:
9297
+ name = "cubemaps/Sodermalmsallen/";
9298
+ ext = "jpg";
9299
+ reverseUP = false;
9300
+ break;
9301
+ case 8:
9302
+ name = "cubemaps/Sodermalmsallen2/";
9303
+ ext = "jpg";
9304
+ reverseUP = false;
9305
+ break;
9306
+ case 9:
9307
+ name = "cubemaps/UnionSquare/";
9308
+ ext = "jpg";
9309
+ reverseUP = false;
9310
+ break;
92399311 default:
9240
- name = "cubemaps/rgb_";
9241
- ext = "png"; /*mipmap = true;*/ reverseUP = false;
9312
+ name = "cubemaps/box/";
9313
+ ext = "png"; /*mipmap = true;*/
9314
+ reverseUP = false;
92429315 break;
92439316 }
9244
-
9245
- try
9246
- {
9247
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9248
- } catch (IOException e)
9249
- {
9250
- throw new RuntimeException(e);
9251
- }
9317
+
9318
+ LoadSkybox(name, ext, mipmap);
92529319 }
92539320
92549321 public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -9280,8 +9347,12 @@
92809347 static double[] model = new double[16];
92819348 double[] camera2light = new double[16];
92829349 double[] light2camera = new double[16];
9283
- int newenvy = -1;
9284
- boolean envyoff = true; // false;
9350
+
9351
+ //int newenvy = -1;
9352
+ //boolean envyoff = false;
9353
+
9354
+ String loadedskyboxname;
9355
+
92859356 cVector light0 = new cVector(0, 0, 0); // 1,3,2);
92869357 //float[] light0 = { 0,0,0 };
92879358 cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9699,7 +9770,7 @@
96999770
97009771 if (renderCamera != lightCamera)
97019772 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9702
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9773
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
97039774
97049775 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
97059776
....@@ -9715,7 +9786,7 @@
97159786
97169787 if (renderCamera != lightCamera)
97179788 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9718
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9789
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
97199790
97209791 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
97219792
....@@ -9761,13 +9832,18 @@
97619832 rati = 1 / rati;
97629833 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
97639834 }
9764
- assert (newenvy == -1);
9835
+
9836
+ //assert (newenvy == -1);
9837
+
97659838 gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
97669839 gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767
- DrawSkyBox(gl);
9840
+ DrawSkyBox(gl, (float)rati);
97689841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
97699842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9770
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
97719847 ratio,
97729848 //near_plane, far_plane,
97739849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10630,9 +10706,18 @@
1063010706 static boolean init = false;
1063110707
1063210708 double[][] matrix = LA.newMatrix();
10709
+
10710
+ // This is to refresh the UI of the material panel.
10711
+ ObjEditor patchMaterial;
1063310712
1063410713 public void display(GLAutoDrawable drawable)
1063510714 {
10715
+ if (patchMaterial.patchMaterial)
10716
+ {
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
1063610721 if (Grafreed.savesound && Grafreed.hassound)
1063710722 {
1063810723 Grafreed.wav.save();
....@@ -10676,7 +10761,9 @@
1067610761 }
1067710762 /**/
1067810763
10679
- if (selection)
10764
+ boolean control = ((modifiers & CTRL) != 0);
10765
+
10766
+ if (selection && (!Globals.isLIVE() || control))
1068010767 {
1068110768 selectbuffer.display();
1068210769 return;
....@@ -10728,6 +10815,112 @@
1072810815
1072910816 if (DrawMode() == DEFAULT)
1073010817 {
10818
+ if (manipCamera == lightCamera)
10819
+ {
10820
+// switch (e.getKeyCode())
10821
+// {
10822
+// case DOWN_ARROW:
10823
+// lightCamera.DECAL /= 2;
10824
+// repaint();
10825
+// break;
10826
+// case UP_ARROW:
10827
+// lightCamera.DECAL *= 2;
10828
+// repaint();
10829
+// break;
10830
+// case LEFT_ARROW:
10831
+// lightCamera.SCALE /= 2;
10832
+// repaint();
10833
+// break;
10834
+// case RIGHT_ARROW:
10835
+// lightCamera.SCALE *= 2;
10836
+// repaint();
10837
+// break;
10838
+// default:
10839
+// break;
10840
+ if (keys[DOWN_ARROW])
10841
+ {
10842
+ lightCamera.DECAL /= 2;
10843
+ }
10844
+
10845
+ if (keys[UP_ARROW])
10846
+ {
10847
+ lightCamera.DECAL *= 2;
10848
+ }
10849
+
10850
+ if (keys[LEFT_ARROW])
10851
+ {
10852
+ lightCamera.SCALE /= 2;
10853
+ }
10854
+
10855
+ if (keys[RIGHT_ARROW])
10856
+ {
10857
+ lightCamera.SCALE *= 2;
10858
+ }
10859
+ }
10860
+ else
10861
+ {
10862
+ //pingthread.mute = true;
10863
+
10864
+ boolean keyon = false;
10865
+
10866
+ if (keys[DOWN_ARROW])
10867
+ {
10868
+ speed = ++speedkey[DOWN_ARROW];
10869
+ if (speed > 20)
10870
+ speed = 20;
10871
+ GoDown(modifiers);
10872
+ keyon = true;
10873
+ }
10874
+ else
10875
+ speedkey[DOWN_ARROW] = 0;
10876
+
10877
+ if (keys[UP_ARROW])
10878
+ {
10879
+ speed = ++speedkey[UP_ARROW];
10880
+ if (speed > 20)
10881
+ speed = 20;
10882
+ GoUp(modifiers);
10883
+ keyon = true;
10884
+ }
10885
+ else
10886
+ speedkey[UP_ARROW] = 0;
10887
+
10888
+ if (keys[LEFT_ARROW])
10889
+ {
10890
+ speed = ++speedkey[LEFT_ARROW];
10891
+ if (speed > 20)
10892
+ speed = 20;
10893
+ GoLeft(modifiers);
10894
+ keyon = true;
10895
+ }
10896
+ else
10897
+ speedkey[LEFT_ARROW] = 0;
10898
+
10899
+ if (keys[RIGHT_ARROW])
10900
+ {
10901
+ speed = ++speedkey[RIGHT_ARROW];
10902
+ if (speed > 20)
10903
+ speed = 20;
10904
+ GoRight(modifiers);
10905
+ keyon = true;
10906
+ }
10907
+ else
10908
+ speedkey[RIGHT_ARROW] = 0;
10909
+
10910
+ if (Globals.WALK && capsLocked)
10911
+ {
10912
+ Walk();
10913
+ keyon = true;
10914
+ }
10915
+
10916
+ if (keyon)
10917
+ {
10918
+ repaint();
10919
+ }
10920
+
10921
+ //pingthread.mute = false;
10922
+ }
10923
+
1073110924 currentlydrawing = true;
1073210925 }
1073310926
....@@ -10801,7 +10994,7 @@
1080110994
1080210995 if (wait)
1080310996 {
10804
- Sleep(500);
10997
+ Sleep(200); // blocks everything
1080510998
1080610999 wait = false;
1080711000 }
....@@ -10916,7 +11109,7 @@
1091611109 // if (parentcam != renderCamera) // not a light
1091711110 if (cam != lightCamera)
1091811111 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10919
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11112
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1092011113
1092111114 for (int j = 0; j < 4; j++)
1092211115 {
....@@ -10931,7 +11124,7 @@
1093111124 // if (parentcam != renderCamera) // not a light
1093211125 if (cam != lightCamera)
1093311126 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11127
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1093511128
1093611129 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1093711130
....@@ -11017,13 +11210,43 @@
1101711210 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1101811211 }
1101911212
11020
- if (newenvy > -1)
11213
+// if (newenvy > -1)
11214
+// {
11215
+// LoadEnvy(newenvy);
11216
+// }
11217
+//
11218
+// newenvy = -1;
11219
+
11220
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1102111221 {
11022
- LoadEnvy(newenvy);
11222
+ if (cubemaprgb == null)
11223
+ {
11224
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11225
+ }
11226
+
11227
+ cubemap = cubemaprgb;
1102311228 }
11024
-
11025
- newenvy = -1;
11026
-
11229
+ else
11230
+ {
11231
+ if (object.skyboxname != null)
11232
+ {
11233
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11234
+ {
11235
+ if (cubemap != null && cubemap != cubemaprgb)
11236
+ cubemap.dispose();
11237
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11238
+ loadedskyboxname = object.skyboxname;
11239
+ }
11240
+ }
11241
+ else
11242
+ {
11243
+ cubemapcustom = null;
11244
+ loadedskyboxname = null;
11245
+ }
11246
+
11247
+ cubemap = cubemapcustom;
11248
+ }
11249
+
1102711250 ratio = ((double) getWidth()) / getHeight();
1102811251 //System.out.println("ratio = " + ratio);
1102911252
....@@ -11039,7 +11262,7 @@
1103911262
1104011263 if (!IsFrozen() && !ambientOcclusion)
1104111264 {
11042
- DrawSkyBox(gl);
11265
+ DrawSkyBox(gl, (float)ratio);
1104311266 }
1104411267
1104511268 //if (selection_view == -1)
....@@ -11222,9 +11445,9 @@
1122211445
1122311446 gl.glMatrixMode(GL.GL_MODELVIEW);
1122411447
11225
-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11226
-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11227
-gl.glEnable(gl.GL_MULTISAMPLE);
11448
+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11449
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11450
+//gl.glEnable(gl.GL_MULTISAMPLE);
1122811451 } else
1122911452 {
1123011453 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11285,7 +11508,10 @@
1128511508 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1128611509 } else
1128711510 {
11288
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11511
+ boolean vr = capsLocked && !lightMode;
11512
+
11513
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11514
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1128911515 }
1129011516 }
1129111517
....@@ -11325,7 +11551,7 @@
1132511551
1132611552 // if (cam != lightCamera)
1132711553 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11328
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11554
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1132911555 }
1133011556
1133111557 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11641,8 +11867,11 @@
1164111867 repaint();
1164211868 }
1164311869
11644
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11870
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11871
+ {
11872
+ renderCamera.computeTransform();
1164511873 repaint();
11874
+ }
1164611875
1164711876 displaydone = true;
1164811877 }
....@@ -11717,9 +11946,23 @@
1171711946 //GL gl = getGL();
1171811947 if ((TRACK || SHADOWTRACK) || zoomonce)
1171911948 {
11949
+ if (TRACK)
11950
+ {
11951
+ if (object.selection != null &&
11952
+ object.selection.size() > 0 &&
11953
+ object.selection.elementAt(0) != null &&
11954
+ !(object.selection.elementAt(0) instanceof Camera) &&
11955
+ !(object.selection.elementAt(0) instanceof ScriptNode))
11956
+ {
11957
+ trackedobject = object.selection.elementAt(0);
11958
+ //repaint();
11959
+ }
11960
+ else
11961
+ trackedobject = null;
11962
+ }
1172011963 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1172111964 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11722
- pingthread.StepToTarget(true); // true);
11965
+ pingthread.StepToTarget(); // true);
1172311966 // zoomonce = false;
1172411967 }
1172511968
....@@ -12399,51 +12642,80 @@
1239912642
1240012643 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1240112644
12402
- String program =
12645
+ String programmin =
1240312646 // Min shader
1240412647 "!!ARBfp1.0\n" +
12405
- "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
12406
- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
12648
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
12649
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
12650
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
1240712651 "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1240812652 "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
1240912653 "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
12654
+ "PARAM light2cam0 = program.env[10];" +
12655
+ "PARAM light2cam1 = program.env[11];" +
12656
+ "PARAM light2cam2 = program.env[12];" +
1241012657 "TEMP temp;" +
1241112658 "TEMP light;" +
1241212659 "TEMP ndotl;" +
1241312660 "TEMP normal;" +
1241412661 "TEMP depth;" +
12662
+ "TEMP eye;" +
12663
+ "TEMP pos;" +
1241512664
12416
- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12417
-
12665
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12666
+ Normalize("normal") +
1241812667 "MOV light, state.light[0].position;" +
1241912668 "DP3 ndotl.x, light, normal;" +
12669
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
1242012670
1242112671 // shadow
12422
- "MOV temp, fragment.texcoord[1];" +
12423
- TextureFetch("depth", "temp", "1") +
12672
+ "MOV pos, fragment.texcoord[1];" +
12673
+ "MOV temp, pos;" +
12674
+ ShadowTextureFetch("depth", "temp", "1") +
1242412675 //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12425
- "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
12426
-
12676
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
1242712677
1242812678 // No shadow when out of frustum
1242912679 //"SGE temp.y, depth.z, zero123.y;" +
1243012680 //"LRP temp.x, temp.y, zero123.y, temp.x;" +
1243112681
12432
- "MUL ndotl.x, ndotl.x, temp.x;" +
12433
- "MAX ndotl.x, ndotl.x, pow2.y;" +
12682
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1243412683
12684
+ // Backlit
12685
+ "MOV pos.w, zero12t.y;" + // one
12686
+ "DP4 eye.x, pos, light2cam0;" +
12687
+ "DP4 eye.y, pos, light2cam1;" +
12688
+ "DP4 eye.z, pos, light2cam2;" +
12689
+ Normalize("eye") +
12690
+
12691
+ "DP3 ndotl.y, -eye, normal;" +
12692
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
12693
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12694
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12695
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12696
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
12697
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
12698
+ "ADD ndotl.y, ndotl.y, one.x;" +
12699
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12700
+
12701
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12702
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12703
+
12704
+ // Pigment
1243512705 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12436
- "LRP temp, zero123.w, temp, one;" + // texture proportion
12437
- "MUL temp, temp, ndotl.x;" +
12706
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12707
+ "MUL temp, temp, zero12t.w;" + // Times x
1243812708
12439
- "MUL temp, temp, zero123.z;" +
12709
+ //"MUL temp, temp, ndotl.y;" +
12710
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
1244012711
12441
- "MOV temp.w, zero123.y;" + // reset alpha
12712
+ "MUL temp, temp, ndotl.x;" + // lambert
1244212713
12714
+ "MOV temp.w, zero12t.y;" + // reset alpha
1244312715 "MOV result.color, temp;" +
1244412716 "END";
1244512717
12446
- String program2 =
12718
+ String programmax =
1244712719 "!!ARBfp1.0\n" +
1244812720
1244912721 //"OPTION ARB_fragment_program_shadow;" +
....@@ -12471,7 +12743,7 @@
1247112743 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1247212744 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1247312745 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12474
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12746
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1247512747 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1247612748 "PARAM options1 = program.env[62];" + // fog rgb color
1247712749 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12581,20 +12853,20 @@
1258112853 "MUL temp, floor, mapgrid.x;" +
1258212854 //"TEX depth0, temp, texture[1], 2D;" +
1258312855 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12584
- TextureFetch("depth0", "temp", "1") +
12856
+ ShadowTextureFetch("depth0", "temp", "1") +
1258512857 "") +
1258612858 "ADD temp.x, temp.x, mapgrid.x;" +
1258712859 //"TEX depth1, temp, texture[1], 2D;" +
1258812860 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12589
- TextureFetch("depth1", "temp", "1") +
12861
+ ShadowTextureFetch("depth1", "temp", "1") +
1259012862 "") +
1259112863 "ADD temp.y, temp.y, mapgrid.x;" +
1259212864 //"TEX depth2, temp, texture[1], 2D;" +
12593
- TextureFetch("depth2", "temp", "1") +
12865
+ ShadowTextureFetch("depth2", "temp", "1") +
1259412866 "SUB temp.x, temp.x, mapgrid.x;" +
1259512867 //"TEX depth3, temp, texture[1], 2D;" +
1259612868 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12597
- TextureFetch("depth3", "temp", "1") +
12869
+ ShadowTextureFetch("depth3", "temp", "1") +
1259812870 "") +
1259912871 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1260012872 //"MOV params, material;" +
....@@ -12716,7 +12988,7 @@
1271612988 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1271712989 // mar 2013 ??? "KIL alpha.a;" +
1271812990 "MOV alpha, texSamp.aaaa;" + // y;" +
12719
- "KIL alpha.a;" +
12991
+ "KIL alpha.a;" + // not sure with parallax mapping
1272012992 /*
1272112993 "MUL temp.xy, temp, two;" +
1272212994 "TXB bump, temp, texture[0], 2D;" +
....@@ -12802,11 +13074,6 @@
1280213074 "SUB bump0, bump0, half;" +
1280313075 "ADD bump, bump, bump0;" +
1280413076
12805
- "MOV temp.x, texSamp.a;" +
12806
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12807
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12808
- "MOV texSamp.a, temp.x;" +
12809
-
1281013077 // double-sided
1281113078 /**/
1281213079 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12816,26 +13083,73 @@
1281613083 "ADD temp.x, temp.x, one.x;" +
1281713084 "MUL normal, normal, temp.xxxx;":""
1281813085 ) +
12819
- /**/
12820
-//// Normalize("normal") +
12821
-//// "MAX normal.z, eps.x, normal.z;" +
12822
-// Normalize("normal") +
12823
- "MOV normald, normal;" +
12824
- "MOV normals, normal;" +
13086
+ /**/
13087
+
13088
+ "MOV temp, fragment.texcoord[4];" +
1282513089
1282613090 // UV base
1282713091 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1282813092 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1282913093 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12830
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12831
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12832
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
13094
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
13095
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
13096
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
13097
+ Normalize("UP") +
13098
+
1283313099 "XPD V, normal, UP;" +
1283413100 Normalize("V") +
1283513101 "XPD U, V, normal;" +
1283613102 Normalize("U") +
1283713103
13104
+ "MOV temp, fragment.texcoord[0];" +
13105
+
13106
+// "MAD normal, -temp.x, U, normal;" +
13107
+// "MAD normal, -temp.y, V, normal;" +
13108
+// Normalize("normal") +
13109
+
13110
+//// "MAX normal.z, eps.x, normal.z;" +
13111
+// Normalize("normal") +
13112
+ "MOV normald, normal;" +
13113
+ "MOV normals, normal;" +
13114
+
1283813115 // parallax mapping
13116
+
13117
+ "DP3 temp2.x, V, eye;" +
13118
+ "DP3 temp2.y, U, eye;" +
13119
+ "DP3 temp2.z, normal, eye;" +
13120
+ "RCP temp2.z, temp2.z;" +
13121
+
13122
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
13123
+ "RSQ temp2.w, temp2.w;" +
13124
+ "RCP temp2.w, temp2.w;" +
13125
+
13126
+ "SUB temp2.w, temp2.w, half;" +
13127
+ // "SGE temp.x, temp2.w, eps.x;" +
13128
+ // "MUL temp2.w, temp2.w, temp.x;" +
13129
+
13130
+ // "MOV texSamp, U;" +
13131
+
13132
+ "MUL temp2.z, temp2.z, temp2.w;" +
13133
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
13134
+
13135
+ "MUL temp2, temp2, temp2.z;" +
13136
+
13137
+ "SUB temp, temp, temp2;" +
13138
+
13139
+ "TEX temp, temp, texture[0], 2D;" +
13140
+ "POW temp.a, temp.a, params6.w;" + // punch through
13141
+
13142
+ "ADD texSamp, temp, texSamp;" +
13143
+ "MUL texSamp.xyz, half, texSamp;" +
13144
+
13145
+ "MOV alpha, texSamp.aaaa;" +
13146
+
13147
+// parallax mapping
13148
+
13149
+ "MOV temp.x, texSamp.a;" +
13150
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13151
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
13152
+ "MOV texSamp.a, temp.x;" +
1283913153
1284013154 //"MOV temp, fragment.texcoord[0];" +
1284113155 //
....@@ -12968,7 +13282,7 @@
1296813282 // display shadow only (fakedepth == 0)
1296913283 "SUB temp.x, half.x, shadow.x;" +
1297013284 "MOV temp.y, -params5.z;" + // params6.x;" +
12971
- "SLT temp.z, temp.y, -one2048th.x;" +
13285
+ "SLT temp.z, temp.y, -c256i.x;" +
1297213286 "SUB temp.y, one.x, temp.z;" +
1297313287 "MUL temp.x, temp.x, temp.y;" +
1297413288 "KIL temp.x;" +
....@@ -13299,8 +13613,19 @@
1329913613 //once = true;
1330013614 }
1330113615
13302
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13303
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13616
+ String program = programmax;
13617
+
13618
+ if (Globals.MINSHADER)
13619
+ {
13620
+ program = programmin;
13621
+ }
13622
+
13623
+ if (Globals.DEBUG)
13624
+ {
13625
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13626
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13627
+ }
13628
+
1330413629 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1330513630
1330613631 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13347,7 +13672,8 @@
1334713672 "\n" +
1334813673 "END\n";
1334913674
13350
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13675
+ if (Globals.DEBUG)
13676
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1335113677 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1335213678
1335313679 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13392,7 +13718,8 @@
1339213718 return out;
1339313719 }
1339413720
13395
- String TextureFetch(String dest, String src, String unit)
13721
+ // Also does frustum culling
13722
+ String ShadowTextureFetch(String dest, String src, String unit)
1339613723 {
1339713724 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1339813725 "SGE " + src + ".w, " + src + ".x, eps.x;" +
....@@ -13604,7 +13931,7 @@
1360413931 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1360513932 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1360613933 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13607
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13934
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1360813935
1360913936 //Object3D.cVector2[] vector2buffer;
1361013937
....@@ -13771,7 +14098,7 @@
1377114098 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1377214099 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1377314100 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13774
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14101
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1377514102 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1377614103 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1377714104 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13832,7 +14159,7 @@
1383214159 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1383314160 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1383414161 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13835
- //"MOV result.texcoord, vertex.texcoord;" +
14162
+ //"MOV result.texcoord, vertex.fogcoord;" +
1383614163 "MOV result.texcoord, temp;" +
1383714164 // border fade
1383814165 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13879,7 +14206,9 @@
1387914206
1388014207 //"ADD temp.z, temp.z, one;" +
1388114208
13882
- "MOV result.color, temp;"
14209
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14210
+
14211
+ "MOV result.color, temp;" // Normal
1388314212 : "MOV result.color, vertex.color;") +
1388414213 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1388514214 : "") +
....@@ -14014,6 +14343,7 @@
1401414343 public void mouseClicked(MouseEvent e)
1401514344 {
1401614345 System.out.println("mouseClicked: " + e);
14346
+ System.exit(0);
1401714347 }
1401814348
1401914349 public void mousePressed(MouseEvent e)
....@@ -14052,10 +14382,12 @@
1405214382 return;
1405314383 }
1405414384
14055
- 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;
1405614388
1405714389 // TIMER
14058
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1405914391 {
1406014392 keepboxmode = BOXMODE;
1406114393 keepsupport = SUPPORT;
....@@ -14096,7 +14428,7 @@
1409614428 //}
1409714429
1409814430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
14099
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1410014432 anchorX = ax;
1410114433 anchorY = ay;
1410214434 prevX = px;
....@@ -14191,8 +14523,9 @@
1419114523 // fev 2014???
1419214524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
1419314525 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14194
- pingthread.StepToTarget(true); // true);
14526
+ pingthread.StepToTarget(); // true);
1419514527 }
14528
+
1419614529 // if (!LIVE)
1419714530 super.repaint();
1419814531 }
....@@ -14255,14 +14588,15 @@
1425514588 drag = false;
1425614589 //System.out.println("Mouse DOWN");
1425714590 editObj = false;
14258
- ClickInfo info = new ClickInfo();
14259
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14260
- info.pane = this;
14261
- info.camera = renderCamera;
14262
- info.x = x;
14263
- info.y = y;
14264
- info.modifiers = modifiersex;
14265
- editObj = object.doEditClick(info, 0);
14591
+ //ClickInfo info = new ClickInfo();
14592
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14593
+ object.clickInfo.pane = this;
14594
+ object.clickInfo.camera = renderCamera;
14595
+ object.clickInfo.x = x;
14596
+ object.clickInfo.y = y;
14597
+ object.clickInfo.modifiers = modifiersex;
14598
+ editObj = object.doEditClick(//info,
14599
+ 0);
1426614600 if (!editObj)
1426714601 {
1426814602 hasMarquee = true;
....@@ -14286,8 +14620,8 @@
1428614620
1428714621 //if (drawing)
1428814622 //return;
14289
- if ((e.getModifiersEx() & CTRL) != 0
14290
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1429114625 {
1429214626 //System.out.println("mouseDragged: " + e);
1429314627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14311,9 +14645,17 @@
1431114645 return targetLookAt;
1431214646 }
1431314647
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
+
1431414653 class PingThread extends Thread
1431514654 {
1431614655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute = false;
1431714659
1431814660 // void JumpToTarget()
1431914661 // {
....@@ -14329,6 +14671,95 @@
1432914671 // only one thread!? synchronized
1433014672 void StepToTarget(boolean jump)
1433114673 {
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
+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683
+ CreateSelectedPoint();
14684
+
14685
+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
14686
+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
14687
+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
14688
+
14689
+ RigidBody.wind.set(RigidBody.pos);
14690
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14691
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14692
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14693
+ RigidBody.wind.normalize();
14694
+ }
14695
+
14696
+ if (mute)
14697
+ return;
14698
+
14699
+ if (capsLocked && manipCamera.viewCode == 0)
14700
+ {
14701
+ eye.x = manipCamera.location.x;
14702
+ eye.y = manipCamera.location.y + 0.25;
14703
+ eye.z = manipCamera.location.z;
14704
+
14705
+ dir.y = -1;
14706
+
14707
+ Ray ray = new Ray(eye, dir);
14708
+
14709
+ IntersectResult res = new IntersectResult();
14710
+ res.t = Double.POSITIVE_INFINITY;
14711
+
14712
+ tmp.set(targetLookAt);
14713
+ tmp.sub(manipCamera.location);
14714
+
14715
+ double dist = tmp.length();
14716
+
14717
+ tmp.normalize();
14718
+
14719
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
14720
+ eye2.y = manipCamera.location.y + 0.25;
14721
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
14722
+
14723
+ Ray ray2 = new Ray(eye2, dir);
14724
+
14725
+ IntersectResult res2 = new IntersectResult();
14726
+ res2.t = Double.POSITIVE_INFINITY;
14727
+
14728
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14729
+ {
14730
+ //tmp.set(manipCamera.location);
14731
+
14732
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14733
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14734
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14735
+
14736
+ //tmp.sub(manipCamera.location);
14737
+
14738
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14739
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14740
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14741
+
14742
+ targetLookAt.sub(manipCamera.location);
14743
+ targetLookAt.normalize();
14744
+ targetLookAt.mul(dist);
14745
+ targetLookAt.add(manipCamera.location);
14746
+
14747
+ //if (tmp.dot(tmp) > 0.000001)
14748
+ // System.out.println("INTERSECTION " + manipCamera.location);
14749
+
14750
+ manipCamera.lookAt.set(targetLookAt);
14751
+
14752
+ tmp.x = res.n.x;
14753
+ tmp.y = res.n.y;
14754
+ tmp.z = res.n.z;
14755
+ tmp.x += res2.n.x;
14756
+ tmp.y += res2.n.y;
14757
+ tmp.z += res2.n.z;
14758
+ tmp.normalize();
14759
+ manipCamera.UP.set(tmp);
14760
+ }
14761
+ }
14762
+
1433214763 tmp.set(targetLookAt);
1433314764 tmp.sub(manipCamera.lookAt); // june 2014
1433414765
....@@ -14366,7 +14797,7 @@
1436614797
1436714798 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1436814799 {
14369
- jump = true; // step = 1;
14800
+ // sep 2019 jump = true; // step = 1;
1437014801 }
1437114802
1437214803 if (OEILONCE && OEIL)
....@@ -14401,7 +14832,10 @@
1440114832 if (tmp.dot(tmp) < 0.00001)
1440214833 {
1440314834 zoomonce = false;
14835
+ live = false;
1440414836 }
14837
+ else
14838
+ live = true;
1440514839
1440614840 tmp.mul(step > step2 ? step : step2);
1440714841 }
....@@ -14428,7 +14862,7 @@
1442814862 {
1442914863 if (LOOKAT)
1443014864 manipCamera.lookAt.add(tmp);
14431
- if (OEIL)
14865
+ if (OEIL && !capsLocked)
1443214866 manipCamera.location.add(tmp);
1443314867
1443414868 {
....@@ -14443,7 +14877,10 @@
1444314877 lightCamera.computeTransform();
1444414878 }
1444514879 }
14446
- manipCamera.computeTransform();
14880
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14881
+ {
14882
+ manipCamera.computeTransform();
14883
+ }
1444714884 }
1444814885 // ?????? mouseDown = true;
1444914886 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14536,49 +14973,107 @@
1453614973 }
1453714974 }
1453814975 }
14976
+
1453914977 PingThread pingthread = new PingThread();
14540
- int delta = 5;
14541
- int speed = 5;
14978
+ int delta = 1;
14979
+ int speed = 1;
14980
+ int walk = 8;
1454214981 boolean autorepeat = false;
1454314982
14983
+ void Walk()
14984
+ {
14985
+ manipCamera.BackForth(0, walk, 1000);
14986
+
14987
+ targetLookAt.set(manipCamera.lookAt);
14988
+ }
14989
+
14990
+ void ViewAngle(float dy)
14991
+ {
14992
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14993
+
14994
+ if (manipCamera.shaper_fovy * factor > 1 &&
14995
+ manipCamera.shaper_fovy * factor < 150)
14996
+ {
14997
+ manipCamera.shaper_fovy *= factor;
14998
+ //System.out.println("fovy = " + shaper_fovy);
14999
+ }
15000
+ }
15001
+
1454415002 void GoDown(int mod)
1454515003 {
1454615004 MODIFIERS |= COMMAND;
15005
+ boolean isVR = (mouseMode&VR)!=0;
1454715006 /**/
1454815007 if((mod&SHIFT) == SHIFT)
14549
- manipCamera.RotatePosition(0, -speed);
14550
- else
14551
- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14552
- /**/
14553
- if ((mod & SHIFT) == SHIFT)
1455415008 {
14555
- mouseMode = mouseMode; // VR??
14556
- } else
14557
- {
14558
- mouseMode |= BACKFORTH;
15009
+// if (isVR)
15010
+// manipCamera.RotateInterest(0, speed);
15011
+// else
15012
+ if (isVR)
15013
+ ViewAngle(-speed*delta);
15014
+ else
15015
+ manipCamera.Translate(0, -speed*delta, getWidth());
1455915016 }
15017
+ else
15018
+ {
15019
+ if (isVR)
15020
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15021
+ else
15022
+ manipCamera.RotatePosition(0, -speed);
15023
+ }
15024
+
15025
+ /**/
15026
+// if ((mod & SHIFT) == SHIFT)
15027
+// {
15028
+// mouseMode = mouseMode; // VR??
15029
+// } else
15030
+// {
15031
+// mouseMode |= BACKFORTH;
15032
+// }
1456015033
15034
+ targetLookAt.set(manipCamera.lookAt);
15035
+
1456115036 //prevX = X = anchorX;
1456215037 prevY = Y = anchorY - (int) (renderCamera.Distance());
1456315038 }
1456415039
1456515040 void GoUp(int mod)
1456615041 {
15042
+ RigidBody.justclicked = true;
15043
+
1456715044 MODIFIERS |= COMMAND;
1456815045 /**/
15046
+ boolean isVR = (mouseMode&VR)!=0;
15047
+
1456915048 if((mod&SHIFT) == SHIFT)
14570
- manipCamera.RotatePosition(0, speed);
14571
- else
14572
- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14573
- /**/
14574
- if ((mod & SHIFT) == SHIFT)
1457515049 {
14576
- mouseMode = mouseMode;
14577
- } else
14578
- {
14579
- mouseMode |= BACKFORTH;
15050
+// if (isVR)
15051
+// manipCamera.RotateInterest(0, -speed);
15052
+// else
15053
+ if (isVR)
15054
+ ViewAngle(speed*delta);
15055
+ else
15056
+ manipCamera.Translate(0, speed*delta, getWidth());
1458015057 }
15058
+ else
15059
+ {
15060
+ if (isVR)
15061
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15062
+ else
15063
+ manipCamera.RotatePosition(0, speed);
15064
+ }
15065
+
15066
+ /**/
15067
+// if ((mod & SHIFT) == SHIFT)
15068
+// {
15069
+// mouseMode = mouseMode;
15070
+// } else
15071
+// {
15072
+// mouseMode |= BACKFORTH;
15073
+// }
1458115074
15075
+ targetLookAt.set(manipCamera.lookAt);
15076
+
1458215077 //prevX = X = anchorX;
1458315078 prevY = Y = anchorY + (int) (renderCamera.Distance());
1458415079 }
....@@ -14588,18 +15083,29 @@
1458815083 MODIFIERS |= COMMAND;
1458915084 /**/
1459015085 if((mod&SHIFT) == SHIFT)
14591
- manipCamera.Translate(speed*delta, 0, getWidth());
15086
+ manipCamera.Translate(speed, 0, getWidth());
1459215087 else
14593
- manipCamera.RotatePosition(speed, 0);
15088
+ {
15089
+ if ((mouseMode&VR)!=0)
15090
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
15091
+ else
15092
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
15093
+ }
15094
+
1459415095 /**/
14595
- if ((mod & SHIFT) == SHIFT)
14596
- {
14597
- mouseMode = mouseMode;
14598
- } else
14599
- {
14600
- mouseMode |= ROTATE;
14601
- } // TRANSLATE;
15096
+// if ((mod & SHIFT) == SHIFT)
15097
+// {
15098
+// mouseMode = mouseMode;
15099
+// } else
15100
+// {
15101
+// mouseMode |= ROTATE;
15102
+// } // TRANSLATE;
1460215103
15104
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15105
+ //System.err.println("location = " + manipCamera.location);
15106
+
15107
+ targetLookAt.set(manipCamera.lookAt);
15108
+
1460315109 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1460415110 prevY = Y = anchorY;
1460515111 }
....@@ -14609,18 +15115,26 @@
1460915115 MODIFIERS |= COMMAND;
1461015116 /**/
1461115117 if((mod&SHIFT) == SHIFT)
14612
- manipCamera.Translate(-speed*delta, 0, getWidth());
15118
+ manipCamera.Translate(-speed, 0, getWidth());
1461315119 else
14614
- manipCamera.RotatePosition(-speed, 0);
15120
+ {
15121
+ if ((mouseMode&VR)!=0)
15122
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
15123
+ else
15124
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
15125
+ }
15126
+
1461515127 /**/
14616
- if ((mod & SHIFT) == SHIFT)
14617
- {
14618
- mouseMode = mouseMode;
14619
- } else
14620
- {
14621
- mouseMode |= ROTATE;
14622
- } // TRANSLATE;
15128
+// if ((mod & SHIFT) == SHIFT)
15129
+// {
15130
+// mouseMode = mouseMode;
15131
+// } else
15132
+// {
15133
+// mouseMode |= ROTATE;
15134
+// } // TRANSLATE;
1462315135
15136
+ targetLookAt.set(manipCamera.lookAt);
15137
+
1462415138 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1462515139 prevY = Y = anchorY;
1462615140 }
....@@ -14662,15 +15176,16 @@
1466215176 if (editObj)
1466315177 {
1466415178 drag = true;
14665
- ClickInfo info = new ClickInfo();
14666
- info.bounds.setBounds(0, 0,
15179
+ //ClickInfo info = new ClickInfo();
15180
+ object.clickInfo.bounds.setBounds(0, 0,
1466715181 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14668
- info.pane = this;
14669
- info.camera = renderCamera;
14670
- info.x = x;
14671
- info.y = y;
14672
- object.GetWindow().copy
14673
- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
15182
+ object.clickInfo.pane = this;
15183
+ object.clickInfo.camera = renderCamera;
15184
+ object.clickInfo.x = x;
15185
+ object.clickInfo.y = y;
15186
+ object //.GetWindow().copy
15187
+ .doEditDrag(//info,
15188
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1467415189 } else
1467515190 {
1467615191 if (x < startX)
....@@ -14753,6 +15268,11 @@
1475315268 if ((mouseMode & ZOOM) != 0)
1475415269 {
1475515270 //if ((mouseMode & BACKFORTH) != 0)
15271
+ if ((modifiersex & SHIFT) == SHIFT)
15272
+ {
15273
+ ViewAngle(dy);
15274
+ }
15275
+ else
1475615276 if ((mouseMode & VR) != 0)
1475715277 manipCamera.BackForth(dx, dy, getWidth());
1475815278 else
....@@ -14819,24 +15339,30 @@
1481915339 }
1482015340 }
1482115341
15342
+// ClickInfo clickInfo = new ClickInfo();
15343
+
1482215344 public void mouseMoved(MouseEvent e)
1482315345 {
15346
+//object.editWindow.frame.
15347
+ setCursor(Cursor.getDefaultCursor());
15348
+
1482415349 //System.out.println("mouseMoved: " + e);
1482515350 if (isRenderer)
1482615351 return;
1482715352
14828
- ClickInfo ci = new ClickInfo();
14829
- ci.x = e.getX();
14830
- ci.y = e.getY();
14831
- ci.modifiers = e.getModifiersEx();
14832
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14833
- ci.pane = this;
14834
- ci.camera = renderCamera;
15353
+ // Mouse cursor feedback
15354
+ object.clickInfo.x = e.getX();
15355
+ object.clickInfo.y = e.getY();
15356
+ object.clickInfo.modifiers = e.getModifiersEx();
15357
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
15358
+ object.clickInfo.pane = this;
15359
+ object.clickInfo.camera = renderCamera;
1483515360 if (!isRenderer)
1483615361 {
1483715362 //ObjEditor editWindow = object.editWindow;
1483815363 //Object3D copy = editWindow.copy;
14839
- if (object.doEditClick(ci, 0))
15364
+ if (object.doEditClick(//clickInfo,
15365
+ 0))
1484015366 {
1484115367 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1484215368 } else
....@@ -14848,6 +15374,12 @@
1484815374
1484915375 public void mouseReleased(MouseEvent e)
1485015376 {
15377
+ if (isRenderer && !movingcamera)
15378
+ {
15379
+ RigidBody.justclicked = true;
15380
+ System.out.println("justclicked: " + e);
15381
+ }
15382
+
1485115383 Globals.MOUSEDRAGGED = false;
1485215384
1485315385 movingcamera = false;
....@@ -15004,8 +15536,10 @@
1500415536 mouseMode |= ZOOM;
1500515537 }
1500615538
15007
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15008
- if (capsLocked) // || (modifiers & META) == META)
15539
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15540
+ boolean vr = capsLocked && !lightMode;
15541
+
15542
+ if (vr) // || (modifiers & META) == META)
1500915543 {
1501015544 mouseMode |= VR; // BACKFORTH;
1501115545 }
....@@ -15017,7 +15551,8 @@
1501715551 {
1501815552 mouseMode |= SELECT;
1501915553 }
15020
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15554
+ if (//(modifiersex & SHIFT) == SHIFT ||
15555
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1502115556 {
1502215557 mouseMode &= ~VR;
1502315558 mouseMode |= TRANSLATE;
....@@ -15061,8 +15596,18 @@
1506115596 float SATPOW = 1; // 2; // 0.5f;
1506215597 float BRIPOW = 1; // 0.5f; // 0.5f;
1506315598
15599
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15600
+
15601
+// Create a new blank cursor.
15602
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15603
+ cursorImg, new Point(0, 0), "blank cursor");
15604
+
1506415605 public void keyPressed(int key)
1506515606 {
15607
+// Set the blank cursor to the JFrame.
15608
+//object.editWindow.frame.
15609
+ setCursor(blankCursor);
15610
+
1506615611 if (key >= '0' && key <= '5')
1506715612 clampbit = (key-'0');
1506815613
....@@ -15119,8 +15664,8 @@
1511915664 case 'K':
1512015665 KOMPACTTEXTURE ^= true;
1512115666 //textures.clear();
15122
- break;
15123
- case 'P': // Texture Projection macros
15667
+ // break;
15668
+ //case 'P': // Texture Projection macros
1512415669 // SAVETEXTURE ^= true;
1512515670 macromode = true;
1512615671 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15221,8 +15766,8 @@
1522115766 RevertCamera();
1522215767 repaint();
1522315768 break;
15224
- case 'l':
15225
- //case 'L':
15769
+ //case 'l':
15770
+ case 'L':
1522615771 if (lightMode)
1522715772 {
1522815773 lightMode = false;
....@@ -15241,7 +15786,7 @@
1524115786 targetLookAt.set(manipCamera.lookAt);
1524215787 repaint();
1524315788 break;
15244
- case 'p':
15789
+ case 'P': // p':
1524515790 // c'est quoi ca au juste? spherical ^= true;
1524615791 Skinshader ^= true; programInitialized = false;
1524715792 repaint();
....@@ -15252,7 +15797,8 @@
1525215797 break;
1525315798 case 'm':
1525415799 {
15255
- PrintMemory();
15800
+ //PrintMemory();
15801
+ ToggleImageFlip();
1525615802 break;
1525715803 }
1525815804 case 'M':
....@@ -15279,27 +15825,31 @@
1527915825 repaint();
1528015826 break;
1528115827 case 'O':
15282
- Globals.drawMode = OCCLUSION; // WARNING
15283
- repaint();
15284
- break;
15828
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15829
+ //repaint();
15830
+ //break;
1528515831 case 'o':
1528615832 OCCLUSION_CULLING ^= true;
1528715833 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1528815834 break;
15289
- case '0': envyoff ^= true; repaint(); break;
15835
+ //case '0': envyoff ^= true; repaint(); break;
1529015836 case '1':
1529115837 case '2':
1529215838 case '3':
1529315839 case '4':
1529415840 case '5':
15295
- newenvy = Character.getNumericValue(key);
15296
- repaint();
15297
- break;
1529815841 case '6':
1529915842 case '7':
1530015843 case '8':
1530115844 case '9':
15302
- BGcolor = (key - '6')/3.f;
15845
+ if (true) // envyoff)
15846
+ {
15847
+ BGcolor = (key - '1')/8.f;
15848
+ }
15849
+ else
15850
+ {
15851
+ //newenvy = Character.getNumericValue(key);
15852
+ }
1530315853 repaint();
1530415854 break;
1530515855 case '!':
....@@ -15369,7 +15919,21 @@
1536915919 // kompactbit = 6;
1537015920 // break;
1537115921 case ' ':
15922
+ capsLocked ^= true;
15923
+ repaint();
15924
+ break;
15925
+ case 'l':
1537215926 lightMode ^= true;
15927
+ if (lightMode)
15928
+ {
15929
+ keepshadow = Globals.RENDERSHADOW;
15930
+ Globals.RENDERSHADOW = false;
15931
+ }
15932
+ else
15933
+ {
15934
+ Globals.RENDERSHADOW = keepshadow;
15935
+ }
15936
+
1537315937 Globals.lighttouched = true;
1537415938 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1537515939 targetLookAt.set(manipCamera.lookAt);
....@@ -15377,6 +15941,10 @@
1537715941 break;
1537815942 //case '`' :
1537915943 case ESC:
15944
+ if (FULLSCREEN)
15945
+ object.editWindow.ToggleFullScreen();
15946
+ break;
15947
+ case 'p':
1538015948 RENDERPROGRAM += 1;
1538115949 RENDERPROGRAM %= 3;
1538215950
....@@ -15415,6 +15983,10 @@
1541515983 case ENTER:
1541615984 // object.editWindow.ScreenFit(); // Edit();
1541715985 ToggleLive();
15986
+ if (capsLocked)
15987
+ {
15988
+ Globals.WALK ^= true;
15989
+ }
1541815990 break;
1541915991 case DELETE:
1542015992 ClearSelection();
....@@ -15451,17 +16023,23 @@
1545116023 object.GetWindow().refreshContents(true);
1545216024 break;
1545316025 case '{':
15454
- manipCamera.shaper_fovy /= 1.1;
16026
+ double factor = 1.1;
16027
+ if (manipCamera.shaper_fovy / factor > 0.1)
16028
+ manipCamera.shaper_fovy /= factor;
1545516029 System.out.println("FOV = " + manipCamera.shaper_fovy);
1545616030 repaint();
1545716031 break;
1545816032 case '}':
15459
- manipCamera.shaper_fovy *= 1.1;
16033
+ factor = 1.1;
16034
+ if (manipCamera.shaper_fovy * factor < 150)
16035
+ manipCamera.shaper_fovy *= factor;
1546016036 System.out.println("FOV = " + manipCamera.shaper_fovy);
1546116037 repaint();
1546216038 break;
1546316039 case '[':
15464
- manipCamera.shaper_fovy /= 1.01;
16040
+ factor = 1.01;
16041
+ if (manipCamera.shaper_fovy / factor > 0.1)
16042
+ manipCamera.shaper_fovy /= factor;
1546516043 if (false) //manipCamera.hAspect == 0)
1546616044 {
1546716045 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15477,7 +16055,9 @@
1547716055 break;
1547816056 case ']':
1547916057 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15480
- manipCamera.shaper_fovy *= 1.01;
16058
+ factor = 1.01;
16059
+ if (manipCamera.shaper_fovy * factor < 150)
16060
+ manipCamera.shaper_fovy *= factor;
1548116061 if (false) //manipCamera.hAspect == 0)
1548216062 {
1548316063 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15515,98 +16095,113 @@
1551516095 }
1551616096 }
1551716097
16098
+ boolean keys[] = new boolean[256];
16099
+ int speedkey[] = new int[256];
16100
+ int modifiers = 0;
16101
+
1551816102 public void processKeyEvent(KeyEvent e)
1551916103 {
1552016104 switch (e.getID())
1552116105 {
1552216106 case KeyEvent.KEY_PRESSED:
15523
- if (!autorepeat)
15524
- {
15525
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15526
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15527
- }
15528
- if (manipCamera == lightCamera)
15529
- {
15530
- switch (e.getKeyCode())
15531
- {
15532
- case DOWN_ARROW:
15533
- lightCamera.DECAL /= 2;
15534
- repaint();
15535
- break;
15536
- case UP_ARROW:
15537
- lightCamera.DECAL *= 2;
15538
- repaint();
15539
- break;
15540
- case LEFT_ARROW:
15541
- lightCamera.SCALE /= 2;
15542
- repaint();
15543
- break;
15544
- case RIGHT_ARROW:
15545
- lightCamera.SCALE *= 2;
15546
- repaint();
15547
- break;
15548
- default:
15549
- break;
15550
- }
15551
-
15552
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15553
- } else
15554
- {
15555
- if (true) // !autorepeat)
15556
- {
15557
- boolean reset = true;
15558
-
15559
- switch (e.getKeyCode())
15560
- {
15561
- case DOWN_ARROW:
15562
- GoDown(e.getModifiersEx());
15563
- repaint();
15564
- break;
15565
- case UP_ARROW:
15566
- GoUp(e.getModifiersEx());
15567
- repaint();
15568
- break;
15569
- case LEFT_ARROW:
15570
- GoLeft(e.getModifiersEx());
15571
- repaint();
15572
- break;
15573
- case RIGHT_ARROW:
15574
- GoRight(e.getModifiersEx());
15575
- repaint();
15576
- break;
15577
- default:
15578
- reset = false;
15579
- break;
15580
- }
15581
-
15582
- if (reset)
15583
- {
15584
- autorepeat = true;
15585
-
15586
- targetLookAt.set(manipCamera.lookAt);
15587
- }
15588
- }
15589
- }
16107
+ keys[e.getKeyCode()] = true;
16108
+ modifiers = e.getModifiersEx();
16109
+ keyPressed(e.getKeyChar(), modifiers);
16110
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16111
+ repaint();
1559016112 break;
15591
- case KeyEvent.KEY_TYPED:
15592
- break;
16113
+// if (!autorepeat)
16114
+// {
16115
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
16116
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
16117
+// }
16118
+// if (manipCamera == lightCamera)
16119
+// {
16120
+// switch (e.getKeyCode())
16121
+// {
16122
+// case DOWN_ARROW:
16123
+// lightCamera.DECAL /= 2;
16124
+// repaint();
16125
+// break;
16126
+// case UP_ARROW:
16127
+// lightCamera.DECAL *= 2;
16128
+// repaint();
16129
+// break;
16130
+// case LEFT_ARROW:
16131
+// lightCamera.SCALE /= 2;
16132
+// repaint();
16133
+// break;
16134
+// case RIGHT_ARROW:
16135
+// lightCamera.SCALE *= 2;
16136
+// repaint();
16137
+// break;
16138
+// default:
16139
+// break;
16140
+// }
16141
+//
16142
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16143
+// } else
16144
+// {
16145
+// if (true) // !autorepeat)
16146
+// {
16147
+// boolean reset = true;
16148
+//
16149
+// switch (e.getKeyCode())
16150
+// {
16151
+// case DOWN_ARROW:
16152
+// GoDown(e.getModifiersEx());
16153
+// repaint();
16154
+// break;
16155
+// case UP_ARROW:
16156
+// GoUp(e.getModifiersEx());
16157
+// repaint();
16158
+// break;
16159
+// case LEFT_ARROW:
16160
+// GoLeft(e.getModifiersEx());
16161
+// repaint();
16162
+// break;
16163
+// case RIGHT_ARROW:
16164
+// GoRight(e.getModifiersEx());
16165
+// repaint();
16166
+// break;
16167
+// default:
16168
+// reset = false;
16169
+// break;
16170
+// }
16171
+//
16172
+// if (reset)
16173
+// {
16174
+// autorepeat = true;
16175
+//
16176
+// targetLookAt.set(manipCamera.lookAt);
16177
+// }
16178
+// }
16179
+// }
16180
+// break;
16181
+// case KeyEvent.KEY_TYPED:
16182
+// break;
1559316183 case KeyEvent.KEY_RELEASED:
15594
- {
15595
- switch (e.getKeyCode())
15596
- {
15597
- case DOWN_ARROW:
15598
- case UP_ARROW:
15599
- case LEFT_ARROW:
15600
- case RIGHT_ARROW:
15601
- MODIFIERS &= ~COMMAND;
15602
- autorepeat = false;
15603
- break;
15604
- default:
15605
- break;
15606
- }
16184
+ keys[e.getKeyCode()] = false;
16185
+ modifiers = e.getModifiersEx();
1560716186 keyReleased(e.getKeyChar(), e.getModifiersEx());
16187
+ repaint();
1560816188 break;
15609
- }
16189
+// {
16190
+// switch (e.getKeyCode())
16191
+// {
16192
+// case DOWN_ARROW:
16193
+// case UP_ARROW:
16194
+// case LEFT_ARROW:
16195
+// case RIGHT_ARROW:
16196
+// MODIFIERS &= ~COMMAND;
16197
+// autorepeat = false;
16198
+// break;
16199
+// default:
16200
+// break;
16201
+// }
16202
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
16203
+// break;
16204
+// }
1561016205 default:
1561116206 break;
1561216207 }
....@@ -15862,8 +16457,6 @@
1586216457
1586316458 int width = getBounds().width;
1586416459 int height = getBounds().height;
15865
- ClickInfo info = new ClickInfo();
15866
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1586716460 //Image img = CreateImage(width, height);
1586816461 //System.out.println("width = " + width + "; height = " + height + "\n");
1586916462
....@@ -15940,31 +16533,37 @@
1594016533 }
1594116534 if (object != null && !hasMarquee)
1594216535 {
16536
+ if (object.clickInfo == null)
16537
+ object.clickInfo = new ClickInfo();
16538
+ ClickInfo info = object.clickInfo;
16539
+ //ClickInfo info = new ClickInfo();
16540
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16541
+
1594316542 if (isRenderer)
1594416543 {
15945
- info.flags++;
16544
+ object.clickInfo.flags++;
1594616545 double frameAspect = (double) width / (double) height;
1594716546 if (frameAspect > renderCamera.aspect)
1594816547 {
1594916548 int desired = (int) ((double) height * renderCamera.aspect);
15950
- info.bounds.width -= width - desired;
15951
- info.bounds.x += (width - desired) / 2;
16549
+ object.clickInfo.bounds.width -= width - desired;
16550
+ object.clickInfo.bounds.x += (width - desired) / 2;
1595216551 } else
1595316552 {
1595416553 int desired = (int) ((double) width / renderCamera.aspect);
15955
- info.bounds.height -= height - desired;
15956
- info.bounds.y += (height - desired) / 2;
16554
+ object.clickInfo.bounds.height -= height - desired;
16555
+ object.clickInfo.bounds.y += (height - desired) / 2;
1595716556 }
1595816557 }
1595916558
15960
- info.g = gr;
15961
- info.camera = renderCamera;
16559
+ object.clickInfo.g = gr;
16560
+ object.clickInfo.camera = renderCamera;
1596216561 /*
1596316562 // Memory intensive (brep.verticescopy)
1596416563 if (!(object instanceof Composite))
1596516564 object.draw(info, 0, false); // SLOW :
1596616565 */
15967
- if (!isRenderer)
16566
+ if (!isRenderer) // && drag)
1596816567 {
1596916568 Grafreed.Assert(object != null);
1597016569 Grafreed.Assert(object.selection != null);
....@@ -15972,9 +16571,9 @@
1597216571 {
1597316572 int hitSomething = object.selection.get(0).hitSomething;
1597416573
15975
- info.DX = 0;
15976
- info.DY = 0;
15977
- info.W = 1;
16574
+ object.clickInfo.DX = 0;
16575
+ object.clickInfo.DY = 0;
16576
+ object.clickInfo.W = 1;
1597816577 if (hitSomething == Object3D.hitCenter)
1597916578 {
1598016579 info.DX = X;
....@@ -15986,13 +16585,14 @@
1598616585 info.DY -= info.bounds.height/2;
1598716586 }
1598816587
15989
- object.drawEditHandles(info, 0);
16588
+ object.drawEditHandles(//info,
16589
+ 0);
1599016590
1599116591 if (drag && (X != 0 || Y != 0))
1599216592 {
1599316593 switch (hitSomething)
1599416594 {
15995
- case Object3D.hitCenter: gr.setColor(Color.pink);
16595
+ case Object3D.hitCenter: gr.setColor(Color.white);
1599616596 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1599716597 break;
1599816598 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16018,7 +16618,7 @@
1601816618 if (hasMarquee)
1601916619 {
1602016620 gr.setXORMode(Color.white);
16021
- gr.setColor(Color.red);
16621
+ gr.setColor(Color.white);
1602216622 if (!firstime)
1602316623 {
1602416624 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16177,7 +16777,8 @@
1617716777
1617816778 public boolean mouseDrag(Event evt, int x, int y)
1617916779 {
16180
- //System.out.println("mouseDrag: " + evt);
16780
+ System.out.println("mouseDrag: " + evt);
16781
+ System.exit(0);
1618116782 /*
1618216783 drag = true;
1618316784 //System.out.println("Mouse DRAG");
....@@ -16296,6 +16897,7 @@
1629616897 public boolean mouseUp(Event evt, int x, int y)
1629716898 {
1629816899 System.out.println("mouseUp: " + evt);
16900
+ System.exit(0);
1629916901 /*
1630016902 locked = false;
1630116903 if (isRenderer)
....@@ -16485,6 +17087,8 @@
1648517087 private /*static*/ boolean firstime;
1648617088 private /*static*/ cVector newView = new cVector();
1648717089 private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
17090
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
17091
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1648817092 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1648917093 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1649017094 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16497,36 +17101,74 @@
1649717101 {
1649817102 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1649917103
17104
+ int usedsuf = 0;
17105
+
1650017106 for (int i = 0; i < suffixes.length; i++)
1650117107 {
16502
- String resourceName = basename + suffixes[i] + "." + suffix;
16503
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16504
- mipmapped,
16505
- FileUtil.getFileSuffix(resourceName));
16506
- if (data == null)
17108
+ String[] suffixe = suffixes;
17109
+ String[] fallback = suffixes2;
17110
+ String[] fallfallback = suffixes3;
17111
+
17112
+ for (int c=usedsuf; --c>=0;)
1650717113 {
16508
- throw new IOException("Unable to load texture " + resourceName);
17114
+// String[] temp = suffixe;
17115
+// suffixe = fallback;
17116
+// fallback = fallfallback;
17117
+// fallfallback = temp;
1650917118 }
17119
+
17120
+ String resourceName = basename + suffixe[i] + "." + suffix;
17121
+ TextureData data;
17122
+
17123
+ try
17124
+ {
17125
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17126
+ mipmapped,
17127
+ FileUtil.getFileSuffix(resourceName));
17128
+ }
17129
+ catch (Exception e)
17130
+ {
17131
+ try
17132
+ {
17133
+ resourceName = basename + fallback[i] + "." + suffix;
17134
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17135
+ mipmapped,
17136
+ FileUtil.getFileSuffix(resourceName));
17137
+ }
17138
+ catch (Exception e2)
17139
+ {
17140
+ resourceName = basename + fallfallback[i] + "." + suffix;
17141
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17142
+ mipmapped,
17143
+ FileUtil.getFileSuffix(resourceName));
17144
+ }
17145
+ }
17146
+
1651017147 //System.out.println("Target = " + targets[i]);
1651117148 cubemap.updateImage(data, targets[i]);
1651217149 }
1651317150
1651417151 return cubemap;
1651517152 }
17153
+
1651617154 int bigsphere = -1;
1651717155
1651817156 float BGcolor = 0.5f;
1651917157
16520
- private void DrawSkyBox(GL gl)
17158
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17159
+
17160
+ private void DrawSkyBox(GL gl, float ratio)
1652117161 {
16522
- if (envyoff || cubemap == null)
17162
+ if (//envyoff ||
17163
+ WIREFRAME ||
17164
+ cubemap == null)
1652317165 {
1652417166 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1652517167 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
1652617168 return;
1652717169 }
1652817170
16529
- if (WIREFRAME)
17171
+ //if (WIREFRAME)
1653017172 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1653117173
1653217174 gl.glDisable(gl.GL_CULL_FACE);
....@@ -16534,7 +17176,17 @@
1653417176 // Compensates for ExaminerViewer's modification of modelview matrix
1653517177 gl.glMatrixMode(GL.GL_MODELVIEW);
1653617178 gl.glLoadIdentity();
17179
+ gl.glScalef(1,ratio,1);
1653717180
17181
+// colorV[0] = 2;
17182
+// colorV[1] = 2;
17183
+// colorV[2] = 2;
17184
+// colorV[3] = 1;
17185
+// gl.glDisable(gl.GL_COLOR_MATERIAL);
17186
+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
17187
+//
17188
+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
17189
+
1653817190 //gl.glActiveTexture(GL.GL_TEXTURE1);
1653917191 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1654017192
....@@ -16566,6 +17218,7 @@
1656617218 {
1656717219 gl.glScalef(1.0f, -1.0f, 1.0f);
1656817220 }
17221
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1656917222 gl.glMultMatrixd(viewrot_1, 0);
1657017223 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1657117224 //viewer.updateInverseRotation(gl);
....@@ -16606,7 +17259,8 @@
1660617259 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1660717260
1660817261 cubemap.disable();
16609
- ////cubemap.unbind();
17262
+ //cubemap.dispose();
17263
+
1661017264 if (CULLFACE)
1661117265 {
1661217266 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16614,6 +17268,8 @@
1661417268
1661517269 if (WIREFRAME)
1661617270 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
17271
+ else
17272
+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1661717273 }
1661817274
1661917275 private void DrawChecker(GL gl)
....@@ -16662,7 +17318,7 @@
1666217318 gl.glScalef(1.0f, -1.0f, 1.0f);
1666317319 }
1666417320
16665
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17321
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1666617322
1666717323 float step = 2; // 0.1666f; //0.25f;
1666817324 float stepv = 2; // step * 1652 / 998;
....@@ -16824,7 +17480,7 @@
1682417480 //new Exception().printStackTrace();
1682517481 System.out.println("select buffer init");
1682617482 // Use debug pipeline
16827
- drawable.setGL(new DebugGL(drawable.getGL()));
17483
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1682817484
1682917485 GL gl = drawable.getGL();
1683017486
....@@ -16951,7 +17607,7 @@
1695117607
1695217608 float depth = depths[y * TEX_SIZE + x];
1695317609
16954
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17610
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1695517611 {
1695617612 pointselection = false;
1695717613
....@@ -17142,6 +17798,7 @@
1714217798
1714317799 public void init(GLAutoDrawable drawable)
1714417800 {
17801
+ if (Globals.DEBUG)
1714517802 System.out.println("shadow buffer init");
1714617803
1714717804 GL gl = drawable.getGL();
....@@ -17370,10 +18027,14 @@
1737018027 gl.glFlush();
1737118028
1737218029 /**/
17373
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
18030
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1737418031
17375
- float[] pixels = occlusionsizebuffer.array();
18032
+ float[] depths = occlusiondepthbuffer.array();
1737618033
18034
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
18035
+
18036
+ int[] pixels = selectsizebuffer.array();
18037
+
1737718038 double r = 0, g = 0, b = 0;
1737818039
1737918040 double count = 0;
....@@ -17384,7 +18045,7 @@
1738418045
1738518046 double FACTOR = 1;
1738618047
17387
- for (int i = 0; i < pixels.length; i++)
18048
+ for (int i = 0; i < depths.length; i++)
1738818049 {
1738918050 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1739018051 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17467,7 +18128,7 @@
1746718128
1746818129 double scale = ray.z; // 1; // cos
1746918130
17470
- float depth = pixels[newindex];
18131
+ float depth = depths[newindex];
1747118132
1747218133 /*
1747318134 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17610,6 +18271,11 @@
1761018271 static boolean DEBUG_SELECTION = false;
1761118272 boolean OCCLUSION_CULLING = false; //true;
1761218273 public boolean lightMode = false;
18274
+
18275
+ private boolean keepshadow;
18276
+
18277
+ static public boolean capsLocked = false; // VR
18278
+
1761318279 static public int indexcount = 0;
1761418280 /*static*/ cColor vertexOcclusion = new cColor();
1761518281 //private int selection_view = -1;
....@@ -17664,11 +18330,14 @@
1766418330 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1766518331 static IntBuffer bigAAbuffer;
1766618332 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17667
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18333
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1766818334 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1766918335 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1767018336 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17671
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18337
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18338
+
18339
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18340
+
1767218341 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1767318342 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1767418343 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();