~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1,4 +1,5 @@
1	1
	2	+import com.bulletphysics.dynamics.RigidBody;
2	3	import java.awt.*;
3	4	import java.awt.event.*;
4	5	import java.awt.image.*;
..	..	@@ -18,7 +19,10 @@
18	19	import javax.imageio.ImageIO;
19	20	import javax.imageio.ImageWriteParam;
20	21	import javax.imageio.ImageWriter;
	22	+import javax.imageio.ImageReadParam;
	23	+import javax.imageio.ImageReader;
21	24	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	25	+import javax.imageio.stream.ImageInputStream;
22	26	import javax.imageio.stream.ImageOutputStream;
23	27	import javax.imageio.ImageWriteParam;
24	28
..	..	@@ -30,6 +34,7 @@
30	34	import java.nio.*;
31	35
32	36	import gleem.linalg.Mat4f;
	37	+import javax.imageio.ImageTypeSpecifier;
33	38
34	39	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	40	{
..	..	@@ -37,7 +42,6 @@
37	42	static boolean[] selectedstack = new boolean[65536];
38	43	static int materialdepth = 0;
39	44
40		- static boolean DEBUG = false;
41	45	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	46
43	47	// camera change fix
..	..	@@ -45,6 +49,39 @@
45	49	static boolean ABORTED = false;
46	50
47	51	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	+ }
48	85
49	86	/static/ private boolean CULLFACE = false; // true;
50	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +93,12 @@
56	93	static int CURRENTANTIALIAS = 0; // 1;
57	94	/static/ boolean RENDERSHADOW = true;
58	95	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	96
62	97	boolean DISPLAYTEXT = false;
63	98	//boolean REDUCETEXTURE = true;
64	99	boolean CACHETEXTURE = true;
65	100	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
67	102	boolean COMPRESSTEXTURE = false;
68	103	boolean KOMPACTTEXTURE = false; // true;
69	104	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +111,11 @@
76	111	//private Mat4f spotlightTransform = new Mat4f();
77	112	//private Mat4f spotlightInverseTransform = new Mat4f();
78	113	static GLContext glcontext = null;
79		- /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	+
80	119	boolean reverseUP = false;
81	120	static boolean frozen = false;
82	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -92,9 +131,11 @@
92	131
93	132	static int tickcount = 0; // slow pose issue
94	133
	134	+static boolean BUTTONLESSWHEEL = false;
	135	+static boolean ZOOMBOXMODE = false;
95	136	static boolean BOXMODE = false;
96	137	static boolean IMAGEFLIP = false;
97		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
98	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
99	140	static boolean SPEAKERCAMERA = false;
100	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -106,7 +147,7 @@
106	147	static boolean OEIL = true;
107	148	static boolean OEILONCE = false; // do oeilon then oeiloff
108	149	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	150	+static boolean SWITCH = true; // false;
110	151	static boolean HANDLES = false; // selection doesn't work!!
111	152	static boolean PAINTMODE = false;
112	153
..	..	@@ -128,16 +169,16 @@
128	169
129	170
130	171	// OPTIONS
131		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
132	173	boolean cameraLight = false;
133	174	boolean UVdebug = false;
134	175	boolean Udebug = false;
135	176	boolean Vdebug = false;
136	177	boolean NORMALdebug = false;
137		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
138	179	boolean anisotropy = true;
139	180	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	182
142	183	boolean macromode = false;
143	184
..	..	@@ -148,6 +189,21 @@
148	189	defaultcaps.setAccumGreenBits(16);
149	190	defaultcaps.setAccumBlueBits(16);
150	191	defaultcaps.setAccumAlphaBits(16);
	192	+ }
	193	+
	194	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	195	+
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	197	+ {
	198	+ try
	199	+ {
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	201	+ } catch (IOException e)
	202	+ {
	203	+ System.out.println("NAME = " + name);
	204	+ e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
	206	+ }
151	207	}
152	208
153	209	void SetAsGLRenderer(boolean b)
..	..	@@ -166,9 +222,10 @@
166	222	cameras = new Camera[2];
167	223	targetLookAts = new cVector[2];
168	224
169		- SetCamera(cam);
	225	+ SetCamera(cam, true);
170	226
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
172	229
173	230	object = o;
174	231
..	..	@@ -191,9 +248,43 @@
191	248
192	249	/// INTERFACE
193	250
	251	+ public javax.media.opengl.GL GetGL0()
	252	+ {
	253	+ return null;
	254	+ }
	255	+
	256	+ public int GenList()
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ return gl.glGenLists(1);
	260	+ }
	261	+
	262	+ public void NewList(int id)
	263	+ {
	264	+ javax.media.opengl.GL gl = GetGL();
	265	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	266	+ }
	267	+
	268	+ public void CallList(int id)
	269	+ {
	270	+ javax.media.opengl.GL gl = GetGL();
	271	+ gl.glCallList(id);
	272	+ }
	273	+
	274	+ public void EndList()
	275	+ {
	276	+ javax.media.opengl.GL gl = GetGL();
	277	+ gl.glEndList();
	278	+ }
	279	+
194	280	public boolean IsBoxMode()
195	281	{
196	282	return BOXMODE;
	283	+ }
	284	+
	285	+ public boolean IsZoomBoxMode()
	286	+ {
	287	+ return ZOOMBOXMODE;
197	288	}
198	289
199	290	public void ClearDepth()
..	..	@@ -291,7 +382,7 @@
291	382	cStatic.objectstack[materialdepth++] = obj;
292	383	//System.out.println("material " + material);
293	384	//Applet3D.tracein(this, selected);
294		- display.vector2buffer = obj.projectedVertices;
	385	+ //display.vector2buffer = obj.projectedVertices;
295	386	if (obj instanceof Camera)
296	387	{
297	388	display.options1[0] = material.shift;
..	..	@@ -300,14 +391,28 @@
300	391	display.options1[2] = material.shadowbias;
301	392	display.options1[3] = material.aniso;
302	393	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]);
303	399	display.options2[0] = material.opacity;
304	400	display.options2[1] = material.diffuse;
305	401	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]);
306	405
307	406	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]);
308	410	display.options4[0] = material.cameralight/0.2f;
309	411	display.options4[1] = material.subsurface;
310	412	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]);
311	416
312	417	// if (display.CURRENTANTIALIAS > 0)
313	418	// display.options3[3] /= 4;
..	..	@@ -323,7 +428,7 @@
323	428	/**/
324	429	} else
325	430	{
326		- DrawMaterial(material, selected);
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
327	432	}
328	433	} else
329	434	{
..	..	@@ -347,8 +452,8 @@
347	452	cStatic.objectstack[materialdepth++] = obj;
348	453	//System.out.println("material " + material);
349	454	//Applet3D.tracein("selected ", selected);
350		- display.vector2buffer = obj.projectedVertices;
351		- display.DrawMaterial(material, selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
352	457	}
353	458	}
354	459
..	..	@@ -365,8 +470,8 @@
365	470	materialdepth -= 1;
366	471	if (materialdepth > 0)
367	472	{
368		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	473	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	474	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
370	475	}
371	476	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372	477	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -386,8 +491,8 @@
386	491	materialdepth -= 1;
387	492	if (materialdepth > 0)
388	493	{
389		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	494	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	495	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
391	496	}
392	497	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393	498	//else
..	..	@@ -428,15 +533,18 @@
428	533	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429	534	{
430	535	//gl.glBegin(gl.GL_TRIANGLES);
431		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	536	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	537	+ // TEST LIVE NORMALS && !obj.dontselect
	538	+ ;
432	539	if (!hasnorm)
433	540	{
434		- // System.out.println("FUCK!!");
	541	+ // System.out.println("Mesh normal");
435	542	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
436	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
437	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
438	545	LA.vecNormalize(obj.v2);
439		- 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);
440	548	}
441	549
442	550	// P
..	..	@@ -458,7 +566,7 @@
458	566	y += ny * obj.NORMALPUSH;
459	567	z += nz * obj.NORMALPUSH;
460	568
461		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
462	570	}
463	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
464	572	SetColor(obj, pv);
..	..	@@ -490,7 +598,7 @@
490	598	y += ny * obj.NORMALPUSH;
491	599	z += nz * obj.NORMALPUSH;
492	600
493		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
494	602	}
495	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
496	604	// boolean locked = false;
..	..	@@ -538,7 +646,7 @@
538	646	y += ny * obj.NORMALPUSH;
539	647	z += nz * obj.NORMALPUSH;
540	648
541		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
542	650	}
543	651
544	652	// if ((dot&4) == 0)
..	..	@@ -774,7 +882,7 @@
774	882	//// tris.postdraw(this);
775	883	}
776	884
777		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
778	886	static cVector from = new cVector();
779	887	static cVector to = new cVector();
780	888
..	..	@@ -783,7 +891,7 @@
783	891	CameraPane cp = this;
784	892
785	893	Camera keep = cp.RenderCamera();
786		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
787	895
788	896	if (br.trimmed)
789	897	{
..	..	@@ -801,7 +909,7 @@
801	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
802	910	LA.xformPos(from, transform, from);
803	911	LA.xformPos(to, transform, to); // RIGID ONLY
804		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
805	913
806	914	CameraPane.occlusionbuffer.display();
807	915
..	..	@@ -835,7 +943,7 @@
835	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
836	944	LA.xformPos(from, transform, from);
837	945	LA.xformPos(to, transform, to); // RIGID ONLY
838		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
839	947
840	948	CameraPane.occlusionbuffer.display();
841	949
..	..	@@ -1059,8 +1167,345 @@
1059	1167	gl.glMatrixMode(gl.GL_MODELVIEW);
1060	1168	}
1061	1169
	1170	+ public void DrawBox(cVector min, cVector max)
	1171	+ {
	1172	+ javax.media.opengl.GL gl = GetGL();
	1173	+ gl.glBegin(gl.GL_LINES);
	1174	+
	1175	+ gl.glVertex3d(min.x, min.y, min.z);
	1176	+ gl.glVertex3d(min.x, min.y, max.z);
	1177	+ gl.glVertex3d(min.x, min.y, min.z);
	1178	+ gl.glVertex3d(min.x, max.y, min.z);
	1179	+ gl.glVertex3d(min.x, min.y, min.z);
	1180	+ gl.glVertex3d(max.x, min.y, min.z);
	1181	+
	1182	+ gl.glVertex3d(max.x, max.y, max.z);
	1183	+ gl.glVertex3d(min.x, max.y, max.z);
	1184	+ gl.glVertex3d(max.x, max.y, max.z);
	1185	+ gl.glVertex3d(max.x, min.y, max.z);
	1186	+ gl.glVertex3d(max.x, max.y, max.z);
	1187	+ gl.glVertex3d(max.x, max.y, min.z);
	1188	+
	1189	+ gl.glEnd();
	1190	+ }
	1191	+
	1192	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1193	+ {
	1194	+ int[] strips = bRep.getRawIndices();
	1195	+
	1196	+ javax.media.opengl.GL gl = GetGL();
	1197	+
	1198	+ // TRIANGLE STRIP ARRAY
	1199	+ if (bRep.trimmed)
	1200	+ {
	1201	+ float[] v = bRep.getRawVertices();
	1202	+ float[] n = bRep.getRawNormals();
	1203	+ float[] c = bRep.getRawColors();
	1204	+ float[] uv = bRep.getRawUVMap();
	1205	+
	1206	+ int count2 = 0;
	1207	+ int count3 = 0;
	1208	+
	1209	+ if (n.length > 0)
	1210	+ {
	1211	+ for (int i = 0; i < strips.length; i++)
	1212	+ {
	1213	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1214	+
	1215	+ /*
	1216	+ boolean locked = false;
	1217	+ float eps = 0.1f;
	1218	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1219	+
	1220	+ int dot = 0;
	1221	+
	1222	+ if ((dot&1) == 0)
	1223	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1224	+
	1225	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1226	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1227	+ else
	1228	+ {
	1229	+ locked = true;
	1230	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1231	+ }
	1232	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1233	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1234	+ if (hasnorm)
	1235	+ {
	1236	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1237	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1238	+ }
	1239	+
	1240	+ if ((dot&4) == 0)
	1241	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1242	+
	1243	+ if (wrap \|\| !locked && (dot&8) != 0)
	1244	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1245	+ else
	1246	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1247	+
	1248	+ f.dot = dot;
	1249	+ */
	1250	+
	1251	+ if (!selectmode)
	1252	+ {
	1253	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1254	+ {
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1256	+ } else
	1257	+ {
	1258	+ SetGLNormal(gl, 0, 0, 1);
	1259	+ }
	1260	+
	1261	+ if (c != null)
	1262	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1263	+ {
	1264	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1265	+ }
	1266	+ }
	1267	+
	1268	+ if (flipV)
	1269	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1270	+ else
	1271	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1272	+
	1273	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1274	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1275	+
	1276	+ count2 += 2;
	1277	+ count3 += 3;
	1278	+ if (!selectmode)
	1279	+ {
	1280	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1281	+ {
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1283	+ } else
	1284	+ {
	1285	+ SetGLNormal(gl, 0, 0, 1);
	1286	+ }
	1287	+ if (c != null)
	1288	+ {
	1289	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1290	+ }
	1291	+ }
	1292	+
	1293	+ if (flipV)
	1294	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1295	+ else
	1296	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1297	+
	1298	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1299	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1300	+
	1301	+ count2 += 2;
	1302	+ count3 += 3;
	1303	+ for (int j = 0; j < strips[i] - 2; j++)
	1304	+ {
	1305	+ //gl.glTexCoord2d(...);
	1306	+ if (!selectmode)
	1307	+ {
	1308	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1309	+ {
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1311	+ } else
	1312	+ {
	1313	+ SetGLNormal(gl, 0, 0, 1);
	1314	+ }
	1315	+ if (c != null)
	1316	+ {
	1317	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1318	+ }
	1319	+ }
	1320	+
	1321	+ if (flipV)
	1322	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1323	+ else
	1324	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1325	+
	1326	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1327	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1328	+
	1329	+ count2 += 2;
	1330	+ count3 += 3;
	1331	+ }
	1332	+
	1333	+ gl.glEnd();
	1334	+ }
	1335	+ }
	1336	+
	1337	+ assert count3 == v.length;
	1338	+ }
	1339	+ else // !trimmed
	1340	+ {
	1341	+ int count = 0;
	1342	+ for (int i = 0; i < strips.length; i++)
	1343	+ {
	1344	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1345	+
	1346	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1347	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1348	+
	1349	+ drawVertex(gl, p, flipV, selectmode);
	1350	+ drawVertex(gl, q, flipV, selectmode);
	1351	+
	1352	+ for (int j = 0; j < strips[i] - 2; j++)
	1353	+ {
	1354	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1355	+
	1356	+ // if (j%2 == 0)
	1357	+ // drawFace(p, q, r, display, null);
	1358	+ // else
	1359	+ // drawFace(p, r, q, display, null);
	1360	+
	1361	+ // p = q;
	1362	+ // q = r;
	1363	+ drawVertex(gl, r, flipV, selectmode);
	1364	+ }
	1365	+
	1366	+ gl.glEnd();
	1367	+ }
	1368	+ }
	1369	+ }
	1370	+
	1371	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1372	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1373	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1374	+
	1375	+ public void DrawDynamicMesh(cMesh mesh)
	1376	+ {
	1377	+ GL gl = GetGL(); // getGL();
	1378	+
	1379	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1380	+
	1381	+ gl.glDisable(gl.GL_LIGHTING);
	1382	+
	1383	+ gl.glLineWidth(1);
	1384	+ gl.glColor3f(1,1,1);
	1385	+ gl.glBegin(gl.GL_LINES);
	1386	+ double scale = 0;
	1387	+ int count = 0;
	1388	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1389	+ {
	1390	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1391	+ if(s == 0)
	1392	+ {
	1393	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1394	+ }
	1395	+ if (mesh.showsprings)
	1396	+ {
	1397	+ temp.set(spring.a.position);
	1398	+ temp.add(spring.b.position);
	1399	+ temp.mul(0.5);
	1400	+ temp2.set(spring.a.position);
	1401	+ temp2.sub(spring.b.position);
	1402	+ temp2.mul(spring.restLength/2);
	1403	+ temp.sub(temp2);
	1404	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1405	+ temp.add(temp2);
	1406	+ temp.add(temp2);
	1407	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1408	+ }
	1409	+
	1410	+ if (spring.isHandle)
	1411	+ continue;
	1412	+
	1413	+ //if (scale < spring.restLength)
	1414	+ scale += spring.restLength;
	1415	+ count++;
	1416	+ }
	1417	+ gl.glEnd();
	1418	+
	1419	+ if (count == 0)
	1420	+ scale = 0.01;
	1421	+ else
	1422	+ scale /= count * 3;
	1423	+
	1424	+ //scale = 0.25;
	1425	+
	1426	+ if (mesh.ShowInfo())
	1427	+ {
	1428	+ gl.glLineWidth(4);
	1429	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1430	+ {
	1431	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1432	+ if (node.mass == 0)
	1433	+ continue;
	1434	+
	1435	+ int i = node.springs==null?-1:node.springs.size();
	1436	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1437	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1438	+ //temp.normalize();
	1439	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1440	+ gl.glBegin(gl.GL_LINES);
	1441	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1442	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1443	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1444	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1445	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1446	+ gl.glEnd();
	1447	+ }
	1448	+
	1449	+ gl.glLineWidth(8);
	1450	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1451	+ {
	1452	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1453	+
	1454	+ if (node.springs != null)
	1455	+ {
	1456	+ for (int i=0; i<node.springs.size(); i+=1)
	1457	+ {
	1458	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1459	+
	1460	+ int c = i+1;
	1461	+ // c = node.springs.get(i).nbcopies;
	1462	+
	1463	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1464	+ gl.glBegin(gl.GL_LINES);
	1465	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1466	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1467	+ gl.glEnd();
	1468	+ }
	1469	+ }
	1470	+ }
	1471	+
	1472	+ gl.glLineWidth(1);
	1473	+ }
	1474	+
	1475	+ gl.glEnable(gl.GL_LIGHTING);
	1476	+ }
	1477	+
