~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,12 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	188
153		- static CameraPane theRenderer;
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	190
155	191	void SetAsGLRenderer(boolean b)
156	192	{
157	193	isRenderer = b;
158		- theRenderer = this;
	194	+ Globals.theRenderer = this;
159	195	}
160	196
161	197	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -170,7 +206,8 @@
170	206
171	207	SetCamera(cam);
172	208
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	211
175	212	object = o;
176	213
..	..	@@ -193,9 +230,43 @@
193	230
194	231	/// INTERFACE
195	232
	233	+ public javax.media.opengl.GL GetGL0()
	234	+ {
	235	+ return null;
	236	+ }
	237	+
	238	+ public int GenList()
	239	+ {
	240	+ javax.media.opengl.GL gl = GetGL();
	241	+ return gl.glGenLists(1);
	242	+ }
	243	+
	244	+ public void NewList(int id)
	245	+ {
	246	+ javax.media.opengl.GL gl = GetGL();
	247	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	248	+ }
	249	+
	250	+ public void CallList(int id)
	251	+ {
	252	+ javax.media.opengl.GL gl = GetGL();
	253	+ gl.glCallList(id);
	254	+ }
	255	+
	256	+ public void EndList()
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ gl.glEndList();
	260	+ }
	261	+
196	262	public boolean IsBoxMode()
197	263	{
198	264	return BOXMODE;
	265	+ }
	266	+
	267	+ public boolean IsZoomBoxMode()
	268	+ {
	269	+ return ZOOMBOXMODE;
199	270	}
200	271
201	272	public void ClearDepth()
..	..	@@ -293,7 +364,7 @@
293	364	cStatic.objectstack[materialdepth++] = obj;
294	365	//System.out.println("material " + material);
295	366	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	367	+ //display.vector2buffer = obj.projectedVertices;
297	368	if (obj instanceof Camera)
298	369	{
299	370	display.options1[0] = material.shift;
..	..	@@ -302,14 +373,28 @@
302	373	display.options1[2] = material.shadowbias;
303	374	display.options1[3] = material.aniso;
304	375	display.options1[4] = material.anisoV;
	376	+// System.out.println("display.options1[0] " + display.options1[0]);
	377	+// System.out.println("display.options1[1] " + display.options1[1]);
	378	+// System.out.println("display.options1[2] " + display.options1[2]);
	379	+// System.out.println("display.options1[3] " + display.options1[3]);
	380	+// System.out.println("display.options1[4] " + display.options1[4]);
305	381	display.options2[0] = material.opacity;
306	382	display.options2[1] = material.diffuse;
307	383	display.options2[2] = material.factor;
	384	+// System.out.println("display.options2[0] " + display.options2[0]);
	385	+// System.out.println("display.options2[1] " + display.options2[1]);
	386	+// System.out.println("display.options2[2] " + display.options2[2]);
308	387
309	388	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	389	+// System.out.println("display.options3[0] " + display.options3[0]);
	390	+// System.out.println("display.options3[1] " + display.options3[1]);
	391	+// System.out.println("display.options3[2] " + display.options3[2]);
310	392	display.options4[0] = material.cameralight/0.2f;
311	393	display.options4[1] = material.subsurface;
312	394	display.options4[2] = material.sheen;
	395	+// System.out.println("display.options4[0] " + display.options4[0]);
	396	+// System.out.println("display.options4[1] " + display.options4[1]);
	397	+// System.out.println("display.options4[2] " + display.options4[2]);
313	398
314	399	// if (display.CURRENTANTIALIAS > 0)
315	400	// display.options3[3] /= 4;
..	..	@@ -325,7 +410,7 @@
325	410	/**/
326	411	} else
327	412	{
328		- DrawMaterial(material, selected);
	413	+ DrawMaterial(material, selected, obj.projectedVertices);
329	414	}
330	415	} else
331	416	{
..	..	@@ -349,8 +434,8 @@
349	434	cStatic.objectstack[materialdepth++] = obj;
350	435	//System.out.println("material " + material);
351	436	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	437	+ //display.vector2buffer = obj.projectedVertices;
	438	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	439	}
