~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;
..	..	@@ -86,7 +120,7 @@
86	120	static boolean FULLSCREEN = false;
87	121	static boolean SUPPORT = true;
88	122	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	123	+static boolean FAST = false;
90	124	static boolean SLOWPOSE = false;
91	125	static boolean FOOTCONTACT = true;
92	126
..	..	@@ -108,7 +142,7 @@
108	142	static boolean OEIL = true;
109	143	static boolean OEILONCE = false; // do oeilon then oeiloff
110	144	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
112	146	static boolean HANDLES = false; // selection doesn't work!!
113	147	static boolean PAINTMODE = false;
114	148
..	..	@@ -152,6 +186,20 @@
152	186	defaultcaps.setAccumAlphaBits(16);
153	187	}
154	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
	202	+
155	203	void SetAsGLRenderer(boolean b)
156	204	{
157	205	isRenderer = b;
..	..	@@ -170,7 +218,8 @@
170	218
171	219	SetCamera(cam);
172	220
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	223
175	224	object = o;
176	225
..	..	@@ -327,7 +376,7 @@
327	376	cStatic.objectstack[materialdepth++] = obj;
328	377	//System.out.println("material " + material);
329	378	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
331	380	if (obj instanceof Camera)
332	381	{
333	382	display.options1[0] = material.shift;
..	..	@@ -336,14 +385,28 @@
336	385	display.options1[2] = material.shadowbias;
337	386	display.options1[3] = material.aniso;
338	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
339	393	display.options2[0] = material.opacity;
340	394	display.options2[1] = material.diffuse;
341	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
342	399
343	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
344	404	display.options4[0] = material.cameralight/0.2f;
345	405	display.options4[1] = material.subsurface;
346	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
347	410
348	411	// if (display.CURRENTANTIALIAS > 0)
349	412	// display.options3[3] /= 4;
..	..	@@ -359,7 +422,7 @@
359	422	/**/
360	423	} else
361	424	{
362		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
363	426	}
364	427	} else
365	428	{
..	..	@@ -383,8 +446,8 @@
383	446	cStatic.objectstack[materialdepth++] = obj;
384	447	//System.out.println("material " + material);
385	448	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	451	}
389	452	}
390	453
..	..	@@ -401,8 +464,8 @@
401	464	materialdepth -= 1;
402	465	if (materialdepth > 0)
403	466	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	469	}
407	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +485,8 @@
422	485	materialdepth -= 1;
423	486	if (materialdepth > 0)
424	487	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	490	}
428	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	492	//else
..	..	@@ -464,10 +527,12 @@
464	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	528	{
466	529	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
468	533	if (!hasnorm)
469	534	{
470		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
471	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1257,12 @@
1192	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1258	}
1194	1259	}
	1260	+
1195	1261	if (flipV)
1196	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1263	else
1198	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1199	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1268
..	..	@@ -1215,10 +1282,12 @@
1215	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1283	}
1217	1284	}
	1285	+
1218	1286	if (flipV)
1219	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1288	else
1221	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1222	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1293
..	..	@@ -1246,8 +1315,10 @@
1246	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1316	else
1248	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1249	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1251	1322	count2 += 2;
1252	1323	count3 += 3;
1253	1324	}
..	..	@@ -1426,6 +1497,8 @@
1426	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1498	}
1428	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1429	1502	void SetColor(Object3D obj, Vertex p0)
1430	1503	{
1431	1504	CameraPane display = this;
..	..	@@ -1493,8 +1566,6 @@
1493	1566	{
1494	1567	return;
1495	1568	}
1496		-
1497		- float[] colorV = new float[3];
1498	1569
1499	1570	if (false) // marked)
1500	1571	{
..	..	@@ -1603,7 +1674,7 @@
1603	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1675	}
1605	1676
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1678	{
1608	1679	CameraPane display = this;
1609	1680	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1701,7 @@
1630	1701
1631	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1703
1633		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
1634	1705
1635	1706	/**/
1636	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1709,7 @@
1638	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1642	1713
1643	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1817,9 @@
1746	1817	display.modelParams7[2] = 0;
1747	1818	display.modelParams7[3] = 0;
1748	1819
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1821
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1824	{
1754	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1961,7 @@
1890	1961	void PushMatrix(double[][] matrix)
1891	1962	{
1892	1963	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1894	1965	}
1895	1966
1896	1967	void PushMatrix()
..	..	@@ -2044,7 +2115,7 @@
2044	2115	//System.err.println("Oeil on");
2045	2116	OEIL = true;
2046	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2119	//pingthread.StepToTarget(true);
2049	2120	}
2050	2121
..	..	@@ -2142,7 +2213,7 @@
2142	2213	System.err.println("LIVE = " + Globals.isLIVE());
2143	2214
2144	2215	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2216	+ Grafreed.savesound = true; // wav.save();
2146	2217	// else
2147	2218	repaint(); // start loop // may 2013
2148	2219	}
..	..	@@ -2259,7 +2330,7 @@
2259	2330
2260	2331	void ToggleDebug()
2261	2332	{
2262		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2263	2334	}
2264	2335
2265	2336	void ToggleLookAt()
..	..	@@ -2267,9 +2338,9 @@
2267	2338	LOOKAT ^= true;
2268	2339	}
2269	2340
2270		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2271	2342	{
2272		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
2273	2344	}
2274	2345
2275	2346	void ToggleHandles()
..	..	@@ -2277,10 +2348,17 @@
2277	2348	HANDLES ^= true;
2278	2349	}
2279	2350
	2351	+ Object3D paintFolder;
	2352	+
