~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,7 @@
2006	2404	{
2007	2405	return currentGL;
2008	2406	}
2009		-
	2407	+
2010	2408	/**/
2011	2409	class CacheTexture
2012	2410	{
..	..	@@ -2024,9 +2422,10 @@
2024	2422	/**/
2025	2423
2026	2424	// 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>();
	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	+
2030	2429	int pigmentdepth = 0;
2031	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2032	2431	int bumpdepth = 0;
..	..	@@ -2048,6 +2447,33 @@
2048	2447	true,
2049	2448	com.sun.opengl.util.texture.TextureIO.PNG);
2050	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)
2051	2477	{
2052	2478	throw new javax.media.opengl.GLException(e);
2053	2479	}
..	..	@@ -3134,6 +3560,8 @@
3134	3560
3135	3561	System.out.println("LOADING TEXTURE : " + name);
3136	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
3137	3565	//
3138	3566	if (false) // compressbit > 0)
3139	3567	{
..	..	@@ -3838,6 +4266,7 @@
3838	4266
3839	4267	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4268	{
	4269	+ new Exception().printStackTrace();
3841	4270	System.exit(0);
3842	4271	com.sun.opengl.util.texture.Texture texture = null;
3843	4272
..	..	@@ -7531,7 +7960,7 @@
7531	7960	String pigment = Object3D.GetPigment(tex);
7532	7961	String bump = Object3D.GetBump(tex);
7533	7962
7534		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7535	7964	{
7536	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7537	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7548,6 +7977,64 @@
7548	7977
7549	7978	ReleaseTexture(bump, true);
7550	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);
7551	8038	}
7552	8039
7553	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7653,7 +8140,55 @@
7653	8140	}
7654	8141	}
7655	8142
7656		- /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
7657	8192	{
7658	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8194	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7663,18 +8198,48 @@
7663	8198
7664	8199	if (tex == null)
7665	8200	{
7666		- BindTexture(null,false,resolution);
7667		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
7668	8202	return;
7669	8203	}
7670	8204
7671	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	+
7672	8238	String bump = Object3D.GetBump(tex);
7673	8239
7674		- usedtextures.put(pigment, pigment);
7675		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
7676	8241
7677		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7678	8243	{
7679	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7680	8245	// System.out.println("; bump = " + bump);
..	..	@@ -7684,42 +8249,70 @@
7684	8249	{
7685	8250	bump = null;
7686	8251	}
7687		- if (pigment.equals(""))
7688		- {
7689		- pigment = null;
7690		- }
7691	8252
7692		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7693		- BindTexture(pigment, false, resolution);
7694	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7695		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
7696	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7697		-
7698		- return; // true;
7699	8256	}
7700	8257
7701		- 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)
7702	8261	{
7703		- 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;
7704	8281
7705	8282	if (tex != null)
7706	8283	{
7707	8284	String texname = tex;
7708	8285
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;
	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	+ }
7715	8298
7716	8299	if (CACHETEXTURE)
7717		- texture = textures.get(texname); // TEXTURE CACHE
7718		-
7719		- TextureData texturedata = null;
7720		-
7721		- if (texture == null \|\| texture.resolution < resolution)
7722	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
7723	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7724	8317	{
7725	8318	assert(!bump);
..	..	@@ -7731,19 +8324,19 @@
7731	8324	// }
7732	8325	// else
7733	8326	// {
7734		- texture = textures.get(tex);
7735		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
7736	8329	{
7737		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7738	8331	}
7739	8332	// }
7740	8333	} else
7741	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7742	8335	{
7743	8336	assert(bump);
7744		- texture = textures.get(tex);
7745		- if (texture == null)
7746		- 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);
7747	8340	} else
7748	8341	{
7749	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,9 +8346,9 @@
7753	8346	//{
7754	8347	if (tex.equals("WHITE_NOISE"))
7755	8348	{
7756		- texture = textures.get(tex);
7757		- if (texture == null)
7758		- 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);
7759	8352	} else
7760	8353	{
7761	8354	if (textureon)
..	..	@@ -7780,7 +8373,7 @@
7780	8373	}
7781	8374
7782	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
7784	8377	cachename = texname;
7785	8378	else
7786	8379	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8395,7 @@
7802	8395	}
7803	8396
7804	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
7806	8399	cachename = texname;
7807	8400	else
7808	8401	processbump = false; // don't process bump map again
..	..	@@ -7811,20 +8404,22 @@
7811	8404	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8405
7813	8406
7814		- if (texturedata != null)
7815		- 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);
7816	8411	//texture = GetTexture(tex, bump);
7817	8412	}
7818	8413	}
7819	8414	//}
7820	8415	}
7821	8416
7822		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
7823	8418	{
7824	8419	//return false;
7825	8420
7826	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7827		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7828	8423	{
7829	8424	// String ext = "_highres";
7830	8425	// if (REDUCETEXTURE)
..	..	@@ -7913,8 +8508,8 @@
7913	8508	textures.remove(texname);
7914	8509	}
7915	8510
7916		- texture.texturedata = texturedata;
7917		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
7918	8513
7919	8514	// newtex = true;
7920	8515	}
..	..	@@ -7930,12 +8525,12 @@
7930	8525	}
7931	8526	}
7932	8527
7933		- return texture;
	8528	+ return texturecache;
