~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,6 +149,8 @@
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
152	151
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
153	154	void SetAsGLRenderer(boolean b)
154	155	{
155	156	isRenderer = b;
..	..	@@ -191,9 +192,43 @@
191	192
192	193	/// INTERFACE
193	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	+
194	224	public boolean IsBoxMode()
195	225	{
196	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
197	232	}
198	233
199	234	public void ClearDepth()
..	..	@@ -291,7 +326,7 @@
291	326	cStatic.objectstack[materialdepth++] = obj;
292	327	//System.out.println("material " + material);
293	328	//Applet3D.tracein(this, selected);
294		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
295	330	if (obj instanceof Camera)
296	331	{
297	332	display.options1[0] = material.shift;
..	..	@@ -300,14 +335,28 @@
300	335	display.options1[2] = material.shadowbias;
301	336	display.options1[3] = material.aniso;
302	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]);
303	343	display.options2[0] = material.opacity;
304	344	display.options2[1] = material.diffuse;
305	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]);
306	349
307	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]);
308	354	display.options4[0] = material.cameralight/0.2f;
309	355	display.options4[1] = material.subsurface;
310	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]);
311	360
312	361	// if (display.CURRENTANTIALIAS > 0)
313	362	// display.options3[3] /= 4;
..	..	@@ -323,7 +372,7 @@
323	372	/**/
324	373	} else
325	374	{
326		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
327	376	}
328	377	} else
329	378	{
..	..	@@ -347,8 +396,8 @@
347	396	cStatic.objectstack[materialdepth++] = obj;
348	397	//System.out.println("material " + material);
349	398	//Applet3D.tracein("selected ", selected);
350		- display.vector2buffer = obj.projectedVertices;
351		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
352	401	}
353	402	}
354	403
..	..	@@ -365,8 +414,8 @@
365	414	materialdepth -= 1;
366	415	if (materialdepth > 0)
367	416	{
368		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369		- 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);
370	419	}
371	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -386,8 +435,8 @@
386	435	materialdepth -= 1;
387	436	if (materialdepth > 0)
388	437	{
389		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390		- 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);
391	440	}
392	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393	442	//else
..	..	@@ -428,10 +477,12 @@
428	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429	478	{
430	479	//gl.glBegin(gl.GL_TRIANGLES);
431		- 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	+ ;
432	483	if (!hasnorm)
433	484	{
434		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
435	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
436	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
437	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1059,7 +1110,342 @@
1059	1110	gl.glMatrixMode(gl.GL_MODELVIEW);
1060	1111	}
1061	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	+
1062	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	+ }
1063	1449
1064	1450	void SetColor(Object3D obj, Vertex p0)
1065	1451	{
..	..	@@ -1238,7 +1624,7 @@
1238	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1239	1625	}
1240	1626
1241		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1242	1628	{
1243	1629	CameraPane display = this;
1244	1630	//new Exception().printStackTrace();
..	..	@@ -1254,18 +1640,18 @@
1254	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255	1641	if (!material.multiply)
1256	1642	{
1257		- display.color = color;
	1643	+ display.color = material.color;
1258	1644	display.saturation = material.modulation;
1259	1645	}
1260	1646	else
1261	1647	{
1262		- display.color = color2;
	1648	+ display.color = material.color2;
1263	1649	display.saturation = material.modulation2;
1264	1650	}
1265	1651
1266	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267	1653
1268		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1269	1655
1270	1656	/**/
1271	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1273,7 +1659,7 @@
1273	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1274	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1275	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1276		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1277	1663
1278	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1279	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1381,9 +1767,9 @@
1381	1767	display.modelParams7[2] = 0;
1382	1768	display.modelParams7[3] = 0;
1383	1769
1384		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1385	1771
1386		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1387	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1388	1774	{
1389	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1525,7 +1911,7 @@
1525	1911	void PushMatrix(double[][] matrix)
1526	1912	{
1527	1913	// GrafreeD.tracein(matrix);
1528		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1529	1915	}
1530	1916
1531	1917	void PushMatrix()
..	..	@@ -1679,7 +2065,7 @@
1679	2065	//System.err.println("Oeil on");
1680	2066	OEIL = true;
1681	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1683	2069	//pingthread.StepToTarget(true);
1684	2070	}
1685	2071
..	..	@@ -1777,7 +2163,7 @@
1777	2163	System.err.println("LIVE = " + Globals.isLIVE());
1778	2164
1779	2165	if (!Globals.isLIVE()) // save sound
1780		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
1781	2167	// else
1782	2168	repaint(); // start loop // may 2013
1783	2169	}
..	..	@@ -1810,6 +2196,11 @@
1810	2196	public void ToggleBoxMode()
1811	2197	{
1812	2198	BOXMODE ^= true;
	2199	+ }
	2200	+
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
1813	2204	}
1814	2205
1815	2206	public void ToggleSmoothFocus()
..	..	@@ -1889,7 +2280,7 @@
1889	2280
1890	2281	void ToggleDebug()
1891	2282	{
1892		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
1893	2284	}
1894	2285
1895	2286	void ToggleLookAt()
..	..	@@ -1897,9 +2288,9 @@
1897	2288	LOOKAT ^= true;
1898	2289	}
1899	2290
1900		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1901	2292	{
1902		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1903	2294	}
1904	2295
1905	2296	void ToggleHandles()
..	..	@@ -1907,10 +2298,17 @@
1907	2298	HANDLES ^= true;
1908	2299	}
1909	2300
	2301	+ Object3D paintFolder;
	2302	+
1910	2303	void TogglePaint()
1911	2304	{
1912	2305	PAINTMODE ^= true;
1913	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
1914	2312	}
1915	2313
1916	2314	void SwapCamera(int a, int b)
..	..	@@ -2006,7 +2404,46 @@
2006	2404	{
2007	2405	return currentGL;
2008	2406	}
2009		-
	2407	+
	2408	+ private BufferedImage CreateBim(TextureData texturedata)
	2409	+ {
	2410	+ // cache to disk
	2411	+ Buffer buffer = texturedata.getBuffer(); // getMipmapData();
	2412	+ //buffers[0].
	2413	+ ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
	2414	+ int[] pixels = new int[bytebuf.capacity()/3];
	2415	+ int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
	2416	+ int height = width;
	2417	+ for (int i=pixels.length; --i>=0;)
	2418	+ {
	2419	+ int i3 = i*3;
	2420	+ pixels[i] = 0xFF;
	2421	+ pixels[i] <<= 8;
	2422	+ pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
	2423	+ pixels[i] <<= 8;
	2424	+ pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
	2425	+ pixels[i] <<= 8;
	2426	+ pixels[i] \|= bytebuf.get(i3) & 0xFF;
	2427	+ }
	2428	+ /*
	2429	+ int r=0,g=0,b=0,a=0;
	2430	+ for (int i=0; i<width; i++)
	2431	+ for (int j=0; j<height; j++)
	2432	+ {
	2433	+ int index = j*width+i;
	2434	+ int p = pixels[index];
	2435	+ a = ((p>>24) & 0xFF);
	2436	+ r = ((p>>16) & 0xFF);
	2437	+ g = ((p>>8) & 0xFF);
	2438	+ b = (p & 0xFF);
	2439	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	2440	+ }
	2441	+ /**/
	2442	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	2443	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	2444	+ return rendImage;
	2445	+ }
	2446	+
