~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -56,14 +55,12 @@
56	55	static int CURRENTANTIALIAS = 0; // 1;
57	56	/static/ boolean RENDERSHADOW = true;
58	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	58
62	59	boolean DISPLAYTEXT = false;
63	60	//boolean REDUCETEXTURE = true;
64	61	boolean CACHETEXTURE = true;
65	62	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
67	64	boolean COMPRESSTEXTURE = false;
68	65	boolean KOMPACTTEXTURE = false; // true;
69	66	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +89,8 @@
92	89
93	90	static int tickcount = 0; // slow pose issue
94	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
95	94	static boolean BOXMODE = false;
96	95	static boolean IMAGEFLIP = false;
97	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -150,12 +149,12 @@
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
152	151
153		- static CameraPane theRenderer;
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	153
155	154	void SetAsGLRenderer(boolean b)
156	155	{
157	156	isRenderer = b;
158		- theRenderer = this;
	157	+ Globals.theRenderer = this;
159	158	}
160	159
161	160	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -193,9 +192,43 @@
193	192
194	193	/// INTERFACE
195	194
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
196	224	public boolean IsBoxMode()
197	225	{
198	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
199	232	}
200	233
201	234	public void ClearDepth()
..	..	@@ -293,7 +326,7 @@
293	326	cStatic.objectstack[materialdepth++] = obj;
294	327	//System.out.println("material " + material);
295	328	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
297	330	if (obj instanceof Camera)
298	331	{
299	332	display.options1[0] = material.shift;
..	..	@@ -302,14 +335,28 @@
302	335	display.options1[2] = material.shadowbias;
303	336	display.options1[3] = material.aniso;
304	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
305	343	display.options2[0] = material.opacity;
306	344	display.options2[1] = material.diffuse;
307	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
308	349
309	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
310	354	display.options4[0] = material.cameralight/0.2f;
311	355	display.options4[1] = material.subsurface;
312	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
313	360
314	361	// if (display.CURRENTANTIALIAS > 0)
315	362	// display.options3[3] /= 4;
..	..	@@ -325,7 +372,7 @@
325	372	/**/
326	373	} else
327	374	{
328		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
329	376	}
330	377	} else
331	378	{
..	..	@@ -349,8 +396,8 @@
349	396	cStatic.objectstack[materialdepth++] = obj;
350	397	//System.out.println("material " + material);
351	398	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	401	}
355	402	}
356	403
..	..	@@ -367,8 +414,8 @@
367	414	materialdepth -= 1;
368	415	if (materialdepth > 0)
369	416	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	419	}
373	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +435,8 @@
388	435	materialdepth -= 1;
389	436	if (materialdepth > 0)
390	437	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	440	}
394	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	442	//else
..	..	@@ -430,10 +477,12 @@
430	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	478	{
432	479	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
434	483	if (!hasnorm)
435	484	{
436		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
437	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +865,7 @@
816	865
817	866	if ((i % 100) == 0 && i != 0)
818	867	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	869	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	870	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	871	}
..	..	@@ -848,7 +897,7 @@
848	897
849	898	if ((i % 100) == 0 && i != 0)
850	899	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	901	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	902	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	903	}
..	..	@@ -1061,7 +1110,342 @@
1061	1110	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1111	}
1063	1112
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
1064	1421	/// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
1065	1449
1066	1450	void SetColor(Object3D obj, Vertex p0)
1067	1451	{
..	..	@@ -1240,7 +1624,7 @@
1240	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1625	}
1242	1626
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1628	{
1245	1629	CameraPane display = this;
1246	1630	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1640,18 @@
1256	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1641	if (!material.multiply)
1258	1642	{
1259		- display.color = color;
	1643	+ display.color = material.color;
1260	1644	display.saturation = material.modulation;
1261	1645	}
1262	1646	else
1263	1647	{
1264		- display.color = color2;
	1648	+ display.color = material.color2;
1265	1649	display.saturation = material.modulation2;
1266	1650	}
1267	1651
1268	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1653
1270		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1271	1655
1272	1656	/**/
1273	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1659,7 @@
1275	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1279	1663
1280	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1767,9 @@
1383	1767	display.modelParams7[2] = 0;
1384	1768	display.modelParams7[3] = 0;
1385	1769
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1771
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1774	{
1391	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1911,7 @@
1527	1911	void PushMatrix(double[][] matrix)
1528	1912	{
1529	1913	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1531	1915	}
1532	1916
1533	1917	void PushMatrix()
..	..	@@ -1624,7 +2008,7 @@
1624	2008
1625	2009	static int camerachangeframe;
1626	2010
1627		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
1628	2012	{
1629	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2014	// return false;
..	..	@@ -1681,7 +2065,7 @@
1681	2065	//System.err.println("Oeil on");
1682	2066	OEIL = true;
1683	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2069	//pingthread.StepToTarget(true);
1686	2070	}
1687	2071
..	..	@@ -1752,33 +2136,6 @@
1752	2136	mainDL ^= true;
1753	2137	}
1754	2138
1755		- void ToggleTexture()
1756		- {
1757		- textureon ^= true;
1758		- }
1759		-
1760		- void ToggleLive()
1761		- {
1762		- Globals.setLIVE(Globals.isLIVE() ^ true);
1763		-
1764		- System.err.println("LIVE = " + Globals.isLIVE());
1765		-
1766		- if (!Globals.isLIVE()) // save sound
1767		- GrafreeD.savesound = true; // wav.save();
1768		- // else
1769		- repaint(); // start loop // may 2013
1770		- }
1771		-
1772		- void ToggleSupport()
1773		- {
1774		- SUPPORT ^= true;
1775		- }
1776		-
1777		- void ToggleAbort()
1778		- {
1779		- ABORTMODE ^= true;
1780		- }
1781		-
1782	2139	void ToggleFullScreen()
1783	2140	{
1784	2141	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2146,94 @@
1789	2146	Globals.CROWD ^= true;
1790	2147	}
1791	2148
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2149	void ToggleLocal()
1798	2150	{
1799	2151	LOCALTRANSFORM ^= true;
1800	2152	}
1801	2153
1802		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
1803	2187	{
1804	2188	FAST ^= true;
1805	2189	}
1806	2190
1807		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
1808	2192	{
1809	2193	SLOWPOSE ^= true;
1810	2194	}
1811	2195
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
1818	2197	{
1819	2198	BOXMODE ^= true;
1820	2199	}
1821	2200
1822		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
1823	2207	{
1824	2208	SMOOTHFOCUS ^= true;
1825	2209	}
1826	2210
1827		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
1828	2212	{
1829	2213	IMAGEFLIP ^= true;
1830	2214	}
1831	2215
1832		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
1833	2217	{
1834	2218	SPEAKERMOCAP ^= true;
1835	2219	}
1836	2220
1837		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
1838	2222	{
1839	2223	SPEAKERCAMERA ^= true;
1840	2224	}
1841	2225
1842		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
1843	2227	{
1844	2228	SPEAKERFOCUS ^= true;
1845	2229	}
1846	2230
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
1853	2232	{
1854	2233	FRUSTUM ^= true;
1855	2234	}
1856	2235
1857		- void ToggleTrack()
	2236	+ public void ToggleTrack()
1858	2237	{
1859	2238	TRACK ^= true;
1860	2239	if (TRACK)
..	..	@@ -1873,25 +2252,35 @@
1873	2252	repaint();
1874	2253	}
1875	2254
1876		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
1877	2256	{
1878	2257	TRACKONCE ^= true;
1879	2258	}
1880	2259
1881		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
1882	2261	{
1883	2262	SHADOWTRACK ^= true;
1884	2263	repaint();
1885	2264	}
1886	2265
1887		- void ToggleOeil()
	2266	+ public void ToggleOeil()
1888	2267	{
1889	2268	OEIL ^= true;
1890	2269	}
1891	2270
1892		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
1893	2272	{
1894	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
1895	2284	}
1896	2285
1897	2286	void ToggleLookAt()
..	..	@@ -1899,9 +2288,9 @@
1899	2288	LOOKAT ^= true;
1900	2289	}
1901	2290
1902		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1903	2292	{
1904		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1905	2294	}
1906	2295
1907	2296	void ToggleHandles()
..	..	@@ -1909,10 +2298,17 @@
1909	2298	HANDLES ^= true;
1910	2299	}
1911	2300
	2301	+ Object3D paintFolder;
	2302	+
