~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))
	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,13 @@
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();
7761	8442	} else
7762	8443	{
7763	8444	if (textureon)
..	..	@@ -7782,7 +8463,7 @@
7782	8463	}
7783	8464
7784	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
7786	8467	cachename = texname;
7787	8468	else
7788	8469	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8485,7 @@
7804	8485	}
7805	8486
7806	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
7808	8489	cachename = texname;
7809	8490	else
7810	8491	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8494,22 @@
7813	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8495
7815	8496
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8497	+ if (texturedata == null)
	8498	+ throw new Exception();
	8499	+
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
7818	8501	//texture = GetTexture(tex, bump);
7819	8502	}
7820	8503	}
7821	8504	//}
7822	8505	}
7823	8506
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7825	8508	{
7826	8509	//return false;
7827	8510
7828	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8513	{
7831	8514	// String ext = "_highres";
7832	8515	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8526,17 @@
7843	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8527	if (!cachefile.exists())
7845	8528	{
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))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8530	{
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);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
7886	8533	ImageWriter writer = null;
7887	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8535	if (iter.hasNext()) {
7889	8536	writer = (ImageWriter)iter.next();
7890	8537	}
7891		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
7892	8540	try
7893	8541	{
7894	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7905,18 +8553,20 @@
7905	8553	}
7906	8554	}
7907	8555	}
7908		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
7909	8559	//System.out.println("Texture = " + tex);
7910		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
7911	8561	{
7912		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
7913	8563	thetex.texture.disable();
7914	8564	thetex.texture.dispose();
7915		- textures.remove(texname);
	8565	+ textures.remove(tex);
7916	8566	}
7917	8567
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
7920	8570
7921	8571	// newtex = true;
7922	8572	}
..	..	@@ -7932,10 +8582,44 @@
7932	8582	}
7933	8583	}
7934	8584
7935		- return texture;
	8585	+ return texturecache;
7936	8586	}
7937	8587
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7939	8623	{
7940	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8625
..	..	@@ -7953,21 +8637,21 @@
7953	8637	return texture!=null?texture.texture:null;
7954	8638	}
7955	8639
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7957	8641	{
7958	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8643
7960	8644	return texture!=null?texture.texturedata:null;
7961	8645	}
7962	8646
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7964	8648	{
7965	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8650	{
7967	8651	return false;
7968	8652	}
7969	8653
7970		- boolean newtex = false;
	8654	+ //boolean newtex = false;
7971	8655
7972	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7973	8657
..	..	@@ -7999,9 +8683,75 @@
7999	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8685
8002		- return newtex;
	8686	+ return true; // Warning: not used.
8003	8687	}
8004	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8005	8755	ShadowBuffer shadowPBuf;
8006	8756	AntialiasBuffer antialiasPBuf;
8007	8757	int MAXSTACK;
..	..	@@ -8194,7 +8944,7 @@
8194	8944
8195	8945	if (cubemap == null)
8196	8946	{
8197		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8198	8948	}
8199	8949
8200	8950	//cubemap.enable();
..	..	@@ -8481,37 +9231,58 @@
8481	9231	cubemap = null;
8482	9232	return;
8483	9233	case 1:
8484		- name = "cubemaps/box_";
8485		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
8486	9236	reverseUP = false;
8487	9237	break;
8488	9238	case 2:
8489		- name = "cubemaps/uffizi_";
8490		- ext = "png";
8491		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
8492	9243	case 3:
8493		- name = "cubemaps/CloudyHills_";
8494		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
8495	9246	reverseUP = false;
8496	9247	break;
8497	9248	case 4:
8498		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
8499	9250	ext = "png";
8500	9251	reverseUP = false;
8501	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
8502	9278	default:
8503		- name = "cubemaps/rgb_";
8504		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
8505	9282	break;
8506	9283	}
8507		-
8508		- try
8509		- {
8510		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8511		- } catch (IOException e)
8512		- {
8513		- throw new RuntimeException(e);
8514		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
8515	9286	}
8516	9287
8517	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8543,8 +9314,12 @@
8543	9314	static double[] model = new double[16];
8544	9315	double[] camera2light = new double[16];
8545	9316	double[] light2camera = new double[16];
8546		- int newenvy = -1;
8547		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
8548	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8549	9324	//float[] light0 = { 0,0,0 };
8550	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8837,11 +9612,35 @@
8837	9612	jy8[3] = 0.5f;
8838	9613	}
8839	9614
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9615	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9616	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9617	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9618	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9619
	9620	+ void ResetOptions()
	9621	+ {
	9622	+ options1[0] = 100;
	9623	+ options1[1] = 0.025f;
	9624	+ options1[2] = 0.01f;
	9625	+ options1[3] = 0;
	9626	+ options1[4] = 0;
	9627	+
	9628	+ options2[0] = 0;
	9629	+ options2[1] = 0.75f;
	9630	+ options2[2] = 0;
	9631	+ options2[3] = 0;
	9632	+
	9633	+ options3[0] = 1;
	9634	+ options3[1] = 1;
	9635	+ options3[2] = 1;
	9636	+ options3[3] = 0;
	9637	+
	9638	+ options4[0] = 1;
	9639	+ options4[1] = 0;
	9640	+ options4[2] = 1;
	9641	+ options4[3] = 0;
	9642	+ }
	9643	+
8845	9644	static int imagecount = 0; // movie generation
8846	9645
8847	9646	static int jitter = 0;
..	..	@@ -8937,8 +9736,8 @@
8937	9736	assert (parentcam != renderCamera);
8938	9737
8939	9738	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9740	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8942	9741
8943	9742	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9743
..	..	@@ -8953,8 +9752,8 @@
8953	9752	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9753
8955	9754	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9755	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9756	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8958	9757
8959	9758	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9759
..	..	@@ -9000,10 +9799,12 @@
9000	9799	rati = 1 / rati;
9001	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9002	9801	}
9003		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
9004	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9005	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9006		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
9007	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9008	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9009	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9026,7 +9827,7 @@
9026	9827	//gl.glFlush();
9027	9828	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9829
9029		- if (ANIMATION && ABORTED)
	9830	+ if (Globals.ANIMATION && ABORTED)
9030	9831	{
9031	9832	System.err.println(" ABORTED FRAME");
9032	9833	break;
..	..	@@ -9056,7 +9857,7 @@
9056	9857	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9858
9058	9859	// save image
9059		- if (ANIMATION && !ABORTED)
	9860	+ if (Globals.ANIMATION && !ABORTED)
9060	9861	{
9061	9862	VPwidth = viewport[2];
9062	9863	VPheight = viewport[3];
..	..	@@ -9167,11 +9968,11 @@
9167	9968
9168	9969	// imagecount++;
9169	9970
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9971	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9972
9172	9973	if (!BOXMODE)
9173	9974	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9975	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9976	}
9176	9977
9177	9978	if (!BOXMODE)
..	..	@@ -9209,7 +10010,7 @@
9209	10010	ABORTED = false;
9210	10011	}
9211	10012	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10013	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	10014
9214	10015	if (false)
9215	10016	{
..	..	@@ -9872,11 +10673,11 @@
9872	10673
9873	10674	public void display(GLAutoDrawable drawable)
9874	10675	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10676	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10677	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10678	+ Grafreed.wav.save();
	10679	+ Grafreed.savesound = false;
	10680	+ Grafreed.hassound = false;
9880	10681	}
9881	10682	// if (DEBUG_SELECTION)
9882	10683	// {
..	..	@@ -9952,6 +10753,7 @@
9952	10753	ANTIALIAS = 0;
9953	10754	//System.out.println("RESTART");
9954	10755	AAtimer.restart();
	10756	+ Globals.TIMERRUNNING = true;