355	440	}
356	441
..	..	@@ -367,8 +452,8 @@
367	452	materialdepth -= 1;
368	453	if (materialdepth > 0)
369	454	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	455	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	456	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	457	}
373	458	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	459	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +473,8 @@
388	473	materialdepth -= 1;
389	474	if (materialdepth > 0)
390	475	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	476	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	477	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	478	}
394	479	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	480	//else
..	..	@@ -430,10 +515,12 @@
430	515	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	516	{
432	517	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	518	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	519	+ // TEST LIVE NORMALS && !obj.dontselect
	520	+ ;
434	521	if (!hasnorm)
435	522	{
436		- // System.out.println("FUCK!!");
	523	+ // System.out.println("Mesh normal");
437	524	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	525	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	526	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +903,7 @@
816	903
817	904	if ((i % 100) == 0 && i != 0)
818	905	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	906	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	907	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	908	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	909	}
..	..	@@ -848,7 +935,7 @@
848	935
849	936	if ((i % 100) == 0 && i != 0)
850	937	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	938	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	939	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	940	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	941	}
..	..	@@ -1061,7 +1148,342 @@
1061	1148	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1149	}
1063	1150
	1151	+ public void DrawBox(cVector min, cVector max)
	1152	+ {
	1153	+ javax.media.opengl.GL gl = GetGL();
	1154	+ gl.glBegin(gl.GL_LINES);
	1155	+
	1156	+ gl.glVertex3d(min.x, min.y, min.z);
	1157	+ gl.glVertex3d(min.x, min.y, max.z);
	1158	+ gl.glVertex3d(min.x, min.y, min.z);
	1159	+ gl.glVertex3d(min.x, max.y, min.z);
	1160	+ gl.glVertex3d(min.x, min.y, min.z);
	1161	+ gl.glVertex3d(max.x, min.y, min.z);
	1162	+
	1163	+ gl.glVertex3d(max.x, max.y, max.z);
	1164	+ gl.glVertex3d(min.x, max.y, max.z);
	1165	+ gl.glVertex3d(max.x, max.y, max.z);
	1166	+ gl.glVertex3d(max.x, min.y, max.z);
	1167	+ gl.glVertex3d(max.x, max.y, max.z);
	1168	+ gl.glVertex3d(max.x, max.y, min.z);
	1169	+
	1170	+ gl.glEnd();
	1171	+ }
	1172	+
	1173	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1174	+ {
	1175	+ int[] strips = bRep.getRawIndices();
	1176	+
	1177	+ javax.media.opengl.GL gl = GetGL();
	1178	+
	1179	+ // TRIANGLE STRIP ARRAY
	1180	+ if (bRep.trimmed)
	1181	+ {
	1182	+ float[] v = bRep.getRawVertices();
	1183	+ float[] n = bRep.getRawNormals();
	1184	+ float[] c = bRep.getRawColors();
	1185	+ float[] uv = bRep.getRawUVMap();
	1186	+
	1187	+ int count2 = 0;
	1188	+ int count3 = 0;
	1189	+
	1190	+ if (n.length > 0)
	1191	+ {
	1192	+ for (int i = 0; i < strips.length; i++)
	1193	+ {
	1194	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1195	+
	1196	+ /*
	1197	+ boolean locked = false;
	1198	+ float eps = 0.1f;
	1199	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1200	+
	1201	+ int dot = 0;
	1202	+
	1203	+ if ((dot&1) == 0)
	1204	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1205	+
	1206	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1207	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1208	+ else
	1209	+ {
	1210	+ locked = true;
	1211	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1212	+ }
	1213	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1214	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1215	+ if (hasnorm)
	1216	+ {
	1217	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1218	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1219	+ }
	1220	+
	1221	+ if ((dot&4) == 0)
	1222	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1223	+
	1224	+ if (wrap \|\| !locked && (dot&8) != 0)
	1225	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1226	+ else
	1227	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1228	+
	1229	+ f.dot = dot;
	1230	+ */
	1231	+
	1232	+ if (!selectmode)
	1233	+ {
	1234	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1235	+ {
	1236	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1237	+ } else
	1238	+ {
	1239	+ gl.glNormal3f(0, 0, 1);
	1240	+ }
	1241	+
	1242	+ if (c != null)
	1243	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1244	+ {
	1245	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1246	+ }
	1247	+ }
	1248	+
	1249	+ if (flipV)
	1250	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1251	+ else
	1252	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1253	+
	1254	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1255	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1256	+
	1257	+ count2 += 2;
	1258	+ count3 += 3;
	1259	+ if (!selectmode)
	1260	+ {
	1261	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1262	+ {
	1263	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1264	+ } else
	1265	+ {
	1266	+ gl.glNormal3f(0, 0, 1);
	1267	+ }
	1268	+ if (c != null)
	1269	+ {
	1270	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1271	+ }
	1272	+ }
	1273	+
	1274	+ if (flipV)
	1275	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1276	+ else
	1277	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1278	+
	1279	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1280	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1281	+
	1282	+ count2 += 2;
	1283	+ count3 += 3;
	1284	+ for (int j = 0; j < strips[i] - 2; j++)
	1285	+ {
	1286	+ //gl.glTexCoord2d(...);
	1287	+ if (!selectmode)
	1288	+ {
	1289	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1290	+ {
	1291	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1292	+ } else
	1293	+ {
	1294	+ gl.glNormal3f(0, 0, 1);
	1295	+ }
	1296	+ if (c != null)
	1297	+ {
	1298	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1299	+ }
	1300	+ }
	1301	+
	1302	+ if (flipV)
	1303	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1304	+ else
	1305	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1306	+
	1307	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1308	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1309	+
	1310	+ count2 += 2;
	1311	+ count3 += 3;
	1312	+ }
	1313	+
	1314	+ gl.glEnd();
	1315	+ }
	1316	+ }
	1317	+
	1318	+ assert count3 == v.length;
	1319	+ }
	1320	+ else // !trimmed
	1321	+ {
	1322	+ int count = 0;
	1323	+ for (int i = 0; i < strips.length; i++)
	1324	+ {
	1325	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1326	+
	1327	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1328	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1329	+
	1330	+ drawVertex(gl, p, flipV, selectmode);
	1331	+ drawVertex(gl, q, flipV, selectmode);
	1332	+
	1333	+ for (int j = 0; j < strips[i] - 2; j++)
	1334	+ {
	1335	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1336	+
	1337	+ // if (j%2 == 0)
	1338	+ // drawFace(p, q, r, display, null);
	1339	+ // else
	1340	+ // drawFace(p, r, q, display, null);
	1341	+
	1342	+ // p = q;
	1343	+ // q = r;
	1344	+ drawVertex(gl, r, flipV, selectmode);
	1345	+ }
	1346	+
	1347	+ gl.glEnd();
	1348	+ }
	1349	+ }
	1350	+ }
	1351	+
	1352	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1353	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1354	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1355	+
	1356	+ public void DrawDynamicMesh(cMesh mesh)
	1357	+ {
	1358	+ GL gl = GetGL(); // getGL();
	1359	+
	1360	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1361	+
	1362	+ gl.glDisable(gl.GL_LIGHTING);
	1363	+
	1364	+ gl.glLineWidth(1);
	1365	+ gl.glColor3f(1,1,1);
	1366	+ gl.glBegin(gl.GL_LINES);
	1367	+ double scale = 0;
	1368	+ int count = 0;
	1369	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1370	+ {
	1371	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1372	+ if(s == 0)
	1373	+ {
	1374	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1375	+ }
	1376	+ if (mesh.showsprings)
	1377	+ {
	1378	+ temp.set(spring.a.position);
	1379	+ temp.add(spring.b.position);
	1380	+ temp.mul(0.5);
	1381	+ temp2.set(spring.a.position);
	1382	+ temp2.sub(spring.b.position);
	1383	+ temp2.mul(spring.restLength/2);
	1384	+ temp.sub(temp2);
	1385	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1386	+ temp.add(temp2);
	1387	+ temp.add(temp2);
	1388	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1389	+ }
	1390	+
	1391	+ if (spring.isHandle)
	1392	+ continue;
	1393	+
	1394	+ //if (scale < spring.restLength)
	1395	+ scale += spring.restLength;
	1396	+ count++;
	1397	+ }
	1398	+ gl.glEnd();
	1399	+
	1400	+ if (count == 0)
	1401	+ scale = 0.01;
	1402	+ else
	1403	+ scale /= count * 3;
	1404	+
	1405	+ //scale = 0.25;
	1406	+
	1407	+ if (mesh.ShowInfo())
	1408	+ {
	1409	+ gl.glLineWidth(4);
	1410	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1411	+ {
	1412	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1413	+ if (node.mass == 0)
	1414	+ continue;
	1415	+
	1416	+ int i = node.springs==null?-1:node.springs.size();
	1417	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1418	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1419	+ //temp.normalize();
	1420	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1421	+ gl.glBegin(gl.GL_LINES);
	1422	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1423	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1424	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1425	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1426	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1427	+ gl.glEnd();
	1428	+ }
	1429	+
	1430	+ gl.glLineWidth(8);
	1431	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1432	+ {
	1433	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1434	+
	1435	+ if (node.springs != null)
	1436	+ {
	1437	+ for (int i=0; i<node.springs.size(); i+=1)
	1438	+ {
	1439	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1440	+
	1441	+ int c = i+1;
	1442	+ // c = node.springs.get(i).nbcopies;
	1443	+
	1444	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1445	+ gl.glBegin(gl.GL_LINES);
	1446	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1447	+ 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);
	1448	+ gl.glEnd();
	1449	+ }
	1450	+ }
	1451	+ }
	1452	+
	1453	+ gl.glLineWidth(1);
	1454	+ }
	1455	+
	1456	+ gl.glEnable(gl.GL_LIGHTING);
	1457	+ }
	1458	+
1064	1459	/// INTERFACE
	1460	+
	1461	+ public void StartTriangles()
	1462	+ {
	1463	+ javax.media.opengl.GL gl = GetGL();
	1464	+ gl.glBegin(gl.GL_TRIANGLES);
	1465	+ }
	1466	+
	1467	+ public void EndTriangles()
	1468	+ {
	1469	+ GetGL().glEnd();
	1470	+ }
	1471	+
	1472	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1473	+ {
	1474	+ if (!selectmode)
	1475	+ {
	1476	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1477	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1478	+
	1479	+ if (flipV)
	1480	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1481	+ else
	1482	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1483	+ }
	1484	+
	1485	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1486	+ }
