~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +126,8 @@
92	126
93	127	static int tickcount = 0; // slow pose issue
94	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
95	131	static boolean BOXMODE = false;
96	132	static boolean IMAGEFLIP = false;
97	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -150,12 +186,24 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	188
153		- static CameraPane theRenderer;
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
154	202
155	203	void SetAsGLRenderer(boolean b)
156	204	{
157	205	isRenderer = b;
158		- theRenderer = this;
	206	+ Globals.theRenderer = this;
159	207	}
160	208
161	209	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -170,7 +218,8 @@
170	218
171	219	SetCamera(cam);
172	220
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	223
175	224	object = o;
176	225
..	..	@@ -193,9 +242,43 @@
193	242
194	243	/// INTERFACE
195	244
	245	+ public javax.media.opengl.GL GetGL0()
	246	+ {
	247	+ return null;
	248	+ }
	249	+
	250	+ public int GenList()
	251	+ {
	252	+ javax.media.opengl.GL gl = GetGL();
	253	+ return gl.glGenLists(1);
	254	+ }
	255	+
	256	+ public void NewList(int id)
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	260	+ }
	261	+
	262	+ public void CallList(int id)
	263	+ {
	264	+ javax.media.opengl.GL gl = GetGL();
	265	+ gl.glCallList(id);
	266	+ }
	267	+
	268	+ public void EndList()
	269	+ {
	270	+ javax.media.opengl.GL gl = GetGL();
	271	+ gl.glEndList();
	272	+ }
	273	+
196	274	public boolean IsBoxMode()
197	275	{
198	276	return BOXMODE;
	277	+ }
	278	+
	279	+ public boolean IsZoomBoxMode()
	280	+ {
	281	+ return ZOOMBOXMODE;
199	282	}
200	283
201	284	public void ClearDepth()
..	..	@@ -293,7 +376,7 @@
293	376	cStatic.objectstack[materialdepth++] = obj;
294	377	//System.out.println("material " + material);
295	378	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
297	380	if (obj instanceof Camera)
298	381	{
299	382	display.options1[0] = material.shift;
..	..	@@ -302,14 +385,28 @@
302	385	display.options1[2] = material.shadowbias;
303	386	display.options1[3] = material.aniso;
304	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
305	393	display.options2[0] = material.opacity;
306	394	display.options2[1] = material.diffuse;
307	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
308	399
309	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
310	404	display.options4[0] = material.cameralight/0.2f;
311	405	display.options4[1] = material.subsurface;
312	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
313	410
314	411	// if (display.CURRENTANTIALIAS > 0)
315	412	// display.options3[3] /= 4;
..	..	@@ -325,7 +422,7 @@
325	422	/**/
326	423	} else
327	424	{
328		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
329	426	}
330	427	} else
331	428	{
..	..	@@ -349,8 +446,8 @@
349	446	cStatic.objectstack[materialdepth++] = obj;
350	447	//System.out.println("material " + material);
351	448	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	451	}
355	452	}
356	453
..	..	@@ -367,8 +464,8 @@
367	464	materialdepth -= 1;
368	465	if (materialdepth > 0)
369	466	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	469	}
373	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +485,8 @@
388	485	materialdepth -= 1;
389	486	if (materialdepth > 0)
390	487	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	490	}
394	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	492	//else
..	..	@@ -430,10 +527,12 @@
430	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	528	{
432	529	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
434	533	if (!hasnorm)
435	534	{
436		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
437	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +915,7 @@
816	915
817	916	if ((i % 100) == 0 && i != 0)
818	917	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	918	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	919	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	920	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	921	}
..	..	@@ -848,7 +947,7 @@
848	947
849	948	if ((i % 100) == 0 && i != 0)
850	949	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	950	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	951	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	952	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	953	}
..	..	@@ -1061,8 +1160,345 @@
1061	1160	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1161	}
1063	1162
	1163	+ public void DrawBox(cVector min, cVector max)
	1164	+ {
	1165	+ javax.media.opengl.GL gl = GetGL();
	1166	+ gl.glBegin(gl.GL_LINES);
	1167	+
	1168	+ gl.glVertex3d(min.x, min.y, min.z);
	1169	+ gl.glVertex3d(min.x, min.y, max.z);
	1170	+ gl.glVertex3d(min.x, min.y, min.z);
	1171	+ gl.glVertex3d(min.x, max.y, min.z);
	1172	+ gl.glVertex3d(min.x, min.y, min.z);
	1173	+ gl.glVertex3d(max.x, min.y, min.z);
	1174	+
	1175	+ gl.glVertex3d(max.x, max.y, max.z);
	1176	+ gl.glVertex3d(min.x, max.y, max.z);
	1177	+ gl.glVertex3d(max.x, max.y, max.z);
	1178	+ gl.glVertex3d(max.x, min.y, max.z);
	1179	+ gl.glVertex3d(max.x, max.y, max.z);
	1180	+ gl.glVertex3d(max.x, max.y, min.z);
	1181	+
	1182	+ gl.glEnd();
	1183	+ }
	1184	+
	1185	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1186	+ {
	1187	+ int[] strips = bRep.getRawIndices();
	1188	+
	1189	+ javax.media.opengl.GL gl = GetGL();
	1190	+
	1191	+ // TRIANGLE STRIP ARRAY
	1192	+ if (bRep.trimmed)
	1193	+ {
	1194	+ float[] v = bRep.getRawVertices();
	1195	+ float[] n = bRep.getRawNormals();
	1196	+ float[] c = bRep.getRawColors();
	1197	+ float[] uv = bRep.getRawUVMap();
	1198	+
	1199	+ int count2 = 0;
	1200	+ int count3 = 0;
	1201	+
	1202	+ if (n.length > 0)
	1203	+ {
	1204	+ for (int i = 0; i < strips.length; i++)
	1205	+ {
	1206	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1207	+
	1208	+ /*
	1209	+ boolean locked = false;
	1210	+ float eps = 0.1f;
	1211	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1212	+
	1213	+ int dot = 0;
	1214	+
	1215	+ if ((dot&1) == 0)
	1216	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1217	+
	1218	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1219	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1220	+ else
	1221	+ {
	1222	+ locked = true;
	1223	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1224	+ }
	1225	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1226	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1227	+ if (hasnorm)
	1228	+ {
	1229	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1230	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1231	+ }
	1232	+
	1233	+ if ((dot&4) == 0)
	1234	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1235	+
	1236	+ if (wrap \|\| !locked && (dot&8) != 0)
	1237	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1238	+ else
	1239	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1240	+
	1241	+ f.dot = dot;
	1242	+ */
	1243	+
	1244	+ if (!selectmode)
	1245	+ {
	1246	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1247	+ {
	1248	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1249	+ } else
	1250	+ {
	1251	+ gl.glNormal3f(0, 0, 1);
	1252	+ }
	1253	+
	1254	+ if (c != null)
	1255	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1256	+ {
	1257	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1258	+ }
	1259	+ }
	1260	+
	1261	+ if (flipV)
	1262	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1263	+ else
	1264	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
	1266	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1267	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1268	+
	1269	+ count2 += 2;
	1270	+ count3 += 3;
	1271	+ if (!selectmode)
	1272	+ {
	1273	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1274	+ {
	1275	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1276	+ } else
	1277	+ {
	1278	+ gl.glNormal3f(0, 0, 1);
	1279	+ }
	1280	+ if (c != null)
	1281	+ {
	1282	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1283	+ }
	1284	+ }
	1285	+
	1286	+ if (flipV)
	1287	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1288	+ else
	1289	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
	1291	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1292	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1293	+
	1294	+ count2 += 2;
	1295	+ count3 += 3;
	1296	+ for (int j = 0; j < strips[i] - 2; j++)
	1297	+ {
	1298	+ //gl.glTexCoord2d(...);
	1299	+ if (!selectmode)
	1300	+ {
	1301	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1302	+ {
	1303	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1304	+ } else
	1305	+ {
	1306	+ gl.glNormal3f(0, 0, 1);
	1307	+ }
	1308	+ if (c != null)
	1309	+ {
	1310	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1311	+ }
	1312	+ }
	1313	+
	1314	+ if (flipV)
	1315	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1316	+ else
	1317	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
	1319	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1320	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
	1322	+ count2 += 2;
	1323	+ count3 += 3;
	1324	+ }
	1325	+
	1326	+ gl.glEnd();
	1327	+ }
	1328	+ }
	1329	+
	1330	+ assert count3 == v.length;
	1331	+ }
	1332	+ else // !trimmed
	1333	+ {
	1334	+ int count = 0;
	1335	+ for (int i = 0; i < strips.length; i++)
	1336	+ {
	1337	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1338	+
	1339	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1340	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1341	+
	1342	+ drawVertex(gl, p, flipV, selectmode);
	1343	+ drawVertex(gl, q, flipV, selectmode);
	1344	+
	1345	+ for (int j = 0; j < strips[i] - 2; j++)
	1346	+ {
	1347	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1348	+
	1349	+ // if (j%2 == 0)
	1350	+ // drawFace(p, q, r, display, null);
	1351	+ // else
	1352	+ // drawFace(p, r, q, display, null);
	1353	+
	1354	+ // p = q;
	1355	+ // q = r;
	1356	+ drawVertex(gl, r, flipV, selectmode);
	1357	+ }
	1358	+
	1359	+ gl.glEnd();
	1360	+ }
	1361	+ }
	1362	+ }
	1363	+
	1364	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1365	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1366	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1367	+
	1368	+ public void DrawDynamicMesh(cMesh mesh)
	1369	+ {
	1370	+ GL gl = GetGL(); // getGL();
	1371	+
	1372	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1373	+
	1374	+ gl.glDisable(gl.GL_LIGHTING);
	1375	+
	1376	+ gl.glLineWidth(1);
	1377	+ gl.glColor3f(1,1,1);
	1378	+ gl.glBegin(gl.GL_LINES);
	1379	+ double scale = 0;
	1380	+ int count = 0;
	1381	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1382	+ {
	1383	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1384	+ if(s == 0)
	1385	+ {
	1386	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1387	+ }
	1388	+ if (mesh.showsprings)
	1389	+ {
	1390	+ temp.set(spring.a.position);
	1391	+ temp.add(spring.b.position);
	1392	+ temp.mul(0.5);
	1393	+ temp2.set(spring.a.position);
	1394	+ temp2.sub(spring.b.position);
	1395	+ temp2.mul(spring.restLength/2);
	1396	+ temp.sub(temp2);
	1397	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1398	+ temp.add(temp2);
	1399	+ temp.add(temp2);
	1400	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1401	+ }
	1402	+
	1403	+ if (spring.isHandle)
	1404	+ continue;
	1405	+
	1406	+ //if (scale < spring.restLength)
	1407	+ scale += spring.restLength;
	1408	+ count++;
	1409	+ }
	1410	+ gl.glEnd();
	1411	+
	1412	+ if (count == 0)
	1413	+ scale = 0.01;
	1414	+ else
	1415	+ scale /= count * 3;
	1416	+
	1417	+ //scale = 0.25;
	1418	+
	1419	+ if (mesh.ShowInfo())
	1420	+ {
	1421	+ gl.glLineWidth(4);
	1422	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1423	+ {
	1424	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1425	+ if (node.mass == 0)
	1426	+ continue;
	1427	+
	1428	+ int i = node.springs==null?-1:node.springs.size();
	1429	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1430	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1431	+ //temp.normalize();
	1432	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1433	+ gl.glBegin(gl.GL_LINES);
	1434	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1435	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1436	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1437	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1438	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1439	+ gl.glEnd();
	1440	+ }
	1441	+
	1442	+ gl.glLineWidth(8);
	1443	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1444	+ {
	1445	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1446	+
	1447	+ if (node.springs != null)
	1448	+ {
	1449	+ for (int i=0; i<node.springs.size(); i+=1)
	1450	+ {
	1451	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1452	+
	1453	+ int c = i+1;
	1454	+ // c = node.springs.get(i).nbcopies;
	1455	+
	1456	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1457	+ gl.glBegin(gl.GL_LINES);
	1458	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1459	+ 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);
	1460	+ gl.glEnd();
	1461	+ }
	1462	+ }
	1463	+ }
	1464	+
	1465	+ gl.glLineWidth(1);
	1466	+ }
	1467	+
	1468	+ gl.glEnable(gl.GL_LIGHTING);
	1469	+ }
	1470	+
