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
....@@ -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
....@@ -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;
....@@ -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();
....@@ -10728,6 +10813,112 @@
1072810813
1072910814 if (DrawMode() == DEFAULT)
1073010815 {
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
+
1073110922 currentlydrawing = true;
1073210923 }
1073310924
....@@ -10801,7 +10992,7 @@
1080110992
1080210993 if (wait)
1080310994 {
10804
- Sleep(500);
10995
+ Sleep(200); // blocks everything
1080510996
1080610997 wait = false;
1080710998 }
....@@ -10916,7 +11107,7 @@
1091611107 // if (parentcam != renderCamera) // not a light
1091711108 if (cam != lightCamera)
1091811109 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10919
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11110
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1092011111
1092111112 for (int j = 0; j < 4; j++)
1092211113 {
....@@ -10931,7 +11122,7 @@
1093111122 // if (parentcam != renderCamera) // not a light
1093211123 if (cam != lightCamera)
1093311124 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11125
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1093511126
1093611127 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1093711128
....@@ -11017,13 +11208,43 @@
1101711208 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1101811209 }
1101911210
11020
- if (newenvy > -1)
11211
+// if (newenvy > -1)
11212
+// {
11213
+// LoadEnvy(newenvy);
11214
+// }
11215
+//
11216
+// newenvy = -1;
11217
+
11218
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1102111219 {
11022
- LoadEnvy(newenvy);
11220
+ if (cubemaprgb == null)
11221
+ {
11222
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11223
+ }
11224
+
11225
+ cubemap = cubemaprgb;
1102311226 }
11024
-
11025
- newenvy = -1;
11026
-
11227
+ else
11228
+ {
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;
11246
+ }
11247
+
1102711248 ratio = ((double) getWidth()) / getHeight();
1102811249 //System.out.println("ratio = " + ratio);
1102911250
....@@ -11039,7 +11260,7 @@
1103911260
1104011261 if (!IsFrozen() && !ambientOcclusion)
1104111262 {
11042
- DrawSkyBox(gl);
11263
+ DrawSkyBox(gl, (float)ratio);
1104311264 }
1104411265
1104511266 //if (selection_view == -1)
....@@ -11222,9 +11443,9 @@
1122211443
1122311444 gl.glMatrixMode(GL.GL_MODELVIEW);
1122411445
11225
-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11226
-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11227
-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);
1122811449 } else
1122911450 {
1123011451 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11285,7 +11506,10 @@
1128511506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1128611507 } else
1128711508 {
11288
- 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());
1128911513 }
1129011514 }
1129111515
....@@ -11325,7 +11549,7 @@
1132511549
1132611550 // if (cam != lightCamera)
1132711551 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11328
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11552
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1132911553 }
1133011554
1133111555 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11641,8 +11865,11 @@
1164111865 repaint();
1164211866 }
1164311867
11644
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1164511871 repaint();
11872
+ }
1164611873
1164711874 displaydone = true;
1164811875 }
....@@ -11717,9 +11944,23 @@
1171711944 //GL gl = getGL();
1171811945 if ((TRACK || SHADOWTRACK) || zoomonce)
1171911946 {
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
+ }
1172011961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1172111962 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11722
- pingthread.StepToTarget(true); // true);
11963
+ pingthread.StepToTarget(); // true);
1172311964 // zoomonce = false;
1172411965 }
1172511966
....@@ -12399,50 +12640,80 @@
1239912640
1240012641 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1240112642
12402
- String program =
12643
+ String programmin =
1240312644 // Min shader
1240412645 "!!ARBfp1.0\n" +
12405
- "PARAM zero123 = { 0.0, 1.0, 2.0, 3.0 };" +
12406
- "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 };" +
1240712649 "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1240812650 "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
1240912651 "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
12652
+ "PARAM light2cam0 = program.env[10];" +
12653
+ "PARAM light2cam1 = program.env[11];" +
12654
+ "PARAM light2cam2 = program.env[12];" +
1241012655 "TEMP temp;" +
1241112656 "TEMP light;" +
1241212657 "TEMP ndotl;" +
1241312658 "TEMP normal;" +
1241412659 "TEMP depth;" +
12660
+ "TEMP eye;" +
12661
+ "TEMP pos;" +
1241512662
12416
- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12417
-
12663
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12664
+ Normalize("normal") +
1241812665 "MOV light, state.light[0].position;" +
1241912666 "DP3 ndotl.x, light, normal;" +
12667
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
1242012668
1242112669 // shadow
12422
- "MOV temp, fragment.texcoord[1];" +
12423
- TextureFetch("depth", "temp", "1") +
12670
+ "MOV pos, fragment.texcoord[1];" +
12671
+ "MOV temp, pos;" +
12672
+ ShadowTextureFetch("depth", "temp", "1") +
1242412673 //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12425
- "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
12426
-
12674
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
1242712675
1242812676 // No shadow when out of frustum
1242912677 //"SGE temp.y, depth.z, zero123.y;" +
1243012678 //"LRP temp.x, temp.y, zero123.y, temp.x;" +
1243112679
12432
- "MUL ndotl.x, ndotl.x, temp.x;" +
12433
- "MAX ndotl.x, ndotl.x, pow2.y;" +
12680
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1243412681
12682
+ // Backlit
12683
+ "MOV pos.w, zero12t.y;" + // one
12684
+ "DP4 eye.x, pos, light2cam0;" +
12685
+ "DP4 eye.y, pos, light2cam1;" +
12686
+ "DP4 eye.z, pos, light2cam2;" +
12687
+ Normalize("eye") +
12688
+
12689
+ "DP3 ndotl.y, -eye, normal;" +
12690
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
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
12694
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
12695
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
12696
+ "ADD ndotl.y, ndotl.y, one.x;" +
12697
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12698
+
12699
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12700
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12701
+
12702
+ // Pigment
1243512703 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12436
- "MUL temp, temp, ndotl.x;" +
12704
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12705
+ "MUL temp, temp, zero12t.w;" + // Times x
1243712706
12438
- "MUL temp, temp, zero123.z;" +
12707
+ //"MUL temp, temp, ndotl.y;" +
12708
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
1243912709
12440
- "MOV temp.w, zero123.y;" + // reset alpha
12710
+ "MUL temp, temp, ndotl.x;" + // lambert
1244112711
12712
+ "MOV temp.w, zero12t.y;" + // reset alpha
1244212713 "MOV result.color, temp;" +
1244312714 "END";
1244412715
12445
- String program2 =
12716
+ String programmax =
1244612717 "!!ARBfp1.0\n" +
1244712718
1244812719 //"OPTION ARB_fragment_program_shadow;" +
....@@ -12470,7 +12741,7 @@
1247012741 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1247112742 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1247212743 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12473
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12744
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1247412745 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1247512746 "PARAM options1 = program.env[62];" + // fog rgb color
1247612747 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12580,20 +12851,20 @@
1258012851 "MUL temp, floor, mapgrid.x;" +
1258112852 //"TEX depth0, temp, texture[1], 2D;" +
1258212853 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12583
- TextureFetch("depth0", "temp", "1") +
12854
+ ShadowTextureFetch("depth0", "temp", "1") +
1258412855 "") +
1258512856 "ADD temp.x, temp.x, mapgrid.x;" +
1258612857 //"TEX depth1, temp, texture[1], 2D;" +
1258712858 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12588
- TextureFetch("depth1", "temp", "1") +
12859
+ ShadowTextureFetch("depth1", "temp", "1") +
1258912860 "") +
1259012861 "ADD temp.y, temp.y, mapgrid.x;" +
1259112862 //"TEX depth2, temp, texture[1], 2D;" +
12592
- TextureFetch("depth2", "temp", "1") +
12863
+ ShadowTextureFetch("depth2", "temp", "1") +
1259312864 "SUB temp.x, temp.x, mapgrid.x;" +
1259412865 //"TEX depth3, temp, texture[1], 2D;" +
1259512866 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12596
- TextureFetch("depth3", "temp", "1") +
12867
+ ShadowTextureFetch("depth3", "temp", "1") +
1259712868 "") +
1259812869 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1259912870 //"MOV params, material;" +
....@@ -12715,7 +12986,7 @@
1271512986 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1271612987 // mar 2013 ??? "KIL alpha.a;" +
1271712988 "MOV alpha, texSamp.aaaa;" + // y;" +
12718
- "KIL alpha.a;" +
12989
+ "KIL alpha.a;" + // not sure with parallax mapping
1271912990 /*
1272012991 "MUL temp.xy, temp, two;" +
1272112992 "TXB bump, temp, texture[0], 2D;" +
....@@ -12801,11 +13072,6 @@
1280113072 "SUB bump0, bump0, half;" +
1280213073 "ADD bump, bump, bump0;" +
1280313074
12804
- "MOV temp.x, texSamp.a;" +
12805
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12806
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12807
- "MOV texSamp.a, temp.x;" +
12808
-
1280913075 // double-sided
1281013076 /**/
1281113077 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12815,26 +13081,73 @@
1281513081 "ADD temp.x, temp.x, one.x;" +
1281613082 "MUL normal, normal, temp.xxxx;":""
1281713083 ) +
12818
- /**/
12819
-//// Normalize("normal") +
12820
-//// "MAX normal.z, eps.x, normal.z;" +
12821
-// Normalize("normal") +
12822
- "MOV normald, normal;" +
12823
- "MOV normals, normal;" +
13084
+ /**/
13085
+
13086
+ "MOV temp, fragment.texcoord[4];" +
1282413087
1282513088 // UV base
1282613089 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1282713090 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1282813091 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12829
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12830
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12831
- "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
+
1283213097 "XPD V, normal, UP;" +
1283313098 Normalize("V") +
1283413099 "XPD U, V, normal;" +
1283513100 Normalize("U") +
1283613101
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
+
1283713113 // 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;" +
1283813151
1283913152 //"MOV temp, fragment.texcoord[0];" +
1284013153 //
....@@ -12967,7 +13280,7 @@
1296713280 // display shadow only (fakedepth == 0)
1296813281 "SUB temp.x, half.x, shadow.x;" +
1296913282 "MOV temp.y, -params5.z;" + // params6.x;" +
12970
- "SLT temp.z, temp.y, -one2048th.x;" +
13283
+ "SLT temp.z, temp.y, -c256i.x;" +
1297113284 "SUB temp.y, one.x, temp.z;" +
1297213285 "MUL temp.x, temp.x, temp.y;" +
1297313286 "KIL temp.x;" +
....@@ -13298,8 +13611,19 @@
1329813611 //once = true;
1329913612 }
1330013613
13301
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13302
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13614
+ String program = programmax;
13615
+
13616
+ if (Globals.MINSHADER)
13617
+ {
13618
+ program = programmin;
13619
+ }
13620
+
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
+
1330313627 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1330413628
1330513629 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13346,7 +13670,8 @@
1334613670 "\n" +
1334713671 "END\n";
1334813672
13349
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13673
+ if (Globals.DEBUG)
13674
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1335013675 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1335113676
1335213677 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13391,25 +13716,26 @@
1339113716 return out;
1339213717 }
1339313718
13394
- String TextureFetch(String dest, String src, String unit)
13719
+ // Also does frustum culling
13720
+ String ShadowTextureFetch(String dest, String src, String unit)
1339513721 {
1339613722 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1339713723 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1339813724 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13725
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13726
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1339913727 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13400
- "SLT " + src + ".z, " + src + ".x, one.x;" +
13401
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13402
- "SLT " + src + ".z, " + src + ".y, one.x;" +
13403
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13728
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13729
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1340413730 //"SWZ buffer, temp, w,w,w,w;";
13405
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13731
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1340613732 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1340713733 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1340813734 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13409
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13735
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1341013736
13411
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13412
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13737
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13738
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1341313739 }
1341413740
1341513741 String Shadow(String depth, String shadow)
....@@ -13603,7 +13929,7 @@
1360313929 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1360413930 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1360513931 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13606
- /*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
1360713933
1360813934 //Object3D.cVector2[] vector2buffer;
1360913935
....@@ -13770,7 +14096,7 @@
1377014096 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1377114097 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1377214098 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13773
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14099
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1377414100 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1377514101 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1377614102 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13831,7 +14157,7 @@
1383114157 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1383214158 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1383314159 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13834
- //"MOV result.texcoord, vertex.texcoord;" +
14160
+ //"MOV result.texcoord, vertex.fogcoord;" +
1383514161 "MOV result.texcoord, temp;" +
1383614162 // border fade
1383714163 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13878,7 +14204,9 @@
1387814204
1387914205 //"ADD temp.z, temp.z, one;" +
1388014206
13881
- "MOV result.color, temp;"
14207
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14208
+
14209
+ "MOV result.color, temp;" // Normal
1388214210 : "MOV result.color, vertex.color;") +
1388314211 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1388414212 : "") +
....@@ -14013,10 +14341,13 @@
1401314341 public void mouseClicked(MouseEvent e)
1401414342 {
1401514343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1401614345 }
1401714346
1401814347 public void mousePressed(MouseEvent e)
1401914348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1402014351 //System.out.println("mousePressed: " + e);
1402114352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1402214353 }
....@@ -14051,10 +14382,12 @@
1405114382 return;
1405214383 }
1405314384
14054
- 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;
1405514388
1405614389 // TIMER
14057
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1405814391 {
1405914392 keepboxmode = BOXMODE;
1406014393 keepsupport = SUPPORT;
....@@ -14095,7 +14428,7 @@
1409514428 //}
1409614429
1409714430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
14098
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1409914432 anchorX = ax;
1410014433 anchorY = ay;
1410114434 prevX = px;
....@@ -14190,8 +14523,9 @@
1419014523 // fev 2014???
1419114524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
1419214525 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14193
- pingthread.StepToTarget(true); // true);
14526
+ pingthread.StepToTarget(); // true);
1419414527 }
14528
+
1419514529 // if (!LIVE)
1419614530 super.repaint();
1419714531 }
....@@ -14254,14 +14588,15 @@
1425414588 drag = false;
1425514589 //System.out.println("Mouse DOWN");
1425614590 editObj = false;
14257
- ClickInfo info = new ClickInfo();
14258
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14259
- info.pane = this;
14260
- info.camera = renderCamera;
14261
- info.x = x;
14262
- info.y = y;
14263
- info.modifiers = modifiersex;
14264
- 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);
1426514600 if (!editObj)
1426614601 {
1426714602 hasMarquee = true;
....@@ -14285,8 +14620,8 @@
1428514620
1428614621 //if (drawing)
1428714622 //return;
14288
- if ((e.getModifiersEx() & CTRL) != 0
14289
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1429014625 {
1429114626 //System.out.println("mouseDragged: " + e);
1429214627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14310,9 +14645,17 @@
1431014645 return targetLookAt;
1431114646 }
1431214647
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
+
1431314653 class PingThread extends Thread
1431414654 {
1431514655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute;
1431614659
1431714660 // void JumpToTarget()
1431814661 // {
....@@ -14328,6 +14671,88 @@
1432814671 // only one thread!? synchronized
1432914672 void StepToTarget(boolean jump)
1433014673 {
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
+
1433114756 tmp.set(targetLookAt);
1433214757 tmp.sub(manipCamera.lookAt); // june 2014
1433314758
....@@ -14365,7 +14790,7 @@
1436514790
1436614791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1436714792 {
14368
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1436914794 }
1437014795
1437114796 if (OEILONCE && OEIL)
....@@ -14400,7 +14825,10 @@
1440014825 if (tmp.dot(tmp) < 0.00001)
1440114826 {
1440214827 zoomonce = false;
14828
+ live = false;
1440314829 }
14830
+ else
14831
+ live = true;
1440414832
1440514833 tmp.mul(step > step2 ? step : step2);
1440614834 }
....@@ -14427,7 +14855,7 @@
1442714855 {
1442814856 if (LOOKAT)
1442914857 manipCamera.lookAt.add(tmp);
14430
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1443114859 manipCamera.location.add(tmp);
1443214860
1443314861 {
....@@ -14442,7 +14870,10 @@
1444214870 lightCamera.computeTransform();
1444314871 }
1444414872 }
14445
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1444614877 }
1444714878 // ?????? mouseDown = true;
1444814879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14535,49 +14966,107 @@
1453514966 }
1453614967 }
1453714968 }
14969
+
1453814970 PingThread pingthread = new PingThread();
14539
- int delta = 5;
14540
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1454114974 boolean autorepeat = false;
1454214975
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
+
1454314995 void GoDown(int mod)
1454414996 {
1454514997 MODIFIERS |= COMMAND;
14998
+ boolean isVR = (mouseMode&VR)!=0;
1454614999 /**/
1454715000 if((mod&SHIFT) == SHIFT)
14548
- manipCamera.RotatePosition(0, -speed);
14549
- else
14550
- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14551
- /**/
14552
- if ((mod & SHIFT) == SHIFT)
1455315001 {
14554
- mouseMode = mouseMode; // VR??
14555
- } else
14556
- {
14557
- 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());
1455815009 }
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
+// }
1455915026
15027
+ targetLookAt.set(manipCamera.lookAt);
15028
+
1456015029 //prevX = X = anchorX;
1456115030 prevY = Y = anchorY - (int) (renderCamera.Distance());
1456215031 }
1456315032
1456415033 void GoUp(int mod)
1456515034 {
15035
+ RigidBody.justclicked = true;
15036
+
1456615037 MODIFIERS |= COMMAND;
1456715038 /**/
15039
+ boolean isVR = (mouseMode&VR)!=0;
15040
+
1456815041 if((mod&SHIFT) == SHIFT)
14569
- manipCamera.RotatePosition(0, speed);
14570
- else
14571
- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14572
- /**/
14573
- if ((mod & SHIFT) == SHIFT)
1457415042 {
14575
- mouseMode = mouseMode;
14576
- } else
14577
- {
14578
- 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());
1457915050 }
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
+// }
1458015067
15068
+ targetLookAt.set(manipCamera.lookAt);
15069
+
1458115070 //prevX = X = anchorX;
1458215071 prevY = Y = anchorY + (int) (renderCamera.Distance());
1458315072 }
....@@ -14587,18 +15076,29 @@
1458715076 MODIFIERS |= COMMAND;
1458815077 /**/
1458915078 if((mod&SHIFT) == SHIFT)
14590
- manipCamera.Translate(speed*delta, 0, getWidth());
15079
+ manipCamera.Translate(speed, 0, getWidth());
1459115080 else
14592
- 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
+
1459315088 /**/
14594
- if ((mod & SHIFT) == SHIFT)
14595
- {
14596
- mouseMode = mouseMode;
14597
- } else
14598
- {
14599
- mouseMode |= ROTATE;
14600
- } // TRANSLATE;
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1460115096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
15100
+ targetLookAt.set(manipCamera.lookAt);
15101
+
1460215102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1460315103 prevY = Y = anchorY;
1460415104 }
....@@ -14608,18 +15108,26 @@
1460815108 MODIFIERS |= COMMAND;
1460915109 /**/
1461015110 if((mod&SHIFT) == SHIFT)
14611
- manipCamera.Translate(-speed*delta, 0, getWidth());
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1461215112 else
14613
- 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
+
1461415120 /**/
14615
- if ((mod & SHIFT) == SHIFT)
14616
- {
14617
- mouseMode = mouseMode;
14618
- } else
14619
- {
14620
- mouseMode |= ROTATE;
14621
- } // TRANSLATE;
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1462215128
15129
+ targetLookAt.set(manipCamera.lookAt);
15130
+
1462315131 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1462415132 prevY = Y = anchorY;
1462515133 }
....@@ -14661,15 +15169,16 @@
1466115169 if (editObj)
1466215170 {
1466315171 drag = true;
14664
- ClickInfo info = new ClickInfo();
14665
- info.bounds.setBounds(0, 0,
15172
+ //ClickInfo info = new ClickInfo();
15173
+ object.clickInfo.bounds.setBounds(0, 0,
1466615174 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14667
- info.pane = this;
14668
- info.camera = renderCamera;
14669
- info.x = x;
14670
- info.y = y;
14671
- object.GetWindow().copy
14672
- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
15175
+ object.clickInfo.pane = this;
15176
+ object.clickInfo.camera = renderCamera;
15177
+ object.clickInfo.x = x;
15178
+ object.clickInfo.y = y;
15179
+ object //.GetWindow().copy
15180
+ .doEditDrag(//info,
15181
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1467315182 } else
1467415183 {
1467515184 if (x < startX)
....@@ -14752,6 +15261,11 @@
1475215261 if ((mouseMode & ZOOM) != 0)
1475315262 {
1475415263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1475515269 if ((mouseMode & VR) != 0)
1475615270 manipCamera.BackForth(dx, dy, getWidth());
1475715271 else
....@@ -14818,24 +15332,30 @@
1481815332 }
1481915333 }
1482015334
15335
+// ClickInfo clickInfo = new ClickInfo();
15336
+
1482115337 public void mouseMoved(MouseEvent e)
1482215338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1482315342 //System.out.println("mouseMoved: " + e);
1482415343 if (isRenderer)
1482515344 return;
1482615345
14827
- ClickInfo ci = new ClickInfo();
14828
- ci.x = e.getX();
14829
- ci.y = e.getY();
14830
- ci.modifiers = e.getModifiersEx();
14831
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14832
- ci.pane = this;
14833
- ci.camera = renderCamera;
15346
+ // Mouse cursor feedback
15347
+ object.clickInfo.x = e.getX();
15348
+ object.clickInfo.y = e.getY();
15349
+ object.clickInfo.modifiers = e.getModifiersEx();
15350
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
15351
+ object.clickInfo.pane = this;
15352
+ object.clickInfo.camera = renderCamera;
1483415353 if (!isRenderer)
1483515354 {
1483615355 //ObjEditor editWindow = object.editWindow;
1483715356 //Object3D copy = editWindow.copy;
14838
- if (object.doEditClick(ci, 0))
15357
+ if (object.doEditClick(//clickInfo,
15358
+ 0))
1483915359 {
1484015360 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1484115361 } else
....@@ -15003,8 +15523,10 @@
1500315523 mouseMode |= ZOOM;
1500415524 }
1500515525
15006
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15007
- 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)
1500815530 {
1500915531 mouseMode |= VR; // BACKFORTH;
1501015532 }
....@@ -15016,7 +15538,8 @@
1501615538 {
1501715539 mouseMode |= SELECT;
1501815540 }
15019
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1502015543 {
1502115544 mouseMode &= ~VR;
1502215545 mouseMode |= TRANSLATE;
....@@ -15060,8 +15583,18 @@
1506015583 float SATPOW = 1; // 2; // 0.5f;
1506115584 float BRIPOW = 1; // 0.5f; // 0.5f;
1506215585
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
+
1506315592 public void keyPressed(int key)
1506415593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1506515598 if (key >= '0' && key <= '5')
1506615599 clampbit = (key-'0');
1506715600
....@@ -15118,8 +15651,8 @@
1511815651 case 'K':
1511915652 KOMPACTTEXTURE ^= true;
1512015653 //textures.clear();
15121
- break;
15122
- case 'P': // Texture Projection macros
15654
+ // break;
15655
+ //case 'P': // Texture Projection macros
1512315656 // SAVETEXTURE ^= true;
1512415657 macromode = true;
1512515658 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15220,8 +15753,8 @@
1522015753 RevertCamera();
1522115754 repaint();
1522215755 break;
15223
- case 'l':
15224
- //case 'L':
15756
+ //case 'l':
15757
+ case 'L':
1522515758 if (lightMode)
1522615759 {
1522715760 lightMode = false;
....@@ -15240,7 +15773,7 @@
1524015773 targetLookAt.set(manipCamera.lookAt);
1524115774 repaint();
1524215775 break;
15243
- case 'p':
15776
+ case 'P': // p':
1524415777 // c'est quoi ca au juste? spherical ^= true;
1524515778 Skinshader ^= true; programInitialized = false;
1524615779 repaint();
....@@ -15251,7 +15784,8 @@
1525115784 break;
1525215785 case 'm':
1525315786 {
15254
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1525515789 break;
1525615790 }
1525715791 case 'M':
....@@ -15278,27 +15812,31 @@
1527815812 repaint();
1527915813 break;
1528015814 case 'O':
15281
- Globals.drawMode = OCCLUSION; // WARNING
15282
- repaint();
15283
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1528415818 case 'o':
1528515819 OCCLUSION_CULLING ^= true;
1528615820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1528715821 break;
15288
- case '0': envyoff ^= true; repaint(); break;
15822
+ //case '0': envyoff ^= true; repaint(); break;
1528915823 case '1':
1529015824 case '2':
1529115825 case '3':
1529215826 case '4':
1529315827 case '5':
15294
- newenvy = Character.getNumericValue(key);
15295
- repaint();
15296
- break;
1529715828 case '6':
1529815829 case '7':
1529915830 case '8':
1530015831 case '9':
15301
- BGcolor = (key - '6')/3.f;
15832
+ if (true) // envyoff)
15833
+ {
15834
+ BGcolor = (key - '1')/8.f;
15835
+ }
15836
+ else
15837
+ {
15838
+ //newenvy = Character.getNumericValue(key);
15839
+ }
1530215840 repaint();
1530315841 break;
1530415842 case '!':
....@@ -15368,7 +15906,21 @@
1536815906 // kompactbit = 6;
1536915907 // break;
1537015908 case ' ':
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
1537115913 lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
1537215924 Globals.lighttouched = true;
1537315925 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1537415926 targetLookAt.set(manipCamera.lookAt);
....@@ -15376,6 +15928,10 @@
1537615928 break;
1537715929 //case '`' :
1537815930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1537915935 RENDERPROGRAM += 1;
1538015936 RENDERPROGRAM %= 3;
1538115937
....@@ -15414,6 +15970,10 @@
1541415970 case ENTER:
1541515971 // object.editWindow.ScreenFit(); // Edit();
1541615972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1541715977 break;
1541815978 case DELETE:
1541915979 ClearSelection();
....@@ -15450,17 +16010,23 @@
1545016010 object.GetWindow().refreshContents(true);
1545116011 break;
1545216012 case '{':
15453
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1545416016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1545516017 repaint();
1545616018 break;
1545716019 case '}':
15458
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1545916023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1546016024 repaint();
1546116025 break;
1546216026 case '[':
15463
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1546416030 if (false) //manipCamera.hAspect == 0)
1546516031 {
1546616032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15476,7 +16042,9 @@
1547616042 break;
1547716043 case ']':
1547816044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15479
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1548016048 if (false) //manipCamera.hAspect == 0)
1548116049 {
1548216050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15514,98 +16082,113 @@
1551416082 }
1551516083 }
1551616084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1551716089 public void processKeyEvent(KeyEvent e)
1551816090 {
1551916091 switch (e.getID())
1552016092 {
1552116093 case KeyEvent.KEY_PRESSED:
15522
- if (!autorepeat)
15523
- {
15524
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15525
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15526
- }
15527
- if (manipCamera == lightCamera)
15528
- {
15529
- switch (e.getKeyCode())
15530
- {
15531
- case DOWN_ARROW:
15532
- lightCamera.DECAL /= 2;
15533
- repaint();
15534
- break;
15535
- case UP_ARROW:
15536
- lightCamera.DECAL *= 2;
15537
- repaint();
15538
- break;
15539
- case LEFT_ARROW:
15540
- lightCamera.SCALE /= 2;
15541
- repaint();
15542
- break;
15543
- case RIGHT_ARROW:
15544
- lightCamera.SCALE *= 2;
15545
- repaint();
15546
- break;
15547
- default:
15548
- break;
15549
- }
15550
-
15551
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15552
- } else
15553
- {
15554
- if (true) // !autorepeat)
15555
- {
15556
- boolean reset = true;
15557
-
15558
- switch (e.getKeyCode())
15559
- {
15560
- case DOWN_ARROW:
15561
- GoDown(e.getModifiersEx());
15562
- repaint();
15563
- break;
15564
- case UP_ARROW:
15565
- GoUp(e.getModifiersEx());
15566
- repaint();
15567
- break;
15568
- case LEFT_ARROW:
15569
- GoLeft(e.getModifiersEx());
15570
- repaint();
15571
- break;
15572
- case RIGHT_ARROW:
15573
- GoRight(e.getModifiersEx());
15574
- repaint();
15575
- break;
15576
- default:
15577
- reset = false;
15578
- break;
15579
- }
15580
-
15581
- if (reset)
15582
- {
15583
- autorepeat = true;
15584
-
15585
- targetLookAt.set(manipCamera.lookAt);
15586
- }
15587
- }
15588
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1558916099 break;
15590
- case KeyEvent.KEY_TYPED:
15591
- 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;
1559216170 case KeyEvent.KEY_RELEASED:
15593
- {
15594
- switch (e.getKeyCode())
15595
- {
15596
- case DOWN_ARROW:
15597
- case UP_ARROW:
15598
- case LEFT_ARROW:
15599
- case RIGHT_ARROW:
15600
- MODIFIERS &= ~COMMAND;
15601
- autorepeat = false;
15602
- break;
15603
- default:
15604
- break;
15605
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1560616173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1560716175 break;
15608
- }
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
+// }
1560916192 default:
1561016193 break;
1561116194 }
....@@ -15861,8 +16444,6 @@
1586116444
1586216445 int width = getBounds().width;
1586316446 int height = getBounds().height;
15864
- ClickInfo info = new ClickInfo();
15865
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1586616447 //Image img = CreateImage(width, height);
1586716448 //System.out.println("width = " + width + "; height = " + height + "\n");
1586816449
....@@ -15939,31 +16520,37 @@
1593916520 }
1594016521 if (object != null && !hasMarquee)
1594116522 {
16523
+ if (object.clickInfo == null)
16524
+ object.clickInfo = new ClickInfo();
16525
+ ClickInfo info = object.clickInfo;
16526
+ //ClickInfo info = new ClickInfo();
16527
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16528
+
1594216529 if (isRenderer)
1594316530 {
15944
- info.flags++;
16531
+ object.clickInfo.flags++;
1594516532 double frameAspect = (double) width / (double) height;
1594616533 if (frameAspect > renderCamera.aspect)
1594716534 {
1594816535 int desired = (int) ((double) height * renderCamera.aspect);
15949
- info.bounds.width -= width - desired;
15950
- info.bounds.x += (width - desired) / 2;
16536
+ object.clickInfo.bounds.width -= width - desired;
16537
+ object.clickInfo.bounds.x += (width - desired) / 2;
1595116538 } else
1595216539 {
1595316540 int desired = (int) ((double) width / renderCamera.aspect);
15954
- info.bounds.height -= height - desired;
15955
- info.bounds.y += (height - desired) / 2;
16541
+ object.clickInfo.bounds.height -= height - desired;
16542
+ object.clickInfo.bounds.y += (height - desired) / 2;
1595616543 }
1595716544 }
1595816545
15959
- info.g = gr;
15960
- info.camera = renderCamera;
16546
+ object.clickInfo.g = gr;
16547
+ object.clickInfo.camera = renderCamera;
1596116548 /*
1596216549 // Memory intensive (brep.verticescopy)
1596316550 if (!(object instanceof Composite))
1596416551 object.draw(info, 0, false); // SLOW :
1596516552 */
15966
- if (!isRenderer)
16553
+ if (!isRenderer) // && drag)
1596716554 {
1596816555 Grafreed.Assert(object != null);
1596916556 Grafreed.Assert(object.selection != null);
....@@ -15971,9 +16558,9 @@
1597116558 {
1597216559 int hitSomething = object.selection.get(0).hitSomething;
1597316560
15974
- info.DX = 0;
15975
- info.DY = 0;
15976
- info.W = 1;
16561
+ object.clickInfo.DX = 0;
16562
+ object.clickInfo.DY = 0;
16563
+ object.clickInfo.W = 1;
1597716564 if (hitSomething == Object3D.hitCenter)
1597816565 {
1597916566 info.DX = X;
....@@ -15985,13 +16572,14 @@
1598516572 info.DY -= info.bounds.height/2;
1598616573 }
1598716574
15988
- object.drawEditHandles(info, 0);
16575
+ object.drawEditHandles(//info,
16576
+ 0);
1598916577
1599016578 if (drag && (X != 0 || Y != 0))
1599116579 {
1599216580 switch (hitSomething)
1599316581 {
15994
- case Object3D.hitCenter: gr.setColor(Color.pink);
16582
+ case Object3D.hitCenter: gr.setColor(Color.white);
1599516583 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1599616584 break;
1599716585 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16017,7 +16605,7 @@
1601716605 if (hasMarquee)
1601816606 {
1601916607 gr.setXORMode(Color.white);
16020
- gr.setColor(Color.red);
16608
+ gr.setColor(Color.white);
1602116609 if (!firstime)
1602216610 {
1602316611 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16176,7 +16764,8 @@
1617616764
1617716765 public boolean mouseDrag(Event evt, int x, int y)
1617816766 {
16179
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1618016769 /*
1618116770 drag = true;
1618216771 //System.out.println("Mouse DRAG");
....@@ -16295,6 +16884,7 @@
1629516884 public boolean mouseUp(Event evt, int x, int y)
1629616885 {
1629716886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1629816888 /*
1629916889 locked = false;
1630016890 if (isRenderer)
....@@ -16484,6 +17074,8 @@
1648417074 private /*static*/ boolean firstime;
1648517075 private /*static*/ cVector newView = new cVector();
1648617076 private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
17077
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
17078
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1648717079 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1648817080 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1648917081 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16496,29 +17088,67 @@
1649617088 {
1649717089 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1649817090
17091
+ int usedsuf = 0;
17092
+
1649917093 for (int i = 0; i < suffixes.length; i++)
1650017094 {
16501
- String resourceName = basename + suffixes[i] + "." + suffix;
16502
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16503
- mipmapped,
16504
- FileUtil.getFileSuffix(resourceName));
16505
- if (data == null)
17095
+ String[] suffixe = suffixes;
17096
+ String[] fallback = suffixes2;
17097
+ String[] fallfallback = suffixes3;
17098
+
17099
+ for (int c=usedsuf; --c>=0;)
1650617100 {
16507
- throw new IOException("Unable to load texture " + resourceName);
17101
+// String[] temp = suffixe;
17102
+// suffixe = fallback;
17103
+// fallback = fallfallback;
17104
+// fallfallback = temp;
1650817105 }
17106
+
17107
+ String resourceName = basename + suffixe[i] + "." + suffix;
17108
+ TextureData data;
17109
+
17110
+ try
17111
+ {
17112
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17113
+ mipmapped,
17114
+ FileUtil.getFileSuffix(resourceName));
17115
+ }
17116
+ catch (Exception e)
17117
+ {
17118
+ try
17119
+ {
17120
+ resourceName = basename + fallback[i] + "." + suffix;
17121
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17122
+ mipmapped,
17123
+ FileUtil.getFileSuffix(resourceName));
17124
+ }
17125
+ catch (Exception e2)
17126
+ {
17127
+ resourceName = basename + fallfallback[i] + "." + suffix;
17128
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17129
+ mipmapped,
17130
+ FileUtil.getFileSuffix(resourceName));
17131
+ }
17132
+ }
17133
+
1650917134 //System.out.println("Target = " + targets[i]);
1651017135 cubemap.updateImage(data, targets[i]);
1651117136 }
1651217137
1651317138 return cubemap;
1651417139 }
17140
+
1651517141 int bigsphere = -1;
1651617142
1651717143 float BGcolor = 0.5f;
1651817144
16519
- private void DrawSkyBox(GL gl)
17145
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17146
+
17147
+ private void DrawSkyBox(GL gl, float ratio)
1652017148 {
16521
- if (envyoff || cubemap == null)
17149
+ if (//envyoff ||
17150
+ WIREFRAME ||
17151
+ cubemap == null)
1652217152 {
1652317153 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1652417154 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -16533,7 +17163,17 @@
1653317163 // Compensates for ExaminerViewer's modification of modelview matrix
1653417164 gl.glMatrixMode(GL.GL_MODELVIEW);
1653517165 gl.glLoadIdentity();
17166
+ gl.glScalef(1,ratio,1);
1653617167
17168
+// colorV[0] = 2;
17169
+// colorV[1] = 2;
17170
+// colorV[2] = 2;
17171
+// colorV[3] = 1;
17172
+// gl.glDisable(gl.GL_COLOR_MATERIAL);
17173
+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
17174
+//
17175
+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
17176
+
1653717177 //gl.glActiveTexture(GL.GL_TEXTURE1);
1653817178 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1653917179
....@@ -16565,6 +17205,7 @@
1656517205 {
1656617206 gl.glScalef(1.0f, -1.0f, 1.0f);
1656717207 }
17208
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1656817209 gl.glMultMatrixd(viewrot_1, 0);
1656917210 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1657017211 //viewer.updateInverseRotation(gl);
....@@ -16605,7 +17246,8 @@
1660517246 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1660617247
1660717248 cubemap.disable();
16608
- ////cubemap.unbind();
17249
+ //cubemap.dispose();
17250
+
1660917251 if (CULLFACE)
1661017252 {
1661117253 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16661,7 +17303,7 @@
1666117303 gl.glScalef(1.0f, -1.0f, 1.0f);
1666217304 }
1666317305
16664
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17306
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1666517307
1666617308 float step = 2; // 0.1666f; //0.25f;
1666717309 float stepv = 2; // step * 1652 / 998;
....@@ -16823,7 +17465,7 @@
1682317465 //new Exception().printStackTrace();
1682417466 System.out.println("select buffer init");
1682517467 // Use debug pipeline
16826
- drawable.setGL(new DebugGL(drawable.getGL()));
17468
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1682717469
1682817470 GL gl = drawable.getGL();
1682917471
....@@ -16950,7 +17592,7 @@
1695017592
1695117593 float depth = depths[y * TEX_SIZE + x];
1695217594
16953
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1695417596 {
1695517597 pointselection = false;
1695617598
....@@ -17141,6 +17783,7 @@
1714117783
1714217784 public void init(GLAutoDrawable drawable)
1714317785 {
17786
+ if (Globals.DEBUG)
1714417787 System.out.println("shadow buffer init");
1714517788
1714617789 GL gl = drawable.getGL();
....@@ -17369,10 +18012,14 @@
1736918012 gl.glFlush();
1737018013
1737118014 /**/
17372
- 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);
1737318016
17374
- float[] pixels = occlusionsizebuffer.array();
18017
+ float[] depths = occlusiondepthbuffer.array();
1737518018
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
+
1737618023 double r = 0, g = 0, b = 0;
1737718024
1737818025 double count = 0;
....@@ -17383,7 +18030,7 @@
1738318030
1738418031 double FACTOR = 1;
1738518032
17386
- for (int i = 0; i < pixels.length; i++)
18033
+ for (int i = 0; i < depths.length; i++)
1738718034 {
1738818035 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1738918036 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17466,7 +18113,7 @@
1746618113
1746718114 double scale = ray.z; // 1; // cos
1746818115
17469
- float depth = pixels[newindex];
18116
+ float depth = depths[newindex];
1747018117
1747118118 /*
1747218119 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17609,6 +18256,11 @@
1760918256 static boolean DEBUG_SELECTION = false;
1761018257 boolean OCCLUSION_CULLING = false; //true;
1761118258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1761218264 static public int indexcount = 0;
1761318265 /*static*/ cColor vertexOcclusion = new cColor();
1761418266 //private int selection_view = -1;
....@@ -17663,11 +18315,14 @@
1766318315 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1766418316 static IntBuffer bigAAbuffer;
1766518317 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17666
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18318
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1766718319 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1766818320 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1766918321 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17670
- 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
+
1767118326 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1767218327 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1767318328 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();