~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -45,6 +44,39 @@
45	44	static boolean ABORTED = false;
46	45
47	46	static int STEP = 1;
	47	+
	48	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	49	+ {
	50	+ int[] pixels = new int[bytes.length/3];
	51	+ for (int i=pixels.length; --i>=0;)
	52	+ {
	53	+ int i3 = i*3;
	54	+ pixels[i] = 0xFF;
	55	+ pixels[i] <<= 8;
	56	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	57	+ pixels[i] <<= 8;
	58	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3] & 0xFF;
	61	+ }
	62	+ /*
	63	+ int r=0,g=0,b=0,a=0;
	64	+ for (int i=0; i<width; i++)
	65	+ for (int j=0; j<height; j++)
	66	+ {
	67	+ int index = j*width+i;
	68	+ int p = pixels[index];
	69	+ a = ((p>>24) & 0xFF);
	70	+ r = ((p>>16) & 0xFF);
	71	+ g = ((p>>8) & 0xFF);
	72	+ b = (p & 0xFF);
	73	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	74	+ }
	75	+ /**/
	76	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	77	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	78	+ return rendImage;
	79	+ }
48	80
49	81	/static/ private boolean CULLFACE = false; // true;
50	82	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +88,12 @@
56	88	static int CURRENTANTIALIAS = 0; // 1;
57	89	/static/ boolean RENDERSHADOW = true;
58	90	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	91
62	92	boolean DISPLAYTEXT = false;
63	93	//boolean REDUCETEXTURE = true;
64	94	boolean CACHETEXTURE = true;
65	95	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	96	+ boolean MIPMAP = true; // false; // true;
67	97	boolean COMPRESSTEXTURE = false;
68	98	boolean KOMPACTTEXTURE = false; // true;
69	99	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +122,8 @@
92	122
93	123	static int tickcount = 0; // slow pose issue
94	124
	125	+static boolean BUTTONLESSWHEEL = false;
	126	+static boolean ZOOMBOXMODE = false;
95	127	static boolean BOXMODE = false;
96	128	static boolean IMAGEFLIP = false;
97	129	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +138,7 @@
106	138	static boolean OEIL = true;
107	139	static boolean OEILONCE = false; // do oeilon then oeiloff
108	140	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	141	+static boolean SWITCH = true; // false;
110	142	static boolean HANDLES = false; // selection doesn't work!!
111	143	static boolean PAINTMODE = false;
112	144
..	..	@@ -150,12 +182,12 @@
150	182	defaultcaps.setAccumAlphaBits(16);
151	183	}
152	184
153		- static CameraPane theRenderer;
	185	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	186
155	187	void SetAsGLRenderer(boolean b)
156	188	{
157	189	isRenderer = b;
158		- theRenderer = this;
	190	+ Globals.theRenderer = this;
159	191	}
160	192
161	193	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -193,9 +225,43 @@
193	225
194	226	/// INTERFACE
195	227
	228	+ public javax.media.opengl.GL GetGL0()
	229	+ {
	230	+ return null;
	231	+ }
	232	+
	233	+ public int GenList()
	234	+ {
	235	+ javax.media.opengl.GL gl = GetGL();
	236	+ return gl.glGenLists(1);
	237	+ }
	238	+
	239	+ public void NewList(int id)
	240	+ {
	241	+ javax.media.opengl.GL gl = GetGL();
	242	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	243	+ }
	244	+
	245	+ public void CallList(int id)
	246	+ {
	247	+ javax.media.opengl.GL gl = GetGL();
	248	+ gl.glCallList(id);
	249	+ }
	250	+
	251	+ public void EndList()
	252	+ {
	253	+ javax.media.opengl.GL gl = GetGL();
	254	+ gl.glEndList();
	255	+ }
	256	+
196	257	public boolean IsBoxMode()
197	258	{
198	259	return BOXMODE;
	260	+ }
	261	+
	262	+ public boolean IsZoomBoxMode()
	263	+ {
	264	+ return ZOOMBOXMODE;
199	265	}
200	266
201	267	public void ClearDepth()
..	..	@@ -293,7 +359,7 @@
293	359	cStatic.objectstack[materialdepth++] = obj;
294	360	//System.out.println("material " + material);
295	361	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	362	+ //display.vector2buffer = obj.projectedVertices;
297	363	if (obj instanceof Camera)
298	364	{
299	365	display.options1[0] = material.shift;
..	..	@@ -302,14 +368,28 @@
302	368	display.options1[2] = material.shadowbias;
303	369	display.options1[3] = material.aniso;
304	370	display.options1[4] = material.anisoV;
	371	+// System.out.println("display.options1[0] " + display.options1[0]);
	372	+// System.out.println("display.options1[1] " + display.options1[1]);
	373	+// System.out.println("display.options1[2] " + display.options1[2]);
	374	+// System.out.println("display.options1[3] " + display.options1[3]);
	375	+// System.out.println("display.options1[4] " + display.options1[4]);
305	376	display.options2[0] = material.opacity;
306	377	display.options2[1] = material.diffuse;
307	378	display.options2[2] = material.factor;
	379	+// System.out.println("display.options2[0] " + display.options2[0]);
	380	+// System.out.println("display.options2[1] " + display.options2[1]);
	381	+// System.out.println("display.options2[2] " + display.options2[2]);
308	382
309	383	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	384	+// System.out.println("display.options3[0] " + display.options3[0]);
	385	+// System.out.println("display.options3[1] " + display.options3[1]);
	386	+// System.out.println("display.options3[2] " + display.options3[2]);
310	387	display.options4[0] = material.cameralight/0.2f;
311	388	display.options4[1] = material.subsurface;
312	389	display.options4[2] = material.sheen;
	390	+// System.out.println("display.options4[0] " + display.options4[0]);
	391	+// System.out.println("display.options4[1] " + display.options4[1]);
	392	+// System.out.println("display.options4[2] " + display.options4[2]);
313	393
314	394	// if (display.CURRENTANTIALIAS > 0)
315	395	// display.options3[3] /= 4;
..	..	@@ -325,7 +405,7 @@
325	405	/**/
326	406	} else
327	407	{
328		- DrawMaterial(material, selected);
	408	+ DrawMaterial(material, selected, obj.projectedVertices);
329	409	}
330	410	} else
331	411	{
..	..	@@ -349,8 +429,8 @@
349	429	cStatic.objectstack[materialdepth++] = obj;
350	430	//System.out.println("material " + material);
351	431	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	432	+ //display.vector2buffer = obj.projectedVertices;
	433	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	434	}
