~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;
..	..	@@ -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,7 +2338,7 @@
2265	2338	LOOKAT ^= true;
2266	2339	}
2267	2340
2268		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2269	2342	{
2270	2343	SWITCH ^= true;
2271	2344	}
..	..	@@ -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,47 +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
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
8078	8355	// String[] split = tex.split("Textures");
8079	8356	// if (split.length > 1)
8080	8357	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8358	// else
8082	8359	// if (!texname.startsWith("/"))
8083	8360	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8085	8362	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8363	+ texname = fallbackTextureName;
8087	8364	}
8088	8365
8089	8366	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8367	{
8096		- 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(""))
8097	8401	{
8098	8402	assert(!bump);
8099	8403	// if (bump)
..	..	@@ -8104,19 +8408,23 @@
8104	8408	// }
8105	8409	// else
8106	8410	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8109	8413	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8112	8418	// }
8113	8419	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8421	{
8116	8422	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- 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();
8120	8428	} else
8121	8429	{
8122	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8432,22 @@
8124	8432	// texture = GetResourceTexture("default.png");
8125	8433	//} else
8126	8434	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8128	8436	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8132	8451	} else
8133	8452	{
8134	8453	if (textureon)
..	..	@@ -8153,7 +8472,7 @@
8153	8472	}
8154	8473
8155	8474	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
8157	8476	cachename = texname;
8158	8477	else
8159	8478	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8494,7 @@
8175	8494	}
8176	8495
8177	8496	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8497	+ if (!FileExists(cachename))
8179	8498	cachename = texname;
8180	8499	else
8181	8500	processbump = false; // don't process bump map again
..	..	@@ -8184,20 +8503,23 @@
8184	8503	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8504
8186	8505
8187		- if (texturedata != null)
8188		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8506	+ if (texturedata == null)
	8507	+ throw new Exception();
	8508	+
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8189	8510	//texture = GetTexture(tex, bump);
8190	8511	}
	8512	+ }
8191	8513	}
8192	8514	//}
8193	8515	}
8194	8516
8195		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8196	8518	{
8197	8519	//return false;
8198	8520
8199	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8200		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8201	8523	{
8202	8524	// String ext = "_highres";
8203	8525	// if (REDUCETEXTURE)
..	..	@@ -8214,52 +8536,17 @@
8214	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8215	8537	if (!cachefile.exists())
8216	8538	{
8217		- // cache to disk
8218		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8219		- //buffers[0].
8220		-
8221		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8222		- int[] pixels = new int[bytebuf.capacity()/3];
8223		-
8224		- // squared size heuristic...
8225		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8226	8540	{
8227		- for (int i=pixels.length; --i>=0;)
8228		- {
8229		- int i3 = i*3;
8230		- pixels[i] = 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8237		- }
8238		-
8239		- /*
8240		- int r=0,g=0,b=0,a=0;
8241		- for (int i=0; i<width; i++)
8242		- for (int j=0; j<height; j++)
8243		- {
8244		- int index = j*width+i;
8245		- int p = pixels[index];
8246		- a = ((p>>24) & 0xFF);
8247		- r = ((p>>16) & 0xFF);
8248		- g = ((p>>8) & 0xFF);
8249		- b = (p & 0xFF);
8250		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8251		- }
8252		- /**/
8253		- int width = (int)Math.sqrt(pixels.length); // squared
8254		- int height = width;
8255		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8256		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8257	8543	ImageWriter writer = null;
8258	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8259	8545	if (iter.hasNext()) {
8260	8546	writer = (ImageWriter)iter.next();
8261	8547	}
8262		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8263	8550	try
8264	8551	{
8265	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8276,18 +8563,20 @@
8276	8563	}
8277	8564	}
8278	8565	}
8279		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8280	8569	//System.out.println("Texture = " + tex);
8281		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8282	8571	{
8283		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8284	8573	thetex.texture.disable();
8285	8574	thetex.texture.dispose();
8286		- textures.remove(texname);
	8575	+ textures.remove(tex);
8287	8576	}
8288	8577
8289		- texture.texturedata = texturedata;
8290		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8291	8580
8292	8581	// newtex = true;
8293	8582	}
..	..	@@ -8303,10 +8592,44 @@
8303	8592	}
8304	8593	}
8305	8594
8306		- return texture;
	8595	+ return texturecache;
8307	8596	}
8308	8597
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8310	8633	{
8311	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8635
..	..	@@ -8324,21 +8647,21 @@
8324	8647	return texture!=null?texture.texture:null;
8325	8648	}
8326	8649
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8328	8651	{
8329	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8653
8331	8654	return texture!=null?texture.texturedata:null;
8332	8655	}
8333	8656
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8335	8658	{
8336	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8660	{
8338	8661	return false;
8339	8662	}
8340	8663
8341		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8342	8665
8343	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8344	8667
..	..	@@ -8370,9 +8693,75 @@
8370	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8371	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8372	8695
8373		- return newtex;
	8696	+ return true; // Warning: not used.
8374	8697	}
8375	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8376	8765	ShadowBuffer shadowPBuf;
8377	8766	AntialiasBuffer antialiasPBuf;
8378	8767	int MAXSTACK;
..	..	@@ -8389,10 +8778,12 @@
8389	8778
8390	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8391	8780	MAXSTACK = temp[0];
8392		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8393	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8394	8784	MAXSTACK = temp[0];
8395		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8396	8787
8397	8788	// Use debug pipeline
8398	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8400,7 +8791,8 @@
8400	8791	gl = drawable.getGL(); //
8401	8792
8402	8793	GL gl3 = getGL();
8403		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8404	8796
8405	8797
8406	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8565,7 +8957,7 @@
8565	8957
8566	8958	if (cubemap == null)
8567	8959	{
8568		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8569	8961	}
8570	8962
8571	8963	//cubemap.enable();
..	..	@@ -8852,37 +9244,58 @@
8852	9244	cubemap = null;
8853	9245	return;
8854	9246	case 1:
8855		- name = "cubemaps/box_";
8856		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
8857	9249	reverseUP = false;
8858	9250	break;
8859	9251	case 2:
8860		- name = "cubemaps/uffizi_";
8861		- ext = "png";
8862		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
8863	9256	case 3:
8864		- name = "cubemaps/CloudyHills_";
8865		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
8866	9259	reverseUP = false;
8867	9260	break;
8868	9261	case 4:
8869		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
8870	9263	ext = "png";
8871	9264	reverseUP = false;
8872	9265	break;
	9266	+ case 5:
	9267	+ name = "cubemaps/skycube/";
	9268	+ ext = "jpg";
	9269	+ reverseUP = false;
	9270	+ break;
	9271	+ case 6:
	9272	+ name = "cubemaps/SaintLazarusChurch3/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 7:
	9277	+ name = "cubemaps/Sodermalmsallen/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 8:
	9282	+ name = "cubemaps/Sodermalmsallen2/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 9:
	9287	+ name = "cubemaps/UnionSquare/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
