~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +110,9 @@
76	110	//private Mat4f spotlightTransform = new Mat4f();
77	111	//private Mat4f spotlightInverseTransform = new Mat4f();
78	112	static GLContext glcontext = null;
79		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
80	116	boolean reverseUP = false;
81	117	static boolean frozen = false;
82	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -92,6 +128,8 @@
92	128
93	129	static int tickcount = 0; // slow pose issue
94	130
	131	+static boolean BUTTONLESSWHEEL = false;
	132	+static boolean ZOOMBOXMODE = false;
95	133	static boolean BOXMODE = false;
96	134	static boolean IMAGEFLIP = false;
97	135	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +144,7 @@
106	144	static boolean OEIL = true;
107	145	static boolean OEILONCE = false; // do oeilon then oeiloff
108	146	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	147	+static boolean SWITCH = true; // false;
110	148	static boolean HANDLES = false; // selection doesn't work!!
111	149	static boolean PAINTMODE = false;
112	150
..	..	@@ -137,7 +175,7 @@
137	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	176	boolean anisotropy = true;
139	177	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	179
142	180	boolean macromode = false;
143	181
..	..	@@ -148,6 +186,21 @@
148	186	defaultcaps.setAccumGreenBits(16);
149	187	defaultcaps.setAccumBlueBits(16);
150	188	defaultcaps.setAccumAlphaBits(16);
	189	+ }
	190	+
	191	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	192	+
	193	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	194	+ {
	195	+ try
	196	+ {
	197	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	198	+ } catch (IOException e)
	199	+ {
	200	+ System.out.println("NAME = " + name);
	201	+ e.printStackTrace(); // throw new RuntimeException(e);
	202	+ return null;
	203	+ }
151	204	}
152	205
153	206	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +221,8 @@
168	221
169	222	SetCamera(cam);
170	223
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	226
173	227	object = o;
174	228
..	..	@@ -191,9 +245,43 @@
191	245
192	246	/// INTERFACE
193	247
	248	+ public javax.media.opengl.GL GetGL0()
	249	+ {
	250	+ return null;
	251	+ }
	252	+
	253	+ public int GenList()
	254	+ {
	255	+ javax.media.opengl.GL gl = GetGL();
	256	+ return gl.glGenLists(1);
	257	+ }
	258	+
	259	+ public void NewList(int id)
	260	+ {
	261	+ javax.media.opengl.GL gl = GetGL();
	262	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	263	+ }
	264	+
	265	+ public void CallList(int id)
	266	+ {
	267	+ javax.media.opengl.GL gl = GetGL();
	268	+ gl.glCallList(id);
	269	+ }
	270	+
	271	+ public void EndList()
	272	+ {
	273	+ javax.media.opengl.GL gl = GetGL();
	274	+ gl.glEndList();
	275	+ }
	276	+
194	277	public boolean IsBoxMode()
195	278	{
196	279	return BOXMODE;
	280	+ }
	281	+
	282	+ public boolean IsZoomBoxMode()
	283	+ {
	284	+ return ZOOMBOXMODE;
197	285	}
198	286
199	287	public void ClearDepth()
..	..	@@ -291,7 +379,7 @@
291	379	cStatic.objectstack[materialdepth++] = obj;
292	380	//System.out.println("material " + material);
293	381	//Applet3D.tracein(this, selected);
294		- display.vector2buffer = obj.projectedVertices;
	382	+ //display.vector2buffer = obj.projectedVertices;