1912	2303	void TogglePaint()
1913	2304	{
1914	2305	PAINTMODE ^= true;
1915	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
1916	2312	}
1917	2313
1918	2314	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2404,46 @@
2008	2404	{
2009	2405	return currentGL;
2010	2406	}
2011		-
	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	+
2012	2447	/**/
2013	2448	class CacheTexture
2014	2449	{
..	..	@@ -2026,9 +2461,10 @@
2026	2461	/**/
2027	2462
2028	2463	// TEXTURE static Texture texture;
2029		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2030		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2031		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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	+
2032	2468	int pigmentdepth = 0;
2033	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2470	int bumpdepth = 0;
..	..	@@ -2050,6 +2486,33 @@
2050	2486	true,
2051	2487	com.sun.opengl.util.texture.TextureIO.PNG);
2052	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)
2053	2516	{
2054	2517	throw new javax.media.opengl.GLException(e);
2055	2518	}
..	..	@@ -3136,6 +3599,8 @@
3136	3599
3137	3600	System.out.println("LOADING TEXTURE : " + name);
3138	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
3139	3604	//
3140	3605	if (false) // compressbit > 0)
3141	3606	{
..	..	@@ -3840,6 +4305,7 @@
3840	4305
3841	4306	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4307	{
	4308	+ new Exception().printStackTrace();
3843	4309	System.exit(0);
3844	4310	com.sun.opengl.util.texture.Texture texture = null;
3845	4311
..	..	@@ -7533,7 +7999,7 @@
7533	7999	String pigment = Object3D.GetPigment(tex);
7534	8000	String bump = Object3D.GetBump(tex);
7535	8001
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	8003	{
7538	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7550,6 +8016,64 @@
7550	8016
7551	8017	ReleaseTexture(bump, true);
7552	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);
7553	8077	}
7554	8078
7555	8079	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7655,7 +8179,55 @@
7655	8179	}
7656	8180	}
7657	8181
7658		- /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
7659	8231	{
7660	8232	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8233	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7665,18 +8237,48 @@
7665	8237
7666	8238	if (tex == null)
7667	8239	{
7668		- BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
	8240	+ BindTexture(null, null,false,resolution);
7670	8241	return;
7671	8242	}
7672	8243
7673	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	+
7674	8277	String bump = Object3D.GetBump(tex);
7675	8278
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
7678	8280
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8282	{
7681	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8284	// System.out.println("; bump = " + bump);
..	..	@@ -7686,42 +8288,70 @@
7686	8288	{
7687	8289	bump = null;
7688	8290	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8291
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
7698	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8295	}
7702	8296
7703		- 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)
7704	8300	{
7705		- 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;
7706	8320
7707	8321	if (tex != null)
7708	8322	{
7709	8323	String texname = tex;
7710	8324
7711		- String[] split = tex.split("Textures");
7712		- if (split.length > 1)
7713		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7714		- else
7715		- if (!texname.startsWith("/"))
7716		- texname = "/Users/nbriere/Textures/" + texname;
	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	+ }
7717	8337
7718	8338	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	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
7725	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8356	{
7727	8357	assert(!bump);
..	..	@@ -7733,19 +8363,23 @@
7733	8363	// }
7734	8364	// else
7735	8365	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
7738	8368	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
7741	8373	// }
7742	8374	} else
7743	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8376	{
7745	8377	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- 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();
7749	8383	} else
7750	8384	{
7751	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -7755,9 +8389,11 @@
7755	8389	//{
7756	8390	if (tex.equals("WHITE_NOISE"))
7757	8391	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- 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();
7761	8397	} else
7762	8398	{
7763	8399	if (textureon)
..	..	@@ -7782,7 +8418,7 @@
7782	8418	}
7783	8419
7784	8420	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8421	+ if (!FileExists(cachename))
7786	8422	cachename = texname;
7787	8423	else
7788	8424	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8440,7 @@
7804	8440	}
7805	8441
7806	8442	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8443	+ if (!FileExists(cachename))
7808	8444	cachename = texname;
7809	8445	else
7810	8446	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8449,23 @@
7813	8449	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8450
7815	8451
7816		- if (texturedata != null)
7817		- 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);
7818	8456	//texture = GetTexture(tex, bump);
7819	8457	}
7820	8458	}
7821	8459	//}
7822	8460	}
7823	8461
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
7825	8463	{
7826	8464	//return false;
	8465	+ assert(bim == null);
7827	8466
7828	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8469	{
7831	8470	// String ext = "_highres";
7832	8471	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8482,17 @@
7843	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8483	if (!cachefile.exists())
7845	8484	{
7846		- // cache to disk
7847		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7848		- //buffers[0].
7849		-
7850		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7851		- int[] pixels = new int[bytebuf.capacity()/3];
7852		-
7853		- // squared size heuristic...
7854		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8486	{
7856		- for (int i=pixels.length; --i>=0;)
7857		- {
7858		- int i3 = i*3;
7859		- pixels[i] = 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7864		- pixels[i] <<= 8;
7865		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7866		- }
7867		-
7868		- /*
7869		- int r=0,g=0,b=0,a=0;
7870		- for (int i=0; i<width; i++)
7871		- for (int j=0; j<height; j++)
7872		- {
7873		- int index = j*width+i;
7874		- int p = pixels[index];
7875		- a = ((p>>24) & 0xFF);
7876		- r = ((p>>16) & 0xFF);
7877		- g = ((p>>8) & 0xFF);
7878		- b = (p & 0xFF);
7879		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7880		- }
7881		- /**/
7882		- int width = (int)Math.sqrt(pixels.length); // squared
7883		- int height = width;
7884		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7885		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
7886	8489	ImageWriter writer = null;
7887	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8491	if (iter.hasNext()) {
7889	8492	writer = (ImageWriter)iter.next();
7890	8493	}
7891		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
7892	8496	try
7893	8497	{
7894	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7915,8 +8519,8 @@
7915	8519	textures.remove(texname);
7916	8520	}
7917	8521
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
7920	8524
7921	8525	// newtex = true;
7922	8526	}
..	..	@@ -7932,12 +8536,17 @@
7932	8536	}
7933	8537	}
7934	8538
7935		- return texture;
	8539	+ return texturecache;
7936	8540	}
7937	8541
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8542	+ static void EmbedTextures(cTexture tex)
7939	8543	{
7940		- 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);
7941	8550
7942	8551	if (bump)
7943	8552	{
..	..	@@ -7953,23 +8562,23 @@
7953	8562	return texture!=null?texture.texture:null;
7954	8563	}
7955	8564
7956		- 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
7957	8566	{
7958		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7959	8568
7960	8569	return texture!=null?texture.texturedata:null;
7961	8570	}
7962	8571
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7964	8573	{
7965	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8575	{
7967	8576	return false;
7968	8577	}
7969	8578
7970		- boolean newtex = false;
	8579	+ //boolean newtex = false;
7971	8580
7972		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
7973	8582
7974	8583	if (texture == null)
7975	8584	return false;
..	..	@@ -7999,7 +8608,7 @@
7999	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8610
8002		- return newtex;
	8611	+ return true; // Warning: not used.
8003	8612	}
8004	8613
8005	8614	ShadowBuffer shadowPBuf;
..	..	@@ -8837,11 +9446,35 @@
8837	9446	jy8[3] = 0.5f;
8838	9447	}
8839	9448
8840		- 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
8841	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9451	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9452	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	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	+
8845	9478	static int imagecount = 0; // movie generation
8846	9479
8847	9480	static int jitter = 0;
..	..	@@ -8937,8 +9570,8 @@
8937	9570	assert (parentcam != renderCamera);
8938	9571
8939	9572	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942	9575
8943	9576	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9577
..	..	@@ -8953,8 +9586,8 @@
8953	9586	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9587
8955	9588	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9589	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9590	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958	9591
8959	9592	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9593
..	..	@@ -9026,7 +9659,7 @@
9026	9659	//gl.glFlush();
9027	9660	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9661
9029		- if (ANIMATION && ABORTED)
	9662	+ if (Globals.ANIMATION && ABORTED)