355	435	}
356	436
..	..	@@ -367,8 +447,8 @@
367	447	materialdepth -= 1;
368	448	if (materialdepth > 0)
369	449	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	450	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	451	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	452	}
373	453	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	454	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +468,8 @@
388	468	materialdepth -= 1;
389	469	if (materialdepth > 0)
390	470	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	471	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	472	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	473	}
394	474	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	475	//else
..	..	@@ -430,10 +510,12 @@
430	510	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	511	{
432	512	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	513	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	514	+ // TEST LIVE NORMALS && !obj.dontselect
	515	+ ;
434	516	if (!hasnorm)
435	517	{
436		- // System.out.println("FUCK!!");
	518	+ // System.out.println("Mesh normal");
437	519	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	520	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	521	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +898,7 @@
816	898
817	899	if ((i % 100) == 0 && i != 0)
818	900	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	902	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	903	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	904	}
..	..	@@ -848,7 +930,7 @@
848	930
849	931	if ((i % 100) == 0 && i != 0)
850	932	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	933	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	934	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	935	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	936	}
..	..	@@ -1061,7 +1143,342 @@
1061	1143	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1144	}
1063	1145
	1146	+ public void DrawBox(cVector min, cVector max)
	1147	+ {
	1148	+ javax.media.opengl.GL gl = GetGL();
	1149	+ gl.glBegin(gl.GL_LINES);
	1150	+
	1151	+ gl.glVertex3d(min.x, min.y, min.z);
	1152	+ gl.glVertex3d(min.x, min.y, max.z);
	1153	+ gl.glVertex3d(min.x, min.y, min.z);
	1154	+ gl.glVertex3d(min.x, max.y, min.z);
	1155	+ gl.glVertex3d(min.x, min.y, min.z);
	1156	+ gl.glVertex3d(max.x, min.y, min.z);
	1157	+
	1158	+ gl.glVertex3d(max.x, max.y, max.z);
	1159	+ gl.glVertex3d(min.x, max.y, max.z);
	1160	+ gl.glVertex3d(max.x, max.y, max.z);
	1161	+ gl.glVertex3d(max.x, min.y, max.z);
	1162	+ gl.glVertex3d(max.x, max.y, max.z);
	1163	+ gl.glVertex3d(max.x, max.y, min.z);
	1164	+
	1165	+ gl.glEnd();
	1166	+ }
	1167	+
	1168	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1169	+ {
	1170	+ int[] strips = bRep.getRawIndices();
	1171	+
	1172	+ javax.media.opengl.GL gl = GetGL();
	1173	+
	1174	+ // TRIANGLE STRIP ARRAY
	1175	+ if (bRep.trimmed)
	1176	+ {
	1177	+ float[] v = bRep.getRawVertices();
	1178	+ float[] n = bRep.getRawNormals();
	1179	+ float[] c = bRep.getRawColors();
	1180	+ float[] uv = bRep.getRawUVMap();
	1181	+
	1182	+ int count2 = 0;
	1183	+ int count3 = 0;
	1184	+
	1185	+ if (n.length > 0)
	1186	+ {
	1187	+ for (int i = 0; i < strips.length; i++)
	1188	+ {
	1189	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1190	+
	1191	+ /*
	1192	+ boolean locked = false;
	1193	+ float eps = 0.1f;
	1194	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1195	+
	1196	+ int dot = 0;
	1197	+
	1198	+ if ((dot&1) == 0)
	1199	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1200	+
	1201	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1202	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1203	+ else
	1204	+ {
	1205	+ locked = true;
	1206	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1207	+ }
	1208	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1209	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1210	+ if (hasnorm)
	1211	+ {
	1212	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1213	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1214	+ }
	1215	+
	1216	+ if ((dot&4) == 0)
	1217	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1218	+
	1219	+ if (wrap \|\| !locked && (dot&8) != 0)
	1220	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1221	+ else
	1222	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1223	+
	1224	+ f.dot = dot;
	1225	+ */
	1226	+
	1227	+ if (!selectmode)
	1228	+ {
	1229	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1230	+ {
	1231	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1232	+ } else
	1233	+ {
	1234	+ gl.glNormal3f(0, 0, 1);
	1235	+ }
	1236	+
	1237	+ if (c != null)
	1238	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1239	+ {
	1240	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1241	+ }
	1242	+ }
	1243	+
	1244	+ if (flipV)
	1245	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1246	+ else
	1247	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1248	+
	1249	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1250	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1251	+
	1252	+ count2 += 2;
	1253	+ count3 += 3;
	1254	+ if (!selectmode)
	1255	+ {
	1256	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1257	+ {
	1258	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1259	+ } else
	1260	+ {
	1261	+ gl.glNormal3f(0, 0, 1);
	1262	+ }
	1263	+ if (c != null)
	1264	+ {
	1265	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1266	+ }
	1267	+ }
	1268	+
	1269	+ if (flipV)
	1270	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1271	+ else
	1272	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1273	+
	1274	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1275	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1276	+
	1277	+ count2 += 2;
	1278	+ count3 += 3;
	1279	+ for (int j = 0; j < strips[i] - 2; j++)
	1280	+ {
	1281	+ //gl.glTexCoord2d(...);
	1282	+ if (!selectmode)
	1283	+ {
	1284	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1285	+ {
	1286	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1287	+ } else
	1288	+ {
	1289	+ gl.glNormal3f(0, 0, 1);
	1290	+ }
	1291	+ if (c != null)
	1292	+ {
	1293	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1294	+ }
	1295	+ }
	1296	+
	1297	+ if (flipV)
	1298	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1299	+ else
	1300	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1301	+
	1302	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1303	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1304	+
	1305	+ count2 += 2;
	1306	+ count3 += 3;
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+
	1313	+ assert count3 == v.length;
	1314	+ }
	1315	+ else // !trimmed
	1316	+ {
	1317	+ int count = 0;
	1318	+ for (int i = 0; i < strips.length; i++)
	1319	+ {
	1320	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1321	+
	1322	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1323	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1324	+
	1325	+ drawVertex(gl, p, flipV, selectmode);
	1326	+ drawVertex(gl, q, flipV, selectmode);
	1327	+
	1328	+ for (int j = 0; j < strips[i] - 2; j++)
	1329	+ {
	1330	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1331	+
	1332	+ // if (j%2 == 0)
	1333	+ // drawFace(p, q, r, display, null);
	1334	+ // else
	1335	+ // drawFace(p, r, q, display, null);
	1336	+
	1337	+ // p = q;
	1338	+ // q = r;
	1339	+ drawVertex(gl, r, flipV, selectmode);
	1340	+ }
	1341	+
	1342	+ gl.glEnd();
	1343	+ }
	1344	+ }
	1345	+ }
	1346	+
	1347	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1348	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1349	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1350	+
	1351	+ public void DrawDynamicMesh(cMesh mesh)
	1352	+ {
	1353	+ GL gl = GetGL(); // getGL();
	1354	+
	1355	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1356	+
	1357	+ gl.glDisable(gl.GL_LIGHTING);
	1358	+
	1359	+ gl.glLineWidth(1);
	1360	+ gl.glColor3f(1,1,1);
	1361	+ gl.glBegin(gl.GL_LINES);
	1362	+ double scale = 0;
	1363	+ int count = 0;
	1364	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1365	+ {
	1366	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1367	+ if(s == 0)
	1368	+ {
	1369	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1370	+ }
	1371	+ if (mesh.showsprings)
	1372	+ {
	1373	+ temp.set(spring.a.position);
	1374	+ temp.add(spring.b.position);
	1375	+ temp.mul(0.5);
	1376	+ temp2.set(spring.a.position);
	1377	+ temp2.sub(spring.b.position);
	1378	+ temp2.mul(spring.restLength/2);
	1379	+ temp.sub(temp2);
	1380	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1381	+ temp.add(temp2);
	1382	+ temp.add(temp2);
	1383	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1384	+ }
	1385	+
	1386	+ if (spring.isHandle)
	1387	+ continue;
	1388	+
	1389	+ //if (scale < spring.restLength)
	1390	+ scale += spring.restLength;
	1391	+ count++;
	1392	+ }
	1393	+ gl.glEnd();
	1394	+
	1395	+ if (count == 0)
	1396	+ scale = 0.01;
	1397	+ else
	1398	+ scale /= count * 3;
	1399	+
	1400	+ //scale = 0.25;
	1401	+
	1402	+ if (mesh.ShowInfo())
	1403	+ {
	1404	+ gl.glLineWidth(4);
	1405	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1406	+ {
	1407	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1408	+ if (node.mass == 0)
	1409	+ continue;
	1410	+
	1411	+ int i = node.springs==null?-1:node.springs.size();
	1412	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1413	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1414	+ //temp.normalize();
	1415	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1416	+ gl.glBegin(gl.GL_LINES);
	1417	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1418	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1419	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1420	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1421	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1422	+ gl.glEnd();
	1423	+ }
	1424	+
	1425	+ gl.glLineWidth(8);
	1426	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1427	+ {
	1428	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1429	+
	1430	+ if (node.springs != null)
	1431	+ {
	1432	+ for (int i=0; i<node.springs.size(); i+=1)
	1433	+ {
	1434	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1435	+
	1436	+ int c = i+1;
	1437	+ // c = node.springs.get(i).nbcopies;
	1438	+
	1439	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1440	+ gl.glBegin(gl.GL_LINES);
	1441	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1442	+ 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);
	1443	+ gl.glEnd();
	1444	+ }
	1445	+ }
	1446	+ }
	1447	+
	1448	+ gl.glLineWidth(1);
	1449	+ }
	1450	+
	1451	+ gl.glEnable(gl.GL_LIGHTING);
	1452	+ }
	1453	+
1064	1454	/// INTERFACE
	1455	+
	1456	+ public void StartTriangles()
	1457	+ {
	1458	+ javax.media.opengl.GL gl = GetGL();
	1459	+ gl.glBegin(gl.GL_TRIANGLES);
	1460	+ }
	1461	+
	1462	+ public void EndTriangles()
	1463	+ {
	1464	+ GetGL().glEnd();
	1465	+ }
	1466	+
	1467	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1468	+ {
	1469	+ if (!selectmode)
	1470	+ {
	1471	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1472	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1473	+
	1474	+ if (flipV)
	1475	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1476	+ else
	1477	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1478	+ }
	1479	+
	1480	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1481	+ }
1065	1482
1066	1483	void SetColor(Object3D obj, Vertex p0)
1067	1484	{
..	..	@@ -1240,7 +1657,7 @@
1240	1657	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1658	}
1242	1659
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1661	{
1245	1662	CameraPane display = this;
1246	1663	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1673,18 @@
1256	1673	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1674	if (!material.multiply)
1258	1675	{
1259		- display.color = color;
	1676	+ display.color = material.color;
1260	1677	display.saturation = material.modulation;
1261	1678	}
1262	1679	else
1263	1680	{
1264		- display.color = color2;
	1681	+ display.color = material.color2;
1265	1682	display.saturation = material.modulation2;
1266	1683	}
1267	1684
1268	1685	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1686
1270		- float[] colorV = GrafreeD.colorV;
	1687	+ float[] colorV = Grafreed.colorV;
1271	1688
1272	1689	/**/
1273	1690	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1692,7 @@
1275	1692	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1693	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1694	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1695	+ colorV[3] = 1; // material.opacity;
1279	1696
1280	1697	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1698	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1800,9 @@
1383	1800	display.modelParams7[2] = 0;
1384	1801	display.modelParams7[3] = 0;
1385	1802
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1804
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1806	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1807	{
1391	1808	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1944,7 @@
1527	1944	void PushMatrix(double[][] matrix)
1528	1945	{
1529	1946	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1947	+ PushMatrix(matrix, 1);
1531	1948	}
1532	1949
1533	1950	void PushMatrix()
..	..	@@ -1624,7 +2041,7 @@
1624	2041
1625	2042	static int camerachangeframe;
1626	2043
1627		- boolean SetCamera(Camera cam)
	2044	+ public boolean SetCamera(Camera cam)
1628	2045	{
1629	2046	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2047	// return false;
..	..	@@ -1681,7 +2098,7 @@
1681	2098	//System.err.println("Oeil on");
1682	2099	OEIL = true;
1683	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2102	//pingthread.StepToTarget(true);
1686	2103	}
1687	2104
..	..	@@ -1752,33 +2169,6 @@
1752	2169	mainDL ^= true;
1753	2170	}
1754	2171
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	2172	void ToggleFullScreen()
1783	2173	{
1784	2174	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2179,94 @@
1789	2179	Globals.CROWD ^= true;
1790	2180	}
1791	2181
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2182	void ToggleLocal()
1798	2183	{
1799	2184	LOCALTRANSFORM ^= true;
1800	2185	}
1801	2186
1802		- void ToggleFast()
	2187	+ public void ToggleTexture()
	2188	+ {
	2189	+ textureon ^= true;
	2190	+ }
	2191	+
	2192	+ public void ToggleLive()
	2193	+ {
	2194	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2195	+
	2196	+ System.err.println("LIVE = " + Globals.isLIVE());
	2197	+
	2198	+ if (!Globals.isLIVE()) // save sound
	2199	+ Grafreed.savesound = true; // wav.save();
	2200	+ // else
	2201	+ repaint(); // start loop // may 2013
	2202	+ }
	2203	+
	2204	+ public void ToggleSupport()
	2205	+ {
	2206	+ SUPPORT ^= true;
	2207	+ }
	2208	+
	2209	+ public void ToggleAbort()
	2210	+ {
	2211	+ ABORTMODE ^= true;
	2212	+ }
	2213	+
	2214	+ public void ToggleInertia()
	2215	+ {
	2216	+ INERTIA ^= true;
	2217	+ }
	2218	+
	2219	+ public void ToggleFast()
1803	2220	{
1804	2221	FAST ^= true;
1805	2222	}
1806	2223
1807		- void ToggleSlowPose()
	2224	+ public void ToggleSlowPose()
1808	2225	{
1809	2226	SLOWPOSE ^= true;
1810	2227	}
1811	2228
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2229	+ public void ToggleBoxMode()
1818	2230	{
1819	2231	BOXMODE ^= true;
1820	2232	}
1821	2233
1822		- void ToggleSmoothFocus()
	2234	+ public void ToggleZoomBoxMode()
	2235	+ {
	2236	+ ZOOMBOXMODE ^= true;
	2237	+ }
	2238	+
	2239	+ public void ToggleSmoothFocus()
1823	2240	{
1824	2241	SMOOTHFOCUS ^= true;
1825	2242	}
1826	2243
1827		- void ToggleImageFlip()
	2244	+ public void ToggleImageFlip()
1828	2245	{
1829	2246	IMAGEFLIP ^= true;
1830	2247	}
1831	2248
1832		- void ToggleSpeakerMocap()
	2249	+ public void ToggleSpeakerMocap()
1833	2250	{
1834	2251	SPEAKERMOCAP ^= true;
1835	2252	}
1836	2253
1837		- void ToggleSpeakerCamera()
	2254	+ public void ToggleSpeakerCamera()
1838	2255	{
1839	2256	SPEAKERCAMERA ^= true;
1840	2257	}
1841	2258
1842		- void ToggleSpeakerFocus()
	2259	+ public void ToggleSpeakerFocus()
1843	2260	{
1844	2261	SPEAKERFOCUS ^= true;
1845	2262	}
1846	2263
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2264	+ public void ToggleFrustum()
1853	2265	{
1854	2266	FRUSTUM ^= true;
1855	2267	}
1856	2268
1857		- void ToggleTrack()
	2269	+ public void ToggleTrack()
1858	2270	{
1859	2271	TRACK ^= true;
1860	2272	if (TRACK)
..	..	@@ -1873,25 +2285,35 @@
1873	2285	repaint();
1874	2286	}
1875	2287
1876		- void ToggleTrackOnce()
	2288	+ public void ToggleTrackOnce()
1877	2289	{
1878	2290	TRACKONCE ^= true;
1879	2291	}
1880	2292
1881		- void ToggleShadowTrack()
	2293	+ public void ToggleShadowTrack()
1882	2294	{
1883	2295	SHADOWTRACK ^= true;
1884	2296	repaint();
1885	2297	}
1886	2298
1887		- void ToggleOeil()
	2299	+ public void ToggleOeil()
1888	2300	{
1889	2301	OEIL ^= true;
1890	2302	}
1891	2303
1892		- void ToggleOeilOnce()
	2304	+ public void ToggleOeilOnce()
1893	2305	{
1894	2306	OEILONCE ^= true;
	2307	+ }
	2308	+
	2309	+ void ToggleFootContact()
	2310	+ {
	2311	+ FOOTCONTACT ^= true;
	2312	+ }
	2313	+
	2314	+ void ToggleDebug()
	2315	+ {
	2316	+ Globals.DEBUG ^= true;
1895	2317	}
1896	2318
1897	2319	void ToggleLookAt()
..	..	@@ -1899,9 +2321,9 @@
1899	2321	LOOKAT ^= true;
1900	2322	}
1901	2323
1902		- void ToggleRandom()
	2324	+ void ToggleSwitch()
1903	2325	{
1904		- RANDOM ^= true;
	2326	+ SWITCH ^= true;
1905	2327	}
1906	2328
1907	2329	void ToggleHandles()
..	..	@@ -1909,10 +2331,17 @@
1909	2331	HANDLES ^= true;
1910	2332	}
1911	2333
	2334	+ Object3D paintFolder;
	2335	+
1912	2336	void TogglePaint()
1913	2337	{
1914	2338	PAINTMODE ^= true;
1915	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
1916	2345	}
1917	2346
1918	2347	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2437,22 @@
2008	2437	{
2009	2438	return currentGL;
2010	2439	}
2011		-
	2440	+
	2441	+ static private BufferedImage CreateBim(TextureData texturedata)
	2442	+ {
	2443	+ Grafreed.Assert(texturedata != null);
	2444	+
	2445	+ int width = texturedata.getWidth();
	2446	+ int height = texturedata.getHeight();
	2447	+
	2448	+ Buffer buffer = texturedata.getBuffer();
	2449	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2450	+
	2451	+ byte[] bytes = bytebuf.array();
	2452	+
	2453	+ return CreateBim(bytes, width, height);
	2454	+ }
	2455	+
2012	2456	/**/
2013	2457	class CacheTexture
2014	2458	{
..	..	@@ -2017,28 +2461,31 @@
2017	2461
2018	2462	int resolution;
2019	2463
2020		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2021	2465	{
2022		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2023	2468	resolution = res;
2024	2469	}
2025	2470	}
2026	2471	/**/
2027	2472
2028	2473	// 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>();
	2474	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2475	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2476	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2477	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2478	+
2032	2479	int pigmentdepth = 0;
2033	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2481	int bumpdepth = 0;
2035	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2036	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2037	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2038		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2039	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2040	2487
2041		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2042	2489	{
2043	2490	TextureData texturedata = null;
2044	2491
..	..	@@ -2057,13 +2504,34 @@
2057	2504	if (bump)
2058	2505	texturedata = ConvertBump(texturedata, false);
2059	2506
2060		- com.sun.opengl.util.texture.Texture texture =
2061		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2507	+// com.sun.opengl.util.texture.Texture texture =
	2508	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2062	2509
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);
	2510	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2511	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2065	2512
2066		- return texture;
	2513	+ return texturedata;
	2514	+ }
	2515	+
	2516	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2517	+ {
	2518	+ TextureData texturedata = null;
	2519	+
	2520	+ try
	2521	+ {
	2522	+ texturedata =
	2523	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2524	+ bim,
	2525	+ true);
	2526	+ } catch (Exception e)
	2527	+ {
	2528	+ throw new javax.media.opengl.GLException(e);
	2529	+ }
	2530	+
	2531	+ if (bump)
	2532	+ texturedata = ConvertBump(texturedata, false);
	2533	+
	2534	+ return texturedata;
