~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;
..	..	@@ -325,7 +358,7 @@
325	358	/**/
326	359	} else
327	360	{
328		- DrawMaterial(material, selected);
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
329	362	}
330	363	} else
331	364	{
..	..	@@ -349,8 +382,8 @@
349	382	cStatic.objectstack[materialdepth++] = obj;
350	383	//System.out.println("material " + material);
351	384	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	387	}
355	388	}
356	389
..	..	@@ -367,8 +400,8 @@
367	400	materialdepth -= 1;
368	401	if (materialdepth > 0)
369	402	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	403	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	404	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	405	}
373	406	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	407	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +421,8 @@
388	421	materialdepth -= 1;
389	422	if (materialdepth > 0)
390	423	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	424	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	425	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	426	}
394	427	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	428	//else
..	..	@@ -430,10 +463,12 @@
430	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	464	{
432	465	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	466	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	467	+ // TEST LIVE NORMALS && !obj.dontselect
	468	+ ;
434	469	if (!hasnorm)
435	470	{
436		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
437	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +851,7 @@
816	851
817	852	if ((i % 100) == 0 && i != 0)
818	853	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	854	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	855	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	856	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	857	}
..	..	@@ -848,7 +883,7 @@
848	883
849	884	if ((i % 100) == 0 && i != 0)
850	885	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	886	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	887	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	888	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	889	}
..	..	@@ -1061,7 +1096,342 @@
1061	1096	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1097	}
1063	1098
	1099	+ public void DrawBox(cVector min, cVector max)
	1100	+ {
	1101	+ javax.media.opengl.GL gl = GetGL();
	1102	+ gl.glBegin(gl.GL_LINES);
	1103	+
	1104	+ gl.glVertex3d(min.x, min.y, min.z);
	1105	+ gl.glVertex3d(min.x, min.y, max.z);
	1106	+ gl.glVertex3d(min.x, min.y, min.z);
	1107	+ gl.glVertex3d(min.x, max.y, min.z);
	1108	+ gl.glVertex3d(min.x, min.y, min.z);
	1109	+ gl.glVertex3d(max.x, min.y, min.z);
	1110	+
	1111	+ gl.glVertex3d(max.x, max.y, max.z);
	1112	+ gl.glVertex3d(min.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, max.y, max.z);
	1114	+ gl.glVertex3d(max.x, min.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, max.z);
	1116	+ gl.glVertex3d(max.x, max.y, min.z);
	1117	+
	1118	+ gl.glEnd();
	1119	+ }
	1120	+
	1121	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1122	+ {
	1123	+ int[] strips = bRep.getRawIndices();
	1124	+
	1125	+ javax.media.opengl.GL gl = GetGL();
	1126	+
	1127	+ // TRIANGLE STRIP ARRAY
	1128	+ if (bRep.trimmed)
	1129	+ {
	1130	+ float[] v = bRep.getRawVertices();
	1131	+ float[] n = bRep.getRawNormals();
	1132	+ float[] c = bRep.getRawColors();
	1133	+ float[] uv = bRep.getRawUVMap();
	1134	+
	1135	+ int count2 = 0;
	1136	+ int count3 = 0;
	1137	+
	1138	+ if (n.length > 0)
	1139	+ {
	1140	+ for (int i = 0; i < strips.length; i++)
	1141	+ {
	1142	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1143	+
	1144	+ /*
	1145	+ boolean locked = false;
	1146	+ float eps = 0.1f;
	1147	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1148	+
	1149	+ int dot = 0;
	1150	+
	1151	+ if ((dot&1) == 0)
	1152	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1153	+
	1154	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1155	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1156	+ else
	1157	+ {
	1158	+ locked = true;
	1159	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1160	+ }
	1161	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1162	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1163	+ if (hasnorm)
	1164	+ {
	1165	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1166	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1167	+ }
	1168	+
	1169	+ if ((dot&4) == 0)
	1170	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1171	+
	1172	+ if (wrap \|\| !locked && (dot&8) != 0)
	1173	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1174	+ else
	1175	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1176	+
	1177	+ f.dot = dot;
	1178	+ */
	1179	+
	1180	+ if (!selectmode)
	1181	+ {
	1182	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1183	+ {
	1184	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1185	+ } else
	1186	+ {
	1187	+ gl.glNormal3f(0, 0, 1);
	1188	+ }
	1189	+
	1190	+ if (c != null)
	1191	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1192	+ {
	1193	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1194	+ }
	1195	+ }
	1196	+
	1197	+ if (flipV)
	1198	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1199	+ else
	1200	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
	1202	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1203	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1204	+
	1205	+ count2 += 2;
	1206	+ count3 += 3;
	1207	+ if (!selectmode)
	1208	+ {
	1209	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1210	+ {
	1211	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1212	+ } else
	1213	+ {
	1214	+ gl.glNormal3f(0, 0, 1);
	1215	+ }
	1216	+ if (c != null)
	1217	+ {
	1218	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1219	+ }
	1220	+ }
	1221	+
	1222	+ if (flipV)
	1223	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1224	+ else
	1225	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
	1227	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1228	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1229	+
	1230	+ count2 += 2;
	1231	+ count3 += 3;
	1232	+ for (int j = 0; j < strips[i] - 2; j++)
	1233	+ {
	1234	+ //gl.glTexCoord2d(...);
	1235	+ if (!selectmode)
	1236	+ {
	1237	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1238	+ {
	1239	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1240	+ } else
	1241	+ {
	1242	+ gl.glNormal3f(0, 0, 1);
	1243	+ }
	1244	+ if (c != null)
	1245	+ {
	1246	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1247	+ }
	1248	+ }
	1249	+
	1250	+ if (flipV)
	1251	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1252	+ else
	1253	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
	1255	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1256	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
	1258	+ count2 += 2;
	1259	+ count3 += 3;
	1260	+ }
	1261	+
	1262	+ gl.glEnd();
	1263	+ }
	1264	+ }
	1265	+
	1266	+ assert count3 == v.length;
	1267	+ }
	1268	+ else // !trimmed
	1269	+ {
	1270	+ int count = 0;
	1271	+ for (int i = 0; i < strips.length; i++)
	1272	+ {
	1273	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1274	+
	1275	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1276	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ drawVertex(gl, p, flipV, selectmode);
	1279	+ drawVertex(gl, q, flipV, selectmode);
	1280	+
	1281	+ for (int j = 0; j < strips[i] - 2; j++)
	1282	+ {
	1283	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1284	+
	1285	+ // if (j%2 == 0)
	1286	+ // drawFace(p, q, r, display, null);
	1287	+ // else
	1288	+ // drawFace(p, r, q, display, null);
	1289	+
	1290	+ // p = q;
	1291	+ // q = r;
	1292	+ drawVertex(gl, r, flipV, selectmode);
	1293	+ }
	1294	+
	1295	+ gl.glEnd();
	1296	+ }
	1297	+ }
	1298	+ }
	1299	+
	1300	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1301	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1302	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1303	+
	1304	+ public void DrawDynamicMesh(cMesh mesh)
	1305	+ {
	1306	+ GL gl = GetGL(); // getGL();
	1307	+
	1308	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1309	+
	1310	+ gl.glDisable(gl.GL_LIGHTING);
	1311	+
	1312	+ gl.glLineWidth(1);
	1313	+ gl.glColor3f(1,1,1);
	1314	+ gl.glBegin(gl.GL_LINES);
	1315	+ double scale = 0;
	1316	+ int count = 0;
	1317	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1318	+ {
	1319	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1320	+ if(s == 0)
	1321	+ {
	1322	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1323	+ }
	1324	+ if (mesh.showsprings)
	1325	+ {
	1326	+ temp.set(spring.a.position);
	1327	+ temp.add(spring.b.position);
	1328	+ temp.mul(0.5);
	1329	+ temp2.set(spring.a.position);
	1330	+ temp2.sub(spring.b.position);
	1331	+ temp2.mul(spring.restLength/2);
	1332	+ temp.sub(temp2);
	1333	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1334	+ temp.add(temp2);
	1335	+ temp.add(temp2);
	1336	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1337	+ }
	1338	+
	1339	+ if (spring.isHandle)
	1340	+ continue;
	1341	+
	1342	+ //if (scale < spring.restLength)
	1343	+ scale += spring.restLength;
	1344	+ count++;
	1345	+ }
	1346	+ gl.glEnd();
	1347	+
	1348	+ if (count == 0)
	1349	+ scale = 0.01;
	1350	+ else
	1351	+ scale /= count * 3;
	1352	+
	1353	+ //scale = 0.25;
	1354	+
	1355	+ if (mesh.ShowInfo())
	1356	+ {
	1357	+ gl.glLineWidth(4);
	1358	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1359	+ {
	1360	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1361	+ if (node.mass == 0)
	1362	+ continue;
	1363	+
	1364	+ int i = node.springs==null?-1:node.springs.size();
	1365	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1366	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1367	+ //temp.normalize();
	1368	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1369	+ gl.glBegin(gl.GL_LINES);
	1370	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1371	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1372	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1373	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1374	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1375	+ gl.glEnd();
	1376	+ }
	1377	+
	1378	+ gl.glLineWidth(8);
	1379	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1380	+ {
	1381	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1382	+
	1383	+ if (node.springs != null)
	1384	+ {
	1385	+ for (int i=0; i<node.springs.size(); i+=1)
	1386	+ {
	1387	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1388	+
	1389	+ int c = i+1;
	1390	+ // c = node.springs.get(i).nbcopies;
	1391	+
	1392	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1393	+ gl.glBegin(gl.GL_LINES);
	1394	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1395	+ 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);
	1396	+ gl.glEnd();
	1397	+ }
	1398	+ }
	1399	+ }
	1400	+
	1401	+ gl.glLineWidth(1);
	1402	+ }
	1403	+
	1404	+ gl.glEnable(gl.GL_LIGHTING);
	1405	+ }
	1406	+
