~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
..	..	@@ -56,14 +55,12 @@
56	55	static int CURRENTANTIALIAS = 0; // 1;
57	56	/static/ boolean RENDERSHADOW = true;
58	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	58
62	59	boolean DISPLAYTEXT = false;
63	60	//boolean REDUCETEXTURE = true;
64	61	boolean CACHETEXTURE = true;
65	62	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
67	64	boolean COMPRESSTEXTURE = false;
68	65	boolean KOMPACTTEXTURE = false; // true;
69	66	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +89,8 @@
92	89
93	90	static int tickcount = 0; // slow pose issue
94	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
95	94	static boolean BOXMODE = false;
96	95	static boolean IMAGEFLIP = false;
97	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -150,12 +149,12 @@
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
152	151
153		- static CameraPane theRenderer;
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	153
155	154	void SetAsGLRenderer(boolean b)
156	155	{
157	156	isRenderer = b;
158		- theRenderer = this;
	157	+ Globals.theRenderer = this;
159	158	}
160	159
161	160	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -193,9 +192,43 @@
193	192
194	193	/// INTERFACE
195	194
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
196	224	public boolean IsBoxMode()
197	225	{
198	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
199	232	}
200	233
201	234	public void ClearDepth()
..	..	@@ -293,7 +326,7 @@
293	326	cStatic.objectstack[materialdepth++] = obj;
294	327	//System.out.println("material " + material);
295	328	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
297	330	if (obj instanceof Camera)
298	331	{
299	332	display.options1[0] = material.shift;
..	..	@@ -302,14 +335,28 @@
302	335	display.options1[2] = material.shadowbias;
303	336	display.options1[3] = material.aniso;
304	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
305	343	display.options2[0] = material.opacity;
306	344	display.options2[1] = material.diffuse;
307	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
308	349
309	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
310	354	display.options4[0] = material.cameralight/0.2f;
311	355	display.options4[1] = material.subsurface;
312	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
313	360
314	361	// if (display.CURRENTANTIALIAS > 0)
315	362	// display.options3[3] /= 4;
..	..	@@ -325,7 +372,7 @@
325	372	/**/
326	373	} else
327	374	{
328		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
329	376	}
330	377	} else
331	378	{
..	..	@@ -349,8 +396,8 @@
349	396	cStatic.objectstack[materialdepth++] = obj;
350	397	//System.out.println("material " + material);
351	398	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	401	}
355	402	}
356	403
..	..	@@ -367,8 +414,8 @@
367	414	materialdepth -= 1;
368	415	if (materialdepth > 0)
369	416	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	419	}
373	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +435,8 @@
388	435	materialdepth -= 1;
389	436	if (materialdepth > 0)
390	437	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	440	}
394	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	442	//else
..	..	@@ -430,10 +477,12 @@
430	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	478	{
432	479	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
434	483	if (!hasnorm)
435	484	{
436		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
437	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +865,7 @@
816	865
817	866	if ((i % 100) == 0 && i != 0)
818	867	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	869	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	870	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	871	}
..	..	@@ -848,7 +897,7 @@
848	897
849	898	if ((i % 100) == 0 && i != 0)
850	899	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	901	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	902	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	903	}
..	..	@@ -1061,7 +1110,342 @@
1061	1110	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1111	}
1063	1112
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ 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);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
1064	1421	/// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
1065	1449
1066	1450	void SetColor(Object3D obj, Vertex p0)
1067	1451	{
..	..	@@ -1240,7 +1624,7 @@
1240	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1625	}
1242	1626
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1628	{
1245	1629	CameraPane display = this;
1246	1630	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1640,18 @@
1256	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1641	if (!material.multiply)
1258	1642	{
1259		- display.color = color;
	1643	+ display.color = material.color;
1260	1644	display.saturation = material.modulation;
1261	1645	}
1262	1646	else
1263	1647	{
1264		- display.color = color2;
	1648	+ display.color = material.color2;
1265	1649	display.saturation = material.modulation2;
1266	1650	}
1267	1651
1268	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1653
1270		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1271	1655
1272	1656	/**/
1273	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1659,7 @@
1275	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1279	1663
1280	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1767,9 @@
1383	1767	display.modelParams7[2] = 0;
1384	1768	display.modelParams7[3] = 0;
1385	1769
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1771
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1774	{
1391	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1911,7 @@
1527	1911	void PushMatrix(double[][] matrix)
1528	1912	{
1529	1913	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1531	1915	}
1532	1916
1533	1917	void PushMatrix()
..	..	@@ -1624,7 +2008,7 @@
1624	2008
1625	2009	static int camerachangeframe;
1626	2010
1627		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
1628	2012	{
1629	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2014	// return false;
..	..	@@ -1681,7 +2065,7 @@
1681	2065	//System.err.println("Oeil on");
1682	2066	OEIL = true;
1683	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2069	//pingthread.StepToTarget(true);
1686	2070	}
1687	2071
..	..	@@ -1752,33 +2136,6 @@
1752	2136	mainDL ^= true;
1753	2137	}
1754	2138
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	2139	void ToggleFullScreen()
1783	2140	{
1784	2141	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2146,94 @@
1789	2146	Globals.CROWD ^= true;
1790	2147	}
1791	2148
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2149	void ToggleLocal()
1798	2150	{
1799	2151	LOCALTRANSFORM ^= true;
1800	2152	}
1801	2153
1802		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
1803	2187	{
1804	2188	FAST ^= true;
1805	2189	}
1806	2190
1807		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
1808	2192	{
1809	2193	SLOWPOSE ^= true;
1810	2194	}
1811	2195
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
1818	2197	{
1819	2198	BOXMODE ^= true;
1820	2199	}
1821	2200
1822		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
1823	2207	{
1824	2208	SMOOTHFOCUS ^= true;
1825	2209	}
1826	2210
1827		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
1828	2212	{
1829	2213	IMAGEFLIP ^= true;
1830	2214	}
1831	2215
1832		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
1833	2217	{
1834	2218	SPEAKERMOCAP ^= true;
1835	2219	}
1836	2220
1837		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
1838	2222	{
1839	2223	SPEAKERCAMERA ^= true;
1840	2224	}
1841	2225
1842		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
1843	2227	{
1844	2228	SPEAKERFOCUS ^= true;
1845	2229	}
1846	2230
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
1853	2232	{
1854	2233	FRUSTUM ^= true;
1855	2234	}
1856	2235
1857		- void ToggleTrack()
	2236	+ public void ToggleTrack()
1858	2237	{
1859	2238	TRACK ^= true;
1860	2239	if (TRACK)
..	..	@@ -1873,25 +2252,35 @@
1873	2252	repaint();
1874	2253	}
1875	2254
1876		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
1877	2256	{
1878	2257	TRACKONCE ^= true;
1879	2258	}
1880	2259
1881		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
1882	2261	{
1883	2262	SHADOWTRACK ^= true;
1884	2263	repaint();
1885	2264	}
1886	2265
1887		- void ToggleOeil()
	2266	+ public void ToggleOeil()
1888	2267	{
1889	2268	OEIL ^= true;
1890	2269	}
1891	2270
1892		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
1893	2272	{
1894	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
1895	2284	}
1896	2285
1897	2286	void ToggleLookAt()
..	..	@@ -1899,9 +2288,9 @@
1899	2288	LOOKAT ^= true;
1900	2289	}
1901	2290
1902		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1903	2292	{
1904		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1905	2294	}
1906	2295
1907	2296	void ToggleHandles()
..	..	@@ -1909,10 +2298,17 @@
1909	2298	HANDLES ^= true;
1910	2299	}
1911	2300
	2301	+ Object3D paintFolder;
	2302	+