1064	1471	/// INTERFACE
1065	1472
	1473	+ public void StartTriangles()
	1474	+ {
	1475	+ javax.media.opengl.GL gl = GetGL();
	1476	+ gl.glBegin(gl.GL_TRIANGLES);
	1477	+ }
	1478	+
	1479	+ public void EndTriangles()
	1480	+ {
	1481	+ GetGL().glEnd();
	1482	+ }
	1483	+
	1484	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1485	+ {
	1486	+ if (!selectmode)
	1487	+ {
	1488	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1489	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1490	+
	1491	+ if (flipV)
	1492	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1493	+ else
	1494	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1495	+ }
	1496	+
	1497	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1498	+ }
	1499	+
	1500	+ float[] colorV = new float[4];
	1501	+
1066	1502	void SetColor(Object3D obj, Vertex p0)
1067	1503	{
1068	1504	CameraPane display = this;
..	..	@@ -1130,8 +1566,6 @@
1130	1566	{
1131	1567	return;
1132	1568	}
1133		-
1134		- float[] colorV = new float[3];
1135	1569
1136	1570	if (false) // marked)
1137	1571	{
..	..	@@ -1240,7 +1674,7 @@
1240	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1675	}
1242	1676
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1678	{
1245	1679	CameraPane display = this;
1246	1680	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1690,18 @@
1256	1690	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1691	if (!material.multiply)
1258	1692	{
1259		- display.color = color;
	1693	+ display.color = material.color;
1260	1694	display.saturation = material.modulation;
1261	1695	}
1262	1696	else
1263	1697	{
1264		- display.color = color2;
	1698	+ display.color = material.color2;
1265	1699	display.saturation = material.modulation2;
1266	1700	}
1267	1701
1268	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1703
1270		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
1271	1705
1272	1706	/**/
1273	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1709,7 @@
1275	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1279	1713
1280	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1817,9 @@
1383	1817	display.modelParams7[2] = 0;
1384	1818	display.modelParams7[3] = 0;
1385	1819
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1821
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1824	{
1391	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1961,7 @@
1527	1961	void PushMatrix(double[][] matrix)
1528	1962	{
1529	1963	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1531	1965	}
1532	1966
1533	1967	void PushMatrix()
..	..	@@ -1624,7 +2058,7 @@
1624	2058
1625	2059	static int camerachangeframe;
1626	2060
1627		- boolean SetCamera(Camera cam)
	2061	+ public boolean SetCamera(Camera cam)
1628	2062	{
1629	2063	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2064	// return false;
..	..	@@ -1681,7 +2115,7 @@
1681	2115	//System.err.println("Oeil on");
1682	2116	OEIL = true;
1683	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2119	//pingthread.StepToTarget(true);
1686	2120	}
1687	2121
..	..	@@ -1752,33 +2186,6 @@
1752	2186	mainDL ^= true;
1753	2187	}
1754	2188
1755		- void ToggleTexture()
1756		- {
1757		- textureon ^= true;
1758		- }
1759		-
1760		- void ToggleLive()
1761		- {
1762		- Globals.setLIVE(Globals.isLIVE() ^ true);
1763		-
1764		- System.err.println("LIVE = " + Globals.isLIVE());
1765		-
1766		- if (!Globals.isLIVE()) // save sound
1767		- GrafreeD.savesound = true; // wav.save();
1768		- // else
1769		- repaint(); // start loop // may 2013
1770		- }
1771		-
1772		- void ToggleSupport()
1773		- {
1774		- SUPPORT ^= true;
1775		- }
1776		-
1777		- void ToggleAbort()
1778		- {
1779		- ABORTMODE ^= true;
1780		- }
1781		-
1782	2189	void ToggleFullScreen()
1783	2190	{
1784	2191	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2196,94 @@
1789	2196	Globals.CROWD ^= true;
1790	2197	}
1791	2198
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2199	void ToggleLocal()
1798	2200	{
1799	2201	LOCALTRANSFORM ^= true;
1800	2202	}
1801	2203
1802		- void ToggleFast()
	2204	+ public void ToggleTexture()
	2205	+ {
	2206	+ textureon ^= true;
	2207	+ }
	2208	+
	2209	+ public void ToggleLive()
	2210	+ {
	2211	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2212	+
	2213	+ System.err.println("LIVE = " + Globals.isLIVE());
	2214	+
	2215	+ if (!Globals.isLIVE()) // save sound
	2216	+ Grafreed.savesound = true; // wav.save();
	2217	+ // else
	2218	+ repaint(); // start loop // may 2013
	2219	+ }
	2220	+
	2221	+ public void ToggleSupport()
	2222	+ {
	2223	+ SUPPORT ^= true;
	2224	+ }
	2225	+
	2226	+ public void ToggleAbort()
	2227	+ {
	2228	+ ABORTMODE ^= true;
	2229	+ }
	2230	+
	2231	+ public void ToggleInertia()
	2232	+ {
	2233	+ INERTIA ^= true;
	2234	+ }
	2235	+
	2236	+ public void ToggleFast()
1803	2237	{
1804	2238	FAST ^= true;
1805	2239	}
1806	2240
1807		- void ToggleSlowPose()
	2241	+ public void ToggleSlowPose()
1808	2242	{
1809	2243	SLOWPOSE ^= true;
1810	2244	}
1811	2245
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2246	+ public void ToggleBoxMode()
1818	2247	{
1819	2248	BOXMODE ^= true;
1820	2249	}
1821	2250
1822		- void ToggleSmoothFocus()
	2251	+ public void ToggleZoomBoxMode()
	2252	+ {
	2253	+ ZOOMBOXMODE ^= true;
	2254	+ }
	2255	+
	2256	+ public void ToggleSmoothFocus()
1823	2257	{
1824	2258	SMOOTHFOCUS ^= true;
1825	2259	}
1826	2260
1827		- void ToggleImageFlip()
	2261	+ public void ToggleImageFlip()
1828	2262	{
1829	2263	IMAGEFLIP ^= true;
1830	2264	}
1831	2265
1832		- void ToggleSpeakerMocap()
	2266	+ public void ToggleSpeakerMocap()
1833	2267	{
1834	2268	SPEAKERMOCAP ^= true;
1835	2269	}
1836	2270
1837		- void ToggleSpeakerCamera()
	2271	+ public void ToggleSpeakerCamera()
1838	2272	{
1839	2273	SPEAKERCAMERA ^= true;
1840	2274	}
1841	2275
1842		- void ToggleSpeakerFocus()
	2276	+ public void ToggleSpeakerFocus()
1843	2277	{
1844	2278	SPEAKERFOCUS ^= true;
1845	2279	}
1846	2280
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2281	+ public void ToggleFrustum()
1853	2282	{
1854	2283	FRUSTUM ^= true;
1855	2284	}
1856	2285
1857		- void ToggleTrack()
	2286	+ public void ToggleTrack()
1858	2287	{
1859	2288	TRACK ^= true;
1860	2289	if (TRACK)
..	..	@@ -1873,25 +2302,35 @@
1873	2302	repaint();
1874	2303	}
1875	2304
1876		- void ToggleTrackOnce()
	2305	+ public void ToggleTrackOnce()
1877	2306	{
1878	2307	TRACKONCE ^= true;
1879	2308	}
1880	2309
1881		- void ToggleShadowTrack()
	2310	+ public void ToggleShadowTrack()
1882	2311	{
1883	2312	SHADOWTRACK ^= true;
1884	2313	repaint();
1885	2314	}
1886	2315
1887		- void ToggleOeil()
	2316	+ public void ToggleOeil()
1888	2317	{
1889	2318	OEIL ^= true;
1890	2319	}
1891	2320
1892		- void ToggleOeilOnce()
	2321	+ public void ToggleOeilOnce()
1893	2322	{
1894	2323	OEILONCE ^= true;
	2324	+ }
	2325	+
	2326	+ void ToggleFootContact()
	2327	+ {
	2328	+ FOOTCONTACT ^= true;
	2329	+ }
	2330	+
	2331	+ void ToggleDebug()
	2332	+ {
	2333	+ Globals.DEBUG ^= true;
1895	2334	}
1896	2335
1897	2336	void ToggleLookAt()
..	..	@@ -1899,9 +2338,9 @@
1899	2338	LOOKAT ^= true;
1900	2339	}
1901	2340
1902		- void ToggleRandom()
	2341	+ void ToggleSwitch()
1903	2342	{
1904		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
1905	2344	}
1906	2345
1907	2346	void ToggleHandles()
..	..	@@ -1909,10 +2348,17 @@
1909	2348	HANDLES ^= true;
1910	2349	}
1911	2350
	2351	+ Object3D paintFolder;
	2352	+
