~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	{
..	..	@@ -44,6 +48,39 @@
44	48	static boolean ABORTED = false;
45	49
46	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	+ }
47	84
48	85	/static/ private boolean CULLFACE = false; // true;
49	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +97,7 @@
60	97	//boolean REDUCETEXTURE = true;
61	98	boolean CACHETEXTURE = true;
62	99	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
64	101	boolean COMPRESSTEXTURE = false;
65	102	boolean KOMPACTTEXTURE = false; // true;
66	103	boolean RESIZETEXTURE = false;
..	..	@@ -326,7 +363,7 @@
326	363	cStatic.objectstack[materialdepth++] = obj;
327	364	//System.out.println("material " + material);
328	365	//Applet3D.tracein(this, selected);
329		- display.vector2buffer = obj.projectedVertices;
	366	+ //display.vector2buffer = obj.projectedVertices;
330	367	if (obj instanceof Camera)
331	368	{
332	369	display.options1[0] = material.shift;
..	..	@@ -335,14 +372,28 @@
335	372	display.options1[2] = material.shadowbias;
336	373	display.options1[3] = material.aniso;
337	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]);
338	380	display.options2[0] = material.opacity;
339	381	display.options2[1] = material.diffuse;
340	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]);
341	386
342	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]);
343	391	display.options4[0] = material.cameralight/0.2f;
344	392	display.options4[1] = material.subsurface;
345	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]);
346	397
347	398	// if (display.CURRENTANTIALIAS > 0)
348	399	// display.options3[3] /= 4;
..	..	@@ -358,7 +409,7 @@
358	409	/**/
359	410	} else
360	411	{
361		- DrawMaterial(material, selected);
	412	+ DrawMaterial(material, selected, obj.projectedVertices);
362	413	}
363	414	} else
364	415	{
..	..	@@ -382,8 +433,8 @@
382	433	cStatic.objectstack[materialdepth++] = obj;
383	434	//System.out.println("material " + material);
384	435	//Applet3D.tracein("selected ", selected);
385		- display.vector2buffer = obj.projectedVertices;
386		- display.DrawMaterial(material, selected);
	436	+ //display.vector2buffer = obj.projectedVertices;
	437	+ display.DrawMaterial(material, selected, obj.projectedVertices);
387	438	}
388	439	}
389	440
..	..	@@ -400,8 +451,8 @@
400	451	materialdepth -= 1;
401	452	if (materialdepth > 0)
402	453	{
403		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404		- 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);
405	456	}
406	457	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
407	458	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -421,8 +472,8 @@
421	472	materialdepth -= 1;
422	473	if (materialdepth > 0)
423	474	{
424		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425		- 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);
426	477	}
427	478	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
428	479	//else
..	..	@@ -1610,7 +1661,7 @@
1610	1661	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1611	1662	}
1612	1663
1613		- void DrawMaterial(cMaterial material, boolean selected)
	1664	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1614	1665	{
1615	1666	CameraPane display = this;
1616	1667	//new Exception().printStackTrace();
..	..	@@ -1645,7 +1696,7 @@
1645	1696	colorV[0] = display.modelParams0[0] * material.diffuse;
1646	1697	colorV[1] = display.modelParams0[1] * material.diffuse;
1647	1698	colorV[2] = display.modelParams0[2] * material.diffuse;
1648		- colorV[3] = material.opacity;
	1699	+ colorV[3] = 1; // material.opacity;
1649	1700
1650	1701	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1651	1702	//System.out.println("Opacity = " + opacity);
..	..	@@ -1753,9 +1804,9 @@
1753	1804	display.modelParams7[2] = 0;
1754	1805	display.modelParams7[3] = 0;
1755	1806
1756		- display.modelParams6[0] = 100; // criss de bug de bump
	1807	+ //display.modelParams6[0] = 100; // criss de bug de bump
1757	1808
1758		- Object3D.cVector2[] extparams = display.vector2buffer;
	1809	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1759	1810	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1760	1811	{
1761	1812	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2051,7 +2102,7 @@
2051	2102	//System.err.println("Oeil on");
2052	2103	OEIL = true;
2053	2104	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2055	2106	//pingthread.StepToTarget(true);
2056	2107	}
2057	2108
..	..	@@ -2284,10 +2335,17 @@
2284	2335	HANDLES ^= true;
2285	2336	}
2286	2337
	2338	+ Object3D paintFolder;
	2339	+
2287	2340	void TogglePaint()
2288	2341	{
2289	2342	PAINTMODE ^= true;
2290	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
2291	2349	}
2292	2350
2293	2351	void SwapCamera(int a, int b)
..	..	@@ -2384,6 +2442,21 @@
2384	2442	return currentGL;
2385	2443	}
2386	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	+
2387	2460	/**/
2388	2461	class CacheTexture
2389	2462	{
..	..	@@ -2392,28 +2465,31 @@
2392	2465
2393	2466	int resolution;
2394	2467
2395		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2396	2469	{
2397		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2398	2472	resolution = res;
2399	2473	}
2400	2474	}
2401	2475	/**/
2402	2476
2403	2477	// TEXTURE static Texture texture;
2404		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2405		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2406		- 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	+
2407	2483	int pigmentdepth = 0;
2408	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2409	2485	int bumpdepth = 0;
2410	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2411	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2412	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2413		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2414	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2415	2491
2416		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2417	2493	{
2418	2494	TextureData texturedata = null;
2419	2495
..	..	@@ -2432,13 +2508,34 @@
2432	2508	if (bump)
2433	2509	texturedata = ConvertBump(texturedata, false);
2434	2510
2435		- com.sun.opengl.util.texture.Texture texture =
2436		- 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);
2437	2513
2438		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2439		- 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);
2440	2516
2441		- 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;
2442	2539	}
2443	2540
2444	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3511,6 +3608,8 @@
3511	3608
3512	3609	System.out.println("LOADING TEXTURE : " + name);
3513	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3514	3613	//
3515	3614	if (false) // compressbit > 0)
3516	3615	{
..	..	@@ -7909,7 +8008,7 @@
7909	8008	String pigment = Object3D.GetPigment(tex);
7910	8009	String bump = Object3D.GetBump(tex);
7911	8010
7912		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7913	8012	{
7914	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7915	8014	// System.out.println("; bump = " + bump);
..	..	@@ -7924,8 +8023,8 @@
7924	8023	pigment = null;
7925	8024	}
7926	8025
7927		- ReleaseTexture(bump, true);
7928		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
7929	8028	}
7930	8029
7931	8030	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7943,7 +8042,7 @@
7943	8042
7944	8043	String pigment = Object3D.GetPigment(tex);
7945	8044
7946		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947	8046	{
7948	8047	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7949	8048	// System.out.println("; bump = " + bump);
..	..	@@ -7954,7 +8053,7 @@
7954	8053	pigment = null;
7955	8054	}
7956	8055
7957		- ReleaseTexture(pigment, false);
	8056	+ ReleaseTexture(tex, false);
