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.*;
....@@ -18,7 +19,10 @@
1819 import javax.imageio.ImageIO;
1920 import javax.imageio.ImageWriteParam;
2021 import javax.imageio.ImageWriter;
22
+import javax.imageio.ImageReadParam;
23
+import javax.imageio.ImageReader;
2124 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
25
+import javax.imageio.stream.ImageInputStream;
2226 import javax.imageio.stream.ImageOutputStream;
2327 import javax.imageio.ImageWriteParam;
2428
....@@ -30,6 +34,7 @@
3034 import java.nio.*;
3135
3236 import gleem.linalg.Mat4f;
37
+import javax.imageio.ImageTypeSpecifier;
3338
3439 class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
3540 {
....@@ -93,7 +98,7 @@
9398 //boolean REDUCETEXTURE = true;
9499 boolean CACHETEXTURE = true;
95100 boolean CLEANCACHE = false; // true;
96
- boolean MIPMAP = true; // false; // true;
101
+ boolean MIPMAP = false; // true; // never works...
97102 boolean COMPRESSTEXTURE = false;
98103 boolean KOMPACTTEXTURE = false; // true;
99104 boolean RESIZETEXTURE = false;
....@@ -106,7 +111,11 @@
106111 //private Mat4f spotlightTransform = new Mat4f();
107112 //private Mat4f spotlightInverseTransform = new Mat4f();
108113 static GLContext glcontext = null;
109
- /*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
+
110119 boolean reverseUP = false;
111120 static boolean frozen = false;
112121 boolean enablebackspace = false; // patch for back buffer refresh
....@@ -115,7 +124,7 @@
115124 static boolean LOCALTRANSFORM = false;
116125 static boolean FULLSCREEN = false;
117126 static boolean SUPPORT = true;
118
-static boolean INERTIA = true;
127
+static boolean INERTIA = false; // true;
119128 static boolean FAST = false;
120129 static boolean SLOWPOSE = false;
121130 static boolean FOOTCONTACT = true;
....@@ -126,7 +135,7 @@
126135 static boolean ZOOMBOXMODE = false;
127136 static boolean BOXMODE = false;
128137 static boolean IMAGEFLIP = false;
129
-static boolean SMOOTHFOCUS = false;
138
+static boolean SMOOTHFOCUS = true; // false;
130139 static boolean SPEAKERMOCAP = true; // jan 2014 false;
131140 static boolean SPEAKERCAMERA = false;
132141 static boolean SPEAKERFOCUS = false;
....@@ -160,16 +169,16 @@
160169
161170
162171 // OPTIONS
163
- boolean Skinshader = true;
172
+ boolean Skinshader = false; // true;
164173 boolean cameraLight = false;
165174 boolean UVdebug = false;
166175 boolean Udebug = false;
167176 boolean Vdebug = false;
168177 boolean NORMALdebug = false;
169
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
178
+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
170179 boolean anisotropy = true;
171180 boolean softshadow = true; // slower but better false;
172
- boolean opacityhalo = false;
181
+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
173182
174183 boolean macromode = false;
175184
....@@ -183,6 +192,19 @@
183192 }
184193
185194 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
+ }
186208
187209 void SetAsGLRenderer(boolean b)
188210 {
....@@ -200,9 +222,10 @@
200222 cameras = new Camera[2];
201223 targetLookAts = new cVector[2];
202224
203
- SetCamera(cam);
225
+ SetCamera(cam, true);
204226
205
- SetLight(new Camera(new cVector(10, 10, -20)));
227
+ // Warning: not used.
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
206229
207230 object = o;
208231
....@@ -227,7 +250,7 @@
227250
228251 public javax.media.opengl.GL GetGL0()
229252 {
230
- return null;
253
+ return currentGL;
231254 }
232255
233256 public int GenList()
....@@ -520,7 +543,8 @@
520543 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
521544 LA.vecCross(obj.v0, obj.v1, obj.v2);
522545 LA.vecNormalize(obj.v2);
523
- 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);
524548 }
525549
526550 // P
....@@ -542,7 +566,7 @@
542566 y += ny * obj.NORMALPUSH;
543567 z += nz * obj.NORMALPUSH;
544568
545
- gl.glNormal3f(nx, ny, nz);
569
+ SetGLNormal(gl, nx, ny, nz);
546570 }
547571 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
548572 SetColor(obj, pv);
....@@ -574,7 +598,7 @@
574598 y += ny * obj.NORMALPUSH;
575599 z += nz * obj.NORMALPUSH;
576600
577
- gl.glNormal3f(nx, ny, nz);
601
+ SetGLNormal(gl, nx, ny, nz);
578602 }
579603 //System.out.println("vertexq = " + qv.s + ", " + qv.t);
580604 // boolean locked = false;
....@@ -622,7 +646,7 @@
622646 y += ny * obj.NORMALPUSH;
623647 z += nz * obj.NORMALPUSH;
624648
625
- gl.glNormal3f(nx, ny, nz);
649
+ SetGLNormal(gl, nx, ny, nz);
626650 }
627651
628652 // if ((dot&4) == 0)
....@@ -858,7 +882,7 @@
858882 //// tris.postdraw(this);
859883 }
860884
861
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
862886 static cVector from = new cVector();
863887 static cVector to = new cVector();
864888
....@@ -867,7 +891,7 @@
867891 CameraPane cp = this;
868892
869893 Camera keep = cp.RenderCamera();
870
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
871895
872896 if (br.trimmed)
873897 {
....@@ -885,7 +909,7 @@
885909 br.positions[i3 + 2] + br.normals[i3 + 2]);
886910 LA.xformPos(from, transform, from);
887911 LA.xformPos(to, transform, to); // RIGID ONLY
888
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
889913
890914 CameraPane.occlusionbuffer.display();
891915
....@@ -919,7 +943,7 @@
919943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
920944 LA.xformPos(from, transform, from);
921945 LA.xformPos(to, transform, to); // RIGID ONLY
922
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
923947
924948 CameraPane.occlusionbuffer.display();
925949
....@@ -1228,10 +1252,10 @@
12281252 {
12291253 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12301254 {
1231
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1255
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12321256 } else
12331257 {
1234
- gl.glNormal3f(0, 0, 1);
1258
+ SetGLNormal(gl, 0, 0, 1);
12351259 }
12361260
12371261 if (c != null)
....@@ -1255,10 +1279,10 @@
12551279 {
12561280 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12571281 {
1258
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1282
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12591283 } else
12601284 {
1261
- gl.glNormal3f(0, 0, 1);
1285
+ SetGLNormal(gl, 0, 0, 1);
12621286 }
12631287 if (c != null)
12641288 {
....@@ -1283,10 +1307,10 @@
12831307 {
12841308 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12851309 {
1286
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1310
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12871311 } else
12881312 {
1289
- gl.glNormal3f(0, 0, 1);
1313
+ SetGLNormal(gl, 0, 0, 1);
12901314 }
12911315 if (c != null)
12921316 {
....@@ -1468,7 +1492,7 @@
14681492 {
14691493 if (!selectmode)
14701494 {
1471
- 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);
14721496 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14731497
14741498 if (flipV)
....@@ -1480,6 +1504,8 @@
14801504 gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14811505 }
14821506
1507
+ float[] colorV = new float[4];
1508
+
14831509 void SetColor(Object3D obj, Vertex p0)
14841510 {
14851511 CameraPane display = this;
....@@ -1504,7 +1530,7 @@
15041530 }
15051531 }
15061532 float b = 0;
1507
- if (obj.support != null && obj.link2master)
1533
+ if (obj.support != null && obj.Link2Support())
15081534 {
15091535 b = 1;
15101536 }
....@@ -1547,8 +1573,6 @@
15471573 {
15481574 return;
15491575 }
1550
-
1551
- float[] colorV = new float[3];
15521576
15531577 if (false) // marked)
15541578 {
....@@ -1797,7 +1821,7 @@
17971821
17981822 display.modelParams7[0] = 0;
17991823 display.modelParams7[1] = 1000;
1800
- display.modelParams7[2] = 0;
1824
+ display.modelParams7[2] = material.parallax;
18011825 display.modelParams7[3] = 0;
18021826
18031827 //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2030,9 +2054,9 @@
20302054 switch(viewcode)
20312055 {
20322056 case 0: return "main";
2033
- case 1: return "one";
2034
- case 2: return "two";
2035
- case 3: return "three";
2057
+ case 1: return "Red";
2058
+ case 2: return "Green";
2059
+ case 3: return "Blue";
20362060 case 4: return "light";
20372061 }
20382062
....@@ -2041,7 +2065,7 @@
20412065
20422066 static int camerachangeframe;
20432067
2044
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
20452069 {
20462070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
20472071 // return false;
....@@ -2059,7 +2083,8 @@
20592083
20602084 camerachangeframe = Globals.framecount;
20612085
2062
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20632088
20642089 cameras[0] = cam;
20652090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2069,11 +2094,14 @@
20692094 {
20702095 cameras[i] = new Camera(cam.viewCode);
20712096 }
2072
-
2073
- cameras[i].setAim(cam.location, cam.lookAt);
2074
- cameras[i].shaper_fovy = cam.shaper_fovy;
2075
- cameras[i].UP.set(cam.UP);
2076
- 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
+ }
20772105 }
20782106 cameracount = 0;
20792107 targetLookAt = targetLookAts[cameracount];
....@@ -2082,7 +2110,7 @@
20822110 // Start with free camera
20832111 SwitchCameras(true);
20842112
2085
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
20862114
20872115 if (TRACKONCE)
20882116 {
....@@ -2269,18 +2297,6 @@
22692297 public void ToggleTrack()
22702298 {
22712299 TRACK ^= true;
2272
- if (TRACK)
2273
- {
2274
- if (object.selection != null &&
2275
- object.selection.size() > 0 &&
2276
- object.selection.elementAt(0) != null &&
2277
- !(object.selection.elementAt(0) instanceof Camera) &&
2278
- !(object.selection.elementAt(0) instanceof ScriptNode))
2279
- {
2280
- trackedobject = object.selection.elementAt(0);
2281
- repaint();
2282
- }
2283
- }
22842300
22852301 repaint();
22862302 }
....@@ -2372,7 +2388,8 @@
23722388 {
23732389 //System.out.println("PROTECTION = " + cam.hAspect);
23742390 //assert (cam.hAspect == 0);
2375
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23762393 lightCamera = cam;
23772394 }
23782395
....@@ -2453,6 +2470,18 @@
24532470 return CreateBim(bytes, width, height);
24542471 }
24552472
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
+
24562485 /**/
24572486 class CacheTexture
24582487 {
....@@ -2495,7 +2524,7 @@
24952524 com.sun.opengl.util.texture.TextureIO.newTextureData(
24962525 getClass().getClassLoader().getResourceAsStream(name),
24972526 true,
2498
- com.sun.opengl.util.texture.TextureIO.PNG);
2527
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
24992528 } catch (java.io.IOException e)
25002529 {
25012530 throw new javax.media.opengl.GLException(e);
....@@ -3561,6 +3590,8 @@
35613590 };
35623591 /**/
35633592
3593
+ static Object3D lastObject;
3594
+
35643595 //com.sun.opengl.util.texture.Texture
35653596 TextureData
35663597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3597,6 +3628,8 @@
35973628 // return null;
35983629 //if (i == 2)
35993630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
36003633 e.printStackTrace();
36013634 name = name.split("\\.tif")[0] + ".jpg";
36023635 }
....@@ -6929,30 +6962,30 @@
69296962 short residu = 0;
69306963
69316964 // wraparound workarounds
6932
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
69336966 /*
6934
- residu += (fuck%2);
6935
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
69366969 {
6937
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
69386971 if(residu == 2)
69396972 residu = 0;
69406973 }
69416974 else
69426975 {
69436976 residu = 0;
6944
- fuck /= 2;
6977
+ ww /= 2;
69456978 }
69466979 */
6947
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
69486981 {
6949
- fuck /= 2;
6982
+ ww /= 2;
69506983 } else
69516984 {
6952
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
69536986 }
69546987
6955
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
69566989 }
69576990 //System.out.print(bytes[i] + " ");
69586991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -8341,7 +8374,7 @@
83418374 // else
83428375 // if (!texname.startsWith("/"))
83438376 // texname = "/Users/nbriere/Textures/" + texname;
8344
- if (!FileExists(texname))
8377
+ if (!FileExists(texname) && !texname.startsWith("@"))
83458378 {
83468379 texname = fallbackTextureName;
83478380 }
....@@ -8358,14 +8391,26 @@
83588391 {
83598392 TextureData texturedata = null;
83608393
8361
- if (texdata != null)
8394
+ if (texdata != null && textureon)
83628395 {
8363
- BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8396
+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
83648397
8365
- CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
8398
+ try
8399
+ {
8400
+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
8401
+ }
8402
+ catch (Exception e)
8403
+ {
8404
+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
8405
+ }
83668406
83678407 texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
83688408 bimtextures.put(texdata, texturecache);
8409
+
8410
+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8411
+
8412
+ //Object bim2 = CreateBim(texturecache.texturedata);
8413
+ //bim2 = bim;
83698414 }
83708415 else
83718416 if (texname.endsWith("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
....@@ -8407,7 +8452,16 @@
84078452 {
84088453 // texturecache = textures.get(texname); // suspicious
84098454 if (texturecache == null)
8410
- 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);
84118465 else
84128466 new Exception().printStackTrace();
84138467 } else
....@@ -8471,6 +8525,7 @@
84718525 texturecache = new CacheTexture(texturedata,resolution);
84728526 //texture = GetTexture(tex, bump);
84738527 }
8528
+ }
84748529 }
84758530 //}
84768531 }
....@@ -8560,29 +8615,34 @@
85608615 {
85618616 if (tex.pigmentdata == null)
85628617 {
8563
- String texname = Object3D.GetPigment(tex);
8618
+ //String texname = Object3D.GetPigment(tex);
85648619
85658620 CacheTexture texturecache = texturepigment.get(tex);
85668621
85678622 if (texturecache != null)
85688623 {
8569
- tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
85708624 tex.pw = texturecache.texturedata.getWidth();
85718625 tex.ph = texturecache.texturedata.getHeight();
8626
+ tex.pigmentdata = //CompressJPEG(CreateBim
8627
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
8628
+ ;
8629
+ //, tex.pw, tex.ph), 0.5f);
85728630 }
85738631 }
85748632
85758633 if (tex.bumpdata == null)
85768634 {
8577
- String texname = Object3D.GetBump(tex);
8635
+ //String texname = Object3D.GetBump(tex);
85788636
85798637 CacheTexture texturecache = texturebump.get(tex);
85808638
85818639 if (texturecache != null)
85828640 {
8583
- tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
85848641 tex.bw = texturecache.texturedata.getWidth();
85858642 tex.bh = texturecache.texturedata.getHeight();
8643
+ tex.bumpdata = //CompressJPEG(CreateBim(
8644
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8645
+ //, tex.bw, tex.bh), 0.5f);
85868646 }
85878647 }
85888648 }
....@@ -8654,6 +8714,72 @@
86548714 return true; // Warning: not used.
86558715 }
86568716
8717
+ public static byte[] CompressJPEG(BufferedImage image, float quality)
8718
+ {
8719
+ try
8720
+ {
8721
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
8722
+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
8723
+ ImageWriter writer = writers.next();
8724
+
8725
+ ImageWriteParam param = writer.getDefaultWriteParam();
8726
+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
8727
+ param.setCompressionQuality(quality);
8728
+
8729
+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
8730
+ writer.setOutput(ios);
8731
+ writer.write(null, new IIOImage(image, null, null), param);
8732
+
8733
+ byte[] data = baos.toByteArray();
8734
+ writer.dispose();
8735
+ return data;
8736
+ }
8737
+ catch (Exception e)
8738
+ {
8739
+ e.printStackTrace();
8740
+ return null;
8741
+ }
8742
+ }
8743
+
8744
+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
8745
+ {
8746
+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
8747
+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
8748
+ ImageReader reader = writers.next();
8749
+
8750
+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
8751
+
8752
+ ImageReadParam param = reader.getDefaultReadParam();
8753
+ param.setDestination(bim);
8754
+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
8755
+
8756
+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
8757
+ reader.setInput(ios);
8758
+ BufferedImage bim2 = reader.read(0, param);
8759
+ reader.dispose();
8760
+
8761
+// WritableRaster raster = bim2.getRaster();
8762
+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
8763
+// byte[] bytes = data.getData();
8764
+//
8765
+// int[] pixels = new int[bytes.length/3];
8766
+// for (int i=pixels.length; --i>=0;)
8767
+// {
8768
+// int i3 = i*3;
8769
+// pixels[i] = 0xFF;
8770
+// pixels[i] <<= 8;
8771
+// pixels[i] |= bytes[i3+2] & 0xFF;
8772
+// pixels[i] <<= 8;
8773
+// pixels[i] |= bytes[i3+1] & 0xFF;
8774
+// pixels[i] <<= 8;
8775
+// pixels[i] |= bytes[i3] & 0xFF;
8776
+// }
8777
+//
8778
+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
8779
+
8780
+ return bim;
8781
+ }
8782
+
86578783 ShadowBuffer shadowPBuf;
86588784 AntialiasBuffer antialiasPBuf;
86598785 int MAXSTACK;
....@@ -8670,10 +8796,12 @@
86708796
86718797 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
86728798 MAXSTACK = temp[0];
8673
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
86748801 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
86758802 MAXSTACK = temp[0];
8676
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8803
+ if (Globals.DEBUG)
8804
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
86778805
86788806 // Use debug pipeline
86798807 //drawable.setGL(new DebugGL(gl)); //
....@@ -8681,7 +8809,8 @@
86818809 gl = drawable.getGL(); //
86828810
86838811 GL gl3 = getGL();
8684
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8812
+ if (Globals.DEBUG)
8813
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
86858814
86868815
86878816 //float pos[] = { 100, 100, 100, 0 };
....@@ -8846,7 +8975,7 @@
88468975
88478976 if (cubemap == null)
88488977 {
8849
- LoadEnvy(5);
8978
+ //LoadEnvy(1);
88508979 }
88518980
88528981 //cubemap.enable();
....@@ -9122,6 +9251,8 @@
91229251
91239252 void LoadEnvy(int which)
91249253 {
9254
+ assert(false);
9255
+
91259256 String name;
91269257 String ext;
91279258
....@@ -9133,37 +9264,58 @@
91339264 cubemap = null;
91349265 return;
91359266 case 1:
9136
- name = "cubemaps/box_";
9137
- ext = "png";
9267
+ name = "cubemaps/rgb/";
9268
+ ext = "jpg";
91389269 reverseUP = false;
91399270 break;
91409271 case 2:
9141
- name = "cubemaps/uffizi_";
9142
- ext = "png";
9143
- break; // reverseUP = true; break;
9272
+ name = "cubemaps/uffizi/";
9273
+ ext = "jpg";
9274
+ reverseUP = false;
9275
+ break;
91449276 case 3:
9145
- name = "cubemaps/CloudyHills_";
9146
- ext = "tga";
9277
+ name = "cubemaps/CloudyHills/";
9278
+ ext = "jpg";
91479279 reverseUP = false;
91489280 break;
91499281 case 4:
9150
- name = "cubemaps/cornell_";
9282
+ name = "cubemaps/cornell/";
91519283 ext = "png";
91529284 reverseUP = false;
91539285 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;
91549311 default:
9155
- name = "cubemaps/rgb_";
9156
- ext = "png"; /*mipmap = true;*/ reverseUP = false;
9312
+ name = "cubemaps/box/";
9313
+ ext = "png"; /*mipmap = true;*/
9314
+ reverseUP = false;
91579315 break;
91589316 }
9159
-
9160
- try
9161
- {
9162
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9163
- } catch (IOException e)
9164
- {
9165
- throw new RuntimeException(e);
9166
- }
9317
+
9318
+ LoadSkybox(name, ext, mipmap);
91679319 }
91689320
91699321 public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -9195,8 +9347,12 @@
91959347 static double[] model = new double[16];
91969348 double[] camera2light = new double[16];
91979349 double[] light2camera = new double[16];
9198
- int newenvy = -1;
9199
- boolean envyoff = true; // false;
9350
+
9351
+ //int newenvy = -1;
9352
+ //boolean envyoff = false;
9353
+
9354
+ String loadedskyboxname;
9355
+
92009356 cVector light0 = new cVector(0, 0, 0); // 1,3,2);
92019357 //float[] light0 = { 0,0,0 };
92029358 cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9614,7 +9770,7 @@
96149770
96159771 if (renderCamera != lightCamera)
96169772 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9617
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9773
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
96189774
96199775 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
96209776
....@@ -9630,7 +9786,7 @@
96309786
96319787 if (renderCamera != lightCamera)
96329788 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9633
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9789
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
96349790
96359791 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
96369792
....@@ -9676,13 +9832,18 @@
96769832 rati = 1 / rati;
96779833 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
96789834 }
9679
- assert (newenvy == -1);
9835
+
9836
+ //assert (newenvy == -1);
9837
+
96809838 gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
96819839 gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9682
- DrawSkyBox(gl);
9840
+ DrawSkyBox(gl, (float)rati);
96839841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
96849842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9685
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
96869847 ratio,
96879848 //near_plane, far_plane,
96889849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10545,9 +10706,18 @@
1054510706 static boolean init = false;
1054610707
1054710708 double[][] matrix = LA.newMatrix();
10709
+
10710
+ // This is to refresh the UI of the material panel.
10711
+ ObjEditor patchMaterial;
1054810712
1054910713 public void display(GLAutoDrawable drawable)
1055010714 {
10715
+ if (patchMaterial.patchMaterial)
10716
+ {
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
1055110721 if (Grafreed.savesound && Grafreed.hassound)
1055210722 {
1055310723 Grafreed.wav.save();
....@@ -10591,7 +10761,9 @@
1059110761 }
1059210762 /**/
1059310763
10594
- if (selection)
10764
+ boolean control = ((modifiers & CTRL) != 0);
10765
+
10766
+ if (selection && (!Globals.isLIVE() || control))
1059510767 {
1059610768 selectbuffer.display();
1059710769 return;
....@@ -10643,6 +10815,112 @@
1064310815
1064410816 if (DrawMode() == DEFAULT)
1064510817 {
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
+
1064610924 currentlydrawing = true;
1064710925 }
1064810926
....@@ -10716,7 +10994,7 @@
1071610994
1071710995 if (wait)
1071810996 {
10719
- Sleep(500);
10997
+ Sleep(200); // blocks everything
1072010998
1072110999 wait = false;
1072211000 }
....@@ -10831,7 +11109,7 @@
1083111109 // if (parentcam != renderCamera) // not a light
1083211110 if (cam != lightCamera)
1083311111 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10834
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11112
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1083511113
1083611114 for (int j = 0; j < 4; j++)
1083711115 {
....@@ -10846,7 +11124,7 @@
1084611124 // if (parentcam != renderCamera) // not a light
1084711125 if (cam != lightCamera)
1084811126 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10849
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11127
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1085011128
1085111129 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1085211130
....@@ -10932,13 +11210,43 @@
1093211210 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1093311211 }
1093411212
10935
- 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"))
1093611221 {
10937
- LoadEnvy(newenvy);
11222
+ if (cubemaprgb == null)
11223
+ {
11224
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11225
+ }
11226
+
11227
+ cubemap = cubemaprgb;
1093811228 }
10939
-
10940
- newenvy = -1;
10941
-
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
+
1094211250 ratio = ((double) getWidth()) / getHeight();
1094311251 //System.out.println("ratio = " + ratio);
1094411252
....@@ -10954,7 +11262,7 @@
1095411262
1095511263 if (!IsFrozen() && !ambientOcclusion)
1095611264 {
10957
- DrawSkyBox(gl);
11265
+ DrawSkyBox(gl, (float)ratio);
1095811266 }
1095911267
1096011268 //if (selection_view == -1)
....@@ -11137,9 +11445,9 @@
1113711445
1113811446 gl.glMatrixMode(GL.GL_MODELVIEW);
1113911447
11140
-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11141
-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11142
-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);
1114311451 } else
1114411452 {
1114511453 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11200,7 +11508,10 @@
1120011508 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1120111509 } else
1120211510 {
11203
- 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());
1120411515 }
1120511516 }
1120611517
....@@ -11240,7 +11551,7 @@
1124011551
1124111552 // if (cam != lightCamera)
1124211553 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11243
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11554
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1124411555 }
1124511556
1124611557 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11399,7 +11710,7 @@
1139911710 }
1140011711 }
1140111712
11402
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11713
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1140311714 {
1140411715 //gl.glDepthFunc(GL.GL_LEQUAL);
1140511716 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11407,24 +11718,21 @@
1140711718
1140811719 boolean texon = textureon;
1140911720
11410
- if (RENDERPROGRAM > 0)
11411
- {
11412
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11413
- textureon = false;
11414
- }
11721
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11722
+ textureon = false;
11723
+
1141511724 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1141611725 //System.out.println("ALLO");
1141711726 gl.glColorMask(false, false, false, false);
1141811727 DrawObject(gl);
11419
- if (RENDERPROGRAM > 0)
11420
- {
11421
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11422
- textureon = texon;
11423
- }
11728
+
11729
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11730
+ textureon = texon;
11731
+
1142411732 gl.glColorMask(true, true, true, true);
1142511733
1142611734 gl.glDepthFunc(GL.GL_EQUAL);
11427
- //gl.glDepthMask(false);
11735
+ gl.glDepthMask(false);
1142811736 }
1142911737
1143011738 if (false) // DrawMode() == SHADOW)
....@@ -11559,8 +11867,11 @@
1155911867 repaint();
1156011868 }
1156111869
11562
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11870
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11871
+ {
11872
+ renderCamera.computeTransform();
1156311873 repaint();
11874
+ }
1156411875
1156511876 displaydone = true;
1156611877 }
....@@ -11635,9 +11946,23 @@
1163511946 //GL gl = getGL();
1163611947 if ((TRACK || SHADOWTRACK) || zoomonce)
1163711948 {
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
+ }
1163811963 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1163911964 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11640
- pingthread.StepToTarget(true); // true);
11965
+ pingthread.StepToTarget(); // true);
1164111966 // zoomonce = false;
1164211967 }
1164311968
....@@ -12317,8 +12642,82 @@
1231712642
1231812643 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1231912644
12320
- String program =
12645
+ String programmin =
12646
+ // Min shader
1232112647 "!!ARBfp1.0\n" +
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 };" +
12651
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12652
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12653
+ "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];" +
12657
+ "TEMP temp;" +
12658
+ "TEMP light;" +
12659
+ "TEMP ndotl;" +
12660
+ "TEMP normal;" +
12661
+ "TEMP depth;" +
12662
+ "TEMP eye;" +
12663
+ "TEMP pos;" +
12664
+
12665
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12666
+ Normalize("normal") +
12667
+ "MOV light, state.light[0].position;" +
12668
+ "DP3 ndotl.x, light, normal;" +
12669
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12670
+
12671
+ // shadow
12672
+ "MOV pos, fragment.texcoord[1];" +
12673
+ "MOV temp, pos;" +
12674
+ ShadowTextureFetch("depth", "temp", "1") +
12675
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12676
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12677
+
12678
+ // No shadow when out of frustum
12679
+ //"SGE temp.y, depth.z, zero123.y;" +
12680
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12681
+
12682
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12683
+
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
12705
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12706
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12707
+ "MUL temp, temp, zero12t.w;" + // Times x
12708
+
12709
+ //"MUL temp, temp, ndotl.y;" +
12710
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12711
+
12712
+ "MUL temp, temp, ndotl.x;" + // lambert
12713
+
12714
+ "MOV temp.w, zero12t.y;" + // reset alpha
12715
+ "MOV result.color, temp;" +
12716
+ "END";
12717
+
12718
+ String programmax =
12719
+ "!!ARBfp1.0\n" +
12720
+
1232212721 //"OPTION ARB_fragment_program_shadow;" +
1232312722 "PARAM light2cam0 = program.env[10];" +
1232412723 "PARAM light2cam1 = program.env[11];" +
....@@ -12344,7 +12743,7 @@
1234412743 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1234512744 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1234612745 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12347
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12746
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1234812747 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1234912748 "PARAM options1 = program.env[62];" + // fog rgb color
1235012749 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12433,8 +12832,7 @@
1243312832 "TEMP shininess;" +
1243412833 "\n" +
1243512834 "MOV texSamp, one;" +
12436
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12437
-
12835
+
1243812836 "MOV mapgrid.x, one2048th.x;" +
1243912837 "MOV temp, fragment.texcoord[1];" +
1244012838 /*
....@@ -12455,20 +12853,20 @@
1245512853 "MUL temp, floor, mapgrid.x;" +
1245612854 //"TEX depth0, temp, texture[1], 2D;" +
1245712855 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12458
- TextureFetch("depth0", "temp", "1") +
12856
+ ShadowTextureFetch("depth0", "temp", "1") +
1245912857 "") +
1246012858 "ADD temp.x, temp.x, mapgrid.x;" +
1246112859 //"TEX depth1, temp, texture[1], 2D;" +
1246212860 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12463
- TextureFetch("depth1", "temp", "1") +
12861
+ ShadowTextureFetch("depth1", "temp", "1") +
1246412862 "") +
1246512863 "ADD temp.y, temp.y, mapgrid.x;" +
1246612864 //"TEX depth2, temp, texture[1], 2D;" +
12467
- TextureFetch("depth2", "temp", "1") +
12865
+ ShadowTextureFetch("depth2", "temp", "1") +
1246812866 "SUB temp.x, temp.x, mapgrid.x;" +
1246912867 //"TEX depth3, temp, texture[1], 2D;" +
1247012868 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12471
- TextureFetch("depth3", "temp", "1") +
12869
+ ShadowTextureFetch("depth3", "temp", "1") +
1247212870 "") +
1247312871 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1247412872 //"MOV params, material;" +
....@@ -12590,7 +12988,7 @@
1259012988 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1259112989 // mar 2013 ??? "KIL alpha.a;" +
1259212990 "MOV alpha, texSamp.aaaa;" + // y;" +
12593
- "KIL alpha.a;" +
12991
+ "KIL alpha.a;" + // not sure with parallax mapping
1259412992 /*
1259512993 "MUL temp.xy, temp, two;" +
1259612994 "TXB bump, temp, texture[0], 2D;" +
....@@ -12676,11 +13074,6 @@
1267613074 "SUB bump0, bump0, half;" +
1267713075 "ADD bump, bump, bump0;" +
1267813076
12679
- "MOV temp.x, texSamp.a;" +
12680
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12681
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12682
- "MOV texSamp.a, temp.x;" +
12683
-
1268413077 // double-sided
1268513078 /**/
1268613079 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12690,26 +13083,73 @@
1269013083 "ADD temp.x, temp.x, one.x;" +
1269113084 "MUL normal, normal, temp.xxxx;":""
1269213085 ) +
12693
- /**/
12694
-//// Normalize("normal") +
12695
-//// "MAX normal.z, eps.x, normal.z;" +
12696
-// Normalize("normal") +
12697
- "MOV normald, normal;" +
12698
- "MOV normals, normal;" +
13086
+ /**/
13087
+
13088
+ "MOV temp, fragment.texcoord[4];" +
1269913089
1270013090 // UV base
1270113091 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1270213092 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1270313093 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12704
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12705
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12706
- "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
+
1270713099 "XPD V, normal, UP;" +
1270813100 Normalize("V") +
1270913101 "XPD U, V, normal;" +
1271013102 Normalize("U") +
1271113103
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
+
1271213115 // 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;" +
1271313153
1271413154 //"MOV temp, fragment.texcoord[0];" +
1271513155 //
....@@ -12839,10 +13279,10 @@
1283913279 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1284013280 "") +
1284113281
12842
- // display shadow only (bump == 0)
13282
+ // display shadow only (fakedepth == 0)
1284313283 "SUB temp.x, half.x, shadow.x;" +
1284413284 "MOV temp.y, -params5.z;" + // params6.x;" +
12845
- "SLT temp.z, temp.y, -one2048th.x;" +
13285
+ "SLT temp.z, temp.y, -c256i.x;" +
1284613286 "SUB temp.y, one.x, temp.z;" +
1284713287 "MUL temp.x, temp.x, temp.y;" +
1284813288 "KIL temp.x;" +
....@@ -13173,8 +13613,19 @@
1317313613 //once = true;
1317413614 }
1317513615
13176
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13177
- 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
+
1317813629 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1317913630
1318013631 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13221,7 +13672,8 @@
1322113672 "\n" +
1322213673 "END\n";
1322313674
13224
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13675
+ if (Globals.DEBUG)
13676
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1322513677 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1322613678
1322713679 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13266,25 +13718,26 @@
1326613718 return out;
1326713719 }
1326813720
13269
- String TextureFetch(String dest, String src, String unit)
13721
+ // Also does frustum culling
13722
+ String ShadowTextureFetch(String dest, String src, String unit)
1327013723 {
1327113724 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1327213725 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1327313726 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13727
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13728
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1327413729 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13275
- "SLT " + src + ".z, " + src + ".x, one.x;" +
13276
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13277
- "SLT " + src + ".z, " + src + ".y, one.x;" +
13278
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13730
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13731
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1327913732 //"SWZ buffer, temp, w,w,w,w;";
13280
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13733
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1328113734 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1328213735 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1328313736 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13284
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13737
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1328513738
13286
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13287
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13739
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13740
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1328813741 }
1328913742
1329013743 String Shadow(String depth, String shadow)
....@@ -13331,7 +13784,7 @@
1333113784 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1333213785 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1333313786
13334
- // No shadow when out of frustrum
13787
+ // No shadow when out of frustum
1333513788 "SGE temp.x, " + depth + ".z, one.z;" +
1333613789 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1333713790 "";
....@@ -13478,7 +13931,7 @@
1347813931 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1347913932 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1348013933 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13481
- /*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
1348213935
1348313936 //Object3D.cVector2[] vector2buffer;
1348413937
....@@ -13645,7 +14098,7 @@
1364514098 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1364614099 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1364714100 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13648
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14101
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1364914102 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1365014103 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1365114104 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13706,7 +14159,7 @@
1370614159 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1370714160 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1370814161 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13709
- //"MOV result.texcoord, vertex.texcoord;" +
14162
+ //"MOV result.texcoord, vertex.fogcoord;" +
1371014163 "MOV result.texcoord, temp;" +
1371114164 // border fade
1371214165 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13753,7 +14206,9 @@
1375314206
1375414207 //"ADD temp.z, temp.z, one;" +
1375514208
13756
- "MOV result.color, temp;"
14209
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14210
+
14211
+ "MOV result.color, temp;" // Normal
1375714212 : "MOV result.color, vertex.color;") +
1375814213 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1375914214 : "") +
....@@ -13888,6 +14343,7 @@
1388814343 public void mouseClicked(MouseEvent e)
1388914344 {
1389014345 System.out.println("mouseClicked: " + e);
14346
+ System.exit(0);
1389114347 }
1389214348
1389314349 public void mousePressed(MouseEvent e)
....@@ -13926,10 +14382,12 @@
1392614382 return;
1392714383 }
1392814384
13929
- 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;
1393014388
1393114389 // TIMER
13932
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1393314391 {
1393414392 keepboxmode = BOXMODE;
1393514393 keepsupport = SUPPORT;
....@@ -13970,7 +14428,7 @@
1397014428 //}
1397114429
1397214430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13973
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1397414432 anchorX = ax;
1397514433 anchorY = ay;
1397614434 prevX = px;
....@@ -14065,8 +14523,9 @@
1406514523 // fev 2014???
1406614524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
1406714525 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14068
- pingthread.StepToTarget(true); // true);
14526
+ pingthread.StepToTarget(); // true);
1406914527 }
14528
+
1407014529 // if (!LIVE)
1407114530 super.repaint();
1407214531 }
....@@ -14129,14 +14588,15 @@
1412914588 drag = false;
1413014589 //System.out.println("Mouse DOWN");
1413114590 editObj = false;
14132
- ClickInfo info = new ClickInfo();
14133
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14134
- info.pane = this;
14135
- info.camera = renderCamera;
14136
- info.x = x;
14137
- info.y = y;
14138
- info.modifiers = modifiersex;
14139
- 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);
1414014600 if (!editObj)
1414114601 {
1414214602 hasMarquee = true;
....@@ -14160,8 +14620,8 @@
1416014620
1416114621 //if (drawing)
1416214622 //return;
14163
- if ((e.getModifiersEx() & CTRL) != 0
14164
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1416514625 {
1416614626 //System.out.println("mouseDragged: " + e);
1416714627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14185,9 +14645,17 @@
1418514645 return targetLookAt;
1418614646 }
1418714647
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
+
1418814653 class PingThread extends Thread
1418914654 {
1419014655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute = false;
1419114659
1419214660 // void JumpToTarget()
1419314661 // {
....@@ -14203,6 +14671,95 @@
1420314671 // only one thread!? synchronized
1420414672 void StepToTarget(boolean jump)
1420514673 {
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
+
1420614763 tmp.set(targetLookAt);
1420714764 tmp.sub(manipCamera.lookAt); // june 2014
1420814765
....@@ -14240,7 +14797,7 @@
1424014797
1424114798 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1424214799 {
14243
- jump = true; // step = 1;
14800
+ // sep 2019 jump = true; // step = 1;
1424414801 }
1424514802
1424614803 if (OEILONCE && OEIL)
....@@ -14275,7 +14832,10 @@
1427514832 if (tmp.dot(tmp) < 0.00001)
1427614833 {
1427714834 zoomonce = false;
14835
+ live = false;
1427814836 }
14837
+ else
14838
+ live = true;
1427914839
1428014840 tmp.mul(step > step2 ? step : step2);
1428114841 }
....@@ -14302,7 +14862,7 @@
1430214862 {
1430314863 if (LOOKAT)
1430414864 manipCamera.lookAt.add(tmp);
14305
- if (OEIL)
14865
+ if (OEIL && !capsLocked)
1430614866 manipCamera.location.add(tmp);
1430714867
1430814868 {
....@@ -14317,7 +14877,10 @@
1431714877 lightCamera.computeTransform();
1431814878 }
1431914879 }
14320
- manipCamera.computeTransform();
14880
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14881
+ {
14882
+ manipCamera.computeTransform();
14883
+ }
1432114884 }
1432214885 // ?????? mouseDown = true;
1432314886 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14410,49 +14973,107 @@
1441014973 }
1441114974 }
1441214975 }
14976
+
1441314977 PingThread pingthread = new PingThread();
14414
- int delta = 5;
14415
- int speed = 5;
14978
+ int delta = 1;
14979
+ int speed = 1;
14980
+ int walk = 8;
1441614981 boolean autorepeat = false;
1441714982
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
+
1441815002 void GoDown(int mod)
1441915003 {
1442015004 MODIFIERS |= COMMAND;
15005
+ boolean isVR = (mouseMode&VR)!=0;
1442115006 /**/
1442215007 if((mod&SHIFT) == SHIFT)
14423
- manipCamera.RotatePosition(0, -speed);
14424
- else
14425
- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14426
- /**/
14427
- if ((mod & SHIFT) == SHIFT)
1442815008 {
14429
- mouseMode = mouseMode; // VR??
14430
- } else
14431
- {
14432
- 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());
1443315016 }
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
+// }
1443415033
15034
+ targetLookAt.set(manipCamera.lookAt);
15035
+
1443515036 //prevX = X = anchorX;
1443615037 prevY = Y = anchorY - (int) (renderCamera.Distance());
1443715038 }
1443815039
1443915040 void GoUp(int mod)
1444015041 {
15042
+ RigidBody.justclicked = true;
15043
+
1444115044 MODIFIERS |= COMMAND;
1444215045 /**/
15046
+ boolean isVR = (mouseMode&VR)!=0;
15047
+
1444315048 if((mod&SHIFT) == SHIFT)
14444
- manipCamera.RotatePosition(0, speed);
14445
- else
14446
- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14447
- /**/
14448
- if ((mod & SHIFT) == SHIFT)
1444915049 {
14450
- mouseMode = mouseMode;
14451
- } else
14452
- {
14453
- 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());
1445415057 }
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
+// }
1445515074
15075
+ targetLookAt.set(manipCamera.lookAt);
15076
+
1445615077 //prevX = X = anchorX;
1445715078 prevY = Y = anchorY + (int) (renderCamera.Distance());
1445815079 }
....@@ -14462,18 +15083,29 @@
1446215083 MODIFIERS |= COMMAND;
1446315084 /**/
1446415085 if((mod&SHIFT) == SHIFT)
14465
- manipCamera.Translate(speed*delta, 0, getWidth());
15086
+ manipCamera.Translate(speed, 0, getWidth());
1446615087 else
14467
- 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
+
1446815095 /**/
14469
- if ((mod & SHIFT) == SHIFT)
14470
- {
14471
- mouseMode = mouseMode;
14472
- } else
14473
- {
14474
- mouseMode |= ROTATE;
14475
- } // TRANSLATE;
15096
+// if ((mod & SHIFT) == SHIFT)
15097
+// {
15098
+// mouseMode = mouseMode;
15099
+// } else
15100
+// {
15101
+// mouseMode |= ROTATE;
15102
+// } // TRANSLATE;
1447615103
15104
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15105
+ //System.err.println("location = " + manipCamera.location);
15106
+
15107
+ targetLookAt.set(manipCamera.lookAt);
15108
+
1447715109 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1447815110 prevY = Y = anchorY;
1447915111 }
....@@ -14483,18 +15115,26 @@
1448315115 MODIFIERS |= COMMAND;
1448415116 /**/
1448515117 if((mod&SHIFT) == SHIFT)
14486
- manipCamera.Translate(-speed*delta, 0, getWidth());
15118
+ manipCamera.Translate(-speed, 0, getWidth());
1448715119 else
14488
- 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
+
1448915127 /**/
14490
- if ((mod & SHIFT) == SHIFT)
14491
- {
14492
- mouseMode = mouseMode;
14493
- } else
14494
- {
14495
- mouseMode |= ROTATE;
14496
- } // TRANSLATE;
15128
+// if ((mod & SHIFT) == SHIFT)
15129
+// {
15130
+// mouseMode = mouseMode;
15131
+// } else
15132
+// {
15133
+// mouseMode |= ROTATE;
15134
+// } // TRANSLATE;
1449715135
15136
+ targetLookAt.set(manipCamera.lookAt);
15137
+
1449815138 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1449915139 prevY = Y = anchorY;
1450015140 }
....@@ -14536,15 +15176,16 @@
1453615176 if (editObj)
1453715177 {
1453815178 drag = true;
14539
- ClickInfo info = new ClickInfo();
14540
- info.bounds.setBounds(0, 0,
15179
+ //ClickInfo info = new ClickInfo();
15180
+ object.clickInfo.bounds.setBounds(0, 0,
1454115181 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14542
- info.pane = this;
14543
- info.camera = renderCamera;
14544
- info.x = x;
14545
- info.y = y;
14546
- object.GetWindow().copy
14547
- .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);
1454815189 } else
1454915190 {
1455015191 if (x < startX)
....@@ -14627,6 +15268,11 @@
1462715268 if ((mouseMode & ZOOM) != 0)
1462815269 {
1462915270 //if ((mouseMode & BACKFORTH) != 0)
15271
+ if ((modifiersex & SHIFT) == SHIFT)
15272
+ {
15273
+ ViewAngle(dy);
15274
+ }
15275
+ else
1463015276 if ((mouseMode & VR) != 0)
1463115277 manipCamera.BackForth(dx, dy, getWidth());
1463215278 else
....@@ -14693,24 +15339,30 @@
1469315339 }
1469415340 }
1469515341
15342
+// ClickInfo clickInfo = new ClickInfo();
15343
+
1469615344 public void mouseMoved(MouseEvent e)
1469715345 {
15346
+//object.editWindow.frame.
15347
+ setCursor(Cursor.getDefaultCursor());
15348
+
1469815349 //System.out.println("mouseMoved: " + e);
1469915350 if (isRenderer)
1470015351 return;
1470115352
14702
- ClickInfo ci = new ClickInfo();
14703
- ci.x = e.getX();
14704
- ci.y = e.getY();
14705
- ci.modifiers = e.getModifiersEx();
14706
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14707
- ci.pane = this;
14708
- 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;
1470915360 if (!isRenderer)
1471015361 {
1471115362 //ObjEditor editWindow = object.editWindow;
1471215363 //Object3D copy = editWindow.copy;
14713
- if (object.doEditClick(ci, 0))
15364
+ if (object.doEditClick(//clickInfo,
15365
+ 0))
1471415366 {
1471515367 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1471615368 } else
....@@ -14722,6 +15374,12 @@
1472215374
1472315375 public void mouseReleased(MouseEvent e)
1472415376 {
15377
+ if (isRenderer && !movingcamera)
15378
+ {
15379
+ RigidBody.justclicked = true;
15380
+ System.out.println("justclicked: " + e);
15381
+ }
15382
+
1472515383 Globals.MOUSEDRAGGED = false;
1472615384
1472715385 movingcamera = false;
....@@ -14878,8 +15536,10 @@
1487815536 mouseMode |= ZOOM;
1487915537 }
1488015538
14881
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14882
- 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)
1488315543 {
1488415544 mouseMode |= VR; // BACKFORTH;
1488515545 }
....@@ -14891,7 +15551,8 @@
1489115551 {
1489215552 mouseMode |= SELECT;
1489315553 }
14894
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15554
+ if (//(modifiersex & SHIFT) == SHIFT ||
15555
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1489515556 {
1489615557 mouseMode &= ~VR;
1489715558 mouseMode |= TRANSLATE;
....@@ -14935,8 +15596,18 @@
1493515596 float SATPOW = 1; // 2; // 0.5f;
1493615597 float BRIPOW = 1; // 0.5f; // 0.5f;
1493715598
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
+
1493815605 public void keyPressed(int key)
1493915606 {
15607
+// Set the blank cursor to the JFrame.
15608
+//object.editWindow.frame.
15609
+ setCursor(blankCursor);
15610
+
1494015611 if (key >= '0' && key <= '5')
1494115612 clampbit = (key-'0');
1494215613
....@@ -14993,8 +15664,8 @@
1499315664 case 'K':
1499415665 KOMPACTTEXTURE ^= true;
1499515666 //textures.clear();
14996
- break;
14997
- case 'P': // Texture Projection macros
15667
+ // break;
15668
+ //case 'P': // Texture Projection macros
1499815669 // SAVETEXTURE ^= true;
1499915670 macromode = true;
1500015671 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15095,8 +15766,8 @@
1509515766 RevertCamera();
1509615767 repaint();
1509715768 break;
15098
- case 'l':
15099
- //case 'L':
15769
+ //case 'l':
15770
+ case 'L':
1510015771 if (lightMode)
1510115772 {
1510215773 lightMode = false;
....@@ -15115,7 +15786,7 @@
1511515786 targetLookAt.set(manipCamera.lookAt);
1511615787 repaint();
1511715788 break;
15118
- case 'p':
15789
+ case 'P': // p':
1511915790 // c'est quoi ca au juste? spherical ^= true;
1512015791 Skinshader ^= true; programInitialized = false;
1512115792 repaint();
....@@ -15126,7 +15797,8 @@
1512615797 break;
1512715798 case 'm':
1512815799 {
15129
- PrintMemory();
15800
+ //PrintMemory();
15801
+ ToggleImageFlip();
1513015802 break;
1513115803 }
1513215804 case 'M':
....@@ -15153,27 +15825,31 @@
1515315825 repaint();
1515415826 break;
1515515827 case 'O':
15156
- Globals.drawMode = OCCLUSION; // WARNING
15157
- repaint();
15158
- break;
15828
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15829
+ //repaint();
15830
+ //break;
1515915831 case 'o':
1516015832 OCCLUSION_CULLING ^= true;
1516115833 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1516215834 break;
15163
- case '0': envyoff ^= true; repaint(); break;
15835
+ //case '0': envyoff ^= true; repaint(); break;
1516415836 case '1':
1516515837 case '2':
1516615838 case '3':
1516715839 case '4':
1516815840 case '5':
15169
- newenvy = Character.getNumericValue(key);
15170
- repaint();
15171
- break;
1517215841 case '6':
1517315842 case '7':
1517415843 case '8':
1517515844 case '9':
15176
- 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
+ }
1517715853 repaint();
1517815854 break;
1517915855 case '!':
....@@ -15243,7 +15919,21 @@
1524315919 // kompactbit = 6;
1524415920 // break;
1524515921 case ' ':
15922
+ capsLocked ^= true;
15923
+ repaint();
15924
+ break;
15925
+ case 'l':
1524615926 lightMode ^= true;
15927
+ if (lightMode)
15928
+ {
15929
+ keepshadow = Globals.RENDERSHADOW;
15930
+ Globals.RENDERSHADOW = false;
15931
+ }
15932
+ else
15933
+ {
15934
+ Globals.RENDERSHADOW = keepshadow;
15935
+ }
15936
+
1524715937 Globals.lighttouched = true;
1524815938 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1524915939 targetLookAt.set(manipCamera.lookAt);
....@@ -15251,6 +15941,10 @@
1525115941 break;
1525215942 //case '`' :
1525315943 case ESC:
15944
+ if (FULLSCREEN)
15945
+ object.editWindow.ToggleFullScreen();
15946
+ break;
15947
+ case 'p':
1525415948 RENDERPROGRAM += 1;
1525515949 RENDERPROGRAM %= 3;
1525615950
....@@ -15289,6 +15983,10 @@
1528915983 case ENTER:
1529015984 // object.editWindow.ScreenFit(); // Edit();
1529115985 ToggleLive();
15986
+ if (capsLocked)
15987
+ {
15988
+ Globals.WALK ^= true;
15989
+ }
1529215990 break;
1529315991 case DELETE:
1529415992 ClearSelection();
....@@ -15325,17 +16023,23 @@
1532516023 object.GetWindow().refreshContents(true);
1532616024 break;
1532716025 case '{':
15328
- manipCamera.shaper_fovy /= 1.1;
16026
+ double factor = 1.1;
16027
+ if (manipCamera.shaper_fovy / factor > 0.1)
16028
+ manipCamera.shaper_fovy /= factor;
1532916029 System.out.println("FOV = " + manipCamera.shaper_fovy);
1533016030 repaint();
1533116031 break;
1533216032 case '}':
15333
- manipCamera.shaper_fovy *= 1.1;
16033
+ factor = 1.1;
16034
+ if (manipCamera.shaper_fovy * factor < 150)
16035
+ manipCamera.shaper_fovy *= factor;
1533416036 System.out.println("FOV = " + manipCamera.shaper_fovy);
1533516037 repaint();
1533616038 break;
1533716039 case '[':
15338
- manipCamera.shaper_fovy /= 1.01;
16040
+ factor = 1.01;
16041
+ if (manipCamera.shaper_fovy / factor > 0.1)
16042
+ manipCamera.shaper_fovy /= factor;
1533916043 if (false) //manipCamera.hAspect == 0)
1534016044 {
1534116045 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15351,7 +16055,9 @@
1535116055 break;
1535216056 case ']':
1535316057 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15354
- manipCamera.shaper_fovy *= 1.01;
16058
+ factor = 1.01;
16059
+ if (manipCamera.shaper_fovy * factor < 150)
16060
+ manipCamera.shaper_fovy *= factor;
1535516061 if (false) //manipCamera.hAspect == 0)
1535616062 {
1535716063 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15389,98 +16095,113 @@
1538916095 }
1539016096 }
1539116097
16098
+ boolean keys[] = new boolean[256];
16099
+ int speedkey[] = new int[256];
16100
+ int modifiers = 0;
16101
+
1539216102 public void processKeyEvent(KeyEvent e)
1539316103 {
1539416104 switch (e.getID())
1539516105 {
1539616106 case KeyEvent.KEY_PRESSED:
15397
- if (!autorepeat)
15398
- {
15399
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15400
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15401
- }
15402
- if (manipCamera == lightCamera)
15403
- {
15404
- switch (e.getKeyCode())
15405
- {
15406
- case DOWN_ARROW:
15407
- lightCamera.DECAL /= 2;
15408
- repaint();
15409
- break;
15410
- case UP_ARROW:
15411
- lightCamera.DECAL *= 2;
15412
- repaint();
15413
- break;
15414
- case LEFT_ARROW:
15415
- lightCamera.SCALE /= 2;
15416
- repaint();
15417
- break;
15418
- case RIGHT_ARROW:
15419
- lightCamera.SCALE *= 2;
15420
- repaint();
15421
- break;
15422
- default:
15423
- break;
15424
- }
15425
-
15426
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15427
- } else
15428
- {
15429
- if (true) // !autorepeat)
15430
- {
15431
- boolean reset = true;
15432
-
15433
- switch (e.getKeyCode())
15434
- {
15435
- case DOWN_ARROW:
15436
- GoDown(e.getModifiersEx());
15437
- repaint();
15438
- break;
15439
- case UP_ARROW:
15440
- GoUp(e.getModifiersEx());
15441
- repaint();
15442
- break;
15443
- case LEFT_ARROW:
15444
- GoLeft(e.getModifiersEx());
15445
- repaint();
15446
- break;
15447
- case RIGHT_ARROW:
15448
- GoRight(e.getModifiersEx());
15449
- repaint();
15450
- break;
15451
- default:
15452
- reset = false;
15453
- break;
15454
- }
15455
-
15456
- if (reset)
15457
- {
15458
- autorepeat = true;
15459
-
15460
- targetLookAt.set(manipCamera.lookAt);
15461
- }
15462
- }
15463
- }
16107
+ keys[e.getKeyCode()] = true;
16108
+ modifiers = e.getModifiersEx();
16109
+ keyPressed(e.getKeyChar(), modifiers);
16110
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16111
+ repaint();
1546416112 break;
15465
- case KeyEvent.KEY_TYPED:
15466
- 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;
1546716183 case KeyEvent.KEY_RELEASED:
15468
- {
15469
- switch (e.getKeyCode())
15470
- {
15471
- case DOWN_ARROW:
15472
- case UP_ARROW:
15473
- case LEFT_ARROW:
15474
- case RIGHT_ARROW:
15475
- MODIFIERS &= ~COMMAND;
15476
- autorepeat = false;
15477
- break;
15478
- default:
15479
- break;
15480
- }
16184
+ keys[e.getKeyCode()] = false;
16185
+ modifiers = e.getModifiersEx();
1548116186 keyReleased(e.getKeyChar(), e.getModifiersEx());
16187
+ repaint();
1548216188 break;
15483
- }
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
+// }
1548416205 default:
1548516206 break;
1548616207 }
....@@ -15736,8 +16457,6 @@
1573616457
1573716458 int width = getBounds().width;
1573816459 int height = getBounds().height;
15739
- ClickInfo info = new ClickInfo();
15740
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1574116460 //Image img = CreateImage(width, height);
1574216461 //System.out.println("width = " + width + "; height = " + height + "\n");
1574316462
....@@ -15814,31 +16533,37 @@
1581416533 }
1581516534 if (object != null && !hasMarquee)
1581616535 {
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
+
1581716542 if (isRenderer)
1581816543 {
15819
- info.flags++;
16544
+ object.clickInfo.flags++;
1582016545 double frameAspect = (double) width / (double) height;
1582116546 if (frameAspect > renderCamera.aspect)
1582216547 {
1582316548 int desired = (int) ((double) height * renderCamera.aspect);
15824
- info.bounds.width -= width - desired;
15825
- info.bounds.x += (width - desired) / 2;
16549
+ object.clickInfo.bounds.width -= width - desired;
16550
+ object.clickInfo.bounds.x += (width - desired) / 2;
1582616551 } else
1582716552 {
1582816553 int desired = (int) ((double) width / renderCamera.aspect);
15829
- info.bounds.height -= height - desired;
15830
- info.bounds.y += (height - desired) / 2;
16554
+ object.clickInfo.bounds.height -= height - desired;
16555
+ object.clickInfo.bounds.y += (height - desired) / 2;
1583116556 }
1583216557 }
1583316558
15834
- info.g = gr;
15835
- info.camera = renderCamera;
16559
+ object.clickInfo.g = gr;
16560
+ object.clickInfo.camera = renderCamera;
1583616561 /*
1583716562 // Memory intensive (brep.verticescopy)
1583816563 if (!(object instanceof Composite))
1583916564 object.draw(info, 0, false); // SLOW :
1584016565 */
15841
- if (!isRenderer)
16566
+ if (!isRenderer) // && drag)
1584216567 {
1584316568 Grafreed.Assert(object != null);
1584416569 Grafreed.Assert(object.selection != null);
....@@ -15846,9 +16571,9 @@
1584616571 {
1584716572 int hitSomething = object.selection.get(0).hitSomething;
1584816573
15849
- info.DX = 0;
15850
- info.DY = 0;
15851
- info.W = 1;
16574
+ object.clickInfo.DX = 0;
16575
+ object.clickInfo.DY = 0;
16576
+ object.clickInfo.W = 1;
1585216577 if (hitSomething == Object3D.hitCenter)
1585316578 {
1585416579 info.DX = X;
....@@ -15860,13 +16585,14 @@
1586016585 info.DY -= info.bounds.height/2;
1586116586 }
1586216587
15863
- object.drawEditHandles(info, 0);
16588
+ object.drawEditHandles(//info,
16589
+ 0);
1586416590
1586516591 if (drag && (X != 0 || Y != 0))
1586616592 {
1586716593 switch (hitSomething)
1586816594 {
15869
- case Object3D.hitCenter: gr.setColor(Color.pink);
16595
+ case Object3D.hitCenter: gr.setColor(Color.white);
1587016596 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1587116597 break;
1587216598 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -15892,7 +16618,7 @@
1589216618 if (hasMarquee)
1589316619 {
1589416620 gr.setXORMode(Color.white);
15895
- gr.setColor(Color.red);
16621
+ gr.setColor(Color.white);
1589616622 if (!firstime)
1589716623 {
1589816624 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16051,7 +16777,8 @@
1605116777
1605216778 public boolean mouseDrag(Event evt, int x, int y)
1605316779 {
16054
- //System.out.println("mouseDrag: " + evt);
16780
+ System.out.println("mouseDrag: " + evt);
16781
+ System.exit(0);
1605516782 /*
1605616783 drag = true;
1605716784 //System.out.println("Mouse DRAG");
....@@ -16170,6 +16897,7 @@
1617016897 public boolean mouseUp(Event evt, int x, int y)
1617116898 {
1617216899 System.out.println("mouseUp: " + evt);
16900
+ System.exit(0);
1617316901 /*
1617416902 locked = false;
1617516903 if (isRenderer)
....@@ -16359,6 +17087,8 @@
1635917087 private /*static*/ boolean firstime;
1636017088 private /*static*/ cVector newView = new cVector();
1636117089 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"};
1636217092 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1636317093 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1636417094 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16371,36 +17101,74 @@
1637117101 {
1637217102 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1637317103
17104
+ int usedsuf = 0;
17105
+
1637417106 for (int i = 0; i < suffixes.length; i++)
1637517107 {
16376
- String resourceName = basename + suffixes[i] + "." + suffix;
16377
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16378
- mipmapped,
16379
- FileUtil.getFileSuffix(resourceName));
16380
- if (data == null)
17108
+ String[] suffixe = suffixes;
17109
+ String[] fallback = suffixes2;
17110
+ String[] fallfallback = suffixes3;
17111
+
17112
+ for (int c=usedsuf; --c>=0;)
1638117113 {
16382
- throw new IOException("Unable to load texture " + resourceName);
17114
+// String[] temp = suffixe;
17115
+// suffixe = fallback;
17116
+// fallback = fallfallback;
17117
+// fallfallback = temp;
1638317118 }
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
+
1638417147 //System.out.println("Target = " + targets[i]);
1638517148 cubemap.updateImage(data, targets[i]);
1638617149 }
1638717150
1638817151 return cubemap;
1638917152 }
17153
+
1639017154 int bigsphere = -1;
1639117155
1639217156 float BGcolor = 0.5f;
1639317157
16394
- private void DrawSkyBox(GL gl)
17158
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17159
+
17160
+ private void DrawSkyBox(GL gl, float ratio)
1639517161 {
16396
- if (envyoff || cubemap == null)
17162
+ if (//envyoff ||
17163
+ WIREFRAME ||
17164
+ cubemap == null)
1639717165 {
1639817166 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1639917167 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
1640017168 return;
1640117169 }
1640217170
16403
- if (WIREFRAME)
17171
+ //if (WIREFRAME)
1640417172 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1640517173
1640617174 gl.glDisable(gl.GL_CULL_FACE);
....@@ -16408,7 +17176,17 @@
1640817176 // Compensates for ExaminerViewer's modification of modelview matrix
1640917177 gl.glMatrixMode(GL.GL_MODELVIEW);
1641017178 gl.glLoadIdentity();
17179
+ gl.glScalef(1,ratio,1);
1641117180
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
+
1641217190 //gl.glActiveTexture(GL.GL_TEXTURE1);
1641317191 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1641417192
....@@ -16440,6 +17218,7 @@
1644017218 {
1644117219 gl.glScalef(1.0f, -1.0f, 1.0f);
1644217220 }
17221
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1644317222 gl.glMultMatrixd(viewrot_1, 0);
1644417223 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1644517224 //viewer.updateInverseRotation(gl);
....@@ -16480,7 +17259,8 @@
1648017259 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1648117260
1648217261 cubemap.disable();
16483
- ////cubemap.unbind();
17262
+ //cubemap.dispose();
17263
+
1648417264 if (CULLFACE)
1648517265 {
1648617266 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16488,6 +17268,8 @@
1648817268
1648917269 if (WIREFRAME)
1649017270 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
17271
+ else
17272
+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1649117273 }
1649217274
1649317275 private void DrawChecker(GL gl)
....@@ -16536,7 +17318,7 @@
1653617318 gl.glScalef(1.0f, -1.0f, 1.0f);
1653717319 }
1653817320
16539
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17321
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1654017322
1654117323 float step = 2; // 0.1666f; //0.25f;
1654217324 float stepv = 2; // step * 1652 / 998;
....@@ -16698,7 +17480,7 @@
1669817480 //new Exception().printStackTrace();
1669917481 System.out.println("select buffer init");
1670017482 // Use debug pipeline
16701
- drawable.setGL(new DebugGL(drawable.getGL()));
17483
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1670217484
1670317485 GL gl = drawable.getGL();
1670417486
....@@ -16825,7 +17607,7 @@
1682517607
1682617608 float depth = depths[y * TEX_SIZE + x];
1682717609
16828
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17610
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1682917611 {
1683017612 pointselection = false;
1683117613
....@@ -17016,6 +17798,7 @@
1701617798
1701717799 public void init(GLAutoDrawable drawable)
1701817800 {
17801
+ if (Globals.DEBUG)
1701917802 System.out.println("shadow buffer init");
1702017803
1702117804 GL gl = drawable.getGL();
....@@ -17244,10 +18027,14 @@
1724418027 gl.glFlush();
1724518028
1724618029 /**/
17247
- 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);
1724818031
17249
- float[] pixels = occlusionsizebuffer.array();
18032
+ float[] depths = occlusiondepthbuffer.array();
1725018033
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
+
1725118038 double r = 0, g = 0, b = 0;
1725218039
1725318040 double count = 0;
....@@ -17258,7 +18045,7 @@
1725818045
1725918046 double FACTOR = 1;
1726018047
17261
- for (int i = 0; i < pixels.length; i++)
18048
+ for (int i = 0; i < depths.length; i++)
1726218049 {
1726318050 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1726418051 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17341,7 +18128,7 @@
1734118128
1734218129 double scale = ray.z; // 1; // cos
1734318130
17344
- float depth = pixels[newindex];
18131
+ float depth = depths[newindex];
1734518132
1734618133 /*
1734718134 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17484,6 +18271,11 @@
1748418271 static boolean DEBUG_SELECTION = false;
1748518272 boolean OCCLUSION_CULLING = false; //true;
1748618273 public boolean lightMode = false;
18274
+
18275
+ private boolean keepshadow;
18276
+
18277
+ static public boolean capsLocked = false; // VR
18278
+
1748718279 static public int indexcount = 0;
1748818280 /*static*/ cColor vertexOcclusion = new cColor();
1748918281 //private int selection_view = -1;
....@@ -17538,11 +18330,14 @@
1753818330 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1753918331 static IntBuffer bigAAbuffer;
1754018332 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17541
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18333
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1754218334 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1754318335 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1754418336 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17545
- 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
+
1754618341 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1754718342 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1754818343 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();