2067	2535	}
2068	2536
2069	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3136,6 +3604,8 @@
3136	3604
3137	3605	System.out.println("LOADING TEXTURE : " + name);
3138	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3139	3609	//
3140	3610	if (false) // compressbit > 0)
3141	3611	{
..	..	@@ -3840,6 +4310,7 @@
3840	4310
3841	4311	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4312	{
	4313	+ new Exception().printStackTrace();
3843	4314	System.exit(0);
3844	4315	com.sun.opengl.util.texture.Texture texture = null;
3845	4316
..	..	@@ -7533,7 +8004,7 @@
7533	8004	String pigment = Object3D.GetPigment(tex);
7534	8005	String bump = Object3D.GetBump(tex);
7535	8006
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	8008	{
7538	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	8010	// System.out.println("; bump = " + bump);
..	..	@@ -7548,11 +8019,69 @@
7548	8019	pigment = null;
7549	8020	}
7550	8021
7551		- ReleaseTexture(bump, true);
7552		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
7553	8024	}
7554	8025
7555		- void ReleaseTexture(String tex, boolean bump)
	8026	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8027	+ {
	8028	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8029	+ {
	8030	+ return;
	8031	+ }
	8032	+
	8033	+ if (tex == null)
	8034	+ {
	8035	+ ReleaseTexture(null, false);
	8036	+ return;
	8037	+ }
	8038	+
	8039	+ String pigment = Object3D.GetPigment(tex);
	8040	+
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ {
	8043	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8044	+ // System.out.println("; bump = " + bump);
	8045	+ }
	8046	+
	8047	+ if (pigment.equals(""))
	8048	+ {
	8049	+ pigment = null;
	8050	+ }
	8051	+
	8052	+ ReleaseTexture(tex, false);
	8053	+ }
	8054	+
	8055	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8056	+ {
	8057	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8058	+ {
	8059	+ return;
	8060	+ }
	8061	+
	8062	+ if (tex == null)
	8063	+ {
	8064	+ ReleaseTexture(null, true);
	8065	+ return;
	8066	+ }
	8067	+
	8068	+ String bump = Object3D.GetBump(tex);
	8069	+
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8071	+ {
	8072	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8073	+ // System.out.println("; bump = " + bump);
	8074	+ }
	8075	+
	8076	+ if (bump.equals(""))
	8077	+ {
	8078	+ bump = null;
	8079	+ }
	8080	+
	8081	+ ReleaseTexture(tex, true);
	8082	+ }
	8083	+
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
7556	8085	{
7557	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7558	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7563,7 +8092,7 @@
7563	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7564	8093
7565	8094	if (tex != null)
7566		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7567	8096
7568	8097	// //assert( texture != null );
7569	8098	// if (texture == null)
..	..	@@ -7655,7 +8184,55 @@
7655	8184	}
7656	8185	}
7657	8186
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8187	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8188	+ {
	8189	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8190	+// ambientOcclusion ) // \|\| !textureon)
	8191	+// {
	8192	+// return; // false;
	8193	+// }
	8194	+//
	8195	+// if (tex == null)
	8196	+// {
	8197	+// BindTexture(null,false,resolution);
	8198	+// BindTexture(null,true,resolution);
	8199	+// return;
	8200	+// }
	8201	+//
	8202	+// String pigment = Object3D.GetPigment(tex);
	8203	+// String bump = Object3D.GetBump(tex);
	8204	+//
	8205	+// usedtextures.add(pigment);
	8206	+// usedtextures.add(bump);
	8207	+//
	8208	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8209	+// {
	8210	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8211	+// // System.out.println("; bump = " + bump);
	8212	+// }
	8213	+//
	8214	+// if (bump.equals(""))
	8215	+// {
	8216	+// bump = null;
	8217	+// }
	8218	+// if (pigment.equals(""))
	8219	+// {
	8220	+// pigment = null;
	8221	+// }
	8222	+//
	8223	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8224	+// BindTexture(pigment, false, resolution);
	8225	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8226	+// BindTexture(bump, true, resolution);
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+//
	8229	+// return; // true;
	8230	+
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
	8233	+ }
	8234	+
	8235	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8236	{
7660	8237	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8238	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7666,17 +8243,47 @@
7666	8243	if (tex == null)
7667	8244	{
7668	8245	BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
7670	8246	return;
7671	8247	}
7672	8248
7673	8249	String pigment = Object3D.GetPigment(tex);
	8250	+
	8251	+ usedtextures.add(tex);
	8252	+
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8254	+ {
	8255	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8256	+ // System.out.println("; bump = " + bump);
	8257	+ }
	8258	+
	8259	+ if (pigment.equals(""))
	8260	+ {
	8261	+ pigment = null;
	8262	+ }
	8263	+
	8264	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8265	+ BindTexture(tex, false, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8269	+ {
	8270	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8271	+ ambientOcclusion ) // \|\| !textureon)
	8272	+ {
	8273	+ return; // false;
	8274	+ }
	8275	+
	8276	+ if (tex == null)
	8277	+ {
	8278	+ BindTexture(null,true,resolution);
	8279	+ return;
	8280	+ }
	8281	+
7674	8282	String bump = Object3D.GetBump(tex);
7675	8283
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
7678	8285
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8287	{
7681	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8289	// System.out.println("; bump = " + bump);
..	..	@@ -7686,43 +8293,82 @@
7686	8293	{
7687	8294	bump = null;
7688	8295	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8296
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
7698	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8300	}
7702	8301
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8302	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8303	+
	8304	+ private boolean FileExists(String tex)
7704	8305	{
7705		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8306	+ if (missingTextures.contains(tex))
	8307	+ {
	8308	+ return false;
	8309	+ }
	8310	+
	8311	+ boolean fileExists = new File(tex).exists();
	8312	+
	8313	+ if (!fileExists)
	8314	+ {
	8315	+ // If file exists, the "new File()" is not executed sgain
	8316	+ missingTextures.add(tex);
	8317	+ }
	8318	+
	8319	+ return fileExists;
	8320	+ }
	8321	+
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8323	+ {
	8324	+ CacheTexture texturecache = null;
7706	8325
7707	8326	if (tex != null)
7708	8327	{
7709		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7710	8330
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;
	8331	+ if (texname.equals("") && texdata == null)
	8332	+ {
	8333	+ return null;
	8334	+ }
	8335	+
	8336	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8337	+
	8338	+// String[] split = tex.split("Textures");
	8339	+// if (split.length > 1)
	8340	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8341	+// else
	8342	+// if (!texname.startsWith("/"))
	8343	+// texname = "/Users/nbriere/Textures/" + texname;
	8344	+ if (!FileExists(texname))
	8345	+ {
	8346	+ texname = fallbackTextureName;
	8347	+ }
7717	8348
7718	8349	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	8350	{
7725		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8351	+ if (texdata == null)
	8352	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8353	+ else
	8354	+ texturecache = bimtextures.get(texdata);
	8355	+ }
	8356	+
	8357	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8358	+ {
	8359	+ TextureData texturedata = null;
	8360	+
	8361	+ if (texdata != null)
	8362	+ {
	8363	+ BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8364	+
	8365	+ CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8366	+
	8367	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8368	+ bimtextures.put(texdata, texturecache);
	8369	+ }
	8370	+ else
	8371	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8372	{
7727	8373	assert(!bump);
7728	8374	// if (bump)
..	..	@@ -7733,19 +8379,23 @@
7733	8379	// }
7734	8380	// else
7735	8381	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
7738	8384	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
7741	8389	// }
7742	8390	} else
7743		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8392	{
7745	8393	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8394	+ // texturecache = textures.get(texname); // suspicious
	8395	+ if (texturecache == null)
	8396	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8397	+ else
	8398	+ new Exception().printStackTrace();
7749	8399	} else
7750	8400	{
7751	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,11 +8403,13 @@
7753	8403	// texture = GetResourceTexture("default.png");
7754	8404	//} else
7755	8405	//{
7756		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
7757	8407	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8408	+ // texturecache = textures.get(texname); // suspicious
	8409	+ if (texturecache == null)
	8410	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8411	+ else
	8412	+ new Exception().printStackTrace();
7761	8413	} else
7762	8414	{
7763	8415	if (textureon)
..	..	@@ -7782,7 +8434,7 @@
7782	8434	}
7783	8435
7784	8436	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8437	+ if (!FileExists(cachename))
7786	8438	cachename = texname;
7787	8439	else
7788	8440	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8456,7 @@
7804	8456	}
7805	8457
7806	8458	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8459	+ if (!FileExists(cachename))
7808	8460	cachename = texname;
7809	8461	else
7810	8462	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8465,22 @@
7813	8465	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8466
7815	8467
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8468	+ if (texturedata == null)
	8469	+ throw new Exception();
	8470	+
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
7818	8472	//texture = GetTexture(tex, bump);
7819	8473	}
7820	8474	}
7821	8475	//}
7822	8476	}
7823	8477
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7825	8479	{
7826	8480	//return false;
7827	8481
7828	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8484	{
7831	8485	// String ext = "_highres";
7832	8486	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8497,17 @@
7843	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8498	if (!cachefile.exists())
7845	8499	{
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))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8501	{
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);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
7886	8504	ImageWriter writer = null;
7887	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8506	if (iter.hasNext()) {
7889	8507	writer = (ImageWriter)iter.next();
7890	8508	}
7891		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
7892	8511	try
7893	8512	{
7894	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7905,18 +8524,20 @@
7905	8524	}
7906	8525	}
7907	8526	}
7908		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
7909	8530	//System.out.println("Texture = " + tex);
7910		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
7911	8532	{
7912		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
7913	8534	thetex.texture.disable();
7914	8535	thetex.texture.dispose();
7915		- textures.remove(texname);
	8536	+ textures.remove(tex);
7916	8537	}
7917	8538
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
7920	8541
7921	8542	// newtex = true;
7922	8543	}
..	..	@@ -7932,10 +8553,41 @@
7932	8553	}
7933	8554	}
7934	8555
7935		- return texture;
	8556	+ return texturecache;