9030	9663	{
9031	9664	System.err.println(" ABORTED FRAME");
9032	9665	break;
..	..	@@ -9056,7 +9689,7 @@
9056	9689	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9690
9058	9691	// save image
9059		- if (ANIMATION && !ABORTED)
	9692	+ if (Globals.ANIMATION && !ABORTED)
9060	9693	{
9061	9694	VPwidth = viewport[2];
9062	9695	VPheight = viewport[3];
..	..	@@ -9167,11 +9800,11 @@
9167	9800
9168	9801	// imagecount++;
9169	9802
9170		- 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;
9171	9804
9172	9805	if (!BOXMODE)
9173	9806	{
9174		- 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) + ")");
9175	9808	}
9176	9809
9177	9810	if (!BOXMODE)
..	..	@@ -9209,7 +9842,7 @@
9209	9842	ABORTED = false;
9210	9843	}
9211	9844	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9845	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	9846
9214	9847	if (false)
9215	9848	{
..	..	@@ -9872,11 +10505,11 @@
9872	10505
9873	10506	public void display(GLAutoDrawable drawable)
9874	10507	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10508	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10509	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10510	+ Grafreed.wav.save();
	10511	+ Grafreed.savesound = false;
	10512	+ Grafreed.hassound = false;
9880	10513	}
9881	10514	// if (DEBUG_SELECTION)
9882	10515	// {
..	..	@@ -9952,6 +10585,7 @@
9952	10585	ANTIALIAS = 0;
9953	10586	//System.out.println("RESTART");
9954	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
9955	10589	}
9956	10590	}
9957	10591	}
..	..	@@ -10006,7 +10640,7 @@
10006	10640	Object3D theobject = object;
10007	10641	Object3D theparent = object.parent;
10008	10642	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10643	+ object = (Object3D)Grafreed.clone(object);
10010	10644	object.Stripify();
10011	10645	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10646	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10653,14 @@
10019	10653	ambientOcclusion = false;
10020	10654	}
10021	10655
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10658	{
10024	10659	//if (RENDERSHADOW) // ?
10025	10660	if (!IsFrozen())
10026	10661	{
10027	10662	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10663	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10664	{
10030	10665	Globals.framecount++;
10031	10666	shadowbuffer.display();
..	..	@@ -10152,8 +10787,8 @@
10152	10787
10153	10788	// if (parentcam != renderCamera) // not a light
10154	10789	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10790	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10791	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157	10792
10158	10793	for (int j = 0; j < 4; j++)
10159	10794	{
..	..	@@ -10167,8 +10802,8 @@
10167	10802
10168	10803	// if (parentcam != renderCamera) // not a light
10169	10804	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10805	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10806	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172	10807
10173	10808	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10809
..	..	@@ -10427,7 +11062,16 @@
10427	11062	// Bump noise
10428	11063	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11064	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- 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	+
10431	11075
10432	11076	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11077	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11094,9 @@
10450	11094
10451	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11096
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//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);
10456	11100	} else
10457	11101	{
10458	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11107,7 @@
10463	11107	//System.out.println("BLENDING ON");
10464	11108	gl.glEnable(GL.GL_BLEND);
10465	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11111	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11112	gl.glLoadIdentity();
10469	11113
..	..	@@ -10552,8 +11196,8 @@
10552	11196	System.err.println("parentcam != renderCamera");
10553	11197
10554	11198	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- 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
10557	11201	}
10558	11202
10559	11203	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11218,8 @@
10574	11218	if (true) // TODO
10575	11219	{
10576	11220	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- 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
10579	11223	}
10580	11224
10581	11225	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10891,8 +11535,14 @@
10891	11535	{
10892	11536	renderpass++;
10893	11537	// System.out.println("Draw object... ");
	11538	+ STEP = 1;
10894	11539	if (FAST) // in case there is no script
10895		- STEP = 16;
	11540	+ STEP = 8;
	11541	+
	11542	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11543	+ {
	11544	+ STEP *= 4;
	11545	+ }
10896	11546
10897	11547	//object.FullInvariants();
10898	11548
..	..	@@ -10906,23 +11556,44 @@
10906	11556	e.printStackTrace();
10907	11557	}
10908	11558
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11559	+ if (Grafreed.RENDERME > 0)
	11560	+ Grafreed.RENDERME--; // mechante magouille
10911	11561
10912	11562	Globals.ONESTEP = false;
10913	11563	}
10914	11564
10915	11565	static boolean zoomonce = false;
10916	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	+
10917	11585	void DrawObject(GL gl, boolean draw)
10918	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
10919	11590	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11591	// DrawMode() = SELECTION;
10921	11592	//GL gl = getGL();
10922	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11594	{
10924	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11597	pingthread.StepToTarget(true); // true);
10927	11598	// zoomonce = false;
10928	11599	}
..	..	@@ -10977,7 +11648,14 @@
10977	11648
10978	11649	usedtextures.clear();
10979	11650
10980		- 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	+ }
10981	11659	}
10982	11660	//System.out.println("--> " + stackdepth);
10983	11661	// GrafreeD.traceon();
..	..	@@ -10987,8 +11665,9 @@
10987	11665
10988	11666	if (DrawMode() == DEFAULT)
10989	11667	{
10990		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
10991	11669	{
	11670	+ CreateSelectedPoint();
10992	11671	float radius = 0.05f;
10993	11672	if (selectedpoint.radius != radius)
10994	11673	{
..	..	@@ -11051,7 +11730,7 @@
11051	11730	if (tex.equals("WHITE_NOISE"))
11052	11731	continue;
11053	11732
11054		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
11055	11734	{
11056	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057	11736	textures.get(tex).texture.dispose();
..	..	@@ -11068,7 +11747,14 @@
11068	11747	if (checker != null && DrawMode() == DEFAULT)
11069	11748	{
11070	11749	//BindTexture(IMMORTAL_TEXTURE);
11071		- 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	+ }
11072	11758	// NEAREST
11073	11759	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11760	DrawChecker(gl);
..	..	@@ -11150,7 +11836,7 @@
11150	11836	return;
11151	11837	}
11152	11838
11153		- String string = obj.GetToolTip();
	11839	+ String string = obj.toString(); //.GetToolTip();
11154	11840
11155	11841	GL gl = GetGL();
11156	11842
..	..	@@ -11467,8 +12153,8 @@
11467	12153	//obj.TransformToWorld(light, light);
11468	12154	for (int i = tp.size(); --i >= 0;)
11469	12155	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- 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);
11472	12158	}
11473	12159
11474	12160
..	..	@@ -11485,8 +12171,8 @@
11485	12171	parentcam = cameras[0];
11486	12172	}
11487	12173
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- 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
11490	12176
11491	12177	LA.xformPos(light, renderCamera.toScreen, light);
11492	12178
..	..	@@ -12100,8 +12786,8 @@
12100	12786
12101	12787	// display shadow only (bump == 0)
12102	12788	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	12789	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12790	+ "SLT temp.z, temp.y, -one2048th.x;" +
12105	12791	"SUB temp.y, one.x, temp.z;" +
12106	12792	"MUL temp.x, temp.x, temp.y;" +
12107	12793	"KIL temp.x;" +
..	..	@@ -12230,8 +12916,10 @@
12230	12916	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	12917
12232	12918	"SUB temp.x, one.x, ndotl.x;" +
12233		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12234		- "ADD temp.y, one.y, options2.y;" + // sursurface
	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