295	383	if (obj instanceof Camera)
296	384	{
297	385	display.options1[0] = material.shift;
..	..	@@ -300,14 +388,28 @@
300	388	display.options1[2] = material.shadowbias;
301	389	display.options1[3] = material.aniso;
302	390	display.options1[4] = material.anisoV;
	391	+// System.out.println("display.options1[0] " + display.options1[0]);
	392	+// System.out.println("display.options1[1] " + display.options1[1]);
	393	+// System.out.println("display.options1[2] " + display.options1[2]);
	394	+// System.out.println("display.options1[3] " + display.options1[3]);
	395	+// System.out.println("display.options1[4] " + display.options1[4]);
303	396	display.options2[0] = material.opacity;
304	397	display.options2[1] = material.diffuse;
305	398	display.options2[2] = material.factor;
	399	+// System.out.println("display.options2[0] " + display.options2[0]);
	400	+// System.out.println("display.options2[1] " + display.options2[1]);
	401	+// System.out.println("display.options2[2] " + display.options2[2]);
306	402
307	403	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	404	+// System.out.println("display.options3[0] " + display.options3[0]);
	405	+// System.out.println("display.options3[1] " + display.options3[1]);
	406	+// System.out.println("display.options3[2] " + display.options3[2]);
308	407	display.options4[0] = material.cameralight/0.2f;
309	408	display.options4[1] = material.subsurface;
310	409	display.options4[2] = material.sheen;
	410	+// System.out.println("display.options4[0] " + display.options4[0]);
	411	+// System.out.println("display.options4[1] " + display.options4[1]);
	412	+// System.out.println("display.options4[2] " + display.options4[2]);
311	413
312	414	// if (display.CURRENTANTIALIAS > 0)
313	415	// display.options3[3] /= 4;
..	..	@@ -323,7 +425,7 @@
323	425	/**/
324	426	} else
325	427	{
326		- DrawMaterial(material, selected);
	428	+ DrawMaterial(material, selected, obj.projectedVertices);
327	429	}
328	430	} else
329	431	{
..	..	@@ -347,8 +449,8 @@
347	449	cStatic.objectstack[materialdepth++] = obj;
348	450	//System.out.println("material " + material);
349	451	//Applet3D.tracein("selected ", selected);
350		- display.vector2buffer = obj.projectedVertices;
351		- display.DrawMaterial(material, selected);
	452	+ //display.vector2buffer = obj.projectedVertices;
	453	+ display.DrawMaterial(material, selected, obj.projectedVertices);
352	454	}
353	455	}
354	456
..	..	@@ -365,8 +467,8 @@
365	467	materialdepth -= 1;
366	468	if (materialdepth > 0)
367	469	{
368		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	470	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	471	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
370	472	}
371	473	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372	474	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -386,8 +488,8 @@
386	488	materialdepth -= 1;
387	489	if (materialdepth > 0)
388	490	{
389		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	491	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	492	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
391	493	}
392	494	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393	495	//else
..	..	@@ -428,10 +530,12 @@
428	530	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429	531	{
430	532	//gl.glBegin(gl.GL_TRIANGLES);
431		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	533	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	534	+ // TEST LIVE NORMALS && !obj.dontselect
	535	+ ;
432	536	if (!hasnorm)
433	537	{
434		- // System.out.println("FUCK!!");
	538	+ // System.out.println("Mesh normal");
435	539	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
436	540	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
437	541	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1059,8 +1163,345 @@
1059	1163	gl.glMatrixMode(gl.GL_MODELVIEW);
1060	1164	}
1061	1165
	1166	+ public void DrawBox(cVector min, cVector max)
	1167	+ {
	1168	+ javax.media.opengl.GL gl = GetGL();
	1169	+ gl.glBegin(gl.GL_LINES);
	1170	+
	1171	+ gl.glVertex3d(min.x, min.y, min.z);
	1172	+ gl.glVertex3d(min.x, min.y, max.z);
	1173	+ gl.glVertex3d(min.x, min.y, min.z);
	1174	+ gl.glVertex3d(min.x, max.y, min.z);
	1175	+ gl.glVertex3d(min.x, min.y, min.z);
	1176	+ gl.glVertex3d(max.x, min.y, min.z);
	1177	+
	1178	+ gl.glVertex3d(max.x, max.y, max.z);
	1179	+ gl.glVertex3d(min.x, max.y, max.z);
	1180	+ gl.glVertex3d(max.x, max.y, max.z);
	1181	+ gl.glVertex3d(max.x, min.y, max.z);
	1182	+ gl.glVertex3d(max.x, max.y, max.z);
	1183	+ gl.glVertex3d(max.x, max.y, min.z);
	1184	+
	1185	+ gl.glEnd();
	1186	+ }
	1187	+
	1188	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1189	+ {
	1190	+ int[] strips = bRep.getRawIndices();
	1191	+
	1192	+ javax.media.opengl.GL gl = GetGL();
	1193	+
	1194	+ // TRIANGLE STRIP ARRAY
	1195	+ if (bRep.trimmed)
	1196	+ {
	1197	+ float[] v = bRep.getRawVertices();
	1198	+ float[] n = bRep.getRawNormals();
	1199	+ float[] c = bRep.getRawColors();
	1200	+ float[] uv = bRep.getRawUVMap();
	1201	+
	1202	+ int count2 = 0;
	1203	+ int count3 = 0;
	1204	+
	1205	+ if (n.length > 0)
	1206	+ {
	1207	+ for (int i = 0; i < strips.length; i++)
	1208	+ {
	1209	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1210	+
	1211	+ /*
	1212	+ boolean locked = false;
	1213	+ float eps = 0.1f;
	1214	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1215	+
	1216	+ int dot = 0;
	1217	+
	1218	+ if ((dot&1) == 0)
	1219	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1220	+
	1221	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1222	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1223	+ else
	1224	+ {
	1225	+ locked = true;
	1226	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1227	+ }
	1228	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1229	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1230	+ if (hasnorm)
	1231	+ {
	1232	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1233	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1234	+ }
	1235	+
	1236	+ if ((dot&4) == 0)
	1237	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1238	+
	1239	+ if (wrap \|\| !locked && (dot&8) != 0)
	1240	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1241	+ else
	1242	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1243	+
	1244	+ f.dot = dot;
	1245	+ */
	1246	+
	1247	+ if (!selectmode)
	1248	+ {
	1249	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1250	+ {
	1251	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1252	+ } else
	1253	+ {
	1254	+ gl.glNormal3f(0, 0, 1);
	1255	+ }
	1256	+
	1257	+ if (c != null)
	1258	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	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("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ if (!selectmode)
	1275	+ {
	1276	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1277	+ {
	1278	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1279	+ } else
	1280	+ {
	1281	+ gl.glNormal3f(0, 0, 1);
	1282	+ }
	1283	+ if (c != null)
	1284	+ {
	1285	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1286	+ }
	1287	+ }
	1288	+
	1289	+ if (flipV)
	1290	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1291	+ else
	1292	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1293	+
	1294	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1295	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1296	+
	1297	+ count2 += 2;
	1298	+ count3 += 3;
	1299	+ for (int j = 0; j < strips[i] - 2; j++)
	1300	+ {
	1301	+ //gl.glTexCoord2d(...);
	1302	+ if (!selectmode)
	1303	+ {
	1304	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1305	+ {
	1306	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1307	+ } else
	1308	+ {
	1309	+ gl.glNormal3f(0, 0, 1);
	1310	+ }
	1311	+ if (c != null)
	1312	+ {
	1313	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1314	+ }
	1315	+ }
	1316	+
	1317	+ if (flipV)
	1318	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1319	+ else
	1320	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1321	+
	1322	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1323	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1324	+
	1325	+ count2 += 2;
	1326	+ count3 += 3;
	1327	+ }
	1328	+
	1329	+ gl.glEnd();
	1330	+ }
	1331	+ }
	1332	+
	1333	+ assert count3 == v.length;
	1334	+ }
	1335	+ else // !trimmed
	1336	+ {
	1337	+ int count = 0;
	1338	+ for (int i = 0; i < strips.length; i++)
	1339	+ {
	1340	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1341	+
	1342	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1343	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1344	+
	1345	+ drawVertex(gl, p, flipV, selectmode);
	1346	+ drawVertex(gl, q, flipV, selectmode);
	1347	+
	1348	+ for (int j = 0; j < strips[i] - 2; j++)
	1349	+ {
	1350	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1351	+
	1352	+ // if (j%2 == 0)
	1353	+ // drawFace(p, q, r, display, null);
	1354	+ // else
	1355	+ // drawFace(p, r, q, display, null);
	1356	+
	1357	+ // p = q;
	1358	+ // q = r;
	1359	+ drawVertex(gl, r, flipV, selectmode);
	1360	+ }
	1361	+
	1362	+ gl.glEnd();
	1363	+ }
	1364	+ }
	1365	+ }
	1366	+
	1367	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1368	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1369	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1370	+
	1371	+ public void DrawDynamicMesh(cMesh mesh)
	1372	+ {
	1373	+ GL gl = GetGL(); // getGL();
	1374	+
	1375	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1376	+
	1377	+ gl.glDisable(gl.GL_LIGHTING);
	1378	+
	1379	+ gl.glLineWidth(1);
	1380	+ gl.glColor3f(1,1,1);
	1381	+ gl.glBegin(gl.GL_LINES);
	1382	+ double scale = 0;
	1383	+ int count = 0;
	1384	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1385	+ {
	1386	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1387	+ if(s == 0)
	1388	+ {
	1389	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1390	+ }
	1391	+ if (mesh.showsprings)
	1392	+ {
	1393	+ temp.set(spring.a.position);
	1394	+ temp.add(spring.b.position);
	1395	+ temp.mul(0.5);
	1396	+ temp2.set(spring.a.position);
	1397	+ temp2.sub(spring.b.position);
	1398	+ temp2.mul(spring.restLength/2);
	1399	+ temp.sub(temp2);
	1400	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1401	+ temp.add(temp2);
	1402	+ temp.add(temp2);
	1403	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1404	+ }
	1405	+
	1406	+ if (spring.isHandle)
	1407	+ continue;
	1408	+
	1409	+ //if (scale < spring.restLength)
	1410	+ scale += spring.restLength;
	1411	+ count++;
	1412	+ }
	1413	+ gl.glEnd();
	1414	+
	1415	+ if (count == 0)
	1416	+ scale = 0.01;
	1417	+ else
	1418	+ scale /= count * 3;
	1419	+
	1420	+ //scale = 0.25;
	1421	+
	1422	+ if (mesh.ShowInfo())
	1423	+ {
	1424	+ gl.glLineWidth(4);
	1425	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1426	+ {
	1427	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1428	+ if (node.mass == 0)
	1429	+ continue;
	1430	+
	1431	+ int i = node.springs==null?-1:node.springs.size();
	1432	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1433	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1434	+ //temp.normalize();
	1435	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1436	+ gl.glBegin(gl.GL_LINES);
	1437	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1438	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1439	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1440	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1441	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1442	+ gl.glEnd();
	1443	+ }
	1444	+
	1445	+ gl.glLineWidth(8);
	1446	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1447	+ {
	1448	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1449	+
	1450	+ if (node.springs != null)
	1451	+ {
	1452	+ for (int i=0; i<node.springs.size(); i+=1)
	1453	+ {
	1454	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1455	+
	1456	+ int c = i+1;
	1457	+ // c = node.springs.get(i).nbcopies;
	1458	+
	1459	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1460	+ gl.glBegin(gl.GL_LINES);
	1461	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1462	+ 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);
	1463	+ gl.glEnd();
	1464	+ }
	1465	+ }
	1466	+ }
	1467	+
	1468	+ gl.glLineWidth(1);
	1469	+ }
	1470	+
	1471	+ gl.glEnable(gl.GL_LIGHTING);
	1472	+ }
	1473	+
1062	1474	/// INTERFACE
1063	1475
	1476	+ public void StartTriangles()
	1477	+ {
	1478	+ javax.media.opengl.GL gl = GetGL();
	1479	+ gl.glBegin(gl.GL_TRIANGLES);
	1480	+ }
	1481	+
	1482	+ public void EndTriangles()
	1483	+ {
	1484	+ GetGL().glEnd();
	1485	+ }
	1486	+
	1487	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1488	+ {
	1489	+ if (!selectmode)
	1490	+ {
	1491	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1492	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1493	+
	1494	+ if (flipV)
	1495	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1496	+ else
	1497	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1498	+ }
	1499	+
	1500	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1501	+ }
	1502	+
	1503	+ float[] colorV = new float[4];
	1504	+
1064	1505	void SetColor(Object3D obj, Vertex p0)
1065	1506	{
1066	1507	CameraPane display = this;
..	..	@@ -1128,8 +1569,6 @@
1128	1569	{
1129	1570	return;
1130	1571	}
1131		-
1132		- float[] colorV = new float[3];
1133	1572
1134	1573	if (false) // marked)
1135	1574	{
..	..	@@ -1238,7 +1677,7 @@
1238	1677	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1239	1678	}
1240	1679
1241		- void DrawMaterial(cMaterial material, boolean selected)
	1680	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1242	1681	{
1243	1682	CameraPane display = this;
1244	1683	//new Exception().printStackTrace();
..	..	@@ -1254,18 +1693,18 @@
1254	1693	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255	1694	if (!material.multiply)
1256	1695	{
1257		- display.color = color;
	1696	+ display.color = material.color;
1258	1697	display.saturation = material.modulation;
1259	1698	}
1260	1699	else
1261	1700	{
1262		- display.color = color2;
	1701	+ display.color = material.color2;
1263	1702	display.saturation = material.modulation2;
1264	1703	}
1265	1704
1266	1705	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267	1706
1268		- float[] colorV = GrafreeD.colorV;
	1707	+ float[] colorV = Grafreed.colorV;
1269	1708
1270	1709	/**/
1271	1710	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1273,7 +1712,7 @@
1273	1712	colorV[0] = display.modelParams0[0] * material.diffuse;
1274	1713	colorV[1] = display.modelParams0[1] * material.diffuse;
1275	1714	colorV[2] = display.modelParams0[2] * material.diffuse;
1276		- colorV[3] = material.opacity;
	1715	+ colorV[3] = 1; // material.opacity;
1277	1716
1278	1717	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1279	1718	//System.out.println("Opacity = " + opacity);
..	..	@@ -1381,9 +1820,9 @@
1381	1820	display.modelParams7[2] = 0;
1382	1821	display.modelParams7[3] = 0;
1383	1822
1384		- display.modelParams6[0] = 100; // criss de bug de bump
	1823	+ //display.modelParams6[0] = 100; // criss de bug de bump
1385	1824
1386		- Object3D.cVector2[] extparams = display.vector2buffer;
	1825	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1387	1826	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1388	1827	{
1389	1828	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1525,7 +1964,7 @@
1525	1964	void PushMatrix(double[][] matrix)
1526	1965	{
1527	1966	// GrafreeD.tracein(matrix);
1528		- PushMatrix(matrix,1);
	1967	+ PushMatrix(matrix, 1);
1529	1968	}
1530	1969
1531	1970	void PushMatrix()
..	..	@@ -1679,7 +2118,7 @@
1679	2118	//System.err.println("Oeil on");
1680	2119	OEIL = true;
1681	2120	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2121	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1683	2122	//pingthread.StepToTarget(true);
1684	2123	}
1685	2124
..	..	@@ -1777,7 +2216,7 @@
1777	2216	System.err.println("LIVE = " + Globals.isLIVE());
1778	2217
1779	2218	if (!Globals.isLIVE()) // save sound
1780		- GrafreeD.savesound = true; // wav.save();
	2219	+ Grafreed.savesound = true; // wav.save();
1781	2220	// else
1782	2221	repaint(); // start loop // may 2013
1783	2222	}
..	..	@@ -1810,6 +2249,11 @@
1810	2249	public void ToggleBoxMode()
1811	2250	{
1812	2251	BOXMODE ^= true;
	2252	+ }
	2253	+
	2254	+ public void ToggleZoomBoxMode()
	2255	+ {
	2256	+ ZOOMBOXMODE ^= true;
1813	2257	}
1814	2258
1815	2259	public void ToggleSmoothFocus()
..	..	@@ -1889,7 +2333,7 @@
1889	2333
1890	2334	void ToggleDebug()
1891	2335	{
1892		- DEBUG ^= true;
	2336	+ Globals.DEBUG ^= true;
1893	2337	}
1894	2338
1895	2339	void ToggleLookAt()
..	..	@@ -1897,9 +2341,9 @@
1897	2341	LOOKAT ^= true;
1898	2342	}
1899	2343
1900		- void ToggleRandom()
	2344	+ void ToggleSwitch()
1901	2345	{
1902		- RANDOM ^= true;
	2346	+ SWITCH ^= true;
1903	2347	}
1904	2348
1905	2349	void ToggleHandles()
..	..	@@ -1907,10 +2351,17 @@
1907	2351	HANDLES ^= true;
1908	2352	}
1909	2353
	2354	+ Object3D paintFolder;
	2355	+
1910	2356	void TogglePaint()
1911	2357	{
1912	2358	PAINTMODE ^= true;
1913	2359	paintcount = 0;
	2360	+
	2361	+ if (PAINTMODE)
	2362	+ {
	2363	+ paintFolder = GetFolder();
	2364	+ }
1914	2365	}
1915	2366
1916	2367	void SwapCamera(int a, int b)
..	..	@@ -2006,7 +2457,22 @@
2006	2457	{
2007	2458	return currentGL;
2008	2459	}
2009		-
	2460	+
	2461	+ static private BufferedImage CreateBim(TextureData texturedata)
	2462	+ {
	2463	+ Grafreed.Assert(texturedata != null);
	2464	+
	2465	+ int width = texturedata.getWidth();
	2466	+ int height = texturedata.getHeight();
	2467	+
	2468	+ Buffer buffer = texturedata.getBuffer();
	2469	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2470	+
	2471	+ byte[] bytes = bytebuf.array();
	2472	+
	2473	+ return CreateBim(bytes, width, height);
	2474	+ }
	2475	+
2010	2476	/**/
2011	2477	class CacheTexture
2012	2478	{
..	..	@@ -2015,28 +2481,31 @@
2015	2481
2016	2482	int resolution;
2017	2483
2018		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2019	2485	{
2020		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2021	2488	resolution = res;
2022	2489	}
2023	2490	}
2024	2491	/**/
2025	2492
2026	2493	// TEXTURE static Texture texture;
2027		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2028		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2029		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2494	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2495	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2496	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2497	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2498	+
2030	2499	int pigmentdepth = 0;
2031	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2032	2501	int bumpdepth = 0;
2033	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2035	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2036		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2037	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2038	2507
2039		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2040	2509	{
2041	2510	TextureData texturedata = null;
2042	2511
..	..	@@ -2055,13 +2524,34 @@
2055	2524	if (bump)
2056	2525	texturedata = ConvertBump(texturedata, false);
2057	2526
2058		- com.sun.opengl.util.texture.Texture texture =
2059		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2527	+// com.sun.opengl.util.texture.Texture texture =
	2528	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2060	2529
2061		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2062		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2530	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2531	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2063	2532
2064		- return texture;
	2533	+ return texturedata;
	2534	+ }
	2535	+
	2536	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2537	+ {
	2538	+ TextureData texturedata = null;
	2539	+
	2540	+ try
	2541	+ {
	2542	+ texturedata =
	2543	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2544	+ bim,
	2545	+ true);
	2546	+ } catch (Exception e)
	2547	+ {
	2548	+ throw new javax.media.opengl.GLException(e);
	2549	+ }
	2550	+
	2551	+ if (bump)
	2552	+ texturedata = ConvertBump(texturedata, false);
	2553	+
	2554	+ return texturedata;
2065	2555	}
2066	2556
2067	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3134,6 +3624,8 @@
3134	3624
3135	3625	System.out.println("LOADING TEXTURE : " + name);
3136	3626
	3627	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3628	+