1062	1478	/// INTERFACE
1063	1479
	1480	+ public void StartTriangles()
	1481	+ {
	1482	+ javax.media.opengl.GL gl = GetGL();
	1483	+ gl.glBegin(gl.GL_TRIANGLES);
	1484	+ }
	1485	+
	1486	+ public void EndTriangles()
	1487	+ {
	1488	+ GetGL().glEnd();
	1489	+ }
	1490	+
	1491	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1492	+ {
	1493	+ if (!selectmode)
	1494	+ {
	1495	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1496	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1497	+
	1498	+ if (flipV)
	1499	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1500	+ else
	1501	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1502	+ }
	1503	+
	1504	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1505	+ }
	1506	+
	1507	+ float[] colorV = new float[4];
	1508	+
1064	1509	void SetColor(Object3D obj, Vertex p0)
1065	1510	{
1066	1511	CameraPane display = this;
..	..	@@ -1128,8 +1573,6 @@
1128	1573	{
1129	1574	return;
1130	1575	}
1131		-
1132		- float[] colorV = new float[3];
1133	1576
1134	1577	if (false) // marked)
1135	1578	{
..	..	@@ -1238,7 +1681,7 @@
1238	1681	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1239	1682	}
1240	1683
1241		- void DrawMaterial(cMaterial material, boolean selected)
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1242	1685	{
1243	1686	CameraPane display = this;
1244	1687	//new Exception().printStackTrace();
..	..	@@ -1254,18 +1697,18 @@
1254	1697	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255	1698	if (!material.multiply)
1256	1699	{
1257		- display.color = color;
	1700	+ display.color = material.color;
1258	1701	display.saturation = material.modulation;
1259	1702	}
1260	1703	else
1261	1704	{
1262		- display.color = color2;
	1705	+ display.color = material.color2;
1263	1706	display.saturation = material.modulation2;
1264	1707	}
1265	1708
1266	1709	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267	1710
1268		- float[] colorV = GrafreeD.colorV;
	1711	+ float[] colorV = Grafreed.colorV;
1269	1712
1270	1713	/**/
1271	1714	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1273,7 +1716,7 @@
1273	1716	colorV[0] = display.modelParams0[0] * material.diffuse;
1274	1717	colorV[1] = display.modelParams0[1] * material.diffuse;
1275	1718	colorV[2] = display.modelParams0[2] * material.diffuse;
1276		- colorV[3] = material.opacity;
	1719	+ colorV[3] = 1; // material.opacity;
1277	1720
1278	1721	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1279	1722	//System.out.println("Opacity = " + opacity);
..	..	@@ -1378,12 +1821,12 @@
1378	1821
1379	1822	display.modelParams7[0] = 0;
1380	1823	display.modelParams7[1] = 1000;
1381		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1382	1825	display.modelParams7[3] = 0;
1383	1826
1384		- display.modelParams6[0] = 100; // criss de bug de bump
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
1385	1828
1386		- Object3D.cVector2[] extparams = display.vector2buffer;
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1387	1830	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1388	1831	{
1389	1832	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1525,7 +1968,7 @@
1525	1968	void PushMatrix(double[][] matrix)
1526	1969	{
1527	1970	// GrafreeD.tracein(matrix);
1528		- PushMatrix(matrix,1);
	1971	+ PushMatrix(matrix, 1);
1529	1972	}
1530	1973
1531	1974	void PushMatrix()
..	..	@@ -1611,9 +2054,9 @@
1611	2054	switch(viewcode)
1612	2055	{
1613	2056	case 0: return "main";
1614		- case 1: return "one";
1615		- case 2: return "two";
1616		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
1617	2060	case 4: return "light";
1618	2061	}
1619	2062
..	..	@@ -1622,7 +2065,7 @@
1622	2065
1623	2066	static int camerachangeframe;
1624	2067
1625		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
1626	2069	{
1627	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1628	2071	// return false;
..	..	@@ -1640,7 +2083,8 @@
1640	2083
1641	2084	camerachangeframe = Globals.framecount;
1642	2085
1643		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
1644	2088
1645	2089	cameras[0] = cam;
1646	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -1650,11 +2094,14 @@
1650	2094	{
1651	2095	cameras[i] = new Camera(cam.viewCode);
1652	2096	}
1653		-
1654		- cameras[i].setAim(cam.location, cam.lookAt);
1655		- cameras[i].shaper_fovy = cam.shaper_fovy;
1656		- cameras[i].UP.set(cam.UP);
1657		- 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	+ }
1658	2105	}
1659	2106	cameracount = 0;
1660	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -1663,7 +2110,7 @@
1663	2110	// Start with free camera
1664	2111	SwitchCameras(true);
1665	2112
1666		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
1667	2114
1668	2115	if (TRACKONCE)
1669	2116	{
..	..	@@ -1679,7 +2126,7 @@
1679	2126	//System.err.println("Oeil on");
1680	2127	OEIL = true;
1681	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1683	2130	//pingthread.StepToTarget(true);
1684	2131	}
1685	2132
..	..	@@ -1777,7 +2224,7 @@
1777	2224	System.err.println("LIVE = " + Globals.isLIVE());
1778	2225
1779	2226	if (!Globals.isLIVE()) // save sound
1780		- GrafreeD.savesound = true; // wav.save();
	2227	+ Grafreed.savesound = true; // wav.save();
1781	2228	// else
1782	2229	repaint(); // start loop // may 2013
1783	2230	}
..	..	@@ -1810,6 +2257,11 @@
1810	2257	public void ToggleBoxMode()
1811	2258	{
1812	2259	BOXMODE ^= true;
	2260	+ }
	2261	+
	2262	+ public void ToggleZoomBoxMode()
	2263	+ {
	2264	+ ZOOMBOXMODE ^= true;
1813	2265	}
1814	2266
1815	2267	public void ToggleSmoothFocus()
..	..	@@ -1845,18 +2297,6 @@
1845	2297	public void ToggleTrack()
1846	2298	{
1847	2299	TRACK ^= true;
1848		- if (TRACK)
1849		- {
1850		- if (object.selection != null &&
1851		- object.selection.size() > 0 &&
1852		- object.selection.elementAt(0) != null &&
1853		- !(object.selection.elementAt(0) instanceof Camera) &&
1854		- !(object.selection.elementAt(0) instanceof ScriptNode))
1855		- {
1856		- trackedobject = object.selection.elementAt(0);
1857		- repaint();
1858		- }
1859		- }
1860	2300
1861	2301	repaint();
1862	2302	}
..	..	@@ -1889,7 +2329,7 @@
1889	2329
1890	2330	void ToggleDebug()
1891	2331	{
1892		- DEBUG ^= true;
	2332	+ Globals.DEBUG ^= true;
1893	2333	}
1894	2334
1895	2335	void ToggleLookAt()
..	..	@@ -1897,9 +2337,9 @@
1897	2337	LOOKAT ^= true;
1898	2338	}
1899	2339
1900		- void ToggleRandom()
	2340	+ void ToggleSwitch()
1901	2341	{
1902		- RANDOM ^= true;
	2342	+ SWITCH ^= true;
1903	2343	}
1904	2344
1905	2345	void ToggleHandles()
..	..	@@ -1907,10 +2347,17 @@
1907	2347	HANDLES ^= true;
1908	2348	}
1909	2349
	2350	+ Object3D paintFolder;
	2351	+
1910	2352	void TogglePaint()
1911	2353	{
1912	2354	PAINTMODE ^= true;
1913	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
1914	2361	}
1915	2362
1916	2363	void SwapCamera(int a, int b)
..	..	@@ -1941,7 +2388,8 @@
1941	2388	{
1942	2389	//System.out.println("PROTECTION = " + cam.hAspect);
1943	2390	//assert (cam.hAspect == 0);
1944		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
1945	2393	lightCamera = cam;
1946	2394	}
1947	2395
..	..	@@ -2006,7 +2454,34 @@
2006	2454	{
2007	2455	return currentGL;
2008	2456	}
2009		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
	2476	+
	2477	+ if (ny > 0.9 \|\| ny < -0.9)
	2478	+ // Ground or ceiling
	2479	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2480	+ else
	2481	+ // Walls
	2482	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2483	+ }
	2484	+
