~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,6 +149,8 @@
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
152	151
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
153	154	void SetAsGLRenderer(boolean b)
154	155	{
155	156	isRenderer = b;
..	..	@@ -191,9 +192,43 @@
191	192
192	193	/// INTERFACE
193	194
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
194	224	public boolean IsBoxMode()
195	225	{
196	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
197	232	}
198	233
199	234	public void ClearDepth()
..	..	@@ -291,7 +326,7 @@
291	326	cStatic.objectstack[materialdepth++] = obj;
292	327	//System.out.println("material " + material);
293	328	//Applet3D.tracein(this, selected);
294		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
295	330	if (obj instanceof Camera)
296	331	{
297	332	display.options1[0] = material.shift;
..	..	@@ -300,14 +335,28 @@
300	335	display.options1[2] = material.shadowbias;
301	336	display.options1[3] = material.aniso;
302	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
303	343	display.options2[0] = material.opacity;
304	344	display.options2[1] = material.diffuse;
305	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
306	349
307	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
308	354	display.options4[0] = material.cameralight/0.2f;
309	355	display.options4[1] = material.subsurface;
310	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
311	360
312	361	// if (display.CURRENTANTIALIAS > 0)
313	362	// display.options3[3] /= 4;
..	..	@@ -323,7 +372,7 @@
323	372	/**/
324	373	} else
325	374	{
326		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
327	376	}
328	377	} else
329	378	{
..	..	@@ -347,8 +396,8 @@
347	396	cStatic.objectstack[materialdepth++] = obj;
348	397	//System.out.println("material " + material);
349	398	//Applet3D.tracein("selected ", selected);
350		- display.vector2buffer = obj.projectedVertices;
351		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
352	401	}
353	402	}
354	403
..	..	@@ -365,8 +414,8 @@
365	414	materialdepth -= 1;
366	415	if (materialdepth > 0)
367	416	{
368		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
370	419	}
371	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -386,8 +435,8 @@
386	435	materialdepth -= 1;
387	436	if (materialdepth > 0)
388	437	{
389		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
391	440	}
392	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393	442	//else
..	..	@@ -428,10 +477,12 @@
428	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429	478	{
430	479	//gl.glBegin(gl.GL_TRIANGLES);
431		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
432	483	if (!hasnorm)
433	484	{
434		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
435	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
436	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
437	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1059,7 +1110,342 @@
1059	1110	gl.glMatrixMode(gl.GL_MODELVIEW);
1060	1111	}
1061	1112
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
1062	1421	/// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
1063	1449
1064	1450	void SetColor(Object3D obj, Vertex p0)
1065	1451	{
..	..	@@ -1238,7 +1624,7 @@
1238	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1239	1625	}
1240	1626
1241		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1242	1628	{
1243	1629	CameraPane display = this;
1244	1630	//new Exception().printStackTrace();
..	..	@@ -1254,18 +1640,18 @@
1254	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255	1641	if (!material.multiply)
1256	1642	{
1257		- display.color = color;
	1643	+ display.color = material.color;
1258	1644	display.saturation = material.modulation;
1259	1645	}
1260	1646	else
1261	1647	{
1262		- display.color = color2;
	1648	+ display.color = material.color2;
1263	1649	display.saturation = material.modulation2;
1264	1650	}
1265	1651
1266	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267	1653
1268		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1269	1655
1270	1656	/**/
1271	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1273,7 +1659,7 @@
1273	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1274	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1275	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1276		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1277	1663
1278	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1279	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1381,9 +1767,9 @@
1381	1767	display.modelParams7[2] = 0;
1382	1768	display.modelParams7[3] = 0;
1383	1769
1384		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1385	1771
1386		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1387	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1388	1774	{
1389	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1525,7 +1911,7 @@
1525	1911	void PushMatrix(double[][] matrix)
1526	1912	{
1527	1913	// GrafreeD.tracein(matrix);
1528		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1529	1915	}
1530	1916
1531	1917	void PushMatrix()
..	..	@@ -1777,7 +2163,7 @@
1777	2163	System.err.println("LIVE = " + Globals.isLIVE());
1778	2164
1779	2165	if (!Globals.isLIVE()) // save sound
1780		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
1781	2167	// else
1782	2168	repaint(); // start loop // may 2013
1783	2169	}
..	..	@@ -1810,6 +2196,11 @@
1810	2196	public void ToggleBoxMode()
1811	2197	{
1812	2198	BOXMODE ^= true;
	2199	+ }
	2200	+
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
1813	2204	}
1814	2205
1815	2206	public void ToggleSmoothFocus()
..	..	@@ -1889,7 +2280,7 @@
1889	2280
1890	2281	void ToggleDebug()
1891	2282	{
1892		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
1893	2284	}
1894	2285
1895	2286	void ToggleLookAt()
..	..	@@ -1897,9 +2288,9 @@
1897	2288	LOOKAT ^= true;
1898	2289	}
1899	2290
1900		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1901	2292	{
1902		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1903	2294	}
1904	2295
1905	2296	void ToggleHandles()
..	..	@@ -2006,7 +2397,129 @@
2006	2397	{
2007	2398	return currentGL;
2008	2399	}
2009		-
	2400	+
	2401	+ private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2402	+ {
	2403	+ java.net.URL u;
	2404	+ InputStream is = null;
	2405	+ DataInputStream dis;
	2406	+ java.util.zip.ZipInputStream zis;
	2407	+ //String s;
	2408	+
	2409	+ System.out.println("GetRemoteZip " + name);
	2410	+
	2411	+ int total = 0; // dis.available();
	2412	+
	2413	+ byte[] bytes = new byte[16384];
	2414	+
	2415	+ try
	2416	+ {
	2417	+ u = new java.net.URL(url + name);
	2418	+ is = u.openStream();
	2419	+
	2420	+ System.out.println(url + name);
	2421	+
	2422	+ if (unzip)
	2423	+ {
	2424	+ //dis = new DataInputStream(new BufferedInputStream(is));
	2425	+ zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
	2426	+ //while ((s = dis.readLine()) != null)
	2427	+
	2428	+ if (save)
	2429	+ new java.io.File(name).mkdirs();
	2430	+
	2431	+ // FileOutputStream stream = new FileOutputStream("test.zip");
	2432	+ //
	2433	+ // int count;
	2434	+ //
	2435	+ // while ((count = dis.read(bytes)) != -1)
	2436	+ // {
	2437	+ // //System.out.println(s);
	2438	+ // System.out.println(count);
	2439	+ // total += count;
	2440	+ // stream.write(bytes);
	2441	+ // }
	2442	+ //
	2443	+ // stream.close();
	2444	+
	2445	+ // now iterate through each item in the stream. The get next
	2446	+ // entry call will return a ZipEntry for each file in the
	2447	+ // stream
	2448	+ java.util.zip.ZipEntry entry;
	2449	+ while((entry = zis.getNextEntry())!=null)
	2450	+ {
	2451	+ if (entry.getName().endsWith(".gsm"))
	2452	+ {
	2453	+ continue;
	2454	+ }
	2455	+
	2456	+ String s = String.format("Entry: %s len %d added %TD",
	2457	+ entry.getName(), entry.getSize(),
	2458	+ new java.util.Date(entry.getTime()));
	2459	+ System.out.println(s);
	2460	+
	2461	+ if (save)
	2462	+ {
	2463	+ // Once we get the entry from the stream, the stream is
	2464	+ // positioned read to read the raw data, and we keep
	2465	+ // reading until read returns 0 or less.
	2466	+ String outpath = name + "/" + entry.getName();
	2467	+ FileOutputStream output = null;
	2468	+ try
	2469	+ {
	2470	+ output = new FileOutputStream(outpath);
	2471	+ int len = 0;
	2472	+ while ((len = zis.read(bytes)) > 0)
	2473	+ {
	2474	+ output.write(bytes, 0, len);
	2475	+ }
	2476	+ }
	2477	+ finally
	2478	+ {
	2479	+ // we must always close the output file
	2480	+ if(output!=null) output.close();
	2481	+ }
	2482	+ }
	2483	+ }
	2484	+ }
	2485	+ }
	2486	+ catch (java.net.MalformedURLException mue)
	2487	+ {
	2488	+ System.err.println("Ouch - a MalformedURLException happened.");
	2489	+ mue.printStackTrace();
	2490	+ //System.exit(2);
	2491	+ }
	2492	+ catch (IOException ioe)
	2493	+ {
	2494	+ //System.err.println("Oops - an IOException happened.");
	2495	+ //ioe.printStackTrace();
	2496	+ //System.exit(3);
	2497	+ }
	2498	+ finally
	2499	+ {
	2500	+ try
	2501	+ {
	2502	+ if (is != null)
	2503	+ is.close();
	2504	+ }
	2505	+ catch (IOException ioe)
	2506	+ {
	2507	+ }
	2508	+ }
	2509	+
	2510	+ // System.out.println("length = " + total);
	2511	+
	2512	+// try
	2513	+// {
	2514	+// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
	2515	+// }
	2516	+// catch (Exception e)
	2517	+// {
	2518	+// e.printStackTrace();
	2519	+// }
	2520	+
	2521	+ }
	2522	+