7934	8529	}
7935	8530
7936		- 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
7937	8532	{
7938		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7939	8534
7940	8535	if (bump)
7941	8536	{
..	..	@@ -7951,23 +8546,23 @@
7951	8546	return texture!=null?texture.texture:null;
7952	8547	}
7953	8548
7954		- public 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
7955	8550	{
7956		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7957	8552
7958	8553	return texture!=null?texture.texturedata:null;
7959	8554	}
7960	8555
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7962	8557	{
7963	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8559	{
7965	8560	return false;
7966	8561	}
7967	8562
7968		- boolean newtex = false;
	8563	+ //boolean newtex = false;
7969	8564
7970		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
7971	8566
7972	8567	if (texture == null)
7973	8568	return false;
..	..	@@ -7997,7 +8592,7 @@
7997	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7998	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7999	8594
8000		- return newtex;
	8595	+ return true; // Warning: not used.
8001	8596	}
8002	8597
8003	8598	ShadowBuffer shadowPBuf;
..	..	@@ -8835,11 +9430,35 @@
8835	9430	jy8[3] = 0.5f;
8836	9431	}
8837	9432
8838		- 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
8839	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	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	+
8843	9462	static int imagecount = 0; // movie generation
8844	9463
8845	9464	static int jitter = 0;
..	..	@@ -8935,8 +9554,8 @@
8935	9554	assert (parentcam != renderCamera);
8936	9555
8937	9556	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8940	9559
8941	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9561
..	..	@@ -8951,8 +9570,8 @@
8951	9570	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9571
8953	9572	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8956	9575
8957	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9577
..	..	@@ -9024,7 +9643,7 @@
9024	9643	//gl.glFlush();
9025	9644	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9645
9027		- if (ANIMATION && ABORTED)
	9646	+ if (Globals.ANIMATION && ABORTED)
