~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;
..	..	@@ -323,7 +358,7 @@
323	358	/**/
324	359	} else
325	360	{
326		- DrawMaterial(material, selected);
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
327	362	}
328	363	} else
329	364	{
..	..	@@ -347,8 +382,8 @@
347	382	cStatic.objectstack[materialdepth++] = obj;
348	383	//System.out.println("material " + material);
349	384	//Applet3D.tracein("selected ", selected);
350		- display.vector2buffer = obj.projectedVertices;
351		- display.DrawMaterial(material, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
352	387	}
353	388	}
354	389
..	..	@@ -365,8 +400,8 @@
365	400	materialdepth -= 1;
366	401	if (materialdepth > 0)
367	402	{
368		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369		- 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);
370	405	}
371	406	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372	407	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -386,8 +421,8 @@
386	421	materialdepth -= 1;
387	422	if (materialdepth > 0)
388	423	{
389		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390		- 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);
391	426	}
392	427	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393	428	//else
..	..	@@ -428,10 +463,12 @@
428	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429	464	{
430	465	//gl.glBegin(gl.GL_TRIANGLES);
431		- 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	+ ;
432	469	if (!hasnorm)
433	470	{
434		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
435	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
436	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
437	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1059,7 +1096,342 @@
1059	1096	gl.glMatrixMode(gl.GL_MODELVIEW);
1060	1097	}
1061	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	+
1062	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	+ }
1063	1435
1064	1436	void SetColor(Object3D obj, Vertex p0)
1065	1437	{
..	..	@@ -1238,7 +1610,7 @@
1238	1610	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1239	1611	}
1240	1612
1241		- void DrawMaterial(cMaterial material, boolean selected)
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1242	1614	{
1243	1615	CameraPane display = this;
1244	1616	//new Exception().printStackTrace();
..	..	@@ -1254,18 +1626,18 @@
1254	1626	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255	1627	if (!material.multiply)
1256	1628	{
1257		- display.color = color;
	1629	+ display.color = material.color;
1258	1630	display.saturation = material.modulation;
1259	1631	}
1260	1632	else
1261	1633	{
1262		- display.color = color2;
	1634	+ display.color = material.color2;
1263	1635	display.saturation = material.modulation2;
1264	1636	}
1265	1637
1266	1638	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267	1639
1268		- float[] colorV = GrafreeD.colorV;
	1640	+ float[] colorV = Grafreed.colorV;
1269	1641
1270	1642	/**/
1271	1643	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1273,7 +1645,7 @@
1273	1645	colorV[0] = display.modelParams0[0] * material.diffuse;
1274	1646	colorV[1] = display.modelParams0[1] * material.diffuse;
1275	1647	colorV[2] = display.modelParams0[2] * material.diffuse;
1276		- colorV[3] = material.opacity;
	1648	+ colorV[3] = 1; // material.opacity;
1277	1649
1278	1650	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1279	1651	//System.out.println("Opacity = " + opacity);
..	..	@@ -1381,9 +1753,9 @@
1381	1753	display.modelParams7[2] = 0;
1382	1754	display.modelParams7[3] = 0;
1383	1755
1384		- display.modelParams6[0] = 100; // criss de bug de bump
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
1385	1757
1386		- Object3D.cVector2[] extparams = display.vector2buffer;
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1387	1759	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1388	1760	{
1389	1761	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1525,7 +1897,7 @@
1525	1897	void PushMatrix(double[][] matrix)
1526	1898	{
1527	1899	// GrafreeD.tracein(matrix);
1528		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1529	1901	}
1530	1902
1531	1903	void PushMatrix()
..	..	@@ -1777,7 +2149,7 @@
1777	2149	System.err.println("LIVE = " + Globals.isLIVE());
1778	2150
1779	2151	if (!Globals.isLIVE()) // save sound
1780		- GrafreeD.savesound = true; // wav.save();
	2152	+ Grafreed.savesound = true; // wav.save();
1781	2153	// else
1782	2154	repaint(); // start loop // may 2013
1783	2155	}
..	..	@@ -1810,6 +2182,11 @@
1810	2182	public void ToggleBoxMode()
1811	2183	{
1812	2184	BOXMODE ^= true;
	2185	+ }
	2186	+
	2187	+ public void ToggleZoomBoxMode()
	2188	+ {
	2189	+ ZOOMBOXMODE ^= true;
1813	2190	}
1814	2191
1815	2192	public void ToggleSmoothFocus()
..	..	@@ -1889,7 +2266,7 @@
1889	2266
1890	2267	void ToggleDebug()
1891	2268	{
1892		- DEBUG ^= true;
	2269	+ Globals.DEBUG ^= true;
1893	2270	}
1894	2271
1895	2272	void ToggleLookAt()
..	..	@@ -1897,9 +2274,9 @@
1897	2274	LOOKAT ^= true;
1898	2275	}
1899	2276
1900		- void ToggleRandom()
	2277	+ void ToggleSwitch()