1912	2353	void TogglePaint()
1913	2354	{
1914	2355	PAINTMODE ^= true;
1915	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
1916	2362	}
1917	2363
1918	2364	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2454,22 @@
2008	2454	{
2009	2455	return currentGL;
2010	2456	}
2011		-
	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	+
2012	2473	/**/
2013	2474	class CacheTexture
2014	2475	{
..	..	@@ -2017,28 +2478,31 @@
2017	2478
2018	2479	int resolution;
2019	2480
2020		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2021	2482	{
2022		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2023	2485	resolution = res;
2024	2486	}
2025	2487	}
2026	2488	/**/
2027	2489
2028	2490	// TEXTURE static Texture texture;
2029		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2030		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2031		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2032	2496	int pigmentdepth = 0;
2033	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2498	int bumpdepth = 0;
2035	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2036	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2037	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2038		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2039	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2040	2504
2041		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2042	2506	{
2043	2507	TextureData texturedata = null;
2044	2508
..	..	@@ -2057,13 +2521,34 @@
2057	2521	if (bump)
2058	2522	texturedata = ConvertBump(texturedata, false);
2059	2523
2060		- com.sun.opengl.util.texture.Texture texture =
2061		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2062	2526
2063		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2064		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2065	2529
2066		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2067	2552	}
2068	2553
2069	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3136,6 +3621,8 @@
3136	3621
3137	3622	System.out.println("LOADING TEXTURE : " + name);
3138	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3139	3626	//
3140	3627	if (false) // compressbit > 0)
3141	3628	{
..	..	@@ -3840,6 +4327,7 @@
3840	4327
3841	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4329	{
	4330	+ new Exception().printStackTrace();
3843	4331	System.exit(0);
3844	4332	com.sun.opengl.util.texture.Texture texture = null;
3845	4333
..	..	@@ -7533,7 +8021,7 @@
7533	8021	String pigment = Object3D.GetPigment(tex);
7534	8022	String bump = Object3D.GetBump(tex);
7535	8023
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	8025	{
7538	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7548,11 +8036,69 @@
7548	8036	pigment = null;
7549	8037	}
7550	8038
7551		- ReleaseTexture(bump, true);
7552		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7553	8041	}
7554	8042
7555		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7556	8102	{
7557	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7558	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7563,7 +8109,7 @@
7563	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7564	8110
7565	8111	if (tex != null)
7566		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7567	8113
7568	8114	// //assert( texture != null );
7569	8115	// if (texture == null)
..	..	@@ -7655,7 +8201,55 @@
7655	8201	}
7656	8202	}
7657	8203
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8205	+ {
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8253	{
7660	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7666,17 +8260,47 @@
7666	8260	if (tex == null)
7667	8261	{
7668	8262	BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
7670	8263	return;
7671	8264	}
7672	8265
7673	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
7674	8299	String bump = Object3D.GetBump(tex);
7675	8300
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
7678	8302
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8304	{
7681	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8306	// System.out.println("; bump = " + bump);
..	..	@@ -7686,43 +8310,94 @@
7686	8310	{
7687	8311	bump = null;
7688	8312	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8313
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
7698	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8317	}
7702	8318
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
7704	8322	{
7705		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
7706	8342
7707	8343	if (tex != null)
7708	8344	{
7709		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7710	8347
7711		- String[] split = tex.split("Textures");
7712		- if (split.length > 1)
7713		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7714		- else
7715		- if (!texname.startsWith("/"))
7716		- texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
	8355	+// String[] split = tex.split("Textures");
	8356	+// if (split.length > 1)
	8357	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8358	+// else
	8359	+// if (!texname.startsWith("/"))
	8360	+// texname = "/Users/nbriere/Textures/" + texname;
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
7717	8365
7718	8366	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	8367	{
7725		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8401	{
7727	8402	assert(!bump);
7728	8403	// if (bump)
..	..	@@ -7733,19 +8408,23 @@
7733	8408	// }
7734	8409	// else
7735	8410	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
7738	8413	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
7741	8418	// }
7742	8419	} else
7743		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8421	{
7745	8422	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
7749	8428	} else
7750	8429	{
7751	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,11 +8432,22 @@
7753	8432	// texture = GetResourceTexture("default.png");
7754	8433	//} else
7755	8434	//{
7756		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
7757	8436	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
7761	8451	} else
7762	8452	{
7763	8453	if (textureon)
..	..	@@ -7782,7 +8472,7 @@
7782	8472	}
7783	8473
7784	8474	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
7786	8476	cachename = texname;
7787	8477	else
7788	8478	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8494,7 @@
7804	8494	}
7805	8495
7806	8496	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8497	+ if (!FileExists(cachename))
7808	8498	cachename = texname;
7809	8499	else
7810	8500	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8503,23 @@
7813	8503	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8504
7815	8505
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8506	+ if (texturedata == null)
	8507	+ throw new Exception();
	8508	+
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
7818	8510	//texture = GetTexture(tex, bump);
7819	8511	}
	8512	+ }
7820	8513	}
7821	8514	//}
7822	8515	}
7823	8516
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7825	8518	{
7826	8519	//return false;
7827	8520
7828	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8523	{
7831	8524	// String ext = "_highres";
7832	8525	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8536,17 @@
7843	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8537	if (!cachefile.exists())
7845	8538	{
7846		- // cache to disk
7847		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7848		- //buffers[0].
7849		-
7850		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7851		- int[] pixels = new int[bytebuf.capacity()/3];
7852		-
7853		- // squared size heuristic...
7854		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8540	{
7856		- for (int i=pixels.length; --i>=0;)
7857		- {
7858		- int i3 = i*3;
7859		- pixels[i] = 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7864		- pixels[i] <<= 8;
7865		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7866		- }
7867		-
7868		- /*
7869		- int r=0,g=0,b=0,a=0;
7870		- for (int i=0; i<width; i++)
7871		- for (int j=0; j<height; j++)
7872		- {
7873		- int index = j*width+i;
7874		- int p = pixels[index];
7875		- a = ((p>>24) & 0xFF);
7876		- r = ((p>>16) & 0xFF);
7877		- g = ((p>>8) & 0xFF);
7878		- b = (p & 0xFF);
7879		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7880		- }
7881		- /**/
7882		- int width = (int)Math.sqrt(pixels.length); // squared
7883		- int height = width;
7884		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7885		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
7886	8543	ImageWriter writer = null;
7887	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8545	if (iter.hasNext()) {
7889	8546	writer = (ImageWriter)iter.next();
7890	8547	}
7891		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
7892	8550	try
7893	8551	{
7894	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7905,18 +8563,20 @@
7905	8563	}
7906	8564	}
7907	8565	}
7908		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
7909	8569	//System.out.println("Texture = " + tex);
7910		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
7911	8571	{
7912		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
7913	8573	thetex.texture.disable();
7914	8574	thetex.texture.dispose();
7915		- textures.remove(texname);
	8575	+ textures.remove(tex);
7916	8576	}
7917	8577
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
7920	8580
7921	8581	// newtex = true;
7922	8582	}
..	..	@@ -7932,10 +8592,44 @@
7932	8592	}
7933	8593	}
7934	8594
7935		- return texture;
	8595	+ return texturecache;
7936	8596	}
7937	8597
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7939	8633	{
7940	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8635
..	..	@@ -7953,21 +8647,21 @@
7953	8647	return texture!=null?texture.texture:null;
7954	8648	}
7955	8649
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7957	8651	{
7958	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8653
7960	8654	return texture!=null?texture.texturedata:null;
7961	8655	}
7962	8656
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7964	8658	{
7965	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8660	{
7967	8661	return false;
7968	8662	}
7969	8663
7970		- boolean newtex = false;
	8664	+ //boolean newtex = false;
7971	8665
7972	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7973	8667
..	..	@@ -7999,9 +8693,75 @@
7999	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8695
8002		- return newtex;
	8696	+ return true; // Warning: not used.
8003	8697	}
8004	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8005	8765	ShadowBuffer shadowPBuf;
8006	8766	AntialiasBuffer antialiasPBuf;
8007	8767	int MAXSTACK;
..	..	@@ -8018,10 +8778,12 @@
8018	8778
8019	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8020	8780	MAXSTACK = temp[0];
8021		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8022	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8023	8784	MAXSTACK = temp[0];
8024		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8025	8787
8026	8788	// Use debug pipeline
8027	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8029,7 +8791,8 @@
8029	8791	gl = drawable.getGL(); //
8030	8792
8031	8793	GL gl3 = getGL();
8032		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8033	8796
8034	8797
8035	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8194,7 +8957,7 @@
8194	8957
8195	8958	if (cubemap == null)
8196	8959	{
8197		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8198	8961	}
8199	8962
8200	8963	//cubemap.enable();
..	..	@@ -8481,37 +9244,58 @@
8481	9244	cubemap = null;
8482	9245	return;
8483	9246	case 1:
8484		- name = "cubemaps/box_";
8485		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
8486	9249	reverseUP = false;
8487	9250	break;
8488	9251	case 2:
8489		- name = "cubemaps/uffizi_";
8490		- ext = "png";
8491		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
8492	9256	case 3:
8493		- name = "cubemaps/CloudyHills_";
8494		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
8495	9259	reverseUP = false;
8496	9260	break;
8497	9261	case 4:
8498		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
8499	9263	ext = "png";
8500	9264	reverseUP = false;
8501	9265	break;
	9266	+ case 5:
	9267	+ name = "cubemaps/skycube/";
	9268	+ ext = "jpg";
	9269	+ reverseUP = false;
	9270	+ break;
	9271	+ case 6:
	9272	+ name = "cubemaps/SaintLazarusChurch3/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 7:
	9277	+ name = "cubemaps/Sodermalmsallen/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 8:
	9282	+ name = "cubemaps/Sodermalmsallen2/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 9:
	9287	+ name = "cubemaps/UnionSquare/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