9028	9647	{
9029	9648	System.err.println(" ABORTED FRAME");
9030	9649	break;
..	..	@@ -9054,7 +9673,7 @@
9054	9673	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9674
9056	9675	// save image
9057		- if (ANIMATION && !ABORTED)
	9676	+ if (Globals.ANIMATION && !ABORTED)
9058	9677	{
9059	9678	VPwidth = viewport[2];
9060	9679	VPheight = viewport[3];
..	..	@@ -9165,11 +9784,11 @@
9165	9784
9166	9785	// imagecount++;
9167	9786
9168		- 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;
9169	9788
9170	9789	if (!BOXMODE)
9171	9790	{
9172		- 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) + ")");
9173	9792	}
9174	9793
9175	9794	if (!BOXMODE)
..	..	@@ -9207,7 +9826,7 @@
9207	9826	ABORTED = false;
9208	9827	}
9209	9828	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9829	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	9830
9212	9831	if (false)
9213	9832	{
..	..	@@ -9870,11 +10489,11 @@
9870	10489
9871	10490	public void display(GLAutoDrawable drawable)
9872	10491	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10492	+ if (Grafreed.savesound && Grafreed.hassound)
9874	10493	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10494	+ Grafreed.wav.save();
	10495	+ Grafreed.savesound = false;
	10496	+ Grafreed.hassound = false;
9878	10497	}
9879	10498	// if (DEBUG_SELECTION)
9880	10499	// {
..	..	@@ -9950,6 +10569,7 @@
9950	10569	ANTIALIAS = 0;
9951	10570	//System.out.println("RESTART");
9952	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
9953	10573	}
9954	10574	}
9955	10575	}
..	..	@@ -10004,7 +10624,7 @@
10004	10624	Object3D theobject = object;
10005	10625	Object3D theparent = object.parent;
10006	10626	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10627	+ object = (Object3D)Grafreed.clone(object);
10008	10628	object.Stripify();
10009	10629	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10630	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10637,14 @@
10017	10637	ambientOcclusion = false;
10018	10638	}
10019	10639
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10642	{
10022	10643	//if (RENDERSHADOW) // ?
10023	10644	if (!IsFrozen())
10024	10645	{
10025	10646	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10648	{
10028	10649	Globals.framecount++;
10029	10650	shadowbuffer.display();
..	..	@@ -10150,8 +10771,8 @@
10150	10771
10151	10772	// if (parentcam != renderCamera) // not a light
10152	10773	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10155	10776
10156	10777	for (int j = 0; j < 4; j++)
10157	10778	{
..	..	@@ -10165,8 +10786,8 @@
10165	10786
10166	10787	// if (parentcam != renderCamera) // not a light
10167	10788	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10170	10791
10171	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	10793
..	..	@@ -10425,7 +11046,16 @@
10425	11046	// Bump noise
10426	11047	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11048	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- 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	+
10429	11059
10430	11060	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11061	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10448,9 +11078,9 @@
10448	11078
10449	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
10450	11080
10451		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10452		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10453		-//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);
10454	11084	} else
10455	11085	{
10456	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10461,7 +11091,7 @@
10461	11091	//System.out.println("BLENDING ON");
10462	11092	gl.glEnable(GL.GL_BLEND);
10463	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10464		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10465	11095	gl.glMatrixMode(gl.GL_PROJECTION);
10466	11096	gl.glLoadIdentity();
10467	11097
..	..	@@ -10550,8 +11180,8 @@
10550	11180	System.err.println("parentcam != renderCamera");
10551	11181
10552	11182	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- 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
10555	11185	}
10556	11186
10557	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11202,8 @@
10572	11202	if (true) // TODO
10573	11203	{
10574	11204	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- 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
10577	11207	}
10578	11208
10579	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10889,8 +11519,14 @@
10889	11519	{
10890	11520	renderpass++;
10891	11521	// System.out.println("Draw object... ");
	11522	+ STEP = 1;
10892	11523	if (FAST) // in case there is no script
10893		- STEP = 16;
	11524	+ STEP = 8;
	11525	+
	11526	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11527	+ {
	11528	+ STEP *= 4;
	11529	+ }
10894	11530
10895	11531	//object.FullInvariants();
10896	11532
..	..	@@ -10904,23 +11540,44 @@
10904	11540	e.printStackTrace();
10905	11541	}
10906	11542
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11543	+ if (Grafreed.RENDERME > 0)
	11544	+ Grafreed.RENDERME--; // mechante magouille
10909	11545
10910	11546	Globals.ONESTEP = false;
10911	11547	}
10912	11548
10913	11549	static boolean zoomonce = false;
10914	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	+
10915	11569	void DrawObject(GL gl, boolean draw)
10916	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
10917	11574	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11575	// DrawMode() = SELECTION;
10919	11576	//GL gl = getGL();
10920	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10921	11578	{
10922	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10923		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10924	11581	pingthread.StepToTarget(true); // true);
10925	11582	// zoomonce = false;
10926	11583	}
..	..	@@ -10975,7 +11632,14 @@
10975	11632
10976	11633	usedtextures.clear();
10977	11634
10978		- 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	+ }
10979	11643	}
10980	11644	//System.out.println("--> " + stackdepth);
10981	11645	// GrafreeD.traceon();
..	..	@@ -10985,8 +11649,9 @@
10985	11649
10986	11650	if (DrawMode() == DEFAULT)
10987	11651	{
10988		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
10989	11653	{
	11654	+ CreateSelectedPoint();
10990	11655	float radius = 0.05f;
10991	11656	if (selectedpoint.radius != radius)
10992	11657	{
..	..	@@ -11049,7 +11714,7 @@
11049	11714	if (tex.equals("WHITE_NOISE"))
11050	11715	continue;
11051	11716
11052		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
11053	11718	{
11054	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11055	11720	textures.get(tex).texture.dispose();
..	..	@@ -11066,7 +11731,14 @@
11066	11731	if (checker != null && DrawMode() == DEFAULT)
11067	11732	{
11068	11733	//BindTexture(IMMORTAL_TEXTURE);
11069		- 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	+ }
11070	11742	// NEAREST
11071	11743	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11744	DrawChecker(gl);
..	..	@@ -11148,7 +11820,7 @@
11148	11820	return;
11149	11821	}
11150	11822
11151		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
11152	11824
11153	11825	GL gl = GetGL();
11154	11826
..	..	@@ -11465,8 +12137,8 @@
11465	12137	//obj.TransformToWorld(light, light);
11466	12138	for (int i = tp.size(); --i >= 0;)
11467	12139	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- 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);
11470	12142	}
11471	12143
11472	12144
..	..	@@ -11483,8 +12155,8 @@
11483	12155	parentcam = cameras[0];
11484	12156	}
11485	12157
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- 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
11488	12160
11489	12161	LA.xformPos(light, renderCamera.toScreen, light);
11490	12162
..	..	@@ -12098,8 +12770,8 @@
12098	12770
12099	12771	// display shadow only (bump == 0)
12100	12772	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	12773	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12774	+ "SLT temp.z, temp.y, -one2048th.x;" +
12103	12775	"SUB temp.y, one.x, temp.z;" +
12104	12776	"MUL temp.x, temp.x, temp.y;" +
12105	12777	"KIL temp.x;" +
..	..	@@ -12228,8 +12900,10 @@
12228	12900	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	12901
12230	12902	"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
	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