1901	2278	{
1902		- RANDOM ^= true;
	2279	+ SWITCH ^= true;
1903	2280	}
1904	2281
1905	2282	void ToggleHandles()
..	..	@@ -2006,7 +2383,7 @@
2006	2383	{
2007	2384	return currentGL;
2008	2385	}
2009		-
	2386	+
2010	2387	/**/
2011	2388	class CacheTexture
2012	2389	{
..	..	@@ -3838,6 +4215,7 @@
3838	4215
3839	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4217	{
	4218	+ new Exception().printStackTrace();
3841	4219	System.exit(0);
3842	4220	com.sun.opengl.util.texture.Texture texture = null;
3843	4221
..	..	@@ -7550,6 +7928,64 @@
7550	7928	ReleaseTexture(pigment, false);
7551	7929	}
7552	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	+
7553	7989	void ReleaseTexture(String tex, boolean bump)
7554	7990	{
7555	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7653,7 +8089,7 @@
7653	8089	}
7654	8090	}
7655	8091
7656		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7657	8093	{
7658	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7698,7 +8134,94 @@
7698	8134	return; // true;
7699	8135	}
7700	8136
7701		- 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
7702	8225	{
7703	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7704	8227
..	..	@@ -7706,12 +8229,18 @@
7706	8229	{
7707	8230	String texname = tex;
7708	8231
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;
	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	+ }
7715	8244
7716	8245	if (CACHETEXTURE)
7717	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7780,7 +8309,7 @@
7780	8309	}
7781	8310
7782	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
7784	8313	cachename = texname;
7785	8314	else
7786	8315	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8331,7 @@
7802	8331	}
7803	8332
7804	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
7806	8335	cachename = texname;
7807	8336	else
7808	8337	processbump = false; // don't process bump map again
..	..	@@ -7811,7 +8340,9 @@
7811	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8341
7813	8342
7814		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
7815	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7816	8347	//texture = GetTexture(tex, bump);
7817	8348	}
..	..	@@ -7933,7 +8464,7 @@
7933	8464	return texture;
7934	8465	}
7935	8466
7936		- 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
7937	8468	{
7938	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939	8470
..	..	@@ -7951,14 +8482,14 @@
7951	8482	return texture!=null?texture.texture:null;
7952	8483	}
7953	8484
7954		- public 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
7955	8486	{
7956	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957	8488
7958	8489	return texture!=null?texture.texturedata:null;
7959	8490	}
7960	8491
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7962	8493	{
7963	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8495	{
..	..	@@ -8935,8 +9466,8 @@
8935	9466	assert (parentcam != renderCamera);
8936	9467
8937	9468	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8940	9471
8941	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9473
..	..	@@ -8951,8 +9482,8 @@
8951	9482	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9483
8953	9484	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8956	9487
8957	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9489
..	..	@@ -9024,7 +9555,7 @@
9024	9555	//gl.glFlush();
9025	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9557
9027		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
9028	9559	{
9029	9560	System.err.println(" ABORTED FRAME");
9030	9561	break;
..	..	@@ -9054,7 +9585,7 @@
9054	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9586
9056	9587	// save image
9057		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
9058	9589	{
9059	9590	VPwidth = viewport[2];
9060	9591	VPheight = viewport[3];
..	..	@@ -9165,11 +9696,11 @@
9165	9696
9166	9697	// imagecount++;
9167	9698
9168		- 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;
9169	9700
9170	9701	if (!BOXMODE)
9171	9702	{
9172		- 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) + ")");
9173	9704	}
9174	9705
9175	9706	if (!BOXMODE)
..	..	@@ -9207,7 +9738,7 @@
9207	9738	ABORTED = false;
9208	9739	}
9209	9740	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	9742
9212	9743	if (false)
9213	9744	{
..	..	@@ -9870,11 +10401,11 @@
9870	10401
9871	10402	public void display(GLAutoDrawable drawable)
9872	10403	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
9874	10405	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
9878	10409	}
9879	10410	// if (DEBUG_SELECTION)
9880	10411	// {
..	..	@@ -10004,7 +10535,7 @@
10004	10535	Object3D theobject = object;
10005	10536	Object3D theparent = object.parent;
10006	10537	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10538	+ object = (Object3D)Grafreed.clone(object);
10008	10539	object.Stripify();
10009	10540	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10541	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10548,14 @@
10017	10548	ambientOcclusion = false;
10018	10549	}
10019	10550
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10551	+ if (//Globals.lighttouched &&
	10552	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10553	{
10022	10554	//if (RENDERSHADOW) // ?
10023	10555	if (!IsFrozen())
10024	10556	{
10025	10557	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10558	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10559	{
10028	10560	Globals.framecount++;
10029	10561	shadowbuffer.display();
..	..	@@ -10150,8 +10682,8 @@
10150	10682
10151	10683	// if (parentcam != renderCamera) // not a light
10152	10684	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10685	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10155	10687
10156	10688	for (int j = 0; j < 4; j++)
10157	10689	{
..	..	@@ -10165,8 +10697,8 @@
10165	10697
10166	10698	// if (parentcam != renderCamera) // not a light
10167	10699	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10700	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10170	10702
10171	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	10704
..	..	@@ -10425,7 +10957,16 @@
10425	10957	// Bump noise
10426	10958	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	10959	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- 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	+
10429	10970
10430	10971	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	10972	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10550,8 +11091,8 @@
10550	11091	System.err.println("parentcam != renderCamera");
10551	11092
10552	11093	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- 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
10555	11096	}
10556	11097
10557	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11113,8 @@
10572	11113	if (true) // TODO
10573	11114	{
10574	11115	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- 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
10577	11118	}
10578	11119
10579	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10889,8 +11430,14 @@
10889	11430	{
10890	11431	renderpass++;
10891	11432	// System.out.println("Draw object... ");
	11433	+ STEP = 1;
10892	11434	if (FAST) // in case there is no script
10893		- STEP = 16;
	11435	+ STEP = 8;
	11436	+
	11437	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11438	+ {
	11439	+ STEP *= 4;
	11440	+ }
10894	11441
10895	11442	//object.FullInvariants();
10896	11443
..	..	@@ -10904,13 +11451,31 @@
10904	11451	e.printStackTrace();
10905	11452	}
10906	11453
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11454	+ if (Grafreed.RENDERME > 0)
	11455	+ Grafreed.RENDERME--; // mechante magouille
10909	11456
10910	11457	Globals.ONESTEP = false;
10911	11458	}
10912	11459
10913	11460	static boolean zoomonce = false;
	11461	+
	11462	+ 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	+ }
10914	11479
10915	11480	void DrawObject(GL gl, boolean draw)
10916	11481	{
..	..	@@ -10975,7 +11540,14 @@
10975	11540
10976	11541	usedtextures.clear();
10977	11542
10978		- 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	+ }
10979	11551	}
10980	11552	//System.out.println("--> " + stackdepth);
10981	11553	// GrafreeD.traceon();
..	..	@@ -10985,8 +11557,9 @@
10985	11557
10986	11558	if (DrawMode() == DEFAULT)
10987	11559	{
10988		- if (DEBUG)
	11560	+ if (Globals.DEBUG)
10989	11561	{
	11562	+ CreateSelectedPoint();
10990	11563	float radius = 0.05f;
10991	11564	if (selectedpoint.radius != radius)
10992	11565	{
..	..	@@ -11066,7 +11639,14 @@
11066	11639	if (checker != null && DrawMode() == DEFAULT)
11067	11640	{
11068	11641	//BindTexture(IMMORTAL_TEXTURE);
11069		- 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	+ }
11070	11650	// NEAREST
11071	11651	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11652	DrawChecker(gl);
..	..	@@ -11148,7 +11728,7 @@
11148	11728	return;
11149	11729	}
11150	11730
11151		- String string = obj.GetToolTip();
	11731	+ String string = obj.toString(); //.GetToolTip();
11152	11732
11153	11733	GL gl = GetGL();
11154	11734
..	..	@@ -11465,8 +12045,8 @@
11465	12045	//obj.TransformToWorld(light, light);
11466	12046	for (int i = tp.size(); --i >= 0;)
11467	12047	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- 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);
11470	12050	}
11471	12051
11472	12052
..	..	@@ -11483,8 +12063,8 @@
11483	12063	parentcam = cameras[0];
11484	12064	}
11485	12065
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- 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
11488	12068
11489	12069	LA.xformPos(light, renderCamera.toScreen, light);
11490	12070
..	..	@@ -12098,8 +12678,8 @@
12098	12678
12099	12679	// display shadow only (bump == 0)
12100	12680	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	12681	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12682	+ "SLT temp.z, temp.y, -one2048th.x;" +
12103	12683	"SUB temp.y, one.x, temp.z;" +
12104	12684	"MUL temp.x, temp.x, temp.y;" +
12105	12685	"KIL temp.x;" +
..	..	@@ -12228,8 +12808,10 @@
12228	12808	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	12809
12230	12810	"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
	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