7936	8557	}
7937	8558
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8559	+ static void EmbedTextures(cTexture tex)
	8560	+ {
	8561	+ if (tex.pigmentdata == null)
	8562	+ {
	8563	+ String texname = Object3D.GetPigment(tex);
	8564	+
	8565	+ CacheTexture texturecache = texturepigment.get(tex);
	8566	+
	8567	+ if (texturecache != null)
	8568	+ {
	8569	+ tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8570	+ tex.pw = texturecache.texturedata.getWidth();
	8571	+ tex.ph = texturecache.texturedata.getHeight();
	8572	+ }
	8573	+ }
	8574	+
	8575	+ if (tex.bumpdata == null)
	8576	+ {
	8577	+ String texname = Object3D.GetBump(tex);
	8578	+
	8579	+ CacheTexture texturecache = texturebump.get(tex);
	8580	+
	8581	+ if (texturecache != null)
	8582	+ {
	8583	+ tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8584	+ tex.bw = texturecache.texturedata.getWidth();
	8585	+ tex.bh = texturecache.texturedata.getHeight();
	8586	+ }
	8587	+ }
	8588	+ }
	8589	+
	8590	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7939	8591	{
7940	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8593
..	..	@@ -7953,21 +8605,21 @@
7953	8605	return texture!=null?texture.texture:null;
7954	8606	}
7955	8607
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8608	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7957	8609	{
7958	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8611
7960	8612	return texture!=null?texture.texturedata:null;
7961	8613	}
7962	8614
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7964	8616	{
7965	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8618	{
7967	8619	return false;
7968	8620	}
7969	8621
7970		- boolean newtex = false;
	8622	+ //boolean newtex = false;
7971	8623
7972	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7973	8625
..	..	@@ -7999,7 +8651,7 @@
7999	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8653
8002		- return newtex;
	8654	+ return true; // Warning: not used.
8003	8655	}
8004	8656
8005	8657	ShadowBuffer shadowPBuf;
..	..	@@ -8837,11 +9489,35 @@
8837	9489	jy8[3] = 0.5f;
8838	9490	}
8839	9491
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9492	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9494	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9495	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9496
	9497	+ void ResetOptions()
	9498	+ {
	9499	+ options1[0] = 100;
	9500	+ options1[1] = 0.025f;
	9501	+ options1[2] = 0.01f;
	9502	+ options1[3] = 0;
	9503	+ options1[4] = 0;
	9504	+
	9505	+ options2[0] = 0;
	9506	+ options2[1] = 0.75f;
	9507	+ options2[2] = 0;
	9508	+ options2[3] = 0;
	9509	+
	9510	+ options3[0] = 1;
	9511	+ options3[1] = 1;
	9512	+ options3[2] = 1;
	9513	+ options3[3] = 0;
	9514	+
	9515	+ options4[0] = 1;
	9516	+ options4[1] = 0;
	9517	+ options4[2] = 1;
	9518	+ options4[3] = 0;
	9519	+ }
	9520	+