8873	9291	default:
8874		- name = "cubemaps/rgb_";
8875		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
8876	9295	break;
8877	9296	}
8878		-
8879		- try
8880		- {
8881		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8882		- } catch (IOException e)
8883		- {
8884		- throw new RuntimeException(e);
8885		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
8886	9299	}
8887	9300
8888	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8914,8 +9327,12 @@
8914	9327	static double[] model = new double[16];
8915	9328	double[] camera2light = new double[16];
8916	9329	double[] light2camera = new double[16];
8917		- int newenvy = -1;
8918		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
8919	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8920	9337	//float[] light0 = { 0,0,0 };
8921	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9208,11 +9625,35 @@
9208	9625	jy8[3] = 0.5f;
9209	9626	}
9210	9627
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9628	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9629	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9630	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9631	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9632
	9633	+ void ResetOptions()
	9634	+ {
	9635	+ options1[0] = 100;
	9636	+ options1[1] = 0.025f;
	9637	+ options1[2] = 0.01f;
	9638	+ options1[3] = 0;
	9639	+ options1[4] = 0;
	9640	+
	9641	+ options2[0] = 0;
	9642	+ options2[1] = 0.75f;
	9643	+ options2[2] = 0;
	9644	+ options2[3] = 0;
	9645	+
	9646	+ options3[0] = 1;
	9647	+ options3[1] = 1;
	9648	+ options3[2] = 1;
	9649	+ options3[3] = 0;
	9650	+
	9651	+ options4[0] = 1;
	9652	+ options4[1] = 0;
	9653	+ options4[2] = 1;
	9654	+ options4[3] = 0;
	9655	+ }
	9656	+
9216	9657	static int imagecount = 0; // movie generation
9217	9658
9218	9659	static int jitter = 0;
..	..	@@ -9308,8 +9749,8 @@
9308	9749	assert (parentcam != renderCamera);
9309	9750
9310	9751	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9752	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9313	9754
9314	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9756
..	..	@@ -9324,8 +9765,8 @@
9324	9765	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9766
9326	9767	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9768	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9329	9770
9330	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9772
..	..	@@ -9371,10 +9812,12 @@
9371	9812	rati = 1 / rati;
9372	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9373	9814	}
9374		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9375	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9377		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9378	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9379	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9380	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9542,7 +9985,7 @@
9542	9985
9543	9986	if (!BOXMODE)
9544	9987	{
9545		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9988	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9546	9989	}
9547	9990
9548	9991	if (!BOXMODE)
..	..	@@ -9580,7 +10023,7 @@
9580	10023	ABORTED = false;
9581	10024	}
9582	10025	else
9583		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10026	+ Grafreed.wav.cursor += 735 * ACSIZE;
9584	10027
9585	10028	if (false)
9586	10029	{
..	..	@@ -10243,11 +10686,11 @@
10243	10686
10244	10687	public void display(GLAutoDrawable drawable)
10245	10688	{
10246		- if (GrafreeD.savesound && GrafreeD.hassound)
	10689	+ if (Grafreed.savesound && Grafreed.hassound)
10247	10690	{
10248		- GrafreeD.wav.save();
10249		- GrafreeD.savesound = false;
10250		- GrafreeD.hassound = false;
	10691	+ Grafreed.wav.save();
	10692	+ Grafreed.savesound = false;
	10693	+ Grafreed.hassound = false;
10251	10694	}
10252	10695	// if (DEBUG_SELECTION)
10253	10696	// {
..	..	@@ -10323,6 +10766,7 @@
10323	10766	ANTIALIAS = 0;
10324	10767	//System.out.println("RESTART");
10325	10768	AAtimer.restart();
	10769	+ Globals.TIMERRUNNING = true;
10326	10770	}
10327	10771	}
10328	10772	}
..	..	@@ -10377,7 +10821,7 @@
10377	10821	Object3D theobject = object;
10378	10822	Object3D theparent = object.parent;
10379	10823	object.parent = null;
10380		- object = (Object3D)GrafreeD.clone(object);
	10824	+ object = (Object3D)Grafreed.clone(object);
10381	10825	object.Stripify();
10382	10826	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10383	10827	theobject.PreprocessOcclusion(this);
..	..	@@ -10390,13 +10834,14 @@
10390	10834	ambientOcclusion = false;
10391	10835	}
10392	10836
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10837	+ if (//Globals.lighttouched &&
	10838	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10839	{
10395	10840	//if (RENDERSHADOW) // ?
10396	10841	if (!IsFrozen())
10397	10842	{
10398	10843	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10844	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10845	{
10401	10846	Globals.framecount++;
10402	10847	shadowbuffer.display();
..	..	@@ -10409,7 +10854,7 @@
10409	10854
10410	10855	if (wait)
10411	10856	{
10412		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10413	10858
10414	10859	wait = false;
10415	10860	}
..	..	@@ -10523,8 +10968,8 @@
10523	10968
10524	10969	// if (parentcam != renderCamera) // not a light
10525	10970	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10971	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10528	10973
10529	10974	for (int j = 0; j < 4; j++)
10530	10975	{
..	..	@@ -10538,8 +10983,8 @@
10538	10983
10539	10984	// if (parentcam != renderCamera) // not a light
10540	10985	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10986	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10543	10988
10544	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10990
..	..	@@ -10625,13 +11070,27 @@
10625	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10626	11071	}
10627	11072
10628		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
10629	11081	{
10630		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
10631	11087	}
10632		-
10633		- newenvy = -1;
10634		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
10635	11094	ratio = ((double) getWidth()) / getHeight();
10636	11095	//System.out.println("ratio = " + ratio);
10637	11096
..	..	@@ -10647,7 +11106,7 @@
10647	11106
10648	11107	if (!IsFrozen() && !ambientOcclusion)
10649	11108	{
10650		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
10651	11110	}
10652	11111
10653	11112	//if (selection_view == -1)
..	..	@@ -10798,7 +11257,16 @@
10798	11257	// Bump noise
10799	11258	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	11259	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	11260	+
	11261	+ try
	11262	+ {
	11263	+ BindTexture(NOISE_TEXTURE, false, 2);
	11264	+ }
	11265	+ catch (Exception e)
	11266	+ {
	11267	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11268	+ }
	11269	+
10802	11270
10803	11271	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	11272	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10821,9 +11289,9 @@
10821	11289
10822	11290	gl.glMatrixMode(GL.GL_MODELVIEW);
10823	11291
10824		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10825		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10826		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11292	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11293	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11294	+gl.glEnable(gl.GL_MULTISAMPLE);
10827	11295	} else
10828	11296	{
10829	11297	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10834,7 +11302,7 @@
10834	11302	//System.out.println("BLENDING ON");
10835	11303	gl.glEnable(GL.GL_BLEND);
10836	11304	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837		-
	11305	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10838	11306	gl.glMatrixMode(gl.GL_PROJECTION);
10839	11307	gl.glLoadIdentity();
10840	11308
..	..	@@ -10923,8 +11391,8 @@
10923	11391	System.err.println("parentcam != renderCamera");
10924	11392
10925	11393	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11394	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10928	11396	}
10929	11397
10930	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11413,8 @@
10945	11413	if (true) // TODO
10946	11414	{
10947	11415	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11416	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11417	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11418	}
10951	11419
10952	11420	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11083,7 +11551,7 @@
11083	11551	}
11084	11552	}
11085	11553
11086		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11554	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11087	11555	{
11088	11556	//gl.glDepthFunc(GL.GL_LEQUAL);
11089	11557	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11091,24 +11559,21 @@
11091	11559
11092	11560	boolean texon = textureon;
11093	11561
11094		- if (RENDERPROGRAM > 0)
11095		- {
11096		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11097		- textureon = false;
11098		- }
	11562	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11563	+ textureon = false;
	11564	+
11099	11565	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11100	11566	//System.out.println("ALLO");
11101	11567	gl.glColorMask(false, false, false, false);
11102	11568	DrawObject(gl);
11103		- if (RENDERPROGRAM > 0)
11104		- {
11105		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11106		- textureon = texon;
11107		- }
	11569	+
	11570	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11571	+ textureon = texon;
	11572	+
11108	11573	gl.glColorMask(true, true, true, true);
11109	11574
11110	11575	gl.glDepthFunc(GL.GL_EQUAL);
11111		- //gl.glDepthMask(false);
	11576	+ gl.glDepthMask(false);
11112	11577	}
11113	11578
11114	11579	if (false) // DrawMode() == SHADOW)
..	..	@@ -11283,23 +11748,44 @@
11283	11748	e.printStackTrace();
11284	11749	}
11285	11750
11286		- if (GrafreeD.RENDERME > 0)
11287		- GrafreeD.RENDERME--; // mechante magouille
	11751	+ if (Grafreed.RENDERME > 0)
	11752	+ Grafreed.RENDERME--; // mechante magouille