1912	2303	void TogglePaint()
1913	2304	{
1914	2305	PAINTMODE ^= true;
1915	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
1916	2312	}
1917	2313
1918	2314	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2404,7 @@
2008	2404	{
2009	2405	return currentGL;
2010	2406	}
2011		-
	2407	+
2012	2408	/**/
2013	2409	class CacheTexture
2014	2410	{
..	..	@@ -2026,9 +2422,10 @@
2026	2422	/**/
2027	2423
2028	2424	// 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>();
	2425	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2426	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2427	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2428	+
2032	2429	int pigmentdepth = 0;
2033	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2431	int bumpdepth = 0;
..	..	@@ -2050,6 +2447,33 @@
2050	2447	true,
2051	2448	com.sun.opengl.util.texture.TextureIO.PNG);
2052	2449	} catch (java.io.IOException e)
	2450	+ {
	2451	+ throw new javax.media.opengl.GLException(e);
	2452	+ }
	2453	+
	2454	+ if (bump)
	2455	+ texturedata = ConvertBump(texturedata, false);
	2456	+
	2457	+ com.sun.opengl.util.texture.Texture texture =
	2458	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2459	+
	2460	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2461	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2462	+
	2463	+ return texture;
	2464	+ }
	2465	+
	2466	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2467	+ {
	2468	+ TextureData texturedata = null;
	2469	+
	2470	+ try
	2471	+ {
	2472	+ texturedata =
	2473	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2474	+ name,
	2475	+ true);
	2476	+ } catch (Exception e)