2010	2447	/**/
2011	2448	class CacheTexture
2012	2449	{
..	..	@@ -2024,9 +2461,10 @@
2024	2461	/**/
2025	2462
2026	2463	// TEXTURE static Texture texture;
2027		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2028		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2029		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2464	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2465	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2466	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2467	+
2030	2468	int pigmentdepth = 0;
2031	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2032	2470	int bumpdepth = 0;
..	..	@@ -2048,6 +2486,33 @@
2048	2486	true,
2049	2487	com.sun.opengl.util.texture.TextureIO.PNG);
2050	2488	} catch (java.io.IOException e)
	2489	+ {
	2490	+ throw new javax.media.opengl.GLException(e);
	2491	+ }
	2492	+
	2493	+ if (bump)
	2494	+ texturedata = ConvertBump(texturedata, false);
	2495	+
	2496	+ com.sun.opengl.util.texture.Texture texture =
	2497	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2498	+
	2499	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2500	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2501	+
	2502	+ return texture;
	2503	+ }
	2504	+
	2505	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2506	+ {
	2507	+ TextureData texturedata = null;
	2508	+
	2509	+ try
	2510	+ {
	2511	+ texturedata =
	2512	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2513	+ name,
	2514	+ true);
	2515	+ } catch (Exception e)
2051	2516	{
2052	2517	throw new javax.media.opengl.GLException(e);
2053	2518	}
..	..	@@ -3134,6 +3599,8 @@
3134	3599
3135	3600	System.out.println("LOADING TEXTURE : " + name);
3136	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
3137	3604	//
3138	3605	if (false) // compressbit > 0)
3139	3606	{
..	..	@@ -3838,6 +4305,7 @@
3838	4305
3839	4306	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4307	{
	4308	+ new Exception().printStackTrace();
3841	4309	System.exit(0);
3842	4310	com.sun.opengl.util.texture.Texture texture = null;
3843	4311
..	..	@@ -7531,7 +7999,7 @@
7531	7999	String pigment = Object3D.GetPigment(tex);
7532	8000	String bump = Object3D.GetBump(tex);
7533	8001
7534		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7535	8003	{
7536	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7537	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7548,6 +8016,64 @@
7548	8016
7549	8017	ReleaseTexture(bump, true);
7550	8018	ReleaseTexture(pigment, false);
	8019	+ }
	8020	+
	8021	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8022	+ {
	8023	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8024	+ {
	8025	+ return;
	8026	+ }
	8027	+
	8028	+ if (tex == null)
	8029	+ {
	8030	+ ReleaseTexture(null, false);
	8031	+ return;
	8032	+ }
	8033	+
	8034	+ String pigment = Object3D.GetPigment(tex);
	8035	+
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8037	+ {
	8038	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8039	+ // System.out.println("; bump = " + bump);
	8040	+ }
	8041	+
	8042	+ if (pigment.equals(""))
	8043	+ {
	8044	+ pigment = null;
	8045	+ }
	8046	+
	8047	+ ReleaseTexture(pigment, false);
	8048	+ }
	8049	+
	8050	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8051	+ {
	8052	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8053	+ {
	8054	+ return;
	8055	+ }
	8056	+
	8057	+ if (tex == null)
	8058	+ {
	8059	+ ReleaseTexture(null, true);
	8060	+ return;
	8061	+ }
	8062	+
	8063	+ String bump = Object3D.GetBump(tex);
	8064	+
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8066	+ {
	8067	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8068	+ // System.out.println("; bump = " + bump);
	8069	+ }
	8070	+
	8071	+ if (bump.equals(""))
	8072	+ {
	8073	+ bump = null;
	8074	+ }
	8075	+
	8076	+ ReleaseTexture(bump, true);
7551	8077	}
7552	8078
7553	8079	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7653,7 +8179,55 @@
7653	8179	}
7654	8180	}
7655	8181
7656		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8182	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8183	+ {
	8184	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8185	+// ambientOcclusion ) // \|\| !textureon)
	8186	+// {
	8187	+// return; // false;
	8188	+// }
	8189	+//
	8190	+// if (tex == null)
	8191	+// {
	8192	+// BindTexture(null,false,resolution);
	8193	+// BindTexture(null,true,resolution);
	8194	+// return;
	8195	+// }
	8196	+//
	8197	+// String pigment = Object3D.GetPigment(tex);
	8198	+// String bump = Object3D.GetBump(tex);
	8199	+//
	8200	+// usedtextures.add(pigment);
	8201	+// usedtextures.add(bump);
	8202	+//
	8203	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8204	+// {
	8205	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8206	+// // System.out.println("; bump = " + bump);
	8207	+// }
	8208	+//
	8209	+// if (bump.equals(""))
	8210	+// {
	8211	+// bump = null;
	8212	+// }
	8213	+// if (pigment.equals(""))
	8214	+// {
	8215	+// pigment = null;
	8216	+// }
	8217	+//
	8218	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8219	+// BindTexture(pigment, false, resolution);
	8220	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+// BindTexture(bump, true, resolution);
	8222	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+//
	8224	+// return; // true;
	8225	+
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
	8228	+ }
	8229	+
	8230	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7657	8231	{
7658	8232	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8233	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7663,18 +8237,48 @@
7663	8237
7664	8238	if (tex == null)
7665	8239	{
7666		- BindTexture(null,false,resolution);
7667		- BindTexture(null,true,resolution);
	8240	+ BindTexture(null, null,false,resolution);
7668	8241	return;
7669	8242	}
7670	8243
7671	8244	String pigment = Object3D.GetPigment(tex);
	8245	+
	8246	+ usedtextures.add(pigment);
	8247	+
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8249	+ {
	8250	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8251	+ // System.out.println("; bump = " + bump);
	8252	+ }
	8253	+
	8254	+ if (pigment.equals(""))
	8255	+ {
	8256	+ pigment = null;
	8257	+ }
	8258	+
	8259	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8261	+ }
	8262	+
	8263	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8264	+ {
	8265	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8266	+ ambientOcclusion ) // \|\| !textureon)
	8267	+ {
	8268	+ return; // false;
	8269	+ }
	8270	+
	8271	+ if (tex == null)
	8272	+ {
	8273	+ BindTexture(null, null,true,resolution);
	8274	+ return;
	8275	+ }
	8276	+
7672	8277	String bump = Object3D.GetBump(tex);
7673	8278
7674		- usedtextures.put(pigment, pigment);
7675		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
7676	8280
7677		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7678	8282	{
7679	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7680	8284	// System.out.println("; bump = " + bump);
..	..	@@ -7684,42 +8288,70 @@
7684	8288	{
7685	8289	bump = null;
7686	8290	}
7687		- if (pigment.equals(""))
7688		- {
7689		- pigment = null;
7690		- }
7691	8291
7692		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7693		- BindTexture(pigment, false, resolution);
7694	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7695		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
7696	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7697		-
7698		- return; // true;
7699	8295	}
7700	8296
7701		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8297	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8298	+
	8299	+ private boolean FileExists(String tex)