2010	2485	/**/
2011	2486	class CacheTexture
2012	2487	{
..	..	@@ -2015,28 +2490,31 @@
2015	2490
2016	2491	int resolution;
2017	2492
2018		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2019	2494	{
2020		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2021	2497	resolution = res;
2022	2498	}
2023	2499	}
2024	2500	/**/
2025	2501
2026	2502	// TEXTURE static Texture texture;
2027		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2028		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2029		- 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	+
2030	2508	int pigmentdepth = 0;
2031	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2032	2510	int bumpdepth = 0;
2033	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2035	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2036		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2037	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2038	2516
2039		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2040	2518	{
2041	2519	TextureData texturedata = null;
2042	2520
..	..	@@ -2046,7 +2524,7 @@
2046	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2047	2525	getClass().getClassLoader().getResourceAsStream(name),
2048	2526	true,
2049		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2050	2528	} catch (java.io.IOException e)
2051	2529	{
2052	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2055,13 +2533,34 @@
2055	2533	if (bump)
2056	2534	texturedata = ConvertBump(texturedata, false);
2057	2535
2058		- com.sun.opengl.util.texture.Texture texture =
2059		- 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);
2060	2538
2061		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2062		- 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);
2063	2541
2064		- 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;
2065	2564	}
2066	2565
2067	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3091,6 +3590,8 @@
3091	3590	};
3092	3591	/**/
3093	3592
	3593	+ static Object3D lastObject;
	3594	+
3094	3595	//com.sun.opengl.util.texture.Texture
3095	3596	TextureData
3096	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3127,6 +3628,8 @@
3127	3628	// return null;
3128	3629	//if (i == 2)
3129	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3130	3633	e.printStackTrace();
3131	3634	name = name.split("\\.tif")[0] + ".jpg";
3132	3635	}
..	..	@@ -3134,6 +3637,8 @@
3134	3637
3135	3638	System.out.println("LOADING TEXTURE : " + name);
3136	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
3137	3642	//
3138	3643	if (false) // compressbit > 0)
3139	3644	{
..	..	@@ -3838,6 +4343,7 @@
3838	4343
3839	4344	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4345	{
	4346	+ new Exception().printStackTrace();
3841	4347	System.exit(0);
3842	4348	com.sun.opengl.util.texture.Texture texture = null;
3843	4349
..	..	@@ -6456,30 +6962,30 @@
6456	6962	short residu = 0;
6457	6963
6458	6964	// wraparound workarounds
6459		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6460	6966	/*
6461		- residu += (fuck%2);
6462		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6463	6969	{
6464		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6465	6971	if(residu == 2)
6466	6972	residu = 0;
6467	6973	}
6468	6974	else
6469	6975	{
6470	6976	residu = 0;
6471		- fuck /= 2;
	6977	+ ww /= 2;
6472	6978	}
6473	6979	*/
6474		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6475	6981	{
6476		- fuck /= 2;
	6982	+ ww /= 2;
6477	6983	} else
6478	6984	{
6479		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6480	6986	}
6481	6987
6482		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6483	6989	}
6484	6990	//System.out.print(bytes[i] + " ");
6485	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7531,7 +8037,7 @@
7531	8037	String pigment = Object3D.GetPigment(tex);
7532	8038	String bump = Object3D.GetBump(tex);
7533	8039
7534		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7535	8041	{
7536	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7537	8043	// System.out.println("; bump = " + bump);
..	..	@@ -7546,11 +8052,69 @@
7546	8052	pigment = null;
7547	8053	}
7548	8054
7549		- ReleaseTexture(bump, true);
7550		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7551	8057	}
7552	8058
7553		- void ReleaseTexture(String tex, boolean bump)
	8059	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, false);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String pigment = Object3D.GetPigment(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (pigment.equals(""))
	8081	+ {
	8082	+ pigment = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, false);
	8086	+ }
	8087	+
	8088	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8089	+ {
	8090	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8091	+ {
	8092	+ return;
	8093	+ }
	8094	+
	8095	+ if (tex == null)
	8096	+ {
	8097	+ ReleaseTexture(null, true);
	8098	+ return;
	8099	+ }
	8100	+
	8101	+ String bump = Object3D.GetBump(tex);
	8102	+
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8104	+ {
	8105	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8106	+ // System.out.println("; bump = " + bump);
	8107	+ }
	8108	+
	8109	+ if (bump.equals(""))
	8110	+ {
	8111	+ bump = null;
	8112	+ }
	8113	+
	8114	+ ReleaseTexture(tex, true);
	8115	+ }
	8116	+
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
7554	8118	{
7555	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7556	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7561,7 +8125,7 @@
7561	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7562	8126
7563	8127	if (tex != null)
7564		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7565	8129
7566	8130	// //assert( texture != null );
7567	8131	// if (texture == null)
..	..	@@ -7653,7 +8217,55 @@
7653	8217	}
7654	8218	}
7655	8219
7656		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8220	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8221	+ {
	8222	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8223	+// ambientOcclusion ) // \|\| !textureon)
	8224	+// {
	8225	+// return; // false;
	8226	+// }
	8227	+//
	8228	+// if (tex == null)
	8229	+// {
	8230	+// BindTexture(null,false,resolution);
	8231	+// BindTexture(null,true,resolution);
	8232	+// return;
	8233	+// }
	8234	+//
	8235	+// String pigment = Object3D.GetPigment(tex);
	8236	+// String bump = Object3D.GetBump(tex);
	8237	+//
	8238	+// usedtextures.add(pigment);
	8239	+// usedtextures.add(bump);
	8240	+//
	8241	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+// {
	8243	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8244	+// // System.out.println("; bump = " + bump);
	8245	+// }
	8246	+//
	8247	+// if (bump.equals(""))
	8248	+// {
	8249	+// bump = null;
	8250	+// }
	8251	+// if (pigment.equals(""))
	8252	+// {
	8253	+// pigment = null;
	8254	+// }
	8255	+//
	8256	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8257	+// BindTexture(pigment, false, resolution);
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8259	+// BindTexture(bump, true, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8261	+//
	8262	+// return; // true;
	8263	+
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7657	8269	{
7658	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8271	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7664,17 +8276,47 @@
7664	8276	if (tex == null)
7665	8277	{
7666	8278	BindTexture(null,false,resolution);
7667		- BindTexture(null,true,resolution);
7668	8279	return;
7669	8280	}
7670	8281
7671	8282	String pigment = Object3D.GetPigment(tex);
	8283	+
	8284	+ usedtextures.add(tex);
	8285	+
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8287	+ {
	8288	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8289	+ // System.out.println("; bump = " + bump);
	8290	+ }
	8291	+
	8292	+ if (pigment.equals(""))
	8293	+ {
	8294	+ pigment = null;
	8295	+ }
	8296	+
	8297	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8298	+ BindTexture(tex, false, resolution);
	8299	+ }
	8300	+
	8301	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8302	+ {
	8303	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8304	+ ambientOcclusion ) // \|\| !textureon)
	8305	+ {
	8306	+ return; // false;
	8307	+ }
	8308	+
	8309	+ if (tex == null)
	8310	+ {
	8311	+ BindTexture(null,true,resolution);
	8312	+ return;
	8313	+ }
	8314	+
7672	8315	String bump = Object3D.GetBump(tex);
7673	8316
7674		- usedtextures.put(pigment, pigment);
7675		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
7676	8318
7677		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7678	8320	{
7679	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7680	8322	// System.out.println("; bump = " + bump);
..	..	@@ -7684,43 +8326,94 @@
7684	8326	{
7685	8327	bump = null;
7686	8328	}
7687		- if (pigment.equals(""))
7688		- {
7689		- pigment = null;
7690		- }
7691	8329
7692		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7693		- BindTexture(pigment, false, resolution);
7694	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7695		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
7696	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7697		-
7698		- return; // true;
7699	8333	}
7700	8334
7701		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8335	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8336	+
	8337	+ private boolean FileExists(String tex)
7702	8338	{
7703		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8339	+ if (missingTextures.contains(tex))
	8340	+ {
	8341	+ return false;
	8342	+ }
	8343	+
	8344	+ boolean fileExists = new File(tex).exists();
	8345	+
	8346	+ if (!fileExists)
	8347	+ {
	8348	+ // If file exists, the "new File()" is not executed sgain
	8349	+ missingTextures.add(tex);
	8350	+ }
	8351	+
	8352	+ return fileExists;
	8353	+ }
	8354	+
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8356	+ {
	8357	+ CacheTexture texturecache = null;
7704	8358
7705	8359	if (tex != null)
7706	8360	{
7707		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7708	8363
7709		- String[] split = tex.split("Textures");
7710		- if (split.length > 1)
7711		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7712		- else
7713		- if (!texname.startsWith("/"))
7714		- texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
	8368	+
	8369	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8370	+
	8371	+// String[] split = tex.split("Textures");
	8372	+// if (split.length > 1)
	8373	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8374	+// else
	8375	+// if (!texname.startsWith("/"))
	8376	+// texname = "/Users/nbriere/Textures/" + texname;
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8378	+ {
	8379	+ texname = fallbackTextureName;
	8380	+ }
7715	8381
7716	8382	if (CACHETEXTURE)
7717		- texture = textures.get(texname); // TEXTURE CACHE
7718		-
7719		- TextureData texturedata = null;
7720		-
7721		- if (texture == null \|\| texture.resolution < resolution)
7722	8383	{
7723		- 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(""))
7724	8417	{
7725	8418	assert(!bump);
7726	8419	// if (bump)
..	..	@@ -7731,19 +8424,23 @@
7731	8424	// }
7732	8425	// else
7733	8426	// {
7734		- texture = textures.get(tex);
7735		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
7736	8429	{
7737		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7738	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
7739	8434	// }
7740	8435	} else
7741		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7742	8437	{
7743	8438	assert(bump);
7744		- texture = textures.get(tex);
7745		- if (texture == null)
7746		- 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();
7747	8444	} else
7748	8445	{
7749	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -7751,11 +8448,22 @@
7751	8448	// texture = GetResourceTexture("default.png");
7752	8449	//} else
7753	8450	//{
7754		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
7755	8452	{
7756		- texture = textures.get(tex);
7757		- if (texture == null)
7758		- 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();
7759	8467	} else
7760	8468	{
7761	8469	if (textureon)
..	..	@@ -7780,7 +8488,7 @@
7780	8488	}
7781	8489
7782	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
7784	8492	cachename = texname;
7785	8493	else
7786	8494	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8510,7 @@
7802	8510	}
7803	8511
7804	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
7806	8514	cachename = texname;
7807	8515	else
7808	8516	processbump = false; // don't process bump map again
..	..	@@ -7811,20 +8519,23 @@
7811	8519	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8520
7813	8521
7814		- if (texturedata != null)
7815		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8522	+ if (texturedata == null)
	8523	+ throw new Exception();
	8524	+
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
7816	8526	//texture = GetTexture(tex, bump);
7817	8527	}
	8528	+ }
7818	8529	}
7819	8530	//}
7820	8531	}
7821	8532
7822		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7823	8534	{
7824	8535	//return false;
7825	8536
7826	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7827		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7828	8539	{
7829	8540	// String ext = "_highres";
7830	8541	// if (REDUCETEXTURE)
..	..	@@ -7841,52 +8552,17 @@
7841	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7842	8553	if (!cachefile.exists())
7843	8554	{
7844		- // cache to disk
7845		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7846		- //buffers[0].
7847		-
7848		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7849		- int[] pixels = new int[bytebuf.capacity()/3];
7850		-
7851		- // squared size heuristic...
7852		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
7853	8556	{
7854		- for (int i=pixels.length; --i>=0;)
7855		- {
7856		- int i3 = i*3;
7857		- pixels[i] = 0xFF;
7858		- pixels[i] <<= 8;
7859		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7864		- }
7865		-
7866		- /*
7867		- int r=0,g=0,b=0,a=0;
7868		- for (int i=0; i<width; i++)
7869		- for (int j=0; j<height; j++)
7870		- {
7871		- int index = j*width+i;
7872		- int p = pixels[index];
7873		- a = ((p>>24) & 0xFF);
7874		- r = ((p>>16) & 0xFF);
7875		- g = ((p>>8) & 0xFF);
7876		- b = (p & 0xFF);
7877		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7878		- }
7879		- /**/
7880		- int width = (int)Math.sqrt(pixels.length); // squared
7881		- int height = width;
7882		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7883		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
7884	8559	ImageWriter writer = null;
7885	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7886	8561	if (iter.hasNext()) {
7887	8562	writer = (ImageWriter)iter.next();
7888	8563	}
7889		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
7890	8566	try
7891	8567	{
7892	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7903,18 +8579,20 @@
7903	8579	}
7904	8580	}
7905	8581	}
7906		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
7907	8585	//System.out.println("Texture = " + tex);
7908		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
7909	8587	{
7910		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
7911	8589	thetex.texture.disable();
7912	8590	thetex.texture.dispose();
7913		- textures.remove(texname);
	8591	+ textures.remove(tex);
7914	8592	}
7915	8593
7916		- texture.texturedata = texturedata;
7917		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
7918	8596
7919	8597	// newtex = true;
7920	8598	}
..	..	@@ -7930,10 +8608,46 @@
7930	8608	}
7931	8609	}
7932	8610
7933		- return texture;
	8611	+ return texturecache;
