~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()
..	..	@@ -1679,7 +2065,7 @@
1679	2065	//System.err.println("Oeil on");
1680	2066	OEIL = true;
1681	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1683	2069	//pingthread.StepToTarget(true);
1684	2070	}
1685	2071
..	..	@@ -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()
..	..	@@ -1907,10 +2298,17 @@
1907	2298	HANDLES ^= true;
1908	2299	}
1909	2300
	2301	+ Object3D paintFolder;
	2302	+
1910	2303	void TogglePaint()
1911	2304	{
1912	2305	PAINTMODE ^= true;
1913	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
1914	2312	}
1915	2313
1916	2314	void SwapCamera(int a, int b)
..	..	@@ -2006,7 +2404,7 @@
2006	2404	{
2007	2405	return currentGL;
2008	2406	}
2009		-
	2407	+
2010	2408	/**/
2011	2409	class CacheTexture
2012	2410	{
..	..	@@ -3838,6 +4236,7 @@
3838	4236
3839	4237	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4238	{
	4239	+ new Exception().printStackTrace();
3841	4240	System.exit(0);
3842	4241	com.sun.opengl.util.texture.Texture texture = null;
3843	4242
..	..	@@ -7531,7 +7930,7 @@
7531	7930	String pigment = Object3D.GetPigment(tex);
7532	7931	String bump = Object3D.GetBump(tex);
7533	7932
7534		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7933	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7535	7934	{
7536	7935	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7537	7936	// System.out.println("; bump = " + bump);
..	..	@@ -7548,6 +7947,64 @@
7548	7947
7549	7948	ReleaseTexture(bump, true);
7550	7949	ReleaseTexture(pigment, false);
	7950	+ }
	7951	+
	7952	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7953	+ {
	7954	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7955	+ {
	7956	+ return;
	7957	+ }
	7958	+
	7959	+ if (tex == null)
	7960	+ {
	7961	+ ReleaseTexture(null, false);
	7962	+ return;
	7963	+ }
	7964	+
	7965	+ String pigment = Object3D.GetPigment(tex);
	7966	+
	7967	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7968	+ {
	7969	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7970	+ // System.out.println("; bump = " + bump);
	7971	+ }
	7972	+
	7973	+ if (pigment.equals(""))
	7974	+ {
	7975	+ pigment = null;
	7976	+ }
	7977	+
	7978	+ ReleaseTexture(pigment, false);
	7979	+ }
	7980	+
	7981	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7982	+ {
	7983	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7984	+ {
	7985	+ return;
	7986	+ }
	7987	+
	7988	+ if (tex == null)
	7989	+ {
	7990	+ ReleaseTexture(null, true);
	7991	+ return;
	7992	+ }
	7993	+
	7994	+ String bump = Object3D.GetBump(tex);
	7995	+
	7996	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7997	+ {
	7998	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7999	+ // System.out.println("; bump = " + bump);
	8000	+ }
	8001	+
	8002	+ if (bump.equals(""))
	8003	+ {
	8004	+ bump = null;
	8005	+ }
	8006	+
	8007	+ ReleaseTexture(bump, true);
7551	8008	}
7552	8009
7553	8010	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7653,7 +8110,7 @@
7653	8110	}
7654	8111	}
7655	8112
7656		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8113	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7657	8114	{
7658	8115	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8116	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7674,7 +8131,7 @@
7674	8131	usedtextures.put(pigment, pigment);
7675	8132	usedtextures.put(bump, bump);
7676	8133
7677		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8134	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7678	8135	{
7679	8136	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7680	8137	// System.out.println("; bump = " + bump);
..	..	@@ -7698,7 +8155,94 @@
7698	8155	return; // true;
7699	8156	}
7700	8157
7701		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8158	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8159	+ {
	8160	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8161	+ ambientOcclusion ) // \|\| !textureon)
	8162	+ {
	8163	+ return; // false;
	8164	+ }
	8165	+
	8166	+ if (tex == null)
	8167	+ {
	8168	+ BindTexture(null,false,resolution);
	8169	+ return;
	8170	+ }
	8171	+
	8172	+ String pigment = Object3D.GetPigment(tex);
	8173	+
	8174	+ usedtextures.put(pigment, pigment);
	8175	+
	8176	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8177	+ {
	8178	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8179	+ // System.out.println("; bump = " + bump);
	8180	+ }
	8181	+
	8182	+ if (pigment.equals(""))
	8183	+ {
	8184	+ pigment = null;
	8185	+ }
	8186	+
	8187	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8188	+ BindTexture(pigment, false, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+ ambientOcclusion ) // \|\| !textureon)
	8195	+ {
	8196	+ return; // false;
	8197	+ }
	8198	+
	8199	+ if (tex == null)
	8200	+ {
	8201	+ BindTexture(null,true,resolution);
	8202	+ return;
	8203	+ }
	8204	+
	8205	+ String bump = Object3D.GetBump(tex);
	8206	+
	8207	+ usedtextures.put(bump, bump);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (bump.equals(""))
	8216	+ {
	8217	+ bump = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+ BindTexture(bump, true, resolution);
	8222	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+ }
	8224	+
	8225	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8226	+
	8227	+ private boolean FileExists(String tex)
	8228	+ {
	8229	+ if (missingTextures.contains(tex))
	8230	+ {
	8231	+ return false;
	8232	+ }
	8233	+
	8234	+ boolean fileExists = new File(tex).exists();
	8235	+
	8236	+ if (!fileExists)
	8237	+ {
	8238	+ // If file exists, the "new File()" is not executed sgain
	8239	+ missingTextures.add(tex);
	8240	+ }
	8241	+
	8242	+ return fileExists;
	8243	+ }
	8244	+
	8245	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7702	8246	{
7703	8247	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7704	8248
..	..	@@ -7706,12 +8250,18 @@
7706	8250	{
7707	8251	String texname = tex;
7708	8252
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;
	8253	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8254	+
	8255	+// String[] split = tex.split("Textures");
	8256	+// if (split.length > 1)
	8257	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8258	+// else
	8259	+// if (!texname.startsWith("/"))
	8260	+// texname = "/Users/nbriere/Textures/" + texname;
	8261	+ if (!FileExists(tex))
	8262	+ {
	8263	+ texname = fallbackTextureName;
	8264	+ }
7715	8265
7716	8266	if (CACHETEXTURE)
7717	8267	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7780,7 +8330,7 @@
7780	8330	}
7781	8331
7782	8332	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8333	+ if (!FileExists(cachename))
7784	8334	cachename = texname;
7785	8335	else
7786	8336	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8352,7 @@
7802	8352	}
7803	8353
7804	8354	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8355	+ if (!FileExists(cachename))
7806	8356	cachename = texname;
7807	8357	else
7808	8358	processbump = false; // don't process bump map again
..	..	@@ -7811,7 +8361,9 @@
7811	8361	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8362
7813	8363
7814		- if (texturedata != null)
	8364	+ if (texturedata == null)
	8365	+ throw new Exception();
	8366	+
7815	8367	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7816	8368	//texture = GetTexture(tex, bump);
7817	8369	}
..	..	@@ -7933,7 +8485,7 @@
7933	8485	return texture;
7934	8486	}
7935	8487
7936		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8488	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7937	8489	{
7938	8490	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939	8491
..	..	@@ -7951,21 +8503,21 @@
7951	8503	return texture!=null?texture.texture:null;
7952	8504	}
7953	8505
7954		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8506	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7955	8507	{
7956	8508	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957	8509
7958	8510	return texture!=null?texture.texturedata:null;
7959	8511	}
7960	8512
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8513	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7962	8514	{
7963	8515	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8516	{
7965	8517	return false;
7966	8518	}
7967	8519
7968		- boolean newtex = false;
	8520	+ //boolean newtex = false;
7969	8521
7970	8522	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7971	8523
..	..	@@ -7997,7 +8549,7 @@
7997	8549	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7998	8550	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7999	8551
8000		- return newtex;
	8552	+ return true; // Warning: not used.
8001	8553	}
8002	8554
8003	8555	ShadowBuffer shadowPBuf;
..	..	@@ -8835,11 +9387,35 @@
8835	9387	jy8[3] = 0.5f;
8836	9388	}
8837	9389
8838		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9390	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8839	9391	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9392	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9393	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	9394
	9395	+ void ResetOptions()
	9396	+ {
	9397	+ options1[0] = 100;
	9398	+ options1[1] = 0.025f;
	9399	+ options1[2] = 0.01f;
	9400	+ options1[3] = 0;
	9401	+ options1[4] = 0;
	9402	+
	9403	+ options2[0] = 0;
	9404	+ options2[1] = 0.75f;
	9405	+ options2[2] = 0;
	9406	+ options2[3] = 0;
	9407	+
	9408	+ options3[0] = 1;
	9409	+ options3[1] = 1;
	9410	+ options3[2] = 1;
	9411	+ options3[3] = 0;
	9412	+
	9413	+ options4[0] = 1;
	9414	+ options4[1] = 0;
	9415	+ options4[2] = 1;
	9416	+ options4[3] = 0;
	9417	+ }
	9418	+