7958	8057	}
7959	8058
7960	8059	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7972,7 +8071,7 @@
7972	8071
7973	8072	String bump = Object3D.GetBump(tex);
7974	8073
7975		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976	8075	{
7977	8076	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7978	8077	// System.out.println("; bump = " + bump);
..	..	@@ -7983,10 +8082,10 @@
7983	8082	bump = null;
7984	8083	}
7985	8084
7986		- ReleaseTexture(bump, true);
	8085	+ ReleaseTexture(tex, true);
7987	8086	}
7988	8087
7989		- void ReleaseTexture(String tex, boolean bump)
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
7990	8089	{
7991	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7992	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7997,7 +8096,7 @@
7997	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7998	8097
7999	8098	if (tex != null)
8000		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8001	8100
8002	8101	// //assert( texture != null );
8003	8102	// if (texture == null)
..	..	@@ -8091,47 +8190,50 @@
8091	8190
8092	8191	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8093	8192	{
8094		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8095		- ambientOcclusion ) // \|\| !textureon)
8096		- {
8097		- return; // false;
8098		- }
8099		-
8100		- if (tex == null)
8101		- {
8102		- BindTexture(null,false,resolution);
8103		- BindTexture(null,true,resolution);
8104		- return;
8105		- }
	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;
8106	8234
8107		- String pigment = Object3D.GetPigment(tex);
8108		- String bump = Object3D.GetBump(tex);
8109		-
8110		- usedtextures.put(pigment, pigment);
8111		- usedtextures.put(bump, bump);
8112		-
8113		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8114		- {
8115		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8116		- // System.out.println("; bump = " + bump);
8117		- }
8118		-
8119		- if (bump.equals(""))
8120		- {
8121		- bump = null;
8122		- }
8123		- if (pigment.equals(""))
8124		- {
8125		- pigment = null;
8126		- }
8127		-
8128		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8129		- BindTexture(pigment, false, resolution);
8130		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8131		- BindTexture(bump, true, resolution);
8132		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8133		-
8134		- return; // true;
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
8135	8237	}
8136	8238
8137	8239	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8150,9 +8252,9 @@
8150	8252
8151	8253	String pigment = Object3D.GetPigment(tex);
8152	8254
8153		- usedtextures.put(pigment, pigment);
	8255	+ usedtextures.add(tex);
8154	8256
8155		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156	8258	{
8157	8259	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8158	8260	// System.out.println("; bump = " + bump);
..	..	@@ -8164,7 +8266,7 @@
8164	8266	}
8165	8267
8166	8268	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167		- BindTexture(pigment, false, resolution);
	8269	+ BindTexture(tex, false, resolution);