1065	1487
1066	1488	void SetColor(Object3D obj, Vertex p0)
1067	1489	{
..	..	@@ -1240,7 +1662,7 @@
1240	1662	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1663	}
1242	1664
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1665	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1666	{
1245	1667	CameraPane display = this;
1246	1668	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1678,18 @@
1256	1678	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1679	if (!material.multiply)
1258	1680	{
1259		- display.color = color;
	1681	+ display.color = material.color;
1260	1682	display.saturation = material.modulation;
1261	1683	}
1262	1684	else
1263	1685	{
1264		- display.color = color2;
	1686	+ display.color = material.color2;
1265	1687	display.saturation = material.modulation2;
1266	1688	}
1267	1689
1268	1690	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1691
1270		- float[] colorV = GrafreeD.colorV;
	1692	+ float[] colorV = Grafreed.colorV;
1271	1693
1272	1694	/**/
1273	1695	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1697,7 @@
1275	1697	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1698	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1699	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1700	+ colorV[3] = 1; // material.opacity;
1279	1701
1280	1702	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1703	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1805,9 @@
1383	1805	display.modelParams7[2] = 0;
1384	1806	display.modelParams7[3] = 0;
1385	1807
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1808	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1809
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1810	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1811	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1812	{
1391	1813	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1949,7 @@
1527	1949	void PushMatrix(double[][] matrix)
1528	1950	{
1529	1951	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1952	+ PushMatrix(matrix, 1);
1531	1953	}
1532	1954
1533	1955	void PushMatrix()
..	..	@@ -1624,7 +2046,7 @@
1624	2046
1625	2047	static int camerachangeframe;
1626	2048
1627		- boolean SetCamera(Camera cam)
	2049	+ public boolean SetCamera(Camera cam)
1628	2050	{
1629	2051	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2052	// return false;
..	..	@@ -1681,7 +2103,7 @@
1681	2103	//System.err.println("Oeil on");
1682	2104	OEIL = true;
1683	2105	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2107	//pingthread.StepToTarget(true);
1686	2108	}
1687	2109
..	..	@@ -1752,33 +2174,6 @@
1752	2174	mainDL ^= true;
1753	2175	}
1754	2176
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	2177	void ToggleFullScreen()
1783	2178	{
1784	2179	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2184,94 @@
1789	2184	Globals.CROWD ^= true;
1790	2185	}
1791	2186
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2187	void ToggleLocal()
1798	2188	{
1799	2189	LOCALTRANSFORM ^= true;
1800	2190	}
1801	2191
1802		- void ToggleFast()
	2192	+ public void ToggleTexture()
	2193	+ {
	2194	+ textureon ^= true;
	2195	+ }
	2196	+
	2197	+ public void ToggleLive()
	2198	+ {
	2199	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2200	+
	2201	+ System.err.println("LIVE = " + Globals.isLIVE());
	2202	+
	2203	+ if (!Globals.isLIVE()) // save sound
	2204	+ Grafreed.savesound = true; // wav.save();
	2205	+ // else
	2206	+ repaint(); // start loop // may 2013
	2207	+ }
	2208	+
	2209	+ public void ToggleSupport()
	2210	+ {
	2211	+ SUPPORT ^= true;
	2212	+ }
	2213	+
	2214	+ public void ToggleAbort()
	2215	+ {
	2216	+ ABORTMODE ^= true;
	2217	+ }
	2218	+
	2219	+ public void ToggleInertia()
	2220	+ {
	2221	+ INERTIA ^= true;
	2222	+ }
	2223	+
	2224	+ public void ToggleFast()
1803	2225	{
1804	2226	FAST ^= true;
1805	2227	}
1806	2228
1807		- void ToggleSlowPose()
	2229	+ public void ToggleSlowPose()
1808	2230	{
1809	2231	SLOWPOSE ^= true;
1810	2232	}
1811	2233
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2234	+ public void ToggleBoxMode()
1818	2235	{
1819	2236	BOXMODE ^= true;
1820	2237	}
1821	2238
1822		- void ToggleSmoothFocus()
	2239	+ public void ToggleZoomBoxMode()
	2240	+ {
	2241	+ ZOOMBOXMODE ^= true;
	2242	+ }
	2243	+
	2244	+ public void ToggleSmoothFocus()
1823	2245	{
1824	2246	SMOOTHFOCUS ^= true;
1825	2247	}
1826	2248
1827		- void ToggleImageFlip()
	2249	+ public void ToggleImageFlip()
1828	2250	{
1829	2251	IMAGEFLIP ^= true;
1830	2252	}
1831	2253
1832		- void ToggleSpeakerMocap()
	2254	+ public void ToggleSpeakerMocap()
1833	2255	{
1834	2256	SPEAKERMOCAP ^= true;
1835	2257	}
1836	2258
1837		- void ToggleSpeakerCamera()
	2259	+ public void ToggleSpeakerCamera()
1838	2260	{
1839	2261	SPEAKERCAMERA ^= true;
1840	2262	}
1841	2263
1842		- void ToggleSpeakerFocus()
	2264	+ public void ToggleSpeakerFocus()
1843	2265	{
1844	2266	SPEAKERFOCUS ^= true;
1845	2267	}
1846	2268
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2269	+ public void ToggleFrustum()
1853	2270	{
1854	2271	FRUSTUM ^= true;
1855	2272	}
1856	2273
1857		- void ToggleTrack()
	2274	+ public void ToggleTrack()
1858	2275	{
1859	2276	TRACK ^= true;
1860	2277	if (TRACK)
..	..	@@ -1873,25 +2290,35 @@
1873	2290	repaint();
1874	2291	}
1875	2292
1876		- void ToggleTrackOnce()
	2293	+ public void ToggleTrackOnce()
1877	2294	{
1878	2295	TRACKONCE ^= true;
1879	2296	}
1880	2297
1881		- void ToggleShadowTrack()
	2298	+ public void ToggleShadowTrack()
1882	2299	{
1883	2300	SHADOWTRACK ^= true;
1884	2301	repaint();
1885	2302	}
1886	2303
1887		- void ToggleOeil()
	2304	+ public void ToggleOeil()
1888	2305	{
1889	2306	OEIL ^= true;
1890	2307	}
1891	2308
1892		- void ToggleOeilOnce()
	2309	+ public void ToggleOeilOnce()
1893	2310	{
1894	2311	OEILONCE ^= true;
	2312	+ }
	2313	+
	2314	+ void ToggleFootContact()
	2315	+ {
	2316	+ FOOTCONTACT ^= true;
	2317	+ }
	2318	+
	2319	+ void ToggleDebug()
	2320	+ {
	2321	+ Globals.DEBUG ^= true;
1895	2322	}
1896	2323
1897	2324	void ToggleLookAt()
..	..	@@ -1899,9 +2326,9 @@
1899	2326	LOOKAT ^= true;
1900	2327	}
1901	2328
1902		- void ToggleRandom()
	2329	+ void ToggleSwitch()
1903	2330	{
1904		- RANDOM ^= true;
	2331	+ SWITCH ^= true;
1905	2332	}
1906	2333
1907	2334	void ToggleHandles()
..	..	@@ -1909,10 +2336,17 @@
1909	2336	HANDLES ^= true;
1910	2337	}
1911	2338
	2339	+ Object3D paintFolder;
	2340	+
1912	2341	void TogglePaint()
1913	2342	{
1914	2343	PAINTMODE ^= true;
1915	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
1916	2350	}
1917	2351
1918	2352	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2442,22 @@
2008	2442	{
2009	2443	return currentGL;
2010	2444	}
2011		-
	2445	+
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
2012	2461	/**/
2013	2462	class CacheTexture
2014	2463	{
..	..	@@ -2017,28 +2466,31 @@
2017	2466
2018	2467	int resolution;
2019	2468
2020		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2021	2470	{
2022		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2023	2473	resolution = res;
2024	2474	}
2025	2475	}
2026	2476	/**/
2027	2477
2028	2478	// 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>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2032	2484	int pigmentdepth = 0;
2033	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2486	int bumpdepth = 0;
2035	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2036	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2037	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2038		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2039	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2040	2492
2041		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2042	2494	{
2043	2495	TextureData texturedata = null;
2044	2496
..	..	@@ -2057,13 +2509,34 @@
2057	2509	if (bump)
2058	2510	texturedata = ConvertBump(texturedata, false);
2059	2511
2060		- com.sun.opengl.util.texture.Texture texture =
2061		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2062	2514
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);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2065	2517
2066		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2067	2540	}
2068	2541
2069	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3136,6 +3609,8 @@
3136	3609
3137	3610	System.out.println("LOADING TEXTURE : " + name);
3138	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3139	3614	//
3140	3615	if (false) // compressbit > 0)
3141	3616	{
..	..	@@ -3840,6 +4315,7 @@
3840	4315
3841	4316	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4317	{
	4318	+ new Exception().printStackTrace();
3843	4319	System.exit(0);
3844	4320	com.sun.opengl.util.texture.Texture texture = null;
3845	4321
..	..	@@ -7533,7 +8009,7 @@
7533	8009	String pigment = Object3D.GetPigment(tex);
7534	8010	String bump = Object3D.GetBump(tex);
7535	8011
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	8013	{
7538	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	8015	// System.out.println("; bump = " + bump);
..	..	@@ -7548,11 +8024,69 @@
7548	8024	pigment = null;
7549	8025	}
7550	8026
7551		- ReleaseTexture(bump, true);
7552		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
7553	8029	}
7554	8030
7555		- void ReleaseTexture(String tex, boolean bump)
	8031	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8032	+ {
	8033	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8034	+ {
	8035	+ return;
	8036	+ }
	8037	+
	8038	+ if (tex == null)
	8039	+ {
	8040	+ ReleaseTexture(null, false);
	8041	+ return;
	8042	+ }
	8043	+
	8044	+ String pigment = Object3D.GetPigment(tex);
	8045	+
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8047	+ {
	8048	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8049	+ // System.out.println("; bump = " + bump);
	8050	+ }
	8051	+
	8052	+ if (pigment.equals(""))
	8053	+ {
	8054	+ pigment = null;
	8055	+ }
	8056	+
	8057	+ ReleaseTexture(tex, false);
	8058	+ }
	8059	+
	8060	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8061	+ {
	8062	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8063	+ {
	8064	+ return;
	8065	+ }
	8066	+
	8067	+ if (tex == null)
	8068	+ {
	8069	+ ReleaseTexture(null, true);
	8070	+ return;
	8071	+ }
	8072	+
	8073	+ String bump = Object3D.GetBump(tex);
	8074	+
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ {
	8077	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8078	+ // System.out.println("; bump = " + bump);
	8079	+ }
	8080	+
	8081	+ if (bump.equals(""))
	8082	+ {
	8083	+ bump = null;
	8084	+ }
	8085	+
	8086	+ ReleaseTexture(tex, true);
	8087	+ }
	8088	+
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
7556	8090	{
7557	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7558	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7563,7 +8097,7 @@
7563	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7564	8098
7565	8099	if (tex != null)
7566		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7567	8101
7568	8102	// //assert( texture != null );
7569	8103	// if (texture == null)
..	..	@@ -7655,7 +8189,55 @@
7655	8189	}
7656	8190	}
7657	8191
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8192	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8193	+ {
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
	8235	+
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
	8238	+ }
	8239	+
	8240	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8241	{
7660	8242	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8243	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7666,17 +8248,47 @@
7666	8248	if (tex == null)
7667	8249	{
7668	8250	BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
7670	8251	return;
7671	8252	}
7672	8253
7673	8254	String pigment = Object3D.GetPigment(tex);
	8255	+
	8256	+ usedtextures.add(tex);
	8257	+
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8259	+ {
	8260	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8261	+ // System.out.println("; bump = " + bump);
	8262	+ }
	8263	+
	8264	+ if (pigment.equals(""))
	8265	+ {
	8266	+ pigment = null;
	8267	+ }
	8268	+
	8269	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8270	+ BindTexture(tex, false, resolution);
	8271	+ }
	8272	+
	8273	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,true,resolution);
	8284	+ return;
	8285	+ }
	8286	+