2280	2353	void TogglePaint()
2281	2354	{
2282	2355	PAINTMODE ^= true;
2283	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2284	2362	}
2285	2363
2286	2364	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2454,22 @@
2376	2454	{
2377	2455	return currentGL;
2378	2456	}
2379		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2380	2473	/**/
2381	2474	class CacheTexture
2382	2475	{
..	..	@@ -2385,28 +2478,31 @@
2385	2478
2386	2479	int resolution;
2387	2480
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2482	{
2390		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2391	2485	resolution = res;
2392	2486	}
2393	2487	}
2394	2488	/**/
2395	2489
2396	2490	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2400	2496	int pigmentdepth = 0;
2401	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2498	int bumpdepth = 0;
2403	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2504
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2506	{
2411	2507	TextureData texturedata = null;
2412	2508
..	..	@@ -2425,13 +2521,34 @@
2425	2521	if (bump)
2426	2522	texturedata = ConvertBump(texturedata, false);
2427	2523
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2526
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2529
2434		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2435	2552	}
2436	2553
2437	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3621,8 @@
3504	3621
3505	3622	System.out.println("LOADING TEXTURE : " + name);
3506	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3507	3626	//
3508	3627	if (false) // compressbit > 0)
3509	3628	{
..	..	@@ -4208,6 +4327,7 @@
4208	4327
4209	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4329	{
	4330	+ new Exception().printStackTrace();
4211	4331	System.exit(0);
4212	4332	com.sun.opengl.util.texture.Texture texture = null;
4213	4333
..	..	@@ -7901,7 +8021,7 @@
7901	8021	String pigment = Object3D.GetPigment(tex);
7902	8022	String bump = Object3D.GetBump(tex);
7903	8023
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8025	{
7906	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8036,69 @@
7916	8036	pigment = null;
7917	8037	}
7918	8038
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7921	8041	}
7922	8042
7923		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8102	{
7925	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8109,7 @@
7931	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8110
7933	8111	if (tex != null)
7934		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8113
7936	8114	// //assert( texture != null );
7937	8115	// if (texture == null)
..	..	@@ -8023,7 +8201,55 @@
8023	8201	}
8024	8202	}
8025	8203
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8205	+ {
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8253	{
8028	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8260,47 @@
8034	8260	if (tex == null)
8035	8261	{
8036	8262	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8263	return;
8039	8264	}
8040	8265
8041	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
8042	8299	String bump = Object3D.GetBump(tex);
8043	8300
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8046	8302
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8304	{
8049	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8310,94 @@
8054	8310	{
8055	8311	bump = null;
8056	8312	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8313
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8066	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8317	}
8070	8318
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
8072	8322	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
8074	8342
8075	8343	if (tex != null)
8076	8344	{
8077		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8347
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
	8355	+// String[] split = tex.split("Textures");
	8356	+// if (split.length > 1)
	8357	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8358	+// else
	8359	+// if (!texname.startsWith("/"))
	8360	+// texname = "/Users/nbriere/Textures/" + texname;
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
8085	8365
8086	8366	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8367	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8401	{
8095	8402	assert(!bump);
8096	8403	// if (bump)
..	..	@@ -8101,19 +8408,23 @@
8101	8408	// }
8102	8409	// else
8103	8410	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8106	8413	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8109	8418	// }
8110	8419	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8421	{
8113	8422	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8117	8428	} else
8118	8429	{
8119	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8432,22 @@
8121	8432	// texture = GetResourceTexture("default.png");
8122	8433	//} else
8123	8434	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8125	8436	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8129	8451	} else
8130	8452	{
8131	8453	if (textureon)
..	..	@@ -8150,7 +8472,7 @@
8150	8472	}
8151	8473
8152	8474	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
8154	8476	cachename = texname;
8155	8477	else
8156	8478	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8494,7 @@
8172	8494	}
8173	8495
8174	8496	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8497	+ if (!FileExists(cachename))
8176	8498	cachename = texname;
8177	8499	else
8178	8500	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8503,23 @@
8181	8503	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8504
8183	8505
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8506	+ if (texturedata == null)
	8507	+ throw new Exception();
	8508	+
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8510	//texture = GetTexture(tex, bump);
8187	8511	}
	8512	+ }
8188	8513	}
8189	8514	//}
8190	8515	}
8191	8516
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8518	{
8194	8519	//return false;
8195	8520
8196	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8523	{
8199	8524	// String ext = "_highres";
8200	8525	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8536,17 @@
8211	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8537	if (!cachefile.exists())
8213	8538	{
8214		- // cache to disk
8215		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8216		- //buffers[0].
8217		-
8218		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8219		- int[] pixels = new int[bytebuf.capacity()/3];
8220		-
8221		- // squared size heuristic...
8222		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8540	{
8224		- for (int i=pixels.length; --i>=0;)
8225		- {
8226		- int i3 = i*3;
8227		- pixels[i] = 0xFF;
8228		- pixels[i] <<= 8;
8229		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8230		- pixels[i] <<= 8;
8231		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8232		- pixels[i] <<= 8;
8233		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8234		- }
8235		-
8236		- /*
8237		- int r=0,g=0,b=0,a=0;
8238		- for (int i=0; i<width; i++)
8239		- for (int j=0; j<height; j++)
8240		- {
8241		- int index = j*width+i;
8242		- int p = pixels[index];
8243		- a = ((p>>24) & 0xFF);
8244		- r = ((p>>16) & 0xFF);
8245		- g = ((p>>8) & 0xFF);
8246		- b = (p & 0xFF);
8247		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8248		- }
8249		- /**/
8250		- int width = (int)Math.sqrt(pixels.length); // squared
8251		- int height = width;
8252		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8253		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8254	8543	ImageWriter writer = null;
8255	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8545	if (iter.hasNext()) {
8257	8546	writer = (ImageWriter)iter.next();
8258	8547	}
8259		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8260	8550	try
8261	8551	{
8262	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8563,20 @@
8273	8563	}
8274	8564	}
8275	8565	}
8276		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8277	8569	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8279	8571	{
8280		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8281	8573	thetex.texture.disable();
8282	8574	thetex.texture.dispose();
8283		- textures.remove(texname);
	8575	+ textures.remove(tex);
8284	8576	}
8285	8577
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8288	8580
8289	8581	// newtex = true;
8290	8582	}
..	..	@@ -8300,10 +8592,44 @@
8300	8592	}
8301	8593	}
8302	8594
8303		- return texture;
	8595	+ return texturecache;
8304	8596	}
8305	8597
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8307	8633	{
8308	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8635
..	..	@@ -8321,21 +8647,21 @@
8321	8647	return texture!=null?texture.texture:null;
8322	8648	}
8323	8649
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8651	{
8326	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8653
8328	8654	return texture!=null?texture.texturedata:null;
8329	8655	}
8330	8656
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8658	{
8333	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8660	{
8335	8661	return false;
8336	8662	}
8337	8663
8338		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8339	8665
8340	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8667
..	..	@@ -8367,9 +8693,75 @@
8367	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8695
8370		- return newtex;
	8696	+ return true; // Warning: not used.
8371	8697	}
8372	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8373	8765	ShadowBuffer shadowPBuf;
8374	8766	AntialiasBuffer antialiasPBuf;
8375	8767	int MAXSTACK;
..	..	@@ -8386,10 +8778,12 @@
8386	8778
8387	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8388	8780	MAXSTACK = temp[0];
8389		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8390	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8391	8784	MAXSTACK = temp[0];
8392		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8393	8787
8394	8788	// Use debug pipeline
8395	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8397,7 +8791,8 @@
8397	8791	gl = drawable.getGL(); //
8398	8792
8399	8793	GL gl3 = getGL();
8400		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8401	8796
8402	8797
8403	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8562,7 +8957,7 @@
8562	8957
8563	8958	if (cubemap == null)
8564	8959	{
8565		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8566	8961	}
8567	8962
8568	8963	//cubemap.enable();
..	..	@@ -8849,37 +9244,58 @@
8849	9244	cubemap = null;
8850	9245	return;
8851	9246	case 1:
8852		- name = "cubemaps/box_";
8853		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
8854	9249	reverseUP = false;
8855	9250	break;
8856	9251	case 2:
8857		- name = "cubemaps/uffizi_";
8858		- ext = "png";
8859		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
8860	9256	case 3:
8861		- name = "cubemaps/CloudyHills_";
8862		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
8863	9259	reverseUP = false;
8864	9260	break;
8865	9261	case 4:
8866		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
8867	9263	ext = "png";
8868	9264	reverseUP = false;
8869	9265	break;
	9266	+ case 5:
	9267	+ name = "cubemaps/skycube/";
	9268	+ ext = "jpg";
	9269	+ reverseUP = false;
	9270	+ break;
	9271	+ case 6:
	9272	+ name = "cubemaps/SaintLazarusChurch3/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 7:
	9277	+ name = "cubemaps/Sodermalmsallen/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 8:
	9282	+ name = "cubemaps/Sodermalmsallen2/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 9:
	9287	+ name = "cubemaps/UnionSquare/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
8870	9291	default:
8871		- name = "cubemaps/rgb_";
8872		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
8873	9295	break;
8874	9296	}
8875		-
8876		- try
8877		- {
8878		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8879		- } catch (IOException e)
8880		- {
8881		- throw new RuntimeException(e);
8882		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
8883	9299	}
8884	9300
8885	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8911,8 +9327,12 @@
8911	9327	static double[] model = new double[16];
8912	9328	double[] camera2light = new double[16];
8913	9329	double[] light2camera = new double[16];
8914		- int newenvy = -1;
8915		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
8916	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8917	9337	//float[] light0 = { 0,0,0 };
8918	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9205,11 +9625,35 @@
9205	9625	jy8[3] = 0.5f;
9206	9626	}
9207	9627
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9628	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9629	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9630	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9631	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9632
	9633	+ void ResetOptions()
	9634	+ {
	9635	+ options1[0] = 100;
	9636	+ options1[1] = 0.025f;
	9637	+ options1[2] = 0.01f;
	9638	+ options1[3] = 0;
	9639	+ options1[4] = 0;
	9640	+
	9641	+ options2[0] = 0;
	9642	+ options2[1] = 0.75f;
	9643	+ options2[2] = 0;
	9644	+ options2[3] = 0;
	9645	+
	9646	+ options3[0] = 1;
	9647	+ options3[1] = 1;
	9648	+ options3[2] = 1;
	9649	+ options3[3] = 0;
	9650	+
	9651	+ options4[0] = 1;
	9652	+ options4[1] = 0;
	9653	+ options4[2] = 1;
	9654	+ options4[3] = 0;
	9655	+ }
	9656	+