3137	3629	//
3138	3630	if (false) // compressbit > 0)
3139	3631	{
..	..	@@ -3838,6 +4330,7 @@
3838	4330
3839	4331	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4332	{
	4333	+ new Exception().printStackTrace();
3841	4334	System.exit(0);
3842	4335	com.sun.opengl.util.texture.Texture texture = null;
3843	4336
..	..	@@ -7531,7 +8024,7 @@
7531	8024	String pigment = Object3D.GetPigment(tex);
7532	8025	String bump = Object3D.GetBump(tex);
7533	8026
7534		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7535	8028	{
7536	8029	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7537	8030	// System.out.println("; bump = " + bump);
..	..	@@ -7546,11 +8039,69 @@
7546	8039	pigment = null;
7547	8040	}
7548	8041
7549		- ReleaseTexture(bump, true);
7550		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
7551	8044	}
7552	8045
7553		- void ReleaseTexture(String tex, boolean bump)
	8046	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8047	+ {
	8048	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8049	+ {
	8050	+ return;
	8051	+ }
	8052	+
	8053	+ if (tex == null)
	8054	+ {
	8055	+ ReleaseTexture(null, false);
	8056	+ return;
	8057	+ }
	8058	+
	8059	+ String pigment = Object3D.GetPigment(tex);
	8060	+
	8061	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8062	+ {
	8063	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8064	+ // System.out.println("; bump = " + bump);
	8065	+ }
	8066	+
	8067	+ if (pigment.equals(""))
	8068	+ {
	8069	+ pigment = null;
	8070	+ }
	8071	+
	8072	+ ReleaseTexture(tex, false);
	8073	+ }
	8074	+
	8075	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8076	+ {
	8077	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8078	+ {
	8079	+ return;
	8080	+ }
	8081	+
	8082	+ if (tex == null)
	8083	+ {
	8084	+ ReleaseTexture(null, true);
	8085	+ return;
	8086	+ }
	8087	+
	8088	+ String bump = Object3D.GetBump(tex);
	8089	+
	8090	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8091	+ {
	8092	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8093	+ // System.out.println("; bump = " + bump);
	8094	+ }
	8095	+
	8096	+ if (bump.equals(""))
	8097	+ {
	8098	+ bump = null;
	8099	+ }
	8100	+
	8101	+ ReleaseTexture(tex, true);
	8102	+ }
	8103	+
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
7554	8105	{
7555	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7556	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7561,7 +8112,7 @@
7561	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7562	8113
7563	8114	if (tex != null)
7564		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7565	8116
7566	8117	// //assert( texture != null );
7567	8118	// if (texture == null)
..	..	@@ -7653,7 +8204,55 @@
7653	8204	}
7654	8205	}
7655	8206
7656		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8207	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8208	+ {
	8209	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8210	+// ambientOcclusion ) // \|\| !textureon)
	8211	+// {
	8212	+// return; // false;
	8213	+// }
	8214	+//
	8215	+// if (tex == null)
	8216	+// {
	8217	+// BindTexture(null,false,resolution);
	8218	+// BindTexture(null,true,resolution);
	8219	+// return;
	8220	+// }
	8221	+//
	8222	+// String pigment = Object3D.GetPigment(tex);
	8223	+// String bump = Object3D.GetBump(tex);
	8224	+//
	8225	+// usedtextures.add(pigment);
	8226	+// usedtextures.add(bump);
	8227	+//
	8228	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8229	+// {
	8230	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8231	+// // System.out.println("; bump = " + bump);
	8232	+// }
	8233	+//
	8234	+// if (bump.equals(""))
	8235	+// {
	8236	+// bump = null;
	8237	+// }
	8238	+// if (pigment.equals(""))
	8239	+// {
	8240	+// pigment = null;
	8241	+// }
	8242	+//
	8243	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8244	+// BindTexture(pigment, false, resolution);
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8246	+// BindTexture(bump, true, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8248	+//
	8249	+// return; // true;
	8250	+
	8251	+ BindPigmentTexture(tex, resolution);
	8252	+ BindBumpTexture(tex, resolution);
	8253	+ }
	8254	+
	8255	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7657	8256	{
7658	8257	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8258	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7664,17 +8263,47 @@
7664	8263	if (tex == null)
7665	8264	{
7666	8265	BindTexture(null,false,resolution);
7667		- BindTexture(null,true,resolution);
7668	8266	return;
7669	8267	}
7670	8268
7671	8269	String pigment = Object3D.GetPigment(tex);
	8270	+
	8271	+ usedtextures.add(tex);
	8272	+
	8273	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8274	+ {
	8275	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8276	+ // System.out.println("; bump = " + bump);
	8277	+ }
	8278	+
	8279	+ if (pigment.equals(""))
	8280	+ {
	8281	+ pigment = null;
	8282	+ }
	8283	+
	8284	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8285	+ BindTexture(tex, false, resolution);
	8286	+ }
	8287	+
	8288	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8289	+ {
	8290	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8291	+ ambientOcclusion ) // \|\| !textureon)
	8292	+ {
	8293	+ return; // false;
	8294	+ }
	8295	+
	8296	+ if (tex == null)
	8297	+ {
	8298	+ BindTexture(null,true,resolution);
	8299	+ return;
	8300	+ }
	8301	+
7672	8302	String bump = Object3D.GetBump(tex);
7673	8303
7674		- usedtextures.put(pigment, pigment);
7675		- usedtextures.put(bump, bump);
	8304	+ usedtextures.add(tex);
7676	8305
7677		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8306	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7678	8307	{
7679	8308	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7680	8309	// System.out.println("; bump = " + bump);
..	..	@@ -7684,43 +8313,94 @@
7684	8313	{
7685	8314	bump = null;
7686	8315	}
7687		- if (pigment.equals(""))
7688		- {
7689		- pigment = null;
7690		- }
7691	8316
7692		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7693		- BindTexture(pigment, false, resolution);
7694	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7695		- BindTexture(bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
7696	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7697		-
7698		- return; // true;
7699	8320	}
7700	8321
7701		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8322	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8323	+
	8324	+ private boolean FileExists(String tex)
7702	8325	{
7703		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8326	+ if (missingTextures.contains(tex))
	8327	+ {
	8328	+ return false;
	8329	+ }
	8330	+
	8331	+ boolean fileExists = new File(tex).exists();
	8332	+
	8333	+ if (!fileExists)
	8334	+ {
	8335	+ // If file exists, the "new File()" is not executed sgain
	8336	+ missingTextures.add(tex);
	8337	+ }
	8338	+
	8339	+ return fileExists;
	8340	+ }
	8341	+
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8343	+ {
	8344	+ CacheTexture texturecache = null;
7704	8345
7705	8346	if (tex != null)
7706	8347	{
7707		- String texname = tex;
	8348	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8349	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7708	8350
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;
	8351	+ if (texname.equals("") && texdata == null)
	8352	+ {
	8353	+ return null;
	8354	+ }
	8355	+
	8356	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8357	+
	8358	+// String[] split = tex.split("Textures");
	8359	+// if (split.length > 1)
	8360	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8361	+// else
	8362	+// if (!texname.startsWith("/"))
	8363	+// texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8365	+ {
	8366	+ texname = fallbackTextureName;
	8367	+ }
7715	8368
7716	8369	if (CACHETEXTURE)
7717		- texture = textures.get(texname); // TEXTURE CACHE
7718		-
7719		- TextureData texturedata = null;
7720		-
7721		- if (texture == null \|\| texture.resolution < resolution)
7722	8370	{
7723		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8371	+ if (texdata == null)
	8372	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8373	+ else
	8374	+ texturecache = bimtextures.get(texdata);
	8375	+ }
	8376	+
	8377	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8378	+ {
	8379	+ TextureData texturedata = null;
	8380	+
	8381	+ if (texdata != null && textureon)
	8382	+ {
	8383	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8384	+
	8385	+ try
	8386	+ {
	8387	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8388	+ }
	8389	+ catch (Exception e)
	8390	+ {
	8391	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8392	+ }
	8393	+
	8394	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8395	+ bimtextures.put(texdata, texturecache);
	8396	+
	8397	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8398	+
	8399	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8400	+ //bim2 = bim;
	8401	+ }
	8402	+ else
	8403	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7724	8404	{
7725	8405	assert(!bump);
7726	8406	// if (bump)
..	..	@@ -7731,19 +8411,23 @@
7731	8411	// }
7732	8412	// else
7733	8413	// {
7734		- texture = textures.get(tex);
7735		- if (texture == null)
	8414	+ // texturecache = textures.get(texname); // suspicious
	8415	+ if (texturecache == null)
7736	8416	{
7737		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8417	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7738	8418	}
	8419	+ else
	8420	+ new Exception().printStackTrace();
7739	8421	// }
7740	8422	} else
7741		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7742	8424	{
7743	8425	assert(bump);
7744		- texture = textures.get(tex);
7745		- if (texture == null)
7746		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ // texturecache = textures.get(texname); // suspicious
	8427	+ if (texturecache == null)
	8428	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8429	+ else
	8430	+ new Exception().printStackTrace();
7747	8431	} else
7748	8432	{
7749	8433	//if (tex.equals("IMMORTAL"))
..	..	@@ -7751,11 +8435,22 @@
7751	8435	// texture = GetResourceTexture("default.png");
7752	8436	//} else
7753	8437	//{
7754		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
7755	8439	{
7756		- texture = textures.get(tex);
7757		- if (texture == null)
7758		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ // texturecache = textures.get(texname); // suspicious
	8441	+ if (texturecache == null)
	8442	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8443	+ else
	8444	+ new Exception().printStackTrace();
	8445	+ } else
	8446	+ {
	8447	+ if (texname.startsWith("@"))
	8448	+ {
	8449	+ // texturecache = textures.get(texname); // suspicious
	8450	+ if (texturecache == null)
	8451	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8452	+ else
	8453	+ new Exception().printStackTrace();
7759	8454	} else
7760	8455	{
7761	8456	if (textureon)
..	..	@@ -7780,7 +8475,7 @@
7780	8475	}
7781	8476
7782	8477	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8478	+ if (!FileExists(cachename))
7784	8479	cachename = texname;
7785	8480	else
7786	8481	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8497,7 @@
7802	8497	}
7803	8498
7804	8499	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8500	+ if (!FileExists(cachename))
7806	8501	cachename = texname;
7807	8502	else
7808	8503	processbump = false; // don't process bump map again
..	..	@@ -7811,20 +8506,23 @@
7811	8506	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8507
7813	8508
7814		- if (texturedata != null)
7815		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ if (texturedata == null)
	8510	+ throw new Exception();
	8511	+
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
7816	8513	//texture = GetTexture(tex, bump);
7817	8514	}
	8515	+ }
7818	8516	}
7819	8517	//}
7820	8518	}
7821	8519
7822		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7823	8521	{
7824	8522	//return false;
7825	8523
7826	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7827		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8525	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7828	8526	{
7829	8527	// String ext = "_highres";
7830	8528	// if (REDUCETEXTURE)
..	..	@@ -7841,52 +8539,17 @@
7841	8539	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7842	8540	if (!cachefile.exists())
7843	8541	{
7844		- // cache to disk
7845		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7846		- //buffers[0].
7847		-
7848		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7849		- int[] pixels = new int[bytebuf.capacity()/3];
7850		-
7851		- // squared size heuristic...
7852		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8542	+ //if (texturedata.getWidth() == texturedata.getHeight())
7853	8543	{
7854		- for (int i=pixels.length; --i>=0;)
7855		- {
7856		- int i3 = i*3;
7857		- pixels[i] = 0xFF;
7858		- pixels[i] <<= 8;
7859		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7864		- }
7865		-
7866		- /*
7867		- int r=0,g=0,b=0,a=0;
7868		- for (int i=0; i<width; i++)
7869		- for (int j=0; j<height; j++)
7870		- {
7871		- int index = j*width+i;
7872		- int p = pixels[index];
7873		- a = ((p>>24) & 0xFF);
7874		- r = ((p>>16) & 0xFF);
7875		- g = ((p>>8) & 0xFF);
7876		- b = (p & 0xFF);
7877		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7878		- }
7879		- /**/
7880		- int width = (int)Math.sqrt(pixels.length); // squared
7881		- int height = width;
7882		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7883		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8544	+ BufferedImage rendImage = CreateBim(texturedata);
	8545	+
7884	8546	ImageWriter writer = null;
7885	8547	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7886	8548	if (iter.hasNext()) {
7887	8549	writer = (ImageWriter)iter.next();
7888	8550	}
7889		- float compressionQuality = 0.9f;
	8551	+
	8552	+ float compressionQuality = 0.85f;
7890	8553	try
7891	8554	{
7892	8555	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7903,18 +8566,20 @@
7903	8566	}
7904	8567	}
7905	8568	}
7906		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
7907	8572	//System.out.println("Texture = " + tex);
7908		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
7909	8574	{
7910		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
7911	8576	thetex.texture.disable();
7912	8577	thetex.texture.dispose();
7913		- textures.remove(texname);
	8578	+ textures.remove(tex);
7914	8579	}
7915	8580
7916		- texture.texturedata = texturedata;
7917		- textures.put(texname, texture);
	8581	+ //texture.texturedata = texturedata;
	8582	+ textures.put(tex, texturecache);
7918	8583
7919	8584	// newtex = true;
7920	8585	}
..	..	@@ -7930,10 +8595,44 @@
7930	8595	}
7931	8596	}
7932	8597
7933		- return texture;
	8598	+ return texturecache;
