Normand Briere
2019-10-04 57c5b6cd8d12ffdaa3e0b099451e3c031012750a
CameraPane.java
....@@ -1,4 +1,5 @@
11
2
+import com.bulletphysics.dynamics.RigidBody;
23 import java.awt.*;
34 import java.awt.event.*;
45 import java.awt.image.*;
....@@ -18,7 +19,10 @@
1819 import javax.imageio.ImageIO;
1920 import javax.imageio.ImageWriteParam;
2021 import javax.imageio.ImageWriter;
22
+import javax.imageio.ImageReadParam;
23
+import javax.imageio.ImageReader;
2124 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
25
+import javax.imageio.stream.ImageInputStream;
2226 import javax.imageio.stream.ImageOutputStream;
2327 import javax.imageio.ImageWriteParam;
2428
....@@ -30,6 +34,7 @@
3034 import java.nio.*;
3135
3236 import gleem.linalg.Mat4f;
37
+import javax.imageio.ImageTypeSpecifier;
3338
3439 class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
3540 {
....@@ -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
....@@ -83,7 +124,7 @@
83124 static boolean LOCALTRANSFORM = false;
84125 static boolean FULLSCREEN = false;
85126 static boolean SUPPORT = true;
86
-static boolean INERTIA = true;
127
+static boolean INERTIA = false; // true;
87128 static boolean FAST = false;
88129 static boolean SLOWPOSE = false;
89130 static boolean FOOTCONTACT = true;
....@@ -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
....@@ -193,7 +250,7 @@
193250
194251 public javax.media.opengl.GL GetGL0()
195252 {
196
- return null;
253
+ return currentGL;
197254 }
198255
199256 public int GenList()
....@@ -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;
....@@ -1448,7 +1530,7 @@
14481530 }
14491531 }
14501532 float b = 0;
1451
- if (obj.support != null && obj.link2master)
1533
+ if (obj.support != null && obj.Link2Support())
14521534 {
14531535 b = 1;
14541536 }
....@@ -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();
....@@ -1628,7 +1708,7 @@
16281708
16291709 cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301710
1631
- float[] colorV = GrafreeD.colorV;
1711
+ float[] colorV = Grafreed.colorV;
16321712
16331713 /**/
16341714 if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -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
....@@ -2140,7 +2224,7 @@
21402224 System.err.println("LIVE = " + Globals.isLIVE());
21412225
21422226 if (!Globals.isLIVE()) // save sound
2143
- GrafreeD.savesound = true; // wav.save();
2227
+ Grafreed.savesound = true; // wav.save();
21442228 // else
21452229 repaint(); // start loop // may 2013
21462230 }
....@@ -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(),
....@@ -9542,7 +10008,7 @@
954210008
954310009 if (!BOXMODE)
954410010 {
9545
- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
10011
+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
954610012 }
954710013
954810014 if (!BOXMODE)
....@@ -9580,7 +10046,7 @@
958010046 ABORTED = false;
958110047 }
958210048 else
9583
- GrafreeD.wav.cursor += 735 * ACSIZE;
10049
+ Grafreed.wav.cursor += 735 * ACSIZE;
958410050
958510051 if (false)
958610052 {
....@@ -10240,14 +10706,23 @@
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 {
10246
- if (GrafreeD.savesound && GrafreeD.hassound)
10715
+ if (patchMaterial.patchMaterial)
1024710716 {
10248
- GrafreeD.wav.save();
10249
- GrafreeD.savesound = false;
10250
- GrafreeD.hassound = false;
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
10721
+ if (Grafreed.savesound && Grafreed.hassound)
10722
+ {
10723
+ Grafreed.wav.save();
10724
+ Grafreed.savesound = false;
10725
+ Grafreed.hassound = false;
1025110726 }
1025210727 // if (DEBUG_SELECTION)
1025310728 // {
....@@ -10286,7 +10761,9 @@
1028610761 }
1028710762 /**/
1028810763
10289
- if (selection)
10764
+ boolean control = ((modifiers & CTRL) != 0);
10765
+
10766
+ if (selection && (!Globals.isLIVE() || control))
1029010767 {
1029110768 selectbuffer.display();
1029210769 return;
....@@ -10323,6 +10800,7 @@
1032310800 ANTIALIAS = 0;
1032410801 //System.out.println("RESTART");
1032510802 AAtimer.restart();
10803
+ Globals.TIMERRUNNING = true;
1032610804 }
1032710805 }
1032810806 }
....@@ -10337,6 +10815,112 @@
1033710815
1033810816 if (DrawMode() == DEFAULT)
1033910817 {
10818
+ if (manipCamera == lightCamera)
10819
+ {
10820
+// switch (e.getKeyCode())
10821
+// {
10822
+// case DOWN_ARROW:
10823
+// lightCamera.DECAL /= 2;
10824
+// repaint();
10825
+// break;
10826
+// case UP_ARROW:
10827
+// lightCamera.DECAL *= 2;
10828
+// repaint();
10829
+// break;
10830
+// case LEFT_ARROW:
10831
+// lightCamera.SCALE /= 2;
10832
+// repaint();
10833
+// break;
10834
+// case RIGHT_ARROW:
10835
+// lightCamera.SCALE *= 2;
10836
+// repaint();
10837
+// break;
10838
+// default:
10839
+// break;
10840
+ if (keys[DOWN_ARROW])
10841
+ {
10842
+ lightCamera.DECAL /= 2;
10843
+ }
10844
+
10845
+ if (keys[UP_ARROW])
10846
+ {
10847
+ lightCamera.DECAL *= 2;
10848
+ }
10849
+
10850
+ if (keys[LEFT_ARROW])
10851
+ {
10852
+ lightCamera.SCALE /= 2;
10853
+ }
10854
+
10855
+ if (keys[RIGHT_ARROW])
10856
+ {
10857
+ lightCamera.SCALE *= 2;
10858
+ }
10859
+ }
10860
+ else
10861
+ {
10862
+ //pingthread.mute = true;
10863
+
10864
+ boolean keyon = false;
10865
+
10866
+ if (keys[DOWN_ARROW])
10867
+ {
10868
+ speed = ++speedkey[DOWN_ARROW];
10869
+ if (speed > 20)
10870
+ speed = 20;
10871
+ GoDown(modifiers);
10872
+ keyon = true;
10873
+ }
10874
+ else
10875
+ speedkey[DOWN_ARROW] = 0;
10876
+
10877
+ if (keys[UP_ARROW])
10878
+ {
10879
+ speed = ++speedkey[UP_ARROW];
10880
+ if (speed > 20)
10881
+ speed = 20;
10882
+ GoUp(modifiers);
10883
+ keyon = true;
10884
+ }
10885
+ else
10886
+ speedkey[UP_ARROW] = 0;
10887
+
10888
+ if (keys[LEFT_ARROW])
10889
+ {
10890
+ speed = ++speedkey[LEFT_ARROW];
10891
+ if (speed > 20)
10892
+ speed = 20;
10893
+ GoLeft(modifiers);
10894
+ keyon = true;
10895
+ }
10896
+ else
10897
+ speedkey[LEFT_ARROW] = 0;
10898
+
10899
+ if (keys[RIGHT_ARROW])
10900
+ {
10901
+ speed = ++speedkey[RIGHT_ARROW];
10902
+ if (speed > 20)
10903
+ speed = 20;
10904
+ GoRight(modifiers);
10905
+ keyon = true;
10906
+ }
10907
+ else
10908
+ speedkey[RIGHT_ARROW] = 0;
10909
+
10910
+ if (Globals.WALK && capsLocked)
10911
+ {
10912
+ Walk();
10913
+ keyon = true;
10914
+ }
10915
+
10916
+ if (keyon)
10917
+ {
10918
+ repaint();
10919
+ }
10920
+
10921
+ //pingthread.mute = false;
10922
+ }
10923
+
1034010924 currentlydrawing = true;
1034110925 }
1034210926
....@@ -10377,7 +10961,7 @@
1037710961 Object3D theobject = object;
1037810962 Object3D theparent = object.parent;
1037910963 object.parent = null;
10380
- object = (Object3D)GrafreeD.clone(object);
10964
+ object = (Object3D)Grafreed.clone(object);
1038110965 object.Stripify();
1038210966 if (theobject.selection == null || theobject.selection.Size() == 0)
1038310967 theobject.PreprocessOcclusion(this);
....@@ -10390,13 +10974,14 @@
1039010974 ambientOcclusion = false;
1039110975 }
1039210976
10393
- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10977
+ if (//Globals.lighttouched &&
10978
+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039410979 {
1039510980 //if (RENDERSHADOW) // ?
1039610981 if (!IsFrozen())
1039710982 {
1039810983 // dec 2012
10399
- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10984
+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1040010985 {
1040110986 Globals.framecount++;
1040210987 shadowbuffer.display();
....@@ -10409,7 +10994,7 @@
1040910994
1041010995 if (wait)
1041110996 {
10412
- Sleep(500);
10997
+ Sleep(200); // blocks everything
1041310998
1041410999 wait = false;
1041511000 }
....@@ -10523,8 +11108,8 @@
1052311108
1052411109 // if (parentcam != renderCamera) // not a light
1052511110 if (cam != lightCamera)
10526
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527
- LA.matConcat(matrix, parentcam.toParent, matrix);
11111
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11112
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1052811113
1052911114 for (int j = 0; j < 4; j++)
1053011115 {
....@@ -10538,8 +11123,8 @@
1053811123
1053911124 // if (parentcam != renderCamera) // not a light
1054011125 if (cam != lightCamera)
10541
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542
- LA.matConcat(parentcam.fromParent, matrix, matrix);
11126
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11127
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1054311128
1054411129 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054511130
....@@ -10625,13 +11210,43 @@
1062511210 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1062611211 }
1062711212
10628
- if (newenvy > -1)
11213
+// if (newenvy > -1)
11214
+// {
11215
+// LoadEnvy(newenvy);
11216
+// }
11217
+//
11218
+// newenvy = -1;
11219
+
11220
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1062911221 {
10630
- LoadEnvy(newenvy);
11222
+ if (cubemaprgb == null)
11223
+ {
11224
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11225
+ }
11226
+
11227
+ cubemap = cubemaprgb;
1063111228 }
10632
-
10633
- newenvy = -1;
10634
-
11229
+ else
11230
+ {
11231
+ if (object.skyboxname != null)
11232
+ {
11233
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11234
+ {
11235
+ if (cubemap != null && cubemap != cubemaprgb)
11236
+ cubemap.dispose();
11237
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11238
+ loadedskyboxname = object.skyboxname;
11239
+ }
11240
+ }
11241
+ else
11242
+ {
11243
+ cubemapcustom = null;
11244
+ loadedskyboxname = null;
11245
+ }
11246
+
11247
+ cubemap = cubemapcustom;
11248
+ }
11249
+
1063511250 ratio = ((double) getWidth()) / getHeight();
1063611251 //System.out.println("ratio = " + ratio);
1063711252
....@@ -10647,7 +11262,7 @@
1064711262
1064811263 if (!IsFrozen() && !ambientOcclusion)
1064911264 {
10650
- DrawSkyBox(gl);
11265
+ DrawSkyBox(gl, (float)ratio);
1065111266 }
1065211267
1065311268 //if (selection_view == -1)
....@@ -10798,7 +11413,16 @@
1079811413 // Bump noise
1079911414 gl.glActiveTexture(GL.GL_TEXTURE6);
1080011415 //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
- BindTexture(NOISE_TEXTURE, false, 2);
11416
+
11417
+ try
11418
+ {
11419
+ BindTexture(NOISE_TEXTURE, false, 2);
11420
+ }
11421
+ catch (Exception e)
11422
+ {
11423
+ System.err.println("FAILED: " + NOISE_TEXTURE);
11424
+ }
11425
+
1080211426
1080311427 gl.glActiveTexture(GL.GL_TEXTURE0);
1080411428 gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10821,8 +11445,8 @@
1082111445
1082211446 gl.glMatrixMode(GL.GL_MODELVIEW);
1082311447
10824
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1082511448 //gl.glEnable(gl.GL_POLYGON_SMOOTH);
11449
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1082611450 //gl.glEnable(gl.GL_MULTISAMPLE);
1082711451 } else
1082811452 {
....@@ -10834,7 +11458,7 @@
1083411458 //System.out.println("BLENDING ON");
1083511459 gl.glEnable(GL.GL_BLEND);
1083611460 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837
-
11461
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1083811462 gl.glMatrixMode(gl.GL_PROJECTION);
1083911463 gl.glLoadIdentity();
1084011464
....@@ -10884,7 +11508,10 @@
1088411508 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1088511509 } else
1088611510 {
10887
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11511
+ boolean vr = capsLocked && !lightMode;
11512
+
11513
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11514
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1088811515 }
1088911516 }
1089011517
....@@ -10923,8 +11550,8 @@
1092311550 System.err.println("parentcam != renderCamera");
1092411551
1092511552 // if (cam != lightCamera)
10926
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927
- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11553
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11554
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1092811555 }
1092911556
1093011557 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10945,8 +11572,8 @@
1094511572 if (true) // TODO
1094611573 {
1094711574 if (cam != lightCamera)
10948
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949
- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11575
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11576
+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1095011577 }
1095111578
1095211579 LA.xformPos(light0, cam.toScreen, light0);
....@@ -11083,7 +11710,7 @@
1108311710 }
1108411711 }
1108511712
11086
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11713
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1108711714 {
1108811715 //gl.glDepthFunc(GL.GL_LEQUAL);
1108911716 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11091,24 +11718,21 @@
1109111718
1109211719 boolean texon = textureon;
1109311720
11094
- if (RENDERPROGRAM > 0)
11095
- {
11096
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11097
- textureon = false;
11098
- }
11721
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11722
+ textureon = false;
11723
+
1109911724 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1110011725 //System.out.println("ALLO");
1110111726 gl.glColorMask(false, false, false, false);
1110211727 DrawObject(gl);
11103
- if (RENDERPROGRAM > 0)
11104
- {
11105
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11106
- textureon = texon;
11107
- }
11728
+
11729
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11730
+ textureon = texon;
11731
+
1110811732 gl.glColorMask(true, true, true, true);
1110911733
1111011734 gl.glDepthFunc(GL.GL_EQUAL);
11111
- //gl.glDepthMask(false);
11735
+ gl.glDepthMask(false);
1111211736 }
1111311737
1111411738 if (false) // DrawMode() == SHADOW)
....@@ -11243,8 +11867,11 @@
1124311867 repaint();
1124411868 }
1124511869
11246
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11870
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11871
+ {
11872
+ renderCamera.computeTransform();
1124711873 repaint();
11874
+ }
1124811875
1124911876 displaydone = true;
1125011877 }
....@@ -11283,24 +11910,59 @@
1128311910 e.printStackTrace();
1128411911 }
1128511912
11286
- if (GrafreeD.RENDERME > 0)
11287
- GrafreeD.RENDERME--; // mechante magouille
11913
+ if (Grafreed.RENDERME > 0)
11914
+ Grafreed.RENDERME--; // mechante magouille
1128811915
1128911916 Globals.ONESTEP = false;
1129011917 }
1129111918
1129211919 static boolean zoomonce = false;
1129311920
11921
+ static void CreateSelectedPoint()
11922
+ {
11923
+ if (selectedpoint == null)
11924
+ {
11925
+ debugpointG = new Sphere();
11926
+ debugpointP = new Sphere();
11927
+ debugpointC = new Sphere();
11928
+ debugpointR = new Sphere();
11929
+
11930
+ selectedpoint = new Superellipsoid();
11931
+
11932
+ for (int i=0; i<8; i++)
11933
+ {
11934
+ debugpoints[i] = new Sphere();
11935
+ }
11936
+ }
11937
+ }
11938
+
1129411939 void DrawObject(GL gl, boolean draw)
1129511940 {
11941
+ // To clear camera values
11942
+ ResetOptions();
11943
+
1129611944 //System.out.println("DRAW OBJECT " + mouseDown);
1129711945 // DrawMode() = SELECTION;
1129811946 //GL gl = getGL();
1129911947 if ((TRACK || SHADOWTRACK) || zoomonce)
1130011948 {
11949
+ if (TRACK)
11950
+ {
11951
+ if (object.selection != null &&
11952
+ object.selection.size() > 0 &&
11953
+ object.selection.elementAt(0) != null &&
11954
+ !(object.selection.elementAt(0) instanceof Camera) &&
11955
+ !(object.selection.elementAt(0) instanceof ScriptNode))
11956
+ {
11957
+ trackedobject = object.selection.elementAt(0);
11958
+ //repaint();
11959
+ }
11960
+ else
11961
+ trackedobject = null;
11962
+ }
1130111963 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303
- pingthread.StepToTarget(true); // true);
11964
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11965
+ pingthread.StepToTarget(); // true);
1130411966 // zoomonce = false;
1130511967 }
1130611968
....@@ -11354,7 +12016,14 @@
1135412016
1135512017 usedtextures.clear();
1135612018
11357
- BindTextures(DEFAULT_TEXTURES, 2);
12019
+ try
12020
+ {
12021
+ BindTextures(DEFAULT_TEXTURES, 2);
12022
+ }
12023
+ catch (Exception e)
12024
+ {
12025
+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
12026
+ }
1135812027 }
1135912028 //System.out.println("--> " + stackdepth);
1136012029 // GrafreeD.traceon();
....@@ -11364,8 +12033,9 @@
1136412033
1136512034 if (DrawMode() == DEFAULT)
1136612035 {
11367
- if (DEBUG)
12036
+ if (Globals.DEBUG)
1136812037 {
12038
+ CreateSelectedPoint();
1136912039 float radius = 0.05f;
1137012040 if (selectedpoint.radius != radius)
1137112041 {
....@@ -11419,20 +12089,32 @@
1141912089 ReleaseTextures(DEFAULT_TEXTURES);
1142012090
1142112091 if (CLEANCACHE)
11422
- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
12092
+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
1142312093 {
11424
- String tex = e.nextElement();
12094
+ cTexture tex = e.nextElement();
1142512095
1142612096 // System.out.println("Texture --------- " + tex);
1142712097
11428
- if (tex.equals("WHITE_NOISE"))
12098
+ if (tex.equals("WHITE_NOISE:"))
1142912099 continue;
1143012100
11431
- if (!usedtextures.containsKey(tex))
12101
+ if (!usedtextures.contains(tex))
1143212102 {
12103
+ CacheTexture gettex = texturepigment.get(tex);
1143312104 // System.out.println("DISPOSE +++++++++++++++ " + tex);
11434
- textures.get(tex).texture.dispose();
11435
- textures.remove(tex);
12105
+ if (gettex != null)
12106
+ {
12107
+ gettex.texture.dispose();
12108
+ texturepigment.remove(tex);
12109
+ }
12110
+
12111
+ gettex = texturebump.get(tex);
12112
+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
12113
+ if (gettex != null)
12114
+ {
12115
+ gettex.texture.dispose();
12116
+ texturebump.remove(tex);
12117
+ }
1143612118 }
1143712119 }
1143812120 }
....@@ -11445,7 +12127,14 @@
1144512127 if (checker != null && DrawMode() == DEFAULT)
1144612128 {
1144712129 //BindTexture(IMMORTAL_TEXTURE);
11448
- BindTextures(checker.GetTextures(), checker.texres);
12130
+ try
12131
+ {
12132
+ BindTextures(checker.GetTextures(), checker.texres);
12133
+ }
12134
+ catch (Exception e)
12135
+ {
12136
+ System.err.println("FAILED: " + checker.GetTextures());
12137
+ }
1144912138 // NEAREST
1145012139 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145112140 DrawChecker(gl);
....@@ -11527,7 +12216,7 @@
1152712216 return;
1152812217 }
1152912218
11530
- String string = obj.GetToolTip();
12219
+ String string = obj.toString(); //.GetToolTip();
1153112220
1153212221 GL gl = GetGL();
1153312222
....@@ -11844,8 +12533,8 @@
1184412533 //obj.TransformToWorld(light, light);
1184512534 for (int i = tp.size(); --i >= 0;)
1184612535 {
11847
- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848
- LA.xformPos(light, tp.get(i).toParent, light);
12536
+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12537
+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1184912538 }
1185012539
1185112540
....@@ -11862,8 +12551,8 @@
1186212551 parentcam = cameras[0];
1186312552 }
1186412553
11865
- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866
- LA.xformPos(light, parentcam.toParent, light); // may 2013
12554
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
12555
+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186712556
1186812557 LA.xformPos(light, renderCamera.toScreen, light);
1186912558
....@@ -11953,8 +12642,82 @@
1195312642
1195412643 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1195512644
11956
- String program =
12645
+ String programmin =
12646
+ // Min shader
1195712647 "!!ARBfp1.0\n" +
12648
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
12649
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
12650
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12651
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12652
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12653
+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
12654
+ "PARAM light2cam0 = program.env[10];" +
12655
+ "PARAM light2cam1 = program.env[11];" +
12656
+ "PARAM light2cam2 = program.env[12];" +
12657
+ "TEMP temp;" +
12658
+ "TEMP light;" +
12659
+ "TEMP ndotl;" +
12660
+ "TEMP normal;" +
12661
+ "TEMP depth;" +
12662
+ "TEMP eye;" +
12663
+ "TEMP pos;" +
12664
+
12665
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12666
+ Normalize("normal") +
12667
+ "MOV light, state.light[0].position;" +
12668
+ "DP3 ndotl.x, light, normal;" +
12669
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12670
+
12671
+ // shadow
12672
+ "MOV pos, fragment.texcoord[1];" +
12673
+ "MOV temp, pos;" +
12674
+ ShadowTextureFetch("depth", "temp", "1") +
12675
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12676
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12677
+
12678
+ // No shadow when out of frustum
12679
+ //"SGE temp.y, depth.z, zero123.y;" +
12680
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12681
+
12682
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12683
+
12684
+ // Backlit
12685
+ "MOV pos.w, zero12t.y;" + // one
12686
+ "DP4 eye.x, pos, light2cam0;" +
12687
+ "DP4 eye.y, pos, light2cam1;" +
12688
+ "DP4 eye.z, pos, light2cam2;" +
12689
+ Normalize("eye") +
12690
+
12691
+ "DP3 ndotl.y, -eye, normal;" +
12692
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
12693
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12694
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12695
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12696
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
12697
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
12698
+ "ADD ndotl.y, ndotl.y, one.x;" +
12699
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12700
+
12701
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12702
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12703
+
12704
+ // Pigment
12705
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12706
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12707
+ "MUL temp, temp, zero12t.w;" + // Times x
12708
+
12709
+ //"MUL temp, temp, ndotl.y;" +
12710
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12711
+
12712
+ "MUL temp, temp, ndotl.x;" + // lambert
12713
+
12714
+ "MOV temp.w, zero12t.y;" + // reset alpha
12715
+ "MOV result.color, temp;" +
12716
+ "END";
12717
+
12718
+ String programmax =
12719
+ "!!ARBfp1.0\n" +
12720
+
1195812721 //"OPTION ARB_fragment_program_shadow;" +
1195912722 "PARAM light2cam0 = program.env[10];" +
1196012723 "PARAM light2cam1 = program.env[11];" +
....@@ -11980,7 +12743,7 @@
1198012743 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1198112744 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1198212745 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11983
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12746
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1198412747 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1198512748 "PARAM options1 = program.env[62];" + // fog rgb color
1198612749 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12069,8 +12832,7 @@
1206912832 "TEMP shininess;" +
1207012833 "\n" +
1207112834 "MOV texSamp, one;" +
12072
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12073
-
12835
+
1207412836 "MOV mapgrid.x, one2048th.x;" +
1207512837 "MOV temp, fragment.texcoord[1];" +
1207612838 /*
....@@ -12091,20 +12853,20 @@
1209112853 "MUL temp, floor, mapgrid.x;" +
1209212854 //"TEX depth0, temp, texture[1], 2D;" +
1209312855 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12094
- TextureFetch("depth0", "temp", "1") +
12856
+ ShadowTextureFetch("depth0", "temp", "1") +
1209512857 "") +
1209612858 "ADD temp.x, temp.x, mapgrid.x;" +
1209712859 //"TEX depth1, temp, texture[1], 2D;" +
1209812860 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12099
- TextureFetch("depth1", "temp", "1") +
12861
+ ShadowTextureFetch("depth1", "temp", "1") +
1210012862 "") +
1210112863 "ADD temp.y, temp.y, mapgrid.x;" +
1210212864 //"TEX depth2, temp, texture[1], 2D;" +
12103
- TextureFetch("depth2", "temp", "1") +
12865
+ ShadowTextureFetch("depth2", "temp", "1") +
1210412866 "SUB temp.x, temp.x, mapgrid.x;" +
1210512867 //"TEX depth3, temp, texture[1], 2D;" +
1210612868 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12107
- TextureFetch("depth3", "temp", "1") +
12869
+ ShadowTextureFetch("depth3", "temp", "1") +
1210812870 "") +
1210912871 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1211012872 //"MOV params, material;" +
....@@ -12226,7 +12988,7 @@
1222612988 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1222712989 // mar 2013 ??? "KIL alpha.a;" +
1222812990 "MOV alpha, texSamp.aaaa;" + // y;" +
12229
- "KIL alpha.a;" +
12991
+ "KIL alpha.a;" + // not sure with parallax mapping
1223012992 /*
1223112993 "MUL temp.xy, temp, two;" +
1223212994 "TXB bump, temp, texture[0], 2D;" +
....@@ -12312,11 +13074,6 @@
1231213074 "SUB bump0, bump0, half;" +
1231313075 "ADD bump, bump, bump0;" +
1231413076
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
-
1232013077 // double-sided
1232113078 /**/
1232213079 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12326,26 +13083,73 @@
1232613083 "ADD temp.x, temp.x, one.x;" +
1232713084 "MUL normal, normal, temp.xxxx;":""
1232813085 ) +
12329
- /**/
12330
-//// Normalize("normal") +
12331
-//// "MAX normal.z, eps.x, normal.z;" +
12332
-// Normalize("normal") +
12333
- "MOV normald, normal;" +
12334
- "MOV normals, normal;" +
13086
+ /**/
13087
+
13088
+ "MOV temp, fragment.texcoord[4];" +
1233513089
1233613090 // UV base
1233713091 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1233813092 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1233913093 //"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;" +
13094
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
13095
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
13096
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
13097
+ Normalize("UP") +
13098
+
1234313099 "XPD V, normal, UP;" +
1234413100 Normalize("V") +
1234513101 "XPD U, V, normal;" +
1234613102 Normalize("U") +
1234713103
13104
+ "MOV temp, fragment.texcoord[0];" +
13105
+
13106
+// "MAD normal, -temp.x, U, normal;" +
13107
+// "MAD normal, -temp.y, V, normal;" +
13108
+// Normalize("normal") +
13109
+
13110
+//// "MAX normal.z, eps.x, normal.z;" +
13111
+// Normalize("normal") +
13112
+ "MOV normald, normal;" +
13113
+ "MOV normals, normal;" +
13114
+
1234813115 // parallax mapping
13116
+
13117
+ "DP3 temp2.x, V, eye;" +
13118
+ "DP3 temp2.y, U, eye;" +
13119
+ "DP3 temp2.z, normal, eye;" +
13120
+ "RCP temp2.z, temp2.z;" +
13121
+
13122
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
13123
+ "RSQ temp2.w, temp2.w;" +
13124
+ "RCP temp2.w, temp2.w;" +
13125
+
13126
+ "SUB temp2.w, temp2.w, half;" +
13127
+ // "SGE temp.x, temp2.w, eps.x;" +
13128
+ // "MUL temp2.w, temp2.w, temp.x;" +
13129
+
13130
+ // "MOV texSamp, U;" +
13131
+
13132
+ "MUL temp2.z, temp2.z, temp2.w;" +
13133
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
13134
+
13135
+ "MUL temp2, temp2, temp2.z;" +
13136
+
13137
+ "SUB temp, temp, temp2;" +
13138
+
13139
+ "TEX temp, temp, texture[0], 2D;" +
13140
+ "POW temp.a, temp.a, params6.w;" + // punch through
13141
+
13142
+ "ADD texSamp, temp, texSamp;" +
13143
+ "MUL texSamp.xyz, half, texSamp;" +
13144
+
13145
+ "MOV alpha, texSamp.aaaa;" +
13146
+
13147
+// parallax mapping
13148
+
13149
+ "MOV temp.x, texSamp.a;" +
13150
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13151
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
13152
+ "MOV texSamp.a, temp.x;" +
1234913153
1235013154 //"MOV temp, fragment.texcoord[0];" +
1235113155 //
....@@ -12475,10 +13279,10 @@
1247513279 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1247613280 "") +
1247713281
12478
- // display shadow only (bump == 0)
13282
+ // display shadow only (fakedepth == 0)
1247913283 "SUB temp.x, half.x, shadow.x;" +
12480
- "MOV temp.y, -params6.x;" +
12481
- "SLT temp.z, temp.y, zero.x;" +
13284
+ "MOV temp.y, -params5.z;" + // params6.x;" +
13285
+ "SLT temp.z, temp.y, -c256i.x;" +
1248213286 "SUB temp.y, one.x, temp.z;" +
1248313287 "MUL temp.x, temp.x, temp.y;" +
1248413288 "KIL temp.x;" +
....@@ -12758,7 +13562,7 @@
1275813562 "MUL final.y, fragment.texcoord[0].x, c256;" +
1275913563 "FLR final.x, final.y;" +
1276013564 "SUB final.y, final.y, final.x;" +
12761
- //"MUL final.x, final.x, c256i;" +
13565
+ "MUL final.x, final.x, c256i;" +
1276213566 "MOV final.z, zero.x;" +
1276313567 "MOV final.a, one.w;":""
1276413568 ) +
....@@ -12766,7 +13570,7 @@
1276613570 "MUL final.y, fragment.texcoord[0].y, c256;" +
1276713571 "FLR final.x, final.y;" +
1276813572 "SUB final.y, final.y, final.x;" +
12769
- //"MUL final.x, final.x, c256i;" +
13573
+ "MUL final.x, final.x, c256i;" +
1277013574 "MOV final.z, zero.x;" +
1277113575 "MOV final.a, one.w;":""
1277213576 ) +
....@@ -12809,8 +13613,19 @@
1280913613 //once = true;
1281013614 }
1281113615
12812
- System.out.print("Program #" + mode + "; length = " + program.length());
12813
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13616
+ String program = programmax;
13617
+
13618
+ if (Globals.MINSHADER)
13619
+ {
13620
+ program = programmin;
13621
+ }
13622
+
13623
+ if (Globals.DEBUG)
13624
+ {
13625
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13626
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13627
+ }
13628
+
1281413629 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281513630
1281613631 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -12857,7 +13672,8 @@
1285713672 "\n" +
1285813673 "END\n";
1285913674
12860
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13675
+ if (Globals.DEBUG)
13676
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1286113677 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1286213678
1286313679 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -12902,25 +13718,26 @@
1290213718 return out;
1290313719 }
1290413720
12905
- String TextureFetch(String dest, String src, String unit)
13721
+ // Also does frustum culling
13722
+ String ShadowTextureFetch(String dest, String src, String unit)
1290613723 {
1290713724 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1290813725 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1290913726 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13727
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13728
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1291013729 "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;" +
13730
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13731
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1291513732 //"SWZ buffer, temp, w,w,w,w;";
12916
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13733
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1291713734 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1291813735 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1291913736 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12920
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13737
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1292113738
12922
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12923
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13739
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13740
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1292413741 }
1292513742
1292613743 String Shadow(String depth, String shadow)
....@@ -12942,12 +13759,16 @@
1294213759
1294313760 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294413761 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13762
+
13763
+ // Compare fragment depth in light space with shadowmap.
1294513764 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294613765 "SGE temp.y, temp.x, zero.x;" +
12947
- "SUB " + shadow + ".y, one.x, temp.y;" +
13766
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13767
+
13768
+ // Reverse comparison
1294813769 "SUB temp.x, one.x, temp.x;" +
1294913770 "MUL " + shadow + ".x, temp.x, temp.y;" +
12950
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13771
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1295113772 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1295213773
1295313774 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12961,6 +13782,10 @@
1296113782 // No shadow for backface
1296213783 "DP3 temp.x, normal, lightd;" +
1296313784 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13785
+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13786
+
13787
+ // No shadow when out of frustum
13788
+ "SGE temp.x, " + depth + ".z, one.z;" +
1296413789 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296513790 "";
1296613791 }
....@@ -13106,8 +13931,9 @@
1310613931 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1310713932 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1310813933 /*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;
13934
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13935
+
13936
+ //Object3D.cVector2[] vector2buffer;
1311113937
1311213938 // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1311313939 // OUT : diff, spec
....@@ -13123,9 +13949,10 @@
1312313949 "DP3 " + dest + ".z," + "normals," + "eye;" +
1312413950 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1312513951 //"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;" +
13952
+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13953
+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13954
+
13955
+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
1312913956 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1313013957 "RCP " + dest + ".w," + dest + ".w;" +
1313113958 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13271,7 +14098,7 @@
1327114098 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1327214099 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1327314100 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13274
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14101
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1327514102 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1327614103 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1327714104 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13332,7 +14159,7 @@
1333214159 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1333314160 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1333414161 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13335
- //"MOV result.texcoord, vertex.texcoord;" +
14162
+ //"MOV result.texcoord, vertex.fogcoord;" +
1333614163 "MOV result.texcoord, temp;" +
1333714164 // border fade
1333814165 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13379,7 +14206,9 @@
1337914206
1338014207 //"ADD temp.z, temp.z, one;" +
1338114208
13382
- "MOV result.color, temp;"
14209
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14210
+
14211
+ "MOV result.color, temp;" // Normal
1338314212 : "MOV result.color, vertex.color;") +
1338414213 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1338514214 : "") +
....@@ -13514,12 +14343,13 @@
1351414343 public void mouseClicked(MouseEvent e)
1351514344 {
1351614345 System.out.println("mouseClicked: " + e);
14346
+ System.exit(0);
1351714347 }
1351814348
1351914349 public void mousePressed(MouseEvent e)
1352014350 {
1352114351 //System.out.println("mousePressed: " + e);
13522
- clickStart(e.getX(), e.getY(), e.getModifiersEx());
14352
+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1352314353 }
1352414354
1352514355 static long prevtime = 0;
....@@ -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;
....@@ -13595,8 +14427,8 @@
1359514427 // mode |= META;
1359614428 //}
1359714429
13598
- SetMouseMode(WHEEL | e.getModifiersEx());
13599
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
14430
+ SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
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();
....@@ -13655,6 +14488,10 @@
1365514488 // LIVE = waslive;
1365614489 // wasliveok = true;
1365714490 // waslive = false;
14491
+
14492
+ // May 2019 Forget it:
14493
+ if (true)
14494
+ return;
1365814495
1365914496 // source == timer
1366014497 if (mouseDown)
....@@ -13685,21 +14522,23 @@
1368514522
1368614523 // fev 2014???
1368714524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13688
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13689
- pingthread.StepToTarget(true); // true);
14525
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14526
+ pingthread.StepToTarget(); // true);
1369014527 }
14528
+
1369114529 // if (!LIVE)
1369214530 super.repaint();
1369314531 }
1369414532
1369514533 javax.swing.Timer timer = new javax.swing.Timer(350, this);
1369614534
13697
- void clickStart(int x, int y, int modifiers)
14535
+ void clickStart(int x, int y, int modifiers, int modifiersex)
1369814536 {
1369914537 if (!wasliveok)
1370014538 return;
1370114539
1370214540 AAtimer.restart(); //
14541
+ Globals.TIMERRUNNING = true;
1370314542
1370414543 // waslive = LIVE;
1370514544 // LIVE = false;
....@@ -13711,7 +14550,7 @@
1371114550 // touched = true; // main DL
1371214551 if (isRenderer)
1371314552 {
13714
- SetMouseMode(modifiers);
14553
+ SetMouseMode(modifiers, modifiersex);
1371514554 }
1371614555
1371714556 selectX = anchorX = x;
....@@ -13724,7 +14563,7 @@
1372414563 clicked = true;
1372514564 hold = false;
1372614565
13727
- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
14566
+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1372814567 // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1372914568 {
1373014569 // System.out.println("RESTART II " + modifiers);
....@@ -13749,14 +14588,15 @@
1374914588 drag = false;
1375014589 //System.out.println("Mouse DOWN");
1375114590 editObj = false;
13752
- ClickInfo info = new ClickInfo();
13753
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13754
- info.pane = this;
13755
- info.camera = renderCamera;
13756
- info.x = x;
13757
- info.y = y;
13758
- info.modifiers = modifiers;
13759
- 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);
1376014600 if (!editObj)
1376114601 {
1376214602 hasMarquee = true;
....@@ -13772,19 +14612,22 @@
1377214612
1377314613 public void mouseDragged(MouseEvent e)
1377414614 {
14615
+ Globals.MOUSEDRAGGED = true;
14616
+
1377514617 //System.out.println("mouseDragged: " + e);
1377614618 if (isRenderer)
1377714619 movingcamera = true;
14620
+
1377814621 //if (drawing)
1377914622 //return;
13780
- if ((e.getModifiersEx() & CTRL) != 0
13781
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1378214625 {
1378314626 //System.out.println("mouseDragged: " + e);
1378414627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1378514628 }
1378614629 else
13787
- drag(e.getX(), e.getY(), e.getModifiersEx());
14630
+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1378814631
1378914632 //try { Thread.sleep(1); } catch (Exception ex) {}
1379014633 }
....@@ -13802,9 +14645,17 @@
1380214645 return targetLookAt;
1380314646 }
1380414647
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
+
1380514653 class PingThread extends Thread
1380614654 {
1380714655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute = false;
1380814659
1380914660 // void JumpToTarget()
1381014661 // {
....@@ -13820,6 +14671,95 @@
1382014671 // only one thread!? synchronized
1382114672 void StepToTarget(boolean jump)
1382214673 {
14674
+ RigidBody.pos.x = 0;
14675
+ RigidBody.pos.y = 0;
14676
+ RigidBody.pos.z = 0;
14677
+ if (RigidBody.justclicked)
14678
+ {
14679
+// RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+// RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+// RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683
+ CreateSelectedPoint();
14684
+
14685
+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
14686
+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
14687
+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
14688
+
14689
+ RigidBody.wind.set(RigidBody.pos);
14690
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14691
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14692
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14693
+ RigidBody.wind.normalize();
14694
+ }
14695
+
14696
+ if (mute)
14697
+ return;
14698
+
14699
+ if (capsLocked && manipCamera.viewCode == 0)
14700
+ {
14701
+ eye.x = manipCamera.location.x;
14702
+ eye.y = manipCamera.location.y + 0.25;
14703
+ eye.z = manipCamera.location.z;
14704
+
14705
+ dir.y = -1;
14706
+
14707
+ Ray ray = new Ray(eye, dir);
14708
+
14709
+ IntersectResult res = new IntersectResult();
14710
+ res.t = Double.POSITIVE_INFINITY;
14711
+
14712
+ tmp.set(targetLookAt);
14713
+ tmp.sub(manipCamera.location);
14714
+
14715
+ double dist = tmp.length();
14716
+
14717
+ tmp.normalize();
14718
+
14719
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
14720
+ eye2.y = manipCamera.location.y + 0.25;
14721
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
14722
+
14723
+ Ray ray2 = new Ray(eye2, dir);
14724
+
14725
+ IntersectResult res2 = new IntersectResult();
14726
+ res2.t = Double.POSITIVE_INFINITY;
14727
+
14728
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14729
+ {
14730
+ //tmp.set(manipCamera.location);
14731
+
14732
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14733
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14734
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14735
+
14736
+ //tmp.sub(manipCamera.location);
14737
+
14738
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14739
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14740
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14741
+
14742
+ targetLookAt.sub(manipCamera.location);
14743
+ targetLookAt.normalize();
14744
+ targetLookAt.mul(dist);
14745
+ targetLookAt.add(manipCamera.location);
14746
+
14747
+ //if (tmp.dot(tmp) > 0.000001)
14748
+ // System.out.println("INTERSECTION " + manipCamera.location);
14749
+
14750
+ manipCamera.lookAt.set(targetLookAt);
14751
+
14752
+ tmp.x = res.n.x;
14753
+ tmp.y = res.n.y;
14754
+ tmp.z = res.n.z;
14755
+ tmp.x += res2.n.x;
14756
+ tmp.y += res2.n.y;
14757
+ tmp.z += res2.n.z;
14758
+ tmp.normalize();
14759
+ manipCamera.UP.set(tmp);
14760
+ }
14761
+ }
14762
+
1382314763 tmp.set(targetLookAt);
1382414764 tmp.sub(manipCamera.lookAt); // june 2014
1382514765
....@@ -13857,7 +14797,7 @@
1385714797
1385814798 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1385914799 {
13860
- jump = true; // step = 1;
14800
+ // sep 2019 jump = true; // step = 1;
1386114801 }
1386214802
1386314803 if (OEILONCE && OEIL)
....@@ -13892,7 +14832,10 @@
1389214832 if (tmp.dot(tmp) < 0.00001)
1389314833 {
1389414834 zoomonce = false;
14835
+ live = false;
1389514836 }
14837
+ else
14838
+ live = true;
1389614839
1389714840 tmp.mul(step > step2 ? step : step2);
1389814841 }
....@@ -13919,7 +14862,7 @@
1391914862 {
1392014863 if (LOOKAT)
1392114864 manipCamera.lookAt.add(tmp);
13922
- if (OEIL)
14865
+ if (OEIL && !capsLocked)
1392314866 manipCamera.location.add(tmp);
1392414867
1392514868 {
....@@ -13934,7 +14877,10 @@
1393414877 lightCamera.computeTransform();
1393514878 }
1393614879 }
13937
- manipCamera.computeTransform();
14880
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14881
+ {
14882
+ manipCamera.computeTransform();
14883
+ }
1393814884 }
1393914885 // ?????? mouseDown = true;
1394014886 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14021,55 +14967,113 @@
1402114967 {
1402214968 Globals.lighttouched = true;
1402314969 }
14024
- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14970
+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1402514971 }
1402614972 //else
1402714973 }
1402814974 }
1402914975 }
14976
+
1403014977 PingThread pingthread = new PingThread();
14031
- int delta = 5;
14032
- int speed = 5;
14978
+ int delta = 1;
14979
+ int speed = 1;
14980
+ int walk = 8;
1403314981 boolean autorepeat = false;
1403414982
14983
+ void Walk()
14984
+ {
14985
+ manipCamera.BackForth(0, walk, 1000);
14986
+
14987
+ targetLookAt.set(manipCamera.lookAt);
14988
+ }
14989
+
14990
+ void ViewAngle(float dy)
14991
+ {
14992
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14993
+
14994
+ if (manipCamera.shaper_fovy * factor > 1 &&
14995
+ manipCamera.shaper_fovy * factor < 150)
14996
+ {
14997
+ manipCamera.shaper_fovy *= factor;
14998
+ //System.out.println("fovy = " + shaper_fovy);
14999
+ }
15000
+ }
15001
+
1403515002 void GoDown(int mod)
1403615003 {
1403715004 MODIFIERS |= COMMAND;
14038
- /*
15005
+ boolean isVR = (mouseMode&VR)!=0;
15006
+ /**/
1403915007 if((mod&SHIFT) == SHIFT)
14040
- manipCamera.RotatePosition(0, -speed);
14041
- else
14042
- manipCamera.BackForth(0, -speed*delta, getWidth());
14043
- */
14044
- if ((mod & SHIFT) == SHIFT)
1404515008 {
14046
- mouseMode = mouseMode; // VR??
14047
- } else
14048
- {
14049
- mouseMode |= BACKFORTH;
15009
+// if (isVR)
15010
+// manipCamera.RotateInterest(0, speed);
15011
+// else
15012
+ if (isVR)
15013
+ ViewAngle(-speed*delta);
15014
+ else
15015
+ manipCamera.Translate(0, -speed*delta, getWidth());
1405015016 }
15017
+ else
15018
+ {
15019
+ if (isVR)
15020
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15021
+ else
15022
+ manipCamera.RotatePosition(0, -speed);
15023
+ }
15024
+
15025
+ /**/
15026
+// if ((mod & SHIFT) == SHIFT)
15027
+// {
15028
+// mouseMode = mouseMode; // VR??
15029
+// } else
15030
+// {
15031
+// mouseMode |= BACKFORTH;
15032
+// }
1405115033
15034
+ targetLookAt.set(manipCamera.lookAt);
15035
+
1405215036 //prevX = X = anchorX;
1405315037 prevY = Y = anchorY - (int) (renderCamera.Distance());
1405415038 }
1405515039
1405615040 void GoUp(int mod)
1405715041 {
15042
+ RigidBody.justclicked = true;
15043
+
1405815044 MODIFIERS |= COMMAND;
14059
- /*
15045
+ /**/
15046
+ boolean isVR = (mouseMode&VR)!=0;
15047
+
1406015048 if((mod&SHIFT) == SHIFT)
14061
- manipCamera.RotatePosition(0, speed);
14062
- else
14063
- manipCamera.BackForth(0, speed*delta, getWidth());
14064
- */
14065
- if ((mod & SHIFT) == SHIFT)
1406615049 {
14067
- mouseMode = mouseMode;
14068
- } else
14069
- {
14070
- mouseMode |= BACKFORTH;
15050
+// if (isVR)
15051
+// manipCamera.RotateInterest(0, -speed);
15052
+// else
15053
+ if (isVR)
15054
+ ViewAngle(speed*delta);
15055
+ else
15056
+ manipCamera.Translate(0, speed*delta, getWidth());
1407115057 }
15058
+ else
15059
+ {
15060
+ if (isVR)
15061
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15062
+ else
15063
+ manipCamera.RotatePosition(0, speed);
15064
+ }
15065
+
15066
+ /**/
15067
+// if ((mod & SHIFT) == SHIFT)
15068
+// {
15069
+// mouseMode = mouseMode;
15070
+// } else
15071
+// {
15072
+// mouseMode |= BACKFORTH;
15073
+// }
1407215074
15075
+ targetLookAt.set(manipCamera.lookAt);
15076
+
1407315077 //prevX = X = anchorX;
1407415078 prevY = Y = anchorY + (int) (renderCamera.Distance());
1407515079 }
....@@ -14077,20 +15081,31 @@
1407715081 void GoLeft(int mod)
1407815082 {
1407915083 MODIFIERS |= COMMAND;
14080
- /*
15084
+ /**/
1408115085 if((mod&SHIFT) == SHIFT)
14082
- manipCamera.RotatePosition(speed, 0);
15086
+ manipCamera.Translate(speed, 0, getWidth());
1408315087 else
14084
- manipCamera.Translate(speed*delta, 0, getWidth());
14085
- */
14086
- if ((mod & SHIFT) == SHIFT)
1408715088 {
14088
- mouseMode = mouseMode;
14089
- } else
14090
- {
14091
- mouseMode |= ROTATE;
14092
- } // TRANSLATE;
15089
+ if ((mouseMode&VR)!=0)
15090
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
15091
+ else
15092
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
15093
+ }
15094
+
15095
+ /**/
15096
+// if ((mod & SHIFT) == SHIFT)
15097
+// {
15098
+// mouseMode = mouseMode;
15099
+// } else
15100
+// {
15101
+// mouseMode |= ROTATE;
15102
+// } // TRANSLATE;
1409315103
15104
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15105
+ //System.err.println("location = " + manipCamera.location);
15106
+
15107
+ targetLookAt.set(manipCamera.lookAt);
15108
+
1409415109 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1409515110 prevY = Y = anchorY;
1409615111 }
....@@ -14098,20 +15113,28 @@
1409815113 void GoRight(int mod)
1409915114 {
1410015115 MODIFIERS |= COMMAND;
14101
- /*
15116
+ /**/
1410215117 if((mod&SHIFT) == SHIFT)
14103
- manipCamera.RotatePosition(-speed, 0);
15118
+ manipCamera.Translate(-speed, 0, getWidth());
1410415119 else
14105
- manipCamera.Translate(-speed*delta, 0, getWidth());
14106
- */
14107
- if ((mod & SHIFT) == SHIFT)
1410815120 {
14109
- mouseMode = mouseMode;
14110
- } else
14111
- {
14112
- mouseMode |= ROTATE;
14113
- } // TRANSLATE;
15121
+ if ((mouseMode&VR)!=0)
15122
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
15123
+ else
15124
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
15125
+ }
15126
+
15127
+ /**/
15128
+// if ((mod & SHIFT) == SHIFT)
15129
+// {
15130
+// mouseMode = mouseMode;
15131
+// } else
15132
+// {
15133
+// mouseMode |= ROTATE;
15134
+// } // TRANSLATE;
1411415135
15136
+ targetLookAt.set(manipCamera.lookAt);
15137
+
1411515138 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1411615139 prevY = Y = anchorY;
1411715140 }
....@@ -14121,7 +15144,7 @@
1412115144 int X, Y;
1412215145 boolean SX, SY;
1412315146
14124
- void drag(int x, int y, int modifiers)
15147
+ void drag(int x, int y, int modifiers, int modifiersex)
1412515148 {
1412615149 if (IsFrozen())
1412715150 {
....@@ -14130,17 +15153,17 @@
1413015153
1413115154 drag = true; // NEW
1413215155
14133
- boolean continuous = (modifiers & COMMAND) == COMMAND;
15156
+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
1413415157
1413515158 X = x;
1413615159 Y = y;
1413715160 // floating state for animation
14138
- MODIFIERS = modifiers;
14139
- modifiers &= ~1024;
15161
+ MODIFIERS = modifiersex;
15162
+ modifiersex &= ~1024;
1414015163 if (false) // modifiers != 0)
1414115164 {
1414215165 //new Exception().printStackTrace();
14143
- System.out.println("mouseDragged: " + modifiers);
15166
+ System.out.println("mouseDragged: " + modifiersex);
1414415167 System.out.println("SHIFT = " + SHIFT);
1414515168 System.out.println("CONTROL = " + COMMAND);
1414615169 System.out.println("META = " + META);
....@@ -14153,14 +15176,16 @@
1415315176 if (editObj)
1415415177 {
1415515178 drag = true;
14156
- ClickInfo info = new ClickInfo();
14157
- info.bounds.setBounds(0, 0,
15179
+ //ClickInfo info = new ClickInfo();
15180
+ object.clickInfo.bounds.setBounds(0, 0,
1415815181 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14159
- info.pane = this;
14160
- info.camera = renderCamera;
14161
- info.x = x;
14162
- info.y = y;
14163
- object.editWindow.copy.doEditDrag(info);
15182
+ object.clickInfo.pane = this;
15183
+ object.clickInfo.camera = renderCamera;
15184
+ object.clickInfo.x = x;
15185
+ object.clickInfo.y = y;
15186
+ object //.GetWindow().copy
15187
+ .doEditDrag(//info,
15188
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416415189 } else
1416515190 {
1416615191 if (x < startX)
....@@ -14243,6 +15268,11 @@
1424315268 if ((mouseMode & ZOOM) != 0)
1424415269 {
1424515270 //if ((mouseMode & BACKFORTH) != 0)
15271
+ if ((modifiersex & SHIFT) == SHIFT)
15272
+ {
15273
+ ViewAngle(dy);
15274
+ }
15275
+ else
1424615276 if ((mouseMode & VR) != 0)
1424715277 manipCamera.BackForth(dx, dy, getWidth());
1424815278 else
....@@ -14309,22 +15339,30 @@
1430915339 }
1431015340 }
1431115341
15342
+// ClickInfo clickInfo = new ClickInfo();
15343
+
1431215344 public void mouseMoved(MouseEvent e)
1431315345 {
15346
+//object.editWindow.frame.
15347
+ setCursor(Cursor.getDefaultCursor());
15348
+
1431415349 //System.out.println("mouseMoved: " + e);
1431515350 if (isRenderer)
1431615351 return;
1431715352
14318
- ClickInfo ci = new ClickInfo();
14319
- ci.x = e.getX();
14320
- ci.y = e.getY();
14321
- ci.modifiers = e.getModifiersEx();
14322
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14323
- ci.pane = this;
14324
- ci.camera = renderCamera;
15353
+ // Mouse cursor feedback
15354
+ object.clickInfo.x = e.getX();
15355
+ object.clickInfo.y = e.getY();
15356
+ object.clickInfo.modifiers = e.getModifiersEx();
15357
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
15358
+ object.clickInfo.pane = this;
15359
+ object.clickInfo.camera = renderCamera;
1432515360 if (!isRenderer)
1432615361 {
14327
- if (object.editWindow.copy.doEditClick(ci, 0))
15362
+ //ObjEditor editWindow = object.editWindow;
15363
+ //Object3D copy = editWindow.copy;
15364
+ if (object.doEditClick(//clickInfo,
15365
+ 0))
1432815366 {
1432915367 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1433015368 } else
....@@ -14336,7 +15374,17 @@
1433615374
1433715375 public void mouseReleased(MouseEvent e)
1433815376 {
15377
+ if (isRenderer && !movingcamera)
15378
+ {
15379
+ RigidBody.justclicked = true;
15380
+ System.out.println("justclicked: " + e);
15381
+ }
15382
+
15383
+ Globals.MOUSEDRAGGED = false;
15384
+
1433915385 movingcamera = false;
15386
+ X = 0; // getBounds().width/2;
15387
+ Y = 0; // getBounds().height/2;
1434015388 //System.out.println("mouseReleased: " + e);
1434115389 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1434215390 }
....@@ -14359,9 +15407,9 @@
1435915407 boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1436015408 boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1436115409
14362
- if (control || command || IsFrozen())
15410
+// No delay if (control || command || IsFrozen())
1436315411 timeout = true;
14364
- else
15412
+// ?? May 2019 else
1436515413 // timer.setDelay((modifiers & 128) != 0?0:350);
1436615414 mouseDown = false;
1436715415 if (!control && !command) // june 2013
....@@ -14471,7 +15519,7 @@
1447115519 System.out.println("keyReleased: " + e);
1447215520 }
1447315521
14474
- void SetMouseMode(int modifiers)
15522
+ void SetMouseMode(int modifiers, int modifiersex)
1447515523 {
1447615524 //System.out.println("SetMouseMode = " + modifiers);
1447715525 //modifiers &= ~1024;
....@@ -14483,25 +15531,28 @@
1448315531 //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1448415532 // return;
1448515533 //System.out.println("SetMode = " + modifiers);
14486
- if ((modifiers & WHEEL) == WHEEL)
15534
+ if ((modifiersex & WHEEL) == WHEEL)
1448715535 {
1448815536 mouseMode |= ZOOM;
1448915537 }
1449015538
14491
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14492
- if (capsLocked || (modifiers & META) == META)
15539
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15540
+ boolean vr = capsLocked && !lightMode;
15541
+
15542
+ if (vr) // || (modifiers & META) == META)
1449315543 {
1449415544 mouseMode |= VR; // BACKFORTH;
1449515545 }
14496
- if ((modifiers & CTRLCLICK) == CTRLCLICK)
15546
+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1449715547 {
1449815548 mouseMode |= SELECT;
1449915549 }
14500
- if ((modifiers & COMMAND) == COMMAND)
15550
+ if ((modifiersex & COMMAND) == COMMAND)
1450115551 {
1450215552 mouseMode |= SELECT;
1450315553 }
14504
- if ((modifiers & SHIFT) == SHIFT || forcetranslate)
15554
+ if (//(modifiersex & SHIFT) == SHIFT ||
15555
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450515556 {
1450615557 mouseMode &= ~VR;
1450715558 mouseMode |= TRANSLATE;
....@@ -14530,7 +15581,7 @@
1453015581
1453115582 if (isRenderer) //
1453215583 {
14533
- SetMouseMode(modifiers);
15584
+ SetMouseMode(0, modifiers);
1453415585 }
1453515586
1453615587 Globals.theRenderer.keyPressed(key);
....@@ -14545,8 +15596,18 @@
1454515596 float SATPOW = 1; // 2; // 0.5f;
1454615597 float BRIPOW = 1; // 0.5f; // 0.5f;
1454715598
15599
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15600
+
15601
+// Create a new blank cursor.
15602
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15603
+ cursorImg, new Point(0, 0), "blank cursor");
15604
+
1454815605 public void keyPressed(int key)
1454915606 {
15607
+// Set the blank cursor to the JFrame.
15608
+//object.editWindow.frame.
15609
+ setCursor(blankCursor);
15610
+
1455015611 if (key >= '0' && key <= '5')
1455115612 clampbit = (key-'0');
1455215613
....@@ -14592,7 +15653,8 @@
1459215653 // break;
1459315654 case 'T':
1459415655 CACHETEXTURE ^= true;
14595
- textures.clear();
15656
+ texturepigment.clear();
15657
+ texturebump.clear();
1459615658 // repaint();
1459715659 break;
1459815660 case 'Y':
....@@ -14602,8 +15664,8 @@
1460215664 case 'K':
1460315665 KOMPACTTEXTURE ^= true;
1460415666 //textures.clear();
14605
- break;
14606
- case 'P': // Texture Projection macros
15667
+ // break;
15668
+ //case 'P': // Texture Projection macros
1460715669 // SAVETEXTURE ^= true;
1460815670 macromode = true;
1460915671 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -14677,7 +15739,9 @@
1467715739 case 'E' : COMPACT ^= true;
1467815740 repaint();
1467915741 break;
14680
- case 'W' : DEBUGHSB ^= true;
15742
+ case 'W' : // Wide Window (fullscreen)
15743
+ //DEBUGHSB ^= true;
15744
+ ObjEditor.theFrame.ToggleFullScreen();
1468115745 repaint();
1468215746 break;
1468315747 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14702,8 +15766,8 @@
1470215766 RevertCamera();
1470315767 repaint();
1470415768 break;
15769
+ //case 'l':
1470515770 case 'L':
14706
- case 'l':
1470715771 if (lightMode)
1470815772 {
1470915773 lightMode = false;
....@@ -14722,7 +15786,7 @@
1472215786 targetLookAt.set(manipCamera.lookAt);
1472315787 repaint();
1472415788 break;
14725
- case 'p':
15789
+ case 'P': // p':
1472615790 // c'est quoi ca au juste? spherical ^= true;
1472715791 Skinshader ^= true; programInitialized = false;
1472815792 repaint();
....@@ -14733,7 +15797,8 @@
1473315797 break;
1473415798 case 'm':
1473515799 {
14736
- PrintMemory();
15800
+ //PrintMemory();
15801
+ ToggleImageFlip();
1473715802 break;
1473815803 }
1473915804 case 'M':
....@@ -14760,27 +15825,31 @@
1476015825 repaint();
1476115826 break;
1476215827 case 'O':
14763
- Globals.drawMode = OCCLUSION; // WARNING
14764
- repaint();
14765
- break;
15828
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15829
+ //repaint();
15830
+ //break;
1476615831 case 'o':
1476715832 OCCLUSION_CULLING ^= true;
1476815833 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1476915834 break;
14770
- case '0': envyoff ^= true; repaint(); break;
15835
+ //case '0': envyoff ^= true; repaint(); break;
1477115836 case '1':
1477215837 case '2':
1477315838 case '3':
1477415839 case '4':
1477515840 case '5':
14776
- newenvy = Character.getNumericValue(key);
14777
- repaint();
14778
- break;
1477915841 case '6':
1478015842 case '7':
1478115843 case '8':
1478215844 case '9':
14783
- BGcolor = (key - '6')/3.f;
15845
+ if (true) // envyoff)
15846
+ {
15847
+ BGcolor = (key - '1')/8.f;
15848
+ }
15849
+ else
15850
+ {
15851
+ //newenvy = Character.getNumericValue(key);
15852
+ }
1478415853 repaint();
1478515854 break;
1478615855 case '!':
....@@ -14846,11 +15915,25 @@
1484615915 case '_':
1484715916 kompactbit = 5;
1484815917 break;
14849
- case '+':
14850
- kompactbit = 6;
14851
- break;
15918
+// case '+':
15919
+// kompactbit = 6;
15920
+// break;
1485215921 case ' ':
15922
+ capsLocked ^= true;
15923
+ repaint();
15924
+ break;
15925
+ case 'l':
1485315926 lightMode ^= true;
15927
+ if (lightMode)
15928
+ {
15929
+ keepshadow = Globals.RENDERSHADOW;
15930
+ Globals.RENDERSHADOW = false;
15931
+ }
15932
+ else
15933
+ {
15934
+ Globals.RENDERSHADOW = keepshadow;
15935
+ }
15936
+
1485415937 Globals.lighttouched = true;
1485515938 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1485615939 targetLookAt.set(manipCamera.lookAt);
....@@ -14858,15 +15941,20 @@
1485815941 break;
1485915942 //case '`' :
1486015943 case ESC:
15944
+ if (FULLSCREEN)
15945
+ object.editWindow.ToggleFullScreen();
15946
+ break;
15947
+ case 'p':
1486115948 RENDERPROGRAM += 1;
1486215949 RENDERPROGRAM %= 3;
15950
+
1486315951 repaint();
1486415952 break;
1486515953 case 'Z':
1486615954 //RESIZETEXTURE ^= true;
1486715955 //break;
1486815956 case 'z':
14869
- RENDERSHADOW ^= true;
15957
+ Globals.RENDERSHADOW ^= true;
1487015958 Globals.lighttouched = true;
1487115959 repaint();
1487215960 break;
....@@ -14895,12 +15983,17 @@
1489515983 case ENTER:
1489615984 // object.editWindow.ScreenFit(); // Edit();
1489715985 ToggleLive();
15986
+ if (capsLocked)
15987
+ {
15988
+ Globals.WALK ^= true;
15989
+ }
1489815990 break;
1489915991 case DELETE:
1490015992 ClearSelection();
1490115993 break;
14902
- /*
1490315994 case '+':
15995
+
15996
+ /*
1490415997 //fontsize += 1;
1490515998 bbzoom *= 2;
1490615999 repaint();
....@@ -14917,30 +16010,36 @@
1491716010 case '=':
1491816011 IncDepth();
1491916012 //fontsize += 1;
14920
- object.editWindow.refreshContents(true);
16013
+ object.GetWindow().refreshContents(true);
1492116014 maskbit = 6;
1492216015 break;
1492316016 case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1492416017 DecDepth();
1492516018 maskbit = 5;
1492616019 //if(fontsize > 1) fontsize -= 1;
14927
- if (object.editWindow == null)
14928
- new Exception().printStackTrace();
14929
- else
14930
- object.editWindow.refreshContents(true);
16020
+// if (object.editWindow == null)
16021
+// new Exception().printStackTrace();
16022
+// else
16023
+ object.GetWindow().refreshContents(true);
1493116024 break;
1493216025 case '{':
14933
- manipCamera.shaper_fovy /= 1.1;
16026
+ double factor = 1.1;
16027
+ if (manipCamera.shaper_fovy / factor > 0.1)
16028
+ manipCamera.shaper_fovy /= factor;
1493416029 System.out.println("FOV = " + manipCamera.shaper_fovy);
1493516030 repaint();
1493616031 break;
1493716032 case '}':
14938
- manipCamera.shaper_fovy *= 1.1;
16033
+ factor = 1.1;
16034
+ if (manipCamera.shaper_fovy * factor < 150)
16035
+ manipCamera.shaper_fovy *= factor;
1493916036 System.out.println("FOV = " + manipCamera.shaper_fovy);
1494016037 repaint();
1494116038 break;
1494216039 case '[':
14943
- manipCamera.shaper_fovy /= 1.01;
16040
+ factor = 1.01;
16041
+ if (manipCamera.shaper_fovy / factor > 0.1)
16042
+ manipCamera.shaper_fovy /= factor;
1494416043 if (false) //manipCamera.hAspect == 0)
1494516044 {
1494616045 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -14956,7 +16055,9 @@
1495616055 break;
1495716056 case ']':
1495816057 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14959
- manipCamera.shaper_fovy *= 1.01;
16058
+ factor = 1.01;
16059
+ if (manipCamera.shaper_fovy * factor < 150)
16060
+ manipCamera.shaper_fovy *= factor;
1496016061 if (false) //manipCamera.hAspect == 0)
1496116062 {
1496216063 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -14990,102 +16091,117 @@
1499016091 //mode = ROTATE;
1499116092 if ((MODIFIERS & COMMAND) == 0) // VR??
1499216093 {
14993
- SetMouseMode(modifiers);
16094
+ SetMouseMode(0, modifiers);
1499416095 }
1499516096 }
1499616097
16098
+ boolean keys[] = new boolean[256];
16099
+ int speedkey[] = new int[256];
16100
+ int modifiers = 0;
16101
+
1499716102 public void processKeyEvent(KeyEvent e)
1499816103 {
1499916104 switch (e.getID())
1500016105 {
1500116106 case KeyEvent.KEY_PRESSED:
15002
- if (!autorepeat)
15003
- {
15004
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15005
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15006
- }
15007
- if (manipCamera == lightCamera)
15008
- {
15009
- switch (e.getKeyCode())
15010
- {
15011
- case DOWN_ARROW:
15012
- lightCamera.DECAL /= 2;
15013
- repaint();
15014
- break;
15015
- case UP_ARROW:
15016
- lightCamera.DECAL *= 2;
15017
- repaint();
15018
- break;
15019
- case LEFT_ARROW:
15020
- lightCamera.SCALE /= 2;
15021
- repaint();
15022
- break;
15023
- case RIGHT_ARROW:
15024
- lightCamera.SCALE *= 2;
15025
- repaint();
15026
- break;
15027
- default:
15028
- break;
15029
- }
15030
-
15031
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15032
- } else
15033
- {
15034
- if (true) // !autorepeat)
15035
- {
15036
- boolean reset = true;
15037
-
15038
- switch (e.getKeyCode())
15039
- {
15040
- case DOWN_ARROW:
15041
- GoDown(e.getModifiersEx());
15042
- repaint();
15043
- break;
15044
- case UP_ARROW:
15045
- GoUp(e.getModifiersEx());
15046
- repaint();
15047
- break;
15048
- case LEFT_ARROW:
15049
- GoLeft(e.getModifiersEx());
15050
- repaint();
15051
- break;
15052
- case RIGHT_ARROW:
15053
- GoRight(e.getModifiersEx());
15054
- repaint();
15055
- break;
15056
- default:
15057
- reset = false;
15058
- break;
15059
- }
15060
-
15061
- if (reset)
15062
- {
15063
- autorepeat = true;
15064
-
15065
- targetLookAt.set(manipCamera.lookAt);
15066
- }
15067
- }
15068
- }
16107
+ keys[e.getKeyCode()] = true;
16108
+ modifiers = e.getModifiersEx();
16109
+ keyPressed(e.getKeyChar(), modifiers);
16110
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16111
+ repaint();
1506916112 break;
15070
- case KeyEvent.KEY_TYPED:
15071
- break;
16113
+// if (!autorepeat)
16114
+// {
16115
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
16116
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
16117
+// }
16118
+// if (manipCamera == lightCamera)
16119
+// {
16120
+// switch (e.getKeyCode())
16121
+// {
16122
+// case DOWN_ARROW:
16123
+// lightCamera.DECAL /= 2;
16124
+// repaint();
16125
+// break;
16126
+// case UP_ARROW:
16127
+// lightCamera.DECAL *= 2;
16128
+// repaint();
16129
+// break;
16130
+// case LEFT_ARROW:
16131
+// lightCamera.SCALE /= 2;
16132
+// repaint();
16133
+// break;
16134
+// case RIGHT_ARROW:
16135
+// lightCamera.SCALE *= 2;
16136
+// repaint();
16137
+// break;
16138
+// default:
16139
+// break;
16140
+// }
16141
+//
16142
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16143
+// } else
16144
+// {
16145
+// if (true) // !autorepeat)
16146
+// {
16147
+// boolean reset = true;
16148
+//
16149
+// switch (e.getKeyCode())
16150
+// {
16151
+// case DOWN_ARROW:
16152
+// GoDown(e.getModifiersEx());
16153
+// repaint();
16154
+// break;
16155
+// case UP_ARROW:
16156
+// GoUp(e.getModifiersEx());
16157
+// repaint();
16158
+// break;
16159
+// case LEFT_ARROW:
16160
+// GoLeft(e.getModifiersEx());
16161
+// repaint();
16162
+// break;
16163
+// case RIGHT_ARROW:
16164
+// GoRight(e.getModifiersEx());
16165
+// repaint();
16166
+// break;
16167
+// default:
16168
+// reset = false;
16169
+// break;
16170
+// }
16171
+//
16172
+// if (reset)
16173
+// {
16174
+// autorepeat = true;
16175
+//
16176
+// targetLookAt.set(manipCamera.lookAt);
16177
+// }
16178
+// }
16179
+// }
16180
+// break;
16181
+// case KeyEvent.KEY_TYPED:
16182
+// break;
1507216183 case KeyEvent.KEY_RELEASED:
15073
- {
15074
- switch (e.getKeyCode())
15075
- {
15076
- case DOWN_ARROW:
15077
- case UP_ARROW:
15078
- case LEFT_ARROW:
15079
- case RIGHT_ARROW:
15080
- MODIFIERS &= ~COMMAND;
15081
- autorepeat = false;
15082
- break;
15083
- default:
15084
- break;
15085
- }
16184
+ keys[e.getKeyCode()] = false;
16185
+ modifiers = e.getModifiersEx();
1508616186 keyReleased(e.getKeyChar(), e.getModifiersEx());
16187
+ repaint();
1508716188 break;
15088
- }
16189
+// {
16190
+// switch (e.getKeyCode())
16191
+// {
16192
+// case DOWN_ARROW:
16193
+// case UP_ARROW:
16194
+// case LEFT_ARROW:
16195
+// case RIGHT_ARROW:
16196
+// MODIFIERS &= ~COMMAND;
16197
+// autorepeat = false;
16198
+// break;
16199
+// default:
16200
+// break;
16201
+// }
16202
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
16203
+// break;
16204
+// }
1508916205 default:
1509016206 break;
1509116207 }
....@@ -15126,7 +16242,7 @@
1512616242 {
1512716243 //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1512816244 //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15129
- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
16245
+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1513016246 {
1513116247 mouseMoved(e);
1513216248 } else
....@@ -15151,7 +16267,7 @@
1515116267 }
1515216268 */
1515316269
15154
- object.editWindow.EditSelection();
16270
+ object.GetWindow().EditSelection(false);
1515516271 }
1515616272
1515716273 void SelectParent()
....@@ -15168,10 +16284,10 @@
1516816284 {
1516916285 //selectees.remove(i);
1517016286 System.out.println("select parent of " + elem);
15171
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
16287
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1517216288 } else
1517316289 {
15174
- group.editWindow.Select(elem.GetTreePath(), first, true);
16290
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
1517516291 }
1517616292
1517716293 first = false;
....@@ -15213,12 +16329,12 @@
1521316329 for (int j = 0; j < group.children.size(); j++)
1521416330 {
1521516331 elem = (Object3D) group.children.elementAt(j);
15216
- object.editWindow.Select(elem.GetTreePath(), first, true);
16332
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1521716333 first = false;
1521816334 }
1521916335 } else
1522016336 {
15221
- object.editWindow.Select(elem.GetTreePath(), first, true);
16337
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1522216338 }
1522316339
1522416340 first = false;
....@@ -15229,21 +16345,21 @@
1522916345 {
1523016346 //Composite group = (Composite) object;
1523116347 Object3D group = object;
15232
- group.editWindow.loadClipboard(true); // ClearSelection(false);
16348
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
1523316349 }
1523416350
1523516351 void ResetTransform(int mask)
1523616352 {
1523716353 //Composite group = (Composite) object;
1523816354 Object3D group = object;
15239
- group.editWindow.ResetTransform(mask);
16355
+ group.GetWindow().ResetTransform(mask);
1524016356 }
1524116357
1524216358 void FlipTransform()
1524316359 {
1524416360 //Composite group = (Composite) object;
1524516361 Object3D group = object;
15246
- group.editWindow.FlipTransform();
16362
+ group.GetWindow().FlipTransform();
1524716363 // group.editWindow.ReduceMesh(true);
1524816364 }
1524916365
....@@ -15251,7 +16367,7 @@
1525116367 {
1525216368 //Composite group = (Composite) object;
1525316369 Object3D group = object;
15254
- group.editWindow.PrintMemory();
16370
+ group.GetWindow().PrintMemory();
1525516371 // group.editWindow.ReduceMesh(true);
1525616372 }
1525716373
....@@ -15259,7 +16375,7 @@
1525916375 {
1526016376 //Composite group = (Composite) object;
1526116377 Object3D group = object;
15262
- group.editWindow.ResetCentroid();
16378
+ group.GetWindow().ResetCentroid();
1526316379 }
1526416380
1526516381 void IncDepth()
....@@ -15341,11 +16457,11 @@
1534116457
1534216458 int width = getBounds().width;
1534316459 int height = getBounds().height;
15344
- ClickInfo info = new ClickInfo();
15345
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1534616460 //Image img = CreateImage(width, height);
1534716461 //System.out.println("width = " + width + "; height = " + height + "\n");
16462
+
1534816463 Graphics gr = g; // img.getGraphics();
16464
+
1534916465 if (!hasMarquee)
1535016466 {
1535116467 if (Xmin < Xmax) // !locked)
....@@ -15417,44 +16533,92 @@
1541716533 }
1541816534 if (object != null && !hasMarquee)
1541916535 {
16536
+ if (object.clickInfo == null)
16537
+ object.clickInfo = new ClickInfo();
16538
+ ClickInfo info = object.clickInfo;
16539
+ //ClickInfo info = new ClickInfo();
16540
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16541
+
1542016542 if (isRenderer)
1542116543 {
15422
- info.flags++;
16544
+ object.clickInfo.flags++;
1542316545 double frameAspect = (double) width / (double) height;
1542416546 if (frameAspect > renderCamera.aspect)
1542516547 {
1542616548 int desired = (int) ((double) height * renderCamera.aspect);
15427
- info.bounds.width -= width - desired;
15428
- info.bounds.x += (width - desired) / 2;
16549
+ object.clickInfo.bounds.width -= width - desired;
16550
+ object.clickInfo.bounds.x += (width - desired) / 2;
1542916551 } else
1543016552 {
1543116553 int desired = (int) ((double) width / renderCamera.aspect);
15432
- info.bounds.height -= height - desired;
15433
- info.bounds.y += (height - desired) / 2;
16554
+ object.clickInfo.bounds.height -= height - desired;
16555
+ object.clickInfo.bounds.y += (height - desired) / 2;
1543416556 }
1543516557 }
15436
- info.g = gr;
15437
- info.camera = renderCamera;
16558
+
16559
+ object.clickInfo.g = gr;
16560
+ object.clickInfo.camera = renderCamera;
1543816561 /*
1543916562 // Memory intensive (brep.verticescopy)
1544016563 if (!(object instanceof Composite))
1544116564 object.draw(info, 0, false); // SLOW :
1544216565 */
15443
- if (!isRenderer)
16566
+ if (!isRenderer) // && drag)
1544416567 {
15445
- object.drawEditHandles(info, 0);
16568
+ Grafreed.Assert(object != null);
16569
+ Grafreed.Assert(object.selection != null);
16570
+ if (object.selection.Size() > 0)
16571
+ {
16572
+ int hitSomething = object.selection.get(0).hitSomething;
16573
+
16574
+ object.clickInfo.DX = 0;
16575
+ object.clickInfo.DY = 0;
16576
+ object.clickInfo.W = 1;
16577
+ if (hitSomething == Object3D.hitCenter)
16578
+ {
16579
+ info.DX = X;
16580
+ if (X != 0)
16581
+ info.DX -= info.bounds.width/2;
16582
+
16583
+ info.DY = Y;
16584
+ if (Y != 0)
16585
+ info.DY -= info.bounds.height/2;
16586
+ }
16587
+
16588
+ object.drawEditHandles(//info,
16589
+ 0);
16590
+
16591
+ if (drag && (X != 0 || Y != 0))
16592
+ {
16593
+ switch (hitSomething)
16594
+ {
16595
+ case Object3D.hitCenter: gr.setColor(Color.white);
16596
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16597
+ break;
16598
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
16599
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16600
+ break;
16601
+ case Object3D.hitScale: gr.setColor(Color.cyan);
16602
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16603
+ break;
16604
+ }
16605
+
16606
+ }
16607
+ }
1544616608 }
1544716609 }
16610
+
1544816611 if (isRenderer)
1544916612 {
1545016613 //gr.setColor(Color.black);
1545116614 //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1545216615 //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1545316616 }
16617
+
1545416618 if (hasMarquee)
1545516619 {
1545616620 gr.setXORMode(Color.white);
15457
- gr.setColor(Color.red);
16621
+ gr.setColor(Color.white);
1545816622 if (!firstime)
1545916623 {
1546016624 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -15563,6 +16727,7 @@
1556316727 public boolean mouseDown(Event evt, int x, int y)
1556416728 {
1556516729 System.out.println("mouseDown: " + evt);
16730
+ System.exit(0);
1556616731 /*
1556716732 locked = true;
1556816733 drag = false;
....@@ -15606,13 +16771,14 @@
1560616771 {
1560716772 keyPressed(0, modifiers);
1560816773 }
15609
- clickStart(x, y, modifiers);
16774
+ // clickStart(x, y, modifiers);
1561016775 return true;
1561116776 }
1561216777
1561316778 public boolean mouseDrag(Event evt, int x, int y)
1561416779 {
15615
- //System.out.println("mouseDrag: " + evt);
16780
+ System.out.println("mouseDrag: " + evt);
16781
+ System.exit(0);
1561616782 /*
1561716783 drag = true;
1561816784 //System.out.println("Mouse DRAG");
....@@ -15724,13 +16890,14 @@
1572416890 {
1572516891 keyReleased(0, 0);
1572616892 }
15727
- drag(x, y, modifiers);
16893
+ drag(x, y, 0, modifiers);
1572816894 return true;
1572916895 }
1573016896
1573116897 public boolean mouseUp(Event evt, int x, int y)
1573216898 {
1573316899 System.out.println("mouseUp: " + evt);
16900
+ System.exit(0);
1573416901 /*
1573516902 locked = false;
1573616903 if (isRenderer)
....@@ -15856,7 +17023,7 @@
1585617023 Object3D object;
1585717024 static Object3D trackedobject;
1585817025 Camera renderCamera; // Light or Eye (or Occlusion)
15859
- /*static*/ Camera manipCamera; // Light or Eye
17026
+ /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1586017027 /*static*/ Camera eyeCamera;
1586117028 /*static*/ Camera lightCamera;
1586217029 int cameracount;
....@@ -15920,6 +17087,8 @@
1592017087 private /*static*/ boolean firstime;
1592117088 private /*static*/ cVector newView = new cVector();
1592217089 private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
17090
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
17091
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1592317092 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1592417093 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1592517094 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -15932,36 +17101,74 @@
1593217101 {
1593317102 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1593417103
17104
+ int usedsuf = 0;
17105
+
1593517106 for (int i = 0; i < suffixes.length; i++)
1593617107 {
15937
- String resourceName = basename + suffixes[i] + "." + suffix;
15938
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15939
- mipmapped,
15940
- FileUtil.getFileSuffix(resourceName));
15941
- if (data == null)
17108
+ String[] suffixe = suffixes;
17109
+ String[] fallback = suffixes2;
17110
+ String[] fallfallback = suffixes3;
17111
+
17112
+ for (int c=usedsuf; --c>=0;)
1594217113 {
15943
- throw new IOException("Unable to load texture " + resourceName);
17114
+// String[] temp = suffixe;
17115
+// suffixe = fallback;
17116
+// fallback = fallfallback;
17117
+// fallfallback = temp;
1594417118 }
17119
+
17120
+ String resourceName = basename + suffixe[i] + "." + suffix;
17121
+ TextureData data;
17122
+
17123
+ try
17124
+ {
17125
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17126
+ mipmapped,
17127
+ FileUtil.getFileSuffix(resourceName));
17128
+ }
17129
+ catch (Exception e)
17130
+ {
17131
+ try
17132
+ {
17133
+ resourceName = basename + fallback[i] + "." + suffix;
17134
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17135
+ mipmapped,
17136
+ FileUtil.getFileSuffix(resourceName));
17137
+ }
17138
+ catch (Exception e2)
17139
+ {
17140
+ resourceName = basename + fallfallback[i] + "." + suffix;
17141
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17142
+ mipmapped,
17143
+ FileUtil.getFileSuffix(resourceName));
17144
+ }
17145
+ }
17146
+
1594517147 //System.out.println("Target = " + targets[i]);
1594617148 cubemap.updateImage(data, targets[i]);
1594717149 }
1594817150
1594917151 return cubemap;
1595017152 }
17153
+
1595117154 int bigsphere = -1;
1595217155
1595317156 float BGcolor = 0.5f;
1595417157
15955
- private void DrawSkyBox(GL gl)
17158
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17159
+
17160
+ private void DrawSkyBox(GL gl, float ratio)
1595617161 {
15957
- if (envyoff || cubemap == null)
17162
+ if (//envyoff ||
17163
+ WIREFRAME ||
17164
+ cubemap == null)
1595817165 {
1595917166 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1596017167 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
1596117168 return;
1596217169 }
1596317170
15964
- if (WIREFRAME)
17171
+ //if (WIREFRAME)
1596517172 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1596617173
1596717174 gl.glDisable(gl.GL_CULL_FACE);
....@@ -15969,7 +17176,17 @@
1596917176 // Compensates for ExaminerViewer's modification of modelview matrix
1597017177 gl.glMatrixMode(GL.GL_MODELVIEW);
1597117178 gl.glLoadIdentity();
17179
+ gl.glScalef(1,ratio,1);
1597217180
17181
+// colorV[0] = 2;
17182
+// colorV[1] = 2;
17183
+// colorV[2] = 2;
17184
+// colorV[3] = 1;
17185
+// gl.glDisable(gl.GL_COLOR_MATERIAL);
17186
+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
17187
+//
17188
+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
17189
+
1597317190 //gl.glActiveTexture(GL.GL_TEXTURE1);
1597417191 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1597517192
....@@ -16001,6 +17218,7 @@
1600117218 {
1600217219 gl.glScalef(1.0f, -1.0f, 1.0f);
1600317220 }
17221
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1600417222 gl.glMultMatrixd(viewrot_1, 0);
1600517223 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1600617224 //viewer.updateInverseRotation(gl);
....@@ -16041,7 +17259,8 @@
1604117259 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1604217260
1604317261 cubemap.disable();
16044
- ////cubemap.unbind();
17262
+ //cubemap.dispose();
17263
+
1604517264 if (CULLFACE)
1604617265 {
1604717266 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16049,6 +17268,8 @@
1604917268
1605017269 if (WIREFRAME)
1605117270 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
17271
+ else
17272
+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1605217273 }
1605317274
1605417275 private void DrawChecker(GL gl)
....@@ -16097,7 +17318,7 @@
1609717318 gl.glScalef(1.0f, -1.0f, 1.0f);
1609817319 }
1609917320
16100
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17321
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1610117322
1610217323 float step = 2; // 0.1666f; //0.25f;
1610317324 float stepv = 2; // step * 1652 / 998;
....@@ -16141,16 +17362,16 @@
1614117362 cStatic.objectstack[materialdepth++] = checker;
1614217363 //System.out.println("material " + material);
1614317364 //Applet3D.tracein(this, selected);
16144
- vector2buffer = checker.projectedVertices;
17365
+ //vector2buffer = checker.projectedVertices;
1614517366
1614617367 //checker.GetMaterial().Draw(this, false); // true);
16147
- DrawMaterial(checker.GetMaterial(), false); // true);
17368
+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1614817369
1614917370 materialdepth -= 1;
1615017371 if (materialdepth > 0)
1615117372 {
16152
- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16153
- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
17373
+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
17374
+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1615417375 }
1615517376 //checker.GetMaterial().opacity = 1f;
1615617377 ////checker.GetMaterial().ambient = 1f;
....@@ -16236,6 +17457,14 @@
1623617457 }
1623717458 }
1623817459
17460
+ private Object3D GetFolder()
17461
+ {
17462
+ Object3D folder = object.GetWindow().copy;
17463
+ if (object.GetWindow().copy.selection.Size() > 0)
17464
+ folder = object.GetWindow().copy.selection.elementAt(0);
17465
+ return folder;
17466
+ }
17467
+
1623917468 class SelectBuffer implements GLEventListener
1624017469 {
1624117470
....@@ -16251,7 +17480,7 @@
1625117480 //new Exception().printStackTrace();
1625217481 System.out.println("select buffer init");
1625317482 // Use debug pipeline
16254
- drawable.setGL(new DebugGL(drawable.getGL()));
17483
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1625517484
1625617485 GL gl = drawable.getGL();
1625717486
....@@ -16315,6 +17544,17 @@
1631517544
1631617545 //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
1631717546
17547
+ if (PAINTMODE)
17548
+ {
17549
+ if (object.GetWindow().copy.selection.Size() > 0)
17550
+ {
17551
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17552
+
17553
+ // Make what you paint not selectable.
17554
+ paintobj.ResetSelectable();
17555
+ }
17556
+ }
17557
+
1631817558 //int tmp = selection_view;
1631917559 //selection_view = -1;
1632017560 int temp = DrawMode();
....@@ -16326,6 +17566,17 @@
1632617566 // temp = DEFAULT; // patch for selection debug
1632717567 Globals.drawMode = temp; // WARNING
1632817568
17569
+ if (PAINTMODE)
17570
+ {
17571
+ if (object.GetWindow().copy.selection.Size() > 0)
17572
+ {
17573
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17574
+
17575
+ // Revert.
17576
+ paintobj.RestoreSelectable();
17577
+ }
17578
+ }
17579
+
1632917580 //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
1633017581
1633117582 // trying different ways of getting the depth info over
....@@ -16356,7 +17607,7 @@
1635617607
1635717608 float depth = depths[y * TEX_SIZE + x];
1635817609
16359
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17610
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1636017611 {
1636117612 pointselection = false;
1636217613
....@@ -16373,6 +17624,8 @@
1637317624 // System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1637417625 // System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1637517626 // System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
17627
+
17628
+ CreateSelectedPoint();
1637617629
1637717630 // Will fit the mesh !!!
1637817631 selectedpoint.toParent[0][0] = 0.0001;
....@@ -16422,34 +17675,36 @@
1642217675 System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
1642317676 }
1642417677
16425
- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
17678
+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1642617679 }
1642717680 }
1642817681
1642917682 if (!movingcamera && !PAINTMODE)
16430
- object.editWindow.ScreenFitPoint(); // fev 2014
17683
+ object.GetWindow().ScreenFitPoint(); // fev 2014
1643117684
16432
- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
17685
+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643317686 {
16434
- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
17687
+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1643517688
16436
- Object3D group = new Object3D("inst" + paintcount++);
17689
+ if (object.GetWindow().copy.selection.Size() > 0)
17690
+ {
17691
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
1643717692
16438
- group.CreateMaterial(); // use a void leaf to select instances
16439
-
16440
- group.add(paintobj); // link
16441
-
16442
- object.editWindow.SnapObject(group);
16443
-
16444
- Object3D folder = object.editWindow.copy;
16445
-
16446
- if (object.editWindow.copy.selection.Size() > 0)
16447
- folder = object.editWindow.copy.selection.elementAt(0);
16448
-
16449
- folder.add(group);
16450
-
16451
- object.editWindow.ResetModel();
16452
- object.editWindow.refreshContents();
17693
+ Object3D inst = new Object3D("inst" + paintcount++);
17694
+
17695
+ inst.CreateMaterial(); // use a void leaf to select instances
17696
+
17697
+ inst.add(paintobj); // link
17698
+
17699
+ object.GetWindow().SnapObject(inst);
17700
+
17701
+ Object3D folder = paintFolder; // GetFolder();
17702
+
17703
+ folder.add(inst);
17704
+
17705
+ object.GetWindow().ResetModel();
17706
+ object.GetWindow().refreshContents();
17707
+ }
1645317708 }
1645417709 else
1645517710 paintcount = 0;
....@@ -16488,6 +17743,11 @@
1648817743 //System.out.println("objects[color] = " + objects[color]);
1648917744 //objects[color].Select();
1649017745 indexcount = 0;
17746
+ ObjEditor window = object.GetWindow();
17747
+ if (window != null && deselect)
17748
+ {
17749
+ window.Select(null, deselect, true);
17750
+ }
1649117751 object.Select(color, deselect);
1649217752 }
1649317753
....@@ -16538,6 +17798,7 @@
1653817798
1653917799 public void init(GLAutoDrawable drawable)
1654017800 {
17801
+ if (Globals.DEBUG)
1654117802 System.out.println("shadow buffer init");
1654217803
1654317804 GL gl = drawable.getGL();
....@@ -16587,7 +17848,7 @@
1658717848 gl.glDisable(gl.GL_CULL_FACE);
1658817849 }
1658917850
16590
- if (!RENDERSHADOW)
17851
+ if (!Globals.RENDERSHADOW)
1659117852 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659217853
1659317854 // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16597,7 +17858,7 @@
1659717858 //gl.glColorMask(false, false, false, false);
1659817859
1659917860 //render_scene_from_light_view(gl, drawable, 0, 0);
16600
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
17861
+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660117862 {
1660217863 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660317864
....@@ -16766,10 +18027,14 @@
1676618027 gl.glFlush();
1676718028
1676818029 /**/
16769
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
18030
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1677018031
16771
- float[] pixels = occlusionsizebuffer.array();
18032
+ float[] depths = occlusiondepthbuffer.array();
1677218033
18034
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
18035
+
18036
+ int[] pixels = selectsizebuffer.array();
18037
+
1677318038 double r = 0, g = 0, b = 0;
1677418039
1677518040 double count = 0;
....@@ -16780,7 +18045,7 @@
1678018045
1678118046 double FACTOR = 1;
1678218047
16783
- for (int i = 0; i < pixels.length; i++)
18048
+ for (int i = 0; i < depths.length; i++)
1678418049 {
1678518050 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1678618051 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -16863,7 +18128,7 @@
1686318128
1686418129 double scale = ray.z; // 1; // cos
1686518130
16866
- float depth = pixels[newindex];
18131
+ float depth = depths[newindex];
1686718132
1686818133 /*
1686918134 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17006,6 +18271,11 @@
1700618271 static boolean DEBUG_SELECTION = false;
1700718272 boolean OCCLUSION_CULLING = false; //true;
1700818273 public boolean lightMode = false;
18274
+
18275
+ private boolean keepshadow;
18276
+
18277
+ static public boolean capsLocked = false; // VR
18278
+
1700918279 static public int indexcount = 0;
1701018280 /*static*/ cColor vertexOcclusion = new cColor();
1701118281 //private int selection_view = -1;
....@@ -17013,23 +18283,15 @@
1701318283 int AAbuffersize = 0;
1701418284
1701518285 //double[] selectedpoint = new double[3];
17016
- static Superellipsoid selectedpoint = new Superellipsoid();
18286
+ static Superellipsoid selectedpoint;
1701718287 static Sphere previousselectedpoint = null;
17018
- static Sphere debugpointG = new Sphere();
17019
- static Sphere debugpointP = new Sphere();
17020
- static Sphere debugpointC = new Sphere();
17021
- static Sphere debugpointR = new Sphere();
18288
+ static Sphere debugpointG;
18289
+ static Sphere debugpointP;
18290
+ static Sphere debugpointC;
18291
+ static Sphere debugpointR;
1702218292
1702318293 static Sphere debugpoints[] = new Sphere[8];
1702418294
17025
- static
17026
- {
17027
- for (int i=0; i<8; i++)
17028
- {
17029
- debugpoints[i] = new Sphere();
17030
- }
17031
- }
17032
-
1703318295 static void InitPoints(float radius)
1703418296 {
1703518297 for (int i=0; i<8; i++)
....@@ -17068,11 +18330,14 @@
1706818330 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1706918331 static IntBuffer bigAAbuffer;
1707018332 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17071
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18333
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1707218334 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1707318335 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1707418336 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17075
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18337
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18338
+
18339
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18340
+
1707618341 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1707718342 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1707818343 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();