Normand Briere
2019-10-04 57c5b6cd8d12ffdaa3e0b099451e3c031012750a
CameraPane.java
....@@ -1,4 +1,5 @@
11
2
+import com.bulletphysics.dynamics.RigidBody;
23 import java.awt.*;
34 import java.awt.event.*;
45 import java.awt.image.*;
....@@ -18,7 +19,10 @@
1819 import javax.imageio.ImageIO;
1920 import javax.imageio.ImageWriteParam;
2021 import javax.imageio.ImageWriter;
22
+import javax.imageio.ImageReadParam;
23
+import javax.imageio.ImageReader;
2124 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
25
+import javax.imageio.stream.ImageInputStream;
2226 import javax.imageio.stream.ImageOutputStream;
2327 import javax.imageio.ImageWriteParam;
2428
....@@ -30,6 +34,7 @@
3034 import java.nio.*;
3135
3236 import gleem.linalg.Mat4f;
37
+import javax.imageio.ImageTypeSpecifier;
3338
3439 class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
3540 {
....@@ -44,6 +49,39 @@
4449 static boolean ABORTED = false;
4550
4651 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
+ }
4785
4886 /*static*/ private boolean CULLFACE = false; // true;
4987 /*static*/ boolean NEAREST = false; // true;
....@@ -60,7 +98,7 @@
6098 //boolean REDUCETEXTURE = true;
6199 boolean CACHETEXTURE = true;
62100 boolean CLEANCACHE = false; // true;
63
- boolean MIPMAP = false; // true;
101
+ boolean MIPMAP = false; // true; // never works...
64102 boolean COMPRESSTEXTURE = false;
65103 boolean KOMPACTTEXTURE = false; // true;
66104 boolean RESIZETEXTURE = false;
....@@ -73,7 +111,11 @@
73111 //private Mat4f spotlightTransform = new Mat4f();
74112 //private Mat4f spotlightInverseTransform = new Mat4f();
75113 static GLContext glcontext = null;
76
- /*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
+
77119 boolean reverseUP = false;
78120 static boolean frozen = false;
79121 boolean enablebackspace = false; // patch for back buffer refresh
....@@ -82,7 +124,7 @@
82124 static boolean LOCALTRANSFORM = false;
83125 static boolean FULLSCREEN = false;
84126 static boolean SUPPORT = true;
85
-static boolean INERTIA = true;
127
+static boolean INERTIA = false; // true;
86128 static boolean FAST = false;
87129 static boolean SLOWPOSE = false;
88130 static boolean FOOTCONTACT = true;
....@@ -93,7 +135,7 @@
93135 static boolean ZOOMBOXMODE = false;
94136 static boolean BOXMODE = false;
95137 static boolean IMAGEFLIP = false;
96
-static boolean SMOOTHFOCUS = false;
138
+static boolean SMOOTHFOCUS = true; // false;
97139 static boolean SPEAKERMOCAP = true; // jan 2014 false;
98140 static boolean SPEAKERCAMERA = false;
99141 static boolean SPEAKERFOCUS = false;
....@@ -127,16 +169,16 @@
127169
128170
129171 // OPTIONS
130
- boolean Skinshader = true;
172
+ boolean Skinshader = false; // true;
131173 boolean cameraLight = false;
132174 boolean UVdebug = false;
133175 boolean Udebug = false;
134176 boolean Vdebug = false;
135177 boolean NORMALdebug = false;
136
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
178
+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
137179 boolean anisotropy = true;
138180 boolean softshadow = true; // slower but better false;
139
- boolean opacityhalo = false;
181
+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140182
141183 boolean macromode = false;
142184
....@@ -150,6 +192,19 @@
150192 }
151193
152194 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
+ }
153208
154209 void SetAsGLRenderer(boolean b)
155210 {
....@@ -167,9 +222,10 @@
167222 cameras = new Camera[2];
168223 targetLookAts = new cVector[2];
169224
170
- SetCamera(cam);
225
+ SetCamera(cam, true);
171226
172
- SetLight(new Camera(new cVector(10, 10, -20)));
227
+ // Warning: not used.
228
+ //SetLight(new Camera(new cVector(15, 10, -20)));
173229
174230 object = o;
175231
....@@ -194,7 +250,7 @@
194250
195251 public javax.media.opengl.GL GetGL0()
196252 {
197
- return null;
253
+ return currentGL;
198254 }
199255
200256 public int GenList()
....@@ -326,7 +382,7 @@
326382 cStatic.objectstack[materialdepth++] = obj;
327383 //System.out.println("material " + material);
328384 //Applet3D.tracein(this, selected);
329
- display.vector2buffer = obj.projectedVertices;
385
+ //display.vector2buffer = obj.projectedVertices;
330386 if (obj instanceof Camera)
331387 {
332388 display.options1[0] = material.shift;
....@@ -335,14 +391,28 @@
335391 display.options1[2] = material.shadowbias;
336392 display.options1[3] = material.aniso;
337393 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]);
338399 display.options2[0] = material.opacity;
339400 display.options2[1] = material.diffuse;
340401 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]);
341405
342406 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]);
343410 display.options4[0] = material.cameralight/0.2f;
344411 display.options4[1] = material.subsurface;
345412 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]);
346416
347417 // if (display.CURRENTANTIALIAS > 0)
348418 // display.options3[3] /= 4;
....@@ -358,7 +428,7 @@
358428 /**/
359429 } else
360430 {
361
- DrawMaterial(material, selected);
431
+ DrawMaterial(material, selected, obj.projectedVertices);
362432 }
363433 } else
364434 {
....@@ -382,8 +452,8 @@
382452 cStatic.objectstack[materialdepth++] = obj;
383453 //System.out.println("material " + material);
384454 //Applet3D.tracein("selected ", selected);
385
- display.vector2buffer = obj.projectedVertices;
386
- display.DrawMaterial(material, selected);
455
+ //display.vector2buffer = obj.projectedVertices;
456
+ display.DrawMaterial(material, selected, obj.projectedVertices);
387457 }
388458 }
389459
....@@ -400,8 +470,8 @@
400470 materialdepth -= 1;
401471 if (materialdepth > 0)
402472 {
403
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
- 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);
405475 }
406476 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
407477 } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -421,8 +491,8 @@
421491 materialdepth -= 1;
422492 if (materialdepth > 0)
423493 {
424
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
- 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);
426496 }
427497 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
428498 //else
....@@ -473,7 +543,8 @@
473543 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
474544 LA.vecCross(obj.v0, obj.v1, obj.v2);
475545 LA.vecNormalize(obj.v2);
476
- 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);
477548 }
478549
479550 // P
....@@ -495,7 +566,7 @@
495566 y += ny * obj.NORMALPUSH;
496567 z += nz * obj.NORMALPUSH;
497568
498
- gl.glNormal3f(nx, ny, nz);
569
+ SetGLNormal(gl, nx, ny, nz);
499570 }
500571 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
501572 SetColor(obj, pv);
....@@ -527,7 +598,7 @@
527598 y += ny * obj.NORMALPUSH;
528599 z += nz * obj.NORMALPUSH;
529600
530
- gl.glNormal3f(nx, ny, nz);
601
+ SetGLNormal(gl, nx, ny, nz);
531602 }
532603 //System.out.println("vertexq = " + qv.s + ", " + qv.t);
533604 // boolean locked = false;
....@@ -575,7 +646,7 @@
575646 y += ny * obj.NORMALPUSH;
576647 z += nz * obj.NORMALPUSH;
577648
578
- gl.glNormal3f(nx, ny, nz);
649
+ SetGLNormal(gl, nx, ny, nz);
579650 }
580651
581652 // if ((dot&4) == 0)
....@@ -811,7 +882,7 @@
811882 //// tris.postdraw(this);
812883 }
813884
814
- static Camera localcamera = new Camera();
885
+ static Camera localAOcamera = new Camera();
815886 static cVector from = new cVector();
816887 static cVector to = new cVector();
817888
....@@ -820,7 +891,7 @@
820891 CameraPane cp = this;
821892
822893 Camera keep = cp.RenderCamera();
823
- cp.renderCamera = localcamera;
894
+ cp.renderCamera = localAOcamera;
824895
825896 if (br.trimmed)
826897 {
....@@ -838,7 +909,7 @@
838909 br.positions[i3 + 2] + br.normals[i3 + 2]);
839910 LA.xformPos(from, transform, from);
840911 LA.xformPos(to, transform, to); // RIGID ONLY
841
- localcamera.setAim(from, to);
912
+ localAOcamera.setAim(from, to);
842913
843914 CameraPane.occlusionbuffer.display();
844915
....@@ -872,7 +943,7 @@
872943 to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
873944 LA.xformPos(from, transform, from);
874945 LA.xformPos(to, transform, to); // RIGID ONLY
875
- localcamera.setAim(from, to);
946
+ localAOcamera.setAim(from, to);
876947
877948 CameraPane.occlusionbuffer.display();
878949
....@@ -1181,10 +1252,10 @@
11811252 {
11821253 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
11831254 {
1184
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1255
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
11851256 } else
11861257 {
1187
- gl.glNormal3f(0, 0, 1);
1258
+ SetGLNormal(gl, 0, 0, 1);
11881259 }
11891260
11901261 if (c != null)
....@@ -1208,10 +1279,10 @@
12081279 {
12091280 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12101281 {
1211
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1282
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12121283 } else
12131284 {
1214
- gl.glNormal3f(0, 0, 1);
1285
+ SetGLNormal(gl, 0, 0, 1);
12151286 }
12161287 if (c != null)
12171288 {
....@@ -1236,10 +1307,10 @@
12361307 {
12371308 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12381309 {
1239
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1310
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12401311 } else
12411312 {
1242
- gl.glNormal3f(0, 0, 1);
1313
+ SetGLNormal(gl, 0, 0, 1);
12431314 }
12441315 if (c != null)
12451316 {
....@@ -1421,7 +1492,7 @@
14211492 {
14221493 if (!selectmode)
14231494 {
1424
- 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);
14251496 gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14261497
14271498 if (flipV)
....@@ -1433,6 +1504,8 @@
14331504 gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14341505 }
14351506
1507
+ float[] colorV = new float[4];
1508
+
14361509 void SetColor(Object3D obj, Vertex p0)
14371510 {
14381511 CameraPane display = this;
....@@ -1457,7 +1530,7 @@
14571530 }
14581531 }
14591532 float b = 0;
1460
- if (obj.support != null && obj.link2master)
1533
+ if (obj.support != null && obj.Link2Support())
14611534 {
14621535 b = 1;
14631536 }
....@@ -1500,8 +1573,6 @@
15001573 {
15011574 return;
15021575 }
1503
-
1504
- float[] colorV = new float[3];
15051576
15061577 if (false) // marked)
15071578 {
....@@ -1610,7 +1681,7 @@
16101681 // gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
16111682 }
16121683
1613
- void DrawMaterial(cMaterial material, boolean selected)
1684
+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
16141685 {
16151686 CameraPane display = this;
16161687 //new Exception().printStackTrace();
....@@ -1645,7 +1716,7 @@
16451716 colorV[0] = display.modelParams0[0] * material.diffuse;
16461717 colorV[1] = display.modelParams0[1] * material.diffuse;
16471718 colorV[2] = display.modelParams0[2] * material.diffuse;
1648
- colorV[3] = material.opacity;
1719
+ colorV[3] = 1; // material.opacity;
16491720
16501721 gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
16511722 //System.out.println("Opacity = " + opacity);
....@@ -1750,12 +1821,12 @@
17501821
17511822 display.modelParams7[0] = 0;
17521823 display.modelParams7[1] = 1000;
1753
- display.modelParams7[2] = 0;
1824
+ display.modelParams7[2] = material.parallax;
17541825 display.modelParams7[3] = 0;
17551826
1756
- display.modelParams6[0] = 100; // criss de bug de bump
1827
+ //display.modelParams6[0] = 100; // criss de bug de bump
17571828
1758
- Object3D.cVector2[] extparams = display.vector2buffer;
1829
+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
17591830 if (extparams != null && extparams.length > 0 && extparams[0] != null)
17601831 {
17611832 display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1983,9 +2054,9 @@
19832054 switch(viewcode)
19842055 {
19852056 case 0: return "main";
1986
- case 1: return "one";
1987
- case 2: return "two";
1988
- case 3: return "three";
2057
+ case 1: return "Red";
2058
+ case 2: return "Green";
2059
+ case 3: return "Blue";
19892060 case 4: return "light";
19902061 }
19912062
....@@ -1994,7 +2065,7 @@
19942065
19952066 static int camerachangeframe;
19962067
1997
- public boolean SetCamera(Camera cam)
2068
+ public boolean SetCamera(Camera cam, boolean set)
19982069 {
19992070 // may 2014 if (cam == cameras[0] || cam == cameras[1])
20002071 // return false;
....@@ -2012,7 +2083,8 @@
20122083
20132084 camerachangeframe = Globals.framecount;
20142085
2015
- cam.hAspect = -1; // Read only
2086
+ if (cam != null)
2087
+ cam.hAspect = -1; // Read only
20162088
20172089 cameras[0] = cam;
20182090 targetLookAts[0] = new cVector(cam.lookAt);
....@@ -2022,11 +2094,14 @@
20222094 {
20232095 cameras[i] = new Camera(cam.viewCode);
20242096 }
2025
-
2026
- cameras[i].setAim(cam.location, cam.lookAt);
2027
- cameras[i].shaper_fovy = cam.shaper_fovy;
2028
- cameras[i].UP.set(cam.UP);
2029
- 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
+ }
20302105 }
20312106 cameracount = 0;
20322107 targetLookAt = targetLookAts[cameracount];
....@@ -2035,7 +2110,7 @@
20352110 // Start with free camera
20362111 SwitchCameras(true);
20372112
2038
- pingthread.jump = true; // optional?
2113
+// pingthread.jump = true; // optional?
20392114
20402115 if (TRACKONCE)
20412116 {
....@@ -2051,7 +2126,7 @@
20512126 //System.err.println("Oeil on");
20522127 OEIL = true;
20532128 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2129
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20552130 //pingthread.StepToTarget(true);
20562131 }
20572132
....@@ -2222,18 +2297,6 @@
22222297 public void ToggleTrack()
22232298 {
22242299 TRACK ^= true;
2225
- if (TRACK)
2226
- {
2227
- if (object.selection != null &&
2228
- object.selection.size() > 0 &&
2229
- object.selection.elementAt(0) != null &&
2230
- !(object.selection.elementAt(0) instanceof Camera) &&
2231
- !(object.selection.elementAt(0) instanceof ScriptNode))
2232
- {
2233
- trackedobject = object.selection.elementAt(0);
2234
- repaint();
2235
- }
2236
- }
22372300
22382301 repaint();
22392302 }
....@@ -2284,10 +2347,17 @@
22842347 HANDLES ^= true;
22852348 }
22862349
2350
+ Object3D paintFolder;
2351
+
22872352 void TogglePaint()
22882353 {
22892354 PAINTMODE ^= true;
22902355 paintcount = 0;
2356
+
2357
+ if (PAINTMODE)
2358
+ {
2359
+ paintFolder = GetFolder();
2360
+ }
22912361 }
22922362
22932363 void SwapCamera(int a, int b)
....@@ -2318,7 +2388,8 @@
23182388 {
23192389 //System.out.println("PROTECTION = " + cam.hAspect);
23202390 //assert (cam.hAspect == 0);
2321
- cam.hAspect = 0;
2391
+ if (cam != null)
2392
+ cam.hAspect = 0;
23222393 lightCamera = cam;
23232394 }
23242395
....@@ -2384,6 +2455,33 @@
23842455 return currentGL;
23852456 }
23862457
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
+
23872485 /**/
23882486 class CacheTexture
23892487 {
....@@ -2392,28 +2490,31 @@
23922490
23932491 int resolution;
23942492
2395
- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
2493
+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
23962494 {
2397
- texture = tex;
2495
+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
2496
+ texturedata = texdata;
23982497 resolution = res;
23992498 }
24002499 }
24012500 /**/
24022501
24032502 // TEXTURE static Texture texture;
2404
- static public java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/> textures
2405
- = new java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/>();
2406
- 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
+
24072508 int pigmentdepth = 0;
24082509 public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
24092510 int bumpdepth = 0;
24102511 public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
24112512 //public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
24122513 public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2413
- public static String NOISE_TEXTURE = "WHITE_NOISE";
2514
+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
24142515 // public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
24152516
2416
- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
2517
+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
24172518 {
24182519 TextureData texturedata = null;
24192520
....@@ -2423,7 +2524,7 @@
24232524 com.sun.opengl.util.texture.TextureIO.newTextureData(
24242525 getClass().getClassLoader().getResourceAsStream(name),
24252526 true,
2426
- com.sun.opengl.util.texture.TextureIO.PNG);
2527
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
24272528 } catch (java.io.IOException e)
24282529 {
24292530 throw new javax.media.opengl.GLException(e);
....@@ -2432,13 +2533,34 @@
24322533 if (bump)
24332534 texturedata = ConvertBump(texturedata, false);
24342535
2435
- com.sun.opengl.util.texture.Texture texture =
2436
- 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);
24372538
2438
- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2439
- 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);
24402541
2441
- 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;
24422564 }
24432565
24442566 boolean HUESMOOTH = true; // wrap around bug... true;
....@@ -3468,6 +3590,8 @@
34683590 };
34693591 /**/
34703592
3593
+ static Object3D lastObject;
3594
+
34713595 //com.sun.opengl.util.texture.Texture
34723596 TextureData
34733597 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3504,6 +3628,8 @@
35043628 // return null;
35053629 //if (i == 2)
35063630 // return null;
3631
+ // TIFF issue sept 2019
3632
+ System.err.println("lastObject = " + lastObject);
35073633 e.printStackTrace();
35083634 name = name.split("\\.tif")[0] + ".jpg";
35093635 }
....@@ -3511,6 +3637,8 @@
35113637
35123638 System.out.println("LOADING TEXTURE : " + name);
35133639
3640
+ Object x = texturedata.getMipmapData(); // .getBuffer();
3641
+
35143642 //
35153643 if (false) // compressbit > 0)
35163644 {
....@@ -6834,30 +6962,30 @@
68346962 short residu = 0;
68356963
68366964 // wraparound workarounds
6837
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
68386966 /*
6839
- residu += (fuck%2);
6840
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
68416969 {
6842
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
68436971 if(residu == 2)
68446972 residu = 0;
68456973 }
68466974 else
68476975 {
68486976 residu = 0;
6849
- fuck /= 2;
6977
+ ww /= 2;
68506978 }
68516979 */
6852
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
68536981 {
6854
- fuck /= 2;
6982
+ ww /= 2;
68556983 } else
68566984 {
6857
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
68586986 }
68596987
6860
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
68616989 }
68626990 //System.out.print(bytes[i] + " ");
68636991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -7909,7 +8037,7 @@
79098037 String pigment = Object3D.GetPigment(tex);
79108038 String bump = Object3D.GetBump(tex);
79118039
7912
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8040
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79138041 {
79148042 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79158043 // System.out.println("; bump = " + bump);
....@@ -7924,8 +8052,8 @@
79248052 pigment = null;
79258053 }
79268054
7927
- ReleaseTexture(bump, true);
7928
- ReleaseTexture(pigment, false);
8055
+ ReleaseTexture(tex, true);
8056
+ ReleaseTexture(tex, false);
79298057 }
79308058
79318059 public void ReleasePigmentTexture(cTexture tex) // INTERFACE
....@@ -7943,7 +8071,7 @@
79438071
79448072 String pigment = Object3D.GetPigment(tex);
79458073
7946
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8074
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79478075 {
79488076 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79498077 // System.out.println("; bump = " + bump);
....@@ -7954,7 +8082,7 @@
79548082 pigment = null;
79558083 }
79568084
7957
- ReleaseTexture(pigment, false);
8085
+ ReleaseTexture(tex, false);
79588086 }
79598087
79608088 public void ReleaseBumpTexture(cTexture tex) // INTERFACE
....@@ -7972,7 +8100,7 @@
79728100
79738101 String bump = Object3D.GetBump(tex);
79748102
7975
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8103
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79768104 {
79778105 // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
79788106 // System.out.println("; bump = " + bump);
....@@ -7983,10 +8111,10 @@
79838111 bump = null;
79848112 }
79858113
7986
- ReleaseTexture(bump, true);
8114
+ ReleaseTexture(tex, true);
79878115 }
79888116
7989
- void ReleaseTexture(String tex, boolean bump)
8117
+ void ReleaseTexture(cTexture tex, boolean bump)
79908118 {
79918119 if (// DrawMode() != 0 || /*tex == null ||*/
79928120 ambientOcclusion ) // || !textureon)
....@@ -7997,7 +8125,7 @@
79978125 CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
79988126
79998127 if (tex != null)
8000
- texture = textures.get(tex);
8128
+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
80018129
80028130 // //assert( texture != null );
80038131 // if (texture == null)
....@@ -8091,47 +8219,50 @@
80918219
80928220 /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80938221 {
8094
- if (// DrawMode() != 0 || /*tex == null ||*/
8095
- ambientOcclusion ) // || !textureon)
8096
- {
8097
- return; // false;
8098
- }
8099
-
8100
- if (tex == null)
8101
- {
8102
- BindTexture(null,false,resolution);
8103
- BindTexture(null,true,resolution);
8104
- return;
8105
- }
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;
81068263
8107
- String pigment = Object3D.GetPigment(tex);
8108
- String bump = Object3D.GetBump(tex);
8109
-
8110
- usedtextures.put(pigment, pigment);
8111
- usedtextures.put(bump, bump);
8112
-
8113
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8114
- {
8115
- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8116
- // System.out.println("; bump = " + bump);
8117
- }
8118
-
8119
- if (bump.equals(""))
8120
- {
8121
- bump = null;
8122
- }
8123
- if (pigment.equals(""))
8124
- {
8125
- pigment = null;
8126
- }
8127
-
8128
- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8129
- BindTexture(pigment, false, resolution);
8130
- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8131
- BindTexture(bump, true, resolution);
8132
- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8133
-
8134
- return; // true;
8264
+ BindPigmentTexture(tex, resolution);
8265
+ BindBumpTexture(tex, resolution);
81358266 }
81368267
81378268 /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
....@@ -8150,9 +8281,9 @@
81508281
81518282 String pigment = Object3D.GetPigment(tex);
81528283
8153
- usedtextures.put(pigment, pigment);
8284
+ usedtextures.add(tex);
81548285
8155
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8286
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
81568287 {
81578288 // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
81588289 // System.out.println("; bump = " + bump);
....@@ -8164,7 +8295,7 @@
81648295 }
81658296
81668297 GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167
- BindTexture(pigment, false, resolution);
8298
+ BindTexture(tex, false, resolution);
81688299 }
81698300
81708301 /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
....@@ -8183,9 +8314,9 @@
81838314
81848315 String bump = Object3D.GetBump(tex);
81858316
8186
- usedtextures.put(bump, bump);
8317
+ usedtextures.add(tex);
81878318
8188
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8319
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
81898320 {
81908321 // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
81918322 // System.out.println("; bump = " + bump);
....@@ -8197,7 +8328,7 @@
81978328 }
81988329
81998330 GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200
- BindTexture(bump, true, resolution);
8331
+ BindTexture(tex, true, resolution);
82018332 GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
82028333 }
82038334
....@@ -8221,13 +8352,19 @@
82218352 return fileExists;
82228353 }
82238354
8224
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8355
+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
82258356 {
8226
- CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
8357
+ CacheTexture texturecache = null;
82278358
82288359 if (tex != null)
82298360 {
8230
- 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
+ }
82318368
82328369 String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
82338370
....@@ -8237,19 +8374,46 @@
82378374 // else
82388375 // if (!texname.startsWith("/"))
82398376 // texname = "/Users/nbriere/Textures/" + texname;
8240
- if (!FileExists(tex))
8377
+ if (!FileExists(texname) && !texname.startsWith("@"))
82418378 {
82428379 texname = fallbackTextureName;
82438380 }
82448381
82458382 if (CACHETEXTURE)
8246
- texture = textures.get(texname); // TEXTURE CACHE
8247
-
8248
- TextureData texturedata = null;
8249
-
8250
- if (texture == null || texture.resolution < resolution)
82518383 {
8252
- 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(""))
82538417 {
82548418 assert(!bump);
82558419 // if (bump)
....@@ -8260,19 +8424,23 @@
82608424 // }
82618425 // else
82628426 // {
8263
- texture = textures.get(tex);
8264
- if (texture == null)
8427
+ // texturecache = textures.get(texname); // suspicious
8428
+ if (texturecache == null)
82658429 {
8266
- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8430
+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
82678431 }
8432
+ else
8433
+ new Exception().printStackTrace();
82688434 // }
82698435 } else
8270
- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
8436
+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
82718437 {
82728438 assert(bump);
8273
- texture = textures.get(tex);
8274
- if (texture == null)
8275
- 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();
82768444 } else
82778445 {
82788446 //if (tex.equals("IMMORTAL"))
....@@ -8280,11 +8448,22 @@
82808448 // texture = GetResourceTexture("default.png");
82818449 //} else
82828450 //{
8283
- if (tex.equals("WHITE_NOISE"))
8451
+ if (texname.endsWith("WHITE_NOISE"))
82848452 {
8285
- texture = textures.get(tex);
8286
- if (texture == null)
8287
- 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();
82888467 } else
82898468 {
82908469 if (textureon)
....@@ -8343,19 +8522,20 @@
83438522 if (texturedata == null)
83448523 throw new Exception();
83458524
8346
- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8525
+ texturecache = new CacheTexture(texturedata,resolution);
83478526 //texture = GetTexture(tex, bump);
83488527 }
8528
+ }
83498529 }
83508530 //}
83518531 }
83528532
8353
- if (/*CACHETEXTURE &&*/ texture != null && textureon)
8533
+ if (texdata == null && /*CACHETEXTURE &&*/ texturecache != null && textureon)
83548534 {
83558535 //return false;
83568536
83578537 // System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8358
- if (texturedata != null && (texname.endsWith(".jpg") || texname.endsWith(".JPG")))
8538
+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
83598539 {
83608540 // String ext = "_highres";
83618541 // if (REDUCETEXTURE)
....@@ -8372,52 +8552,17 @@
83728552 File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
83738553 if (!cachefile.exists())
83748554 {
8375
- // cache to disk
8376
- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8377
- //buffers[0].
8378
-
8379
- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8380
- int[] pixels = new int[bytebuf.capacity()/3];
8381
-
8382
- // squared size heuristic...
8383
- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
8555
+ //if (texturedata.getWidth() == texturedata.getHeight())
83848556 {
8385
- for (int i=pixels.length; --i>=0;)
8386
- {
8387
- int i3 = i*3;
8388
- pixels[i] = 0xFF;
8389
- pixels[i] <<= 8;
8390
- pixels[i] |= bytebuf.get(i3+2) & 0xFF;
8391
- pixels[i] <<= 8;
8392
- pixels[i] |= bytebuf.get(i3+1) & 0xFF;
8393
- pixels[i] <<= 8;
8394
- pixels[i] |= bytebuf.get(i3) & 0xFF;
8395
- }
8396
-
8397
- /*
8398
- int r=0,g=0,b=0,a=0;
8399
- for (int i=0; i<width; i++)
8400
- for (int j=0; j<height; j++)
8401
- {
8402
- int index = j*width+i;
8403
- int p = pixels[index];
8404
- a = ((p>>24) & 0xFF);
8405
- r = ((p>>16) & 0xFF);
8406
- g = ((p>>8) & 0xFF);
8407
- b = (p & 0xFF);
8408
- pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
8409
- }
8410
- /**/
8411
- int width = (int)Math.sqrt(pixels.length); // squared
8412
- int height = width;
8413
- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8414
- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
8557
+ BufferedImage rendImage = CreateBim(texturedata);
8558
+
84158559 ImageWriter writer = null;
84168560 Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
84178561 if (iter.hasNext()) {
84188562 writer = (ImageWriter)iter.next();
84198563 }
8420
- float compressionQuality = 0.9f;
8564
+
8565
+ float compressionQuality = 0.85f;
84218566 try
84228567 {
84238568 ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
....@@ -8434,18 +8579,20 @@
84348579 }
84358580 }
84368581 }
8437
-
8582
+
8583
+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
8584
+
84388585 //System.out.println("Texture = " + tex);
8439
- if (textures.containsKey(texname))
8586
+ if (textures.containsKey(tex))
84408587 {
8441
- CacheTexture thetex = textures.get(texname);
8588
+ CacheTexture thetex = textures.get(tex);
84428589 thetex.texture.disable();
84438590 thetex.texture.dispose();
8444
- textures.remove(texname);
8591
+ textures.remove(tex);
84458592 }
84468593
8447
- texture.texturedata = texturedata;
8448
- textures.put(texname, texture);
8594
+ //texture.texturedata = texturedata;
8595
+ textures.put(tex, texturecache);
84498596
84508597 // newtex = true;
84518598 }
....@@ -8461,10 +8608,46 @@
84618608 }
84628609 }
84638610
8464
- return texture;
8611
+ return texturecache;
84658612 }
84668613
8467
- 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
84688651 {
84698652 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
84708653
....@@ -8482,21 +8665,21 @@
84828665 return texture!=null?texture.texture:null;
84838666 }
84848667
8485
- 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
84868669 {
84878670 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
84888671
84898672 return texture!=null?texture.texturedata:null;
84908673 }
84918674
8492
- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8675
+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
84938676 {
84948677 if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
84958678 {
84968679 return false;
84978680 }
84988681
8499
- boolean newtex = false;
8682
+ //boolean newtex = false;
85008683
85018684 com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
85028685
....@@ -8528,9 +8711,75 @@
85288711 texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
85298712 texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
85308713
8531
- return newtex;
8714
+ return true; // Warning: not used.
85328715 }
85338716
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
+
85348783 ShadowBuffer shadowPBuf;
85358784 AntialiasBuffer antialiasPBuf;
85368785 int MAXSTACK;
....@@ -8547,10 +8796,12 @@
85478796
85488797 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
85498798 MAXSTACK = temp[0];
8550
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
85518801 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
85528802 MAXSTACK = temp[0];
8553
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8803
+ if (Globals.DEBUG)
8804
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
85548805
85558806 // Use debug pipeline
85568807 //drawable.setGL(new DebugGL(gl)); //
....@@ -8558,7 +8809,8 @@
85588809 gl = drawable.getGL(); //
85598810
85608811 GL gl3 = getGL();
8561
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8812
+ if (Globals.DEBUG)
8813
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
85628814
85638815
85648816 //float pos[] = { 100, 100, 100, 0 };
....@@ -8723,7 +8975,7 @@
87238975
87248976 if (cubemap == null)
87258977 {
8726
- LoadEnvy(5);
8978
+ //LoadEnvy(1);
87278979 }
87288980
87298981 //cubemap.enable();
....@@ -8999,6 +9251,8 @@
89999251
90009252 void LoadEnvy(int which)
90019253 {
9254
+ assert(false);
9255
+
90029256 String name;
90039257 String ext;
90049258
....@@ -9010,37 +9264,58 @@
90109264 cubemap = null;
90119265 return;
90129266 case 1:
9013
- name = "cubemaps/box_";
9014
- ext = "png";
9267
+ name = "cubemaps/rgb/";
9268
+ ext = "jpg";
90159269 reverseUP = false;
90169270 break;
90179271 case 2:
9018
- name = "cubemaps/uffizi_";
9019
- ext = "png";
9020
- break; // reverseUP = true; break;
9272
+ name = "cubemaps/uffizi/";
9273
+ ext = "jpg";
9274
+ reverseUP = false;
9275
+ break;
90219276 case 3:
9022
- name = "cubemaps/CloudyHills_";
9023
- ext = "tga";
9277
+ name = "cubemaps/CloudyHills/";
9278
+ ext = "jpg";
90249279 reverseUP = false;
90259280 break;
90269281 case 4:
9027
- name = "cubemaps/cornell_";
9282
+ name = "cubemaps/cornell/";
90289283 ext = "png";
90299284 reverseUP = false;
90309285 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;
90319311 default:
9032
- name = "cubemaps/rgb_";
9033
- ext = "png"; /*mipmap = true;*/ reverseUP = false;
9312
+ name = "cubemaps/box/";
9313
+ ext = "png"; /*mipmap = true;*/
9314
+ reverseUP = false;
90349315 break;
90359316 }
9036
-
9037
- try
9038
- {
9039
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9040
- } catch (IOException e)
9041
- {
9042
- throw new RuntimeException(e);
9043
- }
9317
+
9318
+ LoadSkybox(name, ext, mipmap);
90449319 }
90459320
90469321 public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -9072,8 +9347,12 @@
90729347 static double[] model = new double[16];
90739348 double[] camera2light = new double[16];
90749349 double[] light2camera = new double[16];
9075
- int newenvy = -1;
9076
- boolean envyoff = true; // false;
9350
+
9351
+ //int newenvy = -1;
9352
+ //boolean envyoff = false;
9353
+
9354
+ String loadedskyboxname;
9355
+
90779356 cVector light0 = new cVector(0, 0, 0); // 1,3,2);
90789357 //float[] light0 = { 0,0,0 };
90799358 cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9366,11 +9645,35 @@
93669645 jy8[3] = 0.5f;
93679646 }
93689647
9369
- 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
93709649 float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
93719650 float[] options3 = new float[]{1, 1, 1, 0}; // fog color
93729651 float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
93739652
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
+
93749677 static int imagecount = 0; // movie generation
93759678
93769679 static int jitter = 0;
....@@ -9467,7 +9770,7 @@
94679770
94689771 if (renderCamera != lightCamera)
94699772 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9773
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
94719774
94729775 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
94739776
....@@ -9483,7 +9786,7 @@
94839786
94849787 if (renderCamera != lightCamera)
94859788 //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9789
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
94879790
94889791 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
94899792
....@@ -9529,13 +9832,18 @@
95299832 rati = 1 / rati;
95309833 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
95319834 }
9532
- assert (newenvy == -1);
9835
+
9836
+ //assert (newenvy == -1);
9837
+
95339838 gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
95349839 gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9535
- DrawSkyBox(gl);
9840
+ DrawSkyBox(gl, (float)rati);
95369841 gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
95379842 gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9538
- accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+
9844
+ boolean vr = capsLocked && !lightMode;
9845
+
9846
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
95399847 ratio,
95409848 //near_plane, far_plane,
95419849 renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10398,9 +10706,18 @@
1039810706 static boolean init = false;
1039910707
1040010708 double[][] matrix = LA.newMatrix();
10709
+
10710
+ // This is to refresh the UI of the material panel.
10711
+ ObjEditor patchMaterial;
1040110712
1040210713 public void display(GLAutoDrawable drawable)
1040310714 {
10715
+ if (patchMaterial.patchMaterial)
10716
+ {
10717
+ patchMaterial.patchMaterial = false;
10718
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
10719
+ }
10720
+
1040410721 if (Grafreed.savesound && Grafreed.hassound)
1040510722 {
1040610723 Grafreed.wav.save();
....@@ -10444,7 +10761,9 @@
1044410761 }
1044510762 /**/
1044610763
10447
- if (selection)
10764
+ boolean control = ((modifiers & CTRL) != 0);
10765
+
10766
+ if (selection && (!Globals.isLIVE() || control))
1044810767 {
1044910768 selectbuffer.display();
1045010769 return;
....@@ -10481,6 +10800,7 @@
1048110800 ANTIALIAS = 0;
1048210801 //System.out.println("RESTART");
1048310802 AAtimer.restart();
10803
+ Globals.TIMERRUNNING = true;
1048410804 }
1048510805 }
1048610806 }
....@@ -10495,6 +10815,112 @@
1049510815
1049610816 if (DrawMode() == DEFAULT)
1049710817 {
10818
+ if (manipCamera == lightCamera)
10819
+ {
10820
+// switch (e.getKeyCode())
10821
+// {
10822
+// case DOWN_ARROW:
10823
+// lightCamera.DECAL /= 2;
10824
+// repaint();
10825
+// break;
10826
+// case UP_ARROW:
10827
+// lightCamera.DECAL *= 2;
10828
+// repaint();
10829
+// break;
10830
+// case LEFT_ARROW:
10831
+// lightCamera.SCALE /= 2;
10832
+// repaint();
10833
+// break;
10834
+// case RIGHT_ARROW:
10835
+// lightCamera.SCALE *= 2;
10836
+// repaint();
10837
+// break;
10838
+// default:
10839
+// break;
10840
+ if (keys[DOWN_ARROW])
10841
+ {
10842
+ lightCamera.DECAL /= 2;
10843
+ }
10844
+
10845
+ if (keys[UP_ARROW])
10846
+ {
10847
+ lightCamera.DECAL *= 2;
10848
+ }
10849
+
10850
+ if (keys[LEFT_ARROW])
10851
+ {
10852
+ lightCamera.SCALE /= 2;
10853
+ }
10854
+
10855
+ if (keys[RIGHT_ARROW])
10856
+ {
10857
+ lightCamera.SCALE *= 2;
10858
+ }
10859
+ }
10860
+ else
10861
+ {
10862
+ //pingthread.mute = true;
10863
+
10864
+ boolean keyon = false;
10865
+
10866
+ if (keys[DOWN_ARROW])
10867
+ {
10868
+ speed = ++speedkey[DOWN_ARROW];
10869
+ if (speed > 20)
10870
+ speed = 20;
10871
+ GoDown(modifiers);
10872
+ keyon = true;
10873
+ }
10874
+ else
10875
+ speedkey[DOWN_ARROW] = 0;
10876
+
10877
+ if (keys[UP_ARROW])
10878
+ {
10879
+ speed = ++speedkey[UP_ARROW];
10880
+ if (speed > 20)
10881
+ speed = 20;
10882
+ GoUp(modifiers);
10883
+ keyon = true;
10884
+ }
10885
+ else
10886
+ speedkey[UP_ARROW] = 0;
10887
+
10888
+ if (keys[LEFT_ARROW])
10889
+ {
10890
+ speed = ++speedkey[LEFT_ARROW];
10891
+ if (speed > 20)
10892
+ speed = 20;
10893
+ GoLeft(modifiers);
10894
+ keyon = true;
10895
+ }
10896
+ else
10897
+ speedkey[LEFT_ARROW] = 0;
10898
+
10899
+ if (keys[RIGHT_ARROW])
10900
+ {
10901
+ speed = ++speedkey[RIGHT_ARROW];
10902
+ if (speed > 20)
10903
+ speed = 20;
10904
+ GoRight(modifiers);
10905
+ keyon = true;
10906
+ }
10907
+ else
10908
+ speedkey[RIGHT_ARROW] = 0;
10909
+
10910
+ if (Globals.WALK && capsLocked)
10911
+ {
10912
+ Walk();
10913
+ keyon = true;
10914
+ }
10915
+
10916
+ if (keyon)
10917
+ {
10918
+ repaint();
10919
+ }
10920
+
10921
+ //pingthread.mute = false;
10922
+ }
10923
+
1049810924 currentlydrawing = true;
1049910925 }
1050010926
....@@ -10548,7 +10974,8 @@
1054810974 ambientOcclusion = false;
1054910975 }
1055010976
10551
- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10977
+ if (//Globals.lighttouched &&
10978
+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1055210979 {
1055310980 //if (RENDERSHADOW) // ?
1055410981 if (!IsFrozen())
....@@ -10567,7 +10994,7 @@
1056710994
1056810995 if (wait)
1056910996 {
10570
- Sleep(500);
10997
+ Sleep(200); // blocks everything
1057110998
1057210999 wait = false;
1057311000 }
....@@ -10682,7 +11109,7 @@
1068211109 // if (parentcam != renderCamera) // not a light
1068311110 if (cam != lightCamera)
1068411111 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10685
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11112
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1068611113
1068711114 for (int j = 0; j < 4; j++)
1068811115 {
....@@ -10697,7 +11124,7 @@
1069711124 // if (parentcam != renderCamera) // not a light
1069811125 if (cam != lightCamera)
1069911126 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10700
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11127
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1070111128
1070211129 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1070311130
....@@ -10783,13 +11210,43 @@
1078311210 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1078411211 }
1078511212
10786
- if (newenvy > -1)
11213
+// if (newenvy > -1)
11214
+// {
11215
+// LoadEnvy(newenvy);
11216
+// }
11217
+//
11218
+// newenvy = -1;
11219
+
11220
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1078711221 {
10788
- LoadEnvy(newenvy);
11222
+ if (cubemaprgb == null)
11223
+ {
11224
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11225
+ }
11226
+
11227
+ cubemap = cubemaprgb;
1078911228 }
10790
-
10791
- newenvy = -1;
10792
-
11229
+ else
11230
+ {
11231
+ if (object.skyboxname != null)
11232
+ {
11233
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11234
+ {
11235
+ if (cubemap != null && cubemap != cubemaprgb)
11236
+ cubemap.dispose();
11237
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11238
+ loadedskyboxname = object.skyboxname;
11239
+ }
11240
+ }
11241
+ else
11242
+ {
11243
+ cubemapcustom = null;
11244
+ loadedskyboxname = null;
11245
+ }
11246
+
11247
+ cubemap = cubemapcustom;
11248
+ }
11249
+
1079311250 ratio = ((double) getWidth()) / getHeight();
1079411251 //System.out.println("ratio = " + ratio);
1079511252
....@@ -10805,7 +11262,7 @@
1080511262
1080611263 if (!IsFrozen() && !ambientOcclusion)
1080711264 {
10808
- DrawSkyBox(gl);
11265
+ DrawSkyBox(gl, (float)ratio);
1080911266 }
1081011267
1081111268 //if (selection_view == -1)
....@@ -10988,8 +11445,8 @@
1098811445
1098911446 gl.glMatrixMode(GL.GL_MODELVIEW);
1099011447
10991
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1099211448 //gl.glEnable(gl.GL_POLYGON_SMOOTH);
11449
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1099311450 //gl.glEnable(gl.GL_MULTISAMPLE);
1099411451 } else
1099511452 {
....@@ -11001,7 +11458,7 @@
1100111458 //System.out.println("BLENDING ON");
1100211459 gl.glEnable(GL.GL_BLEND);
1100311460 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11004
-
11461
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1100511462 gl.glMatrixMode(gl.GL_PROJECTION);
1100611463 gl.glLoadIdentity();
1100711464
....@@ -11051,7 +11508,10 @@
1105111508 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1105211509 } else
1105311510 {
11054
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11511
+ boolean vr = capsLocked && !lightMode;
11512
+
11513
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11514
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1105511515 }
1105611516 }
1105711517
....@@ -11091,7 +11551,7 @@
1109111551
1109211552 // if (cam != lightCamera)
1109311553 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11094
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11554
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1109511555 }
1109611556
1109711557 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11250,7 +11710,7 @@
1125011710 }
1125111711 }
1125211712
11253
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11713
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1125411714 {
1125511715 //gl.glDepthFunc(GL.GL_LEQUAL);
1125611716 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11258,24 +11718,21 @@
1125811718
1125911719 boolean texon = textureon;
1126011720
11261
- if (RENDERPROGRAM > 0)
11262
- {
11263
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11264
- textureon = false;
11265
- }
11721
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11722
+ textureon = false;
11723
+
1126611724 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1126711725 //System.out.println("ALLO");
1126811726 gl.glColorMask(false, false, false, false);
1126911727 DrawObject(gl);
11270
- if (RENDERPROGRAM > 0)
11271
- {
11272
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11273
- textureon = texon;
11274
- }
11728
+
11729
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11730
+ textureon = texon;
11731
+
1127511732 gl.glColorMask(true, true, true, true);
1127611733
1127711734 gl.glDepthFunc(GL.GL_EQUAL);
11278
- //gl.glDepthMask(false);
11735
+ gl.glDepthMask(false);
1127911736 }
1128011737
1128111738 if (false) // DrawMode() == SHADOW)
....@@ -11410,8 +11867,11 @@
1141011867 repaint();
1141111868 }
1141211869
11413
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11870
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11871
+ {
11872
+ renderCamera.computeTransform();
1141411873 repaint();
11874
+ }
1141511875
1141611876 displaydone = true;
1141711877 }
....@@ -11458,7 +11918,7 @@
1145811918
1145911919 static boolean zoomonce = false;
1146011920
11461
- void CreateSelectedPoint()
11921
+ static void CreateSelectedPoint()
1146211922 {
1146311923 if (selectedpoint == null)
1146411924 {
....@@ -11478,14 +11938,31 @@
1147811938
1147911939 void DrawObject(GL gl, boolean draw)
1148011940 {
11941
+ // To clear camera values
11942
+ ResetOptions();
11943
+
1148111944 //System.out.println("DRAW OBJECT " + mouseDown);
1148211945 // DrawMode() = SELECTION;
1148311946 //GL gl = getGL();
1148411947 if ((TRACK || SHADOWTRACK) || zoomonce)
1148511948 {
11949
+ if (TRACK)
11950
+ {
11951
+ if (object.selection != null &&
11952
+ object.selection.size() > 0 &&
11953
+ object.selection.elementAt(0) != null &&
11954
+ !(object.selection.elementAt(0) instanceof Camera) &&
11955
+ !(object.selection.elementAt(0) instanceof ScriptNode))
11956
+ {
11957
+ trackedobject = object.selection.elementAt(0);
11958
+ //repaint();
11959
+ }
11960
+ else
11961
+ trackedobject = null;
11962
+ }
1148611963 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11487
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11488
- pingthread.StepToTarget(true); // true);
11964
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11965
+ pingthread.StepToTarget(); // true);
1148911966 // zoomonce = false;
1149011967 }
1149111968
....@@ -11612,20 +12089,32 @@
1161212089 ReleaseTextures(DEFAULT_TEXTURES);
1161312090
1161412091 if (CLEANCACHE)
11615
- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
12092
+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
1161612093 {
11617
- String tex = e.nextElement();
12094
+ cTexture tex = e.nextElement();
1161812095
1161912096 // System.out.println("Texture --------- " + tex);
1162012097
11621
- if (tex.equals("WHITE_NOISE"))
12098
+ if (tex.equals("WHITE_NOISE:"))
1162212099 continue;
1162312100
11624
- if (!usedtextures.containsKey(tex))
12101
+ if (!usedtextures.contains(tex))
1162512102 {
12103
+ CacheTexture gettex = texturepigment.get(tex);
1162612104 // System.out.println("DISPOSE +++++++++++++++ " + tex);
11627
- textures.get(tex).texture.dispose();
11628
- textures.remove(tex);
12105
+ if (gettex != null)
12106
+ {
12107
+ gettex.texture.dispose();
12108
+ texturepigment.remove(tex);
12109
+ }
12110
+
12111
+ gettex = texturebump.get(tex);
12112
+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
12113
+ if (gettex != null)
12114
+ {
12115
+ gettex.texture.dispose();
12116
+ texturebump.remove(tex);
12117
+ }
1162912118 }
1163012119 }
1163112120 }
....@@ -12045,7 +12534,7 @@
1204512534 for (int i = tp.size(); --i >= 0;)
1204612535 {
1204712536 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12048
- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12537
+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1204912538 }
1205012539
1205112540
....@@ -12153,8 +12642,82 @@
1215312642
1215412643 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1215512644
12156
- String program =
12645
+ String programmin =
12646
+ // Min shader
1215712647 "!!ARBfp1.0\n" +
12648
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
12649
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
12650
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12651
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12652
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12653
+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
12654
+ "PARAM light2cam0 = program.env[10];" +
12655
+ "PARAM light2cam1 = program.env[11];" +
12656
+ "PARAM light2cam2 = program.env[12];" +
12657
+ "TEMP temp;" +
12658
+ "TEMP light;" +
12659
+ "TEMP ndotl;" +
12660
+ "TEMP normal;" +
12661
+ "TEMP depth;" +
12662
+ "TEMP eye;" +
12663
+ "TEMP pos;" +
12664
+
12665
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12666
+ Normalize("normal") +
12667
+ "MOV light, state.light[0].position;" +
12668
+ "DP3 ndotl.x, light, normal;" +
12669
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12670
+
12671
+ // shadow
12672
+ "MOV pos, fragment.texcoord[1];" +
12673
+ "MOV temp, pos;" +
12674
+ ShadowTextureFetch("depth", "temp", "1") +
12675
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12676
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12677
+
12678
+ // No shadow when out of frustum
12679
+ //"SGE temp.y, depth.z, zero123.y;" +
12680
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12681
+
12682
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12683
+
12684
+ // Backlit
12685
+ "MOV pos.w, zero12t.y;" + // one
12686
+ "DP4 eye.x, pos, light2cam0;" +
12687
+ "DP4 eye.y, pos, light2cam1;" +
12688
+ "DP4 eye.z, pos, light2cam2;" +
12689
+ Normalize("eye") +
12690
+
12691
+ "DP3 ndotl.y, -eye, normal;" +
12692
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
12693
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12694
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12695
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12696
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
12697
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
12698
+ "ADD ndotl.y, ndotl.y, one.x;" +
12699
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12700
+
12701
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12702
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12703
+
12704
+ // Pigment
12705
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12706
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12707
+ "MUL temp, temp, zero12t.w;" + // Times x
12708
+
12709
+ //"MUL temp, temp, ndotl.y;" +
12710
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12711
+
12712
+ "MUL temp, temp, ndotl.x;" + // lambert
12713
+
12714
+ "MOV temp.w, zero12t.y;" + // reset alpha
12715
+ "MOV result.color, temp;" +
12716
+ "END";
12717
+
12718
+ String programmax =
12719
+ "!!ARBfp1.0\n" +
12720
+
1215812721 //"OPTION ARB_fragment_program_shadow;" +
1215912722 "PARAM light2cam0 = program.env[10];" +
1216012723 "PARAM light2cam1 = program.env[11];" +
....@@ -12180,7 +12743,7 @@
1218012743 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1218112744 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1218212745 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12183
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12746
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1218412747 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1218512748 "PARAM options1 = program.env[62];" + // fog rgb color
1218612749 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12269,8 +12832,7 @@
1226912832 "TEMP shininess;" +
1227012833 "\n" +
1227112834 "MOV texSamp, one;" +
12272
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12273
-
12835
+
1227412836 "MOV mapgrid.x, one2048th.x;" +
1227512837 "MOV temp, fragment.texcoord[1];" +
1227612838 /*
....@@ -12291,20 +12853,20 @@
1229112853 "MUL temp, floor, mapgrid.x;" +
1229212854 //"TEX depth0, temp, texture[1], 2D;" +
1229312855 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12294
- TextureFetch("depth0", "temp", "1") +
12856
+ ShadowTextureFetch("depth0", "temp", "1") +
1229512857 "") +
1229612858 "ADD temp.x, temp.x, mapgrid.x;" +
1229712859 //"TEX depth1, temp, texture[1], 2D;" +
1229812860 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12299
- TextureFetch("depth1", "temp", "1") +
12861
+ ShadowTextureFetch("depth1", "temp", "1") +
1230012862 "") +
1230112863 "ADD temp.y, temp.y, mapgrid.x;" +
1230212864 //"TEX depth2, temp, texture[1], 2D;" +
12303
- TextureFetch("depth2", "temp", "1") +
12865
+ ShadowTextureFetch("depth2", "temp", "1") +
1230412866 "SUB temp.x, temp.x, mapgrid.x;" +
1230512867 //"TEX depth3, temp, texture[1], 2D;" +
1230612868 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12307
- TextureFetch("depth3", "temp", "1") +
12869
+ ShadowTextureFetch("depth3", "temp", "1") +
1230812870 "") +
1230912871 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1231012872 //"MOV params, material;" +
....@@ -12426,7 +12988,7 @@
1242612988 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1242712989 // mar 2013 ??? "KIL alpha.a;" +
1242812990 "MOV alpha, texSamp.aaaa;" + // y;" +
12429
- "KIL alpha.a;" +
12991
+ "KIL alpha.a;" + // not sure with parallax mapping
1243012992 /*
1243112993 "MUL temp.xy, temp, two;" +
1243212994 "TXB bump, temp, texture[0], 2D;" +
....@@ -12512,11 +13074,6 @@
1251213074 "SUB bump0, bump0, half;" +
1251313075 "ADD bump, bump, bump0;" +
1251413076
12515
- "MOV temp.x, texSamp.a;" +
12516
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12517
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12518
- "MOV texSamp.a, temp.x;" +
12519
-
1252013077 // double-sided
1252113078 /**/
1252213079 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12526,26 +13083,73 @@
1252613083 "ADD temp.x, temp.x, one.x;" +
1252713084 "MUL normal, normal, temp.xxxx;":""
1252813085 ) +
12529
- /**/
12530
-//// Normalize("normal") +
12531
-//// "MAX normal.z, eps.x, normal.z;" +
12532
-// Normalize("normal") +
12533
- "MOV normald, normal;" +
12534
- "MOV normals, normal;" +
13086
+ /**/
13087
+
13088
+ "MOV temp, fragment.texcoord[4];" +
1253513089
1253613090 // UV base
1253713091 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1253813092 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1253913093 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12540
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12541
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12542
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
13094
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
13095
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
13096
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
13097
+ Normalize("UP") +
13098
+
1254313099 "XPD V, normal, UP;" +
1254413100 Normalize("V") +
1254513101 "XPD U, V, normal;" +
1254613102 Normalize("U") +
1254713103
13104
+ "MOV temp, fragment.texcoord[0];" +
13105
+
13106
+// "MAD normal, -temp.x, U, normal;" +
13107
+// "MAD normal, -temp.y, V, normal;" +
13108
+// Normalize("normal") +
13109
+
13110
+//// "MAX normal.z, eps.x, normal.z;" +
13111
+// Normalize("normal") +
13112
+ "MOV normald, normal;" +
13113
+ "MOV normals, normal;" +
13114
+
1254813115 // parallax mapping
13116
+
13117
+ "DP3 temp2.x, V, eye;" +
13118
+ "DP3 temp2.y, U, eye;" +
13119
+ "DP3 temp2.z, normal, eye;" +
13120
+ "RCP temp2.z, temp2.z;" +
13121
+
13122
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
13123
+ "RSQ temp2.w, temp2.w;" +
13124
+ "RCP temp2.w, temp2.w;" +
13125
+
13126
+ "SUB temp2.w, temp2.w, half;" +
13127
+ // "SGE temp.x, temp2.w, eps.x;" +
13128
+ // "MUL temp2.w, temp2.w, temp.x;" +
13129
+
13130
+ // "MOV texSamp, U;" +
13131
+
13132
+ "MUL temp2.z, temp2.z, temp2.w;" +
13133
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
13134
+
13135
+ "MUL temp2, temp2, temp2.z;" +
13136
+
13137
+ "SUB temp, temp, temp2;" +
13138
+
13139
+ "TEX temp, temp, texture[0], 2D;" +
13140
+ "POW temp.a, temp.a, params6.w;" + // punch through
13141
+
13142
+ "ADD texSamp, temp, texSamp;" +
13143
+ "MUL texSamp.xyz, half, texSamp;" +
13144
+
13145
+ "MOV alpha, texSamp.aaaa;" +
13146
+
13147
+// parallax mapping
13148
+
13149
+ "MOV temp.x, texSamp.a;" +
13150
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13151
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
13152
+ "MOV texSamp.a, temp.x;" +
1254913153
1255013154 //"MOV temp, fragment.texcoord[0];" +
1255113155 //
....@@ -12675,10 +13279,10 @@
1267513279 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1267613280 "") +
1267713281
12678
- // display shadow only (bump == 0)
13282
+ // display shadow only (fakedepth == 0)
1267913283 "SUB temp.x, half.x, shadow.x;" +
1268013284 "MOV temp.y, -params5.z;" + // params6.x;" +
12681
- "SLT temp.z, temp.y, -one2048th.x;" +
13285
+ "SLT temp.z, temp.y, -c256i.x;" +
1268213286 "SUB temp.y, one.x, temp.z;" +
1268313287 "MUL temp.x, temp.x, temp.y;" +
1268413288 "KIL temp.x;" +
....@@ -13009,8 +13613,19 @@
1300913613 //once = true;
1301013614 }
1301113615
13012
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13013
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13616
+ String program = programmax;
13617
+
13618
+ if (Globals.MINSHADER)
13619
+ {
13620
+ program = programmin;
13621
+ }
13622
+
13623
+ if (Globals.DEBUG)
13624
+ {
13625
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13626
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13627
+ }
13628
+
1301413629 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1301513630
1301613631 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13057,7 +13672,8 @@
1305713672 "\n" +
1305813673 "END\n";
1305913674
13060
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13675
+ if (Globals.DEBUG)
13676
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1306113677 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1306213678
1306313679 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13102,25 +13718,26 @@
1310213718 return out;
1310313719 }
1310413720
13105
- String TextureFetch(String dest, String src, String unit)
13721
+ // Also does frustum culling
13722
+ String ShadowTextureFetch(String dest, String src, String unit)
1310613723 {
1310713724 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1310813725 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1310913726 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13727
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13728
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1311013729 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13111
- "SLT " + src + ".z, " + src + ".x, one.x;" +
13112
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13113
- "SLT " + src + ".z, " + src + ".y, one.x;" +
13114
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13730
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13731
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1311513732 //"SWZ buffer, temp, w,w,w,w;";
13116
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13733
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1311713734 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1311813735 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1311913736 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13120
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13737
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1312113738
13122
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13123
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13739
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13740
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1312413741 }
1312513742
1312613743 String Shadow(String depth, String shadow)
....@@ -13167,7 +13784,7 @@
1316713784 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1316813785 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1316913786
13170
- // No shadow when out of frustrum
13787
+ // No shadow when out of frustum
1317113788 "SGE temp.x, " + depth + ".z, one.z;" +
1317213789 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1317313790 "";
....@@ -13314,8 +13931,9 @@
1331413931 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1331513932 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1331613933 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13317
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13318
- Object3D.cVector2[] vector2buffer;
13934
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13935
+
13936
+ //Object3D.cVector2[] vector2buffer;
1331913937
1332013938 // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1332113939 // OUT : diff, spec
....@@ -13331,9 +13949,10 @@
1333113949 "DP3 " + dest + ".z," + "normals," + "eye;" +
1333213950 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1333313951 //"MOV " + dest + ".w," + "normal.z;" +
13334
- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13335
- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13336
- //"MOV " + dest + ".z," + "params2.w;" +
13952
+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13953
+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13954
+
13955
+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
1333713956 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1333813957 "RCP " + dest + ".w," + dest + ".w;" +
1333913958 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13479,7 +14098,7 @@
1347914098 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1348014099 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1348114100 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13482
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14101
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1348314102 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1348414103 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1348514104 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13540,7 +14159,7 @@
1354014159 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1354114160 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1354214161 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13543
- //"MOV result.texcoord, vertex.texcoord;" +
14162
+ //"MOV result.texcoord, vertex.fogcoord;" +
1354414163 "MOV result.texcoord, temp;" +
1354514164 // border fade
1354614165 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13587,7 +14206,9 @@
1358714206
1358814207 //"ADD temp.z, temp.z, one;" +
1358914208
13590
- "MOV result.color, temp;"
14209
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14210
+
14211
+ "MOV result.color, temp;" // Normal
1359114212 : "MOV result.color, vertex.color;") +
1359214213 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1359314214 : "") +
....@@ -13722,6 +14343,7 @@
1372214343 public void mouseClicked(MouseEvent e)
1372314344 {
1372414345 System.out.println("mouseClicked: " + e);
14346
+ System.exit(0);
1372514347 }
1372614348
1372714349 public void mousePressed(MouseEvent e)
....@@ -13760,10 +14382,12 @@
1376014382 return;
1376114383 }
1376214384
13763
- 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;
1376414388
1376514389 // TIMER
13766
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1376714391 {
1376814392 keepboxmode = BOXMODE;
1376914393 keepsupport = SUPPORT;
....@@ -13804,7 +14428,7 @@
1380414428 //}
1380514429
1380614430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13807
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1380814432 anchorX = ax;
1380914433 anchorY = ay;
1381014434 prevX = px;
....@@ -13838,6 +14462,7 @@
1383814462 else
1383914463 if (evt.getSource() == AAtimer)
1384014464 {
14465
+ Globals.TIMERRUNNING = false;
1384114466 if (mouseDown)
1384214467 {
1384314468 //new Exception().printStackTrace();
....@@ -13897,9 +14522,10 @@
1389714522
1389814523 // fev 2014???
1389914524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13900
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13901
- pingthread.StepToTarget(true); // true);
14525
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14526
+ pingthread.StepToTarget(); // true);
1390214527 }
14528
+
1390314529 // if (!LIVE)
1390414530 super.repaint();
1390514531 }
....@@ -13912,6 +14538,7 @@
1391214538 return;
1391314539
1391414540 AAtimer.restart(); //
14541
+ Globals.TIMERRUNNING = true;
1391514542
1391614543 // waslive = LIVE;
1391714544 // LIVE = false;
....@@ -13961,14 +14588,15 @@
1396114588 drag = false;
1396214589 //System.out.println("Mouse DOWN");
1396314590 editObj = false;
13964
- ClickInfo info = new ClickInfo();
13965
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13966
- info.pane = this;
13967
- info.camera = renderCamera;
13968
- info.x = x;
13969
- info.y = y;
13970
- info.modifiers = modifiersex;
13971
- 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);
1397214600 if (!editObj)
1397314601 {
1397414602 hasMarquee = true;
....@@ -13992,8 +14620,8 @@
1399214620
1399314621 //if (drawing)
1399414622 //return;
13995
- if ((e.getModifiersEx() & CTRL) != 0
13996
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1399714625 {
1399814626 //System.out.println("mouseDragged: " + e);
1399914627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14017,9 +14645,17 @@
1401714645 return targetLookAt;
1401814646 }
1401914647
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
+
1402014653 class PingThread extends Thread
1402114654 {
1402214655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute = false;
1402314659
1402414660 // void JumpToTarget()
1402514661 // {
....@@ -14035,6 +14671,95 @@
1403514671 // only one thread!? synchronized
1403614672 void StepToTarget(boolean jump)
1403714673 {
14674
+ RigidBody.pos.x = 0;
14675
+ RigidBody.pos.y = 0;
14676
+ RigidBody.pos.z = 0;
14677
+ if (RigidBody.justclicked)
14678
+ {
14679
+// RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+// RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+// RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683
+ CreateSelectedPoint();
14684
+
14685
+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
14686
+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
14687
+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
14688
+
14689
+ RigidBody.wind.set(RigidBody.pos);
14690
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14691
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14692
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14693
+ RigidBody.wind.normalize();
14694
+ }
14695
+
14696
+ if (mute)
14697
+ return;
14698
+
14699
+ if (capsLocked && manipCamera.viewCode == 0)
14700
+ {
14701
+ eye.x = manipCamera.location.x;
14702
+ eye.y = manipCamera.location.y + 0.25;
14703
+ eye.z = manipCamera.location.z;
14704
+
14705
+ dir.y = -1;
14706
+
14707
+ Ray ray = new Ray(eye, dir);
14708
+
14709
+ IntersectResult res = new IntersectResult();
14710
+ res.t = Double.POSITIVE_INFINITY;
14711
+
14712
+ tmp.set(targetLookAt);
14713
+ tmp.sub(manipCamera.location);
14714
+
14715
+ double dist = tmp.length();
14716
+
14717
+ tmp.normalize();
14718
+
14719
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
14720
+ eye2.y = manipCamera.location.y + 0.25;
14721
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
14722
+
14723
+ Ray ray2 = new Ray(eye2, dir);
14724
+
14725
+ IntersectResult res2 = new IntersectResult();
14726
+ res2.t = Double.POSITIVE_INFINITY;
14727
+
14728
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14729
+ {
14730
+ //tmp.set(manipCamera.location);
14731
+
14732
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14733
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14734
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14735
+
14736
+ //tmp.sub(manipCamera.location);
14737
+
14738
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14739
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14740
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14741
+
14742
+ targetLookAt.sub(manipCamera.location);
14743
+ targetLookAt.normalize();
14744
+ targetLookAt.mul(dist);
14745
+ targetLookAt.add(manipCamera.location);
14746
+
14747
+ //if (tmp.dot(tmp) > 0.000001)
14748
+ // System.out.println("INTERSECTION " + manipCamera.location);
14749
+
14750
+ manipCamera.lookAt.set(targetLookAt);
14751
+
14752
+ tmp.x = res.n.x;
14753
+ tmp.y = res.n.y;
14754
+ tmp.z = res.n.z;
14755
+ tmp.x += res2.n.x;
14756
+ tmp.y += res2.n.y;
14757
+ tmp.z += res2.n.z;
14758
+ tmp.normalize();
14759
+ manipCamera.UP.set(tmp);
14760
+ }
14761
+ }
14762
+
1403814763 tmp.set(targetLookAt);
1403914764 tmp.sub(manipCamera.lookAt); // june 2014
1404014765
....@@ -14072,7 +14797,7 @@
1407214797
1407314798 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1407414799 {
14075
- jump = true; // step = 1;
14800
+ // sep 2019 jump = true; // step = 1;
1407614801 }
1407714802
1407814803 if (OEILONCE && OEIL)
....@@ -14107,7 +14832,10 @@
1410714832 if (tmp.dot(tmp) < 0.00001)
1410814833 {
1410914834 zoomonce = false;
14835
+ live = false;
1411014836 }
14837
+ else
14838
+ live = true;
1411114839
1411214840 tmp.mul(step > step2 ? step : step2);
1411314841 }
....@@ -14134,7 +14862,7 @@
1413414862 {
1413514863 if (LOOKAT)
1413614864 manipCamera.lookAt.add(tmp);
14137
- if (OEIL)
14865
+ if (OEIL && !capsLocked)
1413814866 manipCamera.location.add(tmp);
1413914867
1414014868 {
....@@ -14149,7 +14877,10 @@
1414914877 lightCamera.computeTransform();
1415014878 }
1415114879 }
14152
- manipCamera.computeTransform();
14880
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14881
+ {
14882
+ manipCamera.computeTransform();
14883
+ }
1415314884 }
1415414885 // ?????? mouseDown = true;
1415514886 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14242,49 +14973,107 @@
1424214973 }
1424314974 }
1424414975 }
14976
+
1424514977 PingThread pingthread = new PingThread();
14246
- int delta = 5;
14247
- int speed = 5;
14978
+ int delta = 1;
14979
+ int speed = 1;
14980
+ int walk = 8;
1424814981 boolean autorepeat = false;
1424914982
14983
+ void Walk()
14984
+ {
14985
+ manipCamera.BackForth(0, walk, 1000);
14986
+
14987
+ targetLookAt.set(manipCamera.lookAt);
14988
+ }
14989
+
14990
+ void ViewAngle(float dy)
14991
+ {
14992
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14993
+
14994
+ if (manipCamera.shaper_fovy * factor > 1 &&
14995
+ manipCamera.shaper_fovy * factor < 150)
14996
+ {
14997
+ manipCamera.shaper_fovy *= factor;
14998
+ //System.out.println("fovy = " + shaper_fovy);
14999
+ }
15000
+ }
15001
+
1425015002 void GoDown(int mod)
1425115003 {
1425215004 MODIFIERS |= COMMAND;
14253
- /*
15005
+ boolean isVR = (mouseMode&VR)!=0;
15006
+ /**/
1425415007 if((mod&SHIFT) == SHIFT)
14255
- manipCamera.RotatePosition(0, -speed);
14256
- else
14257
- manipCamera.BackForth(0, -speed*delta, getWidth());
14258
- */
14259
- if ((mod & SHIFT) == SHIFT)
1426015008 {
14261
- mouseMode = mouseMode; // VR??
14262
- } else
14263
- {
14264
- mouseMode |= BACKFORTH;
15009
+// if (isVR)
15010
+// manipCamera.RotateInterest(0, speed);
15011
+// else
15012
+ if (isVR)
15013
+ ViewAngle(-speed*delta);
15014
+ else
15015
+ manipCamera.Translate(0, -speed*delta, getWidth());
1426515016 }
15017
+ else
15018
+ {
15019
+ if (isVR)
15020
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15021
+ else
15022
+ manipCamera.RotatePosition(0, -speed);
15023
+ }
15024
+
15025
+ /**/
15026
+// if ((mod & SHIFT) == SHIFT)
15027
+// {
15028
+// mouseMode = mouseMode; // VR??
15029
+// } else
15030
+// {
15031
+// mouseMode |= BACKFORTH;
15032
+// }
1426615033
15034
+ targetLookAt.set(manipCamera.lookAt);
15035
+
1426715036 //prevX = X = anchorX;
1426815037 prevY = Y = anchorY - (int) (renderCamera.Distance());
1426915038 }
1427015039
1427115040 void GoUp(int mod)
1427215041 {
15042
+ RigidBody.justclicked = true;
15043
+
1427315044 MODIFIERS |= COMMAND;
14274
- /*
15045
+ /**/
15046
+ boolean isVR = (mouseMode&VR)!=0;
15047
+
1427515048 if((mod&SHIFT) == SHIFT)
14276
- manipCamera.RotatePosition(0, speed);
14277
- else
14278
- manipCamera.BackForth(0, speed*delta, getWidth());
14279
- */
14280
- if ((mod & SHIFT) == SHIFT)
1428115049 {
14282
- mouseMode = mouseMode;
14283
- } else
14284
- {
14285
- mouseMode |= BACKFORTH;
15050
+// if (isVR)
15051
+// manipCamera.RotateInterest(0, -speed);
15052
+// else
15053
+ if (isVR)
15054
+ ViewAngle(speed*delta);
15055
+ else
15056
+ manipCamera.Translate(0, speed*delta, getWidth());
1428615057 }
15058
+ else
15059
+ {
15060
+ if (isVR)
15061
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15062
+ else
15063
+ manipCamera.RotatePosition(0, speed);
15064
+ }
15065
+
15066
+ /**/
15067
+// if ((mod & SHIFT) == SHIFT)
15068
+// {
15069
+// mouseMode = mouseMode;
15070
+// } else
15071
+// {
15072
+// mouseMode |= BACKFORTH;
15073
+// }
1428715074
15075
+ targetLookAt.set(manipCamera.lookAt);
15076
+
1428815077 //prevX = X = anchorX;
1428915078 prevY = Y = anchorY + (int) (renderCamera.Distance());
1429015079 }
....@@ -14292,20 +15081,31 @@
1429215081 void GoLeft(int mod)
1429315082 {
1429415083 MODIFIERS |= COMMAND;
14295
- /*
15084
+ /**/
1429615085 if((mod&SHIFT) == SHIFT)
14297
- manipCamera.RotatePosition(speed, 0);
15086
+ manipCamera.Translate(speed, 0, getWidth());
1429815087 else
14299
- manipCamera.Translate(speed*delta, 0, getWidth());
14300
- */
14301
- if ((mod & SHIFT) == SHIFT)
1430215088 {
14303
- mouseMode = mouseMode;
14304
- } else
14305
- {
14306
- mouseMode |= ROTATE;
14307
- } // TRANSLATE;
15089
+ if ((mouseMode&VR)!=0)
15090
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
15091
+ else
15092
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
15093
+ }
15094
+
15095
+ /**/
15096
+// if ((mod & SHIFT) == SHIFT)
15097
+// {
15098
+// mouseMode = mouseMode;
15099
+// } else
15100
+// {
15101
+// mouseMode |= ROTATE;
15102
+// } // TRANSLATE;
1430815103
15104
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15105
+ //System.err.println("location = " + manipCamera.location);
15106
+
15107
+ targetLookAt.set(manipCamera.lookAt);
15108
+
1430915109 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1431015110 prevY = Y = anchorY;
1431115111 }
....@@ -14313,20 +15113,28 @@
1431315113 void GoRight(int mod)
1431415114 {
1431515115 MODIFIERS |= COMMAND;
14316
- /*
15116
+ /**/
1431715117 if((mod&SHIFT) == SHIFT)
14318
- manipCamera.RotatePosition(-speed, 0);
15118
+ manipCamera.Translate(-speed, 0, getWidth());
1431915119 else
14320
- manipCamera.Translate(-speed*delta, 0, getWidth());
14321
- */
14322
- if ((mod & SHIFT) == SHIFT)
1432315120 {
14324
- mouseMode = mouseMode;
14325
- } else
14326
- {
14327
- mouseMode |= ROTATE;
14328
- } // TRANSLATE;
15121
+ if ((mouseMode&VR)!=0)
15122
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
15123
+ else
15124
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
15125
+ }
15126
+
15127
+ /**/
15128
+// if ((mod & SHIFT) == SHIFT)
15129
+// {
15130
+// mouseMode = mouseMode;
15131
+// } else
15132
+// {
15133
+// mouseMode |= ROTATE;
15134
+// } // TRANSLATE;
1432915135
15136
+ targetLookAt.set(manipCamera.lookAt);
15137
+
1433015138 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1433115139 prevY = Y = anchorY;
1433215140 }
....@@ -14368,14 +15176,16 @@
1436815176 if (editObj)
1436915177 {
1437015178 drag = true;
14371
- ClickInfo info = new ClickInfo();
14372
- info.bounds.setBounds(0, 0,
15179
+ //ClickInfo info = new ClickInfo();
15180
+ object.clickInfo.bounds.setBounds(0, 0,
1437315181 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14374
- info.pane = this;
14375
- info.camera = renderCamera;
14376
- info.x = x;
14377
- info.y = y;
14378
- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
15182
+ object.clickInfo.pane = this;
15183
+ object.clickInfo.camera = renderCamera;
15184
+ object.clickInfo.x = x;
15185
+ object.clickInfo.y = y;
15186
+ object //.GetWindow().copy
15187
+ .doEditDrag(//info,
15188
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1437915189 } else
1438015190 {
1438115191 if (x < startX)
....@@ -14458,6 +15268,11 @@
1445815268 if ((mouseMode & ZOOM) != 0)
1445915269 {
1446015270 //if ((mouseMode & BACKFORTH) != 0)
15271
+ if ((modifiersex & SHIFT) == SHIFT)
15272
+ {
15273
+ ViewAngle(dy);
15274
+ }
15275
+ else
1446115276 if ((mouseMode & VR) != 0)
1446215277 manipCamera.BackForth(dx, dy, getWidth());
1446315278 else
....@@ -14524,22 +15339,30 @@
1452415339 }
1452515340 }
1452615341
15342
+// ClickInfo clickInfo = new ClickInfo();
15343
+
1452715344 public void mouseMoved(MouseEvent e)
1452815345 {
15346
+//object.editWindow.frame.
15347
+ setCursor(Cursor.getDefaultCursor());
15348
+
1452915349 //System.out.println("mouseMoved: " + e);
1453015350 if (isRenderer)
1453115351 return;
1453215352
14533
- ClickInfo ci = new ClickInfo();
14534
- ci.x = e.getX();
14535
- ci.y = e.getY();
14536
- ci.modifiers = e.getModifiersEx();
14537
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14538
- ci.pane = this;
14539
- ci.camera = renderCamera;
15353
+ // Mouse cursor feedback
15354
+ object.clickInfo.x = e.getX();
15355
+ object.clickInfo.y = e.getY();
15356
+ object.clickInfo.modifiers = e.getModifiersEx();
15357
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
15358
+ object.clickInfo.pane = this;
15359
+ object.clickInfo.camera = renderCamera;
1454015360 if (!isRenderer)
1454115361 {
14542
- if (object.editWindow.copy.doEditClick(ci, 0))
15362
+ //ObjEditor editWindow = object.editWindow;
15363
+ //Object3D copy = editWindow.copy;
15364
+ if (object.doEditClick(//clickInfo,
15365
+ 0))
1454315366 {
1454415367 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1454515368 } else
....@@ -14551,10 +15374,17 @@
1455115374
1455215375 public void mouseReleased(MouseEvent e)
1455315376 {
15377
+ if (isRenderer && !movingcamera)
15378
+ {
15379
+ RigidBody.justclicked = true;
15380
+ System.out.println("justclicked: " + e);
15381
+ }
15382
+
1455415383 Globals.MOUSEDRAGGED = false;
1455515384
1455615385 movingcamera = false;
14557
- X = Y = 0;
15386
+ X = 0; // getBounds().width/2;
15387
+ Y = 0; // getBounds().height/2;
1455815388 //System.out.println("mouseReleased: " + e);
1455915389 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1456015390 }
....@@ -14706,8 +15536,10 @@
1470615536 mouseMode |= ZOOM;
1470715537 }
1470815538
14709
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14710
- if (capsLocked) // || (modifiers & META) == META)
15539
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15540
+ boolean vr = capsLocked && !lightMode;
15541
+
15542
+ if (vr) // || (modifiers & META) == META)
1471115543 {
1471215544 mouseMode |= VR; // BACKFORTH;
1471315545 }
....@@ -14719,7 +15551,8 @@
1471915551 {
1472015552 mouseMode |= SELECT;
1472115553 }
14722
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15554
+ if (//(modifiersex & SHIFT) == SHIFT ||
15555
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1472315556 {
1472415557 mouseMode &= ~VR;
1472515558 mouseMode |= TRANSLATE;
....@@ -14763,8 +15596,18 @@
1476315596 float SATPOW = 1; // 2; // 0.5f;
1476415597 float BRIPOW = 1; // 0.5f; // 0.5f;
1476515598
15599
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15600
+
15601
+// Create a new blank cursor.
15602
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15603
+ cursorImg, new Point(0, 0), "blank cursor");
15604
+
1476615605 public void keyPressed(int key)
1476715606 {
15607
+// Set the blank cursor to the JFrame.
15608
+//object.editWindow.frame.
15609
+ setCursor(blankCursor);
15610
+
1476815611 if (key >= '0' && key <= '5')
1476915612 clampbit = (key-'0');
1477015613
....@@ -14810,7 +15653,8 @@
1481015653 // break;
1481115654 case 'T':
1481215655 CACHETEXTURE ^= true;
14813
- textures.clear();
15656
+ texturepigment.clear();
15657
+ texturebump.clear();
1481415658 // repaint();
1481515659 break;
1481615660 case 'Y':
....@@ -14820,8 +15664,8 @@
1482015664 case 'K':
1482115665 KOMPACTTEXTURE ^= true;
1482215666 //textures.clear();
14823
- break;
14824
- case 'P': // Texture Projection macros
15667
+ // break;
15668
+ //case 'P': // Texture Projection macros
1482515669 // SAVETEXTURE ^= true;
1482615670 macromode = true;
1482715671 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -14895,7 +15739,9 @@
1489515739 case 'E' : COMPACT ^= true;
1489615740 repaint();
1489715741 break;
14898
- case 'W' : DEBUGHSB ^= true;
15742
+ case 'W' : // Wide Window (fullscreen)
15743
+ //DEBUGHSB ^= true;
15744
+ ObjEditor.theFrame.ToggleFullScreen();
1489915745 repaint();
1490015746 break;
1490115747 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14920,13 +15766,7 @@
1492015766 RevertCamera();
1492115767 repaint();
1492215768 break;
14923
- case 'l':
14924
- lightMode ^= true;
14925
- Globals.lighttouched = true;
14926
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14927
- targetLookAt.set(manipCamera.lookAt);
14928
- repaint();
14929
- break;
15769
+ //case 'l':
1493015770 case 'L':
1493115771 if (lightMode)
1493215772 {
....@@ -14946,7 +15786,7 @@
1494615786 targetLookAt.set(manipCamera.lookAt);
1494715787 repaint();
1494815788 break;
14949
- case 'p':
15789
+ case 'P': // p':
1495015790 // c'est quoi ca au juste? spherical ^= true;
1495115791 Skinshader ^= true; programInitialized = false;
1495215792 repaint();
....@@ -14957,7 +15797,8 @@
1495715797 break;
1495815798 case 'm':
1495915799 {
14960
- PrintMemory();
15800
+ //PrintMemory();
15801
+ ToggleImageFlip();
1496115802 break;
1496215803 }
1496315804 case 'M':
....@@ -14984,27 +15825,31 @@
1498415825 repaint();
1498515826 break;
1498615827 case 'O':
14987
- Globals.drawMode = OCCLUSION; // WARNING
14988
- repaint();
14989
- break;
15828
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15829
+ //repaint();
15830
+ //break;
1499015831 case 'o':
1499115832 OCCLUSION_CULLING ^= true;
1499215833 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1499315834 break;
14994
- case '0': envyoff ^= true; repaint(); break;
15835
+ //case '0': envyoff ^= true; repaint(); break;
1499515836 case '1':
1499615837 case '2':
1499715838 case '3':
1499815839 case '4':
1499915840 case '5':
15000
- newenvy = Character.getNumericValue(key);
15001
- repaint();
15002
- break;
1500315841 case '6':
1500415842 case '7':
1500515843 case '8':
1500615844 case '9':
15007
- BGcolor = (key - '6')/3.f;
15845
+ if (true) // envyoff)
15846
+ {
15847
+ BGcolor = (key - '1')/8.f;
15848
+ }
15849
+ else
15850
+ {
15851
+ //newenvy = Character.getNumericValue(key);
15852
+ }
1500815853 repaint();
1500915854 break;
1501015855 case '!':
....@@ -15070,15 +15915,36 @@
1507015915 case '_':
1507115916 kompactbit = 5;
1507215917 break;
15073
- case '+':
15074
- kompactbit = 6;
15075
- break;
15918
+// case '+':
15919
+// kompactbit = 6;
15920
+// break;
1507615921 case ' ':
15077
- ObjEditor.theFrame.ToggleFullScreen();
15922
+ capsLocked ^= true;
15923
+ repaint();
15924
+ break;
15925
+ case 'l':
15926
+ lightMode ^= true;
15927
+ if (lightMode)
15928
+ {
15929
+ keepshadow = Globals.RENDERSHADOW;
15930
+ Globals.RENDERSHADOW = false;
15931
+ }
15932
+ else
15933
+ {
15934
+ Globals.RENDERSHADOW = keepshadow;
15935
+ }
15936
+
15937
+ Globals.lighttouched = true;
15938
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15939
+ targetLookAt.set(manipCamera.lookAt);
1507815940 repaint();
1507915941 break;
1508015942 //case '`' :
1508115943 case ESC:
15944
+ if (FULLSCREEN)
15945
+ object.editWindow.ToggleFullScreen();
15946
+ break;
15947
+ case 'p':
1508215948 RENDERPROGRAM += 1;
1508315949 RENDERPROGRAM %= 3;
1508415950
....@@ -15117,12 +15983,17 @@
1511715983 case ENTER:
1511815984 // object.editWindow.ScreenFit(); // Edit();
1511915985 ToggleLive();
15986
+ if (capsLocked)
15987
+ {
15988
+ Globals.WALK ^= true;
15989
+ }
1512015990 break;
1512115991 case DELETE:
1512215992 ClearSelection();
1512315993 break;
15124
- /*
1512515994 case '+':
15995
+
15996
+ /*
1512615997 //fontsize += 1;
1512715998 bbzoom *= 2;
1512815999 repaint();
....@@ -15139,30 +16010,36 @@
1513916010 case '=':
1514016011 IncDepth();
1514116012 //fontsize += 1;
15142
- object.editWindow.refreshContents(true);
16013
+ object.GetWindow().refreshContents(true);
1514316014 maskbit = 6;
1514416015 break;
1514516016 case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1514616017 DecDepth();
1514716018 maskbit = 5;
1514816019 //if(fontsize > 1) fontsize -= 1;
15149
- if (object.editWindow == null)
15150
- new Exception().printStackTrace();
15151
- else
15152
- object.editWindow.refreshContents(true);
16020
+// if (object.editWindow == null)
16021
+// new Exception().printStackTrace();
16022
+// else
16023
+ object.GetWindow().refreshContents(true);
1515316024 break;
1515416025 case '{':
15155
- manipCamera.shaper_fovy /= 1.1;
16026
+ double factor = 1.1;
16027
+ if (manipCamera.shaper_fovy / factor > 0.1)
16028
+ manipCamera.shaper_fovy /= factor;
1515616029 System.out.println("FOV = " + manipCamera.shaper_fovy);
1515716030 repaint();
1515816031 break;
1515916032 case '}':
15160
- manipCamera.shaper_fovy *= 1.1;
16033
+ factor = 1.1;
16034
+ if (manipCamera.shaper_fovy * factor < 150)
16035
+ manipCamera.shaper_fovy *= factor;
1516116036 System.out.println("FOV = " + manipCamera.shaper_fovy);
1516216037 repaint();
1516316038 break;
1516416039 case '[':
15165
- manipCamera.shaper_fovy /= 1.01;
16040
+ factor = 1.01;
16041
+ if (manipCamera.shaper_fovy / factor > 0.1)
16042
+ manipCamera.shaper_fovy /= factor;
1516616043 if (false) //manipCamera.hAspect == 0)
1516716044 {
1516816045 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15178,7 +16055,9 @@
1517816055 break;
1517916056 case ']':
1518016057 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15181
- manipCamera.shaper_fovy *= 1.01;
16058
+ factor = 1.01;
16059
+ if (manipCamera.shaper_fovy * factor < 150)
16060
+ manipCamera.shaper_fovy *= factor;
1518216061 if (false) //manipCamera.hAspect == 0)
1518316062 {
1518416063 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15216,98 +16095,113 @@
1521616095 }
1521716096 }
1521816097
16098
+ boolean keys[] = new boolean[256];
16099
+ int speedkey[] = new int[256];
16100
+ int modifiers = 0;
16101
+
1521916102 public void processKeyEvent(KeyEvent e)
1522016103 {
1522116104 switch (e.getID())
1522216105 {
1522316106 case KeyEvent.KEY_PRESSED:
15224
- if (!autorepeat)
15225
- {
15226
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15227
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15228
- }
15229
- if (manipCamera == lightCamera)
15230
- {
15231
- switch (e.getKeyCode())
15232
- {
15233
- case DOWN_ARROW:
15234
- lightCamera.DECAL /= 2;
15235
- repaint();
15236
- break;
15237
- case UP_ARROW:
15238
- lightCamera.DECAL *= 2;
15239
- repaint();
15240
- break;
15241
- case LEFT_ARROW:
15242
- lightCamera.SCALE /= 2;
15243
- repaint();
15244
- break;
15245
- case RIGHT_ARROW:
15246
- lightCamera.SCALE *= 2;
15247
- repaint();
15248
- break;
15249
- default:
15250
- break;
15251
- }
15252
-
15253
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15254
- } else
15255
- {
15256
- if (true) // !autorepeat)
15257
- {
15258
- boolean reset = true;
15259
-
15260
- switch (e.getKeyCode())
15261
- {
15262
- case DOWN_ARROW:
15263
- GoDown(e.getModifiersEx());
15264
- repaint();
15265
- break;
15266
- case UP_ARROW:
15267
- GoUp(e.getModifiersEx());
15268
- repaint();
15269
- break;
15270
- case LEFT_ARROW:
15271
- GoLeft(e.getModifiersEx());
15272
- repaint();
15273
- break;
15274
- case RIGHT_ARROW:
15275
- GoRight(e.getModifiersEx());
15276
- repaint();
15277
- break;
15278
- default:
15279
- reset = false;
15280
- break;
15281
- }
15282
-
15283
- if (reset)
15284
- {
15285
- autorepeat = true;
15286
-
15287
- targetLookAt.set(manipCamera.lookAt);
15288
- }
15289
- }
15290
- }
16107
+ keys[e.getKeyCode()] = true;
16108
+ modifiers = e.getModifiersEx();
16109
+ keyPressed(e.getKeyChar(), modifiers);
16110
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16111
+ repaint();
1529116112 break;
15292
- case KeyEvent.KEY_TYPED:
15293
- break;
16113
+// if (!autorepeat)
16114
+// {
16115
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
16116
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
16117
+// }
16118
+// if (manipCamera == lightCamera)
16119
+// {
16120
+// switch (e.getKeyCode())
16121
+// {
16122
+// case DOWN_ARROW:
16123
+// lightCamera.DECAL /= 2;
16124
+// repaint();
16125
+// break;
16126
+// case UP_ARROW:
16127
+// lightCamera.DECAL *= 2;
16128
+// repaint();
16129
+// break;
16130
+// case LEFT_ARROW:
16131
+// lightCamera.SCALE /= 2;
16132
+// repaint();
16133
+// break;
16134
+// case RIGHT_ARROW:
16135
+// lightCamera.SCALE *= 2;
16136
+// repaint();
16137
+// break;
16138
+// default:
16139
+// break;
16140
+// }
16141
+//
16142
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16143
+// } else
16144
+// {
16145
+// if (true) // !autorepeat)
16146
+// {
16147
+// boolean reset = true;
16148
+//
16149
+// switch (e.getKeyCode())
16150
+// {
16151
+// case DOWN_ARROW:
16152
+// GoDown(e.getModifiersEx());
16153
+// repaint();
16154
+// break;
16155
+// case UP_ARROW:
16156
+// GoUp(e.getModifiersEx());
16157
+// repaint();
16158
+// break;
16159
+// case LEFT_ARROW:
16160
+// GoLeft(e.getModifiersEx());
16161
+// repaint();
16162
+// break;
16163
+// case RIGHT_ARROW:
16164
+// GoRight(e.getModifiersEx());
16165
+// repaint();
16166
+// break;
16167
+// default:
16168
+// reset = false;
16169
+// break;
16170
+// }
16171
+//
16172
+// if (reset)
16173
+// {
16174
+// autorepeat = true;
16175
+//
16176
+// targetLookAt.set(manipCamera.lookAt);
16177
+// }
16178
+// }
16179
+// }
16180
+// break;
16181
+// case KeyEvent.KEY_TYPED:
16182
+// break;
1529416183 case KeyEvent.KEY_RELEASED:
15295
- {
15296
- switch (e.getKeyCode())
15297
- {
15298
- case DOWN_ARROW:
15299
- case UP_ARROW:
15300
- case LEFT_ARROW:
15301
- case RIGHT_ARROW:
15302
- MODIFIERS &= ~COMMAND;
15303
- autorepeat = false;
15304
- break;
15305
- default:
15306
- break;
15307
- }
16184
+ keys[e.getKeyCode()] = false;
16185
+ modifiers = e.getModifiersEx();
1530816186 keyReleased(e.getKeyChar(), e.getModifiersEx());
16187
+ repaint();
1530916188 break;
15310
- }
16189
+// {
16190
+// switch (e.getKeyCode())
16191
+// {
16192
+// case DOWN_ARROW:
16193
+// case UP_ARROW:
16194
+// case LEFT_ARROW:
16195
+// case RIGHT_ARROW:
16196
+// MODIFIERS &= ~COMMAND;
16197
+// autorepeat = false;
16198
+// break;
16199
+// default:
16200
+// break;
16201
+// }
16202
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
16203
+// break;
16204
+// }
1531116205 default:
1531216206 break;
1531316207 }
....@@ -15373,7 +16267,7 @@
1537316267 }
1537416268 */
1537516269
15376
- object.editWindow.EditSelection();
16270
+ object.GetWindow().EditSelection(false);
1537716271 }
1537816272
1537916273 void SelectParent()
....@@ -15390,10 +16284,10 @@
1539016284 {
1539116285 //selectees.remove(i);
1539216286 System.out.println("select parent of " + elem);
15393
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
16287
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1539416288 } else
1539516289 {
15396
- group.editWindow.Select(elem.GetTreePath(), first, true);
16290
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
1539716291 }
1539816292
1539916293 first = false;
....@@ -15435,12 +16329,12 @@
1543516329 for (int j = 0; j < group.children.size(); j++)
1543616330 {
1543716331 elem = (Object3D) group.children.elementAt(j);
15438
- object.editWindow.Select(elem.GetTreePath(), first, true);
16332
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1543916333 first = false;
1544016334 }
1544116335 } else
1544216336 {
15443
- object.editWindow.Select(elem.GetTreePath(), first, true);
16337
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1544416338 }
1544516339
1544616340 first = false;
....@@ -15451,21 +16345,21 @@
1545116345 {
1545216346 //Composite group = (Composite) object;
1545316347 Object3D group = object;
15454
- group.editWindow.loadClipboard(true); // ClearSelection(false);
16348
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
1545516349 }
1545616350
1545716351 void ResetTransform(int mask)
1545816352 {
1545916353 //Composite group = (Composite) object;
1546016354 Object3D group = object;
15461
- group.editWindow.ResetTransform(mask);
16355
+ group.GetWindow().ResetTransform(mask);
1546216356 }
1546316357
1546416358 void FlipTransform()
1546516359 {
1546616360 //Composite group = (Composite) object;
1546716361 Object3D group = object;
15468
- group.editWindow.FlipTransform();
16362
+ group.GetWindow().FlipTransform();
1546916363 // group.editWindow.ReduceMesh(true);
1547016364 }
1547116365
....@@ -15473,7 +16367,7 @@
1547316367 {
1547416368 //Composite group = (Composite) object;
1547516369 Object3D group = object;
15476
- group.editWindow.PrintMemory();
16370
+ group.GetWindow().PrintMemory();
1547716371 // group.editWindow.ReduceMesh(true);
1547816372 }
1547916373
....@@ -15481,7 +16375,7 @@
1548116375 {
1548216376 //Composite group = (Composite) object;
1548316377 Object3D group = object;
15484
- group.editWindow.ResetCentroid();
16378
+ group.GetWindow().ResetCentroid();
1548516379 }
1548616380
1548716381 void IncDepth()
....@@ -15563,8 +16457,6 @@
1556316457
1556416458 int width = getBounds().width;
1556516459 int height = getBounds().height;
15566
- ClickInfo info = new ClickInfo();
15567
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1556816460 //Image img = CreateImage(width, height);
1556916461 //System.out.println("width = " + width + "; height = " + height + "\n");
1557016462
....@@ -15641,48 +16533,77 @@
1564116533 }
1564216534 if (object != null && !hasMarquee)
1564316535 {
16536
+ if (object.clickInfo == null)
16537
+ object.clickInfo = new ClickInfo();
16538
+ ClickInfo info = object.clickInfo;
16539
+ //ClickInfo info = new ClickInfo();
16540
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16541
+
1564416542 if (isRenderer)
1564516543 {
15646
- info.flags++;
16544
+ object.clickInfo.flags++;
1564716545 double frameAspect = (double) width / (double) height;
1564816546 if (frameAspect > renderCamera.aspect)
1564916547 {
1565016548 int desired = (int) ((double) height * renderCamera.aspect);
15651
- info.bounds.width -= width - desired;
15652
- info.bounds.x += (width - desired) / 2;
16549
+ object.clickInfo.bounds.width -= width - desired;
16550
+ object.clickInfo.bounds.x += (width - desired) / 2;
1565316551 } else
1565416552 {
1565516553 int desired = (int) ((double) width / renderCamera.aspect);
15656
- info.bounds.height -= height - desired;
15657
- info.bounds.y += (height - desired) / 2;
16554
+ object.clickInfo.bounds.height -= height - desired;
16555
+ object.clickInfo.bounds.y += (height - desired) / 2;
1565816556 }
1565916557 }
15660
- info.g = gr;
15661
- info.camera = renderCamera;
16558
+
16559
+ object.clickInfo.g = gr;
16560
+ object.clickInfo.camera = renderCamera;
1566216561 /*
1566316562 // Memory intensive (brep.verticescopy)
1566416563 if (!(object instanceof Composite))
1566516564 object.draw(info, 0, false); // SLOW :
1566616565 */
15667
- if (!isRenderer)
16566
+ if (!isRenderer) // && drag)
1566816567 {
15669
- object.drawEditHandles(info, 0);
15670
-
15671
- if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
16568
+ Grafreed.Assert(object != null);
16569
+ Grafreed.Assert(object.selection != null);
16570
+ if (object.selection.Size() > 0)
1567216571 {
15673
- switch (object.selection.get(0).hitSomething)
16572
+ int hitSomething = object.selection.get(0).hitSomething;
16573
+
16574
+ object.clickInfo.DX = 0;
16575
+ object.clickInfo.DY = 0;
16576
+ object.clickInfo.W = 1;
16577
+ if (hitSomething == Object3D.hitCenter)
1567416578 {
15675
- case Object3D.hitCenter: gr.setColor(Color.pink);
15676
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15677
- break;
15678
- case Object3D.hitRotate: gr.setColor(Color.yellow);
15679
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15680
- break;
15681
- case Object3D.hitScale: gr.setColor(Color.cyan);
15682
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15683
- break;
16579
+ info.DX = X;
16580
+ if (X != 0)
16581
+ info.DX -= info.bounds.width/2;
16582
+
16583
+ info.DY = Y;
16584
+ if (Y != 0)
16585
+ info.DY -= info.bounds.height/2;
1568416586 }
15685
-
16587
+
16588
+ object.drawEditHandles(//info,
16589
+ 0);
16590
+
16591
+ if (drag && (X != 0 || Y != 0))
16592
+ {
16593
+ switch (hitSomething)
16594
+ {
16595
+ case Object3D.hitCenter: gr.setColor(Color.white);
16596
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16597
+ break;
16598
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
16599
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16600
+ break;
16601
+ case Object3D.hitScale: gr.setColor(Color.cyan);
16602
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16603
+ break;
16604
+ }
16605
+
16606
+ }
1568616607 }
1568716608 }
1568816609 }
....@@ -15697,7 +16618,7 @@
1569716618 if (hasMarquee)
1569816619 {
1569916620 gr.setXORMode(Color.white);
15700
- gr.setColor(Color.red);
16621
+ gr.setColor(Color.white);
1570116622 if (!firstime)
1570216623 {
1570316624 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -15856,7 +16777,8 @@
1585616777
1585716778 public boolean mouseDrag(Event evt, int x, int y)
1585816779 {
15859
- //System.out.println("mouseDrag: " + evt);
16780
+ System.out.println("mouseDrag: " + evt);
16781
+ System.exit(0);
1586016782 /*
1586116783 drag = true;
1586216784 //System.out.println("Mouse DRAG");
....@@ -15975,6 +16897,7 @@
1597516897 public boolean mouseUp(Event evt, int x, int y)
1597616898 {
1597716899 System.out.println("mouseUp: " + evt);
16900
+ System.exit(0);
1597816901 /*
1597916902 locked = false;
1598016903 if (isRenderer)
....@@ -16164,6 +17087,8 @@
1616417087 private /*static*/ boolean firstime;
1616517088 private /*static*/ cVector newView = new cVector();
1616617089 private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
17090
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
17091
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1616717092 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1616817093 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1616917094 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16176,36 +17101,74 @@
1617617101 {
1617717102 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1617817103
17104
+ int usedsuf = 0;
17105
+
1617917106 for (int i = 0; i < suffixes.length; i++)
1618017107 {
16181
- String resourceName = basename + suffixes[i] + "." + suffix;
16182
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16183
- mipmapped,
16184
- FileUtil.getFileSuffix(resourceName));
16185
- if (data == null)
17108
+ String[] suffixe = suffixes;
17109
+ String[] fallback = suffixes2;
17110
+ String[] fallfallback = suffixes3;
17111
+
17112
+ for (int c=usedsuf; --c>=0;)
1618617113 {
16187
- throw new IOException("Unable to load texture " + resourceName);
17114
+// String[] temp = suffixe;
17115
+// suffixe = fallback;
17116
+// fallback = fallfallback;
17117
+// fallfallback = temp;
1618817118 }
17119
+
17120
+ String resourceName = basename + suffixe[i] + "." + suffix;
17121
+ TextureData data;
17122
+
17123
+ try
17124
+ {
17125
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17126
+ mipmapped,
17127
+ FileUtil.getFileSuffix(resourceName));
17128
+ }
17129
+ catch (Exception e)
17130
+ {
17131
+ try
17132
+ {
17133
+ resourceName = basename + fallback[i] + "." + suffix;
17134
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17135
+ mipmapped,
17136
+ FileUtil.getFileSuffix(resourceName));
17137
+ }
17138
+ catch (Exception e2)
17139
+ {
17140
+ resourceName = basename + fallfallback[i] + "." + suffix;
17141
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17142
+ mipmapped,
17143
+ FileUtil.getFileSuffix(resourceName));
17144
+ }
17145
+ }
17146
+
1618917147 //System.out.println("Target = " + targets[i]);
1619017148 cubemap.updateImage(data, targets[i]);
1619117149 }
1619217150
1619317151 return cubemap;
1619417152 }
17153
+
1619517154 int bigsphere = -1;
1619617155
1619717156 float BGcolor = 0.5f;
1619817157
16199
- private void DrawSkyBox(GL gl)
17158
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17159
+
17160
+ private void DrawSkyBox(GL gl, float ratio)
1620017161 {
16201
- if (envyoff || cubemap == null)
17162
+ if (//envyoff ||
17163
+ WIREFRAME ||
17164
+ cubemap == null)
1620217165 {
1620317166 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1620417167 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
1620517168 return;
1620617169 }
1620717170
16208
- if (WIREFRAME)
17171
+ //if (WIREFRAME)
1620917172 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1621017173
1621117174 gl.glDisable(gl.GL_CULL_FACE);
....@@ -16213,7 +17176,17 @@
1621317176 // Compensates for ExaminerViewer's modification of modelview matrix
1621417177 gl.glMatrixMode(GL.GL_MODELVIEW);
1621517178 gl.glLoadIdentity();
17179
+ gl.glScalef(1,ratio,1);
1621617180
17181
+// colorV[0] = 2;
17182
+// colorV[1] = 2;
17183
+// colorV[2] = 2;
17184
+// colorV[3] = 1;
17185
+// gl.glDisable(gl.GL_COLOR_MATERIAL);
17186
+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
17187
+//
17188
+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
17189
+
1621717190 //gl.glActiveTexture(GL.GL_TEXTURE1);
1621817191 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1621917192
....@@ -16245,6 +17218,7 @@
1624517218 {
1624617219 gl.glScalef(1.0f, -1.0f, 1.0f);
1624717220 }
17221
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1624817222 gl.glMultMatrixd(viewrot_1, 0);
1624917223 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1625017224 //viewer.updateInverseRotation(gl);
....@@ -16285,7 +17259,8 @@
1628517259 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1628617260
1628717261 cubemap.disable();
16288
- ////cubemap.unbind();
17262
+ //cubemap.dispose();
17263
+
1628917264 if (CULLFACE)
1629017265 {
1629117266 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16293,6 +17268,8 @@
1629317268
1629417269 if (WIREFRAME)
1629517270 gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
17271
+ else
17272
+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
1629617273 }
1629717274
1629817275 private void DrawChecker(GL gl)
....@@ -16341,7 +17318,7 @@
1634117318 gl.glScalef(1.0f, -1.0f, 1.0f);
1634217319 }
1634317320
16344
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17321
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1634517322
1634617323 float step = 2; // 0.1666f; //0.25f;
1634717324 float stepv = 2; // step * 1652 / 998;
....@@ -16385,16 +17362,16 @@
1638517362 cStatic.objectstack[materialdepth++] = checker;
1638617363 //System.out.println("material " + material);
1638717364 //Applet3D.tracein(this, selected);
16388
- vector2buffer = checker.projectedVertices;
17365
+ //vector2buffer = checker.projectedVertices;
1638917366
1639017367 //checker.GetMaterial().Draw(this, false); // true);
16391
- DrawMaterial(checker.GetMaterial(), false); // true);
17368
+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1639217369
1639317370 materialdepth -= 1;
1639417371 if (materialdepth > 0)
1639517372 {
16396
- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16397
- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
17373
+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
17374
+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1639817375 }
1639917376 //checker.GetMaterial().opacity = 1f;
1640017377 ////checker.GetMaterial().ambient = 1f;
....@@ -16480,6 +17457,14 @@
1648017457 }
1648117458 }
1648217459
17460
+ private Object3D GetFolder()
17461
+ {
17462
+ Object3D folder = object.GetWindow().copy;
17463
+ if (object.GetWindow().copy.selection.Size() > 0)
17464
+ folder = object.GetWindow().copy.selection.elementAt(0);
17465
+ return folder;
17466
+ }
17467
+
1648317468 class SelectBuffer implements GLEventListener
1648417469 {
1648517470
....@@ -16495,7 +17480,7 @@
1649517480 //new Exception().printStackTrace();
1649617481 System.out.println("select buffer init");
1649717482 // Use debug pipeline
16498
- drawable.setGL(new DebugGL(drawable.getGL()));
17483
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1649917484
1650017485 GL gl = drawable.getGL();
1650117486
....@@ -16559,6 +17544,17 @@
1655917544
1656017545 //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
1656117546
17547
+ if (PAINTMODE)
17548
+ {
17549
+ if (object.GetWindow().copy.selection.Size() > 0)
17550
+ {
17551
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17552
+
17553
+ // Make what you paint not selectable.
17554
+ paintobj.ResetSelectable();
17555
+ }
17556
+ }
17557
+
1656217558 //int tmp = selection_view;
1656317559 //selection_view = -1;
1656417560 int temp = DrawMode();
....@@ -16570,6 +17566,17 @@
1657017566 // temp = DEFAULT; // patch for selection debug
1657117567 Globals.drawMode = temp; // WARNING
1657217568
17569
+ if (PAINTMODE)
17570
+ {
17571
+ if (object.GetWindow().copy.selection.Size() > 0)
17572
+ {
17573
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17574
+
17575
+ // Revert.
17576
+ paintobj.RestoreSelectable();
17577
+ }
17578
+ }
17579
+
1657317580 //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
1657417581
1657517582 // trying different ways of getting the depth info over
....@@ -16600,7 +17607,7 @@
1660017607
1660117608 float depth = depths[y * TEX_SIZE + x];
1660217609
16603
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17610
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1660417611 {
1660517612 pointselection = false;
1660617613
....@@ -16617,6 +17624,8 @@
1661717624 // System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
1661817625 // System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1661917626 // System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
17627
+
17628
+ CreateSelectedPoint();
1662017629
1662117630 // Will fit the mesh !!!
1662217631 selectedpoint.toParent[0][0] = 0.0001;
....@@ -16671,29 +17680,31 @@
1667117680 }
1667217681
1667317682 if (!movingcamera && !PAINTMODE)
16674
- object.editWindow.ScreenFitPoint(); // fev 2014
17683
+ object.GetWindow().ScreenFitPoint(); // fev 2014
1667517684
16676
- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
17685
+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1667717686 {
16678
- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
17687
+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1667917688
16680
- Object3D group = new Object3D("inst" + paintcount++);
17689
+ if (object.GetWindow().copy.selection.Size() > 0)
17690
+ {
17691
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
1668117692
16682
- group.CreateMaterial(); // use a void leaf to select instances
16683
-
16684
- group.add(paintobj); // link
16685
-
16686
- object.editWindow.SnapObject(group);
16687
-
16688
- Object3D folder = object.editWindow.copy;
16689
-
16690
- if (object.editWindow.copy.selection.Size() > 0)
16691
- folder = object.editWindow.copy.selection.elementAt(0);
16692
-
16693
- folder.add(group);
16694
-
16695
- object.editWindow.ResetModel();
16696
- object.editWindow.refreshContents();
17693
+ Object3D inst = new Object3D("inst" + paintcount++);
17694
+
17695
+ inst.CreateMaterial(); // use a void leaf to select instances
17696
+
17697
+ inst.add(paintobj); // link
17698
+
17699
+ object.GetWindow().SnapObject(inst);
17700
+
17701
+ Object3D folder = paintFolder; // GetFolder();
17702
+
17703
+ folder.add(inst);
17704
+
17705
+ object.GetWindow().ResetModel();
17706
+ object.GetWindow().refreshContents();
17707
+ }
1669717708 }
1669817709 else
1669917710 paintcount = 0;
....@@ -16732,6 +17743,11 @@
1673217743 //System.out.println("objects[color] = " + objects[color]);
1673317744 //objects[color].Select();
1673417745 indexcount = 0;
17746
+ ObjEditor window = object.GetWindow();
17747
+ if (window != null && deselect)
17748
+ {
17749
+ window.Select(null, deselect, true);
17750
+ }
1673517751 object.Select(color, deselect);
1673617752 }
1673717753
....@@ -16782,6 +17798,7 @@
1678217798
1678317799 public void init(GLAutoDrawable drawable)
1678417800 {
17801
+ if (Globals.DEBUG)
1678517802 System.out.println("shadow buffer init");
1678617803
1678717804 GL gl = drawable.getGL();
....@@ -17010,10 +18027,14 @@
1701018027 gl.glFlush();
1701118028
1701218029 /**/
17013
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
18030
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1701418031
17015
- float[] pixels = occlusionsizebuffer.array();
18032
+ float[] depths = occlusiondepthbuffer.array();
1701618033
18034
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
18035
+
18036
+ int[] pixels = selectsizebuffer.array();
18037
+
1701718038 double r = 0, g = 0, b = 0;
1701818039
1701918040 double count = 0;
....@@ -17024,7 +18045,7 @@
1702418045
1702518046 double FACTOR = 1;
1702618047
17027
- for (int i = 0; i < pixels.length; i++)
18048
+ for (int i = 0; i < depths.length; i++)
1702818049 {
1702918050 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1703018051 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17107,7 +18128,7 @@
1710718128
1710818129 double scale = ray.z; // 1; // cos
1710918130
17110
- float depth = pixels[newindex];
18131
+ float depth = depths[newindex];
1711118132
1711218133 /*
1711318134 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17250,6 +18271,11 @@
1725018271 static boolean DEBUG_SELECTION = false;
1725118272 boolean OCCLUSION_CULLING = false; //true;
1725218273 public boolean lightMode = false;
18274
+
18275
+ private boolean keepshadow;
18276
+
18277
+ static public boolean capsLocked = false; // VR
18278
+
1725318279 static public int indexcount = 0;
1725418280 /*static*/ cColor vertexOcclusion = new cColor();
1725518281 //private int selection_view = -1;
....@@ -17304,11 +18330,14 @@
1730418330 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1730518331 static IntBuffer bigAAbuffer;
1730618332 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17307
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18333
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1730818334 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1730918335 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1731018336 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17311
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18337
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18338
+
18339
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18340
+
1731218341 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1731318342 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1731418343 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();