9955	10757	}
9956	10758	}
9957	10759	}
..	..	@@ -10006,7 +10808,7 @@
10006	10808	Object3D theobject = object;
10007	10809	Object3D theparent = object.parent;
10008	10810	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10811	+ object = (Object3D)Grafreed.clone(object);
10010	10812	object.Stripify();
10011	10813	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10814	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10821,14 @@
10019	10821	ambientOcclusion = false;
10020	10822	}
10021	10823
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10824	+ if (//Globals.lighttouched &&
	10825	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10826	{
10024	10827	//if (RENDERSHADOW) // ?
10025	10828	if (!IsFrozen())
10026	10829	{
10027	10830	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10831	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10832	{
10030	10833	Globals.framecount++;
10031	10834	shadowbuffer.display();
..	..	@@ -10152,8 +10955,8 @@
10152	10955
10153	10956	// if (parentcam != renderCamera) // not a light
10154	10957	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10958	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10959	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10157	10960
10158	10961	for (int j = 0; j < 4; j++)
10159	10962	{
..	..	@@ -10167,8 +10970,8 @@
10167	10970
10168	10971	// if (parentcam != renderCamera) // not a light
10169	10972	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10973	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10974	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10172	10975
10173	10976	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10977
..	..	@@ -10254,13 +11057,27 @@
10254	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10255	11058	}
10256	11059
10257		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
10258	11068	{
10259		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
10260	11074	}
10261		-
10262		- newenvy = -1;
10263		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
10264	11081	ratio = ((double) getWidth()) / getHeight();
10265	11082	//System.out.println("ratio = " + ratio);
10266	11083
..	..	@@ -10276,7 +11093,7 @@
10276	11093
10277	11094	if (!IsFrozen() && !ambientOcclusion)
10278	11095	{
10279		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
10280	11097	}
10281	11098
10282	11099	//if (selection_view == -1)
..	..	@@ -10427,7 +11244,16 @@
10427	11244	// Bump noise
10428	11245	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11246	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11247	+
	11248	+ try
	11249	+ {
	11250	+ BindTexture(NOISE_TEXTURE, false, 2);
	11251	+ }
	11252	+ catch (Exception e)
	11253	+ {
	11254	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11255	+ }
	11256	+
10431	11257
10432	11258	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11259	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11276,9 @@
10450	11276
10451	11277	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11278
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11279	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11280	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11281	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11282	} else
10457	11283	{
10458	11284	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11289,7 @@
10463	11289	//System.out.println("BLENDING ON");
10464	11290	gl.glEnable(GL.GL_BLEND);
10465	11291	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11292	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11293	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11294	gl.glLoadIdentity();
10469	11295
..	..	@@ -10552,8 +11378,8 @@
10552	11378	System.err.println("parentcam != renderCamera");
10553	11379
10554	11380	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11381	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11382	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10557	11383	}
10558	11384
10559	11385	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11400,8 @@
10574	11400	if (true) // TODO
10575	11401	{
10576	11402	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11403	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11404	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11405	}
10580	11406
10581	11407	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10712,7 +11538,7 @@
10712	11538	}
10713	11539	}
10714	11540
10715		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11541	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10716	11542	{
10717	11543	//gl.glDepthFunc(GL.GL_LEQUAL);
10718	11544	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10720,24 +11546,21 @@
10720	11546
10721	11547	boolean texon = textureon;
10722	11548
10723		- if (RENDERPROGRAM > 0)
10724		- {
10725		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10726		- textureon = false;
10727		- }
	11549	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11550	+ textureon = false;
	11551	+
10728	11552	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10729	11553	//System.out.println("ALLO");
10730	11554	gl.glColorMask(false, false, false, false);
10731	11555	DrawObject(gl);
10732		- if (RENDERPROGRAM > 0)
10733		- {
10734		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10735		- textureon = texon;
10736		- }
	11556	+
	11557	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11558	+ textureon = texon;
	11559	+
10737	11560	gl.glColorMask(true, true, true, true);
10738	11561
10739	11562	gl.glDepthFunc(GL.GL_EQUAL);
10740		- //gl.glDepthMask(false);
	11563	+ gl.glDepthMask(false);
10741	11564	}
10742	11565
10743	11566	if (false) // DrawMode() == SHADOW)
..	..	@@ -10891,8 +11714,14 @@
10891	11714	{
10892	11715	renderpass++;
10893	11716	// System.out.println("Draw object... ");
	11717	+ STEP = 1;
10894	11718	if (FAST) // in case there is no script
10895		- STEP = 16;
	11719	+ STEP = 8;
	11720	+
	11721	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11722	+ {
	11723	+ STEP *= 4;
	11724	+ }
10896	11725
10897	11726	//object.FullInvariants();
10898	11727
..	..	@@ -10906,23 +11735,44 @@
10906	11735	e.printStackTrace();
10907	11736	}
10908	11737
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11738	+ if (Grafreed.RENDERME > 0)
	11739	+ Grafreed.RENDERME--; // mechante magouille
10911	11740
10912	11741	Globals.ONESTEP = false;
10913	11742	}
10914	11743
10915	11744	static boolean zoomonce = false;
10916	11745
	11746	+ static void CreateSelectedPoint()
	11747	+ {
	11748	+ if (selectedpoint == null)
	11749	+ {
	11750	+ debugpointG = new Sphere();
	11751	+ debugpointP = new Sphere();
	11752	+ debugpointC = new Sphere();
	11753	+ debugpointR = new Sphere();
	11754	+
	11755	+ selectedpoint = new Superellipsoid();
	11756	+
	11757	+ for (int i=0; i<8; i++)
	11758	+ {
	11759	+ debugpoints[i] = new Sphere();
	11760	+ }
	11761	+ }
	11762	+ }
	11763	+