9213	9657	static int imagecount = 0; // movie generation
9214	9658
9215	9659	static int jitter = 0;
..	..	@@ -9305,8 +9749,8 @@
9305	9749	assert (parentcam != renderCamera);
9306	9750
9307	9751	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9752	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9310	9754
9311	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9756
..	..	@@ -9321,8 +9765,8 @@
9321	9765	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9766
9323	9767	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9768	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9326	9770
9327	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9772
..	..	@@ -9368,10 +9812,12 @@
9368	9812	rati = 1 / rati;
9369	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9370	9814	}
9371		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9372	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9373	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9374		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9375	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9377	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9394,7 +9840,7 @@
9394	9840	//gl.glFlush();
9395	9841	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9842
9397		- if (ANIMATION && ABORTED)
	9843	+ if (Globals.ANIMATION && ABORTED)
9398	9844	{
9399	9845	System.err.println(" ABORTED FRAME");
9400	9846	break;
..	..	@@ -9424,7 +9870,7 @@
9424	9870	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9871
9426	9872	// save image
9427		- if (ANIMATION && !ABORTED)
	9873	+ if (Globals.ANIMATION && !ABORTED)
9428	9874	{
9429	9875	VPwidth = viewport[2];
9430	9876	VPheight = viewport[3];
..	..	@@ -9535,11 +9981,11 @@
9535	9981
9536	9982	// imagecount++;
9537	9983
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9984	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9985
9540	9986	if (!BOXMODE)
9541	9987	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9988	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9989	}
9544	9990
9545	9991	if (!BOXMODE)
..	..	@@ -9577,7 +10023,7 @@
9577	10023	ABORTED = false;
9578	10024	}
9579	10025	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10026	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	10027
9582	10028	if (false)
9583	10029	{
..	..	@@ -10240,11 +10686,11 @@
10240	10686
10241	10687	public void display(GLAutoDrawable drawable)
10242	10688	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10689	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10690	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10691	+ Grafreed.wav.save();
	10692	+ Grafreed.savesound = false;
	10693	+ Grafreed.hassound = false;
10248	10694	}
10249	10695	// if (DEBUG_SELECTION)
10250	10696	// {
..	..	@@ -10320,6 +10766,7 @@
10320	10766	ANTIALIAS = 0;
10321	10767	//System.out.println("RESTART");
10322	10768	AAtimer.restart();
	10769	+ Globals.TIMERRUNNING = true;
10323	10770	}
10324	10771	}
10325	10772	}
..	..	@@ -10374,7 +10821,7 @@
10374	10821	Object3D theobject = object;
10375	10822	Object3D theparent = object.parent;
10376	10823	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10824	+ object = (Object3D)Grafreed.clone(object);
10378	10825	object.Stripify();
10379	10826	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10827	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10834,14 @@
10387	10834	ambientOcclusion = false;
10388	10835	}
10389	10836
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10837	+ if (//Globals.lighttouched &&
	10838	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10839	{
10392	10840	//if (RENDERSHADOW) // ?
10393	10841	if (!IsFrozen())
10394	10842	{
10395	10843	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10844	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10845	{
10398	10846	Globals.framecount++;
10399	10847	shadowbuffer.display();
..	..	@@ -10406,7 +10854,7 @@
10406	10854
10407	10855	if (wait)
10408	10856	{
10409		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10410	10858
10411	10859	wait = false;
10412	10860	}
..	..	@@ -10520,8 +10968,8 @@
10520	10968
10521	10969	// if (parentcam != renderCamera) // not a light
10522	10970	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10971	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10525	10973
10526	10974	for (int j = 0; j < 4; j++)
10527	10975	{
..	..	@@ -10535,8 +10983,8 @@
10535	10983
10536	10984	// if (parentcam != renderCamera) // not a light
10537	10985	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10986	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10540	10988
10541	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10990
..	..	@@ -10622,13 +11070,27 @@
10622	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10623	11071	}
10624	11072
10625		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
10626	11081	{
10627		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
10628	11087	}
10629		-
10630		- newenvy = -1;
10631		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
10632	11094	ratio = ((double) getWidth()) / getHeight();
10633	11095	//System.out.println("ratio = " + ratio);
10634	11096
..	..	@@ -10644,7 +11106,7 @@
10644	11106
10645	11107	if (!IsFrozen() && !ambientOcclusion)
10646	11108	{
10647		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
10648	11110	}
10649	11111
10650	11112	//if (selection_view == -1)
..	..	@@ -10795,7 +11257,16 @@
10795	11257	// Bump noise
10796	11258	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11259	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11260	+
	11261	+ try
	11262	+ {
	11263	+ BindTexture(NOISE_TEXTURE, false, 2);
	11264	+ }
	11265	+ catch (Exception e)
	11266	+ {
	11267	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11268	+ }
	11269	+
10799	11270
10800	11271	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11272	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11289,9 @@
10818	11289
10819	11290	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11291
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11292	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11293	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11294	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11295	} else
10825	11296	{
10826	11297	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11302,7 @@
10831	11302	//System.out.println("BLENDING ON");
10832	11303	gl.glEnable(GL.GL_BLEND);
10833	11304	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11305	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11306	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11307	gl.glLoadIdentity();
10837	11308
..	..	@@ -10920,8 +11391,8 @@
10920	11391	System.err.println("parentcam != renderCamera");
10921	11392
10922	11393	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11394	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10925	11396	}
10926	11397
10927	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11413,8 @@
10942	11413	if (true) // TODO
10943	11414	{
10944	11415	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11416	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11417	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11418	}
10948	11419
10949	11420	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11551,7 @@
11080	11551	}
11081	11552	}
11082	11553
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11554	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11555	{
11085	11556	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11557	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11559,21 @@
11088	11559
11089	11560	boolean texon = textureon;
11090	11561
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11562	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11563	+ textureon = false;
	11564	+
11096	11565	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11566	//System.out.println("ALLO");
11098	11567	gl.glColorMask(false, false, false, false);
11099	11568	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11569	+
	11570	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11571	+ textureon = texon;
	11572	+
11105	11573	gl.glColorMask(true, true, true, true);
11106	11574
11107	11575	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11576	+ gl.glDepthMask(false);
11109	11577	}
11110	11578
11111	11579	if (false) // DrawMode() == SHADOW)
..	..	@@ -11259,8 +11727,14 @@
11259	11727	{
11260	11728	renderpass++;
11261	11729	// System.out.println("Draw object... ");
	11730	+ STEP = 1;
11262	11731	if (FAST) // in case there is no script
11263		- STEP = 16;
	11732	+ STEP = 8;
	11733	+
	11734	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11735	+ {
	11736	+ STEP *= 4;
	11737	+ }
11264	11738
11265	11739	//object.FullInvariants();
11266	11740
..	..	@@ -11274,23 +11748,44 @@
11274	11748	e.printStackTrace();
11275	11749	}
11276	11750
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11751	+ if (Grafreed.RENDERME > 0)
	11752	+ Grafreed.RENDERME--; // mechante magouille
11279	11753
11280	11754	Globals.ONESTEP = false;
11281	11755	}
11282	11756
11283	11757	static boolean zoomonce = false;
11284	11758
	11759	+ static void CreateSelectedPoint()
	11760	+ {
	11761	+ if (selectedpoint == null)
	11762	+ {
	11763	+ debugpointG = new Sphere();
	11764	+ debugpointP = new Sphere();
	11765	+ debugpointC = new Sphere();
	11766	+ debugpointR = new Sphere();
	11767	+
	11768	+ selectedpoint = new Superellipsoid();
	11769	+
	11770	+ for (int i=0; i<8; i++)
	11771	+ {
	11772	+ debugpoints[i] = new Sphere();
	11773	+ }
	11774	+ }
	11775	+ }
	11776	+
