~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;
..	..	@@ -327,7 +363,7 @@
327	363	cStatic.objectstack[materialdepth++] = obj;
328	364	//System.out.println("material " + material);
329	365	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	366	+ //display.vector2buffer = obj.projectedVertices;
331	367	if (obj instanceof Camera)
332	368	{
333	369	display.options1[0] = material.shift;
..	..	@@ -336,14 +372,28 @@
336	372	display.options1[2] = material.shadowbias;
337	373	display.options1[3] = material.aniso;
338	374	display.options1[4] = material.anisoV;
	375	+// System.out.println("display.options1[0] " + display.options1[0]);
	376	+// System.out.println("display.options1[1] " + display.options1[1]);
	377	+// System.out.println("display.options1[2] " + display.options1[2]);
	378	+// System.out.println("display.options1[3] " + display.options1[3]);
	379	+// System.out.println("display.options1[4] " + display.options1[4]);
339	380	display.options2[0] = material.opacity;
340	381	display.options2[1] = material.diffuse;
341	382	display.options2[2] = material.factor;
	383	+// System.out.println("display.options2[0] " + display.options2[0]);
	384	+// System.out.println("display.options2[1] " + display.options2[1]);
	385	+// System.out.println("display.options2[2] " + display.options2[2]);
342	386
343	387	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	388	+// System.out.println("display.options3[0] " + display.options3[0]);
	389	+// System.out.println("display.options3[1] " + display.options3[1]);
	390	+// System.out.println("display.options3[2] " + display.options3[2]);
344	391	display.options4[0] = material.cameralight/0.2f;
345	392	display.options4[1] = material.subsurface;
346	393	display.options4[2] = material.sheen;
	394	+// System.out.println("display.options4[0] " + display.options4[0]);
	395	+// System.out.println("display.options4[1] " + display.options4[1]);
	396	+// System.out.println("display.options4[2] " + display.options4[2]);
347	397
348	398	// if (display.CURRENTANTIALIAS > 0)
349	399	// display.options3[3] /= 4;
..	..	@@ -359,7 +409,7 @@
359	409	/**/
360	410	} else
361	411	{
362		- DrawMaterial(material, selected);
	412	+ DrawMaterial(material, selected, obj.projectedVertices);
363	413	}
364	414	} else
365	415	{
..	..	@@ -383,8 +433,8 @@
383	433	cStatic.objectstack[materialdepth++] = obj;
384	434	//System.out.println("material " + material);
385	435	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	436	+ //display.vector2buffer = obj.projectedVertices;
	437	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	438	}
389	439	}
390	440
..	..	@@ -401,8 +451,8 @@
401	451	materialdepth -= 1;
402	452	if (materialdepth > 0)
403	453	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	454	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	455	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	456	}
407	457	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	458	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +472,8 @@
422	472	materialdepth -= 1;
423	473	if (materialdepth > 0)
424	474	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	475	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	476	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	477	}
428	478	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	479	//else
..	..	@@ -1611,7 +1661,7 @@
1611	1661	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612	1662	}
1613	1663
1614		- void DrawMaterial(cMaterial material, boolean selected)
	1664	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615	1665	{
1616	1666	CameraPane display = this;
1617	1667	//new Exception().printStackTrace();
..	..	@@ -1646,7 +1696,7 @@
1646	1696	colorV[0] = display.modelParams0[0] * material.diffuse;
1647	1697	colorV[1] = display.modelParams0[1] * material.diffuse;
1648	1698	colorV[2] = display.modelParams0[2] * material.diffuse;
1649		- colorV[3] = material.opacity;
	1699	+ colorV[3] = 1; // material.opacity;
1650	1700
1651	1701	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652	1702	//System.out.println("Opacity = " + opacity);
..	..	@@ -1754,9 +1804,9 @@
1754	1804	display.modelParams7[2] = 0;
1755	1805	display.modelParams7[3] = 0;
1756	1806
1757		- display.modelParams6[0] = 100; // criss de bug de bump
	1807	+ //display.modelParams6[0] = 100; // criss de bug de bump
1758	1808
1759		- Object3D.cVector2[] extparams = display.vector2buffer;
	1809	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760	1810	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761	1811	{
1762	1812	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2052,7 +2102,7 @@
2052	2102	//System.err.println("Oeil on");
2053	2103	OEIL = true;
2054	2104	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2055		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2056	2106	//pingthread.StepToTarget(true);
2057	2107	}
2058	2108
..	..	@@ -2267,7 +2317,7 @@
2267	2317
2268	2318	void ToggleDebug()
2269	2319	{
2270		- DEBUG ^= true;
	2320	+ Globals.DEBUG ^= true;
2271	2321	}
2272	2322
2273	2323	void ToggleLookAt()
..	..	@@ -2285,10 +2335,17 @@
2285	2335	HANDLES ^= true;
2286	2336	}
2287	2337
	2338	+ Object3D paintFolder;
	2339	+
2288	2340	void TogglePaint()
2289	2341	{
2290	2342	PAINTMODE ^= true;
2291	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
2292	2349	}
2293	2350
2294	2351	void SwapCamera(int a, int b)
..	..	@@ -2385,6 +2442,21 @@
2385	2442	return currentGL;
2386	2443	}
2387	2444
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
	2446	+ {
	2447	+ Grafreed.Assert(texturedata != null);
	2448	+
	2449	+ int width = texturedata.getWidth();
	2450	+ int height = texturedata.getHeight();
	2451	+
	2452	+ Buffer buffer = texturedata.getBuffer();
	2453	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2454	+
	2455	+ byte[] bytes = bytebuf.array();
	2456	+
	2457	+ return CreateBim(bytes, width, height);
	2458	+ }
	2459	+