1064	1407	/// INTERFACE
	1408	+
	1409	+ public void StartTriangles()
	1410	+ {
	1411	+ javax.media.opengl.GL gl = GetGL();
	1412	+ gl.glBegin(gl.GL_TRIANGLES);
	1413	+ }
	1414	+
	1415	+ public void EndTriangles()
	1416	+ {
	1417	+ GetGL().glEnd();
	1418	+ }
	1419	+
	1420	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1421	+ {
	1422	+ if (!selectmode)
	1423	+ {
	1424	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1425	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1426	+
	1427	+ if (flipV)
	1428	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1429	+ else
	1430	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1431	+ }
	1432	+
	1433	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1434	+ }
1065	1435
1066	1436	void SetColor(Object3D obj, Vertex p0)
1067	1437	{
..	..	@@ -1240,7 +1610,7 @@
1240	1610	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1611	}
1242	1612
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1614	{
1245	1615	CameraPane display = this;
1246	1616	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1626,18 @@
1256	1626	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1627	if (!material.multiply)
1258	1628	{
1259		- display.color = color;
	1629	+ display.color = material.color;
1260	1630	display.saturation = material.modulation;
1261	1631	}
1262	1632	else
1263	1633	{
1264		- display.color = color2;
	1634	+ display.color = material.color2;
1265	1635	display.saturation = material.modulation2;
1266	1636	}
1267	1637
1268	1638	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1639
1270		- float[] colorV = GrafreeD.colorV;
	1640	+ float[] colorV = Grafreed.colorV;
1271	1641
1272	1642	/**/
1273	1643	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1645,7 @@
1275	1645	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1646	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1647	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1648	+ colorV[3] = 1; // material.opacity;
1279	1649
1280	1650	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1651	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1753,9 @@
1383	1753	display.modelParams7[2] = 0;
1384	1754	display.modelParams7[3] = 0;
1385	1755
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1757
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1759	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1760	{
1391	1761	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1897,7 @@
1527	1897	void PushMatrix(double[][] matrix)
1528	1898	{
1529	1899	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1531	1901	}
1532	1902
1533	1903	void PushMatrix()
..	..	@@ -1624,7 +1994,7 @@
1624	1994
1625	1995	static int camerachangeframe;
1626	1996
1627		- boolean SetCamera(Camera cam)
	1997	+ public boolean SetCamera(Camera cam)
1628	1998	{
1629	1999	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2000	// return false;
..	..	@@ -1752,33 +2122,6 @@
1752	2122	mainDL ^= true;
1753	2123	}
1754	2124
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	2125	void ToggleFullScreen()
1783	2126	{
1784	2127	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2132,94 @@
1789	2132	Globals.CROWD ^= true;
1790	2133	}
1791	2134
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2135	void ToggleLocal()
1798	2136	{
1799	2137	LOCALTRANSFORM ^= true;
1800	2138	}
1801	2139
1802		- void ToggleFast()
	2140	+ public void ToggleTexture()
	2141	+ {
	2142	+ textureon ^= true;
	2143	+ }
	2144	+
	2145	+ public void ToggleLive()
	2146	+ {
	2147	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2148	+
	2149	+ System.err.println("LIVE = " + Globals.isLIVE());
	2150	+
	2151	+ if (!Globals.isLIVE()) // save sound
	2152	+ Grafreed.savesound = true; // wav.save();
	2153	+ // else
	2154	+ repaint(); // start loop // may 2013
	2155	+ }
	2156	+
	2157	+ public void ToggleSupport()
	2158	+ {
	2159	+ SUPPORT ^= true;
	2160	+ }
	2161	+
	2162	+ public void ToggleAbort()
	2163	+ {
	2164	+ ABORTMODE ^= true;
	2165	+ }
	2166	+
	2167	+ public void ToggleInertia()
	2168	+ {
	2169	+ INERTIA ^= true;
	2170	+ }
	2171	+
	2172	+ public void ToggleFast()
1803	2173	{
1804	2174	FAST ^= true;
1805	2175	}
1806	2176
1807		- void ToggleSlowPose()
	2177	+ public void ToggleSlowPose()
1808	2178	{
1809	2179	SLOWPOSE ^= true;
1810	2180	}
1811	2181
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2182	+ public void ToggleBoxMode()
1818	2183	{
1819	2184	BOXMODE ^= true;
1820	2185	}
1821	2186
1822		- void ToggleSmoothFocus()
	2187	+ public void ToggleZoomBoxMode()
	2188	+ {
	2189	+ ZOOMBOXMODE ^= true;
	2190	+ }
	2191	+
	2192	+ public void ToggleSmoothFocus()
1823	2193	{
1824	2194	SMOOTHFOCUS ^= true;
1825	2195	}
1826	2196
1827		- void ToggleImageFlip()
	2197	+ public void ToggleImageFlip()
1828	2198	{
1829	2199	IMAGEFLIP ^= true;
1830	2200	}
1831	2201
1832		- void ToggleSpeakerMocap()
	2202	+ public void ToggleSpeakerMocap()
1833	2203	{
1834	2204	SPEAKERMOCAP ^= true;
1835	2205	}
1836	2206
1837		- void ToggleSpeakerCamera()
	2207	+ public void ToggleSpeakerCamera()
1838	2208	{
1839	2209	SPEAKERCAMERA ^= true;
1840	2210	}
1841	2211
1842		- void ToggleSpeakerFocus()
	2212	+ public void ToggleSpeakerFocus()
1843	2213	{
1844	2214	SPEAKERFOCUS ^= true;
1845	2215	}
1846	2216
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2217	+ public void ToggleFrustum()
1853	2218	{
1854	2219	FRUSTUM ^= true;
1855	2220	}
1856	2221
1857		- void ToggleTrack()
	2222	+ public void ToggleTrack()
1858	2223	{
1859	2224	TRACK ^= true;
1860	2225	if (TRACK)
..	..	@@ -1873,25 +2238,35 @@
1873	2238	repaint();
1874	2239	}
1875	2240
1876		- void ToggleTrackOnce()
	2241	+ public void ToggleTrackOnce()
1877	2242	{
1878	2243	TRACKONCE ^= true;
1879	2244	}
1880	2245
1881		- void ToggleShadowTrack()
	2246	+ public void ToggleShadowTrack()
1882	2247	{
1883	2248	SHADOWTRACK ^= true;
1884	2249	repaint();
1885	2250	}
1886	2251
1887		- void ToggleOeil()
	2252	+ public void ToggleOeil()
1888	2253	{
1889	2254	OEIL ^= true;
1890	2255	}
1891	2256
1892		- void ToggleOeilOnce()
	2257	+ public void ToggleOeilOnce()
1893	2258	{
1894	2259	OEILONCE ^= true;
	2260	+ }
	2261	+
	2262	+ void ToggleFootContact()
	2263	+ {
	2264	+ FOOTCONTACT ^= true;
	2265	+ }
	2266	+
	2267	+ void ToggleDebug()
	2268	+ {
	2269	+ Globals.DEBUG ^= true;
1895	2270	}
1896	2271
1897	2272	void ToggleLookAt()
..	..	@@ -1899,9 +2274,9 @@
1899	2274	LOOKAT ^= true;
1900	2275	}
1901	2276
1902		- void ToggleRandom()
	2277	+ void ToggleSwitch()
1903	2278	{
1904		- RANDOM ^= true;
	2279	+ SWITCH ^= true;
1905	2280	}
1906	2281
1907	2282	void ToggleHandles()
..	..	@@ -2008,7 +2383,7 @@
2008	2383	{
2009	2384	return currentGL;
2010	2385	}
2011		-
	2386	+
2012	2387	/**/
2013	2388	class CacheTexture
2014	2389	{
..	..	@@ -3840,6 +4215,7 @@
3840	4215
3841	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4217	{
	4218	+ new Exception().printStackTrace();
3843	4219	System.exit(0);
3844	4220	com.sun.opengl.util.texture.Texture texture = null;
3845	4221
..	..	@@ -7552,6 +7928,64 @@
7552	7928	ReleaseTexture(pigment, false);
7553	7929	}
7554	7930
	7931	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7932	+ {
	7933	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7934	+ {
	7935	+ return;
	7936	+ }
	7937	+
	7938	+ if (tex == null)
	7939	+ {
	7940	+ ReleaseTexture(null, false);
	7941	+ return;
	7942	+ }
	7943	+
	7944	+ String pigment = Object3D.GetPigment(tex);
	7945	+
	7946	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7947	+ {
	7948	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7949	+ // System.out.println("; bump = " + bump);
	7950	+ }
	7951	+
	7952	+ if (pigment.equals(""))
	7953	+ {
	7954	+ pigment = null;
	7955	+ }
	7956	+
	7957	+ ReleaseTexture(pigment, false);
	7958	+ }
	7959	+
	7960	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7961	+ {
	7962	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7963	+ {
	7964	+ return;
	7965	+ }
	7966	+
	7967	+ if (tex == null)
	7968	+ {
	7969	+ ReleaseTexture(null, true);
	7970	+ return;
	7971	+ }
	7972	+
	7973	+ String bump = Object3D.GetBump(tex);
	7974	+
	7975	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7976	+ {
	7977	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7978	+ // System.out.println("; bump = " + bump);
	7979	+ }
	7980	+
	7981	+ if (bump.equals(""))
	7982	+ {
	7983	+ bump = null;
	7984	+ }
	7985	+
	7986	+ ReleaseTexture(bump, true);
	7987	+ }
	7988	+
7555	7989	void ReleaseTexture(String tex, boolean bump)
7556	7990	{
7557	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7655,7 +8089,7 @@
7655	8089	}
7656	8090	}
7657	8091
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8093	{
7660	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7700,7 +8134,94 @@
7700	8134	return; // true;
7701	8135	}
7702	8136
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8137	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8138	+ {
	8139	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8140	+ ambientOcclusion ) // \|\| !textureon)
	8141	+ {
	8142	+ return; // false;
	8143	+ }
	8144	+
	8145	+ if (tex == null)
	8146	+ {
	8147	+ BindTexture(null,false,resolution);
	8148	+ return;
	8149	+ }
	8150	+
	8151	+ String pigment = Object3D.GetPigment(tex);
	8152	+
	8153	+ usedtextures.put(pigment, pigment);
	8154	+
	8155	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8156	+ {
	8157	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8158	+ // System.out.println("; bump = " + bump);
	8159	+ }
	8160	+
	8161	+ if (pigment.equals(""))
	8162	+ {
	8163	+ pigment = null;
	8164	+ }
	8165	+
	8166	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8167	+ BindTexture(pigment, false, resolution);
	8168	+ }
	8169	+
	8170	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8171	+ {
	8172	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8173	+ ambientOcclusion ) // \|\| !textureon)
	8174	+ {
	8175	+ return; // false;
	8176	+ }
	8177	+
	8178	+ if (tex == null)
	8179	+ {
	8180	+ BindTexture(null,true,resolution);
	8181	+ return;
	8182	+ }
	8183	+
	8184	+ String bump = Object3D.GetBump(tex);
	8185	+
	8186	+ usedtextures.put(bump, bump);
	8187	+
	8188	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8189	+ {
	8190	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8191	+ // System.out.println("; bump = " + bump);
	8192	+ }
	8193	+
	8194	+ if (bump.equals(""))
	8195	+ {
	8196	+ bump = null;
	8197	+ }
	8198	+
	8199	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8200	+ BindTexture(bump, true, resolution);
	8201	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8202	+ }
	8203	+
	8204	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8205	+
	8206	+ private boolean FileExists(String tex)
	8207	+ {
	8208	+ if (missingTextures.contains(tex))
	8209	+ {
	8210	+ return false;
	8211	+ }
	8212	+
	8213	+ boolean fileExists = new File(tex).exists();
	8214	+
	8215	+ if (!fileExists)
	8216	+ {
	8217	+ // If file exists, the "new File()" is not executed sgain
	8218	+ missingTextures.add(tex);
	8219	+ }
	8220	+
	8221	+ return fileExists;
	8222	+ }
	8223	+
	8224	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7704	8225	{
7705	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7706	8227
..	..	@@ -7708,12 +8229,18 @@
7708	8229	{
7709	8230	String texname = tex;
7710	8231
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;
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
	8234	+// String[] split = tex.split("Textures");
	8235	+// if (split.length > 1)
	8236	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8237	+// else
	8238	+// if (!texname.startsWith("/"))
	8239	+// texname = "/Users/nbriere/Textures/" + texname;
	8240	+ if (!FileExists(tex))
	8241	+ {
	8242	+ texname = fallbackTextureName;
	8243	+ }
7717	8244
7718	8245	if (CACHETEXTURE)
7719	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7782,7 +8309,7 @@
7782	8309	}
7783	8310
7784	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
7786	8313	cachename = texname;
7787	8314	else
7788	8315	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8331,7 @@
7804	8331	}
7805	8332
7806	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
7808	8335	cachename = texname;
7809	8336	else
7810	8337	processbump = false; // don't process bump map again
..	..	@@ -7813,7 +8340,9 @@
7813	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8341
7815	8342
7816		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
7817	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7818	8347	//texture = GetTexture(tex, bump);
7819	8348	}
..	..	@@ -7935,7 +8464,7 @@
7935	8464	return texture;
7936	8465	}
7937	8466
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8467	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7939	8468	{
7940	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8470
..	..	@@ -7953,14 +8482,14 @@
7953	8482	return texture!=null?texture.texture:null;
7954	8483	}
7955	8484
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8485	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7957	8486	{
7958	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8488
7960	8489	return texture!=null?texture.texturedata:null;
7961	8490	}
7962	8491
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7964	8493	{
7965	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8495	{
..	..	@@ -8937,8 +9466,8 @@
8937	9466	assert (parentcam != renderCamera);
8938	9467
8939	9468	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942	9471
8943	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9473
..	..	@@ -8953,8 +9482,8 @@
8953	9482	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9483
8955	9484	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958	9487
8959	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9489
..	..	@@ -9026,7 +9555,7 @@
9026	9555	//gl.glFlush();
9027	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9557
9029		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
9030	9559	{
9031	9560	System.err.println(" ABORTED FRAME");
9032	9561	break;
..	..	@@ -9056,7 +9585,7 @@
9056	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9586
9058	9587	// save image
9059		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
9060	9589	{
9061	9590	VPwidth = viewport[2];
9062	9591	VPheight = viewport[3];
..	..	@@ -9167,11 +9696,11 @@
9167	9696
9168	9697	// imagecount++;
9169	9698
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9699	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9700
9172	9701	if (!BOXMODE)
9173	9702	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9703	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9704	}
9176	9705
9177	9706	if (!BOXMODE)
..	..	@@ -9209,7 +9738,7 @@
9209	9738	ABORTED = false;
9210	9739	}
9211	9740	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	9742
9214	9743	if (false)
9215	9744	{
..	..	@@ -9872,11 +10401,11 @@
9872	10401
9873	10402	public void display(GLAutoDrawable drawable)
9874	10403	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10405	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
9880	10409	}
9881	10410	// if (DEBUG_SELECTION)
9882	10411	// {
..	..	@@ -10006,7 +10535,7 @@
10006	10535	Object3D theobject = object;
10007	10536	Object3D theparent = object.parent;
10008	10537	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10538	+ object = (Object3D)Grafreed.clone(object);
10010	10539	object.Stripify();
10011	10540	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10541	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10548,14 @@
10019	10548	ambientOcclusion = false;
10020	10549	}
10021	10550
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10551	+ if (//Globals.lighttouched &&
	10552	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10553	{
10024	10554	//if (RENDERSHADOW) // ?
10025	10555	if (!IsFrozen())
10026	10556	{
10027	10557	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10558	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10559	{
10030	10560	Globals.framecount++;
10031	10561	shadowbuffer.display();
..	..	@@ -10152,8 +10682,8 @@
10152	10682
10153	10683	// if (parentcam != renderCamera) // not a light
10154	10684	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10685	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157	10687
10158	10688	for (int j = 0; j < 4; j++)
10159	10689	{
..	..	@@ -10167,8 +10697,8 @@
10167	10697
10168	10698	// if (parentcam != renderCamera) // not a light
10169	10699	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10700	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172	10702
10173	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10704
..	..	@@ -10427,7 +10957,16 @@
10427	10957	// Bump noise
10428	10958	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	10959	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	10960	+
	10961	+ try
	10962	+ {
	10963	+ BindTexture(NOISE_TEXTURE, false, 2);
	10964	+ }
	10965	+ catch (Exception e)
	10966	+ {
	10967	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10968	+ }
	10969	+
10431	10970
10432	10971	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	10972	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10552,8 +11091,8 @@
10552	11091	System.err.println("parentcam != renderCamera");
10553	11092
10554	11093	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11094	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11095	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557	11096	}
10558	11097
10559	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11113,8 @@
10574	11113	if (true) // TODO
10575	11114	{
10576	11115	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11116	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11117	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11118	}
10580	11119
10581	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10891,8 +11430,14 @@
10891	11430	{
10892	11431	renderpass++;
10893	11432	// System.out.println("Draw object... ");
	11433	+ STEP = 1;
10894	11434	if (FAST) // in case there is no script
10895		- STEP = 16;
	11435	+ STEP = 8;
	11436	+
	11437	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11438	+ {
	11439	+ STEP *= 4;
	11440	+ }
10896	11441
10897	11442	//object.FullInvariants();
10898	11443
..	..	@@ -10906,13 +11451,31 @@
10906	11451	e.printStackTrace();
10907	11452	}
10908	11453
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11454	+ if (Grafreed.RENDERME > 0)
	11455	+ Grafreed.RENDERME--; // mechante magouille
10911	11456
10912	11457	Globals.ONESTEP = false;
10913	11458	}
10914	11459
10915	11460	static boolean zoomonce = false;
	11461	+
	11462	+ static void CreateSelectedPoint()
	11463	+ {
	11464	+ if (selectedpoint == null)
	11465	+ {
	11466	+ debugpointG = new Sphere();
	11467	+ debugpointP = new Sphere();
	11468	+ debugpointC = new Sphere();
	11469	+ debugpointR = new Sphere();
	11470	+
	11471	+ selectedpoint = new Superellipsoid();
	11472	+
	11473	+ for (int i=0; i<8; i++)
	11474	+ {
	11475	+ debugpoints[i] = new Sphere();
	11476	+ }
	11477	+ }
	11478	+ }
10916	11479
10917	11480	void DrawObject(GL gl, boolean draw)
10918	11481	{
..	..	@@ -10977,7 +11540,14 @@
10977	11540
10978	11541	usedtextures.clear();
10979	11542
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11543	+ try
	11544	+ {
	11545	+ BindTextures(DEFAULT_TEXTURES, 2);
	11546	+ }
	11547	+ catch (Exception e)
	11548	+ {
	11549	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11550	+ }
10981	11551	}
10982	11552	//System.out.println("--> " + stackdepth);
10983	11553	// GrafreeD.traceon();
..	..	@@ -10987,8 +11557,9 @@
10987	11557
10988	11558	if (DrawMode() == DEFAULT)
10989	11559	{
10990		- if (DEBUG)
	11560	+ if (Globals.DEBUG)
10991	11561	{
	11562	+ CreateSelectedPoint();
10992	11563	float radius = 0.05f;
10993	11564	if (selectedpoint.radius != radius)
10994	11565	{
..	..	@@ -11068,7 +11639,14 @@
11068	11639	if (checker != null && DrawMode() == DEFAULT)
11069	11640	{
11070	11641	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11642	+ try
	11643	+ {
	11644	+ BindTextures(checker.GetTextures(), checker.texres);
	11645	+ }
	11646	+ catch (Exception e)
	11647	+ {
	11648	+ System.err.println("FAILED: " + checker.GetTextures());
	11649	+ }
11072	11650	// NEAREST
11073	11651	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11652	DrawChecker(gl);
..	..	@@ -11150,7 +11728,7 @@
11150	11728	return;
11151	11729	}
11152	11730
11153		- String string = obj.GetToolTip();
	11731	+ String string = obj.toString(); //.GetToolTip();
11154	11732
11155	11733	GL gl = GetGL();
11156	11734
..	..	@@ -11467,8 +12045,8 @@
11467	12045	//obj.TransformToWorld(light, light);
11468	12046	for (int i = tp.size(); --i >= 0;)
11469	12047	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12048	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12049	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11472	12050	}
11473	12051
11474	12052
..	..	@@ -11485,8 +12063,8 @@
11485	12063	parentcam = cameras[0];
11486	12064	}
11487	12065
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12066	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12067	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12068
11491	12069	LA.xformPos(light, renderCamera.toScreen, light);
11492	12070
..	..	@@ -12100,8 +12678,8 @@
12100	12678
12101	12679	// display shadow only (bump == 0)
12102	12680	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	12681	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12682	+ "SLT temp.z, temp.y, -one2048th.x;" +
12105	12683	"SUB temp.y, one.x, temp.z;" +
12106	12684	"MUL temp.x, temp.x, temp.y;" +
12107	12685	"KIL temp.x;" +
..	..	@@ -12230,8 +12808,10 @@
12230	12808	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	12809
12232	12810	"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
	12811	+ // Tuning for default skin
	12812	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12813	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12814	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	12815	"MUL temp.x, temp.x, temp.y;" +
12236	12816
12237	12817	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,7 +13010,7 @@
12430	13010	//once = true;
12431	13011	}
12432	13012
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
	13013	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434	13014	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435	13015	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13016
..	..	@@ -12563,12 +13143,16 @@
12563	13143
12564	13144	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13145	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13146	+
	13147	+ // Compare fragment depth in light space with shadowmap.
12566	13148	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13149	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13150	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13151	+
	13152	+ // Reverse comparison
12569	13153	"SUB temp.x, one.x, temp.x;" +
12570	13154	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13155	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13156	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13157
12574	13158	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13166,10 @@
12582	13166	// No shadow for backface
12583	13167	"DP3 temp.x, normal, lightd;" +
12584	13168	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13169	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13170	+
	13171	+ // No shadow when out of frustrum
	13172	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13173	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13174	"";
12587	13175	}
..	..	@@ -12728,7 +13316,8 @@
12728	13316	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13317	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13318	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13319	+
	13320	+ //Object3D.cVector2[] vector2buffer;
12732	13321
12733	13322	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13323	// OUT : diff, spec
..	..	@@ -13140,7 +13729,7 @@
13140	13729	public void mousePressed(MouseEvent e)
13141	13730	{
13142	13731	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13732	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	13733	}
13145	13734
13146	13735	static long prevtime = 0;
..	..	@@ -13167,6 +13756,7 @@
13167	13756
13168	13757	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	13758
	13759	+ if (BUTTONLESSWHEEL)
13170	13760	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	13761	{
13172	13762	return;
..	..	@@ -13175,7 +13765,7 @@
13175	13765	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	13766
13177	13767	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13768	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	13769	{
13180	13770	keepboxmode = BOXMODE;
13181	13771	keepsupport = SUPPORT;
..	..	@@ -13215,8 +13805,8 @@
13215	13805	// mode \|= META;
13216	13806	//}
13217	13807
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13808	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13809	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	13810	anchorX = ax;
13221	13811	anchorY = ay;
13222	13812	prevX = px;
..	..	@@ -13276,6 +13866,10 @@
13276	13866	// wasliveok = true;
13277	13867	// waslive = false;
13278	13868
	13869	+ // May 2019 Forget it:
	13870	+ if (true)
	13871	+ return;
	13872	+
13279	13873	// source == timer
13280	13874	if (mouseDown)
13281	13875	{
..	..	@@ -13314,7 +13908,7 @@
13314	13908
13315	13909	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	13910
13317		- void clickStart(int x, int y, int modifiers)
	13911	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	13912	{
13319	13913	if (!wasliveok)
13320	13914	return;
..	..	@@ -13331,7 +13925,7 @@
13331	13925	// touched = true; // main DL
13332	13926	if (isRenderer)
13333	13927	{
13334		- SetMouseMode(modifiers);
	13928	+ SetMouseMode(modifiers, modifiersex);
13335	13929	}
13336	13930
13337	13931	selectX = anchorX = x;
..	..	@@ -13344,7 +13938,7 @@
13344	13938	clicked = true;
13345	13939	hold = false;
13346	13940
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13941	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	13942	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	13943	{
13350	13944	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13375,7 +13969,7 @@
13375	13969	info.camera = renderCamera;
13376	13970	info.x = x;
13377	13971	info.y = y;
13378		- info.modifiers = modifiers;
	13972	+ info.modifiers = modifiersex;
13379	13973	editObj = object.doEditClick(info, 0);
13380	13974	if (!editObj)
13381	13975	{
..	..	@@ -13392,11 +13986,14 @@
13392	13986
13393	13987	public void mouseDragged(MouseEvent e)
13394	13988	{
	13989	+ Globals.MOUSEDRAGGED = true;
	13990	+
	13991	+ //System.out.println("mouseDragged: " + e);
13395	13992	if (isRenderer)
13396	13993	movingcamera = true;
	13994	+
13397	13995	//if (drawing)
13398	13996	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	13997	if ((e.getModifiersEx() & CTRL) != 0
13401	13998	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	13999	{
..	..	@@ -13404,7 +14001,7 @@
13404	14001	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14002	}
13406	14003	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14004	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14005
13409	14006	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14007	}
..	..	@@ -13577,6 +14174,7 @@
13577	14174
13578	14175	public void run()
13579	14176	{
	14177	+ new Exception().printStackTrace();
13580	14178	System.exit(0);
13581	14179	for (;;)
13582	14180	{
..	..	@@ -13640,7 +14238,7 @@
13640	14238	{
13641	14239	Globals.lighttouched = true;
13642	14240	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14241	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14242	}
13645	14243	//else
13646	14244	}
..	..	@@ -13740,7 +14338,7 @@
13740	14338	int X, Y;
13741	14339	boolean SX, SY;
13742	14340
13743		- void drag(int x, int y, int modifiers)
	14341	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14342	{
13745	14343	if (IsFrozen())
13746	14344	{
..	..	@@ -13749,17 +14347,17 @@
13749	14347
13750	14348	drag = true; // NEW
13751	14349
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14350	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14351
13754	14352	X = x;
13755	14353	Y = y;
13756	14354	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14355	+ MODIFIERS = modifiersex;
	14356	+ modifiersex &= ~1024;
13759	14357	if (false) // modifiers != 0)
13760	14358	{
13761	14359	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14360	+ System.out.println("mouseDragged: " + modifiersex);
13763	14361	System.out.println("SHIFT = " + SHIFT);
13764	14362	System.out.println("CONTROL = " + COMMAND);
13765	14363	System.out.println("META = " + META);
..	..	@@ -13779,7 +14377,8 @@
13779	14377	info.camera = renderCamera;
13780	14378	info.x = x;
13781	14379	info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14380	+ object.manipWindow.copy
	14381	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14382	} else
13784	14383	{
13785	14384	if (x < startX)
..	..	@@ -13931,7 +14530,6 @@
13931	14530	public void mouseMoved(MouseEvent e)
13932	14531	{
13933	14532	//System.out.println("mouseMoved: " + e);
13934		-
13935	14533	if (isRenderer)
13936	14534	return;
13937	14535
..	..	@@ -13944,7 +14542,9 @@
13944	14542	ci.camera = renderCamera;
13945	14543	if (!isRenderer)
13946	14544	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14545	+ //ObjEditor editWindow = object.editWindow;
	14546	+ //Object3D copy = editWindow.copy;
	14547	+ if (object.doEditClick(ci, 0))
13948	14548	{
13949	14549	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	14550	} else
..	..	@@ -13956,7 +14556,10 @@
13956	14556
13957	14557	public void mouseReleased(MouseEvent e)
13958	14558	{
	14559	+ Globals.MOUSEDRAGGED = false;
	14560	+
13959	14561	movingcamera = false;
	14562	+ X = Y = 0;
13960	14563	//System.out.println("mouseReleased: " + e);
13961	14564	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	14565	}
..	..	@@ -13979,9 +14582,9 @@
13979	14582	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	14583	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	14584
13982		- if (control \|\| command \|\| IsFrozen())
	14585	+// No delay if (control \|\| command \|\| IsFrozen())
13983	14586	timeout = true;
13984		- else
	14587	+// ?? May 2019 else
13985	14588	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	14589	mouseDown = false;
13987	14590	if (!control && !command) // june 2013
..	..	@@ -14091,7 +14694,7 @@
14091	14694	System.out.println("keyReleased: " + e);
14092	14695	}
14093	14696
14094		- void SetMouseMode(int modifiers)
	14697	+ void SetMouseMode(int modifiers, int modifiersex)
14095	14698	{
14096	14699	//System.out.println("SetMouseMode = " + modifiers);
14097	14700	//modifiers &= ~1024;
..	..	@@ -14103,25 +14706,25 @@
14103	14706	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	14707	// return;
14105	14708	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	14709	+ if ((modifiersex & WHEEL) == WHEEL)
14107	14710	{
14108	14711	mouseMode \|= ZOOM;
14109	14712	}
14110	14713
14111	14714	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	14715	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	14716	{
14114	14717	mouseMode \|= VR; // BACKFORTH;
14115	14718	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14719	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	14720	{
14118	14721	mouseMode \|= SELECT;
14119	14722	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	14723	+ if ((modifiersex & COMMAND) == COMMAND)
14121	14724	{
14122	14725	mouseMode \|= SELECT;
14123	14726	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14727	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	14728	{
14126	14729	mouseMode &= ~VR;
14127	14730	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +14753,10 @@
14150	14753
14151	14754	if (isRenderer) //
14152	14755	{
14153		- SetMouseMode(modifiers);
	14756	+ SetMouseMode(0, modifiers);
14154	14757	}
14155	14758
14156		- theRenderer.keyPressed(key);
	14759	+ Globals.theRenderer.keyPressed(key);
14157	14760	}
14158	14761
14159	14762	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +14768,7 @@
14165	14768	float SATPOW = 1; // 2; // 0.5f;
14166	14769	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	14770
14168		- void keyPressed(int key)
	14771	+ public void keyPressed(int key)
14169	14772	{
14170	14773	if (key >= '0' && key <= '5')
14171	14774	clampbit = (key-'0');
..	..	@@ -14322,8 +14925,14 @@
14322	14925	RevertCamera();
14323	14926	repaint();
14324	14927	break;
14325		- case 'L':
14326	14928	case 'l':
	14929	+ lightMode ^= true;
	14930	+ Globals.lighttouched = true;
	14931	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14932	+ targetLookAt.set(manipCamera.lookAt);
	14933	+ repaint();
	14934	+ break;
	14935	+ case 'L':
14327	14936	if (lightMode)
14328	14937	{
14329	14938	lightMode = false;
..	..	@@ -14470,23 +15079,21 @@
14470	15079	kompactbit = 6;
14471	15080	break;
14472	15081	case ' ':
14473		- lightMode ^= true;
14474		- Globals.lighttouched = true;
14475		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14476		- targetLookAt.set(manipCamera.lookAt);
	15082	+ ObjEditor.theFrame.ToggleFullScreen();
14477	15083	repaint();
14478	15084	break;
14479	15085	//case '`' :
14480	15086	case ESC:
14481	15087	RENDERPROGRAM += 1;
14482	15088	RENDERPROGRAM %= 3;
	15089	+
14483	15090	repaint();
14484	15091	break;
14485	15092	case 'Z':
14486	15093	//RESIZETEXTURE ^= true;
14487	15094	//break;
14488	15095	case 'z':
14489		- RENDERSHADOW ^= true;
	15096	+ Globals.RENDERSHADOW ^= true;
14490	15097	Globals.lighttouched = true;
14491	15098	repaint();
14492	15099	break;
..	..	@@ -14602,6 +15209,7 @@
14602	15209	}
14603	15210	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15211	}
	15212	+
14605	15213	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15214
14607	15215	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15217,11 @@
14609	15217	//mode = ROTATE;
14610	15218	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15219	{
14612		- SetMouseMode(modifiers);
	15220	+ SetMouseMode(0, modifiers);
14613	15221	}
14614	15222	}
14615	15223
14616		- protected void processKeyEvent(KeyEvent e)
	15224	+ public void processKeyEvent(KeyEvent e)
14617	15225	{
14618	15226	switch (e.getID())
14619	15227	{
..	..	@@ -14743,8 +15351,9 @@
14743	15351
14744	15352	protected void processMouseMotionEvent(MouseEvent e)
14745	15353	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15354	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15355	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15356	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15357	{
14749	15358	mouseMoved(e);
14750	15359	} else
..	..	@@ -14774,6 +15383,7 @@
14774	15383
14775	15384	void SelectParent()
14776	15385	{
	15386	+ new Exception().printStackTrace();
14777	15387	System.exit(0);
14778	15388	Composite group = (Composite) object;
14779	15389	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14797,6 +15407,7 @@
14797	15407
14798	15408	void SelectChildren()
14799	15409	{
	15410	+ new Exception().printStackTrace();
14800	15411	System.exit(0);
14801	15412	/*
14802	15413	Composite group = (Composite) object;
..	..	@@ -14961,7 +15572,9 @@
14961	15572	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	15573	//Image img = CreateImage(width, height);
14963	15574	//System.out.println("width = " + width + "; height = " + height + "\n");
	15575	+
14964	15576	Graphics gr = g; // img.getGraphics();
	15577	+
14965	15578	if (!hasMarquee)
14966	15579	{
14967	15580	if (Xmin < Xmax) // !locked)
..	..	@@ -15059,14 +15672,33 @@
15059	15672	if (!isRenderer)
15060	15673	{
15061	15674	object.drawEditHandles(info, 0);
	15675	+
	15676	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15677	+ {
	15678	+ switch (object.selection.get(0).hitSomething)
	15679	+ {
	15680	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15681	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15682	+ break;
	15683	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15684	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15685	+ break;
	15686	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15687	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15688	+ break;
	15689	+ }
	15690	+
	15691	+ }
15062	15692	}
15063	15693	}
	15694	+
15064	15695	if (isRenderer)
15065	15696	{
15066	15697	//gr.setColor(Color.black);
15067	15698	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	15699	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	15700	}
	15701	+
15070	15702	if (hasMarquee)
15071	15703	{
15072	15704	gr.setXORMode(Color.white);
..	..	@@ -15179,6 +15811,7 @@
15179	15811	public boolean mouseDown(Event evt, int x, int y)
15180	15812	{
15181	15813	System.out.println("mouseDown: " + evt);
	15814	+ System.exit(0);
15182	15815	/*
15183	15816	locked = true;
15184	15817	drag = false;
..	..	@@ -15222,7 +15855,7 @@
15222	15855	{
15223	15856	keyPressed(0, modifiers);
15224	15857	}
15225		- clickStart(x, y, modifiers);
	15858	+ // clickStart(x, y, modifiers);
15226	15859	return true;
15227	15860	}
15228	15861
..	..	@@ -15340,7 +15973,7 @@
15340	15973	{
15341	15974	keyReleased(0, 0);
15342	15975	}
15343		- drag(x, y, modifiers);
	15976	+ drag(x, y, 0, modifiers);
15344	15977	return true;
15345	15978	}
15346	15979
..	..	@@ -15472,7 +16105,7 @@
15472	16105	Object3D object;
15473	16106	static Object3D trackedobject;
15474	16107	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16108	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16109	/static/ Camera eyeCamera;
15477	16110	/static/ Camera lightCamera;
15478	16111	int cameracount;
..	..	@@ -15757,16 +16390,16 @@
15757	16390	cStatic.objectstack[materialdepth++] = checker;
15758	16391	//System.out.println("material " + material);
15759	16392	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16393	+ //vector2buffer = checker.projectedVertices;
15761	16394
15762	16395	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16396	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16397
15765	16398	materialdepth -= 1;
15766	16399	if (materialdepth > 0)
15767	16400	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16401	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16402	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16403	}
15771	16404	//checker.GetMaterial().opacity = 1f;
15772	16405	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15910,6 +16543,7 @@
15910	16543	{
15911	16544	if (!selection)
15912	16545	{
	16546	+ new Exception().printStackTrace();
15913	16547	System.exit(0);
15914	16548	return;
15915	16549	}
..	..	@@ -15989,6 +16623,8 @@
15989	16623	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	16624	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
15991	16625
	16626	+ CreateSelectedPoint();
	16627	+
15992	16628	// Will fit the mesh !!!
15993	16629	selectedpoint.toParent[0][0] = 0.0001;
15994	16630	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16037,16 +16673,16 @@
16037	16673	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	16674	}
16039	16675
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16676	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	16677	}
16042	16678	}
16043	16679
16044	16680	if (!movingcamera && !PAINTMODE)
16045	16681	object.editWindow.ScreenFitPoint(); // fev 2014
16046	16682
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16683	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	16684	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16685	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	16686
16051	16687	Object3D group = new Object3D("inst" + paintcount++);
16052	16688
..	..	@@ -16202,7 +16838,7 @@
16202	16838	gl.glDisable(gl.GL_CULL_FACE);
16203	16839	}
16204	16840
16205		- if (!RENDERSHADOW)
	16841	+ if (!Globals.RENDERSHADOW)
16206	16842	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	16843
16208	16844	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +16848,7 @@
16212	16848	//gl.glColorMask(false, false, false, false);
16213	16849
16214	16850	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16851	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	16852	{
16217	16853	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	16854
..	..	@@ -16628,23 +17264,15 @@
16628	17264	int AAbuffersize = 0;
16629	17265
16630	17266	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17267	+ static Superellipsoid selectedpoint;
16632	17268	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();
	17269	+ static Sphere debugpointG;
	17270	+ static Sphere debugpointP;
	17271	+ static Sphere debugpointC;
	17272	+ static Sphere debugpointR;
16637	17273
16638	17274	static Sphere debugpoints[] = new Sphere[8];
16639	17275
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17276	static void InitPoints(float radius)
16649	17277	{
16650	17278	for (int i=0; i<8; i++)
..	..	@@ -16696,10 +17324,11 @@
16696	17324	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17325	// Depth buffer format
16698	17326	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17327	+
	17328	+ public void NextIndex()
16700	17329	{
16701	17330	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17331	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17332	//objects[indexcount] = o;
16704	17333	//System.out.println("indexcount = " + indexcount);
16705	17334	}