11285	11777	void DrawObject(GL gl, boolean draw)
11286	11778	{
	11779	+ // To clear camera values
	11780	+ ResetOptions();
	11781	+
11287	11782	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11783	// DrawMode() = SELECTION;
11289	11784	//GL gl = getGL();
11290	11785	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11786	{
11292	11787	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11788	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11789	pingthread.StepToTarget(true); // true);
11295	11790	// zoomonce = false;
11296	11791	}
..	..	@@ -11345,7 +11840,14 @@
11345	11840
11346	11841	usedtextures.clear();
11347	11842
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11843	+ try
	11844	+ {
	11845	+ BindTextures(DEFAULT_TEXTURES, 2);
	11846	+ }
	11847	+ catch (Exception e)
	11848	+ {
	11849	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11850	+ }
11349	11851	}
11350	11852	//System.out.println("--> " + stackdepth);
11351	11853	// GrafreeD.traceon();
..	..	@@ -11355,8 +11857,9 @@
11355	11857
11356	11858	if (DrawMode() == DEFAULT)
11357	11859	{
11358		- if (DEBUG)
	11860	+ if (Globals.DEBUG)
11359	11861	{
	11862	+ CreateSelectedPoint();
11360	11863	float radius = 0.05f;
11361	11864	if (selectedpoint.radius != radius)
11362	11865	{
..	..	@@ -11410,20 +11913,32 @@
11410	11913	ReleaseTextures(DEFAULT_TEXTURES);
11411	11914
11412	11915	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11916	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11917	{
11415		- String tex = e.nextElement();
	11918	+ cTexture tex = e.nextElement();
11416	11919
11417	11920	// System.out.println("Texture --------- " + tex);
11418	11921
11419		- if (tex.equals("WHITE_NOISE"))
	11922	+ if (tex.equals("WHITE_NOISE:"))
11420	11923	continue;
11421	11924
11422		- if (!usedtextures.containsKey(tex))
	11925	+ if (!usedtextures.contains(tex))
11423	11926	{
	11927	+ CacheTexture gettex = texturepigment.get(tex);
11424	11928	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	11929	+ if (gettex != null)
	11930	+ {
	11931	+ gettex.texture.dispose();
	11932	+ texturepigment.remove(tex);
	11933	+ }
	11934	+
	11935	+ gettex = texturebump.get(tex);
	11936	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11937	+ if (gettex != null)
	11938	+ {
	11939	+ gettex.texture.dispose();
	11940	+ texturebump.remove(tex);
	11941	+ }
11427	11942	}
11428	11943	}
11429	11944	}
..	..	@@ -11436,7 +11951,14 @@
11436	11951	if (checker != null && DrawMode() == DEFAULT)
11437	11952	{
11438	11953	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11954	+ try
	11955	+ {
	11956	+ BindTextures(checker.GetTextures(), checker.texres);
	11957	+ }
	11958	+ catch (Exception e)
	11959	+ {
	11960	+ System.err.println("FAILED: " + checker.GetTextures());
	11961	+ }
11440	11962	// NEAREST
11441	11963	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11964	DrawChecker(gl);
..	..	@@ -11518,7 +12040,7 @@
11518	12040	return;
11519	12041	}
11520	12042
11521		- String string = obj.GetToolTip();
	12043	+ String string = obj.toString(); //.GetToolTip();
11522	12044
11523	12045	GL gl = GetGL();
11524	12046
..	..	@@ -11835,8 +12357,8 @@
11835	12357	//obj.TransformToWorld(light, light);
11836	12358	for (int i = tp.size(); --i >= 0;)
11837	12359	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12360	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12361	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12362	}
11841	12363
11842	12364
..	..	@@ -11853,8 +12375,8 @@
11853	12375	parentcam = cameras[0];
11854	12376	}
11855	12377
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12378	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12379	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12380
11859	12381	LA.xformPos(light, renderCamera.toScreen, light);
11860	12382
..	..	@@ -11944,8 +12466,76 @@
11944	12466
11945	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12468
11947		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
11948	12471	"!!ARBfp1.0\n" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12473	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12474	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12475	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12476	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12477	+ "PARAM light2cam0 = program.env[10];" +
	12478	+ "PARAM light2cam1 = program.env[11];" +
	12479	+ "PARAM light2cam2 = program.env[12];" +
	12480	+ "TEMP temp;" +
	12481	+ "TEMP light;" +
	12482	+ "TEMP ndotl;" +
	12483	+ "TEMP normal;" +
	12484	+ "TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
	12487	+
	12488	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12489	+ Normalize("normal") +
	12490	+ "MOV light, state.light[0].position;" +
	12491	+ "DP3 ndotl.x, light, normal;" +
	12492	+
	12493	+ // shadow
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
	12497	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12499	+
	12500	+ // No shadow when out of frustum
	12501	+ //"SGE temp.y, depth.z, zero123.y;" +
	12502	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12503	+
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12505	+
	12506	+ // Backlit
	12507	+ "MOV pos.w, zero123.y;" +
	12508	+ "DP4 eye.x, pos, light2cam0;" +
	12509	+ "DP4 eye.y, pos, light2cam1;" +
	12510	+ "DP4 eye.z, pos, light2cam2;" +
	12511	+ Normalize("eye") +
	12512	+
	12513	+ "DP3 ndotl.y, -eye, normal;" +
	12514	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12515	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12516	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12517	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12518	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12519	+
	12520	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12521	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12522	+
	12523	+ // Pigment
	12524	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12526	+ "MUL temp, temp, ndotl.x;" +
	12527	+
	12528	+ "MUL temp, temp, zero123.z;" +
	12529	+
	12530	+ //"MUL temp, temp, ndotl.y;" +
	12531	+
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
	12533	+ "MOV result.color, temp;" +
	12534	+ "END";
	12535	+
	12536	+ String programmax =
	12537	+ "!!ARBfp1.0\n" +
	12538	+