2010	2523	/**/
2011	2524	class CacheTexture
2012	2525	{
..	..	@@ -3838,6 +4351,7 @@
3838	4351
3839	4352	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4353	{
	4354	+ new Exception().printStackTrace();
3841	4355	System.exit(0);
3842	4356	com.sun.opengl.util.texture.Texture texture = null;
3843	4357
..	..	@@ -7550,6 +8064,64 @@
7550	8064	ReleaseTexture(pigment, false);
7551	8065	}
7552	8066
	8067	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8068	+ {
	8069	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8070	+ {
	8071	+ return;
	8072	+ }
	8073	+
	8074	+ if (tex == null)
	8075	+ {
	8076	+ ReleaseTexture(null, false);
	8077	+ return;
	8078	+ }
	8079	+
	8080	+ String pigment = Object3D.GetPigment(tex);
	8081	+
	8082	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8083	+ {
	8084	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8085	+ // System.out.println("; bump = " + bump);
	8086	+ }
	8087	+
	8088	+ if (pigment.equals(""))
	8089	+ {
	8090	+ pigment = null;
	8091	+ }
	8092	+
	8093	+ ReleaseTexture(pigment, false);
	8094	+ }
	8095	+
	8096	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8097	+ {
	8098	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8099	+ {
	8100	+ return;
	8101	+ }
	8102	+
	8103	+ if (tex == null)
	8104	+ {
	8105	+ ReleaseTexture(null, true);
	8106	+ return;
	8107	+ }
	8108	+
	8109	+ String bump = Object3D.GetBump(tex);
	8110	+
	8111	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8112	+ {
	8113	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8114	+ // System.out.println("; bump = " + bump);
	8115	+ }
	8116	+
	8117	+ if (bump.equals(""))
	8118	+ {
	8119	+ bump = null;
	8120	+ }
	8121	+
	8122	+ ReleaseTexture(bump, true);
	8123	+ }
	8124	+
7553	8125	void ReleaseTexture(String tex, boolean bump)
7554	8126	{
7555	8127	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7653,7 +8225,7 @@
7653	8225	}
7654	8226	}
7655	8227
7656		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8228	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7657	8229	{
7658	8230	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8231	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7698,7 +8270,94 @@
7698	8270	return; // true;
7699	8271	}
7700	8272
7701		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8273	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,false,resolution);
	8284	+ return;
	8285	+ }
	8286	+
	8287	+ String pigment = Object3D.GetPigment(tex);
	8288	+
	8289	+ usedtextures.put(pigment, pigment);
	8290	+
	8291	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8292	+ {
	8293	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8294	+ // System.out.println("; bump = " + bump);
	8295	+ }
	8296	+
	8297	+ if (pigment.equals(""))
	8298	+ {
	8299	+ pigment = null;
	8300	+ }
	8301	+
	8302	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8303	+ BindTexture(pigment, false, resolution);
	8304	+ }
	8305	+
	8306	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8307	+ {
	8308	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8309	+ ambientOcclusion ) // \|\| !textureon)
	8310	+ {
	8311	+ return; // false;
	8312	+ }
	8313	+
	8314	+ if (tex == null)
	8315	+ {
	8316	+ BindTexture(null,true,resolution);
	8317	+ return;
	8318	+ }
	8319	+
	8320	+ String bump = Object3D.GetBump(tex);
	8321	+
	8322	+ usedtextures.put(bump, bump);
	8323	+
	8324	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8325	+ {
	8326	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8327	+ // System.out.println("; bump = " + bump);
	8328	+ }
	8329	+
	8330	+ if (bump.equals(""))
	8331	+ {
	8332	+ bump = null;
	8333	+ }
	8334	+
	8335	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8336	+ BindTexture(bump, true, resolution);
	8337	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8338	+ }
	8339	+
	8340	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8341	+
	8342	+ private boolean FileExists(String tex)
	8343	+ {
	8344	+ if (missingTextures.contains(tex))
	8345	+ {
	8346	+ return false;
	8347	+ }
	8348	+
	8349	+ boolean fileExists = new File(tex).exists();
	8350	+
	8351	+ if (!fileExists)
	8352	+ {
	8353	+ // If file exists, the "new File()" is not executed sgain
	8354	+ missingTextures.add(tex);
	8355	+ }
	8356	+
	8357	+ return fileExists;
	8358	+ }
	8359	+
	8360	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7702	8361	{
7703	8362	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7704	8363
..	..	@@ -7706,12 +8365,18 @@
7706	8365	{
7707	8366	String texname = tex;
7708	8367
7709		- String[] split = tex.split("Textures");
7710		- if (split.length > 1)
7711		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7712		- else
7713		- if (!texname.startsWith("/"))
7714		- texname = "/Users/nbriere/Textures/" + texname;
	8368	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8369	+
	8370	+// String[] split = tex.split("Textures");
	8371	+// if (split.length > 1)
	8372	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8373	+// else
	8374	+// if (!texname.startsWith("/"))
	8375	+// texname = "/Users/nbriere/Textures/" + texname;
	8376	+ if (!FileExists(tex))
	8377	+ {
	8378	+ texname = fallbackTextureName;
	8379	+ }
7715	8380
7716	8381	if (CACHETEXTURE)
7717	8382	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7780,7 +8445,7 @@
7780	8445	}
7781	8446
7782	8447	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8448	+ if (!FileExists(cachename))
7784	8449	cachename = texname;
7785	8450	else
7786	8451	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8467,7 @@
7802	8467	}
7803	8468
7804	8469	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8470	+ if (!FileExists(cachename))
7806	8471	cachename = texname;
7807	8472	else
7808	8473	processbump = false; // don't process bump map again
..	..	@@ -7811,7 +8476,9 @@
7811	8476	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8477
7813	8478
7814		- if (texturedata != null)
	8479	+ if (texturedata == null)
	8480	+ throw new Exception();
	8481	+
