Normand Briere
2019-09-25 51e45bf615e1e2b4aca2edf9f7333b687c7d015e
CameraPane.java
....@@ -1,4 +1,5 @@
11
2
+import com.bulletphysics.dynamics.RigidBody;
23 import java.awt.*;
34 import java.awt.event.*;
45 import java.awt.image.*;
....@@ -18,7 +19,10 @@
1819 import javax.imageio.ImageIO;
1920 import javax.imageio.ImageWriteParam;
2021 import javax.imageio.ImageWriter;
22
+import javax.imageio.ImageReadParam;
23
+import javax.imageio.ImageReader;
2124 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
25
+import javax.imageio.stream.ImageInputStream;
2226 import javax.imageio.stream.ImageOutputStream;
2327 import javax.imageio.ImageWriteParam;
2428
....@@ -30,6 +34,7 @@
3034 import java.nio.*;
3135
3236 import gleem.linalg.Mat4f;
37
+import javax.imageio.ImageTypeSpecifier;
3338
3439 class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
3540 {
....@@ -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
....@@ -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
....@@ -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;
....@@ -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;
....@@ -1500,8 +1573,6 @@
15001573 {
15011574 return;
15021575 }
1503
-
1504
- float[] colorV = new float[3];
15051576
15061577 if (false) // marked)
15071578 {
....@@ -1750,7 +1821,7 @@
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
17561827 //display.modelParams6[0] = 100; // criss de bug de 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();
....@@ -10481,6 +10798,7 @@
1048110798 ANTIALIAS = 0;
1048210799 //System.out.println("RESTART");
1048310800 AAtimer.restart();
10801
+ Globals.TIMERRUNNING = true;
1048410802 }
1048510803 }
1048610804 }
....@@ -10495,6 +10813,112 @@
1049510813
1049610814 if (DrawMode() == DEFAULT)
1049710815 {
10816
+ if (manipCamera == lightCamera)
10817
+ {
10818
+// switch (e.getKeyCode())
10819
+// {
10820
+// case DOWN_ARROW:
10821
+// lightCamera.DECAL /= 2;
10822
+// repaint();
10823
+// break;
10824
+// case UP_ARROW:
10825
+// lightCamera.DECAL *= 2;
10826
+// repaint();
10827
+// break;
10828
+// case LEFT_ARROW:
10829
+// lightCamera.SCALE /= 2;
10830
+// repaint();
10831
+// break;
10832
+// case RIGHT_ARROW:
10833
+// lightCamera.SCALE *= 2;
10834
+// repaint();
10835
+// break;
10836
+// default:
10837
+// break;
10838
+ if (keys[DOWN_ARROW])
10839
+ {
10840
+ lightCamera.DECAL /= 2;
10841
+ }
10842
+
10843
+ if (keys[UP_ARROW])
10844
+ {
10845
+ lightCamera.DECAL *= 2;
10846
+ }
10847
+
10848
+ if (keys[LEFT_ARROW])
10849
+ {
10850
+ lightCamera.SCALE /= 2;
10851
+ }
10852
+
10853
+ if (keys[RIGHT_ARROW])
10854
+ {
10855
+ lightCamera.SCALE *= 2;
10856
+ }
10857
+ }
10858
+ else
10859
+ {
10860
+ //pingthread.mute = true;
10861
+
10862
+ boolean keyon = false;
10863
+
10864
+ if (keys[DOWN_ARROW])
10865
+ {
10866
+ speed = ++speedkey[DOWN_ARROW];
10867
+ if (speed > 20)
10868
+ speed = 20;
10869
+ GoDown(modifiers);
10870
+ keyon = true;
10871
+ }
10872
+ else
10873
+ speedkey[DOWN_ARROW] = 0;
10874
+
10875
+ if (keys[UP_ARROW])
10876
+ {
10877
+ speed = ++speedkey[UP_ARROW];
10878
+ if (speed > 20)
10879
+ speed = 20;
10880
+ GoUp(modifiers);
10881
+ keyon = true;
10882
+ }
10883
+ else
10884
+ speedkey[UP_ARROW] = 0;
10885
+
10886
+ if (keys[LEFT_ARROW])
10887
+ {
10888
+ speed = ++speedkey[LEFT_ARROW];
10889
+ if (speed > 20)
10890
+ speed = 20;
10891
+ GoLeft(modifiers);
10892
+ keyon = true;
10893
+ }
10894
+ else
10895
+ speedkey[LEFT_ARROW] = 0;
10896
+
10897
+ if (keys[RIGHT_ARROW])
10898
+ {
10899
+ speed = ++speedkey[RIGHT_ARROW];
10900
+ if (speed > 20)
10901
+ speed = 20;
10902
+ GoRight(modifiers);
10903
+ keyon = true;
10904
+ }
10905
+ else
10906
+ speedkey[RIGHT_ARROW] = 0;
10907
+
10908
+ if (Globals.WALK && capsLocked)
10909
+ {
10910
+ Walk();
10911
+ keyon = true;
10912
+ }
10913
+
10914
+ if (keyon)
10915
+ {
10916
+ repaint();
10917
+ }
10918
+
10919
+ //pingthread.mute = false;
10920
+ }
10921
+
1049810922 currentlydrawing = true;
1049910923 }
1050010924
....@@ -10568,7 +10992,7 @@
1056810992
1056910993 if (wait)
1057010994 {
10571
- Sleep(500);
10995
+ Sleep(200); // blocks everything
1057210996
1057310997 wait = false;
1057410998 }
....@@ -10683,7 +11107,7 @@
1068311107 // if (parentcam != renderCamera) // not a light
1068411108 if (cam != lightCamera)
1068511109 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10686
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
11110
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1068711111
1068811112 for (int j = 0; j < 4; j++)
1068911113 {
....@@ -10698,7 +11122,7 @@
1069811122 // if (parentcam != renderCamera) // not a light
1069911123 if (cam != lightCamera)
1070011124 //for (int count = parentcam.GetTransformCount(); --count>=0;)
10701
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
11125
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1070211126
1070311127 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1070411128
....@@ -10784,13 +11208,43 @@
1078411208 gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1078511209 }
1078611210
10787
- if (newenvy > -1)
11211
+// if (newenvy > -1)
11212
+// {
11213
+// LoadEnvy(newenvy);
11214
+// }
11215
+//
11216
+// newenvy = -1;
11217
+
11218
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1078811219 {
10789
- LoadEnvy(newenvy);
11220
+ if (cubemaprgb == null)
11221
+ {
11222
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11223
+ }
11224
+
11225
+ cubemap = cubemaprgb;
1079011226 }
10791
-
10792
- newenvy = -1;
10793
-
11227
+ else
11228
+ {
11229
+ if (object.skyboxname != null)
11230
+ {
11231
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11232
+ {
11233
+ if (cubemap != null && cubemap != cubemaprgb)
11234
+ cubemap.dispose();
11235
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11236
+ loadedskyboxname = object.skyboxname;
11237
+ }
11238
+ }
11239
+ else
11240
+ {
11241
+ cubemapcustom = null;
11242
+ loadedskyboxname = null;
11243
+ }
11244
+
11245
+ cubemap = cubemapcustom;
11246
+ }
11247
+
1079411248 ratio = ((double) getWidth()) / getHeight();
1079511249 //System.out.println("ratio = " + ratio);
1079611250
....@@ -10806,7 +11260,7 @@
1080611260
1080711261 if (!IsFrozen() && !ambientOcclusion)
1080811262 {
10809
- DrawSkyBox(gl);
11263
+ DrawSkyBox(gl, (float)ratio);
1081011264 }
1081111265
1081211266 //if (selection_view == -1)
....@@ -10989,8 +11443,8 @@
1098911443
1099011444 gl.glMatrixMode(GL.GL_MODELVIEW);
1099111445
10992
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1099311446 //gl.glEnable(gl.GL_POLYGON_SMOOTH);
11447
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
1099411448 //gl.glEnable(gl.GL_MULTISAMPLE);
1099511449 } else
1099611450 {
....@@ -11002,7 +11456,7 @@
1100211456 //System.out.println("BLENDING ON");
1100311457 gl.glEnable(GL.GL_BLEND);
1100411458 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005
-
11459
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1100611460 gl.glMatrixMode(gl.GL_PROJECTION);
1100711461 gl.glLoadIdentity();
1100811462
....@@ -11052,7 +11506,10 @@
1105211506 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
1105311507 } else
1105411508 {
11055
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11509
+ boolean vr = capsLocked && !lightMode;
11510
+
11511
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11512
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1105611513 }
1105711514 }
1105811515
....@@ -11092,7 +11549,7 @@
1109211549
1109311550 // if (cam != lightCamera)
1109411551 //for (int count = parentcam.GetTransformCount(); --count>=0;)
11095
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11552
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1109611553 }
1109711554
1109811555 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -11251,7 +11708,7 @@
1125111708 }
1125211709 }
1125311710
11254
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11711
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1125511712 {
1125611713 //gl.glDepthFunc(GL.GL_LEQUAL);
1125711714 //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11259,24 +11716,21 @@
1125911716
1126011717 boolean texon = textureon;
1126111718
11262
- if (RENDERPROGRAM > 0)
11263
- {
11264
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265
- textureon = false;
11266
- }
11719
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11720
+ textureon = false;
11721
+
1126711722 //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1126811723 //System.out.println("ALLO");
1126911724 gl.glColorMask(false, false, false, false);
1127011725 DrawObject(gl);
11271
- if (RENDERPROGRAM > 0)
11272
- {
11273
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274
- textureon = texon;
11275
- }
11726
+
11727
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11728
+ textureon = texon;
11729
+
1127611730 gl.glColorMask(true, true, true, true);
1127711731
1127811732 gl.glDepthFunc(GL.GL_EQUAL);
11279
- //gl.glDepthMask(false);
11733
+ gl.glDepthMask(false);
1128011734 }
1128111735
1128211736 if (false) // DrawMode() == SHADOW)
....@@ -11411,8 +11865,11 @@
1141111865 repaint();
1141211866 }
1141311867
11414
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+ {
11870
+ renderCamera.computeTransform();
1141511871 repaint();
11872
+ }
1141611873
1141711874 displaydone = true;
1141811875 }
....@@ -11479,14 +11936,31 @@
1147911936
1148011937 void DrawObject(GL gl, boolean draw)
1148111938 {
11939
+ // To clear camera values
11940
+ ResetOptions();
11941
+
1148211942 //System.out.println("DRAW OBJECT " + mouseDown);
1148311943 // DrawMode() = SELECTION;
1148411944 //GL gl = getGL();
1148511945 if ((TRACK || SHADOWTRACK) || zoomonce)
1148611946 {
11947
+ if (TRACK)
11948
+ {
11949
+ if (object.selection != null &&
11950
+ object.selection.size() > 0 &&
11951
+ object.selection.elementAt(0) != null &&
11952
+ !(object.selection.elementAt(0) instanceof Camera) &&
11953
+ !(object.selection.elementAt(0) instanceof ScriptNode))
11954
+ {
11955
+ trackedobject = object.selection.elementAt(0);
11956
+ //repaint();
11957
+ }
11958
+ else
11959
+ trackedobject = null;
11960
+ }
1148711961 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11488
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11489
- pingthread.StepToTarget(true); // true);
11962
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11963
+ pingthread.StepToTarget(); // true);
1149011964 // zoomonce = false;
1149111965 }
1149211966
....@@ -11613,20 +12087,32 @@
1161312087 ReleaseTextures(DEFAULT_TEXTURES);
1161412088
1161512089 if (CLEANCACHE)
11616
- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
12090
+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
1161712091 {
11618
- String tex = e.nextElement();
12092
+ cTexture tex = e.nextElement();
1161912093
1162012094 // System.out.println("Texture --------- " + tex);
1162112095
11622
- if (tex.equals("WHITE_NOISE"))
12096
+ if (tex.equals("WHITE_NOISE:"))
1162312097 continue;
1162412098
11625
- if (!usedtextures.containsKey(tex))
12099
+ if (!usedtextures.contains(tex))
1162612100 {
12101
+ CacheTexture gettex = texturepigment.get(tex);
1162712102 // System.out.println("DISPOSE +++++++++++++++ " + tex);
11628
- textures.get(tex).texture.dispose();
11629
- textures.remove(tex);
12103
+ if (gettex != null)
12104
+ {
12105
+ gettex.texture.dispose();
12106
+ texturepigment.remove(tex);
12107
+ }
12108
+
12109
+ gettex = texturebump.get(tex);
12110
+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
12111
+ if (gettex != null)
12112
+ {
12113
+ gettex.texture.dispose();
12114
+ texturebump.remove(tex);
12115
+ }
1163012116 }
1163112117 }
1163212118 }
....@@ -12046,7 +12532,7 @@
1204612532 for (int i = tp.size(); --i >= 0;)
1204712533 {
1204812534 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049
- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12535
+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1205012536 }
1205112537
1205212538
....@@ -12154,8 +12640,82 @@
1215412640
1215512641 //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1215612642
12157
- String program =
12643
+ String programmin =
12644
+ // Min shader
1215812645 "!!ARBfp1.0\n" +
12646
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
12647
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
12648
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12649
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12650
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12651
+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
12652
+ "PARAM light2cam0 = program.env[10];" +
12653
+ "PARAM light2cam1 = program.env[11];" +
12654
+ "PARAM light2cam2 = program.env[12];" +
12655
+ "TEMP temp;" +
12656
+ "TEMP light;" +
12657
+ "TEMP ndotl;" +
12658
+ "TEMP normal;" +
12659
+ "TEMP depth;" +
12660
+ "TEMP eye;" +
12661
+ "TEMP pos;" +
12662
+
12663
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12664
+ Normalize("normal") +
12665
+ "MOV light, state.light[0].position;" +
12666
+ "DP3 ndotl.x, light, normal;" +
12667
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12668
+
12669
+ // shadow
12670
+ "MOV pos, fragment.texcoord[1];" +
12671
+ "MOV temp, pos;" +
12672
+ ShadowTextureFetch("depth", "temp", "1") +
12673
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12674
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12675
+
12676
+ // No shadow when out of frustum
12677
+ //"SGE temp.y, depth.z, zero123.y;" +
12678
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12679
+
12680
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12681
+
12682
+ // Backlit
12683
+ "MOV pos.w, zero12t.y;" + // one
12684
+ "DP4 eye.x, pos, light2cam0;" +
12685
+ "DP4 eye.y, pos, light2cam1;" +
12686
+ "DP4 eye.z, pos, light2cam2;" +
12687
+ Normalize("eye") +
12688
+
12689
+ "DP3 ndotl.y, -eye, normal;" +
12690
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
12691
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
12692
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
12693
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12694
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
12695
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
12696
+ "ADD ndotl.y, ndotl.y, one.x;" +
12697
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12698
+
12699
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12700
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12701
+
12702
+ // Pigment
12703
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12704
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
12705
+ "MUL temp, temp, zero12t.w;" + // Times x
12706
+
12707
+ //"MUL temp, temp, ndotl.y;" +
12708
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12709
+
12710
+ "MUL temp, temp, ndotl.x;" + // lambert
12711
+
12712
+ "MOV temp.w, zero12t.y;" + // reset alpha
12713
+ "MOV result.color, temp;" +
12714
+ "END";
12715
+
12716
+ String programmax =
12717
+ "!!ARBfp1.0\n" +
12718
+
1215912719 //"OPTION ARB_fragment_program_shadow;" +
1216012720 "PARAM light2cam0 = program.env[10];" +
1216112721 "PARAM light2cam1 = program.env[11];" +
....@@ -12181,7 +12741,7 @@
1218112741 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1218212742 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1218312743 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12184
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12744
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1218512745 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1218612746 "PARAM options1 = program.env[62];" + // fog rgb color
1218712747 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12270,8 +12830,7 @@
1227012830 "TEMP shininess;" +
1227112831 "\n" +
1227212832 "MOV texSamp, one;" +
12273
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12274
-
12833
+
1227512834 "MOV mapgrid.x, one2048th.x;" +
1227612835 "MOV temp, fragment.texcoord[1];" +
1227712836 /*
....@@ -12292,20 +12851,20 @@
1229212851 "MUL temp, floor, mapgrid.x;" +
1229312852 //"TEX depth0, temp, texture[1], 2D;" +
1229412853 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12295
- TextureFetch("depth0", "temp", "1") +
12854
+ ShadowTextureFetch("depth0", "temp", "1") +
1229612855 "") +
1229712856 "ADD temp.x, temp.x, mapgrid.x;" +
1229812857 //"TEX depth1, temp, texture[1], 2D;" +
1229912858 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12300
- TextureFetch("depth1", "temp", "1") +
12859
+ ShadowTextureFetch("depth1", "temp", "1") +
1230112860 "") +
1230212861 "ADD temp.y, temp.y, mapgrid.x;" +
1230312862 //"TEX depth2, temp, texture[1], 2D;" +
12304
- TextureFetch("depth2", "temp", "1") +
12863
+ ShadowTextureFetch("depth2", "temp", "1") +
1230512864 "SUB temp.x, temp.x, mapgrid.x;" +
1230612865 //"TEX depth3, temp, texture[1], 2D;" +
1230712866 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12308
- TextureFetch("depth3", "temp", "1") +
12867
+ ShadowTextureFetch("depth3", "temp", "1") +
1230912868 "") +
1231012869 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1231112870 //"MOV params, material;" +
....@@ -12427,7 +12986,7 @@
1242712986 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1242812987 // mar 2013 ??? "KIL alpha.a;" +
1242912988 "MOV alpha, texSamp.aaaa;" + // y;" +
12430
- "KIL alpha.a;" +
12989
+ "KIL alpha.a;" + // not sure with parallax mapping
1243112990 /*
1243212991 "MUL temp.xy, temp, two;" +
1243312992 "TXB bump, temp, texture[0], 2D;" +
....@@ -12513,11 +13072,6 @@
1251313072 "SUB bump0, bump0, half;" +
1251413073 "ADD bump, bump, bump0;" +
1251513074
12516
- "MOV temp.x, texSamp.a;" +
12517
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12518
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12519
- "MOV texSamp.a, temp.x;" +
12520
-
1252113075 // double-sided
1252213076 /**/
1252313077 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12527,26 +13081,73 @@
1252713081 "ADD temp.x, temp.x, one.x;" +
1252813082 "MUL normal, normal, temp.xxxx;":""
1252913083 ) +
12530
- /**/
12531
-//// Normalize("normal") +
12532
-//// "MAX normal.z, eps.x, normal.z;" +
12533
-// Normalize("normal") +
12534
- "MOV normald, normal;" +
12535
- "MOV normals, normal;" +
13084
+ /**/
13085
+
13086
+ "MOV temp, fragment.texcoord[4];" +
1253613087
1253713088 // UV base
1253813089 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1253913090 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1254013091 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12541
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12542
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12543
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
13092
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
13093
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
13094
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
13095
+ Normalize("UP") +
13096
+
1254413097 "XPD V, normal, UP;" +
1254513098 Normalize("V") +
1254613099 "XPD U, V, normal;" +
1254713100 Normalize("U") +
1254813101
13102
+ "MOV temp, fragment.texcoord[0];" +
13103
+
13104
+// "MAD normal, -temp.x, U, normal;" +
13105
+// "MAD normal, -temp.y, V, normal;" +
13106
+// Normalize("normal") +
13107
+
13108
+//// "MAX normal.z, eps.x, normal.z;" +
13109
+// Normalize("normal") +
13110
+ "MOV normald, normal;" +
13111
+ "MOV normals, normal;" +
13112
+
1254913113 // parallax mapping
13114
+
13115
+ "DP3 temp2.x, V, eye;" +
13116
+ "DP3 temp2.y, U, eye;" +
13117
+ "DP3 temp2.z, normal, eye;" +
13118
+ "RCP temp2.z, temp2.z;" +
13119
+
13120
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
13121
+ "RSQ temp2.w, temp2.w;" +
13122
+ "RCP temp2.w, temp2.w;" +
13123
+
13124
+ "SUB temp2.w, temp2.w, half;" +
13125
+ // "SGE temp.x, temp2.w, eps.x;" +
13126
+ // "MUL temp2.w, temp2.w, temp.x;" +
13127
+
13128
+ // "MOV texSamp, U;" +
13129
+
13130
+ "MUL temp2.z, temp2.z, temp2.w;" +
13131
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
13132
+
13133
+ "MUL temp2, temp2, temp2.z;" +
13134
+
13135
+ "SUB temp, temp, temp2;" +
13136
+
13137
+ "TEX temp, temp, texture[0], 2D;" +
13138
+ "POW temp.a, temp.a, params6.w;" + // punch through
13139
+
13140
+ "ADD texSamp, temp, texSamp;" +
13141
+ "MUL texSamp.xyz, half, texSamp;" +
13142
+
13143
+ "MOV alpha, texSamp.aaaa;" +
13144
+
13145
+// parallax mapping
13146
+
13147
+ "MOV temp.x, texSamp.a;" +
13148
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13149
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
13150
+ "MOV texSamp.a, temp.x;" +
1255013151
1255113152 //"MOV temp, fragment.texcoord[0];" +
1255213153 //
....@@ -12676,10 +13277,10 @@
1267613277 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1267713278 "") +
1267813279
12679
- // display shadow only (bump == 0)
13280
+ // display shadow only (fakedepth == 0)
1268013281 "SUB temp.x, half.x, shadow.x;" +
1268113282 "MOV temp.y, -params5.z;" + // params6.x;" +
12682
- "SLT temp.z, temp.y, -one2048th.x;" +
13283
+ "SLT temp.z, temp.y, -c256i.x;" +
1268313284 "SUB temp.y, one.x, temp.z;" +
1268413285 "MUL temp.x, temp.x, temp.y;" +
1268513286 "KIL temp.x;" +
....@@ -13010,8 +13611,19 @@
1301013611 //once = true;
1301113612 }
1301213613
13013
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13014
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13614
+ String program = programmax;
13615
+
13616
+ if (Globals.MINSHADER)
13617
+ {
13618
+ program = programmin;
13619
+ }
13620
+
13621
+ if (Globals.DEBUG)
13622
+ {
13623
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13624
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13625
+ }
13626
+
1301513627 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1301613628
1301713629 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13058,7 +13670,8 @@
1305813670 "\n" +
1305913671 "END\n";
1306013672
13061
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13673
+ if (Globals.DEBUG)
13674
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1306213675 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1306313676
1306413677 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13103,25 +13716,26 @@
1310313716 return out;
1310413717 }
1310513718
13106
- String TextureFetch(String dest, String src, String unit)
13719
+ // Also does frustum culling
13720
+ String ShadowTextureFetch(String dest, String src, String unit)
1310713721 {
1310813722 return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1310913723 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1311013724 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13725
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
13726
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
1311113727 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13112
- "SLT " + src + ".z, " + src + ".x, one.x;" +
13113
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13114
- "SLT " + src + ".z, " + src + ".y, one.x;" +
13115
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13728
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13729
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1311613730 //"SWZ buffer, temp, w,w,w,w;";
13117
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13731
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1311813732 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1311913733 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1312013734 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13121
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13735
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1312213736
13123
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13124
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13737
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13738
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1312513739 }
1312613740
1312713741 String Shadow(String depth, String shadow)
....@@ -13168,7 +13782,7 @@
1316813782 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1316913783 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1317013784
13171
- // No shadow when out of frustrum
13785
+ // No shadow when out of frustum
1317213786 "SGE temp.x, " + depth + ".z, one.z;" +
1317313787 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1317413788 "";
....@@ -13315,7 +13929,7 @@
1331513929 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1331613930 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1331713931 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13318
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13932
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1331913933
1332013934 //Object3D.cVector2[] vector2buffer;
1332113935
....@@ -13333,9 +13947,10 @@
1333313947 "DP3 " + dest + ".z," + "normals," + "eye;" +
1333413948 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1333513949 //"MOV " + dest + ".w," + "normal.z;" +
13336
- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13337
- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13338
- //"MOV " + dest + ".z," + "params2.w;" +
13950
+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13951
+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13952
+
13953
+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
1333913954 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1334013955 "RCP " + dest + ".w," + dest + ".w;" +
1334113956 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13481,7 +14096,7 @@
1348114096 "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
1348214097 "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
1348314098 "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13484
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
14099
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
1348514100 "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
1348614101 "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1348714102 //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13542,7 +14157,7 @@
1354214157 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1354314158 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1354414159 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13545
- //"MOV result.texcoord, vertex.texcoord;" +
14160
+ //"MOV result.texcoord, vertex.fogcoord;" +
1354614161 "MOV result.texcoord, temp;" +
1354714162 // border fade
1354814163 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -13589,7 +14204,9 @@
1358914204
1359014205 //"ADD temp.z, temp.z, one;" +
1359114206
13592
- "MOV result.color, temp;"
14207
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14208
+
14209
+ "MOV result.color, temp;" // Normal
1359314210 : "MOV result.color, vertex.color;") +
1359414211 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1359514212 : "") +
....@@ -13724,10 +14341,13 @@
1372414341 public void mouseClicked(MouseEvent e)
1372514342 {
1372614343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1372714345 }
1372814346
1372914347 public void mousePressed(MouseEvent e)
1373014348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1373114351 //System.out.println("mousePressed: " + e);
1373214352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1373314353 }
....@@ -13762,10 +14382,12 @@
1376214382 return;
1376314383 }
1376414384
13765
- 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;
1376614388
1376714389 // TIMER
13768
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14390
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
1376914391 {
1377014392 keepboxmode = BOXMODE;
1377114393 keepsupport = SUPPORT;
....@@ -13806,7 +14428,7 @@
1380614428 //}
1380714429
1380814430 SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13809
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1381014432 anchorX = ax;
1381114433 anchorY = ay;
1381214434 prevX = px;
....@@ -13840,6 +14462,7 @@
1384014462 else
1384114463 if (evt.getSource() == AAtimer)
1384214464 {
14465
+ Globals.TIMERRUNNING = false;
1384314466 if (mouseDown)
1384414467 {
1384514468 //new Exception().printStackTrace();
....@@ -13899,9 +14522,10 @@
1389914522
1390014523 // fev 2014???
1390114524 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13902
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13903
- pingthread.StepToTarget(true); // true);
14525
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14526
+ pingthread.StepToTarget(); // true);
1390414527 }
14528
+
1390514529 // if (!LIVE)
1390614530 super.repaint();
1390714531 }
....@@ -13914,6 +14538,7 @@
1391414538 return;
1391514539
1391614540 AAtimer.restart(); //
14541
+ Globals.TIMERRUNNING = true;
1391714542
1391814543 // waslive = LIVE;
1391914544 // LIVE = false;
....@@ -13963,14 +14588,15 @@
1396314588 drag = false;
1396414589 //System.out.println("Mouse DOWN");
1396514590 editObj = false;
13966
- ClickInfo info = new ClickInfo();
13967
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13968
- info.pane = this;
13969
- info.camera = renderCamera;
13970
- info.x = x;
13971
- info.y = y;
13972
- info.modifiers = modifiersex;
13973
- 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);
1397414600 if (!editObj)
1397514601 {
1397614602 hasMarquee = true;
....@@ -13994,8 +14620,8 @@
1399414620
1399514621 //if (drawing)
1399614622 //return;
13997
- if ((e.getModifiersEx() & CTRL) != 0
13998
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+ if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1399914625 {
1400014626 //System.out.println("mouseDragged: " + e);
1400114627 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14019,9 +14645,17 @@
1401914645 return targetLookAt;
1402014646 }
1402114647
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
+
1402214653 class PingThread extends Thread
1402314654 {
1402414655 boolean jump;
14656
+ boolean live;
14657
+
14658
+ boolean mute;
1402514659
1402614660 // void JumpToTarget()
1402714661 // {
....@@ -14037,6 +14671,88 @@
1403714671 // only one thread!? synchronized
1403814672 void StepToTarget(boolean jump)
1403914673 {
14674
+ RigidBody.pos.x = 0;
14675
+ RigidBody.pos.y = 0;
14676
+ RigidBody.pos.z = 0;
14677
+ if (RigidBody.justclicked)
14678
+ {
14679
+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+ RigidBody.wind.set(RigidBody.pos);
14683
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14684
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14685
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14686
+ RigidBody.wind.normalize();
14687
+ }
14688
+
14689
+ if (mute)
14690
+ return;
14691
+
14692
+ if (capsLocked && manipCamera.viewCode == 0)
14693
+ {
14694
+ eye.x = manipCamera.location.x;
14695
+ eye.y = manipCamera.location.y + 0.25;
14696
+ eye.z = manipCamera.location.z;
14697
+
14698
+ dir.y = -1;
14699
+
14700
+ Ray ray = new Ray(eye, dir);
14701
+
14702
+ IntersectResult res = new IntersectResult();
14703
+ res.t = Double.POSITIVE_INFINITY;
14704
+
14705
+ tmp.set(targetLookAt);
14706
+ tmp.sub(manipCamera.location);
14707
+
14708
+ double dist = tmp.length();
14709
+
14710
+ tmp.normalize();
14711
+
14712
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
14713
+ eye2.y = manipCamera.location.y + 0.25;
14714
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
14715
+
14716
+ Ray ray2 = new Ray(eye2, dir);
14717
+
14718
+ IntersectResult res2 = new IntersectResult();
14719
+ res2.t = Double.POSITIVE_INFINITY;
14720
+
14721
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14722
+ {
14723
+ //tmp.set(manipCamera.location);
14724
+
14725
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14726
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14727
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14728
+
14729
+ //tmp.sub(manipCamera.location);
14730
+
14731
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14732
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14733
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14734
+
14735
+ targetLookAt.sub(manipCamera.location);
14736
+ targetLookAt.normalize();
14737
+ targetLookAt.mul(dist);
14738
+ targetLookAt.add(manipCamera.location);
14739
+
14740
+ //if (tmp.dot(tmp) > 0.000001)
14741
+ // System.out.println("INTERSECTION " + manipCamera.location);
14742
+
14743
+ manipCamera.lookAt.set(targetLookAt);
14744
+
14745
+ tmp.x = res.n.x;
14746
+ tmp.y = res.n.y;
14747
+ tmp.z = res.n.z;
14748
+ tmp.x += res2.n.x;
14749
+ tmp.y += res2.n.y;
14750
+ tmp.z += res2.n.z;
14751
+ tmp.normalize();
14752
+ manipCamera.UP.set(tmp);
14753
+ }
14754
+ }
14755
+
1404014756 tmp.set(targetLookAt);
1404114757 tmp.sub(manipCamera.lookAt); // june 2014
1404214758
....@@ -14074,7 +14790,7 @@
1407414790
1407514791 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1407614792 {
14077
- jump = true; // step = 1;
14793
+ // sep 2019 jump = true; // step = 1;
1407814794 }
1407914795
1408014796 if (OEILONCE && OEIL)
....@@ -14109,7 +14825,10 @@
1410914825 if (tmp.dot(tmp) < 0.00001)
1411014826 {
1411114827 zoomonce = false;
14828
+ live = false;
1411214829 }
14830
+ else
14831
+ live = true;
1411314832
1411414833 tmp.mul(step > step2 ? step : step2);
1411514834 }
....@@ -14136,7 +14855,7 @@
1413614855 {
1413714856 if (LOOKAT)
1413814857 manipCamera.lookAt.add(tmp);
14139
- if (OEIL)
14858
+ if (OEIL && !capsLocked)
1414014859 manipCamera.location.add(tmp);
1414114860
1414214861 {
....@@ -14151,7 +14870,10 @@
1415114870 lightCamera.computeTransform();
1415214871 }
1415314872 }
14154
- manipCamera.computeTransform();
14873
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+ {
14875
+ manipCamera.computeTransform();
14876
+ }
1415514877 }
1415614878 // ?????? mouseDown = true;
1415714879 //System.out.println("---------------- ---------- Paint " + tmp.length2());
....@@ -14244,49 +14966,107 @@
1424414966 }
1424514967 }
1424614968 }
14969
+
1424714970 PingThread pingthread = new PingThread();
14248
- int delta = 5;
14249
- int speed = 5;
14971
+ int delta = 1;
14972
+ int speed = 1;
14973
+ int walk = 8;
1425014974 boolean autorepeat = false;
1425114975
14976
+ void Walk()
14977
+ {
14978
+ manipCamera.BackForth(0, walk, 1000);
14979
+
14980
+ targetLookAt.set(manipCamera.lookAt);
14981
+ }
14982
+
14983
+ void ViewAngle(float dy)
14984
+ {
14985
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14986
+
14987
+ if (manipCamera.shaper_fovy * factor > 1 &&
14988
+ manipCamera.shaper_fovy * factor < 150)
14989
+ {
14990
+ manipCamera.shaper_fovy *= factor;
14991
+ //System.out.println("fovy = " + shaper_fovy);
14992
+ }
14993
+ }
14994
+
1425214995 void GoDown(int mod)
1425314996 {
1425414997 MODIFIERS |= COMMAND;
14255
- /*
14998
+ boolean isVR = (mouseMode&VR)!=0;
14999
+ /**/
1425615000 if((mod&SHIFT) == SHIFT)
14257
- manipCamera.RotatePosition(0, -speed);
14258
- else
14259
- manipCamera.BackForth(0, -speed*delta, getWidth());
14260
- */
14261
- if ((mod & SHIFT) == SHIFT)
1426215001 {
14263
- mouseMode = mouseMode; // VR??
14264
- } else
14265
- {
14266
- mouseMode |= BACKFORTH;
15002
+// if (isVR)
15003
+// manipCamera.RotateInterest(0, speed);
15004
+// else
15005
+ if (isVR)
15006
+ ViewAngle(-speed*delta);
15007
+ else
15008
+ manipCamera.Translate(0, -speed*delta, getWidth());
1426715009 }
15010
+ else
15011
+ {
15012
+ if (isVR)
15013
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
15014
+ else
15015
+ manipCamera.RotatePosition(0, -speed);
15016
+ }
15017
+
15018
+ /**/
15019
+// if ((mod & SHIFT) == SHIFT)
15020
+// {
15021
+// mouseMode = mouseMode; // VR??
15022
+// } else
15023
+// {
15024
+// mouseMode |= BACKFORTH;
15025
+// }
1426815026
15027
+ targetLookAt.set(manipCamera.lookAt);
15028
+
1426915029 //prevX = X = anchorX;
1427015030 prevY = Y = anchorY - (int) (renderCamera.Distance());
1427115031 }
1427215032
1427315033 void GoUp(int mod)
1427415034 {
15035
+ RigidBody.justclicked = true;
15036
+
1427515037 MODIFIERS |= COMMAND;
14276
- /*
15038
+ /**/
15039
+ boolean isVR = (mouseMode&VR)!=0;
15040
+
1427715041 if((mod&SHIFT) == SHIFT)
14278
- manipCamera.RotatePosition(0, speed);
14279
- else
14280
- manipCamera.BackForth(0, speed*delta, getWidth());
14281
- */
14282
- if ((mod & SHIFT) == SHIFT)
1428315042 {
14284
- mouseMode = mouseMode;
14285
- } else
14286
- {
14287
- mouseMode |= BACKFORTH;
15043
+// if (isVR)
15044
+// manipCamera.RotateInterest(0, -speed);
15045
+// else
15046
+ if (isVR)
15047
+ ViewAngle(speed*delta);
15048
+ else
15049
+ manipCamera.Translate(0, speed*delta, getWidth());
1428815050 }
15051
+ else
15052
+ {
15053
+ if (isVR)
15054
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
15055
+ else
15056
+ manipCamera.RotatePosition(0, speed);
15057
+ }
15058
+
15059
+ /**/
15060
+// if ((mod & SHIFT) == SHIFT)
15061
+// {
15062
+// mouseMode = mouseMode;
15063
+// } else
15064
+// {
15065
+// mouseMode |= BACKFORTH;
15066
+// }
1428915067
15068
+ targetLookAt.set(manipCamera.lookAt);
15069
+
1429015070 //prevX = X = anchorX;
1429115071 prevY = Y = anchorY + (int) (renderCamera.Distance());
1429215072 }
....@@ -14294,20 +15074,31 @@
1429415074 void GoLeft(int mod)
1429515075 {
1429615076 MODIFIERS |= COMMAND;
14297
- /*
15077
+ /**/
1429815078 if((mod&SHIFT) == SHIFT)
14299
- manipCamera.RotatePosition(speed, 0);
15079
+ manipCamera.Translate(speed, 0, getWidth());
1430015080 else
14301
- manipCamera.Translate(speed*delta, 0, getWidth());
14302
- */
14303
- if ((mod & SHIFT) == SHIFT)
1430415081 {
14305
- mouseMode = mouseMode;
14306
- } else
14307
- {
14308
- mouseMode |= ROTATE;
14309
- } // TRANSLATE;
15082
+ if ((mouseMode&VR)!=0)
15083
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
15084
+ else
15085
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
15086
+ }
15087
+
15088
+ /**/
15089
+// if ((mod & SHIFT) == SHIFT)
15090
+// {
15091
+// mouseMode = mouseMode;
15092
+// } else
15093
+// {
15094
+// mouseMode |= ROTATE;
15095
+// } // TRANSLATE;
1431015096
15097
+ //System.err.println("lookAt = " + manipCamera.lookAt);
15098
+ //System.err.println("location = " + manipCamera.location);
15099
+
15100
+ targetLookAt.set(manipCamera.lookAt);
15101
+
1431115102 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1431215103 prevY = Y = anchorY;
1431315104 }
....@@ -14315,20 +15106,28 @@
1431515106 void GoRight(int mod)
1431615107 {
1431715108 MODIFIERS |= COMMAND;
14318
- /*
15109
+ /**/
1431915110 if((mod&SHIFT) == SHIFT)
14320
- manipCamera.RotatePosition(-speed, 0);
15111
+ manipCamera.Translate(-speed, 0, getWidth());
1432115112 else
14322
- manipCamera.Translate(-speed*delta, 0, getWidth());
14323
- */
14324
- if ((mod & SHIFT) == SHIFT)
1432515113 {
14326
- mouseMode = mouseMode;
14327
- } else
14328
- {
14329
- mouseMode |= ROTATE;
14330
- } // TRANSLATE;
15114
+ if ((mouseMode&VR)!=0)
15115
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
15116
+ else
15117
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
15118
+ }
15119
+
15120
+ /**/
15121
+// if ((mod & SHIFT) == SHIFT)
15122
+// {
15123
+// mouseMode = mouseMode;
15124
+// } else
15125
+// {
15126
+// mouseMode |= ROTATE;
15127
+// } // TRANSLATE;
1433115128
15129
+ targetLookAt.set(manipCamera.lookAt);
15130
+
1433215131 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1433315132 prevY = Y = anchorY;
1433415133 }
....@@ -14370,15 +15169,16 @@
1437015169 if (editObj)
1437115170 {
1437215171 drag = true;
14373
- ClickInfo info = new ClickInfo();
14374
- info.bounds.setBounds(0, 0,
15172
+ //ClickInfo info = new ClickInfo();
15173
+ object.clickInfo.bounds.setBounds(0, 0,
1437515174 (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14376
- info.pane = this;
14377
- info.camera = renderCamera;
14378
- info.x = x;
14379
- info.y = y;
14380
- object.manipWindow.copy
14381
- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
15175
+ object.clickInfo.pane = this;
15176
+ object.clickInfo.camera = renderCamera;
15177
+ object.clickInfo.x = x;
15178
+ object.clickInfo.y = y;
15179
+ object //.GetWindow().copy
15180
+ .doEditDrag(//info,
15181
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1438215182 } else
1438315183 {
1438415184 if (x < startX)
....@@ -14461,6 +15261,11 @@
1446115261 if ((mouseMode & ZOOM) != 0)
1446215262 {
1446315263 //if ((mouseMode & BACKFORTH) != 0)
15264
+ if ((modifiersex & SHIFT) == SHIFT)
15265
+ {
15266
+ ViewAngle(dy);
15267
+ }
15268
+ else
1446415269 if ((mouseMode & VR) != 0)
1446515270 manipCamera.BackForth(dx, dy, getWidth());
1446615271 else
....@@ -14527,24 +15332,30 @@
1452715332 }
1452815333 }
1452915334
15335
+// ClickInfo clickInfo = new ClickInfo();
15336
+
1453015337 public void mouseMoved(MouseEvent e)
1453115338 {
15339
+//object.editWindow.frame.
15340
+ setCursor(Cursor.getDefaultCursor());
15341
+
1453215342 //System.out.println("mouseMoved: " + e);
1453315343 if (isRenderer)
1453415344 return;
1453515345
14536
- ClickInfo ci = new ClickInfo();
14537
- ci.x = e.getX();
14538
- ci.y = e.getY();
14539
- ci.modifiers = e.getModifiersEx();
14540
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14541
- ci.pane = this;
14542
- ci.camera = renderCamera;
15346
+ // Mouse cursor feedback
15347
+ object.clickInfo.x = e.getX();
15348
+ object.clickInfo.y = e.getY();
15349
+ object.clickInfo.modifiers = e.getModifiersEx();
15350
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
15351
+ object.clickInfo.pane = this;
15352
+ object.clickInfo.camera = renderCamera;
1454315353 if (!isRenderer)
1454415354 {
1454515355 //ObjEditor editWindow = object.editWindow;
1454615356 //Object3D copy = editWindow.copy;
14547
- if (object.doEditClick(ci, 0))
15357
+ if (object.doEditClick(//clickInfo,
15358
+ 0))
1454815359 {
1454915360 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1455015361 } else
....@@ -14559,7 +15370,8 @@
1455915370 Globals.MOUSEDRAGGED = false;
1456015371
1456115372 movingcamera = false;
14562
- X = Y = 0;
15373
+ X = 0; // getBounds().width/2;
15374
+ Y = 0; // getBounds().height/2;
1456315375 //System.out.println("mouseReleased: " + e);
1456415376 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1456515377 }
....@@ -14711,8 +15523,10 @@
1471115523 mouseMode |= ZOOM;
1471215524 }
1471315525
14714
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14715
- if (capsLocked) // || (modifiers & META) == META)
15526
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15527
+ boolean vr = capsLocked && !lightMode;
15528
+
15529
+ if (vr) // || (modifiers & META) == META)
1471615530 {
1471715531 mouseMode |= VR; // BACKFORTH;
1471815532 }
....@@ -14724,7 +15538,8 @@
1472415538 {
1472515539 mouseMode |= SELECT;
1472615540 }
14727
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15541
+ if (//(modifiersex & SHIFT) == SHIFT ||
15542
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1472815543 {
1472915544 mouseMode &= ~VR;
1473015545 mouseMode |= TRANSLATE;
....@@ -14768,8 +15583,18 @@
1476815583 float SATPOW = 1; // 2; // 0.5f;
1476915584 float BRIPOW = 1; // 0.5f; // 0.5f;
1477015585
15586
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15587
+
15588
+// Create a new blank cursor.
15589
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15590
+ cursorImg, new Point(0, 0), "blank cursor");
15591
+
1477115592 public void keyPressed(int key)
1477215593 {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+ setCursor(blankCursor);
15597
+
1477315598 if (key >= '0' && key <= '5')
1477415599 clampbit = (key-'0');
1477515600
....@@ -14815,7 +15640,8 @@
1481515640 // break;
1481615641 case 'T':
1481715642 CACHETEXTURE ^= true;
14818
- textures.clear();
15643
+ texturepigment.clear();
15644
+ texturebump.clear();
1481915645 // repaint();
1482015646 break;
1482115647 case 'Y':
....@@ -14825,8 +15651,8 @@
1482515651 case 'K':
1482615652 KOMPACTTEXTURE ^= true;
1482715653 //textures.clear();
14828
- break;
14829
- case 'P': // Texture Projection macros
15654
+ // break;
15655
+ //case 'P': // Texture Projection macros
1483015656 // SAVETEXTURE ^= true;
1483115657 macromode = true;
1483215658 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -14900,7 +15726,9 @@
1490015726 case 'E' : COMPACT ^= true;
1490115727 repaint();
1490215728 break;
14903
- case 'W' : DEBUGHSB ^= true;
15729
+ case 'W' : // Wide Window (fullscreen)
15730
+ //DEBUGHSB ^= true;
15731
+ ObjEditor.theFrame.ToggleFullScreen();
1490415732 repaint();
1490515733 break;
1490615734 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14925,13 +15753,7 @@
1492515753 RevertCamera();
1492615754 repaint();
1492715755 break;
14928
- case 'l':
14929
- lightMode ^= true;
14930
- Globals.lighttouched = true;
14931
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14932
- targetLookAt.set(manipCamera.lookAt);
14933
- repaint();
14934
- break;
15756
+ //case 'l':
1493515757 case 'L':
1493615758 if (lightMode)
1493715759 {
....@@ -14951,7 +15773,7 @@
1495115773 targetLookAt.set(manipCamera.lookAt);
1495215774 repaint();
1495315775 break;
14954
- case 'p':
15776
+ case 'P': // p':
1495515777 // c'est quoi ca au juste? spherical ^= true;
1495615778 Skinshader ^= true; programInitialized = false;
1495715779 repaint();
....@@ -14962,7 +15784,8 @@
1496215784 break;
1496315785 case 'm':
1496415786 {
14965
- PrintMemory();
15787
+ //PrintMemory();
15788
+ ToggleImageFlip();
1496615789 break;
1496715790 }
1496815791 case 'M':
....@@ -14989,27 +15812,31 @@
1498915812 repaint();
1499015813 break;
1499115814 case 'O':
14992
- Globals.drawMode = OCCLUSION; // WARNING
14993
- repaint();
14994
- break;
15815
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15816
+ //repaint();
15817
+ //break;
1499515818 case 'o':
1499615819 OCCLUSION_CULLING ^= true;
1499715820 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1499815821 break;
14999
- case '0': envyoff ^= true; repaint(); break;
15822
+ //case '0': envyoff ^= true; repaint(); break;
1500015823 case '1':
1500115824 case '2':
1500215825 case '3':
1500315826 case '4':
1500415827 case '5':
15005
- newenvy = Character.getNumericValue(key);
15006
- repaint();
15007
- break;
1500815828 case '6':
1500915829 case '7':
1501015830 case '8':
1501115831 case '9':
15012
- BGcolor = (key - '6')/3.f;
15832
+ if (true) // envyoff)
15833
+ {
15834
+ BGcolor = (key - '1')/8.f;
15835
+ }
15836
+ else
15837
+ {
15838
+ //newenvy = Character.getNumericValue(key);
15839
+ }
1501315840 repaint();
1501415841 break;
1501515842 case '!':
....@@ -15075,15 +15902,36 @@
1507515902 case '_':
1507615903 kompactbit = 5;
1507715904 break;
15078
- case '+':
15079
- kompactbit = 6;
15080
- break;
15905
+// case '+':
15906
+// kompactbit = 6;
15907
+// break;
1508115908 case ' ':
15082
- ObjEditor.theFrame.ToggleFullScreen();
15909
+ capsLocked ^= true;
15910
+ repaint();
15911
+ break;
15912
+ case 'l':
15913
+ lightMode ^= true;
15914
+ if (lightMode)
15915
+ {
15916
+ keepshadow = Globals.RENDERSHADOW;
15917
+ Globals.RENDERSHADOW = false;
15918
+ }
15919
+ else
15920
+ {
15921
+ Globals.RENDERSHADOW = keepshadow;
15922
+ }
15923
+
15924
+ Globals.lighttouched = true;
15925
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15926
+ targetLookAt.set(manipCamera.lookAt);
1508315927 repaint();
1508415928 break;
1508515929 //case '`' :
1508615930 case ESC:
15931
+ if (FULLSCREEN)
15932
+ object.editWindow.ToggleFullScreen();
15933
+ break;
15934
+ case 'p':
1508715935 RENDERPROGRAM += 1;
1508815936 RENDERPROGRAM %= 3;
1508915937
....@@ -15122,12 +15970,17 @@
1512215970 case ENTER:
1512315971 // object.editWindow.ScreenFit(); // Edit();
1512415972 ToggleLive();
15973
+ if (capsLocked)
15974
+ {
15975
+ Globals.WALK ^= true;
15976
+ }
1512515977 break;
1512615978 case DELETE:
1512715979 ClearSelection();
1512815980 break;
15129
- /*
1513015981 case '+':
15982
+
15983
+ /*
1513115984 //fontsize += 1;
1513215985 bbzoom *= 2;
1513315986 repaint();
....@@ -15144,30 +15997,36 @@
1514415997 case '=':
1514515998 IncDepth();
1514615999 //fontsize += 1;
15147
- object.editWindow.refreshContents(true);
16000
+ object.GetWindow().refreshContents(true);
1514816001 maskbit = 6;
1514916002 break;
1515016003 case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1515116004 DecDepth();
1515216005 maskbit = 5;
1515316006 //if(fontsize > 1) fontsize -= 1;
15154
- if (object.editWindow == null)
15155
- new Exception().printStackTrace();
15156
- else
15157
- object.editWindow.refreshContents(true);
16007
+// if (object.editWindow == null)
16008
+// new Exception().printStackTrace();
16009
+// else
16010
+ object.GetWindow().refreshContents(true);
1515816011 break;
1515916012 case '{':
15160
- manipCamera.shaper_fovy /= 1.1;
16013
+ double factor = 1.1;
16014
+ if (manipCamera.shaper_fovy / factor > 0.1)
16015
+ manipCamera.shaper_fovy /= factor;
1516116016 System.out.println("FOV = " + manipCamera.shaper_fovy);
1516216017 repaint();
1516316018 break;
1516416019 case '}':
15165
- manipCamera.shaper_fovy *= 1.1;
16020
+ factor = 1.1;
16021
+ if (manipCamera.shaper_fovy * factor < 150)
16022
+ manipCamera.shaper_fovy *= factor;
1516616023 System.out.println("FOV = " + manipCamera.shaper_fovy);
1516716024 repaint();
1516816025 break;
1516916026 case '[':
15170
- manipCamera.shaper_fovy /= 1.01;
16027
+ factor = 1.01;
16028
+ if (manipCamera.shaper_fovy / factor > 0.1)
16029
+ manipCamera.shaper_fovy /= factor;
1517116030 if (false) //manipCamera.hAspect == 0)
1517216031 {
1517316032 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15183,7 +16042,9 @@
1518316042 break;
1518416043 case ']':
1518516044 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15186
- manipCamera.shaper_fovy *= 1.01;
16045
+ factor = 1.01;
16046
+ if (manipCamera.shaper_fovy * factor < 150)
16047
+ manipCamera.shaper_fovy *= factor;
1518716048 if (false) //manipCamera.hAspect == 0)
1518816049 {
1518916050 double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15221,98 +16082,113 @@
1522116082 }
1522216083 }
1522316084
16085
+ boolean keys[] = new boolean[256];
16086
+ int speedkey[] = new int[256];
16087
+ int modifiers = 0;
16088
+
1522416089 public void processKeyEvent(KeyEvent e)
1522516090 {
1522616091 switch (e.getID())
1522716092 {
1522816093 case KeyEvent.KEY_PRESSED:
15229
- if (!autorepeat)
15230
- {
15231
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15232
- keyPressed(e.getKeyChar(), e.getModifiersEx());
15233
- }
15234
- if (manipCamera == lightCamera)
15235
- {
15236
- switch (e.getKeyCode())
15237
- {
15238
- case DOWN_ARROW:
15239
- lightCamera.DECAL /= 2;
15240
- repaint();
15241
- break;
15242
- case UP_ARROW:
15243
- lightCamera.DECAL *= 2;
15244
- repaint();
15245
- break;
15246
- case LEFT_ARROW:
15247
- lightCamera.SCALE /= 2;
15248
- repaint();
15249
- break;
15250
- case RIGHT_ARROW:
15251
- lightCamera.SCALE *= 2;
15252
- repaint();
15253
- break;
15254
- default:
15255
- break;
15256
- }
15257
-
15258
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15259
- } else
15260
- {
15261
- if (true) // !autorepeat)
15262
- {
15263
- boolean reset = true;
15264
-
15265
- switch (e.getKeyCode())
15266
- {
15267
- case DOWN_ARROW:
15268
- GoDown(e.getModifiersEx());
15269
- repaint();
15270
- break;
15271
- case UP_ARROW:
15272
- GoUp(e.getModifiersEx());
15273
- repaint();
15274
- break;
15275
- case LEFT_ARROW:
15276
- GoLeft(e.getModifiersEx());
15277
- repaint();
15278
- break;
15279
- case RIGHT_ARROW:
15280
- GoRight(e.getModifiersEx());
15281
- repaint();
15282
- break;
15283
- default:
15284
- reset = false;
15285
- break;
15286
- }
15287
-
15288
- if (reset)
15289
- {
15290
- autorepeat = true;
15291
-
15292
- targetLookAt.set(manipCamera.lookAt);
15293
- }
15294
- }
15295
- }
16094
+ keys[e.getKeyCode()] = true;
16095
+ modifiers = e.getModifiersEx();
16096
+ keyPressed(e.getKeyChar(), modifiers);
16097
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
16098
+ repaint();
1529616099 break;
15297
- case KeyEvent.KEY_TYPED:
15298
- break;
16100
+// if (!autorepeat)
16101
+// {
16102
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
16103
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
16104
+// }
16105
+// if (manipCamera == lightCamera)
16106
+// {
16107
+// switch (e.getKeyCode())
16108
+// {
16109
+// case DOWN_ARROW:
16110
+// lightCamera.DECAL /= 2;
16111
+// repaint();
16112
+// break;
16113
+// case UP_ARROW:
16114
+// lightCamera.DECAL *= 2;
16115
+// repaint();
16116
+// break;
16117
+// case LEFT_ARROW:
16118
+// lightCamera.SCALE /= 2;
16119
+// repaint();
16120
+// break;
16121
+// case RIGHT_ARROW:
16122
+// lightCamera.SCALE *= 2;
16123
+// repaint();
16124
+// break;
16125
+// default:
16126
+// break;
16127
+// }
16128
+//
16129
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
16130
+// } else
16131
+// {
16132
+// if (true) // !autorepeat)
16133
+// {
16134
+// boolean reset = true;
16135
+//
16136
+// switch (e.getKeyCode())
16137
+// {
16138
+// case DOWN_ARROW:
16139
+// GoDown(e.getModifiersEx());
16140
+// repaint();
16141
+// break;
16142
+// case UP_ARROW:
16143
+// GoUp(e.getModifiersEx());
16144
+// repaint();
16145
+// break;
16146
+// case LEFT_ARROW:
16147
+// GoLeft(e.getModifiersEx());
16148
+// repaint();
16149
+// break;
16150
+// case RIGHT_ARROW:
16151
+// GoRight(e.getModifiersEx());
16152
+// repaint();
16153
+// break;
16154
+// default:
16155
+// reset = false;
16156
+// break;
16157
+// }
16158
+//
16159
+// if (reset)
16160
+// {
16161
+// autorepeat = true;
16162
+//
16163
+// targetLookAt.set(manipCamera.lookAt);
16164
+// }
16165
+// }
16166
+// }
16167
+// break;
16168
+// case KeyEvent.KEY_TYPED:
16169
+// break;
1529916170 case KeyEvent.KEY_RELEASED:
15300
- {
15301
- switch (e.getKeyCode())
15302
- {
15303
- case DOWN_ARROW:
15304
- case UP_ARROW:
15305
- case LEFT_ARROW:
15306
- case RIGHT_ARROW:
15307
- MODIFIERS &= ~COMMAND;
15308
- autorepeat = false;
15309
- break;
15310
- default:
15311
- break;
15312
- }
16171
+ keys[e.getKeyCode()] = false;
16172
+ modifiers = e.getModifiersEx();
1531316173 keyReleased(e.getKeyChar(), e.getModifiersEx());
16174
+ repaint();
1531416175 break;
15315
- }
16176
+// {
16177
+// switch (e.getKeyCode())
16178
+// {
16179
+// case DOWN_ARROW:
16180
+// case UP_ARROW:
16181
+// case LEFT_ARROW:
16182
+// case RIGHT_ARROW:
16183
+// MODIFIERS &= ~COMMAND;
16184
+// autorepeat = false;
16185
+// break;
16186
+// default:
16187
+// break;
16188
+// }
16189
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
16190
+// break;
16191
+// }
1531616192 default:
1531716193 break;
1531816194 }
....@@ -15378,7 +16254,7 @@
1537816254 }
1537916255 */
1538016256
15381
- object.editWindow.EditSelection();
16257
+ object.GetWindow().EditSelection(false);
1538216258 }
1538316259
1538416260 void SelectParent()
....@@ -15395,10 +16271,10 @@
1539516271 {
1539616272 //selectees.remove(i);
1539716273 System.out.println("select parent of " + elem);
15398
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
16274
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1539916275 } else
1540016276 {
15401
- group.editWindow.Select(elem.GetTreePath(), first, true);
16277
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
1540216278 }
1540316279
1540416280 first = false;
....@@ -15440,12 +16316,12 @@
1544016316 for (int j = 0; j < group.children.size(); j++)
1544116317 {
1544216318 elem = (Object3D) group.children.elementAt(j);
15443
- object.editWindow.Select(elem.GetTreePath(), first, true);
16319
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1544416320 first = false;
1544516321 }
1544616322 } else
1544716323 {
15448
- object.editWindow.Select(elem.GetTreePath(), first, true);
16324
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1544916325 }
1545016326
1545116327 first = false;
....@@ -15456,21 +16332,21 @@
1545616332 {
1545716333 //Composite group = (Composite) object;
1545816334 Object3D group = object;
15459
- group.editWindow.loadClipboard(true); // ClearSelection(false);
16335
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
1546016336 }
1546116337
1546216338 void ResetTransform(int mask)
1546316339 {
1546416340 //Composite group = (Composite) object;
1546516341 Object3D group = object;
15466
- group.editWindow.ResetTransform(mask);
16342
+ group.GetWindow().ResetTransform(mask);
1546716343 }
1546816344
1546916345 void FlipTransform()
1547016346 {
1547116347 //Composite group = (Composite) object;
1547216348 Object3D group = object;
15473
- group.editWindow.FlipTransform();
16349
+ group.GetWindow().FlipTransform();
1547416350 // group.editWindow.ReduceMesh(true);
1547516351 }
1547616352
....@@ -15478,7 +16354,7 @@
1547816354 {
1547916355 //Composite group = (Composite) object;
1548016356 Object3D group = object;
15481
- group.editWindow.PrintMemory();
16357
+ group.GetWindow().PrintMemory();
1548216358 // group.editWindow.ReduceMesh(true);
1548316359 }
1548416360
....@@ -15486,7 +16362,7 @@
1548616362 {
1548716363 //Composite group = (Composite) object;
1548816364 Object3D group = object;
15489
- group.editWindow.ResetCentroid();
16365
+ group.GetWindow().ResetCentroid();
1549016366 }
1549116367
1549216368 void IncDepth()
....@@ -15568,8 +16444,6 @@
1556816444
1556916445 int width = getBounds().width;
1557016446 int height = getBounds().height;
15571
- ClickInfo info = new ClickInfo();
15572
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1557316447 //Image img = CreateImage(width, height);
1557416448 //System.out.println("width = " + width + "; height = " + height + "\n");
1557516449
....@@ -15646,48 +16520,77 @@
1564616520 }
1564716521 if (object != null && !hasMarquee)
1564816522 {
16523
+ if (object.clickInfo == null)
16524
+ object.clickInfo = new ClickInfo();
16525
+ ClickInfo info = object.clickInfo;
16526
+ //ClickInfo info = new ClickInfo();
16527
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16528
+
1564916529 if (isRenderer)
1565016530 {
15651
- info.flags++;
16531
+ object.clickInfo.flags++;
1565216532 double frameAspect = (double) width / (double) height;
1565316533 if (frameAspect > renderCamera.aspect)
1565416534 {
1565516535 int desired = (int) ((double) height * renderCamera.aspect);
15656
- info.bounds.width -= width - desired;
15657
- info.bounds.x += (width - desired) / 2;
16536
+ object.clickInfo.bounds.width -= width - desired;
16537
+ object.clickInfo.bounds.x += (width - desired) / 2;
1565816538 } else
1565916539 {
1566016540 int desired = (int) ((double) width / renderCamera.aspect);
15661
- info.bounds.height -= height - desired;
15662
- info.bounds.y += (height - desired) / 2;
16541
+ object.clickInfo.bounds.height -= height - desired;
16542
+ object.clickInfo.bounds.y += (height - desired) / 2;
1566316543 }
1566416544 }
15665
- info.g = gr;
15666
- info.camera = renderCamera;
16545
+
16546
+ object.clickInfo.g = gr;
16547
+ object.clickInfo.camera = renderCamera;
1566716548 /*
1566816549 // Memory intensive (brep.verticescopy)
1566916550 if (!(object instanceof Composite))
1567016551 object.draw(info, 0, false); // SLOW :
1567116552 */
15672
- if (!isRenderer)
16553
+ if (!isRenderer) // && drag)
1567316554 {
15674
- object.drawEditHandles(info, 0);
15675
-
15676
- if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
16555
+ Grafreed.Assert(object != null);
16556
+ Grafreed.Assert(object.selection != null);
16557
+ if (object.selection.Size() > 0)
1567716558 {
15678
- switch (object.selection.get(0).hitSomething)
16559
+ int hitSomething = object.selection.get(0).hitSomething;
16560
+
16561
+ object.clickInfo.DX = 0;
16562
+ object.clickInfo.DY = 0;
16563
+ object.clickInfo.W = 1;
16564
+ if (hitSomething == Object3D.hitCenter)
1567916565 {
15680
- case Object3D.hitCenter: gr.setColor(Color.pink);
15681
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15682
- break;
15683
- case Object3D.hitRotate: gr.setColor(Color.yellow);
15684
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
- break;
15686
- case Object3D.hitScale: gr.setColor(Color.cyan);
15687
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
- break;
16566
+ info.DX = X;
16567
+ if (X != 0)
16568
+ info.DX -= info.bounds.width/2;
16569
+
16570
+ info.DY = Y;
16571
+ if (Y != 0)
16572
+ info.DY -= info.bounds.height/2;
1568916573 }
15690
-
16574
+
16575
+ object.drawEditHandles(//info,
16576
+ 0);
16577
+
16578
+ if (drag && (X != 0 || Y != 0))
16579
+ {
16580
+ switch (hitSomething)
16581
+ {
16582
+ case Object3D.hitCenter: gr.setColor(Color.white);
16583
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16584
+ break;
16585
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
16586
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16587
+ break;
16588
+ case Object3D.hitScale: gr.setColor(Color.cyan);
16589
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16590
+ break;
16591
+ }
16592
+
16593
+ }
1569116594 }
1569216595 }
1569316596 }
....@@ -15702,7 +16605,7 @@
1570216605 if (hasMarquee)
1570316606 {
1570416607 gr.setXORMode(Color.white);
15705
- gr.setColor(Color.red);
16608
+ gr.setColor(Color.white);
1570616609 if (!firstime)
1570716610 {
1570816611 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -15861,7 +16764,8 @@
1586116764
1586216765 public boolean mouseDrag(Event evt, int x, int y)
1586316766 {
15864
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1586516769 /*
1586616770 drag = true;
1586716771 //System.out.println("Mouse DRAG");
....@@ -15980,6 +16884,7 @@
1598016884 public boolean mouseUp(Event evt, int x, int y)
1598116885 {
1598216886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1598316888 /*
1598416889 locked = false;
1598516890 if (isRenderer)
....@@ -16169,6 +17074,8 @@
1616917074 private /*static*/ boolean firstime;
1617017075 private /*static*/ cVector newView = new cVector();
1617117076 private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
17077
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
17078
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1617217079 private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1617317080 GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1617417081 GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16181,29 +17088,67 @@
1618117088 {
1618217089 com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1618317090
17091
+ int usedsuf = 0;
17092
+
1618417093 for (int i = 0; i < suffixes.length; i++)
1618517094 {
16186
- String resourceName = basename + suffixes[i] + "." + suffix;
16187
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16188
- mipmapped,
16189
- FileUtil.getFileSuffix(resourceName));
16190
- if (data == null)
17095
+ String[] suffixe = suffixes;
17096
+ String[] fallback = suffixes2;
17097
+ String[] fallfallback = suffixes3;
17098
+
17099
+ for (int c=usedsuf; --c>=0;)
1619117100 {
16192
- throw new IOException("Unable to load texture " + resourceName);
17101
+// String[] temp = suffixe;
17102
+// suffixe = fallback;
17103
+// fallback = fallfallback;
17104
+// fallfallback = temp;
1619317105 }
17106
+
17107
+ String resourceName = basename + suffixe[i] + "." + suffix;
17108
+ TextureData data;
17109
+
17110
+ try
17111
+ {
17112
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17113
+ mipmapped,
17114
+ FileUtil.getFileSuffix(resourceName));
17115
+ }
17116
+ catch (Exception e)
17117
+ {
17118
+ try
17119
+ {
17120
+ resourceName = basename + fallback[i] + "." + suffix;
17121
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17122
+ mipmapped,
17123
+ FileUtil.getFileSuffix(resourceName));
17124
+ }
17125
+ catch (Exception e2)
17126
+ {
17127
+ resourceName = basename + fallfallback[i] + "." + suffix;
17128
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
17129
+ mipmapped,
17130
+ FileUtil.getFileSuffix(resourceName));
17131
+ }
17132
+ }
17133
+
1619417134 //System.out.println("Target = " + targets[i]);
1619517135 cubemap.updateImage(data, targets[i]);
1619617136 }
1619717137
1619817138 return cubemap;
1619917139 }
17140
+
1620017141 int bigsphere = -1;
1620117142
1620217143 float BGcolor = 0.5f;
1620317144
16204
- private void DrawSkyBox(GL gl)
17145
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
17146
+
17147
+ private void DrawSkyBox(GL gl, float ratio)
1620517148 {
16206
- if (envyoff || cubemap == null)
17149
+ if (//envyoff ||
17150
+ WIREFRAME ||
17151
+ cubemap == null)
1620717152 {
1620817153 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1620917154 gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -16218,7 +17163,17 @@
1621817163 // Compensates for ExaminerViewer's modification of modelview matrix
1621917164 gl.glMatrixMode(GL.GL_MODELVIEW);
1622017165 gl.glLoadIdentity();
17166
+ gl.glScalef(1,ratio,1);
1622117167
17168
+// colorV[0] = 2;
17169
+// colorV[1] = 2;
17170
+// colorV[2] = 2;
17171
+// colorV[3] = 1;
17172
+// gl.glDisable(gl.GL_COLOR_MATERIAL);
17173
+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
17174
+//
17175
+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
17176
+
1622217177 //gl.glActiveTexture(GL.GL_TEXTURE1);
1622317178 //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1622417179
....@@ -16250,6 +17205,7 @@
1625017205 {
1625117206 gl.glScalef(1.0f, -1.0f, 1.0f);
1625217207 }
17208
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
1625317209 gl.glMultMatrixd(viewrot_1, 0);
1625417210 gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
1625517211 //viewer.updateInverseRotation(gl);
....@@ -16290,7 +17246,8 @@
1629017246 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1629117247
1629217248 cubemap.disable();
16293
- ////cubemap.unbind();
17249
+ //cubemap.dispose();
17250
+
1629417251 if (CULLFACE)
1629517252 {
1629617253 gl.glEnable(gl.GL_CULL_FACE);
....@@ -16346,7 +17303,7 @@
1634617303 gl.glScalef(1.0f, -1.0f, 1.0f);
1634717304 }
1634817305
16349
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
17306
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1635017307
1635117308 float step = 2; // 0.1666f; //0.25f;
1635217309 float stepv = 2; // step * 1652 / 998;
....@@ -16485,6 +17442,14 @@
1648517442 }
1648617443 }
1648717444
17445
+ private Object3D GetFolder()
17446
+ {
17447
+ Object3D folder = object.GetWindow().copy;
17448
+ if (object.GetWindow().copy.selection.Size() > 0)
17449
+ folder = object.GetWindow().copy.selection.elementAt(0);
17450
+ return folder;
17451
+ }
17452
+
1648817453 class SelectBuffer implements GLEventListener
1648917454 {
1649017455
....@@ -16500,7 +17465,7 @@
1650017465 //new Exception().printStackTrace();
1650117466 System.out.println("select buffer init");
1650217467 // Use debug pipeline
16503
- drawable.setGL(new DebugGL(drawable.getGL()));
17468
+ //drawable.setGL(new DebugGL(drawable.getGL()));
1650417469
1650517470 GL gl = drawable.getGL();
1650617471
....@@ -16564,6 +17529,17 @@
1656417529
1656517530 //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
1656617531
17532
+ if (PAINTMODE)
17533
+ {
17534
+ if (object.GetWindow().copy.selection.Size() > 0)
17535
+ {
17536
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17537
+
17538
+ // Make what you paint not selectable.
17539
+ paintobj.ResetSelectable();
17540
+ }
17541
+ }
17542
+
1656717543 //int tmp = selection_view;
1656817544 //selection_view = -1;
1656917545 int temp = DrawMode();
....@@ -16575,6 +17551,17 @@
1657517551 // temp = DEFAULT; // patch for selection debug
1657617552 Globals.drawMode = temp; // WARNING
1657717553
17554
+ if (PAINTMODE)
17555
+ {
17556
+ if (object.GetWindow().copy.selection.Size() > 0)
17557
+ {
17558
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
17559
+
17560
+ // Revert.
17561
+ paintobj.RestoreSelectable();
17562
+ }
17563
+ }
17564
+
1657817565 //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
1657917566
1658017567 // trying different ways of getting the depth info over
....@@ -16605,7 +17592,7 @@
1660517592
1660617593 float depth = depths[y * TEX_SIZE + x];
1660717594
16608
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1660917596 {
1661017597 pointselection = false;
1661117598
....@@ -16678,29 +17665,31 @@
1667817665 }
1667917666
1668017667 if (!movingcamera && !PAINTMODE)
16681
- object.editWindow.ScreenFitPoint(); // fev 2014
17668
+ object.GetWindow().ScreenFitPoint(); // fev 2014
1668217669
16683
- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
17670
+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1668417671 {
16685
- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
17672
+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1668617673
16687
- Object3D group = new Object3D("inst" + paintcount++);
17674
+ if (object.GetWindow().copy.selection.Size() > 0)
17675
+ {
17676
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
1668817677
16689
- group.CreateMaterial(); // use a void leaf to select instances
16690
-
16691
- group.add(paintobj); // link
16692
-
16693
- object.editWindow.SnapObject(group);
16694
-
16695
- Object3D folder = object.editWindow.copy;
16696
-
16697
- if (object.editWindow.copy.selection.Size() > 0)
16698
- folder = object.editWindow.copy.selection.elementAt(0);
16699
-
16700
- folder.add(group);
16701
-
16702
- object.editWindow.ResetModel();
16703
- object.editWindow.refreshContents();
17678
+ Object3D inst = new Object3D("inst" + paintcount++);
17679
+
17680
+ inst.CreateMaterial(); // use a void leaf to select instances
17681
+
17682
+ inst.add(paintobj); // link
17683
+
17684
+ object.GetWindow().SnapObject(inst);
17685
+
17686
+ Object3D folder = paintFolder; // GetFolder();
17687
+
17688
+ folder.add(inst);
17689
+
17690
+ object.GetWindow().ResetModel();
17691
+ object.GetWindow().refreshContents();
17692
+ }
1670417693 }
1670517694 else
1670617695 paintcount = 0;
....@@ -16739,6 +17728,11 @@
1673917728 //System.out.println("objects[color] = " + objects[color]);
1674017729 //objects[color].Select();
1674117730 indexcount = 0;
17731
+ ObjEditor window = object.GetWindow();
17732
+ if (window != null && deselect)
17733
+ {
17734
+ window.Select(null, deselect, true);
17735
+ }
1674217736 object.Select(color, deselect);
1674317737 }
1674417738
....@@ -16789,6 +17783,7 @@
1678917783
1679017784 public void init(GLAutoDrawable drawable)
1679117785 {
17786
+ if (Globals.DEBUG)
1679217787 System.out.println("shadow buffer init");
1679317788
1679417789 GL gl = drawable.getGL();
....@@ -17017,10 +18012,14 @@
1701718012 gl.glFlush();
1701818013
1701918014 /**/
17020
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
18015
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1702118016
17022
- float[] pixels = occlusionsizebuffer.array();
18017
+ float[] depths = occlusiondepthbuffer.array();
1702318018
18019
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
18020
+
18021
+ int[] pixels = selectsizebuffer.array();
18022
+
1702418023 double r = 0, g = 0, b = 0;
1702518024
1702618025 double count = 0;
....@@ -17031,7 +18030,7 @@
1703118030
1703218031 double FACTOR = 1;
1703318032
17034
- for (int i = 0; i < pixels.length; i++)
18033
+ for (int i = 0; i < depths.length; i++)
1703518034 {
1703618035 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1703718036 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17114,7 +18113,7 @@
1711418113
1711518114 double scale = ray.z; // 1; // cos
1711618115
17117
- float depth = pixels[newindex];
18116
+ float depth = depths[newindex];
1711818117
1711918118 /*
1712018119 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17257,6 +18256,11 @@
1725718256 static boolean DEBUG_SELECTION = false;
1725818257 boolean OCCLUSION_CULLING = false; //true;
1725918258 public boolean lightMode = false;
18259
+
18260
+ private boolean keepshadow;
18261
+
18262
+ static public boolean capsLocked = false; // VR
18263
+
1726018264 static public int indexcount = 0;
1726118265 /*static*/ cColor vertexOcclusion = new cColor();
1726218266 //private int selection_view = -1;
....@@ -17311,11 +18315,14 @@
1731118315 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1731218316 static IntBuffer bigAAbuffer;
1731318317 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17314
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
18318
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1731518319 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1731618320 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1731718321 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17318
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18322
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18323
+
18324
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
18325
+
1731918326 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1732018327 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1732118328 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();