11949	12539	//"OPTION ARB_fragment_program_shadow;" +
11950	12540	"PARAM light2cam0 = program.env[10];" +
11951	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12060,8 +12650,7 @@
12060	12650	"TEMP shininess;" +
12061	12651	"\n" +
12062	12652	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12653	+
12065	12654	"MOV mapgrid.x, one2048th.x;" +
12066	12655	"MOV temp, fragment.texcoord[1];" +
12067	12656	/*
..	..	@@ -12082,20 +12671,20 @@
12082	12671	"MUL temp, floor, mapgrid.x;" +
12083	12672	//"TEX depth0, temp, texture[1], 2D;" +
12084	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12085		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12086	12675	"") +
12087	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12088	12677	//"TEX depth1, temp, texture[1], 2D;" +
12089	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12091	12680	"") +
12092	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12093	12682	//"TEX depth2, temp, texture[1], 2D;" +
12094		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12095	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12096	12685	//"TEX depth3, temp, texture[1], 2D;" +
12097	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12098		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12099	12688	"") +
12100	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12101	12690	//"MOV params, material;" +
..	..	@@ -12466,10 +13055,10 @@
12466	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	13056	"") +
12468	13057
12469		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12470	13059	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	13060	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12473	13062	"SUB temp.y, one.x, temp.z;" +
12474	13063	"MUL temp.x, temp.x, temp.y;" +
12475	13064	"KIL temp.x;" +
..	..	@@ -12598,8 +13187,10 @@
12598	13187	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13188
12600	13189	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13190	+ // Tuning for default skin
	13191	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13192	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13193	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13194	"MUL temp.x, temp.x, temp.y;" +
12604	13195
12605	13196	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12798,7 +13389,14 @@
12798	13389	//once = true;
12799	13390	}
12800	13391
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
	13399	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13402
..	..	@@ -12891,25 +13489,26 @@
12891	13489	return out;
12892	13490	}
12893	13491
12894		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
12895	13494	{
12896	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13500	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12900		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12901		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12902		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12903		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13503	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13509
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13510	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13511	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12913	13512	}
12914	13513
12915	13514	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13530,16 @@
12931	13530
12932	13531	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13532	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13533	+
	13534	+ // Compare fragment depth in light space with shadowmap.
12934	13535	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13536	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13537	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13538	+
	13539	+ // Reverse comparison
12937	13540	"SUB temp.x, one.x, temp.x;" +
12938	13541	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13542	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13543	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13544
12942	13545	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13553,10 @@
12950	13553	// No shadow for backface
12951	13554	"DP3 temp.x, normal, lightd;" +
12952	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13556	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13557	+
	13558	+ // No shadow when out of frustum
	13559	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13561	"";
12955	13562	}
..	..	@@ -13096,7 +13703,8 @@
13096	13703	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13704	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13705	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13706	+
	13707	+ //Object3D.cVector2[] vector2buffer;
13100	13708
13101	13709	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13710	// OUT : diff, spec
..	..	@@ -13112,9 +13720,10 @@
13112	13720	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13721	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13722	//"MOV " + dest + ".w," + "normal.z;" +
13115		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13116		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13117		- //"MOV " + dest + ".z," + "params2.w;" +
	13723	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13724	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13725	+
	13726	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13727	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13728	"RCP " + dest + ".w," + dest + ".w;" +
13120	13729	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +14117,7 @@
13508	14117	public void mousePressed(MouseEvent e)
13509	14118	{
13510	14119	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14120	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14121	}
13513	14122
13514	14123	static long prevtime = 0;
..	..	@@ -13584,8 +14193,8 @@
13584	14193	// mode \|= META;
13585	14194	//}
13586	14195
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14196	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14197	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	14198	anchorX = ax;
13590	14199	anchorY = ay;
13591	14200	prevX = px;
..	..	@@ -13619,6 +14228,7 @@
13619	14228	else
13620	14229	if (evt.getSource() == AAtimer)
13621	14230	{
	14231	+ Globals.TIMERRUNNING = false;
13622	14232	if (mouseDown)
13623	14233	{
13624	14234	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14254,10 @@
13644	14254	// LIVE = waslive;
13645	14255	// wasliveok = true;
13646	14256	// waslive = false;
	14257	+
	14258	+ // May 2019 Forget it:
	14259	+ if (true)
	14260	+ return;
13647	14261
13648	14262	// source == timer
13649	14263	if (mouseDown)
..	..	@@ -13674,7 +14288,7 @@
13674	14288
13675	14289	// fev 2014???
13676	14290	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14291	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14292	pingthread.StepToTarget(true); // true);
13679	14293	}
13680	14294	// if (!LIVE)
..	..	@@ -13683,12 +14297,13 @@
13683	14297
13684	14298	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14299
13686		- void clickStart(int x, int y, int modifiers)
	14300	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14301	{
13688	14302	if (!wasliveok)
13689	14303	return;
13690	14304
13691	14305	AAtimer.restart(); //
	14306	+ Globals.TIMERRUNNING = true;
13692	14307
13693	14308	// waslive = LIVE;
13694	14309	// LIVE = false;
..	..	@@ -13700,7 +14315,7 @@
13700	14315	// touched = true; // main DL
13701	14316	if (isRenderer)
13702	14317	{
13703		- SetMouseMode(modifiers);
	14318	+ SetMouseMode(modifiers, modifiersex);
13704	14319	}
13705	14320
13706	14321	selectX = anchorX = x;
..	..	@@ -13713,7 +14328,7 @@
13713	14328	clicked = true;
13714	14329	hold = false;
13715	14330
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14331	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14332	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14333	{
13719	14334	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14353,15 @@
13738	14353	drag = false;
13739	14354	//System.out.println("Mouse DOWN");
13740	14355	editObj = false;
13741		- ClickInfo info = new ClickInfo();
13742		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13743		- info.pane = this;
13744		- info.camera = renderCamera;
13745		- info.x = x;
13746		- info.y = y;
13747		- info.modifiers = modifiers;
13748		- editObj = object.doEditClick(info, 0);
	14356	+ //ClickInfo info = new ClickInfo();
	14357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14358	+ object.clickInfo.pane = this;
	14359	+ object.clickInfo.camera = renderCamera;
	14360	+ object.clickInfo.x = x;
	14361	+ object.clickInfo.y = y;
	14362	+ object.clickInfo.modifiers = modifiersex;
	14363	+ editObj = object.doEditClick(//info,
	14364	+ 0);
13749	14365	if (!editObj)
13750	14366	{
13751	14367	hasMarquee = true;
..	..	@@ -13761,9 +14377,12 @@
13761	14377
13762	14378	public void mouseDragged(MouseEvent e)
13763	14379	{
	14380	+ Globals.MOUSEDRAGGED = true;
	14381	+
13764	14382	//System.out.println("mouseDragged: " + e);
13765	14383	if (isRenderer)
13766	14384	movingcamera = true;
	14385	+
13767	14386	//if (drawing)
13768	14387	//return;
13769	14388	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14392,7 @@
13773	14392	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14393	}
13775	14394	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14395	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14396
13778	14397	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14398	}
..	..	@@ -13946,6 +14565,7 @@
13946	14565
13947	14566	public void run()
13948	14567	{
	14568	+ new Exception().printStackTrace();
13949	14569	System.exit(0);
13950	14570	for (;;)
13951	14571	{
..	..	@@ -14009,7 +14629,7 @@
14009	14629	{
14010	14630	Globals.lighttouched = true;
14011	14631	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14632	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14633	}
14014	14634	//else
14015	14635	}
..	..	@@ -14023,12 +14643,12 @@
14023	14643	void GoDown(int mod)
14024	14644	{
14025	14645	MODIFIERS \|= COMMAND;
14026		- /*
	14646	+ /**/
14027	14647	if((mod&SHIFT) == SHIFT)
14028		- manipCamera.RotatePosition(0, -speed);
	14648	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14029	14649	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14650	+ manipCamera.RotatePosition(0, -speed);
	14651	+ /**/