8502	9291	default:
8503		- name = "cubemaps/rgb_";
8504		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
8505	9295	break;
8506	9296	}
8507		-
8508		- try
8509		- {
8510		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8511		- } catch (IOException e)
8512		- {
8513		- throw new RuntimeException(e);
8514		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
8515	9299	}
8516	9300
8517	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8543,8 +9327,12 @@
8543	9327	static double[] model = new double[16];
8544	9328	double[] camera2light = new double[16];
8545	9329	double[] light2camera = new double[16];
8546		- int newenvy = -1;
8547		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
8548	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8549	9337	//float[] light0 = { 0,0,0 };
8550	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8837,11 +9625,35 @@
8837	9625	jy8[3] = 0.5f;
8838	9626	}
8839	9627
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9628	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9629	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9630	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9631	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9632
	9633	+ void ResetOptions()
	9634	+ {
	9635	+ options1[0] = 100;
	9636	+ options1[1] = 0.025f;
	9637	+ options1[2] = 0.01f;
	9638	+ options1[3] = 0;
	9639	+ options1[4] = 0;
	9640	+
	9641	+ options2[0] = 0;
	9642	+ options2[1] = 0.75f;
	9643	+ options2[2] = 0;
	9644	+ options2[3] = 0;
	9645	+
	9646	+ options3[0] = 1;
	9647	+ options3[1] = 1;
	9648	+ options3[2] = 1;
	9649	+ options3[3] = 0;
	9650	+
	9651	+ options4[0] = 1;
	9652	+ options4[1] = 0;
	9653	+ options4[2] = 1;
	9654	+ options4[3] = 0;
	9655	+ }
	9656	+
8845	9657	static int imagecount = 0; // movie generation
8846	9658
8847	9659	static int jitter = 0;
..	..	@@ -8937,8 +9749,8 @@
8937	9749	assert (parentcam != renderCamera);
8938	9750
8939	9751	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9752	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8942	9754
8943	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9756
..	..	@@ -8953,8 +9765,8 @@
8953	9765	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9766
8955	9767	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9768	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8958	9770
8959	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9772
..	..	@@ -9000,10 +9812,12 @@
9000	9812	rati = 1 / rati;
9001	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9002	9814	}
9003		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9004	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9005	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9006		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9007	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9008	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9009	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9026,7 +9840,7 @@
9026	9840	//gl.glFlush();
9027	9841	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9842
9029		- if (ANIMATION && ABORTED)
	9843	+ if (Globals.ANIMATION && ABORTED)
9030	9844	{
9031	9845	System.err.println(" ABORTED FRAME");
9032	9846	break;
..	..	@@ -9056,7 +9870,7 @@
9056	9870	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9871
9058	9872	// save image
9059		- if (ANIMATION && !ABORTED)
	9873	+ if (Globals.ANIMATION && !ABORTED)
9060	9874	{
9061	9875	VPwidth = viewport[2];
9062	9876	VPheight = viewport[3];
..	..	@@ -9167,11 +9981,11 @@
9167	9981
9168	9982	// imagecount++;
9169	9983
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9984	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9985
9172	9986	if (!BOXMODE)
9173	9987	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9988	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9989	}
9176	9990
9177	9991	if (!BOXMODE)
..	..	@@ -9209,7 +10023,7 @@
9209	10023	ABORTED = false;
9210	10024	}
9211	10025	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10026	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	10027
9214	10028	if (false)
9215	10029	{
..	..	@@ -9872,11 +10686,11 @@
9872	10686
9873	10687	public void display(GLAutoDrawable drawable)
9874	10688	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10689	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10690	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10691	+ Grafreed.wav.save();
	10692	+ Grafreed.savesound = false;
	10693	+ Grafreed.hassound = false;
9880	10694	}
9881	10695	// if (DEBUG_SELECTION)
9882	10696	// {
..	..	@@ -9952,6 +10766,7 @@
9952	10766	ANTIALIAS = 0;
9953	10767	//System.out.println("RESTART");
9954	10768	AAtimer.restart();
	10769	+ Globals.TIMERRUNNING = true;
9955	10770	}
9956	10771	}
9957	10772	}
..	..	@@ -10006,7 +10821,7 @@
10006	10821	Object3D theobject = object;
10007	10822	Object3D theparent = object.parent;
10008	10823	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10824	+ object = (Object3D)Grafreed.clone(object);
10010	10825	object.Stripify();
10011	10826	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10827	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10834,14 @@
10019	10834	ambientOcclusion = false;
10020	10835	}
10021	10836
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10837	+ if (//Globals.lighttouched &&
	10838	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10839	{
10024	10840	//if (RENDERSHADOW) // ?
10025	10841	if (!IsFrozen())
10026	10842	{
10027	10843	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10844	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10845	{
10030	10846	Globals.framecount++;
10031	10847	shadowbuffer.display();
..	..	@@ -10038,7 +10854,7 @@
10038	10854
10039	10855	if (wait)
10040	10856	{
10041		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10042	10858
10043	10859	wait = false;
10044	10860	}
..	..	@@ -10152,8 +10968,8 @@
10152	10968
10153	10969	// if (parentcam != renderCamera) // not a light
10154	10970	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10971	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10157	10973
10158	10974	for (int j = 0; j < 4; j++)
10159	10975	{
..	..	@@ -10167,8 +10983,8 @@
10167	10983
10168	10984	// if (parentcam != renderCamera) // not a light
10169	10985	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10986	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10172	10988
10173	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10990
..	..	@@ -10254,13 +11070,27 @@
10254	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10255	11071	}
10256	11072
10257		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
10258	11081	{
10259		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
10260	11087	}
10261		-
10262		- newenvy = -1;
10263		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
10264	11094	ratio = ((double) getWidth()) / getHeight();
10265	11095	//System.out.println("ratio = " + ratio);
10266	11096
..	..	@@ -10276,7 +11106,7 @@
10276	11106
10277	11107	if (!IsFrozen() && !ambientOcclusion)
10278	11108	{
10279		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
10280	11110	}
10281	11111
10282	11112	//if (selection_view == -1)
..	..	@@ -10427,7 +11257,16 @@
10427	11257	// Bump noise
10428	11258	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11259	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11260	+
	11261	+ try
	11262	+ {
	11263	+ BindTexture(NOISE_TEXTURE, false, 2);
	11264	+ }
	11265	+ catch (Exception e)
	11266	+ {
	11267	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11268	+ }
	11269	+
10431	11270
10432	11271	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11272	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11289,9 @@
10450	11289
10451	11290	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11291
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11292	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11293	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11294	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11295	} else
10457	11296	{
10458	11297	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11302,7 @@
10463	11302	//System.out.println("BLENDING ON");
10464	11303	gl.glEnable(GL.GL_BLEND);
10465	11304	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11305	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11306	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11307	gl.glLoadIdentity();
10469	11308
..	..	@@ -10552,8 +11391,8 @@
10552	11391	System.err.println("parentcam != renderCamera");
10553	11392
10554	11393	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11394	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10557	11396	}
10558	11397
10559	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11413,8 @@
10574	11413	if (true) // TODO
10575	11414	{
10576	11415	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11416	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11417	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11418	}
10580	11419
10581	11420	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10712,7 +11551,7 @@
10712	11551	}
10713	11552	}
10714	11553
10715		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11554	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10716	11555	{
10717	11556	//gl.glDepthFunc(GL.GL_LEQUAL);
10718	11557	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10720,24 +11559,21 @@
10720	11559
10721	11560	boolean texon = textureon;
10722	11561
10723		- if (RENDERPROGRAM > 0)
10724		- {
10725		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10726		- textureon = false;
10727		- }
	11562	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11563	+ textureon = false;
	11564	+
10728	11565	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10729	11566	//System.out.println("ALLO");
10730	11567	gl.glColorMask(false, false, false, false);
10731	11568	DrawObject(gl);
10732		- if (RENDERPROGRAM > 0)
10733		- {
10734		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10735		- textureon = texon;
10736		- }
	11569	+
	11570	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11571	+ textureon = texon;
	11572	+
10737	11573	gl.glColorMask(true, true, true, true);
10738	11574
10739	11575	gl.glDepthFunc(GL.GL_EQUAL);
10740		- //gl.glDepthMask(false);
	11576	+ gl.glDepthMask(false);
10741	11577	}
10742	11578
10743	11579	if (false) // DrawMode() == SHADOW)
..	..	@@ -10891,8 +11727,14 @@
10891	11727	{
10892	11728	renderpass++;
10893	11729	// System.out.println("Draw object... ");
	11730	+ STEP = 1;
10894	11731	if (FAST) // in case there is no script
10895		- STEP = 16;
	11732	+ STEP = 8;
	11733	+
	11734	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11735	+ {
	11736	+ STEP *= 4;
	11737	+ }
10896	11738
10897	11739	//object.FullInvariants();
10898	11740
..	..	@@ -10906,23 +11748,44 @@
10906	11748	e.printStackTrace();
10907	11749	}
10908	11750
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11751	+ if (Grafreed.RENDERME > 0)
	11752	+ Grafreed.RENDERME--; // mechante magouille
10911	11753
10912	11754	Globals.ONESTEP = false;
10913	11755	}
10914	11756
10915	11757	static boolean zoomonce = false;
10916	11758
	11759	+ static void CreateSelectedPoint()
	11760	+ {
	11761	+ if (selectedpoint == null)
	11762	+ {
	11763	+ debugpointG = new Sphere();
	11764	+ debugpointP = new Sphere();
	11765	+ debugpointC = new Sphere();
	11766	+ debugpointR = new Sphere();
	11767	+
	11768	+ selectedpoint = new Superellipsoid();
	11769	+
	11770	+ for (int i=0; i<8; i++)
	11771	+ {
	11772	+ debugpoints[i] = new Sphere();
	11773	+ }
	11774	+ }
	11775	+ }
	11776	+