8845	9521	static int imagecount = 0; // movie generation
8846	9522
8847	9523	static int jitter = 0;
..	..	@@ -8937,8 +9613,8 @@
8937	9613	assert (parentcam != renderCamera);
8938	9614
8939	9615	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9616	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9617	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942	9618
8943	9619	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9620
..	..	@@ -8953,8 +9629,8 @@
8953	9629	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9630
8955	9631	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9632	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9633	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958	9634
8959	9635	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9636
..	..	@@ -9026,7 +9702,7 @@
9026	9702	//gl.glFlush();
9027	9703	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9704
9029		- if (ANIMATION && ABORTED)
	9705	+ if (Globals.ANIMATION && ABORTED)
9030	9706	{
9031	9707	System.err.println(" ABORTED FRAME");
9032	9708	break;
..	..	@@ -9056,7 +9732,7 @@
9056	9732	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9733
9058	9734	// save image
9059		- if (ANIMATION && !ABORTED)
	9735	+ if (Globals.ANIMATION && !ABORTED)
9060	9736	{
9061	9737	VPwidth = viewport[2];
9062	9738	VPheight = viewport[3];
..	..	@@ -9167,11 +9843,11 @@
9167	9843
9168	9844	// imagecount++;
9169	9845
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9846	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9847
9172	9848	if (!BOXMODE)
9173	9849	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9850	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9851	}
9176	9852
9177	9853	if (!BOXMODE)
..	..	@@ -9209,7 +9885,7 @@
9209	9885	ABORTED = false;
9210	9886	}
9211	9887	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9888	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	9889
9214	9890	if (false)
9215	9891	{
..	..	@@ -9872,11 +10548,11 @@
9872	10548
9873	10549	public void display(GLAutoDrawable drawable)
9874	10550	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10551	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10552	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10553	+ Grafreed.wav.save();
	10554	+ Grafreed.savesound = false;
	10555	+ Grafreed.hassound = false;
9880	10556	}
9881	10557	// if (DEBUG_SELECTION)
9882	10558	// {
..	..	@@ -9952,6 +10628,7 @@
9952	10628	ANTIALIAS = 0;
9953	10629	//System.out.println("RESTART");
9954	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
9955	10632	}
9956	10633	}
9957	10634	}
..	..	@@ -10006,7 +10683,7 @@
10006	10683	Object3D theobject = object;
10007	10684	Object3D theparent = object.parent;
10008	10685	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10686	+ object = (Object3D)Grafreed.clone(object);
10010	10687	object.Stripify();
10011	10688	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10689	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10696,14 @@
10019	10696	ambientOcclusion = false;
10020	10697	}
10021	10698
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10701	{
10024	10702	//if (RENDERSHADOW) // ?
10025	10703	if (!IsFrozen())
10026	10704	{
10027	10705	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10706	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10707	{
10030	10708	Globals.framecount++;
10031	10709	shadowbuffer.display();
..	..	@@ -10152,8 +10830,8 @@
10152	10830
10153	10831	// if (parentcam != renderCamera) // not a light
10154	10832	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10833	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10834	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157	10835
10158	10836	for (int j = 0; j < 4; j++)
10159	10837	{
..	..	@@ -10167,8 +10845,8 @@
10167	10845
10168	10846	// if (parentcam != renderCamera) // not a light
10169	10847	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10848	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10849	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172	10850
10173	10851	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10852
..	..	@@ -10427,7 +11105,16 @@
10427	11105	// Bump noise
10428	11106	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11107	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11108	+
	11109	+ try
	11110	+ {
	11111	+ BindTexture(NOISE_TEXTURE, false, 2);
	11112	+ }
	11113	+ catch (Exception e)
	11114	+ {
	11115	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11116	+ }
	11117	+
10431	11118
10432	11119	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11120	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11137,9 @@
10450	11137
10451	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11139
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11140	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11141	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11142	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11143	} else
10457	11144	{
10458	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11150,7 @@
10463	11150	//System.out.println("BLENDING ON");
10464	11151	gl.glEnable(GL.GL_BLEND);
10465	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11154	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11155	gl.glLoadIdentity();
10469	11156
..	..	@@ -10552,8 +11239,8 @@
10552	11239	System.err.println("parentcam != renderCamera");
10553	11240
10554	11241	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11242	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11243	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557	11244	}
10558	11245
10559	11246	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11261,8 @@
10574	11261	if (true) // TODO
10575	11262	{
10576	11263	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11264	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11265	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11266	}
10580	11267
10581	11268	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10891,8 +11578,14 @@
10891	11578	{
10892	11579	renderpass++;
10893	11580	// System.out.println("Draw object... ");
	11581	+ STEP = 1;
10894	11582	if (FAST) // in case there is no script
10895		- STEP = 16;
	11583	+ STEP = 8;
	11584	+
	11585	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11586	+ {
	11587	+ STEP *= 4;
	11588	+ }
10896	11589
10897	11590	//object.FullInvariants();
10898	11591
..	..	@@ -10906,23 +11599,44 @@
10906	11599	e.printStackTrace();
10907	11600	}
10908	11601
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11602	+ if (Grafreed.RENDERME > 0)
	11603	+ Grafreed.RENDERME--; // mechante magouille
10911	11604
10912	11605	Globals.ONESTEP = false;
10913	11606	}
10914	11607
10915	11608	static boolean zoomonce = false;
10916	11609
	11610	+ static void CreateSelectedPoint()
	11611	+ {
	11612	+ if (selectedpoint == null)
	11613	+ {
	11614	+ debugpointG = new Sphere();
	11615	+ debugpointP = new Sphere();
	11616	+ debugpointC = new Sphere();
	11617	+ debugpointR = new Sphere();
	11618	+
	11619	+ selectedpoint = new Superellipsoid();
	11620	+
	11621	+ for (int i=0; i<8; i++)
	11622	+ {
	11623	+ debugpoints[i] = new Sphere();
	11624	+ }
	11625	+ }
	11626	+ }
	11627	+
10917	11628	void DrawObject(GL gl, boolean draw)
10918	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
10919	11633	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11634	// DrawMode() = SELECTION;
10921	11635	//GL gl = getGL();
10922	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11637	{
10924	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11640	pingthread.StepToTarget(true); // true);
10927	11641	// zoomonce = false;
10928	11642	}
..	..	@@ -10977,7 +11691,14 @@
10977	11691
10978	11692	usedtextures.clear();
10979	11693
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11694	+ try
	11695	+ {
	11696	+ BindTextures(DEFAULT_TEXTURES, 2);
	11697	+ }
	11698	+ catch (Exception e)
	11699	+ {
	11700	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11701	+ }
10981	11702	}
10982	11703	//System.out.println("--> " + stackdepth);
10983	11704	// GrafreeD.traceon();
..	..	@@ -10987,8 +11708,9 @@
10987	11708
10988	11709	if (DrawMode() == DEFAULT)
10989	11710	{
10990		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
10991	11712	{
	11713	+ CreateSelectedPoint();
10992	11714	float radius = 0.05f;
10993	11715	if (selectedpoint.radius != radius)
10994	11716	{
..	..	@@ -11042,20 +11764,32 @@
11042	11764	ReleaseTextures(DEFAULT_TEXTURES);
11043	11765
11044	11766	if (CLEANCACHE)
11045		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11046	11768	{
11047		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11048	11770
11049	11771	// System.out.println("Texture --------- " + tex);
11050	11772
11051		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11052	11774	continue;
11053	11775
11054		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11055	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11056	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057		- textures.get(tex).texture.dispose();
11058		- textures.remove(tex);
	11780	+ if (gettex != null)
	11781	+ {
	11782	+ gettex.texture.dispose();
	11783	+ texturepigment.remove(tex);
	11784	+ }
	11785	+
	11786	+ gettex = texturebump.get(tex);
	11787	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11788	+ if (gettex != null)
	11789	+ {
	11790	+ gettex.texture.dispose();
	11791	+ texturebump.remove(tex);
	11792	+ }
11059	11793	}
11060	11794	}
11061	11795	}
..	..	@@ -11068,7 +11802,14 @@
11068	11802	if (checker != null && DrawMode() == DEFAULT)
11069	11803	{
11070	11804	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11805	+ try
	11806	+ {
	11807	+ BindTextures(checker.GetTextures(), checker.texres);
	11808	+ }
	11809	+ catch (Exception e)
	11810	+ {
	11811	+ System.err.println("FAILED: " + checker.GetTextures());
	11812	+ }
11072	11813	// NEAREST
11073	11814	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11815	DrawChecker(gl);
..	..	@@ -11150,7 +11891,7 @@
11150	11891	return;
11151	11892	}
11152	11893
11153		- String string = obj.GetToolTip();
	11894	+ String string = obj.toString(); //.GetToolTip();
11154	11895
11155	11896	GL gl = GetGL();
11156	11897
..	..	@@ -11467,8 +12208,8 @@
11467	12208	//obj.TransformToWorld(light, light);
11468	12209	for (int i = tp.size(); --i >= 0;)
11469	12210	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12211	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12212	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12213	}
11473	12214
11474	12215
..	..	@@ -11485,8 +12226,8 @@
11485	12226	parentcam = cameras[0];
11486	12227	}
11487	12228
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12229	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12230	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12231
11491	12232	LA.xformPos(light, renderCamera.toScreen, light);
11492	12233
..	..	@@ -12100,8 +12841,8 @@
12100	12841
12101	12842	// display shadow only (bump == 0)
12102	12843	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	12844	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12845	+ "SLT temp.z, temp.y, -one2048th.x;" +
12105	12846	"SUB temp.y, one.x, temp.z;" +
12106	12847	"MUL temp.x, temp.x, temp.y;" +
12107	12848	"KIL temp.x;" +
..	..	@@ -12230,8 +12971,10 @@
12230	12971	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	12972
12232	12973	"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
	12974	+ // Tuning for default skin
	12975	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12976	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12977	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	12978	"MUL temp.x, temp.x, temp.y;" +