7815	8482	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7816	8483	//texture = GetTexture(tex, bump);
7817	8484	}
..	..	@@ -7933,7 +8600,7 @@
7933	8600	return texture;
7934	8601	}
7935	8602
7936		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7937	8604	{
7938	8605	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939	8606
..	..	@@ -7951,14 +8618,14 @@
7951	8618	return texture!=null?texture.texture:null;
7952	8619	}
7953	8620
7954		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8621	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7955	8622	{
7956	8623	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957	8624
7958	8625	return texture!=null?texture.texturedata:null;
7959	8626	}
7960	8627
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8628	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7962	8629	{
7963	8630	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8631	{
..	..	@@ -8835,11 +9502,35 @@
8835	9502	jy8[3] = 0.5f;
8836	9503	}
8837	9504
8838		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9505	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8839	9506	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9507	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9508	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	9509
	9510	+ void ResetOptions()
	9511	+ {
	9512	+ options1[0] = 100;
	9513	+ options1[1] = 0.025f;
	9514	+ options1[2] = 0.01f;
	9515	+ options1[3] = 0;
	9516	+ options1[4] = 0;
	9517	+
	9518	+ options2[0] = 0;
	9519	+ options2[1] = 0.75f;
	9520	+ options2[2] = 0;
	9521	+ options2[3] = 0;
	9522	+
	9523	+ options3[0] = 1;
	9524	+ options3[1] = 1;
	9525	+ options3[2] = 1;
	9526	+ options3[3] = 0;
	9527	+
	9528	+ options4[0] = 1;
	9529	+ options4[1] = 0;
	9530	+ options4[2] = 1;
	9531	+ options4[3] = 0;
	9532	+ }
	9533	+
8843	9534	static int imagecount = 0; // movie generation
8844	9535
8845	9536	static int jitter = 0;
..	..	@@ -8935,8 +9626,8 @@
8935	9626	assert (parentcam != renderCamera);
8936	9627
8937	9628	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9629	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9630	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8940	9631
8941	9632	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9633
..	..	@@ -8951,8 +9642,8 @@
8951	9642	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9643
8953	9644	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9645	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9646	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8956	9647
8957	9648	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9649
..	..	@@ -9024,7 +9715,7 @@
9024	9715	//gl.glFlush();
9025	9716	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9717
9027		- if (ANIMATION && ABORTED)
	9718	+ if (Globals.ANIMATION && ABORTED)
9028	9719	{
9029	9720	System.err.println(" ABORTED FRAME");
9030	9721	break;
..	..	@@ -9054,7 +9745,7 @@
9054	9745	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9746
9056	9747	// save image
9057		- if (ANIMATION && !ABORTED)
	9748	+ if (Globals.ANIMATION && !ABORTED)
9058	9749	{
9059	9750	VPwidth = viewport[2];
9060	9751	VPheight = viewport[3];
..	..	@@ -9165,11 +9856,11 @@
9165	9856
9166	9857	// imagecount++;
9167	9858
9168		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9859	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9169	9860
9170	9861	if (!BOXMODE)
9171	9862	{
9172		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9863	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9173	9864	}
9174	9865
9175	9866	if (!BOXMODE)
..	..	@@ -9207,7 +9898,7 @@
9207	9898	ABORTED = false;
9208	9899	}
9209	9900	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9901	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	9902
9212	9903	if (false)
9213	9904	{
..	..	@@ -9870,11 +10561,11 @@
9870	10561
9871	10562	public void display(GLAutoDrawable drawable)
9872	10563	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10564	+ if (Grafreed.savesound && Grafreed.hassound)
9874	10565	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10566	+ Grafreed.wav.save();
	10567	+ Grafreed.savesound = false;
	10568	+ Grafreed.hassound = false;
9878	10569	}
9879	10570	// if (DEBUG_SELECTION)
9880	10571	// {
..	..	@@ -9950,6 +10641,7 @@
9950	10641	ANTIALIAS = 0;
9951	10642	//System.out.println("RESTART");
9952	10643	AAtimer.restart();
	10644	+ Globals.TIMERRUNNING = true;
9953	10645	}
9954	10646	}
9955	10647	}
..	..	@@ -10004,7 +10696,7 @@
10004	10696	Object3D theobject = object;
10005	10697	Object3D theparent = object.parent;
10006	10698	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10699	+ object = (Object3D)Grafreed.clone(object);
10008	10700	object.Stripify();
10009	10701	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10702	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10709,14 @@
10017	10709	ambientOcclusion = false;
10018	10710	}
10019	10711
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10712	+ if (//Globals.lighttouched &&
	10713	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10714	{
10022	10715	//if (RENDERSHADOW) // ?
10023	10716	if (!IsFrozen())
10024	10717	{
10025	10718	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10719	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10720	{
10028	10721	Globals.framecount++;
10029	10722	shadowbuffer.display();
..	..	@@ -10150,8 +10843,8 @@
10150	10843
10151	10844	// if (parentcam != renderCamera) // not a light
10152	10845	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10846	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10847	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10155	10848
10156	10849	for (int j = 0; j < 4; j++)
10157	10850	{
..	..	@@ -10165,8 +10858,8 @@
10165	10858
10166	10859	// if (parentcam != renderCamera) // not a light
10167	10860	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10861	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10862	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10170	10863
10171	10864	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	10865
..	..	@@ -10425,7 +11118,16 @@
10425	11118	// Bump noise
10426	11119	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11120	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- BindTexture(NOISE_TEXTURE, false, 2);
	11121	+
	11122	+ try
	11123	+ {
	11124	+ BindTexture(NOISE_TEXTURE, false, 2);
	11125	+ }
	11126	+ catch (Exception e)
	11127	+ {
	11128	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11129	+ }
	11130	+
10429	11131
10430	11132	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11133	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10550,8 +11252,8 @@
10550	11252	System.err.println("parentcam != renderCamera");
10551	11253
10552	11254	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11255	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11256	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10555	11257	}
10556	11258
10557	11259	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11274,8 @@
10572	11274	if (true) // TODO
10573	11275	{
10574	11276	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11277	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11278	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10577	11279	}
10578	11280
10579	11281	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10889,8 +11591,14 @@
10889	11591	{
10890	11592	renderpass++;
10891	11593	// System.out.println("Draw object... ");
	11594	+ STEP = 1;
10892	11595	if (FAST) // in case there is no script
10893		- STEP = 16;
	11596	+ STEP = 8;
	11597	+
	11598	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11599	+ {
	11600	+ STEP *= 4;
	11601	+ }
10894	11602
10895	11603	//object.FullInvariants();
10896	11604
..	..	@@ -10904,16 +11612,37 @@
10904	11612	e.printStackTrace();
10905	11613	}
10906	11614
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11615	+ if (Grafreed.RENDERME > 0)
	11616	+ Grafreed.RENDERME--; // mechante magouille
10909	11617
10910	11618	Globals.ONESTEP = false;
10911	11619	}
10912	11620
10913	11621	static boolean zoomonce = false;
10914	11622
	11623	+ static void CreateSelectedPoint()
	11624	+ {
	11625	+ if (selectedpoint == null)
	11626	+ {
	11627	+ debugpointG = new Sphere();
	11628	+ debugpointP = new Sphere();
	11629	+ debugpointC = new Sphere();
	11630	+ debugpointR = new Sphere();
	11631	+
	11632	+ selectedpoint = new Superellipsoid();
	11633	+
	11634	+ for (int i=0; i<8; i++)
	11635	+ {
	11636	+ debugpoints[i] = new Sphere();
	11637	+ }
	11638	+ }
	11639	+ }
	11640	+
10915	11641	void DrawObject(GL gl, boolean draw)
10916	11642	{
	11643	+ // To clear camera values
	11644	+ ResetOptions();
	11645	+
10917	11646	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11647	// DrawMode() = SELECTION;
10919	11648	//GL gl = getGL();
..	..	@@ -10975,7 +11704,14 @@
10975	11704
10976	11705	usedtextures.clear();
10977	11706
10978		- BindTextures(DEFAULT_TEXTURES, 2);
	11707	+ try
	11708	+ {
	11709	+ BindTextures(DEFAULT_TEXTURES, 2);
	11710	+ }
	11711	+ catch (Exception e)
	11712	+ {
	11713	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11714	+ }
10979	11715	}
10980	11716	//System.out.println("--> " + stackdepth);
10981	11717	// GrafreeD.traceon();
..	..	@@ -10985,8 +11721,9 @@
10985	11721
10986	11722	if (DrawMode() == DEFAULT)
10987	11723	{
10988		- if (DEBUG)
	11724	+ if (Globals.DEBUG)
10989	11725	{
	11726	+ CreateSelectedPoint();
10990	11727	float radius = 0.05f;
10991	11728	if (selectedpoint.radius != radius)
10992	11729	{
..	..	@@ -11066,7 +11803,14 @@
11066	11803	if (checker != null && DrawMode() == DEFAULT)
11067	11804	{
11068	11805	//BindTexture(IMMORTAL_TEXTURE);
11069		- BindTextures(checker.GetTextures(), checker.texres);
	11806	+ try
	11807	+ {
	11808	+ BindTextures(checker.GetTextures(), checker.texres);
	11809	+ }
	11810	+ catch (Exception e)
	11811	+ {
	11812	+ System.err.println("FAILED: " + checker.GetTextures());
	11813	+ }
11070	11814	// NEAREST
11071	11815	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11816	DrawChecker(gl);
..	..	@@ -11148,7 +11892,7 @@
11148	11892	return;
11149	11893	}
11150	11894
11151		- String string = obj.GetToolTip();
	11895	+ String string = obj.toString(); //.GetToolTip();
11152	11896
11153	11897	GL gl = GetGL();
11154	11898
..	..	@@ -11465,8 +12209,8 @@
11465	12209	//obj.TransformToWorld(light, light);
11466	12210	for (int i = tp.size(); --i >= 0;)
11467	12211	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- LA.xformPos(light, tp.get(i).toParent, light);
	12212	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12213	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11470	12214	}
11471	12215
11472	12216
..	..	@@ -11483,8 +12227,8 @@
11483	12227	parentcam = cameras[0];
11484	12228	}
11485	12229
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12230	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12231	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11488	12232
11489	12233	LA.xformPos(light, renderCamera.toScreen, light);
11490	12234
..	..	@@ -12098,8 +12842,8 @@
12098	12842
12099	12843	// display shadow only (bump == 0)
12100	12844	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	12845	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12846	+ "SLT temp.z, temp.y, -one2048th.x;" +
12103	12847	"SUB temp.y, one.x, temp.z;" +
12104	12848	"MUL temp.x, temp.x, temp.y;" +
12105	12849	"KIL temp.x;" +
..	..	@@ -12228,8 +12972,10 @@
12228	12972	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	12973
12230	12974	"SUB temp.x, one.x, ndotl.x;" +
12231		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12232		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12975	+ // Tuning for default skin
	12976	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12977	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12978	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12233	12979	"MUL temp.x, temp.x, temp.y;" +
12234	12980
12235	12981	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,7 +13174,7 @@
12428	13174	//once = true;
12429	13175	}
12430	13176
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
	13177	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432	13178	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433	13179	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13180
..	..	@@ -12561,12 +13307,16 @@
12561	13307
12562	13308	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13309	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13310	+
	13311	+ // Compare fragment depth in light space with shadowmap.
12564	13312	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13313	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13314	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13315	+
	13316	+ // Reverse comparison
12567	13317	"SUB temp.x, one.x, temp.x;" +
12568	13318	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13319	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13320	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13321
12572	13322	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13330,10 @@
12580	13330	// No shadow for backface
12581	13331	"DP3 temp.x, normal, lightd;" +
12582	13332	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13333	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13334	+
	13335	+ // No shadow when out of frustrum
	13336	+ "SGE temp.x, " + depth + ".z, one.z;" +
12583	13337	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13338	"";
12585	13339	}
..	..	@@ -12726,7 +13480,8 @@
12726	13480	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13481	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13482	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13483	+
	13484	+ //Object3D.cVector2[] vector2buffer;
12730	13485
12731	13486	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13487	// OUT : diff, spec
..	..	@@ -12742,9 +13497,10 @@
12742	13497	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13498	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13499	//"MOV " + dest + ".w," + "normal.z;" +
12745		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12746		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12747		- //"MOV " + dest + ".z," + "params2.w;" +
	13500	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13501	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13502	+
	13503	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12748	13504	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13505	"RCP " + dest + ".w," + dest + ".w;" +
12750	13506	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13138,7 +13894,7 @@
13138	13894	public void mousePressed(MouseEvent e)
13139	13895	{
13140	13896	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13897	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	13898	}
13143	13899
13144	13900	static long prevtime = 0;
..	..	@@ -13165,6 +13921,7 @@
13165	13921
13166	13922	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	13923
	13924	+ if (BUTTONLESSWHEEL)
13168	13925	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	13926	{
13170	13927	return;
..	..	@@ -13173,7 +13930,7 @@
13173	13930	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	13931
13175	13932	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13933	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	13934	{
13178	13935	keepboxmode = BOXMODE;
13179	13936	keepsupport = SUPPORT;
..	..	@@ -13213,8 +13970,8 @@
13213	13970	// mode \|= META;
13214	13971	//}
13215	13972
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13973	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13974	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	13975	anchorX = ax;
13219	13976	anchorY = ay;
13220	13977	prevX = px;
..	..	@@ -13248,6 +14005,7 @@
13248	14005	else
13249	14006	if (evt.getSource() == AAtimer)
13250	14007	{
	14008	+ Globals.TIMERRUNNING = false;
13251	14009	if (mouseDown)
13252	14010	{
13253	14011	//new Exception().printStackTrace();
..	..	@@ -13273,6 +14031,10 @@
13273	14031	// LIVE = waslive;
13274	14032	// wasliveok = true;
13275	14033	// waslive = false;
	14034	+
	14035	+ // May 2019 Forget it:
	14036	+ if (true)
	14037	+ return;
13276	14038
13277	14039	// source == timer
13278	14040	if (mouseDown)
..	..	@@ -13312,12 +14074,13 @@
13312	14074
13313	14075	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	14076
13315		- void clickStart(int x, int y, int modifiers)
	14077	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	14078	{
13317	14079	if (!wasliveok)
13318	14080	return;
13319	14081
13320	14082	AAtimer.restart(); //
	14083	+ Globals.TIMERRUNNING = true;
13321	14084
13322	14085	// waslive = LIVE;
13323	14086	// LIVE = false;
..	..	@@ -13329,7 +14092,7 @@
13329	14092	// touched = true; // main DL
13330	14093	if (isRenderer)
13331	14094	{
13332		- SetMouseMode(modifiers);
	14095	+ SetMouseMode(modifiers, modifiersex);
13333	14096	}
13334	14097
13335	14098	selectX = anchorX = x;
..	..	@@ -13342,7 +14105,7 @@
13342	14105	clicked = true;
13343	14106	hold = false;
13344	14107
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14108	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	14109	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	14110	{
13348	14111	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13373,7 +14136,7 @@
13373	14136	info.camera = renderCamera;
13374	14137	info.x = x;
13375	14138	info.y = y;
13376		- info.modifiers = modifiers;
	14139	+ info.modifiers = modifiersex;
13377	14140	editObj = object.doEditClick(info, 0);
13378	14141	if (!editObj)
13379	14142	{
..	..	@@ -13390,11 +14153,14 @@
13390	14153
13391	14154	public void mouseDragged(MouseEvent e)
13392	14155	{
	14156	+ Globals.MOUSEDRAGGED = true;
	14157	+
	14158	+ //System.out.println("mouseDragged: " + e);
13393	14159	if (isRenderer)
13394	14160	movingcamera = true;
	14161	+
13395	14162	//if (drawing)
13396	14163	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	14164	if ((e.getModifiersEx() & CTRL) != 0
13399	14165	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14166	{
..	..	@@ -13402,7 +14168,7 @@
13402	14168	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14169	}
13404	14170	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14171	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14172
13407	14173	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14174	}
..	..	@@ -13575,6 +14341,7 @@
13575	14341
13576	14342	public void run()
13577	14343	{
	14344	+ new Exception().printStackTrace();
13578	14345	System.exit(0);
13579	14346	for (;;)
13580	14347	{
..	..	@@ -13638,7 +14405,7 @@
13638	14405	{
13639	14406	Globals.lighttouched = true;
13640	14407	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14408	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14409	}
13643	14410	//else
13644	14411	}
..	..	@@ -13738,7 +14505,7 @@
13738	14505	int X, Y;
13739	14506	boolean SX, SY;
13740	14507
13741		- void drag(int x, int y, int modifiers)
	14508	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14509	{
13743	14510	if (IsFrozen())
13744	14511	{
..	..	@@ -13747,17 +14514,17 @@
13747	14514
13748	14515	drag = true; // NEW
13749	14516
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14517	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14518
13752	14519	X = x;
13753	14520	Y = y;
13754	14521	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14522	+ MODIFIERS = modifiersex;
	14523	+ modifiersex &= ~1024;
13757	14524	if (false) // modifiers != 0)
13758	14525	{
13759	14526	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14527	+ System.out.println("mouseDragged: " + modifiersex);
13761	14528	System.out.println("SHIFT = " + SHIFT);
13762	14529	System.out.println("CONTROL = " + COMMAND);
13763	14530	System.out.println("META = " + META);
..	..	@@ -13777,7 +14544,8 @@
13777	14544	info.camera = renderCamera;
13778	14545	info.x = x;
13779	14546	info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14547	+ object.GetWindow().copy
	14548	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14549	} else
13782	14550	{
13783	14551	if (x < startX)
..	..	@@ -13929,7 +14697,6 @@
13929	14697	public void mouseMoved(MouseEvent e)
13930	14698	{
13931	14699	//System.out.println("mouseMoved: " + e);
13932		-
13933	14700	if (isRenderer)
13934	14701	return;
13935	14702
..	..	@@ -13942,7 +14709,9 @@
13942	14709	ci.camera = renderCamera;
13943	14710	if (!isRenderer)
13944	14711	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	14712	+ //ObjEditor editWindow = object.editWindow;
	14713	+ //Object3D copy = editWindow.copy;
	14714	+ if (object.doEditClick(ci, 0))
13946	14715	{
13947	14716	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	14717	} else
..	..	@@ -13954,7 +14723,10 @@
13954	14723
13955	14724	public void mouseReleased(MouseEvent e)
13956	14725	{
	14726	+ Globals.MOUSEDRAGGED = false;
	14727	+
13957	14728	movingcamera = false;
	14729	+ X = Y = 0;
13958	14730	//System.out.println("mouseReleased: " + e);
13959	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	14732	}
..	..	@@ -13977,9 +14749,9 @@
13977	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	14751
13980		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
13981	14753	timeout = true;
13982		- else
	14754	+// ?? May 2019 else
13983	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	14756	mouseDown = false;
13985	14757	if (!control && !command) // june 2013
..	..	@@ -14089,7 +14861,7 @@
14089	14861	System.out.println("keyReleased: " + e);
14090	14862	}
14091	14863
14092		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
14093	14865	{
14094	14866	//System.out.println("SetMouseMode = " + modifiers);
14095	14867	//modifiers &= ~1024;
..	..	@@ -14101,25 +14873,25 @@
14101	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	14874	// return;
14103	14875	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
14105	14877	{
14106	14878	mouseMode \|= ZOOM;
14107	14879	}
14108	14880
14109	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	14883	{
14112	14884	mouseMode \|= VR; // BACKFORTH;
14113	14885	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	14887	{
14116	14888	mouseMode \|= SELECT;
14117	14889	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
14119	14891	{
14120	14892	mouseMode \|= SELECT;
14121	14893	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	14895	{
14124	14896	mouseMode &= ~VR;
14125	14897	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +14920,7 @@
14148	14920
14149	14921	if (isRenderer) //
14150	14922	{
14151		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
14152	14924	}
14153	14925
14154	14926	Globals.theRenderer.keyPressed(key);
..	..	@@ -14320,8 +15092,14 @@
14320	15092	RevertCamera();
14321	15093	repaint();
14322	15094	break;
14323		- case 'L':
14324	15095	case 'l':
	15096	+ lightMode ^= true;
	15097	+ Globals.lighttouched = true;
	15098	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15099	+ targetLookAt.set(manipCamera.lookAt);
	15100	+ repaint();
	15101	+ break;
	15102	+ case 'L':
14325	15103	if (lightMode)
14326	15104	{
14327	15105	lightMode = false;
..	..	@@ -14464,27 +15242,25 @@
14464	15242	case '_':
14465	15243	kompactbit = 5;
14466	15244	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15245	+// case '+':
	15246	+// kompactbit = 6;
	15247	+// break;
14470	15248	case ' ':
14471		- lightMode ^= true;
14472		- Globals.lighttouched = true;
14473		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14474		- targetLookAt.set(manipCamera.lookAt);
	15249	+ ObjEditor.theFrame.ToggleFullScreen();
14475	15250	repaint();
14476	15251	break;
14477	15252	//case '`' :
14478	15253	case ESC:
14479	15254	RENDERPROGRAM += 1;
14480	15255	RENDERPROGRAM %= 3;
	15256	+
14481	15257	repaint();
14482	15258	break;
14483	15259	case 'Z':
14484	15260	//RESIZETEXTURE ^= true;
14485	15261	//break;
14486	15262	case 'z':
14487		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14488	15264	Globals.lighttouched = true;
14489	15265	repaint();
14490	15266	break;
..	..	@@ -14517,8 +15293,15 @@
14517	15293	case DELETE:
14518	15294	ClearSelection();
14519	15295	break;
14520		- /*
14521	15296	case '+':
	15297	+
	15298	+ //for (int i=0; i<0x7FFFFFFF; i++)
	15299	+ {
	15300	+ //String.format("%08X", i); // "7caca905"
	15301	+ GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
	15302	+ }
	15303	+
	15304	+ /*
14522	15305	//fontsize += 1;
14523	15306	bbzoom *= 2;
14524	15307	repaint();
..	..	@@ -14608,7 +15391,7 @@
14608	15391	//mode = ROTATE;
14609	15392	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15393	{
14611		- SetMouseMode(modifiers);
	15394	+ SetMouseMode(0, modifiers);
14612	15395	}
14613	15396	}
14614	15397
..	..	@@ -14742,8 +15525,9 @@
14742	15525
14743	15526	protected void processMouseMotionEvent(MouseEvent e)
14744	15527	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15528	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15529	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15530	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	15531	{
14748	15532	mouseMoved(e);
14749	15533	} else
..	..	@@ -14768,11 +15552,12 @@
14768	15552	}
14769	15553	*/
14770	15554
14771		- object.editWindow.EditSelection();
	15555	+ object.editWindow.EditSelection(false);
14772	15556	}
14773	15557
14774	15558	void SelectParent()
14775	15559	{
	15560	+ new Exception().printStackTrace();
14776	15561	System.exit(0);
14777	15562	Composite group = (Composite) object;
14778	15563	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14796,6 +15581,7 @@
14796	15581
14797	15582	void SelectChildren()
14798	15583	{
	15584	+ new Exception().printStackTrace();
14799	15585	System.exit(0);
14800	15586	/*
14801	15587	Composite group = (Composite) object;
..	..	@@ -14960,7 +15746,9 @@
14960	15746	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	15747	//Image img = CreateImage(width, height);
14962	15748	//System.out.println("width = " + width + "; height = " + height + "\n");
	15749	+
14963	15750	Graphics gr = g; // img.getGraphics();
	15751	+
14964	15752	if (!hasMarquee)
14965	15753	{
14966	15754	if (Xmin < Xmax) // !locked)
..	..	@@ -15058,14 +15846,33 @@
15058	15846	if (!isRenderer)
15059	15847	{
15060	15848	object.drawEditHandles(info, 0);
	15849	+
	15850	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15851	+ {
	15852	+ switch (object.selection.get(0).hitSomething)
	15853	+ {
	15854	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15855	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15856	+ break;
	15857	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15858	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15859	+ break;
	15860	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15861	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15862	+ break;
	15863	+ }
	15864	+
	15865	+ }
15061	15866	}
15062	15867	}
	15868	+
15063	15869	if (isRenderer)
15064	15870	{
15065	15871	//gr.setColor(Color.black);
15066	15872	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	15873	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	15874	}
	15875	+
15069	15876	if (hasMarquee)
15070	15877	{
15071	15878	gr.setXORMode(Color.white);
..	..	@@ -15178,6 +15985,7 @@
15178	15985	public boolean mouseDown(Event evt, int x, int y)
15179	15986	{
15180	15987	System.out.println("mouseDown: " + evt);
	15988	+ System.exit(0);
15181	15989	/*
15182	15990	locked = true;
15183	15991	drag = false;
..	..	@@ -15221,7 +16029,7 @@
15221	16029	{
15222	16030	keyPressed(0, modifiers);
15223	16031	}
15224		- clickStart(x, y, modifiers);
	16032	+ // clickStart(x, y, modifiers);
15225	16033	return true;
15226	16034	}
15227	16035
..	..	@@ -15339,7 +16147,7 @@
15339	16147	{
15340	16148	keyReleased(0, 0);
15341	16149	}
15342		- drag(x, y, modifiers);
	16150	+ drag(x, y, 0, modifiers);
15343	16151	return true;
15344	16152	}
15345	16153
..	..	@@ -15471,7 +16279,7 @@
15471	16279	Object3D object;
15472	16280	static Object3D trackedobject;
15473	16281	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16282	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16283	/static/ Camera eyeCamera;
15476	16284	/static/ Camera lightCamera;
15477	16285	int cameracount;
..	..	@@ -15756,16 +16564,16 @@
15756	16564	cStatic.objectstack[materialdepth++] = checker;
15757	16565	//System.out.println("material " + material);
15758	16566	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16567	+ //vector2buffer = checker.projectedVertices;
15760	16568
15761	16569	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16570	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16571
15764	16572	materialdepth -= 1;
15765	16573	if (materialdepth > 0)
15766	16574	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16575	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16576	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	16577	}
15770	16578	//checker.GetMaterial().opacity = 1f;
15771	16579	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15909,6 +16717,7 @@
15909	16717	{
15910	16718	if (!selection)
15911	16719	{
	16720	+ new Exception().printStackTrace();
15912	16721	System.exit(0);
15913	16722	return;
15914	16723	}
..	..	@@ -15988,6 +16797,8 @@
15988	16797	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	16798	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
15990	16799
	16800	+ CreateSelectedPoint();
	16801	+
15991	16802	// Will fit the mesh !!!
15992	16803	selectedpoint.toParent[0][0] = 0.0001;
15993	16804	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16036,16 +16847,16 @@
16036	16847	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16037	16848	}
16038	16849
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16850	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	16851	}
16041	16852	}
16042	16853
16043	16854	if (!movingcamera && !PAINTMODE)
16044	16855	object.editWindow.ScreenFitPoint(); // fev 2014
16045	16856
16046		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16857	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047	16858	{
16048		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16859	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049	16860
16050	16861	Object3D group = new Object3D("inst" + paintcount++);
16051	16862
..	..	@@ -16102,6 +16913,11 @@
16102	16913	//System.out.println("objects[color] = " + objects[color]);
16103	16914	//objects[color].Select();
16104	16915	indexcount = 0;
	16916	+ ObjEditor window = object.GetWindow();
	16917	+ if (window != null && deselect)
	16918	+ {
	16919	+ window.Select(null, deselect, true);
	16920	+ }
16105	16921	object.Select(color, deselect);
16106	16922	}
16107	16923
..	..	@@ -16201,7 +17017,7 @@
16201	17017	gl.glDisable(gl.GL_CULL_FACE);
16202	17018	}
16203	17019
16204		- if (!RENDERSHADOW)
	17020	+ if (!Globals.RENDERSHADOW)
16205	17021	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	17022
16207	17023	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +17027,7 @@
16211	17027	//gl.glColorMask(false, false, false, false);
16212	17028
16213	17029	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17030	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	17031	{
16216	17032	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	17033
..	..	@@ -16627,23 +17443,15 @@
16627	17443	int AAbuffersize = 0;
16628	17444
16629	17445	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17446	+ static Superellipsoid selectedpoint;
16631	17447	static Sphere previousselectedpoint = null;
16632		- static Sphere debugpointG = new Sphere();
16633		- static Sphere debugpointP = new Sphere();
16634		- static Sphere debugpointC = new Sphere();
16635		- static Sphere debugpointR = new Sphere();
	17448	+ static Sphere debugpointG;
	17449	+ static Sphere debugpointP;
	17450	+ static Sphere debugpointC;
	17451	+ static Sphere debugpointR;
16636	17452
16637	17453	static Sphere debugpoints[] = new Sphere[8];
16638	17454
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17455	static void InitPoints(float radius)
16648	17456	{
16649	17457	for (int i=0; i<8; i++)
..	..	@@ -16695,10 +17503,11 @@
16695	17503	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17504	// Depth buffer format
16697	17505	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17506	+
	17507	+ public void NextIndex()
16699	17508	{
16700	17509	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17510	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	17511	//objects[indexcount] = o;
16703	17512	//System.out.println("indexcount = " + indexcount);
16704	17513	}