10917	11764	void DrawObject(GL gl, boolean draw)
10918	11765	{
	11766	+ // To clear camera values
	11767	+ ResetOptions();
	11768	+
10919	11769	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11770	// DrawMode() = SELECTION;
10921	11771	//GL gl = getGL();
10922	11772	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11773	{
10924	11774	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11775	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11776	pingthread.StepToTarget(true); // true);
10927	11777	// zoomonce = false;
10928	11778	}
..	..	@@ -10977,7 +11827,14 @@
10977	11827
10978	11828	usedtextures.clear();
10979	11829
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11830	+ try
	11831	+ {
	11832	+ BindTextures(DEFAULT_TEXTURES, 2);
	11833	+ }
	11834	+ catch (Exception e)
	11835	+ {
	11836	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11837	+ }
10981	11838	}
10982	11839	//System.out.println("--> " + stackdepth);
10983	11840	// GrafreeD.traceon();
..	..	@@ -10987,8 +11844,9 @@
10987	11844
10988	11845	if (DrawMode() == DEFAULT)
10989	11846	{
10990		- if (DEBUG)
	11847	+ if (Globals.DEBUG)
10991	11848	{
	11849	+ CreateSelectedPoint();
10992	11850	float radius = 0.05f;
10993	11851	if (selectedpoint.radius != radius)
10994	11852	{
..	..	@@ -11042,20 +11900,32 @@
11042	11900	ReleaseTextures(DEFAULT_TEXTURES);
11043	11901
11044	11902	if (CLEANCACHE)
11045		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11903	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11046	11904	{
11047		- String tex = e.nextElement();
	11905	+ cTexture tex = e.nextElement();
11048	11906
11049	11907	// System.out.println("Texture --------- " + tex);
11050	11908
11051		- if (tex.equals("WHITE_NOISE"))
	11909	+ if (tex.equals("WHITE_NOISE:"))
11052	11910	continue;
11053	11911
11054		- if (!usedtextures.containsKey(tex))
	11912	+ if (!usedtextures.contains(tex))
11055	11913	{
	11914	+ CacheTexture gettex = texturepigment.get(tex);
11056	11915	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057		- textures.get(tex).texture.dispose();
11058		- textures.remove(tex);
	11916	+ if (gettex != null)
	11917	+ {
	11918	+ gettex.texture.dispose();
	11919	+ texturepigment.remove(tex);
	11920	+ }
	11921	+
	11922	+ gettex = texturebump.get(tex);
	11923	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11924	+ if (gettex != null)
	11925	+ {
	11926	+ gettex.texture.dispose();
	11927	+ texturebump.remove(tex);
	11928	+ }
11059	11929	}
11060	11930	}
11061	11931	}
..	..	@@ -11068,7 +11938,14 @@
11068	11938	if (checker != null && DrawMode() == DEFAULT)
11069	11939	{
11070	11940	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11941	+ try
	11942	+ {
	11943	+ BindTextures(checker.GetTextures(), checker.texres);
	11944	+ }
	11945	+ catch (Exception e)
	11946	+ {
	11947	+ System.err.println("FAILED: " + checker.GetTextures());
	11948	+ }
11072	11949	// NEAREST
11073	11950	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11951	DrawChecker(gl);
..	..	@@ -11150,7 +12027,7 @@
11150	12027	return;
11151	12028	}
11152	12029
11153		- String string = obj.GetToolTip();
	12030	+ String string = obj.toString(); //.GetToolTip();
11154	12031
11155	12032	GL gl = GetGL();
11156	12033
..	..	@@ -11467,8 +12344,8 @@
11467	12344	//obj.TransformToWorld(light, light);
11468	12345	for (int i = tp.size(); --i >= 0;)
11469	12346	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12347	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12348	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12349	}
11473	12350
11474	12351
..	..	@@ -11485,8 +12362,8 @@
11485	12362	parentcam = cameras[0];
11486	12363	}
11487	12364
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12365	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12366	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12367
11491	12368	LA.xformPos(light, renderCamera.toScreen, light);
11492	12369
..	..	@@ -11576,8 +12453,76 @@
11576	12453
11577	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11578	12455
11579		- String program =
	12456	+ String programmin =
	12457	+ // Min shader
11580	12458	"!!ARBfp1.0\n" +
	12459	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12460	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12461	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12462	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12463	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12464	+ "PARAM light2cam0 = program.env[10];" +
	12465	+ "PARAM light2cam1 = program.env[11];" +
	12466	+ "PARAM light2cam2 = program.env[12];" +
	12467	+ "TEMP temp;" +
	12468	+ "TEMP light;" +
	12469	+ "TEMP ndotl;" +
	12470	+ "TEMP normal;" +
	12471	+ "TEMP depth;" +
	12472	+ "TEMP eye;" +
	12473	+ "TEMP pos;" +
	12474	+
	12475	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12476	+ Normalize("normal") +
	12477	+ "MOV light, state.light[0].position;" +
	12478	+ "DP3 ndotl.x, light, normal;" +
	12479	+
	12480	+ // shadow
	12481	+ "MOV pos, fragment.texcoord[1];" +
	12482	+ "MOV temp, pos;" +
	12483	+ ShadowTextureFetch("depth", "temp", "1") +
	12484	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12485	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12486	+
	12487	+ // No shadow when out of frustum
	12488	+ //"SGE temp.y, depth.z, zero123.y;" +
	12489	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12490	+
	12491	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12492	+
	12493	+ // Backlit
	12494	+ "MOV pos.w, zero123.y;" +
	12495	+ "DP4 eye.x, pos, light2cam0;" +
	12496	+ "DP4 eye.y, pos, light2cam1;" +
	12497	+ "DP4 eye.z, pos, light2cam2;" +
	12498	+ Normalize("eye") +
	12499	+
	12500	+ "DP3 ndotl.y, -eye, normal;" +
	12501	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12502	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12503	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12504	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12505	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12506	+
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12509	+
	12510	+ // Pigment
	12511	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12512	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12513	+ "MUL temp, temp, ndotl.x;" +
	12514	+
	12515	+ "MUL temp, temp, zero123.z;" +
	12516	+
	12517	+ //"MUL temp, temp, ndotl.y;" +
	12518	+
	12519	+ "MOV temp.w, zero123.y;" + // reset alpha
	12520	+ "MOV result.color, temp;" +
	12521	+ "END";
	12522	+
	12523	+ String programmax =
	12524	+ "!!ARBfp1.0\n" +
	12525	+
11581	12526	//"OPTION ARB_fragment_program_shadow;" +
11582	12527	"PARAM light2cam0 = program.env[10];" +
11583	12528	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11692,8 +12637,7 @@
11692	12637	"TEMP shininess;" +
11693	12638	"\n" +
11694	12639	"MOV texSamp, one;" +
11695		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11696		-
	12640	+