12233	12815	"MUL temp.x, temp.x, temp.y;" +
12234	12816
12235	12817	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,7 +13010,7 @@
12428	13010	//once = true;
12429	13011	}
12430	13012
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
	13013	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432	13014	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433	13015	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13016
..	..	@@ -12561,12 +13143,16 @@
12561	13143
12562	13144	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13145	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13146	+
	13147	+ // Compare fragment depth in light space with shadowmap.
12564	13148	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13149	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13150	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13151	+
	13152	+ // Reverse comparison
12567	13153	"SUB temp.x, one.x, temp.x;" +
12568	13154	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13155	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13156	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13157
12572	13158	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13166,10 @@
12580	13166	// No shadow for backface
12581	13167	"DP3 temp.x, normal, lightd;" +
12582	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;" +
12583	13173	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13174	"";
12585	13175	}
..	..	@@ -12726,7 +13316,8 @@
12726	13316	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13317	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13318	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13319	+
	13320	+ //Object3D.cVector2[] vector2buffer;
12730	13321
12731	13322	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13323	// OUT : diff, spec
..	..	@@ -13138,7 +13729,7 @@
13138	13729	public void mousePressed(MouseEvent e)
13139	13730	{
13140	13731	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13732	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	13733	}
13143	13734
13144	13735	static long prevtime = 0;
..	..	@@ -13165,6 +13756,7 @@
13165	13756
13166	13757	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	13758
	13759	+ if (BUTTONLESSWHEEL)