7934	8612	}
7935	8613
7936		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8614	+ static void EmbedTextures(cTexture tex)
	8615	+ {
	8616	+ if (tex.pigmentdata == null)
	8617	+ {
	8618	+ //String texname = Object3D.GetPigment(tex);
	8619	+
	8620	+ CacheTexture texturecache = texturepigment.get(tex);
	8621	+
	8622	+ if (texturecache != null)
	8623	+ {
	8624	+ tex.pw = texturecache.texturedata.getWidth();
	8625	+ tex.ph = texturecache.texturedata.getHeight();
	8626	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8627	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8628	+ ;
	8629	+ //, tex.pw, tex.ph), 0.5f);
	8630	+ }
	8631	+ }
	8632	+
	8633	+ if (tex.bumpdata == null)
	8634	+ {
	8635	+ //String texname = Object3D.GetBump(tex);
	8636	+
	8637	+ CacheTexture texturecache = texturebump.get(tex);
	8638	+
	8639	+ if (texturecache != null)
	8640	+ {
	8641	+ tex.bw = texturecache.texturedata.getWidth();
	8642	+ tex.bh = texturecache.texturedata.getHeight();
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, tex.bw, tex.bh), 0.5f);
	8646	+ }
	8647	+ }
	8648	+ }
	8649	+
	8650	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7937	8651	{
7938	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939	8653
..	..	@@ -7951,21 +8665,21 @@
7951	8665	return texture!=null?texture.texture:null;
7952	8666	}
7953	8667
7954		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7955	8669	{
7956	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957	8671
7958	8672	return texture!=null?texture.texturedata:null;
7959	8673	}
7960	8674
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7962	8676	{
7963	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8678	{
7965	8679	return false;
7966	8680	}
7967	8681
7968		- boolean newtex = false;
	8682	+ //boolean newtex = false;
7969	8683
7970	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7971	8685
..	..	@@ -7997,9 +8711,75 @@
7997	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7998	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7999	8713
8000		- return newtex;
	8714	+ return true; // Warning: not used.
8001	8715	}
8002	8716
	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	+
8003	8783	ShadowBuffer shadowPBuf;
8004	8784	AntialiasBuffer antialiasPBuf;
8005	8785	int MAXSTACK;
..	..	@@ -8016,10 +8796,12 @@
8016	8796
8017	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8018	8798	MAXSTACK = temp[0];
8019		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8020	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8021	8802	MAXSTACK = temp[0];
8022		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8023	8805
8024	8806	// Use debug pipeline
8025	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8027,7 +8809,8 @@
8027	8809	gl = drawable.getGL(); //
8028	8810
8029	8811	GL gl3 = getGL();
8030		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8031	8814
8032	8815
8033	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8192,7 +8975,7 @@
8192	8975
8193	8976	if (cubemap == null)
8194	8977	{
8195		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8196	8979	}
8197	8980
8198	8981	//cubemap.enable();
..	..	@@ -8468,6 +9251,8 @@
8468	9251
8469	9252	void LoadEnvy(int which)
8470	9253	{
	9254	+ assert(false);
	9255	+
8471	9256	String name;
8472	9257	String ext;
8473	9258
..	..	@@ -8479,37 +9264,58 @@
8479	9264	cubemap = null;
8480	9265	return;
8481	9266	case 1:
8482		- name = "cubemaps/box_";
8483		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8484	9269	reverseUP = false;
8485	9270	break;
8486	9271	case 2:
8487		- name = "cubemaps/uffizi_";
8488		- ext = "png";
8489		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8490	9276	case 3:
8491		- name = "cubemaps/CloudyHills_";
8492		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8493	9279	reverseUP = false;
8494	9280	break;
8495	9281	case 4:
8496		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8497	9283	ext = "png";
8498	9284	reverseUP = false;
8499	9285	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;
8500	9311	default:
8501		- name = "cubemaps/rgb_";
8502		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8503	9315	break;
8504	9316	}
8505		-
8506		- try
8507		- {
8508		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8509		- } catch (IOException e)
8510		- {
8511		- throw new RuntimeException(e);
8512		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8513	9319	}
8514	9320
8515	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8541,8 +9347,12 @@
8541	9347	static double[] model = new double[16];
8542	9348	double[] camera2light = new double[16];
8543	9349	double[] light2camera = new double[16];
8544		- int newenvy = -1;
8545		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8546	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8547	9357	//float[] light0 = { 0,0,0 };
8548	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8835,11 +9645,35 @@
8835	9645	jy8[3] = 0.5f;
8836	9646	}
8837	9647
8838		- 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
8839	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	9652
	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	+
8843	9677	static int imagecount = 0; // movie generation
8844	9678
8845	9679	static int jitter = 0;
..	..	@@ -8935,8 +9769,8 @@
8935	9769	assert (parentcam != renderCamera);
8936	9770
8937	9771	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8940	9774
8941	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9776
..	..	@@ -8951,8 +9785,8 @@
8951	9785	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9786
8953	9787	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8956	9790
8957	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9792
..	..	@@ -8998,13 +9832,18 @@
8998	9832	rati = 1 / rati;
8999	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9000	9834	}
9001		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9002	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9003	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9004		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9005	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9006	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9007		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9008	9847	ratio,
9009	9848	//near_plane, far_plane,
9010	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -9024,7 +9863,7 @@
9024	9863	//gl.glFlush();
9025	9864	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9865
9027		- if (ANIMATION && ABORTED)
	9866	+ if (Globals.ANIMATION && ABORTED)
9028	9867	{
9029	9868	System.err.println(" ABORTED FRAME");
9030	9869	break;
..	..	@@ -9054,7 +9893,7 @@
9054	9893	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9894
9056	9895	// save image
9057		- if (ANIMATION && !ABORTED)
	9896	+ if (Globals.ANIMATION && !ABORTED)
9058	9897	{
9059	9898	VPwidth = viewport[2];
9060	9899	VPheight = viewport[3];
..	..	@@ -9165,11 +10004,11 @@
9165	10004
9166	10005	// imagecount++;
9167	10006
9168		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	10007	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9169	10008
9170	10009	if (!BOXMODE)
9171	10010	{
9172		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10011	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9173	10012	}
9174	10013
9175	10014	if (!BOXMODE)
..	..	@@ -9207,7 +10046,7 @@
9207	10046	ABORTED = false;
9208	10047	}
9209	10048	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10049	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	10050
9212	10051	if (false)
9213	10052	{
..	..	@@ -9867,14 +10706,23 @@
9867	10706	static boolean init = false;
9868	10707
9869	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
9870	10712
9871	10713	public void display(GLAutoDrawable drawable)
9872	10714	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10715	+ if (patchMaterial.patchMaterial)
9874	10716	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
	10721	+ if (Grafreed.savesound && Grafreed.hassound)
	10722	+ {
	10723	+ Grafreed.wav.save();
	10724	+ Grafreed.savesound = false;
	10725	+ Grafreed.hassound = false;
9878	10726	}
9879	10727	// if (DEBUG_SELECTION)
9880	10728	// {
..	..	@@ -9950,6 +10798,7 @@
9950	10798	ANTIALIAS = 0;
9951	10799	//System.out.println("RESTART");
9952	10800	AAtimer.restart();
	10801	+ Globals.TIMERRUNNING = true;
9953	10802	}
9954	10803	}
9955	10804	}
..	..	@@ -9964,6 +10813,112 @@
9964	10813
9965	10814	if (DrawMode() == DEFAULT)
9966	10815	{
	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	+
9967	10922	currentlydrawing = true;
9968	10923	}
9969	10924
..	..	@@ -10004,7 +10959,7 @@
10004	10959	Object3D theobject = object;
10005	10960	Object3D theparent = object.parent;
10006	10961	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10962	+ object = (Object3D)Grafreed.clone(object);
10008	10963	object.Stripify();
10009	10964	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10965	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10972,14 @@
10017	10972	ambientOcclusion = false;
10018	10973	}
10019	10974
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10975	+ if (//Globals.lighttouched &&
	10976	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10977	{
10022	10978	//if (RENDERSHADOW) // ?
10023	10979	if (!IsFrozen())
10024	10980	{
10025	10981	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10982	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10983	{
10028	10984	Globals.framecount++;
10029	10985	shadowbuffer.display();
..	..	@@ -10036,7 +10992,7 @@
10036	10992
10037	10993	if (wait)
10038	10994	{
10039		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
10040	10996
10041	10997	wait = false;
10042	10998	}
..	..	@@ -10150,8 +11106,8 @@
10150	11106
10151	11107	// if (parentcam != renderCamera) // not a light
10152	11108	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11109	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11110	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10155	11111
10156	11112	for (int j = 0; j < 4; j++)
10157	11113	{
..	..	@@ -10165,8 +11121,8 @@
10165	11121
10166	11122	// if (parentcam != renderCamera) // not a light
10167	11123	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11124	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11125	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10170	11126
10171	11127	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	11128
..	..	@@ -10252,13 +11208,43 @@
10252	11208	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10253	11209	}
10254	11210
10255		- 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"))
10256	11219	{
10257		- LoadEnvy(newenvy);
	11220	+ if (cubemaprgb == null)
	11221	+ {
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11223	+ }
	11224	+
	11225	+ cubemap = cubemaprgb;
10258	11226	}
10259		-
10260		- newenvy = -1;
10261		-
	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	+
10262	11248	ratio = ((double) getWidth()) / getHeight();
10263	11249	//System.out.println("ratio = " + ratio);
10264	11250
..	..	@@ -10274,7 +11260,7 @@
10274	11260
10275	11261	if (!IsFrozen() && !ambientOcclusion)
10276	11262	{
10277		- DrawSkyBox(gl);
	11263	+ DrawSkyBox(gl, (float)ratio);
10278	11264	}
10279	11265
10280	11266	//if (selection_view == -1)
..	..	@@ -10425,7 +11411,16 @@
10425	11411	// Bump noise
10426	11412	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11413	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- BindTexture(NOISE_TEXTURE, false, 2);
	11414	+
	11415	+ try
	11416	+ {
	11417	+ BindTexture(NOISE_TEXTURE, false, 2);
	11418	+ }
	11419	+ catch (Exception e)
	11420	+ {
	11421	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11422	+ }
	11423	+
10429	11424
10430	11425	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11426	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10448,8 +11443,8 @@
10448	11443
10449	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
10450	11445
10451		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10452	11446	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11447	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10453	11448	//gl.glEnable(gl.GL_MULTISAMPLE);
10454	11449	} else
10455	11450	{
..	..	@@ -10461,7 +11456,7 @@
10461	11456	//System.out.println("BLENDING ON");
10462	11457	gl.glEnable(GL.GL_BLEND);
10463	11458	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10464		-
	11459	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10465	11460	gl.glMatrixMode(gl.GL_PROJECTION);
10466	11461	gl.glLoadIdentity();
10467	11462
..	..	@@ -10511,7 +11506,10 @@
10511	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10512	11507	} else
10513	11508	{
10514		- 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());
10515	11513	}
10516	11514	}
10517	11515
..	..	@@ -10550,8 +11548,8 @@
10550	11548	System.err.println("parentcam != renderCamera");
10551	11549
10552	11550	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11551	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10555	11553	}
10556	11554
10557	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11570,8 @@
10572	11570	if (true) // TODO
10573	11571	{
10574	11572	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11574	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10577	11575	}
10578	11576
10579	11577	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10710,7 +11708,7 @@
10710	11708	}
10711	11709	}
10712	11710
10713		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11711	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10714	11712	{
10715	11713	//gl.glDepthFunc(GL.GL_LEQUAL);
10716	11714	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10718,24 +11716,21 @@
10718	11716
10719	11717	boolean texon = textureon;
10720	11718
10721		- if (RENDERPROGRAM > 0)
10722		- {
10723		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10724		- textureon = false;
10725		- }
	11719	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11720	+ textureon = false;
	11721	+
10726	11722	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10727	11723	//System.out.println("ALLO");
10728	11724	gl.glColorMask(false, false, false, false);
10729	11725	DrawObject(gl);
10730		- if (RENDERPROGRAM > 0)
10731		- {
10732		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10733		- textureon = texon;
10734		- }
	11726	+
	11727	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11728	+ textureon = texon;
	11729	+
10735	11730	gl.glColorMask(true, true, true, true);
10736	11731
10737	11732	gl.glDepthFunc(GL.GL_EQUAL);
10738		- //gl.glDepthMask(false);
	11733	+ gl.glDepthMask(false);
10739	11734	}
10740	11735
10741	11736	if (false) // DrawMode() == SHADOW)
..	..	@@ -10870,8 +11865,11 @@
10870	11865	repaint();
10871	11866	}
10872	11867
10873		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
10874	11871	repaint();
	11872	+ }
10875	11873
10876	11874	displaydone = true;
10877	11875	}
..	..	@@ -10889,8 +11887,14 @@
10889	11887	{
10890	11888	renderpass++;
10891	11889	// System.out.println("Draw object... ");
	11890	+ STEP = 1;
10892	11891	if (FAST) // in case there is no script
10893		- STEP = 16;
	11892	+ STEP = 8;
	11893	+
	11894	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11895	+ {
	11896	+ STEP *= 4;
	11897	+ }
10894	11898
10895	11899	//object.FullInvariants();
10896	11900
..	..	@@ -10904,24 +11908,59 @@
10904	11908	e.printStackTrace();
10905	11909	}
10906	11910
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11911	+ if (Grafreed.RENDERME > 0)
	11912	+ Grafreed.RENDERME--; // mechante magouille
10909	11913
10910	11914	Globals.ONESTEP = false;
10911	11915	}
10912	11916
10913	11917	static boolean zoomonce = false;
10914	11918
	11919	+ static void CreateSelectedPoint()
	11920	+ {
	11921	+ if (selectedpoint == null)
	11922	+ {
	11923	+ debugpointG = new Sphere();
	11924	+ debugpointP = new Sphere();
	11925	+ debugpointC = new Sphere();
	11926	+ debugpointR = new Sphere();
	11927	+
	11928	+ selectedpoint = new Superellipsoid();
	11929	+
	11930	+ for (int i=0; i<8; i++)
	11931	+ {
	11932	+ debugpoints[i] = new Sphere();
	11933	+ }
	11934	+ }
	11935	+ }
	11936	+