2053	2477	{
2054	2478	throw new javax.media.opengl.GLException(e);
2055	2479	}
..	..	@@ -3136,6 +3560,8 @@
3136	3560
3137	3561	System.out.println("LOADING TEXTURE : " + name);
3138	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
3139	3565	//
3140	3566	if (false) // compressbit > 0)
3141	3567	{
..	..	@@ -3840,6 +4266,7 @@
3840	4266
3841	4267	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4268	{
	4269	+ new Exception().printStackTrace();
3843	4270	System.exit(0);
3844	4271	com.sun.opengl.util.texture.Texture texture = null;
3845	4272
..	..	@@ -7533,7 +7960,7 @@
7533	7960	String pigment = Object3D.GetPigment(tex);
7534	7961	String bump = Object3D.GetBump(tex);
7535	7962
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	7964	{
7538	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7550,6 +7977,64 @@
7550	7977
7551	7978	ReleaseTexture(bump, true);
7552	7979	ReleaseTexture(pigment, false);
	7980	+ }
	7981	+
	7982	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7983	+ {
	7984	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7985	+ {
	7986	+ return;
	7987	+ }
	7988	+
	7989	+ if (tex == null)
	7990	+ {
	7991	+ ReleaseTexture(null, false);
	7992	+ return;
	7993	+ }
	7994	+
	7995	+ String pigment = Object3D.GetPigment(tex);
	7996	+
	7997	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7998	+ {
	7999	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8000	+ // System.out.println("; bump = " + bump);
	8001	+ }
	8002	+
	8003	+ if (pigment.equals(""))
	8004	+ {
	8005	+ pigment = null;
	8006	+ }
	8007	+
	8008	+ ReleaseTexture(pigment, false);
	8009	+ }
	8010	+
	8011	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8012	+ {
	8013	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8014	+ {
	8015	+ return;
	8016	+ }
	8017	+
	8018	+ if (tex == null)
	8019	+ {
	8020	+ ReleaseTexture(null, true);
	8021	+ return;
	8022	+ }
	8023	+
	8024	+ String bump = Object3D.GetBump(tex);
	8025	+
	8026	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ {
	8028	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8029	+ // System.out.println("; bump = " + bump);
	8030	+ }
	8031	+
	8032	+ if (bump.equals(""))
	8033	+ {
	8034	+ bump = null;
	8035	+ }
	8036	+
	8037	+ ReleaseTexture(bump, true);
7553	8038	}
7554	8039
7555	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7655,7 +8140,55 @@
7655	8140	}
7656	8141	}
7657	8142
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8143	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8144	+ {
	8145	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8146	+// ambientOcclusion ) // \|\| !textureon)
	8147	+// {
	8148	+// return; // false;
	8149	+// }
	8150	+//
	8151	+// if (tex == null)
	8152	+// {
	8153	+// BindTexture(null,false,resolution);
	8154	+// BindTexture(null,true,resolution);
	8155	+// return;
	8156	+// }
	8157	+//
	8158	+// String pigment = Object3D.GetPigment(tex);
	8159	+// String bump = Object3D.GetBump(tex);
	8160	+//
	8161	+// usedtextures.add(pigment);
	8162	+// usedtextures.add(bump);
	8163	+//
	8164	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8165	+// {
	8166	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8167	+// // System.out.println("; bump = " + bump);
	8168	+// }
	8169	+//
	8170	+// if (bump.equals(""))
	8171	+// {
	8172	+// bump = null;
	8173	+// }
	8174	+// if (pigment.equals(""))
	8175	+// {
	8176	+// pigment = null;
	8177	+// }
	8178	+//
	8179	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8180	+// BindTexture(pigment, false, resolution);
	8181	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8182	+// BindTexture(bump, true, resolution);
	8183	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8184	+//
	8185	+// return; // true;
	8186	+
	8187	+ BindPigmentTexture(tex, resolution);
	8188	+ BindBumpTexture(tex, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8192	{
7660	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8194	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7665,18 +8198,48 @@
7665	8198
7666	8199	if (tex == null)
7667	8200	{
7668		- BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
7670	8202	return;
7671	8203	}
7672	8204
7673	8205	String pigment = Object3D.GetPigment(tex);
	8206	+
	8207	+ usedtextures.add(pigment);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (pigment.equals(""))
	8216	+ {
	8217	+ pigment = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8221	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8222	+ }
	8223	+
	8224	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8225	+ {
	8226	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8227	+ ambientOcclusion ) // \|\| !textureon)
	8228	+ {
	8229	+ return; // false;
	8230	+ }
	8231	+
	8232	+ if (tex == null)
	8233	+ {
	8234	+ BindTexture(null, null,true,resolution);
	8235	+ return;
	8236	+ }
	8237	+
7674	8238	String bump = Object3D.GetBump(tex);
7675	8239
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
7678	8241
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8243	{
7681	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8245	// System.out.println("; bump = " + bump);
..	..	@@ -7686,42 +8249,70 @@
7686	8249	{
7687	8250	bump = null;
7688	8251	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8252
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
7698	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8256	}
7702	8257
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8258	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8259	+
	8260	+ private boolean FileExists(String tex)
7704	8261	{
7705		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8262	+ if (missingTextures.contains(tex))
	8263	+ {
	8264	+ return false;
	8265	+ }
	8266	+
	8267	+ boolean fileExists = new File(tex).exists();
	8268	+
	8269	+ if (!fileExists)
	8270	+ {
	8271	+ // If file exists, the "new File()" is not executed sgain
	8272	+ missingTextures.add(tex);
	8273	+ }
	8274	+
	8275	+ return fileExists;
	8276	+ }
	8277	+
	8278	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8279	+ {
	8280	+ CacheTexture texturecache = null;
7706	8281
7707	8282	if (tex != null)
7708	8283	{
7709	8284	String texname = tex;
7710	8285
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;
	8286	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8287	+
	8288	+// String[] split = tex.split("Textures");
	8289	+// if (split.length > 1)
	8290	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8291	+// else
	8292	+// if (!texname.startsWith("/"))
	8293	+// texname = "/Users/nbriere/Textures/" + texname;
	8294	+ if (!FileExists(tex))
	8295	+ {
	8296	+ texname = fallbackTextureName;
	8297	+ }
7717	8298
7718	8299	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	8300	{
	8301	+ if (bim == null)
	8302	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8303	+ else
	8304	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8305	+ }
	8306	+
	8307	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8308	+ {
	8309	+ TextureData texturedata = null;
	8310	+
	8311	+ if (bim == null)
	8312	+ {
	8313	+
	8314	+ }
	8315	+ else
7725	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8317	{
7727	8318	assert(!bump);
..	..	@@ -7733,19 +8324,19 @@
7733	8324	// }
7734	8325	// else
7735	8326	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
7738	8329	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8331	}
7741	8332	// }
7742	8333	} else
7743	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8335	{
7745	8336	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8337	+ texturecache = textures.get(tex);
	8338	+ if (texturecache == null)
	8339	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7749	8340	} else
7750	8341	{
7751	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -7755,9 +8346,9 @@
7755	8346	//{
7756	8347	if (tex.equals("WHITE_NOISE"))
7757	8348	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8349	+ texturecache = textures.get(tex);
	8350	+ if (texturecache == null)
	8351	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
7761	8352	} else
7762	8353	{
7763	8354	if (textureon)
..	..	@@ -7782,7 +8373,7 @@
7782	8373	}
7783	8374
7784	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
7786	8377	cachename = texname;
7787	8378	else
7788	8379	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8395,7 @@
7804	8395	}
7805	8396
7806	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
7808	8399	cachename = texname;
7809	8400	else
7810	8401	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8404,22 @@
7813	8404	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8405
7815	8406
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8407	+ if (texturedata == null)
	8408	+ throw new Exception();
	8409	+
	8410	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7818	8411	//texture = GetTexture(tex, bump);
7819	8412	}
7820	8413	}
7821	8414	//}
7822	8415	}
7823	8416
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
7825	8418	{
7826	8419	//return false;
7827	8420
7828	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8423	{
7831	8424	// String ext = "_highres";
7832	8425	// if (REDUCETEXTURE)
..	..	@@ -7915,8 +8508,8 @@
7915	8508	textures.remove(texname);
7916	8509	}
7917	8510
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
7920	8513
7921	8514	// newtex = true;
7922	8515	}
..	..	@@ -7932,12 +8525,12 @@
7932	8525	}
7933	8526	}
7934	8527
7935		- return texture;
	8528	+ return texturecache;
7936	8529	}
7937	8530
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8531	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7939	8532	{
7940		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7941	8534
7942	8535	if (bump)
7943	8536	{
..	..	@@ -7953,23 +8546,23 @@
7953	8546	return texture!=null?texture.texture:null;
7954	8547	}
7955	8548
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8549	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7957	8550	{
7958		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7959	8552
7960	8553	return texture!=null?texture.texturedata:null;
7961	8554	}
7962	8555
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7964	8557	{
7965	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8559	{
7967	8560	return false;
7968	8561	}
7969	8562
7970		- boolean newtex = false;
	8563	+ //boolean newtex = false;
7971	8564
7972		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
7973	8566
7974	8567	if (texture == null)
7975	8568	return false;
..	..	@@ -7999,7 +8592,7 @@
7999	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8594
8002		- return newtex;
	8595	+ return true; // Warning: not used.
8003	8596	}
8004	8597
8005	8598	ShadowBuffer shadowPBuf;
..	..	@@ -8837,11 +9430,35 @@
8837	9430	jy8[3] = 0.5f;
8838	9431	}
8839	9432
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9433	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9437
	9438	+ void ResetOptions()
	9439	+ {
	9440	+ options1[0] = 100;
	9441	+ options1[1] = 0.025f;
	9442	+ options1[2] = 0.01f;
	9443	+ options1[3] = 0;
	9444	+ options1[4] = 0;
	9445	+
	9446	+ options2[0] = 0;
	9447	+ options2[1] = 0.75f;
	9448	+ options2[2] = 0;
	9449	+ options2[3] = 0;
	9450	+
	9451	+ options3[0] = 1;
	9452	+ options3[1] = 1;
	9453	+ options3[2] = 1;
	9454	+ options3[3] = 0;
	9455	+
	9456	+ options4[0] = 1;
	9457	+ options4[1] = 0;
	9458	+ options4[2] = 1;
	9459	+ options4[3] = 0;
	9460	+ }
	9461	+