12233	12907	"MUL temp.x, temp.x, temp.y;" +
12234	12908
12235	12909	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,7 +13102,7 @@
12428	13102	//once = true;
12429	13103	}
12430	13104
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
	13105	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432	13106	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433	13107	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13108
..	..	@@ -12561,12 +13235,16 @@
12561	13235
12562	13236	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13237	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13238	+
	13239	+ // Compare fragment depth in light space with shadowmap.
12564	13240	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13241	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13242	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13243	+
	13244	+ // Reverse comparison
12567	13245	"SUB temp.x, one.x, temp.x;" +
12568	13246	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13247	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13248	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13249
12572	13250	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13258,10 @@
12580	13258	// No shadow for backface
12581	13259	"DP3 temp.x, normal, lightd;" +
12582	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;" +
12583	13265	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13266	"";
12585	13267	}
..	..	@@ -12726,7 +13408,8 @@
12726	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
12730	13413
12731	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13415	// OUT : diff, spec
..	..	@@ -12742,9 +13425,10 @@
12742	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13427	//"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;" +
	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
12748	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13433	"RCP " + dest + ".w," + dest + ".w;" +
12750	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13138,7 +13822,7 @@
13138	13822	public void mousePressed(MouseEvent e)
13139	13823	{
13140	13824	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13825	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	13826	}
13143	13827
13144	13828	static long prevtime = 0;
..	..	@@ -13165,6 +13849,7 @@
13165	13849
13166	13850	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	13851
	13852	+ if (BUTTONLESSWHEEL)