7934	8599	}
7935	8600
7936		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8601	+ static void EmbedTextures(cTexture tex)
	8602	+ {
	8603	+ if (tex.pigmentdata == null)
	8604	+ {
	8605	+ //String texname = Object3D.GetPigment(tex);
	8606	+
	8607	+ CacheTexture texturecache = texturepigment.get(tex);
	8608	+
	8609	+ if (texturecache != null)
	8610	+ {
	8611	+ tex.pw = texturecache.texturedata.getWidth();
	8612	+ tex.ph = texturecache.texturedata.getHeight();
	8613	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8614	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8615	+ ;
	8616	+ //, tex.pw, tex.ph), 0.5f);
	8617	+ }
	8618	+ }
	8619	+
	8620	+ if (tex.bumpdata == null)
	8621	+ {
	8622	+ //String texname = Object3D.GetBump(tex);
	8623	+
	8624	+ CacheTexture texturecache = texturebump.get(tex);
	8625	+
	8626	+ if (texturecache != null)
	8627	+ {
	8628	+ tex.bw = texturecache.texturedata.getWidth();
	8629	+ tex.bh = texturecache.texturedata.getHeight();
	8630	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8631	+ }
	8632	+ }
	8633	+ }
	8634	+
	8635	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7937	8636	{
7938	8637	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939	8638
..	..	@@ -7951,21 +8650,21 @@
7951	8650	return texture!=null?texture.texture:null;
7952	8651	}
7953	8652
7954		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8653	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7955	8654	{
7956	8655	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957	8656
7958	8657	return texture!=null?texture.texturedata:null;
7959	8658	}
7960	8659
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7962	8661	{
7963	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8663	{
7965	8664	return false;
7966	8665	}
7967	8666
7968		- boolean newtex = false;
	8667	+ //boolean newtex = false;
7969	8668
7970	8669	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7971	8670
..	..	@@ -7997,9 +8696,75 @@
7997	8696	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7998	8697	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7999	8698
8000		- return newtex;
	8699	+ return true; // Warning: not used.
8001	8700	}
8002	8701
	8702	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8703	+ {
	8704	+ try
	8705	+ {
	8706	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8707	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8708	+ ImageWriter writer = writers.next();
	8709	+
	8710	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8711	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8712	+ param.setCompressionQuality(quality);
	8713	+
	8714	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8715	+ writer.setOutput(ios);
	8716	+ writer.write(null, new IIOImage(image, null, null), param);
	8717	+
	8718	+ byte[] data = baos.toByteArray();
	8719	+ writer.dispose();
	8720	+ return data;
	8721	+ }
	8722	+ catch (Exception e)
	8723	+ {
	8724	+ e.printStackTrace();
	8725	+ return null;
	8726	+ }
	8727	+ }
	8728	+
	8729	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8730	+ {
	8731	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8732	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8733	+ ImageReader reader = writers.next();
	8734	+
	8735	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8736	+
	8737	+ ImageReadParam param = reader.getDefaultReadParam();
	8738	+ param.setDestination(bim);
	8739	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8740	+
	8741	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8742	+ reader.setInput(ios);
	8743	+ BufferedImage bim2 = reader.read(0, param);
	8744	+ reader.dispose();
	8745	+
	8746	+// WritableRaster raster = bim2.getRaster();
	8747	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8748	+// byte[] bytes = data.getData();
	8749	+//
	8750	+// int[] pixels = new int[bytes.length/3];
	8751	+// for (int i=pixels.length; --i>=0;)
	8752	+// {
	8753	+// int i3 = i*3;
	8754	+// pixels[i] = 0xFF;
	8755	+// pixels[i] <<= 8;
	8756	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3] & 0xFF;
	8761	+// }
	8762	+//
	8763	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8764	+
	8765	+ return bim;
	8766	+ }
	8767	+
8003	8768	ShadowBuffer shadowPBuf;
8004	8769	AntialiasBuffer antialiasPBuf;
8005	8770	int MAXSTACK;
..	..	@@ -8016,10 +8781,12 @@
8016	8781
8017	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8018	8783	MAXSTACK = temp[0];
8019		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8020	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8021	8787	MAXSTACK = temp[0];
8022		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8023	8790
8024	8791	// Use debug pipeline
8025	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8027,7 +8794,8 @@
8027	8794	gl = drawable.getGL(); //
8028	8795
8029	8796	GL gl3 = getGL();
8030		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8031	8799
8032	8800
8033	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8192,7 +8960,7 @@
8192	8960
8193	8961	if (cubemap == null)
8194	8962	{
8195		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8196	8964	}
8197	8965
8198	8966	//cubemap.enable();
..	..	@@ -8468,6 +9236,8 @@
8468	9236
8469	9237	void LoadEnvy(int which)
8470	9238	{
	9239	+ assert(false);
	9240	+
8471	9241	String name;
8472	9242	String ext;
8473	9243
..	..	@@ -8479,37 +9249,58 @@
8479	9249	cubemap = null;
8480	9250	return;
8481	9251	case 1:
8482		- name = "cubemaps/box_";
8483		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
8484	9254	reverseUP = false;
8485	9255	break;
8486	9256	case 2:
8487		- name = "cubemaps/uffizi_";
8488		- ext = "png";
8489		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
8490	9261	case 3:
8491		- name = "cubemaps/CloudyHills_";
8492		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
8493	9264	reverseUP = false;
8494	9265	break;
8495	9266	case 4:
8496		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
8497	9268	ext = "png";
8498	9269	reverseUP = false;
8499	9270	break;
	9271	+ case 5:
	9272	+ name = "cubemaps/skycube/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 6:
	9277	+ name = "cubemaps/SaintLazarusChurch3/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 7:
	9282	+ name = "cubemaps/Sodermalmsallen/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 8:
	9287	+ name = "cubemaps/Sodermalmsallen2/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 9:
	9292	+ name = "cubemaps/UnionSquare/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
8500	9296	default:
8501		- name = "cubemaps/rgb_";
8502		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
8503	9300	break;
8504	9301	}
8505		-
8506		- try
8507		- {
8508		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8509		- } catch (IOException e)
8510		- {
8511		- throw new RuntimeException(e);
8512		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
8513	9304	}
8514	9305
8515	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8541,8 +9332,12 @@
8541	9332	static double[] model = new double[16];
8542	9333	double[] camera2light = new double[16];
8543	9334	double[] light2camera = new double[16];
8544		- int newenvy = -1;
8545		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
8546	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8547	9342	//float[] light0 = { 0,0,0 };
8548	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8835,11 +9630,35 @@
8835	9630	jy8[3] = 0.5f;
8836	9631	}
8837	9632
8838		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9633	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8839	9634	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9635	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9636	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	9637
	9638	+ void ResetOptions()
	9639	+ {
	9640	+ options1[0] = 100;
	9641	+ options1[1] = 0.025f;
	9642	+ options1[2] = 0.01f;
	9643	+ options1[3] = 0;
	9644	+ options1[4] = 0;
	9645	+
	9646	+ options2[0] = 0;
	9647	+ options2[1] = 0.75f;
	9648	+ options2[2] = 0;
	9649	+ options2[3] = 0;
	9650	+
	9651	+ options3[0] = 1;
	9652	+ options3[1] = 1;
	9653	+ options3[2] = 1;
	9654	+ options3[3] = 0;
	9655	+
	9656	+ options4[0] = 1;
	9657	+ options4[1] = 0;
	9658	+ options4[2] = 1;
	9659	+ options4[3] = 0;
	9660	+ }
	9661	+
8843	9662	static int imagecount = 0; // movie generation
8844	9663
8845	9664	static int jitter = 0;
..	..	@@ -8935,8 +9754,8 @@
8935	9754	assert (parentcam != renderCamera);
8936	9755
8937	9756	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9757	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8940	9759
8941	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9761
..	..	@@ -8951,8 +9770,8 @@
8951	9770	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9771
8953	9772	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9773	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8956	9775
8957	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9777
..	..	@@ -8998,10 +9817,12 @@
8998	9817	rati = 1 / rati;
8999	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9000	9819	}
9001		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9002	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9003	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9004		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9005	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9006	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9007	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9024,7 +9845,7 @@
9024	9845	//gl.glFlush();
9025	9846	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9847
9027		- if (ANIMATION && ABORTED)
	9848	+ if (Globals.ANIMATION && ABORTED)
