Normand Briere
2019-09-25 51e45bf615e1e2b4aca2edf9f7333b687c7d015e
CameraPane.java
....@@ -1,4 +1,5 @@
11
2
+import com.bulletphysics.dynamics.RigidBody;
23 import java.awt.*;
34 import java.awt.event.*;
45 import java.awt.image.*;
....@@ -18,7 +19,10 @@
1819 import javax.imageio.ImageIO;
1920 import javax.imageio.ImageWriteParam;
2021 import javax.imageio.ImageWriter;
22
+import javax.imageio.ImageReadParam;
23
+import javax.imageio.ImageReader;
2124 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
25
+import javax.imageio.stream.ImageInputStream;
2226 import javax.imageio.stream.ImageOutputStream;
2327 import javax.imageio.ImageWriteParam;
2428
....@@ -30,6 +34,7 @@
3034 import java.nio.*;
3135
3236 import gleem.linalg.Mat4f;
37
+import javax.imageio.ImageTypeSpecifier;
3338
3439 class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
3540 {
....@@ -37,7 +42,6 @@
3742 static boolean[] selectedstack = new boolean[65536];
3843 static int materialdepth = 0;
3944
40
- static boolean DEBUG = false;
4145 static boolean FRUSTUM = false; // still bogus true; // frustum culling
4246
4347 // camera change fix
....@@ -45,6 +49,39 @@
4549 static boolean ABORTED = false;
4650
4751 static int STEP = 1;
52
+
53
+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
54
+ {
55
+ int[] pixels = new int[bytes.length/3];
56
+ for (int i=pixels.length; --i>=0;)
57
+ {
58
+ int i3 = i*3;
59
+ pixels[i] = 0xFF;
60
+ pixels[i] <<= 8;
61
+ pixels[i] |= bytes[i3+2] & 0xFF;
62
+ pixels[i] <<= 8;
63
+ pixels[i] |= bytes[i3+1] & 0xFF;
64
+ pixels[i] <<= 8;
65
+ pixels[i] |= bytes[i3] & 0xFF;
66
+ }
67
+ /*
68
+ int r=0,g=0,b=0,a=0;
69
+ for (int i=0; i<width; i++)
70
+ for (int j=0; j<height; j++)
71
+ {
72
+ int index = j*width+i;
73
+ int p = pixels[index];
74
+ a = ((p>>24) & 0xFF);
75
+ r = ((p>>16) & 0xFF);
76
+ g = ((p>>8) & 0xFF);
77
+ b = (p & 0xFF);
78
+ pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
79
+ }
80
+ /**/
81
+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
82
+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
83
+ return rendImage;
84
+ }
4885
4986 /*static*/ private boolean CULLFACE = false; // true;
5087 /*static*/ boolean NEAREST = false; // true;
....@@ -61,7 +98,7 @@
6198 //boolean REDUCETEXTURE = true;
6299 boolean CACHETEXTURE = true;
63100 boolean CLEANCACHE = false; // true;
64
- boolean MIPMAP = false; // true;
101
+ boolean MIPMAP = false; // true; // never works...
65102 boolean COMPRESSTEXTURE = false;
66103 boolean KOMPACTTEXTURE = false; // true;
67104 boolean RESIZETEXTURE = false;
....@@ -74,7 +111,11 @@
74111 //private Mat4f spotlightTransform = new Mat4f();
75112 //private Mat4f spotlightInverseTransform = new Mat4f();
76113 static GLContext glcontext = null;
77
- /*static*/ com.sun.opengl.util.texture.Texture cubemap;
114
+ /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
115
+ /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
116
+ /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
117
+ boolean transformMode;
118
+
78119 boolean reverseUP = false;
79120 static boolean frozen = false;
80121 boolean enablebackspace = false; // patch for back buffer refresh
....@@ -94,7 +135,7 @@
94135 static boolean ZOOMBOXMODE = false;
95136 static boolean BOXMODE = false;
96137 static boolean IMAGEFLIP = false;
97
-static boolean SMOOTHFOCUS = false;
138
+static boolean SMOOTHFOCUS = true; // false;
98139 static boolean SPEAKERMOCAP = true; // jan 2014 false;
99140 static boolean SPEAKERCAMERA = false;
100141 static boolean SPEAKERFOCUS = false;
....@@ -128,16 +169,16 @@
128169
129170
130171 // OPTIONS
131
- boolean Skinshader = true;
172
+ boolean Skinshader = false; // true;
132173 boolean cameraLight = false;
133174 boolean UVdebug = false;
134175 boolean Udebug = false;
135176 boolean Vdebug = false;
136177 boolean NORMALdebug = false;
137
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
178
+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
138179 boolean anisotropy = true;
139180 boolean softshadow = true; // slower but better false;
140
- boolean opacityhalo = false;
181
+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141182
142183 boolean macromode = false;
143184
....@@ -151,6 +192,19 @@
151192 }
152193
153194 private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
195
+
196
+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
197
+ {
198
+ try
199
+ {
200
+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
201
+ } catch (IOException e)
202
+ {
203
+ System.out.println("NAME = " + name);
204
+ e.printStackTrace(); // throw new RuntimeException(e);
205
+ return null;
206
+ }
207
+ }
154208
155209 void SetAsGLRenderer(boolean b)
156210 {
....@@ -168,9 +222,10 @@
168222 cameras = new Camera[2];
169223 targetLookAts = new cVector[2];
170224
171
- SetCamera(cam);
225
+ SetCamera(cam, true);
172226
173
- SetLight(new Camera(new cVector(10, 10, -20)));
227
+ // Warning: not used.
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
174229
175230 object = o;
176231
....@@ -327,7 +382,7 @@
327382 cStatic.objectstack[materialdepth++] = obj;
328383 //System.out.println("material " + material);
329384 //Applet3D.tracein(this, selected);
330
- display.vector2buffer = obj.projectedVertices;
385
+ //display.vector2buffer = obj.projectedVertices;
331386 if (obj instanceof Camera)
332387 {
333388 display.options1[0] = material.shift;
....@@ -336,14 +391,28 @@
336391 display.options1[2] = material.shadowbias;
337392 display.options1[3] = material.aniso;
338393 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]);
339399 display.options2[0] = material.opacity;
340400 display.options2[1] = material.diffuse;
341401 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]);
342405
343406 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]);
344410 display.options4[0] = material.cameralight/0.2f;
345411 display.options4[1] = material.subsurface;
346412 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]);
347416
348417 // if (display.CURRENTANTIALIAS > 0)
349418 // display.options3[3] /= 4;
....@@ -359,7 +428,7 @@
359428 /**/
360429 } else
361430 {
362
- DrawMaterial(material, selected);
431
+ DrawMaterial(material, selected, obj.projectedVertices);
363432 }
364433 } else
365434 {
....@@ -383,8 +452,8 @@
383452 cStatic.objectstack[materialdepth++] = obj;
384453 //System.out.println("material " + material);
385454 //Applet3D.tracein("selected ", selected);
386
- display.vector2buffer = obj.projectedVertices;
387
- display.DrawMaterial(material, selected);
455
+ //display.vector2buffer = obj.projectedVertices;
456
+ display.DrawMaterial(material, selected, obj.projectedVertices);
388457 }
389458 }
390459
....@@ -401,8 +470,8 @@
401470 materialdepth -= 1;
402471 if (materialdepth > 0)
403472 {
404
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405
- 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);
406475 }
407476 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408477 } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -422,8 +491,8 @@
422491 materialdepth -= 1;
423492 if (materialdepth > 0)
424493 {
425
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426
- 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);
427496 }
428497 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429498 //else
....@@ -464,15 +533,18 @@
464533 if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465534 {
466535 //gl.glBegin(gl.GL_TRIANGLES);
467
- 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
+ ;
468539 if (!hasnorm)
469540 {
470
- // System.out.println("FUCK!!");
541
+ // System.out.println("Mesh normal");
471542 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
472543 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
473544 LA.vecCross(obj.v0, obj.v1, obj.v2);
474545 LA.vecNormalize(obj.v2);
475
- 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);
476548 }
477549
478550 // P
....@@ -494,7 +566,7 @@
494566 y += ny * obj.NORMALPUSH;
495567 z += nz * obj.NORMALPUSH;
496568
497
- gl.glNormal3f(nx, ny, nz);
569
+ SetGLNormal(gl, nx, ny, nz);
498570 }
499571 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
500572 SetColor(obj, pv);
....@@ -526,7 +598,7 @@
526598 y += ny * obj.NORMALPUSH;
527599 z += nz * obj.NORMALPUSH;
528600
529
- gl.glNormal3f(nx, ny, nz);
601
+ SetGLNormal(gl, nx, ny, nz);
530602 }
531603 //System.out.println("vertexq = " + qv.s + ", " + qv.t);
532604 // boolean locked = false;
....@@ -574,7 +646,7 @@
574646 y += ny * obj.NORMALPUSH;
575647 z += nz * obj.NORMALPUSH;
576648
577
- gl.glNormal3f(nx, ny, nz);
649
+ SetGLNormal(gl, nx, ny, nz);
578650 }
579651
580652 // if ((dot&4) == 0)
....@@ -810,7 +882,7 @@
810882 //// tris.postdraw(this);
811883 }
812884
813
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
814886 static cVector from = new cVector();
815887 static cVector to = new cVector();
816888
....@@ -819,7 +891,7 @@
819891 CameraPane cp = this;
820892
821893 Camera keep = cp.RenderCamera();
822
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
823895
824896 if (br.trimmed)
825897 {
....@@ -837,7 +909,7 @@
837909 br.positions[i3 + 2] + br.normals[i3 + 2]);
838910 LA.xformPos(from, transform, from);
839911 LA.xformPos(to, transform, to); // RIGID ONLY
840
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
841913
842914 CameraPane.occlusionbuffer.display();
843915
....@@ -871,7 +943,7 @@
871943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
872944 LA.xformPos(from, transform, from);
873945 LA.xformPos(to, transform, to); // RIGID ONLY
874
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
875947
876948 CameraPane.occlusionbuffer.display();
877949
....@@ -1180,10 +1252,10 @@
11801252 {
11811253 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
11821254 {
1183
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1255
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
11841256 } else
11851257 {
1186
- gl.glNormal3f(0, 0, 1);
1258
+ SetGLNormal(gl, 0, 0, 1);
11871259 }
11881260
11891261 if (c != null)
....@@ -1192,10 +1264,12 @@
11921264 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11931265 }
11941266 }
1267
+
11951268 if (flipV)
11961269 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11971270 else
11981271 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1272
+
11991273 //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12001274 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12011275
....@@ -1205,20 +1279,22 @@
12051279 {
12061280 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12071281 {
1208
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1282
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12091283 } else
12101284 {
1211
- gl.glNormal3f(0, 0, 1);
1285
+ SetGLNormal(gl, 0, 0, 1);
12121286 }
12131287 if (c != null)
12141288 {
12151289 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12161290 }
12171291 }
1292
+
12181293 if (flipV)
12191294 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12201295 else
12211296 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1297
+
12221298 //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12231299 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12241300
....@@ -1231,10 +1307,10 @@
12311307 {
12321308 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12331309 {
1234
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1310
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12351311 } else
12361312 {
1237
- gl.glNormal3f(0, 0, 1);
1313
+ SetGLNormal(gl, 0, 0, 1);
12381314 }
12391315 if (c != null)
12401316 {
....@@ -1246,8 +1322,10 @@
12461322 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12471323 else
12481324 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1325
+
12491326 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12501327 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1328
+
12511329 count2 += 2;
12521330 count3 += 3;
12531331 }
....@@ -1414,7 +1492,7 @@
14141492 {
14151493 if (!selectmode)
14161494 {
1417
- 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);
14181496 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14191497
14201498 if (flipV)
....@@ -1426,6 +1504,8 @@
14261504 gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14271505 }
14281506
1507
+ float[] colorV = new float[4];
1508
+
14291509 void SetColor(Object3D obj, Vertex p0)
14301510 {
14311511 CameraPane display = this;
....@@ -1493,8 +1573,6 @@
14931573 {
14941574 return;
14951575 }
1496
-
1497
- float[] colorV = new float[3];
14981576
14991577 if (false) // marked)
15001578 {
....@@ -1603,7 +1681,7 @@
16031681 // gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16041682 }
16051683
1606
- void DrawMaterial(cMaterial material, boolean selected)
1684
+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16071685 {
16081686 CameraPane display = this;
16091687 //new Exception().printStackTrace();
....@@ -1638,7 +1716,7 @@
16381716 colorV[0] = display.modelParams0[0] * material.diffuse;
16391717 colorV[1] = display.modelParams0[1] * material.diffuse;
16401718 colorV[2] = display.modelParams0[2] * material.diffuse;
1641
- colorV[3] = material.opacity;
1719
+ colorV[3] = 1; // material.opacity;
16421720
16431721 gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16441722 //System.out.println("Opacity = " + opacity);
....@@ -1743,12 +1821,12 @@
17431821
17441822 display.modelParams7[0] = 0;
17451823 display.modelParams7[1] = 1000;
1746
- display.modelParams7[2] = 0;
1824
+ display.modelParams7[2] = material.parallax;
17471825 display.modelParams7[3] = 0;
17481826
1749
- display.modelParams6[0] = 100; // criss de bug de bump
1827
+ //display.modelParams6[0] = 100; // criss de bug de bump
17501828
1751
- Object3D.cVector2[] extparams = display.vector2buffer;
1829
+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
17521830 if (extparams != null && extparams.length > 0 && extparams[0] != null)
17531831 {
17541832 display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1976,9 +2054,9 @@
19762054 switch(viewcode)
19772055 {
19782056 case 0: return "main";
1979
- case 1: return "one";
1980
- case 2: return "two";
1981
- case 3: return "three";
2057
+ case 1: return "Red";
2058
+ case 2: return "Green";
2059
+ case 3: return "Blue";
19822060 case 4: return "light";
19832061 }
19842062
....@@ -1987,7 +2065,7 @@
19872065
19882066 static int camerachangeframe;
19892067
1990
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
19912069 {
19922070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
19932071 // return false;
....@@ -2005,7 +2083,8 @@
20052083
20062084 camerachangeframe = Globals.framecount;
20072085
2008
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20092088
20102089 cameras[0] = cam;
20112090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2015,11 +2094,14 @@
20152094 {
20162095 cameras[i] = new Camera(cam.viewCode);
20172096 }
2018
-
2019
- cameras[i].setAim(cam.location, cam.lookAt);
2020
- cameras[i].shaper_fovy = cam.shaper_fovy;
2021
- cameras[i].UP.set(cam.UP);
2022
- 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
+ }
20232105 }
20242106 cameracount = 0;
20252107 targetLookAt = targetLookAts[cameracount];
....@@ -2028,7 +2110,7 @@
20282110 // Start with free camera
20292111 SwitchCameras(true);
20302112
2031
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
20322114
20332115 if (TRACKONCE)
20342116 {
....@@ -2044,7 +2126,7 @@
20442126 //System.err.println("Oeil on");
20452127 OEIL = true;
20462128 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2129
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20482130 //pingthread.StepToTarget(true);
20492131 }
20502132
....@@ -2215,18 +2297,6 @@
22152297 public void ToggleTrack()
22162298 {
22172299 TRACK ^= true;
2218
- if (TRACK)
2219
- {
2220
- if (object.selection != null &&
2221
- object.selection.size() > 0 &&
2222
- object.selection.elementAt(0) != null &&
2223
- !(object.selection.elementAt(0) instanceof Camera) &&
2224
- !(object.selection.elementAt(0) instanceof ScriptNode))
2225
- {
2226
- trackedobject = object.selection.elementAt(0);
2227
- repaint();
2228
- }
2229
- }
22302300
22312301 repaint();
22322302 }
....@@ -2259,7 +2329,7 @@
22592329
22602330 void ToggleDebug()
22612331 {
2262
- DEBUG ^= true;
2332
+ Globals.DEBUG ^= true;
22632333 }
22642334
22652335 void ToggleLookAt()
....@@ -2277,10 +2347,17 @@
22772347 HANDLES ^= true;
22782348 }
22792349
2350
+ Object3D paintFolder;
2351
+
22802352 void TogglePaint()
22812353 {
22822354 PAINTMODE ^= true;
22832355 paintcount = 0;
2356
+
2357
+ if (PAINTMODE)
2358
+ {
2359
+ paintFolder = GetFolder();
2360
+ }
22842361 }
22852362
22862363 void SwapCamera(int a, int b)
....@@ -2311,7 +2388,8 @@
23112388 {
23122389 //System.out.println("PROTECTION = " + cam.hAspect);
23132390 //assert (cam.hAspect == 0);
2314
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23152393 lightCamera = cam;
23162394 }
23172395
....@@ -2377,6 +2455,33 @@
23772455 return currentGL;
23782456 }
23792457
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
+
23802485 /**/
23812486 class CacheTexture
23822487 {
....@@ -2385,28 +2490,31 @@
23852490
23862491 int resolution;
23872492
2388
- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
2493
+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
23892494 {
2390
- texture = tex;
2495
+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
2496
+ texturedata = texdata;
23912497 resolution = res;
23922498 }
23932499 }
23942500 /**/
23952501
23962502 // TEXTURE static Texture texture;
2397
- static public java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/> textures
2398
- = new java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/>();
2399
- 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
+
24002508 int pigmentdepth = 0;
24012509 public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
24022510 int bumpdepth = 0;
24032511 public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
24042512 //public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
24052513 public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406
- public static String NOISE_TEXTURE = "WHITE_NOISE";
2514
+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
24072515 // public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
24082516
2409
- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
2517
+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
24102518 {
24112519 TextureData texturedata = null;
24122520
....@@ -2416,7 +2524,7 @@
24162524 com.sun.opengl.util.texture.TextureIO.newTextureData(
24172525 getClass().getClassLoader().getResourceAsStream(name),
24182526 true,
2419
- com.sun.opengl.util.texture.TextureIO.PNG);
2527
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
24202528 } catch (java.io.IOException e)
24212529 {
24222530 throw new javax.media.opengl.GLException(e);
....@@ -2425,13 +2533,34 @@
24252533 if (bump)
24262534 texturedata = ConvertBump(texturedata, false);
24272535
2428
- com.sun.opengl.util.texture.Texture texture =
2429
- 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);
24302538
2431
- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432
- 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);
24332541
2434
- 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;
24352564 }
24362565
24372566 boolean HUESMOOTH = true; // wrap around bug... true;
....@@ -3461,6 +3590,8 @@
34613590 };
34623591 /**/
34633592
3593
+ static Object3D lastObject;
3594
+
34643595 //com.sun.opengl.util.texture.Texture
34653596 TextureData
34663597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3497,6 +3628,8 @@
34973628 // return null;
34983629 //if (i == 2)
34993630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
35003633 e.printStackTrace();
35013634 name = name.split("\\.tif")[0] + ".jpg";
35023635 }
....@@ -3504,6 +3637,8 @@
35043637
35053638 System.out.println("LOADING TEXTURE : " + name);
35063639
3640
+ Object x = texturedata.getMipmapData(); // .getBuffer();
3641
+
35073642 //
35083643 if (false) // compressbit > 0)
35093644 {
....@@ -6827,30 +6962,30 @@
68276962 short residu = 0;
68286963
68296964 // wraparound workarounds
6830
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
68316966 /*
6832
- residu += (fuck%2);
6833
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
68346969 {
6835
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
68366971 if(residu == 2)
68376972 residu = 0;
68386973 }
68396974 else
68406975 {
68416976 residu = 0;
6842
- fuck /= 2;
6977
+ ww /= 2;
68436978 }
68446979 */
6845
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
68466981 {
6847
- fuck /= 2;
6982
+ ww /= 2;
68486983 } else
68496984 {
6850
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
68516986 }
68526987
6853
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
68546989 }
68556990 //System.out.print(bytes[i] + " ");
68566991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -7902,7 +8037,7 @@
79028037 String pigment = Object3D.GetPigment(tex);
79038038 String bump = Object3D.GetBump(tex);
79048039
7905
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8040
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79068041 {
79078042 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79088043 // System.out.println("; bump = " + bump);
....@@ -7917,8 +8052,8 @@
79178052 pigment = null;
79188053 }
79198054
7920
- ReleaseTexture(bump, true);
7921
- ReleaseTexture(pigment, false);
8055
+ ReleaseTexture(tex, true);
8056
+ ReleaseTexture(tex, false);
79228057 }
79238058
79248059 public void ReleasePigmentTexture(cTexture tex) // INTERFACE
....@@ -7936,7 +8071,7 @@
79368071
79378072 String pigment = Object3D.GetPigment(tex);
79388073
7939
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8074
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79408075 {
79418076 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79428077 // System.out.println("; bump = " + bump);
....@@ -7947,7 +8082,7 @@
79478082 pigment = null;
79488083 }
79498084
7950
- ReleaseTexture(pigment, false);
8085
+ ReleaseTexture(tex, false);
79518086 }
79528087
79538088 public void ReleaseBumpTexture(cTexture tex) // INTERFACE
....@@ -7965,7 +8100,7 @@
79658100
79668101 String bump = Object3D.GetBump(tex);
79678102
7968
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8103
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79698104 {
79708105 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79718106 // System.out.println("; bump = " + bump);
....@@ -7976,10 +8111,10 @@
79768111 bump = null;
79778112 }
79788113
7979
- ReleaseTexture(bump, true);
8114
+ ReleaseTexture(tex, true);
79808115 }
79818116
7982
- void ReleaseTexture(String tex, boolean bump)
8117
+ void ReleaseTexture(cTexture tex, boolean bump)
79838118 {
79848119 if (// DrawMode() != 0 || /*tex == null ||*/
79858120 ambientOcclusion ) // || !textureon)
....@@ -7990,7 +8125,7 @@
79908125 CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
79918126
79928127 if (tex != null)
7993
- texture = textures.get(tex);
8128
+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
79948129
79958130 // //assert( texture != null );
79968131 // if (texture == null)
....@@ -8084,47 +8219,50 @@
80848219
80858220 /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80868221 {
8087
- if (// DrawMode() != 0 || /*tex == null ||*/
8088
- ambientOcclusion ) // || !textureon)
8089
- {
8090
- return; // false;
8091
- }
8092
-
8093
- if (tex == null)
8094
- {
8095
- BindTexture(null,false,resolution);
8096
- BindTexture(null,true,resolution);
8097
- return;
8098
- }
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;
80998263
8100
- String pigment = Object3D.GetPigment(tex);
8101
- String bump = Object3D.GetBump(tex);
8102
-
8103
- usedtextures.put(pigment, pigment);
8104
- usedtextures.put(bump, bump);
8105
-
8106
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8107
- {
8108
- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8109
- // System.out.println("; bump = " + bump);
8110
- }
8111
-
8112
- if (bump.equals(""))
8113
- {
8114
- bump = null;
8115
- }
8116
- if (pigment.equals(""))
8117
- {
8118
- pigment = null;
8119
- }
8120
-
8121
- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8122
- BindTexture(pigment, false, resolution);
8123
- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8124
- BindTexture(bump, true, resolution);
8125
- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8126
-
8127
- return; // true;
8264
+ BindPigmentTexture(tex, resolution);
8265
+ BindBumpTexture(tex, resolution);
81288266 }
81298267
81308268 /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
....@@ -8143,9 +8281,9 @@
81438281
81448282 String pigment = Object3D.GetPigment(tex);
81458283
8146
- usedtextures.put(pigment, pigment);
8284
+ usedtextures.add(tex);
81478285
8148
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8286
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
81498287 {
81508288 // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
81518289 // System.out.println("; bump = " + bump);
....@@ -8157,7 +8295,7 @@
81578295 }
81588296
81598297 GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160
- BindTexture(pigment, false, resolution);
8298
+ BindTexture(tex, false, resolution);
81618299 }
81628300
81638301 /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
....@@ -8176,9 +8314,9 @@
81768314
81778315 String bump = Object3D.GetBump(tex);
81788316
8179
- usedtextures.put(bump, bump);
8317
+ usedtextures.add(tex);
81808318
8181
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8319
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
81828320 {
81838321 // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
81848322 // System.out.println("; bump = " + bump);
....@@ -8190,7 +8328,7 @@
81908328 }
81918329
81928330 GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193
- BindTexture(bump, true, resolution);
8331
+ BindTexture(tex, true, resolution);
81948332 GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
81958333 }
81968334
....@@ -8214,13 +8352,19 @@
82148352 return fileExists;
82158353 }
82168354
8217
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8355
+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
82188356 {
8219
- CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
8357
+ CacheTexture texturecache = null;
82208358
82218359 if (tex != null)
82228360 {
8223
- String texname = tex;
8361
+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
8362
+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8363
+
8364
+ if (texname.equals("") && texdata == null)
8365
+ {
8366
+ return null;
8367
+ }
82248368
82258369 String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
82268370
....@@ -8230,19 +8374,46 @@
82308374 // else
82318375 // if (!texname.startsWith("/"))
82328376 // texname = "/Users/nbriere/Textures/" + texname;
8233
- if (!FileExists(tex))
8377
+ if (!FileExists(texname) && !texname.startsWith("@"))
82348378 {
82358379 texname = fallbackTextureName;
82368380 }
82378381
82388382 if (CACHETEXTURE)
8239
- texture = textures.get(texname); // TEXTURE CACHE
8240
-
8241
- TextureData texturedata = null;
8242
-
8243
- if (texture == null || texture.resolution < resolution)
82448383 {
8245
- 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(""))
82468417 {
82478418 assert(!bump);
82488419 // if (bump)
....@@ -8253,19 +8424,23 @@
82538424 // }
82548425 // else
82558426 // {
8256
- texture = textures.get(tex);
8257
- if (texture == null)
8427
+ // texturecache = textures.get(texname); // suspicious
8428
+ if (texturecache == null)
82588429 {
8259
- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8430
+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
82608431 }
8432
+ else
8433
+ new Exception().printStackTrace();
82618434 // }
82628435 } else
8263
- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
8436
+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
82648437 {
82658438 assert(bump);
8266
- texture = textures.get(tex);
8267
- if (texture == null)
8268
- 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();
82698444 } else
82708445 {
82718446 //if (tex.equals("IMMORTAL"))
....@@ -8273,11 +8448,22 @@
82738448 // texture = GetResourceTexture("default.png");
82748449 //} else
82758450 //{
8276
- if (tex.equals("WHITE_NOISE"))
8451
+ if (texname.endsWith("WHITE_NOISE"))
82778452 {
8278
- texture = textures.get(tex);
8279
- if (texture == null)
8280
- 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();
82818467 } else
82828468 {
82838469 if (textureon)
....@@ -8336,19 +8522,20 @@
83368522 if (texturedata == null)
83378523 throw new Exception();
83388524
8339
- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8525
+ texturecache = new CacheTexture(texturedata,resolution);
83408526 //texture = GetTexture(tex, bump);
83418527 }
8528
+ }
83428529 }
83438530 //}
83448531 }
83458532
8346
- if (/*CACHETEXTURE &&*/ texture != null && textureon)
8533
+ if (texdata == null && /*CACHETEXTURE &&*/ texturecache != null && textureon)
83478534 {
83488535 //return false;
83498536
83508537 // System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351
- if (texturedata != null && (texname.endsWith(".jpg") || texname.endsWith(".JPG")))
8538
+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
83528539 {
83538540 // String ext = "_highres";
83548541 // if (REDUCETEXTURE)
....@@ -8365,52 +8552,17 @@
83658552 File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
83668553 if (!cachefile.exists())
83678554 {
8368
- // cache to disk
8369
- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8370
- //buffers[0].
8371
-
8372
- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8373
- int[] pixels = new int[bytebuf.capacity()/3];
8374
-
8375
- // squared size heuristic...
8376
- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
8555
+ //if (texturedata.getWidth() == texturedata.getHeight())
83778556 {
8378
- for (int i=pixels.length; --i>=0;)
8379
- {
8380
- int i3 = i*3;
8381
- pixels[i] = 0xFF;
8382
- pixels[i] <<= 8;
8383
- pixels[i] |= bytebuf.get(i3+2) & 0xFF;
8384
- pixels[i] <<= 8;
8385
- pixels[i] |= bytebuf.get(i3+1) & 0xFF;
8386
- pixels[i] <<= 8;
8387
- pixels[i] |= bytebuf.get(i3) & 0xFF;
8388
- }
8389
-
8390
- /*
8391
- int r=0,g=0,b=0,a=0;
8392
- for (int i=0; i<width; i++)
8393
- for (int j=0; j<height; j++)
8394
- {
8395
- int index = j*width+i;
8396
- int p = pixels[index];
8397
- a = ((p>>24) & 0xFF);
8398
- r = ((p>>16) & 0xFF);
8399
- g = ((p>>8) & 0xFF);
8400
- b = (p & 0xFF);
8401
- pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
8402
- }
8403
- /**/
8404
- int width = (int)Math.sqrt(pixels.length); // squared
8405
- int height = width;
8406
- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8407
- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
8557
+ BufferedImage rendImage = CreateBim(texturedata);
8558
+
84088559 ImageWriter writer = null;
84098560 Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
84108561 if (iter.hasNext()) {
84118562 writer = (ImageWriter)iter.next();
84128563 }
8413
- float compressionQuality = 0.9f;
8564
+
8565
+ float compressionQuality = 0.85f;
84148566 try
84158567 {
84168568 ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
....@@ -8427,18 +8579,20 @@
84278579 }
84288580 }
84298581 }
8430
-
8582
+
8583
+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
8584
+
84318585 //System.out.println("Texture = " + tex);
8432
- if (textures.containsKey(texname))
8586
+ if (textures.containsKey(tex))
84338587 {
8434
- CacheTexture thetex = textures.get(texname);
8588
+ CacheTexture thetex = textures.get(tex);
84358589 thetex.texture.disable();
84368590 thetex.texture.dispose();
8437
- textures.remove(texname);
8591
+ textures.remove(tex);
84388592 }
84398593
8440
- texture.texturedata = texturedata;
8441
- textures.put(texname, texture);
8594
+ //texture.texturedata = texturedata;
8595
+ textures.put(tex, texturecache);
84428596
84438597 // newtex = true;
84448598 }
....@@ -8454,10 +8608,46 @@
84548608 }
84558609 }
84568610
8457
- return texture;
8611
+ return texturecache;
84588612 }
84598613
8460
- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
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
84618651 {
84628652 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
84638653
....@@ -8475,21 +8665,21 @@
84758665 return texture!=null?texture.texture:null;
84768666 }
84778667
8478
- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8668
+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
84798669 {
84808670 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
84818671
84828672 return texture!=null?texture.texturedata:null;
84838673 }
84848674
8485
- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8675
+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
84868676 {
84878677 if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
84888678 {
84898679 return false;
84908680 }
84918681
8492
- boolean newtex = false;
8682
+ //boolean newtex = false;
84938683
84948684 com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
84958685
....@@ -8521,9 +8711,75 @@
85218711 texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
85228712 texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
85238713
8524
- return newtex;
8714
+ return true; // Warning: not used.
85258715 }
85268716
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
+
85278783 ShadowBuffer shadowPBuf;
85288784 AntialiasBuffer antialiasPBuf;
85298785 int MAXSTACK;
....@@ -8540,10 +8796,12 @@
85408796
85418797 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
85428798 MAXSTACK = temp[0];
8543
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
85448801 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
85458802 MAXSTACK = temp[0];
8546
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8803
+ if (Globals.DEBUG)
8804
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
85478805
85488806 // Use debug pipeline
85498807 //drawable.setGL(new DebugGL(gl)); //
....@@ -8551,7 +8809,8 @@
85518809 gl = drawable.getGL(); //
85528810
85538811 GL gl3 = getGL();
8554
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8812
+ if (Globals.DEBUG)
8813
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
85558814
85568815
85578816 //float pos[] = { 100, 100, 100, 0 };
....@@ -8716,7 +8975,7 @@
87168975
87178976 if (cubemap == null)
87188977 {
8719
- LoadEnvy(5);
8978
+ //LoadEnvy(1);
87208979 }
87218980
87228981 //cubemap.enable();
....@@ -8992,6 +9251,8 @@
89929251
89939252 void LoadEnvy(int which)
89949253 {
9254
+ assert(false);
9255
+
89959256 String name;
89969257 String ext;
89979258
....@@ -9003,37 +9264,58 @@
90039264 cubemap = null;
90049265 return;
90059266 case 1:
9006
- name = "cubemaps/box_";
9007
- ext = "png";
9267
+ name = "cubemaps/rgb/";
9268
+ ext = "jpg";
90089269 reverseUP = false;
90099270 break;
90109271 case 2:
9011
- name = "cubemaps/uffizi_";
9012
- ext = "png";
9013
- break; // reverseUP = true; break;
9272
+ name = "cubemaps/uffizi/";
9273
+ ext = "jpg";
9274
+ reverseUP = false;
9275
+ break;
90149276 case 3:
9015
- name = "cubemaps/CloudyHills_";
9016
- ext = "tga";
9277
+ name = "cubemaps/CloudyHills/";
9278
+ ext = "jpg";
90179279 reverseUP = false;
90189280 break;
90199281 case 4:
9020
- name = "cubemaps/cornell_";
9282
+ name = "cubemaps/cornell/";
90219283 ext = "png";
90229284 reverseUP = false;
90239285 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;
90249311 default:
9025
- name = "cubemaps/rgb_";
9026
- ext = "png"; /*mipmap = true;*/ reverseUP = false;
9312
+ name = "cubemaps/box/";
9313
+ ext = "png"; /*mipmap = true;*/
9314
+ reverseUP = false;
90279315 break;
90289316 }
9029
-
9030
- try
9031
- {
9032
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9033
- } catch (IOException e)
9034
- {
9035
- throw new RuntimeException(e);
9036
- }
9317
+
9318
+ LoadSkybox(name, ext, mipmap);
90379319 }
90389320
90399321 public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -9065,8 +9347,12 @@
90659347 static double[] model = new double[16];
90669348 double[] camera2light = new double[16];
90679349 double[] light2camera = new double[16];
9068
- int newenvy = -1;
9069
- boolean envyoff = true; // false;
9350
+
9351
+ //int newenvy = -1;
9352
+ //boolean envyoff = false;
9353
+
9354
+ String loadedskyboxname;
9355
+
90709356 cVector light0 = new cVector(0, 0, 0); // 1,3,2);
90719357 //float[] light0 = { 0,0,0 };
90729358 cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9359,11 +9645,35 @@
93599645 jy8[3] = 0.5f;
93609646 }
93619647
9362
- 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
93639649 float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
93649650 float[] options3 = new float[]{1, 1, 1, 0}; // fog color
93659651 float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
93669652
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
+
93679677 static int imagecount = 0; // movie generation
93689678
93699679 static int jitter = 0;
....@@ -9460,7 +9770,7 @@
94609770
94619771 if (renderCamera != lightCamera)
94629772 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9463
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9773
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
94649774
94659775 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
94669776
....@@ -9476,7 +9786,7 @@
94769786
94779787 if (renderCamera != lightCamera)
94789788 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9479
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9789
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
94809790
94819791 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
94829792
....@@ -9522,13 +9832,18 @@
95229832 rati = 1 / rati;
95239833 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
95249834 }
9525
- assert (newenvy == -1);
9835
+
9836
+ //assert (newenvy == -1);
9837
+
95269838 gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
95279839 gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9528
- DrawSkyBox(gl);
9840
+ DrawSkyBox(gl, (float)rati);
95299841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
95309842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9531
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
95329847 ratio,
95339848 //near_plane, far_plane,
95349849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10391,9 +10706,18 @@
1039110706 static boolean init = false;
1039210707
1039310708 double[][] matrix = LA.newMatrix();
10709
+
10710
+ // This is to refresh the UI of the material panel.
10711
+ ObjEditor patchMaterial;
1039410712
1039510713 public void display(GLAutoDrawable drawable)
1039610714 {
10715
+ if (patchMaterial.patchMaterial)
10716
+ {
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
1039710721 if (Grafreed.savesound && Grafreed.hassound)
1039810722 {
1039910723 Grafreed.wav.save();
....@@ -10474,6 +10798,7 @@
1047410798 ANTIALIAS = 0;
1047510799 //System.out.println("RESTART");
1047610800 AAtimer.restart();
10801
+ Globals.TIMERRUNNING = true;
1047710802 }
1047810803 }
1047910804 }
....@@ -10488,6 +10813,112 @@
1048810813
1048910814 if (DrawMode() == DEFAULT)
1049010815 {
10816
+ if (manipCamera == lightCamera)
10817
+ {
10818
+// switch (e.getKeyCode())
10819
+// {
10820
+// case DOWN_ARROW:
10821
+// lightCamera.DECAL /= 2;
10822
+// repaint();
10823
+// break;
10824
+// case UP_ARROW:
10825
+// lightCamera.DECAL *= 2;
10826
+// repaint();
10827
+// break;
10828
+// case LEFT_ARROW:
10829
+// lightCamera.SCALE /= 2;
10830
+// repaint();
10831
+// break;
10832
+// case RIGHT_ARROW:
10833
+// lightCamera.SCALE *= 2;
10834
+// repaint();
10835
+// break;
10836
+// default:
10837
+// break;
10838
+ if (keys[DOWN_ARROW])
10839
+ {
10840
+ lightCamera.DECAL /= 2;
10841
+ }
10842
+
10843
+ if (keys[UP_ARROW])
10844
+ {
10845
+ lightCamera.DECAL *= 2;
10846
+ }
10847
+
10848
+ if (keys[LEFT_ARROW])
10849
+ {
10850
+ lightCamera.SCALE /= 2;
10851
+ }
10852
+
10853
+ if (keys[RIGHT_ARROW])
10854
+ {
10855
+ lightCamera.SCALE *= 2;
10856
+ }
10857
+ }
10858
+ else
10859
+ {
10860
+ //pingthread.mute = true;
10861
+
10862
+ boolean keyon = false;
10863
+
10864
+ if (keys[DOWN_ARROW])
10865
+ {
10866
+ speed = ++speedkey[DOWN_ARROW];
10867
+ if (speed > 20)
10868
+ speed = 20;
10869
+ GoDown(modifiers);
10870
+ keyon = true;
10871
+ }
10872
+ else
10873
+ speedkey[DOWN_ARROW] = 0;
10874
+
10875
+ if (keys[UP_ARROW])
10876
+ {
10877
+ speed = ++speedkey[UP_ARROW];
10878
+ if (speed > 20)
10879
+ speed = 20;
10880
+ GoUp(modifiers);
10881
+ keyon = true;
10882
+ }
10883
+ else
10884
+ speedkey[UP_ARROW] = 0;
10885
+
10886
+ if (keys[LEFT_ARROW])
10887
+ {
10888
+ speed = ++speedkey[LEFT_ARROW];
10889
+ if (speed > 20)
10890
+ speed = 20;
10891
+ GoLeft(modifiers);
10892
+ keyon = true;
10893
+ }
10894
+ else
10895
+ speedkey[LEFT_ARROW] = 0;
10896
+
10897
+ if (keys[RIGHT_ARROW])
10898
+ {
10899
+ speed = ++speedkey[RIGHT_ARROW];
10900
+ if (speed > 20)
10901
+ speed = 20;
10902
+ GoRight(modifiers);
10903
+ keyon = true;
10904
+ }
10905
+ else
10906
+ speedkey[RIGHT_ARROW] = 0;
10907
+
10908
+ if (Globals.WALK && capsLocked)
10909
+ {
10910
+ Walk();
10911
+ keyon = true;
10912
+ }
10913
+
10914
+ if (keyon)
10915
+ {
10916
+ repaint();
10917
+ }
10918
+
10919
+ //pingthread.mute = false;
10920
+ }
10921
+
1049110922 currentlydrawing = true;
1049210923 }
1049310924
....@@ -10541,7 +10972,8 @@
1054110972 ambientOcclusion = false;
1054210973 }
1054310974
10544
- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10975
+ if (//Globals.lighttouched &&
10976
+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1054510977 {
1054610978 //if (RENDERSHADOW) // ?
1054710979 if (!IsFrozen())
....@@ -10560,7 +10992,7 @@
1056010992
1056110993 if (wait)
1056210994 {
10563
- Sleep(500);
10995
+ Sleep(200); // blocks everything
1056410996
1056510997 wait = false;
1056610998 }
....@@ -10675,7 +11107,7 @@
1067511107 // if (parentcam != renderCamera) // not a light
1067611108 if (cam != lightCamera)
1067711109 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10678
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11110
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1067911111
1068011112 for (int j = 0; j < 4; j++)
1068111113 {
....@@ -10690,7 +11122,7 @@
1069011122 // if (parentcam != renderCamera) // not a light
1069111123 if (cam != lightCamera)
1069211124 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10693
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11125
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1069411126
1069511127 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1069611128
....@@ -10776,13 +11208,43 @@
1077611208 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1077711209 }
1077811210
10779
- if (newenvy > -1)
11211
+// if (newenvy > -1)
11212
+// {
11213
+// LoadEnvy(newenvy);
11214
+// }
11215
+//
11216
+// newenvy = -1;
11217
+
11218
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1078011219 {
10781
- LoadEnvy(newenvy);
11220
+ if (cubemaprgb == null)
11221
+ {
11222
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11223
+ }
11224
+
11225
+ cubemap = cubemaprgb;
1078211226 }
10783
-
10784
- newenvy = -1;
10785
-
11227
+ else
11228
+ {
11229
+ if (object.skyboxname != null)
11230
+ {
11231
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11232
+ {
11233
+ if (cubemap != null && cubemap != cubemaprgb)
11234
+ cubemap.dispose();
11235
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11236
+ loadedskyboxname = object.skyboxname;
11237
+ }
11238
+ }
11239
+ else
11240
+ {
11241
+ cubemapcustom = null;
11242
+ loadedskyboxname = null;
11243
+ }
11244
+
11245
+ cubemap = cubemapcustom;
11246
+ }
11247
+
1078611248 ratio = ((double) getWidth()) / getHeight();
1078711249 //System.out.println("ratio = " + ratio);
1078811250
....@@ -10798,7 +11260,7 @@
1079811260
1079911261 if (!IsFrozen() && !ambientOcclusion)
1080011262 {
10801
- DrawSkyBox(gl);
11263
+ DrawSkyBox(gl, (float)ratio);
1080211264 }
1080311265
1080411266 //if (selection_view == -1)
....@@ -10981,8 +11443,8 @@
1098111443
1098211444 gl.glMatrixMode(GL.GL_MODELVIEW);
1098311445
10984
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1098511446 //gl.glEnable(gl.GL_POLYGON_SMOOTH);
11447
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1098611448 //gl.glEnable(gl.GL_MULTISAMPLE);
1098711449 } else
1098811450 {
....@@ -10994,7 +11456,7 @@
1099411456 //System.out.println("BLENDING ON");
1099511457 gl.glEnable(GL.GL_BLEND);
1099611458 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997
-
11459
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1099811460 gl.glMatrixMode(gl.GL_PROJECTION);
1099911461 gl.glLoadIdentity();
1100011462
....@@ -11044,7 +11506,10 @@
1104411506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1104511507 } else
1104611508 {
11047
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11509
+ boolean vr = capsLocked && !lightMode;
11510
+
11511
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11512
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1104811513 }
1104911514 }
1105011515
....@@ -11084,7 +11549,7 @@
1108411549
1108511550 // if (cam != lightCamera)
1108611551 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11087
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11552
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1108811553 }
1108911554
1109011555 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11243,7 +11708,7 @@
1124311708 }
1124411709 }
1124511710
11246
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11711
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1124711712 {
1124811713 //gl.glDepthFunc(GL.GL_LEQUAL);
1124911714 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11251,24 +11716,21 @@
1125111716
1125211717 boolean texon = textureon;
1125311718
11254
- if (RENDERPROGRAM > 0)
11255
- {
11256
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11257
- textureon = false;
11258
- }
11719
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11720
+ textureon = false;
11721
+
1125911722 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1126011723 //System.out.println("ALLO");
1126111724 gl.glColorMask(false, false, false, false);
1126211725 DrawObject(gl);
11263
- if (RENDERPROGRAM > 0)
11264
- {
11265
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11266
- textureon = texon;
11267
- }
11726
+
11727
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11728
+ textureon = texon;
11729
+
1126811730 gl.glColorMask(true, true, true, true);
1126911731
1127011732 gl.glDepthFunc(GL.GL_EQUAL);
11271
- //gl.glDepthMask(false);
11733
+ gl.glDepthMask(false);
1127211734 }
1127311735
1127411736 if (false) // DrawMode() == SHADOW)
....@@ -11403,8 +11865,11 @@
1140311865 repaint();
1140411866 }
1140511867
11406
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1140711871 repaint();
11872
+ }
1140811873
1140911874 displaydone = true;
1141011875 }
....@@ -11451,16 +11916,51 @@
1145111916
1145211917 static boolean zoomonce = false;
1145311918
11919
+ static void CreateSelectedPoint()
11920
+ {
11921
+ if (selectedpoint == null)
11922
+ {
11923
+ debugpointG = new Sphere();
11924
+ debugpointP = new Sphere();
11925
+ debugpointC = new Sphere();
11926
+ debugpointR = new Sphere();
11927
+
11928
+ selectedpoint = new Superellipsoid();
11929
+
11930
+ for (int i=0; i<8; i++)
11931
+ {
11932
+ debugpoints[i] = new Sphere();
11933
+ }
11934
+ }
11935
+ }
11936
+
1145411937 void DrawObject(GL gl, boolean draw)
1145511938 {
11939
+ // To clear camera values
11940
+ ResetOptions();
11941
+
1145611942 //System.out.println("DRAW OBJECT " + mouseDown);
1145711943 // DrawMode() = SELECTION;
1145811944 //GL gl = getGL();
1145911945 if ((TRACK || SHADOWTRACK) || zoomonce)
1146011946 {
11947
+ if (TRACK)
11948
+ {
11949
+ if (object.selection != null &&
11950
+ object.selection.size() > 0 &&
11951
+ object.selection.elementAt(0) != null &&
11952
+ !(object.selection.elementAt(0) instanceof Camera) &&
11953
+ !(object.selection.elementAt(0) instanceof ScriptNode))
11954
+ {
11955
+ trackedobject = object.selection.elementAt(0);
11956
+ //repaint();
11957
+ }
11958
+ else
11959
+ trackedobject = null;
11960
+ }
1146111961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463
- pingthread.StepToTarget(true); // true);
11962
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11963
+ pingthread.StepToTarget(); // true);
1146411964 // zoomonce = false;
1146511965 }
1146611966
....@@ -11531,8 +12031,9 @@
1153112031
1153212032 if (DrawMode() == DEFAULT)
1153312033 {
11534
- if (DEBUG)
12034
+ if (Globals.DEBUG)
1153512035 {
12036
+ CreateSelectedPoint();
1153612037 float radius = 0.05f;
1153712038 if (selectedpoint.radius != radius)
1153812039 {
....@@ -11586,20 +12087,32 @@
1158612087 ReleaseTextures(DEFAULT_TEXTURES);
1158712088
1158812089 if (CLEANCACHE)
11589
- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
12090
+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
1159012091 {
11591
- String tex = e.nextElement();
12092
+ cTexture tex = e.nextElement();
1159212093
1159312094 // System.out.println("Texture --------- " + tex);
1159412095
11595
- if (tex.equals("WHITE_NOISE"))
12096
+ if (tex.equals("WHITE_NOISE:"))
1159612097 continue;
1159712098
11598
- if (!usedtextures.containsKey(tex))
12099
+ if (!usedtextures.contains(tex))
1159912100 {
12101
+ CacheTexture gettex = texturepigment.get(tex);
1160012102 // System.out.println("DISPOSE +++++++++++++++ " + tex);
11601
- textures.get(tex).texture.dispose();
11602
- textures.remove(tex);
12103
+ if (gettex != null)
12104
+ {
12105
+ gettex.texture.dispose();
12106
+ texturepigment.remove(tex);
12107
+ }
12108
+
12109
+ gettex = texturebump.get(tex);
12110
+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
12111
+ if (gettex != null)
12112
+ {
12113
+ gettex.texture.dispose();
12114
+ texturebump.remove(tex);
12115
+ }
1160312116 }
1160412117 }
1160512118 }
....@@ -12019,7 +12532,7 @@
1201912532 for (int i = tp.size(); --i >= 0;)
1202012533 {
1202112534 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022
- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12535
+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1202312536 }
1202412537
1202512538
....@@ -12127,8 +12640,82 @@
1212712640
1212812641 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1212912642
12130
- String program =
12643
+ String programmin =
12644
+ // Min shader
1213112645 "!!ARBfp1.0\n" +
12646
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
12647
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
12648
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12649
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12650
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12651
+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
12652
+ "PARAM light2cam0 = program.env[10];" +
12653
+ "PARAM light2cam1 = program.env[11];" +
12654
+ "PARAM light2cam2 = program.env[12];" +
12655
+ "TEMP temp;" +
12656
+ "TEMP light;" +
12657
+ "TEMP ndotl;" +
12658
+ "TEMP normal;" +
12659
+ "TEMP depth;" +
12660
+ "TEMP eye;" +
12661
+ "TEMP pos;" +
12662
+
12663
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12664
+ Normalize("normal") +
12665
+ "MOV light, state.light[0].position;" +
12666
+ "DP3 ndotl.x, light, normal;" +
12667
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12668
+
12669
+ // shadow
12670
+ "MOV pos, fragment.texcoord[1];" +
12671
+ "MOV temp, pos;" +
12672
+ ShadowTextureFetch("depth", "temp", "1") +
12673
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12674
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12675
+
12676
+ // No shadow when out of frustum
12677
+ //"SGE temp.y, depth.z, zero123.y;" +
12678
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12679
+
12680
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12681
+
12682
+ // Backlit
12683
+ "MOV pos.w, zero12t.y;" + // one
12684
+ "DP4 eye.x, pos, light2cam0;" +
12685
+ "DP4 eye.y, pos, light2cam1;" +
12686
+ "DP4 eye.z, pos, light2cam2;" +
12687
+ Normalize("eye") +
12688
+
12689
+ "DP3 ndotl.y, -eye, normal;" +
12690
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
12691
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12692
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12693
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12694
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
12695
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
12696
+ "ADD ndotl.y, ndotl.y, one.x;" +
12697
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12698
+
12699
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12700
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12701
+
12702
+ // Pigment
12703
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12704
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12705
+ "MUL temp, temp, zero12t.w;" + // Times x
12706
+
12707
+ //"MUL temp, temp, ndotl.y;" +
12708
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12709
+
12710
+ "MUL temp, temp, ndotl.x;" + // lambert
12711
+
12712
+ "MOV temp.w, zero12t.y;" + // reset alpha
12713
+ "MOV result.color, temp;" +
12714
+ "END";
12715
+
12716
+ String programmax =
12717
+ "!!ARBfp1.0\n" +
12718
+
1213212719 //"OPTION ARB_fragment_program_shadow;" +
1213312720 "PARAM light2cam0 = program.env[10];" +
1213412721 "PARAM light2cam1 = program.env[11];" +
....@@ -12154,7 +12741,7 @@
1215412741 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1215512742 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1215612743 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12157
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12744
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1215812745 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1215912746 "PARAM options1 = program.env[62];" + // fog rgb color
1216012747 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12243,8 +12830,7 @@
1224312830 "TEMP shininess;" +
1224412831 "\n" +
1224512832 "MOV texSamp, one;" +
12246
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12247
-
12833
+
1224812834 "MOV mapgrid.x, one2048th.x;" +
1224912835 "MOV temp, fragment.texcoord[1];" +
1225012836 /*
....@@ -12265,20 +12851,20 @@
1226512851 "MUL temp, floor, mapgrid.x;" +
1226612852 //"TEX depth0, temp, texture[1], 2D;" +
1226712853 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12268
- TextureFetch("depth0", "temp", "1") +
12854
+ ShadowTextureFetch("depth0", "temp", "1") +
1226912855 "") +
1227012856 "ADD temp.x, temp.x, mapgrid.x;" +
1227112857 //"TEX depth1, temp, texture[1], 2D;" +
1227212858 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12273
- TextureFetch("depth1", "temp", "1") +
12859
+ ShadowTextureFetch("depth1", "temp", "1") +
1227412860 "") +
1227512861 "ADD temp.y, temp.y, mapgrid.x;" +
1227612862 //"TEX depth2, temp, texture[1], 2D;" +
12277
- TextureFetch("depth2", "temp", "1") +
12863
+ ShadowTextureFetch("depth2", "temp", "1") +
1227812864 "SUB temp.x, temp.x, mapgrid.x;" +
1227912865 //"TEX depth3, temp, texture[1], 2D;" +
1228012866 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12281
- TextureFetch("depth3", "temp", "1") +
12867
+ ShadowTextureFetch("depth3", "temp", "1") +
1228212868 "") +
1228312869 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1228412870 //"MOV params, material;" +
....@@ -12400,7 +12986,7 @@
1240012986 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1240112987 // mar 2013 ??? "KIL alpha.a;" +
1240212988 "MOV alpha, texSamp.aaaa;" + // y;" +
12403
- "KIL alpha.a;" +
12989
+ "KIL alpha.a;" + // not sure with parallax mapping
1240412990 /*
1240512991 "MUL temp.xy, temp, two;" +
1240612992 "TXB bump, temp, texture[0], 2D;" +
....@@ -12486,11 +13072,6 @@
1248613072 "SUB bump0, bump0, half;" +
1248713073 "ADD bump, bump, bump0;" +
1248813074
12489
- "MOV temp.x, texSamp.a;" +
12490
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12491
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12492
- "MOV texSamp.a, temp.x;" +
12493
-
1249413075 // double-sided
1249513076 /**/
1249613077 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12500,26 +13081,73 @@
1250013081 "ADD temp.x, temp.x, one.x;" +
1250113082 "MUL normal, normal, temp.xxxx;":""
1250213083 ) +
12503
- /**/
12504
-//// Normalize("normal") +
12505
-//// "MAX normal.z, eps.x, normal.z;" +
12506
-// Normalize("normal") +
12507
- "MOV normald, normal;" +
12508
- "MOV normals, normal;" +
13084
+ /**/
13085
+
13086
+ "MOV temp, fragment.texcoord[4];" +
1250913087
1251013088 // UV base
1251113089 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1251213090 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1251313091 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12514
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12515
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12516
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
13092
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
13093
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
13094
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
13095
+ Normalize("UP") +
13096
+
1251713097 "XPD V, normal, UP;" +
1251813098 Normalize("V") +
1251913099 "XPD U, V, normal;" +
1252013100 Normalize("U") +
1252113101
13102
+ "MOV temp, fragment.texcoord[0];" +
13103
+
13104
+// "MAD normal, -temp.x, U, normal;" +
13105
+// "MAD normal, -temp.y, V, normal;" +
13106
+// Normalize("normal") +
13107
+
13108
+//// "MAX normal.z, eps.x, normal.z;" +
13109
+// Normalize("normal") +
13110
+ "MOV normald, normal;" +
13111
+ "MOV normals, normal;" +
13112
+
1252213113 // parallax mapping
13114
+
13115
+ "DP3 temp2.x, V, eye;" +
13116
+ "DP3 temp2.y, U, eye;" +
13117
+ "DP3 temp2.z, normal, eye;" +
13118
+ "RCP temp2.z, temp2.z;" +
13119
+
13120
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
13121
+ "RSQ temp2.w, temp2.w;" +
13122
+ "RCP temp2.w, temp2.w;" +
13123
+
13124
+ "SUB temp2.w, temp2.w, half;" +
13125
+ // "SGE temp.x, temp2.w, eps.x;" +
13126
+ // "MUL temp2.w, temp2.w, temp.x;" +
13127
+
13128
+ // "MOV texSamp, U;" +
13129
+
13130
+ "MUL temp2.z, temp2.z, temp2.w;" +
13131
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
13132
+
13133
+ "MUL temp2, temp2, temp2.z;" +
13134
+
13135
+ "SUB temp, temp, temp2;" +
13136
+
13137
+ "TEX temp, temp, texture[0], 2D;" +
13138
+ "POW temp.a, temp.a, params6.w;" + // punch through
13139
+
13140
+ "ADD texSamp, temp, texSamp;" +
13141
+ "MUL texSamp.xyz, half, texSamp;" +
13142
+
13143
+ "MOV alpha, texSamp.aaaa;" +
13144
+
13145
+// parallax mapping
13146
+
13147
+ "MOV temp.x, texSamp.a;" +
13148
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13149
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
13150
+ "MOV texSamp.a, temp.x;" +
1252313151
1252413152 //"MOV temp, fragment.texcoord[0];" +
1252513153 //
....@@ -12649,10 +13277,10 @@
1264913277 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1265013278 "") +
1265113279
12652
- // display shadow only (bump == 0)
13280
+ // display shadow only (fakedepth == 0)
1265313281 "SUB temp.x, half.x, shadow.x;" +
1265413282 "MOV temp.y, -params5.z;" + // params6.x;" +
12655
- "SLT temp.z, temp.y, -one2048th.x;" +
13283
+ "SLT temp.z, temp.y, -c256i.x;" +
1265613284 "SUB temp.y, one.x, temp.z;" +
1265713285 "MUL temp.x, temp.x, temp.y;" +
1265813286 "KIL temp.x;" +
....@@ -12983,8 +13611,19 @@
1298313611 //once = true;
1298413612 }
1298513613
12986
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12987
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13614
+ String program = programmax;
13615
+
13616
+ if (Globals.MINSHADER)
13617
+ {
13618
+ program = programmin;
13619
+ }
13620
+
13621
+ if (Globals.DEBUG)
13622
+ {
13623
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13624
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13625
+ }
13626
+
1298813627 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1298913628
1299013629 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13031,7 +13670,8 @@
1303113670 "\n" +
1303213671 "END\n";
1303313672
13034
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13673
+ if (Globals.DEBUG)
13674
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1303513675 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1303613676
1303713677 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13076,25 +13716,26 @@
1307613716 return out;
1307713717 }
1307813718
13079
- String TextureFetch(String dest, String src, String unit)
13719
+ // Also does frustum culling
13720
+ String ShadowTextureFetch(String dest, String src, String unit)
1308013721 {
1308113722 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1308213723 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1308313724 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13725
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13726
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1308413727 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13085
- "SLT " + src + ".z, " + src + ".x, one.x;" +
13086
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13087
- "SLT " + src + ".z, " + src + ".y, one.x;" +
13088
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13728
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13729
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1308913730 //"SWZ buffer, temp, w,w,w,w;";
13090
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13731
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1309113732 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1309213733 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1309313734 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13094
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13735
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1309513736
13096
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13097
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13737
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13738
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1309813739 }
1309913740
1310013741 String Shadow(String depth, String shadow)
....@@ -13141,7 +13782,7 @@
1314113782 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1314213783 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1314313784
13144
- // No shadow when out of frustrum
13785
+ // No shadow when out of frustum
1314513786 "SGE temp.x, " + depth + ".z, one.z;" +
1314613787 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1314713788 "";
....@@ -13288,8 +13929,9 @@
1328813929 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1328913930 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1329013931 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292
- Object3D.cVector2[] vector2buffer;
13932
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13933
+
13934
+ //Object3D.cVector2[] vector2buffer;
1329313935
1329413936 // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1329513937 // OUT : diff, spec
....@@ -13305,9 +13947,10 @@
1330513947 "DP3 " + dest + ".z," + "normals," + "eye;" +
1330613948 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1330713949 //"MOV " + dest + ".w," + "normal.z;" +
13308
- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13309
- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13310
- //"MOV " + dest + ".z," + "params2.w;" +
13950
+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13951
+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13952
+
13953
+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
1331113954 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1331213955 "RCP " + dest + ".w," + dest + ".w;" +
1331313956 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13453,7 +14096,7 @@
1345314096 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1345414097 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1345514098 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13456
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14099
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1345714100 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1345814101 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1345914102 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13514,7 +14157,7 @@
1351414157 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1351514158 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1351614159 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13517
- //"MOV result.texcoord, vertex.texcoord;" +
14160
+ //"MOV result.texcoord, vertex.fogcoord;" +
1351814161 "MOV result.texcoord, temp;" +
1351914162 // border fade
1352014163 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13561,7 +14204,9 @@
1356114204
1356214205 //"ADD temp.z, temp.z, one;" +
1356314206
13564
- "MOV result.color, temp;"
14207
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14208
+
14209
+ "MOV result.color, temp;" // Normal
1356514210 : "MOV result.color, vertex.color;") +
1356614211 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1356714212 : "") +
....@@ -13696,10 +14341,13 @@
1369614341 public void mouseClicked(MouseEvent e)
1369714342 {
1369814343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1369914345 }
1370014346
1370114347 public void mousePressed(MouseEvent e)
1370214348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1370314351 //System.out.println("mousePressed: " + e);
1370414352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1370514353 }
....@@ -13734,10 +14382,12 @@
1373414382 return;
1373514383 }
1373614384
13737
- 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;
1373814388
1373914389 // TIMER
13740
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1374114391 {
1374214392 keepboxmode = BOXMODE;
1374314393 keepsupport = SUPPORT;
....@@ -13778,7 +14428,7 @@
1377814428 //}
1377914429
1378014430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13781
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1378214432 anchorX = ax;
1378314433 anchorY = ay;
1378414434 prevX = px;
....@@ -13812,6 +14462,7 @@
1381214462 else
1381314463 if (evt.getSource() == AAtimer)
1381414464 {
14465
+ Globals.TIMERRUNNING = false;
1381514466 if (mouseDown)
1381614467 {
1381714468 //new Exception().printStackTrace();
....@@ -13871,9 +14522,10 @@
1387114522
1387214523 // fev 2014???
1387314524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875
- pingthread.StepToTarget(true); // true);
14525
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14526
+ pingthread.StepToTarget(); // true);
1387614527 }
14528
+
1387714529 // if (!LIVE)
1387814530 super.repaint();
1387914531 }
....@@ -13886,6 +14538,7 @@
1388614538 return;
1388714539
1388814540 AAtimer.restart(); //
14541
+ Globals.TIMERRUNNING = true;
1388914542
1389014543 // waslive = LIVE;
1389114544 // LIVE = false;
....@@ -13935,14 +14588,15 @@
1393514588 drag = false;
1393614589 //System.out.println("Mouse DOWN");
1393714590 editObj = false;
13938
- ClickInfo info = new ClickInfo();
13939
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13940
- info.pane = this;
13941
- info.camera = renderCamera;
13942
- info.x = x;
13943
- info.y = y;
13944
- info.modifiers = modifiersex;
13945
- 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);
1394614600 if (!editObj)
1394714601 {
1394814602 hasMarquee = true;
....@@ -13966,8 +14620,8 @@
1396614620
1396714621 //if (drawing)
1396814622 //return;
13969
- if ((e.getModifiersEx() & CTRL) != 0
13970
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1397114625 {
1397214626 //System.out.println("mouseDragged: " + e);
1397314627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -13991,9 +14645,17 @@
1399114645 return targetLookAt;
1399214646 }
1399314647
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
+
1399414653 class PingThread extends Thread
1399514654 {
1399614655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute;
1399714659
1399814660 // void JumpToTarget()
1399914661 // {
....@@ -14009,6 +14671,88 @@
1400914671 // only one thread!? synchronized
1401014672 void StepToTarget(boolean jump)
1401114673 {
14674
+ RigidBody.pos.x = 0;
14675
+ RigidBody.pos.y = 0;
14676
+ RigidBody.pos.z = 0;
14677
+ if (RigidBody.justclicked)
14678
+ {
14679
+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+ RigidBody.wind.set(RigidBody.pos);
14683
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14684
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14685
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14686
+ RigidBody.wind.normalize();
14687
+ }
14688
+
14689
+ if (mute)
14690
+ return;
14691
+
14692
+ if (capsLocked && manipCamera.viewCode == 0)
14693
+ {
14694
+ eye.x = manipCamera.location.x;
14695
+ eye.y = manipCamera.location.y + 0.25;
14696
+ eye.z = manipCamera.location.z;
14697
+
14698
+ dir.y = -1;
14699
+
14700
+ Ray ray = new Ray(eye, dir);
14701
+
14702
+ IntersectResult res = new IntersectResult();
14703
+ res.t = Double.POSITIVE_INFINITY;
14704
+
14705
+ tmp.set(targetLookAt);
14706
+ tmp.sub(manipCamera.location);
14707
+
14708
+ double dist = tmp.length();
14709
+
14710
+ tmp.normalize();
14711
+
14712
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
14713
+ eye2.y = manipCamera.location.y + 0.25;
14714
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
14715
+
14716
+ Ray ray2 = new Ray(eye2, dir);
14717
+
14718
+ IntersectResult res2 = new IntersectResult();
14719
+ res2.t = Double.POSITIVE_INFINITY;
14720
+
14721
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14722
+ {
14723
+ //tmp.set(manipCamera.location);
14724
+
14725
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14726
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14727
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14728
+
14729
+ //tmp.sub(manipCamera.location);
14730
+
14731
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14732
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14733
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14734
+
14735
+ targetLookAt.sub(manipCamera.location);
14736
+ targetLookAt.normalize();
14737
+ targetLookAt.mul(dist);
14738
+ targetLookAt.add(manipCamera.location);
14739
+
14740
+ //if (tmp.dot(tmp) > 0.000001)
14741
+ // System.out.println("INTERSECTION " + manipCamera.location);
14742
+
14743
+ manipCamera.lookAt.set(targetLookAt);
14744
+
14745
+ tmp.x = res.n.x;
14746
+ tmp.y = res.n.y;
14747
+ tmp.z = res.n.z;
14748
+ tmp.x += res2.n.x;
14749
+ tmp.y += res2.n.y;
14750
+ tmp.z += res2.n.z;
14751
+ tmp.normalize();
14752
+ manipCamera.UP.set(tmp);
14753
+ }
14754
+ }
14755
+
1401214756 tmp.set(targetLookAt);
1401314757 tmp.sub(manipCamera.lookAt); // june 2014
1401414758
....@@ -14046,7 +14790,7 @@
1404614790
1404714791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1404814792 {
14049
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1405014794 }
1405114795
1405214796 if (OEILONCE && OEIL)
....@@ -14081,7 +14825,10 @@
1408114825 if (tmp.dot(tmp) < 0.00001)
1408214826 {
1408314827 zoomonce = false;
14828
+ live = false;
1408414829 }
14830
+ else
14831
+ live = true;
1408514832
1408614833 tmp.mul(step > step2 ? step : step2);
1408714834 }
....@@ -14108,7 +14855,7 @@
1410814855 {
1410914856 if (LOOKAT)
1411014857 manipCamera.lookAt.add(tmp);
14111
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1411214859 manipCamera.location.add(tmp);
1411314860
1411414861 {
....@@ -14123,7 +14870,10 @@
1412314870 lightCamera.computeTransform();
1412414871 }
1412514872 }
14126
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1412714877 }
1412814878 // ?????? mouseDown = true;
1412914879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14216,49 +14966,107 @@
1421614966 }
1421714967 }
1421814968 }
14969
+
1421914970 PingThread pingthread = new PingThread();
14220
- int delta = 5;
14221
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1422214974 boolean autorepeat = false;
1422314975
14976
+ void Walk()
14977
+ {
14978
+ manipCamera.BackForth(0, walk, 1000);
14979
+
14980
+ targetLookAt.set(manipCamera.lookAt);
14981
+ }
14982
+
14983
+ void ViewAngle(float dy)
14984
+ {
14985
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14986
+
14987
+ if (manipCamera.shaper_fovy * factor > 1 &&
14988
+ manipCamera.shaper_fovy * factor < 150)
14989
+ {
14990
+ manipCamera.shaper_fovy *= factor;
14991
+ //System.out.println("fovy = " + shaper_fovy);
14992
+ }
14993
+ }
14994
+
1422414995 void GoDown(int mod)
1422514996 {
1422614997 MODIFIERS |= COMMAND;
14227
- /*
14998
+ boolean isVR = (mouseMode&VR)!=0;
14999
+ /**/
1422815000 if((mod&SHIFT) == SHIFT)
14229
- manipCamera.RotatePosition(0, -speed);
14230
- else
14231
- manipCamera.BackForth(0, -speed*delta, getWidth());
14232
- */
14233
- if ((mod & SHIFT) == SHIFT)
1423415001 {
14235
- mouseMode = mouseMode; // VR??
14236
- } else
14237
- {
14238
- mouseMode |= BACKFORTH;
15002
+// if (isVR)
15003
+// manipCamera.RotateInterest(0, speed);
15004
+// else
15005
+ if (isVR)
15006
+ ViewAngle(-speed*delta);
15007
+ else
15008
+ manipCamera.Translate(0, -speed*delta, getWidth());
1423915009 }
15010
+ else
15011
+ {
15012
+ if (isVR)
15013
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15014
+ else
15015
+ manipCamera.RotatePosition(0, -speed);
15016
+ }
15017
+
15018
+ /**/
15019
+// if ((mod & SHIFT) == SHIFT)
15020
+// {
15021
+// mouseMode = mouseMode; // VR??
15022
+// } else
15023
+// {
15024
+// mouseMode |= BACKFORTH;
15025
+// }
1424015026
15027
+ targetLookAt.set(manipCamera.lookAt);
15028
+
1424115029 //prevX = X = anchorX;
1424215030 prevY = Y = anchorY - (int) (renderCamera.Distance());
1424315031 }
1424415032
1424515033 void GoUp(int mod)
1424615034 {
15035
+ RigidBody.justclicked = true;
15036
+
1424715037 MODIFIERS |= COMMAND;
14248
- /*
15038
+ /**/
15039
+ boolean isVR = (mouseMode&VR)!=0;
15040
+
1424915041 if((mod&SHIFT) == SHIFT)
14250
- manipCamera.RotatePosition(0, speed);
14251
- else
14252
- manipCamera.BackForth(0, speed*delta, getWidth());
14253
- */
14254
- if ((mod & SHIFT) == SHIFT)
1425515042 {
14256
- mouseMode = mouseMode;
14257
- } else
14258
- {
14259
- mouseMode |= BACKFORTH;
15043
+// if (isVR)
15044
+// manipCamera.RotateInterest(0, -speed);
15045
+// else
15046
+ if (isVR)
15047
+ ViewAngle(speed*delta);
15048
+ else
15049
+ manipCamera.Translate(0, speed*delta, getWidth());
1426015050 }
15051
+ else
15052
+ {
15053
+ if (isVR)
15054
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15055
+ else
15056
+ manipCamera.RotatePosition(0, speed);
15057
+ }
15058
+
15059
+ /**/
15060
+// if ((mod & SHIFT) == SHIFT)
15061
+// {
15062
+// mouseMode = mouseMode;
15063
+// } else
15064
+// {
15065
+// mouseMode |= BACKFORTH;
15066
+// }
1426115067
15068
+ targetLookAt.set(manipCamera.lookAt);
15069
+
1426215070 //prevX = X = anchorX;
1426315071 prevY = Y = anchorY + (int) (renderCamera.Distance());
1426415072 }
....@@ -14266,20 +15074,31 @@
1426615074 void GoLeft(int mod)
1426715075 {
1426815076 MODIFIERS |= COMMAND;
14269
- /*
15077
+ /**/
1427015078 if((mod&SHIFT) == SHIFT)
14271
- manipCamera.RotatePosition(speed, 0);
15079
+ manipCamera.Translate(speed, 0, getWidth());
1427215080 else
14273
- manipCamera.Translate(speed*delta, 0, getWidth());
14274
- */
14275
- if ((mod & SHIFT) == SHIFT)
1427615081 {
14277
- mouseMode = mouseMode;
14278
- } else
14279
- {
14280
- mouseMode |= ROTATE;
14281
- } // TRANSLATE;
15082
+ if ((mouseMode&VR)!=0)
15083
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
15084
+ else
15085
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
15086
+ }
15087
+
15088
+ /**/
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1428215096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
15100
+ targetLookAt.set(manipCamera.lookAt);
15101
+
1428315102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1428415103 prevY = Y = anchorY;
1428515104 }
....@@ -14287,20 +15106,28 @@
1428715106 void GoRight(int mod)
1428815107 {
1428915108 MODIFIERS |= COMMAND;
14290
- /*
15109
+ /**/
1429115110 if((mod&SHIFT) == SHIFT)
14292
- manipCamera.RotatePosition(-speed, 0);
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1429315112 else
14294
- manipCamera.Translate(-speed*delta, 0, getWidth());
14295
- */
14296
- if ((mod & SHIFT) == SHIFT)
1429715113 {
14298
- mouseMode = mouseMode;
14299
- } else
14300
- {
14301
- mouseMode |= ROTATE;
14302
- } // TRANSLATE;
15114
+ if ((mouseMode&VR)!=0)
15115
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
15116
+ else
15117
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
15118
+ }
15119
+
15120
+ /**/
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1430315128
15129
+ targetLookAt.set(manipCamera.lookAt);
15130
+
1430415131 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1430515132 prevY = Y = anchorY;
1430615133 }
....@@ -14342,14 +15169,16 @@
1434215169 if (editObj)
1434315170 {
1434415171 drag = true;
14345
- ClickInfo info = new ClickInfo();
14346
- info.bounds.setBounds(0, 0,
15172
+ //ClickInfo info = new ClickInfo();
15173
+ object.clickInfo.bounds.setBounds(0, 0,
1434715174 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14348
- info.pane = this;
14349
- info.camera = renderCamera;
14350
- info.x = x;
14351
- info.y = y;
14352
- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
15175
+ object.clickInfo.pane = this;
15176
+ object.clickInfo.camera = renderCamera;
15177
+ object.clickInfo.x = x;
15178
+ object.clickInfo.y = y;
15179
+ object //.GetWindow().copy
15180
+ .doEditDrag(//info,
15181
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1435315182 } else
1435415183 {
1435515184 if (x < startX)
....@@ -14432,6 +15261,11 @@
1443215261 if ((mouseMode & ZOOM) != 0)
1443315262 {
1443415263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1443515269 if ((mouseMode & VR) != 0)
1443615270 manipCamera.BackForth(dx, dy, getWidth());
1443715271 else
....@@ -14498,22 +15332,30 @@
1449815332 }
1449915333 }
1450015334
15335
+// ClickInfo clickInfo = new ClickInfo();
15336
+
1450115337 public void mouseMoved(MouseEvent e)
1450215338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1450315342 //System.out.println("mouseMoved: " + e);
1450415343 if (isRenderer)
1450515344 return;
1450615345
14507
- ClickInfo ci = new ClickInfo();
14508
- ci.x = e.getX();
14509
- ci.y = e.getY();
14510
- ci.modifiers = e.getModifiersEx();
14511
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14512
- ci.pane = this;
14513
- ci.camera = renderCamera;
15346
+ // Mouse cursor feedback
15347
+ object.clickInfo.x = e.getX();
15348
+ object.clickInfo.y = e.getY();
15349
+ object.clickInfo.modifiers = e.getModifiersEx();
15350
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
15351
+ object.clickInfo.pane = this;
15352
+ object.clickInfo.camera = renderCamera;
1451415353 if (!isRenderer)
1451515354 {
14516
- if (object.editWindow.copy.doEditClick(ci, 0))
15355
+ //ObjEditor editWindow = object.editWindow;
15356
+ //Object3D copy = editWindow.copy;
15357
+ if (object.doEditClick(//clickInfo,
15358
+ 0))
1451715359 {
1451815360 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1451915361 } else
....@@ -14528,7 +15370,8 @@
1452815370 Globals.MOUSEDRAGGED = false;
1452915371
1453015372 movingcamera = false;
14531
- X = Y = 0;
15373
+ X = 0; // getBounds().width/2;
15374
+ Y = 0; // getBounds().height/2;
1453215375 //System.out.println("mouseReleased: " + e);
1453315376 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1453415377 }
....@@ -14680,8 +15523,10 @@
1468015523 mouseMode |= ZOOM;
1468115524 }
1468215525
14683
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14684
- if (capsLocked) // || (modifiers & META) == META)
15526
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15527
+ boolean vr = capsLocked && !lightMode;
15528
+
15529
+ if (vr) // || (modifiers & META) == META)
1468515530 {
1468615531 mouseMode |= VR; // BACKFORTH;
1468715532 }
....@@ -14693,7 +15538,8 @@
1469315538 {
1469415539 mouseMode |= SELECT;
1469515540 }
14696
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1469715543 {
1469815544 mouseMode &= ~VR;
1469915545 mouseMode |= TRANSLATE;
....@@ -14737,8 +15583,18 @@
1473715583 float SATPOW = 1; // 2; // 0.5f;
1473815584 float BRIPOW = 1; // 0.5f; // 0.5f;
1473915585
15586
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15587
+
15588
+// Create a new blank cursor.
15589
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15590
+ cursorImg, new Point(0, 0), "blank cursor");
15591
+
1474015592 public void keyPressed(int key)
1474115593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1474215598 if (key >= '0' && key <= '5')
1474315599 clampbit = (key-'0');
1474415600
....@@ -14784,7 +15640,8 @@
1478415640 // break;
1478515641 case 'T':
1478615642 CACHETEXTURE ^= true;
14787
- textures.clear();
15643
+ texturepigment.clear();
15644
+ texturebump.clear();
1478815645 // repaint();
1478915646 break;
1479015647 case 'Y':
....@@ -14794,8 +15651,8 @@
1479415651 case 'K':
1479515652 KOMPACTTEXTURE ^= true;
1479615653 //textures.clear();
14797
- break;
14798
- case 'P': // Texture Projection macros
15654
+ // break;
15655
+ //case 'P': // Texture Projection macros
1479915656 // SAVETEXTURE ^= true;
1480015657 macromode = true;
1480115658 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -14869,7 +15726,9 @@
1486915726 case 'E' : COMPACT ^= true;
1487015727 repaint();
1487115728 break;
14872
- case 'W' : DEBUGHSB ^= true;
15729
+ case 'W' : // Wide Window (fullscreen)
15730
+ //DEBUGHSB ^= true;
15731
+ ObjEditor.theFrame.ToggleFullScreen();
1487315732 repaint();
1487415733 break;
1487515734 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14894,8 +15753,8 @@
1489415753 RevertCamera();
1489515754 repaint();
1489615755 break;
15756
+ //case 'l':
1489715757 case 'L':
14898
- case 'l':
1489915758 if (lightMode)
1490015759 {
1490115760 lightMode = false;
....@@ -14914,7 +15773,7 @@
1491415773 targetLookAt.set(manipCamera.lookAt);
1491515774 repaint();
1491615775 break;
14917
- case 'p':
15776
+ case 'P': // p':
1491815777 // c'est quoi ca au juste? spherical ^= true;
1491915778 Skinshader ^= true; programInitialized = false;
1492015779 repaint();
....@@ -14925,7 +15784,8 @@
1492515784 break;
1492615785 case 'm':
1492715786 {
14928
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1492915789 break;
1493015790 }
1493115791 case 'M':
....@@ -14952,27 +15812,31 @@
1495215812 repaint();
1495315813 break;
1495415814 case 'O':
14955
- Globals.drawMode = OCCLUSION; // WARNING
14956
- repaint();
14957
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1495815818 case 'o':
1495915819 OCCLUSION_CULLING ^= true;
1496015820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1496115821 break;
14962
- case '0': envyoff ^= true; repaint(); break;
15822
+ //case '0': envyoff ^= true; repaint(); break;
1496315823 case '1':
1496415824 case '2':
1496515825 case '3':
1496615826 case '4':
1496715827 case '5':
14968
- newenvy = Character.getNumericValue(key);
14969
- repaint();
14970
- break;
1497115828 case '6':
1497215829 case '7':
1497315830 case '8':
1497415831 case '9':
14975
- BGcolor = (key - '6')/3.f;
15832
+ if (true) // envyoff)
15833
+ {
15834
+ BGcolor = (key - '1')/8.f;
15835
+ }
15836
+ else
15837
+ {
15838
+ //newenvy = Character.getNumericValue(key);
15839
+ }
1497615840 repaint();
1497715841 break;
1497815842 case '!':
....@@ -15038,11 +15902,25 @@
1503815902 case '_':
1503915903 kompactbit = 5;
1504015904 break;
15041
- case '+':
15042
- kompactbit = 6;
15043
- break;
15905
+// case '+':
15906
+// kompactbit = 6;
15907
+// break;
1504415908 case ' ':
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
1504515913 lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
1504615924 Globals.lighttouched = true;
1504715925 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1504815926 targetLookAt.set(manipCamera.lookAt);
....@@ -15050,8 +15928,13 @@
1505015928 break;
1505115929 //case '`' :
1505215930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1505315935 RENDERPROGRAM += 1;
1505415936 RENDERPROGRAM %= 3;
15937
+
1505515938 repaint();
1505615939 break;
1505715940 case 'Z':
....@@ -15087,12 +15970,17 @@
1508715970 case ENTER:
1508815971 // object.editWindow.ScreenFit(); // Edit();
1508915972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1509015977 break;
1509115978 case DELETE:
1509215979 ClearSelection();
1509315980 break;
15094
- /*
1509515981 case '+':
15982
+
15983
+ /*
1509615984 //fontsize += 1;
1509715985 bbzoom *= 2;
1509815986 repaint();
....@@ -15109,30 +15997,36 @@
1510915997 case '=':
1511015998 IncDepth();
1511115999 //fontsize += 1;
15112
- object.editWindow.refreshContents(true);
16000
+ object.GetWindow().refreshContents(true);
1511316001 maskbit = 6;
1511416002 break;
1511516003 case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1511616004 DecDepth();
1511716005 maskbit = 5;
1511816006 //if(fontsize > 1) fontsize -= 1;
15119
- if (object.editWindow == null)
15120
- new Exception().printStackTrace();
15121
- else
15122
- object.editWindow.refreshContents(true);
16007
+// if (object.editWindow == null)
16008
+// new Exception().printStackTrace();
16009
+// else
16010
+ object.GetWindow().refreshContents(true);
1512316011 break;
1512416012 case '{':
15125
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1512616016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1512716017 repaint();
1512816018 break;
1512916019 case '}':
15130
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1513116023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1513216024 repaint();
1513316025 break;
1513416026 case '[':
15135
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1513616030 if (false) //manipCamera.hAspect == 0)
1513716031 {
1513816032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15148,7 +16042,9 @@
1514816042 break;
1514916043 case ']':
1515016044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15151
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1515216048 if (false) //manipCamera.hAspect == 0)
1515316049 {
1515416050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15186,98 +16082,113 @@
1518616082 }
1518716083 }
1518816084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1518916089 public void processKeyEvent(KeyEvent e)
1519016090 {
1519116091 switch (e.getID())
1519216092 {
1519316093 case KeyEvent.KEY_PRESSED:
15194
- if (!autorepeat)
15195
- {
15196
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15197
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15198
- }
15199
- if (manipCamera == lightCamera)
15200
- {
15201
- switch (e.getKeyCode())
15202
- {
15203
- case DOWN_ARROW:
15204
- lightCamera.DECAL /= 2;
15205
- repaint();
15206
- break;
15207
- case UP_ARROW:
15208
- lightCamera.DECAL *= 2;
15209
- repaint();
15210
- break;
15211
- case LEFT_ARROW:
15212
- lightCamera.SCALE /= 2;
15213
- repaint();
15214
- break;
15215
- case RIGHT_ARROW:
15216
- lightCamera.SCALE *= 2;
15217
- repaint();
15218
- break;
15219
- default:
15220
- break;
15221
- }
15222
-
15223
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15224
- } else
15225
- {
15226
- if (true) // !autorepeat)
15227
- {
15228
- boolean reset = true;
15229
-
15230
- switch (e.getKeyCode())
15231
- {
15232
- case DOWN_ARROW:
15233
- GoDown(e.getModifiersEx());
15234
- repaint();
15235
- break;
15236
- case UP_ARROW:
15237
- GoUp(e.getModifiersEx());
15238
- repaint();
15239
- break;
15240
- case LEFT_ARROW:
15241
- GoLeft(e.getModifiersEx());
15242
- repaint();
15243
- break;
15244
- case RIGHT_ARROW:
15245
- GoRight(e.getModifiersEx());
15246
- repaint();
15247
- break;
15248
- default:
15249
- reset = false;
15250
- break;
15251
- }
15252
-
15253
- if (reset)
15254
- {
15255
- autorepeat = true;
15256
-
15257
- targetLookAt.set(manipCamera.lookAt);
15258
- }
15259
- }
15260
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1526116099 break;
15262
- case KeyEvent.KEY_TYPED:
15263
- break;
16100
+// if (!autorepeat)
16101
+// {
16102
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
16103
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
16104
+// }
16105
+// if (manipCamera == lightCamera)
16106
+// {
16107
+// switch (e.getKeyCode())
16108
+// {
16109
+// case DOWN_ARROW:
16110
+// lightCamera.DECAL /= 2;
16111
+// repaint();
16112
+// break;
16113
+// case UP_ARROW:
16114
+// lightCamera.DECAL *= 2;
16115
+// repaint();
16116
+// break;
16117
+// case LEFT_ARROW:
16118
+// lightCamera.SCALE /= 2;
16119
+// repaint();
16120
+// break;
16121
+// case RIGHT_ARROW:
16122
+// lightCamera.SCALE *= 2;
16123
+// repaint();
16124
+// break;
16125
+// default:
16126
+// break;
16127
+// }
16128
+//
16129
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16130
+// } else
16131
+// {
16132
+// if (true) // !autorepeat)
16133
+// {
16134
+// boolean reset = true;
16135
+//
16136
+// switch (e.getKeyCode())
16137
+// {
16138
+// case DOWN_ARROW:
16139
+// GoDown(e.getModifiersEx());
16140
+// repaint();
16141
+// break;
16142
+// case UP_ARROW:
16143
+// GoUp(e.getModifiersEx());
16144
+// repaint();
16145
+// break;
16146
+// case LEFT_ARROW:
16147
+// GoLeft(e.getModifiersEx());
16148
+// repaint();
16149
+// break;
16150
+// case RIGHT_ARROW:
16151
+// GoRight(e.getModifiersEx());
16152
+// repaint();
16153
+// break;
16154
+// default:
16155
+// reset = false;
16156
+// break;
16157
+// }
16158
+//
16159
+// if (reset)
16160
+// {
16161
+// autorepeat = true;
16162
+//
16163
+// targetLookAt.set(manipCamera.lookAt);
16164
+// }
16165
+// }
16166
+// }
16167
+// break;
16168
+// case KeyEvent.KEY_TYPED:
16169
+// break;
1526416170 case KeyEvent.KEY_RELEASED:
15265
- {
15266
- switch (e.getKeyCode())
15267
- {
15268
- case DOWN_ARROW:
15269
- case UP_ARROW:
15270
- case LEFT_ARROW:
15271
- case RIGHT_ARROW:
15272
- MODIFIERS &= ~COMMAND;
15273
- autorepeat = false;
15274
- break;
15275
- default:
15276
- break;
15277
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1527816173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1527916175 break;
15280
- }
16176
+// {
16177
+// switch (e.getKeyCode())
16178
+// {
16179
+// case DOWN_ARROW:
16180
+// case UP_ARROW:
16181
+// case LEFT_ARROW:
16182
+// case RIGHT_ARROW:
16183
+// MODIFIERS &= ~COMMAND;
16184
+// autorepeat = false;
16185
+// break;
16186
+// default:
16187
+// break;
16188
+// }
16189
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
16190
+// break;
16191
+// }
1528116192 default:
1528216193 break;
1528316194 }
....@@ -15343,7 +16254,7 @@
1534316254 }
1534416255 */
1534516256
15346
- object.editWindow.EditSelection();
16257
+ object.GetWindow().EditSelection(false);
1534716258 }
1534816259
1534916260 void SelectParent()
....@@ -15360,10 +16271,10 @@
1536016271 {
1536116272 //selectees.remove(i);
1536216273 System.out.println("select parent of " + elem);
15363
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
16274
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1536416275 } else
1536516276 {
15366
- group.editWindow.Select(elem.GetTreePath(), first, true);
16277
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
1536716278 }
1536816279
1536916280 first = false;
....@@ -15405,12 +16316,12 @@
1540516316 for (int j = 0; j < group.children.size(); j++)
1540616317 {
1540716318 elem = (Object3D) group.children.elementAt(j);
15408
- object.editWindow.Select(elem.GetTreePath(), first, true);
16319
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1540916320 first = false;
1541016321 }
1541116322 } else
1541216323 {
15413
- object.editWindow.Select(elem.GetTreePath(), first, true);
16324
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1541416325 }
1541516326
1541616327 first = false;
....@@ -15421,21 +16332,21 @@
1542116332 {
1542216333 //Composite group = (Composite) object;
1542316334 Object3D group = object;
15424
- group.editWindow.loadClipboard(true); // ClearSelection(false);
16335
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
1542516336 }
1542616337
1542716338 void ResetTransform(int mask)
1542816339 {
1542916340 //Composite group = (Composite) object;
1543016341 Object3D group = object;
15431
- group.editWindow.ResetTransform(mask);
16342
+ group.GetWindow().ResetTransform(mask);
1543216343 }
1543316344
1543416345 void FlipTransform()
1543516346 {
1543616347 //Composite group = (Composite) object;
1543716348 Object3D group = object;
15438
- group.editWindow.FlipTransform();
16349
+ group.GetWindow().FlipTransform();
1543916350 // group.editWindow.ReduceMesh(true);
1544016351 }
1544116352
....@@ -15443,7 +16354,7 @@
1544316354 {
1544416355 //Composite group = (Composite) object;
1544516356 Object3D group = object;
15446
- group.editWindow.PrintMemory();
16357
+ group.GetWindow().PrintMemory();
1544716358 // group.editWindow.ReduceMesh(true);
1544816359 }
1544916360
....@@ -15451,7 +16362,7 @@
1545116362 {
1545216363 //Composite group = (Composite) object;
1545316364 Object3D group = object;
15454
- group.editWindow.ResetCentroid();
16365
+ group.GetWindow().ResetCentroid();
1545516366 }
1545616367
1545716368 void IncDepth()
....@@ -15533,8 +16444,6 @@
1553316444
1553416445 int width = getBounds().width;
1553516446 int height = getBounds().height;
15536
- ClickInfo info = new ClickInfo();
15537
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1553816447 //Image img = CreateImage(width, height);
1553916448 //System.out.println("width = " + width + "; height = " + height + "\n");
1554016449
....@@ -15611,48 +16520,77 @@
1561116520 }
1561216521 if (object != null && !hasMarquee)
1561316522 {
16523
+ if (object.clickInfo == null)
16524
+ object.clickInfo = new ClickInfo();
16525
+ ClickInfo info = object.clickInfo;
16526
+ //ClickInfo info = new ClickInfo();
16527
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16528
+
1561416529 if (isRenderer)
1561516530 {
15616
- info.flags++;
16531
+ object.clickInfo.flags++;
1561716532 double frameAspect = (double) width / (double) height;
1561816533 if (frameAspect > renderCamera.aspect)
1561916534 {
1562016535 int desired = (int) ((double) height * renderCamera.aspect);
15621
- info.bounds.width -= width - desired;
15622
- info.bounds.x += (width - desired) / 2;
16536
+ object.clickInfo.bounds.width -= width - desired;
16537
+ object.clickInfo.bounds.x += (width - desired) / 2;
1562316538 } else
1562416539 {
1562516540 int desired = (int) ((double) width / renderCamera.aspect);
15626
- info.bounds.height -= height - desired;
15627
- info.bounds.y += (height - desired) / 2;
16541
+ object.clickInfo.bounds.height -= height - desired;
16542
+ object.clickInfo.bounds.y += (height - desired) / 2;
1562816543 }
1562916544 }
15630
- info.g = gr;
15631
- info.camera = renderCamera;
16545
+
16546
+ object.clickInfo.g = gr;
16547
+ object.clickInfo.camera = renderCamera;
1563216548 /*
1563316549 // Memory intensive (brep.verticescopy)
1563416550 if (!(object instanceof Composite))
1563516551 object.draw(info, 0, false); // SLOW :
1563616552 */
15637
- if (!isRenderer)
16553
+ if (!isRenderer) // && drag)
1563816554 {
15639
- object.drawEditHandles(info, 0);
15640
-
15641
- if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
16555
+ Grafreed.Assert(object != null);
16556
+ Grafreed.Assert(object.selection != null);
16557
+ if (object.selection.Size() > 0)
1564216558 {
15643
- switch (object.selection.get(0).hitSomething)
16559
+ int hitSomething = object.selection.get(0).hitSomething;
16560
+
16561
+ object.clickInfo.DX = 0;
16562
+ object.clickInfo.DY = 0;
16563
+ object.clickInfo.W = 1;
16564
+ if (hitSomething == Object3D.hitCenter)
1564416565 {
15645
- case Object3D.hitCenter: gr.setColor(Color.pink);
15646
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647
- break;
15648
- case Object3D.hitRotate: gr.setColor(Color.yellow);
15649
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650
- break;
15651
- case Object3D.hitScale: gr.setColor(Color.cyan);
15652
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653
- break;
16566
+ info.DX = X;
16567
+ if (X != 0)
16568
+ info.DX -= info.bounds.width/2;
16569
+
16570
+ info.DY = Y;
16571
+ if (Y != 0)
16572
+ info.DY -= info.bounds.height/2;
1565416573 }
15655
-
16574
+
16575
+ object.drawEditHandles(//info,
16576
+ 0);
16577
+
16578
+ if (drag && (X != 0 || Y != 0))
16579
+ {
16580
+ switch (hitSomething)
16581
+ {
16582
+ case Object3D.hitCenter: gr.setColor(Color.white);
16583
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16584
+ break;
16585
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
16586
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16587
+ break;
16588
+ case Object3D.hitScale: gr.setColor(Color.cyan);
16589
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16590
+ break;
16591
+ }
16592
+
16593
+ }
1565616594 }
1565716595 }
1565816596 }
....@@ -15667,7 +16605,7 @@
1566716605 if (hasMarquee)
1566816606 {
1566916607 gr.setXORMode(Color.white);
15670
- gr.setColor(Color.red);
16608
+ gr.setColor(Color.white);
1567116609 if (!firstime)
1567216610 {
1567316611 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -15826,7 +16764,8 @@
1582616764
1582716765 public boolean mouseDrag(Event evt, int x, int y)
1582816766 {
15829
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1583016769 /*
1583116770 drag = true;
1583216771 //System.out.println("Mouse DRAG");
....@@ -15945,6 +16884,7 @@
1594516884 public boolean mouseUp(Event evt, int x, int y)
1594616885 {
1594716886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1594816888 /*
1594916889 locked = false;
1595016890 if (isRenderer)
....@@ -16134,6 +17074,8 @@
1613417074 private /*static*/ boolean firstime;
1613517075 private /*static*/ cVector newView = new cVector();
1613617076 private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
17077
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
17078
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1613717079 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1613817080 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1613917081 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16146,29 +17088,67 @@
1614617088 {
1614717089 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1614817090
17091
+ int usedsuf = 0;
17092
+
1614917093 for (int i = 0; i < suffixes.length; i++)
1615017094 {
16151
- String resourceName = basename + suffixes[i] + "." + suffix;
16152
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16153
- mipmapped,
16154
- FileUtil.getFileSuffix(resourceName));
16155
- if (data == null)
17095
+ String[] suffixe = suffixes;
17096
+ String[] fallback = suffixes2;
17097
+ String[] fallfallback = suffixes3;
17098
+
17099
+ for (int c=usedsuf; --c>=0;)
1615617100 {
16157
- throw new IOException("Unable to load texture " + resourceName);
17101
+// String[] temp = suffixe;
17102
+// suffixe = fallback;
17103
+// fallback = fallfallback;
17104
+// fallfallback = temp;
1615817105 }
17106
+
17107
+ String resourceName = basename + suffixe[i] + "." + suffix;
17108
+ TextureData data;
17109
+
17110
+ try
17111
+ {
17112
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17113
+ mipmapped,
17114
+ FileUtil.getFileSuffix(resourceName));
17115
+ }
17116
+ catch (Exception e)
17117
+ {
17118
+ try
17119
+ {
17120
+ resourceName = basename + fallback[i] + "." + suffix;
17121
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17122
+ mipmapped,
17123
+ FileUtil.getFileSuffix(resourceName));
17124
+ }
17125
+ catch (Exception e2)
17126
+ {
17127
+ resourceName = basename + fallfallback[i] + "." + suffix;
17128
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17129
+ mipmapped,
17130
+ FileUtil.getFileSuffix(resourceName));
17131
+ }
17132
+ }
17133
+
1615917134 //System.out.println("Target = " + targets[i]);
1616017135 cubemap.updateImage(data, targets[i]);
1616117136 }
1616217137
1616317138 return cubemap;
1616417139 }
17140
+
1616517141 int bigsphere = -1;
1616617142
1616717143 float BGcolor = 0.5f;
1616817144
16169
- private void DrawSkyBox(GL gl)
17145
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17146
+
17147
+ private void DrawSkyBox(GL gl, float ratio)
1617017148 {
16171
- if (envyoff || cubemap == null)
17149
+ if (//envyoff ||
17150
+ WIREFRAME ||
17151
+ cubemap == null)
1617217152 {
1617317153 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1617417154 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -16183,7 +17163,17 @@
1618317163 // Compensates for ExaminerViewer's modification of modelview matrix
1618417164 gl.glMatrixMode(GL.GL_MODELVIEW);
1618517165 gl.glLoadIdentity();
17166
+ gl.glScalef(1,ratio,1);
1618617167
17168
+// colorV[0] = 2;
17169
+// colorV[1] = 2;
17170
+// colorV[2] = 2;
17171
+// colorV[3] = 1;
17172
+// gl.glDisable(gl.GL_COLOR_MATERIAL);
17173
+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
17174
+//
17175
+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
17176
+
1618717177 //gl.glActiveTexture(GL.GL_TEXTURE1);
1618817178 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1618917179
....@@ -16215,6 +17205,7 @@
1621517205 {
1621617206 gl.glScalef(1.0f, -1.0f, 1.0f);
1621717207 }
17208
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1621817209 gl.glMultMatrixd(viewrot_1, 0);
1621917210 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1622017211 //viewer.updateInverseRotation(gl);
....@@ -16255,7 +17246,8 @@
1625517246 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1625617247
1625717248 cubemap.disable();
16258
- ////cubemap.unbind();
17249
+ //cubemap.dispose();
17250
+
1625917251 if (CULLFACE)
1626017252 {
1626117253 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16311,7 +17303,7 @@
1631117303 gl.glScalef(1.0f, -1.0f, 1.0f);
1631217304 }
1631317305
16314
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17306
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1631517307
1631617308 float step = 2; // 0.1666f; //0.25f;
1631717309 float stepv = 2; // step * 1652 / 998;
....@@ -16355,16 +17347,16 @@
1635517347 cStatic.objectstack[materialdepth++] = checker;
1635617348 //System.out.println("material " + material);
1635717349 //Applet3D.tracein(this, selected);
16358
- vector2buffer = checker.projectedVertices;
17350
+ //vector2buffer = checker.projectedVertices;
1635917351
1636017352 //checker.GetMaterial().Draw(this, false); // true);
16361
- DrawMaterial(checker.GetMaterial(), false); // true);
17353
+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1636217354
1636317355 materialdepth -= 1;
1636417356 if (materialdepth > 0)
1636517357 {
16366
- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367
- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
17358
+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
17359
+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1636817360 }
1636917361 //checker.GetMaterial().opacity = 1f;
1637017362 ////checker.GetMaterial().ambient = 1f;
....@@ -16450,6 +17442,14 @@
1645017442 }
1645117443 }
1645217444
17445
+ private Object3D GetFolder()
17446
+ {
17447
+ Object3D folder = object.GetWindow().copy;
17448
+ if (object.GetWindow().copy.selection.Size() > 0)
17449
+ folder = object.GetWindow().copy.selection.elementAt(0);
17450
+ return folder;
17451
+ }
17452
+
1645317453 class SelectBuffer implements GLEventListener
1645417454 {
1645517455
....@@ -16465,7 +17465,7 @@
1646517465 //new Exception().printStackTrace();
1646617466 System.out.println("select buffer init");
1646717467 // Use debug pipeline
16468
- drawable.setGL(new DebugGL(drawable.getGL()));
17468
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1646917469
1647017470 GL gl = drawable.getGL();
1647117471
....@@ -16529,6 +17529,17 @@
1652917529
1653017530 //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
1653117531
17532
+ if (PAINTMODE)
17533
+ {
17534
+ if (object.GetWindow().copy.selection.Size() > 0)
17535
+ {
17536
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17537
+
17538
+ // Make what you paint not selectable.
17539
+ paintobj.ResetSelectable();
17540
+ }
17541
+ }
17542
+
1653217543 //int tmp = selection_view;
1653317544 //selection_view = -1;
1653417545 int temp = DrawMode();
....@@ -16540,6 +17551,17 @@
1654017551 // temp = DEFAULT; // patch for selection debug
1654117552 Globals.drawMode = temp; // WARNING
1654217553
17554
+ if (PAINTMODE)
17555
+ {
17556
+ if (object.GetWindow().copy.selection.Size() > 0)
17557
+ {
17558
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17559
+
17560
+ // Revert.
17561
+ paintobj.RestoreSelectable();
17562
+ }
17563
+ }
17564
+
1654317565 //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
1654417566
1654517567 // trying different ways of getting the depth info over
....@@ -16570,7 +17592,7 @@
1657017592
1657117593 float depth = depths[y * TEX_SIZE + x];
1657217594
16573
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1657417596 {
1657517597 pointselection = false;
1657617598
....@@ -16587,6 +17609,8 @@
1658717609 // System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1658817610 // System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1658917611 // System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
17612
+
17613
+ CreateSelectedPoint();
1659017614
1659117615 // Will fit the mesh !!!
1659217616 selectedpoint.toParent[0][0] = 0.0001;
....@@ -16641,29 +17665,31 @@
1664117665 }
1664217666
1664317667 if (!movingcamera && !PAINTMODE)
16644
- object.editWindow.ScreenFitPoint(); // fev 2014
17668
+ object.GetWindow().ScreenFitPoint(); // fev 2014
1664517669
16646
- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
17670
+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1664717671 {
16648
- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
17672
+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1664917673
16650
- Object3D group = new Object3D("inst" + paintcount++);
17674
+ if (object.GetWindow().copy.selection.Size() > 0)
17675
+ {
17676
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
1665117677
16652
- group.CreateMaterial(); // use a void leaf to select instances
16653
-
16654
- group.add(paintobj); // link
16655
-
16656
- object.editWindow.SnapObject(group);
16657
-
16658
- Object3D folder = object.editWindow.copy;
16659
-
16660
- if (object.editWindow.copy.selection.Size() > 0)
16661
- folder = object.editWindow.copy.selection.elementAt(0);
16662
-
16663
- folder.add(group);
16664
-
16665
- object.editWindow.ResetModel();
16666
- object.editWindow.refreshContents();
17678
+ Object3D inst = new Object3D("inst" + paintcount++);
17679
+
17680
+ inst.CreateMaterial(); // use a void leaf to select instances
17681
+
17682
+ inst.add(paintobj); // link
17683
+
17684
+ object.GetWindow().SnapObject(inst);
17685
+
17686
+ Object3D folder = paintFolder; // GetFolder();
17687
+
17688
+ folder.add(inst);
17689
+
17690
+ object.GetWindow().ResetModel();
17691
+ object.GetWindow().refreshContents();
17692
+ }
1666717693 }
1666817694 else
1666917695 paintcount = 0;
....@@ -16702,6 +17728,11 @@
1670217728 //System.out.println("objects[color] = " + objects[color]);
1670317729 //objects[color].Select();
1670417730 indexcount = 0;
17731
+ ObjEditor window = object.GetWindow();
17732
+ if (window != null && deselect)
17733
+ {
17734
+ window.Select(null, deselect, true);
17735
+ }
1670517736 object.Select(color, deselect);
1670617737 }
1670717738
....@@ -16752,6 +17783,7 @@
1675217783
1675317784 public void init(GLAutoDrawable drawable)
1675417785 {
17786
+ if (Globals.DEBUG)
1675517787 System.out.println("shadow buffer init");
1675617788
1675717789 GL gl = drawable.getGL();
....@@ -16980,10 +18012,14 @@
1698018012 gl.glFlush();
1698118013
1698218014 /**/
16983
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
18015
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1698418016
16985
- float[] pixels = occlusionsizebuffer.array();
18017
+ float[] depths = occlusiondepthbuffer.array();
1698618018
18019
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
18020
+
18021
+ int[] pixels = selectsizebuffer.array();
18022
+
1698718023 double r = 0, g = 0, b = 0;
1698818024
1698918025 double count = 0;
....@@ -16994,7 +18030,7 @@
1699418030
1699518031 double FACTOR = 1;
1699618032
16997
- for (int i = 0; i < pixels.length; i++)
18033
+ for (int i = 0; i < depths.length; i++)
1699818034 {
1699918035 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1700018036 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17077,7 +18113,7 @@
1707718113
1707818114 double scale = ray.z; // 1; // cos
1707918115
17080
- float depth = pixels[newindex];
18116
+ float depth = depths[newindex];
1708118117
1708218118 /*
1708318119 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17220,6 +18256,11 @@
1722018256 static boolean DEBUG_SELECTION = false;
1722118257 boolean OCCLUSION_CULLING = false; //true;
1722218258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1722318264 static public int indexcount = 0;
1722418265 /*static*/ cColor vertexOcclusion = new cColor();
1722518266 //private int selection_view = -1;
....@@ -17227,23 +18268,15 @@
1722718268 int AAbuffersize = 0;
1722818269
1722918270 //double[] selectedpoint = new double[3];
17230
- static Superellipsoid selectedpoint = new Superellipsoid();
18271
+ static Superellipsoid selectedpoint;
1723118272 static Sphere previousselectedpoint = null;
17232
- static Sphere debugpointG = new Sphere();
17233
- static Sphere debugpointP = new Sphere();
17234
- static Sphere debugpointC = new Sphere();
17235
- static Sphere debugpointR = new Sphere();
18273
+ static Sphere debugpointG;
18274
+ static Sphere debugpointP;
18275
+ static Sphere debugpointC;
18276
+ static Sphere debugpointR;
1723618277
1723718278 static Sphere debugpoints[] = new Sphere[8];
1723818279
17239
- static
17240
- {
17241
- for (int i=0; i<8; i++)
17242
- {
17243
- debugpoints[i] = new Sphere();
17244
- }
17245
- }
17246
-
1724718280 static void InitPoints(float radius)
1724818281 {
1724918282 for (int i=0; i<8; i++)
....@@ -17282,11 +18315,14 @@
1728218315 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1728318316 static IntBuffer bigAAbuffer;
1728418317 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17285
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18318
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1728618319 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1728718320 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1728818321 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17289
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18322
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18323
+
18324
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18325
+
1729018326 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1729118327 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1729218328 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();