12236	12979
12237	12980	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13173,7 @@
12430	13173	//once = true;
12431	13174	}
12432	13175
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13176	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13177	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13178	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13179
..	..	@@ -12563,12 +13306,16 @@
12563	13306
12564	13307	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13308	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13309	+
	13310	+ // Compare fragment depth in light space with shadowmap.
12566	13311	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13312	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13313	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13314	+
	13315	+ // Reverse comparison
12569	13316	"SUB temp.x, one.x, temp.x;" +
12570	13317	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13318	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13319	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13320
12574	13321	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13329,10 @@
12582	13329	// No shadow for backface
12583	13330	"DP3 temp.x, normal, lightd;" +
12584	13331	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13332	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13333	+
	13334	+ // No shadow when out of frustrum
	13335	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13336	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13337	"";
12587	13338	}
..	..	@@ -12728,7 +13479,8 @@
12728	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
12732	13484
12733	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13486	// OUT : diff, spec
..	..	@@ -12744,9 +13496,10 @@
12744	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13498	//"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;" +
	13499	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13500	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13501	+
	13502	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13504	"RCP " + dest + ".w," + dest + ".w;" +
12752	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +13893,7 @@
13140	13893	public void mousePressed(MouseEvent e)
13141	13894	{
13142	13895	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13896	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	13897	}
13145	13898
13146	13899	static long prevtime = 0;
..	..	@@ -13167,6 +13920,7 @@
13167	13920
13168	13921	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	13922
	13923	+ if (BUTTONLESSWHEEL)