9028	9849	{
9029	9850	System.err.println(" ABORTED FRAME");
9030	9851	break;
..	..	@@ -9054,7 +9875,7 @@
9054	9875	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9876
9056	9877	// save image
9057		- if (ANIMATION && !ABORTED)
	9878	+ if (Globals.ANIMATION && !ABORTED)
9058	9879	{
9059	9880	VPwidth = viewport[2];
9060	9881	VPheight = viewport[3];
..	..	@@ -9165,11 +9986,11 @@
9165	9986
9166	9987	// imagecount++;
9167	9988
9168		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9989	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9169	9990
9170	9991	if (!BOXMODE)
9171	9992	{
9172		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9993	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9173	9994	}
9174	9995
9175	9996	if (!BOXMODE)
..	..	@@ -9207,7 +10028,7 @@
9207	10028	ABORTED = false;
9208	10029	}
9209	10030	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10031	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	10032
9212	10033	if (false)
9213	10034	{
..	..	@@ -9870,11 +10691,11 @@
9870	10691
9871	10692	public void display(GLAutoDrawable drawable)
9872	10693	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10694	+ if (Grafreed.savesound && Grafreed.hassound)
9874	10695	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10696	+ Grafreed.wav.save();
	10697	+ Grafreed.savesound = false;
	10698	+ Grafreed.hassound = false;
9878	10699	}
9879	10700	// if (DEBUG_SELECTION)
9880	10701	// {
..	..	@@ -9950,6 +10771,7 @@
9950	10771	ANTIALIAS = 0;
9951	10772	//System.out.println("RESTART");
9952	10773	AAtimer.restart();
	10774	+ Globals.TIMERRUNNING = true;
9953	10775	}
9954	10776	}
9955	10777	}
..	..	@@ -10004,7 +10826,7 @@
10004	10826	Object3D theobject = object;
10005	10827	Object3D theparent = object.parent;
10006	10828	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10829	+ object = (Object3D)Grafreed.clone(object);
10008	10830	object.Stripify();
10009	10831	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10832	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10839,14 @@
10017	10839	ambientOcclusion = false;
10018	10840	}
10019	10841
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10842	+ if (//Globals.lighttouched &&
	10843	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10844	{
10022	10845	//if (RENDERSHADOW) // ?
10023	10846	if (!IsFrozen())
10024	10847	{
10025	10848	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10849	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10850	{
10028	10851	Globals.framecount++;
10029	10852	shadowbuffer.display();
..	..	@@ -10036,7 +10859,7 @@
10036	10859
10037	10860	if (wait)
10038	10861	{
10039		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10040	10863
10041	10864	wait = false;
10042	10865	}
..	..	@@ -10150,8 +10973,8 @@
10150	10973
10151	10974	// if (parentcam != renderCamera) // not a light
10152	10975	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10976	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10155	10978
10156	10979	for (int j = 0; j < 4; j++)
10157	10980	{
..	..	@@ -10165,8 +10988,8 @@
10165	10988
10166	10989	// if (parentcam != renderCamera) // not a light
10167	10990	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10991	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10170	10993
10171	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	10995
..	..	@@ -10252,13 +11075,41 @@
10252	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10253	11076	}
10254	11077
10255		- if (newenvy > -1)
	11078	+// if (newenvy > -1)
	11079	+// {
	11080	+// LoadEnvy(newenvy);
	11081	+// }
	11082	+//
	11083	+// newenvy = -1;
	11084	+
	11085	+ if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10256	11086	{
10257		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10258	11093	}
10259		-
10260		- newenvy = -1;
10261		-
	11094	+ else
	11095	+ {
	11096	+ if (object.skyboxname != null)
	11097	+ {
	11098	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11099	+ {
	11100	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11101	+ loadedskyboxname = object.skyboxname;
	11102	+ }
	11103	+ }
	11104	+ else
	11105	+ {
	11106	+ cubemapcustom = null;
	11107	+ loadedskyboxname = null;
	11108	+ }
	11109	+
	11110	+ cubemap = cubemapcustom;
	11111	+ }
	11112	+
10262	11113	ratio = ((double) getWidth()) / getHeight();
10263	11114	//System.out.println("ratio = " + ratio);
10264	11115
..	..	@@ -10274,7 +11125,7 @@
10274	11125
10275	11126	if (!IsFrozen() && !ambientOcclusion)
10276	11127	{
10277		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10278	11129	}
10279	11130
10280	11131	//if (selection_view == -1)
..	..	@@ -10425,7 +11276,16 @@
10425	11276	// Bump noise
10426	11277	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11278	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- BindTexture(NOISE_TEXTURE, false, 2);
	11279	+
	11280	+ try
	11281	+ {
	11282	+ BindTexture(NOISE_TEXTURE, false, 2);
	11283	+ }
	11284	+ catch (Exception e)
	11285	+ {
	11286	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11287	+ }
	11288	+
10429	11289
10430	11290	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11291	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10448,9 +11308,9 @@
10448	11308
10449	11309	gl.glMatrixMode(GL.GL_MODELVIEW);
10450	11310
10451		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10452		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10453		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11311	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11312	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11313	+gl.glEnable(gl.GL_MULTISAMPLE);
10454	11314	} else
10455	11315	{
10456	11316	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10461,7 +11321,7 @@
10461	11321	//System.out.println("BLENDING ON");
10462	11322	gl.glEnable(GL.GL_BLEND);
10463	11323	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10464		-
	11324	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10465	11325	gl.glMatrixMode(gl.GL_PROJECTION);
10466	11326	gl.glLoadIdentity();
10467	11327
..	..	@@ -10550,8 +11410,8 @@
10550	11410	System.err.println("parentcam != renderCamera");
10551	11411
10552	11412	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11413	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10555	11415	}
10556	11416
10557	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11432,8 @@
10572	11432	if (true) // TODO
10573	11433	{
10574	11434	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11435	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11436	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10577	11437	}
10578	11438
10579	11439	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10710,7 +11570,7 @@
10710	11570	}
10711	11571	}
10712	11572
10713		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10714	11574	{
10715	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
10716	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10718,24 +11578,21 @@
10718	11578
10719	11579	boolean texon = textureon;
10720	11580
10721		- if (RENDERPROGRAM > 0)
10722		- {
10723		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10724		- textureon = false;
10725		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
10726	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10727	11585	//System.out.println("ALLO");
10728	11586	gl.glColorMask(false, false, false, false);
10729	11587	DrawObject(gl);
10730		- if (RENDERPROGRAM > 0)
10731		- {
10732		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10733		- textureon = texon;
10734		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
10735	11592	gl.glColorMask(true, true, true, true);
10736	11593
10737	11594	gl.glDepthFunc(GL.GL_EQUAL);
10738		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
10739	11596	}
10740	11597
10741	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -10889,8 +11746,14 @@
10889	11746	{
10890	11747	renderpass++;
10891	11748	// System.out.println("Draw object... ");
	11749	+ STEP = 1;
10892	11750	if (FAST) // in case there is no script
10893		- STEP = 16;
	11751	+ STEP = 8;
	11752	+
	11753	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11754	+ {
	11755	+ STEP *= 4;
	11756	+ }
10894	11757
10895	11758	//object.FullInvariants();
10896	11759
..	..	@@ -10904,23 +11767,44 @@
10904	11767	e.printStackTrace();
10905	11768	}
10906	11769
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11770	+ if (Grafreed.RENDERME > 0)
	11771	+ Grafreed.RENDERME--; // mechante magouille
10909	11772
10910	11773	Globals.ONESTEP = false;
10911	11774	}
10912	11775
10913	11776	static boolean zoomonce = false;
10914	11777
	11778	+ static void CreateSelectedPoint()
	11779	+ {
	11780	+ if (selectedpoint == null)
	11781	+ {
	11782	+ debugpointG = new Sphere();
	11783	+ debugpointP = new Sphere();
	11784	+ debugpointC = new Sphere();
	11785	+ debugpointR = new Sphere();
	11786	+
	11787	+ selectedpoint = new Superellipsoid();
	11788	+
	11789	+ for (int i=0; i<8; i++)
	11790	+ {
	11791	+ debugpoints[i] = new Sphere();
	11792	+ }
	11793	+ }
	11794	+ }
	11795	+
10915	11796	void DrawObject(GL gl, boolean draw)
10916	11797	{
	11798	+ // To clear camera values
	11799	+ ResetOptions();
	11800	+
10917	11801	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11802	// DrawMode() = SELECTION;
10919	11803	//GL gl = getGL();
10920	11804	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10921	11805	{
10922	11806	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10923		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11807	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10924	11808	pingthread.StepToTarget(true); // true);
10925	11809	// zoomonce = false;
10926	11810	}
..	..	@@ -10975,7 +11859,14 @@
10975	11859
10976	11860	usedtextures.clear();
10977	11861
10978		- BindTextures(DEFAULT_TEXTURES, 2);
	11862	+ try
	11863	+ {
	11864	+ BindTextures(DEFAULT_TEXTURES, 2);
	11865	+ }
	11866	+ catch (Exception e)
	11867	+ {
	11868	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11869	+ }
10979	11870	}
10980	11871	//System.out.println("--> " + stackdepth);
10981	11872	// GrafreeD.traceon();
..	..	@@ -10985,8 +11876,9 @@
10985	11876
10986	11877	if (DrawMode() == DEFAULT)
10987	11878	{
10988		- if (DEBUG)
	11879	+ if (Globals.DEBUG)
10989	11880	{
	11881	+ CreateSelectedPoint();
10990	11882	float radius = 0.05f;
10991	11883	if (selectedpoint.radius != radius)
10992	11884	{
..	..	@@ -11040,20 +11932,32 @@
11040	11932	ReleaseTextures(DEFAULT_TEXTURES);
11041	11933
11042	11934	if (CLEANCACHE)
11043		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11044	11936	{
11045		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11046	11938
11047	11939	// System.out.println("Texture --------- " + tex);
11048	11940
11049		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11050	11942	continue;
11051	11943
11052		- if (!usedtextures.containsKey(tex))
	11944	+ if (!usedtextures.contains(tex))
11053	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11054	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11055		- textures.get(tex).texture.dispose();
11056		- textures.remove(tex);
	11948	+ if (gettex != null)
	11949	+ {
	11950	+ gettex.texture.dispose();
	11951	+ texturepigment.remove(tex);
	11952	+ }
	11953	+
	11954	+ gettex = texturebump.get(tex);
	11955	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11956	+ if (gettex != null)
	11957	+ {
	11958	+ gettex.texture.dispose();
	11959	+ texturebump.remove(tex);
	11960	+ }
11057	11961	}
11058	11962	}
11059	11963	}
..	..	@@ -11066,7 +11970,14 @@
11066	11970	if (checker != null && DrawMode() == DEFAULT)
11067	11971	{
11068	11972	//BindTexture(IMMORTAL_TEXTURE);
11069		- BindTextures(checker.GetTextures(), checker.texres);
	11973	+ try
	11974	+ {
	11975	+ BindTextures(checker.GetTextures(), checker.texres);
	11976	+ }
	11977	+ catch (Exception e)
	11978	+ {
	11979	+ System.err.println("FAILED: " + checker.GetTextures());
	11980	+ }
11070	11981	// NEAREST
11071	11982	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11983	DrawChecker(gl);
..	..	@@ -11148,7 +12059,7 @@
11148	12059	return;
11149	12060	}
11150	12061
11151		- String string = obj.GetToolTip();
	12062	+ String string = obj.toString(); //.GetToolTip();
11152	12063
11153	12064	GL gl = GetGL();
11154	12065
..	..	@@ -11465,8 +12376,8 @@
11465	12376	//obj.TransformToWorld(light, light);
11466	12377	for (int i = tp.size(); --i >= 0;)
11467	12378	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- LA.xformPos(light, tp.get(i).toParent, light);
	12379	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12380	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11470	12381	}
11471	12382
11472	12383
..	..	@@ -11483,8 +12394,8 @@
11483	12394	parentcam = cameras[0];
11484	12395	}
11485	12396
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12397	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12398	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11488	12399
11489	12400	LA.xformPos(light, renderCamera.toScreen, light);
11490	12401
..	..	@@ -11574,8 +12485,76 @@
11574	12485
11575	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11576	12487
11577		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
11578	12490	"!!ARBfp1.0\n" +
	12491	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12492	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12493	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12494	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12495	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12496	+ "PARAM light2cam0 = program.env[10];" +
	12497	+ "PARAM light2cam1 = program.env[11];" +
	12498	+ "PARAM light2cam2 = program.env[12];" +
	12499	+ "TEMP temp;" +
	12500	+ "TEMP light;" +
	12501	+ "TEMP ndotl;" +
	12502	+ "TEMP normal;" +
	12503	+ "TEMP depth;" +
	12504	+ "TEMP eye;" +
	12505	+ "TEMP pos;" +
	12506	+
	12507	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12508	+ Normalize("normal") +
	12509	+ "MOV light, state.light[0].position;" +
	12510	+ "DP3 ndotl.x, light, normal;" +
	12511	+
	12512	+ // shadow
	12513	+ "MOV pos, fragment.texcoord[1];" +
	12514	+ "MOV temp, pos;" +
	12515	+ ShadowTextureFetch("depth", "temp", "1") +
	12516	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12517	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12518	+
	12519	+ // No shadow when out of frustum
	12520	+ //"SGE temp.y, depth.z, zero123.y;" +
	12521	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12522	+
	12523	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12524	+
	12525	+ // Backlit
	12526	+ "MOV pos.w, zero123.y;" +
	12527	+ "DP4 eye.x, pos, light2cam0;" +
	12528	+ "DP4 eye.y, pos, light2cam1;" +
	12529	+ "DP4 eye.z, pos, light2cam2;" +
	12530	+ Normalize("eye") +
	12531	+
	12532	+ "DP3 ndotl.y, -eye, normal;" +
	12533	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12534	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12535	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12536	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12538	+
	12539	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12540	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12541	+
	12542	+ // Pigment
	12543	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12544	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12545	+ "MUL temp, temp, ndotl.x;" +
	12546	+
	12547	+ "MUL temp, temp, zero123.z;" +
	12548	+
	12549	+ //"MUL temp, temp, ndotl.y;" +
	12550	+
	12551	+ "MOV temp.w, zero123.y;" + // reset alpha
	12552	+ "MOV result.color, temp;" +
	12553	+ "END";
	12554	+
	12555	+ String programmax =
	12556	+ "!!ARBfp1.0\n" +
	12557	+
11579	12558	//"OPTION ARB_fragment_program_shadow;" +
11580	12559	"PARAM light2cam0 = program.env[10];" +
11581	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11690,8 +12669,7 @@
11690	12669	"TEMP shininess;" +
11691	12670	"\n" +
11692	12671	"MOV texSamp, one;" +
11693		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11694		-
	12672	+
11695	12673	"MOV mapgrid.x, one2048th.x;" +
11696	12674	"MOV temp, fragment.texcoord[1];" +
11697	12675	/*
..	..	@@ -11712,20 +12690,20 @@
11712	12690	"MUL temp, floor, mapgrid.x;" +
11713	12691	//"TEX depth0, temp, texture[1], 2D;" +
11714	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11715		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
11716	12694	"") +
11717	12695	"ADD temp.x, temp.x, mapgrid.x;" +
11718	12696	//"TEX depth1, temp, texture[1], 2D;" +
11719	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11720		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
11721	12699	"") +
11722	12700	"ADD temp.y, temp.y, mapgrid.x;" +
11723	12701	//"TEX depth2, temp, texture[1], 2D;" +
11724		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
11725	12703	"SUB temp.x, temp.x, mapgrid.x;" +
11726	12704	//"TEX depth3, temp, texture[1], 2D;" +
11727	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11728		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
11729	12707	"") +
11730	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11731	12709	//"MOV params, material;" +
..	..	@@ -12096,10 +13074,10 @@
12096	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12097	13075	"") +
12098	13076
12099		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12100	13078	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	13079	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12103	13081	"SUB temp.y, one.x, temp.z;" +
12104	13082	"MUL temp.x, temp.x, temp.y;" +
12105	13083	"KIL temp.x;" +
..	..	@@ -12228,8 +13206,10 @@
12228	13206	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	13207
12230	13208	"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
	13209	+ // Tuning for default skin
	13210	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13211	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13212	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12233	13213	"MUL temp.x, temp.x, temp.y;" +
12234	13214
12235	13215	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,7 +13408,14 @@
12428	13408	//once = true;
12429	13409	}
12430	13410
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
	13418	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13421
..	..	@@ -12521,25 +13508,26 @@
12521	13508	return out;
12522	13509	}
12523	13510
12524		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
12525	13513	{
12526	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12527	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12528	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12529	13519	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12530		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12531		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12532		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12533		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12534	13522	//"SWZ buffer, temp, w,w,w,w;";
12535		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12536	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12537	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12538	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12539		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12540	13528
12541		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12542		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13529	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13530	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12543	13531	}
12544	13532
12545	13533	String Shadow(String depth, String shadow)
..	..	@@ -12561,12 +13549,16 @@
12561	13549
12562	13550	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13551	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13552	+
	13553	+ // Compare fragment depth in light space with shadowmap.
12564	13554	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13555	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13556	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13557	+
	13558	+ // Reverse comparison
12567	13559	"SUB temp.x, one.x, temp.x;" +
12568	13560	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13561	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13562	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13563
12572	13564	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13572,10 @@
12580	13572	// No shadow for backface
12581	13573	"DP3 temp.x, normal, lightd;" +
12582	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13575	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13576	+
	13577	+ // No shadow when out of frustum
	13578	+ "SGE temp.x, " + depth + ".z, one.z;" +
12583	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13580	"";
12585	13581	}
..	..	@@ -12726,7 +13722,8 @@
12726	13722	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13723	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13724	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13725	+
	13726	+ //Object3D.cVector2[] vector2buffer;
12730	13727
12731	13728	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13729	// OUT : diff, spec
..	..	@@ -12742,9 +13739,10 @@
12742	13739	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13740	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13741	//"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;" +
	13742	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13743	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13744	+
	13745	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12748	13746	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13747	"RCP " + dest + ".w," + dest + ".w;" +
12750	13748	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13138,7 +14136,7 @@
13138	14136	public void mousePressed(MouseEvent e)
13139	14137	{
13140	14138	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14139	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	14140	}
13143	14141
13144	14142	static long prevtime = 0;
..	..	@@ -13165,6 +14163,7 @@
13165	14163
13166	14164	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	14165
	14166	+ if (BUTTONLESSWHEEL)
13168	14167	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	14168	{
13170	14169	return;
..	..	@@ -13173,7 +14172,7 @@
13173	14172	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	14173
13175	14174	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14175	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	14176	{
13178	14177	keepboxmode = BOXMODE;
13179	14178	keepsupport = SUPPORT;
..	..	@@ -13213,8 +14212,8 @@
13213	14212	// mode \|= META;
13214	14213	//}
13215	14214
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14215	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14216	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	14217	anchorX = ax;
13219	14218	anchorY = ay;
13220	14219	prevX = px;
..	..	@@ -13248,6 +14247,7 @@
13248	14247	else
13249	14248	if (evt.getSource() == AAtimer)
13250	14249	{
	14250	+ Globals.TIMERRUNNING = false;
13251	14251	if (mouseDown)
13252	14252	{
13253	14253	//new Exception().printStackTrace();
..	..	@@ -13273,6 +14273,10 @@
13273	14273	// LIVE = waslive;
13274	14274	// wasliveok = true;
13275	14275	// waslive = false;
	14276	+
	14277	+ // May 2019 Forget it:
	14278	+ if (true)
	14279	+ return;
13276	14280
13277	14281	// source == timer
13278	14282	if (mouseDown)
..	..	@@ -13303,7 +14307,7 @@
13303	14307
13304	14308	// fev 2014???
13305	14309	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13306		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14310	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13307	14311	pingthread.StepToTarget(true); // true);
13308	14312	}
13309	14313	// if (!LIVE)
..	..	@@ -13312,12 +14316,13 @@
13312	14316
13313	14317	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	14318
13315		- void clickStart(int x, int y, int modifiers)
	14319	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	14320	{
13317	14321	if (!wasliveok)
13318	14322	return;
13319	14323
13320	14324	AAtimer.restart(); //
	14325	+ Globals.TIMERRUNNING = true;
13321	14326
13322	14327	// waslive = LIVE;
13323	14328	// LIVE = false;
..	..	@@ -13329,7 +14334,7 @@
13329	14334	// touched = true; // main DL
13330	14335	if (isRenderer)
13331	14336	{
13332		- SetMouseMode(modifiers);
	14337	+ SetMouseMode(modifiers, modifiersex);
13333	14338	}
13334	14339
13335	14340	selectX = anchorX = x;
..	..	@@ -13342,7 +14347,7 @@
13342	14347	clicked = true;
13343	14348	hold = false;
13344	14349
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14350	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	14351	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	14352	{
13348	14353	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13367,14 +14372,15 @@
13367	14372	drag = false;
13368	14373	//System.out.println("Mouse DOWN");
13369	14374	editObj = false;
13370		- ClickInfo info = new ClickInfo();
13371		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13372		- info.pane = this;
13373		- info.camera = renderCamera;
13374		- info.x = x;
13375		- info.y = y;
13376		- info.modifiers = modifiers;
13377		- editObj = object.doEditClick(info, 0);
	14375	+ //ClickInfo info = new ClickInfo();
	14376	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14377	+ object.clickInfo.pane = this;
	14378	+ object.clickInfo.camera = renderCamera;
	14379	+ object.clickInfo.x = x;
	14380	+ object.clickInfo.y = y;
	14381	+ object.clickInfo.modifiers = modifiersex;
	14382	+ editObj = object.doEditClick(//info,
	14383	+ 0);
13378	14384	if (!editObj)
13379	14385	{
13380	14386	hasMarquee = true;
..	..	@@ -13390,11 +14396,14 @@
13390	14396
13391	14397	public void mouseDragged(MouseEvent e)
13392	14398	{
	14399	+ Globals.MOUSEDRAGGED = true;
	14400	+
	14401	+ //System.out.println("mouseDragged: " + e);
13393	14402	if (isRenderer)
13394	14403	movingcamera = true;
	14404	+
13395	14405	//if (drawing)
13396	14406	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	14407	if ((e.getModifiersEx() & CTRL) != 0
13399	14408	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14409	{
..	..	@@ -13402,7 +14411,7 @@
13402	14411	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14412	}
13404	14413	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14414	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14415
13407	14416	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14417	}
..	..	@@ -13575,6 +14584,7 @@
13575	14584
13576	14585	public void run()
13577	14586	{
	14587	+ new Exception().printStackTrace();
13578	14588	System.exit(0);
13579	14589	for (;;)
13580	14590	{
..	..	@@ -13638,7 +14648,7 @@
13638	14648	{
13639	14649	Globals.lighttouched = true;
13640	14650	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14651	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14652	}
13643	14653	//else
13644	14654	}
..	..	@@ -13652,12 +14662,12 @@
13652	14662	void GoDown(int mod)
13653	14663	{
13654	14664	MODIFIERS \|= COMMAND;
13655		- /*
	14665	+ /**/
13656	14666	if((mod&SHIFT) == SHIFT)
13657		- manipCamera.RotatePosition(0, -speed);
	14667	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
13658	14668	else
13659		- manipCamera.BackForth(0, -speed*delta, getWidth());
13660		- */
	14669	+ manipCamera.RotatePosition(0, -speed);
	14670	+ /**/
13661	14671	if ((mod & SHIFT) == SHIFT)
13662	14672	{
13663	14673	mouseMode = mouseMode; // VR??
..	..	@@ -13673,12 +14683,12 @@
13673	14683	void GoUp(int mod)
13674	14684	{
13675	14685	MODIFIERS \|= COMMAND;
13676		- /*
	14686	+ /**/
13677	14687	if((mod&SHIFT) == SHIFT)
13678		- manipCamera.RotatePosition(0, speed);
	14688	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
13679	14689	else
13680		- manipCamera.BackForth(0, speed*delta, getWidth());
13681		- */
	14690	+ manipCamera.RotatePosition(0, speed);
	14691	+ /**/
13682	14692	if ((mod & SHIFT) == SHIFT)
13683	14693	{
13684	14694	mouseMode = mouseMode;
..	..	@@ -13694,12 +14704,12 @@
13694	14704	void GoLeft(int mod)
13695	14705	{
13696	14706	MODIFIERS \|= COMMAND;
13697		- /*
	14707	+ /**/
13698	14708	if((mod&SHIFT) == SHIFT)
13699		- manipCamera.RotatePosition(speed, 0);
13700		- else
13701	14709	manipCamera.Translate(speed*delta, 0, getWidth());
13702		- */
	14710	+ else
	14711	+ manipCamera.RotatePosition(speed, 0);
	14712	+ /**/
13703	14713	if ((mod & SHIFT) == SHIFT)
13704	14714	{
13705	14715	mouseMode = mouseMode;
..	..	@@ -13715,12 +14725,12 @@
13715	14725	void GoRight(int mod)
13716	14726	{
13717	14727	MODIFIERS \|= COMMAND;
13718		- /*
	14728	+ /**/
13719	14729	if((mod&SHIFT) == SHIFT)
13720		- manipCamera.RotatePosition(-speed, 0);
13721		- else
13722	14730	manipCamera.Translate(-speed*delta, 0, getWidth());
13723		- */
	14731	+ else
	14732	+ manipCamera.RotatePosition(-speed, 0);
	14733	+ /**/
13724	14734	if ((mod & SHIFT) == SHIFT)
13725	14735	{
13726	14736	mouseMode = mouseMode;
..	..	@@ -13738,7 +14748,7 @@
13738	14748	int X, Y;
13739	14749	boolean SX, SY;
13740	14750
13741		- void drag(int x, int y, int modifiers)
	14751	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14752	{
13743	14753	if (IsFrozen())
13744	14754	{
..	..	@@ -13747,17 +14757,17 @@
13747	14757
13748	14758	drag = true; // NEW
13749	14759
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14760	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14761
13752	14762	X = x;
13753	14763	Y = y;
13754	14764	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14765	+ MODIFIERS = modifiersex;
	14766	+ modifiersex &= ~1024;
13757	14767	if (false) // modifiers != 0)
13758	14768	{
13759	14769	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14770	+ System.out.println("mouseDragged: " + modifiersex);
13761	14771	System.out.println("SHIFT = " + SHIFT);
13762	14772	System.out.println("CONTROL = " + COMMAND);
13763	14773	System.out.println("META = " + META);
..	..	@@ -13770,14 +14780,16 @@
13770	14780	if (editObj)
13771	14781	{
13772	14782	drag = true;
13773		- ClickInfo info = new ClickInfo();
13774		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
13775	14785	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13776		- info.pane = this;
13777		- info.camera = renderCamera;
13778		- info.x = x;
13779		- info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14786	+ object.clickInfo.pane = this;
	14787	+ object.clickInfo.camera = renderCamera;
	14788	+ object.clickInfo.x = x;
	14789	+ object.clickInfo.y = y;
	14790	+ object //.GetWindow().copy
	14791	+ .doEditDrag(//info,
	14792	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14793	} else
13782	14794	{
13783	14795	if (x < startX)
..	..	@@ -13926,23 +14938,27 @@
13926	14938	}
13927	14939	}
13928	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
13929	14943	public void mouseMoved(MouseEvent e)
13930	14944	{
13931	14945	//System.out.println("mouseMoved: " + e);
13932		-
13933	14946	if (isRenderer)
13934	14947	return;
13935	14948
13936		- ClickInfo ci = new ClickInfo();
13937		- ci.x = e.getX();
13938		- ci.y = e.getY();
13939		- ci.modifiers = e.getModifiersEx();
13940		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13941		- ci.pane = this;
13942		- ci.camera = renderCamera;
	14949	+ // Mouse cursor feedback
	14950	+ object.clickInfo.x = e.getX();
	14951	+ object.clickInfo.y = e.getY();
	14952	+ object.clickInfo.modifiers = e.getModifiersEx();
	14953	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14954	+ object.clickInfo.pane = this;
	14955	+ object.clickInfo.camera = renderCamera;
13943	14956	if (!isRenderer)
13944	14957	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	14958	+ //ObjEditor editWindow = object.editWindow;
	14959	+ //Object3D copy = editWindow.copy;
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
13946	14962	{
13947	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	14964	} else
..	..	@@ -13954,7 +14970,11 @@
13954	14970
13955	14971	public void mouseReleased(MouseEvent e)
13956	14972	{
	14973	+ Globals.MOUSEDRAGGED = false;
	14974	+
13957	14975	movingcamera = false;
	14976	+ X = 0; // getBounds().width/2;
	14977	+ Y = 0; // getBounds().height/2;
13958	14978	//System.out.println("mouseReleased: " + e);
13959	14979	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	14980	}
..	..	@@ -13977,9 +14997,9 @@
13977	14997	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	14998	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	14999
13980		- if (control \|\| command \|\| IsFrozen())
	15000	+// No delay if (control \|\| command \|\| IsFrozen())
13981	15001	timeout = true;
13982		- else
	15002	+// ?? May 2019 else
13983	15003	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	15004	mouseDown = false;
13985	15005	if (!control && !command) // june 2013
..	..	@@ -14089,7 +15109,7 @@
14089	15109	System.out.println("keyReleased: " + e);
14090	15110	}
14091	15111
14092		- void SetMouseMode(int modifiers)
	15112	+ void SetMouseMode(int modifiers, int modifiersex)
14093	15113	{
14094	15114	//System.out.println("SetMouseMode = " + modifiers);
14095	15115	//modifiers &= ~1024;
..	..	@@ -14101,25 +15121,25 @@
14101	15121	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	15122	// return;
14103	15123	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	15124	+ if ((modifiersex & WHEEL) == WHEEL)
14105	15125	{
14106	15126	mouseMode \|= ZOOM;
14107	15127	}
14108	15128
14109	15129	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	15130	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	15131	{
14112	15132	mouseMode \|= VR; // BACKFORTH;
14113	15133	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15134	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	15135	{
14116	15136	mouseMode \|= SELECT;
14117	15137	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	15138	+ if ((modifiersex & COMMAND) == COMMAND)
14119	15139	{
14120	15140	mouseMode \|= SELECT;
14121	15141	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15142	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	15143	{
14124	15144	mouseMode &= ~VR;
14125	15145	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +15168,7 @@
14148	15168
14149	15169	if (isRenderer) //
14150	15170	{
14151		- SetMouseMode(modifiers);
	15171	+ SetMouseMode(0, modifiers);
14152	15172	}
14153	15173
14154	15174	Globals.theRenderer.keyPressed(key);
..	..	@@ -14210,7 +15230,8 @@
14210	15230	// break;
14211	15231	case 'T':
14212	15232	CACHETEXTURE ^= true;
14213		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14214	15235	// repaint();
14215	15236	break;
14216	15237	case 'Y':
..	..	@@ -14295,7 +15316,9 @@
14295	15316	case 'E' : COMPACT ^= true;
14296	15317	repaint();
14297	15318	break;
14298		- case 'W' : DEBUGHSB ^= true;
	15319	+ case 'W' : // Wide Window (fullscreen)
	15320	+ //DEBUGHSB ^= true;
	15321	+ ObjEditor.theFrame.ToggleFullScreen();
14299	15322	repaint();
14300	15323	break;
14301	15324	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14320,8 +15343,8 @@
14320	15343	RevertCamera();
14321	15344	repaint();
14322	15345	break;
14323		- case 'L':
14324	15346	case 'l':
	15347	+ //case 'L':
14325	15348	if (lightMode)
14326	15349	{
14327	15350	lightMode = false;
..	..	@@ -14385,20 +15408,24 @@
14385	15408	OCCLUSION_CULLING ^= true;
14386	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14387	15410	break;
14388		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
14389	15412	case '1':
14390	15413	case '2':
14391	15414	case '3':
14392	15415	case '4':
14393	15416	case '5':
14394		- newenvy = Character.getNumericValue(key);
14395		- repaint();
14396		- break;
14397	15417	case '6':
14398	15418	case '7':
14399	15419	case '8':
14400	15420	case '9':
14401		- BGcolor = (key - '6')/3.f;
	15421	+ if (true) // envyoff)
	15422	+ {
	15423	+ BGcolor = (key - '1')/8.f;
	15424	+ }
	15425	+ else
	15426	+ {
	15427	+ //newenvy = Character.getNumericValue(key);
	15428	+ }
14402	15429	repaint();
14403	15430	break;
14404	15431	case '!':
..	..	@@ -14464,9 +15491,9 @@
14464	15491	case '_':
14465	15492	kompactbit = 5;
14466	15493	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15494	+// case '+':
	15495	+// kompactbit = 6;
	15496	+// break;
14470	15497	case ' ':
14471	15498	lightMode ^= true;
14472	15499	Globals.lighttouched = true;
..	..	@@ -14478,13 +15505,14 @@
14478	15505	case ESC:
14479	15506	RENDERPROGRAM += 1;
14480	15507	RENDERPROGRAM %= 3;
	15508	+
14481	15509	repaint();
14482	15510	break;
14483	15511	case 'Z':
14484	15512	//RESIZETEXTURE ^= true;
14485	15513	//break;
14486	15514	case 'z':
14487		- RENDERSHADOW ^= true;
	15515	+ Globals.RENDERSHADOW ^= true;
14488	15516	Globals.lighttouched = true;
14489	15517	repaint();
14490	15518	break;
..	..	@@ -14517,8 +15545,9 @@
14517	15545	case DELETE:
14518	15546	ClearSelection();
14519	15547	break;
14520		- /*
14521	15548	case '+':
	15549	+
	15550	+ /*
14522	15551	//fontsize += 1;
14523	15552	bbzoom *= 2;
14524	15553	repaint();
..	..	@@ -14535,17 +15564,17 @@
14535	15564	case '=':
14536	15565	IncDepth();
14537	15566	//fontsize += 1;
14538		- object.editWindow.refreshContents(true);
	15567	+ object.GetWindow().refreshContents(true);
14539	15568	maskbit = 6;
14540	15569	break;
14541	15570	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14542	15571	DecDepth();
14543	15572	maskbit = 5;
14544	15573	//if(fontsize > 1) fontsize -= 1;
14545		- if (object.editWindow == null)
14546		- new Exception().printStackTrace();
14547		- else
14548		- object.editWindow.refreshContents(true);
	15574	+// if (object.editWindow == null)
	15575	+// new Exception().printStackTrace();
	15576	+// else
	15577	+ object.GetWindow().refreshContents(true);
14549	15578	break;
14550	15579	case '{':
14551	15580	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14608,7 +15637,7 @@
14608	15637	//mode = ROTATE;
14609	15638	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15639	{
14611		- SetMouseMode(modifiers);
	15640	+ SetMouseMode(0, modifiers);
14612	15641	}
14613	15642	}
14614	15643
..	..	@@ -14742,8 +15771,9 @@
14742	15771
14743	15772	protected void processMouseMotionEvent(MouseEvent e)
14744	15773	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15774	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15775	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15776	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	15777	{
14748	15778	mouseMoved(e);
14749	15779	} else
..	..	@@ -14768,11 +15798,12 @@
14768	15798	}
14769	15799	*/
14770	15800
14771		- object.editWindow.EditSelection();
	15801	+ object.GetWindow().EditSelection(false);
14772	15802	}
14773	15803
14774	15804	void SelectParent()
14775	15805	{
	15806	+ new Exception().printStackTrace();
14776	15807	System.exit(0);
14777	15808	Composite group = (Composite) object;
14778	15809	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14784,10 +15815,10 @@
14784	15815	{
14785	15816	//selectees.remove(i);
14786	15817	System.out.println("select parent of " + elem);
14787		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15818	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14788	15819	} else
14789	15820	{
14790		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15821	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14791	15822	}
14792	15823
14793	15824	first = false;
..	..	@@ -14796,6 +15827,7 @@
14796	15827
14797	15828	void SelectChildren()
14798	15829	{
	15830	+ new Exception().printStackTrace();
14799	15831	System.exit(0);
14800	15832	/*
14801	15833	Composite group = (Composite) object;
..	..	@@ -14828,12 +15860,12 @@
14828	15860	for (int j = 0; j < group.children.size(); j++)
14829	15861	{
14830	15862	elem = (Object3D) group.children.elementAt(j);
14831		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15863	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14832	15864	first = false;
14833	15865	}
14834	15866	} else
14835	15867	{
14836		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15868	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14837	15869	}
14838	15870
14839	15871	first = false;
..	..	@@ -14844,21 +15876,21 @@
14844	15876	{
14845	15877	//Composite group = (Composite) object;
14846	15878	Object3D group = object;
14847		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15879	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14848	15880	}
14849	15881
14850	15882	void ResetTransform(int mask)
14851	15883	{
14852	15884	//Composite group = (Composite) object;
14853	15885	Object3D group = object;
14854		- group.editWindow.ResetTransform(mask);
	15886	+ group.GetWindow().ResetTransform(mask);
14855	15887	}
14856	15888
14857	15889	void FlipTransform()
14858	15890	{
14859	15891	//Composite group = (Composite) object;
14860	15892	Object3D group = object;
14861		- group.editWindow.FlipTransform();
	15893	+ group.GetWindow().FlipTransform();
14862	15894	// group.editWindow.ReduceMesh(true);
14863	15895	}
14864	15896
..	..	@@ -14866,7 +15898,7 @@
14866	15898	{
14867	15899	//Composite group = (Composite) object;
14868	15900	Object3D group = object;
14869		- group.editWindow.PrintMemory();
	15901	+ group.GetWindow().PrintMemory();
14870	15902	// group.editWindow.ReduceMesh(true);
14871	15903	}
14872	15904
..	..	@@ -14874,7 +15906,7 @@
14874	15906	{
14875	15907	//Composite group = (Composite) object;
14876	15908	Object3D group = object;
14877		- group.editWindow.ResetCentroid();
	15909	+ group.GetWindow().ResetCentroid();
14878	15910	}
14879	15911
14880	15912	void IncDepth()
..	..	@@ -14956,11 +15988,11 @@
14956	15988
14957	15989	int width = getBounds().width;
14958	15990	int height = getBounds().height;
14959		- ClickInfo info = new ClickInfo();
14960		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	15991	//Image img = CreateImage(width, height);
14962	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
	15993	+
14963	15994	Graphics gr = g; // img.getGraphics();
	15995	+
14964	15996	if (!hasMarquee)
14965	15997	{
14966	15998	if (Xmin < Xmax) // !locked)
..	..	@@ -15032,40 +16064,88 @@
15032	16064	}
15033	16065	if (object != null && !hasMarquee)
15034	16066	{
	16067	+ if (object.clickInfo == null)
	16068	+ object.clickInfo = new ClickInfo();
	16069	+ ClickInfo info = object.clickInfo;
	16070	+ //ClickInfo info = new ClickInfo();
	16071	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16072	+
15035	16073	if (isRenderer)
15036	16074	{
15037		- info.flags++;
	16075	+ object.clickInfo.flags++;
15038	16076	double frameAspect = (double) width / (double) height;
15039	16077	if (frameAspect > renderCamera.aspect)
15040	16078	{
15041	16079	int desired = (int) ((double) height * renderCamera.aspect);
15042		- info.bounds.width -= width - desired;
15043		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15044	16082	} else
15045	16083	{
15046	16084	int desired = (int) ((double) width / renderCamera.aspect);
15047		- info.bounds.height -= height - desired;
15048		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15049	16087	}
15050	16088	}
15051		- info.g = gr;
15052		- info.camera = renderCamera;
	16089	+
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15053	16092	/*
15054	16093	// Memory intensive (brep.verticescopy)
15055	16094	if (!(object instanceof Composite))
15056	16095	object.draw(info, 0, false); // SLOW :
15057	16096	*/
15058		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15059	16098	{
15060		- object.drawEditHandles(info, 0);
	16099	+ Grafreed.Assert(object != null);
	16100	+ Grafreed.Assert(object.selection != null);
	16101	+ if (object.selection.Size() > 0)
	16102	+ {
	16103	+ int hitSomething = object.selection.get(0).hitSomething;
	16104	+
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
	16108	+ if (hitSomething == Object3D.hitCenter)
	16109	+ {
	16110	+ info.DX = X;
	16111	+ if (X != 0)
	16112	+ info.DX -= info.bounds.width/2;
	16113	+
	16114	+ info.DY = Y;
	16115	+ if (Y != 0)
	16116	+ info.DY -= info.bounds.height/2;
	16117	+ }
	16118	+
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
	16121	+
	16122	+ if (drag && (X != 0 \|\| Y != 0))
	16123	+ {
	16124	+ switch (hitSomething)
	16125	+ {
	16126	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16127	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16128	+ break;
	16129	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16130	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16131	+ break;
	16132	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16133	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16134	+ break;
	16135	+ }
	16136	+
	16137	+ }
	16138	+ }
15061	16139	}
15062	16140	}
	16141	+
15063	16142	if (isRenderer)
15064	16143	{
15065	16144	//gr.setColor(Color.black);
15066	16145	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	16146	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	16147	}
	16148	+
15069	16149	if (hasMarquee)
15070	16150	{
15071	16151	gr.setXORMode(Color.white);
..	..	@@ -15178,6 +16258,7 @@
15178	16258	public boolean mouseDown(Event evt, int x, int y)
15179	16259	{
15180	16260	System.out.println("mouseDown: " + evt);
	16261	+ System.exit(0);
15181	16262	/*
15182	16263	locked = true;
15183	16264	drag = false;
..	..	@@ -15221,7 +16302,7 @@
15221	16302	{
15222	16303	keyPressed(0, modifiers);
15223	16304	}
15224		- clickStart(x, y, modifiers);
	16305	+ // clickStart(x, y, modifiers);
15225	16306	return true;
15226	16307	}
15227	16308
..	..	@@ -15339,7 +16420,7 @@
15339	16420	{
15340	16421	keyReleased(0, 0);
15341	16422	}
15342		- drag(x, y, modifiers);
	16423	+ drag(x, y, 0, modifiers);
15343	16424	return true;
15344	16425	}
15345	16426
..	..	@@ -15471,7 +16552,7 @@
15471	16552	Object3D object;
15472	16553	static Object3D trackedobject;
15473	16554	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16555	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16556	/static/ Camera eyeCamera;
15476	16557	/static/ Camera lightCamera;
15477	16558	int cameracount;
..	..	@@ -15535,6 +16616,8 @@
15535	16616	private /static/ boolean firstime;
15536	16617	private /static/ cVector newView = new cVector();
15537	16618	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16619	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16620	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15538	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15539	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15540	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15547,29 +16630,67 @@
15547	16630	{
15548	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15549	16632
	16633	+ int usedsuf = 0;
	16634	+
15550	16635	for (int i = 0; i < suffixes.length; i++)
15551	16636	{
15552		- String resourceName = basename + suffixes[i] + "." + suffix;
15553		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15554		- mipmapped,
15555		- FileUtil.getFileSuffix(resourceName));
15556		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
15557	16642	{
15558		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
15559	16647	}
	16648	+
	16649	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16650	+ TextureData data;
	16651	+
	16652	+ try
	16653	+ {
	16654	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16655	+ mipmapped,
	16656	+ FileUtil.getFileSuffix(resourceName));
	16657	+ }
	16658	+ catch (Exception e)
	16659	+ {
	16660	+ try
	16661	+ {
	16662	+ resourceName = basename + fallback[i] + "." + suffix;
	16663	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16664	+ mipmapped,
	16665	+ FileUtil.getFileSuffix(resourceName));
	16666	+ }
	16667	+ catch (Exception e2)
	16668	+ {
	16669	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16670	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16671	+ mipmapped,
	16672	+ FileUtil.getFileSuffix(resourceName));
	16673	+ }
	16674	+ }
	16675	+
15560	16676	//System.out.println("Target = " + targets[i]);
15561	16677	cubemap.updateImage(data, targets[i]);
15562	16678	}
15563	16679
15564	16680	return cubemap;
15565	16681	}
	16682	+
15566	16683	int bigsphere = -1;
15567	16684
15568	16685	float BGcolor = 0.5f;
15569	16686
15570		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
15571	16690	{
15572		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
15573	16694	{
15574	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15575	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15584,7 +16705,17 @@
15584	16705	// Compensates for ExaminerViewer's modification of modelview matrix
15585	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
15586	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
15587	16709
	16710	+// colorV[0] = 2;
	16711	+// colorV[1] = 2;
	16712	+// colorV[2] = 2;
	16713	+// colorV[3] = 1;
	16714	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16715	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16716	+//
	16717	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16718	+
15588	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
15589	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15590	16721
..	..	@@ -15616,6 +16747,7 @@
15616	16747	{
15617	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
15618	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15619	16751	gl.glMultMatrixd(viewrot_1, 0);
15620	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15621	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -15756,16 +16888,16 @@
15756	16888	cStatic.objectstack[materialdepth++] = checker;
15757	16889	//System.out.println("material " + material);
15758	16890	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16891	+ //vector2buffer = checker.projectedVertices;
15760	16892
15761	16893	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16894	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16895
15764	16896	materialdepth -= 1;
15765	16897	if (materialdepth > 0)
15766	16898	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16899	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16900	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	16901	}
15770	16902	//checker.GetMaterial().opacity = 1f;
15771	16903	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15851,6 +16983,14 @@
15851	16983	}
15852	16984	}
15853	16985
	16986	+ private Object3D GetFolder()
	16987	+ {
	16988	+ Object3D folder = object.GetWindow().copy;
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16991	+ return folder;
	16992	+ }
	16993	+
15854	16994	class SelectBuffer implements GLEventListener
15855	16995	{
15856	16996
..	..	@@ -15866,7 +17006,7 @@
15866	17006	//new Exception().printStackTrace();
15867	17007	System.out.println("select buffer init");
15868	17008	// Use debug pipeline
15869		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15870	17010
15871	17011	GL gl = drawable.getGL();
15872	17012
..	..	@@ -15909,6 +17049,7 @@
15909	17049	{
15910	17050	if (!selection)
15911	17051	{
	17052	+ new Exception().printStackTrace();
15912	17053	System.exit(0);
15913	17054	return;
15914	17055	}
..	..	@@ -15929,6 +17070,17 @@
15929	17070
15930	17071	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15931	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Make what you paint not selectable.
	17080	+ paintobj.ResetSelectable();
	17081	+ }
	17082	+ }
	17083	+
15932	17084	//int tmp = selection_view;
15933	17085	//selection_view = -1;
15934	17086	int temp = DrawMode();
..	..	@@ -15940,6 +17092,17 @@
15940	17092	// temp = DEFAULT; // patch for selection debug
15941	17093	Globals.drawMode = temp; // WARNING
15942	17094
	17095	+ if (PAINTMODE)
	17096	+ {
	17097	+ if (object.GetWindow().copy.selection.Size() > 0)
	17098	+ {
	17099	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17100	+
	17101	+ // Revert.
	17102	+ paintobj.RestoreSelectable();
	17103	+ }
	17104	+ }
	17105	+
15943	17106	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15944	17107
15945	17108	// trying different ways of getting the depth info over
..	..	@@ -15987,6 +17150,8 @@
15987	17150	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15988	17151	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	17152	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17153	+
	17154	+ CreateSelectedPoint();
15990	17155
15991	17156	// Will fit the mesh !!!
15992	17157	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16036,34 +17201,36 @@
16036	17201	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	17202	}
16038	17203
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17204	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	17205	}
16041	17206	}
16042	17207
16043	17208	if (!movingcamera && !PAINTMODE)
16044		- object.editWindow.ScreenFitPoint(); // fev 2014
	17209	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16045	17210
16046		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17211	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047	17212	{
16048		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17213	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049	17214
16050		- Object3D group = new Object3D("inst" + paintcount++);
	17215	+ if (object.GetWindow().copy.selection.Size() > 0)
	17216	+ {
	17217	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16051	17218
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();
	17219	+ Object3D inst = new Object3D("inst" + paintcount++);
	17220	+
	17221	+ inst.CreateMaterial(); // use a void leaf to select instances
	17222	+
	17223	+ inst.add(paintobj); // link
	17224	+
	17225	+ object.GetWindow().SnapObject(inst);
	17226	+
	17227	+ Object3D folder = paintFolder; // GetFolder();
	17228	+
	17229	+ folder.add(inst);
	17230	+
	17231	+ object.GetWindow().ResetModel();
	17232	+ object.GetWindow().refreshContents();
	17233	+ }
16067	17234	}
16068	17235	else
16069	17236	paintcount = 0;
..	..	@@ -16102,6 +17269,11 @@
16102	17269	//System.out.println("objects[color] = " + objects[color]);
16103	17270	//objects[color].Select();
16104	17271	indexcount = 0;
	17272	+ ObjEditor window = object.GetWindow();
	17273	+ if (window != null && deselect)
	17274	+ {
	17275	+ window.Select(null, deselect, true);
	17276	+ }
16105	17277	object.Select(color, deselect);
16106	17278	}
16107	17279
..	..	@@ -16201,7 +17373,7 @@
16201	17373	gl.glDisable(gl.GL_CULL_FACE);
16202	17374	}
16203	17375
16204		- if (!RENDERSHADOW)
	17376	+ if (!Globals.RENDERSHADOW)
16205	17377	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	17378
16207	17379	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +17383,7 @@
16211	17383	//gl.glColorMask(false, false, false, false);
16212	17384
16213	17385	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17386	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	17387	{
16216	17388	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	17389
..	..	@@ -16380,10 +17552,14 @@
16380	17552	gl.glFlush();
16381	17553
16382	17554	/**/
16383		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17555	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16384	17556
16385		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
16386	17558
	17559	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17560	+
	17561	+ int[] pixels = selectsizebuffer.array();
	17562	+
16387	17563	double r = 0, g = 0, b = 0;
16388	17564
16389	17565	double count = 0;
..	..	@@ -16394,7 +17570,7 @@
16394	17570
16395	17571	double FACTOR = 1;
16396	17572
16397		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
16398	17574	{
16399	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16400	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16477,7 +17653,7 @@
16477	17653
16478	17654	double scale = ray.z; // 1; // cos
16479	17655
16480		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
16481	17657
16482	17658	/*
16483	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16627,23 +17803,15 @@
16627	17803	int AAbuffersize = 0;
16628	17804
16629	17805	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17806	+ static Superellipsoid selectedpoint;
16631	17807	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();
	17808	+ static Sphere debugpointG;
	17809	+ static Sphere debugpointP;
	17810	+ static Sphere debugpointC;
	17811	+ static Sphere debugpointR;
16636	17812
16637	17813	static Sphere debugpoints[] = new Sphere[8];
16638	17814
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17815	static void InitPoints(float radius)
16648	17816	{
16649	17817	for (int i=0; i<8; i++)
..	..	@@ -16682,11 +17850,14 @@
16682	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
16683	17851	static IntBuffer bigAAbuffer;
16684	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
16685		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
16686	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16687	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16688	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
16689		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17857	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17858	+
	17859	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17860	+
16690	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
16691	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
16692	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -16695,10 +17866,11 @@
16695	17866	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17867	// Depth buffer format
16697	17868	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17869	+
	17870	+ public void NextIndex()
16699	17871	{
16700	17872	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17873	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	17874	//objects[indexcount] = o;
16703	17875	//System.out.println("indexcount = " + indexcount);
16704	17876	}