8843	9419	static int imagecount = 0; // movie generation
8844	9420
8845	9421	static int jitter = 0;
..	..	@@ -8935,8 +9511,8 @@
8935	9511	assert (parentcam != renderCamera);
8936	9512
8937	9513	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9514	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9515	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8940	9516
8941	9517	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9518
..	..	@@ -8951,8 +9527,8 @@
8951	9527	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9528
8953	9529	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9530	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9531	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8956	9532
8957	9533	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9534
..	..	@@ -9024,7 +9600,7 @@
9024	9600	//gl.glFlush();
9025	9601	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9602
9027		- if (ANIMATION && ABORTED)
	9603	+ if (Globals.ANIMATION && ABORTED)
9028	9604	{
9029	9605	System.err.println(" ABORTED FRAME");
9030	9606	break;
..	..	@@ -9054,7 +9630,7 @@
9054	9630	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9631
9056	9632	// save image
9057		- if (ANIMATION && !ABORTED)
	9633	+ if (Globals.ANIMATION && !ABORTED)
9058	9634	{
9059	9635	VPwidth = viewport[2];
9060	9636	VPheight = viewport[3];
..	..	@@ -9165,11 +9741,11 @@
9165	9741
9166	9742	// imagecount++;
9167	9743
9168		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9744	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9169	9745
9170	9746	if (!BOXMODE)
9171	9747	{
9172		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9748	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9173	9749	}
9174	9750
9175	9751	if (!BOXMODE)
..	..	@@ -9207,7 +9783,7 @@
9207	9783	ABORTED = false;
9208	9784	}
9209	9785	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9786	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	9787
9212	9788	if (false)
9213	9789	{
..	..	@@ -9870,11 +10446,11 @@
9870	10446
9871	10447	public void display(GLAutoDrawable drawable)
9872	10448	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10449	+ if (Grafreed.savesound && Grafreed.hassound)
9874	10450	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10451	+ Grafreed.wav.save();
	10452	+ Grafreed.savesound = false;
	10453	+ Grafreed.hassound = false;
9878	10454	}
9879	10455	// if (DEBUG_SELECTION)
9880	10456	// {
..	..	@@ -9950,6 +10526,7 @@
9950	10526	ANTIALIAS = 0;
9951	10527	//System.out.println("RESTART");
9952	10528	AAtimer.restart();
	10529	+ Globals.TIMERRUNNING = true;
9953	10530	}
9954	10531	}
9955	10532	}
..	..	@@ -10004,7 +10581,7 @@
10004	10581	Object3D theobject = object;
10005	10582	Object3D theparent = object.parent;
10006	10583	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10584	+ object = (Object3D)Grafreed.clone(object);
10008	10585	object.Stripify();
10009	10586	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10587	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10594,14 @@
10017	10594	ambientOcclusion = false;
10018	10595	}
10019	10596
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10597	+ if (//Globals.lighttouched &&
	10598	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10599	{
10022	10600	//if (RENDERSHADOW) // ?
10023	10601	if (!IsFrozen())
10024	10602	{
10025	10603	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10604	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10605	{
10028	10606	Globals.framecount++;
10029	10607	shadowbuffer.display();
..	..	@@ -10150,8 +10728,8 @@
10150	10728
10151	10729	// if (parentcam != renderCamera) // not a light
10152	10730	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10731	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10732	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10155	10733
10156	10734	for (int j = 0; j < 4; j++)
10157	10735	{
..	..	@@ -10165,8 +10743,8 @@
10165	10743
10166	10744	// if (parentcam != renderCamera) // not a light
10167	10745	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10746	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10747	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10170	10748
10171	10749	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	10750
..	..	@@ -10425,7 +11003,16 @@
10425	11003	// Bump noise
10426	11004	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11005	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- BindTexture(NOISE_TEXTURE, false, 2);
	11006	+
	11007	+ try
	11008	+ {
	11009	+ BindTexture(NOISE_TEXTURE, false, 2);
	11010	+ }
	11011	+ catch (Exception e)
	11012	+ {
	11013	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11014	+ }
	11015	+
10429	11016
10430	11017	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11018	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10448,9 +11035,9 @@
10448	11035
10449	11036	gl.glMatrixMode(GL.GL_MODELVIEW);
10450	11037
10451		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10452		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10453		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11038	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11039	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11040	+gl.glEnable(gl.GL_MULTISAMPLE);
10454	11041	} else
10455	11042	{
10456	11043	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10461,7 +11048,7 @@
10461	11048	//System.out.println("BLENDING ON");
10462	11049	gl.glEnable(GL.GL_BLEND);
10463	11050	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10464		-
	11051	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10465	11052	gl.glMatrixMode(gl.GL_PROJECTION);
10466	11053	gl.glLoadIdentity();
10467	11054
..	..	@@ -10550,8 +11137,8 @@
10550	11137	System.err.println("parentcam != renderCamera");
10551	11138
10552	11139	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11140	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11141	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10555	11142	}
10556	11143
10557	11144	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11159,8 @@
10572	11159	if (true) // TODO
10573	11160	{
10574	11161	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11162	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11163	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10577	11164	}
10578	11165
10579	11166	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10889,8 +11476,14 @@
10889	11476	{
10890	11477	renderpass++;
10891	11478	// System.out.println("Draw object... ");
	11479	+ STEP = 1;
10892	11480	if (FAST) // in case there is no script
10893		- STEP = 16;
	11481	+ STEP = 8;
	11482	+
	11483	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11484	+ {
	11485	+ STEP *= 4;
	11486	+ }
10894	11487
10895	11488	//object.FullInvariants();
10896	11489
..	..	@@ -10904,23 +11497,44 @@
10904	11497	e.printStackTrace();
10905	11498	}
10906	11499
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11500	+ if (Grafreed.RENDERME > 0)
	11501	+ Grafreed.RENDERME--; // mechante magouille
10909	11502
10910	11503	Globals.ONESTEP = false;
10911	11504	}
10912	11505
10913	11506	static boolean zoomonce = false;
10914	11507
	11508	+ static void CreateSelectedPoint()
	11509	+ {
	11510	+ if (selectedpoint == null)
	11511	+ {
	11512	+ debugpointG = new Sphere();
	11513	+ debugpointP = new Sphere();
	11514	+ debugpointC = new Sphere();
	11515	+ debugpointR = new Sphere();
	11516	+
	11517	+ selectedpoint = new Superellipsoid();
	11518	+
	11519	+ for (int i=0; i<8; i++)
	11520	+ {
	11521	+ debugpoints[i] = new Sphere();
	11522	+ }
	11523	+ }
	11524	+ }
	11525	+
10915	11526	void DrawObject(GL gl, boolean draw)
10916	11527	{
	11528	+ // To clear camera values
	11529	+ ResetOptions();
	11530	+
10917	11531	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11532	// DrawMode() = SELECTION;
10919	11533	//GL gl = getGL();
10920	11534	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10921	11535	{
10922	11536	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10923		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11537	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10924	11538	pingthread.StepToTarget(true); // true);
10925	11539	// zoomonce = false;
10926	11540	}
..	..	@@ -10975,7 +11589,14 @@
10975	11589
10976	11590	usedtextures.clear();
10977	11591
10978		- BindTextures(DEFAULT_TEXTURES, 2);
	11592	+ try
	11593	+ {
	11594	+ BindTextures(DEFAULT_TEXTURES, 2);
	11595	+ }
	11596	+ catch (Exception e)
	11597	+ {
	11598	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11599	+ }
10979	11600	}
10980	11601	//System.out.println("--> " + stackdepth);
10981	11602	// GrafreeD.traceon();
..	..	@@ -10985,8 +11606,9 @@
10985	11606
10986	11607	if (DrawMode() == DEFAULT)
10987	11608	{
10988		- if (DEBUG)
	11609	+ if (Globals.DEBUG)
10989	11610	{
	11611	+ CreateSelectedPoint();
10990	11612	float radius = 0.05f;
10991	11613	if (selectedpoint.radius != radius)
10992	11614	{
..	..	@@ -11066,7 +11688,14 @@
11066	11688	if (checker != null && DrawMode() == DEFAULT)
11067	11689	{
11068	11690	//BindTexture(IMMORTAL_TEXTURE);
11069		- BindTextures(checker.GetTextures(), checker.texres);
	11691	+ try
	11692	+ {
	11693	+ BindTextures(checker.GetTextures(), checker.texres);
	11694	+ }
	11695	+ catch (Exception e)
	11696	+ {
	11697	+ System.err.println("FAILED: " + checker.GetTextures());
	11698	+ }
11070	11699	// NEAREST
11071	11700	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11701	DrawChecker(gl);
..	..	@@ -11148,7 +11777,7 @@
11148	11777	return;
11149	11778	}
11150	11779
11151		- String string = obj.GetToolTip();
	11780	+ String string = obj.toString(); //.GetToolTip();
11152	11781
11153	11782	GL gl = GetGL();
11154	11783
..	..	@@ -11465,8 +12094,8 @@
11465	12094	//obj.TransformToWorld(light, light);
11466	12095	for (int i = tp.size(); --i >= 0;)
11467	12096	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- LA.xformPos(light, tp.get(i).toParent, light);
	12097	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12098	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11470	12099	}
11471	12100
11472	12101
..	..	@@ -11483,8 +12112,8 @@
11483	12112	parentcam = cameras[0];
11484	12113	}
11485	12114
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12115	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12116	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11488	12117
11489	12118	LA.xformPos(light, renderCamera.toScreen, light);
11490	12119
..	..	@@ -12098,8 +12727,8 @@
12098	12727
12099	12728	// display shadow only (bump == 0)
12100	12729	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	12730	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12731	+ "SLT temp.z, temp.y, -one2048th.x;" +
12103	12732	"SUB temp.y, one.x, temp.z;" +
12104	12733	"MUL temp.x, temp.x, temp.y;" +
12105	12734	"KIL temp.x;" +
..	..	@@ -12228,8 +12857,10 @@
12228	12857	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	12858
12230	12859	"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
	12860	+ // Tuning for default skin
	12861	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12862	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12863	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12233	12864	"MUL temp.x, temp.x, temp.y;" +
12234	12865
12235	12866	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,7 +13059,7 @@
12428	13059	//once = true;
12429	13060	}
12430	13061
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
	13062	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432	13063	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433	13064	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13065
..	..	@@ -12561,12 +13192,16 @@
12561	13192
12562	13193	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13194	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13195	+
	13196	+ // Compare fragment depth in light space with shadowmap.
12564	13197	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13198	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13199	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13200	+
	13201	+ // Reverse comparison
12567	13202	"SUB temp.x, one.x, temp.x;" +
12568	13203	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13204	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13205	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13206
12572	13207	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13215,10 @@
12580	13215	// No shadow for backface
12581	13216	"DP3 temp.x, normal, lightd;" +
12582	13217	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13218	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13219	+
	13220	+ // No shadow when out of frustrum
	13221	+ "SGE temp.x, " + depth + ".z, one.z;" +
12583	13222	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13223	"";
12585	13224	}
..	..	@@ -12726,7 +13365,8 @@
12726	13365	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13366	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13367	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13368	+
	13369	+ //Object3D.cVector2[] vector2buffer;
12730	13370
12731	13371	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13372	// OUT : diff, spec
..	..	@@ -12742,9 +13382,10 @@
12742	13382	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13383	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13384	//"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;" +
	13385	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13386	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13387	+
	13388	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12748	13389	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13390	"RCP " + dest + ".w," + dest + ".w;" +
12750	13391	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13138,7 +13779,7 @@
13138	13779	public void mousePressed(MouseEvent e)
13139	13780	{
13140	13781	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13782	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	13783	}
13143	13784
13144	13785	static long prevtime = 0;
..	..	@@ -13165,6 +13806,7 @@
13165	13806
13166	13807	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	13808
	13809	+ if (BUTTONLESSWHEEL)
13168	13810	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	13811	{
13170	13812	return;
..	..	@@ -13173,7 +13815,7 @@
13173	13815	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	13816
13175	13817	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13818	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	13819	{
13178	13820	keepboxmode = BOXMODE;
13179	13821	keepsupport = SUPPORT;
..	..	@@ -13213,8 +13855,8 @@
13213	13855	// mode \|= META;
13214	13856	//}
13215	13857
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13858	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13859	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	13860	anchorX = ax;
13219	13861	anchorY = ay;
13220	13862	prevX = px;
..	..	@@ -13248,6 +13890,7 @@
13248	13890	else
13249	13891	if (evt.getSource() == AAtimer)
13250	13892	{
	13893	+ Globals.TIMERRUNNING = false;
13251	13894	if (mouseDown)
13252	13895	{
13253	13896	//new Exception().printStackTrace();
..	..	@@ -13273,6 +13916,10 @@
13273	13916	// LIVE = waslive;
13274	13917	// wasliveok = true;
13275	13918	// waslive = false;
	13919	+
	13920	+ // May 2019 Forget it:
	13921	+ if (true)
	13922	+ return;
13276	13923
13277	13924	// source == timer
13278	13925	if (mouseDown)
..	..	@@ -13303,7 +13950,7 @@
13303	13950
13304	13951	// fev 2014???
13305	13952	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13306		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13953	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13307	13954	pingthread.StepToTarget(true); // true);
13308	13955	}
13309	13956	// if (!LIVE)
..	..	@@ -13312,12 +13959,13 @@
13312	13959
13313	13960	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	13961
13315		- void clickStart(int x, int y, int modifiers)
	13962	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	13963	{
13317	13964	if (!wasliveok)
13318	13965	return;
13319	13966
13320	13967	AAtimer.restart(); //
	13968	+ Globals.TIMERRUNNING = true;
13321	13969
13322	13970	// waslive = LIVE;
13323	13971	// LIVE = false;
..	..	@@ -13329,7 +13977,7 @@
13329	13977	// touched = true; // main DL
13330	13978	if (isRenderer)
13331	13979	{
13332		- SetMouseMode(modifiers);
	13980	+ SetMouseMode(modifiers, modifiersex);
13333	13981	}
13334	13982
13335	13983	selectX = anchorX = x;
..	..	@@ -13342,7 +13990,7 @@
13342	13990	clicked = true;
13343	13991	hold = false;
13344	13992
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13993	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	13994	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	13995	{
13348	13996	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13373,7 +14021,7 @@
13373	14021	info.camera = renderCamera;
13374	14022	info.x = x;
13375	14023	info.y = y;
13376		- info.modifiers = modifiers;
	14024	+ info.modifiers = modifiersex;
13377	14025	editObj = object.doEditClick(info, 0);
13378	14026	if (!editObj)
13379	14027	{
..	..	@@ -13390,11 +14038,14 @@
13390	14038
13391	14039	public void mouseDragged(MouseEvent e)
13392	14040	{
	14041	+ Globals.MOUSEDRAGGED = true;
	14042	+
	14043	+ //System.out.println("mouseDragged: " + e);
13393	14044	if (isRenderer)
13394	14045	movingcamera = true;
	14046	+
13395	14047	//if (drawing)
13396	14048	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	14049	if ((e.getModifiersEx() & CTRL) != 0
13399	14050	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14051	{
..	..	@@ -13402,7 +14053,7 @@
13402	14053	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14054	}
13404	14055	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14056	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14057
13407	14058	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14059	}
..	..	@@ -13575,6 +14226,7 @@
13575	14226
13576	14227	public void run()
13577	14228	{
	14229	+ new Exception().printStackTrace();
13578	14230	System.exit(0);
13579	14231	for (;;)
13580	14232	{
..	..	@@ -13638,7 +14290,7 @@
13638	14290	{
13639	14291	Globals.lighttouched = true;
13640	14292	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14293	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14294	}
13643	14295	//else
13644	14296	}
..	..	@@ -13652,12 +14304,12 @@
13652	14304	void GoDown(int mod)
13653	14305	{
13654	14306	MODIFIERS \|= COMMAND;
13655		- /*
	14307	+ /**/
13656	14308	if((mod&SHIFT) == SHIFT)
13657	14309	manipCamera.RotatePosition(0, -speed);
13658	14310	else
13659		- manipCamera.BackForth(0, -speed*delta, getWidth());
13660		- */
	14311	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14312	+ /**/
13661	14313	if ((mod & SHIFT) == SHIFT)
13662	14314	{
13663	14315	mouseMode = mouseMode; // VR??
..	..	@@ -13673,12 +14325,12 @@
13673	14325	void GoUp(int mod)
13674	14326	{
13675	14327	MODIFIERS \|= COMMAND;
13676		- /*
	14328	+ /**/
13677	14329	if((mod&SHIFT) == SHIFT)
13678	14330	manipCamera.RotatePosition(0, speed);
13679	14331	else
13680		- manipCamera.BackForth(0, speed*delta, getWidth());
13681		- */
	14332	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14333	+ /**/
13682	14334	if ((mod & SHIFT) == SHIFT)
13683	14335	{
13684	14336	mouseMode = mouseMode;
..	..	@@ -13694,12 +14346,12 @@
13694	14346	void GoLeft(int mod)
13695	14347	{
13696	14348	MODIFIERS \|= COMMAND;
13697		- /*
	14349	+ /**/
13698	14350	if((mod&SHIFT) == SHIFT)
13699		- manipCamera.RotatePosition(speed, 0);
13700		- else
13701	14351	manipCamera.Translate(speed*delta, 0, getWidth());
13702		- */
	14352	+ else
	14353	+ manipCamera.RotatePosition(speed, 0);
	14354	+ /**/
13703	14355	if ((mod & SHIFT) == SHIFT)
13704	14356	{
13705	14357	mouseMode = mouseMode;
..	..	@@ -13715,12 +14367,12 @@
13715	14367	void GoRight(int mod)
13716	14368	{
13717	14369	MODIFIERS \|= COMMAND;
13718		- /*
	14370	+ /**/
13719	14371	if((mod&SHIFT) == SHIFT)
13720		- manipCamera.RotatePosition(-speed, 0);
13721		- else
13722	14372	manipCamera.Translate(-speed*delta, 0, getWidth());
13723		- */
	14373	+ else
	14374	+ manipCamera.RotatePosition(-speed, 0);
	14375	+ /**/
13724	14376	if ((mod & SHIFT) == SHIFT)
13725	14377	{
13726	14378	mouseMode = mouseMode;
..	..	@@ -13738,7 +14390,7 @@
13738	14390	int X, Y;
13739	14391	boolean SX, SY;
13740	14392
13741		- void drag(int x, int y, int modifiers)
	14393	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14394	{
13743	14395	if (IsFrozen())
13744	14396	{
..	..	@@ -13747,17 +14399,17 @@
13747	14399
13748	14400	drag = true; // NEW
13749	14401
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14402	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14403
13752	14404	X = x;
13753	14405	Y = y;
13754	14406	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14407	+ MODIFIERS = modifiersex;
	14408	+ modifiersex &= ~1024;
13757	14409	if (false) // modifiers != 0)
13758	14410	{
13759	14411	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14412	+ System.out.println("mouseDragged: " + modifiersex);
13761	14413	System.out.println("SHIFT = " + SHIFT);
13762	14414	System.out.println("CONTROL = " + COMMAND);
13763	14415	System.out.println("META = " + META);
..	..	@@ -13777,7 +14429,8 @@
13777	14429	info.camera = renderCamera;
13778	14430	info.x = x;
13779	14431	info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14432	+ object.GetWindow().copy
	14433	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14434	} else
13782	14435	{
13783	14436	if (x < startX)
..	..	@@ -13929,7 +14582,6 @@
13929	14582	public void mouseMoved(MouseEvent e)
13930	14583	{
13931	14584	//System.out.println("mouseMoved: " + e);
13932		-
13933	14585	if (isRenderer)
13934	14586	return;
13935	14587
..	..	@@ -13942,7 +14594,9 @@
13942	14594	ci.camera = renderCamera;
13943	14595	if (!isRenderer)
13944	14596	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	14597	+ //ObjEditor editWindow = object.editWindow;
	14598	+ //Object3D copy = editWindow.copy;
	14599	+ if (object.doEditClick(ci, 0))
13946	14600	{
13947	14601	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	14602	} else
..	..	@@ -13954,7 +14608,11 @@
13954	14608
13955	14609	public void mouseReleased(MouseEvent e)
13956	14610	{
	14611	+ Globals.MOUSEDRAGGED = false;
	14612	+
13957	14613	movingcamera = false;
	14614	+ X = 0; // getBounds().width/2;
	14615	+ Y = 0; // getBounds().height/2;
13958	14616	//System.out.println("mouseReleased: " + e);
13959	14617	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	14618	}
..	..	@@ -13977,9 +14635,9 @@
13977	14635	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	14636	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	14637
13980		- if (control \|\| command \|\| IsFrozen())
	14638	+// No delay if (control \|\| command \|\| IsFrozen())
13981	14639	timeout = true;
13982		- else
	14640	+// ?? May 2019 else
13983	14641	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	14642	mouseDown = false;
13985	14643	if (!control && !command) // june 2013
..	..	@@ -14089,7 +14747,7 @@
14089	14747	System.out.println("keyReleased: " + e);
14090	14748	}
14091	14749
14092		- void SetMouseMode(int modifiers)
	14750	+ void SetMouseMode(int modifiers, int modifiersex)
14093	14751	{
14094	14752	//System.out.println("SetMouseMode = " + modifiers);
14095	14753	//modifiers &= ~1024;
..	..	@@ -14101,25 +14759,25 @@
14101	14759	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	14760	// return;
14103	14761	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	14762	+ if ((modifiersex & WHEEL) == WHEEL)
14105	14763	{
14106	14764	mouseMode \|= ZOOM;
14107	14765	}
14108	14766
14109	14767	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	14768	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	14769	{
14112	14770	mouseMode \|= VR; // BACKFORTH;
14113	14771	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14772	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	14773	{
14116	14774	mouseMode \|= SELECT;
14117	14775	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	14776	+ if ((modifiersex & COMMAND) == COMMAND)
14119	14777	{
14120	14778	mouseMode \|= SELECT;
14121	14779	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14780	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	14781	{
14124	14782	mouseMode &= ~VR;
14125	14783	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +14806,7 @@
14148	14806
14149	14807	if (isRenderer) //
14150	14808	{
14151		- SetMouseMode(modifiers);
	14809	+ SetMouseMode(0, modifiers);
14152	14810	}
14153	14811
14154	14812	Globals.theRenderer.keyPressed(key);
..	..	@@ -14295,7 +14953,9 @@
14295	14953	case 'E' : COMPACT ^= true;
14296	14954	repaint();
14297	14955	break;
14298		- case 'W' : DEBUGHSB ^= true;
	14956	+ case 'W' : // Wide Window (fullscreen)
	14957	+ //DEBUGHSB ^= true;
	14958	+ ObjEditor.theFrame.ToggleFullScreen();
14299	14959	repaint();
14300	14960	break;
14301	14961	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14320,8 +14980,8 @@
14320	14980	RevertCamera();
14321	14981	repaint();
14322	14982	break;
14323		- case 'L':
14324	14983	case 'l':
	14984	+ //case 'L':
14325	14985	if (lightMode)
14326	14986	{
14327	14987	lightMode = false;
..	..	@@ -14464,9 +15124,9 @@
14464	15124	case '_':
14465	15125	kompactbit = 5;
14466	15126	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15127	+// case '+':
	15128	+// kompactbit = 6;
	15129	+// break;
14470	15130	case ' ':
14471	15131	lightMode ^= true;
14472	15132	Globals.lighttouched = true;
..	..	@@ -14478,13 +15138,14 @@
14478	15138	case ESC:
14479	15139	RENDERPROGRAM += 1;
14480	15140	RENDERPROGRAM %= 3;
	15141	+
14481	15142	repaint();
14482	15143	break;
14483	15144	case 'Z':
14484	15145	//RESIZETEXTURE ^= true;
14485	15146	//break;
14486	15147	case 'z':
14487		- RENDERSHADOW ^= true;
	15148	+ Globals.RENDERSHADOW ^= true;
14488	15149	Globals.lighttouched = true;
14489	15150	repaint();
14490	15151	break;
..	..	@@ -14517,8 +15178,9 @@
14517	15178	case DELETE:
14518	15179	ClearSelection();
14519	15180	break;
14520		- /*
14521	15181	case '+':
	15182	+
	15183	+ /*
14522	15184	//fontsize += 1;
14523	15185	bbzoom *= 2;
14524	15186	repaint();
..	..	@@ -14535,17 +15197,17 @@
14535	15197	case '=':
14536	15198	IncDepth();
14537	15199	//fontsize += 1;
14538		- object.editWindow.refreshContents(true);
	15200	+ object.GetWindow().refreshContents(true);
14539	15201	maskbit = 6;
14540	15202	break;
14541	15203	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14542	15204	DecDepth();
14543	15205	maskbit = 5;
14544	15206	//if(fontsize > 1) fontsize -= 1;
14545		- if (object.editWindow == null)
14546		- new Exception().printStackTrace();
14547		- else
14548		- object.editWindow.refreshContents(true);
	15207	+// if (object.editWindow == null)
	15208	+// new Exception().printStackTrace();
	15209	+// else
	15210	+ object.GetWindow().refreshContents(true);
14549	15211	break;
14550	15212	case '{':
14551	15213	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14608,7 +15270,7 @@
14608	15270	//mode = ROTATE;
14609	15271	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15272	{
14611		- SetMouseMode(modifiers);
	15273	+ SetMouseMode(0, modifiers);
14612	15274	}
14613	15275	}
14614	15276
..	..	@@ -14742,8 +15404,9 @@
14742	15404
14743	15405	protected void processMouseMotionEvent(MouseEvent e)
14744	15406	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15407	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15408	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15409	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	15410	{
14748	15411	mouseMoved(e);
14749	15412	} else
..	..	@@ -14768,11 +15431,12 @@
14768	15431	}
14769	15432	*/
14770	15433
14771		- object.editWindow.EditSelection();
	15434	+ object.GetWindow().EditSelection(false);
14772	15435	}
14773	15436
14774	15437	void SelectParent()
14775	15438	{
	15439	+ new Exception().printStackTrace();
14776	15440	System.exit(0);
14777	15441	Composite group = (Composite) object;
14778	15442	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14784,10 +15448,10 @@
14784	15448	{
14785	15449	//selectees.remove(i);
14786	15450	System.out.println("select parent of " + elem);
14787		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15451	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14788	15452	} else
14789	15453	{
14790		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15454	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14791	15455	}
14792	15456
14793	15457	first = false;
..	..	@@ -14796,6 +15460,7 @@
14796	15460
14797	15461	void SelectChildren()
14798	15462	{
	15463	+ new Exception().printStackTrace();
14799	15464	System.exit(0);
14800	15465	/*
14801	15466	Composite group = (Composite) object;
..	..	@@ -14828,12 +15493,12 @@
14828	15493	for (int j = 0; j < group.children.size(); j++)
14829	15494	{
14830	15495	elem = (Object3D) group.children.elementAt(j);
14831		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15496	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14832	15497	first = false;
14833	15498	}
14834	15499	} else
14835	15500	{
14836		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15501	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14837	15502	}
14838	15503
14839	15504	first = false;
..	..	@@ -14844,21 +15509,21 @@
14844	15509	{
14845	15510	//Composite group = (Composite) object;
14846	15511	Object3D group = object;
14847		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15512	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14848	15513	}
14849	15514
14850	15515	void ResetTransform(int mask)
14851	15516	{
14852	15517	//Composite group = (Composite) object;
14853	15518	Object3D group = object;
14854		- group.editWindow.ResetTransform(mask);
	15519	+ group.GetWindow().ResetTransform(mask);
14855	15520	}
14856	15521
14857	15522	void FlipTransform()
14858	15523	{
14859	15524	//Composite group = (Composite) object;
14860	15525	Object3D group = object;
14861		- group.editWindow.FlipTransform();
	15526	+ group.GetWindow().FlipTransform();
14862	15527	// group.editWindow.ReduceMesh(true);
14863	15528	}
14864	15529
..	..	@@ -14866,7 +15531,7 @@
14866	15531	{
14867	15532	//Composite group = (Composite) object;
14868	15533	Object3D group = object;
14869		- group.editWindow.PrintMemory();
	15534	+ group.GetWindow().PrintMemory();
14870	15535	// group.editWindow.ReduceMesh(true);
14871	15536	}
14872	15537
..	..	@@ -14874,7 +15539,7 @@
14874	15539	{
14875	15540	//Composite group = (Composite) object;
14876	15541	Object3D group = object;
14877		- group.editWindow.ResetCentroid();
	15542	+ group.GetWindow().ResetCentroid();
14878	15543	}
14879	15544
14880	15545	void IncDepth()
..	..	@@ -14960,7 +15625,9 @@
14960	15625	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	15626	//Image img = CreateImage(width, height);
14962	15627	//System.out.println("width = " + width + "; height = " + height + "\n");
	15628	+
14963	15629	Graphics gr = g; // img.getGraphics();
	15630	+
14964	15631	if (!hasMarquee)
14965	15632	{
14966	15633	if (Xmin < Xmax) // !locked)
..	..	@@ -15048,6 +15715,7 @@
15048	15715	info.bounds.y += (height - desired) / 2;
15049	15716	}
15050	15717	}
	15718	+
15051	15719	info.g = gr;
15052	15720	info.camera = renderCamera;
15053	15721	/*
..	..	@@ -15057,15 +15725,55 @@
15057	15725	*/
15058	15726	if (!isRenderer)
15059	15727	{
15060		- object.drawEditHandles(info, 0);
	15728	+ Grafreed.Assert(object != null);
	15729	+ Grafreed.Assert(object.selection != null);
	15730	+ if (object.selection.Size() > 0)
	15731	+ {
	15732	+ int hitSomething = object.selection.get(0).hitSomething;
	15733	+
	15734	+ info.DX = 0;
	15735	+ info.DY = 0;
	15736	+ info.W = 1;
	15737	+ if (hitSomething == Object3D.hitCenter)
	15738	+ {
	15739	+ info.DX = X;
	15740	+ if (X != 0)
	15741	+ info.DX -= info.bounds.width/2;
	15742	+
	15743	+ info.DY = Y;
	15744	+ if (Y != 0)
	15745	+ info.DY -= info.bounds.height/2;
	15746	+ }
	15747	+
	15748	+ object.drawEditHandles(info, 0);
	15749	+
	15750	+ if (drag && (X != 0 \|\| Y != 0))
	15751	+ {
	15752	+ switch (hitSomething)
	15753	+ {
	15754	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15755	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15756	+ break;
	15757	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15758	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15759	+ break;
	15760	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15761	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15762	+ break;
	15763	+ }
	15764	+
	15765	+ }
	15766	+ }
15061	15767	}
15062	15768	}
	15769	+
15063	15770	if (isRenderer)
15064	15771	{
15065	15772	//gr.setColor(Color.black);
15066	15773	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	15774	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	15775	}
	15776	+
15069	15777	if (hasMarquee)
15070	15778	{
15071	15779	gr.setXORMode(Color.white);
..	..	@@ -15178,6 +15886,7 @@
15178	15886	public boolean mouseDown(Event evt, int x, int y)
15179	15887	{
15180	15888	System.out.println("mouseDown: " + evt);
	15889	+ System.exit(0);
15181	15890	/*
15182	15891	locked = true;
15183	15892	drag = false;
..	..	@@ -15221,7 +15930,7 @@
15221	15930	{
15222	15931	keyPressed(0, modifiers);
15223	15932	}
15224		- clickStart(x, y, modifiers);
	15933	+ // clickStart(x, y, modifiers);
15225	15934	return true;
15226	15935	}
15227	15936
..	..	@@ -15339,7 +16048,7 @@
15339	16048	{
15340	16049	keyReleased(0, 0);
15341	16050	}
15342		- drag(x, y, modifiers);
	16051	+ drag(x, y, 0, modifiers);
15343	16052	return true;
15344	16053	}
15345	16054
..	..	@@ -15471,7 +16180,7 @@
15471	16180	Object3D object;
15472	16181	static Object3D trackedobject;
15473	16182	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16183	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16184	/static/ Camera eyeCamera;
15476	16185	/static/ Camera lightCamera;
15477	16186	int cameracount;
..	..	@@ -15756,16 +16465,16 @@
15756	16465	cStatic.objectstack[materialdepth++] = checker;
15757	16466	//System.out.println("material " + material);
15758	16467	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16468	+ //vector2buffer = checker.projectedVertices;
15760	16469
15761	16470	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16471	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16472
15764	16473	materialdepth -= 1;
15765	16474	if (materialdepth > 0)
15766	16475	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16476	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16477	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	16478	}
15770	16479	//checker.GetMaterial().opacity = 1f;
15771	16480	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15851,6 +16560,14 @@
15851	16560	}
15852	16561	}
15853	16562
	16563	+ private Object3D GetFolder()
	16564	+ {
	16565	+ Object3D folder = object.GetWindow().copy;
	16566	+ if (object.GetWindow().copy.selection.Size() > 0)
	16567	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16568	+ return folder;
	16569	+ }
	16570	+
15854	16571	class SelectBuffer implements GLEventListener
15855	16572	{
15856	16573
..	..	@@ -15909,6 +16626,7 @@
15909	16626	{
15910	16627	if (!selection)
15911	16628	{
	16629	+ new Exception().printStackTrace();
15912	16630	System.exit(0);
15913	16631	return;
15914	16632	}
..	..	@@ -15929,6 +16647,17 @@
15929	16647
15930	16648	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15931	16649
	16650	+ if (PAINTMODE)
	16651	+ {
	16652	+ if (object.GetWindow().copy.selection.Size() > 0)
	16653	+ {
	16654	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16655	+
	16656	+ // Make what you paint not selectable.
	16657	+ paintobj.ResetSelectable();
	16658	+ }
	16659	+ }
	16660	+
15932	16661	//int tmp = selection_view;
15933	16662	//selection_view = -1;
15934	16663	int temp = DrawMode();
..	..	@@ -15940,6 +16669,17 @@
15940	16669	// temp = DEFAULT; // patch for selection debug
15941	16670	Globals.drawMode = temp; // WARNING
15942	16671
	16672	+ if (PAINTMODE)
	16673	+ {
	16674	+ if (object.GetWindow().copy.selection.Size() > 0)
	16675	+ {
	16676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16677	+
	16678	+ // Revert.
	16679	+ paintobj.RestoreSelectable();
	16680	+ }
	16681	+ }
	16682	+
15943	16683	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15944	16684
15945	16685	// trying different ways of getting the depth info over
..	..	@@ -15987,6 +16727,8 @@
15987	16727	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15988	16728	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	16729	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16730	+
	16731	+ CreateSelectedPoint();
15990	16732
15991	16733	// Will fit the mesh !!!
15992	16734	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16036,34 +16778,36 @@
16036	16778	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	16779	}
16038	16780
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16781	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	16782	}
16041	16783	}
16042	16784
16043	16785	if (!movingcamera && !PAINTMODE)
16044		- object.editWindow.ScreenFitPoint(); // fev 2014
	16786	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16045	16787
16046		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16788	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047	16789	{
16048		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16790	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049	16791
16050		- Object3D group = new Object3D("inst" + paintcount++);
	16792	+ if (object.GetWindow().copy.selection.Size() > 0)
	16793	+ {
	16794	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16051	16795
16052		- group.CreateMaterial(); // use a void leaf to select instances
16053		-
16054		- group.add(paintobj); // link
16055		-
16056		- object.editWindow.SnapObject(group);
16057		-
16058		- Object3D folder = object.editWindow.copy;
16059		-
16060		- if (object.editWindow.copy.selection.Size() > 0)
16061		- folder = object.editWindow.copy.selection.elementAt(0);
16062		-
16063		- folder.add(group);
16064		-
16065		- object.editWindow.ResetModel();
16066		- object.editWindow.refreshContents();
	16796	+ Object3D inst = new Object3D("inst" + paintcount++);
	16797	+
	16798	+ inst.CreateMaterial(); // use a void leaf to select instances
	16799	+
	16800	+ inst.add(paintobj); // link
	16801	+
	16802	+ object.GetWindow().SnapObject(inst);
	16803	+
	16804	+ Object3D folder = paintFolder; // GetFolder();
	16805	+
	16806	+ folder.add(inst);
	16807	+
	16808	+ object.GetWindow().ResetModel();
	16809	+ object.GetWindow().refreshContents();
	16810	+ }
16067	16811	}
16068	16812	else
16069	16813	paintcount = 0;
..	..	@@ -16102,6 +16846,11 @@
16102	16846	//System.out.println("objects[color] = " + objects[color]);
16103	16847	//objects[color].Select();
16104	16848	indexcount = 0;
	16849	+ ObjEditor window = object.GetWindow();
	16850	+ if (window != null && deselect)
	16851	+ {
	16852	+ window.Select(null, deselect, true);
	16853	+ }
16105	16854	object.Select(color, deselect);
16106	16855	}
16107	16856
..	..	@@ -16201,7 +16950,7 @@
16201	16950	gl.glDisable(gl.GL_CULL_FACE);
16202	16951	}
16203	16952
16204		- if (!RENDERSHADOW)
	16953	+ if (!Globals.RENDERSHADOW)
16205	16954	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	16955
16207	16956	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +16960,7 @@
16211	16960	//gl.glColorMask(false, false, false, false);
16212	16961
16213	16962	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16963	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	16964	{
16216	16965	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	16966
..	..	@@ -16627,23 +17376,15 @@
16627	17376	int AAbuffersize = 0;
16628	17377
16629	17378	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17379	+ static Superellipsoid selectedpoint;
16631	17380	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();
	17381	+ static Sphere debugpointG;
	17382	+ static Sphere debugpointP;
	17383	+ static Sphere debugpointC;
	17384	+ static Sphere debugpointR;
16636	17385
16637	17386	static Sphere debugpoints[] = new Sphere[8];
16638	17387
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17388	static void InitPoints(float radius)
16648	17389	{
16649	17390	for (int i=0; i<8; i++)
..	..	@@ -16695,10 +17436,11 @@
16695	17436	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17437	// Depth buffer format
16697	17438	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17439	+
	17440	+ public void NextIndex()
16699	17441	{
16700	17442	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17443	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	17444	//objects[indexcount] = o;
16703	17445	//System.out.println("indexcount = " + indexcount);
16704	17446	}