7702	8300	{
7703		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8301	+ if (missingTextures.contains(tex))
	8302	+ {
	8303	+ return false;
	8304	+ }
	8305	+
	8306	+ boolean fileExists = new File(tex).exists();
	8307	+
	8308	+ if (!fileExists)
	8309	+ {
	8310	+ // If file exists, the "new File()" is not executed sgain
	8311	+ missingTextures.add(tex);
	8312	+ }
	8313	+
	8314	+ return fileExists;
	8315	+ }
	8316	+
	8317	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8318	+ {
	8319	+ CacheTexture texturecache = null;
7704	8320
7705	8321	if (tex != null)
7706	8322	{
7707	8323	String texname = tex;
7708	8324
7709		- String[] split = tex.split("Textures");
7710		- if (split.length > 1)
7711		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7712		- else
7713		- if (!texname.startsWith("/"))
7714		- texname = "/Users/nbriere/Textures/" + texname;
	8325	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8326	+
	8327	+// String[] split = tex.split("Textures");
	8328	+// if (split.length > 1)
	8329	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8330	+// else
	8331	+// if (!texname.startsWith("/"))
	8332	+// texname = "/Users/nbriere/Textures/" + texname;
	8333	+ if (!FileExists(tex))
	8334	+ {
	8335	+ texname = fallbackTextureName;
	8336	+ }
7715	8337
7716	8338	if (CACHETEXTURE)
7717		- texture = textures.get(texname); // TEXTURE CACHE
7718		-
7719		- TextureData texturedata = null;
7720		-
7721		- if (texture == null \|\| texture.resolution < resolution)
7722	8339	{
	8340	+ if (bim == null)
	8341	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8342	+ else
	8343	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8344	+ }
	8345	+
	8346	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8347	+ {
	8348	+ TextureData texturedata = null;
	8349	+
	8350	+ if (bim != null)
	8351	+ {
	8352	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8353	+ }
	8354	+ else
7723	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7724	8356	{
7725	8357	assert(!bump);
..	..	@@ -7731,19 +8363,23 @@
7731	8363	// }
7732	8364	// else
7733	8365	// {
7734		- texture = textures.get(tex);
7735		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
7736	8368	{
7737		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7738	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
7739	8373	// }
7740	8374	} else
7741	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7742	8376	{
7743	8377	assert(bump);
7744		- texture = textures.get(tex);
7745		- if (texture == null)
7746		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8378	+ texturecache = textures.get(tex);
	8379	+ if (texturecache == null)
	8380	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8381	+ else
	8382	+ new Exception().printStackTrace();
7747	8383	} else
7748	8384	{
7749	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,9 +8389,11 @@
7753	8389	//{
7754	8390	if (tex.equals("WHITE_NOISE"))
7755	8391	{
7756		- texture = textures.get(tex);
7757		- if (texture == null)
7758		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8392	+ texturecache = textures.get(tex);
	8393	+ if (texturecache == null)
	8394	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8395	+ else
	8396	+ new Exception().printStackTrace();
7759	8397	} else
7760	8398	{
7761	8399	if (textureon)
..	..	@@ -7780,7 +8418,7 @@
7780	8418	}
7781	8419
7782	8420	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8421	+ if (!FileExists(cachename))
7784	8422	cachename = texname;
7785	8423	else
7786	8424	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8440,7 @@
7802	8440	}
7803	8441
7804	8442	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8443	+ if (!FileExists(cachename))
7806	8444	cachename = texname;
7807	8445	else
7808	8446	processbump = false; // don't process bump map again
..	..	@@ -7811,20 +8449,23 @@
7811	8449	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8450
7813	8451
7814		- if (texturedata != null)
7815		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8452	+ if (texturedata == null)
	8453	+ throw new Exception();
	8454	+
	8455	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7816	8456	//texture = GetTexture(tex, bump);
7817	8457	}
7818	8458	}
7819	8459	//}
7820	8460	}
7821	8461
7822		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
7823	8463	{
7824	8464	//return false;
	8465	+ assert(bim == null);
7825	8466
7826	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7827		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7828	8469	{
7829	8470	// String ext = "_highres";
7830	8471	// if (REDUCETEXTURE)
..	..	@@ -7841,52 +8482,17 @@
7841	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7842	8483	if (!cachefile.exists())
7843	8484	{
7844		- // cache to disk
7845		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7846		- //buffers[0].
7847		-
7848		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7849		- int[] pixels = new int[bytebuf.capacity()/3];
7850		-
7851		- // squared size heuristic...
7852		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
7853	8486	{
7854		- for (int i=pixels.length; --i>=0;)
7855		- {
7856		- int i3 = i*3;
7857		- pixels[i] = 0xFF;
7858		- pixels[i] <<= 8;
7859		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7864		- }
7865		-
7866		- /*
7867		- int r=0,g=0,b=0,a=0;
7868		- for (int i=0; i<width; i++)
7869		- for (int j=0; j<height; j++)
7870		- {
7871		- int index = j*width+i;
7872		- int p = pixels[index];
7873		- a = ((p>>24) & 0xFF);
7874		- r = ((p>>16) & 0xFF);
7875		- g = ((p>>8) & 0xFF);
7876		- b = (p & 0xFF);
7877		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7878		- }
7879		- /**/
7880		- int width = (int)Math.sqrt(pixels.length); // squared
7881		- int height = width;
7882		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7883		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
7884	8489	ImageWriter writer = null;
7885	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7886	8491	if (iter.hasNext()) {
7887	8492	writer = (ImageWriter)iter.next();
7888	8493	}
7889		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
7890	8496	try
7891	8497	{
7892	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7913,8 +8519,8 @@
7913	8519	textures.remove(texname);
7914	8520	}
7915	8521
7916		- texture.texturedata = texturedata;
7917		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
7918	8524
7919	8525	// newtex = true;
7920	8526	}
..	..	@@ -7930,12 +8536,17 @@
7930	8536	}
7931	8537	}
7932	8538
7933		- return texture;
	8539	+ return texturecache;
7934	8540	}
7935	8541
7936		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8542	+ static void EmbedTextures(cTexture tex)
7937	8543	{
7938		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8544	+
	8545	+ }
	8546	+
	8547	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8548	+ {
	8549	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7939	8550
7940	8551	if (bump)
7941	8552	{
..	..	@@ -7951,23 +8562,23 @@
7951	8562	return texture!=null?texture.texture:null;
7952	8563	}
7953	8564
7954		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8565	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7955	8566	{
7956		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7957	8568
7958	8569	return texture!=null?texture.texturedata:null;
7959	8570	}
7960	8571
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7962	8573	{
7963	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8575	{
7965	8576	return false;
7966	8577	}
7967	8578
7968		- boolean newtex = false;
	8579	+ //boolean newtex = false;
7969	8580
7970		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
7971	8582
7972	8583	if (texture == null)
7973	8584	return false;
..	..	@@ -7997,7 +8608,7 @@
7997	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7998	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7999	8610
8000		- return newtex;
	8611	+ return true; // Warning: not used.
8001	8612	}
8002	8613
8003	8614	ShadowBuffer shadowPBuf;
..	..	@@ -8835,11 +9446,35 @@
8835	9446	jy8[3] = 0.5f;
8836	9447	}
8837	9448
8838		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9449	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8839	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9451	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9452	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	9453
	9454	+ void ResetOptions()
	9455	+ {
	9456	+ options1[0] = 100;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
	9459	+ options1[3] = 0;
	9460	+ options1[4] = 0;
	9461	+
	9462	+ options2[0] = 0;
	9463	+ options2[1] = 0.75f;
	9464	+ options2[2] = 0;
	9465	+ options2[3] = 0;
	9466	+
	9467	+ options3[0] = 1;
	9468	+ options3[1] = 1;
	9469	+ options3[2] = 1;
	9470	+ options3[3] = 0;
	9471	+
	9472	+ options4[0] = 1;
	9473	+ options4[1] = 0;
	9474	+ options4[2] = 1;
	9475	+ options4[3] = 0;
	9476	+ }
	9477	+
8843	9478	static int imagecount = 0; // movie generation
8844	9479
8845	9480	static int jitter = 0;
..	..	@@ -8935,8 +9570,8 @@
8935	9570	assert (parentcam != renderCamera);
8936	9571
8937	9572	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8940	9575
8941	9576	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9577
..	..	@@ -8951,8 +9586,8 @@
8951	9586	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9587
8953	9588	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9589	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9590	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8956	9591
8957	9592	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9593
..	..	@@ -9024,7 +9659,7 @@
9024	9659	//gl.glFlush();
9025	9660	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9661
9027		- if (ANIMATION && ABORTED)
	9662	+ if (Globals.ANIMATION && ABORTED)
9028	9663	{
9029	9664	System.err.println(" ABORTED FRAME");
9030	9665	break;
..	..	@@ -9054,7 +9689,7 @@
9054	9689	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9690
9056	9691	// save image
9057		- if (ANIMATION && !ABORTED)
	9692	+ if (Globals.ANIMATION && !ABORTED)
9058	9693	{
9059	9694	VPwidth = viewport[2];
9060	9695	VPheight = viewport[3];
..	..	@@ -9165,11 +9800,11 @@
9165	9800
9166	9801	// imagecount++;
9167	9802
9168		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9803	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9169	9804
9170	9805	if (!BOXMODE)
9171	9806	{
9172		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9807	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9173	9808	}
9174	9809
9175	9810	if (!BOXMODE)
..	..	@@ -9207,7 +9842,7 @@
9207	9842	ABORTED = false;
9208	9843	}
9209	9844	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9845	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	9846
9212	9847	if (false)
9213	9848	{
..	..	@@ -9870,11 +10505,11 @@
9870	10505
9871	10506	public void display(GLAutoDrawable drawable)
9872	10507	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10508	+ if (Grafreed.savesound && Grafreed.hassound)
9874	10509	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10510	+ Grafreed.wav.save();
	10511	+ Grafreed.savesound = false;
	10512	+ Grafreed.hassound = false;
9878	10513	}
9879	10514	// if (DEBUG_SELECTION)
9880	10515	// {
..	..	@@ -9950,6 +10585,7 @@
9950	10585	ANTIALIAS = 0;
9951	10586	//System.out.println("RESTART");
9952	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
9953	10589	}
9954	10590	}
9955	10591	}
..	..	@@ -10004,7 +10640,7 @@
10004	10640	Object3D theobject = object;
10005	10641	Object3D theparent = object.parent;
10006	10642	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10643	+ object = (Object3D)Grafreed.clone(object);
10008	10644	object.Stripify();
10009	10645	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10646	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10653,14 @@
10017	10653	ambientOcclusion = false;
10018	10654	}
10019	10655
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10658	{
10022	10659	//if (RENDERSHADOW) // ?
10023	10660	if (!IsFrozen())
10024	10661	{
10025	10662	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10663	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10664	{
10028	10665	Globals.framecount++;
10029	10666	shadowbuffer.display();
..	..	@@ -10150,8 +10787,8 @@
10150	10787
10151	10788	// if (parentcam != renderCamera) // not a light
10152	10789	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10790	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10791	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10155	10792
10156	10793	for (int j = 0; j < 4; j++)
10157	10794	{
..	..	@@ -10165,8 +10802,8 @@
10165	10802
10166	10803	// if (parentcam != renderCamera) // not a light
10167	10804	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10805	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10806	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10170	10807
10171	10808	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	10809
..	..	@@ -10425,7 +11062,16 @@
10425	11062	// Bump noise
10426	11063	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11064	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- BindTexture(NOISE_TEXTURE, false, 2);
	11065	+
	11066	+ try
	11067	+ {
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11069	+ }
	11070	+ catch (Exception e)
	11071	+ {
	11072	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11073	+ }
	11074	+
10429	11075
10430	11076	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11077	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10448,9 +11094,9 @@
10448	11094
10449	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
10450	11096
10451		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10452		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10453		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11097	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11098	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11099	+gl.glEnable(gl.GL_MULTISAMPLE);
10454	11100	} else
10455	11101	{
10456	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10461,7 +11107,7 @@
10461	11107	//System.out.println("BLENDING ON");
10462	11108	gl.glEnable(GL.GL_BLEND);
10463	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10464		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10465	11111	gl.glMatrixMode(gl.GL_PROJECTION);
10466	11112	gl.glLoadIdentity();
10467	11113
..	..	@@ -10550,8 +11196,8 @@
10550	11196	System.err.println("parentcam != renderCamera");
10551	11197
10552	11198	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11199	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11200	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10555	11201	}
10556	11202
10557	11203	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11218,8 @@
10572	11218	if (true) // TODO
10573	11219	{
10574	11220	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11221	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11222	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10577	11223	}
10578	11224
10579	11225	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10889,8 +11535,14 @@
10889	11535	{
10890	11536	renderpass++;
10891	11537	// System.out.println("Draw object... ");
	11538	+ STEP = 1;
10892	11539	if (FAST) // in case there is no script
10893		- STEP = 16;
	11540	+ STEP = 8;
	11541	+
	11542	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11543	+ {
	11544	+ STEP *= 4;
	11545	+ }
10894	11546
10895	11547	//object.FullInvariants();
10896	11548
..	..	@@ -10904,23 +11556,44 @@
10904	11556	e.printStackTrace();
10905	11557	}
10906	11558
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11559	+ if (Grafreed.RENDERME > 0)
	11560	+ Grafreed.RENDERME--; // mechante magouille
10909	11561
10910	11562	Globals.ONESTEP = false;
10911	11563	}
10912	11564
10913	11565	static boolean zoomonce = false;
10914	11566
	11567	+ static void CreateSelectedPoint()
	11568	+ {
	11569	+ if (selectedpoint == null)
	11570	+ {
	11571	+ debugpointG = new Sphere();
	11572	+ debugpointP = new Sphere();
	11573	+ debugpointC = new Sphere();
	11574	+ debugpointR = new Sphere();
	11575	+
	11576	+ selectedpoint = new Superellipsoid();
	11577	+
	11578	+ for (int i=0; i<8; i++)
	11579	+ {
	11580	+ debugpoints[i] = new Sphere();
	11581	+ }
	11582	+ }
	11583	+ }
	11584	+
10915	11585	void DrawObject(GL gl, boolean draw)
10916	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
10917	11590	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11591	// DrawMode() = SELECTION;
10919	11592	//GL gl = getGL();
10920	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10921	11594	{
10922	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10923		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10924	11597	pingthread.StepToTarget(true); // true);
10925	11598	// zoomonce = false;
10926	11599	}
..	..	@@ -10975,7 +11648,14 @@
10975	11648
10976	11649	usedtextures.clear();
10977	11650
10978		- BindTextures(DEFAULT_TEXTURES, 2);
	11651	+ try
	11652	+ {
	11653	+ BindTextures(DEFAULT_TEXTURES, 2);
	11654	+ }
	11655	+ catch (Exception e)
	11656	+ {
	11657	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11658	+ }
10979	11659	}
10980	11660	//System.out.println("--> " + stackdepth);
10981	11661	// GrafreeD.traceon();
..	..	@@ -10985,8 +11665,9 @@
10985	11665
10986	11666	if (DrawMode() == DEFAULT)
10987	11667	{
10988		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
10989	11669	{
	11670	+ CreateSelectedPoint();
10990	11671	float radius = 0.05f;
10991	11672	if (selectedpoint.radius != radius)
10992	11673	{
..	..	@@ -11049,7 +11730,7 @@
11049	11730	if (tex.equals("WHITE_NOISE"))
11050	11731	continue;
11051	11732
11052		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
11053	11734	{
11054	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11055	11736	textures.get(tex).texture.dispose();
..	..	@@ -11066,7 +11747,14 @@
11066	11747	if (checker != null && DrawMode() == DEFAULT)
11067	11748	{
11068	11749	//BindTexture(IMMORTAL_TEXTURE);
11069		- BindTextures(checker.GetTextures(), checker.texres);
	11750	+ try
	11751	+ {
	11752	+ BindTextures(checker.GetTextures(), checker.texres);
	11753	+ }
	11754	+ catch (Exception e)
	11755	+ {
	11756	+ System.err.println("FAILED: " + checker.GetTextures());
	11757	+ }
11070	11758	// NEAREST
11071	11759	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11760	DrawChecker(gl);
..	..	@@ -11148,7 +11836,7 @@
11148	11836	return;
11149	11837	}
11150	11838
11151		- String string = obj.GetToolTip();
	11839	+ String string = obj.toString(); //.GetToolTip();
11152	11840
11153	11841	GL gl = GetGL();
11154	11842
..	..	@@ -11465,8 +12153,8 @@
11465	12153	//obj.TransformToWorld(light, light);
11466	12154	for (int i = tp.size(); --i >= 0;)
11467	12155	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- LA.xformPos(light, tp.get(i).toParent, light);
	12156	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12157	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11470	12158	}
11471	12159
11472	12160
..	..	@@ -11483,8 +12171,8 @@
11483	12171	parentcam = cameras[0];
11484	12172	}
11485	12173
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12174	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12175	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11488	12176
11489	12177	LA.xformPos(light, renderCamera.toScreen, light);
11490	12178
..	..	@@ -12098,8 +12786,8 @@
12098	12786
12099	12787	// display shadow only (bump == 0)
12100	12788	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	12789	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12790	+ "SLT temp.z, temp.y, -one2048th.x;" +
12103	12791	"SUB temp.y, one.x, temp.z;" +
12104	12792	"MUL temp.x, temp.x, temp.y;" +
12105	12793	"KIL temp.x;" +
..	..	@@ -12228,8 +12916,10 @@
12228	12916	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	12917
12230	12918	"SUB temp.x, one.x, ndotl.x;" +
12231		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12232		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12919	+ // Tuning for default skin
	12920	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12921	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12922	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12233	12923	"MUL temp.x, temp.x, temp.y;" +
12234	12924
12235	12925	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,7 +13118,7 @@
12428	13118	//once = true;
12429	13119	}
12430	13120
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
	13121	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432	13122	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433	13123	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13124
..	..	@@ -12561,12 +13251,16 @@
12561	13251
12562	13252	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13253	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13254	+
	13255	+ // Compare fragment depth in light space with shadowmap.
12564	13256	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13257	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13258	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13259	+
	13260	+ // Reverse comparison
12567	13261	"SUB temp.x, one.x, temp.x;" +
12568	13262	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13263	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13264	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13265
12572	13266	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13274,10 @@
12580	13274	// No shadow for backface
12581	13275	"DP3 temp.x, normal, lightd;" +
12582	13276	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13277	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13278	+
	13279	+ // No shadow when out of frustrum
	13280	+ "SGE temp.x, " + depth + ".z, one.z;" +
12583	13281	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13282	"";
12585	13283	}
..	..	@@ -12726,7 +13424,8 @@
12726	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
12730	13429
12731	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13431	// OUT : diff, spec
..	..	@@ -12742,9 +13441,10 @@
12742	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13443	//"MOV " + dest + ".w," + "normal.z;" +
12745		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12746		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12747		- //"MOV " + dest + ".z," + "params2.w;" +
	13444	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13445	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13446	+
	13447	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12748	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13449	"RCP " + dest + ".w," + dest + ".w;" +
12750	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13138,7 +13838,7 @@
13138	13838	public void mousePressed(MouseEvent e)
13139	13839	{
13140	13840	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13841	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	13842	}
13143	13843
13144	13844	static long prevtime = 0;
..	..	@@ -13165,6 +13865,7 @@
13165	13865
13166	13866	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	13867
	13868	+ if (BUTTONLESSWHEEL)
13168	13869	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	13870	{
13170	13871	return;
..	..	@@ -13173,7 +13874,7 @@
13173	13874	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	13875
13175	13876	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13877	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	13878	{
13178	13879	keepboxmode = BOXMODE;
13179	13880	keepsupport = SUPPORT;
..	..	@@ -13213,8 +13914,8 @@
13213	13914	// mode \|= META;
13214	13915	//}
13215	13916
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13917	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13918	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	13919	anchorX = ax;
13219	13920	anchorY = ay;
13220	13921	prevX = px;
..	..	@@ -13248,6 +13949,7 @@
13248	13949	else
13249	13950	if (evt.getSource() == AAtimer)
13250	13951	{
	13952	+ Globals.TIMERRUNNING = false;
13251	13953	if (mouseDown)
13252	13954	{
13253	13955	//new Exception().printStackTrace();
..	..	@@ -13273,6 +13975,10 @@
13273	13975	// LIVE = waslive;
13274	13976	// wasliveok = true;
13275	13977	// waslive = false;
	13978	+
	13979	+ // May 2019 Forget it:
	13980	+ if (true)
	13981	+ return;
13276	13982
13277	13983	// source == timer
13278	13984	if (mouseDown)
..	..	@@ -13303,7 +14009,7 @@
13303	14009
13304	14010	// fev 2014???
13305	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13306		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13307	14013	pingthread.StepToTarget(true); // true);
13308	14014	}
13309	14015	// if (!LIVE)
..	..	@@ -13312,12 +14018,13 @@
13312	14018
13313	14019	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	14020
13315		- void clickStart(int x, int y, int modifiers)
	14021	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	14022	{
13317	14023	if (!wasliveok)
13318	14024	return;
13319	14025
13320	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
13321	14028
13322	14029	// waslive = LIVE;
13323	14030	// LIVE = false;
..	..	@@ -13329,7 +14036,7 @@
13329	14036	// touched = true; // main DL
13330	14037	if (isRenderer)
13331	14038	{
13332		- SetMouseMode(modifiers);
	14039	+ SetMouseMode(modifiers, modifiersex);
13333	14040	}
13334	14041
13335	14042	selectX = anchorX = x;
..	..	@@ -13342,7 +14049,7 @@
13342	14049	clicked = true;
13343	14050	hold = false;
13344	14051
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14052	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	14053	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	14054	{
13348	14055	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13373,7 +14080,7 @@
13373	14080	info.camera = renderCamera;
13374	14081	info.x = x;
13375	14082	info.y = y;
13376		- info.modifiers = modifiers;
	14083	+ info.modifiers = modifiersex;
13377	14084	editObj = object.doEditClick(info, 0);
13378	14085	if (!editObj)
13379	14086	{
..	..	@@ -13390,11 +14097,14 @@
13390	14097
13391	14098	public void mouseDragged(MouseEvent e)
13392	14099	{
	14100	+ Globals.MOUSEDRAGGED = true;
	14101	+
	14102	+ //System.out.println("mouseDragged: " + e);
13393	14103	if (isRenderer)
13394	14104	movingcamera = true;
	14105	+
13395	14106	//if (drawing)
13396	14107	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	14108	if ((e.getModifiersEx() & CTRL) != 0
13399	14109	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14110	{
..	..	@@ -13402,7 +14112,7 @@
13402	14112	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14113	}
13404	14114	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14115	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14116
13407	14117	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14118	}
..	..	@@ -13575,6 +14285,7 @@
13575	14285
13576	14286	public void run()
13577	14287	{
	14288	+ new Exception().printStackTrace();
13578	14289	System.exit(0);
13579	14290	for (;;)
13580	14291	{
..	..	@@ -13638,7 +14349,7 @@
13638	14349	{
13639	14350	Globals.lighttouched = true;
13640	14351	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14352	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14353	}
13643	14354	//else
13644	14355	}
..	..	@@ -13652,12 +14363,12 @@
13652	14363	void GoDown(int mod)
13653	14364	{
13654	14365	MODIFIERS \|= COMMAND;
13655		- /*
	14366	+ /**/
13656	14367	if((mod&SHIFT) == SHIFT)
13657	14368	manipCamera.RotatePosition(0, -speed);
13658	14369	else
13659		- manipCamera.BackForth(0, -speed*delta, getWidth());
13660		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
13661	14372	if ((mod & SHIFT) == SHIFT)
13662	14373	{
13663	14374	mouseMode = mouseMode; // VR??
..	..	@@ -13673,12 +14384,12 @@
13673	14384	void GoUp(int mod)
13674	14385	{
13675	14386	MODIFIERS \|= COMMAND;
13676		- /*
	14387	+ /**/
13677	14388	if((mod&SHIFT) == SHIFT)
13678	14389	manipCamera.RotatePosition(0, speed);
13679	14390	else
13680		- manipCamera.BackForth(0, speed*delta, getWidth());
13681		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
13682	14393	if ((mod & SHIFT) == SHIFT)
13683	14394	{
13684	14395	mouseMode = mouseMode;
..	..	@@ -13694,12 +14405,12 @@
13694	14405	void GoLeft(int mod)
13695	14406	{
13696	14407	MODIFIERS \|= COMMAND;
13697		- /*
	14408	+ /**/
13698	14409	if((mod&SHIFT) == SHIFT)
13699		- manipCamera.RotatePosition(speed, 0);
13700		- else
13701	14410	manipCamera.Translate(speed*delta, 0, getWidth());
13702		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
13703	14414	if ((mod & SHIFT) == SHIFT)
13704	14415	{
13705	14416	mouseMode = mouseMode;
..	..	@@ -13715,12 +14426,12 @@
13715	14426	void GoRight(int mod)
13716	14427	{
13717	14428	MODIFIERS \|= COMMAND;
13718		- /*
	14429	+ /**/
13719	14430	if((mod&SHIFT) == SHIFT)
13720		- manipCamera.RotatePosition(-speed, 0);
13721		- else
13722	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
13723		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
13724	14435	if ((mod & SHIFT) == SHIFT)
13725	14436	{
13726	14437	mouseMode = mouseMode;
..	..	@@ -13738,7 +14449,7 @@
13738	14449	int X, Y;
13739	14450	boolean SX, SY;
13740	14451
13741		- void drag(int x, int y, int modifiers)
	14452	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14453	{
13743	14454	if (IsFrozen())
13744	14455	{
..	..	@@ -13747,17 +14458,17 @@
13747	14458
13748	14459	drag = true; // NEW
13749	14460
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14461	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14462
13752	14463	X = x;
13753	14464	Y = y;
13754	14465	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14466	+ MODIFIERS = modifiersex;
	14467	+ modifiersex &= ~1024;
13757	14468	if (false) // modifiers != 0)
13758	14469	{
13759	14470	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14471	+ System.out.println("mouseDragged: " + modifiersex);
13761	14472	System.out.println("SHIFT = " + SHIFT);
13762	14473	System.out.println("CONTROL = " + COMMAND);
13763	14474	System.out.println("META = " + META);
..	..	@@ -13777,7 +14488,8 @@
13777	14488	info.camera = renderCamera;
13778	14489	info.x = x;
13779	14490	info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14493	} else
13782	14494	{
13783	14495	if (x < startX)
..	..	@@ -13929,7 +14641,6 @@
13929	14641	public void mouseMoved(MouseEvent e)
13930	14642	{
13931	14643	//System.out.println("mouseMoved: " + e);
13932		-
13933	14644	if (isRenderer)
13934	14645	return;
13935	14646
..	..	@@ -13942,7 +14653,9 @@
13942	14653	ci.camera = renderCamera;
13943	14654	if (!isRenderer)
13944	14655	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
13946	14659	{
13947	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	14661	} else
..	..	@@ -13954,7 +14667,11 @@
13954	14667
13955	14668	public void mouseReleased(MouseEvent e)
13956	14669	{
	14670	+ Globals.MOUSEDRAGGED = false;
	14671	+
13957	14672	movingcamera = false;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
13958	14675	//System.out.println("mouseReleased: " + e);
13959	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	14677	}
..	..	@@ -13977,9 +14694,9 @@
13977	14694	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	14695	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	14696
13980		- if (control \|\| command \|\| IsFrozen())
	14697	+// No delay if (control \|\| command \|\| IsFrozen())
13981	14698	timeout = true;
13982		- else
	14699	+// ?? May 2019 else
13983	14700	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	14701	mouseDown = false;
13985	14702	if (!control && !command) // june 2013
..	..	@@ -14089,7 +14806,7 @@
14089	14806	System.out.println("keyReleased: " + e);
14090	14807	}
14091	14808
14092		- void SetMouseMode(int modifiers)
	14809	+ void SetMouseMode(int modifiers, int modifiersex)
14093	14810	{
14094	14811	//System.out.println("SetMouseMode = " + modifiers);
14095	14812	//modifiers &= ~1024;
..	..	@@ -14101,25 +14818,25 @@
14101	14818	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	14819	// return;
14103	14820	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	14821	+ if ((modifiersex & WHEEL) == WHEEL)
14105	14822	{
14106	14823	mouseMode \|= ZOOM;
14107	14824	}
14108	14825
14109	14826	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	14827	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	14828	{
14112	14829	mouseMode \|= VR; // BACKFORTH;
14113	14830	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14831	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	14832	{
14116	14833	mouseMode \|= SELECT;
14117	14834	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	14835	+ if ((modifiersex & COMMAND) == COMMAND)
14119	14836	{
14120	14837	mouseMode \|= SELECT;
14121	14838	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14839	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	14840	{
14124	14841	mouseMode &= ~VR;
14125	14842	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +14865,7 @@
14148	14865
14149	14866	if (isRenderer) //
14150	14867	{
14151		- SetMouseMode(modifiers);
	14868	+ SetMouseMode(0, modifiers);
14152	14869	}
14153	14870
14154	14871	Globals.theRenderer.keyPressed(key);
..	..	@@ -14295,7 +15012,9 @@
14295	15012	case 'E' : COMPACT ^= true;
14296	15013	repaint();
14297	15014	break;
14298		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
14299	15018	repaint();
14300	15019	break;
14301	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14320,8 +15039,8 @@
14320	15039	RevertCamera();
14321	15040	repaint();
14322	15041	break;
14323		- case 'L':
14324	15042	case 'l':
	15043	+ //case 'L':
14325	15044	if (lightMode)
14326	15045	{
14327	15046	lightMode = false;
..	..	@@ -14464,9 +15183,9 @@
14464	15183	case '_':
14465	15184	kompactbit = 5;
14466	15185	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
14470	15189	case ' ':
14471	15190	lightMode ^= true;
14472	15191	Globals.lighttouched = true;
..	..	@@ -14478,13 +15197,14 @@
14478	15197	case ESC:
14479	15198	RENDERPROGRAM += 1;
14480	15199	RENDERPROGRAM %= 3;
	15200	+
14481	15201	repaint();
14482	15202	break;
14483	15203	case 'Z':
14484	15204	//RESIZETEXTURE ^= true;
14485	15205	//break;
14486	15206	case 'z':
14487		- RENDERSHADOW ^= true;
	15207	+ Globals.RENDERSHADOW ^= true;
14488	15208	Globals.lighttouched = true;
14489	15209	repaint();
14490	15210	break;
..	..	@@ -14517,8 +15237,9 @@
14517	15237	case DELETE:
14518	15238	ClearSelection();
14519	15239	break;
14520		- /*
14521	15240	case '+':
	15241	+
	15242	+ /*
14522	15243	//fontsize += 1;
14523	15244	bbzoom *= 2;
14524	15245	repaint();
..	..	@@ -14535,17 +15256,17 @@
14535	15256	case '=':
14536	15257	IncDepth();
14537	15258	//fontsize += 1;
14538		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
14539	15260	maskbit = 6;
14540	15261	break;
14541	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14542	15263	DecDepth();
14543	15264	maskbit = 5;
14544	15265	//if(fontsize > 1) fontsize -= 1;
14545		- if (object.editWindow == null)
14546		- new Exception().printStackTrace();
14547		- else
14548		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
14549	15270	break;
14550	15271	case '{':
14551	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14608,7 +15329,7 @@
14608	15329	//mode = ROTATE;
14609	15330	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15331	{
14611		- SetMouseMode(modifiers);
	15332	+ SetMouseMode(0, modifiers);
14612	15333	}
14613	15334	}
14614	15335
..	..	@@ -14742,8 +15463,9 @@
14742	15463
14743	15464	protected void processMouseMotionEvent(MouseEvent e)
14744	15465	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15466	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15467	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15468	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	15469	{
14748	15470	mouseMoved(e);
14749	15471	} else
..	..	@@ -14768,11 +15490,12 @@
14768	15490	}
14769	15491	*/
14770	15492
14771		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
14772	15494	}
14773	15495
14774	15496	void SelectParent()
14775	15497	{
	15498	+ new Exception().printStackTrace();
14776	15499	System.exit(0);
14777	15500	Composite group = (Composite) object;
14778	15501	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14784,10 +15507,10 @@
14784	15507	{
14785	15508	//selectees.remove(i);
14786	15509	System.out.println("select parent of " + elem);
14787		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14788	15511	} else
14789	15512	{
14790		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14791	15514	}
14792	15515
14793	15516	first = false;
..	..	@@ -14796,6 +15519,7 @@
14796	15519
14797	15520	void SelectChildren()
14798	15521	{
	15522	+ new Exception().printStackTrace();
14799	15523	System.exit(0);
14800	15524	/*
14801	15525	Composite group = (Composite) object;
..	..	@@ -14828,12 +15552,12 @@
14828	15552	for (int j = 0; j < group.children.size(); j++)
14829	15553	{
14830	15554	elem = (Object3D) group.children.elementAt(j);
14831		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14832	15556	first = false;
14833	15557	}
14834	15558	} else
14835	15559	{
14836		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14837	15561	}
14838	15562
14839	15563	first = false;
..	..	@@ -14844,21 +15568,21 @@
14844	15568	{
14845	15569	//Composite group = (Composite) object;
14846	15570	Object3D group = object;
14847		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14848	15572	}
14849	15573
14850	15574	void ResetTransform(int mask)
14851	15575	{
14852	15576	//Composite group = (Composite) object;
14853	15577	Object3D group = object;
14854		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
14855	15579	}
14856	15580
14857	15581	void FlipTransform()
14858	15582	{
14859	15583	//Composite group = (Composite) object;
14860	15584	Object3D group = object;
14861		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
14862	15586	// group.editWindow.ReduceMesh(true);
14863	15587	}
14864	15588
..	..	@@ -14866,7 +15590,7 @@
14866	15590	{
14867	15591	//Composite group = (Composite) object;
14868	15592	Object3D group = object;
14869		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
14870	15594	// group.editWindow.ReduceMesh(true);
14871	15595	}
14872	15596
..	..	@@ -14874,7 +15598,7 @@
14874	15598	{
14875	15599	//Composite group = (Composite) object;
14876	15600	Object3D group = object;
14877		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
14878	15602	}
14879	15603
14880	15604	void IncDepth()
..	..	@@ -14960,7 +15684,9 @@
14960	15684	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	15685	//Image img = CreateImage(width, height);
14962	15686	//System.out.println("width = " + width + "; height = " + height + "\n");
	15687	+
14963	15688	Graphics gr = g; // img.getGraphics();
	15689	+
14964	15690	if (!hasMarquee)
14965	15691	{
14966	15692	if (Xmin < Xmax) // !locked)
..	..	@@ -15048,6 +15774,7 @@
15048	15774	info.bounds.y += (height - desired) / 2;
15049	15775	}
15050	15776	}
	15777	+
15051	15778	info.g = gr;
15052	15779	info.camera = renderCamera;
15053	15780	/*
..	..	@@ -15057,15 +15784,55 @@
15057	15784	*/
15058	15785	if (!isRenderer)
15059	15786	{
15060		- object.drawEditHandles(info, 0);
	15787	+ Grafreed.Assert(object != null);
	15788	+ Grafreed.Assert(object.selection != null);
	15789	+ if (object.selection.Size() > 0)
	15790	+ {
	15791	+ int hitSomething = object.selection.get(0).hitSomething;
	15792	+
	15793	+ info.DX = 0;
	15794	+ info.DY = 0;
	15795	+ info.W = 1;
	15796	+ if (hitSomething == Object3D.hitCenter)
	15797	+ {
	15798	+ info.DX = X;
	15799	+ if (X != 0)
	15800	+ info.DX -= info.bounds.width/2;
	15801	+
	15802	+ info.DY = Y;
	15803	+ if (Y != 0)
	15804	+ info.DY -= info.bounds.height/2;
	15805	+ }
	15806	+
	15807	+ object.drawEditHandles(info, 0);
	15808	+
	15809	+ if (drag && (X != 0 \|\| Y != 0))
	15810	+ {
	15811	+ switch (hitSomething)
	15812	+ {
	15813	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15814	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15815	+ break;
	15816	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15817	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15818	+ break;
	15819	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15820	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15821	+ break;
	15822	+ }
	15823	+
	15824	+ }
	15825	+ }
15061	15826	}
15062	15827	}
	15828	+
15063	15829	if (isRenderer)
15064	15830	{
15065	15831	//gr.setColor(Color.black);
15066	15832	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	15833	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	15834	}
	15835	+
15069	15836	if (hasMarquee)
15070	15837	{
15071	15838	gr.setXORMode(Color.white);
..	..	@@ -15178,6 +15945,7 @@
15178	15945	public boolean mouseDown(Event evt, int x, int y)
15179	15946	{
15180	15947	System.out.println("mouseDown: " + evt);
	15948	+ System.exit(0);
15181	15949	/*
15182	15950	locked = true;
15183	15951	drag = false;
..	..	@@ -15221,7 +15989,7 @@
15221	15989	{
15222	15990	keyPressed(0, modifiers);
15223	15991	}
15224		- clickStart(x, y, modifiers);
	15992	+ // clickStart(x, y, modifiers);
15225	15993	return true;
15226	15994	}
15227	15995
..	..	@@ -15339,7 +16107,7 @@
15339	16107	{
15340	16108	keyReleased(0, 0);
15341	16109	}
15342		- drag(x, y, modifiers);
	16110	+ drag(x, y, 0, modifiers);
15343	16111	return true;
15344	16112	}
15345	16113
..	..	@@ -15471,7 +16239,7 @@
15471	16239	Object3D object;
15472	16240	static Object3D trackedobject;
15473	16241	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16242	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16243	/static/ Camera eyeCamera;
15476	16244	/static/ Camera lightCamera;
15477	16245	int cameracount;
..	..	@@ -15756,16 +16524,16 @@
15756	16524	cStatic.objectstack[materialdepth++] = checker;
15757	16525	//System.out.println("material " + material);
15758	16526	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
15760	16528
15761	16529	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16531
15764	16532	materialdepth -= 1;
15765	16533	if (materialdepth > 0)
15766	16534	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16535	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16536	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	16537	}
15770	16538	//checker.GetMaterial().opacity = 1f;
15771	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15851,6 +16619,14 @@
15851	16619	}
15852	16620	}
15853	16621
	16622	+ private Object3D GetFolder()
	16623	+ {
	16624	+ Object3D folder = object.GetWindow().copy;
	16625	+ if (object.GetWindow().copy.selection.Size() > 0)
	16626	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16627	+ return folder;
	16628	+ }
	16629	+
15854	16630	class SelectBuffer implements GLEventListener
15855	16631	{
15856	16632
..	..	@@ -15909,6 +16685,7 @@
15909	16685	{
15910	16686	if (!selection)
15911	16687	{
	16688	+ new Exception().printStackTrace();
15912	16689	System.exit(0);
15913	16690	return;
15914	16691	}
..	..	@@ -15929,6 +16706,17 @@
15929	16706
15930	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15931	16708
	16709	+ if (PAINTMODE)
	16710	+ {
	16711	+ if (object.GetWindow().copy.selection.Size() > 0)
	16712	+ {
	16713	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16714	+
	16715	+ // Make what you paint not selectable.
	16716	+ paintobj.ResetSelectable();
	16717	+ }
	16718	+ }
	16719	+
15932	16720	//int tmp = selection_view;
15933	16721	//selection_view = -1;
15934	16722	int temp = DrawMode();
..	..	@@ -15940,6 +16728,17 @@
15940	16728	// temp = DEFAULT; // patch for selection debug
15941	16729	Globals.drawMode = temp; // WARNING
15942	16730
	16731	+ if (PAINTMODE)
	16732	+ {
	16733	+ if (object.GetWindow().copy.selection.Size() > 0)
	16734	+ {
	16735	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16736	+
	16737	+ // Revert.
	16738	+ paintobj.RestoreSelectable();
	16739	+ }
	16740	+ }
	16741	+
15943	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15944	16743
15945	16744	// trying different ways of getting the depth info over
..	..	@@ -15987,6 +16786,8 @@
15987	16786	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15988	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16789	+
	16790	+ CreateSelectedPoint();
15990	16791
15991	16792	// Will fit the mesh !!!
15992	16793	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16036,34 +16837,36 @@
16036	16837	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]));
16037	16838	}
16038	16839
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16840	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	16841	}
16041	16842	}
16042	16843
16043	16844	if (!movingcamera && !PAINTMODE)
16044		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16045	16846
16046		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16847	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047	16848	{
16048		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16849	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049	16850
16050		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16051	16854
16052		- group.CreateMaterial(); // use a void leaf to select instances
16053		-
16054		- group.add(paintobj); // link
16055		-
16056		- object.editWindow.SnapObject(group);
16057		-
16058		- Object3D folder = object.editWindow.copy;
16059		-
16060		- if (object.editWindow.copy.selection.Size() > 0)
16061		- folder = object.editWindow.copy.selection.elementAt(0);
16062		-
16063		- folder.add(group);
16064		-
16065		- object.editWindow.ResetModel();
16066		- object.editWindow.refreshContents();
	16855	+ Object3D inst = new Object3D("inst" + paintcount++);
	16856	+
	16857	+ inst.CreateMaterial(); // use a void leaf to select instances
	16858	+
	16859	+ inst.add(paintobj); // link
	16860	+
	16861	+ object.GetWindow().SnapObject(inst);
	16862	+
	16863	+ Object3D folder = paintFolder; // GetFolder();
	16864	+
	16865	+ folder.add(inst);
	16866	+
	16867	+ object.GetWindow().ResetModel();
	16868	+ object.GetWindow().refreshContents();
	16869	+ }
16067	16870	}
16068	16871	else
16069	16872	paintcount = 0;
..	..	@@ -16102,6 +16905,11 @@
16102	16905	//System.out.println("objects[color] = " + objects[color]);
16103	16906	//objects[color].Select();
16104	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
16105	16913	object.Select(color, deselect);
16106	16914	}
16107	16915
..	..	@@ -16201,7 +17009,7 @@
16201	17009	gl.glDisable(gl.GL_CULL_FACE);
16202	17010	}
16203	17011
16204		- if (!RENDERSHADOW)
	17012	+ if (!Globals.RENDERSHADOW)
16205	17013	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	17014
16207	17015	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +17019,7 @@
16211	17019	//gl.glColorMask(false, false, false, false);
16212	17020
16213	17021	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17022	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	17023	{
16216	17024	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	17025
..	..	@@ -16627,23 +17435,15 @@
16627	17435	int AAbuffersize = 0;
16628	17436
16629	17437	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17438	+ static Superellipsoid selectedpoint;
16631	17439	static Sphere previousselectedpoint = null;
16632		- static Sphere debugpointG = new Sphere();
16633		- static Sphere debugpointP = new Sphere();
16634		- static Sphere debugpointC = new Sphere();
16635		- static Sphere debugpointR = new Sphere();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
16636	17444
16637	17445	static Sphere debugpoints[] = new Sphere[8];
16638	17446
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17447	static void InitPoints(float radius)
16648	17448	{
16649	17449	for (int i=0; i<8; i++)
..	..	@@ -16695,10 +17495,11 @@
16695	17495	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17496	// Depth buffer format
16697	17497	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17498	+
	17499	+ public void NextIndex()
16699	17500	{
16700	17501	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17502	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	17503	//objects[indexcount] = o;
16703	17504	//System.out.println("indexcount = " + indexcount);
16704	17505	}