11697	12641	"MOV mapgrid.x, one2048th.x;" +
11698	12642	"MOV temp, fragment.texcoord[1];" +
11699	12643	/*
..	..	@@ -11714,20 +12658,20 @@
11714	12658	"MUL temp, floor, mapgrid.x;" +
11715	12659	//"TEX depth0, temp, texture[1], 2D;" +
11716	12660	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11717		- TextureFetch("depth0", "temp", "1") +
	12661	+ ShadowTextureFetch("depth0", "temp", "1") +
11718	12662	"") +
11719	12663	"ADD temp.x, temp.x, mapgrid.x;" +
11720	12664	//"TEX depth1, temp, texture[1], 2D;" +
11721	12665	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11722		- TextureFetch("depth1", "temp", "1") +
	12666	+ ShadowTextureFetch("depth1", "temp", "1") +
11723	12667	"") +
11724	12668	"ADD temp.y, temp.y, mapgrid.x;" +
11725	12669	//"TEX depth2, temp, texture[1], 2D;" +
11726		- TextureFetch("depth2", "temp", "1") +
	12670	+ ShadowTextureFetch("depth2", "temp", "1") +
11727	12671	"SUB temp.x, temp.x, mapgrid.x;" +
11728	12672	//"TEX depth3, temp, texture[1], 2D;" +
11729	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11730		- TextureFetch("depth3", "temp", "1") +
	12674	+ ShadowTextureFetch("depth3", "temp", "1") +
11731	12675	"") +
11732	12676	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11733	12677	//"MOV params, material;" +
..	..	@@ -12098,10 +13042,10 @@
12098	13042	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12099	13043	"") +
12100	13044
12101		- // display shadow only (bump == 0)
	13045	+ // display shadow only (fakedepth == 0)
12102	13046	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	13047	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
12105	13049	"SUB temp.y, one.x, temp.z;" +
12106	13050	"MUL temp.x, temp.x, temp.y;" +
12107	13051	"KIL temp.x;" +
..	..	@@ -12230,8 +13174,10 @@
12230	13174	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	13175
12232	13176	"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
	13177	+ // Tuning for default skin
	13178	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13179	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13180	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	13181	"MUL temp.x, temp.x, temp.y;" +
12236	13182
12237	13183	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13376,14 @@
12430	13376	//once = true;
12431	13377	}
12432	13378
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
	13386	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13389
..	..	@@ -12523,25 +13476,26 @@
12523	13476	return out;
12524	13477	}
12525	13478
12526		- String TextureFetch(String dest, String src, String unit)
	13479	+ // Also does frustum culling
	13480	+ String ShadowTextureFetch(String dest, String src, String unit)
12527	13481	{
12528	13482	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12529	13483	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12530	13484	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13485	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13486	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12531	13487	"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;" +
	13488	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13489	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12536	13490	//"SWZ buffer, temp, w,w,w,w;";
12537		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13491	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12538	13492	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12539	13493	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12540	13494	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12541		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13495	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12542	13496
12543		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12544		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13497	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13498	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12545	13499	}
12546	13500
12547	13501	String Shadow(String depth, String shadow)
..	..	@@ -12563,12 +13517,16 @@
12563	13517
12564	13518	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13519	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13520	+
	13521	+ // Compare fragment depth in light space with shadowmap.
12566	13522	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13523	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13524	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13525	+
	13526	+ // Reverse comparison
12569	13527	"SUB temp.x, one.x, temp.x;" +
12570	13528	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13529	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13530	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13531
12574	13532	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13540,10 @@
12582	13540	// No shadow for backface
12583	13541	"DP3 temp.x, normal, lightd;" +
12584	13542	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13543	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13544	+
	13545	+ // No shadow when out of frustum
	13546	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13547	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13548	"";
12587	13549	}
..	..	@@ -12728,7 +13690,8 @@
12728	13690	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13691	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13692	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13693	+
	13694	+ //Object3D.cVector2[] vector2buffer;
12732	13695
12733	13696	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13697	// OUT : diff, spec
..	..	@@ -12744,9 +13707,10 @@
12744	13707	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13708	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13709	//"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;" +
	13710	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13711	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13712	+
	13713	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13714	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13715	"RCP " + dest + ".w," + dest + ".w;" +
12752	13716	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +14104,7 @@
13140	14104	public void mousePressed(MouseEvent e)
13141	14105	{
13142	14106	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14107	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	14108	}
13145	14109
13146	14110	static long prevtime = 0;
..	..	@@ -13167,6 +14131,7 @@
13167	14131
13168	14132	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	14133
	14134	+ if (BUTTONLESSWHEEL)
13170	14135	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	14136	{
13172	14137	return;
..	..	@@ -13175,7 +14140,7 @@
13175	14140	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	14141
13177	14142	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14143	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	14144	{
13180	14145	keepboxmode = BOXMODE;
13181	14146	keepsupport = SUPPORT;
..	..	@@ -13215,8 +14180,8 @@
13215	14180	// mode \|= META;
13216	14181	//}
13217	14182
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14183	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14184	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	14185	anchorX = ax;
13221	14186	anchorY = ay;
13222	14187	prevX = px;
..	..	@@ -13250,6 +14215,7 @@
13250	14215	else
13251	14216	if (evt.getSource() == AAtimer)
13252	14217	{
	14218	+ Globals.TIMERRUNNING = false;
13253	14219	if (mouseDown)
13254	14220	{
13255	14221	//new Exception().printStackTrace();
..	..	@@ -13275,6 +14241,10 @@
13275	14241	// LIVE = waslive;
13276	14242	// wasliveok = true;
13277	14243	// waslive = false;
	14244	+
	14245	+ // May 2019 Forget it:
	14246	+ if (true)
	14247	+ return;
13278	14248
13279	14249	// source == timer
13280	14250	if (mouseDown)
..	..	@@ -13305,7 +14275,7 @@
13305	14275
13306	14276	// fev 2014???
13307	14277	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14278	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14279	pingthread.StepToTarget(true); // true);
13310	14280	}
13311	14281	// if (!LIVE)
..	..	@@ -13314,12 +14284,13 @@
13314	14284
13315	14285	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14286
13317		- void clickStart(int x, int y, int modifiers)
	14287	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14288	{
13319	14289	if (!wasliveok)
13320	14290	return;
13321	14291
13322	14292	AAtimer.restart(); //
	14293	+ Globals.TIMERRUNNING = true;
13323	14294
13324	14295	// waslive = LIVE;
13325	14296	// LIVE = false;
..	..	@@ -13331,7 +14302,7 @@
13331	14302	// touched = true; // main DL
13332	14303	if (isRenderer)
13333	14304	{
13334		- SetMouseMode(modifiers);
	14305	+ SetMouseMode(modifiers, modifiersex);
13335	14306	}
13336	14307
13337	14308	selectX = anchorX = x;
..	..	@@ -13344,7 +14315,7 @@
13344	14315	clicked = true;
13345	14316	hold = false;
13346	14317
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14318	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14319	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14320	{
13350	14321	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13369,14 +14340,15 @@
13369	14340	drag = false;
13370	14341	//System.out.println("Mouse DOWN");
13371	14342	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);
	14343	+ //ClickInfo info = new ClickInfo();
	14344	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14345	+ object.clickInfo.pane = this;
	14346	+ object.clickInfo.camera = renderCamera;
	14347	+ object.clickInfo.x = x;
	14348	+ object.clickInfo.y = y;
	14349	+ object.clickInfo.modifiers = modifiersex;
	14350	+ editObj = object.doEditClick(//info,
	14351	+ 0);
13380	14352	if (!editObj)
13381	14353	{
13382	14354	hasMarquee = true;
..	..	@@ -13392,11 +14364,14 @@
13392	14364
13393	14365	public void mouseDragged(MouseEvent e)
13394	14366	{
	14367	+ Globals.MOUSEDRAGGED = true;
	14368	+
	14369	+ //System.out.println("mouseDragged: " + e);
13395	14370	if (isRenderer)
13396	14371	movingcamera = true;
	14372	+
13397	14373	//if (drawing)
13398	14374	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14375	if ((e.getModifiersEx() & CTRL) != 0
13401	14376	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14377	{
..	..	@@ -13404,7 +14379,7 @@
13404	14379	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14380	}
13406	14381	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14382	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14383
13409	14384	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14385	}
..	..	@@ -13577,6 +14552,7 @@
13577	14552
13578	14553	public void run()
13579	14554	{
	14555	+ new Exception().printStackTrace();
13580	14556	System.exit(0);
13581	14557	for (;;)
13582	14558	{
..	..	@@ -13640,7 +14616,7 @@
13640	14616	{
13641	14617	Globals.lighttouched = true;
13642	14618	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14619	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14620	}
13645	14621	//else
13646	14622	}
..	..	@@ -13654,12 +14630,12 @@
13654	14630	void GoDown(int mod)
13655	14631	{
13656	14632	MODIFIERS \|= COMMAND;
13657		- /*
	14633	+ /**/
