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.*;
....@@ -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
....@@ -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
....@@ -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;
....@@ -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();
....@@ -10643,6 +10813,112 @@
1064310813
1064410814 if (DrawMode() == DEFAULT)
1064510815 {
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
+
1064610922 currentlydrawing = true;
1064710923 }
1064810924
....@@ -10716,7 +10992,7 @@
1071610992
1071710993 if (wait)
1071810994 {
10719
- Sleep(500);
10995
+ Sleep(200); // blocks everything
1072010996
1072110997 wait = false;
1072210998 }
....@@ -10831,7 +11107,7 @@
1083111107 // if (parentcam != renderCamera) // not a light
1083211108 if (cam != lightCamera)
1083311109 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10834
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11110
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1083511111
1083611112 for (int j = 0; j < 4; j++)
1083711113 {
....@@ -10846,7 +11122,7 @@
1084611122 // if (parentcam != renderCamera) // not a light
1084711123 if (cam != lightCamera)
1084811124 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10849
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11125
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1085011126
1085111127 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1085211128
....@@ -10932,13 +11208,43 @@
1093211208 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1093311209 }
1093411210
10935
- 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"))
1093611219 {
10937
- LoadEnvy(newenvy);
11220
+ if (cubemaprgb == null)
11221
+ {
11222
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11223
+ }
11224
+
11225
+ cubemap = cubemaprgb;
1093811226 }
10939
-
10940
- newenvy = -1;
10941
-
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
+
1094211248 ratio = ((double) getWidth()) / getHeight();
1094311249 //System.out.println("ratio = " + ratio);
1094411250
....@@ -10954,7 +11260,7 @@
1095411260
1095511261 if (!IsFrozen() && !ambientOcclusion)
1095611262 {
10957
- DrawSkyBox(gl);
11263
+ DrawSkyBox(gl, (float)ratio);
1095811264 }
1095911265
1096011266 //if (selection_view == -1)
....@@ -11137,9 +11443,9 @@
1113711443
1113811444 gl.glMatrixMode(GL.GL_MODELVIEW);
1113911445
11140
-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11141
-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11142
-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);
1114311449 } else
1114411450 {
1114511451 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11200,7 +11506,10 @@
1120011506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1120111507 } else
1120211508 {
11203
- 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());
1120411513 }
1120511514 }
1120611515
....@@ -11240,7 +11549,7 @@
1124011549
1124111550 // if (cam != lightCamera)
1124211551 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11243
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11552
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1124411553 }
1124511554
1124611555 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11399,7 +11708,7 @@
1139911708 }
1140011709 }
1140111710
11402
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11711
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1140311712 {
1140411713 //gl.glDepthFunc(GL.GL_LEQUAL);
1140511714 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11407,24 +11716,21 @@
1140711716
1140811717 boolean texon = textureon;
1140911718
11410
- if (RENDERPROGRAM > 0)
11411
- {
11412
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11413
- textureon = false;
11414
- }
11719
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11720
+ textureon = false;
11721
+
1141511722 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1141611723 //System.out.println("ALLO");
1141711724 gl.glColorMask(false, false, false, false);
1141811725 DrawObject(gl);
11419
- if (RENDERPROGRAM > 0)
11420
- {
11421
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11422
- textureon = texon;
11423
- }
11726
+
11727
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11728
+ textureon = texon;
11729
+
1142411730 gl.glColorMask(true, true, true, true);
1142511731
1142611732 gl.glDepthFunc(GL.GL_EQUAL);
11427
- //gl.glDepthMask(false);
11733
+ gl.glDepthMask(false);
1142811734 }
1142911735
1143011736 if (false) // DrawMode() == SHADOW)
....@@ -11559,8 +11865,11 @@
1155911865 repaint();
1156011866 }
1156111867
11562
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1156311871 repaint();
11872
+ }
1156411873
1156511874 displaydone = true;
1156611875 }
....@@ -11635,9 +11944,23 @@
1163511944 //GL gl = getGL();
1163611945 if ((TRACK || SHADOWTRACK) || zoomonce)
1163711946 {
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
+ }
1163811961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1163911962 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11640
- pingthread.StepToTarget(true); // true);
11963
+ pingthread.StepToTarget(); // true);
1164111964 // zoomonce = false;
1164211965 }
1164311966
....@@ -12317,8 +12640,82 @@
1231712640
1231812641 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1231912642
12320
- String program =
12643
+ String programmin =
12644
+ // Min shader
1232112645 "!!ARBfp1.0\n" +
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 };" +
12649
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12650
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12651
+ "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];" +
12655
+ "TEMP temp;" +
12656
+ "TEMP light;" +
12657
+ "TEMP ndotl;" +
12658
+ "TEMP normal;" +
12659
+ "TEMP depth;" +
12660
+ "TEMP eye;" +
12661
+ "TEMP pos;" +
12662
+
12663
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12664
+ Normalize("normal") +
12665
+ "MOV light, state.light[0].position;" +
12666
+ "DP3 ndotl.x, light, normal;" +
12667
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12668
+
12669
+ // shadow
12670
+ "MOV pos, fragment.texcoord[1];" +
12671
+ "MOV temp, pos;" +
12672
+ ShadowTextureFetch("depth", "temp", "1") +
12673
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12674
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12675
+
12676
+ // No shadow when out of frustum
12677
+ //"SGE temp.y, depth.z, zero123.y;" +
12678
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12679
+
12680
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12681
+
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
12703
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12704
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12705
+ "MUL temp, temp, zero12t.w;" + // Times x
12706
+
12707
+ //"MUL temp, temp, ndotl.y;" +
12708
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12709
+
12710
+ "MUL temp, temp, ndotl.x;" + // lambert
12711
+
12712
+ "MOV temp.w, zero12t.y;" + // reset alpha
12713
+ "MOV result.color, temp;" +
12714
+ "END";
12715
+
12716
+ String programmax =
12717
+ "!!ARBfp1.0\n" +
12718
+
1232212719 //"OPTION ARB_fragment_program_shadow;" +
1232312720 "PARAM light2cam0 = program.env[10];" +
1232412721 "PARAM light2cam1 = program.env[11];" +
....@@ -12344,7 +12741,7 @@
1234412741 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1234512742 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1234612743 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12347
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12744
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1234812745 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1234912746 "PARAM options1 = program.env[62];" + // fog rgb color
1235012747 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12433,8 +12830,7 @@
1243312830 "TEMP shininess;" +
1243412831 "\n" +
1243512832 "MOV texSamp, one;" +
12436
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12437
-
12833
+
1243812834 "MOV mapgrid.x, one2048th.x;" +
1243912835 "MOV temp, fragment.texcoord[1];" +
1244012836 /*
....@@ -12455,20 +12851,20 @@
1245512851 "MUL temp, floor, mapgrid.x;" +
1245612852 //"TEX depth0, temp, texture[1], 2D;" +
1245712853 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12458
- TextureFetch("depth0", "temp", "1") +
12854
+ ShadowTextureFetch("depth0", "temp", "1") +
1245912855 "") +
1246012856 "ADD temp.x, temp.x, mapgrid.x;" +
1246112857 //"TEX depth1, temp, texture[1], 2D;" +
1246212858 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12463
- TextureFetch("depth1", "temp", "1") +
12859
+ ShadowTextureFetch("depth1", "temp", "1") +
1246412860 "") +
1246512861 "ADD temp.y, temp.y, mapgrid.x;" +
1246612862 //"TEX depth2, temp, texture[1], 2D;" +
12467
- TextureFetch("depth2", "temp", "1") +
12863
+ ShadowTextureFetch("depth2", "temp", "1") +
1246812864 "SUB temp.x, temp.x, mapgrid.x;" +
1246912865 //"TEX depth3, temp, texture[1], 2D;" +
1247012866 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12471
- TextureFetch("depth3", "temp", "1") +
12867
+ ShadowTextureFetch("depth3", "temp", "1") +
1247212868 "") +
1247312869 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1247412870 //"MOV params, material;" +
....@@ -12590,7 +12986,7 @@
1259012986 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1259112987 // mar 2013 ??? "KIL alpha.a;" +
1259212988 "MOV alpha, texSamp.aaaa;" + // y;" +
12593
- "KIL alpha.a;" +
12989
+ "KIL alpha.a;" + // not sure with parallax mapping
1259412990 /*
1259512991 "MUL temp.xy, temp, two;" +
1259612992 "TXB bump, temp, texture[0], 2D;" +
....@@ -12676,11 +13072,6 @@
1267613072 "SUB bump0, bump0, half;" +
1267713073 "ADD bump, bump, bump0;" +
1267813074
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
-
1268413075 // double-sided
1268513076 /**/
1268613077 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12690,26 +13081,73 @@
1269013081 "ADD temp.x, temp.x, one.x;" +
1269113082 "MUL normal, normal, temp.xxxx;":""
1269213083 ) +
12693
- /**/
12694
-//// Normalize("normal") +
12695
-//// "MAX normal.z, eps.x, normal.z;" +
12696
-// Normalize("normal") +
12697
- "MOV normald, normal;" +
12698
- "MOV normals, normal;" +
13084
+ /**/
13085
+
13086
+ "MOV temp, fragment.texcoord[4];" +
1269913087
1270013088 // UV base
1270113089 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1270213090 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1270313091 //"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;" +
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
+
1270713097 "XPD V, normal, UP;" +
1270813098 Normalize("V") +
1270913099 "XPD U, V, normal;" +
1271013100 Normalize("U") +
1271113101
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
+
1271213113 // 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;" +
1271313151
1271413152 //"MOV temp, fragment.texcoord[0];" +
1271513153 //
....@@ -12839,10 +13277,10 @@
1283913277 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1284013278 "") +
1284113279
12842
- // display shadow only (bump == 0)
13280
+ // display shadow only (fakedepth == 0)
1284313281 "SUB temp.x, half.x, shadow.x;" +
1284413282 "MOV temp.y, -params5.z;" + // params6.x;" +
12845
- "SLT temp.z, temp.y, -one2048th.x;" +
13283
+ "SLT temp.z, temp.y, -c256i.x;" +
1284613284 "SUB temp.y, one.x, temp.z;" +
1284713285 "MUL temp.x, temp.x, temp.y;" +
1284813286 "KIL temp.x;" +
....@@ -13173,8 +13611,19 @@
1317313611 //once = true;
1317413612 }
1317513613
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 " : ""));
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
+
1317813627 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1317913628
1318013629 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13221,7 +13670,8 @@
1322113670 "\n" +
1322213671 "END\n";
1322313672
13224
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13673
+ if (Globals.DEBUG)
13674
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1322513675 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1322613676
1322713677 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13266,25 +13716,26 @@
1326613716 return out;
1326713717 }
1326813718
13269
- String TextureFetch(String dest, String src, String unit)
13719
+ // Also does frustum culling
13720
+ String ShadowTextureFetch(String dest, String src, String unit)
1327013721 {
1327113722 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1327213723 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1327313724 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13725
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13726
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1327413727 "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;" +
13728
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13729
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1327913730 //"SWZ buffer, temp, w,w,w,w;";
13280
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13731
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1328113732 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1328213733 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1328313734 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13284
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13735
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1328513736
13286
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13287
- //"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;";
1328813739 }
1328913740
1329013741 String Shadow(String depth, String shadow)
....@@ -13331,7 +13782,7 @@
1333113782 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1333213783 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1333313784
13334
- // No shadow when out of frustrum
13785
+ // No shadow when out of frustum
1333513786 "SGE temp.x, " + depth + ".z, one.z;" +
1333613787 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1333713788 "";
....@@ -13478,7 +13929,7 @@
1347813929 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1347913930 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1348013931 /*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
13932
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1348213933
1348313934 //Object3D.cVector2[] vector2buffer;
1348413935
....@@ -13645,7 +14096,7 @@
1364514096 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1364614097 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1364714098 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13648
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14099
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1364914100 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1365014101 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1365114102 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13706,7 +14157,7 @@
1370614157 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1370714158 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1370814159 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13709
- //"MOV result.texcoord, vertex.texcoord;" +
14160
+ //"MOV result.texcoord, vertex.fogcoord;" +
1371014161 "MOV result.texcoord, temp;" +
1371114162 // border fade
1371214163 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13753,7 +14204,9 @@
1375314204
1375414205 //"ADD temp.z, temp.z, one;" +
1375514206
13756
- "MOV result.color, temp;"
14207
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14208
+
14209
+ "MOV result.color, temp;" // Normal
1375714210 : "MOV result.color, vertex.color;") +
1375814211 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1375914212 : "") +
....@@ -13888,10 +14341,13 @@
1388814341 public void mouseClicked(MouseEvent e)
1388914342 {
1389014343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1389114345 }
1389214346
1389314347 public void mousePressed(MouseEvent e)
1389414348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1389514351 //System.out.println("mousePressed: " + e);
1389614352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1389714353 }
....@@ -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;
1419114659
1419214660 // void JumpToTarget()
1419314661 // {
....@@ -14203,6 +14671,88 @@
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
+ 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
+
1420614756 tmp.set(targetLookAt);
1420714757 tmp.sub(manipCamera.lookAt); // june 2014
1420814758
....@@ -14240,7 +14790,7 @@
1424014790
1424114791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1424214792 {
14243
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1424414794 }
1424514795
1424614796 if (OEILONCE && OEIL)
....@@ -14275,7 +14825,10 @@
1427514825 if (tmp.dot(tmp) < 0.00001)
1427614826 {
1427714827 zoomonce = false;
14828
+ live = false;
1427814829 }
14830
+ else
14831
+ live = true;
1427914832
1428014833 tmp.mul(step > step2 ? step : step2);
1428114834 }
....@@ -14302,7 +14855,7 @@
1430214855 {
1430314856 if (LOOKAT)
1430414857 manipCamera.lookAt.add(tmp);
14305
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1430614859 manipCamera.location.add(tmp);
1430714860
1430814861 {
....@@ -14317,7 +14870,10 @@
1431714870 lightCamera.computeTransform();
1431814871 }
1431914872 }
14320
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1432114877 }
1432214878 // ?????? mouseDown = true;
1432314879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14410,49 +14966,107 @@
1441014966 }
1441114967 }
1441214968 }
14969
+
1441314970 PingThread pingthread = new PingThread();
14414
- int delta = 5;
14415
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1441614974 boolean autorepeat = false;
1441714975
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
+
1441814995 void GoDown(int mod)
1441914996 {
1442014997 MODIFIERS |= COMMAND;
14998
+ boolean isVR = (mouseMode&VR)!=0;
1442114999 /**/
1442215000 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)
1442815001 {
14429
- mouseMode = mouseMode; // VR??
14430
- } else
14431
- {
14432
- 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());
1443315009 }
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
+// }
1443415026
15027
+ targetLookAt.set(manipCamera.lookAt);
15028
+
1443515029 //prevX = X = anchorX;
1443615030 prevY = Y = anchorY - (int) (renderCamera.Distance());
1443715031 }
1443815032
1443915033 void GoUp(int mod)
1444015034 {
15035
+ RigidBody.justclicked = true;
15036
+
1444115037 MODIFIERS |= COMMAND;
1444215038 /**/
15039
+ boolean isVR = (mouseMode&VR)!=0;
15040
+
1444315041 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)
1444915042 {
14450
- mouseMode = mouseMode;
14451
- } else
14452
- {
14453
- 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());
1445415050 }
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
+// }
1445515067
15068
+ targetLookAt.set(manipCamera.lookAt);
15069
+
1445615070 //prevX = X = anchorX;
1445715071 prevY = Y = anchorY + (int) (renderCamera.Distance());
1445815072 }
....@@ -14462,18 +15076,29 @@
1446215076 MODIFIERS |= COMMAND;
1446315077 /**/
1446415078 if((mod&SHIFT) == SHIFT)
14465
- manipCamera.Translate(speed*delta, 0, getWidth());
15079
+ manipCamera.Translate(speed, 0, getWidth());
1446615080 else
14467
- 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
+
1446815088 /**/
14469
- if ((mod & SHIFT) == SHIFT)
14470
- {
14471
- mouseMode = mouseMode;
14472
- } else
14473
- {
14474
- mouseMode |= ROTATE;
14475
- } // TRANSLATE;
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1447615096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
15100
+ targetLookAt.set(manipCamera.lookAt);
15101
+
1447715102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1447815103 prevY = Y = anchorY;
1447915104 }
....@@ -14483,18 +15108,26 @@
1448315108 MODIFIERS |= COMMAND;
1448415109 /**/
1448515110 if((mod&SHIFT) == SHIFT)
14486
- manipCamera.Translate(-speed*delta, 0, getWidth());
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1448715112 else
14488
- 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
+
1448915120 /**/
14490
- if ((mod & SHIFT) == SHIFT)
14491
- {
14492
- mouseMode = mouseMode;
14493
- } else
14494
- {
14495
- mouseMode |= ROTATE;
14496
- } // TRANSLATE;
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1449715128
15129
+ targetLookAt.set(manipCamera.lookAt);
15130
+
1449815131 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1449915132 prevY = Y = anchorY;
1450015133 }
....@@ -14536,15 +15169,16 @@
1453615169 if (editObj)
1453715170 {
1453815171 drag = true;
14539
- ClickInfo info = new ClickInfo();
14540
- info.bounds.setBounds(0, 0,
15172
+ //ClickInfo info = new ClickInfo();
15173
+ object.clickInfo.bounds.setBounds(0, 0,
1454115174 (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);
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);
1454815182 } else
1454915183 {
1455015184 if (x < startX)
....@@ -14627,6 +15261,11 @@
1462715261 if ((mouseMode & ZOOM) != 0)
1462815262 {
1462915263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1463015269 if ((mouseMode & VR) != 0)
1463115270 manipCamera.BackForth(dx, dy, getWidth());
1463215271 else
....@@ -14693,24 +15332,30 @@
1469315332 }
1469415333 }
1469515334
15335
+// ClickInfo clickInfo = new ClickInfo();
15336
+
1469615337 public void mouseMoved(MouseEvent e)
1469715338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1469815342 //System.out.println("mouseMoved: " + e);
1469915343 if (isRenderer)
1470015344 return;
1470115345
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;
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;
1470915353 if (!isRenderer)
1471015354 {
1471115355 //ObjEditor editWindow = object.editWindow;
1471215356 //Object3D copy = editWindow.copy;
14713
- if (object.doEditClick(ci, 0))
15357
+ if (object.doEditClick(//clickInfo,
15358
+ 0))
1471415359 {
1471515360 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1471615361 } else
....@@ -14878,8 +15523,10 @@
1487815523 mouseMode |= ZOOM;
1487915524 }
1488015525
14881
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14882
- 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)
1488315530 {
1488415531 mouseMode |= VR; // BACKFORTH;
1488515532 }
....@@ -14891,7 +15538,8 @@
1489115538 {
1489215539 mouseMode |= SELECT;
1489315540 }
14894
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1489515543 {
1489615544 mouseMode &= ~VR;
1489715545 mouseMode |= TRANSLATE;
....@@ -14935,8 +15583,18 @@
1493515583 float SATPOW = 1; // 2; // 0.5f;
1493615584 float BRIPOW = 1; // 0.5f; // 0.5f;
1493715585
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
+
1493815592 public void keyPressed(int key)
1493915593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1494015598 if (key >= '0' && key <= '5')
1494115599 clampbit = (key-'0');
1494215600
....@@ -14993,8 +15651,8 @@
1499315651 case 'K':
1499415652 KOMPACTTEXTURE ^= true;
1499515653 //textures.clear();
14996
- break;
14997
- case 'P': // Texture Projection macros
15654
+ // break;
15655
+ //case 'P': // Texture Projection macros
1499815656 // SAVETEXTURE ^= true;
1499915657 macromode = true;
1500015658 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15095,8 +15753,8 @@
1509515753 RevertCamera();
1509615754 repaint();
1509715755 break;
15098
- case 'l':
15099
- //case 'L':
15756
+ //case 'l':
15757
+ case 'L':
1510015758 if (lightMode)
1510115759 {
1510215760 lightMode = false;
....@@ -15115,7 +15773,7 @@
1511515773 targetLookAt.set(manipCamera.lookAt);
1511615774 repaint();
1511715775 break;
15118
- case 'p':
15776
+ case 'P': // p':
1511915777 // c'est quoi ca au juste? spherical ^= true;
1512015778 Skinshader ^= true; programInitialized = false;
1512115779 repaint();
....@@ -15126,7 +15784,8 @@
1512615784 break;
1512715785 case 'm':
1512815786 {
15129
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1513015789 break;
1513115790 }
1513215791 case 'M':
....@@ -15153,27 +15812,31 @@
1515315812 repaint();
1515415813 break;
1515515814 case 'O':
15156
- Globals.drawMode = OCCLUSION; // WARNING
15157
- repaint();
15158
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1515915818 case 'o':
1516015819 OCCLUSION_CULLING ^= true;
1516115820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1516215821 break;
15163
- case '0': envyoff ^= true; repaint(); break;
15822
+ //case '0': envyoff ^= true; repaint(); break;
1516415823 case '1':
1516515824 case '2':
1516615825 case '3':
1516715826 case '4':
1516815827 case '5':
15169
- newenvy = Character.getNumericValue(key);
15170
- repaint();
15171
- break;
1517215828 case '6':
1517315829 case '7':
1517415830 case '8':
1517515831 case '9':
15176
- 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
+ }
1517715840 repaint();
1517815841 break;
1517915842 case '!':
....@@ -15243,7 +15906,21 @@
1524315906 // kompactbit = 6;
1524415907 // break;
1524515908 case ' ':
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
1524615913 lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
1524715924 Globals.lighttouched = true;
1524815925 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1524915926 targetLookAt.set(manipCamera.lookAt);
....@@ -15251,6 +15928,10 @@
1525115928 break;
1525215929 //case '`' :
1525315930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1525415935 RENDERPROGRAM += 1;
1525515936 RENDERPROGRAM %= 3;
1525615937
....@@ -15289,6 +15970,10 @@
1528915970 case ENTER:
1529015971 // object.editWindow.ScreenFit(); // Edit();
1529115972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1529215977 break;
1529315978 case DELETE:
1529415979 ClearSelection();
....@@ -15325,17 +16010,23 @@
1532516010 object.GetWindow().refreshContents(true);
1532616011 break;
1532716012 case '{':
15328
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1532916016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1533016017 repaint();
1533116018 break;
1533216019 case '}':
15333
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1533416023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1533516024 repaint();
1533616025 break;
1533716026 case '[':
15338
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1533916030 if (false) //manipCamera.hAspect == 0)
1534016031 {
1534116032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15351,7 +16042,9 @@
1535116042 break;
1535216043 case ']':
1535316044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15354
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1535516048 if (false) //manipCamera.hAspect == 0)
1535616049 {
1535716050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15389,98 +16082,113 @@
1538916082 }
1539016083 }
1539116084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1539216089 public void processKeyEvent(KeyEvent e)
1539316090 {
1539416091 switch (e.getID())
1539516092 {
1539616093 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
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1546416099 break;
15465
- case KeyEvent.KEY_TYPED:
15466
- 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;
1546716170 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
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1548116173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1548216175 break;
15483
- }
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
+// }
1548416192 default:
1548516193 break;
1548616194 }
....@@ -15736,8 +16444,6 @@
1573616444
1573716445 int width = getBounds().width;
1573816446 int height = getBounds().height;
15739
- ClickInfo info = new ClickInfo();
15740
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1574116447 //Image img = CreateImage(width, height);
1574216448 //System.out.println("width = " + width + "; height = " + height + "\n");
1574316449
....@@ -15814,31 +16520,37 @@
1581416520 }
1581516521 if (object != null && !hasMarquee)
1581616522 {
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
+
1581716529 if (isRenderer)
1581816530 {
15819
- info.flags++;
16531
+ object.clickInfo.flags++;
1582016532 double frameAspect = (double) width / (double) height;
1582116533 if (frameAspect > renderCamera.aspect)
1582216534 {
1582316535 int desired = (int) ((double) height * renderCamera.aspect);
15824
- info.bounds.width -= width - desired;
15825
- info.bounds.x += (width - desired) / 2;
16536
+ object.clickInfo.bounds.width -= width - desired;
16537
+ object.clickInfo.bounds.x += (width - desired) / 2;
1582616538 } else
1582716539 {
1582816540 int desired = (int) ((double) width / renderCamera.aspect);
15829
- info.bounds.height -= height - desired;
15830
- info.bounds.y += (height - desired) / 2;
16541
+ object.clickInfo.bounds.height -= height - desired;
16542
+ object.clickInfo.bounds.y += (height - desired) / 2;
1583116543 }
1583216544 }
1583316545
15834
- info.g = gr;
15835
- info.camera = renderCamera;
16546
+ object.clickInfo.g = gr;
16547
+ object.clickInfo.camera = renderCamera;
1583616548 /*
1583716549 // Memory intensive (brep.verticescopy)
1583816550 if (!(object instanceof Composite))
1583916551 object.draw(info, 0, false); // SLOW :
1584016552 */
15841
- if (!isRenderer)
16553
+ if (!isRenderer) // && drag)
1584216554 {
1584316555 Grafreed.Assert(object != null);
1584416556 Grafreed.Assert(object.selection != null);
....@@ -15846,9 +16558,9 @@
1584616558 {
1584716559 int hitSomething = object.selection.get(0).hitSomething;
1584816560
15849
- info.DX = 0;
15850
- info.DY = 0;
15851
- info.W = 1;
16561
+ object.clickInfo.DX = 0;
16562
+ object.clickInfo.DY = 0;
16563
+ object.clickInfo.W = 1;
1585216564 if (hitSomething == Object3D.hitCenter)
1585316565 {
1585416566 info.DX = X;
....@@ -15860,13 +16572,14 @@
1586016572 info.DY -= info.bounds.height/2;
1586116573 }
1586216574
15863
- object.drawEditHandles(info, 0);
16575
+ object.drawEditHandles(//info,
16576
+ 0);
1586416577
1586516578 if (drag && (X != 0 || Y != 0))
1586616579 {
1586716580 switch (hitSomething)
1586816581 {
15869
- case Object3D.hitCenter: gr.setColor(Color.pink);
16582
+ case Object3D.hitCenter: gr.setColor(Color.white);
1587016583 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1587116584 break;
1587216585 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -15892,7 +16605,7 @@
1589216605 if (hasMarquee)
1589316606 {
1589416607 gr.setXORMode(Color.white);
15895
- gr.setColor(Color.red);
16608
+ gr.setColor(Color.white);
1589616609 if (!firstime)
1589716610 {
1589816611 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16051,7 +16764,8 @@
1605116764
1605216765 public boolean mouseDrag(Event evt, int x, int y)
1605316766 {
16054
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1605516769 /*
1605616770 drag = true;
1605716771 //System.out.println("Mouse DRAG");
....@@ -16170,6 +16884,7 @@
1617016884 public boolean mouseUp(Event evt, int x, int y)
1617116885 {
1617216886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1617316888 /*
1617416889 locked = false;
1617516890 if (isRenderer)
....@@ -16359,6 +17074,8 @@
1635917074 private /*static*/ boolean firstime;
1636017075 private /*static*/ cVector newView = new cVector();
1636117076 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"};
1636217079 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1636317080 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1636417081 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16371,29 +17088,67 @@
1637117088 {
1637217089 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1637317090
17091
+ int usedsuf = 0;
17092
+
1637417093 for (int i = 0; i < suffixes.length; i++)
1637517094 {
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)
17095
+ String[] suffixe = suffixes;
17096
+ String[] fallback = suffixes2;
17097
+ String[] fallfallback = suffixes3;
17098
+
17099
+ for (int c=usedsuf; --c>=0;)
1638117100 {
16382
- throw new IOException("Unable to load texture " + resourceName);
17101
+// String[] temp = suffixe;
17102
+// suffixe = fallback;
17103
+// fallback = fallfallback;
17104
+// fallfallback = temp;
1638317105 }
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
+
1638417134 //System.out.println("Target = " + targets[i]);
1638517135 cubemap.updateImage(data, targets[i]);
1638617136 }
1638717137
1638817138 return cubemap;
1638917139 }
17140
+
1639017141 int bigsphere = -1;
1639117142
1639217143 float BGcolor = 0.5f;
1639317144
16394
- private void DrawSkyBox(GL gl)
17145
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17146
+
17147
+ private void DrawSkyBox(GL gl, float ratio)
1639517148 {
16396
- if (envyoff || cubemap == null)
17149
+ if (//envyoff ||
17150
+ WIREFRAME ||
17151
+ cubemap == null)
1639717152 {
1639817153 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1639917154 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -16408,7 +17163,17 @@
1640817163 // Compensates for ExaminerViewer's modification of modelview matrix
1640917164 gl.glMatrixMode(GL.GL_MODELVIEW);
1641017165 gl.glLoadIdentity();
17166
+ gl.glScalef(1,ratio,1);
1641117167
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
+
1641217177 //gl.glActiveTexture(GL.GL_TEXTURE1);
1641317178 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1641417179
....@@ -16440,6 +17205,7 @@
1644017205 {
1644117206 gl.glScalef(1.0f, -1.0f, 1.0f);
1644217207 }
17208
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1644317209 gl.glMultMatrixd(viewrot_1, 0);
1644417210 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1644517211 //viewer.updateInverseRotation(gl);
....@@ -16480,7 +17246,8 @@
1648017246 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1648117247
1648217248 cubemap.disable();
16483
- ////cubemap.unbind();
17249
+ //cubemap.dispose();
17250
+
1648417251 if (CULLFACE)
1648517252 {
1648617253 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16536,7 +17303,7 @@
1653617303 gl.glScalef(1.0f, -1.0f, 1.0f);
1653717304 }
1653817305
16539
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17306
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1654017307
1654117308 float step = 2; // 0.1666f; //0.25f;
1654217309 float stepv = 2; // step * 1652 / 998;
....@@ -16698,7 +17465,7 @@
1669817465 //new Exception().printStackTrace();
1669917466 System.out.println("select buffer init");
1670017467 // Use debug pipeline
16701
- drawable.setGL(new DebugGL(drawable.getGL()));
17468
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1670217469
1670317470 GL gl = drawable.getGL();
1670417471
....@@ -16825,7 +17592,7 @@
1682517592
1682617593 float depth = depths[y * TEX_SIZE + x];
1682717594
16828
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1682917596 {
1683017597 pointselection = false;
1683117598
....@@ -17016,6 +17783,7 @@
1701617783
1701717784 public void init(GLAutoDrawable drawable)
1701817785 {
17786
+ if (Globals.DEBUG)
1701917787 System.out.println("shadow buffer init");
1702017788
1702117789 GL gl = drawable.getGL();
....@@ -17244,10 +18012,14 @@
1724418012 gl.glFlush();
1724518013
1724618014 /**/
17247
- 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);
1724818016
17249
- float[] pixels = occlusionsizebuffer.array();
18017
+ float[] depths = occlusiondepthbuffer.array();
1725018018
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
+
1725118023 double r = 0, g = 0, b = 0;
1725218024
1725318025 double count = 0;
....@@ -17258,7 +18030,7 @@
1725818030
1725918031 double FACTOR = 1;
1726018032
17261
- for (int i = 0; i < pixels.length; i++)
18033
+ for (int i = 0; i < depths.length; i++)
1726218034 {
1726318035 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1726418036 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17341,7 +18113,7 @@
1734118113
1734218114 double scale = ray.z; // 1; // cos
1734318115
17344
- float depth = pixels[newindex];
18116
+ float depth = depths[newindex];
1734518117
1734618118 /*
1734718119 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17484,6 +18256,11 @@
1748418256 static boolean DEBUG_SELECTION = false;
1748518257 boolean OCCLUSION_CULLING = false; //true;
1748618258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1748718264 static public int indexcount = 0;
1748818265 /*static*/ cColor vertexOcclusion = new cColor();
1748918266 //private int selection_view = -1;
....@@ -17538,11 +18315,14 @@
1753818315 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1753918316 static IntBuffer bigAAbuffer;
1754018317 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17541
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18318
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1754218319 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1754318320 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1754418321 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17545
- 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
+
1754618326 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1754718327 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1754818328 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();