10915	11937	void DrawObject(GL gl, boolean draw)
10916	11938	{
	11939	+ // To clear camera values
	11940	+ ResetOptions();
	11941	+
10917	11942	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11943	// DrawMode() = SELECTION;
10919	11944	//GL gl = getGL();
10920	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10921	11946	{
	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	+ }
10922	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10923		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10924		- pingthread.StepToTarget(true); // true);
	11962	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11963	+ pingthread.StepToTarget(); // true);
10925	11964	// zoomonce = false;
10926	11965	}
10927	11966
..	..	@@ -10975,7 +12014,14 @@
10975	12014
10976	12015	usedtextures.clear();
10977	12016
10978		- BindTextures(DEFAULT_TEXTURES, 2);
	12017	+ try
	12018	+ {
	12019	+ BindTextures(DEFAULT_TEXTURES, 2);
	12020	+ }
	12021	+ catch (Exception e)
	12022	+ {
	12023	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	12024	+ }
10979	12025	}
10980	12026	//System.out.println("--> " + stackdepth);
10981	12027	// GrafreeD.traceon();
..	..	@@ -10985,8 +12031,9 @@
10985	12031
10986	12032	if (DrawMode() == DEFAULT)
10987	12033	{
10988		- if (DEBUG)
	12034	+ if (Globals.DEBUG)
10989	12035	{
	12036	+ CreateSelectedPoint();
10990	12037	float radius = 0.05f;
10991	12038	if (selectedpoint.radius != radius)
10992	12039	{
..	..	@@ -11040,20 +12087,32 @@
11040	12087	ReleaseTextures(DEFAULT_TEXTURES);
11041	12088
11042	12089	if (CLEANCACHE)
11043		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12090	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11044	12091	{
11045		- String tex = e.nextElement();
	12092	+ cTexture tex = e.nextElement();
11046	12093
11047	12094	// System.out.println("Texture --------- " + tex);
11048	12095
11049		- if (tex.equals("WHITE_NOISE"))
	12096	+ if (tex.equals("WHITE_NOISE:"))
11050	12097	continue;
11051	12098
11052		- if (!usedtextures.containsKey(tex))
	12099	+ if (!usedtextures.contains(tex))
11053	12100	{
	12101	+ CacheTexture gettex = texturepigment.get(tex);
11054	12102	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11055		- textures.get(tex).texture.dispose();
11056		- 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	+ }
11057	12116	}
11058	12117	}
11059	12118	}
..	..	@@ -11066,7 +12125,14 @@
11066	12125	if (checker != null && DrawMode() == DEFAULT)
11067	12126	{
11068	12127	//BindTexture(IMMORTAL_TEXTURE);
11069		- BindTextures(checker.GetTextures(), checker.texres);
	12128	+ try
	12129	+ {
	12130	+ BindTextures(checker.GetTextures(), checker.texres);
	12131	+ }
	12132	+ catch (Exception e)
	12133	+ {
	12134	+ System.err.println("FAILED: " + checker.GetTextures());
	12135	+ }
11070	12136	// NEAREST
11071	12137	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	12138	DrawChecker(gl);
..	..	@@ -11148,7 +12214,7 @@
11148	12214	return;
11149	12215	}
11150	12216
11151		- String string = obj.GetToolTip();
	12217	+ String string = obj.toString(); //.GetToolTip();
11152	12218
11153	12219	GL gl = GetGL();
11154	12220
..	..	@@ -11465,8 +12531,8 @@
11465	12531	//obj.TransformToWorld(light, light);
11466	12532	for (int i = tp.size(); --i >= 0;)
11467	12533	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- LA.xformPos(light, tp.get(i).toParent, light);
	12534	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12535	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11470	12536	}
11471	12537
11472	12538
..	..	@@ -11483,8 +12549,8 @@
11483	12549	parentcam = cameras[0];
11484	12550	}
11485	12551
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12552	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12553	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11488	12554
11489	12555	LA.xformPos(light, renderCamera.toScreen, light);
11490	12556
..	..	@@ -11574,8 +12640,82 @@
11574	12640
11575	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11576	12642
11577		- String program =
	12643	+ String programmin =
	12644	+ // Min shader
11578	12645	"!!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	+
11579	12719	//"OPTION ARB_fragment_program_shadow;" +
11580	12720	"PARAM light2cam0 = program.env[10];" +
11581	12721	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11601,7 +12741,7 @@
11601	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11602	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11603	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11604		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11605	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11606	12746	"PARAM options1 = program.env[62];" + // fog rgb color
11607	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -11690,8 +12830,7 @@
11690	12830	"TEMP shininess;" +
11691	12831	"\n" +
11692	12832	"MOV texSamp, one;" +
11693		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11694		-
	12833	+
11695	12834	"MOV mapgrid.x, one2048th.x;" +
11696	12835	"MOV temp, fragment.texcoord[1];" +
11697	12836	/*
..	..	@@ -11712,20 +12851,20 @@
11712	12851	"MUL temp, floor, mapgrid.x;" +
11713	12852	//"TEX depth0, temp, texture[1], 2D;" +
11714	12853	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11715		- TextureFetch("depth0", "temp", "1") +
	12854	+ ShadowTextureFetch("depth0", "temp", "1") +
11716	12855	"") +
11717	12856	"ADD temp.x, temp.x, mapgrid.x;" +
11718	12857	//"TEX depth1, temp, texture[1], 2D;" +
11719	12858	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11720		- TextureFetch("depth1", "temp", "1") +
	12859	+ ShadowTextureFetch("depth1", "temp", "1") +
11721	12860	"") +
11722	12861	"ADD temp.y, temp.y, mapgrid.x;" +
11723	12862	//"TEX depth2, temp, texture[1], 2D;" +
11724		- TextureFetch("depth2", "temp", "1") +
	12863	+ ShadowTextureFetch("depth2", "temp", "1") +
11725	12864	"SUB temp.x, temp.x, mapgrid.x;" +
11726	12865	//"TEX depth3, temp, texture[1], 2D;" +
11727	12866	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11728		- TextureFetch("depth3", "temp", "1") +
	12867	+ ShadowTextureFetch("depth3", "temp", "1") +
11729	12868	"") +
11730	12869	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11731	12870	//"MOV params, material;" +
..	..	@@ -11847,7 +12986,7 @@
11847	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
11848	12987	// mar 2013 ??? "KIL alpha.a;" +
11849	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
11850		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
11851	12990	/*
11852	12991	"MUL temp.xy, temp, two;" +
11853	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -11933,11 +13072,6 @@
11933	13072	"SUB bump0, bump0, half;" +
11934	13073	"ADD bump, bump, bump0;" +
11935	13074
11936		- "MOV temp.x, texSamp.a;" +
11937		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
11938		- //"LRP texSamp0, params5.x, texSamp0, one;" +
11939		- "MOV texSamp.a, temp.x;" +
11940		-
11941	13075	// double-sided
11942	13076	/**/
11943	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -11947,26 +13081,73 @@
11947	13081	"ADD temp.x, temp.x, one.x;" +
11948	13082	"MUL normal, normal, temp.xxxx;":""
11949	13083	) +
11950		- /**/
11951		-//// Normalize("normal") +
11952		-//// "MAX normal.z, eps.x, normal.z;" +
11953		-// Normalize("normal") +
11954		- "MOV normald, normal;" +
11955		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
11956	13087
11957	13088	// UV base
11958	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
11959	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
11960	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
11961		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
11962		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
11963		- "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	+
11964	13097	"XPD V, normal, UP;" +
11965	13098	Normalize("V") +
11966	13099	"XPD U, V, normal;" +
11967	13100	Normalize("U") +
11968	13101
	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	+
11969	13113	// 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;" +
11970	13151
11971	13152	//"MOV temp, fragment.texcoord[0];" +
11972	13153	//
..	..	@@ -12096,10 +13277,10 @@
12096	13277	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12097	13278	"") +
12098	13279
12099		- // display shadow only (bump == 0)
	13280	+ // display shadow only (fakedepth == 0)
12100	13281	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	13282	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13283	+ "SLT temp.z, temp.y, -c256i.x;" +
12103	13284	"SUB temp.y, one.x, temp.z;" +
12104	13285	"MUL temp.x, temp.x, temp.y;" +
12105	13286	"KIL temp.x;" +
..	..	@@ -12228,8 +13409,10 @@
12228	13409	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	13410
12230	13411	"SUB temp.x, one.x, ndotl.x;" +
12231		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12232		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13412	+ // Tuning for default skin
	13413	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13414	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13415	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12233	13416	"MUL temp.x, temp.x, temp.y;" +
12234	13417
12235	13418	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,8 +13611,19 @@
12428	13611	//once = true;
12429	13612	}
12430	13613
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
12432		- 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	+
12433	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13628
12435	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12476,7 +13670,8 @@
12476	13670	"\n" +
12477	13671	"END\n";
12478	13672
12479		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12480	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12481	13676
12482	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12521,25 +13716,26 @@
12521	13716	return out;
12522	13717	}
12523	13718
12524		- String TextureFetch(String dest, String src, String unit)
	13719	+ // Also does frustum culling
	13720	+ String ShadowTextureFetch(String dest, String src, String unit)
12525	13721	{
12526	13722	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12527	13723	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12528	13724	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13725	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13726	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12529	13727	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12530		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12531		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12532		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12533		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13728	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13729	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12534	13730	//"SWZ buffer, temp, w,w,w,w;";
12535		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13731	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12536	13732	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12537	13733	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12538	13734	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12539		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13735	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12540	13736
12541		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12542		- //"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;";
12543	13739	}
12544	13740
12545	13741	String Shadow(String depth, String shadow)
..	..	@@ -12561,12 +13757,16 @@
12561	13757
12562	13758	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13759	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13760	+
	13761	+ // Compare fragment depth in light space with shadowmap.
12564	13762	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13763	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13764	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13765	+
	13766	+ // Reverse comparison
12567	13767	"SUB temp.x, one.x, temp.x;" +
12568	13768	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13769	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13770	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13771
12572	13772	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13780,10 @@
12580	13780	// No shadow for backface
12581	13781	"DP3 temp.x, normal, lightd;" +
12582	13782	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13783	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13784	+
	13785	+ // No shadow when out of frustum
	13786	+ "SGE temp.x, " + depth + ".z, one.z;" +
12583	13787	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13788	"";
12585	13789	}
..	..	@@ -12725,8 +13929,9 @@
12725	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
12726	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13932	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13933	+
	13934	+ //Object3D.cVector2[] vector2buffer;
12730	13935
12731	13936	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13937	// OUT : diff, spec
..	..	@@ -12742,9 +13947,10 @@
12742	13947	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13948	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13949	//"MOV " + dest + ".w," + "normal.z;" +
12745		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12746		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12747		- //"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
12748	13954	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13955	"RCP " + dest + ".w," + dest + ".w;" +
12750	13956	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12890,7 +14096,7 @@
12890	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
12891	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
12892	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
12893		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12894	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
12895	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
12896	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -12951,7 +14157,7 @@
12951	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
12952	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
12953	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
12954		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
12955	14161	"MOV result.texcoord, temp;" +
12956	14162	// border fade
12957	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -12998,7 +14204,9 @@
12998	14204
12999	14205	//"ADD temp.z, temp.z, one;" +
13000	14206
13001		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
13002	14210	: "MOV result.color, vertex.color;") +
13003	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13004	14212	: "") +
..	..	@@ -13133,12 +14341,15 @@
13133	14341	public void mouseClicked(MouseEvent e)
13134	14342	{
13135	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
13136	14345	}
13137	14346
13138	14347	public void mousePressed(MouseEvent e)
13139	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
13140	14351	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14352	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	14353	}
13143	14354
13144	14355	static long prevtime = 0;
..	..	@@ -13165,15 +14376,18 @@
13165	14376
13166	14377	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	14378
	14379	+ if (BUTTONLESSWHEEL)