7674	8287	String bump = Object3D.GetBump(tex);
7675	8288
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
7678	8290
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8292	{
7681	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8294	// System.out.println("; bump = " + bump);
..	..	@@ -7686,43 +8298,94 @@
7686	8298	{
7687	8299	bump = null;
7688	8300	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8301
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
7698	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8305	}
7702	8306
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8307	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8308	+
	8309	+ private boolean FileExists(String tex)
7704	8310	{
7705		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8311	+ if (missingTextures.contains(tex))
	8312	+ {
	8313	+ return false;
	8314	+ }
	8315	+
	8316	+ boolean fileExists = new File(tex).exists();
	8317	+
	8318	+ if (!fileExists)
	8319	+ {
	8320	+ // If file exists, the "new File()" is not executed sgain
	8321	+ missingTextures.add(tex);
	8322	+ }
	8323	+
	8324	+ return fileExists;
	8325	+ }
	8326	+
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8328	+ {
	8329	+ CacheTexture texturecache = null;
7706	8330
7707	8331	if (tex != null)
7708	8332	{
7709		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7710	8335
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;
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
	8340	+
	8341	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8342	+
	8343	+// String[] split = tex.split("Textures");
	8344	+// if (split.length > 1)
	8345	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8346	+// else
	8347	+// if (!texname.startsWith("/"))
	8348	+// texname = "/Users/nbriere/Textures/" + texname;
	8349	+ if (!FileExists(texname))
	8350	+ {
	8351	+ texname = fallbackTextureName;
	8352	+ }
7717	8353
7718	8354	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	8355	{
7725		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8389	{
7727	8390	assert(!bump);
7728	8391	// if (bump)
..	..	@@ -7733,19 +8396,23 @@
7733	8396	// }
7734	8397	// else
7735	8398	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
7738	8401	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
7741	8406	// }
7742	8407	} else
7743		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8409	{
7745	8410	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
7749	8416	} else
7750	8417	{
7751	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,11 +8420,13 @@
7753	8420	// texture = GetResourceTexture("default.png");
7754	8421	//} else
7755	8422	//{
7756		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
7757	8424	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
7761	8430	} else
7762	8431	{
7763	8432	if (textureon)
..	..	@@ -7782,7 +8451,7 @@
7782	8451	}
7783	8452
7784	8453	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8454	+ if (!FileExists(cachename))
7786	8455	cachename = texname;
7787	8456	else
7788	8457	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8473,7 @@
7804	8473	}
7805	8474
7806	8475	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8476	+ if (!FileExists(cachename))
7808	8477	cachename = texname;
7809	8478	else
7810	8479	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8482,22 @@
7813	8482	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8483
7815	8484
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8485	+ if (texturedata == null)
	8486	+ throw new Exception();
	8487	+
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
7818	8489	//texture = GetTexture(tex, bump);
7819	8490	}
7820	8491	}
7821	8492	//}
7822	8493	}
7823	8494
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7825	8496	{
7826	8497	//return false;
7827	8498
7828	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8501	{
7831	8502	// String ext = "_highres";
7832	8503	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8514,17 @@
7843	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8515	if (!cachefile.exists())
7845	8516	{
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))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8518	{
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);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
7886	8521	ImageWriter writer = null;
7887	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8523	if (iter.hasNext()) {
7889	8524	writer = (ImageWriter)iter.next();
7890	8525	}
7891		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
7892	8528	try
7893	8529	{
7894	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7905,18 +8541,20 @@
7905	8541	}
7906	8542	}
7907	8543	}
7908		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
7909	8547	//System.out.println("Texture = " + tex);
7910		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
7911	8549	{
7912		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
7913	8551	thetex.texture.disable();
7914	8552	thetex.texture.dispose();
7915		- textures.remove(texname);
	8553	+ textures.remove(tex);
7916	8554	}
7917	8555
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
7920	8558
7921	8559	// newtex = true;
7922	8560	}
..	..	@@ -7932,10 +8570,44 @@
7932	8570	}
7933	8571	}
7934	8572
7935		- return texture;
	8573	+ return texturecache;
7936	8574	}
7937	8575
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7939	8611	{
7940	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8613
..	..	@@ -7953,21 +8625,21 @@
7953	8625	return texture!=null?texture.texture:null;
7954	8626	}
7955	8627
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7957	8629	{
7958	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8631
7960	8632	return texture!=null?texture.texturedata:null;
7961	8633	}
7962	8634
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7964	8636	{
7965	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8638	{
7967	8639	return false;
7968	8640	}
7969	8641
7970		- boolean newtex = false;
	8642	+ //boolean newtex = false;
7971	8643
7972	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7973	8645
..	..	@@ -7999,9 +8671,75 @@
7999	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8673
8002		- return newtex;
	8674	+ return true; // Warning: not used.
8003	8675	}
8004	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8005	8743	ShadowBuffer shadowPBuf;
8006	8744	AntialiasBuffer antialiasPBuf;
8007	8745	int MAXSTACK;
..	..	@@ -8837,11 +9575,35 @@
8837	9575	jy8[3] = 0.5f;
8838	9576	}
8839	9577
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9578	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9580	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9581	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9582
	9583	+ void ResetOptions()
	9584	+ {
	9585	+ options1[0] = 100;
	9586	+ options1[1] = 0.025f;
	9587	+ options1[2] = 0.01f;
	9588	+ options1[3] = 0;
	9589	+ options1[4] = 0;
	9590	+
	9591	+ options2[0] = 0;
	9592	+ options2[1] = 0.75f;
	9593	+ options2[2] = 0;
	9594	+ options2[3] = 0;
	9595	+
	9596	+ options3[0] = 1;
	9597	+ options3[1] = 1;
	9598	+ options3[2] = 1;
	9599	+ options3[3] = 0;
	9600	+
	9601	+ options4[0] = 1;
	9602	+ options4[1] = 0;
	9603	+ options4[2] = 1;
	9604	+ options4[3] = 0;
	9605	+ }
	9606	+
8845	9607	static int imagecount = 0; // movie generation
8846	9608
8847	9609	static int jitter = 0;
..	..	@@ -8937,8 +9699,8 @@
8937	9699	assert (parentcam != renderCamera);
8938	9700
8939	9701	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9702	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8942	9704
8943	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9706
..	..	@@ -8953,8 +9715,8 @@
8953	9715	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9716
8955	9717	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9718	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8958	9720
8959	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9722
..	..	@@ -9026,7 +9788,7 @@
9026	9788	//gl.glFlush();
9027	9789	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9790
9029		- if (ANIMATION && ABORTED)
	9791	+ if (Globals.ANIMATION && ABORTED)