11288	11753
11289	11754	Globals.ONESTEP = false;
11290	11755	}
11291	11756
11292	11757	static boolean zoomonce = false;
11293	11758
	11759	+ static void CreateSelectedPoint()
	11760	+ {
	11761	+ if (selectedpoint == null)
	11762	+ {
	11763	+ debugpointG = new Sphere();
	11764	+ debugpointP = new Sphere();
	11765	+ debugpointC = new Sphere();
	11766	+ debugpointR = new Sphere();
	11767	+
	11768	+ selectedpoint = new Superellipsoid();
	11769	+
	11770	+ for (int i=0; i<8; i++)
	11771	+ {
	11772	+ debugpoints[i] = new Sphere();
	11773	+ }
	11774	+ }
	11775	+ }
	11776	+
11294	11777	void DrawObject(GL gl, boolean draw)
11295	11778	{
	11779	+ // To clear camera values
	11780	+ ResetOptions();
	11781	+
11296	11782	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11783	// DrawMode() = SELECTION;
11298	11784	//GL gl = getGL();
11299	11785	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11300	11786	{
11301	11787	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11788	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303	11789	pingthread.StepToTarget(true); // true);
11304	11790	// zoomonce = false;
11305	11791	}
..	..	@@ -11354,7 +11840,14 @@
11354	11840
11355	11841	usedtextures.clear();
11356	11842
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11843	+ try
	11844	+ {
	11845	+ BindTextures(DEFAULT_TEXTURES, 2);
	11846	+ }
	11847	+ catch (Exception e)
	11848	+ {
	11849	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11850	+ }
11358	11851	}
11359	11852	//System.out.println("--> " + stackdepth);
11360	11853	// GrafreeD.traceon();
..	..	@@ -11364,8 +11857,9 @@
11364	11857
11365	11858	if (DrawMode() == DEFAULT)
11366	11859	{
11367		- if (DEBUG)
	11860	+ if (Globals.DEBUG)
11368	11861	{
	11862	+ CreateSelectedPoint();
11369	11863	float radius = 0.05f;
11370	11864	if (selectedpoint.radius != radius)
11371	11865	{
..	..	@@ -11419,20 +11913,32 @@
11419	11913	ReleaseTextures(DEFAULT_TEXTURES);
11420	11914
11421	11915	if (CLEANCACHE)
11422		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11916	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11423	11917	{
11424		- String tex = e.nextElement();
	11918	+ cTexture tex = e.nextElement();
11425	11919
11426	11920	// System.out.println("Texture --------- " + tex);
11427	11921
11428		- if (tex.equals("WHITE_NOISE"))
	11922	+ if (tex.equals("WHITE_NOISE:"))
11429	11923	continue;
11430	11924
11431		- if (!usedtextures.containsKey(tex))
	11925	+ if (!usedtextures.contains(tex))
11432	11926	{
	11927	+ CacheTexture gettex = texturepigment.get(tex);
11433	11928	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11434		- textures.get(tex).texture.dispose();
11435		- textures.remove(tex);
	11929	+ if (gettex != null)
	11930	+ {
	11931	+ gettex.texture.dispose();
	11932	+ texturepigment.remove(tex);
	11933	+ }
	11934	+
	11935	+ gettex = texturebump.get(tex);
	11936	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11937	+ if (gettex != null)
	11938	+ {
	11939	+ gettex.texture.dispose();
	11940	+ texturebump.remove(tex);
	11941	+ }
11436	11942	}
11437	11943	}
11438	11944	}
..	..	@@ -11445,7 +11951,14 @@
11445	11951	if (checker != null && DrawMode() == DEFAULT)
11446	11952	{
11447	11953	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11954	+ try
	11955	+ {
	11956	+ BindTextures(checker.GetTextures(), checker.texres);
	11957	+ }
	11958	+ catch (Exception e)
	11959	+ {
	11960	+ System.err.println("FAILED: " + checker.GetTextures());
	11961	+ }
11449	11962	// NEAREST
11450	11963	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11964	DrawChecker(gl);
..	..	@@ -11527,7 +12040,7 @@
11527	12040	return;
11528	12041	}
11529	12042
11530		- String string = obj.GetToolTip();
	12043	+ String string = obj.toString(); //.GetToolTip();
11531	12044
11532	12045	GL gl = GetGL();
11533	12046
..	..	@@ -11844,8 +12357,8 @@
11844	12357	//obj.TransformToWorld(light, light);
11845	12358	for (int i = tp.size(); --i >= 0;)
11846	12359	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12360	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12361	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12362	}
11850	12363
11851	12364
..	..	@@ -11862,8 +12375,8 @@
11862	12375	parentcam = cameras[0];
11863	12376	}
11864	12377
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12378	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12379	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12380
11868	12381	LA.xformPos(light, renderCamera.toScreen, light);
11869	12382
..	..	@@ -11953,8 +12466,76 @@
11953	12466
11954	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11955	12468
11956		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
11957	12471	"!!ARBfp1.0\n" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12473	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12474	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12475	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12476	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12477	+ "PARAM light2cam0 = program.env[10];" +
	12478	+ "PARAM light2cam1 = program.env[11];" +
	12479	+ "PARAM light2cam2 = program.env[12];" +
	12480	+ "TEMP temp;" +
	12481	+ "TEMP light;" +
	12482	+ "TEMP ndotl;" +
	12483	+ "TEMP normal;" +
	12484	+ "TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
	12487	+
	12488	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12489	+ Normalize("normal") +
	12490	+ "MOV light, state.light[0].position;" +
	12491	+ "DP3 ndotl.x, light, normal;" +
	12492	+
	12493	+ // shadow
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
	12497	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12499	+
	12500	+ // No shadow when out of frustum
	12501	+ //"SGE temp.y, depth.z, zero123.y;" +
	12502	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12503	+
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12505	+
	12506	+ // Backlit
	12507	+ "MOV pos.w, zero123.y;" +
	12508	+ "DP4 eye.x, pos, light2cam0;" +
	12509	+ "DP4 eye.y, pos, light2cam1;" +
	12510	+ "DP4 eye.z, pos, light2cam2;" +
	12511	+ Normalize("eye") +
	12512	+
	12513	+ "DP3 ndotl.y, -eye, normal;" +
	12514	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12515	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12516	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12517	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12518	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12519	+
	12520	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12521	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12522	+
	12523	+ // Pigment
	12524	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12526	+ "MUL temp, temp, ndotl.x;" +
	12527	+
	12528	+ "MUL temp, temp, zero123.z;" +
	12529	+
	12530	+ //"MUL temp, temp, ndotl.y;" +
	12531	+
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
	12533	+ "MOV result.color, temp;" +
	12534	+ "END";
	12535	+
	12536	+ String programmax =
	12537	+ "!!ARBfp1.0\n" +
	12538	+