2388	2460	/**/
2389	2461	class CacheTexture
2390	2462	{
..	..	@@ -2393,28 +2465,31 @@
2393	2465
2394	2466	int resolution;
2395	2467
2396		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2397	2469	{
2398		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2399	2472	resolution = res;
2400	2473	}
2401	2474	}
2402	2475	/**/
2403	2476
2404	2477	// TEXTURE static Texture texture;
2405		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2406		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2407		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2478	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2481	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2482	+
2408	2483	int pigmentdepth = 0;
2409	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2410	2485	int bumpdepth = 0;
2411	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2412	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2413	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2414		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2415	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2416	2491
2417		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2418	2493	{
2419	2494	TextureData texturedata = null;
2420	2495
..	..	@@ -2433,13 +2508,34 @@
2433	2508	if (bump)
2434	2509	texturedata = ConvertBump(texturedata, false);
2435	2510
2436		- com.sun.opengl.util.texture.Texture texture =
2437		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2511	+// com.sun.opengl.util.texture.Texture texture =
	2512	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2438	2513
2439		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2440		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2514	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2441	2516
2442		- return texture;
	2517	+ return texturedata;
	2518	+ }
	2519	+
	2520	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2521	+ {
	2522	+ TextureData texturedata = null;
	2523	+
	2524	+ try
	2525	+ {
	2526	+ texturedata =
	2527	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2528	+ bim,
	2529	+ true);
	2530	+ } catch (Exception e)
	2531	+ {
	2532	+ throw new javax.media.opengl.GLException(e);
	2533	+ }
	2534	+
	2535	+ if (bump)
	2536	+ texturedata = ConvertBump(texturedata, false);
	2537	+
	2538	+ return texturedata;
2443	2539	}
2444	2540
2445	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3512,6 +3608,8 @@
3512	3608
3513	3609	System.out.println("LOADING TEXTURE : " + name);
3514	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3515	3613	//
3516	3614	if (false) // compressbit > 0)
3517	3615	{
..	..	@@ -7910,7 +8008,7 @@
7910	8008	String pigment = Object3D.GetPigment(tex);
7911	8009	String bump = Object3D.GetBump(tex);
7912	8010
7913		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7914	8012	{
7915	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7916	8014	// System.out.println("; bump = " + bump);
..	..	@@ -7925,8 +8023,8 @@
7925	8023	pigment = null;
7926	8024	}
7927	8025
7928		- ReleaseTexture(bump, true);
7929		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
7930	8028	}
7931	8029
7932	8030	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7944,7 +8042,7 @@
7944	8042
7945	8043	String pigment = Object3D.GetPigment(tex);
7946	8044
7947		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948	8046	{
7949	8047	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7950	8048	// System.out.println("; bump = " + bump);
..	..	@@ -7955,7 +8053,7 @@
7955	8053	pigment = null;
7956	8054	}
7957	8055
7958		- ReleaseTexture(pigment, false);
	8056	+ ReleaseTexture(tex, false);
7959	8057	}
7960	8058
7961	8059	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7973,7 +8071,7 @@
7973	8071
7974	8072	String bump = Object3D.GetBump(tex);
7975	8073
7976		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977	8075	{
7978	8076	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7979	8077	// System.out.println("; bump = " + bump);
..	..	@@ -7984,10 +8082,10 @@
7984	8082	bump = null;
7985	8083	}
7986	8084
7987		- ReleaseTexture(bump, true);
	8085	+ ReleaseTexture(tex, true);
7988	8086	}
7989	8087
7990		- void ReleaseTexture(String tex, boolean bump)
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
7991	8089	{
7992	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7993	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7998,7 +8096,7 @@
7998	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7999	8097
8000	8098	if (tex != null)
8001		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8002	8100
8003	8101	// //assert( texture != null );
8004	8102	// if (texture == null)
..	..	@@ -8092,47 +8190,50 @@
8092	8190
8093	8191	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8094	8192	{
8095		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8096		- ambientOcclusion ) // \|\| !textureon)
8097		- {
8098		- return; // false;
8099		- }
8100		-
8101		- if (tex == null)
8102		- {
8103		- BindTexture(null,false,resolution);
8104		- BindTexture(null,true,resolution);
8105		- return;
8106		- }
	8193	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+// ambientOcclusion ) // \|\| !textureon)
	8195	+// {
	8196	+// return; // false;
	8197	+// }
	8198	+//
	8199	+// if (tex == null)
	8200	+// {
	8201	+// BindTexture(null,false,resolution);
	8202	+// BindTexture(null,true,resolution);
	8203	+// return;
	8204	+// }
	8205	+//
	8206	+// String pigment = Object3D.GetPigment(tex);
	8207	+// String bump = Object3D.GetBump(tex);
	8208	+//
	8209	+// usedtextures.add(pigment);
	8210	+// usedtextures.add(bump);
	8211	+//
	8212	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8213	+// {
	8214	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8215	+// // System.out.println("; bump = " + bump);
	8216	+// }
	8217	+//
	8218	+// if (bump.equals(""))
	8219	+// {
	8220	+// bump = null;
	8221	+// }
	8222	+// if (pigment.equals(""))
	8223	+// {
	8224	+// pigment = null;
	8225	+// }
	8226	+//
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+// BindTexture(pigment, false, resolution);
	8229	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8230	+// BindTexture(bump, true, resolution);
	8231	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8232	+//
	8233	+// return; // true;
8107	8234
8108		- String pigment = Object3D.GetPigment(tex);
8109		- String bump = Object3D.GetBump(tex);
8110		-
8111		- usedtextures.put(pigment, pigment);
8112		- usedtextures.put(bump, bump);
8113		-
8114		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8115		- {
8116		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8117		- // System.out.println("; bump = " + bump);
8118		- }
8119		-
8120		- if (bump.equals(""))
8121		- {
8122		- bump = null;
8123		- }
8124		- if (pigment.equals(""))
8125		- {
8126		- pigment = null;
8127		- }
8128		-
8129		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8130		- BindTexture(pigment, false, resolution);
8131		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8132		- BindTexture(bump, true, resolution);
8133		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8134		-
8135		- return; // true;
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
8136	8237	}
8137	8238
8138	8239	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8151,9 +8252,9 @@
8151	8252
8152	8253	String pigment = Object3D.GetPigment(tex);
8153	8254
8154		- usedtextures.put(pigment, pigment);
	8255	+ usedtextures.add(tex);
8155	8256
8156		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157	8258	{
8158	8259	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8159	8260	// System.out.println("; bump = " + bump);
..	..	@@ -8165,7 +8266,7 @@
8165	8266	}
8166	8267
8167	8268	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168		- BindTexture(pigment, false, resolution);
	8269	+ BindTexture(tex, false, resolution);
