~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,8 +55,6 @@
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;
..	..	@@ -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;
..	..	@@ -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()
..	..	@@ -2008,7 +2397,7 @@
2008	2397	{
2009	2398	return currentGL;
2010	2399	}
2011		-
	2400	+
2012	2401	/**/
2013	2402	class CacheTexture
2014	2403	{
..	..	@@ -3840,6 +4229,7 @@
3840	4229
3841	4230	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4231	{
	4232	+ new Exception().printStackTrace();
3843	4233	System.exit(0);
3844	4234	com.sun.opengl.util.texture.Texture texture = null;
3845	4235
..	..	@@ -7552,6 +7942,64 @@
7552	7942	ReleaseTexture(pigment, false);
7553	7943	}
7554	7944
	7945	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7946	+ {
	7947	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7948	+ {
	7949	+ return;
	7950	+ }
	7951	+
	7952	+ if (tex == null)
	7953	+ {
	7954	+ ReleaseTexture(null, false);
	7955	+ return;
	7956	+ }
	7957	+
	7958	+ String pigment = Object3D.GetPigment(tex);
	7959	+
	7960	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7961	+ {
	7962	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7963	+ // System.out.println("; bump = " + bump);
	7964	+ }
	7965	+
	7966	+ if (pigment.equals(""))
	7967	+ {
	7968	+ pigment = null;
	7969	+ }
	7970	+
	7971	+ ReleaseTexture(pigment, false);
	7972	+ }
	7973	+
	7974	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7975	+ {
	7976	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7977	+ {
	7978	+ return;
	7979	+ }
	7980	+
	7981	+ if (tex == null)
	7982	+ {
	7983	+ ReleaseTexture(null, true);
	7984	+ return;
	7985	+ }
	7986	+
	7987	+ String bump = Object3D.GetBump(tex);
	7988	+
	7989	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7990	+ {
	7991	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7992	+ // System.out.println("; bump = " + bump);
	7993	+ }
	7994	+
	7995	+ if (bump.equals(""))
	7996	+ {
	7997	+ bump = null;
	7998	+ }
	7999	+
	8000	+ ReleaseTexture(bump, true);
	8001	+ }
	8002	+
7555	8003	void ReleaseTexture(String tex, boolean bump)
7556	8004	{
7557	8005	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7655,7 +8103,7 @@
7655	8103	}
7656	8104	}
7657	8105
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8106	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8107	{
7660	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7700,7 +8148,94 @@
7700	8148	return; // true;
7701	8149	}
7702	8150
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8151	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8152	+ {
	8153	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8154	+ ambientOcclusion ) // \|\| !textureon)
	8155	+ {
	8156	+ return; // false;
	8157	+ }
	8158	+
	8159	+ if (tex == null)
	8160	+ {
	8161	+ BindTexture(null,false,resolution);
	8162	+ return;
	8163	+ }
	8164	+
	8165	+ String pigment = Object3D.GetPigment(tex);
	8166	+
	8167	+ usedtextures.put(pigment, pigment);
	8168	+
	8169	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8170	+ {
	8171	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8172	+ // System.out.println("; bump = " + bump);
	8173	+ }
	8174	+
	8175	+ if (pigment.equals(""))
	8176	+ {
	8177	+ pigment = null;
	8178	+ }
	8179	+
	8180	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8181	+ BindTexture(pigment, false, resolution);
	8182	+ }
	8183	+
	8184	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8185	+ {
	8186	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8187	+ ambientOcclusion ) // \|\| !textureon)
	8188	+ {
	8189	+ return; // false;
	8190	+ }
	8191	+
	8192	+ if (tex == null)
	8193	+ {
	8194	+ BindTexture(null,true,resolution);
	8195	+ return;
	8196	+ }
	8197	+
	8198	+ String bump = Object3D.GetBump(tex);
	8199	+
	8200	+ usedtextures.put(bump, bump);
	8201	+
	8202	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8203	+ {
	8204	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8205	+ // System.out.println("; bump = " + bump);
	8206	+ }
	8207	+
	8208	+ if (bump.equals(""))
	8209	+ {
	8210	+ bump = null;
	8211	+ }
	8212	+
	8213	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8214	+ BindTexture(bump, true, resolution);
	8215	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8216	+ }
	8217	+
	8218	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8219	+
	8220	+ private boolean FileExists(String tex)
	8221	+ {
	8222	+ if (missingTextures.contains(tex))
	8223	+ {
	8224	+ return false;
	8225	+ }
	8226	+
	8227	+ boolean fileExists = new File(tex).exists();
	8228	+
	8229	+ if (!fileExists)
	8230	+ {
	8231	+ // If file exists, the "new File()" is not executed sgain
	8232	+ missingTextures.add(tex);
	8233	+ }
	8234	+
	8235	+ return fileExists;
	8236	+ }
	8237	+
	8238	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7704	8239	{
7705	8240	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7706	8241
..	..	@@ -7708,12 +8243,18 @@
7708	8243	{
7709	8244	String texname = tex;
7710	8245
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;
	8246	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8247	+
	8248	+// String[] split = tex.split("Textures");
	8249	+// if (split.length > 1)
	8250	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8251	+// else
	8252	+// if (!texname.startsWith("/"))
	8253	+// texname = "/Users/nbriere/Textures/" + texname;
	8254	+ if (!FileExists(tex))
	8255	+ {
	8256	+ texname = fallbackTextureName;
	8257	+ }
7717	8258
7718	8259	if (CACHETEXTURE)
7719	8260	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7782,7 +8323,7 @@
7782	8323	}
7783	8324
7784	8325	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8326	+ if (!FileExists(cachename))
7786	8327	cachename = texname;
7787	8328	else
7788	8329	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8345,7 @@
7804	8345	}
7805	8346
7806	8347	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8348	+ if (!FileExists(cachename))
7808	8349	cachename = texname;
7809	8350	else
7810	8351	processbump = false; // don't process bump map again
..	..	@@ -7813,7 +8354,9 @@
7813	8354	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8355
7815	8356
7816		- if (texturedata != null)
	8357	+ if (texturedata == null)
	8358	+ throw new Exception();
	8359	+