11958	12539	//"OPTION ARB_fragment_program_shadow;" +
11959	12540	"PARAM light2cam0 = program.env[10];" +
11960	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12069,8 +12650,7 @@
12069	12650	"TEMP shininess;" +
12070	12651	"\n" +
12071	12652	"MOV texSamp, one;" +
12072		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12073		-
	12653	+
12074	12654	"MOV mapgrid.x, one2048th.x;" +
12075	12655	"MOV temp, fragment.texcoord[1];" +
12076	12656	/*
..	..	@@ -12091,20 +12671,20 @@
12091	12671	"MUL temp, floor, mapgrid.x;" +
12092	12672	//"TEX depth0, temp, texture[1], 2D;" +
12093	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12094		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12095	12675	"") +
12096	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12097	12677	//"TEX depth1, temp, texture[1], 2D;" +
12098	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12099		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12100	12680	"") +
12101	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12102	12682	//"TEX depth2, temp, texture[1], 2D;" +
12103		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12104	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12105	12685	//"TEX depth3, temp, texture[1], 2D;" +
12106	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12107		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12108	12688	"") +
12109	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12110	12690	//"MOV params, material;" +
..	..	@@ -12475,10 +13055,10 @@
12475	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12476	13056	"") +
12477	13057
12478		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12479	13059	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	13060	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12482	13062	"SUB temp.y, one.x, temp.z;" +
12483	13063	"MUL temp.x, temp.x, temp.y;" +
12484	13064	"KIL temp.x;" +
..	..	@@ -12809,7 +13389,14 @@
12809	13389	//once = true;
12810	13390	}
12811	13391
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
	13399	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13402
..	..	@@ -12902,25 +13489,26 @@
12902	13489	return out;
12903	13490	}
12904	13491
12905		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
12906	13494	{
12907	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12908	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12909	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12910	13500	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12911		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12912		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12913		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12914		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12915	13503	//"SWZ buffer, temp, w,w,w,w;";
12916		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12917	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12918	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12919	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12920		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12921	13509
12922		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12923		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13510	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13511	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12924	13512	}
12925	13513
12926	13514	String Shadow(String depth, String shadow)
..	..	@@ -12942,12 +13530,16 @@
12942	13530
12943	13531	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13532	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13533	+
	13534	+ // Compare fragment depth in light space with shadowmap.
12945	13535	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13536	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13537	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13538	+
	13539	+ // Reverse comparison
12948	13540	"SUB temp.x, one.x, temp.x;" +
12949	13541	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13542	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13543	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13544
12953	13545	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13553,10 @@
12961	13553	// No shadow for backface
12962	13554	"DP3 temp.x, normal, lightd;" +
12963	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13556	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13557	+
	13558	+ // No shadow when out of frustum
	13559	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13561	"";
12966	13562	}
..	..	@@ -13107,7 +13703,8 @@
13107	13703	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13704	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13705	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13706	+
	13707	+ //Object3D.cVector2[] vector2buffer;
13111	13708
13112	13709	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13710	// OUT : diff, spec
..	..	@@ -13123,9 +13720,10 @@
13123	13720	"DP3 " + dest + ".z," + "normals," + "eye;" +
13124	13721	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13125	13722	//"MOV " + dest + ".w," + "normal.z;" +
13126		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13127		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13128		- //"MOV " + dest + ".z," + "params2.w;" +
	13723	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13724	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13725	+
	13726	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13129	13727	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13130	13728	"RCP " + dest + ".w," + dest + ".w;" +
13131	13729	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13519,7 +14117,7 @@
13519	14117	public void mousePressed(MouseEvent e)
13520	14118	{
13521	14119	//System.out.println("mousePressed: " + e);
13522		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14120	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13523	14121	}
13524	14122
13525	14123	static long prevtime = 0;
..	..	@@ -13595,8 +14193,8 @@
13595	14193	// mode \|= META;
13596	14194	//}
13597	14195
13598		- SetMouseMode(WHEEL \| e.getModifiersEx());
13599		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14196	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14197	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13600	14198	anchorX = ax;
13601	14199	anchorY = ay;
13602	14200	prevX = px;
..	..	@@ -13630,6 +14228,7 @@
13630	14228	else
13631	14229	if (evt.getSource() == AAtimer)
13632	14230	{
	14231	+ Globals.TIMERRUNNING = false;
13633	14232	if (mouseDown)
13634	14233	{
13635	14234	//new Exception().printStackTrace();
..	..	@@ -13655,6 +14254,10 @@
13655	14254	// LIVE = waslive;
13656	14255	// wasliveok = true;
13657	14256	// waslive = false;
	14257	+
	14258	+ // May 2019 Forget it:
	14259	+ if (true)
	14260	+ return;
13658	14261
13659	14262	// source == timer
13660	14263	if (mouseDown)
..	..	@@ -13685,7 +14288,7 @@
13685	14288
13686	14289	// fev 2014???
13687	14290	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13688		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14291	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13689	14292	pingthread.StepToTarget(true); // true);
13690	14293	}
13691	14294	// if (!LIVE)
..	..	@@ -13694,12 +14297,13 @@
13694	14297
13695	14298	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13696	14299
13697		- void clickStart(int x, int y, int modifiers)
	14300	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13698	14301	{
13699	14302	if (!wasliveok)
13700	14303	return;
13701	14304
13702	14305	AAtimer.restart(); //
	14306	+ Globals.TIMERRUNNING = true;
13703	14307
13704	14308	// waslive = LIVE;
13705	14309	// LIVE = false;
..	..	@@ -13711,7 +14315,7 @@
13711	14315	// touched = true; // main DL
13712	14316	if (isRenderer)
13713	14317	{
13714		- SetMouseMode(modifiers);
	14318	+ SetMouseMode(modifiers, modifiersex);
13715	14319	}
13716	14320
13717	14321	selectX = anchorX = x;
..	..	@@ -13724,7 +14328,7 @@
13724	14328	clicked = true;
13725	14329	hold = false;
13726	14330
13727		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14331	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13728	14332	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13729	14333	{
13730	14334	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13749,14 +14353,15 @@
13749	14353	drag = false;
13750	14354	//System.out.println("Mouse DOWN");
13751	14355	editObj = false;
13752		- ClickInfo info = new ClickInfo();
13753		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13754		- info.pane = this;
13755		- info.camera = renderCamera;
13756		- info.x = x;
13757		- info.y = y;
13758		- info.modifiers = modifiers;
13759		- editObj = object.doEditClick(info, 0);
	14356	+ //ClickInfo info = new ClickInfo();
	14357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14358	+ object.clickInfo.pane = this;
	14359	+ object.clickInfo.camera = renderCamera;
	14360	+ object.clickInfo.x = x;
	14361	+ object.clickInfo.y = y;
	14362	+ object.clickInfo.modifiers = modifiersex;
	14363	+ editObj = object.doEditClick(//info,
	14364	+ 0);
13760	14365	if (!editObj)
13761	14366	{
13762	14367	hasMarquee = true;
..	..	@@ -13772,9 +14377,12 @@
13772	14377
13773	14378	public void mouseDragged(MouseEvent e)
13774	14379	{
	14380	+ Globals.MOUSEDRAGGED = true;
	14381	+
13775	14382	//System.out.println("mouseDragged: " + e);
13776	14383	if (isRenderer)
13777	14384	movingcamera = true;
	14385	+
13778	14386	//if (drawing)
13779	14387	//return;
13780	14388	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13784,7 +14392,7 @@
13784	14392	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13785	14393	}
13786	14394	else
13787		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14395	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13788	14396
13789	14397	//try { Thread.sleep(1); } catch (Exception ex) {}
13790	14398	}
..	..	@@ -14021,7 +14629,7 @@
14021	14629	{
14022	14630	Globals.lighttouched = true;
14023	14631	}
14024		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14632	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14025	14633	}
14026	14634	//else
14027	14635	}
..	..	@@ -14035,12 +14643,12 @@
14035	14643	void GoDown(int mod)
14036	14644	{
14037	14645	MODIFIERS \|= COMMAND;
14038		- /*
	14646	+ /**/
