~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;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -150,6 +186,20 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	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	+
153	203	void SetAsGLRenderer(boolean b)
154	204	{
155	205	isRenderer = b;
..	..	@@ -168,7 +218,8 @@
168	218
169	219	SetCamera(cam);
170	220
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	223
173	224	object = o;
174	225
..	..	@@ -325,7 +376,7 @@
325	376	cStatic.objectstack[materialdepth++] = obj;
326	377	//System.out.println("material " + material);
327	378	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
329	380	if (obj instanceof Camera)
330	381	{
331	382	display.options1[0] = material.shift;
..	..	@@ -334,14 +385,28 @@
334	385	display.options1[2] = material.shadowbias;
335	386	display.options1[3] = material.aniso;
336	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]);
337	393	display.options2[0] = material.opacity;
338	394	display.options2[1] = material.diffuse;
339	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]);
340	399
341	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]);
342	404	display.options4[0] = material.cameralight/0.2f;
343	405	display.options4[1] = material.subsurface;
344	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]);
345	410
346	411	// if (display.CURRENTANTIALIAS > 0)
347	412	// display.options3[3] /= 4;
..	..	@@ -357,7 +422,7 @@
357	422	/**/
358	423	} else
359	424	{
360		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
361	426	}
362	427	} else
363	428	{
..	..	@@ -381,8 +446,8 @@
381	446	cStatic.objectstack[materialdepth++] = obj;
382	447	//System.out.println("material " + material);
383	448	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	451	}
387	452	}
388	453
..	..	@@ -399,8 +464,8 @@
399	464	materialdepth -= 1;
400	465	if (materialdepth > 0)
401	466	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- 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);
404	469	}
405	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +485,8 @@
420	485	materialdepth -= 1;
421	486	if (materialdepth > 0)
422	487	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- 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);
425	490	}
426	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	492	//else
..	..	@@ -462,10 +527,12 @@
462	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	528	{
464	529	//gl.glBegin(gl.GL_TRIANGLES);
465		- 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	+ ;
466	533	if (!hasnorm)
467	534	{
468		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
469	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1257,12 @@
1190	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1258	}
1192	1259	}
	1260	+
1193	1261	if (flipV)
1194	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1263	else
1196	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1197	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1268
..	..	@@ -1213,10 +1282,12 @@
1213	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1283	}
1215	1284	}
	1285	+
1216	1286	if (flipV)
1217	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1288	else
1219	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1220	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1293
..	..	@@ -1244,8 +1315,10 @@
1244	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1316	else
1246	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1247	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1249	1322	count2 += 2;
1250	1323	count3 += 3;
1251	1324	}
..	..	@@ -1424,6 +1497,8 @@
1424	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1498	}
1426	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1427	1502	void SetColor(Object3D obj, Vertex p0)
1428	1503	{
1429	1504	CameraPane display = this;
..	..	@@ -1491,8 +1566,6 @@
1491	1566	{
1492	1567	return;
1493	1568	}
1494		-
1495		- float[] colorV = new float[3];
1496	1569
1497	1570	if (false) // marked)
1498	1571	{
..	..	@@ -1601,7 +1674,7 @@
1601	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1675	}
1603	1676
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1678	{
1606	1679	CameraPane display = this;
1607	1680	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1701,7 @@
1628	1701
1629	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1703
1631		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
1632	1705
1633	1706	/**/
1634	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1709,7 @@
1636	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1640	1713
1641	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1817,9 @@
1744	1817	display.modelParams7[2] = 0;
1745	1818	display.modelParams7[3] = 0;
1746	1819
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1821
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1824	{
1752	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1961,7 @@
1888	1961	void PushMatrix(double[][] matrix)
1889	1962	{
1890	1963	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1892	1965	}
1893	1966
1894	1967	void PushMatrix()
..	..	@@ -2042,7 +2115,7 @@
2042	2115	//System.err.println("Oeil on");
2043	2116	OEIL = true;
2044	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2119	//pingthread.StepToTarget(true);
2047	2120	}
2048	2121
..	..	@@ -2140,7 +2213,7 @@
2140	2213	System.err.println("LIVE = " + Globals.isLIVE());
2141	2214
2142	2215	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2216	+ Grafreed.savesound = true; // wav.save();
2144	2217	// else
2145	2218	repaint(); // start loop // may 2013
2146	2219	}
..	..	@@ -2257,7 +2330,7 @@
2257	2330
2258	2331	void ToggleDebug()
2259	2332	{
2260		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2261	2334	}
2262	2335
2263	2336	void ToggleLookAt()
..	..	@@ -2265,9 +2338,9 @@
2265	2338	LOOKAT ^= true;
2266	2339	}
2267	2340
2268		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2269	2342	{
2270		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
2271	2344	}
2272	2345
2273	2346	void ToggleHandles()
..	..	@@ -2275,10 +2348,17 @@
2275	2348	HANDLES ^= true;
2276	2349	}
2277	2350
	2351	+ Object3D paintFolder;
	2352	+
2278	2353	void TogglePaint()
2279	2354	{
2280	2355	PAINTMODE ^= true;
2281	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2282	2362	}
2283	2363
2284	2364	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2454,22 @@
2374	2454	{
2375	2455	return currentGL;
2376	2456	}
2377		-
	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	+