13170	13924	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	13925	{
13172	13926	return;
..	..	@@ -13175,7 +13929,7 @@
13175	13929	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	13930
13177	13931	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13932	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	13933	{
13180	13934	keepboxmode = BOXMODE;
13181	13935	keepsupport = SUPPORT;
..	..	@@ -13215,8 +13969,8 @@
13215	13969	// mode \|= META;
13216	13970	//}
13217	13971
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13972	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13973	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	13974	anchorX = ax;
13221	13975	anchorY = ay;
13222	13976	prevX = px;
..	..	@@ -13250,6 +14004,7 @@
13250	14004	else
13251	14005	if (evt.getSource() == AAtimer)
13252	14006	{
	14007	+ Globals.TIMERRUNNING = false;
13253	14008	if (mouseDown)
13254	14009	{
13255	14010	//new Exception().printStackTrace();
..	..	@@ -13275,6 +14030,10 @@
13275	14030	// LIVE = waslive;
13276	14031	// wasliveok = true;
13277	14032	// waslive = false;
	14033	+
	14034	+ // May 2019 Forget it:
	14035	+ if (true)
	14036	+ return;
13278	14037
13279	14038	// source == timer
13280	14039	if (mouseDown)
..	..	@@ -13305,7 +14064,7 @@
13305	14064
13306	14065	// fev 2014???
13307	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14068	pingthread.StepToTarget(true); // true);
13310	14069	}
13311	14070	// if (!LIVE)
..	..	@@ -13314,12 +14073,13 @@
13314	14073
13315	14074	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14075
13317		- void clickStart(int x, int y, int modifiers)
	14076	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14077	{
13319	14078	if (!wasliveok)
13320	14079	return;
13321	14080
13322	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
13323	14083
13324	14084	// waslive = LIVE;
13325	14085	// LIVE = false;
..	..	@@ -13331,7 +14091,7 @@
13331	14091	// touched = true; // main DL
13332	14092	if (isRenderer)
13333	14093	{
13334		- SetMouseMode(modifiers);
	14094	+ SetMouseMode(modifiers, modifiersex);
13335	14095	}
13336	14096
13337	14097	selectX = anchorX = x;
..	..	@@ -13344,7 +14104,7 @@
13344	14104	clicked = true;
13345	14105	hold = false;
13346	14106
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14107	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14108	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14109	{
13350	14110	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13375,7 +14135,7 @@
13375	14135	info.camera = renderCamera;
13376	14136	info.x = x;
13377	14137	info.y = y;
13378		- info.modifiers = modifiers;
	14138	+ info.modifiers = modifiersex;
13379	14139	editObj = object.doEditClick(info, 0);
13380	14140	if (!editObj)
13381	14141	{
..	..	@@ -13392,11 +14152,14 @@
13392	14152
13393	14153	public void mouseDragged(MouseEvent e)
13394	14154	{
	14155	+ Globals.MOUSEDRAGGED = true;
	14156	+
	14157	+ //System.out.println("mouseDragged: " + e);
13395	14158	if (isRenderer)
13396	14159	movingcamera = true;
	14160	+
13397	14161	//if (drawing)
13398	14162	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14163	if ((e.getModifiersEx() & CTRL) != 0
13401	14164	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14165	{
..	..	@@ -13404,7 +14167,7 @@
13404	14167	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14168	}
13406	14169	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14170	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14171
13409	14172	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14173	}
..	..	@@ -13577,6 +14340,7 @@
13577	14340
13578	14341	public void run()
13579	14342	{
	14343	+ new Exception().printStackTrace();
13580	14344	System.exit(0);
13581	14345	for (;;)
13582	14346	{
..	..	@@ -13640,7 +14404,7 @@
13640	14404	{
13641	14405	Globals.lighttouched = true;
13642	14406	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14407	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14408	}
13645	14409	//else
13646	14410	}
..	..	@@ -13654,12 +14418,12 @@
13654	14418	void GoDown(int mod)
13655	14419	{
13656	14420	MODIFIERS \|= COMMAND;
13657		- /*
	14421	+ /**/
13658	14422	if((mod&SHIFT) == SHIFT)
13659	14423	manipCamera.RotatePosition(0, -speed);
13660	14424	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
13663	14427	if ((mod & SHIFT) == SHIFT)
13664	14428	{
13665	14429	mouseMode = mouseMode; // VR??
..	..	@@ -13675,12 +14439,12 @@
13675	14439	void GoUp(int mod)
13676	14440	{
13677	14441	MODIFIERS \|= COMMAND;
13678		- /*
	14442	+ /**/
13679	14443	if((mod&SHIFT) == SHIFT)
13680	14444	manipCamera.RotatePosition(0, speed);
13681	14445	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
13684	14448	if ((mod & SHIFT) == SHIFT)
13685	14449	{
13686	14450	mouseMode = mouseMode;
..	..	@@ -13696,12 +14460,12 @@
13696	14460	void GoLeft(int mod)
13697	14461	{
13698	14462	MODIFIERS \|= COMMAND;
13699		- /*
	14463	+ /**/
13700	14464	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
13702		- else
13703	14465	manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
13705	14469	if ((mod & SHIFT) == SHIFT)
13706	14470	{
13707	14471	mouseMode = mouseMode;
..	..	@@ -13717,12 +14481,12 @@
13717	14481	void GoRight(int mod)
13718	14482	{
13719	14483	MODIFIERS \|= COMMAND;
13720		- /*
	14484	+ /**/
13721	14485	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
13723		- else
13724	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
13726	14490	if ((mod & SHIFT) == SHIFT)
13727	14491	{
13728	14492	mouseMode = mouseMode;
..	..	@@ -13740,7 +14504,7 @@
13740	14504	int X, Y;
13741	14505	boolean SX, SY;
13742	14506
13743		- void drag(int x, int y, int modifiers)
	14507	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14508	{
13745	14509	if (IsFrozen())
13746	14510	{
..	..	@@ -13749,17 +14513,17 @@
13749	14513
13750	14514	drag = true; // NEW
13751	14515
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14516	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14517
13754	14518	X = x;
13755	14519	Y = y;
13756	14520	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14521	+ MODIFIERS = modifiersex;
	14522	+ modifiersex &= ~1024;
13759	14523	if (false) // modifiers != 0)
13760	14524	{
13761	14525	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14526	+ System.out.println("mouseDragged: " + modifiersex);
13763	14527	System.out.println("SHIFT = " + SHIFT);
13764	14528	System.out.println("CONTROL = " + COMMAND);
13765	14529	System.out.println("META = " + META);
..	..	@@ -13779,7 +14543,8 @@
13779	14543	info.camera = renderCamera;
13780	14544	info.x = x;
13781	14545	info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14548	} else
13784	14549	{
13785	14550	if (x < startX)
..	..	@@ -13931,7 +14696,6 @@
13931	14696	public void mouseMoved(MouseEvent e)
13932	14697	{
13933	14698	//System.out.println("mouseMoved: " + e);
13934		-
13935	14699	if (isRenderer)
13936	14700	return;
13937	14701
..	..	@@ -13944,7 +14708,9 @@
13944	14708	ci.camera = renderCamera;
13945	14709	if (!isRenderer)
13946	14710	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
13948	14714	{
13949	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14716	} else
..	..	@@ -13956,7 +14722,11 @@
13956	14722
13957	14723	public void mouseReleased(MouseEvent e)
13958	14724	{
	14725	+ Globals.MOUSEDRAGGED = false;
	14726	+
13959	14727	movingcamera = false;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
13960	14730	//System.out.println("mouseReleased: " + e);
13961	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14732	}
..	..	@@ -13979,9 +14749,9 @@
13979	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14751
13982		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14753	timeout = true;
13984		- else
	14754	+// ?? May 2019 else
13985	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14756	mouseDown = false;
13987	14757	if (!control && !command) // june 2013
..	..	@@ -14091,7 +14861,7 @@
14091	14861	System.out.println("keyReleased: " + e);
14092	14862	}
14093	14863
14094		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
14095	14865	{
14096	14866	//System.out.println("SetMouseMode = " + modifiers);
14097	14867	//modifiers &= ~1024;
..	..	@@ -14103,25 +14873,25 @@
14103	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	14874	// return;
14105	14875	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
14107	14877	{
14108	14878	mouseMode \|= ZOOM;
14109	14879	}
14110	14880
14111	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	14883	{
14114	14884	mouseMode \|= VR; // BACKFORTH;
14115	14885	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	14887	{
14118	14888	mouseMode \|= SELECT;
14119	14889	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
14121	14891	{
14122	14892	mouseMode \|= SELECT;
14123	14893	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	14895	{
14126	14896	mouseMode &= ~VR;
14127	14897	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +14920,10 @@
14150	14920
14151	14921	if (isRenderer) //
14152	14922	{
14153		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
14154	14924	}
14155	14925
14156		- theRenderer.keyPressed(key);
	14926	+ Globals.theRenderer.keyPressed(key);
14157	14927	}
14158	14928
14159	14929	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +14935,7 @@
14165	14935	float SATPOW = 1; // 2; // 0.5f;
14166	14936	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	14937
14168		- void keyPressed(int key)
	14938	+ public void keyPressed(int key)
14169	14939	{
14170	14940	if (key >= '0' && key <= '5')
14171	14941	clampbit = (key-'0');
..	..	@@ -14212,7 +14982,8 @@
14212	14982	// break;
14213	14983	case 'T':
14214	14984	CACHETEXTURE ^= true;
14215		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14216	14987	// repaint();
14217	14988	break;
14218	14989	case 'Y':
..	..	@@ -14297,7 +15068,9 @@
14297	15068	case 'E' : COMPACT ^= true;
14298	15069	repaint();
14299	15070	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15074	repaint();
14302	15075	break;
14303	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15095,8 @@
14322	15095	RevertCamera();
14323	15096	repaint();
14324	15097	break;
14325		- case 'L':
14326	15098	case 'l':
	15099	+ //case 'L':
14327	15100	if (lightMode)
14328	15101	{
14329	15102	lightMode = false;
..	..	@@ -14466,9 +15239,9 @@
14466	15239	case '_':
14467	15240	kompactbit = 5;
14468	15241	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
14472	15245	case ' ':
14473	15246	lightMode ^= true;
14474	15247	Globals.lighttouched = true;
..	..	@@ -14480,13 +15253,14 @@
14480	15253	case ESC:
14481	15254	RENDERPROGRAM += 1;
14482	15255	RENDERPROGRAM %= 3;
	15256	+
14483	15257	repaint();
14484	15258	break;
14485	15259	case 'Z':
14486	15260	//RESIZETEXTURE ^= true;
14487	15261	//break;
14488	15262	case 'z':
14489		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14490	15264	Globals.lighttouched = true;
14491	15265	repaint();
14492	15266	break;
..	..	@@ -14519,8 +15293,9 @@
14519	15293	case DELETE:
14520	15294	ClearSelection();
14521	15295	break;
14522		- /*
14523	15296	case '+':
	15297	+
	15298	+ /*
14524	15299	//fontsize += 1;
14525	15300	bbzoom *= 2;
14526	15301	repaint();
..	..	@@ -14537,17 +15312,17 @@
14537	15312	case '=':
14538	15313	IncDepth();
14539	15314	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
14541	15316	maskbit = 6;
14542	15317	break;
14543	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15319	DecDepth();
14545	15320	maskbit = 5;
14546	15321	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
14551	15326	break;
14552	15327	case '{':
14553	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15377,7 @@
14602	15377	}
14603	15378	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15379	}
	15380	+
14605	15381	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15382
14607	15383	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15385,11 @@
14609	15385	//mode = ROTATE;
14610	15386	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15387	{
14612		- SetMouseMode(modifiers);
	15388	+ SetMouseMode(0, modifiers);
14613	15389	}
14614	15390	}
14615	15391
14616		- protected void processKeyEvent(KeyEvent e)
	15392	+ public void processKeyEvent(KeyEvent e)
14617	15393	{
14618	15394	switch (e.getID())
14619	15395	{
..	..	@@ -14743,8 +15519,9 @@
14743	15519
14744	15520	protected void processMouseMotionEvent(MouseEvent e)
14745	15521	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15522	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15523	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15524	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15525	{
14749	15526	mouseMoved(e);
14750	15527	} else
..	..	@@ -14769,11 +15546,12 @@
14769	15546	}
14770	15547	*/
14771	15548
14772		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
14773	15550	}
14774	15551
14775	15552	void SelectParent()
14776	15553	{
	15554	+ new Exception().printStackTrace();
14777	15555	System.exit(0);
14778	15556	Composite group = (Composite) object;
14779	15557	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15563,10 @@
14785	15563	{
14786	15564	//selectees.remove(i);
14787	15565	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15567	} else
14790	15568	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15570	}
14793	15571
14794	15572	first = false;
..	..	@@ -14797,6 +15575,7 @@
14797	15575
14798	15576	void SelectChildren()
14799	15577	{
	15578	+ new Exception().printStackTrace();
14800	15579	System.exit(0);
14801	15580	/*
14802	15581	Composite group = (Composite) object;
..	..	@@ -14829,12 +15608,12 @@
14829	15608	for (int j = 0; j < group.children.size(); j++)
14830	15609	{
14831	15610	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15612	first = false;
14834	15613	}
14835	15614	} else
14836	15615	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15617	}
14839	15618
14840	15619	first = false;
..	..	@@ -14845,21 +15624,21 @@
14845	15624	{
14846	15625	//Composite group = (Composite) object;
14847	15626	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15628	}
14850	15629
14851	15630	void ResetTransform(int mask)
14852	15631	{
14853	15632	//Composite group = (Composite) object;
14854	15633	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
14856	15635	}
14857	15636
14858	15637	void FlipTransform()
14859	15638	{
14860	15639	//Composite group = (Composite) object;
14861	15640	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
14863	15642	// group.editWindow.ReduceMesh(true);
14864	15643	}
14865	15644
..	..	@@ -14867,7 +15646,7 @@
14867	15646	{
14868	15647	//Composite group = (Composite) object;
14869	15648	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
14871	15650	// group.editWindow.ReduceMesh(true);
14872	15651	}
14873	15652
..	..	@@ -14875,7 +15654,7 @@
14875	15654	{
14876	15655	//Composite group = (Composite) object;
14877	15656	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
14879	15658	}
14880	15659
14881	15660	void IncDepth()
..	..	@@ -14961,7 +15740,9 @@
14961	15740	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15741	//Image img = CreateImage(width, height);
14963	15742	//System.out.println("width = " + width + "; height = " + height + "\n");
	15743	+
14964	15744	Graphics gr = g; // img.getGraphics();
	15745	+
14965	15746	if (!hasMarquee)
14966	15747	{
14967	15748	if (Xmin < Xmax) // !locked)
..	..	@@ -15049,6 +15830,7 @@
15049	15830	info.bounds.y += (height - desired) / 2;
15050	15831	}
15051	15832	}
	15833	+
15052	15834	info.g = gr;
15053	15835	info.camera = renderCamera;
15054	15836	/*
..	..	@@ -15058,15 +15840,55 @@
15058	15840	*/
15059	15841	if (!isRenderer)
15060	15842	{
15061		- object.drawEditHandles(info, 0);
	15843	+ Grafreed.Assert(object != null);
	15844	+ Grafreed.Assert(object.selection != null);
	15845	+ if (object.selection.Size() > 0)
	15846	+ {
	15847	+ int hitSomething = object.selection.get(0).hitSomething;
	15848	+
	15849	+ info.DX = 0;
	15850	+ info.DY = 0;
	15851	+ info.W = 1;
	15852	+ if (hitSomething == Object3D.hitCenter)
	15853	+ {
	15854	+ info.DX = X;
	15855	+ if (X != 0)
	15856	+ info.DX -= info.bounds.width/2;
	15857	+
	15858	+ info.DY = Y;
	15859	+ if (Y != 0)
	15860	+ info.DY -= info.bounds.height/2;
	15861	+ }
	15862	+
	15863	+ object.drawEditHandles(info, 0);
	15864	+
	15865	+ if (drag && (X != 0 \|\| Y != 0))
	15866	+ {
	15867	+ switch (hitSomething)
	15868	+ {
	15869	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15870	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15871	+ break;
	15872	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15873	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15874	+ break;
	15875	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15876	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15877	+ break;
	15878	+ }
	15879	+
	15880	+ }
	15881	+ }
15062	15882	}
15063	15883	}
	15884	+
15064	15885	if (isRenderer)
15065	15886	{
15066	15887	//gr.setColor(Color.black);
15067	15888	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	15889	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	15890	}
	15891	+
15070	15892	if (hasMarquee)
15071	15893	{
15072	15894	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +16001,7 @@
15179	16001	public boolean mouseDown(Event evt, int x, int y)
15180	16002	{
15181	16003	System.out.println("mouseDown: " + evt);
	16004	+ System.exit(0);
15182	16005	/*
15183	16006	locked = true;
15184	16007	drag = false;
..	..	@@ -15222,7 +16045,7 @@
15222	16045	{
15223	16046	keyPressed(0, modifiers);
15224	16047	}
15225		- clickStart(x, y, modifiers);
	16048	+ // clickStart(x, y, modifiers);
15226	16049	return true;
15227	16050	}
15228	16051
..	..	@@ -15340,7 +16163,7 @@
15340	16163	{
15341	16164	keyReleased(0, 0);
15342	16165	}
15343		- drag(x, y, modifiers);
	16166	+ drag(x, y, 0, modifiers);
15344	16167	return true;
15345	16168	}
15346	16169
..	..	@@ -15472,7 +16295,7 @@
15472	16295	Object3D object;
15473	16296	static Object3D trackedobject;
15474	16297	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16298	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16299	/static/ Camera eyeCamera;
15477	16300	/static/ Camera lightCamera;
15478	16301	int cameracount;
..	..	@@ -15757,16 +16580,16 @@
15757	16580	cStatic.objectstack[materialdepth++] = checker;
15758	16581	//System.out.println("material " + material);
15759	16582	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
15761	16584
15762	16585	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16587
15765	16588	materialdepth -= 1;
15766	16589	if (materialdepth > 0)
15767	16590	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16591	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16592	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16593	}
15771	16594	//checker.GetMaterial().opacity = 1f;
15772	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +16675,14 @@
15852	16675	}
15853	16676	}
15854	16677
	16678	+ private Object3D GetFolder()
	16679	+ {
	16680	+ Object3D folder = object.GetWindow().copy;
	16681	+ if (object.GetWindow().copy.selection.Size() > 0)
	16682	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16683	+ return folder;
	16684	+ }
	16685	+
15855	16686	class SelectBuffer implements GLEventListener
15856	16687	{
15857	16688
..	..	@@ -15910,6 +16741,7 @@
15910	16741	{
15911	16742	if (!selection)
15912	16743	{
	16744	+ new Exception().printStackTrace();
15913	16745	System.exit(0);
15914	16746	return;
15915	16747	}
..	..	@@ -15930,6 +16762,17 @@
15930	16762
15931	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	16764
	16765	+ if (PAINTMODE)
	16766	+ {
	16767	+ if (object.GetWindow().copy.selection.Size() > 0)
	16768	+ {
	16769	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16770	+
	16771	+ // Make what you paint not selectable.
	16772	+ paintobj.ResetSelectable();
	16773	+ }
	16774	+ }
	16775	+
15933	16776	//int tmp = selection_view;
15934	16777	//selection_view = -1;
15935	16778	int temp = DrawMode();
..	..	@@ -15941,6 +16784,17 @@
15941	16784	// temp = DEFAULT; // patch for selection debug
15942	16785	Globals.drawMode = temp; // WARNING
15943	16786
	16787	+ if (PAINTMODE)
	16788	+ {
	16789	+ if (object.GetWindow().copy.selection.Size() > 0)
	16790	+ {
	16791	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16792	+
	16793	+ // Revert.
	16794	+ paintobj.RestoreSelectable();
	16795	+ }
	16796	+ }
	16797	+
15944	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	16799
15946	16800	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +16842,8 @@
15988	16842	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16845	+
	16846	+ CreateSelectedPoint();
15991	16847
15992	16848	// Will fit the mesh !!!
15993	16849	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +16893,36 @@
16037	16893	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	16894	}
16039	16895
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16896	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	16897	}
16042	16898	}
16043	16899
16044	16900	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	16902
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16903	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	16904	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16905	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	16906
16051		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	16910
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();
	16911	+ Object3D inst = new Object3D("inst" + paintcount++);
	16912	+
	16913	+ inst.CreateMaterial(); // use a void leaf to select instances
	16914	+
	16915	+ inst.add(paintobj); // link
	16916	+
	16917	+ object.GetWindow().SnapObject(inst);
	16918	+
	16919	+ Object3D folder = paintFolder; // GetFolder();
	16920	+
	16921	+ folder.add(inst);
	16922	+
	16923	+ object.GetWindow().ResetModel();
	16924	+ object.GetWindow().refreshContents();
	16925	+ }
16068	16926	}
16069	16927	else
16070	16928	paintcount = 0;
..	..	@@ -16103,6 +16961,11 @@
16103	16961	//System.out.println("objects[color] = " + objects[color]);
16104	16962	//objects[color].Select();
16105	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
16106	16969	object.Select(color, deselect);
16107	16970	}
16108	16971
..	..	@@ -16202,7 +17065,7 @@
16202	17065	gl.glDisable(gl.GL_CULL_FACE);
16203	17066	}
16204	17067
16205		- if (!RENDERSHADOW)
	17068	+ if (!Globals.RENDERSHADOW)
16206	17069	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17070
16208	17071	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17075,7 @@
16212	17075	//gl.glColorMask(false, false, false, false);
16213	17076
16214	17077	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17078	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17079	{
16217	17080	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17081
..	..	@@ -16628,23 +17491,15 @@
16628	17491	int AAbuffersize = 0;
16629	17492
16630	17493	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17494	+ static Superellipsoid selectedpoint;
16632	17495	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();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
16637	17500
16638	17501	static Sphere debugpoints[] = new Sphere[8];
16639	17502
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17503	static void InitPoints(float radius)
16649	17504	{
16650	17505	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17551,11 @@
16696	17551	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17552	// Depth buffer format
16698	17553	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17554	+
	17555	+ public void NextIndex()
16700	17556	{
16701	17557	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17558	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17559	//objects[indexcount] = o;
16704	17560	//System.out.println("indexcount = " + indexcount);
16705	17561	}