12235	12923	"MUL temp.x, temp.x, temp.y;" +
12236	12924
12237	12925	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13118,7 @@
12430	13118	//once = true;
12431	13119	}
12432	13120
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13121	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13122	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13123	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13124
..	..	@@ -12563,12 +13251,16 @@
12563	13251
12564	13252	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13253	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13254	+
	13255	+ // Compare fragment depth in light space with shadowmap.
12566	13256	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13257	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13258	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13259	+
	13260	+ // Reverse comparison
12569	13261	"SUB temp.x, one.x, temp.x;" +
12570	13262	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13263	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13264	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13265
12574	13266	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13274,10 @@
12582	13274	// No shadow for backface
12583	13275	"DP3 temp.x, normal, lightd;" +
12584	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;" +
12585	13281	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13282	"";
12587	13283	}
..	..	@@ -12728,7 +13424,8 @@
12728	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
12732	13429
12733	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13431	// OUT : diff, spec
..	..	@@ -12744,9 +13441,10 @@
12744	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13443	//"MOV " + dest + ".w," + "normal.z;" +
12747		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12748		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12749		- //"MOV " + dest + ".z," + "params2.w;" +
	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
12750	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13449	"RCP " + dest + ".w," + dest + ".w;" +
12752	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +13838,7 @@
13140	13838	public void mousePressed(MouseEvent e)
13141	13839	{
13142	13840	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13841	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	13842	}
13145	13843
13146	13844	static long prevtime = 0;
..	..	@@ -13167,6 +13865,7 @@
13167	13865
13168	13866	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	13867
	13868	+ if (BUTTONLESSWHEEL)