8169	8270	}
8170	8271
8171	8272	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8184,9 +8285,9 @@
8184	8285
8185	8286	String bump = Object3D.GetBump(tex);
8186	8287
8187		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8188	8289
8189		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190	8291	{
8191	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8192	8293	// System.out.println("; bump = " + bump);
..	..	@@ -8198,7 +8299,7 @@
8198	8299	}
8199	8300
8200	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8202	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203	8304	}
8204	8305
..	..	@@ -8222,13 +8323,19 @@
8222	8323	return fileExists;
8223	8324	}
8224	8325
8225		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8226	8327	{
8227		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ CacheTexture texturecache = null;
8228	8329
8229	8330	if (tex != null)
8230	8331	{
8231		- String texname = tex;
	8332	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8333	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8334	+
	8335	+ if (texname.equals("") && texdata == null)
	8336	+ {
	8337	+ return null;
	8338	+ }
8232	8339
8233	8340	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234	8341
..	..	@@ -8238,19 +8345,46 @@
8238	8345	// else
8239	8346	// if (!texname.startsWith("/"))
8240	8347	// texname = "/Users/nbriere/Textures/" + texname;
8241		- if (!FileExists(tex))
	8348	+ if (!FileExists(texname))
8242	8349	{
8243	8350	texname = fallbackTextureName;
8244	8351	}
8245	8352
8246	8353	if (CACHETEXTURE)
8247		- texture = textures.get(texname); // TEXTURE CACHE
8248		-
8249		- TextureData texturedata = null;
8250		-
8251		- if (texture == null \|\| texture.resolution < resolution)
8252	8354	{
8253		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8355	+ if (texdata == null)
	8356	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8357	+ else
	8358	+ texturecache = bimtextures.get(texdata);
	8359	+ }
	8360	+
	8361	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8362	+ {
	8363	+ TextureData texturedata = null;
	8364	+
	8365	+ if (texdata != null && textureon)
	8366	+ {
	8367	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8368	+
	8369	+ try
	8370	+ {
	8371	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8372	+ }
	8373	+ catch (Exception e)
	8374	+ {
	8375	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8376	+ }
	8377	+
	8378	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8379	+ bimtextures.put(texdata, texturecache);
	8380	+
	8381	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8382	+
	8383	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8384	+ //bim2 = bim;
	8385	+ }
	8386	+ else
	8387	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8254	8388	{
8255	8389	assert(!bump);
8256	8390	// if (bump)
..	..	@@ -8261,19 +8395,23 @@
8261	8395	// }
8262	8396	// else
8263	8397	// {
8264		- texture = textures.get(tex);
8265		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8266	8400	{
8267		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8268	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8269	8405	// }
8270	8406	} else
8271		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8272	8408	{
8273	8409	assert(bump);
8274		- texture = textures.get(tex);
8275		- if (texture == null)
8276		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8410	+ // texturecache = textures.get(texname); // suspicious
	8411	+ if (texturecache == null)
	8412	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8413	+ else
	8414	+ new Exception().printStackTrace();
8277	8415	} else
8278	8416	{
8279	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8281,11 +8419,13 @@
8281	8419	// texture = GetResourceTexture("default.png");
8282	8420	//} else
8283	8421	//{
8284		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8285	8423	{
8286		- texture = textures.get(tex);
8287		- if (texture == null)
8288		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8424	+ // texturecache = textures.get(texname); // suspicious
	8425	+ if (texturecache == null)
	8426	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8427	+ else
	8428	+ new Exception().printStackTrace();
8289	8429	} else
8290	8430	{
8291	8431	if (textureon)
..	..	@@ -8344,19 +8484,19 @@
8344	8484	if (texturedata == null)
8345	8485	throw new Exception();
8346	8486
8347		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8348	8488	//texture = GetTexture(tex, bump);
8349	8489	}
8350	8490	}
8351	8491	//}
8352	8492	}
8353	8493
8354		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8355	8495	{
8356	8496	//return false;
8357	8497
8358	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8359		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8360	8500	{
8361	8501	// String ext = "_highres";
8362	8502	// if (REDUCETEXTURE)
..	..	@@ -8373,52 +8513,17 @@
8373	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8374	8514	if (!cachefile.exists())
8375	8515	{
8376		- // cache to disk
8377		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8378		- //buffers[0].
8379		-
8380		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8381		- int[] pixels = new int[bytebuf.capacity()/3];
8382		-
8383		- // squared size heuristic...
8384		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8385	8517	{
8386		- for (int i=pixels.length; --i>=0;)
8387		- {
8388		- int i3 = i*3;
8389		- pixels[i] = 0xFF;
8390		- pixels[i] <<= 8;
8391		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8392		- pixels[i] <<= 8;
8393		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8394		- pixels[i] <<= 8;
8395		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8396		- }
8397		-
8398		- /*
8399		- int r=0,g=0,b=0,a=0;
8400		- for (int i=0; i<width; i++)
8401		- for (int j=0; j<height; j++)
8402		- {
8403		- int index = j*width+i;
8404		- int p = pixels[index];
8405		- a = ((p>>24) & 0xFF);
8406		- r = ((p>>16) & 0xFF);
8407		- g = ((p>>8) & 0xFF);
8408		- b = (p & 0xFF);
8409		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8410		- }
8411		- /**/
8412		- int width = (int)Math.sqrt(pixels.length); // squared
8413		- int height = width;
8414		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8415		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8416	8520	ImageWriter writer = null;
8417	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8418	8522	if (iter.hasNext()) {
8419	8523	writer = (ImageWriter)iter.next();
8420	8524	}
8421		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8422	8527	try
8423	8528	{
8424	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8435,18 +8540,20 @@
8435	8540	}
8436	8541	}
8437	8542	}
8438		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8439	8546	//System.out.println("Texture = " + tex);
8440		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8441	8548	{
8442		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8443	8550	thetex.texture.disable();
8444	8551	thetex.texture.dispose();
8445		- textures.remove(texname);
	8552	+ textures.remove(tex);
8446	8553	}
8447	8554
8448		- texture.texturedata = texturedata;
8449		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8450	8557
8451	8558	// newtex = true;
8452	8559	}
..	..	@@ -8462,10 +8569,44 @@
8462	8569	}
8463	8570	}
8464	8571
8465		- return texture;
	8572	+ return texturecache;
8466	8573	}
8467	8574
8468		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8575	+ static void EmbedTextures(cTexture tex)
	8576	+ {
	8577	+ if (tex.pigmentdata == null)
	8578	+ {
	8579	+ //String texname = Object3D.GetPigment(tex);
	8580	+
	8581	+ CacheTexture texturecache = texturepigment.get(tex);
	8582	+
	8583	+ if (texturecache != null)
	8584	+ {
	8585	+ tex.pw = texturecache.texturedata.getWidth();
	8586	+ tex.ph = texturecache.texturedata.getHeight();
	8587	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8588	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8589	+ ;
	8590	+ //, tex.pw, tex.ph), 0.5f);
	8591	+ }
	8592	+ }
	8593	+
	8594	+ if (tex.bumpdata == null)
	8595	+ {
	8596	+ //String texname = Object3D.GetBump(tex);
	8597	+
	8598	+ CacheTexture texturecache = texturebump.get(tex);
	8599	+
	8600	+ if (texturecache != null)
	8601	+ {
	8602	+ tex.bw = texturecache.texturedata.getWidth();
	8603	+ tex.bh = texturecache.texturedata.getHeight();
	8604	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8605	+ }
	8606	+ }
	8607	+ }
	8608	+
	8609	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8469	8610	{
8470	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8471	8612
..	..	@@ -8483,21 +8624,21 @@
8483	8624	return texture!=null?texture.texture:null;
8484	8625	}
8485	8626
8486		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8627	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8487	8628	{
8488	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8489	8630
8490	8631	return texture!=null?texture.texturedata:null;
8491	8632	}
8492	8633
8493		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8494	8635	{
8495	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8496	8637	{
8497	8638	return false;
8498	8639	}
8499	8640
8500		- boolean newtex = false;
	8641	+ //boolean newtex = false;
8501	8642
8502	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8503	8644
..	..	@@ -8529,9 +8670,75 @@
8529	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8530	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8531	8672
8532		- return newtex;
	8673	+ return true; // Warning: not used.
8533	8674	}
8534	8675
	8676	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8677	+ {
	8678	+ try
	8679	+ {
	8680	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8681	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8682	+ ImageWriter writer = writers.next();
	8683	+
	8684	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8685	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8686	+ param.setCompressionQuality(quality);
	8687	+
	8688	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8689	+ writer.setOutput(ios);
	8690	+ writer.write(null, new IIOImage(image, null, null), param);
	8691	+
	8692	+ byte[] data = baos.toByteArray();
	8693	+ writer.dispose();
	8694	+ return data;
	8695	+ }
	8696	+ catch (Exception e)
	8697	+ {
	8698	+ e.printStackTrace();
	8699	+ return null;
	8700	+ }
	8701	+ }
	8702	+
	8703	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8704	+ {
	8705	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8706	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8707	+ ImageReader reader = writers.next();
	8708	+
	8709	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8710	+
	8711	+ ImageReadParam param = reader.getDefaultReadParam();
	8712	+ param.setDestination(bim);
	8713	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8714	+
	8715	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8716	+ reader.setInput(ios);
	8717	+ BufferedImage bim2 = reader.read(0, param);
	8718	+ reader.dispose();
	8719	+
	8720	+// WritableRaster raster = bim2.getRaster();
	8721	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8722	+// byte[] bytes = data.getData();
	8723	+//
	8724	+// int[] pixels = new int[bytes.length/3];
	8725	+// for (int i=pixels.length; --i>=0;)
	8726	+// {
	8727	+// int i3 = i*3;
	8728	+// pixels[i] = 0xFF;
	8729	+// pixels[i] <<= 8;
	8730	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8731	+// pixels[i] <<= 8;
	8732	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8733	+// pixels[i] <<= 8;
	8734	+// pixels[i] \|= bytes[i3] & 0xFF;
	8735	+// }
	8736	+//
	8737	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8738	+
	8739	+ return bim;
	8740	+ }
	8741	+
8535	8742	ShadowBuffer shadowPBuf;
8536	8743	AntialiasBuffer antialiasPBuf;
8537	8744	int MAXSTACK;
..	..	@@ -9367,11 +9574,35 @@
9367	9574	jy8[3] = 0.5f;
9368	9575	}
9369	9576
9370		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9577	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9371	9578	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9372	9579	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9373	9580	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9374	9581
	9582	+ void ResetOptions()
	9583	+ {
	9584	+ options1[0] = 100;
	9585	+ options1[1] = 0.025f;
	9586	+ options1[2] = 0.01f;
	9587	+ options1[3] = 0;
	9588	+ options1[4] = 0;
	9589	+
	9590	+ options2[0] = 0;
	9591	+ options2[1] = 0.75f;
	9592	+ options2[2] = 0;
	9593	+ options2[3] = 0;
	9594	+
	9595	+ options3[0] = 1;
	9596	+ options3[1] = 1;
	9597	+ options3[2] = 1;
	9598	+ options3[3] = 0;
	9599	+
	9600	+ options4[0] = 1;
	9601	+ options4[1] = 0;
	9602	+ options4[2] = 1;
	9603	+ options4[3] = 0;
	9604	+ }
	9605	+