14032	14652	if ((mod & SHIFT) == SHIFT)
14033	14653	{
14034	14654	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14664,12 @@
14044	14664	void GoUp(int mod)
14045	14665	{
14046	14666	MODIFIERS \|= COMMAND;
14047		- /*
	14667	+ /**/
14048	14668	if((mod&SHIFT) == SHIFT)
14049		- manipCamera.RotatePosition(0, speed);
	14669	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14050	14670	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14671	+ manipCamera.RotatePosition(0, speed);
	14672	+ /**/
14053	14673	if ((mod & SHIFT) == SHIFT)
14054	14674	{
14055	14675	mouseMode = mouseMode;
..	..	@@ -14065,12 +14685,12 @@
14065	14685	void GoLeft(int mod)
14066	14686	{
14067	14687	MODIFIERS \|= COMMAND;
14068		- /*
	14688	+ /**/
14069	14689	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14690	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14691	+ else
	14692	+ manipCamera.RotatePosition(speed, 0);
	14693	+ /**/
14074	14694	if ((mod & SHIFT) == SHIFT)
14075	14695	{
14076	14696	mouseMode = mouseMode;
..	..	@@ -14086,12 +14706,12 @@
14086	14706	void GoRight(int mod)
14087	14707	{
14088	14708	MODIFIERS \|= COMMAND;
14089		- /*
	14709	+ /**/
14090	14710	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14711	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14712	+ else
	14713	+ manipCamera.RotatePosition(-speed, 0);
	14714	+ /**/
14095	14715	if ((mod & SHIFT) == SHIFT)
14096	14716	{
14097	14717	mouseMode = mouseMode;
..	..	@@ -14109,7 +14729,7 @@
14109	14729	int X, Y;
14110	14730	boolean SX, SY;
14111	14731
14112		- void drag(int x, int y, int modifiers)
	14732	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14733	{
14114	14734	if (IsFrozen())
14115	14735	{
..	..	@@ -14118,17 +14738,17 @@
14118	14738
14119	14739	drag = true; // NEW
14120	14740
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14741	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14742
14123	14743	X = x;
14124	14744	Y = y;
14125	14745	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14746	+ MODIFIERS = modifiersex;
	14747	+ modifiersex &= ~1024;
14128	14748	if (false) // modifiers != 0)
14129	14749	{
14130	14750	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14751	+ System.out.println("mouseDragged: " + modifiersex);
14132	14752	System.out.println("SHIFT = " + SHIFT);
14133	14753	System.out.println("CONTROL = " + COMMAND);
14134	14754	System.out.println("META = " + META);
..	..	@@ -14141,14 +14761,16 @@
14141	14761	if (editObj)
14142	14762	{
14143	14763	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14146	14766	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14147		- info.pane = this;
14148		- info.camera = renderCamera;
14149		- info.x = x;
14150		- info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14767	+ object.clickInfo.pane = this;
	14768	+ object.clickInfo.camera = renderCamera;
	14769	+ object.clickInfo.x = x;
	14770	+ object.clickInfo.y = y;
	14771	+ object //.GetWindow().copy
	14772	+ .doEditDrag(//info,
	14773	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14774	} else
14153	14775	{
14154	14776	if (x < startX)
..	..	@@ -14297,22 +14919,27 @@
14297	14919	}
14298	14920	}
14299	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14300	14924	public void mouseMoved(MouseEvent e)
14301	14925	{
14302	14926	//System.out.println("mouseMoved: " + e);
14303	14927	if (isRenderer)
14304	14928	return;
14305	14929
14306		- ClickInfo ci = new ClickInfo();
14307		- ci.x = e.getX();
14308		- ci.y = e.getY();
14309		- ci.modifiers = e.getModifiersEx();
14310		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14311		- ci.pane = this;
14312		- ci.camera = renderCamera;
	14930	+ // Mouse cursor feedback
	14931	+ object.clickInfo.x = e.getX();
	14932	+ object.clickInfo.y = e.getY();
	14933	+ object.clickInfo.modifiers = e.getModifiersEx();
	14934	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14935	+ object.clickInfo.pane = this;
	14936	+ object.clickInfo.camera = renderCamera;
14313	14937	if (!isRenderer)
14314	14938	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14939	+ //ObjEditor editWindow = object.editWindow;
	14940	+ //Object3D copy = editWindow.copy;
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14316	14943	{
14317	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14945	} else
..	..	@@ -14324,7 +14951,11 @@
14324	14951
14325	14952	public void mouseReleased(MouseEvent e)
14326	14953	{
	14954	+ Globals.MOUSEDRAGGED = false;
	14955	+
14327	14956	movingcamera = false;
	14957	+ X = 0; // getBounds().width/2;
	14958	+ Y = 0; // getBounds().height/2;
14328	14959	//System.out.println("mouseReleased: " + e);
14329	14960	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14961	}
..	..	@@ -14347,9 +14978,9 @@
14347	14978	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14979	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14980
14350		- if (control \|\| command \|\| IsFrozen())
	14981	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14982	timeout = true;
14352		- else
	14983	+// ?? May 2019 else
14353	14984	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14985	mouseDown = false;
14355	14986	if (!control && !command) // june 2013
..	..	@@ -14459,7 +15090,7 @@
14459	15090	System.out.println("keyReleased: " + e);
14460	15091	}
14461	15092
14462		- void SetMouseMode(int modifiers)
	15093	+ void SetMouseMode(int modifiers, int modifiersex)
14463	15094	{
14464	15095	//System.out.println("SetMouseMode = " + modifiers);
14465	15096	//modifiers &= ~1024;
..	..	@@ -14471,25 +15102,25 @@
14471	15102	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15103	// return;
14473	15104	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15105	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15106	{
14476	15107	mouseMode \|= ZOOM;
14477	15108	}
14478	15109
14479	15110	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15111	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	15112	{
14482	15113	mouseMode \|= VR; // BACKFORTH;
14483	15114	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15115	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15116	{
14486	15117	mouseMode \|= SELECT;
14487	15118	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15119	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15120	{
14490	15121	mouseMode \|= SELECT;
14491	15122	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15123	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15124	{
14494	15125	mouseMode &= ~VR;
14495	15126	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15149,7 @@
14518	15149
14519	15150	if (isRenderer) //
14520	15151	{
14521		- SetMouseMode(modifiers);
	15152	+ SetMouseMode(0, modifiers);
14522	15153	}
14523	15154
14524	15155	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +15211,8 @@
14580	15211	// break;
14581	15212	case 'T':
14582	15213	CACHETEXTURE ^= true;
14583		- textures.clear();
	15214	+ texturepigment.clear();
	15215	+ texturebump.clear();
14584	15216	// repaint();
14585	15217	break;
14586	15218	case 'Y':
..	..	@@ -14665,7 +15297,9 @@
14665	15297	case 'E' : COMPACT ^= true;
14666	15298	repaint();
14667	15299	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15300	+ case 'W' : // Wide Window (fullscreen)
	15301	+ //DEBUGHSB ^= true;
	15302	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15303	repaint();
14670	15304	break;
14671	15305	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15324,8 @@
14690	15324	RevertCamera();
14691	15325	repaint();
14692	15326	break;
14693		- case 'L':
14694	15327	case 'l':
	15328	+ //case 'L':
14695	15329	if (lightMode)
14696	15330	{
14697	15331	lightMode = false;
..	..	@@ -14755,20 +15389,24 @@
14755	15389	OCCLUSION_CULLING ^= true;
14756	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14757	15391	break;
14758		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
14759	15393	case '1':
14760	15394	case '2':
14761	15395	case '3':
14762	15396	case '4':
14763	15397	case '5':
14764		- newenvy = Character.getNumericValue(key);
14765		- repaint();
14766		- break;
14767	15398	case '6':
14768	15399	case '7':
14769	15400	case '8':
14770	15401	case '9':
14771		- BGcolor = (key - '6')/3.f;
	15402	+ if (true) // envyoff)
	15403	+ {
	15404	+ BGcolor = (key - '1')/8.f;
	15405	+ }
	15406	+ else
	15407	+ {
	15408	+ //newenvy = Character.getNumericValue(key);
	15409	+ }
14772	15410	repaint();
14773	15411	break;
14774	15412	case '!':
..	..	@@ -14834,9 +15472,9 @@
14834	15472	case '_':
14835	15473	kompactbit = 5;
14836	15474	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15475	+// case '+':
	15476	+// kompactbit = 6;
	15477	+// break;
14840	15478	case ' ':
14841	15479	lightMode ^= true;
14842	15480	Globals.lighttouched = true;
..	..	@@ -14848,13 +15486,14 @@
14848	15486	case ESC:
14849	15487	RENDERPROGRAM += 1;
14850	15488	RENDERPROGRAM %= 3;
	15489	+
14851	15490	repaint();
14852	15491	break;
14853	15492	case 'Z':
14854	15493	//RESIZETEXTURE ^= true;
14855	15494	//break;
14856	15495	case 'z':
14857		- RENDERSHADOW ^= true;
	15496	+ Globals.RENDERSHADOW ^= true;
14858	15497	Globals.lighttouched = true;
14859	15498	repaint();
14860	15499	break;
..	..	@@ -14887,8 +15526,9 @@
14887	15526	case DELETE:
14888	15527	ClearSelection();
14889	15528	break;
14890		- /*
14891	15529	case '+':
	15530	+
	15531	+ /*
14892	15532	//fontsize += 1;
14893	15533	bbzoom *= 2;
14894	15534	repaint();
..	..	@@ -14905,17 +15545,17 @@
14905	15545	case '=':
14906	15546	IncDepth();
14907	15547	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15548	+ object.GetWindow().refreshContents(true);
14909	15549	maskbit = 6;
14910	15550	break;
14911	15551	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15552	DecDepth();
14913	15553	maskbit = 5;
14914	15554	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15555	+// if (object.editWindow == null)
	15556	+// new Exception().printStackTrace();
	15557	+// else
	15558	+ object.GetWindow().refreshContents(true);
14919	15559	break;
14920	15560	case '{':
14921	15561	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15618,7 @@
14978	15618	//mode = ROTATE;
14979	15619	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15620	{
14981		- SetMouseMode(modifiers);
	15621	+ SetMouseMode(0, modifiers);
14982	15622	}
14983	15623	}
14984	15624
..	..	@@ -15114,7 +15754,7 @@
15114	15754	{
15115	15755	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15756	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15757	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15758	{
15119	15759	mouseMoved(e);
15120	15760	} else
..	..	@@ -15139,11 +15779,12 @@
15139	15779	}
15140	15780	*/
15141	15781
15142		- object.editWindow.EditSelection();
	15782	+ object.GetWindow().EditSelection(false);
15143	15783	}
15144	15784
15145	15785	void SelectParent()
15146	15786	{
	15787	+ new Exception().printStackTrace();
15147	15788	System.exit(0);
15148	15789	Composite group = (Composite) object;
15149	15790	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15796,10 @@
15155	15796	{
15156	15797	//selectees.remove(i);
15157	15798	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15800	} else
15160	15801	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15802	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15803	}
15163	15804
15164	15805	first = false;
..	..	@@ -15167,6 +15808,7 @@
15167	15808
15168	15809	void SelectChildren()
15169	15810	{
	15811	+ new Exception().printStackTrace();
15170	15812	System.exit(0);
15171	15813	/*
15172	15814	Composite group = (Composite) object;
..	..	@@ -15199,12 +15841,12 @@
15199	15841	for (int j = 0; j < group.children.size(); j++)
15200	15842	{
15201	15843	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15844	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15845	first = false;
15204	15846	}
15205	15847	} else
15206	15848	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15849	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15850	}
15209	15851
15210	15852	first = false;
..	..	@@ -15215,21 +15857,21 @@
15215	15857	{
15216	15858	//Composite group = (Composite) object;
15217	15859	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15860	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15861	}
15220	15862
15221	15863	void ResetTransform(int mask)
15222	15864	{
15223	15865	//Composite group = (Composite) object;
15224	15866	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15867	+ group.GetWindow().ResetTransform(mask);
15226	15868	}
15227	15869
15228	15870	void FlipTransform()
15229	15871	{
15230	15872	//Composite group = (Composite) object;
15231	15873	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15874	+ group.GetWindow().FlipTransform();
15233	15875	// group.editWindow.ReduceMesh(true);
15234	15876	}
15235	15877
..	..	@@ -15237,7 +15879,7 @@
15237	15879	{
15238	15880	//Composite group = (Composite) object;
15239	15881	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15882	+ group.GetWindow().PrintMemory();
15241	15883	// group.editWindow.ReduceMesh(true);
15242	15884	}
15243	15885
..	..	@@ -15245,7 +15887,7 @@
15245	15887	{
15246	15888	//Composite group = (Composite) object;
15247	15889	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15890	+ group.GetWindow().ResetCentroid();
15249	15891	}
15250	15892
15251	15893	void IncDepth()
..	..	@@ -15327,11 +15969,11 @@
15327	15969
15328	15970	int width = getBounds().width;
15329	15971	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15972	//Image img = CreateImage(width, height);
15333	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
	15974	+
15334	15975	Graphics gr = g; // img.getGraphics();
	15976	+
15335	15977	if (!hasMarquee)
15336	15978	{
15337	15979	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,40 +16045,88 @@
15403	16045	}
15404	16046	if (object != null && !hasMarquee)
15405	16047	{
	16048	+ if (object.clickInfo == null)
	16049	+ object.clickInfo = new ClickInfo();
	16050	+ ClickInfo info = object.clickInfo;
	16051	+ //ClickInfo info = new ClickInfo();
	16052	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16053	+
15406	16054	if (isRenderer)
15407	16055	{
15408		- info.flags++;
	16056	+ object.clickInfo.flags++;
15409	16057	double frameAspect = (double) width / (double) height;
15410	16058	if (frameAspect > renderCamera.aspect)
15411	16059	{
15412	16060	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	16063	} else
15416	16064	{
15417	16065	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	16068	}
15421	16069	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	16070	+
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15424	16073	/*
15425	16074	// Memory intensive (brep.verticescopy)
15426	16075	if (!(object instanceof Composite))
15427	16076	object.draw(info, 0, false); // SLOW :
15428	16077	*/
15429		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15430	16079	{
15431		- object.drawEditHandles(info, 0);
	16080	+ Grafreed.Assert(object != null);
	16081	+ Grafreed.Assert(object.selection != null);
	16082	+ if (object.selection.Size() > 0)
	16083	+ {
	16084	+ int hitSomething = object.selection.get(0).hitSomething;
	16085	+
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
	16089	+ if (hitSomething == Object3D.hitCenter)
	16090	+ {
	16091	+ info.DX = X;
	16092	+ if (X != 0)
	16093	+ info.DX -= info.bounds.width/2;
	16094	+
	16095	+ info.DY = Y;
	16096	+ if (Y != 0)
	16097	+ info.DY -= info.bounds.height/2;
	16098	+ }
	16099	+
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
	16102	+
	16103	+ if (drag && (X != 0 \|\| Y != 0))
	16104	+ {
	16105	+ switch (hitSomething)
	16106	+ {
	16107	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16114	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16115	+ break;
	16116	+ }
	16117	+
	16118	+ }
	16119	+ }
15432	16120	}
15433	16121	}
	16122	+
15434	16123	if (isRenderer)
15435	16124	{
15436	16125	//gr.setColor(Color.black);
15437	16126	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16127	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16128	}
	16129	+
15440	16130	if (hasMarquee)
15441	16131	{
15442	16132	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +16239,7 @@
15549	16239	public boolean mouseDown(Event evt, int x, int y)
15550	16240	{
15551	16241	System.out.println("mouseDown: " + evt);
	16242	+ System.exit(0);
15552	16243	/*
15553	16244	locked = true;
15554	16245	drag = false;
..	..	@@ -15592,7 +16283,7 @@
15592	16283	{
15593	16284	keyPressed(0, modifiers);
15594	16285	}
15595		- clickStart(x, y, modifiers);
	16286	+ // clickStart(x, y, modifiers);
15596	16287	return true;
15597	16288	}
15598	16289
..	..	@@ -15710,7 +16401,7 @@
15710	16401	{
15711	16402	keyReleased(0, 0);
15712	16403	}
15713		- drag(x, y, modifiers);
	16404	+ drag(x, y, 0, modifiers);
15714	16405	return true;
15715	16406	}
15716	16407
..	..	@@ -15842,7 +16533,7 @@
15842	16533	Object3D object;
15843	16534	static Object3D trackedobject;
15844	16535	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16536	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16537	/static/ Camera eyeCamera;
15847	16538	/static/ Camera lightCamera;
15848	16539	int cameracount;
..	..	@@ -15906,6 +16597,8 @@
15906	16597	private /static/ boolean firstime;
15907	16598	private /static/ cVector newView = new cVector();
15908	16599	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16600	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16601	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15909	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15910	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15911	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15918,29 +16611,67 @@
15918	16611	{
15919	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15920	16613
	16614	+ int usedsuf = 0;
	16615	+
15921	16616	for (int i = 0; i < suffixes.length; i++)
15922	16617	{
15923		- String resourceName = basename + suffixes[i] + "." + suffix;
15924		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15925		- mipmapped,
15926		- FileUtil.getFileSuffix(resourceName));
15927		- if (data == null)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
15928	16623	{
15929		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
15930	16628	}
	16629	+
	16630	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16631	+ TextureData data;
	16632	+
	16633	+ try
	16634	+ {
	16635	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16636	+ mipmapped,
	16637	+ FileUtil.getFileSuffix(resourceName));
	16638	+ }
	16639	+ catch (Exception e)
	16640	+ {
	16641	+ try
	16642	+ {
	16643	+ resourceName = basename + fallback[i] + "." + suffix;
	16644	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16645	+ mipmapped,
	16646	+ FileUtil.getFileSuffix(resourceName));
	16647	+ }
	16648	+ catch (Exception e2)
	16649	+ {
	16650	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16651	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16652	+ mipmapped,
	16653	+ FileUtil.getFileSuffix(resourceName));
	16654	+ }
	16655	+ }
	16656	+
15931	16657	//System.out.println("Target = " + targets[i]);
15932	16658	cubemap.updateImage(data, targets[i]);
15933	16659	}
15934	16660
15935	16661	return cubemap;
15936	16662	}
	16663	+
15937	16664	int bigsphere = -1;
15938	16665
15939	16666	float BGcolor = 0.5f;
15940	16667
15941		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
15942	16671	{
15943		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
15944	16675	{
15945	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15946	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15955,7 +16686,17 @@
15955	16686	// Compensates for ExaminerViewer's modification of modelview matrix
15956	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
15957	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
15958	16690
	16691	+// colorV[0] = 2;
	16692	+// colorV[1] = 2;
	16693	+// colorV[2] = 2;
	16694	+// colorV[3] = 1;
	16695	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16696	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16697	+//
	16698	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16699	+
15959	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
15960	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15961	16702
..	..	@@ -15987,6 +16728,7 @@
15987	16728	{
15988	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
15989	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15990	16732	gl.glMultMatrixd(viewrot_1, 0);
15991	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15992	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16127,16 +16869,16 @@
16127	16869	cStatic.objectstack[materialdepth++] = checker;
16128	16870	//System.out.println("material " + material);
16129	16871	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16872	+ //vector2buffer = checker.projectedVertices;
16131	16873
16132	16874	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16875	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16876
16135	16877	materialdepth -= 1;
16136	16878	if (materialdepth > 0)
16137	16879	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16880	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16881	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	16882	}
16141	16883	//checker.GetMaterial().opacity = 1f;
16142	16884	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16964,14 @@
16222	16964	}
16223	16965	}
16224	16966
	16967	+ private Object3D GetFolder()
	16968	+ {
	16969	+ Object3D folder = object.GetWindow().copy;
	16970	+ if (object.GetWindow().copy.selection.Size() > 0)
	16971	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16972	+ return folder;
	16973	+ }
	16974	+
16225	16975	class SelectBuffer implements GLEventListener
16226	16976	{
16227	16977
..	..	@@ -16237,7 +16987,7 @@
16237	16987	//new Exception().printStackTrace();
16238	16988	System.out.println("select buffer init");
16239	16989	// Use debug pipeline
16240		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16241	16991
16242	16992	GL gl = drawable.getGL();
16243	16993
..	..	@@ -16280,6 +17030,7 @@
16280	17030	{
16281	17031	if (!selection)
16282	17032	{
	17033	+ new Exception().printStackTrace();
16283	17034	System.exit(0);
16284	17035	return;
16285	17036	}
..	..	@@ -16300,6 +17051,17 @@
16300	17051
16301	17052	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	17053
	17054	+ if (PAINTMODE)
	17055	+ {
	17056	+ if (object.GetWindow().copy.selection.Size() > 0)
	17057	+ {
	17058	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17059	+
	17060	+ // Make what you paint not selectable.
	17061	+ paintobj.ResetSelectable();
	17062	+ }
	17063	+ }
	17064	+
16303	17065	//int tmp = selection_view;
16304	17066	//selection_view = -1;
16305	17067	int temp = DrawMode();
..	..	@@ -16311,6 +17073,17 @@
16311	17073	// temp = DEFAULT; // patch for selection debug
16312	17074	Globals.drawMode = temp; // WARNING
16313	17075
	17076	+ if (PAINTMODE)
	17077	+ {
	17078	+ if (object.GetWindow().copy.selection.Size() > 0)
	17079	+ {
	17080	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17081	+
	17082	+ // Revert.
	17083	+ paintobj.RestoreSelectable();
	17084	+ }
	17085	+ }
	17086	+
16314	17087	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	17088
16316	17089	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +17131,8 @@
16358	17131	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	17132	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	17133	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17134	+
	17135	+ CreateSelectedPoint();
16361	17136
16362	17137	// Will fit the mesh !!!
16363	17138	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17182,36 @@
16407	17182	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]));
16408	17183	}
16409	17184
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17185	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17186	}
16412	17187	}
16413	17188
16414	17189	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17190	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17191
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17192	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	17193	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17194	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	17195
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17196	+ if (object.GetWindow().copy.selection.Size() > 0)
	17197	+ {
	17198	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17199
16423		- group.CreateMaterial(); // use a void leaf to select instances
16424		-
16425		- group.add(paintobj); // link
16426		-
16427		- object.editWindow.SnapObject(group);
16428		-
16429		- Object3D folder = object.editWindow.copy;
16430		-
16431		- if (object.editWindow.copy.selection.Size() > 0)
16432		- folder = object.editWindow.copy.selection.elementAt(0);
16433		-
16434		- folder.add(group);
16435		-
16436		- object.editWindow.ResetModel();
16437		- object.editWindow.refreshContents();
	17200	+ Object3D inst = new Object3D("inst" + paintcount++);
	17201	+
	17202	+ inst.CreateMaterial(); // use a void leaf to select instances
	17203	+
	17204	+ inst.add(paintobj); // link
	17205	+
	17206	+ object.GetWindow().SnapObject(inst);
	17207	+
	17208	+ Object3D folder = paintFolder; // GetFolder();
	17209	+
	17210	+ folder.add(inst);
	17211	+
	17212	+ object.GetWindow().ResetModel();
	17213	+ object.GetWindow().refreshContents();
	17214	+ }
16438	17215	}
16439	17216	else
16440	17217	paintcount = 0;
..	..	@@ -16473,6 +17250,11 @@
16473	17250	//System.out.println("objects[color] = " + objects[color]);
16474	17251	//objects[color].Select();
16475	17252	indexcount = 0;
	17253	+ ObjEditor window = object.GetWindow();
	17254	+ if (window != null && deselect)
	17255	+ {
	17256	+ window.Select(null, deselect, true);
	17257	+ }
16476	17258	object.Select(color, deselect);
16477	17259	}
16478	17260
..	..	@@ -16572,7 +17354,7 @@
16572	17354	gl.glDisable(gl.GL_CULL_FACE);
16573	17355	}
16574	17356
16575		- if (!RENDERSHADOW)
	17357	+ if (!Globals.RENDERSHADOW)
16576	17358	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17359
16578	17360	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17364,7 @@
16582	17364	//gl.glColorMask(false, false, false, false);
16583	17365
16584	17366	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17367	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17368	{
16587	17369	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17370
..	..	@@ -16998,23 +17780,15 @@
16998	17780	int AAbuffersize = 0;
16999	17781
17000	17782	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17783	+ static Superellipsoid selectedpoint;
17002	17784	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	17785	+ static Sphere debugpointG;
	17786	+ static Sphere debugpointP;
	17787	+ static Sphere debugpointC;
	17788	+ static Sphere debugpointR;
17007	17789
17008	17790	static Sphere debugpoints[] = new Sphere[8];
17009	17791
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17792	static void InitPoints(float radius)
17019	17793	{
17020	17794	for (int i=0; i<8; i++)