2378	2473	/**/
2379	2474	class CacheTexture
2380	2475	{
..	..	@@ -2383,28 +2478,31 @@
2383	2478
2384	2479	int resolution;
2385	2480
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2482	{
2388		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2389	2485	resolution = res;
2390	2486	}
2391	2487	}
2392	2488	/**/
2393	2489
2394	2490	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- 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	+
2398	2496	int pigmentdepth = 0;
2399	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2498	int bumpdepth = 0;
2401	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2504
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2506	{
2409	2507	TextureData texturedata = null;
2410	2508
..	..	@@ -2423,13 +2521,34 @@
2423	2521	if (bump)
2424	2522	texturedata = ConvertBump(texturedata, false);
2425	2523
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- 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);
2428	2526
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- 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);
2431	2529
2432		- 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;
2433	2552	}
2434	2553
2435	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3621,8 @@
3502	3621
3503	3622	System.out.println("LOADING TEXTURE : " + name);
3504	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3505	3626	//
3506	3627	if (false) // compressbit > 0)
3507	3628	{
..	..	@@ -7900,7 +8021,7 @@
7900	8021	String pigment = Object3D.GetPigment(tex);
7901	8022	String bump = Object3D.GetBump(tex);
7902	8023
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8025	{
7905	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8036,69 @@
7915	8036	pigment = null;
7916	8037	}
7917	8038
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7920	8041	}
7921	8042
7922		- 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)
7923	8102	{
7924	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8109,7 @@
7930	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8110
7932	8111	if (tex != null)
7933		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8113
7935	8114	// //assert( texture != null );
7936	8115	// if (texture == null)
..	..	@@ -8022,7 +8201,55 @@
8022	8201	}
8023	8202	}
8024	8203
8025		- /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
8026	8253	{
8027	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,17 +8260,47 @@
8033	8260	if (tex == null)
8034	8261	{
8035	8262	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8263	return;
8038	8264	}
8039	8265
8040	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	+
8041	8299	String bump = Object3D.GetBump(tex);
8042	8300
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8045	8302
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8304	{
8048	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8053,43 +8310,94 @@
8053	8310	{
8054	8311	bump = null;
8055	8312	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8313
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8065	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8317	}
8069	8318
8070		- 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)
8071	8322	{
8072		- 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;
8073	8342
8074	8343	if (tex != null)
8075	8344	{
8076		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8347
8078		- String[] split = tex.split("Textures");
8079		- if (split.length > 1)
8080		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081		- else
8082		- if (!texname.startsWith("/"))
8083		- 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))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
8084	8365
8085	8366	if (CACHETEXTURE)
8086		- texture = textures.get(texname); // TEXTURE CACHE
8087		-
8088		- TextureData texturedata = null;
8089		-
8090		- if (texture == null \|\| texture.resolution < resolution)
8091	8367	{
8092		- 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(""))
8093	8401	{
8094	8402	assert(!bump);
8095	8403	// if (bump)
..	..	@@ -8100,19 +8408,23 @@
8100	8408	// }
8101	8409	// else
8102	8410	// {
8103		- texture = textures.get(tex);
8104		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8105	8413	{
8106		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8107	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8108	8418	// }
8109	8419	} else
8110		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8111	8421	{
8112	8422	assert(bump);
8113		- texture = textures.get(tex);
8114		- if (texture == null)
8115		- 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();
8116	8428	} else
8117	8429	{
8118	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8120,11 +8432,13 @@
8120	8432	// texture = GetResourceTexture("default.png");
8121	8433	//} else
8122	8434	//{
8123		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8124	8436	{
8125		- texture = textures.get(tex);
8126		- if (texture == null)
8127		- 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();
8128	8442	} else
8129	8443	{
8130	8444	if (textureon)
..	..	@@ -8149,7 +8463,7 @@
8149	8463	}
8150	8464
8151	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
8153	8467	cachename = texname;
8154	8468	else
8155	8469	processbump = false; // don't process bump map again
..	..	@@ -8171,7 +8485,7 @@
8171	8485	}
8172	8486
8173	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
8175	8489	cachename = texname;
8176	8490	else
8177	8491	processbump = false; // don't process bump map again
..	..	@@ -8180,20 +8494,22 @@
8180	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
8181	8495
8182	8496
8183		- if (texturedata != null)
8184		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8497	+ if (texturedata == null)
	8498	+ throw new Exception();
	8499	+
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8185	8501	//texture = GetTexture(tex, bump);
8186	8502	}
8187	8503	}
8188	8504	//}
8189	8505	}
8190	8506
8191		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8192	8508	{
8193	8509	//return false;
8194	8510
8195	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8196		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8197	8513	{
8198	8514	// String ext = "_highres";
8199	8515	// if (REDUCETEXTURE)
..	..	@@ -8210,52 +8526,17 @@
8210	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8211	8527	if (!cachefile.exists())
8212	8528	{
8213		- // cache to disk
8214		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8215		- //buffers[0].
8216		-
8217		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8218		- int[] pixels = new int[bytebuf.capacity()/3];
8219		-
8220		- // squared size heuristic...
8221		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8222	8530	{
8223		- for (int i=pixels.length; --i>=0;)
8224		- {
8225		- int i3 = i*3;
8226		- pixels[i] = 0xFF;
8227		- pixels[i] <<= 8;
8228		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8229		- pixels[i] <<= 8;
8230		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8233		- }
8234		-
8235		- /*
8236		- int r=0,g=0,b=0,a=0;
8237		- for (int i=0; i<width; i++)
8238		- for (int j=0; j<height; j++)
8239		- {
8240		- int index = j*width+i;
8241		- int p = pixels[index];
8242		- a = ((p>>24) & 0xFF);
8243		- r = ((p>>16) & 0xFF);
8244		- g = ((p>>8) & 0xFF);
8245		- b = (p & 0xFF);
8246		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8247		- }
8248		- /**/
8249		- int width = (int)Math.sqrt(pixels.length); // squared
8250		- int height = width;
8251		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8252		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8253	8533	ImageWriter writer = null;
8254	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8255	8535	if (iter.hasNext()) {
8256	8536	writer = (ImageWriter)iter.next();
8257	8537	}
8258		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8259	8540	try
8260	8541	{
8261	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8272,18 +8553,20 @@
8272	8553	}
8273	8554	}
8274	8555	}
8275		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8276	8559	//System.out.println("Texture = " + tex);
8277		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8278	8561	{
8279		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8280	8563	thetex.texture.disable();
8281	8564	thetex.texture.dispose();
8282		- textures.remove(texname);
	8565	+ textures.remove(tex);
8283	8566	}
8284	8567
8285		- texture.texturedata = texturedata;
8286		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8287	8570
8288	8571	// newtex = true;
8289	8572	}
..	..	@@ -8299,10 +8582,44 @@
8299	8582	}
8300	8583	}
8301	8584
8302		- return texture;
	8585	+ return texturecache;
8303	8586	}
8304	8587
8305		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8306	8623	{
8307	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8308	8625
..	..	@@ -8320,21 +8637,21 @@
8320	8637	return texture!=null?texture.texture:null;
8321	8638	}
8322	8639
8323		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8324	8641	{
8325	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8326	8643
8327	8644	return texture!=null?texture.texturedata:null;
8328	8645	}
8329	8646
8330		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8331	8648	{
8332	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8333	8650	{
8334	8651	return false;
8335	8652	}
8336	8653
8337		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8338	8655
8339	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8340	8657
..	..	@@ -8366,9 +8683,75 @@
8366	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8367	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8368	8685
8369		- return newtex;
	8686	+ return true; // Warning: not used.
8370	8687	}
8371	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8372	8755	ShadowBuffer shadowPBuf;
8373	8756	AntialiasBuffer antialiasPBuf;
8374	8757	int MAXSTACK;
..	..	@@ -8561,7 +8944,7 @@
8561	8944
8562	8945	if (cubemap == null)
8563	8946	{
8564		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8565	8948	}
8566	8949
8567	8950	//cubemap.enable();
..	..	@@ -8848,37 +9231,58 @@
8848	9231	cubemap = null;
8849	9232	return;
8850	9233	case 1:
8851		- name = "cubemaps/box_";
8852		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
8853	9236	reverseUP = false;
8854	9237	break;
8855	9238	case 2:
8856		- name = "cubemaps/uffizi_";
8857		- ext = "png";
8858		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
8859	9243	case 3:
8860		- name = "cubemaps/CloudyHills_";
8861		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
8862	9246	reverseUP = false;
8863	9247	break;
8864	9248	case 4:
8865		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
8866	9250	ext = "png";
8867	9251	reverseUP = false;
8868	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
8869	9278	default:
8870		- name = "cubemaps/rgb_";
8871		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
8872	9282	break;
8873	9283	}
8874		-
8875		- try
8876		- {
8877		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8878		- } catch (IOException e)
8879		- {
8880		- throw new RuntimeException(e);
8881		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
8882	9286	}
8883	9287
8884	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8910,8 +9314,13 @@
8910	9314	static double[] model = new double[16];
8911	9315	double[] camera2light = new double[16];
8912	9316	double[] light2camera = new double[16];
8913		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
8914	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
8915	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8916	9325	//float[] light0 = { 0,0,0 };
8917	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9204,11 +9613,35 @@
9204	9613	jy8[3] = 0.5f;
9205	9614	}
9206	9615
9207		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9616	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9208	9617	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9209	9618	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9210	9619	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9211	9620
	9621	+ void ResetOptions()
	9622	+ {
	9623	+ options1[0] = 100;
	9624	+ options1[1] = 0.025f;
	9625	+ options1[2] = 0.01f;
	9626	+ options1[3] = 0;
	9627	+ options1[4] = 0;
	9628	+
	9629	+ options2[0] = 0;
	9630	+ options2[1] = 0.75f;
	9631	+ options2[2] = 0;
	9632	+ options2[3] = 0;
	9633	+
	9634	+ options3[0] = 1;
	9635	+ options3[1] = 1;
	9636	+ options3[2] = 1;
	9637	+ options3[3] = 0;
	9638	+
	9639	+ options4[0] = 1;
	9640	+ options4[1] = 0;
	9641	+ options4[2] = 1;
	9642	+ options4[3] = 0;
	9643	+ }
	9644	+