9375	9606	static int imagecount = 0; // movie generation
9376	9607
9377	9608	static int jitter = 0;
..	..	@@ -10482,6 +10713,7 @@
10482	10713	ANTIALIAS = 0;
10483	10714	//System.out.println("RESTART");
10484	10715	AAtimer.restart();
	10716	+ Globals.TIMERRUNNING = true;
10485	10717	}
10486	10718	}
10487	10719	}
..	..	@@ -10549,7 +10781,8 @@
10549	10781	ambientOcclusion = false;
10550	10782	}
10551	10783
10552		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10784	+ if (//Globals.lighttouched &&
	10785	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553	10786	{
10554	10787	//if (RENDERSHADOW) // ?
10555	10788	if (!IsFrozen())
..	..	@@ -10989,9 +11222,9 @@
10989	11222
10990	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11224
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11225	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11226	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11227	+gl.glEnable(gl.GL_MULTISAMPLE);
10995	11228	} else
10996	11229	{
10997	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11235,7 @@
11002	11235	//System.out.println("BLENDING ON");
11003	11236	gl.glEnable(GL.GL_BLEND);
11004	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11239	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11240	gl.glLoadIdentity();
11008	11241
..	..	@@ -11251,7 +11484,7 @@
11251	11484	}
11252	11485	}
11253	11486
11254		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11255	11488	{
11256	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11257	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11259,24 +11492,21 @@
11259	11492
11260	11493	boolean texon = textureon;
11261	11494
11262		- if (RENDERPROGRAM > 0)
11263		- {
11264		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265		- textureon = false;
11266		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11267	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11268	11499	//System.out.println("ALLO");
11269	11500	gl.glColorMask(false, false, false, false);
11270	11501	DrawObject(gl);
11271		- if (RENDERPROGRAM > 0)
11272		- {
11273		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274		- textureon = texon;
11275		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11276	11506	gl.glColorMask(true, true, true, true);
11277	11507
11278	11508	gl.glDepthFunc(GL.GL_EQUAL);
11279		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11280	11510	}
11281	11511
11282	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11459,15 +11689,36 @@
11459	11689
11460	11690	static boolean zoomonce = false;
11461	11691
	11692	+ static void CreateSelectedPoint()
	11693	+ {
	11694	+ if (selectedpoint == null)
	11695	+ {
	11696	+ debugpointG = new Sphere();
	11697	+ debugpointP = new Sphere();
	11698	+ debugpointC = new Sphere();
	11699	+ debugpointR = new Sphere();
	11700	+
	11701	+ selectedpoint = new Superellipsoid();
	11702	+
	11703	+ for (int i=0; i<8; i++)
	11704	+ {
	11705	+ debugpoints[i] = new Sphere();
	11706	+ }
	11707	+ }
	11708	+ }
	11709	+
11462	11710	void DrawObject(GL gl, boolean draw)
11463	11711	{
	11712	+ // To clear camera values
	11713	+ ResetOptions();
	11714	+
11464	11715	//System.out.println("DRAW OBJECT " + mouseDown);
11465	11716	// DrawMode() = SELECTION;
11466	11717	//GL gl = getGL();
11467	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11468	11719	{
11469	11720	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11470		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11471	11722	pingthread.StepToTarget(true); // true);
11472	11723	// zoomonce = false;
11473	11724	}
..	..	@@ -11539,8 +11790,9 @@
11539	11790
11540	11791	if (DrawMode() == DEFAULT)
11541	11792	{
11542		- if (DEBUG)
	11793	+ if (Globals.DEBUG)
11543	11794	{
	11795	+ CreateSelectedPoint();
11544	11796	float radius = 0.05f;
11545	11797	if (selectedpoint.radius != radius)
11546	11798	{
..	..	@@ -11594,20 +11846,32 @@
11594	11846	ReleaseTextures(DEFAULT_TEXTURES);
11595	11847
11596	11848	if (CLEANCACHE)
11597		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11598	11850	{
11599		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11600	11852
11601	11853	// System.out.println("Texture --------- " + tex);
11602	11854
11603		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11604	11856	continue;
11605	11857
11606		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11607	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11608	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11609		- textures.get(tex).texture.dispose();
11610		- textures.remove(tex);
	11862	+ if (gettex != null)
	11863	+ {
	11864	+ gettex.texture.dispose();
	11865	+ texturepigment.remove(tex);
	11866	+ }
	11867	+
	11868	+ gettex = texturebump.get(tex);
	11869	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11870	+ if (gettex != null)
	11871	+ {
	11872	+ gettex.texture.dispose();
	11873	+ texturebump.remove(tex);
	11874	+ }
11611	11875	}
11612	11876	}
11613	11877	}
..	..	@@ -12027,7 +12291,7 @@
12027	12291	for (int i = tp.size(); --i >= 0;)
12028	12292	{
12029	12293	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12294	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12031	12295	}
12032	12296
12033	12297
..	..	@@ -12136,7 +12400,51 @@
12136	12400	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12137	12401
12138	12402	String program =
	12403	+ // Min shader
12139	12404	"!!ARBfp1.0\n" +
	12405	+ "PARAM zero123 = { 0.0, 1.0, 2.0, 3.0 };" +
	12406	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12407	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12408	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12409	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12410	+ "TEMP temp;" +
	12411	+ "TEMP light;" +
	12412	+ "TEMP ndotl;" +
	12413	+ "TEMP normal;" +
	12414	+ "TEMP depth;" +
	12415	+
	12416	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12417	+
	12418	+ "MOV light, state.light[0].position;" +
	12419	+ "DP3 ndotl.x, light, normal;" +
	12420	+
	12421	+ // shadow
	12422	+ "MOV temp, fragment.texcoord[1];" +
	12423	+ TextureFetch("depth", "temp", "1") +
	12424	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12425	+ "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
	12426	+
	12427	+
	12428	+ // No shadow when out of frustum
	12429	+ //"SGE temp.y, depth.z, zero123.y;" +
	12430	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12431	+
	12432	+ "MUL ndotl.x, ndotl.x, temp.x;" +
	12433	+ "MAX ndotl.x, ndotl.x, pow2.y;" +
	12434	+
	12435	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12436	+ "MUL temp, temp, ndotl.x;" +
	12437	+
	12438	+ "MUL temp, temp, zero123.z;" +
	12439	+
	12440	+ "MOV temp.w, zero123.y;" + // reset alpha
	12441	+
	12442	+ "MOV result.color, temp;" +
	12443	+ "END";
	12444	+
	12445	+ String program2 =
	12446	+ "!!ARBfp1.0\n" +
	12447	+
12140	12448	//"OPTION ARB_fragment_program_shadow;" +
12141	12449	"PARAM light2cam0 = program.env[10];" +
12142	12450	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12251,8 +12559,7 @@
12251	12559	"TEMP shininess;" +
12252	12560	"\n" +
12253	12561	"MOV texSamp, one;" +
12254		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12255		-
	12562	+
12256	12563	"MOV mapgrid.x, one2048th.x;" +
12257	12564	"MOV temp, fragment.texcoord[1];" +
12258	12565	/*
..	..	@@ -12657,7 +12964,7 @@
12657	12964	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12658	12965	"") +
12659	12966
12660		- // display shadow only (bump == 0)
	12967	+ // display shadow only (fakedepth == 0)
12661	12968	"SUB temp.x, half.x, shadow.x;" +
12662	12969	"MOV temp.y, -params5.z;" + // params6.x;" +
12663	12970	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13149,7 +13456,7 @@
13149	13456	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13150	13457	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13151	13458
13152		- // No shadow when out of frustrum
	13459	+ // No shadow when out of frustum
13153	13460	"SGE temp.x, " + depth + ".z, one.z;" +
13154	13461	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13155	13462	"";
..	..	@@ -13297,7 +13604,8 @@
13297	13604	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298	13605	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299	13606	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300		- Object3D.cVector2[] vector2buffer;
	13607	+
	13608	+ //Object3D.cVector2[] vector2buffer;
13301	13609
13302	13610	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303	13611	// OUT : diff, spec
..	..	@@ -13313,9 +13621,10 @@
13313	13621	"DP3 " + dest + ".z," + "normals," + "eye;" +
13314	13622	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13315	13623	//"MOV " + dest + ".w," + "normal.z;" +
13316		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13317		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13318		- //"MOV " + dest + ".z," + "params2.w;" +
	13624	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13625	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13626	+
	13627	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13319	13628	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13320	13629	"RCP " + dest + ".w," + dest + ".w;" +
13321	13630	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13820,6 +14129,7 @@
13820	14129	else
13821	14130	if (evt.getSource() == AAtimer)
13822	14131	{
	14132	+ Globals.TIMERRUNNING = false;
13823	14133	if (mouseDown)
13824	14134	{
13825	14135	//new Exception().printStackTrace();
..	..	@@ -13879,7 +14189,7 @@
13879	14189
13880	14190	// fev 2014???
13881	14191	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13882		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14192	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13883	14193	pingthread.StepToTarget(true); // true);
13884	14194	}
13885	14195	// if (!LIVE)
..	..	@@ -13894,6 +14204,7 @@
13894	14204	return;
13895	14205
13896	14206	AAtimer.restart(); //
	14207	+ Globals.TIMERRUNNING = true;
13897	14208
13898	14209	// waslive = LIVE;
13899	14210	// LIVE = false;
..	..	@@ -14232,12 +14543,12 @@
14232	14543	void GoDown(int mod)
14233	14544	{
14234	14545	MODIFIERS \|= COMMAND;
14235		- /*
	14546	+ /**/
14236	14547	if((mod&SHIFT) == SHIFT)
14237	14548	manipCamera.RotatePosition(0, -speed);
14238	14549	else
14239		- manipCamera.BackForth(0, -speed*delta, getWidth());
14240		- */
	14550	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14551	+ /**/
14241	14552	if ((mod & SHIFT) == SHIFT)
14242	14553	{
14243	14554	mouseMode = mouseMode; // VR??
..	..	@@ -14253,12 +14564,12 @@
14253	14564	void GoUp(int mod)
14254	14565	{
14255	14566	MODIFIERS \|= COMMAND;
14256		- /*
	14567	+ /**/
14257	14568	if((mod&SHIFT) == SHIFT)
14258	14569	manipCamera.RotatePosition(0, speed);
14259	14570	else
14260		- manipCamera.BackForth(0, speed*delta, getWidth());
14261		- */
	14571	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14572	+ /**/
14262	14573	if ((mod & SHIFT) == SHIFT)
14263	14574	{
14264	14575	mouseMode = mouseMode;
..	..	@@ -14274,12 +14585,12 @@
14274	14585	void GoLeft(int mod)
14275	14586	{
14276	14587	MODIFIERS \|= COMMAND;
14277		- /*
	14588	+ /**/
14278	14589	if((mod&SHIFT) == SHIFT)
14279		- manipCamera.RotatePosition(speed, 0);
14280		- else
14281	14590	manipCamera.Translate(speed*delta, 0, getWidth());
14282		- */
	14591	+ else
	14592	+ manipCamera.RotatePosition(speed, 0);
	14593	+ /**/
14283	14594	if ((mod & SHIFT) == SHIFT)
14284	14595	{
14285	14596	mouseMode = mouseMode;
..	..	@@ -14295,12 +14606,12 @@
14295	14606	void GoRight(int mod)
14296	14607	{
14297	14608	MODIFIERS \|= COMMAND;
14298		- /*
	14609	+ /**/
14299	14610	if((mod&SHIFT) == SHIFT)
14300		- manipCamera.RotatePosition(-speed, 0);
14301		- else
14302	14611	manipCamera.Translate(-speed*delta, 0, getWidth());
14303		- */
	14612	+ else
	14613	+ manipCamera.RotatePosition(-speed, 0);
	14614	+ /**/
14304	14615	if ((mod & SHIFT) == SHIFT)
14305	14616	{
14306	14617	mouseMode = mouseMode;
..	..	@@ -14357,7 +14668,8 @@
14357	14668	info.camera = renderCamera;
14358	14669	info.x = x;
14359	14670	info.y = y;
14360		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14671	+ object.GetWindow().copy
	14672	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14361	14673	} else
14362	14674	{
14363	14675	if (x < startX)
..	..	@@ -14521,7 +14833,9 @@
14521	14833	ci.camera = renderCamera;
14522	14834	if (!isRenderer)
14523	14835	{
14524		- if (object.editWindow.copy.doEditClick(ci, 0))
	14836	+ //ObjEditor editWindow = object.editWindow;
	14837	+ //Object3D copy = editWindow.copy;
	14838	+ if (object.doEditClick(ci, 0))
14525	14839	{
14526	14840	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527	14841	} else
..	..	@@ -14536,7 +14850,8 @@
14536	14850	Globals.MOUSEDRAGGED = false;
14537	14851
14538	14852	movingcamera = false;
14539		- X = Y = 0;
	14853	+ X = 0; // getBounds().width/2;
	14854	+ Y = 0; // getBounds().height/2;
14540	14855	//System.out.println("mouseReleased: " + e);
14541	14856	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14542	14857	}
..	..	@@ -14792,7 +15107,8 @@
14792	15107	// break;
14793	15108	case 'T':
14794	15109	CACHETEXTURE ^= true;
14795		- textures.clear();
	15110	+ texturepigment.clear();
	15111	+ texturebump.clear();
14796	15112	// repaint();
14797	15113	break;
14798	15114	case 'Y':
..	..	@@ -14877,7 +15193,9 @@
14877	15193	case 'E' : COMPACT ^= true;
14878	15194	repaint();
14879	15195	break;
14880		- case 'W' : DEBUGHSB ^= true;
	15196	+ case 'W' : // Wide Window (fullscreen)
	15197	+ //DEBUGHSB ^= true;
	15198	+ ObjEditor.theFrame.ToggleFullScreen();
14881	15199	repaint();
14882	15200	break;
14883	15201	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14902,8 +15220,8 @@
14902	15220	RevertCamera();
14903	15221	repaint();
14904	15222	break;
14905		- case 'L':
14906	15223	case 'l':
	15224	+ //case 'L':
14907	15225	if (lightMode)
14908	15226	{
14909	15227	lightMode = false;
..	..	@@ -15046,9 +15364,9 @@
15046	15364	case '_':
15047	15365	kompactbit = 5;
15048	15366	break;
15049		- case '+':
15050		- kompactbit = 6;
15051		- break;
	15367	+// case '+':
	15368	+// kompactbit = 6;
	15369	+// break;
15052	15370	case ' ':
15053	15371	lightMode ^= true;
15054	15372	Globals.lighttouched = true;
..	..	@@ -15060,6 +15378,7 @@
15060	15378	case ESC:
15061	15379	RENDERPROGRAM += 1;
15062	15380	RENDERPROGRAM %= 3;
	15381	+
15063	15382	repaint();
15064	15383	break;
15065	15384	case 'Z':
..	..	@@ -15099,8 +15418,9 @@
15099	15418	case DELETE:
15100	15419	ClearSelection();
15101	15420	break;
15102		- /*
15103	15421	case '+':
	15422	+
	15423	+ /*
15104	15424	//fontsize += 1;
15105	15425	bbzoom *= 2;
15106	15426	repaint();
..	..	@@ -15117,17 +15437,17 @@
15117	15437	case '=':
15118	15438	IncDepth();
15119	15439	//fontsize += 1;
15120		- object.editWindow.refreshContents(true);
	15440	+ object.GetWindow().refreshContents(true);
15121	15441	maskbit = 6;
15122	15442	break;
15123	15443	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15124	15444	DecDepth();
15125	15445	maskbit = 5;
15126	15446	//if(fontsize > 1) fontsize -= 1;
15127		- if (object.editWindow == null)
15128		- new Exception().printStackTrace();
15129		- else
15130		- object.editWindow.refreshContents(true);
	15447	+// if (object.editWindow == null)
	15448	+// new Exception().printStackTrace();
	15449	+// else
	15450	+ object.GetWindow().refreshContents(true);
15131	15451	break;
15132	15452	case '{':
15133	15453	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15351,7 +15671,7 @@
15351	15671	}
15352	15672	*/
15353	15673
15354		- object.editWindow.EditSelection();
	15674	+ object.GetWindow().EditSelection(false);
15355	15675	}
15356	15676
15357	15677	void SelectParent()
..	..	@@ -15368,10 +15688,10 @@
15368	15688	{
15369	15689	//selectees.remove(i);
15370	15690	System.out.println("select parent of " + elem);
15371		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15691	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15372	15692	} else
15373	15693	{
15374		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15694	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15375	15695	}
15376	15696
15377	15697	first = false;
..	..	@@ -15413,12 +15733,12 @@
15413	15733	for (int j = 0; j < group.children.size(); j++)
15414	15734	{
15415	15735	elem = (Object3D) group.children.elementAt(j);
15416		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15736	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15417	15737	first = false;
15418	15738	}
15419	15739	} else
15420	15740	{
15421		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15741	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15422	15742	}
15423	15743
15424	15744	first = false;
..	..	@@ -15429,21 +15749,21 @@
15429	15749	{
15430	15750	//Composite group = (Composite) object;
15431	15751	Object3D group = object;
15432		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15752	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15433	15753	}
15434	15754
15435	15755	void ResetTransform(int mask)
15436	15756	{
15437	15757	//Composite group = (Composite) object;
15438	15758	Object3D group = object;
15439		- group.editWindow.ResetTransform(mask);
	15759	+ group.GetWindow().ResetTransform(mask);
15440	15760	}
15441	15761
15442	15762	void FlipTransform()
15443	15763	{
15444	15764	//Composite group = (Composite) object;
15445	15765	Object3D group = object;
15446		- group.editWindow.FlipTransform();
	15766	+ group.GetWindow().FlipTransform();
15447	15767	// group.editWindow.ReduceMesh(true);
15448	15768	}
15449	15769
..	..	@@ -15451,7 +15771,7 @@
15451	15771	{
15452	15772	//Composite group = (Composite) object;
15453	15773	Object3D group = object;
15454		- group.editWindow.PrintMemory();
	15774	+ group.GetWindow().PrintMemory();
15455	15775	// group.editWindow.ReduceMesh(true);
15456	15776	}
15457	15777
..	..	@@ -15459,7 +15779,7 @@
15459	15779	{
15460	15780	//Composite group = (Composite) object;
15461	15781	Object3D group = object;
15462		- group.editWindow.ResetCentroid();
	15782	+ group.GetWindow().ResetCentroid();
15463	15783	}
15464	15784
15465	15785	void IncDepth()
..	..	@@ -15635,6 +15955,7 @@
15635	15955	info.bounds.y += (height - desired) / 2;
15636	15956	}
15637	15957	}
	15958	+
15638	15959	info.g = gr;
15639	15960	info.camera = renderCamera;
15640	15961	/*
..	..	@@ -15644,23 +15965,44 @@
15644	15965	*/
15645	15966	if (!isRenderer)
15646	15967	{
15647		- object.drawEditHandles(info, 0);
15648		-
15649		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15968	+ Grafreed.Assert(object != null);
	15969	+ Grafreed.Assert(object.selection != null);
	15970	+ if (object.selection.Size() > 0)
15650	15971	{
15651		- switch (object.selection.get(0).hitSomething)
	15972	+ int hitSomething = object.selection.get(0).hitSomething;
	15973	+
	15974	+ info.DX = 0;
	15975	+ info.DY = 0;
	15976	+ info.W = 1;
	15977	+ if (hitSomething == Object3D.hitCenter)
15652	15978	{
15653		- case Object3D.hitCenter: gr.setColor(Color.pink);
15654		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15655		- break;
15656		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15657		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15658		- break;
15659		- case Object3D.hitScale: gr.setColor(Color.cyan);
15660		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15661		- break;
	15979	+ info.DX = X;
	15980	+ if (X != 0)
	15981	+ info.DX -= info.bounds.width/2;
	15982	+
	15983	+ info.DY = Y;
	15984	+ if (Y != 0)
	15985	+ info.DY -= info.bounds.height/2;
15662	15986	}
15663		-
	15987	+
	15988	+ object.drawEditHandles(info, 0);
	15989	+
	15990	+ if (drag && (X != 0 \|\| Y != 0))
	15991	+ {
	15992	+ switch (hitSomething)
	15993	+ {
	15994	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15995	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15996	+ break;
	15997	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15998	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15999	+ break;
	16000	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16001	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16002	+ break;
	16003	+ }
	16004	+
	16005	+ }
15664	16006	}
15665	16007	}
15666	16008	}
..	..	@@ -16363,16 +16705,16 @@
16363	16705	cStatic.objectstack[materialdepth++] = checker;
16364	16706	//System.out.println("material " + material);
16365	16707	//Applet3D.tracein(this, selected);
16366		- vector2buffer = checker.projectedVertices;
	16708	+ //vector2buffer = checker.projectedVertices;
16367	16709
16368	16710	//checker.GetMaterial().Draw(this, false); // true);
16369		- DrawMaterial(checker.GetMaterial(), false); // true);
	16711	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370	16712
16371	16713	materialdepth -= 1;
16372	16714	if (materialdepth > 0)
16373	16715	{
16374		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16716	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16717	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16376	16718	}
16377	16719	//checker.GetMaterial().opacity = 1f;
16378	16720	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16458,6 +16800,14 @@
16458	16800	}
16459	16801	}
16460	16802
	16803	+ private Object3D GetFolder()
	16804	+ {
	16805	+ Object3D folder = object.GetWindow().copy;
	16806	+ if (object.GetWindow().copy.selection.Size() > 0)
	16807	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16808	+ return folder;
	16809	+ }
	16810	+
16461	16811	class SelectBuffer implements GLEventListener
16462	16812	{
16463	16813
..	..	@@ -16537,6 +16887,17 @@
16537	16887
16538	16888	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16539	16889
	16890	+ if (PAINTMODE)
	16891	+ {
	16892	+ if (object.GetWindow().copy.selection.Size() > 0)
	16893	+ {
	16894	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16895	+
	16896	+ // Make what you paint not selectable.
	16897	+ paintobj.ResetSelectable();
	16898	+ }
	16899	+ }
	16900	+
16540	16901	//int tmp = selection_view;
16541	16902	//selection_view = -1;
16542	16903	int temp = DrawMode();
..	..	@@ -16548,6 +16909,17 @@
16548	16909	// temp = DEFAULT; // patch for selection debug
16549	16910	Globals.drawMode = temp; // WARNING
16550	16911
	16912	+ if (PAINTMODE)
	16913	+ {
	16914	+ if (object.GetWindow().copy.selection.Size() > 0)
	16915	+ {
	16916	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16917	+
	16918	+ // Revert.
	16919	+ paintobj.RestoreSelectable();
	16920	+ }
	16921	+ }
	16922	+
16551	16923	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16552	16924
16553	16925	// trying different ways of getting the depth info over
..	..	@@ -16595,6 +16967,8 @@
16595	16967	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596	16968	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597	16969	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16970	+
	16971	+ CreateSelectedPoint();
16598	16972
16599	16973	// Will fit the mesh !!!
16600	16974	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16649,29 +17023,31 @@
16649	17023	}
16650	17024
16651	17025	if (!movingcamera && !PAINTMODE)
16652		- object.editWindow.ScreenFitPoint(); // fev 2014
	17026	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16653	17027
16654		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17028	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16655	17029	{
16656		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17030	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16657	17031
16658		- Object3D group = new Object3D("inst" + paintcount++);
	17032	+ if (object.GetWindow().copy.selection.Size() > 0)
	17033	+ {
	17034	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16659	17035
16660		- group.CreateMaterial(); // use a void leaf to select instances
16661		-
16662		- group.add(paintobj); // link
16663		-
16664		- object.editWindow.SnapObject(group);
16665		-
16666		- Object3D folder = object.editWindow.copy;
16667		-
16668		- if (object.editWindow.copy.selection.Size() > 0)
16669		- folder = object.editWindow.copy.selection.elementAt(0);
16670		-
16671		- folder.add(group);
16672		-
16673		- object.editWindow.ResetModel();
16674		- object.editWindow.refreshContents();
	17036	+ Object3D inst = new Object3D("inst" + paintcount++);
	17037	+
	17038	+ inst.CreateMaterial(); // use a void leaf to select instances
	17039	+
	17040	+ inst.add(paintobj); // link
	17041	+
	17042	+ object.GetWindow().SnapObject(inst);
	17043	+
	17044	+ Object3D folder = paintFolder; // GetFolder();
	17045	+
	17046	+ folder.add(inst);
	17047	+
	17048	+ object.GetWindow().ResetModel();
	17049	+ object.GetWindow().refreshContents();
	17050	+ }
16675	17051	}
16676	17052	else
16677	17053	paintcount = 0;
..	..	@@ -16710,6 +17086,11 @@
16710	17086	//System.out.println("objects[color] = " + objects[color]);
16711	17087	//objects[color].Select();
16712	17088	indexcount = 0;
	17089	+ ObjEditor window = object.GetWindow();
	17090	+ if (window != null && deselect)
	17091	+ {
	17092	+ window.Select(null, deselect, true);
	17093	+ }
16713	17094	object.Select(color, deselect);
16714	17095	}
16715	17096
..	..	@@ -17235,23 +17616,15 @@
17235	17616	int AAbuffersize = 0;
17236	17617
17237	17618	//double[] selectedpoint = new double[3];
17238		- static Superellipsoid selectedpoint = new Superellipsoid();
	17619	+ static Superellipsoid selectedpoint;
17239	17620	static Sphere previousselectedpoint = null;
17240		- static Sphere debugpointG = new Sphere();
17241		- static Sphere debugpointP = new Sphere();
17242		- static Sphere debugpointC = new Sphere();
17243		- static Sphere debugpointR = new Sphere();
	17621	+ static Sphere debugpointG;
	17622	+ static Sphere debugpointP;
	17623	+ static Sphere debugpointC;
	17624	+ static Sphere debugpointR;
17244	17625
17245	17626	static Sphere debugpoints[] = new Sphere[8];
17246	17627
17247		- static
17248		- {
17249		- for (int i=0; i<8; i++)
17250		- {
17251		- debugpoints[i] = new Sphere();
17252		- }
17253		- }
17254		-
17255	17628	static void InitPoints(float radius)
17256	17629	{
17257	17630	for (int i=0; i<8; i++)