9030	9792	{
9031	9793	System.err.println(" ABORTED FRAME");
9032	9794	break;
..	..	@@ -9056,7 +9818,7 @@
9056	9818	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9819
9058	9820	// save image
9059		- if (ANIMATION && !ABORTED)
	9821	+ if (Globals.ANIMATION && !ABORTED)
9060	9822	{
9061	9823	VPwidth = viewport[2];
9062	9824	VPheight = viewport[3];
..	..	@@ -9167,11 +9929,11 @@
9167	9929
9168	9930	// imagecount++;
9169	9931
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9932	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9933
9172	9934	if (!BOXMODE)
9173	9935	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9936	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9937	}
9176	9938
9177	9939	if (!BOXMODE)
..	..	@@ -9209,7 +9971,7 @@
9209	9971	ABORTED = false;
9210	9972	}
9211	9973	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9974	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	9975
9214	9976	if (false)
9215	9977	{
..	..	@@ -9872,11 +10634,11 @@
9872	10634
9873	10635	public void display(GLAutoDrawable drawable)
9874	10636	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10637	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10638	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10639	+ Grafreed.wav.save();
	10640	+ Grafreed.savesound = false;
	10641	+ Grafreed.hassound = false;
9880	10642	}
9881	10643	// if (DEBUG_SELECTION)
9882	10644	// {
..	..	@@ -9952,6 +10714,7 @@
9952	10714	ANTIALIAS = 0;
9953	10715	//System.out.println("RESTART");
9954	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
9955	10718	}
9956	10719	}
9957	10720	}
..	..	@@ -10006,7 +10769,7 @@
10006	10769	Object3D theobject = object;
10007	10770	Object3D theparent = object.parent;
10008	10771	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10772	+ object = (Object3D)Grafreed.clone(object);
10010	10773	object.Stripify();
10011	10774	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10775	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10782,14 @@
10019	10782	ambientOcclusion = false;
10020	10783	}
10021	10784
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10787	{
10024	10788	//if (RENDERSHADOW) // ?
10025	10789	if (!IsFrozen())
10026	10790	{
10027	10791	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10792	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10793	{
10030	10794	Globals.framecount++;
10031	10795	shadowbuffer.display();
..	..	@@ -10152,8 +10916,8 @@
10152	10916
10153	10917	// if (parentcam != renderCamera) // not a light
10154	10918	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10919	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10157	10921
10158	10922	for (int j = 0; j < 4; j++)
10159	10923	{
..	..	@@ -10167,8 +10931,8 @@
10167	10931
10168	10932	// if (parentcam != renderCamera) // not a light
10169	10933	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10934	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10172	10936
10173	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10938
..	..	@@ -10427,7 +11191,16 @@
10427	11191	// Bump noise
10428	11192	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11193	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11194	+
	11195	+ try
	11196	+ {
	11197	+ BindTexture(NOISE_TEXTURE, false, 2);
	11198	+ }
	11199	+ catch (Exception e)
	11200	+ {
	11201	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11202	+ }
	11203	+
10431	11204
10432	11205	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11206	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11223,9 @@
10450	11223
10451	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11225
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11229	} else
10457	11230	{
10458	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11236,7 @@
10463	11236	//System.out.println("BLENDING ON");
10464	11237	gl.glEnable(GL.GL_BLEND);
10465	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11240	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11241	gl.glLoadIdentity();
10469	11242
..	..	@@ -10552,8 +11325,8 @@
10552	11325	System.err.println("parentcam != renderCamera");
10553	11326
10554	11327	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11328	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11329	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557	11330	}
10558	11331
10559	11332	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11347,8 @@
10574	11347	if (true) // TODO
10575	11348	{
10576	11349	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11350	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11351	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11352	}
10580	11353
10581	11354	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10712,7 +11485,7 @@
10712	11485	}
10713	11486	}
10714	11487
10715		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10716	11489	{
10717	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
10718	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10720,24 +11493,21 @@
10720	11493
10721	11494	boolean texon = textureon;
10722	11495
10723		- if (RENDERPROGRAM > 0)
10724		- {
10725		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10726		- textureon = false;
10727		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
10728	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10729	11500	//System.out.println("ALLO");
10730	11501	gl.glColorMask(false, false, false, false);
10731	11502	DrawObject(gl);
10732		- if (RENDERPROGRAM > 0)
10733		- {
10734		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10735		- textureon = texon;
10736		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
10737	11507	gl.glColorMask(true, true, true, true);
10738	11508
10739	11509	gl.glDepthFunc(GL.GL_EQUAL);
10740		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
10741	11511	}
10742	11512
10743	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -10891,8 +11661,14 @@
10891	11661	{
10892	11662	renderpass++;
10893	11663	// System.out.println("Draw object... ");
	11664	+ STEP = 1;
10894	11665	if (FAST) // in case there is no script
10895		- STEP = 16;
	11666	+ STEP = 8;
	11667	+
	11668	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11669	+ {
	11670	+ STEP *= 4;
	11671	+ }
10896	11672
10897	11673	//object.FullInvariants();
10898	11674
..	..	@@ -10906,23 +11682,44 @@
10906	11682	e.printStackTrace();
10907	11683	}
10908	11684
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11685	+ if (Grafreed.RENDERME > 0)
	11686	+ Grafreed.RENDERME--; // mechante magouille
10911	11687
10912	11688	Globals.ONESTEP = false;
10913	11689	}
10914	11690
10915	11691	static boolean zoomonce = false;
10916	11692
	11693	+ static void CreateSelectedPoint()
	11694	+ {
	11695	+ if (selectedpoint == null)
	11696	+ {
	11697	+ debugpointG = new Sphere();
	11698	+ debugpointP = new Sphere();
	11699	+ debugpointC = new Sphere();
	11700	+ debugpointR = new Sphere();
	11701	+
	11702	+ selectedpoint = new Superellipsoid();
	11703	+
	11704	+ for (int i=0; i<8; i++)
	11705	+ {
	11706	+ debugpoints[i] = new Sphere();
	11707	+ }
	11708	+ }
	11709	+ }
	11710	+
10917	11711	void DrawObject(GL gl, boolean draw)
10918	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
10919	11716	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11717	// DrawMode() = SELECTION;
10921	11718	//GL gl = getGL();
10922	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11720	{
10924	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11723	pingthread.StepToTarget(true); // true);
10927	11724	// zoomonce = false;
10928	11725	}
..	..	@@ -10977,7 +11774,14 @@
10977	11774
10978	11775	usedtextures.clear();
10979	11776
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11777	+ try
	11778	+ {
	11779	+ BindTextures(DEFAULT_TEXTURES, 2);
	11780	+ }
	11781	+ catch (Exception e)
	11782	+ {
	11783	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11784	+ }
10981	11785	}
10982	11786	//System.out.println("--> " + stackdepth);
10983	11787	// GrafreeD.traceon();
..	..	@@ -10987,8 +11791,9 @@
10987	11791
10988	11792	if (DrawMode() == DEFAULT)
10989	11793	{
10990		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
10991	11795	{
	11796	+ CreateSelectedPoint();
10992	11797	float radius = 0.05f;
10993	11798	if (selectedpoint.radius != radius)
10994	11799	{
..	..	@@ -11042,20 +11847,32 @@
11042	11847	ReleaseTextures(DEFAULT_TEXTURES);
11043	11848
11044	11849	if (CLEANCACHE)
11045		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11046	11851	{
11047		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11048	11853
11049	11854	// System.out.println("Texture --------- " + tex);
11050	11855
11051		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11052	11857	continue;
11053	11858
11054		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11055	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11056	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057		- textures.get(tex).texture.dispose();
11058		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11059	11876	}
11060	11877	}
11061	11878	}
..	..	@@ -11068,7 +11885,14 @@
11068	11885	if (checker != null && DrawMode() == DEFAULT)
11069	11886	{
11070	11887	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11888	+ try
	11889	+ {
	11890	+ BindTextures(checker.GetTextures(), checker.texres);
	11891	+ }
	11892	+ catch (Exception e)
	11893	+ {
	11894	+ System.err.println("FAILED: " + checker.GetTextures());
	11895	+ }
11072	11896	// NEAREST
11073	11897	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11898	DrawChecker(gl);
..	..	@@ -11150,7 +11974,7 @@
11150	11974	return;
11151	11975	}
11152	11976
11153		- String string = obj.GetToolTip();
	11977	+ String string = obj.toString(); //.GetToolTip();
11154	11978
11155	11979	GL gl = GetGL();
11156	11980
..	..	@@ -11467,8 +12291,8 @@
11467	12291	//obj.TransformToWorld(light, light);
11468	12292	for (int i = tp.size(); --i >= 0;)
11469	12293	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12294	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12296	}
11473	12297
11474	12298
..	..	@@ -11485,8 +12309,8 @@
11485	12309	parentcam = cameras[0];
11486	12310	}
11487	12311
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12312	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12313	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12314
11491	12315	LA.xformPos(light, renderCamera.toScreen, light);
11492	12316
..	..	@@ -11577,7 +12401,74 @@
11577	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11578	12402
11579	12403	String program =
	12404	+ // Min shader