13658	14634	if((mod&SHIFT) == SHIFT)
13659		- manipCamera.RotatePosition(0, -speed);
	14635	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
13660	14636	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14637	+ manipCamera.RotatePosition(0, -speed);
	14638	+ /**/
13663	14639	if ((mod & SHIFT) == SHIFT)
13664	14640	{
13665	14641	mouseMode = mouseMode; // VR??
..	..	@@ -13675,12 +14651,12 @@
13675	14651	void GoUp(int mod)
13676	14652	{
13677	14653	MODIFIERS \|= COMMAND;
13678		- /*
	14654	+ /**/
13679	14655	if((mod&SHIFT) == SHIFT)
13680		- manipCamera.RotatePosition(0, speed);
	14656	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
13681	14657	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14658	+ manipCamera.RotatePosition(0, speed);
	14659	+ /**/
13684	14660	if ((mod & SHIFT) == SHIFT)
13685	14661	{
13686	14662	mouseMode = mouseMode;
..	..	@@ -13696,12 +14672,12 @@
13696	14672	void GoLeft(int mod)
13697	14673	{
13698	14674	MODIFIERS \|= COMMAND;
13699		- /*
	14675	+ /**/
13700	14676	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
13702		- else
13703	14677	manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14678	+ else
	14679	+ manipCamera.RotatePosition(speed, 0);
	14680	+ /**/
13705	14681	if ((mod & SHIFT) == SHIFT)
13706	14682	{
13707	14683	mouseMode = mouseMode;
..	..	@@ -13717,12 +14693,12 @@
13717	14693	void GoRight(int mod)
13718	14694	{
13719	14695	MODIFIERS \|= COMMAND;
13720		- /*
	14696	+ /**/
13721	14697	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
13723		- else
13724	14698	manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14699	+ else
	14700	+ manipCamera.RotatePosition(-speed, 0);
	14701	+ /**/
13726	14702	if ((mod & SHIFT) == SHIFT)
13727	14703	{
13728	14704	mouseMode = mouseMode;
..	..	@@ -13740,7 +14716,7 @@
13740	14716	int X, Y;
13741	14717	boolean SX, SY;
13742	14718
13743		- void drag(int x, int y, int modifiers)
	14719	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14720	{
13745	14721	if (IsFrozen())
13746	14722	{
..	..	@@ -13749,17 +14725,17 @@
13749	14725
13750	14726	drag = true; // NEW
13751	14727
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14728	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14729
13754	14730	X = x;
13755	14731	Y = y;
13756	14732	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14733	+ MODIFIERS = modifiersex;
	14734	+ modifiersex &= ~1024;
13759	14735	if (false) // modifiers != 0)
13760	14736	{
13761	14737	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14738	+ System.out.println("mouseDragged: " + modifiersex);
13763	14739	System.out.println("SHIFT = " + SHIFT);
13764	14740	System.out.println("CONTROL = " + COMMAND);
13765	14741	System.out.println("META = " + META);
..	..	@@ -13772,14 +14748,16 @@
13772	14748	if (editObj)
13773	14749	{
13774	14750	drag = true;
13775		- ClickInfo info = new ClickInfo();
13776		- info.bounds.setBounds(0, 0,
	14751	+ //ClickInfo info = new ClickInfo();
	14752	+ object.clickInfo.bounds.setBounds(0, 0,
13777	14753	(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);
	14754	+ object.clickInfo.pane = this;
	14755	+ object.clickInfo.camera = renderCamera;
	14756	+ object.clickInfo.x = x;
	14757	+ object.clickInfo.y = y;
	14758	+ object //.GetWindow().copy
	14759	+ .doEditDrag(//info,
	14760	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14761	} else
13784	14762	{
13785	14763	if (x < startX)
..	..	@@ -13928,23 +14906,27 @@
13928	14906	}
13929	14907	}
13930	14908
	14909	+// ClickInfo clickInfo = new ClickInfo();
	14910	+
13931	14911	public void mouseMoved(MouseEvent e)
13932	14912	{
13933	14913	//System.out.println("mouseMoved: " + e);
13934		-
13935	14914	if (isRenderer)
13936	14915	return;
13937	14916
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;
	14917	+ // Mouse cursor feedback
	14918	+ object.clickInfo.x = e.getX();
	14919	+ object.clickInfo.y = e.getY();
	14920	+ object.clickInfo.modifiers = e.getModifiersEx();
	14921	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14922	+ object.clickInfo.pane = this;
	14923	+ object.clickInfo.camera = renderCamera;
13945	14924	if (!isRenderer)
13946	14925	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14926	+ //ObjEditor editWindow = object.editWindow;
	14927	+ //Object3D copy = editWindow.copy;
	14928	+ if (object.doEditClick(//clickInfo,
	14929	+ 0))
13948	14930	{
13949	14931	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14932	} else
..	..	@@ -13956,7 +14938,11 @@
13956	14938
13957	14939	public void mouseReleased(MouseEvent e)
13958	14940	{
	14941	+ Globals.MOUSEDRAGGED = false;
	14942	+
13959	14943	movingcamera = false;
	14944	+ X = 0; // getBounds().width/2;
	14945	+ Y = 0; // getBounds().height/2;
13960	14946	//System.out.println("mouseReleased: " + e);
13961	14947	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14948	}
..	..	@@ -13979,9 +14965,9 @@
13979	14965	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14966	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14967
13982		- if (control \|\| command \|\| IsFrozen())
	14968	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14969	timeout = true;
13984		- else
	14970	+// ?? May 2019 else
13985	14971	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14972	mouseDown = false;
13987	14973	if (!control && !command) // june 2013
..	..	@@ -14091,7 +15077,7 @@
14091	15077	System.out.println("keyReleased: " + e);
14092	15078	}
14093	15079
14094		- void SetMouseMode(int modifiers)
	15080	+ void SetMouseMode(int modifiers, int modifiersex)
14095	15081	{
14096	15082	//System.out.println("SetMouseMode = " + modifiers);
14097	15083	//modifiers &= ~1024;
..	..	@@ -14103,25 +15089,25 @@
14103	15089	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	15090	// return;
14105	15091	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	15092	+ if ((modifiersex & WHEEL) == WHEEL)
14107	15093	{
14108	15094	mouseMode \|= ZOOM;
14109	15095	}
14110	15096
14111	15097	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	15098	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	15099	{
14114	15100	mouseMode \|= VR; // BACKFORTH;
14115	15101	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15102	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	15103	{
14118	15104	mouseMode \|= SELECT;
14119	15105	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	15106	+ if ((modifiersex & COMMAND) == COMMAND)
14121	15107	{
14122	15108	mouseMode \|= SELECT;
14123	15109	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15110	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	15111	{
14126	15112	mouseMode &= ~VR;
14127	15113	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +15136,10 @@
14150	15136
14151	15137	if (isRenderer) //
14152	15138	{
14153		- SetMouseMode(modifiers);
	15139	+ SetMouseMode(0, modifiers);
14154	15140	}
14155	15141
14156		- theRenderer.keyPressed(key);
	15142	+ Globals.theRenderer.keyPressed(key);
14157	15143	}
14158	15144
14159	15145	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +15151,7 @@
14165	15151	float SATPOW = 1; // 2; // 0.5f;
14166	15152	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	15153
14168		- void keyPressed(int key)
	15154	+ public void keyPressed(int key)
14169	15155	{
14170	15156	if (key >= '0' && key <= '5')
14171	15157	clampbit = (key-'0');
..	..	@@ -14212,7 +15198,8 @@
14212	15198	// break;
14213	15199	case 'T':
14214	15200	CACHETEXTURE ^= true;
14215		- textures.clear();
	15201	+ texturepigment.clear();
	15202	+ texturebump.clear();
14216	15203	// repaint();
14217	15204	break;
14218	15205	case 'Y':
..	..	@@ -14297,7 +15284,9 @@
14297	15284	case 'E' : COMPACT ^= true;
14298	15285	repaint();
14299	15286	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15287	+ case 'W' : // Wide Window (fullscreen)
	15288	+ //DEBUGHSB ^= true;
	15289	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15290	repaint();
14302	15291	break;
14303	15292	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15311,8 @@
14322	15311	RevertCamera();
14323	15312	repaint();
14324	15313	break;
14325		- case 'L':
14326	15314	case 'l':
	15315	+ //case 'L':
14327	15316	if (lightMode)
14328	15317	{
14329	15318	lightMode = false;
..	..	@@ -14387,20 +15376,24 @@
14387	15376	OCCLUSION_CULLING ^= true;
14388	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14389	15378	break;
14390		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
14391	15380	case '1':
14392	15381	case '2':
14393	15382	case '3':
14394	15383	case '4':
14395	15384	case '5':
14396		- newenvy = Character.getNumericValue(key);
14397		- repaint();
14398		- break;
14399	15385	case '6':
14400	15386	case '7':
14401	15387	case '8':
14402	15388	case '9':
14403		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
14404	15397	repaint();
14405	15398	break;
14406	15399	case '!':
..	..	@@ -14466,9 +15459,9 @@
14466	15459	case '_':
14467	15460	kompactbit = 5;
14468	15461	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15462	+// case '+':
	15463	+// kompactbit = 6;
	15464	+// break;
14472	15465	case ' ':
14473	15466	lightMode ^= true;
14474	15467	Globals.lighttouched = true;
..	..	@@ -14480,13 +15473,14 @@
14480	15473	case ESC:
14481	15474	RENDERPROGRAM += 1;
14482	15475	RENDERPROGRAM %= 3;
	15476	+
14483	15477	repaint();
14484	15478	break;
14485	15479	case 'Z':
14486	15480	//RESIZETEXTURE ^= true;
14487	15481	//break;
14488	15482	case 'z':
14489		- RENDERSHADOW ^= true;
	15483	+ Globals.RENDERSHADOW ^= true;
14490	15484	Globals.lighttouched = true;
14491	15485	repaint();
14492	15486	break;
..	..	@@ -14519,8 +15513,9 @@
14519	15513	case DELETE:
14520	15514	ClearSelection();
14521	15515	break;
14522		- /*
14523	15516	case '+':
	15517	+
	15518	+ /*
14524	15519	//fontsize += 1;
14525	15520	bbzoom *= 2;
14526	15521	repaint();
..	..	@@ -14537,17 +15532,17 @@
14537	15532	case '=':
14538	15533	IncDepth();
14539	15534	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15535	+ object.GetWindow().refreshContents(true);
14541	15536	maskbit = 6;
14542	15537	break;
14543	15538	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15539	DecDepth();
14545	15540	maskbit = 5;
14546	15541	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15542	+// if (object.editWindow == null)
	15543	+// new Exception().printStackTrace();
	15544	+// else
	15545	+ object.GetWindow().refreshContents(true);
14551	15546	break;
14552	15547	case '{':
14553	15548	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15597,7 @@
14602	15597	}
14603	15598	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15599	}
	15600	+
14605	15601	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15602
14607	15603	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15605,11 @@
14609	15605	//mode = ROTATE;
14610	15606	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15607	{
14612		- SetMouseMode(modifiers);
	15608	+ SetMouseMode(0, modifiers);
14613	15609	}
14614	15610	}
14615	15611
14616		- protected void processKeyEvent(KeyEvent e)
	15612	+ public void processKeyEvent(KeyEvent e)
14617	15613	{
14618	15614	switch (e.getID())
14619	15615	{
..	..	@@ -14743,8 +15739,9 @@
14743	15739
14744	15740	protected void processMouseMotionEvent(MouseEvent e)
14745	15741	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15742	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15743	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15744	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15745	{
14749	15746	mouseMoved(e);
14750	15747	} else
..	..	@@ -14769,11 +15766,12 @@
14769	15766	}
14770	15767	*/
14771	15768
14772		- object.editWindow.EditSelection();
	15769	+ object.GetWindow().EditSelection(false);
14773	15770	}
14774	15771
14775	15772	void SelectParent()
14776	15773	{
	15774	+ new Exception().printStackTrace();
14777	15775	System.exit(0);
14778	15776	Composite group = (Composite) object;
14779	15777	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15783,10 @@
14785	15783	{
14786	15784	//selectees.remove(i);
14787	15785	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15786	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15787	} else
14790	15788	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15789	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15790	}
14793	15791
14794	15792	first = false;
..	..	@@ -14797,6 +15795,7 @@
14797	15795
14798	15796	void SelectChildren()
14799	15797	{
	15798	+ new Exception().printStackTrace();
14800	15799	System.exit(0);
14801	15800	/*
14802	15801	Composite group = (Composite) object;
..	..	@@ -14829,12 +15828,12 @@
14829	15828	for (int j = 0; j < group.children.size(); j++)
14830	15829	{
14831	15830	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15831	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15832	first = false;
14834	15833	}
14835	15834	} else
14836	15835	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15836	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15837	}
14839	15838
14840	15839	first = false;
..	..	@@ -14845,21 +15844,21 @@
14845	15844	{
14846	15845	//Composite group = (Composite) object;
14847	15846	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15847	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15848	}
14850	15849
14851	15850	void ResetTransform(int mask)
14852	15851	{
14853	15852	//Composite group = (Composite) object;
14854	15853	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15854	+ group.GetWindow().ResetTransform(mask);
14856	15855	}
14857	15856
14858	15857	void FlipTransform()
14859	15858	{
14860	15859	//Composite group = (Composite) object;
14861	15860	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15861	+ group.GetWindow().FlipTransform();
14863	15862	// group.editWindow.ReduceMesh(true);
14864	15863	}
14865	15864
..	..	@@ -14867,7 +15866,7 @@
14867	15866	{
14868	15867	//Composite group = (Composite) object;
14869	15868	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15869	+ group.GetWindow().PrintMemory();
14871	15870	// group.editWindow.ReduceMesh(true);
14872	15871	}
14873	15872
..	..	@@ -14875,7 +15874,7 @@
14875	15874	{
14876	15875	//Composite group = (Composite) object;
14877	15876	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15877	+ group.GetWindow().ResetCentroid();
14879	15878	}
14880	15879
14881	15880	void IncDepth()
..	..	@@ -14957,11 +15956,11 @@
14957	15956
14958	15957	int width = getBounds().width;
14959	15958	int height = getBounds().height;
14960		- ClickInfo info = new ClickInfo();
14961		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15959	//Image img = CreateImage(width, height);
14963	15960	//System.out.println("width = " + width + "; height = " + height + "\n");
	15961	+
14964	15962	Graphics gr = g; // img.getGraphics();
	15963	+
14965	15964	if (!hasMarquee)
14966	15965	{
14967	15966	if (Xmin < Xmax) // !locked)
..	..	@@ -15033,40 +16032,88 @@
15033	16032	}
15034	16033	if (object != null && !hasMarquee)
15035	16034	{
	16035	+ if (object.clickInfo == null)
	16036	+ object.clickInfo = new ClickInfo();
	16037	+ ClickInfo info = object.clickInfo;
	16038	+ //ClickInfo info = new ClickInfo();
	16039	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16040	+
15036	16041	if (isRenderer)
15037	16042	{
15038		- info.flags++;
	16043	+ object.clickInfo.flags++;
15039	16044	double frameAspect = (double) width / (double) height;
15040	16045	if (frameAspect > renderCamera.aspect)
15041	16046	{
15042	16047	int desired = (int) ((double) height * renderCamera.aspect);
15043		- info.bounds.width -= width - desired;
15044		- info.bounds.x += (width - desired) / 2;
	16048	+ object.clickInfo.bounds.width -= width - desired;
	16049	+ object.clickInfo.bounds.x += (width - desired) / 2;
15045	16050	} else
15046	16051	{
15047	16052	int desired = (int) ((double) width / renderCamera.aspect);
15048		- info.bounds.height -= height - desired;
15049		- info.bounds.y += (height - desired) / 2;
	16053	+ object.clickInfo.bounds.height -= height - desired;
	16054	+ object.clickInfo.bounds.y += (height - desired) / 2;
15050	16055	}
15051	16056	}
15052		- info.g = gr;
15053		- info.camera = renderCamera;
	16057	+
	16058	+ object.clickInfo.g = gr;
	16059	+ object.clickInfo.camera = renderCamera;
15054	16060	/*
15055	16061	// Memory intensive (brep.verticescopy)
15056	16062	if (!(object instanceof Composite))
15057	16063	object.draw(info, 0, false); // SLOW :
15058	16064	*/
15059		- if (!isRenderer)
	16065	+ if (!isRenderer) // && drag)
15060	16066	{
15061		- object.drawEditHandles(info, 0);
	16067	+ Grafreed.Assert(object != null);
	16068	+ Grafreed.Assert(object.selection != null);
	16069	+ if (object.selection.Size() > 0)
	16070	+ {
	16071	+ int hitSomething = object.selection.get(0).hitSomething;
	16072	+
	16073	+ object.clickInfo.DX = 0;
	16074	+ object.clickInfo.DY = 0;
	16075	+ object.clickInfo.W = 1;
	16076	+ if (hitSomething == Object3D.hitCenter)
	16077	+ {
	16078	+ info.DX = X;
	16079	+ if (X != 0)
	16080	+ info.DX -= info.bounds.width/2;
	16081	+
	16082	+ info.DY = Y;
	16083	+ if (Y != 0)
	16084	+ info.DY -= info.bounds.height/2;
	16085	+ }
	16086	+
	16087	+ object.drawEditHandles(//info,
	16088	+ 0);
	16089	+
	16090	+ if (drag && (X != 0 \|\| Y != 0))
	16091	+ {
	16092	+ switch (hitSomething)
	16093	+ {
	16094	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16095	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16096	+ break;
	16097	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16098	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16099	+ break;
	16100	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16101	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16102	+ break;
	16103	+ }
	16104	+
	16105	+ }
	16106	+ }
15062	16107	}
15063	16108	}
	16109	+
15064	16110	if (isRenderer)
15065	16111	{
15066	16112	//gr.setColor(Color.black);
15067	16113	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	16114	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	16115	}
	16116	+
15070	16117	if (hasMarquee)
15071	16118	{
15072	16119	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +16226,7 @@
15179	16226	public boolean mouseDown(Event evt, int x, int y)
15180	16227	{
15181	16228	System.out.println("mouseDown: " + evt);
	16229	+ System.exit(0);
15182	16230	/*
15183	16231	locked = true;
15184	16232	drag = false;
..	..	@@ -15222,7 +16270,7 @@
15222	16270	{
15223	16271	keyPressed(0, modifiers);
15224	16272	}
15225		- clickStart(x, y, modifiers);
	16273	+ // clickStart(x, y, modifiers);
15226	16274	return true;
15227	16275	}
15228	16276
..	..	@@ -15340,7 +16388,7 @@
15340	16388	{
15341	16389	keyReleased(0, 0);
15342	16390	}
15343		- drag(x, y, modifiers);
	16391	+ drag(x, y, 0, modifiers);
15344	16392	return true;
15345	16393	}
15346	16394
..	..	@@ -15472,7 +16520,7 @@
15472	16520	Object3D object;
15473	16521	static Object3D trackedobject;
15474	16522	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16523	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16524	/static/ Camera eyeCamera;
15477	16525	/static/ Camera lightCamera;
15478	16526	int cameracount;
..	..	@@ -15536,6 +16584,8 @@
15536	16584	private /static/ boolean firstime;
15537	16585	private /static/ cVector newView = new cVector();
15538	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15539	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15540	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15541	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15548,29 +16598,66 @@
15548	16598	{
15549	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15550	16600
	16601	+ int usedsuf = 0;
	16602	+
15551	16603	for (int i = 0; i < suffixes.length; i++)
15552	16604	{
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)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
15558	16610	{
15559		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
15560	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
15561	16644	//System.out.println("Target = " + targets[i]);
15562	16645	cubemap.updateImage(data, targets[i]);
15563	16646	}
15564	16647
15565	16648	return cubemap;
15566	16649	}
	16650	+
15567	16651	int bigsphere = -1;
15568	16652
15569	16653	float BGcolor = 0.5f;
15570	16654
15571		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
15572	16658	{
15573		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
15574	16661	{
15575	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15576	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15585,7 +16672,17 @@
15585	16672	// Compensates for ExaminerViewer's modification of modelview matrix
15586	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
15587	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
15588	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
15589	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
15590	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15591	16688
..	..	@@ -15617,6 +16714,7 @@
15617	16714	{
15618	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
15619	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15620	16718	gl.glMultMatrixd(viewrot_1, 0);
15621	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15622	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -15757,16 +16855,16 @@
15757	16855	cStatic.objectstack[materialdepth++] = checker;
15758	16856	//System.out.println("material " + material);
15759	16857	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16858	+ //vector2buffer = checker.projectedVertices;
15761	16859
15762	16860	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16861	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16862
15765	16863	materialdepth -= 1;
15766	16864	if (materialdepth > 0)
15767	16865	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16866	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16867	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16868	}
15771	16869	//checker.GetMaterial().opacity = 1f;
15772	16870	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +16950,14 @@
15852	16950	}
15853	16951	}
15854	16952
	16953	+ private Object3D GetFolder()
	16954	+ {
	16955	+ Object3D folder = object.GetWindow().copy;
	16956	+ if (object.GetWindow().copy.selection.Size() > 0)
	16957	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16958	+ return folder;
	16959	+ }
	16960	+
15855	16961	class SelectBuffer implements GLEventListener
15856	16962	{
15857	16963
..	..	@@ -15867,7 +16973,7 @@
15867	16973	//new Exception().printStackTrace();
15868	16974	System.out.println("select buffer init");
15869	16975	// Use debug pipeline
15870		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15871	16977
15872	16978	GL gl = drawable.getGL();
15873	16979
..	..	@@ -15910,6 +17016,7 @@
15910	17016	{
15911	17017	if (!selection)
15912	17018	{
	17019	+ new Exception().printStackTrace();
15913	17020	System.exit(0);
15914	17021	return;
15915	17022	}
..	..	@@ -15930,6 +17037,17 @@
15930	17037
15931	17038	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	17039
	17040	+ if (PAINTMODE)
	17041	+ {
	17042	+ if (object.GetWindow().copy.selection.Size() > 0)
	17043	+ {
	17044	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17045	+
	17046	+ // Make what you paint not selectable.
	17047	+ paintobj.ResetSelectable();
	17048	+ }
	17049	+ }
	17050	+
15933	17051	//int tmp = selection_view;
15934	17052	//selection_view = -1;
15935	17053	int temp = DrawMode();
..	..	@@ -15941,6 +17059,17 @@
15941	17059	// temp = DEFAULT; // patch for selection debug
15942	17060	Globals.drawMode = temp; // WARNING
15943	17061
	17062	+ if (PAINTMODE)
	17063	+ {
	17064	+ if (object.GetWindow().copy.selection.Size() > 0)
	17065	+ {
	17066	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17067	+
	17068	+ // Revert.
	17069	+ paintobj.RestoreSelectable();
	17070	+ }
	17071	+ }
	17072	+
15944	17073	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	17074
15946	17075	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +17117,8 @@
15988	17117	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	17118	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	17119	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17120	+
	17121	+ CreateSelectedPoint();
15991	17122
15992	17123	// Will fit the mesh !!!
15993	17124	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +17168,36 @@
16037	17168	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	17169	}
16039	17170
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17171	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	17172	}
16042	17173	}
16043	17174
16044	17175	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	17176	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	17177
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17178	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	17179	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17180	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	17181
16051		- Object3D group = new Object3D("inst" + paintcount++);
	17182	+ if (object.GetWindow().copy.selection.Size() > 0)
	17183	+ {
	17184	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	17185
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();
	17186	+ Object3D inst = new Object3D("inst" + paintcount++);
	17187	+
	17188	+ inst.CreateMaterial(); // use a void leaf to select instances
	17189	+
	17190	+ inst.add(paintobj); // link
	17191	+
	17192	+ object.GetWindow().SnapObject(inst);
	17193	+
	17194	+ Object3D folder = paintFolder; // GetFolder();
	17195	+
	17196	+ folder.add(inst);
	17197	+
	17198	+ object.GetWindow().ResetModel();
	17199	+ object.GetWindow().refreshContents();
	17200	+ }
16068	17201	}
16069	17202	else
16070	17203	paintcount = 0;
..	..	@@ -16103,6 +17236,11 @@
16103	17236	//System.out.println("objects[color] = " + objects[color]);
16104	17237	//objects[color].Select();
16105	17238	indexcount = 0;
	17239	+ ObjEditor window = object.GetWindow();
	17240	+ if (window != null && deselect)
	17241	+ {
	17242	+ window.Select(null, deselect, true);
	17243	+ }
16106	17244	object.Select(color, deselect);
16107	17245	}
16108	17246
..	..	@@ -16202,7 +17340,7 @@
16202	17340	gl.glDisable(gl.GL_CULL_FACE);
16203	17341	}
16204	17342
16205		- if (!RENDERSHADOW)
	17343	+ if (!Globals.RENDERSHADOW)
16206	17344	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17345
16208	17346	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17350,7 @@
16212	17350	//gl.glColorMask(false, false, false, false);
16213	17351
16214	17352	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17353	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17354	{
16217	17355	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17356
..	..	@@ -16628,23 +17766,15 @@
16628	17766	int AAbuffersize = 0;
16629	17767
16630	17768	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17769	+ static Superellipsoid selectedpoint;
16632	17770	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();
	17771	+ static Sphere debugpointG;
	17772	+ static Sphere debugpointP;
	17773	+ static Sphere debugpointC;
	17774	+ static Sphere debugpointR;
16637	17775
16638	17776	static Sphere debugpoints[] = new Sphere[8];
16639	17777
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17778	static void InitPoints(float radius)
16649	17779	{
16650	17780	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17826,11 @@
16696	17826	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17827	// Depth buffer format
16698	17828	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17829	+
	17830	+ public void NextIndex()
16700	17831	{
16701	17832	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17833	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17834	//objects[indexcount] = o;
16704	17835	//System.out.println("indexcount = " + indexcount);
16705	17836	}