8168	8270	}
8169	8271
8170	8272	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8183,9 +8285,9 @@
8183	8285
8184	8286	String bump = Object3D.GetBump(tex);
8185	8287
8186		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8187	8289
8188		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189	8291	{
8190	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8191	8293	// System.out.println("; bump = " + bump);
..	..	@@ -8197,7 +8299,7 @@
8197	8299	}
8198	8300
8199	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8201	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202	8304	}
8203	8305
..	..	@@ -8221,13 +8323,19 @@
8221	8323	return fileExists;
8222	8324	}
8223	8325
8224		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8225	8327	{
8226		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ CacheTexture texturecache = null;
8227	8329
8228	8330	if (tex != null)
8229	8331	{
8230		- 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	+ }
8231	8339
8232	8340	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233	8341
..	..	@@ -8237,19 +8345,46 @@
8237	8345	// else
8238	8346	// if (!texname.startsWith("/"))
8239	8347	// texname = "/Users/nbriere/Textures/" + texname;
8240		- if (!FileExists(tex))
	8348	+ if (!FileExists(texname))
8241	8349	{
8242	8350	texname = fallbackTextureName;
8243	8351	}
8244	8352
8245	8353	if (CACHETEXTURE)
8246		- texture = textures.get(texname); // TEXTURE CACHE
8247		-
8248		- TextureData texturedata = null;
8249		-
8250		- if (texture == null \|\| texture.resolution < resolution)
8251	8354	{
8252		- 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(""))
8253	8388	{
8254	8389	assert(!bump);
8255	8390	// if (bump)
..	..	@@ -8260,19 +8395,23 @@
8260	8395	// }
8261	8396	// else
8262	8397	// {
8263		- texture = textures.get(tex);
8264		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8265	8400	{
8266		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8267	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8268	8405	// }
8269	8406	} else
8270		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8271	8408	{
8272	8409	assert(bump);
8273		- texture = textures.get(tex);
8274		- if (texture == null)
8275		- 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();
8276	8415	} else
8277	8416	{
8278	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8280,11 +8419,13 @@
8280	8419	// texture = GetResourceTexture("default.png");
8281	8420	//} else
8282	8421	//{
8283		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8284	8423	{
8285		- texture = textures.get(tex);
8286		- if (texture == null)
8287		- 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();
8288	8429	} else
8289	8430	{
8290	8431	if (textureon)
..	..	@@ -8343,19 +8484,19 @@
8343	8484	if (texturedata == null)
8344	8485	throw new Exception();
8345	8486
8346		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8347	8488	//texture = GetTexture(tex, bump);
8348	8489	}
8349	8490	}
8350	8491	//}
8351	8492	}
8352	8493
8353		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8354	8495	{
8355	8496	//return false;
8356	8497
8357	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8358		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8359	8500	{
8360	8501	// String ext = "_highres";
8361	8502	// if (REDUCETEXTURE)
..	..	@@ -8372,52 +8513,17 @@
8372	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8373	8514	if (!cachefile.exists())
8374	8515	{
8375		- // cache to disk
8376		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8377		- //buffers[0].
8378		-
8379		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8380		- int[] pixels = new int[bytebuf.capacity()/3];
8381		-
8382		- // squared size heuristic...
8383		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8384	8517	{
8385		- for (int i=pixels.length; --i>=0;)
8386		- {
8387		- int i3 = i*3;
8388		- pixels[i] = 0xFF;
8389		- pixels[i] <<= 8;
8390		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8391		- pixels[i] <<= 8;
8392		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8393		- pixels[i] <<= 8;
8394		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8395		- }
8396		-
8397		- /*
8398		- int r=0,g=0,b=0,a=0;
8399		- for (int i=0; i<width; i++)
8400		- for (int j=0; j<height; j++)
8401		- {
8402		- int index = j*width+i;
8403		- int p = pixels[index];
8404		- a = ((p>>24) & 0xFF);
8405		- r = ((p>>16) & 0xFF);
8406		- g = ((p>>8) & 0xFF);
8407		- b = (p & 0xFF);
8408		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8409		- }
8410		- /**/
8411		- int width = (int)Math.sqrt(pixels.length); // squared
8412		- int height = width;
8413		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8414		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8415	8520	ImageWriter writer = null;
8416	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8417	8522	if (iter.hasNext()) {
8418	8523	writer = (ImageWriter)iter.next();
8419	8524	}
8420		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8421	8527	try
8422	8528	{
8423	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8434,18 +8540,20 @@
8434	8540	}
8435	8541	}
8436	8542	}
8437		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8438	8546	//System.out.println("Texture = " + tex);
8439		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8440	8548	{
8441		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8442	8550	thetex.texture.disable();
8443	8551	thetex.texture.dispose();
8444		- textures.remove(texname);
	8552	+ textures.remove(tex);
8445	8553	}
8446	8554
8447		- texture.texturedata = texturedata;
8448		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8449	8557
8450	8558	// newtex = true;
8451	8559	}
..	..	@@ -8461,10 +8569,44 @@
8461	8569	}
8462	8570	}
8463	8571
8464		- return texture;
	8572	+ return texturecache;
8465	8573	}
8466	8574
8467		- 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
8468	8610	{
8469	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8470	8612
..	..	@@ -8482,21 +8624,21 @@
8482	8624	return texture!=null?texture.texture:null;
8483	8625	}
8484	8626
8485		- 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
8486	8628	{
8487	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8488	8630
8489	8631	return texture!=null?texture.texturedata:null;
8490	8632	}
8491	8633
8492		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8493	8635	{
8494	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8495	8637	{
8496	8638	return false;
8497	8639	}
8498	8640
8499		- boolean newtex = false;
	8641	+ //boolean newtex = false;
8500	8642
8501	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8502	8644
..	..	@@ -8528,9 +8670,75 @@
8528	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8529	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8530	8672
8531		- return newtex;
	8673	+ return true; // Warning: not used.
8532	8674	}
8533	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	+
8534	8742	ShadowBuffer shadowPBuf;
8535	8743	AntialiasBuffer antialiasPBuf;
8536	8744	int MAXSTACK;
..	..	@@ -9366,11 +9574,35 @@
9366	9574	jy8[3] = 0.5f;
9367	9575	}
9368	9576
9369		- 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
9370	9578	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371	9579	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372	9580	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373	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	+
9374	9606	static int imagecount = 0; // movie generation
9375	9607
9376	9608	static int jitter = 0;
..	..	@@ -9467,7 +9699,7 @@
9467	9699
9468	9700	if (renderCamera != lightCamera)
9469	9701	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9470		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9702	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9471	9703
9472	9704	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9473	9705
..	..	@@ -9483,7 +9715,7 @@
9483	9715
9484	9716	if (renderCamera != lightCamera)
9485	9717	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9486		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9718	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9487	9719
9488	9720	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9489	9721
..	..	@@ -10481,6 +10713,7 @@
10481	10713	ANTIALIAS = 0;
10482	10714	//System.out.println("RESTART");
10483	10715	AAtimer.restart();
	10716	+ Globals.TIMERRUNNING = true;