8845	9462	static int imagecount = 0; // movie generation
8846	9463
8847	9464	static int jitter = 0;
..	..	@@ -8937,8 +9554,8 @@
8937	9554	assert (parentcam != renderCamera);
8938	9555
8939	9556	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942	9559
8943	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9561
..	..	@@ -8953,8 +9570,8 @@
8953	9570	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9571
8955	9572	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958	9575
8959	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9577
..	..	@@ -9026,7 +9643,7 @@
9026	9643	//gl.glFlush();
9027	9644	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9645
9029		- if (ANIMATION && ABORTED)
	9646	+ if (Globals.ANIMATION && ABORTED)
9030	9647	{
9031	9648	System.err.println(" ABORTED FRAME");
9032	9649	break;
..	..	@@ -9056,7 +9673,7 @@
9056	9673	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9674
9058	9675	// save image
9059		- if (ANIMATION && !ABORTED)
	9676	+ if (Globals.ANIMATION && !ABORTED)
9060	9677	{
9061	9678	VPwidth = viewport[2];
9062	9679	VPheight = viewport[3];
..	..	@@ -9167,11 +9784,11 @@
9167	9784
9168	9785	// imagecount++;
9169	9786
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9787	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9788
9172	9789	if (!BOXMODE)
9173	9790	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9791	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9792	}
9176	9793
9177	9794	if (!BOXMODE)
..	..	@@ -9209,7 +9826,7 @@
9209	9826	ABORTED = false;
9210	9827	}
9211	9828	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9829	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	9830
9214	9831	if (false)
9215	9832	{
..	..	@@ -9872,11 +10489,11 @@
9872	10489
9873	10490	public void display(GLAutoDrawable drawable)
9874	10491	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10492	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10493	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10494	+ Grafreed.wav.save();
	10495	+ Grafreed.savesound = false;
	10496	+ Grafreed.hassound = false;
9880	10497	}
9881	10498	// if (DEBUG_SELECTION)
9882	10499	// {
..	..	@@ -9952,6 +10569,7 @@
9952	10569	ANTIALIAS = 0;
9953	10570	//System.out.println("RESTART");
9954	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
9955	10573	}
9956	10574	}
9957	10575	}
..	..	@@ -10006,7 +10624,7 @@
10006	10624	Object3D theobject = object;
10007	10625	Object3D theparent = object.parent;
10008	10626	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10627	+ object = (Object3D)Grafreed.clone(object);
10010	10628	object.Stripify();
10011	10629	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10630	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10637,14 @@
10019	10637	ambientOcclusion = false;
10020	10638	}
10021	10639
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10642	{
10024	10643	//if (RENDERSHADOW) // ?
10025	10644	if (!IsFrozen())
10026	10645	{
10027	10646	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10648	{
10030	10649	Globals.framecount++;
10031	10650	shadowbuffer.display();
..	..	@@ -10152,8 +10771,8 @@
10152	10771
10153	10772	// if (parentcam != renderCamera) // not a light
10154	10773	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157	10776
10158	10777	for (int j = 0; j < 4; j++)
10159	10778	{
..	..	@@ -10167,8 +10786,8 @@
10167	10786
10168	10787	// if (parentcam != renderCamera) // not a light
10169	10788	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172	10791
10173	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10793
..	..	@@ -10427,7 +11046,16 @@
10427	11046	// Bump noise
10428	11047	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11048	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11049	+
	11050	+ try
	11051	+ {
	11052	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11053	+ }
	11054	+ catch (Exception e)
	11055	+ {
	11056	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11057	+ }
	11058	+
10431	11059
10432	11060	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11061	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11078,9 @@
10450	11078
10451	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11080
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11081	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11082	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11083	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11084	} else
10457	11085	{
10458	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11091,7 @@
10463	11091	//System.out.println("BLENDING ON");
10464	11092	gl.glEnable(GL.GL_BLEND);
10465	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11095	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11096	gl.glLoadIdentity();
10469	11097
..	..	@@ -10552,8 +11180,8 @@
10552	11180	System.err.println("parentcam != renderCamera");
10553	11181
10554	11182	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11183	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11184	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557	11185	}
10558	11186
10559	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11202,8 @@
10574	11202	if (true) // TODO
10575	11203	{
10576	11204	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11205	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11206	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11207	}
10580	11208
10581	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10891,8 +11519,14 @@
10891	11519	{
10892	11520	renderpass++;
10893	11521	// System.out.println("Draw object... ");
	11522	+ STEP = 1;
10894	11523	if (FAST) // in case there is no script
10895		- STEP = 16;
	11524	+ STEP = 8;
	11525	+
	11526	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11527	+ {
	11528	+ STEP *= 4;
	11529	+ }
10896	11530
10897	11531	//object.FullInvariants();
10898	11532
..	..	@@ -10906,23 +11540,44 @@
10906	11540	e.printStackTrace();
10907	11541	}
10908	11542
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11543	+ if (Grafreed.RENDERME > 0)
	11544	+ Grafreed.RENDERME--; // mechante magouille
10911	11545
10912	11546	Globals.ONESTEP = false;
10913	11547	}
10914	11548
10915	11549	static boolean zoomonce = false;
10916	11550
	11551	+ static void CreateSelectedPoint()
	11552	+ {
	11553	+ if (selectedpoint == null)
	11554	+ {
	11555	+ debugpointG = new Sphere();
	11556	+ debugpointP = new Sphere();
	11557	+ debugpointC = new Sphere();
	11558	+ debugpointR = new Sphere();
	11559	+
	11560	+ selectedpoint = new Superellipsoid();
	11561	+
	11562	+ for (int i=0; i<8; i++)
	11563	+ {
	11564	+ debugpoints[i] = new Sphere();
	11565	+ }
	11566	+ }
	11567	+ }
	11568	+
10917	11569	void DrawObject(GL gl, boolean draw)
10918	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
10919	11574	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11575	// DrawMode() = SELECTION;
10921	11576	//GL gl = getGL();
10922	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11578	{
10924	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11581	pingthread.StepToTarget(true); // true);
10927	11582	// zoomonce = false;
10928	11583	}
..	..	@@ -10977,7 +11632,14 @@
10977	11632
10978	11633	usedtextures.clear();
10979	11634
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11635	+ try
	11636	+ {
	11637	+ BindTextures(DEFAULT_TEXTURES, 2);
	11638	+ }
	11639	+ catch (Exception e)
	11640	+ {
	11641	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11642	+ }
10981	11643	}
10982	11644	//System.out.println("--> " + stackdepth);
10983	11645	// GrafreeD.traceon();
..	..	@@ -10987,8 +11649,9 @@
10987	11649
10988	11650	if (DrawMode() == DEFAULT)
10989	11651	{
10990		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
10991	11653	{
	11654	+ CreateSelectedPoint();
10992	11655	float radius = 0.05f;
10993	11656	if (selectedpoint.radius != radius)
10994	11657	{
..	..	@@ -11051,7 +11714,7 @@
11051	11714	if (tex.equals("WHITE_NOISE"))
11052	11715	continue;
11053	11716
11054		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
11055	11718	{
11056	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057	11720	textures.get(tex).texture.dispose();
..	..	@@ -11068,7 +11731,14 @@
11068	11731	if (checker != null && DrawMode() == DEFAULT)
11069	11732	{
11070	11733	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11734	+ try
	11735	+ {
	11736	+ BindTextures(checker.GetTextures(), checker.texres);
	11737	+ }
	11738	+ catch (Exception e)
	11739	+ {
	11740	+ System.err.println("FAILED: " + checker.GetTextures());
	11741	+ }
11072	11742	// NEAREST
11073	11743	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11744	DrawChecker(gl);
..	..	@@ -11150,7 +11820,7 @@
11150	11820	return;
11151	11821	}
11152	11822
11153		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
11154	11824
11155	11825	GL gl = GetGL();
11156	11826
..	..	@@ -11467,8 +12137,8 @@
11467	12137	//obj.TransformToWorld(light, light);
11468	12138	for (int i = tp.size(); --i >= 0;)
11469	12139	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12140	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12141	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12142	}
11473	12143
11474	12144
..	..	@@ -11485,8 +12155,8 @@
11485	12155	parentcam = cameras[0];
11486	12156	}
11487	12157
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12158	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12159	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12160
11491	12161	LA.xformPos(light, renderCamera.toScreen, light);
11492	12162
..	..	@@ -12100,8 +12770,8 @@
12100	12770
12101	12771	// display shadow only (bump == 0)
12102	12772	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	12773	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12774	+ "SLT temp.z, temp.y, -one2048th.x;" +
12105	12775	"SUB temp.y, one.x, temp.z;" +
12106	12776	"MUL temp.x, temp.x, temp.y;" +
12107	12777	"KIL temp.x;" +
..	..	@@ -12230,8 +12900,10 @@
12230	12900	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	12901
12232	12902	"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
	12903	+ // Tuning for default skin
	12904	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12905	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12906	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	12907	"MUL temp.x, temp.x, temp.y;" +
12236	12908
12237	12909	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13102,7 @@
12430	13102	//once = true;
12431	13103	}
12432	13104
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13105	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13106	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13107	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13108
..	..	@@ -12563,12 +13235,16 @@
12563	13235
12564	13236	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13237	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13238	+
	13239	+ // Compare fragment depth in light space with shadowmap.
12566	13240	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13241	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13242	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13243	+
	13244	+ // Reverse comparison
12569	13245	"SUB temp.x, one.x, temp.x;" +
12570	13246	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13247	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13248	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13249
12574	13250	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13258,10 @@
12582	13258	// No shadow for backface
12583	13259	"DP3 temp.x, normal, lightd;" +
12584	13260	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13261	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13262	+
	13263	+ // No shadow when out of frustrum
	13264	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13265	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13266	"";
12587	13267	}
..	..	@@ -12728,7 +13408,8 @@
12728	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
12732	13413
12733	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13415	// OUT : diff, spec
..	..	@@ -12744,9 +13425,10 @@
12744	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13427	//"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;" +
	13428	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13429	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13430	+
	13431	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13433	"RCP " + dest + ".w," + dest + ".w;" +
12752	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +13822,7 @@
13140	13822	public void mousePressed(MouseEvent e)
13141	13823	{
13142	13824	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13825	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	13826	}
13145	13827
13146	13828	static long prevtime = 0;
..	..	@@ -13167,6 +13849,7 @@
13167	13849
13168	13850	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	13851
	13852	+ if (BUTTONLESSWHEEL)
13170	13853	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	13854	{
13172	13855	return;
..	..	@@ -13175,7 +13858,7 @@
13175	13858	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	13859
13177	13860	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13861	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	13862	{
13180	13863	keepboxmode = BOXMODE;
13181	13864	keepsupport = SUPPORT;
..	..	@@ -13215,8 +13898,8 @@
13215	13898	// mode \|= META;
13216	13899	//}
13217	13900
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13901	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13902	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	13903	anchorX = ax;
13221	13904	anchorY = ay;
13222	13905	prevX = px;
..	..	@@ -13250,6 +13933,7 @@
13250	13933	else
13251	13934	if (evt.getSource() == AAtimer)
13252	13935	{
	13936	+ Globals.TIMERRUNNING = false;
13253	13937	if (mouseDown)
13254	13938	{
13255	13939	//new Exception().printStackTrace();
..	..	@@ -13275,6 +13959,10 @@
13275	13959	// LIVE = waslive;
13276	13960	// wasliveok = true;
13277	13961	// waslive = false;
	13962	+
	13963	+ // May 2019 Forget it:
	13964	+ if (true)
	13965	+ return;
13278	13966
13279	13967	// source == timer
13280	13968	if (mouseDown)
..	..	@@ -13305,7 +13993,7 @@
13305	13993
13306	13994	// fev 2014???
13307	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	13997	pingthread.StepToTarget(true); // true);
13310	13998	}
13311	13999	// if (!LIVE)
..	..	@@ -13314,12 +14002,13 @@
13314	14002
13315	14003	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14004
13317		- void clickStart(int x, int y, int modifiers)
	14005	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14006	{
13319	14007	if (!wasliveok)
13320	14008	return;
13321	14009
13322	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
13323	14012
13324	14013	// waslive = LIVE;
13325	14014	// LIVE = false;
..	..	@@ -13331,7 +14020,7 @@
13331	14020	// touched = true; // main DL
13332	14021	if (isRenderer)
13333	14022	{
13334		- SetMouseMode(modifiers);
	14023	+ SetMouseMode(modifiers, modifiersex);
13335	14024	}
13336	14025
13337	14026	selectX = anchorX = x;
..	..	@@ -13344,7 +14033,7 @@
13344	14033	clicked = true;
13345	14034	hold = false;
13346	14035
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14036	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14037	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14038	{
13350	14039	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13375,7 +14064,7 @@
13375	14064	info.camera = renderCamera;
13376	14065	info.x = x;
13377	14066	info.y = y;
13378		- info.modifiers = modifiers;
	14067	+ info.modifiers = modifiersex;
13379	14068	editObj = object.doEditClick(info, 0);
13380	14069	if (!editObj)
13381	14070	{
..	..	@@ -13392,11 +14081,14 @@
13392	14081
13393	14082	public void mouseDragged(MouseEvent e)
13394	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
	14086	+ //System.out.println("mouseDragged: " + e);
13395	14087	if (isRenderer)
13396	14088	movingcamera = true;
	14089	+
13397	14090	//if (drawing)
13398	14091	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14092	if ((e.getModifiersEx() & CTRL) != 0
13401	14093	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14094	{
..	..	@@ -13404,7 +14096,7 @@
13404	14096	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14097	}
13406	14098	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14099	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14100
13409	14101	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14102	}
..	..	@@ -13577,6 +14269,7 @@
13577	14269
13578	14270	public void run()
13579	14271	{
	14272	+ new Exception().printStackTrace();
13580	14273	System.exit(0);
13581	14274	for (;;)
13582	14275	{
..	..	@@ -13640,7 +14333,7 @@
13640	14333	{
13641	14334	Globals.lighttouched = true;
13642	14335	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14336	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14337	}
13645	14338	//else
13646	14339	}
..	..	@@ -13654,12 +14347,12 @@
13654	14347	void GoDown(int mod)
13655	14348	{
13656	14349	MODIFIERS \|= COMMAND;
13657		- /*
	14350	+ /**/
13658	14351	if((mod&SHIFT) == SHIFT)
13659	14352	manipCamera.RotatePosition(0, -speed);
13660	14353	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
13663	14356	if ((mod & SHIFT) == SHIFT)
13664	14357	{
13665	14358	mouseMode = mouseMode; // VR??
..	..	@@ -13675,12 +14368,12 @@
13675	14368	void GoUp(int mod)
13676	14369	{
13677	14370	MODIFIERS \|= COMMAND;
13678		- /*
	14371	+ /**/
13679	14372	if((mod&SHIFT) == SHIFT)
13680	14373	manipCamera.RotatePosition(0, speed);
13681	14374	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
13684	14377	if ((mod & SHIFT) == SHIFT)
13685	14378	{
13686	14379	mouseMode = mouseMode;
..	..	@@ -13696,12 +14389,12 @@
13696	14389	void GoLeft(int mod)
13697	14390	{
13698	14391	MODIFIERS \|= COMMAND;
13699		- /*
	14392	+ /**/
13700	14393	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
13702		- else
13703	14394	manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
13705	14398	if ((mod & SHIFT) == SHIFT)
13706	14399	{
13707	14400	mouseMode = mouseMode;
..	..	@@ -13717,12 +14410,12 @@
13717	14410	void GoRight(int mod)
13718	14411	{
13719	14412	MODIFIERS \|= COMMAND;
13720		- /*
	14413	+ /**/
13721	14414	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
13723		- else
13724	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
13726	14419	if ((mod & SHIFT) == SHIFT)
13727	14420	{
13728	14421	mouseMode = mouseMode;
..	..	@@ -13740,7 +14433,7 @@
13740	14433	int X, Y;
13741	14434	boolean SX, SY;
13742	14435
13743		- void drag(int x, int y, int modifiers)
	14436	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14437	{
13745	14438	if (IsFrozen())
13746	14439	{
..	..	@@ -13749,17 +14442,17 @@
13749	14442
13750	14443	drag = true; // NEW
13751	14444
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14445	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14446
13754	14447	X = x;
13755	14448	Y = y;
13756	14449	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14450	+ MODIFIERS = modifiersex;
	14451	+ modifiersex &= ~1024;
13759	14452	if (false) // modifiers != 0)
13760	14453	{
13761	14454	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14455	+ System.out.println("mouseDragged: " + modifiersex);
13763	14456	System.out.println("SHIFT = " + SHIFT);
13764	14457	System.out.println("CONTROL = " + COMMAND);
13765	14458	System.out.println("META = " + META);
..	..	@@ -13779,7 +14472,8 @@
13779	14472	info.camera = renderCamera;
13780	14473	info.x = x;
13781	14474	info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14477	} else
13784	14478	{
13785	14479	if (x < startX)
..	..	@@ -13931,7 +14625,6 @@
13931	14625	public void mouseMoved(MouseEvent e)
13932	14626	{
13933	14627	//System.out.println("mouseMoved: " + e);
13934		-
13935	14628	if (isRenderer)
13936	14629	return;
13937	14630
..	..	@@ -13944,7 +14637,9 @@
13944	14637	ci.camera = renderCamera;
13945	14638	if (!isRenderer)
13946	14639	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
13948	14643	{
13949	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14645	} else
..	..	@@ -13956,7 +14651,11 @@
13956	14651
13957	14652	public void mouseReleased(MouseEvent e)
13958	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
13959	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
13960	14659	//System.out.println("mouseReleased: " + e);
13961	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14661	}
..	..	@@ -13979,9 +14678,9 @@
13979	14678	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14679	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14680
13982		- if (control \|\| command \|\| IsFrozen())
	14681	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14682	timeout = true;
13984		- else
	14683	+// ?? May 2019 else
13985	14684	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14685	mouseDown = false;
13987	14686	if (!control && !command) // june 2013
..	..	@@ -14091,7 +14790,7 @@
14091	14790	System.out.println("keyReleased: " + e);
14092	14791	}
14093	14792
14094		- void SetMouseMode(int modifiers)
	14793	+ void SetMouseMode(int modifiers, int modifiersex)
14095	14794	{
14096	14795	//System.out.println("SetMouseMode = " + modifiers);
14097	14796	//modifiers &= ~1024;
..	..	@@ -14103,25 +14802,25 @@
14103	14802	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	14803	// return;
14105	14804	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	14805	+ if ((modifiersex & WHEEL) == WHEEL)
14107	14806	{
14108	14807	mouseMode \|= ZOOM;
14109	14808	}
14110	14809
14111	14810	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	14811	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	14812	{
14114	14813	mouseMode \|= VR; // BACKFORTH;
14115	14814	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14815	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	14816	{
14118	14817	mouseMode \|= SELECT;
14119	14818	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	14819	+ if ((modifiersex & COMMAND) == COMMAND)
14121	14820	{
14122	14821	mouseMode \|= SELECT;
14123	14822	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14823	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	14824	{
14126	14825	mouseMode &= ~VR;
14127	14826	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +14849,10 @@
14150	14849
14151	14850	if (isRenderer) //
14152	14851	{
14153		- SetMouseMode(modifiers);
	14852	+ SetMouseMode(0, modifiers);
14154	14853	}
14155	14854
14156		- theRenderer.keyPressed(key);
	14855	+ Globals.theRenderer.keyPressed(key);
14157	14856	}
14158	14857
14159	14858	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +14864,7 @@
14165	14864	float SATPOW = 1; // 2; // 0.5f;
14166	14865	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	14866
14168		- void keyPressed(int key)
	14867	+ public void keyPressed(int key)
14169	14868	{
14170	14869	if (key >= '0' && key <= '5')
14171	14870	clampbit = (key-'0');
..	..	@@ -14297,7 +14996,9 @@
14297	14996	case 'E' : COMPACT ^= true;
14298	14997	repaint();
14299	14998	break;
14300		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15002	repaint();
14302	15003	break;
14303	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15023,8 @@
14322	15023	RevertCamera();
14323	15024	repaint();
14324	15025	break;
14325		- case 'L':
14326	15026	case 'l':
	15027	+ //case 'L':
14327	15028	if (lightMode)
14328	15029	{
14329	15030	lightMode = false;
..	..	@@ -14466,9 +15167,9 @@
14466	15167	case '_':
14467	15168	kompactbit = 5;
14468	15169	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
14472	15173	case ' ':
14473	15174	lightMode ^= true;
14474	15175	Globals.lighttouched = true;
..	..	@@ -14480,13 +15181,14 @@
14480	15181	case ESC:
14481	15182	RENDERPROGRAM += 1;
14482	15183	RENDERPROGRAM %= 3;
	15184	+
14483	15185	repaint();
14484	15186	break;
14485	15187	case 'Z':
14486	15188	//RESIZETEXTURE ^= true;
14487	15189	//break;
14488	15190	case 'z':
14489		- RENDERSHADOW ^= true;
	15191	+ Globals.RENDERSHADOW ^= true;
14490	15192	Globals.lighttouched = true;
14491	15193	repaint();
14492	15194	break;
..	..	@@ -14519,8 +15221,9 @@
14519	15221	case DELETE:
14520	15222	ClearSelection();
14521	15223	break;
14522		- /*
14523	15224	case '+':
	15225	+
	15226	+ /*
14524	15227	//fontsize += 1;
14525	15228	bbzoom *= 2;
14526	15229	repaint();
..	..	@@ -14537,17 +15240,17 @@
14537	15240	case '=':
14538	15241	IncDepth();
14539	15242	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14541	15244	maskbit = 6;
14542	15245	break;
14543	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15247	DecDepth();
14545	15248	maskbit = 5;
14546	15249	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14551	15254	break;
14552	15255	case '{':
14553	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15305,7 @@
14602	15305	}
14603	15306	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15307	}
	15308	+
14605	15309	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15310
14607	15311	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15313,11 @@
14609	15313	//mode = ROTATE;
14610	15314	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15315	{
14612		- SetMouseMode(modifiers);
	15316	+ SetMouseMode(0, modifiers);
14613	15317	}
14614	15318	}
14615	15319
14616		- protected void processKeyEvent(KeyEvent e)
	15320	+ public void processKeyEvent(KeyEvent e)
14617	15321	{
14618	15322	switch (e.getID())
14619	15323	{
..	..	@@ -14743,8 +15447,9 @@
14743	15447
14744	15448	protected void processMouseMotionEvent(MouseEvent e)
14745	15449	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15450	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15451	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15452	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15453	{
14749	15454	mouseMoved(e);
14750	15455	} else
..	..	@@ -14769,11 +15474,12 @@
14769	15474	}
14770	15475	*/
14771	15476
14772		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
14773	15478	}
14774	15479
14775	15480	void SelectParent()
14776	15481	{
	15482	+ new Exception().printStackTrace();
14777	15483	System.exit(0);
14778	15484	Composite group = (Composite) object;
14779	15485	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15491,10 @@
14785	15491	{
14786	15492	//selectees.remove(i);
14787	15493	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15495	} else
14790	15496	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15498	}
14793	15499
14794	15500	first = false;
..	..	@@ -14797,6 +15503,7 @@
14797	15503
14798	15504	void SelectChildren()
14799	15505	{
	15506	+ new Exception().printStackTrace();
14800	15507	System.exit(0);
14801	15508	/*
14802	15509	Composite group = (Composite) object;
..	..	@@ -14829,12 +15536,12 @@
14829	15536	for (int j = 0; j < group.children.size(); j++)
14830	15537	{
14831	15538	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15540	first = false;
14834	15541	}
14835	15542	} else
14836	15543	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15545	}
14839	15546
14840	15547	first = false;
..	..	@@ -14845,21 +15552,21 @@
14845	15552	{
14846	15553	//Composite group = (Composite) object;
14847	15554	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15556	}
14850	15557
14851	15558	void ResetTransform(int mask)
14852	15559	{
14853	15560	//Composite group = (Composite) object;
14854	15561	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
14856	15563	}
14857	15564
14858	15565	void FlipTransform()
14859	15566	{
14860	15567	//Composite group = (Composite) object;
14861	15568	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
14863	15570	// group.editWindow.ReduceMesh(true);
14864	15571	}
14865	15572
..	..	@@ -14867,7 +15574,7 @@
14867	15574	{
14868	15575	//Composite group = (Composite) object;
14869	15576	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
14871	15578	// group.editWindow.ReduceMesh(true);
14872	15579	}
14873	15580
..	..	@@ -14875,7 +15582,7 @@
14875	15582	{
14876	15583	//Composite group = (Composite) object;
14877	15584	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
14879	15586	}
14880	15587
14881	15588	void IncDepth()
..	..	@@ -14961,7 +15668,9 @@
14961	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15669	//Image img = CreateImage(width, height);
14963	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
14964	15672	Graphics gr = g; // img.getGraphics();
	15673	+
14965	15674	if (!hasMarquee)
14966	15675	{
14967	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -15049,6 +15758,7 @@
15049	15758	info.bounds.y += (height - desired) / 2;
15050	15759	}
15051	15760	}
	15761	+
15052	15762	info.g = gr;
15053	15763	info.camera = renderCamera;
15054	15764	/*
..	..	@@ -15058,15 +15768,55 @@
15058	15768	*/
15059	15769	if (!isRenderer)
15060	15770	{
15061		- object.drawEditHandles(info, 0);
	15771	+ Grafreed.Assert(object != null);
	15772	+ Grafreed.Assert(object.selection != null);
	15773	+ if (object.selection.Size() > 0)
	15774	+ {
	15775	+ int hitSomething = object.selection.get(0).hitSomething;
	15776	+
	15777	+ info.DX = 0;
	15778	+ info.DY = 0;
	15779	+ info.W = 1;
	15780	+ if (hitSomething == Object3D.hitCenter)
	15781	+ {
	15782	+ info.DX = X;
	15783	+ if (X != 0)
	15784	+ info.DX -= info.bounds.width/2;
	15785	+
	15786	+ info.DY = Y;
	15787	+ if (Y != 0)
	15788	+ info.DY -= info.bounds.height/2;
	15789	+ }
	15790	+
	15791	+ object.drawEditHandles(info, 0);
	15792	+
	15793	+ if (drag && (X != 0 \|\| Y != 0))
	15794	+ {
	15795	+ switch (hitSomething)
	15796	+ {
	15797	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15798	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15799	+ break;
	15800	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15801	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15802	+ break;
	15803	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15804	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15805	+ break;
	15806	+ }
	15807	+
	15808	+ }
	15809	+ }
15062	15810	}
15063	15811	}
	15812	+
15064	15813	if (isRenderer)
15065	15814	{
15066	15815	//gr.setColor(Color.black);
15067	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	15818	}
	15819	+
15070	15820	if (hasMarquee)
15071	15821	{
15072	15822	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +15929,7 @@
15179	15929	public boolean mouseDown(Event evt, int x, int y)
15180	15930	{
15181	15931	System.out.println("mouseDown: " + evt);
	15932	+ System.exit(0);
15182	15933	/*
15183	15934	locked = true;
15184	15935	drag = false;
..	..	@@ -15222,7 +15973,7 @@
15222	15973	{
15223	15974	keyPressed(0, modifiers);
15224	15975	}
15225		- clickStart(x, y, modifiers);
	15976	+ // clickStart(x, y, modifiers);
15226	15977	return true;
15227	15978	}
15228	15979
..	..	@@ -15340,7 +16091,7 @@
15340	16091	{
15341	16092	keyReleased(0, 0);
15342	16093	}
15343		- drag(x, y, modifiers);
	16094	+ drag(x, y, 0, modifiers);
15344	16095	return true;
15345	16096	}
15346	16097
..	..	@@ -15472,7 +16223,7 @@
15472	16223	Object3D object;
15473	16224	static Object3D trackedobject;
15474	16225	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16227	/static/ Camera eyeCamera;
15477	16228	/static/ Camera lightCamera;
15478	16229	int cameracount;
..	..	@@ -15757,16 +16508,16 @@
15757	16508	cStatic.objectstack[materialdepth++] = checker;
15758	16509	//System.out.println("material " + material);
15759	16510	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
15761	16512
15762	16513	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16515
15765	16516	materialdepth -= 1;
15766	16517	if (materialdepth > 0)
15767	16518	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16519	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16520	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16521	}
15771	16522	//checker.GetMaterial().opacity = 1f;
15772	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +16603,14 @@
15852	16603	}
15853	16604	}
15854	16605
	16606	+ private Object3D GetFolder()
	16607	+ {
	16608	+ Object3D folder = object.GetWindow().copy;
	16609	+ if (object.GetWindow().copy.selection.Size() > 0)
	16610	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16611	+ return folder;
	16612	+ }
	16613	+
15855	16614	class SelectBuffer implements GLEventListener
15856	16615	{
15857	16616
..	..	@@ -15910,6 +16669,7 @@
15910	16669	{
15911	16670	if (!selection)
15912	16671	{
	16672	+ new Exception().printStackTrace();
15913	16673	System.exit(0);
15914	16674	return;
15915	16675	}
..	..	@@ -15930,6 +16690,17 @@
15930	16690
15931	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	16692
	16693	+ if (PAINTMODE)
	16694	+ {
	16695	+ if (object.GetWindow().copy.selection.Size() > 0)
	16696	+ {
	16697	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16698	+
	16699	+ // Make what you paint not selectable.
	16700	+ paintobj.ResetSelectable();
	16701	+ }
	16702	+ }
	16703	+
15933	16704	//int tmp = selection_view;
15934	16705	//selection_view = -1;
15935	16706	int temp = DrawMode();
..	..	@@ -15941,6 +16712,17 @@
15941	16712	// temp = DEFAULT; // patch for selection debug
15942	16713	Globals.drawMode = temp; // WARNING
15943	16714
	16715	+ if (PAINTMODE)
	16716	+ {
	16717	+ if (object.GetWindow().copy.selection.Size() > 0)
	16718	+ {
	16719	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16720	+
	16721	+ // Revert.
	16722	+ paintobj.RestoreSelectable();
	16723	+ }
	16724	+ }
	16725	+
15944	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	16727
15946	16728	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +16770,8 @@
15988	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
15991	16775
15992	16776	// Will fit the mesh !!!
15993	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +16821,36 @@
16037	16821	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	16822	}
16039	16823
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16824	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	16825	}
16042	16826	}
16043	16827
16044	16828	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	16830
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16831	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	16832	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16833	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	16834
16051		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	16838
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();
	16839	+ Object3D inst = new Object3D("inst" + paintcount++);
	16840	+
	16841	+ inst.CreateMaterial(); // use a void leaf to select instances
	16842	+
	16843	+ inst.add(paintobj); // link
	16844	+
	16845	+ object.GetWindow().SnapObject(inst);
	16846	+
	16847	+ Object3D folder = paintFolder; // GetFolder();
	16848	+
	16849	+ folder.add(inst);
	16850	+
	16851	+ object.GetWindow().ResetModel();
	16852	+ object.GetWindow().refreshContents();
	16853	+ }
16068	16854	}
16069	16855	else
16070	16856	paintcount = 0;
..	..	@@ -16103,6 +16889,11 @@
16103	16889	//System.out.println("objects[color] = " + objects[color]);
16104	16890	//objects[color].Select();
16105	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
16106	16897	object.Select(color, deselect);
16107	16898	}
16108	16899
..	..	@@ -16202,7 +16993,7 @@
16202	16993	gl.glDisable(gl.GL_CULL_FACE);
16203	16994	}
16204	16995
16205		- if (!RENDERSHADOW)
	16996	+ if (!Globals.RENDERSHADOW)
16206	16997	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	16998
16208	16999	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17003,7 @@
16212	17003	//gl.glColorMask(false, false, false, false);
16213	17004
16214	17005	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17006	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17007	{
16217	17008	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17009
..	..	@@ -16628,23 +17419,15 @@
16628	17419	int AAbuffersize = 0;
16629	17420
16630	17421	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
16632	17423	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();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
16637	17428
16638	17429	static Sphere debugpoints[] = new Sphere[8];
16639	17430
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17431	static void InitPoints(float radius)
16649	17432	{
16650	17433	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17479,11 @@
16696	17479	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17480	// Depth buffer format
16698	17481	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17482	+
	17483	+ public void NextIndex()
16700	17484	{
16701	17485	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17486	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17487	//objects[indexcount] = o;
16704	17488	//System.out.println("indexcount = " + indexcount);
16705	17489	}