10917	11777	void DrawObject(GL gl, boolean draw)
10918	11778	{
	11779	+ // To clear camera values
	11780	+ ResetOptions();
	11781	+
10919	11782	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11783	// DrawMode() = SELECTION;
10921	11784	//GL gl = getGL();
10922	11785	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11786	{
10924	11787	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11788	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11789	pingthread.StepToTarget(true); // true);
10927	11790	// zoomonce = false;
10928	11791	}
..	..	@@ -10977,7 +11840,14 @@
10977	11840
10978	11841	usedtextures.clear();
10979	11842
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11843	+ try
	11844	+ {
	11845	+ BindTextures(DEFAULT_TEXTURES, 2);
	11846	+ }
	11847	+ catch (Exception e)
	11848	+ {
	11849	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11850	+ }
10981	11851	}
10982	11852	//System.out.println("--> " + stackdepth);
10983	11853	// GrafreeD.traceon();
..	..	@@ -10987,8 +11857,9 @@
10987	11857
10988	11858	if (DrawMode() == DEFAULT)
10989	11859	{
10990		- if (DEBUG)
	11860	+ if (Globals.DEBUG)
10991	11861	{
	11862	+ CreateSelectedPoint();
10992	11863	float radius = 0.05f;
10993	11864	if (selectedpoint.radius != radius)
10994	11865	{
..	..	@@ -11042,20 +11913,32 @@
11042	11913	ReleaseTextures(DEFAULT_TEXTURES);
11043	11914
11044	11915	if (CLEANCACHE)
11045		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11916	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11046	11917	{
11047		- String tex = e.nextElement();
	11918	+ cTexture tex = e.nextElement();
11048	11919
11049	11920	// System.out.println("Texture --------- " + tex);
11050	11921
11051		- if (tex.equals("WHITE_NOISE"))
	11922	+ if (tex.equals("WHITE_NOISE:"))
11052	11923	continue;
11053	11924
11054		- if (!usedtextures.containsKey(tex))
	11925	+ if (!usedtextures.contains(tex))
11055	11926	{
	11927	+ CacheTexture gettex = texturepigment.get(tex);
11056	11928	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057		- textures.get(tex).texture.dispose();
11058		- textures.remove(tex);
	11929	+ if (gettex != null)
	11930	+ {
	11931	+ gettex.texture.dispose();
	11932	+ texturepigment.remove(tex);
	11933	+ }
	11934	+
	11935	+ gettex = texturebump.get(tex);
	11936	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11937	+ if (gettex != null)
	11938	+ {
	11939	+ gettex.texture.dispose();
	11940	+ texturebump.remove(tex);
	11941	+ }
11059	11942	}
11060	11943	}
11061	11944	}
..	..	@@ -11068,7 +11951,14 @@
11068	11951	if (checker != null && DrawMode() == DEFAULT)
11069	11952	{
11070	11953	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11954	+ try
	11955	+ {
	11956	+ BindTextures(checker.GetTextures(), checker.texres);
	11957	+ }
	11958	+ catch (Exception e)
	11959	+ {
	11960	+ System.err.println("FAILED: " + checker.GetTextures());
	11961	+ }
11072	11962	// NEAREST
11073	11963	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11964	DrawChecker(gl);
..	..	@@ -11150,7 +12040,7 @@
11150	12040	return;
11151	12041	}
11152	12042
11153		- String string = obj.GetToolTip();
	12043	+ String string = obj.toString(); //.GetToolTip();
11154	12044
11155	12045	GL gl = GetGL();
11156	12046
..	..	@@ -11467,8 +12357,8 @@
11467	12357	//obj.TransformToWorld(light, light);
11468	12358	for (int i = tp.size(); --i >= 0;)
11469	12359	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12360	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12361	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12362	}
11473	12363
11474	12364
..	..	@@ -11485,8 +12375,8 @@
11485	12375	parentcam = cameras[0];
11486	12376	}
11487	12377
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12378	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12379	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12380
11491	12381	LA.xformPos(light, renderCamera.toScreen, light);
11492	12382
..	..	@@ -11576,8 +12466,76 @@
11576	12466
11577	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11578	12468
11579		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
11580	12471	"!!ARBfp1.0\n" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12473	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12474	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12475	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12476	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12477	+ "PARAM light2cam0 = program.env[10];" +
	12478	+ "PARAM light2cam1 = program.env[11];" +
	12479	+ "PARAM light2cam2 = program.env[12];" +
	12480	+ "TEMP temp;" +
	12481	+ "TEMP light;" +
	12482	+ "TEMP ndotl;" +
	12483	+ "TEMP normal;" +
	12484	+ "TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
	12487	+
	12488	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12489	+ Normalize("normal") +
	12490	+ "MOV light, state.light[0].position;" +
	12491	+ "DP3 ndotl.x, light, normal;" +
	12492	+
	12493	+ // shadow
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
	12497	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12499	+
	12500	+ // No shadow when out of frustum
	12501	+ //"SGE temp.y, depth.z, zero123.y;" +
	12502	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12503	+
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12505	+
	12506	+ // Backlit
	12507	+ "MOV pos.w, zero123.y;" +
	12508	+ "DP4 eye.x, pos, light2cam0;" +
	12509	+ "DP4 eye.y, pos, light2cam1;" +
	12510	+ "DP4 eye.z, pos, light2cam2;" +
	12511	+ Normalize("eye") +
	12512	+
	12513	+ "DP3 ndotl.y, -eye, normal;" +
	12514	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12515	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12516	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12517	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12518	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12519	+
	12520	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12521	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12522	+
	12523	+ // Pigment
	12524	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12526	+ "MUL temp, temp, ndotl.x;" +
	12527	+
	12528	+ "MUL temp, temp, zero123.z;" +
	12529	+
	12530	+ //"MUL temp, temp, ndotl.y;" +
	12531	+
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
	12533	+ "MOV result.color, temp;" +
	12534	+ "END";
	12535	+
	12536	+ String programmax =
	12537	+ "!!ARBfp1.0\n" +
	12538	+
11581	12539	//"OPTION ARB_fragment_program_shadow;" +
11582	12540	"PARAM light2cam0 = program.env[10];" +
11583	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11692,8 +12650,7 @@
11692	12650	"TEMP shininess;" +
11693	12651	"\n" +
11694	12652	"MOV texSamp, one;" +
11695		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11696		-
	12653	+
11697	12654	"MOV mapgrid.x, one2048th.x;" +
11698	12655	"MOV temp, fragment.texcoord[1];" +
11699	12656	/*
..	..	@@ -11714,20 +12671,20 @@
11714	12671	"MUL temp, floor, mapgrid.x;" +
11715	12672	//"TEX depth0, temp, texture[1], 2D;" +
11716	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11717		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
11718	12675	"") +
11719	12676	"ADD temp.x, temp.x, mapgrid.x;" +
11720	12677	//"TEX depth1, temp, texture[1], 2D;" +
11721	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11722		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
11723	12680	"") +
11724	12681	"ADD temp.y, temp.y, mapgrid.x;" +
11725	12682	//"TEX depth2, temp, texture[1], 2D;" +
11726		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
11727	12684	"SUB temp.x, temp.x, mapgrid.x;" +
11728	12685	//"TEX depth3, temp, texture[1], 2D;" +
11729	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11730		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
11731	12688	"") +
11732	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11733	12690	//"MOV params, material;" +
..	..	@@ -12098,10 +13055,10 @@
12098	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12099	13056	"") +
12100	13057
12101		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12102	13059	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	13060	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12105	13062	"SUB temp.y, one.x, temp.z;" +
12106	13063	"MUL temp.x, temp.x, temp.y;" +
12107	13064	"KIL temp.x;" +
..	..	@@ -12230,8 +13187,10 @@
12230	13187	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	13188
12232	13189	"SUB temp.x, one.x, ndotl.x;" +
12233		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12234		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13190	+ // Tuning for default skin
	13191	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13192	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13193	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	13194	"MUL temp.x, temp.x, temp.y;" +
12236	13195
12237	13196	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13389,14 @@
12430	13389	//once = true;
12431	13390	}
12432	13391
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
	13399	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13402
..	..	@@ -12523,25 +13489,26 @@
12523	13489	return out;
12524	13490	}
12525	13491
12526		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
12527	13494	{
12528	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12529	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12530	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12531	13500	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12532		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12533		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12534		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12535		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12536	13503	//"SWZ buffer, temp, w,w,w,w;";
12537		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12538	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12539	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12540	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12541		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12542	13509
12543		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12544		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13510	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13511	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12545	13512	}
12546	13513
12547	13514	String Shadow(String depth, String shadow)
..	..	@@ -12563,12 +13530,16 @@
12563	13530
12564	13531	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13532	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13533	+
	13534	+ // Compare fragment depth in light space with shadowmap.
12566	13535	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13536	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13537	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13538	+
	13539	+ // Reverse comparison
12569	13540	"SUB temp.x, one.x, temp.x;" +
12570	13541	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13542	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13543	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13544
12574	13545	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13553,10 @@
12582	13553	// No shadow for backface
12583	13554	"DP3 temp.x, normal, lightd;" +
12584	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13556	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13557	+
	13558	+ // No shadow when out of frustum
	13559	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13561	"";
12587	13562	}
..	..	@@ -12728,7 +13703,8 @@
12728	13703	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13704	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13705	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13706	+
	13707	+ //Object3D.cVector2[] vector2buffer;
12732	13708
12733	13709	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13710	// OUT : diff, spec
..	..	@@ -12744,9 +13720,10 @@
12744	13720	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13721	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13722	//"MOV " + dest + ".w," + "normal.z;" +
12747		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12748		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12749		- //"MOV " + dest + ".z," + "params2.w;" +
	13723	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13724	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13725	+
	13726	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13727	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13728	"RCP " + dest + ".w," + dest + ".w;" +
12752	13729	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +14117,7 @@
13140	14117	public void mousePressed(MouseEvent e)
13141	14118	{
13142	14119	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14120	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	14121	}
13145	14122
13146	14123	static long prevtime = 0;
..	..	@@ -13167,6 +14144,7 @@
13167	14144
13168	14145	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	14146
	14147	+ if (BUTTONLESSWHEEL)
13170	14148	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	14149	{
13172	14150	return;
..	..	@@ -13175,7 +14153,7 @@
13175	14153	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	14154
13177	14155	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14156	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	14157	{
13180	14158	keepboxmode = BOXMODE;
13181	14159	keepsupport = SUPPORT;
..	..	@@ -13215,8 +14193,8 @@
13215	14193	// mode \|= META;
13216	14194	//}
13217	14195
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14196	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14197	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	14198	anchorX = ax;
13221	14199	anchorY = ay;
13222	14200	prevX = px;
..	..	@@ -13250,6 +14228,7 @@
13250	14228	else
13251	14229	if (evt.getSource() == AAtimer)
13252	14230	{
	14231	+ Globals.TIMERRUNNING = false;
13253	14232	if (mouseDown)
13254	14233	{
13255	14234	//new Exception().printStackTrace();
..	..	@@ -13275,6 +14254,10 @@
13275	14254	// LIVE = waslive;
13276	14255	// wasliveok = true;
13277	14256	// waslive = false;
	14257	+
	14258	+ // May 2019 Forget it:
	14259	+ if (true)
	14260	+ return;
13278	14261
13279	14262	// source == timer
13280	14263	if (mouseDown)
..	..	@@ -13305,7 +14288,7 @@
13305	14288
13306	14289	// fev 2014???
13307	14290	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14291	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14292	pingthread.StepToTarget(true); // true);
13310	14293	}
13311	14294	// if (!LIVE)
..	..	@@ -13314,12 +14297,13 @@
13314	14297
13315	14298	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14299
13317		- void clickStart(int x, int y, int modifiers)
	14300	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14301	{
13319	14302	if (!wasliveok)
13320	14303	return;
13321	14304
13322	14305	AAtimer.restart(); //
	14306	+ Globals.TIMERRUNNING = true;
13323	14307
13324	14308	// waslive = LIVE;
13325	14309	// LIVE = false;
..	..	@@ -13331,7 +14315,7 @@
13331	14315	// touched = true; // main DL
13332	14316	if (isRenderer)
13333	14317	{
13334		- SetMouseMode(modifiers);
	14318	+ SetMouseMode(modifiers, modifiersex);
13335	14319	}
13336	14320
13337	14321	selectX = anchorX = x;
..	..	@@ -13344,7 +14328,7 @@
13344	14328	clicked = true;
13345	14329	hold = false;
13346	14330
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14331	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14332	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14333	{
13350	14334	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13369,14 +14353,15 @@
13369	14353	drag = false;
13370	14354	//System.out.println("Mouse DOWN");
13371	14355	editObj = false;
13372		- ClickInfo info = new ClickInfo();
13373		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13374		- info.pane = this;
13375		- info.camera = renderCamera;
13376		- info.x = x;
13377		- info.y = y;
13378		- info.modifiers = modifiers;
13379		- editObj = object.doEditClick(info, 0);
	14356	+ //ClickInfo info = new ClickInfo();
	14357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14358	+ object.clickInfo.pane = this;
	14359	+ object.clickInfo.camera = renderCamera;
	14360	+ object.clickInfo.x = x;
	14361	+ object.clickInfo.y = y;
	14362	+ object.clickInfo.modifiers = modifiersex;
	14363	+ editObj = object.doEditClick(//info,
	14364	+ 0);
13380	14365	if (!editObj)
13381	14366	{
13382	14367	hasMarquee = true;
..	..	@@ -13392,11 +14377,14 @@
13392	14377
13393	14378	public void mouseDragged(MouseEvent e)
13394	14379	{
	14380	+ Globals.MOUSEDRAGGED = true;
	14381	+
	14382	+ //System.out.println("mouseDragged: " + e);
13395	14383	if (isRenderer)
13396	14384	movingcamera = true;
	14385	+
13397	14386	//if (drawing)
13398	14387	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14388	if ((e.getModifiersEx() & CTRL) != 0
13401	14389	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14390	{
..	..	@@ -13404,7 +14392,7 @@
13404	14392	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14393	}
13406	14394	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14395	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14396
13409	14397	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14398	}
..	..	@@ -13577,6 +14565,7 @@
13577	14565
13578	14566	public void run()
13579	14567	{
	14568	+ new Exception().printStackTrace();
13580	14569	System.exit(0);
13581	14570	for (;;)
13582	14571	{
..	..	@@ -13640,7 +14629,7 @@
13640	14629	{
13641	14630	Globals.lighttouched = true;
13642	14631	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14632	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14633	}
13645	14634	//else
13646	14635	}
..	..	@@ -13654,12 +14643,12 @@
13654	14643	void GoDown(int mod)
13655	14644	{
13656	14645	MODIFIERS \|= COMMAND;
13657		- /*
	14646	+ /**/