10484	10717	}
10485	10718	}
10486	10719	}
..	..	@@ -10548,7 +10781,8 @@
10548	10781	ambientOcclusion = false;
10549	10782	}
10550	10783
10551		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10784	+ if (//Globals.lighttouched &&
	10785	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552	10786	{
10553	10787	//if (RENDERSHADOW) // ?
10554	10788	if (!IsFrozen())
..	..	@@ -10682,7 +10916,7 @@
10682	10916	// if (parentcam != renderCamera) // not a light
10683	10917	if (cam != lightCamera)
10684	10918	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10685		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10919	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10686	10920
10687	10921	for (int j = 0; j < 4; j++)
10688	10922	{
..	..	@@ -10697,7 +10931,7 @@
10697	10931	// if (parentcam != renderCamera) // not a light
10698	10932	if (cam != lightCamera)
10699	10933	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10700		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10934	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10701	10935
10702	10936	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10703	10937
..	..	@@ -10988,9 +11222,9 @@
10988	11222
10989	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
10990	11224
10991		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10992		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10993		-//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);
10994	11228	} else
10995	11229	{
10996	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11001,7 +11235,7 @@
11001	11235	//System.out.println("BLENDING ON");
11002	11236	gl.glEnable(GL.GL_BLEND);
11003	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11004		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11005	11239	gl.glMatrixMode(gl.GL_PROJECTION);
11006	11240	gl.glLoadIdentity();
11007	11241
..	..	@@ -11250,7 +11484,7 @@
11250	11484	}
11251	11485	}
11252	11486
11253		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11254	11488	{
11255	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11256	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11258,24 +11492,21 @@
11258	11492
11259	11493	boolean texon = textureon;
11260	11494
11261		- if (RENDERPROGRAM > 0)
11262		- {
11263		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11264		- textureon = false;
11265		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11266	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11267	11499	//System.out.println("ALLO");
11268	11500	gl.glColorMask(false, false, false, false);
11269	11501	DrawObject(gl);
11270		- if (RENDERPROGRAM > 0)
11271		- {
11272		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11273		- textureon = texon;
11274		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11275	11506	gl.glColorMask(true, true, true, true);
11276	11507
11277	11508	gl.glDepthFunc(GL.GL_EQUAL);
11278		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11279	11510	}
11280	11511
11281	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11458,7 +11689,7 @@
11458	11689
11459	11690	static boolean zoomonce = false;
11460	11691
11461		- void CreateSelectedPoint()
	11692	+ static void CreateSelectedPoint()
11462	11693	{
11463	11694	if (selectedpoint == null)
11464	11695	{
..	..	@@ -11478,13 +11709,16 @@
11478	11709
11479	11710	void DrawObject(GL gl, boolean draw)
11480	11711	{
	11712	+ // To clear camera values
	11713	+ ResetOptions();
	11714	+
11481	11715	//System.out.println("DRAW OBJECT " + mouseDown);
11482	11716	// DrawMode() = SELECTION;
11483	11717	//GL gl = getGL();
11484	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11485	11719	{
11486	11720	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11487		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11488	11722	pingthread.StepToTarget(true); // true);
11489	11723	// zoomonce = false;
11490	11724	}
..	..	@@ -11612,20 +11846,32 @@
11612	11846	ReleaseTextures(DEFAULT_TEXTURES);
11613	11847
11614	11848	if (CLEANCACHE)
11615		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11616	11850	{
11617		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11618	11852
11619	11853	// System.out.println("Texture --------- " + tex);
11620	11854
11621		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11622	11856	continue;
11623	11857
11624		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11625	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11626	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11627		- textures.get(tex).texture.dispose();
11628		- 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	+ }
11629	11875	}
11630	11876	}
11631	11877	}
..	..	@@ -12045,7 +12291,7 @@
12045	12291	for (int i = tp.size(); --i >= 0;)
12046	12292	{
12047	12293	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12048		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12294	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12049	12295	}
12050	12296
12051	12297
..	..	@@ -12154,7 +12400,52 @@
12154	12400	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12155	12401
12156	12402	String program =
	12403	+ // Min shader
12157	12404	"!!ARBfp1.0\n" +
	12405	+ "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
	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	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12437	+ "MUL temp, temp, ndotl.x;" +
	12438	+
	12439	+ "MUL temp, temp, zero123.z;" +
	12440	+
	12441	+ "MOV temp.w, zero123.y;" + // reset alpha
	12442	+
	12443	+ "MOV result.color, temp;" +
	12444	+ "END";
	12445	+
	12446	+ String program2 =
	12447	+ "!!ARBfp1.0\n" +
	12448	+
12158	12449	//"OPTION ARB_fragment_program_shadow;" +
12159	12450	"PARAM light2cam0 = program.env[10];" +
12160	12451	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12269,8 +12560,7 @@
12269	12560	"TEMP shininess;" +
12270	12561	"\n" +
12271	12562	"MOV texSamp, one;" +
12272		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12273		-
	12563	+
12274	12564	"MOV mapgrid.x, one2048th.x;" +
12275	12565	"MOV temp, fragment.texcoord[1];" +
12276	12566	/*
..	..	@@ -12675,7 +12965,7 @@
12675	12965	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12676	12966	"") +
12677	12967
12678		- // display shadow only (bump == 0)
	12968	+ // display shadow only (fakedepth == 0)
12679	12969	"SUB temp.x, half.x, shadow.x;" +
12680	12970	"MOV temp.y, -params5.z;" + // params6.x;" +
12681	12971	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13107,20 +13397,20 @@
13107	13397	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13108	13398	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13109	13399	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13400	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13401	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13110	13402	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13111		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13112		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13113		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13114		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13403	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13404	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13115	13405	//"SWZ buffer, temp, w,w,w,w;";
13116		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13406	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13117	13407	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13118	13408	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13119	13409	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13120		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13410	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13121	13411
13122		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13123		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13412	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13413	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13124	13414	}
13125	13415
13126	13416	String Shadow(String depth, String shadow)
..	..	@@ -13167,7 +13457,7 @@
13167	13457	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13168	13458	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13169	13459
13170		- // No shadow when out of frustrum
	13460	+ // No shadow when out of frustum
13171	13461	"SGE temp.x, " + depth + ".z, one.z;" +
13172	13462	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13173	13463	"";
..	..	@@ -13315,7 +13605,8 @@
13315	13605	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13316	13606	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13317	13607	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13318		- Object3D.cVector2[] vector2buffer;
	13608	+
	13609	+ //Object3D.cVector2[] vector2buffer;
13319	13610
13320	13611	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13321	13612	// OUT : diff, spec
..	..	@@ -13331,9 +13622,10 @@
13331	13622	"DP3 " + dest + ".z," + "normals," + "eye;" +
13332	13623	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13333	13624	//"MOV " + dest + ".w," + "normal.z;" +
13334		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13335		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13336		- //"MOV " + dest + ".z," + "params2.w;" +
	13625	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13626	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13627	+
	13628	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13337	13629	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13338	13630	"RCP " + dest + ".w," + dest + ".w;" +
13339	13631	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13838,6 +14130,7 @@
13838	14130	else
13839	14131	if (evt.getSource() == AAtimer)
13840	14132	{
	14133	+ Globals.TIMERRUNNING = false;
13841	14134	if (mouseDown)
13842	14135	{
13843	14136	//new Exception().printStackTrace();
..	..	@@ -13897,7 +14190,7 @@
13897	14190
13898	14191	// fev 2014???
13899	14192	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13900		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14193	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13901	14194	pingthread.StepToTarget(true); // true);
13902	14195	}
13903	14196	// if (!LIVE)
..	..	@@ -13912,6 +14205,7 @@
13912	14205	return;
13913	14206
13914	14207	AAtimer.restart(); //
	14208	+ Globals.TIMERRUNNING = true;
13915	14209
13916	14210	// waslive = LIVE;
13917	14211	// LIVE = false;
..	..	@@ -13961,14 +14255,15 @@
13961	14255	drag = false;
13962	14256	//System.out.println("Mouse DOWN");
13963	14257	editObj = false;
13964		- ClickInfo info = new ClickInfo();
13965		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13966		- info.pane = this;
13967		- info.camera = renderCamera;
13968		- info.x = x;
13969		- info.y = y;
13970		- info.modifiers = modifiersex;
13971		- editObj = object.doEditClick(info, 0);
	14258	+ //ClickInfo info = new ClickInfo();
	14259	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14260	+ object.clickInfo.pane = this;
	14261	+ object.clickInfo.camera = renderCamera;
	14262	+ object.clickInfo.x = x;
	14263	+ object.clickInfo.y = y;
	14264	+ object.clickInfo.modifiers = modifiersex;
	14265	+ editObj = object.doEditClick(//info,
	14266	+ 0);
13972	14267	if (!editObj)
13973	14268	{
13974	14269	hasMarquee = true;
..	..	@@ -14250,12 +14545,12 @@
14250	14545	void GoDown(int mod)
14251	14546	{
14252	14547	MODIFIERS \|= COMMAND;
14253		- /*
	14548	+ /**/
14254	14549	if((mod&SHIFT) == SHIFT)
14255	14550	manipCamera.RotatePosition(0, -speed);
14256	14551	else
14257		- manipCamera.BackForth(0, -speed*delta, getWidth());
14258		- */
	14552	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14553	+ /**/
14259	14554	if ((mod & SHIFT) == SHIFT)
14260	14555	{
14261	14556	mouseMode = mouseMode; // VR??
..	..	@@ -14271,12 +14566,12 @@
14271	14566	void GoUp(int mod)
14272	14567	{
14273	14568	MODIFIERS \|= COMMAND;
14274		- /*
	14569	+ /**/
14275	14570	if((mod&SHIFT) == SHIFT)
14276	14571	manipCamera.RotatePosition(0, speed);
14277	14572	else
14278		- manipCamera.BackForth(0, speed*delta, getWidth());
14279		- */
	14573	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14574	+ /**/
14280	14575	if ((mod & SHIFT) == SHIFT)
14281	14576	{
14282	14577	mouseMode = mouseMode;
..	..	@@ -14292,12 +14587,12 @@
14292	14587	void GoLeft(int mod)
14293	14588	{
14294	14589	MODIFIERS \|= COMMAND;
14295		- /*
	14590	+ /**/
14296	14591	if((mod&SHIFT) == SHIFT)
14297		- manipCamera.RotatePosition(speed, 0);
14298		- else
14299	14592	manipCamera.Translate(speed*delta, 0, getWidth());
14300		- */
	14593	+ else
	14594	+ manipCamera.RotatePosition(speed, 0);
	14595	+ /**/
14301	14596	if ((mod & SHIFT) == SHIFT)
14302	14597	{
14303	14598	mouseMode = mouseMode;
..	..	@@ -14313,12 +14608,12 @@
14313	14608	void GoRight(int mod)
14314	14609	{
14315	14610	MODIFIERS \|= COMMAND;
14316		- /*
	14611	+ /**/
14317	14612	if((mod&SHIFT) == SHIFT)
14318		- manipCamera.RotatePosition(-speed, 0);
14319		- else
14320	14613	manipCamera.Translate(-speed*delta, 0, getWidth());
14321		- */
	14614	+ else
	14615	+ manipCamera.RotatePosition(-speed, 0);
	14616	+ /**/
14322	14617	if ((mod & SHIFT) == SHIFT)
14323	14618	{
14324	14619	mouseMode = mouseMode;
..	..	@@ -14368,14 +14663,16 @@
14368	14663	if (editObj)
14369	14664	{
14370	14665	drag = true;
14371		- ClickInfo info = new ClickInfo();
14372		- info.bounds.setBounds(0, 0,
	14666	+ //ClickInfo info = new ClickInfo();
	14667	+ object.clickInfo.bounds.setBounds(0, 0,
14373	14668	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14374		- info.pane = this;
14375		- info.camera = renderCamera;
14376		- info.x = x;
14377		- info.y = y;
14378		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14669	+ object.clickInfo.pane = this;
	14670	+ object.clickInfo.camera = renderCamera;
	14671	+ object.clickInfo.x = x;
	14672	+ object.clickInfo.y = y;
	14673	+ object //.GetWindow().copy
	14674	+ .doEditDrag(//info,
	14675	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14379	14676	} else
14380	14677	{
14381	14678	if (x < startX)
..	..	@@ -14524,22 +14821,27 @@
14524	14821	}
14525	14822	}
14526	14823
	14824	+// ClickInfo clickInfo = new ClickInfo();
	14825	+
14527	14826	public void mouseMoved(MouseEvent e)
14528	14827	{
14529	14828	//System.out.println("mouseMoved: " + e);
14530	14829	if (isRenderer)
14531	14830	return;
14532	14831
14533		- ClickInfo ci = new ClickInfo();
14534		- ci.x = e.getX();
14535		- ci.y = e.getY();
14536		- ci.modifiers = e.getModifiersEx();
14537		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14538		- ci.pane = this;
14539		- ci.camera = renderCamera;
	14832	+ // Mouse cursor feedback
	14833	+ object.clickInfo.x = e.getX();
	14834	+ object.clickInfo.y = e.getY();
	14835	+ object.clickInfo.modifiers = e.getModifiersEx();
	14836	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14837	+ object.clickInfo.pane = this;
	14838	+ object.clickInfo.camera = renderCamera;
14540	14839	if (!isRenderer)
14541	14840	{
14542		- if (object.editWindow.copy.doEditClick(ci, 0))
	14841	+ //ObjEditor editWindow = object.editWindow;
	14842	+ //Object3D copy = editWindow.copy;
	14843	+ if (object.doEditClick(//clickInfo,
	14844	+ 0))
14543	14845	{
14544	14846	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14545	14847	} else
..	..	@@ -14554,7 +14856,8 @@
14554	14856	Globals.MOUSEDRAGGED = false;
14555	14857
14556	14858	movingcamera = false;
14557		- X = Y = 0;
	14859	+ X = 0; // getBounds().width/2;
	14860	+ Y = 0; // getBounds().height/2;
14558	14861	//System.out.println("mouseReleased: " + e);
14559	14862	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14560	14863	}
..	..	@@ -14810,7 +15113,8 @@
14810	15113	// break;
14811	15114	case 'T':
14812	15115	CACHETEXTURE ^= true;
14813		- textures.clear();
	15116	+ texturepigment.clear();
	15117	+ texturebump.clear();
14814	15118	// repaint();
14815	15119	break;
14816	15120	case 'Y':
..	..	@@ -14895,7 +15199,9 @@
14895	15199	case 'E' : COMPACT ^= true;
14896	15200	repaint();
14897	15201	break;
14898		- case 'W' : DEBUGHSB ^= true;
	15202	+ case 'W' : // Wide Window (fullscreen)
	15203	+ //DEBUGHSB ^= true;
	15204	+ ObjEditor.theFrame.ToggleFullScreen();
14899	15205	repaint();
14900	15206	break;
14901	15207	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14921,13 +15227,7 @@
14921	15227	repaint();
14922	15228	break;
14923	15229	case 'l':
14924		- lightMode ^= true;
14925		- Globals.lighttouched = true;
14926		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14927		- targetLookAt.set(manipCamera.lookAt);
14928		- repaint();
14929		- break;
14930		- case 'L':
	15230	+ //case 'L':
14931	15231	if (lightMode)
14932	15232	{
14933	15233	lightMode = false;
..	..	@@ -15070,11 +15370,14 @@
15070	15370	case '_':
15071	15371	kompactbit = 5;
15072	15372	break;
15073		- case '+':
15074		- kompactbit = 6;
15075		- break;
	15373	+// case '+':
	15374	+// kompactbit = 6;
	15375	+// break;
15076	15376	case ' ':
15077		- ObjEditor.theFrame.ToggleFullScreen();
	15377	+ lightMode ^= true;
	15378	+ Globals.lighttouched = true;
	15379	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15380	+ targetLookAt.set(manipCamera.lookAt);
15078	15381	repaint();
15079	15382	break;
15080	15383	//case '`' :
..	..	@@ -15121,8 +15424,9 @@
15121	15424	case DELETE:
15122	15425	ClearSelection();
15123	15426	break;
15124		- /*
15125	15427	case '+':
	15428	+
	15429	+ /*
15126	15430	//fontsize += 1;
15127	15431	bbzoom *= 2;
15128	15432	repaint();
..	..	@@ -15139,17 +15443,17 @@
15139	15443	case '=':
15140	15444	IncDepth();
15141	15445	//fontsize += 1;
15142		- object.editWindow.refreshContents(true);
	15446	+ object.GetWindow().refreshContents(true);
15143	15447	maskbit = 6;
15144	15448	break;
15145	15449	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15146	15450	DecDepth();
15147	15451	maskbit = 5;
15148	15452	//if(fontsize > 1) fontsize -= 1;
15149		- if (object.editWindow == null)
15150		- new Exception().printStackTrace();
15151		- else
15152		- object.editWindow.refreshContents(true);
	15453	+// if (object.editWindow == null)
	15454	+// new Exception().printStackTrace();
	15455	+// else
	15456	+ object.GetWindow().refreshContents(true);
15153	15457	break;
15154	15458	case '{':
15155	15459	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15373,7 +15677,7 @@
15373	15677	}
15374	15678	*/
15375	15679
15376		- object.editWindow.EditSelection();
	15680	+ object.GetWindow().EditSelection(false);
15377	15681	}
15378	15682
15379	15683	void SelectParent()
..	..	@@ -15390,10 +15694,10 @@
15390	15694	{
15391	15695	//selectees.remove(i);
15392	15696	System.out.println("select parent of " + elem);
15393		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15697	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15394	15698	} else
15395	15699	{
15396		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15700	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15397	15701	}
15398	15702
15399	15703	first = false;
..	..	@@ -15435,12 +15739,12 @@
15435	15739	for (int j = 0; j < group.children.size(); j++)
15436	15740	{
15437	15741	elem = (Object3D) group.children.elementAt(j);
15438		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15742	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15439	15743	first = false;
15440	15744	}
15441	15745	} else
15442	15746	{
15443		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15747	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15444	15748	}
15445	15749
15446	15750	first = false;
..	..	@@ -15451,21 +15755,21 @@
15451	15755	{
15452	15756	//Composite group = (Composite) object;
15453	15757	Object3D group = object;
15454		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15758	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15455	15759	}
15456	15760
15457	15761	void ResetTransform(int mask)
15458	15762	{
15459	15763	//Composite group = (Composite) object;
15460	15764	Object3D group = object;
15461		- group.editWindow.ResetTransform(mask);
	15765	+ group.GetWindow().ResetTransform(mask);
15462	15766	}
15463	15767
15464	15768	void FlipTransform()
15465	15769	{
15466	15770	//Composite group = (Composite) object;
15467	15771	Object3D group = object;
15468		- group.editWindow.FlipTransform();
	15772	+ group.GetWindow().FlipTransform();
15469	15773	// group.editWindow.ReduceMesh(true);
15470	15774	}
15471	15775
..	..	@@ -15473,7 +15777,7 @@
15473	15777	{
15474	15778	//Composite group = (Composite) object;
15475	15779	Object3D group = object;
15476		- group.editWindow.PrintMemory();
	15780	+ group.GetWindow().PrintMemory();
15477	15781	// group.editWindow.ReduceMesh(true);
15478	15782	}
15479	15783
..	..	@@ -15481,7 +15785,7 @@
15481	15785	{
15482	15786	//Composite group = (Composite) object;
15483	15787	Object3D group = object;
15484		- group.editWindow.ResetCentroid();
	15788	+ group.GetWindow().ResetCentroid();
15485	15789	}
15486	15790
15487	15791	void IncDepth()
..	..	@@ -15563,8 +15867,6 @@
15563	15867
15564	15868	int width = getBounds().width;
15565	15869	int height = getBounds().height;
15566		- ClickInfo info = new ClickInfo();
15567		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15568	15870	//Image img = CreateImage(width, height);
15569	15871	//System.out.println("width = " + width + "; height = " + height + "\n");
15570	15872
..	..	@@ -15641,48 +15943,77 @@
15641	15943	}
15642	15944	if (object != null && !hasMarquee)
15643	15945	{
	15946	+ if (object.clickInfo == null)
	15947	+ object.clickInfo = new ClickInfo();
	15948	+ ClickInfo info = object.clickInfo;
	15949	+ //ClickInfo info = new ClickInfo();
	15950	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15951	+
15644	15952	if (isRenderer)
15645	15953	{
15646		- info.flags++;
	15954	+ object.clickInfo.flags++;
15647	15955	double frameAspect = (double) width / (double) height;
15648	15956	if (frameAspect > renderCamera.aspect)
15649	15957	{
15650	15958	int desired = (int) ((double) height * renderCamera.aspect);
15651		- info.bounds.width -= width - desired;
15652		- info.bounds.x += (width - desired) / 2;
	15959	+ object.clickInfo.bounds.width -= width - desired;
	15960	+ object.clickInfo.bounds.x += (width - desired) / 2;
15653	15961	} else
15654	15962	{
15655	15963	int desired = (int) ((double) width / renderCamera.aspect);
15656		- info.bounds.height -= height - desired;
15657		- info.bounds.y += (height - desired) / 2;
	15964	+ object.clickInfo.bounds.height -= height - desired;
	15965	+ object.clickInfo.bounds.y += (height - desired) / 2;
15658	15966	}
15659	15967	}
15660		- info.g = gr;
15661		- info.camera = renderCamera;
	15968	+
	15969	+ object.clickInfo.g = gr;
	15970	+ object.clickInfo.camera = renderCamera;
15662	15971	/*
15663	15972	// Memory intensive (brep.verticescopy)
15664	15973	if (!(object instanceof Composite))
15665	15974	object.draw(info, 0, false); // SLOW :
15666	15975	*/
15667		- if (!isRenderer)
	15976	+ if (!isRenderer) // && drag)
15668	15977	{
15669		- object.drawEditHandles(info, 0);
15670		-
15671		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15978	+ Grafreed.Assert(object != null);
	15979	+ Grafreed.Assert(object.selection != null);
	15980	+ if (object.selection.Size() > 0)
15672	15981	{
15673		- switch (object.selection.get(0).hitSomething)
	15982	+ int hitSomething = object.selection.get(0).hitSomething;
	15983	+
	15984	+ object.clickInfo.DX = 0;
	15985	+ object.clickInfo.DY = 0;
	15986	+ object.clickInfo.W = 1;
	15987	+ if (hitSomething == Object3D.hitCenter)
15674	15988	{
15675		- case Object3D.hitCenter: gr.setColor(Color.pink);
15676		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15677		- break;
15678		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15679		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15680		- break;
15681		- case Object3D.hitScale: gr.setColor(Color.cyan);
15682		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15683		- break;
	15989	+ info.DX = X;
	15990	+ if (X != 0)
	15991	+ info.DX -= info.bounds.width/2;
	15992	+
	15993	+ info.DY = Y;
	15994	+ if (Y != 0)
	15995	+ info.DY -= info.bounds.height/2;
15684	15996	}
15685		-
	15997	+
	15998	+ object.drawEditHandles(//info,
	15999	+ 0);
	16000	+
	16001	+ if (drag && (X != 0 \|\| Y != 0))
	16002	+ {
	16003	+ switch (hitSomething)
	16004	+ {
	16005	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16006	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16007	+ break;
	16008	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16009	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16010	+ break;
	16011	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16012	+ gr.drawLine(X, Y, 0, 0);
	16013	+ break;
	16014	+ }
	16015	+
	16016	+ }
15686	16017	}
15687	16018	}
15688	16019	}
..	..	@@ -16385,16 +16716,16 @@
16385	16716	cStatic.objectstack[materialdepth++] = checker;
16386	16717	//System.out.println("material " + material);
16387	16718	//Applet3D.tracein(this, selected);
16388		- vector2buffer = checker.projectedVertices;
	16719	+ //vector2buffer = checker.projectedVertices;
16389	16720
16390	16721	//checker.GetMaterial().Draw(this, false); // true);
16391		- DrawMaterial(checker.GetMaterial(), false); // true);
	16722	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16392	16723
16393	16724	materialdepth -= 1;
16394	16725	if (materialdepth > 0)
16395	16726	{
16396		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16397		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16727	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16728	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16398	16729	}
16399	16730	//checker.GetMaterial().opacity = 1f;
16400	16731	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16480,6 +16811,14 @@
16480	16811	}
16481	16812	}
16482	16813
	16814	+ private Object3D GetFolder()
	16815	+ {
	16816	+ Object3D folder = object.GetWindow().copy;
	16817	+ if (object.GetWindow().copy.selection.Size() > 0)
	16818	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16819	+ return folder;
	16820	+ }
	16821	+
16483	16822	class SelectBuffer implements GLEventListener
16484	16823	{
16485	16824
..	..	@@ -16559,6 +16898,17 @@
16559	16898
16560	16899	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16561	16900
	16901	+ if (PAINTMODE)
	16902	+ {
	16903	+ if (object.GetWindow().copy.selection.Size() > 0)
	16904	+ {
	16905	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16906	+
	16907	+ // Make what you paint not selectable.
	16908	+ paintobj.ResetSelectable();
	16909	+ }
	16910	+ }
	16911	+
16562	16912	//int tmp = selection_view;
16563	16913	//selection_view = -1;
16564	16914	int temp = DrawMode();
..	..	@@ -16570,6 +16920,17 @@
16570	16920	// temp = DEFAULT; // patch for selection debug
16571	16921	Globals.drawMode = temp; // WARNING
16572	16922
	16923	+ if (PAINTMODE)
	16924	+ {
	16925	+ if (object.GetWindow().copy.selection.Size() > 0)
	16926	+ {
	16927	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16928	+
	16929	+ // Revert.
	16930	+ paintobj.RestoreSelectable();
	16931	+ }
	16932	+ }
	16933	+
16573	16934	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16574	16935
16575	16936	// trying different ways of getting the depth info over
..	..	@@ -16617,6 +16978,8 @@
16617	16978	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16618	16979	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16619	16980	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16981	+
	16982	+ CreateSelectedPoint();
16620	16983
16621	16984	// Will fit the mesh !!!
16622	16985	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16671,29 +17034,31 @@
16671	17034	}
16672	17035
16673	17036	if (!movingcamera && !PAINTMODE)
16674		- object.editWindow.ScreenFitPoint(); // fev 2014
	17037	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16675	17038
16676		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17039	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16677	17040	{
16678		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17041	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16679	17042
16680		- Object3D group = new Object3D("inst" + paintcount++);
	17043	+ if (object.GetWindow().copy.selection.Size() > 0)
	17044	+ {
	17045	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16681	17046
16682		- group.CreateMaterial(); // use a void leaf to select instances
16683		-
16684		- group.add(paintobj); // link
16685		-
16686		- object.editWindow.SnapObject(group);
16687		-
16688		- Object3D folder = object.editWindow.copy;
16689		-
16690		- if (object.editWindow.copy.selection.Size() > 0)
16691		- folder = object.editWindow.copy.selection.elementAt(0);
16692		-
16693		- folder.add(group);
16694		-
16695		- object.editWindow.ResetModel();
16696		- object.editWindow.refreshContents();
	17047	+ Object3D inst = new Object3D("inst" + paintcount++);
	17048	+
	17049	+ inst.CreateMaterial(); // use a void leaf to select instances
	17050	+
	17051	+ inst.add(paintobj); // link
	17052	+
	17053	+ object.GetWindow().SnapObject(inst);
	17054	+
	17055	+ Object3D folder = paintFolder; // GetFolder();
	17056	+
	17057	+ folder.add(inst);
	17058	+
	17059	+ object.GetWindow().ResetModel();
	17060	+ object.GetWindow().refreshContents();
	17061	+ }
16697	17062	}
16698	17063	else
16699	17064	paintcount = 0;
..	..	@@ -16732,6 +17097,11 @@
16732	17097	//System.out.println("objects[color] = " + objects[color]);
16733	17098	//objects[color].Select();
16734	17099	indexcount = 0;
	17100	+ ObjEditor window = object.GetWindow();
	17101	+ if (window != null && deselect)
	17102	+ {
	17103	+ window.Select(null, deselect, true);
	17104	+ }
16735	17105	object.Select(color, deselect);
16736	17106	}
16737	17107