13170	13869	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	13870	{
13172	13871	return;
..	..	@@ -13175,7 +13874,7 @@
13175	13874	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	13875
13177	13876	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13877	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	13878	{
13180	13879	keepboxmode = BOXMODE;
13181	13880	keepsupport = SUPPORT;
..	..	@@ -13215,8 +13914,8 @@
13215	13914	// mode \|= META;
13216	13915	//}
13217	13916
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13917	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13918	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	13919	anchorX = ax;
13221	13920	anchorY = ay;
13222	13921	prevX = px;
..	..	@@ -13250,6 +13949,7 @@
13250	13949	else
13251	13950	if (evt.getSource() == AAtimer)
13252	13951	{
	13952	+ Globals.TIMERRUNNING = false;
13253	13953	if (mouseDown)
13254	13954	{
13255	13955	//new Exception().printStackTrace();
..	..	@@ -13275,6 +13975,10 @@
13275	13975	// LIVE = waslive;
13276	13976	// wasliveok = true;
13277	13977	// waslive = false;
	13978	+
	13979	+ // May 2019 Forget it:
	13980	+ if (true)
	13981	+ return;
13278	13982
13279	13983	// source == timer
13280	13984	if (mouseDown)
..	..	@@ -13305,7 +14009,7 @@
13305	14009
13306	14010	// fev 2014???
13307	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14013	pingthread.StepToTarget(true); // true);
13310	14014	}
13311	14015	// if (!LIVE)
..	..	@@ -13314,12 +14018,13 @@
13314	14018
13315	14019	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14020
13317		- void clickStart(int x, int y, int modifiers)
	14021	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14022	{
13319	14023	if (!wasliveok)
13320	14024	return;
13321	14025
13322	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
13323	14028
13324	14029	// waslive = LIVE;
13325	14030	// LIVE = false;
..	..	@@ -13331,7 +14036,7 @@
13331	14036	// touched = true; // main DL
13332	14037	if (isRenderer)
13333	14038	{
13334		- SetMouseMode(modifiers);
	14039	+ SetMouseMode(modifiers, modifiersex);
13335	14040	}
13336	14041
13337	14042	selectX = anchorX = x;
..	..	@@ -13344,7 +14049,7 @@
13344	14049	clicked = true;
13345	14050	hold = false;
13346	14051
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14052	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14053	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14054	{
13350	14055	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13375,7 +14080,7 @@
13375	14080	info.camera = renderCamera;
13376	14081	info.x = x;
13377	14082	info.y = y;
13378		- info.modifiers = modifiers;
	14083	+ info.modifiers = modifiersex;
13379	14084	editObj = object.doEditClick(info, 0);
13380	14085	if (!editObj)
13381	14086	{
..	..	@@ -13392,11 +14097,14 @@
13392	14097
13393	14098	public void mouseDragged(MouseEvent e)
13394	14099	{
	14100	+ Globals.MOUSEDRAGGED = true;
	14101	+
	14102	+ //System.out.println("mouseDragged: " + e);
13395	14103	if (isRenderer)
13396	14104	movingcamera = true;
	14105	+
13397	14106	//if (drawing)
13398	14107	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14108	if ((e.getModifiersEx() & CTRL) != 0
13401	14109	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14110	{
..	..	@@ -13404,7 +14112,7 @@
13404	14112	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14113	}
13406	14114	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14115	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14116
13409	14117	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14118	}
..	..	@@ -13577,6 +14285,7 @@
13577	14285
13578	14286	public void run()
13579	14287	{
	14288	+ new Exception().printStackTrace();
13580	14289	System.exit(0);
13581	14290	for (;;)
13582	14291	{
..	..	@@ -13640,7 +14349,7 @@
13640	14349	{
13641	14350	Globals.lighttouched = true;
13642	14351	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14352	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14353	}
13645	14354	//else
13646	14355	}
..	..	@@ -13654,12 +14363,12 @@
13654	14363	void GoDown(int mod)
13655	14364	{
13656	14365	MODIFIERS \|= COMMAND;
13657		- /*
	14366	+ /**/
13658	14367	if((mod&SHIFT) == SHIFT)
13659	14368	manipCamera.RotatePosition(0, -speed);
13660	14369	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
13663	14372	if ((mod & SHIFT) == SHIFT)
13664	14373	{
13665	14374	mouseMode = mouseMode; // VR??
..	..	@@ -13675,12 +14384,12 @@
13675	14384	void GoUp(int mod)
13676	14385	{
13677	14386	MODIFIERS \|= COMMAND;
13678		- /*
	14387	+ /**/
13679	14388	if((mod&SHIFT) == SHIFT)
13680	14389	manipCamera.RotatePosition(0, speed);
13681	14390	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
13684	14393	if ((mod & SHIFT) == SHIFT)
13685	14394	{
13686	14395	mouseMode = mouseMode;
..	..	@@ -13696,12 +14405,12 @@
13696	14405	void GoLeft(int mod)
13697	14406	{
13698	14407	MODIFIERS \|= COMMAND;
13699		- /*
	14408	+ /**/
13700	14409	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
13702		- else
13703	14410	manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
13705	14414	if ((mod & SHIFT) == SHIFT)
13706	14415	{
13707	14416	mouseMode = mouseMode;
..	..	@@ -13717,12 +14426,12 @@
13717	14426	void GoRight(int mod)
13718	14427	{
13719	14428	MODIFIERS \|= COMMAND;
13720		- /*
	14429	+ /**/
13721	14430	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
13723		- else
13724	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
13726	14435	if ((mod & SHIFT) == SHIFT)
13727	14436	{
13728	14437	mouseMode = mouseMode;
..	..	@@ -13740,7 +14449,7 @@
13740	14449	int X, Y;
13741	14450	boolean SX, SY;
13742	14451
13743		- void drag(int x, int y, int modifiers)
	14452	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14453	{
13745	14454	if (IsFrozen())
13746	14455	{
..	..	@@ -13749,17 +14458,17 @@
13749	14458
13750	14459	drag = true; // NEW
13751	14460
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14461	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14462
13754	14463	X = x;
13755	14464	Y = y;
13756	14465	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14466	+ MODIFIERS = modifiersex;
	14467	+ modifiersex &= ~1024;
13759	14468	if (false) // modifiers != 0)
13760	14469	{
13761	14470	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14471	+ System.out.println("mouseDragged: " + modifiersex);
13763	14472	System.out.println("SHIFT = " + SHIFT);
13764	14473	System.out.println("CONTROL = " + COMMAND);
13765	14474	System.out.println("META = " + META);
..	..	@@ -13779,7 +14488,8 @@
13779	14488	info.camera = renderCamera;
13780	14489	info.x = x;
13781	14490	info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14493	} else
13784	14494	{
13785	14495	if (x < startX)
..	..	@@ -13931,7 +14641,6 @@
13931	14641	public void mouseMoved(MouseEvent e)
13932	14642	{
13933	14643	//System.out.println("mouseMoved: " + e);
13934		-
13935	14644	if (isRenderer)
13936	14645	return;
13937	14646
..	..	@@ -13944,7 +14653,9 @@
13944	14653	ci.camera = renderCamera;
13945	14654	if (!isRenderer)
13946	14655	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
13948	14659	{
13949	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14661	} else
..	..	@@ -13956,7 +14667,11 @@
13956	14667
13957	14668	public void mouseReleased(MouseEvent e)
13958	14669	{
	14670	+ Globals.MOUSEDRAGGED = false;
	14671	+
13959	14672	movingcamera = false;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
13960	14675	//System.out.println("mouseReleased: " + e);
13961	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14677	}
..	..	@@ -13979,9 +14694,9 @@
13979	14694	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14695	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14696
13982		- if (control \|\| command \|\| IsFrozen())
	14697	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14698	timeout = true;
13984		- else
	14699	+// ?? May 2019 else
13985	14700	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14701	mouseDown = false;
13987	14702	if (!control && !command) // june 2013
..	..	@@ -14091,7 +14806,7 @@
14091	14806	System.out.println("keyReleased: " + e);
14092	14807	}
14093	14808
14094		- void SetMouseMode(int modifiers)
	14809	+ void SetMouseMode(int modifiers, int modifiersex)
14095	14810	{
14096	14811	//System.out.println("SetMouseMode = " + modifiers);
14097	14812	//modifiers &= ~1024;
..	..	@@ -14103,25 +14818,25 @@
14103	14818	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	14819	// return;
14105	14820	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	14821	+ if ((modifiersex & WHEEL) == WHEEL)
14107	14822	{
14108	14823	mouseMode \|= ZOOM;
14109	14824	}
14110	14825
14111	14826	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	14827	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	14828	{
14114	14829	mouseMode \|= VR; // BACKFORTH;
14115	14830	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14831	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	14832	{
14118	14833	mouseMode \|= SELECT;
14119	14834	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	14835	+ if ((modifiersex & COMMAND) == COMMAND)
14121	14836	{
14122	14837	mouseMode \|= SELECT;
14123	14838	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14839	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	14840	{
14126	14841	mouseMode &= ~VR;
14127	14842	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +14865,10 @@
14150	14865
14151	14866	if (isRenderer) //
14152	14867	{
14153		- SetMouseMode(modifiers);
	14868	+ SetMouseMode(0, modifiers);
14154	14869	}
14155	14870
14156		- theRenderer.keyPressed(key);
	14871	+ Globals.theRenderer.keyPressed(key);
14157	14872	}
14158	14873
14159	14874	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +14880,7 @@
14165	14880	float SATPOW = 1; // 2; // 0.5f;
14166	14881	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	14882
14168		- void keyPressed(int key)
	14883	+ public void keyPressed(int key)
14169	14884	{
14170	14885	if (key >= '0' && key <= '5')
14171	14886	clampbit = (key-'0');
..	..	@@ -14297,7 +15012,9 @@
14297	15012	case 'E' : COMPACT ^= true;
14298	15013	repaint();
14299	15014	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15018	repaint();
14302	15019	break;
14303	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15039,8 @@
14322	15039	RevertCamera();
14323	15040	repaint();
14324	15041	break;
14325		- case 'L':
14326	15042	case 'l':
	15043	+ //case 'L':
14327	15044	if (lightMode)
14328	15045	{
14329	15046	lightMode = false;
..	..	@@ -14466,9 +15183,9 @@
14466	15183	case '_':
14467	15184	kompactbit = 5;
14468	15185	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
14472	15189	case ' ':
14473	15190	lightMode ^= true;
14474	15191	Globals.lighttouched = true;
..	..	@@ -14480,13 +15197,14 @@
14480	15197	case ESC:
14481	15198	RENDERPROGRAM += 1;
14482	15199	RENDERPROGRAM %= 3;
	15200	+
14483	15201	repaint();
14484	15202	break;
14485	15203	case 'Z':
14486	15204	//RESIZETEXTURE ^= true;
14487	15205	//break;
14488	15206	case 'z':
14489		- RENDERSHADOW ^= true;
	15207	+ Globals.RENDERSHADOW ^= true;
14490	15208	Globals.lighttouched = true;
14491	15209	repaint();
14492	15210	break;
..	..	@@ -14519,8 +15237,9 @@
14519	15237	case DELETE:
14520	15238	ClearSelection();
14521	15239	break;
14522		- /*
14523	15240	case '+':
	15241	+
	15242	+ /*
14524	15243	//fontsize += 1;
14525	15244	bbzoom *= 2;
14526	15245	repaint();
..	..	@@ -14537,17 +15256,17 @@
14537	15256	case '=':
14538	15257	IncDepth();
14539	15258	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
14541	15260	maskbit = 6;
14542	15261	break;
14543	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15263	DecDepth();
14545	15264	maskbit = 5;
14546	15265	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
14551	15270	break;
14552	15271	case '{':
14553	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15321,7 @@
14602	15321	}
14603	15322	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15323	}
	15324	+
14605	15325	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15326
14607	15327	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15329,11 @@
14609	15329	//mode = ROTATE;
14610	15330	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15331	{
14612		- SetMouseMode(modifiers);
	15332	+ SetMouseMode(0, modifiers);
14613	15333	}
14614	15334	}
14615	15335
14616		- protected void processKeyEvent(KeyEvent e)
	15336	+ public void processKeyEvent(KeyEvent e)
14617	15337	{
14618	15338	switch (e.getID())
14619	15339	{
..	..	@@ -14743,8 +15463,9 @@
14743	15463
14744	15464	protected void processMouseMotionEvent(MouseEvent e)
14745	15465	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- 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)
14748	15469	{
14749	15470	mouseMoved(e);
14750	15471	} else
..	..	@@ -14769,11 +15490,12 @@
14769	15490	}
14770	15491	*/
14771	15492
14772		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
14773	15494	}
14774	15495
14775	15496	void SelectParent()
14776	15497	{
	15498	+ new Exception().printStackTrace();
14777	15499	System.exit(0);
14778	15500	Composite group = (Composite) object;
14779	15501	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15507,10 @@
14785	15507	{
14786	15508	//selectees.remove(i);
14787	15509	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15511	} else
14790	15512	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15514	}
14793	15515
14794	15516	first = false;
..	..	@@ -14797,6 +15519,7 @@
14797	15519
14798	15520	void SelectChildren()
14799	15521	{
	15522	+ new Exception().printStackTrace();
14800	15523	System.exit(0);
14801	15524	/*
14802	15525	Composite group = (Composite) object;
..	..	@@ -14829,12 +15552,12 @@
14829	15552	for (int j = 0; j < group.children.size(); j++)
14830	15553	{
14831	15554	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15556	first = false;
14834	15557	}
14835	15558	} else
14836	15559	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15561	}
14839	15562
14840	15563	first = false;
..	..	@@ -14845,21 +15568,21 @@
14845	15568	{
14846	15569	//Composite group = (Composite) object;
14847	15570	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15572	}
14850	15573
14851	15574	void ResetTransform(int mask)
14852	15575	{
14853	15576	//Composite group = (Composite) object;
14854	15577	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
14856	15579	}
14857	15580
14858	15581	void FlipTransform()
14859	15582	{
14860	15583	//Composite group = (Composite) object;
14861	15584	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
14863	15586	// group.editWindow.ReduceMesh(true);
14864	15587	}
14865	15588
..	..	@@ -14867,7 +15590,7 @@
14867	15590	{
14868	15591	//Composite group = (Composite) object;
14869	15592	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
14871	15594	// group.editWindow.ReduceMesh(true);
14872	15595	}
14873	15596
..	..	@@ -14875,7 +15598,7 @@
14875	15598	{
14876	15599	//Composite group = (Composite) object;
14877	15600	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
14879	15602	}
14880	15603
14881	15604	void IncDepth()
..	..	@@ -14961,7 +15684,9 @@
14961	15684	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15685	//Image img = CreateImage(width, height);
14963	15686	//System.out.println("width = " + width + "; height = " + height + "\n");
	15687	+
14964	15688	Graphics gr = g; // img.getGraphics();
	15689	+
14965	15690	if (!hasMarquee)
14966	15691	{
14967	15692	if (Xmin < Xmax) // !locked)
..	..	@@ -15049,6 +15774,7 @@
15049	15774	info.bounds.y += (height - desired) / 2;
15050	15775	}
15051	15776	}
	15777	+
15052	15778	info.g = gr;
15053	15779	info.camera = renderCamera;
15054	15780	/*
..	..	@@ -15058,15 +15784,55 @@
15058	15784	*/
15059	15785	if (!isRenderer)
15060	15786	{
15061		- 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	+ }
15062	15826	}
15063	15827	}
	15828	+
15064	15829	if (isRenderer)
15065	15830	{
15066	15831	//gr.setColor(Color.black);
15067	15832	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	15833	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	15834	}
	15835	+
15070	15836	if (hasMarquee)
15071	15837	{
15072	15838	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +15945,7 @@
15179	15945	public boolean mouseDown(Event evt, int x, int y)
15180	15946	{
15181	15947	System.out.println("mouseDown: " + evt);
	15948	+ System.exit(0);
15182	15949	/*
15183	15950	locked = true;
15184	15951	drag = false;
..	..	@@ -15222,7 +15989,7 @@
15222	15989	{
15223	15990	keyPressed(0, modifiers);
15224	15991	}
15225		- clickStart(x, y, modifiers);
	15992	+ // clickStart(x, y, modifiers);
15226	15993	return true;
15227	15994	}
15228	15995
..	..	@@ -15340,7 +16107,7 @@
15340	16107	{
15341	16108	keyReleased(0, 0);
15342	16109	}
15343		- drag(x, y, modifiers);
	16110	+ drag(x, y, 0, modifiers);
15344	16111	return true;
15345	16112	}
15346	16113
..	..	@@ -15472,7 +16239,7 @@
15472	16239	Object3D object;
15473	16240	static Object3D trackedobject;
15474	16241	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16242	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16243	/static/ Camera eyeCamera;
15477	16244	/static/ Camera lightCamera;
15478	16245	int cameracount;
..	..	@@ -15757,16 +16524,16 @@
15757	16524	cStatic.objectstack[materialdepth++] = checker;
15758	16525	//System.out.println("material " + material);
15759	16526	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
15761	16528
15762	16529	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16531
15765	16532	materialdepth -= 1;
15766	16533	if (materialdepth > 0)
15767	16534	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- 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);
15770	16537	}
15771	16538	//checker.GetMaterial().opacity = 1f;
15772	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +16619,14 @@
15852	16619	}
15853	16620	}
15854	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	+
15855	16630	class SelectBuffer implements GLEventListener
15856	16631	{
15857	16632
..	..	@@ -15910,6 +16685,7 @@
15910	16685	{
15911	16686	if (!selection)
15912	16687	{
	16688	+ new Exception().printStackTrace();
15913	16689	System.exit(0);
15914	16690	return;
15915	16691	}
..	..	@@ -15930,6 +16706,17 @@
15930	16706
15931	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	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	+
15933	16720	//int tmp = selection_view;
15934	16721	//selection_view = -1;
15935	16722	int temp = DrawMode();
..	..	@@ -15941,6 +16728,17 @@
15941	16728	// temp = DEFAULT; // patch for selection debug
15942	16729	Globals.drawMode = temp; // WARNING
15943	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	+
15944	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	16743
15946	16744	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +16786,8 @@
15988	16786	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16789	+
	16790	+ CreateSelectedPoint();
15991	16791
15992	16792	// Will fit the mesh !!!
15993	16793	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +16837,36 @@
16037	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]));
16038	16838	}
16039	16839
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16840	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	16841	}
16042	16842	}
16043	16843
16044	16844	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	16846
16047		- 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)
16048	16848	{
16049		- 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);
16050	16850
16051		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	16854
16053		- group.CreateMaterial(); // use a void leaf to select instances
16054		-
16055		- group.add(paintobj); // link
16056		-
16057		- object.editWindow.SnapObject(group);
16058		-
16059		- Object3D folder = object.editWindow.copy;
16060		-
16061		- if (object.editWindow.copy.selection.Size() > 0)
16062		- folder = object.editWindow.copy.selection.elementAt(0);
16063		-
16064		- folder.add(group);
16065		-
16066		- object.editWindow.ResetModel();
16067		- object.editWindow.refreshContents();
	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	+ }
16068	16870	}
16069	16871	else
16070	16872	paintcount = 0;
..	..	@@ -16103,6 +16905,11 @@
16103	16905	//System.out.println("objects[color] = " + objects[color]);
16104	16906	//objects[color].Select();
16105	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
16106	16913	object.Select(color, deselect);
16107	16914	}
16108	16915
..	..	@@ -16202,7 +17009,7 @@
16202	17009	gl.glDisable(gl.GL_CULL_FACE);
16203	17010	}
16204	17011
16205		- if (!RENDERSHADOW)
	17012	+ if (!Globals.RENDERSHADOW)
16206	17013	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17014
16208	17015	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17019,7 @@
16212	17019	//gl.glColorMask(false, false, false, false);
16213	17020
16214	17021	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17022	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17023	{
16217	17024	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17025
..	..	@@ -16628,23 +17435,15 @@
16628	17435	int AAbuffersize = 0;
16629	17436
16630	17437	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17438	+ static Superellipsoid selectedpoint;
16632	17439	static Sphere previousselectedpoint = null;
16633		- static Sphere debugpointG = new Sphere();
16634		- static Sphere debugpointP = new Sphere();
16635		- static Sphere debugpointC = new Sphere();
16636		- static Sphere debugpointR = new Sphere();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
16637	17444
16638	17445	static Sphere debugpoints[] = new Sphere[8];
16639	17446
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17447	static void InitPoints(float radius)
16649	17448	{
16650	17449	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17495,11 @@
16696	17495	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17496	// Depth buffer format
16698	17497	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17498	+
	17499	+ public void NextIndex()
16700	17500	{
16701	17501	indexcount+=16;
16702		- 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);
16703	17503	//objects[indexcount] = o;
16704	17504	//System.out.println("indexcount = " + indexcount);
16705	17505	}