13658	14647	if((mod&SHIFT) == SHIFT)
13659		- manipCamera.RotatePosition(0, -speed);
	14648	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
13660	14649	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14650	+ manipCamera.RotatePosition(0, -speed);
	14651	+ /**/
13663	14652	if ((mod & SHIFT) == SHIFT)
13664	14653	{
13665	14654	mouseMode = mouseMode; // VR??
..	..	@@ -13675,12 +14664,12 @@
13675	14664	void GoUp(int mod)
13676	14665	{
13677	14666	MODIFIERS \|= COMMAND;
13678		- /*
	14667	+ /**/
13679	14668	if((mod&SHIFT) == SHIFT)
13680		- manipCamera.RotatePosition(0, speed);
	14669	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
13681	14670	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14671	+ manipCamera.RotatePosition(0, speed);
	14672	+ /**/
13684	14673	if ((mod & SHIFT) == SHIFT)
13685	14674	{
13686	14675	mouseMode = mouseMode;
..	..	@@ -13696,12 +14685,12 @@
13696	14685	void GoLeft(int mod)
13697	14686	{
13698	14687	MODIFIERS \|= COMMAND;
13699		- /*
	14688	+ /**/
13700	14689	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
13702		- else
13703	14690	manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14691	+ else
	14692	+ manipCamera.RotatePosition(speed, 0);
	14693	+ /**/
13705	14694	if ((mod & SHIFT) == SHIFT)
13706	14695	{
13707	14696	mouseMode = mouseMode;
..	..	@@ -13717,12 +14706,12 @@
13717	14706	void GoRight(int mod)
13718	14707	{
13719	14708	MODIFIERS \|= COMMAND;
13720		- /*
	14709	+ /**/
13721	14710	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
13723		- else
13724	14711	manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14712	+ else
	14713	+ manipCamera.RotatePosition(-speed, 0);
	14714	+ /**/
13726	14715	if ((mod & SHIFT) == SHIFT)
13727	14716	{
13728	14717	mouseMode = mouseMode;
..	..	@@ -13740,7 +14729,7 @@
13740	14729	int X, Y;
13741	14730	boolean SX, SY;
13742	14731
13743		- void drag(int x, int y, int modifiers)
	14732	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14733	{
13745	14734	if (IsFrozen())
13746	14735	{
..	..	@@ -13749,17 +14738,17 @@
13749	14738
13750	14739	drag = true; // NEW
13751	14740
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14741	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14742
13754	14743	X = x;
13755	14744	Y = y;
13756	14745	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14746	+ MODIFIERS = modifiersex;
	14747	+ modifiersex &= ~1024;
13759	14748	if (false) // modifiers != 0)
13760	14749	{
13761	14750	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14751	+ System.out.println("mouseDragged: " + modifiersex);
13763	14752	System.out.println("SHIFT = " + SHIFT);
13764	14753	System.out.println("CONTROL = " + COMMAND);
13765	14754	System.out.println("META = " + META);
..	..	@@ -13772,14 +14761,16 @@
13772	14761	if (editObj)
13773	14762	{
13774	14763	drag = true;
13775		- ClickInfo info = new ClickInfo();
13776		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
13777	14766	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13778		- info.pane = this;
13779		- info.camera = renderCamera;
13780		- info.x = x;
13781		- info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14767	+ object.clickInfo.pane = this;
	14768	+ object.clickInfo.camera = renderCamera;
	14769	+ object.clickInfo.x = x;
	14770	+ object.clickInfo.y = y;
	14771	+ object //.GetWindow().copy
	14772	+ .doEditDrag(//info,
	14773	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14774	} else
13784	14775	{
13785	14776	if (x < startX)
..	..	@@ -13928,23 +14919,27 @@
13928	14919	}
13929	14920	}
13930	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
13931	14924	public void mouseMoved(MouseEvent e)
13932	14925	{
13933	14926	//System.out.println("mouseMoved: " + e);
13934		-
13935	14927	if (isRenderer)
13936	14928	return;
13937	14929
13938		- ClickInfo ci = new ClickInfo();
13939		- ci.x = e.getX();
13940		- ci.y = e.getY();
13941		- ci.modifiers = e.getModifiersEx();
13942		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13943		- ci.pane = this;
13944		- ci.camera = renderCamera;
	14930	+ // Mouse cursor feedback
	14931	+ object.clickInfo.x = e.getX();
	14932	+ object.clickInfo.y = e.getY();
	14933	+ object.clickInfo.modifiers = e.getModifiersEx();
	14934	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14935	+ object.clickInfo.pane = this;
	14936	+ object.clickInfo.camera = renderCamera;
13945	14937	if (!isRenderer)
13946	14938	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14939	+ //ObjEditor editWindow = object.editWindow;
	14940	+ //Object3D copy = editWindow.copy;
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
13948	14943	{
13949	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14945	} else
..	..	@@ -13956,7 +14951,11 @@
13956	14951
13957	14952	public void mouseReleased(MouseEvent e)
13958	14953	{
	14954	+ Globals.MOUSEDRAGGED = false;
	14955	+
13959	14956	movingcamera = false;
	14957	+ X = 0; // getBounds().width/2;
	14958	+ Y = 0; // getBounds().height/2;
13960	14959	//System.out.println("mouseReleased: " + e);
13961	14960	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14961	}
..	..	@@ -13979,9 +14978,9 @@
13979	14978	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14979	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14980
13982		- if (control \|\| command \|\| IsFrozen())
	14981	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14982	timeout = true;
13984		- else
	14983	+// ?? May 2019 else
13985	14984	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14985	mouseDown = false;
13987	14986	if (!control && !command) // june 2013
..	..	@@ -14091,7 +15090,7 @@
14091	15090	System.out.println("keyReleased: " + e);
14092	15091	}
14093	15092
14094		- void SetMouseMode(int modifiers)
	15093	+ void SetMouseMode(int modifiers, int modifiersex)
14095	15094	{
14096	15095	//System.out.println("SetMouseMode = " + modifiers);
14097	15096	//modifiers &= ~1024;
..	..	@@ -14103,25 +15102,25 @@
14103	15102	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	15103	// return;
14105	15104	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	15105	+ if ((modifiersex & WHEEL) == WHEEL)
14107	15106	{
14108	15107	mouseMode \|= ZOOM;
14109	15108	}
14110	15109
14111	15110	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	15111	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	15112	{
14114	15113	mouseMode \|= VR; // BACKFORTH;
14115	15114	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15115	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	15116	{
14118	15117	mouseMode \|= SELECT;
14119	15118	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	15119	+ if ((modifiersex & COMMAND) == COMMAND)
14121	15120	{
14122	15121	mouseMode \|= SELECT;
14123	15122	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15123	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	15124	{
14126	15125	mouseMode &= ~VR;
14127	15126	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +15149,10 @@
14150	15149
14151	15150	if (isRenderer) //
14152	15151	{
14153		- SetMouseMode(modifiers);
	15152	+ SetMouseMode(0, modifiers);
14154	15153	}
14155	15154
14156		- theRenderer.keyPressed(key);
	15155	+ Globals.theRenderer.keyPressed(key);
14157	15156	}
14158	15157
14159	15158	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +15164,7 @@
14165	15164	float SATPOW = 1; // 2; // 0.5f;
14166	15165	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	15166
14168		- void keyPressed(int key)
	15167	+ public void keyPressed(int key)
14169	15168	{
14170	15169	if (key >= '0' && key <= '5')
14171	15170	clampbit = (key-'0');
..	..	@@ -14212,7 +15211,8 @@
14212	15211	// break;
14213	15212	case 'T':
14214	15213	CACHETEXTURE ^= true;
14215		- textures.clear();
	15214	+ texturepigment.clear();
	15215	+ texturebump.clear();
14216	15216	// repaint();
14217	15217	break;
14218	15218	case 'Y':
..	..	@@ -14297,7 +15297,9 @@
14297	15297	case 'E' : COMPACT ^= true;
14298	15298	repaint();
14299	15299	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15300	+ case 'W' : // Wide Window (fullscreen)
	15301	+ //DEBUGHSB ^= true;
	15302	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15303	repaint();
14302	15304	break;
14303	15305	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15324,8 @@
14322	15324	RevertCamera();
14323	15325	repaint();
14324	15326	break;
14325		- case 'L':
14326	15327	case 'l':
	15328	+ //case 'L':
14327	15329	if (lightMode)
14328	15330	{
14329	15331	lightMode = false;
..	..	@@ -14387,20 +15389,24 @@
14387	15389	OCCLUSION_CULLING ^= true;
14388	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14389	15391	break;
14390		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
14391	15393	case '1':
14392	15394	case '2':
14393	15395	case '3':
14394	15396	case '4':
14395	15397	case '5':
14396		- newenvy = Character.getNumericValue(key);
14397		- repaint();
14398		- break;
14399	15398	case '6':
14400	15399	case '7':
14401	15400	case '8':
14402	15401	case '9':
14403		- BGcolor = (key - '6')/3.f;
	15402	+ if (true) // envyoff)
	15403	+ {
	15404	+ BGcolor = (key - '1')/8.f;
	15405	+ }
	15406	+ else
	15407	+ {
	15408	+ //newenvy = Character.getNumericValue(key);
	15409	+ }
14404	15410	repaint();
14405	15411	break;
14406	15412	case '!':
..	..	@@ -14466,9 +15472,9 @@
14466	15472	case '_':
14467	15473	kompactbit = 5;
14468	15474	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15475	+// case '+':
	15476	+// kompactbit = 6;
	15477	+// break;
14472	15478	case ' ':
14473	15479	lightMode ^= true;
14474	15480	Globals.lighttouched = true;
..	..	@@ -14480,13 +15486,14 @@
14480	15486	case ESC:
14481	15487	RENDERPROGRAM += 1;
14482	15488	RENDERPROGRAM %= 3;
	15489	+
14483	15490	repaint();
14484	15491	break;
14485	15492	case 'Z':
14486	15493	//RESIZETEXTURE ^= true;
14487	15494	//break;
14488	15495	case 'z':
14489		- RENDERSHADOW ^= true;
	15496	+ Globals.RENDERSHADOW ^= true;
14490	15497	Globals.lighttouched = true;
14491	15498	repaint();
14492	15499	break;
..	..	@@ -14519,8 +15526,9 @@
14519	15526	case DELETE:
14520	15527	ClearSelection();
14521	15528	break;
14522		- /*
14523	15529	case '+':
	15530	+
	15531	+ /*
14524	15532	//fontsize += 1;
14525	15533	bbzoom *= 2;
14526	15534	repaint();
..	..	@@ -14537,17 +15545,17 @@
14537	15545	case '=':
14538	15546	IncDepth();
14539	15547	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15548	+ object.GetWindow().refreshContents(true);
14541	15549	maskbit = 6;
14542	15550	break;
14543	15551	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15552	DecDepth();
14545	15553	maskbit = 5;
14546	15554	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15555	+// if (object.editWindow == null)
	15556	+// new Exception().printStackTrace();
	15557	+// else
	15558	+ object.GetWindow().refreshContents(true);
14551	15559	break;
14552	15560	case '{':
14553	15561	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15610,7 @@
14602	15610	}
14603	15611	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15612	}
	15613	+
14605	15614	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15615
14607	15616	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15618,11 @@
14609	15618	//mode = ROTATE;
14610	15619	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15620	{
14612		- SetMouseMode(modifiers);
	15621	+ SetMouseMode(0, modifiers);
14613	15622	}
14614	15623	}
14615	15624
14616		- protected void processKeyEvent(KeyEvent e)
	15625	+ public void processKeyEvent(KeyEvent e)
14617	15626	{
14618	15627	switch (e.getID())
14619	15628	{
..	..	@@ -14743,8 +15752,9 @@
14743	15752
14744	15753	protected void processMouseMotionEvent(MouseEvent e)
14745	15754	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15755	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15756	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15757	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15758	{
14749	15759	mouseMoved(e);
14750	15760	} else
..	..	@@ -14769,11 +15779,12 @@
14769	15779	}
14770	15780	*/
14771	15781
14772		- object.editWindow.EditSelection();
	15782	+ object.GetWindow().EditSelection(false);
14773	15783	}
14774	15784
14775	15785	void SelectParent()
14776	15786	{
	15787	+ new Exception().printStackTrace();
14777	15788	System.exit(0);
14778	15789	Composite group = (Composite) object;
14779	15790	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15796,10 @@
14785	15796	{
14786	15797	//selectees.remove(i);
14787	15798	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15800	} else
14790	15801	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15802	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15803	}
14793	15804
14794	15805	first = false;
..	..	@@ -14797,6 +15808,7 @@
14797	15808
14798	15809	void SelectChildren()
14799	15810	{
	15811	+ new Exception().printStackTrace();
14800	15812	System.exit(0);
14801	15813	/*
14802	15814	Composite group = (Composite) object;
..	..	@@ -14829,12 +15841,12 @@
14829	15841	for (int j = 0; j < group.children.size(); j++)
14830	15842	{
14831	15843	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15844	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15845	first = false;
14834	15846	}
14835	15847	} else
14836	15848	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15849	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15850	}
14839	15851
14840	15852	first = false;
..	..	@@ -14845,21 +15857,21 @@
14845	15857	{
14846	15858	//Composite group = (Composite) object;
14847	15859	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15860	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15861	}
14850	15862
14851	15863	void ResetTransform(int mask)
14852	15864	{
14853	15865	//Composite group = (Composite) object;
14854	15866	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15867	+ group.GetWindow().ResetTransform(mask);
14856	15868	}
14857	15869
14858	15870	void FlipTransform()
14859	15871	{
14860	15872	//Composite group = (Composite) object;
14861	15873	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15874	+ group.GetWindow().FlipTransform();
14863	15875	// group.editWindow.ReduceMesh(true);
14864	15876	}
14865	15877
..	..	@@ -14867,7 +15879,7 @@
14867	15879	{
14868	15880	//Composite group = (Composite) object;
14869	15881	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15882	+ group.GetWindow().PrintMemory();
14871	15883	// group.editWindow.ReduceMesh(true);
14872	15884	}
14873	15885
..	..	@@ -14875,7 +15887,7 @@
14875	15887	{
14876	15888	//Composite group = (Composite) object;
14877	15889	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15890	+ group.GetWindow().ResetCentroid();
14879	15891	}
14880	15892
14881	15893	void IncDepth()
..	..	@@ -14957,11 +15969,11 @@
14957	15969
14958	15970	int width = getBounds().width;
14959	15971	int height = getBounds().height;
14960		- ClickInfo info = new ClickInfo();
14961		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15972	//Image img = CreateImage(width, height);
14963	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
	15974	+
14964	15975	Graphics gr = g; // img.getGraphics();
	15976	+
14965	15977	if (!hasMarquee)
14966	15978	{
14967	15979	if (Xmin < Xmax) // !locked)
..	..	@@ -15033,40 +16045,88 @@
15033	16045	}
15034	16046	if (object != null && !hasMarquee)
15035	16047	{
	16048	+ if (object.clickInfo == null)
	16049	+ object.clickInfo = new ClickInfo();
	16050	+ ClickInfo info = object.clickInfo;
	16051	+ //ClickInfo info = new ClickInfo();
	16052	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16053	+
15036	16054	if (isRenderer)
15037	16055	{
15038		- info.flags++;
	16056	+ object.clickInfo.flags++;
15039	16057	double frameAspect = (double) width / (double) height;
15040	16058	if (frameAspect > renderCamera.aspect)
15041	16059	{
15042	16060	int desired = (int) ((double) height * renderCamera.aspect);
15043		- info.bounds.width -= width - desired;
15044		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15045	16063	} else
15046	16064	{
15047	16065	int desired = (int) ((double) width / renderCamera.aspect);
15048		- info.bounds.height -= height - desired;
15049		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15050	16068	}
15051	16069	}
15052		- info.g = gr;
15053		- info.camera = renderCamera;
	16070	+
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15054	16073	/*
15055	16074	// Memory intensive (brep.verticescopy)
15056	16075	if (!(object instanceof Composite))
15057	16076	object.draw(info, 0, false); // SLOW :
15058	16077	*/
15059		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15060	16079	{
15061		- object.drawEditHandles(info, 0);
	16080	+ Grafreed.Assert(object != null);
	16081	+ Grafreed.Assert(object.selection != null);
	16082	+ if (object.selection.Size() > 0)
	16083	+ {
	16084	+ int hitSomething = object.selection.get(0).hitSomething;
	16085	+
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
	16089	+ if (hitSomething == Object3D.hitCenter)
	16090	+ {
	16091	+ info.DX = X;
	16092	+ if (X != 0)
	16093	+ info.DX -= info.bounds.width/2;
	16094	+
	16095	+ info.DY = Y;
	16096	+ if (Y != 0)
	16097	+ info.DY -= info.bounds.height/2;
	16098	+ }
	16099	+
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
	16102	+
	16103	+ if (drag && (X != 0 \|\| Y != 0))
	16104	+ {
	16105	+ switch (hitSomething)
	16106	+ {
	16107	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16114	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16115	+ break;
	16116	+ }
	16117	+
	16118	+ }
	16119	+ }
15062	16120	}
15063	16121	}
	16122	+
15064	16123	if (isRenderer)
15065	16124	{
15066	16125	//gr.setColor(Color.black);
15067	16126	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	16127	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	16128	}
	16129	+
15070	16130	if (hasMarquee)
15071	16131	{
15072	16132	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +16239,7 @@
15179	16239	public boolean mouseDown(Event evt, int x, int y)
15180	16240	{
15181	16241	System.out.println("mouseDown: " + evt);
	16242	+ System.exit(0);
15182	16243	/*
15183	16244	locked = true;
15184	16245	drag = false;
..	..	@@ -15222,7 +16283,7 @@
15222	16283	{
15223	16284	keyPressed(0, modifiers);
15224	16285	}
15225		- clickStart(x, y, modifiers);
	16286	+ // clickStart(x, y, modifiers);
15226	16287	return true;
15227	16288	}
15228	16289
..	..	@@ -15340,7 +16401,7 @@
15340	16401	{
15341	16402	keyReleased(0, 0);
15342	16403	}
15343		- drag(x, y, modifiers);
	16404	+ drag(x, y, 0, modifiers);
15344	16405	return true;
15345	16406	}
15346	16407
..	..	@@ -15472,7 +16533,7 @@
15472	16533	Object3D object;
15473	16534	static Object3D trackedobject;
15474	16535	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16536	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16537	/static/ Camera eyeCamera;
15477	16538	/static/ Camera lightCamera;
15478	16539	int cameracount;
..	..	@@ -15536,6 +16597,8 @@
15536	16597	private /static/ boolean firstime;
15537	16598	private /static/ cVector newView = new cVector();
15538	16599	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16600	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16601	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15539	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15540	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15541	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15548,29 +16611,67 @@
15548	16611	{
15549	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15550	16613
	16614	+ int usedsuf = 0;
	16615	+
15551	16616	for (int i = 0; i < suffixes.length; i++)
15552	16617	{
15553		- String resourceName = basename + suffixes[i] + "." + suffix;
15554		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15555		- mipmapped,
15556		- FileUtil.getFileSuffix(resourceName));
15557		- if (data == null)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
15558	16623	{
15559		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
15560	16628	}
	16629	+
	16630	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16631	+ TextureData data;
	16632	+
	16633	+ try
	16634	+ {
	16635	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16636	+ mipmapped,
	16637	+ FileUtil.getFileSuffix(resourceName));
	16638	+ }
	16639	+ catch (Exception e)
	16640	+ {
	16641	+ try
	16642	+ {
	16643	+ resourceName = basename + fallback[i] + "." + suffix;
	16644	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16645	+ mipmapped,
	16646	+ FileUtil.getFileSuffix(resourceName));
	16647	+ }
	16648	+ catch (Exception e2)
	16649	+ {
	16650	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16651	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16652	+ mipmapped,
	16653	+ FileUtil.getFileSuffix(resourceName));
	16654	+ }
	16655	+ }
	16656	+
15561	16657	//System.out.println("Target = " + targets[i]);
15562	16658	cubemap.updateImage(data, targets[i]);
15563	16659	}
15564	16660
15565	16661	return cubemap;
15566	16662	}
	16663	+
15567	16664	int bigsphere = -1;
15568	16665
15569	16666	float BGcolor = 0.5f;
15570	16667
15571		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
15572	16671	{
15573		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
15574	16675	{
15575	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15576	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15585,7 +16686,17 @@
15585	16686	// Compensates for ExaminerViewer's modification of modelview matrix
15586	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
15587	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
15588	16690
	16691	+// colorV[0] = 2;
	16692	+// colorV[1] = 2;
	16693	+// colorV[2] = 2;
	16694	+// colorV[3] = 1;
	16695	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16696	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16697	+//
	16698	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16699	+
15589	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
15590	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15591	16702
..	..	@@ -15617,6 +16728,7 @@
15617	16728	{
15618	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
15619	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15620	16732	gl.glMultMatrixd(viewrot_1, 0);
15621	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15622	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -15757,16 +16869,16 @@
15757	16869	cStatic.objectstack[materialdepth++] = checker;
15758	16870	//System.out.println("material " + material);
15759	16871	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16872	+ //vector2buffer = checker.projectedVertices;
15761	16873
15762	16874	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16875	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16876
15765	16877	materialdepth -= 1;
15766	16878	if (materialdepth > 0)
15767	16879	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16880	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16881	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16882	}
15771	16883	//checker.GetMaterial().opacity = 1f;
15772	16884	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +16964,14 @@
15852	16964	}
15853	16965	}
15854	16966
	16967	+ private Object3D GetFolder()
	16968	+ {
	16969	+ Object3D folder = object.GetWindow().copy;
	16970	+ if (object.GetWindow().copy.selection.Size() > 0)
	16971	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16972	+ return folder;
	16973	+ }
	16974	+
15855	16975	class SelectBuffer implements GLEventListener
15856	16976	{
15857	16977
..	..	@@ -15867,7 +16987,7 @@
15867	16987	//new Exception().printStackTrace();
15868	16988	System.out.println("select buffer init");
15869	16989	// Use debug pipeline
15870		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15871	16991
15872	16992	GL gl = drawable.getGL();
15873	16993
..	..	@@ -15910,6 +17030,7 @@
15910	17030	{
15911	17031	if (!selection)
15912	17032	{
	17033	+ new Exception().printStackTrace();
15913	17034	System.exit(0);
15914	17035	return;
15915	17036	}
..	..	@@ -15930,6 +17051,17 @@
15930	17051
15931	17052	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	17053
	17054	+ if (PAINTMODE)
	17055	+ {
	17056	+ if (object.GetWindow().copy.selection.Size() > 0)
	17057	+ {
	17058	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17059	+
	17060	+ // Make what you paint not selectable.
	17061	+ paintobj.ResetSelectable();
	17062	+ }
	17063	+ }
	17064	+
15933	17065	//int tmp = selection_view;
15934	17066	//selection_view = -1;
15935	17067	int temp = DrawMode();
..	..	@@ -15941,6 +17073,17 @@
15941	17073	// temp = DEFAULT; // patch for selection debug
15942	17074	Globals.drawMode = temp; // WARNING
15943	17075
	17076	+ if (PAINTMODE)
	17077	+ {
	17078	+ if (object.GetWindow().copy.selection.Size() > 0)
	17079	+ {
	17080	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17081	+
	17082	+ // Revert.
	17083	+ paintobj.RestoreSelectable();
	17084	+ }
	17085	+ }
	17086	+
15944	17087	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	17088
15946	17089	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +17131,8 @@
15988	17131	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	17132	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	17133	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17134	+
	17135	+ CreateSelectedPoint();
15991	17136
15992	17137	// Will fit the mesh !!!
15993	17138	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +17182,36 @@
16037	17182	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]));
16038	17183	}
16039	17184
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17185	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	17186	}
16042	17187	}
16043	17188
16044	17189	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	17190	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	17191
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17192	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	17193	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17194	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	17195
16051		- Object3D group = new Object3D("inst" + paintcount++);
	17196	+ if (object.GetWindow().copy.selection.Size() > 0)
	17197	+ {
	17198	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	17199
16053		- group.CreateMaterial(); // use a void leaf to select instances
16054		-
16055		- group.add(paintobj); // link
16056		-
16057		- object.editWindow.SnapObject(group);
16058		-
16059		- Object3D folder = object.editWindow.copy;
16060		-
16061		- if (object.editWindow.copy.selection.Size() > 0)
16062		- folder = object.editWindow.copy.selection.elementAt(0);
16063		-
16064		- folder.add(group);
16065		-
16066		- object.editWindow.ResetModel();
16067		- object.editWindow.refreshContents();
	17200	+ Object3D inst = new Object3D("inst" + paintcount++);
	17201	+
	17202	+ inst.CreateMaterial(); // use a void leaf to select instances
	17203	+
	17204	+ inst.add(paintobj); // link
	17205	+
	17206	+ object.GetWindow().SnapObject(inst);
	17207	+
	17208	+ Object3D folder = paintFolder; // GetFolder();
	17209	+
	17210	+ folder.add(inst);
	17211	+
	17212	+ object.GetWindow().ResetModel();
	17213	+ object.GetWindow().refreshContents();
	17214	+ }
16068	17215	}
16069	17216	else
16070	17217	paintcount = 0;
..	..	@@ -16103,6 +17250,11 @@
16103	17250	//System.out.println("objects[color] = " + objects[color]);
16104	17251	//objects[color].Select();
16105	17252	indexcount = 0;
	17253	+ ObjEditor window = object.GetWindow();
	17254	+ if (window != null && deselect)
	17255	+ {
	17256	+ window.Select(null, deselect, true);
	17257	+ }
16106	17258	object.Select(color, deselect);
16107	17259	}
16108	17260
..	..	@@ -16202,7 +17354,7 @@
16202	17354	gl.glDisable(gl.GL_CULL_FACE);
16203	17355	}
16204	17356
16205		- if (!RENDERSHADOW)
	17357	+ if (!Globals.RENDERSHADOW)
16206	17358	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17359
16208	17360	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17364,7 @@
16212	17364	//gl.glColorMask(false, false, false, false);
16213	17365
16214	17366	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17367	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17368	{
16217	17369	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17370
..	..	@@ -16628,23 +17780,15 @@
16628	17780	int AAbuffersize = 0;
16629	17781
16630	17782	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17783	+ static Superellipsoid selectedpoint;
16632	17784	static Sphere previousselectedpoint = null;
16633		- static Sphere debugpointG = new Sphere();
16634		- static Sphere debugpointP = new Sphere();
16635		- static Sphere debugpointC = new Sphere();
16636		- static Sphere debugpointR = new Sphere();
	17785	+ static Sphere debugpointG;
	17786	+ static Sphere debugpointP;
	17787	+ static Sphere debugpointC;
	17788	+ static Sphere debugpointR;
16637	17789
16638	17790	static Sphere debugpoints[] = new Sphere[8];
16639	17791
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17792	static void InitPoints(float radius)
16649	17793	{
16650	17794	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17840,11 @@
16696	17840	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17841	// Depth buffer format
16698	17842	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17843	+
	17844	+ public void NextIndex()
16700	17845	{
16701	17846	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17847	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17848	//objects[indexcount] = o;
16704	17849	//System.out.println("indexcount = " + indexcount);
16705	17850	}