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 {
....@@ -37,7 +42,6 @@
3742 static boolean[] selectedstack = new boolean[65536];
3843 static int materialdepth = 0;
3944
40
- static boolean DEBUG = false;
4145 static boolean FRUSTUM = false; // still bogus true; // frustum culling
4246
4347 // camera change fix
....@@ -45,6 +49,39 @@
4549 static boolean ABORTED = false;
4650
4751 static int STEP = 1;
52
+
53
+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
54
+ {
55
+ int[] pixels = new int[bytes.length/3];
56
+ for (int i=pixels.length; --i>=0;)
57
+ {
58
+ int i3 = i*3;
59
+ pixels[i] = 0xFF;
60
+ pixels[i] <<= 8;
61
+ pixels[i] |= bytes[i3+2] & 0xFF;
62
+ pixels[i] <<= 8;
63
+ pixels[i] |= bytes[i3+1] & 0xFF;
64
+ pixels[i] <<= 8;
65
+ pixels[i] |= bytes[i3] & 0xFF;
66
+ }
67
+ /*
68
+ int r=0,g=0,b=0,a=0;
69
+ for (int i=0; i<width; i++)
70
+ for (int j=0; j<height; j++)
71
+ {
72
+ int index = j*width+i;
73
+ int p = pixels[index];
74
+ a = ((p>>24) & 0xFF);
75
+ r = ((p>>16) & 0xFF);
76
+ g = ((p>>8) & 0xFF);
77
+ b = (p & 0xFF);
78
+ pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
79
+ }
80
+ /**/
81
+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
82
+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
83
+ return rendImage;
84
+ }
4885
4986 /*static*/ private boolean CULLFACE = false; // true;
5087 /*static*/ boolean NEAREST = false; // true;
....@@ -61,7 +98,7 @@
6198 //boolean REDUCETEXTURE = true;
6299 boolean CACHETEXTURE = true;
63100 boolean CLEANCACHE = false; // true;
64
- boolean MIPMAP = false; // true;
101
+ boolean MIPMAP = false; // true; // never works...
65102 boolean COMPRESSTEXTURE = false;
66103 boolean KOMPACTTEXTURE = false; // true;
67104 boolean RESIZETEXTURE = false;
....@@ -74,7 +111,11 @@
74111 //private Mat4f spotlightTransform = new Mat4f();
75112 //private Mat4f spotlightInverseTransform = new Mat4f();
76113 static GLContext glcontext = null;
77
- /*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
+
78119 boolean reverseUP = false;
79120 static boolean frozen = false;
80121 boolean enablebackspace = false; // patch for back buffer refresh
....@@ -94,7 +135,7 @@
94135 static boolean ZOOMBOXMODE = false;
95136 static boolean BOXMODE = false;
96137 static boolean IMAGEFLIP = false;
97
-static boolean SMOOTHFOCUS = false;
138
+static boolean SMOOTHFOCUS = true; // false;
98139 static boolean SPEAKERMOCAP = true; // jan 2014 false;
99140 static boolean SPEAKERCAMERA = false;
100141 static boolean SPEAKERFOCUS = false;
....@@ -128,16 +169,16 @@
128169
129170
130171 // OPTIONS
131
- boolean Skinshader = true;
172
+ boolean Skinshader = false; // true;
132173 boolean cameraLight = false;
133174 boolean UVdebug = false;
134175 boolean Udebug = false;
135176 boolean Vdebug = false;
136177 boolean NORMALdebug = false;
137
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
178
+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
138179 boolean anisotropy = true;
139180 boolean softshadow = true; // slower but better false;
140
- boolean opacityhalo = false;
181
+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141182
142183 boolean macromode = false;
143184
....@@ -148,6 +189,21 @@
148189 defaultcaps.setAccumGreenBits(16);
149190 defaultcaps.setAccumBlueBits(16);
150191 defaultcaps.setAccumAlphaBits(16);
192
+ }
193
+
194
+ 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
+ }
151207 }
152208
153209 void SetAsGLRenderer(boolean b)
....@@ -166,9 +222,10 @@
166222 cameras = new Camera[2];
167223 targetLookAts = new cVector[2];
168224
169
- SetCamera(cam);
225
+ SetCamera(cam, true);
170226
171
- SetLight(new Camera(new cVector(10, 10, -20)));
227
+ // Warning: not used.
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
172229
173230 object = o;
174231
....@@ -325,7 +382,7 @@
325382 cStatic.objectstack[materialdepth++] = obj;
326383 //System.out.println("material " + material);
327384 //Applet3D.tracein(this, selected);
328
- display.vector2buffer = obj.projectedVertices;
385
+ //display.vector2buffer = obj.projectedVertices;
329386 if (obj instanceof Camera)
330387 {
331388 display.options1[0] = material.shift;
....@@ -334,14 +391,28 @@
334391 display.options1[2] = material.shadowbias;
335392 display.options1[3] = material.aniso;
336393 display.options1[4] = material.anisoV;
394
+// System.out.println("display.options1[0] " + display.options1[0]);
395
+// System.out.println("display.options1[1] " + display.options1[1]);
396
+// System.out.println("display.options1[2] " + display.options1[2]);
397
+// System.out.println("display.options1[3] " + display.options1[3]);
398
+// System.out.println("display.options1[4] " + display.options1[4]);
337399 display.options2[0] = material.opacity;
338400 display.options2[1] = material.diffuse;
339401 display.options2[2] = material.factor;
402
+// System.out.println("display.options2[0] " + display.options2[0]);
403
+// System.out.println("display.options2[1] " + display.options2[1]);
404
+// System.out.println("display.options2[2] " + display.options2[2]);
340405
341406 cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
407
+// System.out.println("display.options3[0] " + display.options3[0]);
408
+// System.out.println("display.options3[1] " + display.options3[1]);
409
+// System.out.println("display.options3[2] " + display.options3[2]);
342410 display.options4[0] = material.cameralight/0.2f;
343411 display.options4[1] = material.subsurface;
344412 display.options4[2] = material.sheen;
413
+// System.out.println("display.options4[0] " + display.options4[0]);
414
+// System.out.println("display.options4[1] " + display.options4[1]);
415
+// System.out.println("display.options4[2] " + display.options4[2]);
345416
346417 // if (display.CURRENTANTIALIAS > 0)
347418 // display.options3[3] /= 4;
....@@ -357,7 +428,7 @@
357428 /**/
358429 } else
359430 {
360
- DrawMaterial(material, selected);
431
+ DrawMaterial(material, selected, obj.projectedVertices);
361432 }
362433 } else
363434 {
....@@ -381,8 +452,8 @@
381452 cStatic.objectstack[materialdepth++] = obj;
382453 //System.out.println("material " + material);
383454 //Applet3D.tracein("selected ", selected);
384
- display.vector2buffer = obj.projectedVertices;
385
- display.DrawMaterial(material, selected);
455
+ //display.vector2buffer = obj.projectedVertices;
456
+ display.DrawMaterial(material, selected, obj.projectedVertices);
386457 }
387458 }
388459
....@@ -399,8 +470,8 @@
399470 materialdepth -= 1;
400471 if (materialdepth > 0)
401472 {
402
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403
- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
473
+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
474
+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404475 }
405476 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406477 } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -420,8 +491,8 @@
420491 materialdepth -= 1;
421492 if (materialdepth > 0)
422493 {
423
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424
- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
494
+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
495
+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425496 }
426497 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427498 //else
....@@ -462,15 +533,18 @@
462533 if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463534 {
464535 //gl.glBegin(gl.GL_TRIANGLES);
465
- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
536
+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
537
+ // TEST LIVE NORMALS && !obj.dontselect
538
+ ;
466539 if (!hasnorm)
467540 {
468
- // System.out.println("FUCK!!");
541
+ // System.out.println("Mesh normal");
469542 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470543 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471544 LA.vecCross(obj.v0, obj.v1, obj.v2);
472545 LA.vecNormalize(obj.v2);
473
- 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);
474548 }
475549
476550 // P
....@@ -492,7 +566,7 @@
492566 y += ny * obj.NORMALPUSH;
493567 z += nz * obj.NORMALPUSH;
494568
495
- gl.glNormal3f(nx, ny, nz);
569
+ SetGLNormal(gl, nx, ny, nz);
496570 }
497571 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
498572 SetColor(obj, pv);
....@@ -524,7 +598,7 @@
524598 y += ny * obj.NORMALPUSH;
525599 z += nz * obj.NORMALPUSH;
526600
527
- gl.glNormal3f(nx, ny, nz);
601
+ SetGLNormal(gl, nx, ny, nz);
528602 }
529603 //System.out.println("vertexq = " + qv.s + ", " + qv.t);
530604 // boolean locked = false;
....@@ -572,7 +646,7 @@
572646 y += ny * obj.NORMALPUSH;
573647 z += nz * obj.NORMALPUSH;
574648
575
- gl.glNormal3f(nx, ny, nz);
649
+ SetGLNormal(gl, nx, ny, nz);
576650 }
577651
578652 // if ((dot&4) == 0)
....@@ -808,7 +882,7 @@
808882 //// tris.postdraw(this);
809883 }
810884
811
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
812886 static cVector from = new cVector();
813887 static cVector to = new cVector();
814888
....@@ -817,7 +891,7 @@
817891 CameraPane cp = this;
818892
819893 Camera keep = cp.RenderCamera();
820
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
821895
822896 if (br.trimmed)
823897 {
....@@ -835,7 +909,7 @@
835909 br.positions[i3 + 2] + br.normals[i3 + 2]);
836910 LA.xformPos(from, transform, from);
837911 LA.xformPos(to, transform, to); // RIGID ONLY
838
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
839913
840914 CameraPane.occlusionbuffer.display();
841915
....@@ -869,7 +943,7 @@
869943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
870944 LA.xformPos(from, transform, from);
871945 LA.xformPos(to, transform, to); // RIGID ONLY
872
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
873947
874948 CameraPane.occlusionbuffer.display();
875949
....@@ -1178,10 +1252,10 @@
11781252 {
11791253 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
11801254 {
1181
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1255
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
11821256 } else
11831257 {
1184
- gl.glNormal3f(0, 0, 1);
1258
+ SetGLNormal(gl, 0, 0, 1);
11851259 }
11861260
11871261 if (c != null)
....@@ -1190,10 +1264,12 @@
11901264 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911265 }
11921266 }
1267
+
11931268 if (flipV)
11941269 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951270 else
11961271 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1272
+
11971273 //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981274 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991275
....@@ -1203,20 +1279,22 @@
12031279 {
12041280 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12051281 {
1206
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1282
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12071283 } else
12081284 {
1209
- gl.glNormal3f(0, 0, 1);
1285
+ SetGLNormal(gl, 0, 0, 1);
12101286 }
12111287 if (c != null)
12121288 {
12131289 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141290 }
12151291 }
1292
+
12161293 if (flipV)
12171294 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181295 else
12191296 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1297
+
12201298 //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211299 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221300
....@@ -1229,10 +1307,10 @@
12291307 {
12301308 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12311309 {
1232
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1310
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12331311 } else
12341312 {
1235
- gl.glNormal3f(0, 0, 1);
1313
+ SetGLNormal(gl, 0, 0, 1);
12361314 }
12371315 if (c != null)
12381316 {
....@@ -1244,8 +1322,10 @@
12441322 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451323 else
12461324 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1325
+
12471326 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481327 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1328
+
12491329 count2 += 2;
12501330 count3 += 3;
12511331 }
....@@ -1412,7 +1492,7 @@
14121492 {
14131493 if (!selectmode)
14141494 {
1415
- 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);
14161496 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14171497
14181498 if (flipV)
....@@ -1424,6 +1504,8 @@
14241504 gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14251505 }
14261506
1507
+ float[] colorV = new float[4];
1508
+
14271509 void SetColor(Object3D obj, Vertex p0)
14281510 {
14291511 CameraPane display = this;
....@@ -1491,8 +1573,6 @@
14911573 {
14921574 return;
14931575 }
1494
-
1495
- float[] colorV = new float[3];
14961576
14971577 if (false) // marked)
14981578 {
....@@ -1601,7 +1681,7 @@
16011681 // gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16021682 }
16031683
1604
- void DrawMaterial(cMaterial material, boolean selected)
1684
+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16051685 {
16061686 CameraPane display = this;
16071687 //new Exception().printStackTrace();
....@@ -1636,7 +1716,7 @@
16361716 colorV[0] = display.modelParams0[0] * material.diffuse;
16371717 colorV[1] = display.modelParams0[1] * material.diffuse;
16381718 colorV[2] = display.modelParams0[2] * material.diffuse;
1639
- colorV[3] = material.opacity;
1719
+ colorV[3] = 1; // material.opacity;
16401720
16411721 gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16421722 //System.out.println("Opacity = " + opacity);
....@@ -1741,12 +1821,12 @@
17411821
17421822 display.modelParams7[0] = 0;
17431823 display.modelParams7[1] = 1000;
1744
- display.modelParams7[2] = 0;
1824
+ display.modelParams7[2] = material.parallax;
17451825 display.modelParams7[3] = 0;
17461826
1747
- display.modelParams6[0] = 100; // criss de bug de bump
1827
+ //display.modelParams6[0] = 100; // criss de bug de bump
17481828
1749
- Object3D.cVector2[] extparams = display.vector2buffer;
1829
+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
17501830 if (extparams != null && extparams.length > 0 && extparams[0] != null)
17511831 {
17521832 display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1888,7 +1968,7 @@
18881968 void PushMatrix(double[][] matrix)
18891969 {
18901970 // GrafreeD.tracein(matrix);
1891
- PushMatrix(matrix,1);
1971
+ PushMatrix(matrix, 1);
18921972 }
18931973
18941974 void PushMatrix()
....@@ -1974,9 +2054,9 @@
19742054 switch(viewcode)
19752055 {
19762056 case 0: return "main";
1977
- case 1: return "one";
1978
- case 2: return "two";
1979
- case 3: return "three";
2057
+ case 1: return "Red";
2058
+ case 2: return "Green";
2059
+ case 3: return "Blue";
19802060 case 4: return "light";
19812061 }
19822062
....@@ -1985,7 +2065,7 @@
19852065
19862066 static int camerachangeframe;
19872067
1988
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
19892069 {
19902070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
19912071 // return false;
....@@ -2003,7 +2083,8 @@
20032083
20042084 camerachangeframe = Globals.framecount;
20052085
2006
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20072088
20082089 cameras[0] = cam;
20092090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2013,11 +2094,14 @@
20132094 {
20142095 cameras[i] = new Camera(cam.viewCode);
20152096 }
2016
-
2017
- cameras[i].setAim(cam.location, cam.lookAt);
2018
- cameras[i].shaper_fovy = cam.shaper_fovy;
2019
- cameras[i].UP.set(cam.UP);
2020
- 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
+ }
20212105 }
20222106 cameracount = 0;
20232107 targetLookAt = targetLookAts[cameracount];
....@@ -2026,7 +2110,7 @@
20262110 // Start with free camera
20272111 SwitchCameras(true);
20282112
2029
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
20302114
20312115 if (TRACKONCE)
20322116 {
....@@ -2042,7 +2126,7 @@
20422126 //System.err.println("Oeil on");
20432127 OEIL = true;
20442128 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2129
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20462130 //pingthread.StepToTarget(true);
20472131 }
20482132
....@@ -2213,18 +2297,6 @@
22132297 public void ToggleTrack()
22142298 {
22152299 TRACK ^= true;
2216
- if (TRACK)
2217
- {
2218
- if (object.selection != null &&
2219
- object.selection.size() > 0 &&
2220
- object.selection.elementAt(0) != null &&
2221
- !(object.selection.elementAt(0) instanceof Camera) &&
2222
- !(object.selection.elementAt(0) instanceof ScriptNode))
2223
- {
2224
- trackedobject = object.selection.elementAt(0);
2225
- repaint();
2226
- }
2227
- }
22282300
22292301 repaint();
22302302 }
....@@ -2257,7 +2329,7 @@
22572329
22582330 void ToggleDebug()
22592331 {
2260
- DEBUG ^= true;
2332
+ Globals.DEBUG ^= true;
22612333 }
22622334
22632335 void ToggleLookAt()
....@@ -2265,7 +2337,7 @@
22652337 LOOKAT ^= true;
22662338 }
22672339
2268
- void ToggleRandom()
2340
+ void ToggleSwitch()
22692341 {
22702342 SWITCH ^= true;
22712343 }
....@@ -2275,10 +2347,17 @@
22752347 HANDLES ^= true;
22762348 }
22772349
2350
+ Object3D paintFolder;
2351
+
22782352 void TogglePaint()
22792353 {
22802354 PAINTMODE ^= true;
22812355 paintcount = 0;
2356
+
2357
+ if (PAINTMODE)
2358
+ {
2359
+ paintFolder = GetFolder();
2360
+ }
22822361 }
22832362
22842363 void SwapCamera(int a, int b)
....@@ -2309,7 +2388,8 @@
23092388 {
23102389 //System.out.println("PROTECTION = " + cam.hAspect);
23112390 //assert (cam.hAspect == 0);
2312
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23132393 lightCamera = cam;
23142394 }
23152395
....@@ -2374,7 +2454,34 @@
23742454 {
23752455 return currentGL;
23762456 }
2377
-
2457
+
2458
+ static private BufferedImage CreateBim(TextureData texturedata)
2459
+ {
2460
+ Grafreed.Assert(texturedata != null);
2461
+
2462
+ int width = texturedata.getWidth();
2463
+ int height = texturedata.getHeight();
2464
+
2465
+ Buffer buffer = texturedata.getBuffer();
2466
+ ByteBuffer bytebuf = (ByteBuffer)buffer;
2467
+
2468
+ byte[] bytes = bytebuf.array();
2469
+
2470
+ return CreateBim(bytes, width, height);
2471
+ }
2472
+
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
+
23782485 /**/
23792486 class CacheTexture
23802487 {
....@@ -2383,28 +2490,31 @@
23832490
23842491 int resolution;
23852492
2386
- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
2493
+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
23872494 {
2388
- texture = tex;
2495
+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
2496
+ texturedata = texdata;
23892497 resolution = res;
23902498 }
23912499 }
23922500 /**/
23932501
23942502 // TEXTURE static Texture texture;
2395
- static public java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/> textures
2396
- = new java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/>();
2397
- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
2503
+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
2504
+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
2505
+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
2506
+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
2507
+
23982508 int pigmentdepth = 0;
23992509 public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
24002510 int bumpdepth = 0;
24012511 public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
24022512 //public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
24032513 public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404
- public static String NOISE_TEXTURE = "WHITE_NOISE";
2514
+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
24052515 // public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
24062516
2407
- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
2517
+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
24082518 {
24092519 TextureData texturedata = null;
24102520
....@@ -2414,7 +2524,7 @@
24142524 com.sun.opengl.util.texture.TextureIO.newTextureData(
24152525 getClass().getClassLoader().getResourceAsStream(name),
24162526 true,
2417
- com.sun.opengl.util.texture.TextureIO.PNG);
2527
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
24182528 } catch (java.io.IOException e)
24192529 {
24202530 throw new javax.media.opengl.GLException(e);
....@@ -2423,13 +2533,34 @@
24232533 if (bump)
24242534 texturedata = ConvertBump(texturedata, false);
24252535
2426
- com.sun.opengl.util.texture.Texture texture =
2427
- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2536
+// com.sun.opengl.util.texture.Texture texture =
2537
+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
24282538
2429
- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430
- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2539
+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2540
+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
24312541
2432
- return texture;
2542
+ return texturedata;
2543
+ }
2544
+
2545
+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
2546
+ {
2547
+ TextureData texturedata = null;
2548
+
2549
+ try
2550
+ {
2551
+ texturedata =
2552
+ com.sun.opengl.util.texture.TextureIO.newTextureData(
2553
+ bim,
2554
+ true);
2555
+ } catch (Exception e)
2556
+ {
2557
+ throw new javax.media.opengl.GLException(e);
2558
+ }
2559
+
2560
+ if (bump)
2561
+ texturedata = ConvertBump(texturedata, false);
2562
+
2563
+ return texturedata;
24332564 }
24342565
24352566 boolean HUESMOOTH = true; // wrap around bug... true;
....@@ -3459,6 +3590,8 @@
34593590 };
34603591 /**/
34613592
3593
+ static Object3D lastObject;
3594
+
34623595 //com.sun.opengl.util.texture.Texture
34633596 TextureData
34643597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3495,6 +3628,8 @@
34953628 // return null;
34963629 //if (i == 2)
34973630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
34983633 e.printStackTrace();
34993634 name = name.split("\\.tif")[0] + ".jpg";
35003635 }
....@@ -3502,6 +3637,8 @@
35023637
35033638 System.out.println("LOADING TEXTURE : " + name);
35043639
3640
+ Object x = texturedata.getMipmapData(); // .getBuffer();
3641
+
35053642 //
35063643 if (false) // compressbit > 0)
35073644 {
....@@ -6825,30 +6962,30 @@
68256962 short residu = 0;
68266963
68276964 // wraparound workarounds
6828
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
68296966 /*
6830
- residu += (fuck%2);
6831
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
68326969 {
6833
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
68346971 if(residu == 2)
68356972 residu = 0;
68366973 }
68376974 else
68386975 {
68396976 residu = 0;
6840
- fuck /= 2;
6977
+ ww /= 2;
68416978 }
68426979 */
6843
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
68446981 {
6845
- fuck /= 2;
6982
+ ww /= 2;
68466983 } else
68476984 {
6848
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
68496986 }
68506987
6851
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
68526989 }
68536990 //System.out.print(bytes[i] + " ");
68546991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -7900,7 +8037,7 @@
79008037 String pigment = Object3D.GetPigment(tex);
79018038 String bump = Object3D.GetBump(tex);
79028039
7903
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8040
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79048041 {
79058042 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79068043 // System.out.println("; bump = " + bump);
....@@ -7915,11 +8052,69 @@
79158052 pigment = null;
79168053 }
79178054
7918
- ReleaseTexture(bump, true);
7919
- ReleaseTexture(pigment, false);
8055
+ ReleaseTexture(tex, true);
8056
+ ReleaseTexture(tex, false);
79208057 }
79218058
7922
- void ReleaseTexture(String tex, boolean bump)
8059
+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
8060
+ {
8061
+ if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
8062
+ {
8063
+ return;
8064
+ }
8065
+
8066
+ if (tex == null)
8067
+ {
8068
+ ReleaseTexture(null, false);
8069
+ return;
8070
+ }
8071
+
8072
+ String pigment = Object3D.GetPigment(tex);
8073
+
8074
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8075
+ {
8076
+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8077
+ // System.out.println("; bump = " + bump);
8078
+ }
8079
+
8080
+ if (pigment.equals(""))
8081
+ {
8082
+ pigment = null;
8083
+ }
8084
+
8085
+ ReleaseTexture(tex, false);
8086
+ }
8087
+
8088
+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
8089
+ {
8090
+ if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
8091
+ {
8092
+ return;
8093
+ }
8094
+
8095
+ if (tex == null)
8096
+ {
8097
+ ReleaseTexture(null, true);
8098
+ return;
8099
+ }
8100
+
8101
+ String bump = Object3D.GetBump(tex);
8102
+
8103
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8104
+ {
8105
+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8106
+ // System.out.println("; bump = " + bump);
8107
+ }
8108
+
8109
+ if (bump.equals(""))
8110
+ {
8111
+ bump = null;
8112
+ }
8113
+
8114
+ ReleaseTexture(tex, true);
8115
+ }
8116
+
8117
+ void ReleaseTexture(cTexture tex, boolean bump)
79238118 {
79248119 if (// DrawMode() != 0 || /*tex == null ||*/
79258120 ambientOcclusion ) // || !textureon)
....@@ -7930,7 +8125,7 @@
79308125 CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
79318126
79328127 if (tex != null)
7933
- texture = textures.get(tex);
8128
+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
79348129
79358130 // //assert( texture != null );
79368131 // if (texture == null)
....@@ -8022,7 +8217,55 @@
80228217 }
80238218 }
80248219
8025
- /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8220
+ /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8221
+ {
8222
+// if (// DrawMode() != 0 || /*tex == null ||*/
8223
+// ambientOcclusion ) // || !textureon)
8224
+// {
8225
+// return; // false;
8226
+// }
8227
+//
8228
+// if (tex == null)
8229
+// {
8230
+// BindTexture(null,false,resolution);
8231
+// BindTexture(null,true,resolution);
8232
+// return;
8233
+// }
8234
+//
8235
+// String pigment = Object3D.GetPigment(tex);
8236
+// String bump = Object3D.GetBump(tex);
8237
+//
8238
+// usedtextures.add(pigment);
8239
+// usedtextures.add(bump);
8240
+//
8241
+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8242
+// {
8243
+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8244
+// // System.out.println("; bump = " + bump);
8245
+// }
8246
+//
8247
+// if (bump.equals(""))
8248
+// {
8249
+// bump = null;
8250
+// }
8251
+// if (pigment.equals(""))
8252
+// {
8253
+// pigment = null;
8254
+// }
8255
+//
8256
+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8257
+// BindTexture(pigment, false, resolution);
8258
+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8259
+// BindTexture(bump, true, resolution);
8260
+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8261
+//
8262
+// return; // true;
8263
+
8264
+ BindPigmentTexture(tex, resolution);
8265
+ BindBumpTexture(tex, resolution);
8266
+ }
8267
+
8268
+ /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
80268269 {
80278270 if (// DrawMode() != 0 || /*tex == null ||*/
80288271 ambientOcclusion ) // || !textureon)
....@@ -8033,17 +8276,47 @@
80338276 if (tex == null)
80348277 {
80358278 BindTexture(null,false,resolution);
8036
- BindTexture(null,true,resolution);
80378279 return;
80388280 }
80398281
80408282 String pigment = Object3D.GetPigment(tex);
8283
+
8284
+ usedtextures.add(tex);
8285
+
8286
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8287
+ {
8288
+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8289
+ // System.out.println("; bump = " + bump);
8290
+ }
8291
+
8292
+ if (pigment.equals(""))
8293
+ {
8294
+ pigment = null;
8295
+ }
8296
+
8297
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8298
+ BindTexture(tex, false, resolution);
8299
+ }
8300
+
8301
+ /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8302
+ {
8303
+ if (// DrawMode() != 0 || /*tex == null ||*/
8304
+ ambientOcclusion ) // || !textureon)
8305
+ {
8306
+ return; // false;
8307
+ }
8308
+
8309
+ if (tex == null)
8310
+ {
8311
+ BindTexture(null,true,resolution);
8312
+ return;
8313
+ }
8314
+
80418315 String bump = Object3D.GetBump(tex);
80428316
8043
- usedtextures.put(pigment, pigment);
8044
- usedtextures.put(bump, bump);
8317
+ usedtextures.add(tex);
80458318
8046
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8319
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
80478320 {
80488321 // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
80498322 // System.out.println("; bump = " + bump);
....@@ -8053,47 +8326,94 @@
80538326 {
80548327 bump = null;
80558328 }
8056
- if (pigment.equals(""))
8057
- {
8058
- pigment = null;
8059
- }
80608329
8061
- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062
- BindTexture(pigment, false, resolution);
80638330 GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064
- BindTexture(bump, true, resolution);
8331
+ BindTexture(tex, true, resolution);
80658332 GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066
-
8067
- return; // true;
80688333 }
80698334
8070
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8335
+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8336
+
8337
+ private boolean FileExists(String tex)
80718338 {
8072
- CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
8339
+ if (missingTextures.contains(tex))
8340
+ {
8341
+ return false;
8342
+ }
8343
+
8344
+ boolean fileExists = new File(tex).exists();
8345
+
8346
+ if (!fileExists)
8347
+ {
8348
+ // If file exists, the "new File()" is not executed sgain
8349
+ missingTextures.add(tex);
8350
+ }
8351
+
8352
+ return fileExists;
8353
+ }
8354
+
8355
+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8356
+ {
8357
+ CacheTexture texturecache = null;
80738358
80748359 if (tex != null)
80758360 {
8076
- String texname = tex;
8361
+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
8362
+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
80778363
8364
+ if (texname.equals("") && texdata == null)
8365
+ {
8366
+ return null;
8367
+ }
8368
+
8369
+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8370
+
80788371 // String[] split = tex.split("Textures");
80798372 // if (split.length > 1)
80808373 // texname = "/Users/nbriere/Textures" + split[split.length-1];
80818374 // else
80828375 // if (!texname.startsWith("/"))
80838376 // texname = "/Users/nbriere/Textures/" + texname;
8084
- if (!new File(tex).exists())
8377
+ if (!FileExists(texname) && !texname.startsWith("@"))
80858378 {
8086
- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8379
+ texname = fallbackTextureName;
80878380 }
80888381
80898382 if (CACHETEXTURE)
8090
- texture = textures.get(texname); // TEXTURE CACHE
8091
-
8092
- TextureData texturedata = null;
8093
-
8094
- if (texture == null || texture.resolution < resolution)
80958383 {
8096
- if (tex.equals("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
8384
+ if (texdata == null)
8385
+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
8386
+ else
8387
+ texturecache = bimtextures.get(texdata);
8388
+ }
8389
+
8390
+ if (texturecache == null || texturecache.resolution != -1 && texturecache.resolution < resolution)
8391
+ {
8392
+ TextureData texturedata = null;
8393
+
8394
+ if (texdata != null && textureon)
8395
+ {
8396
+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8397
+
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
+ }
8406
+
8407
+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
8408
+ 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;
8414
+ }
8415
+ else
8416
+ if (texname.endsWith("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
80978417 {
80988418 assert(!bump);
80998419 // if (bump)
....@@ -8104,19 +8424,23 @@
81048424 // }
81058425 // else
81068426 // {
8107
- texture = textures.get(tex);
8108
- if (texture == null)
8427
+ // texturecache = textures.get(texname); // suspicious
8428
+ if (texturecache == null)
81098429 {
8110
- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8430
+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
81118431 }
8432
+ else
8433
+ new Exception().printStackTrace();
81128434 // }
81138435 } else
8114
- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
8436
+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
81158437 {
81168438 assert(bump);
8117
- texture = textures.get(tex);
8118
- if (texture == null)
8119
- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8439
+ // texturecache = textures.get(texname); // suspicious
8440
+ if (texturecache == null)
8441
+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8442
+ else
8443
+ new Exception().printStackTrace();
81208444 } else
81218445 {
81228446 //if (tex.equals("IMMORTAL"))
....@@ -8124,11 +8448,22 @@
81248448 // texture = GetResourceTexture("default.png");
81258449 //} else
81268450 //{
8127
- if (tex.equals("WHITE_NOISE"))
8451
+ if (texname.endsWith("WHITE_NOISE"))
81288452 {
8129
- texture = textures.get(tex);
8130
- if (texture == null)
8131
- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8453
+ // texturecache = textures.get(texname); // suspicious
8454
+ if (texturecache == null)
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);
8465
+ else
8466
+ new Exception().printStackTrace();
81328467 } else
81338468 {
81348469 if (textureon)
....@@ -8153,7 +8488,7 @@
81538488 }
81548489
81558490 cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156
- if (!new File(cachename).exists())
8491
+ if (!FileExists(cachename))
81578492 cachename = texname;
81588493 else
81598494 processbump = false; // don't process bump map again
....@@ -8175,7 +8510,7 @@
81758510 }
81768511
81778512 cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178
- if (!new File(cachename).exists())
8513
+ if (!FileExists(cachename))
81798514 cachename = texname;
81808515 else
81818516 processbump = false; // don't process bump map again
....@@ -8184,20 +8519,23 @@
81848519 texturedata = GetFileTexture(cachename, processbump, resolution);
81858520
81868521
8187
- if (texturedata != null)
8188
- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8522
+ if (texturedata == null)
8523
+ throw new Exception();
8524
+
8525
+ texturecache = new CacheTexture(texturedata,resolution);
81898526 //texture = GetTexture(tex, bump);
81908527 }
8528
+ }
81918529 }
81928530 //}
81938531 }
81948532
8195
- if (/*CACHETEXTURE &&*/ texture != null && textureon)
8533
+ if (texdata == null && /*CACHETEXTURE &&*/ texturecache != null && textureon)
81968534 {
81978535 //return false;
81988536
81998537 // System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8200
- if (texturedata != null && (texname.endsWith(".jpg") || texname.endsWith(".JPG")))
8538
+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
82018539 {
82028540 // String ext = "_highres";
82038541 // if (REDUCETEXTURE)
....@@ -8214,52 +8552,17 @@
82148552 File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
82158553 if (!cachefile.exists())
82168554 {
8217
- // cache to disk
8218
- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8219
- //buffers[0].
8220
-
8221
- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8222
- int[] pixels = new int[bytebuf.capacity()/3];
8223
-
8224
- // squared size heuristic...
8225
- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
8555
+ //if (texturedata.getWidth() == texturedata.getHeight())
82268556 {
8227
- for (int i=pixels.length; --i>=0;)
8228
- {
8229
- int i3 = i*3;
8230
- pixels[i] = 0xFF;
8231
- pixels[i] <<= 8;
8232
- pixels[i] |= bytebuf.get(i3+2) & 0xFF;
8233
- pixels[i] <<= 8;
8234
- pixels[i] |= bytebuf.get(i3+1) & 0xFF;
8235
- pixels[i] <<= 8;
8236
- pixels[i] |= bytebuf.get(i3) & 0xFF;
8237
- }
8238
-
8239
- /*
8240
- int r=0,g=0,b=0,a=0;
8241
- for (int i=0; i<width; i++)
8242
- for (int j=0; j<height; j++)
8243
- {
8244
- int index = j*width+i;
8245
- int p = pixels[index];
8246
- a = ((p>>24) & 0xFF);
8247
- r = ((p>>16) & 0xFF);
8248
- g = ((p>>8) & 0xFF);
8249
- b = (p & 0xFF);
8250
- pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
8251
- }
8252
- /**/
8253
- int width = (int)Math.sqrt(pixels.length); // squared
8254
- int height = width;
8255
- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8256
- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
8557
+ BufferedImage rendImage = CreateBim(texturedata);
8558
+
82578559 ImageWriter writer = null;
82588560 Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
82598561 if (iter.hasNext()) {
82608562 writer = (ImageWriter)iter.next();
82618563 }
8262
- float compressionQuality = 0.9f;
8564
+
8565
+ float compressionQuality = 0.85f;
82638566 try
82648567 {
82658568 ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
....@@ -8276,18 +8579,20 @@
82768579 }
82778580 }
82788581 }
8279
-
8582
+
8583
+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
8584
+
82808585 //System.out.println("Texture = " + tex);
8281
- if (textures.containsKey(texname))
8586
+ if (textures.containsKey(tex))
82828587 {
8283
- CacheTexture thetex = textures.get(texname);
8588
+ CacheTexture thetex = textures.get(tex);
82848589 thetex.texture.disable();
82858590 thetex.texture.dispose();
8286
- textures.remove(texname);
8591
+ textures.remove(tex);
82878592 }
82888593
8289
- texture.texturedata = texturedata;
8290
- textures.put(texname, texture);
8594
+ //texture.texturedata = texturedata;
8595
+ textures.put(tex, texturecache);
82918596
82928597 // newtex = true;
82938598 }
....@@ -8303,10 +8608,46 @@
83038608 }
83048609 }
83058610
8306
- return texture;
8611
+ return texturecache;
83078612 }
83088613
8309
- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8614
+ static void EmbedTextures(cTexture tex)
8615
+ {
8616
+ if (tex.pigmentdata == null)
8617
+ {
8618
+ //String texname = Object3D.GetPigment(tex);
8619
+
8620
+ CacheTexture texturecache = texturepigment.get(tex);
8621
+
8622
+ if (texturecache != null)
8623
+ {
8624
+ tex.pw = texturecache.texturedata.getWidth();
8625
+ tex.ph = texturecache.texturedata.getHeight();
8626
+ tex.pigmentdata = //CompressJPEG(CreateBim
8627
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
8628
+ ;
8629
+ //, tex.pw, tex.ph), 0.5f);
8630
+ }
8631
+ }
8632
+
8633
+ if (tex.bumpdata == null)
8634
+ {
8635
+ //String texname = Object3D.GetBump(tex);
8636
+
8637
+ CacheTexture texturecache = texturebump.get(tex);
8638
+
8639
+ if (texturecache != null)
8640
+ {
8641
+ tex.bw = texturecache.texturedata.getWidth();
8642
+ tex.bh = texturecache.texturedata.getHeight();
8643
+ tex.bumpdata = //CompressJPEG(CreateBim(
8644
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8645
+ //, tex.bw, tex.bh), 0.5f);
8646
+ }
8647
+ }
8648
+ }
8649
+
8650
+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
83108651 {
83118652 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83128653
....@@ -8324,21 +8665,21 @@
83248665 return texture!=null?texture.texture:null;
83258666 }
83268667
8327
- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8668
+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
83288669 {
83298670 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83308671
83318672 return texture!=null?texture.texturedata:null;
83328673 }
83338674
8334
- boolean BindTexture(String tex, boolean bump, int resolution)
8675
+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
83358676 {
83368677 if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83378678 {
83388679 return false;
83398680 }
83408681
8341
- boolean newtex = false;
8682
+ //boolean newtex = false;
83428683
83438684 com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
83448685
....@@ -8370,9 +8711,75 @@
83708711 texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
83718712 texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
83728713
8373
- return newtex;
8714
+ return true; // Warning: not used.
83748715 }
83758716
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
+
83768783 ShadowBuffer shadowPBuf;
83778784 AntialiasBuffer antialiasPBuf;
83788785 int MAXSTACK;
....@@ -8389,10 +8796,12 @@
83898796
83908797 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
83918798 MAXSTACK = temp[0];
8392
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
83938801 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
83948802 MAXSTACK = temp[0];
8395
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8803
+ if (Globals.DEBUG)
8804
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
83968805
83978806 // Use debug pipeline
83988807 //drawable.setGL(new DebugGL(gl)); //
....@@ -8400,7 +8809,8 @@
84008809 gl = drawable.getGL(); //
84018810
84028811 GL gl3 = getGL();
8403
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8812
+ if (Globals.DEBUG)
8813
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
84048814
84058815
84068816 //float pos[] = { 100, 100, 100, 0 };
....@@ -8565,7 +8975,7 @@
85658975
85668976 if (cubemap == null)
85678977 {
8568
- LoadEnvy(5);
8978
+ //LoadEnvy(1);
85698979 }
85708980
85718981 //cubemap.enable();
....@@ -8841,6 +9251,8 @@
88419251
88429252 void LoadEnvy(int which)
88439253 {
9254
+ assert(false);
9255
+
88449256 String name;
88459257 String ext;
88469258
....@@ -8852,37 +9264,58 @@
88529264 cubemap = null;
88539265 return;
88549266 case 1:
8855
- name = "cubemaps/box_";
8856
- ext = "png";
9267
+ name = "cubemaps/rgb/";
9268
+ ext = "jpg";
88579269 reverseUP = false;
88589270 break;
88599271 case 2:
8860
- name = "cubemaps/uffizi_";
8861
- ext = "png";
8862
- break; // reverseUP = true; break;
9272
+ name = "cubemaps/uffizi/";
9273
+ ext = "jpg";
9274
+ reverseUP = false;
9275
+ break;
88639276 case 3:
8864
- name = "cubemaps/CloudyHills_";
8865
- ext = "tga";
9277
+ name = "cubemaps/CloudyHills/";
9278
+ ext = "jpg";
88669279 reverseUP = false;
88679280 break;
88689281 case 4:
8869
- name = "cubemaps/cornell_";
9282
+ name = "cubemaps/cornell/";
88709283 ext = "png";
88719284 reverseUP = false;
88729285 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;
88739311 default:
8874
- name = "cubemaps/rgb_";
8875
- ext = "png"; /*mipmap = true;*/ reverseUP = false;
9312
+ name = "cubemaps/box/";
9313
+ ext = "png"; /*mipmap = true;*/
9314
+ reverseUP = false;
88769315 break;
88779316 }
8878
-
8879
- try
8880
- {
8881
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8882
- } catch (IOException e)
8883
- {
8884
- throw new RuntimeException(e);
8885
- }
9317
+
9318
+ LoadSkybox(name, ext, mipmap);
88869319 }
88879320
88889321 public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -8914,8 +9347,12 @@
89149347 static double[] model = new double[16];
89159348 double[] camera2light = new double[16];
89169349 double[] light2camera = new double[16];
8917
- int newenvy = -1;
8918
- boolean envyoff = true; // false;
9350
+
9351
+ //int newenvy = -1;
9352
+ //boolean envyoff = false;
9353
+
9354
+ String loadedskyboxname;
9355
+
89199356 cVector light0 = new cVector(0, 0, 0); // 1,3,2);
89209357 //float[] light0 = { 0,0,0 };
89219358 cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9208,11 +9645,35 @@
92089645 jy8[3] = 0.5f;
92099646 }
92109647
9211
- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9648
+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
92129649 float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
92139650 float[] options3 = new float[]{1, 1, 1, 0}; // fog color
92149651 float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
92159652
9653
+ void ResetOptions()
9654
+ {
9655
+ options1[0] = 100;
9656
+ options1[1] = 0.025f;
9657
+ options1[2] = 0.01f;
9658
+ options1[3] = 0;
9659
+ options1[4] = 0;
9660
+
9661
+ options2[0] = 0;
9662
+ options2[1] = 0.75f;
9663
+ options2[2] = 0;
9664
+ options2[3] = 0;
9665
+
9666
+ options3[0] = 1;
9667
+ options3[1] = 1;
9668
+ options3[2] = 1;
9669
+ options3[3] = 0;
9670
+
9671
+ options4[0] = 1;
9672
+ options4[1] = 0;
9673
+ options4[2] = 1;
9674
+ options4[3] = 0;
9675
+ }
9676
+
92169677 static int imagecount = 0; // movie generation
92179678
92189679 static int jitter = 0;
....@@ -9308,8 +9769,8 @@
93089769 assert (parentcam != renderCamera);
93099770
93109771 if (renderCamera != lightCamera)
9311
- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312
- LA.matConcat(matrix, parentcam.toParent, matrix);
9772
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9773
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
93139774
93149775 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93159776
....@@ -9324,8 +9785,8 @@
93249785 LA.matCopy(renderCamera.fromScreen, matrix);
93259786
93269787 if (renderCamera != lightCamera)
9327
- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328
- LA.matConcat(parentcam.fromParent, matrix, matrix);
9788
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9789
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
93299790
93309791 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93319792
....@@ -9371,13 +9832,18 @@
93719832 rati = 1 / rati;
93729833 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
93739834 }
9374
- assert (newenvy == -1);
9835
+
9836
+ //assert (newenvy == -1);
9837
+
93759838 gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
93769839 gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9377
- DrawSkyBox(gl);
9840
+ DrawSkyBox(gl, (float)rati);
93789841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
93799842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9380
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
93819847 ratio,
93829848 //near_plane, far_plane,
93839849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10240,9 +10706,18 @@
1024010706 static boolean init = false;
1024110707
1024210708 double[][] matrix = LA.newMatrix();
10709
+
10710
+ // This is to refresh the UI of the material panel.
10711
+ ObjEditor patchMaterial;
1024310712
1024410713 public void display(GLAutoDrawable drawable)
1024510714 {
10715
+ if (patchMaterial.patchMaterial)
10716
+ {
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
1024610721 if (Grafreed.savesound && Grafreed.hassound)
1024710722 {
1024810723 Grafreed.wav.save();
....@@ -10323,6 +10798,7 @@
1032310798 ANTIALIAS = 0;
1032410799 //System.out.println("RESTART");
1032510800 AAtimer.restart();
10801
+ Globals.TIMERRUNNING = true;
1032610802 }
1032710803 }
1032810804 }
....@@ -10337,6 +10813,112 @@
1033710813
1033810814 if (DrawMode() == DEFAULT)
1033910815 {
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
+
1034010922 currentlydrawing = true;
1034110923 }
1034210924
....@@ -10390,13 +10972,14 @@
1039010972 ambientOcclusion = false;
1039110973 }
1039210974
10393
- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10975
+ if (//Globals.lighttouched &&
10976
+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039410977 {
1039510978 //if (RENDERSHADOW) // ?
1039610979 if (!IsFrozen())
1039710980 {
1039810981 // dec 2012
10399
- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10982
+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1040010983 {
1040110984 Globals.framecount++;
1040210985 shadowbuffer.display();
....@@ -10409,7 +10992,7 @@
1040910992
1041010993 if (wait)
1041110994 {
10412
- Sleep(500);
10995
+ Sleep(200); // blocks everything
1041310996
1041410997 wait = false;
1041510998 }
....@@ -10523,8 +11106,8 @@
1052311106
1052411107 // if (parentcam != renderCamera) // not a light
1052511108 if (cam != lightCamera)
10526
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
- LA.matConcat(matrix, parentcam.toParent, matrix);
11109
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11110
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1052811111
1052911112 for (int j = 0; j < 4; j++)
1053011113 {
....@@ -10538,8 +11121,8 @@
1053811121
1053911122 // if (parentcam != renderCamera) // not a light
1054011123 if (cam != lightCamera)
10541
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542
- LA.matConcat(parentcam.fromParent, matrix, matrix);
11124
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11125
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1054311126
1054411127 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054511128
....@@ -10625,13 +11208,43 @@
1062511208 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1062611209 }
1062711210
10628
- 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"))
1062911219 {
10630
- LoadEnvy(newenvy);
11220
+ if (cubemaprgb == null)
11221
+ {
11222
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11223
+ }
11224
+
11225
+ cubemap = cubemaprgb;
1063111226 }
10632
-
10633
- newenvy = -1;
10634
-
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
+
1063511248 ratio = ((double) getWidth()) / getHeight();
1063611249 //System.out.println("ratio = " + ratio);
1063711250
....@@ -10647,7 +11260,7 @@
1064711260
1064811261 if (!IsFrozen() && !ambientOcclusion)
1064911262 {
10650
- DrawSkyBox(gl);
11263
+ DrawSkyBox(gl, (float)ratio);
1065111264 }
1065211265
1065311266 //if (selection_view == -1)
....@@ -10798,7 +11411,16 @@
1079811411 // Bump noise
1079911412 gl.glActiveTexture(GL.GL_TEXTURE6);
1080011413 //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
- BindTexture(NOISE_TEXTURE, false, 2);
11414
+
11415
+ try
11416
+ {
11417
+ BindTexture(NOISE_TEXTURE, false, 2);
11418
+ }
11419
+ catch (Exception e)
11420
+ {
11421
+ System.err.println("FAILED: " + NOISE_TEXTURE);
11422
+ }
11423
+
1080211424
1080311425 gl.glActiveTexture(GL.GL_TEXTURE0);
1080411426 gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10821,8 +11443,8 @@
1082111443
1082211444 gl.glMatrixMode(GL.GL_MODELVIEW);
1082311445
10824
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1082511446 //gl.glEnable(gl.GL_POLYGON_SMOOTH);
11447
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1082611448 //gl.glEnable(gl.GL_MULTISAMPLE);
1082711449 } else
1082811450 {
....@@ -10834,7 +11456,7 @@
1083411456 //System.out.println("BLENDING ON");
1083511457 gl.glEnable(GL.GL_BLEND);
1083611458 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837
-
11459
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1083811460 gl.glMatrixMode(gl.GL_PROJECTION);
1083911461 gl.glLoadIdentity();
1084011462
....@@ -10884,7 +11506,10 @@
1088411506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1088511507 } else
1088611508 {
10887
- 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());
1088811513 }
1088911514 }
1089011515
....@@ -10923,8 +11548,8 @@
1092311548 System.err.println("parentcam != renderCamera");
1092411549
1092511550 // if (cam != lightCamera)
10926
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927
- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11551
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11552
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1092811553 }
1092911554
1093011555 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10945,8 +11570,8 @@
1094511570 if (true) // TODO
1094611571 {
1094711572 if (cam != lightCamera)
10948
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949
- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11573
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11574
+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1095011575 }
1095111576
1095211577 LA.xformPos(light0, cam.toScreen, light0);
....@@ -11083,7 +11708,7 @@
1108311708 }
1108411709 }
1108511710
11086
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11711
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1108711712 {
1108811713 //gl.glDepthFunc(GL.GL_LEQUAL);
1108911714 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11091,24 +11716,21 @@
1109111716
1109211717 boolean texon = textureon;
1109311718
11094
- if (RENDERPROGRAM > 0)
11095
- {
11096
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11097
- textureon = false;
11098
- }
11719
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11720
+ textureon = false;
11721
+
1109911722 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1110011723 //System.out.println("ALLO");
1110111724 gl.glColorMask(false, false, false, false);
1110211725 DrawObject(gl);
11103
- if (RENDERPROGRAM > 0)
11104
- {
11105
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11106
- textureon = texon;
11107
- }
11726
+
11727
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11728
+ textureon = texon;
11729
+
1110811730 gl.glColorMask(true, true, true, true);
1110911731
1111011732 gl.glDepthFunc(GL.GL_EQUAL);
11111
- //gl.glDepthMask(false);
11733
+ gl.glDepthMask(false);
1111211734 }
1111311735
1111411736 if (false) // DrawMode() == SHADOW)
....@@ -11243,8 +11865,11 @@
1124311865 repaint();
1124411866 }
1124511867
11246
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1124711871 repaint();
11872
+ }
1124811873
1124911874 displaydone = true;
1125011875 }
....@@ -11291,16 +11916,51 @@
1129111916
1129211917 static boolean zoomonce = false;
1129311918
11919
+ static void CreateSelectedPoint()
11920
+ {
11921
+ if (selectedpoint == null)
11922
+ {
11923
+ debugpointG = new Sphere();
11924
+ debugpointP = new Sphere();
11925
+ debugpointC = new Sphere();
11926
+ debugpointR = new Sphere();
11927
+
11928
+ selectedpoint = new Superellipsoid();
11929
+
11930
+ for (int i=0; i<8; i++)
11931
+ {
11932
+ debugpoints[i] = new Sphere();
11933
+ }
11934
+ }
11935
+ }
11936
+
1129411937 void DrawObject(GL gl, boolean draw)
1129511938 {
11939
+ // To clear camera values
11940
+ ResetOptions();
11941
+
1129611942 //System.out.println("DRAW OBJECT " + mouseDown);
1129711943 // DrawMode() = SELECTION;
1129811944 //GL gl = getGL();
1129911945 if ((TRACK || SHADOWTRACK) || zoomonce)
1130011946 {
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
+ }
1130111961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303
- pingthread.StepToTarget(true); // true);
11962
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11963
+ pingthread.StepToTarget(); // true);
1130411964 // zoomonce = false;
1130511965 }
1130611966
....@@ -11354,7 +12014,14 @@
1135412014
1135512015 usedtextures.clear();
1135612016
11357
- BindTextures(DEFAULT_TEXTURES, 2);
12017
+ try
12018
+ {
12019
+ BindTextures(DEFAULT_TEXTURES, 2);
12020
+ }
12021
+ catch (Exception e)
12022
+ {
12023
+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
12024
+ }
1135812025 }
1135912026 //System.out.println("--> " + stackdepth);
1136012027 // GrafreeD.traceon();
....@@ -11364,8 +12031,9 @@
1136412031
1136512032 if (DrawMode() == DEFAULT)
1136612033 {
11367
- if (DEBUG)
12034
+ if (Globals.DEBUG)
1136812035 {
12036
+ CreateSelectedPoint();
1136912037 float radius = 0.05f;
1137012038 if (selectedpoint.radius != radius)
1137112039 {
....@@ -11419,20 +12087,32 @@
1141912087 ReleaseTextures(DEFAULT_TEXTURES);
1142012088
1142112089 if (CLEANCACHE)
11422
- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
12090
+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
1142312091 {
11424
- String tex = e.nextElement();
12092
+ cTexture tex = e.nextElement();
1142512093
1142612094 // System.out.println("Texture --------- " + tex);
1142712095
11428
- if (tex.equals("WHITE_NOISE"))
12096
+ if (tex.equals("WHITE_NOISE:"))
1142912097 continue;
1143012098
11431
- if (!usedtextures.containsKey(tex))
12099
+ if (!usedtextures.contains(tex))
1143212100 {
12101
+ CacheTexture gettex = texturepigment.get(tex);
1143312102 // System.out.println("DISPOSE +++++++++++++++ " + tex);
11434
- textures.get(tex).texture.dispose();
11435
- textures.remove(tex);
12103
+ if (gettex != null)
12104
+ {
12105
+ gettex.texture.dispose();
12106
+ texturepigment.remove(tex);
12107
+ }
12108
+
12109
+ gettex = texturebump.get(tex);
12110
+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
12111
+ if (gettex != null)
12112
+ {
12113
+ gettex.texture.dispose();
12114
+ texturebump.remove(tex);
12115
+ }
1143612116 }
1143712117 }
1143812118 }
....@@ -11445,7 +12125,14 @@
1144512125 if (checker != null && DrawMode() == DEFAULT)
1144612126 {
1144712127 //BindTexture(IMMORTAL_TEXTURE);
11448
- BindTextures(checker.GetTextures(), checker.texres);
12128
+ try
12129
+ {
12130
+ BindTextures(checker.GetTextures(), checker.texres);
12131
+ }
12132
+ catch (Exception e)
12133
+ {
12134
+ System.err.println("FAILED: " + checker.GetTextures());
12135
+ }
1144912136 // NEAREST
1145012137 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145112138 DrawChecker(gl);
....@@ -11527,7 +12214,7 @@
1152712214 return;
1152812215 }
1152912216
11530
- String string = obj.GetToolTip();
12217
+ String string = obj.toString(); //.GetToolTip();
1153112218
1153212219 GL gl = GetGL();
1153312220
....@@ -11844,8 +12531,8 @@
1184412531 //obj.TransformToWorld(light, light);
1184512532 for (int i = tp.size(); --i >= 0;)
1184612533 {
11847
- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848
- LA.xformPos(light, tp.get(i).toParent, light);
12534
+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12535
+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1184912536 }
1185012537
1185112538
....@@ -11862,8 +12549,8 @@
1186212549 parentcam = cameras[0];
1186312550 }
1186412551
11865
- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866
- LA.xformPos(light, parentcam.toParent, light); // may 2013
12552
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
12553
+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186712554
1186812555 LA.xformPos(light, renderCamera.toScreen, light);
1186912556
....@@ -11953,8 +12640,82 @@
1195312640
1195412641 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1195512642
11956
- String program =
12643
+ String programmin =
12644
+ // Min shader
1195712645 "!!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
+
1195812719 //"OPTION ARB_fragment_program_shadow;" +
1195912720 "PARAM light2cam0 = program.env[10];" +
1196012721 "PARAM light2cam1 = program.env[11];" +
....@@ -11980,7 +12741,7 @@
1198012741 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1198112742 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1198212743 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11983
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12744
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1198412745 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1198512746 "PARAM options1 = program.env[62];" + // fog rgb color
1198612747 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12069,8 +12830,7 @@
1206912830 "TEMP shininess;" +
1207012831 "\n" +
1207112832 "MOV texSamp, one;" +
12072
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12073
-
12833
+
1207412834 "MOV mapgrid.x, one2048th.x;" +
1207512835 "MOV temp, fragment.texcoord[1];" +
1207612836 /*
....@@ -12091,20 +12851,20 @@
1209112851 "MUL temp, floor, mapgrid.x;" +
1209212852 //"TEX depth0, temp, texture[1], 2D;" +
1209312853 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12094
- TextureFetch("depth0", "temp", "1") +
12854
+ ShadowTextureFetch("depth0", "temp", "1") +
1209512855 "") +
1209612856 "ADD temp.x, temp.x, mapgrid.x;" +
1209712857 //"TEX depth1, temp, texture[1], 2D;" +
1209812858 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12099
- TextureFetch("depth1", "temp", "1") +
12859
+ ShadowTextureFetch("depth1", "temp", "1") +
1210012860 "") +
1210112861 "ADD temp.y, temp.y, mapgrid.x;" +
1210212862 //"TEX depth2, temp, texture[1], 2D;" +
12103
- TextureFetch("depth2", "temp", "1") +
12863
+ ShadowTextureFetch("depth2", "temp", "1") +
1210412864 "SUB temp.x, temp.x, mapgrid.x;" +
1210512865 //"TEX depth3, temp, texture[1], 2D;" +
1210612866 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12107
- TextureFetch("depth3", "temp", "1") +
12867
+ ShadowTextureFetch("depth3", "temp", "1") +
1210812868 "") +
1210912869 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1211012870 //"MOV params, material;" +
....@@ -12226,7 +12986,7 @@
1222612986 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1222712987 // mar 2013 ??? "KIL alpha.a;" +
1222812988 "MOV alpha, texSamp.aaaa;" + // y;" +
12229
- "KIL alpha.a;" +
12989
+ "KIL alpha.a;" + // not sure with parallax mapping
1223012990 /*
1223112991 "MUL temp.xy, temp, two;" +
1223212992 "TXB bump, temp, texture[0], 2D;" +
....@@ -12312,11 +13072,6 @@
1231213072 "SUB bump0, bump0, half;" +
1231313073 "ADD bump, bump, bump0;" +
1231413074
12315
- "MOV temp.x, texSamp.a;" +
12316
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12317
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12318
- "MOV texSamp.a, temp.x;" +
12319
-
1232013075 // double-sided
1232113076 /**/
1232213077 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12326,26 +13081,73 @@
1232613081 "ADD temp.x, temp.x, one.x;" +
1232713082 "MUL normal, normal, temp.xxxx;":""
1232813083 ) +
12329
- /**/
12330
-//// Normalize("normal") +
12331
-//// "MAX normal.z, eps.x, normal.z;" +
12332
-// Normalize("normal") +
12333
- "MOV normald, normal;" +
12334
- "MOV normals, normal;" +
13084
+ /**/
13085
+
13086
+ "MOV temp, fragment.texcoord[4];" +
1233513087
1233613088 // UV base
1233713089 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1233813090 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1233913091 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12340
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12341
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12342
- "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
+
1234313097 "XPD V, normal, UP;" +
1234413098 Normalize("V") +
1234513099 "XPD U, V, normal;" +
1234613100 Normalize("U") +
1234713101
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
+
1234813113 // 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;" +
1234913151
1235013152 //"MOV temp, fragment.texcoord[0];" +
1235113153 //
....@@ -12475,10 +13277,10 @@
1247513277 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1247613278 "") +
1247713279
12478
- // display shadow only (bump == 0)
13280
+ // display shadow only (fakedepth == 0)
1247913281 "SUB temp.x, half.x, shadow.x;" +
12480
- "MOV temp.y, -params6.x;" +
12481
- "SLT temp.z, temp.y, zero.x;" +
13282
+ "MOV temp.y, -params5.z;" + // params6.x;" +
13283
+ "SLT temp.z, temp.y, -c256i.x;" +
1248213284 "SUB temp.y, one.x, temp.z;" +
1248313285 "MUL temp.x, temp.x, temp.y;" +
1248413286 "KIL temp.x;" +
....@@ -12809,8 +13611,19 @@
1280913611 //once = true;
1281013612 }
1281113613
12812
- System.out.print("Program #" + mode + "; length = " + program.length());
12813
- 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
+
1281413627 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281513628
1281613629 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -12857,7 +13670,8 @@
1285713670 "\n" +
1285813671 "END\n";
1285913672
12860
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13673
+ if (Globals.DEBUG)
13674
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1286113675 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1286213676
1286313677 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -12902,25 +13716,26 @@
1290213716 return out;
1290313717 }
1290413718
12905
- String TextureFetch(String dest, String src, String unit)
13719
+ // Also does frustum culling
13720
+ String ShadowTextureFetch(String dest, String src, String unit)
1290613721 {
1290713722 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1290813723 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1290913724 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13725
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13726
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1291013727 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12911
- "SLT " + src + ".z, " + src + ".x, one.x;" +
12912
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12913
- "SLT " + src + ".z, " + src + ".y, one.x;" +
12914
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13728
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13729
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1291513730 //"SWZ buffer, temp, w,w,w,w;";
12916
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13731
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1291713732 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1291813733 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1291913734 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12920
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13735
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1292113736
12922
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12923
- //"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;";
1292413739 }
1292513740
1292613741 String Shadow(String depth, String shadow)
....@@ -12942,12 +13757,16 @@
1294213757
1294313758 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294413759 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13760
+
13761
+ // Compare fragment depth in light space with shadowmap.
1294513762 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294613763 "SGE temp.y, temp.x, zero.x;" +
12947
- "SUB " + shadow + ".y, one.x, temp.y;" +
13764
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13765
+
13766
+ // Reverse comparison
1294813767 "SUB temp.x, one.x, temp.x;" +
1294913768 "MUL " + shadow + ".x, temp.x, temp.y;" +
12950
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13769
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1295113770 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1295213771
1295313772 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12961,6 +13780,10 @@
1296113780 // No shadow for backface
1296213781 "DP3 temp.x, normal, lightd;" +
1296313782 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13783
+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13784
+
13785
+ // No shadow when out of frustum
13786
+ "SGE temp.x, " + depth + ".z, one.z;" +
1296413787 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296513788 "";
1296613789 }
....@@ -13106,8 +13929,9 @@
1310613929 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1310713930 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1310813931 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110
- Object3D.cVector2[] vector2buffer;
13932
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13933
+
13934
+ //Object3D.cVector2[] vector2buffer;
1311113935
1311213936 // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1311313937 // OUT : diff, spec
....@@ -13123,9 +13947,10 @@
1312313947 "DP3 " + dest + ".z," + "normals," + "eye;" +
1312413948 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1312513949 //"MOV " + dest + ".w," + "normal.z;" +
13126
- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13127
- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13128
- //"MOV " + dest + ".z," + "params2.w;" +
13950
+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13951
+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13952
+
13953
+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
1312913954 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1313013955 "RCP " + dest + ".w," + dest + ".w;" +
1313113956 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13271,7 +14096,7 @@
1327114096 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1327214097 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1327314098 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13274
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14099
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1327514100 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1327614101 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1327714102 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13332,7 +14157,7 @@
1333214157 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1333314158 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1333414159 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13335
- //"MOV result.texcoord, vertex.texcoord;" +
14160
+ //"MOV result.texcoord, vertex.fogcoord;" +
1333614161 "MOV result.texcoord, temp;" +
1333714162 // border fade
1333814163 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13379,7 +14204,9 @@
1337914204
1338014205 //"ADD temp.z, temp.z, one;" +
1338114206
13382
- "MOV result.color, temp;"
14207
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14208
+
14209
+ "MOV result.color, temp;" // Normal
1338314210 : "MOV result.color, vertex.color;") +
1338414211 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1338514212 : "") +
....@@ -13514,10 +14341,13 @@
1351414341 public void mouseClicked(MouseEvent e)
1351514342 {
1351614343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1351714345 }
1351814346
1351914347 public void mousePressed(MouseEvent e)
1352014348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1352114351 //System.out.println("mousePressed: " + e);
1352214352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1352314353 }
....@@ -13552,10 +14382,12 @@
1355214382 return;
1355314383 }
1355414384
13555
- 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;
1355614388
1355714389 // TIMER
13558
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1355914391 {
1356014392 keepboxmode = BOXMODE;
1356114393 keepsupport = SUPPORT;
....@@ -13596,7 +14428,7 @@
1359614428 //}
1359714429
1359814430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13599
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1360014432 anchorX = ax;
1360114433 anchorY = ay;
1360214434 prevX = px;
....@@ -13630,6 +14462,7 @@
1363014462 else
1363114463 if (evt.getSource() == AAtimer)
1363214464 {
14465
+ Globals.TIMERRUNNING = false;
1363314466 if (mouseDown)
1363414467 {
1363514468 //new Exception().printStackTrace();
....@@ -13689,9 +14522,10 @@
1368914522
1369014523 // fev 2014???
1369114524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13692
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13693
- pingthread.StepToTarget(true); // true);
14525
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14526
+ pingthread.StepToTarget(); // true);
1369414527 }
14528
+
1369514529 // if (!LIVE)
1369614530 super.repaint();
1369714531 }
....@@ -13704,6 +14538,7 @@
1370414538 return;
1370514539
1370614540 AAtimer.restart(); //
14541
+ Globals.TIMERRUNNING = true;
1370714542
1370814543 // waslive = LIVE;
1370914544 // LIVE = false;
....@@ -13753,14 +14588,15 @@
1375314588 drag = false;
1375414589 //System.out.println("Mouse DOWN");
1375514590 editObj = false;
13756
- ClickInfo info = new ClickInfo();
13757
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13758
- info.pane = this;
13759
- info.camera = renderCamera;
13760
- info.x = x;
13761
- info.y = y;
13762
- info.modifiers = modifiersex;
13763
- 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);
1376414600 if (!editObj)
1376514601 {
1376614602 hasMarquee = true;
....@@ -13776,13 +14612,16 @@
1377614612
1377714613 public void mouseDragged(MouseEvent e)
1377814614 {
14615
+ Globals.MOUSEDRAGGED = true;
14616
+
1377914617 //System.out.println("mouseDragged: " + e);
1378014618 if (isRenderer)
1378114619 movingcamera = true;
14620
+
1378214621 //if (drawing)
1378314622 //return;
13784
- if ((e.getModifiersEx() & CTRL) != 0
13785
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1378614625 {
1378714626 //System.out.println("mouseDragged: " + e);
1378814627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -13806,9 +14645,17 @@
1380614645 return targetLookAt;
1380714646 }
1380814647
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
+
1380914653 class PingThread extends Thread
1381014654 {
1381114655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute;
1381214659
1381314660 // void JumpToTarget()
1381414661 // {
....@@ -13824,6 +14671,88 @@
1382414671 // only one thread!? synchronized
1382514672 void StepToTarget(boolean jump)
1382614673 {
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
+
1382714756 tmp.set(targetLookAt);
1382814757 tmp.sub(manipCamera.lookAt); // june 2014
1382914758
....@@ -13861,7 +14790,7 @@
1386114790
1386214791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1386314792 {
13864
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1386514794 }
1386614795
1386714796 if (OEILONCE && OEIL)
....@@ -13896,7 +14825,10 @@
1389614825 if (tmp.dot(tmp) < 0.00001)
1389714826 {
1389814827 zoomonce = false;
14828
+ live = false;
1389914829 }
14830
+ else
14831
+ live = true;
1390014832
1390114833 tmp.mul(step > step2 ? step : step2);
1390214834 }
....@@ -13923,7 +14855,7 @@
1392314855 {
1392414856 if (LOOKAT)
1392514857 manipCamera.lookAt.add(tmp);
13926
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1392714859 manipCamera.location.add(tmp);
1392814860
1392914861 {
....@@ -13938,7 +14870,10 @@
1393814870 lightCamera.computeTransform();
1393914871 }
1394014872 }
13941
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1394214877 }
1394314878 // ?????? mouseDown = true;
1394414879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14031,49 +14966,107 @@
1403114966 }
1403214967 }
1403314968 }
14969
+
1403414970 PingThread pingthread = new PingThread();
14035
- int delta = 5;
14036
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1403714974 boolean autorepeat = false;
1403814975
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
+
1403914995 void GoDown(int mod)
1404014996 {
1404114997 MODIFIERS |= COMMAND;
14042
- /*
14998
+ boolean isVR = (mouseMode&VR)!=0;
14999
+ /**/
1404315000 if((mod&SHIFT) == SHIFT)
14044
- manipCamera.RotatePosition(0, -speed);
14045
- else
14046
- manipCamera.BackForth(0, -speed*delta, getWidth());
14047
- */
14048
- if ((mod & SHIFT) == SHIFT)
1404915001 {
14050
- mouseMode = mouseMode; // VR??
14051
- } else
14052
- {
14053
- 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());
1405415009 }
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
+// }
1405515026
15027
+ targetLookAt.set(manipCamera.lookAt);
15028
+
1405615029 //prevX = X = anchorX;
1405715030 prevY = Y = anchorY - (int) (renderCamera.Distance());
1405815031 }
1405915032
1406015033 void GoUp(int mod)
1406115034 {
15035
+ RigidBody.justclicked = true;
15036
+
1406215037 MODIFIERS |= COMMAND;
14063
- /*
15038
+ /**/
15039
+ boolean isVR = (mouseMode&VR)!=0;
15040
+
1406415041 if((mod&SHIFT) == SHIFT)
14065
- manipCamera.RotatePosition(0, speed);
14066
- else
14067
- manipCamera.BackForth(0, speed*delta, getWidth());
14068
- */
14069
- if ((mod & SHIFT) == SHIFT)
1407015042 {
14071
- mouseMode = mouseMode;
14072
- } else
14073
- {
14074
- 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());
1407515050 }
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
+// }
1407615067
15068
+ targetLookAt.set(manipCamera.lookAt);
15069
+
1407715070 //prevX = X = anchorX;
1407815071 prevY = Y = anchorY + (int) (renderCamera.Distance());
1407915072 }
....@@ -14081,20 +15074,31 @@
1408115074 void GoLeft(int mod)
1408215075 {
1408315076 MODIFIERS |= COMMAND;
14084
- /*
15077
+ /**/
1408515078 if((mod&SHIFT) == SHIFT)
14086
- manipCamera.RotatePosition(speed, 0);
15079
+ manipCamera.Translate(speed, 0, getWidth());
1408715080 else
14088
- manipCamera.Translate(speed*delta, 0, getWidth());
14089
- */
14090
- if ((mod & SHIFT) == SHIFT)
1409115081 {
14092
- mouseMode = mouseMode;
14093
- } else
14094
- {
14095
- mouseMode |= ROTATE;
14096
- } // TRANSLATE;
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
+
15088
+ /**/
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1409715096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
15100
+ targetLookAt.set(manipCamera.lookAt);
15101
+
1409815102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1409915103 prevY = Y = anchorY;
1410015104 }
....@@ -14102,20 +15106,28 @@
1410215106 void GoRight(int mod)
1410315107 {
1410415108 MODIFIERS |= COMMAND;
14105
- /*
15109
+ /**/
1410615110 if((mod&SHIFT) == SHIFT)
14107
- manipCamera.RotatePosition(-speed, 0);
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1410815112 else
14109
- manipCamera.Translate(-speed*delta, 0, getWidth());
14110
- */
14111
- if ((mod & SHIFT) == SHIFT)
1411215113 {
14113
- mouseMode = mouseMode;
14114
- } else
14115
- {
14116
- mouseMode |= ROTATE;
14117
- } // TRANSLATE;
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
+
15120
+ /**/
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1411815128
15129
+ targetLookAt.set(manipCamera.lookAt);
15130
+
1411915131 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1412015132 prevY = Y = anchorY;
1412115133 }
....@@ -14157,14 +15169,16 @@
1415715169 if (editObj)
1415815170 {
1415915171 drag = true;
14160
- ClickInfo info = new ClickInfo();
14161
- info.bounds.setBounds(0, 0,
15172
+ //ClickInfo info = new ClickInfo();
15173
+ object.clickInfo.bounds.setBounds(0, 0,
1416215174 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14163
- info.pane = this;
14164
- info.camera = renderCamera;
14165
- info.x = x;
14166
- info.y = y;
14167
- object.editWindow.copy.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);
1416815182 } else
1416915183 {
1417015184 if (x < startX)
....@@ -14247,6 +15261,11 @@
1424715261 if ((mouseMode & ZOOM) != 0)
1424815262 {
1424915263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1425015269 if ((mouseMode & VR) != 0)
1425115270 manipCamera.BackForth(dx, dy, getWidth());
1425215271 else
....@@ -14313,22 +15332,30 @@
1431315332 }
1431415333 }
1431515334
15335
+// ClickInfo clickInfo = new ClickInfo();
15336
+
1431615337 public void mouseMoved(MouseEvent e)
1431715338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1431815342 //System.out.println("mouseMoved: " + e);
1431915343 if (isRenderer)
1432015344 return;
1432115345
14322
- ClickInfo ci = new ClickInfo();
14323
- ci.x = e.getX();
14324
- ci.y = e.getY();
14325
- ci.modifiers = e.getModifiersEx();
14326
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14327
- ci.pane = this;
14328
- 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;
1432915353 if (!isRenderer)
1433015354 {
14331
- if (object.editWindow.copy.doEditClick(ci, 0))
15355
+ //ObjEditor editWindow = object.editWindow;
15356
+ //Object3D copy = editWindow.copy;
15357
+ if (object.doEditClick(//clickInfo,
15358
+ 0))
1433215359 {
1433315360 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1433415361 } else
....@@ -14340,7 +15367,11 @@
1434015367
1434115368 public void mouseReleased(MouseEvent e)
1434215369 {
15370
+ Globals.MOUSEDRAGGED = false;
15371
+
1434315372 movingcamera = false;
15373
+ X = 0; // getBounds().width/2;
15374
+ Y = 0; // getBounds().height/2;
1434415375 //System.out.println("mouseReleased: " + e);
1434515376 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1434615377 }
....@@ -14492,8 +15523,10 @@
1449215523 mouseMode |= ZOOM;
1449315524 }
1449415525
14495
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14496
- 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)
1449715530 {
1449815531 mouseMode |= VR; // BACKFORTH;
1449915532 }
....@@ -14505,7 +15538,8 @@
1450515538 {
1450615539 mouseMode |= SELECT;
1450715540 }
14508
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450915543 {
1451015544 mouseMode &= ~VR;
1451115545 mouseMode |= TRANSLATE;
....@@ -14549,8 +15583,18 @@
1454915583 float SATPOW = 1; // 2; // 0.5f;
1455015584 float BRIPOW = 1; // 0.5f; // 0.5f;
1455115585
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
+
1455215592 public void keyPressed(int key)
1455315593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1455415598 if (key >= '0' && key <= '5')
1455515599 clampbit = (key-'0');
1455615600
....@@ -14596,7 +15640,8 @@
1459615640 // break;
1459715641 case 'T':
1459815642 CACHETEXTURE ^= true;
14599
- textures.clear();
15643
+ texturepigment.clear();
15644
+ texturebump.clear();
1460015645 // repaint();
1460115646 break;
1460215647 case 'Y':
....@@ -14606,8 +15651,8 @@
1460615651 case 'K':
1460715652 KOMPACTTEXTURE ^= true;
1460815653 //textures.clear();
14609
- break;
14610
- case 'P': // Texture Projection macros
15654
+ // break;
15655
+ //case 'P': // Texture Projection macros
1461115656 // SAVETEXTURE ^= true;
1461215657 macromode = true;
1461315658 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -14681,7 +15726,9 @@
1468115726 case 'E' : COMPACT ^= true;
1468215727 repaint();
1468315728 break;
14684
- case 'W' : DEBUGHSB ^= true;
15729
+ case 'W' : // Wide Window (fullscreen)
15730
+ //DEBUGHSB ^= true;
15731
+ ObjEditor.theFrame.ToggleFullScreen();
1468515732 repaint();
1468615733 break;
1468715734 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14706,8 +15753,8 @@
1470615753 RevertCamera();
1470715754 repaint();
1470815755 break;
15756
+ //case 'l':
1470915757 case 'L':
14710
- case 'l':
1471115758 if (lightMode)
1471215759 {
1471315760 lightMode = false;
....@@ -14726,7 +15773,7 @@
1472615773 targetLookAt.set(manipCamera.lookAt);
1472715774 repaint();
1472815775 break;
14729
- case 'p':
15776
+ case 'P': // p':
1473015777 // c'est quoi ca au juste? spherical ^= true;
1473115778 Skinshader ^= true; programInitialized = false;
1473215779 repaint();
....@@ -14737,7 +15784,8 @@
1473715784 break;
1473815785 case 'm':
1473915786 {
14740
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1474115789 break;
1474215790 }
1474315791 case 'M':
....@@ -14764,27 +15812,31 @@
1476415812 repaint();
1476515813 break;
1476615814 case 'O':
14767
- Globals.drawMode = OCCLUSION; // WARNING
14768
- repaint();
14769
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1477015818 case 'o':
1477115819 OCCLUSION_CULLING ^= true;
1477215820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1477315821 break;
14774
- case '0': envyoff ^= true; repaint(); break;
15822
+ //case '0': envyoff ^= true; repaint(); break;
1477515823 case '1':
1477615824 case '2':
1477715825 case '3':
1477815826 case '4':
1477915827 case '5':
14780
- newenvy = Character.getNumericValue(key);
14781
- repaint();
14782
- break;
1478315828 case '6':
1478415829 case '7':
1478515830 case '8':
1478615831 case '9':
14787
- 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
+ }
1478815840 repaint();
1478915841 break;
1479015842 case '!':
....@@ -14850,11 +15902,25 @@
1485015902 case '_':
1485115903 kompactbit = 5;
1485215904 break;
14853
- case '+':
14854
- kompactbit = 6;
14855
- break;
15905
+// case '+':
15906
+// kompactbit = 6;
15907
+// break;
1485615908 case ' ':
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
1485715913 lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
1485815924 Globals.lighttouched = true;
1485915925 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1486015926 targetLookAt.set(manipCamera.lookAt);
....@@ -14862,15 +15928,20 @@
1486215928 break;
1486315929 //case '`' :
1486415930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1486515935 RENDERPROGRAM += 1;
1486615936 RENDERPROGRAM %= 3;
15937
+
1486715938 repaint();
1486815939 break;
1486915940 case 'Z':
1487015941 //RESIZETEXTURE ^= true;
1487115942 //break;
1487215943 case 'z':
14873
- RENDERSHADOW ^= true;
15944
+ Globals.RENDERSHADOW ^= true;
1487415945 Globals.lighttouched = true;
1487515946 repaint();
1487615947 break;
....@@ -14899,12 +15970,17 @@
1489915970 case ENTER:
1490015971 // object.editWindow.ScreenFit(); // Edit();
1490115972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1490215977 break;
1490315978 case DELETE:
1490415979 ClearSelection();
1490515980 break;
14906
- /*
1490715981 case '+':
15982
+
15983
+ /*
1490815984 //fontsize += 1;
1490915985 bbzoom *= 2;
1491015986 repaint();
....@@ -14921,30 +15997,36 @@
1492115997 case '=':
1492215998 IncDepth();
1492315999 //fontsize += 1;
14924
- object.editWindow.refreshContents(true);
16000
+ object.GetWindow().refreshContents(true);
1492516001 maskbit = 6;
1492616002 break;
1492716003 case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1492816004 DecDepth();
1492916005 maskbit = 5;
1493016006 //if(fontsize > 1) fontsize -= 1;
14931
- if (object.editWindow == null)
14932
- new Exception().printStackTrace();
14933
- else
14934
- object.editWindow.refreshContents(true);
16007
+// if (object.editWindow == null)
16008
+// new Exception().printStackTrace();
16009
+// else
16010
+ object.GetWindow().refreshContents(true);
1493516011 break;
1493616012 case '{':
14937
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1493816016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1493916017 repaint();
1494016018 break;
1494116019 case '}':
14942
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1494316023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1494416024 repaint();
1494516025 break;
1494616026 case '[':
14947
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1494816030 if (false) //manipCamera.hAspect == 0)
1494916031 {
1495016032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -14960,7 +16042,9 @@
1496016042 break;
1496116043 case ']':
1496216044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14963
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1496416048 if (false) //manipCamera.hAspect == 0)
1496516049 {
1496616050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -14998,98 +16082,113 @@
1499816082 }
1499916083 }
1500016084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1500116089 public void processKeyEvent(KeyEvent e)
1500216090 {
1500316091 switch (e.getID())
1500416092 {
1500516093 case KeyEvent.KEY_PRESSED:
15006
- if (!autorepeat)
15007
- {
15008
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15009
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15010
- }
15011
- if (manipCamera == lightCamera)
15012
- {
15013
- switch (e.getKeyCode())
15014
- {
15015
- case DOWN_ARROW:
15016
- lightCamera.DECAL /= 2;
15017
- repaint();
15018
- break;
15019
- case UP_ARROW:
15020
- lightCamera.DECAL *= 2;
15021
- repaint();
15022
- break;
15023
- case LEFT_ARROW:
15024
- lightCamera.SCALE /= 2;
15025
- repaint();
15026
- break;
15027
- case RIGHT_ARROW:
15028
- lightCamera.SCALE *= 2;
15029
- repaint();
15030
- break;
15031
- default:
15032
- break;
15033
- }
15034
-
15035
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15036
- } else
15037
- {
15038
- if (true) // !autorepeat)
15039
- {
15040
- boolean reset = true;
15041
-
15042
- switch (e.getKeyCode())
15043
- {
15044
- case DOWN_ARROW:
15045
- GoDown(e.getModifiersEx());
15046
- repaint();
15047
- break;
15048
- case UP_ARROW:
15049
- GoUp(e.getModifiersEx());
15050
- repaint();
15051
- break;
15052
- case LEFT_ARROW:
15053
- GoLeft(e.getModifiersEx());
15054
- repaint();
15055
- break;
15056
- case RIGHT_ARROW:
15057
- GoRight(e.getModifiersEx());
15058
- repaint();
15059
- break;
15060
- default:
15061
- reset = false;
15062
- break;
15063
- }
15064
-
15065
- if (reset)
15066
- {
15067
- autorepeat = true;
15068
-
15069
- targetLookAt.set(manipCamera.lookAt);
15070
- }
15071
- }
15072
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1507316099 break;
15074
- case KeyEvent.KEY_TYPED:
15075
- 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;
1507616170 case KeyEvent.KEY_RELEASED:
15077
- {
15078
- switch (e.getKeyCode())
15079
- {
15080
- case DOWN_ARROW:
15081
- case UP_ARROW:
15082
- case LEFT_ARROW:
15083
- case RIGHT_ARROW:
15084
- MODIFIERS &= ~COMMAND;
15085
- autorepeat = false;
15086
- break;
15087
- default:
15088
- break;
15089
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1509016173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1509116175 break;
15092
- }
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
+// }
1509316192 default:
1509416193 break;
1509516194 }
....@@ -15155,7 +16254,7 @@
1515516254 }
1515616255 */
1515716256
15158
- object.editWindow.EditSelection();
16257
+ object.GetWindow().EditSelection(false);
1515916258 }
1516016259
1516116260 void SelectParent()
....@@ -15172,10 +16271,10 @@
1517216271 {
1517316272 //selectees.remove(i);
1517416273 System.out.println("select parent of " + elem);
15175
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
16274
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1517616275 } else
1517716276 {
15178
- group.editWindow.Select(elem.GetTreePath(), first, true);
16277
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
1517916278 }
1518016279
1518116280 first = false;
....@@ -15217,12 +16316,12 @@
1521716316 for (int j = 0; j < group.children.size(); j++)
1521816317 {
1521916318 elem = (Object3D) group.children.elementAt(j);
15220
- object.editWindow.Select(elem.GetTreePath(), first, true);
16319
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1522116320 first = false;
1522216321 }
1522316322 } else
1522416323 {
15225
- object.editWindow.Select(elem.GetTreePath(), first, true);
16324
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1522616325 }
1522716326
1522816327 first = false;
....@@ -15233,21 +16332,21 @@
1523316332 {
1523416333 //Composite group = (Composite) object;
1523516334 Object3D group = object;
15236
- group.editWindow.loadClipboard(true); // ClearSelection(false);
16335
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
1523716336 }
1523816337
1523916338 void ResetTransform(int mask)
1524016339 {
1524116340 //Composite group = (Composite) object;
1524216341 Object3D group = object;
15243
- group.editWindow.ResetTransform(mask);
16342
+ group.GetWindow().ResetTransform(mask);
1524416343 }
1524516344
1524616345 void FlipTransform()
1524716346 {
1524816347 //Composite group = (Composite) object;
1524916348 Object3D group = object;
15250
- group.editWindow.FlipTransform();
16349
+ group.GetWindow().FlipTransform();
1525116350 // group.editWindow.ReduceMesh(true);
1525216351 }
1525316352
....@@ -15255,7 +16354,7 @@
1525516354 {
1525616355 //Composite group = (Composite) object;
1525716356 Object3D group = object;
15258
- group.editWindow.PrintMemory();
16357
+ group.GetWindow().PrintMemory();
1525916358 // group.editWindow.ReduceMesh(true);
1526016359 }
1526116360
....@@ -15263,7 +16362,7 @@
1526316362 {
1526416363 //Composite group = (Composite) object;
1526516364 Object3D group = object;
15266
- group.editWindow.ResetCentroid();
16365
+ group.GetWindow().ResetCentroid();
1526716366 }
1526816367
1526916368 void IncDepth()
....@@ -15345,11 +16444,11 @@
1534516444
1534616445 int width = getBounds().width;
1534716446 int height = getBounds().height;
15348
- ClickInfo info = new ClickInfo();
15349
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1535016447 //Image img = CreateImage(width, height);
1535116448 //System.out.println("width = " + width + "; height = " + height + "\n");
16449
+
1535216450 Graphics gr = g; // img.getGraphics();
16451
+
1535316452 if (!hasMarquee)
1535416453 {
1535516454 if (Xmin < Xmax) // !locked)
....@@ -15421,44 +16520,92 @@
1542116520 }
1542216521 if (object != null && !hasMarquee)
1542316522 {
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
+
1542416529 if (isRenderer)
1542516530 {
15426
- info.flags++;
16531
+ object.clickInfo.flags++;
1542716532 double frameAspect = (double) width / (double) height;
1542816533 if (frameAspect > renderCamera.aspect)
1542916534 {
1543016535 int desired = (int) ((double) height * renderCamera.aspect);
15431
- info.bounds.width -= width - desired;
15432
- info.bounds.x += (width - desired) / 2;
16536
+ object.clickInfo.bounds.width -= width - desired;
16537
+ object.clickInfo.bounds.x += (width - desired) / 2;
1543316538 } else
1543416539 {
1543516540 int desired = (int) ((double) width / renderCamera.aspect);
15436
- info.bounds.height -= height - desired;
15437
- info.bounds.y += (height - desired) / 2;
16541
+ object.clickInfo.bounds.height -= height - desired;
16542
+ object.clickInfo.bounds.y += (height - desired) / 2;
1543816543 }
1543916544 }
15440
- info.g = gr;
15441
- info.camera = renderCamera;
16545
+
16546
+ object.clickInfo.g = gr;
16547
+ object.clickInfo.camera = renderCamera;
1544216548 /*
1544316549 // Memory intensive (brep.verticescopy)
1544416550 if (!(object instanceof Composite))
1544516551 object.draw(info, 0, false); // SLOW :
1544616552 */
15447
- if (!isRenderer)
16553
+ if (!isRenderer) // && drag)
1544816554 {
15449
- object.drawEditHandles(info, 0);
16555
+ Grafreed.Assert(object != null);
16556
+ Grafreed.Assert(object.selection != null);
16557
+ if (object.selection.Size() > 0)
16558
+ {
16559
+ int hitSomething = object.selection.get(0).hitSomething;
16560
+
16561
+ object.clickInfo.DX = 0;
16562
+ object.clickInfo.DY = 0;
16563
+ object.clickInfo.W = 1;
16564
+ if (hitSomething == Object3D.hitCenter)
16565
+ {
16566
+ info.DX = X;
16567
+ if (X != 0)
16568
+ info.DX -= info.bounds.width/2;
16569
+
16570
+ info.DY = Y;
16571
+ if (Y != 0)
16572
+ info.DY -= info.bounds.height/2;
16573
+ }
16574
+
16575
+ object.drawEditHandles(//info,
16576
+ 0);
16577
+
16578
+ if (drag && (X != 0 || Y != 0))
16579
+ {
16580
+ switch (hitSomething)
16581
+ {
16582
+ case Object3D.hitCenter: gr.setColor(Color.white);
16583
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16584
+ break;
16585
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
16586
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16587
+ break;
16588
+ case Object3D.hitScale: gr.setColor(Color.cyan);
16589
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16590
+ break;
16591
+ }
16592
+
16593
+ }
16594
+ }
1545016595 }
1545116596 }
16597
+
1545216598 if (isRenderer)
1545316599 {
1545416600 //gr.setColor(Color.black);
1545516601 //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1545616602 //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1545716603 }
16604
+
1545816605 if (hasMarquee)
1545916606 {
1546016607 gr.setXORMode(Color.white);
15461
- gr.setColor(Color.red);
16608
+ gr.setColor(Color.white);
1546216609 if (!firstime)
1546316610 {
1546416611 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -15617,7 +16764,8 @@
1561716764
1561816765 public boolean mouseDrag(Event evt, int x, int y)
1561916766 {
15620
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1562116769 /*
1562216770 drag = true;
1562316771 //System.out.println("Mouse DRAG");
....@@ -15736,6 +16884,7 @@
1573616884 public boolean mouseUp(Event evt, int x, int y)
1573716885 {
1573816886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1573916888 /*
1574016889 locked = false;
1574116890 if (isRenderer)
....@@ -15861,7 +17010,7 @@
1586117010 Object3D object;
1586217011 static Object3D trackedobject;
1586317012 Camera renderCamera; // Light or Eye (or Occlusion)
15864
- /*static*/ Camera manipCamera; // Light or Eye
17013
+ /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1586517014 /*static*/ Camera eyeCamera;
1586617015 /*static*/ Camera lightCamera;
1586717016 int cameracount;
....@@ -15925,6 +17074,8 @@
1592517074 private /*static*/ boolean firstime;
1592617075 private /*static*/ cVector newView = new cVector();
1592717076 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"};
1592817079 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1592917080 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1593017081 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -15937,29 +17088,67 @@
1593717088 {
1593817089 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1593917090
17091
+ int usedsuf = 0;
17092
+
1594017093 for (int i = 0; i < suffixes.length; i++)
1594117094 {
15942
- String resourceName = basename + suffixes[i] + "." + suffix;
15943
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15944
- mipmapped,
15945
- FileUtil.getFileSuffix(resourceName));
15946
- if (data == null)
17095
+ String[] suffixe = suffixes;
17096
+ String[] fallback = suffixes2;
17097
+ String[] fallfallback = suffixes3;
17098
+
17099
+ for (int c=usedsuf; --c>=0;)
1594717100 {
15948
- throw new IOException("Unable to load texture " + resourceName);
17101
+// String[] temp = suffixe;
17102
+// suffixe = fallback;
17103
+// fallback = fallfallback;
17104
+// fallfallback = temp;
1594917105 }
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
+
1595017134 //System.out.println("Target = " + targets[i]);
1595117135 cubemap.updateImage(data, targets[i]);
1595217136 }
1595317137
1595417138 return cubemap;
1595517139 }
17140
+
1595617141 int bigsphere = -1;
1595717142
1595817143 float BGcolor = 0.5f;
1595917144
15960
- private void DrawSkyBox(GL gl)
17145
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17146
+
17147
+ private void DrawSkyBox(GL gl, float ratio)
1596117148 {
15962
- if (envyoff || cubemap == null)
17149
+ if (//envyoff ||
17150
+ WIREFRAME ||
17151
+ cubemap == null)
1596317152 {
1596417153 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1596517154 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -15974,7 +17163,17 @@
1597417163 // Compensates for ExaminerViewer's modification of modelview matrix
1597517164 gl.glMatrixMode(GL.GL_MODELVIEW);
1597617165 gl.glLoadIdentity();
17166
+ gl.glScalef(1,ratio,1);
1597717167
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
+
1597817177 //gl.glActiveTexture(GL.GL_TEXTURE1);
1597917178 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1598017179
....@@ -16006,6 +17205,7 @@
1600617205 {
1600717206 gl.glScalef(1.0f, -1.0f, 1.0f);
1600817207 }
17208
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1600917209 gl.glMultMatrixd(viewrot_1, 0);
1601017210 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1601117211 //viewer.updateInverseRotation(gl);
....@@ -16046,7 +17246,8 @@
1604617246 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1604717247
1604817248 cubemap.disable();
16049
- ////cubemap.unbind();
17249
+ //cubemap.dispose();
17250
+
1605017251 if (CULLFACE)
1605117252 {
1605217253 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16102,7 +17303,7 @@
1610217303 gl.glScalef(1.0f, -1.0f, 1.0f);
1610317304 }
1610417305
16105
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17306
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1610617307
1610717308 float step = 2; // 0.1666f; //0.25f;
1610817309 float stepv = 2; // step * 1652 / 998;
....@@ -16146,16 +17347,16 @@
1614617347 cStatic.objectstack[materialdepth++] = checker;
1614717348 //System.out.println("material " + material);
1614817349 //Applet3D.tracein(this, selected);
16149
- vector2buffer = checker.projectedVertices;
17350
+ //vector2buffer = checker.projectedVertices;
1615017351
1615117352 //checker.GetMaterial().Draw(this, false); // true);
16152
- DrawMaterial(checker.GetMaterial(), false); // true);
17353
+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1615317354
1615417355 materialdepth -= 1;
1615517356 if (materialdepth > 0)
1615617357 {
16157
- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16158
- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
17358
+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
17359
+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1615917360 }
1616017361 //checker.GetMaterial().opacity = 1f;
1616117362 ////checker.GetMaterial().ambient = 1f;
....@@ -16241,6 +17442,14 @@
1624117442 }
1624217443 }
1624317444
17445
+ private Object3D GetFolder()
17446
+ {
17447
+ Object3D folder = object.GetWindow().copy;
17448
+ if (object.GetWindow().copy.selection.Size() > 0)
17449
+ folder = object.GetWindow().copy.selection.elementAt(0);
17450
+ return folder;
17451
+ }
17452
+
1624417453 class SelectBuffer implements GLEventListener
1624517454 {
1624617455
....@@ -16256,7 +17465,7 @@
1625617465 //new Exception().printStackTrace();
1625717466 System.out.println("select buffer init");
1625817467 // Use debug pipeline
16259
- drawable.setGL(new DebugGL(drawable.getGL()));
17468
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1626017469
1626117470 GL gl = drawable.getGL();
1626217471
....@@ -16320,6 +17529,17 @@
1632017529
1632117530 //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
1632217531
17532
+ if (PAINTMODE)
17533
+ {
17534
+ if (object.GetWindow().copy.selection.Size() > 0)
17535
+ {
17536
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17537
+
17538
+ // Make what you paint not selectable.
17539
+ paintobj.ResetSelectable();
17540
+ }
17541
+ }
17542
+
1632317543 //int tmp = selection_view;
1632417544 //selection_view = -1;
1632517545 int temp = DrawMode();
....@@ -16331,6 +17551,17 @@
1633117551 // temp = DEFAULT; // patch for selection debug
1633217552 Globals.drawMode = temp; // WARNING
1633317553
17554
+ if (PAINTMODE)
17555
+ {
17556
+ if (object.GetWindow().copy.selection.Size() > 0)
17557
+ {
17558
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17559
+
17560
+ // Revert.
17561
+ paintobj.RestoreSelectable();
17562
+ }
17563
+ }
17564
+
1633417565 //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
1633517566
1633617567 // trying different ways of getting the depth info over
....@@ -16361,7 +17592,7 @@
1636117592
1636217593 float depth = depths[y * TEX_SIZE + x];
1636317594
16364
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1636517596 {
1636617597 pointselection = false;
1636717598
....@@ -16378,6 +17609,8 @@
1637817609 // System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1637917610 // System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1638017611 // System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
17612
+
17613
+ CreateSelectedPoint();
1638117614
1638217615 // Will fit the mesh !!!
1638317616 selectedpoint.toParent[0][0] = 0.0001;
....@@ -16432,29 +17665,31 @@
1643217665 }
1643317666
1643417667 if (!movingcamera && !PAINTMODE)
16435
- object.editWindow.ScreenFitPoint(); // fev 2014
17668
+ object.GetWindow().ScreenFitPoint(); // fev 2014
1643617669
16437
- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
17670
+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643817671 {
16439
- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
17672
+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1644017673
16441
- Object3D group = new Object3D("inst" + paintcount++);
17674
+ if (object.GetWindow().copy.selection.Size() > 0)
17675
+ {
17676
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
1644217677
16443
- group.CreateMaterial(); // use a void leaf to select instances
16444
-
16445
- group.add(paintobj); // link
16446
-
16447
- object.editWindow.SnapObject(group);
16448
-
16449
- Object3D folder = object.editWindow.copy;
16450
-
16451
- if (object.editWindow.copy.selection.Size() > 0)
16452
- folder = object.editWindow.copy.selection.elementAt(0);
16453
-
16454
- folder.add(group);
16455
-
16456
- object.editWindow.ResetModel();
16457
- object.editWindow.refreshContents();
17678
+ Object3D inst = new Object3D("inst" + paintcount++);
17679
+
17680
+ inst.CreateMaterial(); // use a void leaf to select instances
17681
+
17682
+ inst.add(paintobj); // link
17683
+
17684
+ object.GetWindow().SnapObject(inst);
17685
+
17686
+ Object3D folder = paintFolder; // GetFolder();
17687
+
17688
+ folder.add(inst);
17689
+
17690
+ object.GetWindow().ResetModel();
17691
+ object.GetWindow().refreshContents();
17692
+ }
1645817693 }
1645917694 else
1646017695 paintcount = 0;
....@@ -16493,6 +17728,11 @@
1649317728 //System.out.println("objects[color] = " + objects[color]);
1649417729 //objects[color].Select();
1649517730 indexcount = 0;
17731
+ ObjEditor window = object.GetWindow();
17732
+ if (window != null && deselect)
17733
+ {
17734
+ window.Select(null, deselect, true);
17735
+ }
1649617736 object.Select(color, deselect);
1649717737 }
1649817738
....@@ -16543,6 +17783,7 @@
1654317783
1654417784 public void init(GLAutoDrawable drawable)
1654517785 {
17786
+ if (Globals.DEBUG)
1654617787 System.out.println("shadow buffer init");
1654717788
1654817789 GL gl = drawable.getGL();
....@@ -16592,7 +17833,7 @@
1659217833 gl.glDisable(gl.GL_CULL_FACE);
1659317834 }
1659417835
16595
- if (!RENDERSHADOW)
17836
+ if (!Globals.RENDERSHADOW)
1659617837 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659717838
1659817839 // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16602,7 +17843,7 @@
1660217843 //gl.glColorMask(false, false, false, false);
1660317844
1660417845 //render_scene_from_light_view(gl, drawable, 0, 0);
16605
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
17846
+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660617847 {
1660717848 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660817849
....@@ -16771,10 +18012,14 @@
1677118012 gl.glFlush();
1677218013
1677318014 /**/
16774
- 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);
1677518016
16776
- float[] pixels = occlusionsizebuffer.array();
18017
+ float[] depths = occlusiondepthbuffer.array();
1677718018
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
+
1677818023 double r = 0, g = 0, b = 0;
1677918024
1678018025 double count = 0;
....@@ -16785,7 +18030,7 @@
1678518030
1678618031 double FACTOR = 1;
1678718032
16788
- for (int i = 0; i < pixels.length; i++)
18033
+ for (int i = 0; i < depths.length; i++)
1678918034 {
1679018035 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1679118036 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -16868,7 +18113,7 @@
1686818113
1686918114 double scale = ray.z; // 1; // cos
1687018115
16871
- float depth = pixels[newindex];
18116
+ float depth = depths[newindex];
1687218117
1687318118 /*
1687418119 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17011,6 +18256,11 @@
1701118256 static boolean DEBUG_SELECTION = false;
1701218257 boolean OCCLUSION_CULLING = false; //true;
1701318258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1701418264 static public int indexcount = 0;
1701518265 /*static*/ cColor vertexOcclusion = new cColor();
1701618266 //private int selection_view = -1;
....@@ -17018,23 +18268,15 @@
1701818268 int AAbuffersize = 0;
1701918269
1702018270 //double[] selectedpoint = new double[3];
17021
- static Superellipsoid selectedpoint = new Superellipsoid();
18271
+ static Superellipsoid selectedpoint;
1702218272 static Sphere previousselectedpoint = null;
17023
- static Sphere debugpointG = new Sphere();
17024
- static Sphere debugpointP = new Sphere();
17025
- static Sphere debugpointC = new Sphere();
17026
- static Sphere debugpointR = new Sphere();
18273
+ static Sphere debugpointG;
18274
+ static Sphere debugpointP;
18275
+ static Sphere debugpointC;
18276
+ static Sphere debugpointR;
1702718277
1702818278 static Sphere debugpoints[] = new Sphere[8];
1702918279
17030
- static
17031
- {
17032
- for (int i=0; i<8; i++)
17033
- {
17034
- debugpoints[i] = new Sphere();
17035
- }
17036
- }
17037
-
1703818280 static void InitPoints(float radius)
1703918281 {
1704018282 for (int i=0; i<8; i++)
....@@ -17073,11 +18315,14 @@
1707318315 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1707418316 static IntBuffer bigAAbuffer;
1707518317 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17076
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18318
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1707718319 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1707818320 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1707918321 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17080
- 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
+
1708118326 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1708218327 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1708318328 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();