11580	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
11581	12472	//"OPTION ARB_fragment_program_shadow;" +
11582	12473	"PARAM light2cam0 = program.env[10];" +
11583	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11692,8 +12583,7 @@
11692	12583	"TEMP shininess;" +
11693	12584	"\n" +
11694	12585	"MOV texSamp, one;" +
11695		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11696		-
	12586	+
11697	12587	"MOV mapgrid.x, one2048th.x;" +
11698	12588	"MOV temp, fragment.texcoord[1];" +
11699	12589	/*
..	..	@@ -11714,20 +12604,20 @@
11714	12604	"MUL temp, floor, mapgrid.x;" +
11715	12605	//"TEX depth0, temp, texture[1], 2D;" +
11716	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11717		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
11718	12608	"") +
11719	12609	"ADD temp.x, temp.x, mapgrid.x;" +
11720	12610	//"TEX depth1, temp, texture[1], 2D;" +
11721	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11722		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
11723	12613	"") +
11724	12614	"ADD temp.y, temp.y, mapgrid.x;" +
11725	12615	//"TEX depth2, temp, texture[1], 2D;" +
11726		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
11727	12617	"SUB temp.x, temp.x, mapgrid.x;" +
11728	12618	//"TEX depth3, temp, texture[1], 2D;" +
11729	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11730		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
11731	12621	"") +
11732	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11733	12623	//"MOV params, material;" +
..	..	@@ -12098,10 +12988,10 @@
12098	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12099	12989	"") +
12100	12990
12101		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12102	12992	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	12993	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12994	+ "SLT temp.z, temp.y, -one2048th.x;" +
12105	12995	"SUB temp.y, one.x, temp.z;" +
12106	12996	"MUL temp.x, temp.x, temp.y;" +
12107	12997	"KIL temp.x;" +
..	..	@@ -12230,8 +13120,10 @@
12230	13120	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	13121
12232	13122	"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
	13123	+ // Tuning for default skin
	13124	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13125	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13126	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	13127	"MUL temp.x, temp.x, temp.y;" +
12236	13128
12237	13129	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13322,7 @@
12430	13322	//once = true;
12431	13323	}
12432	13324
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13325	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13326	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13327	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13328
..	..	@@ -12523,25 +13415,26 @@
12523	13415	return out;
12524	13416	}
12525	13417
12526		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
12527	13420	{
12528	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12529	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12530	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12531	13426	"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;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12536	13429	//"SWZ buffer, temp, w,w,w,w;";
12537		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12538	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12539	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12540	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12541		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12542	13435
12543		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12544		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12545	13438	}
12546	13439
12547	13440	String Shadow(String depth, String shadow)
..	..	@@ -12563,12 +13456,16 @@
12563	13456
12564	13457	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13458	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13459	+
	13460	+ // Compare fragment depth in light space with shadowmap.
12566	13461	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13462	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13463	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13464	+
	13465	+ // Reverse comparison
12569	13466	"SUB temp.x, one.x, temp.x;" +
12570	13467	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13468	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13469	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13470
12574	13471	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13479,10 @@
12582	13479	// No shadow for backface
12583	13480	"DP3 temp.x, normal, lightd;" +
12584	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13482	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13483	+
	13484	+ // No shadow when out of frustum
	13485	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13487	"";
12587	13488	}
..	..	@@ -12728,7 +13629,8 @@
12728	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
12732	13634
12733	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13636	// OUT : diff, spec
..	..	@@ -12744,9 +13646,10 @@
12744	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13648	//"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;" +
	13649	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13650	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13651	+
	13652	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13654	"RCP " + dest + ".w," + dest + ".w;" +
12752	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +14043,7 @@
13140	14043	public void mousePressed(MouseEvent e)
13141	14044	{
13142	14045	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14046	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	14047	}
13145	14048
13146	14049	static long prevtime = 0;
..	..	@@ -13167,6 +14070,7 @@
13167	14070
13168	14071	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	14072
	14073	+ if (BUTTONLESSWHEEL)
13170	14074	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	14075	{
13172	14076	return;
..	..	@@ -13175,7 +14079,7 @@
13175	14079	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	14080
13177	14081	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14082	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	14083	{
13180	14084	keepboxmode = BOXMODE;
13181	14085	keepsupport = SUPPORT;
..	..	@@ -13215,8 +14119,8 @@
13215	14119	// mode \|= META;
13216	14120	//}
13217	14121
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14122	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14123	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	14124	anchorX = ax;
13221	14125	anchorY = ay;
13222	14126	prevX = px;
..	..	@@ -13250,6 +14154,7 @@
13250	14154	else
13251	14155	if (evt.getSource() == AAtimer)
13252	14156	{
	14157	+ Globals.TIMERRUNNING = false;
13253	14158	if (mouseDown)
13254	14159	{
13255	14160	//new Exception().printStackTrace();
..	..	@@ -13275,6 +14180,10 @@
13275	14180	// LIVE = waslive;
13276	14181	// wasliveok = true;
13277	14182	// waslive = false;
	14183	+
	14184	+ // May 2019 Forget it:
	14185	+ if (true)
	14186	+ return;
13278	14187
13279	14188	// source == timer
13280	14189	if (mouseDown)
..	..	@@ -13305,7 +14214,7 @@
13305	14214
13306	14215	// fev 2014???
13307	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14218	pingthread.StepToTarget(true); // true);
13310	14219	}
13311	14220	// if (!LIVE)
..	..	@@ -13314,12 +14223,13 @@
13314	14223
13315	14224	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14225
13317		- void clickStart(int x, int y, int modifiers)
	14226	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14227	{
13319	14228	if (!wasliveok)
13320	14229	return;
13321	14230
13322	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
13323	14233
13324	14234	// waslive = LIVE;
13325	14235	// LIVE = false;
..	..	@@ -13331,7 +14241,7 @@
13331	14241	// touched = true; // main DL
13332	14242	if (isRenderer)
13333	14243	{
13334		- SetMouseMode(modifiers);
	14244	+ SetMouseMode(modifiers, modifiersex);
13335	14245	}
13336	14246
13337	14247	selectX = anchorX = x;
..	..	@@ -13344,7 +14254,7 @@
13344	14254	clicked = true;
13345	14255	hold = false;
13346	14256
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14257	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14258	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14259	{
13350	14260	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13369,14 +14279,15 @@
13369	14279	drag = false;
13370	14280	//System.out.println("Mouse DOWN");
13371	14281	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);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
13380	14291	if (!editObj)
13381	14292	{
13382	14293	hasMarquee = true;
..	..	@@ -13392,11 +14303,14 @@
13392	14303
13393	14304	public void mouseDragged(MouseEvent e)
13394	14305	{
	14306	+ Globals.MOUSEDRAGGED = true;
	14307	+
	14308	+ //System.out.println("mouseDragged: " + e);
13395	14309	if (isRenderer)
13396	14310	movingcamera = true;
	14311	+
13397	14312	//if (drawing)
13398	14313	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14314	if ((e.getModifiersEx() & CTRL) != 0
13401	14315	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14316	{
..	..	@@ -13404,7 +14318,7 @@
13404	14318	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14319	}
13406	14320	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14321	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14322
13409	14323	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14324	}
..	..	@@ -13577,6 +14491,7 @@
13577	14491
13578	14492	public void run()
13579	14493	{
	14494	+ new Exception().printStackTrace();
13580	14495	System.exit(0);
13581	14496	for (;;)
13582	14497	{
..	..	@@ -13640,7 +14555,7 @@
13640	14555	{
13641	14556	Globals.lighttouched = true;
13642	14557	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14558	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14559	}
13645	14560	//else
13646	14561	}
..	..	@@ -13654,12 +14569,12 @@
13654	14569	void GoDown(int mod)
13655	14570	{
13656	14571	MODIFIERS \|= COMMAND;
13657		- /*
	14572	+ /**/