9212	9645	static int imagecount = 0; // movie generation
9213	9646
9214	9647	static int jitter = 0;
..	..	@@ -9304,8 +9737,8 @@
9304	9737	assert (parentcam != renderCamera);
9305	9738
9306	9739	if (renderCamera != lightCamera)
9307		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9740	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9309	9742
9310	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9311	9744
..	..	@@ -9320,8 +9753,8 @@
9320	9753	LA.matCopy(renderCamera.fromScreen, matrix);
9321	9754
9322	9755	if (renderCamera != lightCamera)
9323		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9756	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9325	9758
9326	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9327	9760
..	..	@@ -9367,10 +9800,12 @@
9367	9800	rati = 1 / rati;
9368	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9369	9802	}
9370		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
9371	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9372	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9373		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
9374	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9375	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9376	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9538,7 +9973,7 @@
9538	9973
9539	9974	if (!BOXMODE)
9540	9975	{
9541		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9976	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9542	9977	}
9543	9978
9544	9979	if (!BOXMODE)
..	..	@@ -9576,7 +10011,7 @@
9576	10011	ABORTED = false;
9577	10012	}
9578	10013	else
9579		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10014	+ Grafreed.wav.cursor += 735 * ACSIZE;
9580	10015
9581	10016	if (false)
9582	10017	{
..	..	@@ -10239,11 +10674,11 @@
10239	10674
10240	10675	public void display(GLAutoDrawable drawable)
10241	10676	{
10242		- if (GrafreeD.savesound && GrafreeD.hassound)
	10677	+ if (Grafreed.savesound && Grafreed.hassound)
10243	10678	{
10244		- GrafreeD.wav.save();
10245		- GrafreeD.savesound = false;
10246		- GrafreeD.hassound = false;
	10679	+ Grafreed.wav.save();
	10680	+ Grafreed.savesound = false;
	10681	+ Grafreed.hassound = false;
10247	10682	}
10248	10683	// if (DEBUG_SELECTION)
10249	10684	// {
..	..	@@ -10319,6 +10754,7 @@
10319	10754	ANTIALIAS = 0;
10320	10755	//System.out.println("RESTART");
10321	10756	AAtimer.restart();
	10757	+ Globals.TIMERRUNNING = true;
10322	10758	}
10323	10759	}
10324	10760	}
..	..	@@ -10373,7 +10809,7 @@
10373	10809	Object3D theobject = object;
10374	10810	Object3D theparent = object.parent;
10375	10811	object.parent = null;
10376		- object = (Object3D)GrafreeD.clone(object);
	10812	+ object = (Object3D)Grafreed.clone(object);