7817	8360	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7818	8361	//texture = GetTexture(tex, bump);
7819	8362	}
..	..	@@ -7935,7 +8478,7 @@
7935	8478	return texture;
7936	8479	}
7937	8480
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8481	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7939	8482	{
7940	8483	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8484
..	..	@@ -7953,14 +8496,14 @@
7953	8496	return texture!=null?texture.texture:null;
7954	8497	}
7955	8498
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8499	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7957	8500	{
7958	8501	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8502
7960	8503	return texture!=null?texture.texturedata:null;
7961	8504	}
7962	8505
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8506	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7964	8507	{
7965	8508	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8509	{
..	..	@@ -8837,11 +9380,35 @@
8837	9380	jy8[3] = 0.5f;
8838	9381	}
8839	9382
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9383	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9384	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9385	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9386	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9387
	9388	+ void ResetOptions()
	9389	+ {
	9390	+ options1[0] = 100;
	9391	+ options1[1] = 0.025f;
	9392	+ options1[2] = 0.01f;
	9393	+ options1[3] = 0;
	9394	+ options1[4] = 0;
	9395	+
	9396	+ options2[0] = 0;
	9397	+ options2[1] = 0.75f;
	9398	+ options2[2] = 0;
	9399	+ options2[3] = 0;
	9400	+
	9401	+ options3[0] = 1;
	9402	+ options3[1] = 1;
	9403	+ options3[2] = 1;
	9404	+ options3[3] = 0;
	9405	+
	9406	+ options4[0] = 1;
	9407	+ options4[1] = 0;
	9408	+ options4[2] = 1;
	9409	+ options4[3] = 0;
	9410	+ }
	9411	+
8845	9412	static int imagecount = 0; // movie generation
8846	9413
8847	9414	static int jitter = 0;
..	..	@@ -8937,8 +9504,8 @@
8937	9504	assert (parentcam != renderCamera);
8938	9505
8939	9506	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9507	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9508	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942	9509
8943	9510	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9511
..	..	@@ -8953,8 +9520,8 @@
8953	9520	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9521
8955	9522	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9523	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9524	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958	9525
8959	9526	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9527
..	..	@@ -9026,7 +9593,7 @@
9026	9593	//gl.glFlush();
9027	9594	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9595
9029		- if (ANIMATION && ABORTED)
	9596	+ if (Globals.ANIMATION && ABORTED)
9030	9597	{
9031	9598	System.err.println(" ABORTED FRAME");
9032	9599	break;
..	..	@@ -9056,7 +9623,7 @@
9056	9623	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9624
9058	9625	// save image
9059		- if (ANIMATION && !ABORTED)
	9626	+ if (Globals.ANIMATION && !ABORTED)
9060	9627	{
9061	9628	VPwidth = viewport[2];
9062	9629	VPheight = viewport[3];
..	..	@@ -9167,11 +9734,11 @@
9167	9734
9168	9735	// imagecount++;
9169	9736
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9737	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9738
9172	9739	if (!BOXMODE)
9173	9740	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9741	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9742	}
9176	9743
9177	9744	if (!BOXMODE)
..	..	@@ -9209,7 +9776,7 @@
9209	9776	ABORTED = false;
9210	9777	}
9211	9778	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9779	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	9780
9214	9781	if (false)
9215	9782	{
..	..	@@ -9872,11 +10439,11 @@
9872	10439
9873	10440	public void display(GLAutoDrawable drawable)
9874	10441	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10442	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10443	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10444	+ Grafreed.wav.save();
	10445	+ Grafreed.savesound = false;
	10446	+ Grafreed.hassound = false;
9880	10447	}
9881	10448	// if (DEBUG_SELECTION)
9882	10449	// {
..	..	@@ -9952,6 +10519,7 @@
9952	10519	ANTIALIAS = 0;
9953	10520	//System.out.println("RESTART");
9954	10521	AAtimer.restart();
	10522	+ Globals.TIMERRUNNING = true;
9955	10523	}
9956	10524	}
9957	10525	}
..	..	@@ -10006,7 +10574,7 @@
10006	10574	Object3D theobject = object;
10007	10575	Object3D theparent = object.parent;
10008	10576	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10577	+ object = (Object3D)Grafreed.clone(object);
10010	10578	object.Stripify();
10011	10579	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10580	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10587,14 @@
10019	10587	ambientOcclusion = false;
10020	10588	}
10021	10589
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10590	+ if (//Globals.lighttouched &&
	10591	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10592	{
10024	10593	//if (RENDERSHADOW) // ?
10025	10594	if (!IsFrozen())
10026	10595	{
10027	10596	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10597	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10598	{
10030	10599	Globals.framecount++;
10031	10600	shadowbuffer.display();
..	..	@@ -10152,8 +10721,8 @@
10152	10721
10153	10722	// if (parentcam != renderCamera) // not a light
10154	10723	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10724	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10725	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157	10726
10158	10727	for (int j = 0; j < 4; j++)
10159	10728	{
..	..	@@ -10167,8 +10736,8 @@
10167	10736
10168	10737	// if (parentcam != renderCamera) // not a light
10169	10738	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10740	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172	10741
10173	10742	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10743
..	..	@@ -10427,7 +10996,16 @@
10427	10996	// Bump noise
10428	10997	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	10998	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	10999	+
	11000	+ try
	11001	+ {
	11002	+ BindTexture(NOISE_TEXTURE, false, 2);
	11003	+ }
	11004	+ catch (Exception e)
	11005	+ {
	11006	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11007	+ }
	11008	+
10431	11009
10432	11010	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11011	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10552,8 +11130,8 @@
10552	11130	System.err.println("parentcam != renderCamera");
10553	11131
10554	11132	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11133	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11134	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557	11135	}
10558	11136
10559	11137	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11152,8 @@
10574	11152	if (true) // TODO
10575	11153	{
10576	11154	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11155	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11156	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11157	}
10580	11158
10581	11159	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10891,8 +11469,14 @@
10891	11469	{
10892	11470	renderpass++;
10893	11471	// System.out.println("Draw object... ");
	11472	+ STEP = 1;
10894	11473	if (FAST) // in case there is no script
10895		- STEP = 16;
	11474	+ STEP = 8;
	11475	+
	11476	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11477	+ {
	11478	+ STEP *= 4;
	11479	+ }
10896	11480
10897	11481	//object.FullInvariants();
10898	11482
..	..	@@ -10906,16 +11490,37 @@
10906	11490	e.printStackTrace();
10907	11491	}
10908	11492
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11493	+ if (Grafreed.RENDERME > 0)
	11494	+ Grafreed.RENDERME--; // mechante magouille
10911	11495
10912	11496	Globals.ONESTEP = false;
10913	11497	}
10914	11498
10915	11499	static boolean zoomonce = false;
10916	11500
	11501	+ static void CreateSelectedPoint()
	11502	+ {
	11503	+ if (selectedpoint == null)
	11504	+ {
	11505	+ debugpointG = new Sphere();
	11506	+ debugpointP = new Sphere();
	11507	+ debugpointC = new Sphere();
	11508	+ debugpointR = new Sphere();
	11509	+
	11510	+ selectedpoint = new Superellipsoid();
	11511	+
	11512	+ for (int i=0; i<8; i++)
	11513	+ {
	11514	+ debugpoints[i] = new Sphere();
	11515	+ }
	11516	+ }
	11517	+ }
	11518	+
10917	11519	void DrawObject(GL gl, boolean draw)
10918	11520	{
	11521	+ // To clear camera values
	11522	+ ResetOptions();
	11523	+
10919	11524	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11525	// DrawMode() = SELECTION;
10921	11526	//GL gl = getGL();
..	..	@@ -10977,7 +11582,14 @@
10977	11582
10978	11583	usedtextures.clear();
10979	11584
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11585	+ try
	11586	+ {
	11587	+ BindTextures(DEFAULT_TEXTURES, 2);
	11588	+ }
	11589	+ catch (Exception e)
	11590	+ {
	11591	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11592	+ }
10981	11593	}
10982	11594	//System.out.println("--> " + stackdepth);
10983	11595	// GrafreeD.traceon();
..	..	@@ -10987,8 +11599,9 @@
10987	11599
10988	11600	if (DrawMode() == DEFAULT)
10989	11601	{
10990		- if (DEBUG)
	11602	+ if (Globals.DEBUG)
10991	11603	{
	11604	+ CreateSelectedPoint();
10992	11605	float radius = 0.05f;
10993	11606	if (selectedpoint.radius != radius)
10994	11607	{
..	..	@@ -11068,7 +11681,14 @@
11068	11681	if (checker != null && DrawMode() == DEFAULT)
11069	11682	{
11070	11683	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11684	+ try
	11685	+ {
	11686	+ BindTextures(checker.GetTextures(), checker.texres);
	11687	+ }
	11688	+ catch (Exception e)
	11689	+ {
	11690	+ System.err.println("FAILED: " + checker.GetTextures());
	11691	+ }
11072	11692	// NEAREST
11073	11693	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11694	DrawChecker(gl);
..	..	@@ -11150,7 +11770,7 @@
11150	11770	return;
11151	11771	}
11152	11772
11153		- String string = obj.GetToolTip();
	11773	+ String string = obj.toString(); //.GetToolTip();
11154	11774
11155	11775	GL gl = GetGL();
11156	11776
..	..	@@ -11467,8 +12087,8 @@
11467	12087	//obj.TransformToWorld(light, light);
11468	12088	for (int i = tp.size(); --i >= 0;)
11469	12089	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12090	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12091	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12092	}
11473	12093
11474	12094
..	..	@@ -11485,8 +12105,8 @@
11485	12105	parentcam = cameras[0];
11486	12106	}
11487	12107
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12108	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12109	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12110
11491	12111	LA.xformPos(light, renderCamera.toScreen, light);
11492	12112
..	..	@@ -12100,8 +12720,8 @@
12100	12720
12101	12721	// display shadow only (bump == 0)
12102	12722	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	12723	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12724	+ "SLT temp.z, temp.y, -one2048th.x;" +
12105	12725	"SUB temp.y, one.x, temp.z;" +
12106	12726	"MUL temp.x, temp.x, temp.y;" +
12107	12727	"KIL temp.x;" +
..	..	@@ -12230,8 +12850,10 @@
12230	12850	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	12851
12232	12852	"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
	12853	+ // Tuning for default skin
	12854	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12855	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12856	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	12857	"MUL temp.x, temp.x, temp.y;" +
12236	12858
12237	12859	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13052,7 @@
12430	13052	//once = true;
12431	13053	}
12432	13054
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13055	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13056	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13057	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13058
..	..	@@ -12563,12 +13185,16 @@
12563	13185
12564	13186	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13187	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13188	+
	13189	+ // Compare fragment depth in light space with shadowmap.
12566	13190	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13191	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13192	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13193	+
	13194	+ // Reverse comparison
12569	13195	"SUB temp.x, one.x, temp.x;" +
12570	13196	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13197	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13198	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13199
12574	13200	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13208,10 @@
12582	13208	// No shadow for backface
12583	13209	"DP3 temp.x, normal, lightd;" +
12584	13210	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13211	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13212	+
	13213	+ // No shadow when out of frustrum
	13214	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13215	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13216	"";
12587	13217	}
..	..	@@ -12728,7 +13358,8 @@
12728	13358	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13359	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13360	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13361	+
	13362	+ //Object3D.cVector2[] vector2buffer;
12732	13363
12733	13364	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13365	// OUT : diff, spec
..	..	@@ -12744,9 +13375,10 @@
12744	13375	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13376	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13377	//"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;" +
	13378	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13379	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13380	+
	13381	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13382	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13383	"RCP " + dest + ".w," + dest + ".w;" +
12752	13384	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +13772,7 @@
13140	13772	public void mousePressed(MouseEvent e)
13141	13773	{
13142	13774	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13775	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	13776	}
13145	13777
13146	13778	static long prevtime = 0;
..	..	@@ -13167,6 +13799,7 @@
13167	13799
13168	13800	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	13801
	13802	+ if (BUTTONLESSWHEEL)
13170	13803	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	13804	{
13172	13805	return;
..	..	@@ -13175,7 +13808,7 @@
13175	13808	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	13809
13177	13810	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13811	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	13812	{
13180	13813	keepboxmode = BOXMODE;
13181	13814	keepsupport = SUPPORT;
..	..	@@ -13215,8 +13848,8 @@
13215	13848	// mode \|= META;
13216	13849	//}
13217	13850
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13851	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13852	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	13853	anchorX = ax;
13221	13854	anchorY = ay;
13222	13855	prevX = px;
..	..	@@ -13250,6 +13883,7 @@
13250	13883	else
13251	13884	if (evt.getSource() == AAtimer)
13252	13885	{
	13886	+ Globals.TIMERRUNNING = false;
13253	13887	if (mouseDown)
13254	13888	{
13255	13889	//new Exception().printStackTrace();
..	..	@@ -13275,6 +13909,10 @@
13275	13909	// LIVE = waslive;
13276	13910	// wasliveok = true;
13277	13911	// waslive = false;
	13912	+
	13913	+ // May 2019 Forget it:
	13914	+ if (true)
	13915	+ return;
13278	13916
13279	13917	// source == timer
13280	13918	if (mouseDown)
..	..	@@ -13314,12 +13952,13 @@
13314	13952
13315	13953	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	13954
13317		- void clickStart(int x, int y, int modifiers)
	13955	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	13956	{
13319	13957	if (!wasliveok)
13320	13958	return;
13321	13959
13322	13960	AAtimer.restart(); //
	13961	+ Globals.TIMERRUNNING = true;
13323	13962
13324	13963	// waslive = LIVE;
13325	13964	// LIVE = false;
..	..	@@ -13331,7 +13970,7 @@
13331	13970	// touched = true; // main DL
13332	13971	if (isRenderer)
13333	13972	{
13334		- SetMouseMode(modifiers);
	13973	+ SetMouseMode(modifiers, modifiersex);
13335	13974	}
13336	13975
13337	13976	selectX = anchorX = x;
..	..	@@ -13344,7 +13983,7 @@
13344	13983	clicked = true;
13345	13984	hold = false;
13346	13985
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13986	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	13987	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	13988	{
13350	13989	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13375,7 +14014,7 @@
13375	14014	info.camera = renderCamera;
13376	14015	info.x = x;
13377	14016	info.y = y;
13378		- info.modifiers = modifiers;
	14017	+ info.modifiers = modifiersex;
13379	14018	editObj = object.doEditClick(info, 0);
13380	14019	if (!editObj)
13381	14020	{
..	..	@@ -13392,11 +14031,14 @@
13392	14031
13393	14032	public void mouseDragged(MouseEvent e)
13394	14033	{
	14034	+ Globals.MOUSEDRAGGED = true;
	14035	+
	14036	+ //System.out.println("mouseDragged: " + e);
13395	14037	if (isRenderer)
13396	14038	movingcamera = true;
	14039	+
13397	14040	//if (drawing)
13398	14041	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14042	if ((e.getModifiersEx() & CTRL) != 0
13401	14043	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14044	{
..	..	@@ -13404,7 +14046,7 @@
13404	14046	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14047	}
13406	14048	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14049	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14050
13409	14051	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14052	}
..	..	@@ -13577,6 +14219,7 @@
13577	14219
13578	14220	public void run()
13579	14221	{
	14222	+ new Exception().printStackTrace();
13580	14223	System.exit(0);
13581	14224	for (;;)
13582	14225	{
..	..	@@ -13640,7 +14283,7 @@
13640	14283	{
13641	14284	Globals.lighttouched = true;
13642	14285	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14286	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14287	}
13645	14288	//else
13646	14289	}
..	..	@@ -13740,7 +14383,7 @@
13740	14383	int X, Y;
13741	14384	boolean SX, SY;
13742	14385
13743		- void drag(int x, int y, int modifiers)
	14386	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14387	{
13745	14388	if (IsFrozen())
13746	14389	{
..	..	@@ -13749,17 +14392,17 @@
13749	14392
13750	14393	drag = true; // NEW
13751	14394
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14395	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14396
13754	14397	X = x;
13755	14398	Y = y;
13756	14399	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14400	+ MODIFIERS = modifiersex;
	14401	+ modifiersex &= ~1024;
13759	14402	if (false) // modifiers != 0)
13760	14403	{
13761	14404	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14405	+ System.out.println("mouseDragged: " + modifiersex);
13763	14406	System.out.println("SHIFT = " + SHIFT);
13764	14407	System.out.println("CONTROL = " + COMMAND);
13765	14408	System.out.println("META = " + META);
..	..	@@ -13779,7 +14422,8 @@
13779	14422	info.camera = renderCamera;
13780	14423	info.x = x;
13781	14424	info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14425	+ object.GetWindow().copy
	14426	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14427	} else
13784	14428	{
13785	14429	if (x < startX)
..	..	@@ -13931,7 +14575,6 @@
13931	14575	public void mouseMoved(MouseEvent e)
13932	14576	{
13933	14577	//System.out.println("mouseMoved: " + e);
13934		-
13935	14578	if (isRenderer)
13936	14579	return;
13937	14580
..	..	@@ -13944,7 +14587,9 @@
13944	14587	ci.camera = renderCamera;
13945	14588	if (!isRenderer)
13946	14589	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14590	+ //ObjEditor editWindow = object.editWindow;
	14591	+ //Object3D copy = editWindow.copy;
	14592	+ if (object.doEditClick(ci, 0))
13948	14593	{
13949	14594	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14595	} else
..	..	@@ -13956,7 +14601,10 @@
13956	14601
13957	14602	public void mouseReleased(MouseEvent e)
13958	14603	{
	14604	+ Globals.MOUSEDRAGGED = false;
	14605	+
13959	14606	movingcamera = false;
	14607	+ X = Y = 0;
13960	14608	//System.out.println("mouseReleased: " + e);
13961	14609	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14610	}
..	..	@@ -13979,9 +14627,9 @@
13979	14627	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14628	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14629
13982		- if (control \|\| command \|\| IsFrozen())
	14630	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14631	timeout = true;
13984		- else
	14632	+// ?? May 2019 else
13985	14633	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14634	mouseDown = false;
13987	14635	if (!control && !command) // june 2013
..	..	@@ -14091,7 +14739,7 @@
14091	14739	System.out.println("keyReleased: " + e);
14092	14740	}
14093	14741
14094		- void SetMouseMode(int modifiers)
	14742	+ void SetMouseMode(int modifiers, int modifiersex)
14095	14743	{
14096	14744	//System.out.println("SetMouseMode = " + modifiers);
14097	14745	//modifiers &= ~1024;
..	..	@@ -14103,25 +14751,25 @@
14103	14751	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	14752	// return;
14105	14753	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	14754	+ if ((modifiersex & WHEEL) == WHEEL)
14107	14755	{
14108	14756	mouseMode \|= ZOOM;
14109	14757	}
14110	14758
14111	14759	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	14760	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	14761	{
14114	14762	mouseMode \|= VR; // BACKFORTH;
14115	14763	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14764	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	14765	{
14118	14766	mouseMode \|= SELECT;
14119	14767	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	14768	+ if ((modifiersex & COMMAND) == COMMAND)
14121	14769	{
14122	14770	mouseMode \|= SELECT;
14123	14771	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14772	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	14773	{
14126	14774	mouseMode &= ~VR;
14127	14775	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +14798,10 @@
14150	14798
14151	14799	if (isRenderer) //
14152	14800	{
14153		- SetMouseMode(modifiers);
	14801	+ SetMouseMode(0, modifiers);
14154	14802	}
14155	14803
14156		- theRenderer.keyPressed(key);
	14804	+ Globals.theRenderer.keyPressed(key);
14157	14805	}
14158	14806
14159	14807	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +14813,7 @@
14165	14813	float SATPOW = 1; // 2; // 0.5f;
14166	14814	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	14815
14168		- void keyPressed(int key)
	14816	+ public void keyPressed(int key)
14169	14817	{
14170	14818	if (key >= '0' && key <= '5')
14171	14819	clampbit = (key-'0');
..	..	@@ -14322,8 +14970,14 @@
14322	14970	RevertCamera();
14323	14971	repaint();
14324	14972	break;
14325		- case 'L':
14326	14973	case 'l':
	14974	+ lightMode ^= true;
	14975	+ Globals.lighttouched = true;
	14976	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14977	+ targetLookAt.set(manipCamera.lookAt);
	14978	+ repaint();
	14979	+ break;
	14980	+ case 'L':
14327	14981	if (lightMode)
14328	14982	{
14329	14983	lightMode = false;
..	..	@@ -14466,27 +15120,25 @@
14466	15120	case '_':
14467	15121	kompactbit = 5;
14468	15122	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15123	+// case '+':
	15124	+// kompactbit = 6;
	15125	+// break;
14472	15126	case ' ':
14473		- lightMode ^= true;
14474		- Globals.lighttouched = true;
14475		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14476		- targetLookAt.set(manipCamera.lookAt);
	15127	+ ObjEditor.theFrame.ToggleFullScreen();
14477	15128	repaint();
14478	15129	break;
14479	15130	//case '`' :
14480	15131	case ESC:
14481	15132	RENDERPROGRAM += 1;
14482	15133	RENDERPROGRAM %= 3;
	15134	+
14483	15135	repaint();
14484	15136	break;
14485	15137	case 'Z':
14486	15138	//RESIZETEXTURE ^= true;
14487	15139	//break;
14488	15140	case 'z':
14489		- RENDERSHADOW ^= true;
	15141	+ Globals.RENDERSHADOW ^= true;
14490	15142	Globals.lighttouched = true;
14491	15143	repaint();
14492	15144	break;
..	..	@@ -14519,8 +15171,8 @@
14519	15171	case DELETE:
14520	15172	ClearSelection();
14521	15173	break;
14522		- /*
14523	15174	case '+':
	15175	+ /*
14524	15176	//fontsize += 1;
14525	15177	bbzoom *= 2;
14526	15178	repaint();
..	..	@@ -14602,6 +15254,7 @@
14602	15254	}
14603	15255	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15256	}
	15257	+
14605	15258	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15259
14607	15260	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15262,11 @@
14609	15262	//mode = ROTATE;
14610	15263	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15264	{
14612		- SetMouseMode(modifiers);
	15265	+ SetMouseMode(0, modifiers);
14613	15266	}
14614	15267	}
14615	15268
14616		- protected void processKeyEvent(KeyEvent e)
	15269	+ public void processKeyEvent(KeyEvent e)
14617	15270	{
14618	15271	switch (e.getID())
14619	15272	{
..	..	@@ -14743,8 +15396,9 @@
14743	15396
14744	15397	protected void processMouseMotionEvent(MouseEvent e)
14745	15398	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15399	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15400	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15401	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15402	{
14749	15403	mouseMoved(e);
14750	15404	} else
..	..	@@ -14769,11 +15423,12 @@
14769	15423	}
14770	15424	*/
14771	15425
14772		- object.editWindow.EditSelection();
	15426	+ object.editWindow.EditSelection(false);
14773	15427	}
14774	15428
14775	15429	void SelectParent()
14776	15430	{
	15431	+ new Exception().printStackTrace();
14777	15432	System.exit(0);
14778	15433	Composite group = (Composite) object;
14779	15434	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14797,6 +15452,7 @@
14797	15452
14798	15453	void SelectChildren()
14799	15454	{
	15455	+ new Exception().printStackTrace();
14800	15456	System.exit(0);
14801	15457	/*
14802	15458	Composite group = (Composite) object;
..	..	@@ -14961,7 +15617,9 @@
14961	15617	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15618	//Image img = CreateImage(width, height);
14963	15619	//System.out.println("width = " + width + "; height = " + height + "\n");
	15620	+
14964	15621	Graphics gr = g; // img.getGraphics();
	15622	+
14965	15623	if (!hasMarquee)
14966	15624	{
14967	15625	if (Xmin < Xmax) // !locked)
..	..	@@ -15059,14 +15717,33 @@
15059	15717	if (!isRenderer)
15060	15718	{
15061	15719	object.drawEditHandles(info, 0);
	15720	+
	15721	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15722	+ {
	15723	+ switch (object.selection.get(0).hitSomething)
	15724	+ {
	15725	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15726	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15727	+ break;
	15728	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15729	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15730	+ break;
	15731	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15732	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15733	+ break;
	15734	+ }
	15735	+
	15736	+ }
15062	15737	}
15063	15738	}
	15739	+
15064	15740	if (isRenderer)
15065	15741	{
15066	15742	//gr.setColor(Color.black);
15067	15743	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	15744	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	15745	}
	15746	+
15070	15747	if (hasMarquee)
15071	15748	{
15072	15749	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +15856,7 @@
15179	15856	public boolean mouseDown(Event evt, int x, int y)
15180	15857	{
15181	15858	System.out.println("mouseDown: " + evt);
	15859	+ System.exit(0);
15182	15860	/*
15183	15861	locked = true;
15184	15862	drag = false;
..	..	@@ -15222,7 +15900,7 @@
15222	15900	{
15223	15901	keyPressed(0, modifiers);
15224	15902	}
15225		- clickStart(x, y, modifiers);
	15903	+ // clickStart(x, y, modifiers);
15226	15904	return true;
15227	15905	}
15228	15906
..	..	@@ -15340,7 +16018,7 @@
15340	16018	{
15341	16019	keyReleased(0, 0);
15342	16020	}
15343		- drag(x, y, modifiers);
	16021	+ drag(x, y, 0, modifiers);
15344	16022	return true;
15345	16023	}
15346	16024
..	..	@@ -15472,7 +16150,7 @@
15472	16150	Object3D object;
15473	16151	static Object3D trackedobject;
15474	16152	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16153	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16154	/static/ Camera eyeCamera;
15477	16155	/static/ Camera lightCamera;
15478	16156	int cameracount;
..	..	@@ -15757,16 +16435,16 @@
15757	16435	cStatic.objectstack[materialdepth++] = checker;
15758	16436	//System.out.println("material " + material);
15759	16437	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16438	+ //vector2buffer = checker.projectedVertices;
15761	16439
15762	16440	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16441	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16442
15765	16443	materialdepth -= 1;
15766	16444	if (materialdepth > 0)
15767	16445	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16446	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16447	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16448	}
15771	16449	//checker.GetMaterial().opacity = 1f;
15772	16450	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15910,6 +16588,7 @@
15910	16588	{
15911	16589	if (!selection)
15912	16590	{
	16591	+ new Exception().printStackTrace();
15913	16592	System.exit(0);
15914	16593	return;
15915	16594	}
..	..	@@ -15989,6 +16668,8 @@
15989	16668	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	16669	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
15991	16670
	16671	+ CreateSelectedPoint();
	16672	+
15992	16673	// Will fit the mesh !!!
15993	16674	selectedpoint.toParent[0][0] = 0.0001;
15994	16675	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16037,16 +16718,16 @@
16037	16718	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	16719	}
16039	16720
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16721	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	16722	}
16042	16723	}
16043	16724
16044	16725	if (!movingcamera && !PAINTMODE)
16045	16726	object.editWindow.ScreenFitPoint(); // fev 2014
16046	16727
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16728	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	16729	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16730	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	16731
16051	16732	Object3D group = new Object3D("inst" + paintcount++);
16052	16733
..	..	@@ -16103,6 +16784,11 @@
16103	16784	//System.out.println("objects[color] = " + objects[color]);
16104	16785	//objects[color].Select();
16105	16786	indexcount = 0;
	16787	+ ObjEditor window = object.GetWindow();
	16788	+ if (window != null && deselect)
	16789	+ {
	16790	+ window.Select(null, deselect, true);
	16791	+ }
16106	16792	object.Select(color, deselect);
16107	16793	}
16108	16794
..	..	@@ -16202,7 +16888,7 @@
16202	16888	gl.glDisable(gl.GL_CULL_FACE);
16203	16889	}
16204	16890
16205		- if (!RENDERSHADOW)
	16891	+ if (!Globals.RENDERSHADOW)
16206	16892	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	16893
16208	16894	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +16898,7 @@
16212	16898	//gl.glColorMask(false, false, false, false);
16213	16899
16214	16900	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16901	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	16902	{
16217	16903	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	16904
..	..	@@ -16628,23 +17314,15 @@
16628	17314	int AAbuffersize = 0;
16629	17315
16630	17316	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17317	+ static Superellipsoid selectedpoint;
16632	17318	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();
	17319	+ static Sphere debugpointG;
	17320	+ static Sphere debugpointP;
	17321	+ static Sphere debugpointC;
	17322	+ static Sphere debugpointR;
16637	17323
16638	17324	static Sphere debugpoints[] = new Sphere[8];
16639	17325
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17326	static void InitPoints(float radius)
16649	17327	{
16650	17328	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17374,11 @@
16696	17374	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17375	// Depth buffer format
16698	17376	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17377	+
	17378	+ public void NextIndex()
16700	17379	{
16701	17380	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17381	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17382	//objects[indexcount] = o;
16704	17383	//System.out.println("indexcount = " + indexcount);
16705	17384	}