13168	14380	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	14381	{
13170	14382	return;
13171	14383	}
13172	14384
13173		- 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;
13174	14388
13175	14389	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13177	14391	{
13178	14392	keepboxmode = BOXMODE;
13179	14393	keepsupport = SUPPORT;
..	..	@@ -13213,8 +14427,8 @@
13213	14427	// mode \|= META;
13214	14428	//}
13215	14429
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14430	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13218	14432	anchorX = ax;
13219	14433	anchorY = ay;
13220	14434	prevX = px;
..	..	@@ -13248,6 +14462,7 @@
13248	14462	else
13249	14463	if (evt.getSource() == AAtimer)
13250	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13251	14466	if (mouseDown)
13252	14467	{
13253	14468	//new Exception().printStackTrace();
..	..	@@ -13273,6 +14488,10 @@
13273	14488	// LIVE = waslive;
13274	14489	// wasliveok = true;
13275	14490	// waslive = false;
	14491	+
	14492	+ // May 2019 Forget it:
	14493	+ if (true)
	14494	+ return;
13276	14495
13277	14496	// source == timer
13278	14497	if (mouseDown)
..	..	@@ -13303,21 +14522,23 @@
13303	14522
13304	14523	// fev 2014???
13305	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13306		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13307		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13308	14527	}
	14528	+
13309	14529	// if (!LIVE)
13310	14530	super.repaint();
13311	14531	}
13312	14532
13313	14533	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	14534
13315		- void clickStart(int x, int y, int modifiers)
	14535	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	14536	{
13317	14537	if (!wasliveok)
13318	14538	return;
13319	14539
13320	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13321	14542
13322	14543	// waslive = LIVE;
13323	14544	// LIVE = false;
..	..	@@ -13329,7 +14550,7 @@
13329	14550	// touched = true; // main DL
13330	14551	if (isRenderer)
13331	14552	{
13332		- SetMouseMode(modifiers);
	14553	+ SetMouseMode(modifiers, modifiersex);
13333	14554	}
13334	14555
13335	14556	selectX = anchorX = x;
..	..	@@ -13342,7 +14563,7 @@
13342	14563	clicked = true;
13343	14564	hold = false;
13344	14565
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14566	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	14567	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	14568	{
13348	14569	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13367,14 +14588,15 @@
13367	14588	drag = false;
13368	14589	//System.out.println("Mouse DOWN");
13369	14590	editObj = false;
13370		- ClickInfo info = new ClickInfo();
13371		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13372		- info.pane = this;
13373		- info.camera = renderCamera;
13374		- info.x = x;
13375		- info.y = y;
13376		- info.modifiers = modifiers;
13377		- 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);
13378	14600	if (!editObj)
13379	14601	{
13380	14602	hasMarquee = true;
..	..	@@ -13390,19 +14612,22 @@
13390	14612
13391	14613	public void mouseDragged(MouseEvent e)
13392	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
	14617	+ //System.out.println("mouseDragged: " + e);
13393	14618	if (isRenderer)
13394	14619	movingcamera = true;
	14620	+
13395	14621	//if (drawing)
13396	14622	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398		- if ((e.getModifiersEx() & CTRL) != 0
13399		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14625	{
13401	14626	//System.out.println("mouseDragged: " + e);
13402	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14628	}
13404	14629	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14630	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14631
13407	14632	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14633	}
..	..	@@ -13420,9 +14645,17 @@
13420	14645	return targetLookAt;
13421	14646	}
13422	14647
	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	+
13423	14653	class PingThread extends Thread
13424	14654	{
13425	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
13426	14659
13427	14660	// void JumpToTarget()
13428	14661	// {
..	..	@@ -13438,6 +14671,88 @@
13438	14671	// only one thread!? synchronized
13439	14672	void StepToTarget(boolean jump)
13440	14673	{
	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	+
13441	14756	tmp.set(targetLookAt);
13442	14757	tmp.sub(manipCamera.lookAt); // june 2014
13443	14758
..	..	@@ -13475,7 +14790,7 @@
13475	14790
13476	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13477	14792	{
13478		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
13479	14794	}
13480	14795
13481	14796	if (OEILONCE && OEIL)
..	..	@@ -13510,7 +14825,10 @@
13510	14825	if (tmp.dot(tmp) < 0.00001)
13511	14826	{
13512	14827	zoomonce = false;
	14828	+ live = false;
13513	14829	}
	14830	+ else
	14831	+ live = true;
13514	14832
13515	14833	tmp.mul(step > step2 ? step : step2);
13516	14834	}
..	..	@@ -13537,7 +14855,7 @@
13537	14855	{
13538	14856	if (LOOKAT)
13539	14857	manipCamera.lookAt.add(tmp);
13540		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
13541	14859	manipCamera.location.add(tmp);
13542	14860
13543	14861	{
..	..	@@ -13552,7 +14870,10 @@
13552	14870	lightCamera.computeTransform();
13553	14871	}
13554	14872	}
13555		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
13556	14877	}
13557	14878	// ?????? mouseDown = true;
13558	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -13575,6 +14896,7 @@
13575	14896
13576	14897	public void run()
13577	14898	{
	14899	+ new Exception().printStackTrace();
13578	14900	System.exit(0);
13579	14901	for (;;)
13580	14902	{
..	..	@@ -13638,55 +14960,113 @@
13638	14960	{
13639	14961	Globals.lighttouched = true;
13640	14962	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14963	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14964	}
13643	14965	//else
13644	14966	}
13645	14967	}
13646	14968	}
	14969	+
13647	14970	PingThread pingthread = new PingThread();
13648		- int delta = 5;
13649		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
13650	14974	boolean autorepeat = false;
13651	14975
	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	+
13652	14995	void GoDown(int mod)
13653	14996	{
13654	14997	MODIFIERS \|= COMMAND;
13655		- /*
	14998	+ boolean isVR = (mouseMode&VR)!=0;
	14999	+ /**/
13656	15000	if((mod&SHIFT) == SHIFT)
13657		- manipCamera.RotatePosition(0, -speed);
13658		- else
13659		- manipCamera.BackForth(0, -speed*delta, getWidth());
13660		- */
13661		- if ((mod & SHIFT) == SHIFT)
13662	15001	{
13663		- mouseMode = mouseMode; // VR??
13664		- } else
13665		- {
13666		- 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());
13667	15009	}
	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	+// }
13668	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
13669	15029	//prevX = X = anchorX;
13670	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
13671	15031	}
13672	15032
13673	15033	void GoUp(int mod)
13674	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
13675	15037	MODIFIERS \|= COMMAND;
13676		- /*
	15038	+ /**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
13677	15041	if((mod&SHIFT) == SHIFT)
13678		- manipCamera.RotatePosition(0, speed);
13679		- else
13680		- manipCamera.BackForth(0, speed*delta, getWidth());
13681		- */
13682		- if ((mod & SHIFT) == SHIFT)
13683	15042	{
13684		- mouseMode = mouseMode;
13685		- } else
13686		- {
13687		- 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());
13688	15050	}
	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	+// }