13168	13760	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	13761	{
13170	13762	return;
..	..	@@ -13173,7 +13765,7 @@
13173	13765	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	13766
13175	13767	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13768	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	13769	{
13178	13770	keepboxmode = BOXMODE;
13179	13771	keepsupport = SUPPORT;
..	..	@@ -13213,8 +13805,8 @@
13213	13805	// mode \|= META;
13214	13806	//}
13215	13807
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13808	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13809	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	13810	anchorX = ax;
13219	13811	anchorY = ay;
13220	13812	prevX = px;
..	..	@@ -13274,6 +13866,10 @@
13274	13866	// wasliveok = true;
13275	13867	// waslive = false;
13276	13868
	13869	+ // May 2019 Forget it:
	13870	+ if (true)
	13871	+ return;
	13872	+
13277	13873	// source == timer
13278	13874	if (mouseDown)
13279	13875	{
..	..	@@ -13312,7 +13908,7 @@
13312	13908
13313	13909	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	13910
13315		- void clickStart(int x, int y, int modifiers)
	13911	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	13912	{
13317	13913	if (!wasliveok)
13318	13914	return;
..	..	@@ -13329,7 +13925,7 @@
13329	13925	// touched = true; // main DL
13330	13926	if (isRenderer)
13331	13927	{
13332		- SetMouseMode(modifiers);
	13928	+ SetMouseMode(modifiers, modifiersex);
13333	13929	}
13334	13930
13335	13931	selectX = anchorX = x;
..	..	@@ -13342,7 +13938,7 @@
13342	13938	clicked = true;
13343	13939	hold = false;
13344	13940
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13941	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	13942	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	13943	{
13348	13944	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13373,7 +13969,7 @@
13373	13969	info.camera = renderCamera;
13374	13970	info.x = x;
13375	13971	info.y = y;
13376		- info.modifiers = modifiers;
	13972	+ info.modifiers = modifiersex;
13377	13973	editObj = object.doEditClick(info, 0);
13378	13974	if (!editObj)
13379	13975	{
..	..	@@ -13390,11 +13986,14 @@
13390	13986
13391	13987	public void mouseDragged(MouseEvent e)
13392	13988	{
	13989	+ Globals.MOUSEDRAGGED = true;
	13990	+
	13991	+ //System.out.println("mouseDragged: " + e);
13393	13992	if (isRenderer)
13394	13993	movingcamera = true;
	13994	+
13395	13995	//if (drawing)
13396	13996	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	13997	if ((e.getModifiersEx() & CTRL) != 0
13399	13998	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	13999	{
..	..	@@ -13402,7 +14001,7 @@
13402	14001	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14002	}
13404	14003	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14004	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14005
13407	14006	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14007	}
..	..	@@ -13575,6 +14174,7 @@
13575	14174
13576	14175	public void run()
13577	14176	{
	14177	+ new Exception().printStackTrace();
13578	14178	System.exit(0);
13579	14179	for (;;)
13580	14180	{
..	..	@@ -13638,7 +14238,7 @@
13638	14238	{
13639	14239	Globals.lighttouched = true;
13640	14240	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14241	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14242	}
13643	14243	//else
13644	14244	}
..	..	@@ -13738,7 +14338,7 @@
13738	14338	int X, Y;
13739	14339	boolean SX, SY;
13740	14340
13741		- void drag(int x, int y, int modifiers)
	14341	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14342	{
13743	14343	if (IsFrozen())
13744	14344	{
..	..	@@ -13747,17 +14347,17 @@
13747	14347
13748	14348	drag = true; // NEW
13749	14349
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14350	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14351
13752	14352	X = x;
13753	14353	Y = y;
13754	14354	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14355	+ MODIFIERS = modifiersex;
	14356	+ modifiersex &= ~1024;
13757	14357	if (false) // modifiers != 0)
13758	14358	{
13759	14359	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14360	+ System.out.println("mouseDragged: " + modifiersex);
13761	14361	System.out.println("SHIFT = " + SHIFT);
13762	14362	System.out.println("CONTROL = " + COMMAND);
13763	14363	System.out.println("META = " + META);
..	..	@@ -13777,7 +14377,7 @@
13777	14377	info.camera = renderCamera;
13778	14378	info.x = x;
13779	14379	info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14380	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14381	} else
13782	14382	{
13783	14383	if (x < startX)
..	..	@@ -13929,7 +14529,6 @@
13929	14529	public void mouseMoved(MouseEvent e)
13930	14530	{
13931	14531	//System.out.println("mouseMoved: " + e);
13932		-
13933	14532	if (isRenderer)
13934	14533	return;
13935	14534
..	..	@@ -13942,7 +14541,9 @@
13942	14541	ci.camera = renderCamera;
13943	14542	if (!isRenderer)
13944	14543	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	14544	+ ObjEditor editWindow = object.editWindow;
	14545	+ Object3D copy = editWindow.copy;
	14546	+ if (copy.doEditClick(ci, 0))
13946	14547	{
13947	14548	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	14549	} else
..	..	@@ -13954,7 +14555,10 @@
13954	14555
13955	14556	public void mouseReleased(MouseEvent e)
13956	14557	{
	14558	+ Globals.MOUSEDRAGGED = false;
	14559	+
13957	14560	movingcamera = false;
	14561	+ X = Y = 0;
13958	14562	//System.out.println("mouseReleased: " + e);
13959	14563	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	14564	}
..	..	@@ -13977,9 +14581,9 @@
13977	14581	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	14582	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	14583
13980		- if (control \|\| command \|\| IsFrozen())
	14584	+// No delay if (control \|\| command \|\| IsFrozen())
13981	14585	timeout = true;
13982		- else
	14586	+// ?? May 2019 else
13983	14587	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	14588	mouseDown = false;
13985	14589	if (!control && !command) // june 2013
..	..	@@ -14089,7 +14693,7 @@
14089	14693	System.out.println("keyReleased: " + e);
14090	14694	}
14091	14695
14092		- void SetMouseMode(int modifiers)
	14696	+ void SetMouseMode(int modifiers, int modifiersex)
14093	14697	{
14094	14698	//System.out.println("SetMouseMode = " + modifiers);
14095	14699	//modifiers &= ~1024;
..	..	@@ -14101,25 +14705,25 @@
14101	14705	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	14706	// return;
14103	14707	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	14708	+ if ((modifiersex & WHEEL) == WHEEL)
14105	14709	{
14106	14710	mouseMode \|= ZOOM;
14107	14711	}
14108	14712
14109	14713	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	14714	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	14715	{
14112	14716	mouseMode \|= VR; // BACKFORTH;
14113	14717	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14718	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	14719	{
14116	14720	mouseMode \|= SELECT;
14117	14721	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	14722	+ if ((modifiersex & COMMAND) == COMMAND)
14119	14723	{
14120	14724	mouseMode \|= SELECT;
14121	14725	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14726	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	14727	{
14124	14728	mouseMode &= ~VR;
14125	14729	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +14752,7 @@
14148	14752
14149	14753	if (isRenderer) //
14150	14754	{
14151		- SetMouseMode(modifiers);
	14755	+ SetMouseMode(0, modifiers);
14152	14756	}
14153	14757
14154	14758	Globals.theRenderer.keyPressed(key);
..	..	@@ -14320,8 +14924,14 @@
14320	14924	RevertCamera();
14321	14925	repaint();
14322	14926	break;
14323		- case 'L':
14324	14927	case 'l':
	14928	+ lightMode ^= true;
	14929	+ Globals.lighttouched = true;
	14930	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14931	+ targetLookAt.set(manipCamera.lookAt);
	14932	+ repaint();
	14933	+ break;
	14934	+ case 'L':
14325	14935	if (lightMode)
14326	14936	{
14327	14937	lightMode = false;
..	..	@@ -14468,23 +15078,21 @@
14468	15078	kompactbit = 6;
14469	15079	break;
14470	15080	case ' ':
14471		- lightMode ^= true;
14472		- Globals.lighttouched = true;
14473		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14474		- targetLookAt.set(manipCamera.lookAt);
	15081	+ ObjEditor.theFrame.ToggleFullScreen();
14475	15082	repaint();
14476	15083	break;
14477	15084	//case '`' :
14478	15085	case ESC:
14479	15086	RENDERPROGRAM += 1;
14480	15087	RENDERPROGRAM %= 3;
	15088	+
14481	15089	repaint();
14482	15090	break;
14483	15091	case 'Z':
14484	15092	//RESIZETEXTURE ^= true;
14485	15093	//break;
14486	15094	case 'z':
14487		- RENDERSHADOW ^= true;
	15095	+ Globals.RENDERSHADOW ^= true;
14488	15096	Globals.lighttouched = true;
14489	15097	repaint();
14490	15098	break;
..	..	@@ -14608,7 +15216,7 @@
14608	15216	//mode = ROTATE;
14609	15217	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15218	{
14611		- SetMouseMode(modifiers);
	15219	+ SetMouseMode(0, modifiers);
14612	15220	}
14613	15221	}
14614	15222
..	..	@@ -14742,8 +15350,9 @@
14742	15350
14743	15351	protected void processMouseMotionEvent(MouseEvent e)
14744	15352	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15353	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15354	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15355	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	15356	{
14748	15357	mouseMoved(e);
14749	15358	} else
..	..	@@ -14773,6 +15382,7 @@
14773	15382
14774	15383	void SelectParent()
14775	15384	{
	15385	+ new Exception().printStackTrace();
14776	15386	System.exit(0);
14777	15387	Composite group = (Composite) object;
14778	15388	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14796,6 +15406,7 @@
14796	15406
14797	15407	void SelectChildren()
14798	15408	{
	15409	+ new Exception().printStackTrace();
14799	15410	System.exit(0);
14800	15411	/*
14801	15412	Composite group = (Composite) object;
..	..	@@ -14960,7 +15571,9 @@
14960	15571	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	15572	//Image img = CreateImage(width, height);
14962	15573	//System.out.println("width = " + width + "; height = " + height + "\n");
	15574	+
14963	15575	Graphics gr = g; // img.getGraphics();
	15576	+
14964	15577	if (!hasMarquee)
14965	15578	{
14966	15579	if (Xmin < Xmax) // !locked)
..	..	@@ -15058,14 +15671,33 @@
15058	15671	if (!isRenderer)
15059	15672	{
15060	15673	object.drawEditHandles(info, 0);
	15674	+
	15675	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15676	+ {
	15677	+ switch (object.selection.get(0).hitSomething)
	15678	+ {
	15679	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15680	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15681	+ break;
	15682	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15683	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15684	+ break;
	15685	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15686	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15687	+ break;
	15688	+ }
	15689	+
	15690	+ }
15061	15691	}
15062	15692	}
	15693	+
15063	15694	if (isRenderer)
15064	15695	{
15065	15696	//gr.setColor(Color.black);
15066	15697	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	15698	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	15699	}
	15700	+
15069	15701	if (hasMarquee)
15070	15702	{
15071	15703	gr.setXORMode(Color.white);
..	..	@@ -15178,6 +15810,7 @@
15178	15810	public boolean mouseDown(Event evt, int x, int y)
15179	15811	{
15180	15812	System.out.println("mouseDown: " + evt);
	15813	+ System.exit(0);
15181	15814	/*
15182	15815	locked = true;
15183	15816	drag = false;
..	..	@@ -15221,7 +15854,7 @@
15221	15854	{
15222	15855	keyPressed(0, modifiers);
15223	15856	}
15224		- clickStart(x, y, modifiers);
	15857	+ // clickStart(x, y, modifiers);
15225	15858	return true;
15226	15859	}
15227	15860
..	..	@@ -15339,7 +15972,7 @@
15339	15972	{
15340	15973	keyReleased(0, 0);
15341	15974	}
15342		- drag(x, y, modifiers);
	15975	+ drag(x, y, 0, modifiers);
15343	15976	return true;
15344	15977	}
15345	15978
..	..	@@ -15471,7 +16104,7 @@
15471	16104	Object3D object;
15472	16105	static Object3D trackedobject;
15473	16106	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16107	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16108	/static/ Camera eyeCamera;
15476	16109	/static/ Camera lightCamera;
15477	16110	int cameracount;
..	..	@@ -15756,16 +16389,16 @@
15756	16389	cStatic.objectstack[materialdepth++] = checker;
15757	16390	//System.out.println("material " + material);
15758	16391	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16392	+ //vector2buffer = checker.projectedVertices;
15760	16393
15761	16394	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16395	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16396
15764	16397	materialdepth -= 1;
15765	16398	if (materialdepth > 0)
15766	16399	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16400	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16401	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	16402	}
15770	16403	//checker.GetMaterial().opacity = 1f;
15771	16404	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15909,6 +16542,7 @@
15909	16542	{
15910	16543	if (!selection)
15911	16544	{
	16545	+ new Exception().printStackTrace();
15912	16546	System.exit(0);
15913	16547	return;
15914	16548	}
..	..	@@ -16036,16 +16670,16 @@
16036	16670	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	16671	}
16038	16672
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16673	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	16674	}
16041	16675	}
16042	16676
16043	16677	if (!movingcamera && !PAINTMODE)
16044	16678	object.editWindow.ScreenFitPoint(); // fev 2014
16045	16679
16046		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16680	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047	16681	{
16048		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16682	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049	16683
16050	16684	Object3D group = new Object3D("inst" + paintcount++);
16051	16685
..	..	@@ -16201,7 +16835,7 @@
16201	16835	gl.glDisable(gl.GL_CULL_FACE);
16202	16836	}
16203	16837
16204		- if (!RENDERSHADOW)
	16838	+ if (!Globals.RENDERSHADOW)
16205	16839	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	16840
16207	16841	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +16845,7 @@
16211	16845	//gl.glColorMask(false, false, false, false);
16212	16846
16213	16847	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16848	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	16849	{
16216	16850	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	16851
..	..	@@ -16627,23 +17261,15 @@
16627	17261	int AAbuffersize = 0;
16628	17262
16629	17263	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17264	+ static Superellipsoid selectedpoint;
16631	17265	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();
	17266	+ static Sphere debugpointG;
	17267	+ static Sphere debugpointP;
	17268	+ static Sphere debugpointC;
	17269	+ static Sphere debugpointR;
16636	17270
16637	17271	static Sphere debugpoints[] = new Sphere[8];
16638	17272
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17273	static void InitPoints(float radius)
16648	17274	{
16649	17275	for (int i=0; i<8; i++)
..	..	@@ -16695,10 +17321,11 @@
16695	17321	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17322	// Depth buffer format
16697	17323	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17324	+
	17325	+ public void NextIndex()
16699	17326	{
16700	17327	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17328	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	17329	//objects[indexcount] = o;
16703	17330	//System.out.println("indexcount = " + indexcount);
16704	17331	}