10377	10813	object.Stripify();
10378	10814	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10379	10815	theobject.PreprocessOcclusion(this);
..	..	@@ -10386,13 +10822,14 @@
10386	10822	ambientOcclusion = false;
10387	10823	}
10388	10824
10389		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10825	+ if (//Globals.lighttouched &&
	10826	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10390	10827	{
10391	10828	//if (RENDERSHADOW) // ?
10392	10829	if (!IsFrozen())
10393	10830	{
10394	10831	// dec 2012
10395		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10832	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10396	10833	{
10397	10834	Globals.framecount++;
10398	10835	shadowbuffer.display();
..	..	@@ -10519,8 +10956,8 @@
10519	10956
10520	10957	// if (parentcam != renderCamera) // not a light
10521	10958	if (cam != lightCamera)
10522		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10959	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10524	10961
10525	10962	for (int j = 0; j < 4; j++)
10526	10963	{
..	..	@@ -10534,8 +10971,8 @@
10534	10971
10535	10972	// if (parentcam != renderCamera) // not a light
10536	10973	if (cam != lightCamera)
10537		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10974	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10539	10976
10540	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10541	10978
..	..	@@ -10621,13 +11058,19 @@
10621	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10622	11059	}
10623	11060
10624		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
10625	11069	{
10626		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
10627	11072	}
10628		-
10629		- newenvy = -1;
10630		-
	11073	+
10631	11074	ratio = ((double) getWidth()) / getHeight();
10632	11075	//System.out.println("ratio = " + ratio);
10633	11076
..	..	@@ -10643,7 +11086,7 @@
10643	11086
10644	11087	if (!IsFrozen() && !ambientOcclusion)
10645	11088	{
10646		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
10647	11090	}
10648	11091
10649	11092	//if (selection_view == -1)
..	..	@@ -10794,7 +11237,16 @@
10794	11237	// Bump noise
10795	11238	gl.glActiveTexture(GL.GL_TEXTURE6);
10796	11239	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797		- BindTexture(NOISE_TEXTURE, false, 2);
	11240	+
	11241	+ try
	11242	+ {
	11243	+ BindTexture(NOISE_TEXTURE, false, 2);
	11244	+ }
	11245	+ catch (Exception e)
	11246	+ {
	11247	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11248	+ }
	11249	+
10798	11250
10799	11251	gl.glActiveTexture(GL.GL_TEXTURE0);
10800	11252	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10817,9 +11269,9 @@
10817	11269
10818	11270	gl.glMatrixMode(GL.GL_MODELVIEW);
10819	11271
10820		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10821		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10822		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11272	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11273	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11274	+gl.glEnable(gl.GL_MULTISAMPLE);
10823	11275	} else
10824	11276	{
10825	11277	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10830,7 +11282,7 @@
10830	11282	//System.out.println("BLENDING ON");
10831	11283	gl.glEnable(GL.GL_BLEND);
10832	11284	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10833		-
	11285	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10834	11286	gl.glMatrixMode(gl.GL_PROJECTION);
10835	11287	gl.glLoadIdentity();
10836	11288
..	..	@@ -10919,8 +11371,8 @@
10919	11371	System.err.println("parentcam != renderCamera");
10920	11372
10921	11373	// if (cam != lightCamera)
10922		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11374	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11375	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10924	11376	}
10925	11377
10926	11378	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10941,8 +11393,8 @@
10941	11393	if (true) // TODO
10942	11394	{
10943	11395	if (cam != lightCamera)
10944		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11396	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11397	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10946	11398	}
10947	11399
10948	11400	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11079,7 +11531,7 @@
11079	11531	}
11080	11532	}
11081	11533
11082		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11083	11535	{
11084	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
11085	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11087,24 +11539,21 @@
11087	11539
11088	11540	boolean texon = textureon;
11089	11541
11090		- if (RENDERPROGRAM > 0)
11091		- {
11092		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11093		- textureon = false;
11094		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
11095	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11096	11546	//System.out.println("ALLO");
11097	11547	gl.glColorMask(false, false, false, false);
11098	11548	DrawObject(gl);
11099		- if (RENDERPROGRAM > 0)
11100		- {
11101		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11102		- textureon = texon;
11103		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
11104	11553	gl.glColorMask(true, true, true, true);
11105	11554
11106	11555	gl.glDepthFunc(GL.GL_EQUAL);
11107		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
11108	11557	}
11109	11558
11110	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -11279,23 +11728,44 @@
11279	11728	e.printStackTrace();
11280	11729	}
11281	11730
11282		- if (GrafreeD.RENDERME > 0)
11283		- GrafreeD.RENDERME--; // mechante magouille
	11731	+ if (Grafreed.RENDERME > 0)
	11732	+ Grafreed.RENDERME--; // mechante magouille
11284	11733
11285	11734	Globals.ONESTEP = false;
11286	11735	}
11287	11736
11288	11737	static boolean zoomonce = false;
11289	11738
	11739	+ static void CreateSelectedPoint()
	11740	+ {
	11741	+ if (selectedpoint == null)
	11742	+ {
	11743	+ debugpointG = new Sphere();
	11744	+ debugpointP = new Sphere();
	11745	+ debugpointC = new Sphere();
	11746	+ debugpointR = new Sphere();
	11747	+
	11748	+ selectedpoint = new Superellipsoid();
	11749	+
	11750	+ for (int i=0; i<8; i++)
	11751	+ {
	11752	+ debugpoints[i] = new Sphere();
	11753	+ }
	11754	+ }
	11755	+ }
	11756	+
11290	11757	void DrawObject(GL gl, boolean draw)
11291	11758	{
	11759	+ // To clear camera values
	11760	+ ResetOptions();
	11761	+
11292	11762	//System.out.println("DRAW OBJECT " + mouseDown);
11293	11763	// DrawMode() = SELECTION;
11294	11764	//GL gl = getGL();
11295	11765	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11296	11766	{
11297	11767	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11298		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11768	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11299	11769	pingthread.StepToTarget(true); // true);
11300	11770	// zoomonce = false;
11301	11771	}
..	..	@@ -11350,7 +11820,14 @@
11350	11820
11351	11821	usedtextures.clear();
11352	11822
11353		- BindTextures(DEFAULT_TEXTURES, 2);
	11823	+ try
	11824	+ {
	11825	+ BindTextures(DEFAULT_TEXTURES, 2);
	11826	+ }
	11827	+ catch (Exception e)
	11828	+ {
	11829	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11830	+ }
11354	11831	}
11355	11832	//System.out.println("--> " + stackdepth);
11356	11833	// GrafreeD.traceon();
..	..	@@ -11360,8 +11837,9 @@
11360	11837
11361	11838	if (DrawMode() == DEFAULT)
11362	11839	{
11363		- if (DEBUG)
	11840	+ if (Globals.DEBUG)
11364	11841	{
	11842	+ CreateSelectedPoint();
11365	11843	float radius = 0.05f;
11366	11844	if (selectedpoint.radius != radius)
11367	11845	{
..	..	@@ -11415,20 +11893,32 @@
11415	11893	ReleaseTextures(DEFAULT_TEXTURES);
11416	11894
11417	11895	if (CLEANCACHE)
11418		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11419	11897	{
11420		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
11421	11899
11422	11900	// System.out.println("Texture --------- " + tex);
11423	11901
11424		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
11425	11903	continue;
11426	11904
11427		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
11428	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
11429	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11430		- textures.get(tex).texture.dispose();
11431		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
11432	11922	}
11433	11923	}
11434	11924	}
..	..	@@ -11441,7 +11931,14 @@
11441	11931	if (checker != null && DrawMode() == DEFAULT)
11442	11932	{
11443	11933	//BindTexture(IMMORTAL_TEXTURE);
11444		- BindTextures(checker.GetTextures(), checker.texres);
	11934	+ try
	11935	+ {
	11936	+ BindTextures(checker.GetTextures(), checker.texres);
	11937	+ }
	11938	+ catch (Exception e)
	11939	+ {
	11940	+ System.err.println("FAILED: " + checker.GetTextures());
	11941	+ }
11445	11942	// NEAREST
11446	11943	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11447	11944	DrawChecker(gl);
..	..	@@ -11523,7 +12020,7 @@
11523	12020	return;
11524	12021	}
11525	12022
11526		- String string = obj.GetToolTip();
	12023	+ String string = obj.toString(); //.GetToolTip();
11527	12024
11528	12025	GL gl = GetGL();
11529	12026
..	..	@@ -11840,8 +12337,8 @@
11840	12337	//obj.TransformToWorld(light, light);
11841	12338	for (int i = tp.size(); --i >= 0;)
11842	12339	{
11843		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844		- LA.xformPos(light, tp.get(i).toParent, light);
	12340	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12341	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11845	12342	}
11846	12343
11847	12344
..	..	@@ -11858,8 +12355,8 @@
11858	12355	parentcam = cameras[0];
11859	12356	}
11860	12357
11861		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12358	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12359	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11863	12360
11864	12361	LA.xformPos(light, renderCamera.toScreen, light);
11865	12362
..	..	@@ -11949,8 +12446,76 @@
11949	12446
11950	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11951	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
11952	12516	String program =
11953	12517	"!!ARBfp1.0\n" +
	12518	+
11954	12519	//"OPTION ARB_fragment_program_shadow;" +
11955	12520	"PARAM light2cam0 = program.env[10];" +
11956	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12065,8 +12630,7 @@
12065	12630	"TEMP shininess;" +
12066	12631	"\n" +
12067	12632	"MOV texSamp, one;" +
12068		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12069		-
	12633	+
12070	12634	"MOV mapgrid.x, one2048th.x;" +
12071	12635	"MOV temp, fragment.texcoord[1];" +
12072	12636	/*
..	..	@@ -12087,20 +12651,20 @@
12087	12651	"MUL temp, floor, mapgrid.x;" +
12088	12652	//"TEX depth0, temp, texture[1], 2D;" +
12089	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
12091	12655	"") +
12092	12656	"ADD temp.x, temp.x, mapgrid.x;" +
12093	12657	//"TEX depth1, temp, texture[1], 2D;" +
12094	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12095		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
12096	12660	"") +
12097	12661	"ADD temp.y, temp.y, mapgrid.x;" +
12098	12662	//"TEX depth2, temp, texture[1], 2D;" +
12099		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
12100	12664	"SUB temp.x, temp.x, mapgrid.x;" +
12101	12665	//"TEX depth3, temp, texture[1], 2D;" +
12102	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12103		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
12104	12668	"") +
12105	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12106	12670	//"MOV params, material;" +
..	..	@@ -12471,10 +13035,10 @@
12471	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12472	13036	"") +
12473	13037
12474		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
12475	13039	"SUB temp.x, half.x, shadow.x;" +
12476		- "MOV temp.y, -params6.x;" +
12477		- "SLT temp.z, temp.y, zero.x;" +
	13040	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13041	+ "SLT temp.z, temp.y, -one2048th.x;" +
12478	13042	"SUB temp.y, one.x, temp.z;" +
12479	13043	"MUL temp.x, temp.x, temp.y;" +
12480	13044	"KIL temp.x;" +
..	..	@@ -12603,8 +13167,10 @@
12603	13167	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12604	13168
12605	13169	"SUB temp.x, one.x, ndotl.x;" +
12606		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12607		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13170	+ // Tuning for default skin
	13171	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13172	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13173	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12608	13174	"MUL temp.x, temp.x, temp.y;" +
12609	13175
12610	13176	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12752,7 +13318,7 @@
12752	13318	"MUL final.y, fragment.texcoord[0].x, c256;" +
12753	13319	"FLR final.x, final.y;" +
12754	13320	"SUB final.y, final.y, final.x;" +
12755		- //"MUL final.x, final.x, c256i;" +
	13321	+ "MUL final.x, final.x, c256i;" +
12756	13322	"MOV final.z, zero.x;" +
12757	13323	"MOV final.a, one.w;":""
12758	13324	) +
..	..	@@ -12760,7 +13326,7 @@
12760	13326	"MUL final.y, fragment.texcoord[0].y, c256;" +
12761	13327	"FLR final.x, final.y;" +
12762	13328	"SUB final.y, final.y, final.x;" +
12763		- //"MUL final.x, final.x, c256i;" +
	13329	+ "MUL final.x, final.x, c256i;" +
12764	13330	"MOV final.z, zero.x;" +
12765	13331	"MOV final.a, one.w;":""
12766	13332	) +
..	..	@@ -12803,7 +13369,7 @@
12803	13369	//once = true;
12804	13370	}
12805	13371
12806		- System.out.print("Program #" + mode + "; length = " + program.length());
	13372	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12807	13373	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12808	13374	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12809	13375
..	..	@@ -12896,25 +13462,26 @@
12896	13462	return out;
12897	13463	}
12898	13464
12899		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
12900	13467	{
12901	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12902	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12903	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12904	13473	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12905		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12906		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12907		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12908		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12909	13476	//"SWZ buffer, temp, w,w,w,w;";
12910		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12911	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12912	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12913	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12914		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12915	13482
12916		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12917		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12918	13485	}
12919	13486
12920	13487	String Shadow(String depth, String shadow)
..	..	@@ -12936,12 +13503,16 @@
12936	13503
12937	13504	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12938	13505	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13506	+
	13507	+ // Compare fragment depth in light space with shadowmap.
12939	13508	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12940	13509	"SGE temp.y, temp.x, zero.x;" +
12941		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13510	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13511	+
	13512	+ // Reverse comparison
12942	13513	"SUB temp.x, one.x, temp.x;" +
12943	13514	"MUL " + shadow + ".x, temp.x, temp.y;" +
12944		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13515	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12945	13516	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12946	13517
12947	13518	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12955,6 +13526,10 @@
12955	13526	// No shadow for backface
12956	13527	"DP3 temp.x, normal, lightd;" +
12957	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13529	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13530	+
	13531	+ // No shadow when out of frustum
	13532	+ "SGE temp.x, " + depth + ".z, one.z;" +
12958	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12959	13534	"";
12960	13535	}
..	..	@@ -13101,7 +13676,8 @@
13101	13676	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13102	13677	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13103	13678	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13104		- Object3D.cVector2[] vector2buffer;
	13679	+
	13680	+ //Object3D.cVector2[] vector2buffer;
13105	13681
13106	13682	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13107	13683	// OUT : diff, spec
..	..	@@ -13117,9 +13693,10 @@
13117	13693	"DP3 " + dest + ".z," + "normals," + "eye;" +
13118	13694	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13119	13695	//"MOV " + dest + ".w," + "normal.z;" +
13120		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13121		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13122		- //"MOV " + dest + ".z," + "params2.w;" +
	13696	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13697	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13698	+
	13699	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13123	13700	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13124	13701	"RCP " + dest + ".w," + dest + ".w;" +
13125	13702	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13513,7 +14090,7 @@
13513	14090	public void mousePressed(MouseEvent e)
13514	14091	{
13515	14092	//System.out.println("mousePressed: " + e);
13516		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14093	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13517	14094	}
13518	14095
13519	14096	static long prevtime = 0;
..	..	@@ -13589,8 +14166,8 @@
13589	14166	// mode \|= META;
13590	14167	//}
13591	14168
13592		- SetMouseMode(WHEEL \| e.getModifiersEx());
13593		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14169	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14170	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13594	14171	anchorX = ax;
13595	14172	anchorY = ay;
13596	14173	prevX = px;
..	..	@@ -13624,6 +14201,7 @@
13624	14201	else
13625	14202	if (evt.getSource() == AAtimer)
13626	14203	{
	14204	+ Globals.TIMERRUNNING = false;
13627	14205	if (mouseDown)
13628	14206	{
13629	14207	//new Exception().printStackTrace();
..	..	@@ -13649,6 +14227,10 @@
13649	14227	// LIVE = waslive;
13650	14228	// wasliveok = true;
13651	14229	// waslive = false;
	14230	+
	14231	+ // May 2019 Forget it:
	14232	+ if (true)
	14233	+ return;
13652	14234
13653	14235	// source == timer
13654	14236	if (mouseDown)
..	..	@@ -13679,7 +14261,7 @@
13679	14261
13680	14262	// fev 2014???
13681	14263	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14264	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13683	14265	pingthread.StepToTarget(true); // true);
13684	14266	}
13685	14267	// if (!LIVE)
..	..	@@ -13688,12 +14270,13 @@
13688	14270
13689	14271	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13690	14272
13691		- void clickStart(int x, int y, int modifiers)
	14273	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13692	14274	{
13693	14275	if (!wasliveok)
13694	14276	return;
13695	14277
13696	14278	AAtimer.restart(); //
	14279	+ Globals.TIMERRUNNING = true;
13697	14280
13698	14281	// waslive = LIVE;
13699	14282	// LIVE = false;
..	..	@@ -13705,7 +14288,7 @@
13705	14288	// touched = true; // main DL
13706	14289	if (isRenderer)
13707	14290	{
13708		- SetMouseMode(modifiers);
	14291	+ SetMouseMode(modifiers, modifiersex);
13709	14292	}
13710	14293
13711	14294	selectX = anchorX = x;
..	..	@@ -13718,7 +14301,7 @@
13718	14301	clicked = true;
13719	14302	hold = false;
13720	14303
13721		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14304	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13722	14305	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13723	14306	{
13724	14307	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13743,14 +14326,15 @@
13743	14326	drag = false;
13744	14327	//System.out.println("Mouse DOWN");
13745	14328	editObj = false;
13746		- ClickInfo info = new ClickInfo();
13747		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13748		- info.pane = this;
13749		- info.camera = renderCamera;
13750		- info.x = x;
13751		- info.y = y;
13752		- info.modifiers = modifiers;
13753		- editObj = object.doEditClick(info, 0);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
13754	14338	if (!editObj)
13755	14339	{
13756	14340	hasMarquee = true;
..	..	@@ -13766,9 +14350,12 @@
13766	14350
13767	14351	public void mouseDragged(MouseEvent e)
13768	14352	{
	14353	+ Globals.MOUSEDRAGGED = true;
	14354	+
13769	14355	//System.out.println("mouseDragged: " + e);
13770	14356	if (isRenderer)
13771	14357	movingcamera = true;
	14358	+
13772	14359	//if (drawing)
13773	14360	//return;
13774	14361	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13778,7 +14365,7 @@
13778	14365	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13779	14366	}
13780	14367	else
13781		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14368	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13782	14369
13783	14370	//try { Thread.sleep(1); } catch (Exception ex) {}
13784	14371	}
..	..	@@ -14015,7 +14602,7 @@
14015	14602	{
14016	14603	Globals.lighttouched = true;
14017	14604	}
14018		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14605	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14019	14606	}
14020	14607	//else
14021	14608	}
..	..	@@ -14029,12 +14616,12 @@
14029	14616	void GoDown(int mod)
14030	14617	{
14031	14618	MODIFIERS \|= COMMAND;
14032		- /*
	14619	+ /**/
14033	14620	if((mod&SHIFT) == SHIFT)
14034	14621	manipCamera.RotatePosition(0, -speed);
14035	14622	else
14036		- manipCamera.BackForth(0, -speed*delta, getWidth());
14037		- */
	14623	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14624	+ /**/
14038	14625	if ((mod & SHIFT) == SHIFT)
14039	14626	{
14040	14627	mouseMode = mouseMode; // VR??
..	..	@@ -14050,12 +14637,12 @@
14050	14637	void GoUp(int mod)
14051	14638	{
14052	14639	MODIFIERS \|= COMMAND;
14053		- /*
	14640	+ /**/
14054	14641	if((mod&SHIFT) == SHIFT)
14055	14642	manipCamera.RotatePosition(0, speed);
14056	14643	else
14057		- manipCamera.BackForth(0, speed*delta, getWidth());
14058		- */
	14644	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14645	+ /**/
14059	14646	if ((mod & SHIFT) == SHIFT)
14060	14647	{
14061	14648	mouseMode = mouseMode;
..	..	@@ -14071,12 +14658,12 @@
14071	14658	void GoLeft(int mod)
14072	14659	{
14073	14660	MODIFIERS \|= COMMAND;
14074		- /*
	14661	+ /**/
14075	14662	if((mod&SHIFT) == SHIFT)
14076		- manipCamera.RotatePosition(speed, 0);
14077		- else
14078	14663	manipCamera.Translate(speed*delta, 0, getWidth());
14079		- */
	14664	+ else
	14665	+ manipCamera.RotatePosition(speed, 0);
	14666	+ /**/
14080	14667	if ((mod & SHIFT) == SHIFT)
14081	14668	{
14082	14669	mouseMode = mouseMode;
..	..	@@ -14092,12 +14679,12 @@
14092	14679	void GoRight(int mod)
14093	14680	{
14094	14681	MODIFIERS \|= COMMAND;
14095		- /*
	14682	+ /**/
14096	14683	if((mod&SHIFT) == SHIFT)
14097		- manipCamera.RotatePosition(-speed, 0);
14098		- else
14099	14684	manipCamera.Translate(-speed*delta, 0, getWidth());
14100		- */
	14685	+ else
	14686	+ manipCamera.RotatePosition(-speed, 0);
	14687	+ /**/
14101	14688	if ((mod & SHIFT) == SHIFT)
14102	14689	{
14103	14690	mouseMode = mouseMode;
..	..	@@ -14115,7 +14702,7 @@
14115	14702	int X, Y;
14116	14703	boolean SX, SY;
14117	14704
14118		- void drag(int x, int y, int modifiers)
	14705	+ void drag(int x, int y, int modifiers, int modifiersex)
14119	14706	{
14120	14707	if (IsFrozen())
14121	14708	{
..	..	@@ -14124,17 +14711,17 @@
14124	14711
14125	14712	drag = true; // NEW
14126	14713
14127		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14714	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14128	14715
14129	14716	X = x;
14130	14717	Y = y;
14131	14718	// floating state for animation
14132		- MODIFIERS = modifiers;
14133		- modifiers &= ~1024;
	14719	+ MODIFIERS = modifiersex;
	14720	+ modifiersex &= ~1024;
14134	14721	if (false) // modifiers != 0)
14135	14722	{
14136	14723	//new Exception().printStackTrace();
14137		- System.out.println("mouseDragged: " + modifiers);
	14724	+ System.out.println("mouseDragged: " + modifiersex);
14138	14725	System.out.println("SHIFT = " + SHIFT);
14139	14726	System.out.println("CONTROL = " + COMMAND);
14140	14727	System.out.println("META = " + META);
..	..	@@ -14147,14 +14734,16 @@
14147	14734	if (editObj)
14148	14735	{
14149	14736	drag = true;
14150		- ClickInfo info = new ClickInfo();
14151		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
14152	14739	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14153		- info.pane = this;
14154		- info.camera = renderCamera;
14155		- info.x = x;
14156		- info.y = y;
14157		- object.editWindow.copy.doEditDrag(info);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14158	14747	} else
14159	14748	{
14160	14749	if (x < startX)
..	..	@@ -14303,22 +14892,27 @@
14303	14892	}
14304	14893	}
14305	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
14306	14897	public void mouseMoved(MouseEvent e)
14307	14898	{
14308	14899	//System.out.println("mouseMoved: " + e);
14309	14900	if (isRenderer)
14310	14901	return;
14311	14902
14312		- ClickInfo ci = new ClickInfo();
14313		- ci.x = e.getX();
14314		- ci.y = e.getY();
14315		- ci.modifiers = e.getModifiersEx();
14316		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14317		- ci.pane = this;
14318		- ci.camera = renderCamera;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
14319	14910	if (!isRenderer)
14320	14911	{
14321		- if (object.editWindow.copy.doEditClick(ci, 0))
	14912	+ //ObjEditor editWindow = object.editWindow;
	14913	+ //Object3D copy = editWindow.copy;
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
14322	14916	{
14323	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14324	14918	} else
..	..	@@ -14330,7 +14924,11 @@
14330	14924
14331	14925	public void mouseReleased(MouseEvent e)
14332	14926	{
	14927	+ Globals.MOUSEDRAGGED = false;
	14928	+
14333	14929	movingcamera = false;
	14930	+ X = 0; // getBounds().width/2;
	14931	+ Y = 0; // getBounds().height/2;
14334	14932	//System.out.println("mouseReleased: " + e);
14335	14933	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14336	14934	}
..	..	@@ -14353,9 +14951,9 @@
14353	14951	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14354	14952	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14355	14953
14356		- if (control \|\| command \|\| IsFrozen())
	14954	+// No delay if (control \|\| command \|\| IsFrozen())
14357	14955	timeout = true;
14358		- else
	14956	+// ?? May 2019 else
14359	14957	// timer.setDelay((modifiers & 128) != 0?0:350);
14360	14958	mouseDown = false;
14361	14959	if (!control && !command) // june 2013
..	..	@@ -14465,7 +15063,7 @@
14465	15063	System.out.println("keyReleased: " + e);
14466	15064	}
14467	15065
14468		- void SetMouseMode(int modifiers)
	15066	+ void SetMouseMode(int modifiers, int modifiersex)
14469	15067	{
14470	15068	//System.out.println("SetMouseMode = " + modifiers);
14471	15069	//modifiers &= ~1024;
..	..	@@ -14477,25 +15075,25 @@
14477	15075	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14478	15076	// return;
14479	15077	//System.out.println("SetMode = " + modifiers);
14480		- if ((modifiers & WHEEL) == WHEEL)
	15078	+ if ((modifiersex & WHEEL) == WHEEL)
14481	15079	{
14482	15080	mouseMode \|= ZOOM;
14483	15081	}
14484	15082
14485	15083	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14486		- if (capsLocked \|\| (modifiers & META) == META)
	15084	+ if (capsLocked) // \|\| (modifiers & META) == META)
14487	15085	{
14488	15086	mouseMode \|= VR; // BACKFORTH;
14489	15087	}
14490		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15088	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14491	15089	{
14492	15090	mouseMode \|= SELECT;
14493	15091	}
14494		- if ((modifiers & COMMAND) == COMMAND)
	15092	+ if ((modifiersex & COMMAND) == COMMAND)
14495	15093	{
14496	15094	mouseMode \|= SELECT;
14497	15095	}
14498		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15096	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14499	15097	{
14500	15098	mouseMode &= ~VR;
14501	15099	mouseMode \|= TRANSLATE;
..	..	@@ -14524,7 +15122,7 @@
14524	15122
14525	15123	if (isRenderer) //
14526	15124	{
14527		- SetMouseMode(modifiers);
	15125	+ SetMouseMode(0, modifiers);
14528	15126	}
14529	15127
14530	15128	Globals.theRenderer.keyPressed(key);
..	..	@@ -14586,7 +15184,8 @@
14586	15184	// break;
14587	15185	case 'T':
14588	15186	CACHETEXTURE ^= true;
14589		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
14590	15189	// repaint();
14591	15190	break;
14592	15191	case 'Y':
..	..	@@ -14671,7 +15270,9 @@
14671	15270	case 'E' : COMPACT ^= true;
14672	15271	repaint();
14673	15272	break;
14674		- case 'W' : DEBUGHSB ^= true;
	15273	+ case 'W' : // Wide Window (fullscreen)
	15274	+ //DEBUGHSB ^= true;
	15275	+ ObjEditor.theFrame.ToggleFullScreen();
14675	15276	repaint();
14676	15277	break;
14677	15278	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14696,8 +15297,8 @@
14696	15297	RevertCamera();
14697	15298	repaint();
14698	15299	break;
14699		- case 'L':
14700	15300	case 'l':
	15301	+ //case 'L':
14701	15302	if (lightMode)
14702	15303	{
14703	15304	lightMode = false;
..	..	@@ -14767,14 +15368,18 @@
14767	15368	case '3':
14768	15369	case '4':
14769	15370	case '5':
14770		- newenvy = Character.getNumericValue(key);
14771		- repaint();
14772		- break;
14773	15371	case '6':
14774	15372	case '7':
14775	15373	case '8':
14776	15374	case '9':
14777		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
14778	15383	repaint();
14779	15384	break;
14780	15385	case '!':
..	..	@@ -14840,9 +15445,9 @@
14840	15445	case '_':
14841	15446	kompactbit = 5;
14842	15447	break;
14843		- case '+':
14844		- kompactbit = 6;
14845		- break;
	15448	+// case '+':
	15449	+// kompactbit = 6;
	15450	+// break;
14846	15451	case ' ':
14847	15452	lightMode ^= true;
14848	15453	Globals.lighttouched = true;
..	..	@@ -14854,13 +15459,14 @@
14854	15459	case ESC:
14855	15460	RENDERPROGRAM += 1;
14856	15461	RENDERPROGRAM %= 3;
	15462	+
14857	15463	repaint();
14858	15464	break;
14859	15465	case 'Z':
14860	15466	//RESIZETEXTURE ^= true;
14861	15467	//break;
14862	15468	case 'z':
14863		- RENDERSHADOW ^= true;
	15469	+ Globals.RENDERSHADOW ^= true;
14864	15470	Globals.lighttouched = true;
14865	15471	repaint();
14866	15472	break;
..	..	@@ -14893,8 +15499,9 @@
14893	15499	case DELETE:
14894	15500	ClearSelection();
14895	15501	break;
14896		- /*
14897	15502	case '+':
	15503	+
	15504	+ /*
14898	15505	//fontsize += 1;
14899	15506	bbzoom *= 2;
14900	15507	repaint();
..	..	@@ -14911,17 +15518,17 @@
14911	15518	case '=':
14912	15519	IncDepth();
14913	15520	//fontsize += 1;
14914		- object.editWindow.refreshContents(true);
	15521	+ object.GetWindow().refreshContents(true);
14915	15522	maskbit = 6;
14916	15523	break;
14917	15524	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14918	15525	DecDepth();
14919	15526	maskbit = 5;
14920	15527	//if(fontsize > 1) fontsize -= 1;
14921		- if (object.editWindow == null)
14922		- new Exception().printStackTrace();
14923		- else
14924		- object.editWindow.refreshContents(true);
	15528	+// if (object.editWindow == null)
	15529	+// new Exception().printStackTrace();
	15530	+// else
	15531	+ object.GetWindow().refreshContents(true);
14925	15532	break;
14926	15533	case '{':
14927	15534	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14984,7 +15591,7 @@
14984	15591	//mode = ROTATE;
14985	15592	if ((MODIFIERS & COMMAND) == 0) // VR??
14986	15593	{
14987		- SetMouseMode(modifiers);
	15594	+ SetMouseMode(0, modifiers);
14988	15595	}
14989	15596	}
14990	15597
..	..	@@ -15120,7 +15727,7 @@
15120	15727	{
15121	15728	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15122	15729	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15123		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15730	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15124	15731	{
15125	15732	mouseMoved(e);
15126	15733	} else
..	..	@@ -15145,7 +15752,7 @@
15145	15752	}
15146	15753	*/
15147	15754
15148		- object.editWindow.EditSelection();
	15755	+ object.GetWindow().EditSelection(false);
15149	15756	}
15150	15757
15151	15758	void SelectParent()
..	..	@@ -15162,10 +15769,10 @@
15162	15769	{
15163	15770	//selectees.remove(i);
15164	15771	System.out.println("select parent of " + elem);
15165		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15772	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15166	15773	} else
15167	15774	{
15168		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15775	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15169	15776	}
15170	15777
15171	15778	first = false;
..	..	@@ -15207,12 +15814,12 @@
15207	15814	for (int j = 0; j < group.children.size(); j++)
15208	15815	{
15209	15816	elem = (Object3D) group.children.elementAt(j);
15210		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15817	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15211	15818	first = false;
15212	15819	}
15213	15820	} else
15214	15821	{
15215		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15822	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15216	15823	}
15217	15824
15218	15825	first = false;
..	..	@@ -15223,21 +15830,21 @@
15223	15830	{
15224	15831	//Composite group = (Composite) object;
15225	15832	Object3D group = object;
15226		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15833	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15227	15834	}
15228	15835
15229	15836	void ResetTransform(int mask)
15230	15837	{
15231	15838	//Composite group = (Composite) object;
15232	15839	Object3D group = object;
15233		- group.editWindow.ResetTransform(mask);
	15840	+ group.GetWindow().ResetTransform(mask);
15234	15841	}
15235	15842
15236	15843	void FlipTransform()
15237	15844	{
15238	15845	//Composite group = (Composite) object;
15239	15846	Object3D group = object;
15240		- group.editWindow.FlipTransform();
	15847	+ group.GetWindow().FlipTransform();
15241	15848	// group.editWindow.ReduceMesh(true);
15242	15849	}
15243	15850
..	..	@@ -15245,7 +15852,7 @@
15245	15852	{
15246	15853	//Composite group = (Composite) object;
15247	15854	Object3D group = object;
15248		- group.editWindow.PrintMemory();
	15855	+ group.GetWindow().PrintMemory();
15249	15856	// group.editWindow.ReduceMesh(true);
15250	15857	}
15251	15858
..	..	@@ -15253,7 +15860,7 @@
15253	15860	{
15254	15861	//Composite group = (Composite) object;
15255	15862	Object3D group = object;
15256		- group.editWindow.ResetCentroid();
	15863	+ group.GetWindow().ResetCentroid();
15257	15864	}
15258	15865
15259	15866	void IncDepth()
..	..	@@ -15335,11 +15942,11 @@
15335	15942
15336	15943	int width = getBounds().width;
15337	15944	int height = getBounds().height;
15338		- ClickInfo info = new ClickInfo();
15339		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15340	15945	//Image img = CreateImage(width, height);
15341	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
	15947	+
15342	15948	Graphics gr = g; // img.getGraphics();
	15949	+
15343	15950	if (!hasMarquee)
15344	15951	{
15345	15952	if (Xmin < Xmax) // !locked)
..	..	@@ -15411,40 +16018,88 @@
15411	16018	}
15412	16019	if (object != null && !hasMarquee)
15413	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
15414	16027	if (isRenderer)
15415	16028	{
15416		- info.flags++;
	16029	+ object.clickInfo.flags++;
15417	16030	double frameAspect = (double) width / (double) height;
15418	16031	if (frameAspect > renderCamera.aspect)
15419	16032	{
15420	16033	int desired = (int) ((double) height * renderCamera.aspect);
15421		- info.bounds.width -= width - desired;
15422		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
15423	16036	} else
15424	16037	{
15425	16038	int desired = (int) ((double) width / renderCamera.aspect);
15426		- info.bounds.height -= height - desired;
15427		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
15428	16041	}
15429	16042	}
15430		- info.g = gr;
15431		- info.camera = renderCamera;
	16043	+
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
15432	16046	/*
15433	16047	// Memory intensive (brep.verticescopy)
15434	16048	if (!(object instanceof Composite))
15435	16049	object.draw(info, 0, false); // SLOW :
15436	16050	*/
15437		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
15438	16052	{
15439		- object.drawEditHandles(info, 0);
	16053	+ Grafreed.Assert(object != null);
	16054	+ Grafreed.Assert(object.selection != null);
	16055	+ if (object.selection.Size() > 0)
	16056	+ {
	16057	+ int hitSomething = object.selection.get(0).hitSomething;
	16058	+
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
	16062	+ if (hitSomething == Object3D.hitCenter)
	16063	+ {
	16064	+ info.DX = X;
	16065	+ if (X != 0)
	16066	+ info.DX -= info.bounds.width/2;
	16067	+
	16068	+ info.DY = Y;
	16069	+ if (Y != 0)
	16070	+ info.DY -= info.bounds.height/2;
	16071	+ }
	16072	+
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
	16075	+
	16076	+ if (drag && (X != 0 \|\| Y != 0))
	16077	+ {
	16078	+ switch (hitSomething)
	16079	+ {
	16080	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16081	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16082	+ break;
	16083	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16084	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16085	+ break;
	16086	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16087	+ gr.drawLine(X, Y, 0, 0);
	16088	+ break;
	16089	+ }
	16090	+
	16091	+ }
	16092	+ }
15440	16093	}
15441	16094	}
	16095	+
15442	16096	if (isRenderer)
15443	16097	{
15444	16098	//gr.setColor(Color.black);
15445	16099	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15446	16100	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15447	16101	}
	16102	+
15448	16103	if (hasMarquee)
15449	16104	{
15450	16105	gr.setXORMode(Color.white);
..	..	@@ -15557,6 +16212,7 @@
15557	16212	public boolean mouseDown(Event evt, int x, int y)
15558	16213	{
15559	16214	System.out.println("mouseDown: " + evt);
	16215	+ System.exit(0);
15560	16216	/*
15561	16217	locked = true;
15562	16218	drag = false;
..	..	@@ -15600,7 +16256,7 @@
15600	16256	{
15601	16257	keyPressed(0, modifiers);
15602	16258	}
15603		- clickStart(x, y, modifiers);
	16259	+ // clickStart(x, y, modifiers);
15604	16260	return true;
15605	16261	}
15606	16262
..	..	@@ -15718,7 +16374,7 @@
15718	16374	{
15719	16375	keyReleased(0, 0);
15720	16376	}
15721		- drag(x, y, modifiers);
	16377	+ drag(x, y, 0, modifiers);
15722	16378	return true;
15723	16379	}
15724	16380
..	..	@@ -15850,7 +16506,7 @@
15850	16506	Object3D object;
15851	16507	static Object3D trackedobject;
15852	16508	Camera renderCamera; // Light or Eye (or Occlusion)
15853		- /static/ Camera manipCamera; // Light or Eye
	16509	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15854	16510	/static/ Camera eyeCamera;
15855	16511	/static/ Camera lightCamera;
15856	16512	int cameracount;
..	..	@@ -15946,7 +16602,9 @@
15946	16602
15947	16603	float BGcolor = 0.5f;
15948	16604
15949		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
15950	16608	{
15951	16609	if (envyoff \|\| cubemap == null)
15952	16610	{
..	..	@@ -15963,7 +16621,17 @@
15963	16621	// Compensates for ExaminerViewer's modification of modelview matrix
15964	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
15965	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
15966	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
15967	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
15968	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15969	16637
..	..	@@ -15976,7 +16644,7 @@
15976	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
15977	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
15978	16646	//gl.glEnable(GL.GL_LIGHTING);
15979		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
15980	16648
15981	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
15982	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16135,16 +16803,16 @@
16135	16803	cStatic.objectstack[materialdepth++] = checker;
16136	16804	//System.out.println("material " + material);
16137	16805	//Applet3D.tracein(this, selected);
16138		- vector2buffer = checker.projectedVertices;
	16806	+ //vector2buffer = checker.projectedVertices;
16139	16807
16140	16808	//checker.GetMaterial().Draw(this, false); // true);
16141		- DrawMaterial(checker.GetMaterial(), false); // true);
	16809	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16142	16810
16143	16811	materialdepth -= 1;
16144	16812	if (materialdepth > 0)
16145	16813	{
16146		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16147		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16814	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16815	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16148	16816	}
16149	16817	//checker.GetMaterial().opacity = 1f;
16150	16818	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16230,6 +16898,14 @@
16230	16898	}
16231	16899	}
16232	16900
	16901	+ private Object3D GetFolder()
	16902	+ {
	16903	+ Object3D folder = object.GetWindow().copy;
	16904	+ if (object.GetWindow().copy.selection.Size() > 0)
	16905	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16906	+ return folder;
	16907	+ }
	16908	+
16233	16909	class SelectBuffer implements GLEventListener
16234	16910	{
16235	16911
..	..	@@ -16245,7 +16921,7 @@
16245	16921	//new Exception().printStackTrace();
16246	16922	System.out.println("select buffer init");
16247	16923	// Use debug pipeline
16248		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16249	16925
16250	16926	GL gl = drawable.getGL();
16251	16927
..	..	@@ -16309,6 +16985,17 @@
16309	16985
16310	16986	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16311	16987
	16988	+ if (PAINTMODE)
	16989	+ {
	16990	+ if (object.GetWindow().copy.selection.Size() > 0)
	16991	+ {
	16992	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16993	+
	16994	+ // Make what you paint not selectable.
	16995	+ paintobj.ResetSelectable();
	16996	+ }
	16997	+ }
	16998	+
16312	16999	//int tmp = selection_view;
16313	17000	//selection_view = -1;
16314	17001	int temp = DrawMode();
..	..	@@ -16320,6 +17007,17 @@
16320	17007	// temp = DEFAULT; // patch for selection debug
16321	17008	Globals.drawMode = temp; // WARNING
16322	17009
	17010	+ if (PAINTMODE)
	17011	+ {
	17012	+ if (object.GetWindow().copy.selection.Size() > 0)
	17013	+ {
	17014	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17015	+
	17016	+ // Revert.
	17017	+ paintobj.RestoreSelectable();
	17018	+ }
	17019	+ }
	17020	+
16323	17021	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16324	17022
16325	17023	// trying different ways of getting the depth info over
..	..	@@ -16367,6 +17065,8 @@
16367	17065	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16368	17066	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16369	17067	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17068	+
	17069	+ CreateSelectedPoint();
16370	17070
16371	17071	// Will fit the mesh !!!
16372	17072	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16416,34 +17116,36 @@
16416	17116	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]));
16417	17117	}
16418	17118
16419		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17119	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16420	17120	}
16421	17121	}
16422	17122
16423	17123	if (!movingcamera && !PAINTMODE)
16424		- object.editWindow.ScreenFitPoint(); // fev 2014
	17124	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16425	17125
16426		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17126	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16427	17127	{
16428		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17128	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16429	17129
16430		- Object3D group = new Object3D("inst" + paintcount++);
	17130	+ if (object.GetWindow().copy.selection.Size() > 0)
	17131	+ {
	17132	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16431	17133
16432		- group.CreateMaterial(); // use a void leaf to select instances
16433		-
16434		- group.add(paintobj); // link
16435		-
16436		- object.editWindow.SnapObject(group);
16437		-
16438		- Object3D folder = object.editWindow.copy;
16439		-
16440		- if (object.editWindow.copy.selection.Size() > 0)
16441		- folder = object.editWindow.copy.selection.elementAt(0);
16442		-
16443		- folder.add(group);
16444		-
16445		- object.editWindow.ResetModel();
16446		- object.editWindow.refreshContents();
	17134	+ Object3D inst = new Object3D("inst" + paintcount++);
	17135	+
	17136	+ inst.CreateMaterial(); // use a void leaf to select instances
	17137	+
	17138	+ inst.add(paintobj); // link
	17139	+
	17140	+ object.GetWindow().SnapObject(inst);
	17141	+
	17142	+ Object3D folder = paintFolder; // GetFolder();
	17143	+
	17144	+ folder.add(inst);
	17145	+
	17146	+ object.GetWindow().ResetModel();
	17147	+ object.GetWindow().refreshContents();
	17148	+ }
16447	17149	}
16448	17150	else
16449	17151	paintcount = 0;
..	..	@@ -16482,6 +17184,11 @@
16482	17184	//System.out.println("objects[color] = " + objects[color]);
16483	17185	//objects[color].Select();
16484	17186	indexcount = 0;
	17187	+ ObjEditor window = object.GetWindow();
	17188	+ if (window != null && deselect)
	17189	+ {
	17190	+ window.Select(null, deselect, true);
	17191	+ }
16485	17192	object.Select(color, deselect);
16486	17193	}
16487	17194
..	..	@@ -16581,7 +17288,7 @@
16581	17288	gl.glDisable(gl.GL_CULL_FACE);
16582	17289	}
16583	17290
16584		- if (!RENDERSHADOW)
	17291	+ if (!Globals.RENDERSHADOW)
16585	17292	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16586	17293
16587	17294	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16591,7 +17298,7 @@
16591	17298	//gl.glColorMask(false, false, false, false);
16592	17299
16593	17300	//render_scene_from_light_view(gl, drawable, 0, 0);
16594		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17301	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16595	17302	{
16596	17303	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16597	17304
..	..	@@ -17007,23 +17714,15 @@
17007	17714	int AAbuffersize = 0;
17008	17715
17009	17716	//double[] selectedpoint = new double[3];
17010		- static Superellipsoid selectedpoint = new Superellipsoid();
	17717	+ static Superellipsoid selectedpoint;
17011	17718	static Sphere previousselectedpoint = null;
17012		- static Sphere debugpointG = new Sphere();
17013		- static Sphere debugpointP = new Sphere();
17014		- static Sphere debugpointC = new Sphere();
17015		- static Sphere debugpointR = new Sphere();
	17719	+ static Sphere debugpointG;
	17720	+ static Sphere debugpointP;
	17721	+ static Sphere debugpointC;
	17722	+ static Sphere debugpointR;
17016	17723
17017	17724	static Sphere debugpoints[] = new Sphere[8];
17018	17725
17019		- static
17020		- {
17021		- for (int i=0; i<8; i++)
17022		- {
17023		- debugpoints[i] = new Sphere();
17024		- }
17025		- }
17026		-
17027	17726	static void InitPoints(float radius)
17028	17727	{
17029	17728	for (int i=0; i<8; i++)