13689	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
13690	15070	//prevX = X = anchorX;
13691	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
13692	15072	}
..	..	@@ -13694,20 +15074,31 @@
13694	15074	void GoLeft(int mod)
13695	15075	{
13696	15076	MODIFIERS \|= COMMAND;
13697		- /*
	15077	+ /**/
13698	15078	if((mod&SHIFT) == SHIFT)
13699		- manipCamera.RotatePosition(speed, 0);
	15079	+ manipCamera.Translate(speed, 0, getWidth());
13700	15080	else
13701		- manipCamera.Translate(speed*delta, 0, getWidth());
13702		- */
13703		- if ((mod & SHIFT) == SHIFT)
13704	15081	{
13705		- mouseMode = mouseMode;
13706		- } else
13707		- {
13708		- mouseMode \|= ROTATE;
13709		- } // 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;
13710	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
13711	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
13712	15103	prevY = Y = anchorY;
13713	15104	}
..	..	@@ -13715,20 +15106,28 @@
13715	15106	void GoRight(int mod)
13716	15107	{
13717	15108	MODIFIERS \|= COMMAND;
13718		- /*
	15109	+ /**/
13719	15110	if((mod&SHIFT) == SHIFT)
13720		- manipCamera.RotatePosition(-speed, 0);
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
13721	15112	else
13722		- manipCamera.Translate(-speed*delta, 0, getWidth());
13723		- */
13724		- if ((mod & SHIFT) == SHIFT)
13725	15113	{
13726		- mouseMode = mouseMode;
13727		- } else
13728		- {
13729		- mouseMode \|= ROTATE;
13730		- } // 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;
13731	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
13732	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
13733	15132	prevY = Y = anchorY;
13734	15133	}
..	..	@@ -13738,7 +15137,7 @@
13738	15137	int X, Y;
13739	15138	boolean SX, SY;
13740	15139
13741		- void drag(int x, int y, int modifiers)
	15140	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	15141	{
13743	15142	if (IsFrozen())
13744	15143	{
..	..	@@ -13747,17 +15146,17 @@
13747	15146
13748	15147	drag = true; // NEW
13749	15148
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	15149	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	15150
13752	15151	X = x;
13753	15152	Y = y;
13754	15153	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	15154	+ MODIFIERS = modifiersex;
	15155	+ modifiersex &= ~1024;
13757	15156	if (false) // modifiers != 0)
13758	15157	{
13759	15158	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	15159	+ System.out.println("mouseDragged: " + modifiersex);
13761	15160	System.out.println("SHIFT = " + SHIFT);
13762	15161	System.out.println("CONTROL = " + COMMAND);
13763	15162	System.out.println("META = " + META);
..	..	@@ -13770,14 +15169,16 @@
13770	15169	if (editObj)
13771	15170	{
13772	15171	drag = true;
13773		- ClickInfo info = new ClickInfo();
13774		- info.bounds.setBounds(0, 0,
	15172	+ //ClickInfo info = new ClickInfo();
	15173	+ object.clickInfo.bounds.setBounds(0, 0,
13775	15174	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13776		- info.pane = this;
13777		- info.camera = renderCamera;
13778		- info.x = x;
13779		- info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	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);
13781	15182	} else
13782	15183	{
13783	15184	if (x < startX)
..	..	@@ -13860,6 +15261,11 @@
13860	15261	if ((mouseMode & ZOOM) != 0)
13861	15262	{
13862	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
13863	15269	if ((mouseMode & VR) != 0)
13864	15270	manipCamera.BackForth(dx, dy, getWidth());
13865	15271	else
..	..	@@ -13926,23 +15332,30 @@
13926	15332	}
13927	15333	}
13928	15334
	15335	+// ClickInfo clickInfo = new ClickInfo();
	15336	+
13929	15337	public void mouseMoved(MouseEvent e)
13930	15338	{
13931		- //System.out.println("mouseMoved: " + e);
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
13932	15341
	15342	+ //System.out.println("mouseMoved: " + e);
13933	15343	if (isRenderer)
13934	15344	return;
13935	15345
13936		- ClickInfo ci = new ClickInfo();
13937		- ci.x = e.getX();
13938		- ci.y = e.getY();
13939		- ci.modifiers = e.getModifiersEx();
13940		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13941		- ci.pane = this;
13942		- 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;
13943	15353	if (!isRenderer)
13944	15354	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	15355	+ //ObjEditor editWindow = object.editWindow;
	15356	+ //Object3D copy = editWindow.copy;
	15357	+ if (object.doEditClick(//clickInfo,
	15358	+ 0))
13946	15359	{
13947	15360	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	15361	} else
..	..	@@ -13954,7 +15367,11 @@
13954	15367
13955	15368	public void mouseReleased(MouseEvent e)
13956	15369	{
	15370	+ Globals.MOUSEDRAGGED = false;
	15371	+
13957	15372	movingcamera = false;
	15373	+ X = 0; // getBounds().width/2;
	15374	+ Y = 0; // getBounds().height/2;
13958	15375	//System.out.println("mouseReleased: " + e);
13959	15376	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	15377	}
..	..	@@ -13977,9 +15394,9 @@
13977	15394	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	15395	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	15396
13980		- if (control \|\| command \|\| IsFrozen())
	15397	+// No delay if (control \|\| command \|\| IsFrozen())
13981	15398	timeout = true;
13982		- else
	15399	+// ?? May 2019 else
13983	15400	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	15401	mouseDown = false;
13985	15402	if (!control && !command) // june 2013
..	..	@@ -14089,7 +15506,7 @@
14089	15506	System.out.println("keyReleased: " + e);
14090	15507	}
14091	15508
14092		- void SetMouseMode(int modifiers)
	15509	+ void SetMouseMode(int modifiers, int modifiersex)
14093	15510	{
14094	15511	//System.out.println("SetMouseMode = " + modifiers);
14095	15512	//modifiers &= ~1024;
..	..	@@ -14101,25 +15518,28 @@
14101	15518	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	15519	// return;
14103	15520	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	15521	+ if ((modifiersex & WHEEL) == WHEEL)
14105	15522	{
14106	15523	mouseMode \|= ZOOM;
14107	15524	}
14108	15525
14109		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- 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)
14111	15530	{
14112	15531	mouseMode \|= VR; // BACKFORTH;
14113	15532	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15533	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	15534	{
14116	15535	mouseMode \|= SELECT;
14117	15536	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	15537	+ if ((modifiersex & COMMAND) == COMMAND)
14119	15538	{
14120	15539	mouseMode \|= SELECT;
14121	15540	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	15543	{
14124	15544	mouseMode &= ~VR;
14125	15545	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +15568,7 @@
14148	15568
14149	15569	if (isRenderer) //
14150	15570	{
14151		- SetMouseMode(modifiers);
	15571	+ SetMouseMode(0, modifiers);
14152	15572	}
14153	15573
14154	15574	Globals.theRenderer.keyPressed(key);
..	..	@@ -14163,8 +15583,18 @@
14163	15583	float SATPOW = 1; // 2; // 0.5f;
14164	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
14165	15585
	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	+
14166	15592	public void keyPressed(int key)
14167	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
14168	15598	if (key >= '0' && key <= '5')
14169	15599	clampbit = (key-'0');
14170	15600
..	..	@@ -14210,7 +15640,8 @@
14210	15640	// break;
14211	15641	case 'T':
14212	15642	CACHETEXTURE ^= true;
14213		- textures.clear();
	15643	+ texturepigment.clear();
	15644	+ texturebump.clear();
14214	15645	// repaint();
14215	15646	break;
14216	15647	case 'Y':
..	..	@@ -14220,8 +15651,8 @@
14220	15651	case 'K':
14221	15652	KOMPACTTEXTURE ^= true;
14222	15653	//textures.clear();
14223		- break;
14224		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
14225	15656	// SAVETEXTURE ^= true;
14226	15657	macromode = true;
14227	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14295,7 +15726,9 @@
14295	15726	case 'E' : COMPACT ^= true;
14296	15727	repaint();
14297	15728	break;
14298		- case 'W' : DEBUGHSB ^= true;
	15729	+ case 'W' : // Wide Window (fullscreen)
	15730	+ //DEBUGHSB ^= true;
	15731	+ ObjEditor.theFrame.ToggleFullScreen();
14299	15732	repaint();
14300	15733	break;
14301	15734	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14320,8 +15753,8 @@
14320	15753	RevertCamera();
14321	15754	repaint();
14322	15755	break;
	15756	+ //case 'l':
14323	15757	case 'L':
14324		- case 'l':
14325	15758	if (lightMode)
14326	15759	{
14327	15760	lightMode = false;
..	..	@@ -14340,7 +15773,7 @@
14340	15773	targetLookAt.set(manipCamera.lookAt);
14341	15774	repaint();
14342	15775	break;
14343		- case 'p':
	15776	+ case 'P': // p':
14344	15777	// c'est quoi ca au juste? spherical ^= true;
14345	15778	Skinshader ^= true; programInitialized = false;
14346	15779	repaint();
..	..	@@ -14351,7 +15784,8 @@
14351	15784	break;
14352	15785	case 'm':
14353	15786	{
14354		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
14355	15789	break;
14356	15790	}
14357	15791	case 'M':
..	..	@@ -14378,27 +15812,31 @@
14378	15812	repaint();
14379	15813	break;
14380	15814	case 'O':
14381		- Globals.drawMode = OCCLUSION; // WARNING
14382		- repaint();
14383		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
14384	15818	case 'o':
14385	15819	OCCLUSION_CULLING ^= true;
14386	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14387	15821	break;
14388		- case '0': envyoff ^= true; repaint(); break;
	15822	+ //case '0': envyoff ^= true; repaint(); break;
14389	15823	case '1':
14390	15824	case '2':
14391	15825	case '3':
14392	15826	case '4':
14393	15827	case '5':
14394		- newenvy = Character.getNumericValue(key);
14395		- repaint();
14396		- break;
14397	15828	case '6':
14398	15829	case '7':
14399	15830	case '8':
14400	15831	case '9':
14401		- 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	+ }
14402	15840	repaint();
14403	15841	break;
14404	15842	case '!':
..	..	@@ -14464,11 +15902,25 @@
14464	15902	case '_':
14465	15903	kompactbit = 5;
14466	15904	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15905	+// case '+':
	15906	+// kompactbit = 6;
	15907	+// break;
14470	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
14471	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	+
14472	15924	Globals.lighttouched = true;
14473	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14474	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14476,15 +15928,20 @@
14476	15928	break;
14477	15929	//case '`' :
14478	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
14479	15935	RENDERPROGRAM += 1;
14480	15936	RENDERPROGRAM %= 3;
	15937	+
14481	15938	repaint();
14482	15939	break;
14483	15940	case 'Z':
14484	15941	//RESIZETEXTURE ^= true;
14485	15942	//break;
14486	15943	case 'z':
14487		- RENDERSHADOW ^= true;
	15944	+ Globals.RENDERSHADOW ^= true;
14488	15945	Globals.lighttouched = true;
14489	15946	repaint();
14490	15947	break;
..	..	@@ -14513,12 +15970,17 @@
14513	15970	case ENTER:
14514	15971	// object.editWindow.ScreenFit(); // Edit();
14515	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
14516	15977	break;
14517	15978	case DELETE:
14518	15979	ClearSelection();
14519	15980	break;
14520		- /*
14521	15981	case '+':
	15982	+
	15983	+ /*
14522	15984	//fontsize += 1;
14523	15985	bbzoom *= 2;
14524	15986	repaint();
..	..	@@ -14535,30 +15997,36 @@
14535	15997	case '=':
14536	15998	IncDepth();
14537	15999	//fontsize += 1;
14538		- object.editWindow.refreshContents(true);
	16000	+ object.GetWindow().refreshContents(true);
14539	16001	maskbit = 6;
14540	16002	break;
14541	16003	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14542	16004	DecDepth();
14543	16005	maskbit = 5;
14544	16006	//if(fontsize > 1) fontsize -= 1;
14545		- if (object.editWindow == null)
14546		- new Exception().printStackTrace();
14547		- else
14548		- object.editWindow.refreshContents(true);
	16007	+// if (object.editWindow == null)
	16008	+// new Exception().printStackTrace();
	16009	+// else
	16010	+ object.GetWindow().refreshContents(true);
14549	16011	break;
14550	16012	case '{':
14551		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
14552	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
14553	16017	repaint();
14554	16018	break;
14555	16019	case '}':
14556		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
14557	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
14558	16024	repaint();
14559	16025	break;
14560	16026	case '[':
14561		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
14562	16030	if (false) //manipCamera.hAspect == 0)
14563	16031	{
14564	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14574,7 +16042,9 @@
14574	16042	break;
14575	16043	case ']':
14576	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14577		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
14578	16048	if (false) //manipCamera.hAspect == 0)
14579	16049	{
14580	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14608,102 +16078,117 @@
14608	16078	//mode = ROTATE;
14609	16079	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	16080	{
14611		- SetMouseMode(modifiers);
	16081	+ SetMouseMode(0, modifiers);
14612	16082	}
14613	16083	}
14614	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
14615	16089	public void processKeyEvent(KeyEvent e)
14616	16090	{
14617	16091	switch (e.getID())
14618	16092	{
14619	16093	case KeyEvent.KEY_PRESSED:
14620		- if (!autorepeat)
14621		- {
14622		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
14623		- keyPressed(e.getKeyChar(), e.getModifiersEx());
14624		- }
14625		- if (manipCamera == lightCamera)
14626		- {
14627		- switch (e.getKeyCode())
14628		- {
14629		- case DOWN_ARROW:
14630		- lightCamera.DECAL /= 2;
14631		- repaint();
14632		- break;
14633		- case UP_ARROW:
14634		- lightCamera.DECAL *= 2;
14635		- repaint();
14636		- break;
14637		- case LEFT_ARROW:
14638		- lightCamera.SCALE /= 2;
14639		- repaint();
14640		- break;
14641		- case RIGHT_ARROW:
14642		- lightCamera.SCALE *= 2;
14643		- repaint();
14644		- break;
14645		- default:
14646		- break;
14647		- }
14648		-
14649		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
14650		- } else
14651		- {
14652		- if (true) // !autorepeat)
14653		- {
14654		- boolean reset = true;
14655		-
14656		- switch (e.getKeyCode())
14657		- {
14658		- case DOWN_ARROW:
14659		- GoDown(e.getModifiersEx());
14660		- repaint();
14661		- break;
14662		- case UP_ARROW:
14663		- GoUp(e.getModifiersEx());
14664		- repaint();
14665		- break;
14666		- case LEFT_ARROW:
14667		- GoLeft(e.getModifiersEx());
14668		- repaint();
14669		- break;
14670		- case RIGHT_ARROW:
14671		- GoRight(e.getModifiersEx());
14672		- repaint();
14673		- break;
14674		- default:
14675		- reset = false;
14676		- break;
14677		- }
14678		-
14679		- if (reset)
14680		- {
14681		- autorepeat = true;
14682		-
14683		- targetLookAt.set(manipCamera.lookAt);
14684		- }
14685		- }
14686		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
14687	16099	break;
14688		- case KeyEvent.KEY_TYPED:
14689		- 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;
14690	16170	case KeyEvent.KEY_RELEASED:
14691		- {
14692		- switch (e.getKeyCode())
14693		- {
14694		- case DOWN_ARROW:
14695		- case UP_ARROW:
14696		- case LEFT_ARROW:
14697		- case RIGHT_ARROW:
14698		- MODIFIERS &= ~COMMAND;
14699		- autorepeat = false;
14700		- break;
14701		- default:
14702		- break;
14703		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
14704	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
14705	16175	break;
14706		- }
	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	+// }
14707	16192	default:
14708	16193	break;
14709	16194	}
..	..	@@ -14742,8 +16227,9 @@
14742	16227
14743	16228	protected void processMouseMotionEvent(MouseEvent e)
14744	16229	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16230	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	16231	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16232	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	16233	{
14748	16234	mouseMoved(e);
14749	16235	} else
..	..	@@ -14768,11 +16254,12 @@
14768	16254	}
14769	16255	*/
14770	16256
14771		- object.editWindow.EditSelection();
	16257	+ object.GetWindow().EditSelection(false);
14772	16258	}
14773	16259
14774	16260	void SelectParent()
14775	16261	{
	16262	+ new Exception().printStackTrace();
14776	16263	System.exit(0);
14777	16264	Composite group = (Composite) object;
14778	16265	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14784,10 +16271,10 @@
14784	16271	{
14785	16272	//selectees.remove(i);
14786	16273	System.out.println("select parent of " + elem);
14787		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16274	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14788	16275	} else
14789	16276	{
14790		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16277	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14791	16278	}
14792	16279
14793	16280	first = false;
..	..	@@ -14796,6 +16283,7 @@
14796	16283
14797	16284	void SelectChildren()
14798	16285	{
	16286	+ new Exception().printStackTrace();
14799	16287	System.exit(0);
14800	16288	/*
14801	16289	Composite group = (Composite) object;
..	..	@@ -14828,12 +16316,12 @@
14828	16316	for (int j = 0; j < group.children.size(); j++)
14829	16317	{
14830	16318	elem = (Object3D) group.children.elementAt(j);
14831		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16319	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14832	16320	first = false;
14833	16321	}
14834	16322	} else
14835	16323	{
14836		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16324	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14837	16325	}
14838	16326
14839	16327	first = false;
..	..	@@ -14844,21 +16332,21 @@
14844	16332	{
14845	16333	//Composite group = (Composite) object;
14846	16334	Object3D group = object;
14847		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16335	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14848	16336	}
14849	16337
14850	16338	void ResetTransform(int mask)
14851	16339	{
14852	16340	//Composite group = (Composite) object;
14853	16341	Object3D group = object;
14854		- group.editWindow.ResetTransform(mask);
	16342	+ group.GetWindow().ResetTransform(mask);
14855	16343	}
14856	16344
14857	16345	void FlipTransform()
14858	16346	{
14859	16347	//Composite group = (Composite) object;
14860	16348	Object3D group = object;
14861		- group.editWindow.FlipTransform();
	16349	+ group.GetWindow().FlipTransform();
14862	16350	// group.editWindow.ReduceMesh(true);
14863	16351	}
14864	16352
..	..	@@ -14866,7 +16354,7 @@
14866	16354	{
14867	16355	//Composite group = (Composite) object;
14868	16356	Object3D group = object;
14869		- group.editWindow.PrintMemory();
	16357	+ group.GetWindow().PrintMemory();
14870	16358	// group.editWindow.ReduceMesh(true);
14871	16359	}
14872	16360
..	..	@@ -14874,7 +16362,7 @@
14874	16362	{
14875	16363	//Composite group = (Composite) object;
14876	16364	Object3D group = object;
14877		- group.editWindow.ResetCentroid();
	16365	+ group.GetWindow().ResetCentroid();
14878	16366	}
14879	16367
14880	16368	void IncDepth()
..	..	@@ -14956,11 +16444,11 @@
14956	16444
14957	16445	int width = getBounds().width;
14958	16446	int height = getBounds().height;
14959		- ClickInfo info = new ClickInfo();
14960		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	16447	//Image img = CreateImage(width, height);
14962	16448	//System.out.println("width = " + width + "; height = " + height + "\n");
	16449	+
14963	16450	Graphics gr = g; // img.getGraphics();
	16451	+
14964	16452	if (!hasMarquee)
14965	16453	{
14966	16454	if (Xmin < Xmax) // !locked)
..	..	@@ -15032,44 +16520,92 @@
15032	16520	}
15033	16521	if (object != null && !hasMarquee)
15034	16522	{
	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	+
15035	16529	if (isRenderer)
15036	16530	{
15037		- info.flags++;
	16531	+ object.clickInfo.flags++;
15038	16532	double frameAspect = (double) width / (double) height;
15039	16533	if (frameAspect > renderCamera.aspect)
15040	16534	{
15041	16535	int desired = (int) ((double) height * renderCamera.aspect);
15042		- info.bounds.width -= width - desired;
15043		- info.bounds.x += (width - desired) / 2;
	16536	+ object.clickInfo.bounds.width -= width - desired;
	16537	+ object.clickInfo.bounds.x += (width - desired) / 2;
15044	16538	} else
15045	16539	{
15046	16540	int desired = (int) ((double) width / renderCamera.aspect);
15047		- info.bounds.height -= height - desired;
15048		- info.bounds.y += (height - desired) / 2;
	16541	+ object.clickInfo.bounds.height -= height - desired;
	16542	+ object.clickInfo.bounds.y += (height - desired) / 2;
15049	16543	}
15050	16544	}
15051		- info.g = gr;
15052		- info.camera = renderCamera;
	16545	+
	16546	+ object.clickInfo.g = gr;
	16547	+ object.clickInfo.camera = renderCamera;
15053	16548	/*
15054	16549	// Memory intensive (brep.verticescopy)
15055	16550	if (!(object instanceof Composite))
15056	16551	object.draw(info, 0, false); // SLOW :
15057	16552	*/
15058		- if (!isRenderer)
	16553	+ if (!isRenderer) // && drag)
15059	16554	{
15060		- object.drawEditHandles(info, 0);
	16555	+ Grafreed.Assert(object != null);
	16556	+ Grafreed.Assert(object.selection != null);
	16557	+ if (object.selection.Size() > 0)
	16558	+ {
	16559	+ int hitSomething = object.selection.get(0).hitSomething;
	16560	+
	16561	+ object.clickInfo.DX = 0;
	16562	+ object.clickInfo.DY = 0;
	16563	+ object.clickInfo.W = 1;
	16564	+ if (hitSomething == Object3D.hitCenter)
	16565	+ {
	16566	+ info.DX = X;
	16567	+ if (X != 0)
	16568	+ info.DX -= info.bounds.width/2;
	16569	+
	16570	+ info.DY = Y;
	16571	+ if (Y != 0)
	16572	+ info.DY -= info.bounds.height/2;
	16573	+ }
	16574	+
	16575	+ object.drawEditHandles(//info,
	16576	+ 0);
	16577	+
	16578	+ if (drag && (X != 0 \|\| Y != 0))
	16579	+ {
	16580	+ switch (hitSomething)
	16581	+ {
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16583	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16584	+ break;
	16585	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16586	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16587	+ break;
	16588	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16589	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16590	+ break;
	16591	+ }
	16592	+
	16593	+ }
	16594	+ }
15061	16595	}
15062	16596	}
	16597	+
15063	16598	if (isRenderer)
15064	16599	{
15065	16600	//gr.setColor(Color.black);
15066	16601	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	16602	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	16603	}
	16604	+
15069	16605	if (hasMarquee)
15070	16606	{
15071	16607	gr.setXORMode(Color.white);
15072		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
15073	16609	if (!firstime)
15074	16610	{
15075	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15178,6 +16714,7 @@
15178	16714	public boolean mouseDown(Event evt, int x, int y)
15179	16715	{
15180	16716	System.out.println("mouseDown: " + evt);
	16717	+ System.exit(0);
15181	16718	/*
15182	16719	locked = true;
15183	16720	drag = false;
..	..	@@ -15221,13 +16758,14 @@
15221	16758	{
15222	16759	keyPressed(0, modifiers);
15223	16760	}
15224		- clickStart(x, y, modifiers);
	16761	+ // clickStart(x, y, modifiers);
15225	16762	return true;
15226	16763	}
15227	16764
15228	16765	public boolean mouseDrag(Event evt, int x, int y)
15229	16766	{
15230		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
15231	16769	/*
15232	16770	drag = true;
15233	16771	//System.out.println("Mouse DRAG");
..	..	@@ -15339,13 +16877,14 @@
15339	16877	{
15340	16878	keyReleased(0, 0);
15341	16879	}
15342		- drag(x, y, modifiers);
	16880	+ drag(x, y, 0, modifiers);
15343	16881	return true;
15344	16882	}
15345	16883
15346	16884	public boolean mouseUp(Event evt, int x, int y)
15347	16885	{
15348	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
15349	16888	/*
15350	16889	locked = false;
15351	16890	if (isRenderer)
..	..	@@ -15471,7 +17010,7 @@
15471	17010	Object3D object;
15472	17011	static Object3D trackedobject;
15473	17012	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	17013	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	17014	/static/ Camera eyeCamera;
15476	17015	/static/ Camera lightCamera;
15477	17016	int cameracount;
..	..	@@ -15535,6 +17074,8 @@
15535	17074	private /static/ boolean firstime;
15536	17075	private /static/ cVector newView = new cVector();
15537	17076	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"};
15538	17079	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15539	17080	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15540	17081	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15547,29 +17088,67 @@
15547	17088	{
15548	17089	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15549	17090
	17091	+ int usedsuf = 0;
	17092	+
15550	17093	for (int i = 0; i < suffixes.length; i++)
15551	17094	{
15552		- String resourceName = basename + suffixes[i] + "." + suffix;
15553		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15554		- mipmapped,
15555		- FileUtil.getFileSuffix(resourceName));
15556		- if (data == null)
	17095	+ String[] suffixe = suffixes;
	17096	+ String[] fallback = suffixes2;
	17097	+ String[] fallfallback = suffixes3;
	17098	+
	17099	+ for (int c=usedsuf; --c>=0;)
15557	17100	{
15558		- throw new IOException("Unable to load texture " + resourceName);
	17101	+// String[] temp = suffixe;
	17102	+// suffixe = fallback;
	17103	+// fallback = fallfallback;
	17104	+// fallfallback = temp;
15559	17105	}
	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	+
15560	17134	//System.out.println("Target = " + targets[i]);
15561	17135	cubemap.updateImage(data, targets[i]);
15562	17136	}
15563	17137
15564	17138	return cubemap;
15565	17139	}
	17140	+
15566	17141	int bigsphere = -1;
15567	17142
15568	17143	float BGcolor = 0.5f;
15569	17144
15570		- private void DrawSkyBox(GL gl)
	17145	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17146	+
	17147	+ private void DrawSkyBox(GL gl, float ratio)
15571	17148	{
15572		- if (envyoff \|\| cubemap == null)
	17149	+ if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
	17151	+ cubemap == null)
15573	17152	{
15574	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15575	17154	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15584,7 +17163,17 @@
15584	17163	// Compensates for ExaminerViewer's modification of modelview matrix
15585	17164	gl.glMatrixMode(GL.GL_MODELVIEW);
15586	17165	gl.glLoadIdentity();
	17166	+ gl.glScalef(1,ratio,1);
15587	17167
	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	+
15588	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
15589	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15590	17179
..	..	@@ -15616,6 +17205,7 @@
15616	17205	{
15617	17206	gl.glScalef(1.0f, -1.0f, 1.0f);
15618	17207	}
	17208	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15619	17209	gl.glMultMatrixd(viewrot_1, 0);
15620	17210	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15621	17211	//viewer.updateInverseRotation(gl);
..	..	@@ -15656,7 +17246,8 @@
15656	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
15657	17247
15658	17248	cubemap.disable();
15659		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
15660	17251	if (CULLFACE)
15661	17252	{
15662	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -15712,7 +17303,7 @@
15712	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
15713	17304	}
15714	17305
15715		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
15716	17307
15717	17308	float step = 2; // 0.1666f; //0.25f;
15718	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -15756,16 +17347,16 @@
15756	17347	cStatic.objectstack[materialdepth++] = checker;
15757	17348	//System.out.println("material " + material);
15758	17349	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	17350	+ //vector2buffer = checker.projectedVertices;
15760	17351
15761	17352	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	17353	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	17354
15764	17355	materialdepth -= 1;
15765	17356	if (materialdepth > 0)
15766	17357	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17358	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17359	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	17360	}
15770	17361	//checker.GetMaterial().opacity = 1f;
15771	17362	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15851,6 +17442,14 @@
15851	17442	}
15852	17443	}
15853	17444
	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	+
15854	17453	class SelectBuffer implements GLEventListener
15855	17454	{
15856	17455
..	..	@@ -15866,7 +17465,7 @@
15866	17465	//new Exception().printStackTrace();
15867	17466	System.out.println("select buffer init");
15868	17467	// Use debug pipeline
15869		- drawable.setGL(new DebugGL(drawable.getGL()));
	17468	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15870	17469
15871	17470	GL gl = drawable.getGL();
15872	17471
..	..	@@ -15909,6 +17508,7 @@
15909	17508	{
15910	17509	if (!selection)
15911	17510	{
	17511	+ new Exception().printStackTrace();
15912	17512	System.exit(0);
15913	17513	return;
15914	17514	}
..	..	@@ -15929,6 +17529,17 @@
15929	17529
15930	17530	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15931	17531
	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	+
15932	17543	//int tmp = selection_view;
15933	17544	//selection_view = -1;
15934	17545	int temp = DrawMode();
..	..	@@ -15940,6 +17551,17 @@
15940	17551	// temp = DEFAULT; // patch for selection debug
15941	17552	Globals.drawMode = temp; // WARNING
15942	17553
	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	+
15943	17565	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15944	17566
15945	17567	// trying different ways of getting the depth info over
..	..	@@ -15970,7 +17592,7 @@
15970	17592
15971	17593	float depth = depths[y * TEX_SIZE + x];
15972	17594
15973		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
15974	17596	{
15975	17597	pointselection = false;
15976	17598
..	..	@@ -15987,6 +17609,8 @@
15987	17609	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15988	17610	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	17611	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17612	+
	17613	+ CreateSelectedPoint();
15990	17614
15991	17615	// Will fit the mesh !!!
15992	17616	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16036,34 +17660,36 @@
16036	17660	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16037	17661	}
16038	17662
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17663	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	17664	}
16041	17665	}
16042	17666
16043	17667	if (!movingcamera && !PAINTMODE)
16044		- object.editWindow.ScreenFitPoint(); // fev 2014
	17668	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16045	17669
16046		- 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)
16047	17671	{
16048		- 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);
16049	17673
16050		- Object3D group = new Object3D("inst" + paintcount++);
	17674	+ if (object.GetWindow().copy.selection.Size() > 0)
	17675	+ {
	17676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16051	17677
16052		- group.CreateMaterial(); // use a void leaf to select instances
16053		-
16054		- group.add(paintobj); // link
16055		-
16056		- object.editWindow.SnapObject(group);
16057		-
16058		- Object3D folder = object.editWindow.copy;
16059		-
16060		- if (object.editWindow.copy.selection.Size() > 0)
16061		- folder = object.editWindow.copy.selection.elementAt(0);
16062		-
16063		- folder.add(group);
16064		-
16065		- object.editWindow.ResetModel();
16066		- 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	+ }
16067	17693	}
16068	17694	else
16069	17695	paintcount = 0;
..	..	@@ -16102,6 +17728,11 @@
16102	17728	//System.out.println("objects[color] = " + objects[color]);
16103	17729	//objects[color].Select();
16104	17730	indexcount = 0;
	17731	+ ObjEditor window = object.GetWindow();
	17732	+ if (window != null && deselect)
	17733	+ {
	17734	+ window.Select(null, deselect, true);
	17735	+ }
16105	17736	object.Select(color, deselect);
16106	17737	}
16107	17738
..	..	@@ -16152,6 +17783,7 @@
16152	17783
16153	17784	public void init(GLAutoDrawable drawable)
16154	17785	{
	17786	+ if (Globals.DEBUG)
16155	17787	System.out.println("shadow buffer init");
16156	17788
16157	17789	GL gl = drawable.getGL();
..	..	@@ -16201,7 +17833,7 @@
16201	17833	gl.glDisable(gl.GL_CULL_FACE);
16202	17834	}
16203	17835
16204		- if (!RENDERSHADOW)
	17836	+ if (!Globals.RENDERSHADOW)
16205	17837	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	17838
16207	17839	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +17843,7 @@
16211	17843	//gl.glColorMask(false, false, false, false);
16212	17844
16213	17845	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17846	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	17847	{
16216	17848	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	17849
..	..	@@ -16380,10 +18012,14 @@
16380	18012	gl.glFlush();
16381	18013
16382	18014	/**/
16383		- 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);
16384	18016
16385		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
16386	18018
	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	+
16387	18023	double r = 0, g = 0, b = 0;
16388	18024
16389	18025	double count = 0;
..	..	@@ -16394,7 +18030,7 @@
16394	18030
16395	18031	double FACTOR = 1;
16396	18032
16397		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
16398	18034	{
16399	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16400	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16477,7 +18113,7 @@
16477	18113
16478	18114	double scale = ray.z; // 1; // cos
16479	18115
16480		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
16481	18117
16482	18118	/*
16483	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16620,6 +18256,11 @@
16620	18256	static boolean DEBUG_SELECTION = false;
16621	18257	boolean OCCLUSION_CULLING = false; //true;
16622	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
16623	18264	static public int indexcount = 0;
16624	18265	/static/ cColor vertexOcclusion = new cColor();
16625	18266	//private int selection_view = -1;
..	..	@@ -16627,23 +18268,15 @@
16627	18268	int AAbuffersize = 0;
16628	18269
16629	18270	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	18271	+ static Superellipsoid selectedpoint;
16631	18272	static Sphere previousselectedpoint = null;
16632		- static Sphere debugpointG = new Sphere();
16633		- static Sphere debugpointP = new Sphere();
16634		- static Sphere debugpointC = new Sphere();
16635		- static Sphere debugpointR = new Sphere();
	18273	+ static Sphere debugpointG;
	18274	+ static Sphere debugpointP;
	18275	+ static Sphere debugpointC;
	18276	+ static Sphere debugpointR;
16636	18277
16637	18278	static Sphere debugpoints[] = new Sphere[8];
16638	18279
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	18280	static void InitPoints(float radius)
16648	18281	{
16649	18282	for (int i=0; i<8; i++)
..	..	@@ -16682,11 +18315,14 @@
16682	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
16683	18316	static IntBuffer bigAAbuffer;
16684	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
16685		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
16686	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16687	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16688	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
16689		- 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	+
16690	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
16691	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
16692	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -16695,10 +18331,11 @@
16695	18331	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	18332	// Depth buffer format
16697	18333	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	18334	+
	18335	+ public void NextIndex()
16699	18336	{
16700	18337	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	18338	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	18339	//objects[indexcount] = o;
16703	18340	//System.out.println("indexcount = " + indexcount);
16704	18341	}