13168	13853	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	13854	{
13170	13855	return;
..	..	@@ -13173,7 +13858,7 @@
13173	13858	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	13859
13175	13860	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13861	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	13862	{
13178	13863	keepboxmode = BOXMODE;
13179	13864	keepsupport = SUPPORT;
..	..	@@ -13213,8 +13898,8 @@
13213	13898	// mode \|= META;
13214	13899	//}
13215	13900
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13901	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13902	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	13903	anchorX = ax;
13219	13904	anchorY = ay;
13220	13905	prevX = px;
..	..	@@ -13248,6 +13933,7 @@
13248	13933	else
13249	13934	if (evt.getSource() == AAtimer)
13250	13935	{
	13936	+ Globals.TIMERRUNNING = false;
13251	13937	if (mouseDown)
13252	13938	{
13253	13939	//new Exception().printStackTrace();
..	..	@@ -13273,6 +13959,10 @@
13273	13959	// LIVE = waslive;
13274	13960	// wasliveok = true;
13275	13961	// waslive = false;
	13962	+
	13963	+ // May 2019 Forget it:
	13964	+ if (true)
	13965	+ return;
13276	13966
13277	13967	// source == timer
13278	13968	if (mouseDown)
..	..	@@ -13303,7 +13993,7 @@
13303	13993
13304	13994	// fev 2014???
13305	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13306		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13307	13997	pingthread.StepToTarget(true); // true);
13308	13998	}
13309	13999	// if (!LIVE)
..	..	@@ -13312,12 +14002,13 @@
13312	14002
13313	14003	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	14004
13315		- void clickStart(int x, int y, int modifiers)
	14005	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	14006	{
13317	14007	if (!wasliveok)
13318	14008	return;
13319	14009
13320	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
13321	14012
13322	14013	// waslive = LIVE;
13323	14014	// LIVE = false;
..	..	@@ -13329,7 +14020,7 @@
13329	14020	// touched = true; // main DL
13330	14021	if (isRenderer)
13331	14022	{
13332		- SetMouseMode(modifiers);
	14023	+ SetMouseMode(modifiers, modifiersex);
13333	14024	}
13334	14025
13335	14026	selectX = anchorX = x;
..	..	@@ -13342,7 +14033,7 @@
13342	14033	clicked = true;
13343	14034	hold = false;
13344	14035
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14036	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	14037	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	14038	{
13348	14039	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13373,7 +14064,7 @@
13373	14064	info.camera = renderCamera;
13374	14065	info.x = x;
13375	14066	info.y = y;
13376		- info.modifiers = modifiers;
	14067	+ info.modifiers = modifiersex;
13377	14068	editObj = object.doEditClick(info, 0);
13378	14069	if (!editObj)
13379	14070	{
..	..	@@ -13390,11 +14081,14 @@
13390	14081
13391	14082	public void mouseDragged(MouseEvent e)
13392	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
	14086	+ //System.out.println("mouseDragged: " + e);
13393	14087	if (isRenderer)
13394	14088	movingcamera = true;
	14089	+
13395	14090	//if (drawing)
13396	14091	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	14092	if ((e.getModifiersEx() & CTRL) != 0
13399	14093	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14094	{
..	..	@@ -13402,7 +14096,7 @@
13402	14096	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14097	}
13404	14098	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14099	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14100
13407	14101	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14102	}
..	..	@@ -13575,6 +14269,7 @@
13575	14269
13576	14270	public void run()
13577	14271	{
	14272	+ new Exception().printStackTrace();
13578	14273	System.exit(0);
13579	14274	for (;;)
13580	14275	{
..	..	@@ -13638,7 +14333,7 @@
13638	14333	{
13639	14334	Globals.lighttouched = true;
13640	14335	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14336	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14337	}
13643	14338	//else
13644	14339	}
..	..	@@ -13652,12 +14347,12 @@
13652	14347	void GoDown(int mod)
13653	14348	{
13654	14349	MODIFIERS \|= COMMAND;
13655		- /*
	14350	+ /**/
13656	14351	if((mod&SHIFT) == SHIFT)
13657	14352	manipCamera.RotatePosition(0, -speed);
13658	14353	else
13659		- manipCamera.BackForth(0, -speed*delta, getWidth());
13660		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
13661	14356	if ((mod & SHIFT) == SHIFT)
13662	14357	{
13663	14358	mouseMode = mouseMode; // VR??
..	..	@@ -13673,12 +14368,12 @@
13673	14368	void GoUp(int mod)
13674	14369	{
13675	14370	MODIFIERS \|= COMMAND;
13676		- /*
	14371	+ /**/
13677	14372	if((mod&SHIFT) == SHIFT)
13678	14373	manipCamera.RotatePosition(0, speed);
13679	14374	else
13680		- manipCamera.BackForth(0, speed*delta, getWidth());
13681		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
13682	14377	if ((mod & SHIFT) == SHIFT)
13683	14378	{
13684	14379	mouseMode = mouseMode;
..	..	@@ -13694,12 +14389,12 @@
13694	14389	void GoLeft(int mod)
13695	14390	{
13696	14391	MODIFIERS \|= COMMAND;
13697		- /*
	14392	+ /**/
13698	14393	if((mod&SHIFT) == SHIFT)
13699		- manipCamera.RotatePosition(speed, 0);
13700		- else
13701	14394	manipCamera.Translate(speed*delta, 0, getWidth());
13702		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
13703	14398	if ((mod & SHIFT) == SHIFT)
13704	14399	{
13705	14400	mouseMode = mouseMode;
..	..	@@ -13715,12 +14410,12 @@
13715	14410	void GoRight(int mod)
13716	14411	{
13717	14412	MODIFIERS \|= COMMAND;
13718		- /*
	14413	+ /**/
13719	14414	if((mod&SHIFT) == SHIFT)
13720		- manipCamera.RotatePosition(-speed, 0);
13721		- else
13722	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
13723		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
13724	14419	if ((mod & SHIFT) == SHIFT)
13725	14420	{
13726	14421	mouseMode = mouseMode;
..	..	@@ -13738,7 +14433,7 @@
13738	14433	int X, Y;
13739	14434	boolean SX, SY;
13740	14435
13741		- void drag(int x, int y, int modifiers)
	14436	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14437	{
13743	14438	if (IsFrozen())
13744	14439	{
..	..	@@ -13747,17 +14442,17 @@
13747	14442
13748	14443	drag = true; // NEW
13749	14444
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14445	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14446
13752	14447	X = x;
13753	14448	Y = y;
13754	14449	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14450	+ MODIFIERS = modifiersex;
	14451	+ modifiersex &= ~1024;
13757	14452	if (false) // modifiers != 0)
13758	14453	{
13759	14454	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14455	+ System.out.println("mouseDragged: " + modifiersex);
13761	14456	System.out.println("SHIFT = " + SHIFT);
13762	14457	System.out.println("CONTROL = " + COMMAND);
13763	14458	System.out.println("META = " + META);
..	..	@@ -13777,7 +14472,8 @@
13777	14472	info.camera = renderCamera;
13778	14473	info.x = x;
13779	14474	info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14477	} else
13782	14478	{
13783	14479	if (x < startX)
..	..	@@ -13929,7 +14625,6 @@
13929	14625	public void mouseMoved(MouseEvent e)
13930	14626	{
13931	14627	//System.out.println("mouseMoved: " + e);
13932		-
13933	14628	if (isRenderer)
13934	14629	return;
13935	14630
..	..	@@ -13942,7 +14637,9 @@
13942	14637	ci.camera = renderCamera;
13943	14638	if (!isRenderer)
13944	14639	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
13946	14643	{
13947	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	14645	} else
..	..	@@ -13954,7 +14651,11 @@
13954	14651
13955	14652	public void mouseReleased(MouseEvent e)
13956	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
13957	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
13958	14659	//System.out.println("mouseReleased: " + e);
13959	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	14661	}
..	..	@@ -13977,9 +14678,9 @@
13977	14678	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	14679	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	14680
13980		- if (control \|\| command \|\| IsFrozen())
	14681	+// No delay if (control \|\| command \|\| IsFrozen())
13981	14682	timeout = true;
13982		- else
	14683	+// ?? May 2019 else
13983	14684	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	14685	mouseDown = false;
13985	14686	if (!control && !command) // june 2013
..	..	@@ -14089,7 +14790,7 @@
14089	14790	System.out.println("keyReleased: " + e);
14090	14791	}
14091	14792
14092		- void SetMouseMode(int modifiers)
	14793	+ void SetMouseMode(int modifiers, int modifiersex)
14093	14794	{
14094	14795	//System.out.println("SetMouseMode = " + modifiers);
14095	14796	//modifiers &= ~1024;
..	..	@@ -14101,25 +14802,25 @@
14101	14802	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	14803	// return;
14103	14804	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	14805	+ if ((modifiersex & WHEEL) == WHEEL)
14105	14806	{
14106	14807	mouseMode \|= ZOOM;
14107	14808	}
14108	14809
14109	14810	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	14811	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	14812	{
14112	14813	mouseMode \|= VR; // BACKFORTH;
14113	14814	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14815	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	14816	{
14116	14817	mouseMode \|= SELECT;
14117	14818	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	14819	+ if ((modifiersex & COMMAND) == COMMAND)
14119	14820	{
14120	14821	mouseMode \|= SELECT;
14121	14822	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14823	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	14824	{
14124	14825	mouseMode &= ~VR;
14125	14826	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +14849,7 @@
14148	14849
14149	14850	if (isRenderer) //
14150	14851	{
14151		- SetMouseMode(modifiers);
	14852	+ SetMouseMode(0, modifiers);
14152	14853	}
14153	14854
14154	14855	Globals.theRenderer.keyPressed(key);
..	..	@@ -14295,7 +14996,9 @@
14295	14996	case 'E' : COMPACT ^= true;
14296	14997	repaint();
14297	14998	break;
14298		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
14299	15002	repaint();
14300	15003	break;
14301	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14320,8 +15023,8 @@
14320	15023	RevertCamera();
14321	15024	repaint();
14322	15025	break;
14323		- case 'L':
14324	15026	case 'l':
	15027	+ //case 'L':
14325	15028	if (lightMode)
14326	15029	{
14327	15030	lightMode = false;
..	..	@@ -14464,9 +15167,9 @@
14464	15167	case '_':
14465	15168	kompactbit = 5;
14466	15169	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
14470	15173	case ' ':
14471	15174	lightMode ^= true;
14472	15175	Globals.lighttouched = true;
..	..	@@ -14478,13 +15181,14 @@
14478	15181	case ESC:
14479	15182	RENDERPROGRAM += 1;
14480	15183	RENDERPROGRAM %= 3;
	15184	+
14481	15185	repaint();
14482	15186	break;
14483	15187	case 'Z':
14484	15188	//RESIZETEXTURE ^= true;
14485	15189	//break;
14486	15190	case 'z':
14487		- RENDERSHADOW ^= true;
	15191	+ Globals.RENDERSHADOW ^= true;
14488	15192	Globals.lighttouched = true;
14489	15193	repaint();
14490	15194	break;
..	..	@@ -14517,8 +15221,9 @@
14517	15221	case DELETE:
14518	15222	ClearSelection();
14519	15223	break;
14520		- /*
14521	15224	case '+':
	15225	+
	15226	+ /*
14522	15227	//fontsize += 1;
14523	15228	bbzoom *= 2;
14524	15229	repaint();
..	..	@@ -14535,17 +15240,17 @@
14535	15240	case '=':
14536	15241	IncDepth();
14537	15242	//fontsize += 1;
14538		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14539	15244	maskbit = 6;
14540	15245	break;
14541	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14542	15247	DecDepth();
14543	15248	maskbit = 5;
14544	15249	//if(fontsize > 1) fontsize -= 1;
14545		- if (object.editWindow == null)
14546		- new Exception().printStackTrace();
14547		- else
14548		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14549	15254	break;
14550	15255	case '{':
14551	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14608,7 +15313,7 @@
14608	15313	//mode = ROTATE;
14609	15314	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15315	{
14611		- SetMouseMode(modifiers);
	15316	+ SetMouseMode(0, modifiers);
14612	15317	}
14613	15318	}
14614	15319
..	..	@@ -14742,8 +15447,9 @@
14742	15447
14743	15448	protected void processMouseMotionEvent(MouseEvent e)
14744	15449	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- 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)
14747	15453	{
14748	15454	mouseMoved(e);
14749	15455	} else
..	..	@@ -14768,11 +15474,12 @@
14768	15474	}
14769	15475	*/
14770	15476
14771		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
14772	15478	}
14773	15479
14774	15480	void SelectParent()
14775	15481	{
	15482	+ new Exception().printStackTrace();
14776	15483	System.exit(0);
14777	15484	Composite group = (Composite) object;
14778	15485	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14784,10 +15491,10 @@
14784	15491	{
14785	15492	//selectees.remove(i);
14786	15493	System.out.println("select parent of " + elem);
14787		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14788	15495	} else
14789	15496	{
14790		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14791	15498	}
14792	15499
14793	15500	first = false;
..	..	@@ -14796,6 +15503,7 @@
14796	15503
14797	15504	void SelectChildren()
14798	15505	{
	15506	+ new Exception().printStackTrace();
14799	15507	System.exit(0);
14800	15508	/*
14801	15509	Composite group = (Composite) object;
..	..	@@ -14828,12 +15536,12 @@
14828	15536	for (int j = 0; j < group.children.size(); j++)
14829	15537	{
14830	15538	elem = (Object3D) group.children.elementAt(j);
14831		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14832	15540	first = false;
14833	15541	}
14834	15542	} else
14835	15543	{
14836		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14837	15545	}
14838	15546
14839	15547	first = false;
..	..	@@ -14844,21 +15552,21 @@
14844	15552	{
14845	15553	//Composite group = (Composite) object;
14846	15554	Object3D group = object;
14847		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14848	15556	}
14849	15557
14850	15558	void ResetTransform(int mask)
14851	15559	{
14852	15560	//Composite group = (Composite) object;
14853	15561	Object3D group = object;
14854		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
14855	15563	}
14856	15564
14857	15565	void FlipTransform()
14858	15566	{
14859	15567	//Composite group = (Composite) object;
14860	15568	Object3D group = object;
14861		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
14862	15570	// group.editWindow.ReduceMesh(true);
14863	15571	}
14864	15572
..	..	@@ -14866,7 +15574,7 @@
14866	15574	{
14867	15575	//Composite group = (Composite) object;
14868	15576	Object3D group = object;
14869		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
14870	15578	// group.editWindow.ReduceMesh(true);
14871	15579	}
14872	15580
..	..	@@ -14874,7 +15582,7 @@
14874	15582	{
14875	15583	//Composite group = (Composite) object;
14876	15584	Object3D group = object;
14877		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
14878	15586	}
14879	15587
14880	15588	void IncDepth()
..	..	@@ -14960,7 +15668,9 @@
14960	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	15669	//Image img = CreateImage(width, height);
14962	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
14963	15672	Graphics gr = g; // img.getGraphics();
	15673	+
14964	15674	if (!hasMarquee)
14965	15675	{
14966	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -15048,6 +15758,7 @@
15048	15758	info.bounds.y += (height - desired) / 2;
15049	15759	}
15050	15760	}
	15761	+
15051	15762	info.g = gr;
15052	15763	info.camera = renderCamera;
15053	15764	/*
..	..	@@ -15057,15 +15768,55 @@
15057	15768	*/
15058	15769	if (!isRenderer)
15059	15770	{
15060		- 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	+ }
15061	15810	}
15062	15811	}
	15812	+
15063	15813	if (isRenderer)
15064	15814	{
15065	15815	//gr.setColor(Color.black);
15066	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	15818	}
	15819	+
15069	15820	if (hasMarquee)
15070	15821	{
15071	15822	gr.setXORMode(Color.white);
..	..	@@ -15178,6 +15929,7 @@
15178	15929	public boolean mouseDown(Event evt, int x, int y)
15179	15930	{
15180	15931	System.out.println("mouseDown: " + evt);
	15932	+ System.exit(0);
15181	15933	/*
15182	15934	locked = true;
15183	15935	drag = false;
..	..	@@ -15221,7 +15973,7 @@
15221	15973	{
15222	15974	keyPressed(0, modifiers);
15223	15975	}
15224		- clickStart(x, y, modifiers);
	15976	+ // clickStart(x, y, modifiers);
15225	15977	return true;
15226	15978	}
15227	15979
..	..	@@ -15339,7 +16091,7 @@
15339	16091	{
15340	16092	keyReleased(0, 0);
15341	16093	}
15342		- drag(x, y, modifiers);
	16094	+ drag(x, y, 0, modifiers);
15343	16095	return true;
15344	16096	}
15345	16097
..	..	@@ -15471,7 +16223,7 @@
15471	16223	Object3D object;
15472	16224	static Object3D trackedobject;
15473	16225	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16227	/static/ Camera eyeCamera;
15476	16228	/static/ Camera lightCamera;
15477	16229	int cameracount;
..	..	@@ -15756,16 +16508,16 @@
15756	16508	cStatic.objectstack[materialdepth++] = checker;
15757	16509	//System.out.println("material " + material);
15758	16510	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
15760	16512
15761	16513	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16515
15764	16516	materialdepth -= 1;
15765	16517	if (materialdepth > 0)
15766	16518	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- 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);
15769	16521	}
15770	16522	//checker.GetMaterial().opacity = 1f;
15771	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15851,6 +16603,14 @@
15851	16603	}
15852	16604	}
15853	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	+
15854	16614	class SelectBuffer implements GLEventListener
15855	16615	{
15856	16616
..	..	@@ -15909,6 +16669,7 @@
15909	16669	{
15910	16670	if (!selection)
15911	16671	{
	16672	+ new Exception().printStackTrace();
15912	16673	System.exit(0);
15913	16674	return;
15914	16675	}
..	..	@@ -15929,6 +16690,17 @@
15929	16690
15930	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15931	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	+
15932	16704	//int tmp = selection_view;
15933	16705	//selection_view = -1;
15934	16706	int temp = DrawMode();
..	..	@@ -15940,6 +16712,17 @@
15940	16712	// temp = DEFAULT; // patch for selection debug
15941	16713	Globals.drawMode = temp; // WARNING
15942	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	+
15943	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15944	16727
15945	16728	// trying different ways of getting the depth info over
..	..	@@ -15987,6 +16770,8 @@
15987	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15988	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
15990	16775
15991	16776	// Will fit the mesh !!!
15992	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16036,34 +16821,36 @@
16036	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]));
16037	16822	}
16038	16823
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16824	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	16825	}
16041	16826	}
16042	16827
16043	16828	if (!movingcamera && !PAINTMODE)
16044		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16045	16830
16046		- 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)
16047	16832	{
16048		- 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);
16049	16834
16050		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16051	16838
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();
	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	+ }
16067	16854	}
16068	16855	else
16069	16856	paintcount = 0;
..	..	@@ -16102,6 +16889,11 @@
16102	16889	//System.out.println("objects[color] = " + objects[color]);
16103	16890	//objects[color].Select();
16104	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
16105	16897	object.Select(color, deselect);
16106	16898	}
16107	16899
..	..	@@ -16201,7 +16993,7 @@
16201	16993	gl.glDisable(gl.GL_CULL_FACE);
16202	16994	}
16203	16995
16204		- if (!RENDERSHADOW)
	16996	+ if (!Globals.RENDERSHADOW)
16205	16997	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	16998
16207	16999	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +17003,7 @@
16211	17003	//gl.glColorMask(false, false, false, false);
16212	17004
16213	17005	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17006	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	17007	{
16216	17008	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	17009
..	..	@@ -16627,23 +17419,15 @@
16627	17419	int AAbuffersize = 0;
16628	17420
16629	17421	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
16631	17423	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();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
16636	17428
16637	17429	static Sphere debugpoints[] = new Sphere[8];
16638	17430
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17431	static void InitPoints(float radius)
16648	17432	{
16649	17433	for (int i=0; i<8; i++)
..	..	@@ -16695,10 +17479,11 @@
16695	17479	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17480	// Depth buffer format
16697	17481	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17482	+
	17483	+ public void NextIndex()
16699	17484	{
16700	17485	indexcount+=16;
16701		- 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);
16702	17487	//objects[indexcount] = o;
16703	17488	//System.out.println("indexcount = " + indexcount);
16704	17489	}