14039	14647	if((mod&SHIFT) == SHIFT)
14040		- manipCamera.RotatePosition(0, -speed);
	14648	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14041	14649	else
14042		- manipCamera.BackForth(0, -speed*delta, getWidth());
14043		- */
	14650	+ manipCamera.RotatePosition(0, -speed);
	14651	+ /**/
14044	14652	if ((mod & SHIFT) == SHIFT)
14045	14653	{
14046	14654	mouseMode = mouseMode; // VR??
..	..	@@ -14056,12 +14664,12 @@
14056	14664	void GoUp(int mod)
14057	14665	{
14058	14666	MODIFIERS \|= COMMAND;
14059		- /*
	14667	+ /**/
14060	14668	if((mod&SHIFT) == SHIFT)
14061		- manipCamera.RotatePosition(0, speed);
	14669	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14062	14670	else
14063		- manipCamera.BackForth(0, speed*delta, getWidth());
14064		- */
	14671	+ manipCamera.RotatePosition(0, speed);
	14672	+ /**/
14065	14673	if ((mod & SHIFT) == SHIFT)
14066	14674	{
14067	14675	mouseMode = mouseMode;
..	..	@@ -14077,12 +14685,12 @@
14077	14685	void GoLeft(int mod)
14078	14686	{
14079	14687	MODIFIERS \|= COMMAND;
14080		- /*
	14688	+ /**/
14081	14689	if((mod&SHIFT) == SHIFT)
14082		- manipCamera.RotatePosition(speed, 0);
14083		- else
14084	14690	manipCamera.Translate(speed*delta, 0, getWidth());
14085		- */
	14691	+ else
	14692	+ manipCamera.RotatePosition(speed, 0);
	14693	+ /**/
14086	14694	if ((mod & SHIFT) == SHIFT)
14087	14695	{
14088	14696	mouseMode = mouseMode;
..	..	@@ -14098,12 +14706,12 @@
14098	14706	void GoRight(int mod)
14099	14707	{
14100	14708	MODIFIERS \|= COMMAND;
14101		- /*
	14709	+ /**/
14102	14710	if((mod&SHIFT) == SHIFT)
14103		- manipCamera.RotatePosition(-speed, 0);
14104		- else
14105	14711	manipCamera.Translate(-speed*delta, 0, getWidth());
14106		- */
	14712	+ else
	14713	+ manipCamera.RotatePosition(-speed, 0);
	14714	+ /**/
14107	14715	if ((mod & SHIFT) == SHIFT)
14108	14716	{
14109	14717	mouseMode = mouseMode;
..	..	@@ -14121,7 +14729,7 @@
14121	14729	int X, Y;
14122	14730	boolean SX, SY;
14123	14731
14124		- void drag(int x, int y, int modifiers)
	14732	+ void drag(int x, int y, int modifiers, int modifiersex)
14125	14733	{
14126	14734	if (IsFrozen())
14127	14735	{
..	..	@@ -14130,17 +14738,17 @@
14130	14738
14131	14739	drag = true; // NEW
14132	14740
14133		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14741	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14134	14742
14135	14743	X = x;
14136	14744	Y = y;
14137	14745	// floating state for animation
14138		- MODIFIERS = modifiers;
14139		- modifiers &= ~1024;
	14746	+ MODIFIERS = modifiersex;
	14747	+ modifiersex &= ~1024;
14140	14748	if (false) // modifiers != 0)
14141	14749	{
14142	14750	//new Exception().printStackTrace();
14143		- System.out.println("mouseDragged: " + modifiers);
	14751	+ System.out.println("mouseDragged: " + modifiersex);
14144	14752	System.out.println("SHIFT = " + SHIFT);
14145	14753	System.out.println("CONTROL = " + COMMAND);
14146	14754	System.out.println("META = " + META);
..	..	@@ -14153,14 +14761,16 @@
14153	14761	if (editObj)
14154	14762	{
14155	14763	drag = true;
14156		- ClickInfo info = new ClickInfo();
14157		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14158	14766	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14159		- info.pane = this;
14160		- info.camera = renderCamera;
14161		- info.x = x;
14162		- info.y = y;
14163		- object.editWindow.copy.doEditDrag(info);
	14767	+ object.clickInfo.pane = this;
	14768	+ object.clickInfo.camera = renderCamera;
	14769	+ object.clickInfo.x = x;
	14770	+ object.clickInfo.y = y;
	14771	+ object //.GetWindow().copy
	14772	+ .doEditDrag(//info,
	14773	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14164	14774	} else
14165	14775	{
14166	14776	if (x < startX)
..	..	@@ -14309,22 +14919,27 @@
14309	14919	}
14310	14920	}
14311	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14312	14924	public void mouseMoved(MouseEvent e)
14313	14925	{
14314	14926	//System.out.println("mouseMoved: " + e);
14315	14927	if (isRenderer)
14316	14928	return;
14317	14929
14318		- ClickInfo ci = new ClickInfo();
14319		- ci.x = e.getX();
14320		- ci.y = e.getY();
14321		- ci.modifiers = e.getModifiersEx();
14322		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14323		- ci.pane = this;
14324		- ci.camera = renderCamera;
	14930	+ // Mouse cursor feedback
	14931	+ object.clickInfo.x = e.getX();
	14932	+ object.clickInfo.y = e.getY();
	14933	+ object.clickInfo.modifiers = e.getModifiersEx();
	14934	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14935	+ object.clickInfo.pane = this;
	14936	+ object.clickInfo.camera = renderCamera;
14325	14937	if (!isRenderer)
14326	14938	{
14327		- if (object.editWindow.copy.doEditClick(ci, 0))
	14939	+ //ObjEditor editWindow = object.editWindow;
	14940	+ //Object3D copy = editWindow.copy;
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14328	14943	{
14329	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14330	14945	} else
..	..	@@ -14336,7 +14951,11 @@
14336	14951
14337	14952	public void mouseReleased(MouseEvent e)
14338	14953	{
	14954	+ Globals.MOUSEDRAGGED = false;
	14955	+
14339	14956	movingcamera = false;
	14957	+ X = 0; // getBounds().width/2;
	14958	+ Y = 0; // getBounds().height/2;
14340	14959	//System.out.println("mouseReleased: " + e);
14341	14960	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14342	14961	}
..	..	@@ -14359,9 +14978,9 @@
14359	14978	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360	14979	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361	14980
14362		- if (control \|\| command \|\| IsFrozen())
	14981	+// No delay if (control \|\| command \|\| IsFrozen())
14363	14982	timeout = true;
14364		- else
	14983	+// ?? May 2019 else
14365	14984	// timer.setDelay((modifiers & 128) != 0?0:350);
14366	14985	mouseDown = false;
14367	14986	if (!control && !command) // june 2013
..	..	@@ -14471,7 +15090,7 @@
14471	15090	System.out.println("keyReleased: " + e);
14472	15091	}
14473	15092
14474		- void SetMouseMode(int modifiers)
	15093	+ void SetMouseMode(int modifiers, int modifiersex)
14475	15094	{
14476	15095	//System.out.println("SetMouseMode = " + modifiers);
14477	15096	//modifiers &= ~1024;
..	..	@@ -14483,7 +15102,7 @@
14483	15102	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14484	15103	// return;
14485	15104	//System.out.println("SetMode = " + modifiers);
14486		- if ((modifiers & WHEEL) == WHEEL)
	15105	+ if ((modifiersex & WHEEL) == WHEEL)
14487	15106	{
14488	15107	mouseMode \|= ZOOM;
14489	15108	}
..	..	@@ -14493,15 +15112,15 @@
14493	15112	{
14494	15113	mouseMode \|= VR; // BACKFORTH;
14495	15114	}
14496		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15115	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14497	15116	{
14498	15117	mouseMode \|= SELECT;
14499	15118	}
14500		- if ((modifiers & COMMAND) == COMMAND)
	15119	+ if ((modifiersex & COMMAND) == COMMAND)
14501	15120	{
14502	15121	mouseMode \|= SELECT;
14503	15122	}
14504		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15123	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14505	15124	{
14506	15125	mouseMode &= ~VR;
14507	15126	mouseMode \|= TRANSLATE;
..	..	@@ -14530,7 +15149,7 @@
14530	15149
14531	15150	if (isRenderer) //
14532	15151	{
14533		- SetMouseMode(modifiers);
	15152	+ SetMouseMode(0, modifiers);
14534	15153	}
14535	15154
14536	15155	Globals.theRenderer.keyPressed(key);
..	..	@@ -14592,7 +15211,8 @@
14592	15211	// break;
14593	15212	case 'T':
14594	15213	CACHETEXTURE ^= true;
14595		- textures.clear();
	15214	+ texturepigment.clear();
	15215	+ texturebump.clear();
14596	15216	// repaint();
14597	15217	break;
14598	15218	case 'Y':
..	..	@@ -14677,7 +15297,9 @@
14677	15297	case 'E' : COMPACT ^= true;
14678	15298	repaint();
14679	15299	break;
14680		- case 'W' : DEBUGHSB ^= true;
	15300	+ case 'W' : // Wide Window (fullscreen)
	15301	+ //DEBUGHSB ^= true;
	15302	+ ObjEditor.theFrame.ToggleFullScreen();
14681	15303	repaint();
14682	15304	break;
14683	15305	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14702,8 +15324,8 @@
14702	15324	RevertCamera();
14703	15325	repaint();
14704	15326	break;
14705		- case 'L':
14706	15327	case 'l':
	15328	+ //case 'L':
14707	15329	if (lightMode)
14708	15330	{
14709	15331	lightMode = false;
..	..	@@ -14767,20 +15389,24 @@
14767	15389	OCCLUSION_CULLING ^= true;
14768	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14769	15391	break;
14770		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
14771	15393	case '1':
14772	15394	case '2':
14773	15395	case '3':
14774	15396	case '4':
14775	15397	case '5':
14776		- newenvy = Character.getNumericValue(key);
14777		- repaint();
14778		- break;
14779	15398	case '6':
14780	15399	case '7':
14781	15400	case '8':
14782	15401	case '9':
14783		- BGcolor = (key - '6')/3.f;
	15402	+ if (true) // envyoff)
	15403	+ {
	15404	+ BGcolor = (key - '1')/8.f;
	15405	+ }
	15406	+ else
	15407	+ {
	15408	+ //newenvy = Character.getNumericValue(key);
	15409	+ }
14784	15410	repaint();
14785	15411	break;
14786	15412	case '!':
..	..	@@ -14846,9 +15472,9 @@
14846	15472	case '_':
14847	15473	kompactbit = 5;
14848	15474	break;
14849		- case '+':
14850		- kompactbit = 6;
14851		- break;
	15475	+// case '+':
	15476	+// kompactbit = 6;
	15477	+// break;
14852	15478	case ' ':
14853	15479	lightMode ^= true;
14854	15480	Globals.lighttouched = true;
..	..	@@ -14860,13 +15486,14 @@
14860	15486	case ESC:
14861	15487	RENDERPROGRAM += 1;
14862	15488	RENDERPROGRAM %= 3;
	15489	+
14863	15490	repaint();
14864	15491	break;
14865	15492	case 'Z':
14866	15493	//RESIZETEXTURE ^= true;
14867	15494	//break;
14868	15495	case 'z':
14869		- RENDERSHADOW ^= true;
	15496	+ Globals.RENDERSHADOW ^= true;
14870	15497	Globals.lighttouched = true;
14871	15498	repaint();
14872	15499	break;
..	..	@@ -14899,8 +15526,9 @@
14899	15526	case DELETE:
14900	15527	ClearSelection();
14901	15528	break;
14902		- /*
14903	15529	case '+':
	15530	+
	15531	+ /*
14904	15532	//fontsize += 1;
14905	15533	bbzoom *= 2;
14906	15534	repaint();
..	..	@@ -14917,17 +15545,17 @@
14917	15545	case '=':
14918	15546	IncDepth();
14919	15547	//fontsize += 1;
14920		- object.editWindow.refreshContents(true);
	15548	+ object.GetWindow().refreshContents(true);
14921	15549	maskbit = 6;
14922	15550	break;
14923	15551	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14924	15552	DecDepth();
14925	15553	maskbit = 5;
14926	15554	//if(fontsize > 1) fontsize -= 1;
14927		- if (object.editWindow == null)
14928		- new Exception().printStackTrace();
14929		- else
14930		- object.editWindow.refreshContents(true);
	15555	+// if (object.editWindow == null)
	15556	+// new Exception().printStackTrace();
	15557	+// else
	15558	+ object.GetWindow().refreshContents(true);
14931	15559	break;
14932	15560	case '{':
14933	15561	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14990,7 +15618,7 @@
14990	15618	//mode = ROTATE;
14991	15619	if ((MODIFIERS & COMMAND) == 0) // VR??
14992	15620	{
14993		- SetMouseMode(modifiers);
	15621	+ SetMouseMode(0, modifiers);
14994	15622	}
14995	15623	}
14996	15624
..	..	@@ -15151,7 +15779,7 @@
15151	15779	}
15152	15780	*/
15153	15781
15154		- object.editWindow.EditSelection();
	15782	+ object.GetWindow().EditSelection(false);
15155	15783	}
15156	15784
15157	15785	void SelectParent()
..	..	@@ -15168,10 +15796,10 @@
15168	15796	{
15169	15797	//selectees.remove(i);
15170	15798	System.out.println("select parent of " + elem);
15171		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15172	15800	} else
15173	15801	{
15174		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15802	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15175	15803	}
15176	15804
15177	15805	first = false;
..	..	@@ -15213,12 +15841,12 @@
15213	15841	for (int j = 0; j < group.children.size(); j++)
15214	15842	{
15215	15843	elem = (Object3D) group.children.elementAt(j);
15216		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15844	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15217	15845	first = false;
15218	15846	}
15219	15847	} else
15220	15848	{
15221		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15849	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15222	15850	}
15223	15851
15224	15852	first = false;
..	..	@@ -15229,21 +15857,21 @@
15229	15857	{
15230	15858	//Composite group = (Composite) object;
15231	15859	Object3D group = object;
15232		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15860	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15233	15861	}
15234	15862
15235	15863	void ResetTransform(int mask)
15236	15864	{
15237	15865	//Composite group = (Composite) object;
15238	15866	Object3D group = object;
15239		- group.editWindow.ResetTransform(mask);
	15867	+ group.GetWindow().ResetTransform(mask);
15240	15868	}
15241	15869
15242	15870	void FlipTransform()
15243	15871	{
15244	15872	//Composite group = (Composite) object;
15245	15873	Object3D group = object;
15246		- group.editWindow.FlipTransform();
	15874	+ group.GetWindow().FlipTransform();
15247	15875	// group.editWindow.ReduceMesh(true);
15248	15876	}
15249	15877
..	..	@@ -15251,7 +15879,7 @@
15251	15879	{
15252	15880	//Composite group = (Composite) object;
15253	15881	Object3D group = object;
15254		- group.editWindow.PrintMemory();
	15882	+ group.GetWindow().PrintMemory();
15255	15883	// group.editWindow.ReduceMesh(true);
15256	15884	}
15257	15885
..	..	@@ -15259,7 +15887,7 @@
15259	15887	{
15260	15888	//Composite group = (Composite) object;
15261	15889	Object3D group = object;
15262		- group.editWindow.ResetCentroid();
	15890	+ group.GetWindow().ResetCentroid();
15263	15891	}
15264	15892
15265	15893	void IncDepth()
..	..	@@ -15341,11 +15969,11 @@
15341	15969
15342	15970	int width = getBounds().width;
15343	15971	int height = getBounds().height;
15344		- ClickInfo info = new ClickInfo();
15345		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15346	15972	//Image img = CreateImage(width, height);
15347	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
	15974	+
15348	15975	Graphics gr = g; // img.getGraphics();
	15976	+
15349	15977	if (!hasMarquee)
15350	15978	{
15351	15979	if (Xmin < Xmax) // !locked)
..	..	@@ -15417,40 +16045,88 @@
15417	16045	}
15418	16046	if (object != null && !hasMarquee)
15419	16047	{
	16048	+ if (object.clickInfo == null)
	16049	+ object.clickInfo = new ClickInfo();
	16050	+ ClickInfo info = object.clickInfo;
	16051	+ //ClickInfo info = new ClickInfo();
	16052	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16053	+
15420	16054	if (isRenderer)
15421	16055	{
15422		- info.flags++;
	16056	+ object.clickInfo.flags++;
15423	16057	double frameAspect = (double) width / (double) height;
15424	16058	if (frameAspect > renderCamera.aspect)
15425	16059	{
15426	16060	int desired = (int) ((double) height * renderCamera.aspect);
15427		- info.bounds.width -= width - desired;
15428		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15429	16063	} else
15430	16064	{
15431	16065	int desired = (int) ((double) width / renderCamera.aspect);
15432		- info.bounds.height -= height - desired;
15433		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15434	16068	}
15435	16069	}
15436		- info.g = gr;
15437		- info.camera = renderCamera;
	16070	+
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15438	16073	/*
15439	16074	// Memory intensive (brep.verticescopy)
15440	16075	if (!(object instanceof Composite))
15441	16076	object.draw(info, 0, false); // SLOW :
15442	16077	*/
15443		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15444	16079	{
15445		- object.drawEditHandles(info, 0);
	16080	+ Grafreed.Assert(object != null);
	16081	+ Grafreed.Assert(object.selection != null);
	16082	+ if (object.selection.Size() > 0)
	16083	+ {
	16084	+ int hitSomething = object.selection.get(0).hitSomething;
	16085	+
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
	16089	+ if (hitSomething == Object3D.hitCenter)
	16090	+ {
	16091	+ info.DX = X;
	16092	+ if (X != 0)
	16093	+ info.DX -= info.bounds.width/2;
	16094	+
	16095	+ info.DY = Y;
	16096	+ if (Y != 0)
	16097	+ info.DY -= info.bounds.height/2;
	16098	+ }
	16099	+
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
	16102	+
	16103	+ if (drag && (X != 0 \|\| Y != 0))
	16104	+ {
	16105	+ switch (hitSomething)
	16106	+ {
	16107	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16114	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16115	+ break;
	16116	+ }
	16117	+
	16118	+ }
	16119	+ }
15446	16120	}
15447	16121	}
	16122	+
15448	16123	if (isRenderer)
15449	16124	{
15450	16125	//gr.setColor(Color.black);
15451	16126	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15452	16127	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15453	16128	}
	16129	+
15454	16130	if (hasMarquee)
15455	16131	{
15456	16132	gr.setXORMode(Color.white);
..	..	@@ -15563,6 +16239,7 @@
15563	16239	public boolean mouseDown(Event evt, int x, int y)
15564	16240	{
15565	16241	System.out.println("mouseDown: " + evt);
	16242	+ System.exit(0);
15566	16243	/*
15567	16244	locked = true;
15568	16245	drag = false;
..	..	@@ -15606,7 +16283,7 @@
15606	16283	{
15607	16284	keyPressed(0, modifiers);
15608	16285	}
15609		- clickStart(x, y, modifiers);
	16286	+ // clickStart(x, y, modifiers);
15610	16287	return true;
15611	16288	}
15612	16289
..	..	@@ -15724,7 +16401,7 @@
15724	16401	{
15725	16402	keyReleased(0, 0);
15726	16403	}
15727		- drag(x, y, modifiers);
	16404	+ drag(x, y, 0, modifiers);
15728	16405	return true;
15729	16406	}
15730	16407
..	..	@@ -15856,7 +16533,7 @@
15856	16533	Object3D object;
15857	16534	static Object3D trackedobject;
15858	16535	Camera renderCamera; // Light or Eye (or Occlusion)
15859		- /static/ Camera manipCamera; // Light or Eye
	16536	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15860	16537	/static/ Camera eyeCamera;
15861	16538	/static/ Camera lightCamera;
15862	16539	int cameracount;
..	..	@@ -15920,6 +16597,8 @@
15920	16597	private /static/ boolean firstime;
15921	16598	private /static/ cVector newView = new cVector();
15922	16599	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16600	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16601	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15923	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15924	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15925	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15932,29 +16611,67 @@
15932	16611	{
15933	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15934	16613
	16614	+ int usedsuf = 0;
	16615	+
15935	16616	for (int i = 0; i < suffixes.length; i++)
15936	16617	{
15937		- String resourceName = basename + suffixes[i] + "." + suffix;
15938		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15939		- mipmapped,
15940		- FileUtil.getFileSuffix(resourceName));
15941		- if (data == null)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
15942	16623	{
15943		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
15944	16628	}
	16629	+
	16630	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16631	+ TextureData data;
	16632	+
	16633	+ try
	16634	+ {
	16635	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16636	+ mipmapped,
	16637	+ FileUtil.getFileSuffix(resourceName));
	16638	+ }
	16639	+ catch (Exception e)
	16640	+ {
	16641	+ try
	16642	+ {
	16643	+ resourceName = basename + fallback[i] + "." + suffix;
	16644	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16645	+ mipmapped,
	16646	+ FileUtil.getFileSuffix(resourceName));
	16647	+ }
	16648	+ catch (Exception e2)
	16649	+ {
	16650	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16651	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16652	+ mipmapped,
	16653	+ FileUtil.getFileSuffix(resourceName));
	16654	+ }
	16655	+ }
	16656	+
15945	16657	//System.out.println("Target = " + targets[i]);
15946	16658	cubemap.updateImage(data, targets[i]);
15947	16659	}
15948	16660
15949	16661	return cubemap;
15950	16662	}
	16663	+
15951	16664	int bigsphere = -1;
15952	16665
15953	16666	float BGcolor = 0.5f;
15954	16667
15955		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
15956	16671	{
15957		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
15958	16675	{
15959	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15960	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15969,7 +16686,17 @@
15969	16686	// Compensates for ExaminerViewer's modification of modelview matrix
15970	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
15971	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
15972	16690
	16691	+// colorV[0] = 2;
	16692	+// colorV[1] = 2;
	16693	+// colorV[2] = 2;
	16694	+// colorV[3] = 1;
	16695	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16696	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16697	+//
	16698	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16699	+
15973	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
15974	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15975	16702
..	..	@@ -16001,6 +16728,7 @@
16001	16728	{
16002	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
16003	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16004	16732	gl.glMultMatrixd(viewrot_1, 0);
16005	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16006	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16141,16 +16869,16 @@
16141	16869	cStatic.objectstack[materialdepth++] = checker;
16142	16870	//System.out.println("material " + material);
16143	16871	//Applet3D.tracein(this, selected);
16144		- vector2buffer = checker.projectedVertices;
	16872	+ //vector2buffer = checker.projectedVertices;
16145	16873
16146	16874	//checker.GetMaterial().Draw(this, false); // true);
16147		- DrawMaterial(checker.GetMaterial(), false); // true);
	16875	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16148	16876
16149	16877	materialdepth -= 1;
16150	16878	if (materialdepth > 0)
16151	16879	{
16152		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16153		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16880	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16881	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16154	16882	}
16155	16883	//checker.GetMaterial().opacity = 1f;
16156	16884	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16236,6 +16964,14 @@
16236	16964	}
16237	16965	}
16238	16966
	16967	+ private Object3D GetFolder()
	16968	+ {
	16969	+ Object3D folder = object.GetWindow().copy;
	16970	+ if (object.GetWindow().copy.selection.Size() > 0)
	16971	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16972	+ return folder;
	16973	+ }
	16974	+
16239	16975	class SelectBuffer implements GLEventListener
16240	16976	{
16241	16977
..	..	@@ -16251,7 +16987,7 @@
16251	16987	//new Exception().printStackTrace();
16252	16988	System.out.println("select buffer init");
16253	16989	// Use debug pipeline
16254		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16255	16991
16256	16992	GL gl = drawable.getGL();
16257	16993
..	..	@@ -16315,6 +17051,17 @@
16315	17051
16316	17052	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16317	17053
	17054	+ if (PAINTMODE)
	17055	+ {
	17056	+ if (object.GetWindow().copy.selection.Size() > 0)
	17057	+ {
	17058	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17059	+
	17060	+ // Make what you paint not selectable.
	17061	+ paintobj.ResetSelectable();
	17062	+ }
	17063	+ }
	17064	+
16318	17065	//int tmp = selection_view;
16319	17066	//selection_view = -1;
16320	17067	int temp = DrawMode();
..	..	@@ -16326,6 +17073,17 @@
16326	17073	// temp = DEFAULT; // patch for selection debug
16327	17074	Globals.drawMode = temp; // WARNING
16328	17075
	17076	+ if (PAINTMODE)
	17077	+ {
	17078	+ if (object.GetWindow().copy.selection.Size() > 0)
	17079	+ {
	17080	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17081	+
	17082	+ // Revert.
	17083	+ paintobj.RestoreSelectable();
	17084	+ }
	17085	+ }
	17086	+
16329	17087	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16330	17088
16331	17089	// trying different ways of getting the depth info over
..	..	@@ -16373,6 +17131,8 @@
16373	17131	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16374	17132	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16375	17133	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17134	+
	17135	+ CreateSelectedPoint();
16376	17136
16377	17137	// Will fit the mesh !!!
16378	17138	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16422,34 +17182,36 @@
16422	17182	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16423	17183	}
16424	17184
16425		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17185	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16426	17186	}
16427	17187	}
16428	17188
16429	17189	if (!movingcamera && !PAINTMODE)
16430		- object.editWindow.ScreenFitPoint(); // fev 2014
	17190	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16431	17191
16432		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17192	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16433	17193	{
16434		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17194	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16435	17195
16436		- Object3D group = new Object3D("inst" + paintcount++);
	17196	+ if (object.GetWindow().copy.selection.Size() > 0)
	17197	+ {
	17198	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16437	17199
16438		- group.CreateMaterial(); // use a void leaf to select instances
16439		-
16440		- group.add(paintobj); // link
16441		-
16442		- object.editWindow.SnapObject(group);
16443		-
16444		- Object3D folder = object.editWindow.copy;
16445		-
16446		- if (object.editWindow.copy.selection.Size() > 0)
16447		- folder = object.editWindow.copy.selection.elementAt(0);
16448		-
16449		- folder.add(group);
16450		-
16451		- object.editWindow.ResetModel();
16452		- object.editWindow.refreshContents();
	17200	+ Object3D inst = new Object3D("inst" + paintcount++);
	17201	+
	17202	+ inst.CreateMaterial(); // use a void leaf to select instances
	17203	+
	17204	+ inst.add(paintobj); // link
	17205	+
	17206	+ object.GetWindow().SnapObject(inst);
	17207	+
	17208	+ Object3D folder = paintFolder; // GetFolder();
	17209	+
	17210	+ folder.add(inst);
	17211	+
	17212	+ object.GetWindow().ResetModel();
	17213	+ object.GetWindow().refreshContents();
	17214	+ }
16453	17215	}
16454	17216	else
16455	17217	paintcount = 0;
..	..	@@ -16488,6 +17250,11 @@
16488	17250	//System.out.println("objects[color] = " + objects[color]);
16489	17251	//objects[color].Select();
16490	17252	indexcount = 0;
	17253	+ ObjEditor window = object.GetWindow();
	17254	+ if (window != null && deselect)
	17255	+ {
	17256	+ window.Select(null, deselect, true);
	17257	+ }
16491	17258	object.Select(color, deselect);
16492	17259	}
16493	17260
..	..	@@ -16587,7 +17354,7 @@
16587	17354	gl.glDisable(gl.GL_CULL_FACE);
16588	17355	}
16589	17356
16590		- if (!RENDERSHADOW)
	17357	+ if (!Globals.RENDERSHADOW)
16591	17358	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16592	17359
16593	17360	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16597,7 +17364,7 @@
16597	17364	//gl.glColorMask(false, false, false, false);
16598	17365
16599	17366	//render_scene_from_light_view(gl, drawable, 0, 0);
16600		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17367	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16601	17368	{
16602	17369	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16603	17370
..	..	@@ -17013,23 +17780,15 @@
17013	17780	int AAbuffersize = 0;
17014	17781
17015	17782	//double[] selectedpoint = new double[3];
17016		- static Superellipsoid selectedpoint = new Superellipsoid();
	17783	+ static Superellipsoid selectedpoint;
17017	17784	static Sphere previousselectedpoint = null;
17018		- static Sphere debugpointG = new Sphere();
17019		- static Sphere debugpointP = new Sphere();
17020		- static Sphere debugpointC = new Sphere();
17021		- static Sphere debugpointR = new Sphere();
	17785	+ static Sphere debugpointG;
	17786	+ static Sphere debugpointP;
	17787	+ static Sphere debugpointC;
	17788	+ static Sphere debugpointR;
17022	17789
17023	17790	static Sphere debugpoints[] = new Sphere[8];
17024	17791
17025		- static
17026		- {
17027		- for (int i=0; i<8; i++)
17028		- {
17029		- debugpoints[i] = new Sphere();
17030		- }
17031		- }
17032		-
17033	17792	static void InitPoints(float radius)
17034	17793	{
17035	17794	for (int i=0; i<8; i++)