13658	14573	if((mod&SHIFT) == SHIFT)
13659	14574	manipCamera.RotatePosition(0, -speed);
13660	14575	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
13663	14578	if ((mod & SHIFT) == SHIFT)
13664	14579	{
13665	14580	mouseMode = mouseMode; // VR??
..	..	@@ -13675,12 +14590,12 @@
13675	14590	void GoUp(int mod)
13676	14591	{
13677	14592	MODIFIERS \|= COMMAND;
13678		- /*
	14593	+ /**/
13679	14594	if((mod&SHIFT) == SHIFT)
13680	14595	manipCamera.RotatePosition(0, speed);
13681	14596	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
13684	14599	if ((mod & SHIFT) == SHIFT)
13685	14600	{
13686	14601	mouseMode = mouseMode;
..	..	@@ -13696,12 +14611,12 @@
13696	14611	void GoLeft(int mod)
13697	14612	{
13698	14613	MODIFIERS \|= COMMAND;
13699		- /*
	14614	+ /**/
13700	14615	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
13702		- else
13703	14616	manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
13705	14620	if ((mod & SHIFT) == SHIFT)
13706	14621	{
13707	14622	mouseMode = mouseMode;
..	..	@@ -13717,12 +14632,12 @@
13717	14632	void GoRight(int mod)
13718	14633	{
13719	14634	MODIFIERS \|= COMMAND;
13720		- /*
	14635	+ /**/
13721	14636	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
13723		- else
13724	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
13726	14641	if ((mod & SHIFT) == SHIFT)
13727	14642	{
13728	14643	mouseMode = mouseMode;
..	..	@@ -13740,7 +14655,7 @@
13740	14655	int X, Y;
13741	14656	boolean SX, SY;
13742	14657
13743		- void drag(int x, int y, int modifiers)
	14658	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14659	{
13745	14660	if (IsFrozen())
13746	14661	{
..	..	@@ -13749,17 +14664,17 @@
13749	14664
13750	14665	drag = true; // NEW
13751	14666
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14667	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14668
13754	14669	X = x;
13755	14670	Y = y;
13756	14671	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14672	+ MODIFIERS = modifiersex;
	14673	+ modifiersex &= ~1024;
13759	14674	if (false) // modifiers != 0)
13760	14675	{
13761	14676	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14677	+ System.out.println("mouseDragged: " + modifiersex);
13763	14678	System.out.println("SHIFT = " + SHIFT);
13764	14679	System.out.println("CONTROL = " + COMMAND);
13765	14680	System.out.println("META = " + META);
..	..	@@ -13772,14 +14687,16 @@
13772	14687	if (editObj)
13773	14688	{
13774	14689	drag = true;
13775		- ClickInfo info = new ClickInfo();
13776		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
13777	14692	(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);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14700	} else
13784	14701	{
13785	14702	if (x < startX)
..	..	@@ -13928,23 +14845,27 @@
13928	14845	}
13929	14846	}
13930	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
13931	14850	public void mouseMoved(MouseEvent e)
13932	14851	{
13933	14852	//System.out.println("mouseMoved: " + e);
13934		-
13935	14853	if (isRenderer)
13936	14854	return;
13937	14855
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;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
13945	14863	if (!isRenderer)
13946	14864	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
13948	14869	{
13949	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14871	} else
..	..	@@ -13956,7 +14877,11 @@
13956	14877
13957	14878	public void mouseReleased(MouseEvent e)
13958	14879	{
	14880	+ Globals.MOUSEDRAGGED = false;
	14881	+
13959	14882	movingcamera = false;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
13960	14885	//System.out.println("mouseReleased: " + e);
13961	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14887	}
..	..	@@ -13979,9 +14904,9 @@
13979	14904	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14905	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14906
13982		- if (control \|\| command \|\| IsFrozen())
	14907	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14908	timeout = true;
13984		- else
	14909	+// ?? May 2019 else
13985	14910	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14911	mouseDown = false;
13987	14912	if (!control && !command) // june 2013
..	..	@@ -14091,7 +15016,7 @@
14091	15016	System.out.println("keyReleased: " + e);
14092	15017	}
14093	15018
14094		- void SetMouseMode(int modifiers)
	15019	+ void SetMouseMode(int modifiers, int modifiersex)
14095	15020	{
14096	15021	//System.out.println("SetMouseMode = " + modifiers);
14097	15022	//modifiers &= ~1024;
..	..	@@ -14103,25 +15028,25 @@
14103	15028	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	15029	// return;
14105	15030	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	15031	+ if ((modifiersex & WHEEL) == WHEEL)
14107	15032	{
14108	15033	mouseMode \|= ZOOM;
14109	15034	}
14110	15035
14111	15036	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	15037	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	15038	{
14114	15039	mouseMode \|= VR; // BACKFORTH;
14115	15040	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15041	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	15042	{
14118	15043	mouseMode \|= SELECT;
14119	15044	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	15045	+ if ((modifiersex & COMMAND) == COMMAND)
14121	15046	{
14122	15047	mouseMode \|= SELECT;
14123	15048	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15049	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	15050	{
14126	15051	mouseMode &= ~VR;
14127	15052	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +15075,10 @@
14150	15075
14151	15076	if (isRenderer) //
14152	15077	{
14153		- SetMouseMode(modifiers);
	15078	+ SetMouseMode(0, modifiers);
14154	15079	}
14155	15080
14156		- theRenderer.keyPressed(key);
	15081	+ Globals.theRenderer.keyPressed(key);
14157	15082	}
14158	15083
14159	15084	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +15090,7 @@
14165	15090	float SATPOW = 1; // 2; // 0.5f;
14166	15091	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	15092
14168		- void keyPressed(int key)
	15093	+ public void keyPressed(int key)
14169	15094	{
14170	15095	if (key >= '0' && key <= '5')
14171	15096	clampbit = (key-'0');
..	..	@@ -14212,7 +15137,8 @@
14212	15137	// break;
14213	15138	case 'T':
14214	15139	CACHETEXTURE ^= true;
14215		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14216	15142	// repaint();
14217	15143	break;
14218	15144	case 'Y':
..	..	@@ -14297,7 +15223,9 @@
14297	15223	case 'E' : COMPACT ^= true;
14298	15224	repaint();
14299	15225	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15229	repaint();
14302	15230	break;
14303	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15250,8 @@
14322	15250	RevertCamera();
14323	15251	repaint();
14324	15252	break;
14325		- case 'L':
14326	15253	case 'l':
	15254	+ //case 'L':
14327	15255	if (lightMode)
14328	15256	{
14329	15257	lightMode = false;
..	..	@@ -14466,9 +15394,9 @@
14466	15394	case '_':
14467	15395	kompactbit = 5;
14468	15396	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
14472	15400	case ' ':
14473	15401	lightMode ^= true;
14474	15402	Globals.lighttouched = true;
..	..	@@ -14480,13 +15408,14 @@
14480	15408	case ESC:
14481	15409	RENDERPROGRAM += 1;
14482	15410	RENDERPROGRAM %= 3;
	15411	+
14483	15412	repaint();
14484	15413	break;
14485	15414	case 'Z':
14486	15415	//RESIZETEXTURE ^= true;
14487	15416	//break;
14488	15417	case 'z':
14489		- RENDERSHADOW ^= true;
	15418	+ Globals.RENDERSHADOW ^= true;
14490	15419	Globals.lighttouched = true;
14491	15420	repaint();
14492	15421	break;
..	..	@@ -14519,8 +15448,9 @@
14519	15448	case DELETE:
14520	15449	ClearSelection();
14521	15450	break;
14522		- /*
14523	15451	case '+':
	15452	+
	15453	+ /*
14524	15454	//fontsize += 1;
14525	15455	bbzoom *= 2;
14526	15456	repaint();
..	..	@@ -14537,17 +15467,17 @@
14537	15467	case '=':
14538	15468	IncDepth();
14539	15469	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
14541	15471	maskbit = 6;
14542	15472	break;
14543	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15474	DecDepth();
14545	15475	maskbit = 5;
14546	15476	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
14551	15481	break;
14552	15482	case '{':
14553	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15532,7 @@
14602	15532	}
14603	15533	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15534	}
	15535	+
14605	15536	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15537
14607	15538	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15540,11 @@
14609	15540	//mode = ROTATE;
14610	15541	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15542	{
14612		- SetMouseMode(modifiers);
	15543	+ SetMouseMode(0, modifiers);
14613	15544	}
14614	15545	}
14615	15546
14616		- protected void processKeyEvent(KeyEvent e)
	15547	+ public void processKeyEvent(KeyEvent e)
14617	15548	{
14618	15549	switch (e.getID())
14619	15550	{
..	..	@@ -14743,8 +15674,9 @@
14743	15674
14744	15675	protected void processMouseMotionEvent(MouseEvent e)
14745	15676	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15677	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15678	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15679	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15680	{
14749	15681	mouseMoved(e);
14750	15682	} else
..	..	@@ -14769,11 +15701,12 @@
14769	15701	}
14770	15702	*/
14771	15703
14772		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
14773	15705	}
14774	15706
14775	15707	void SelectParent()
14776	15708	{
	15709	+ new Exception().printStackTrace();
14777	15710	System.exit(0);
14778	15711	Composite group = (Composite) object;
14779	15712	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15718,10 @@
14785	15718	{
14786	15719	//selectees.remove(i);
14787	15720	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15722	} else
14790	15723	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15725	}
14793	15726
14794	15727	first = false;
..	..	@@ -14797,6 +15730,7 @@
14797	15730
14798	15731	void SelectChildren()
14799	15732	{
	15733	+ new Exception().printStackTrace();
14800	15734	System.exit(0);
14801	15735	/*
14802	15736	Composite group = (Composite) object;
..	..	@@ -14829,12 +15763,12 @@
14829	15763	for (int j = 0; j < group.children.size(); j++)
14830	15764	{
14831	15765	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15767	first = false;
14834	15768	}
14835	15769	} else
14836	15770	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15772	}
14839	15773
14840	15774	first = false;
..	..	@@ -14845,21 +15779,21 @@
14845	15779	{
14846	15780	//Composite group = (Composite) object;
14847	15781	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15783	}
14850	15784
14851	15785	void ResetTransform(int mask)
14852	15786	{
14853	15787	//Composite group = (Composite) object;
14854	15788	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
14856	15790	}
14857	15791
14858	15792	void FlipTransform()
14859	15793	{
14860	15794	//Composite group = (Composite) object;
14861	15795	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
14863	15797	// group.editWindow.ReduceMesh(true);
14864	15798	}
14865	15799
..	..	@@ -14867,7 +15801,7 @@
14867	15801	{
14868	15802	//Composite group = (Composite) object;
14869	15803	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
14871	15805	// group.editWindow.ReduceMesh(true);
14872	15806	}
14873	15807
..	..	@@ -14875,7 +15809,7 @@
14875	15809	{
14876	15810	//Composite group = (Composite) object;
14877	15811	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
14879	15813	}
14880	15814
14881	15815	void IncDepth()
..	..	@@ -14957,11 +15891,11 @@
14957	15891
14958	15892	int width = getBounds().width;
14959	15893	int height = getBounds().height;
14960		- ClickInfo info = new ClickInfo();
14961		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15894	//Image img = CreateImage(width, height);
14963	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
	15896	+
14964	15897	Graphics gr = g; // img.getGraphics();
	15898	+
14965	15899	if (!hasMarquee)
14966	15900	{
14967	15901	if (Xmin < Xmax) // !locked)
..	..	@@ -15033,40 +15967,88 @@
15033	15967	}
15034	15968	if (object != null && !hasMarquee)
15035	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15036	15976	if (isRenderer)
15037	15977	{
15038		- info.flags++;
	15978	+ object.clickInfo.flags++;
15039	15979	double frameAspect = (double) width / (double) height;
15040	15980	if (frameAspect > renderCamera.aspect)
15041	15981	{
15042	15982	int desired = (int) ((double) height * renderCamera.aspect);
15043		- info.bounds.width -= width - desired;
15044		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15045	15985	} else
15046	15986	{
15047	15987	int desired = (int) ((double) width / renderCamera.aspect);
15048		- info.bounds.height -= height - desired;
15049		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15050	15990	}
15051	15991	}
15052		- info.g = gr;
15053		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15054	15995	/*
15055	15996	// Memory intensive (brep.verticescopy)
15056	15997	if (!(object instanceof Composite))
15057	15998	object.draw(info, 0, false); // SLOW :
15058	15999	*/
15059		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15060	16001	{
15061		- object.drawEditHandles(info, 0);
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
	16005	+ {
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
	16012	+ {
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
	16020	+ }
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
	16041	+ }
15062	16042	}
15063	16043	}
	16044	+
15064	16045	if (isRenderer)
15065	16046	{
15066	16047	//gr.setColor(Color.black);
15067	16048	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	16049	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	16050	}
	16051	+
15070	16052	if (hasMarquee)
15071	16053	{
15072	16054	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +16161,7 @@
15179	16161	public boolean mouseDown(Event evt, int x, int y)
15180	16162	{
15181	16163	System.out.println("mouseDown: " + evt);
	16164	+ System.exit(0);
15182	16165	/*
15183	16166	locked = true;
15184	16167	drag = false;
..	..	@@ -15222,7 +16205,7 @@
15222	16205	{
15223	16206	keyPressed(0, modifiers);
15224	16207	}
15225		- clickStart(x, y, modifiers);
	16208	+ // clickStart(x, y, modifiers);
15226	16209	return true;
15227	16210	}
15228	16211
..	..	@@ -15340,7 +16323,7 @@
15340	16323	{
15341	16324	keyReleased(0, 0);
15342	16325	}
15343		- drag(x, y, modifiers);
	16326	+ drag(x, y, 0, modifiers);
15344	16327	return true;
15345	16328	}
15346	16329
..	..	@@ -15472,7 +16455,7 @@
15472	16455	Object3D object;
15473	16456	static Object3D trackedobject;
15474	16457	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16458	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16459	/static/ Camera eyeCamera;
15477	16460	/static/ Camera lightCamera;
15478	16461	int cameracount;
..	..	@@ -15757,16 +16740,16 @@
15757	16740	cStatic.objectstack[materialdepth++] = checker;
15758	16741	//System.out.println("material " + material);
15759	16742	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
15761	16744
15762	16745	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16747
15765	16748	materialdepth -= 1;
15766	16749	if (materialdepth > 0)
15767	16750	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16751	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16752	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16753	}
15771	16754	//checker.GetMaterial().opacity = 1f;
15772	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +16835,14 @@
15852	16835	}
15853	16836	}
15854	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
15855	16846	class SelectBuffer implements GLEventListener
15856	16847	{
15857	16848
..	..	@@ -15910,6 +16901,7 @@
15910	16901	{
15911	16902	if (!selection)
15912	16903	{
	16904	+ new Exception().printStackTrace();
15913	16905	System.exit(0);
15914	16906	return;
15915	16907	}
..	..	@@ -15930,6 +16922,17 @@
15930	16922
15931	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
15933	16936	//int tmp = selection_view;
15934	16937	//selection_view = -1;
15935	16938	int temp = DrawMode();
..	..	@@ -15941,6 +16944,17 @@
15941	16944	// temp = DEFAULT; // patch for selection debug
15942	16945	Globals.drawMode = temp; // WARNING
15943	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
15944	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	16959
15946	16960	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +17002,8 @@
15988	17002	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17005	+
	17006	+ CreateSelectedPoint();
15991	17007
15992	17008	// Will fit the mesh !!!
15993	17009	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +17053,36 @@
16037	17053	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	17054	}
16039	17055
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17056	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	17057	}
16042	17058	}
16043	17059
16044	17060	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	17062
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	17064	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	17066
16051		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	17070
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();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
16068	17086	}
16069	17087	else
16070	17088	paintcount = 0;
..	..	@@ -16103,6 +17121,11 @@
16103	17121	//System.out.println("objects[color] = " + objects[color]);
16104	17122	//objects[color].Select();
16105	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
16106	17129	object.Select(color, deselect);
16107	17130	}
16108	17131
..	..	@@ -16202,7 +17225,7 @@
16202	17225	gl.glDisable(gl.GL_CULL_FACE);
16203	17226	}
16204	17227
16205		- if (!RENDERSHADOW)
	17228	+ if (!Globals.RENDERSHADOW)
16206	17229	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17230
16208	17231	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17235,7 @@
16212	17235	//gl.glColorMask(false, false, false, false);
16213	17236
16214	17237	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17238	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17239	{
16217	17240	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17241
..	..	@@ -16628,23 +17651,15 @@
16628	17651	int AAbuffersize = 0;
16629	17652
16630	17653	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17654	+ static Superellipsoid selectedpoint;
16632	17655	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();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
16637	17660
16638	17661	static Sphere debugpoints[] = new Sphere[8];
16639	17662
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17663	static void InitPoints(float radius)
16649	17664	{
16650	17665	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17711,11 @@
16696	17711	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17712	// Depth buffer format
16698	17713	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17714	+
	17715	+ public void NextIndex()
16700	17716	{
16701	17717	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17718	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17719	//objects[indexcount] = o;
16704	17720	//System.out.println("indexcount = " + indexcount);
16705	17721	}