~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;
..	..	@@ -150,6 +187,18 @@
150	187	}
151	188
152	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
153	202
154	203	void SetAsGLRenderer(boolean b)
155	204	{
..	..	@@ -169,7 +218,8 @@
169	218
170	219	SetCamera(cam);
171	220
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	223
174	224	object = o;
175	225
..	..	@@ -326,7 +376,7 @@
326	376	cStatic.objectstack[materialdepth++] = obj;
327	377	//System.out.println("material " + material);
328	378	//Applet3D.tracein(this, selected);
329		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
330	380	if (obj instanceof Camera)
331	381	{
332	382	display.options1[0] = material.shift;
..	..	@@ -335,14 +385,28 @@
335	385	display.options1[2] = material.shadowbias;
336	386	display.options1[3] = material.aniso;
337	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
338	393	display.options2[0] = material.opacity;
339	394	display.options2[1] = material.diffuse;
340	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
341	399
342	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
343	404	display.options4[0] = material.cameralight/0.2f;
344	405	display.options4[1] = material.subsurface;
345	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
346	410
347	411	// if (display.CURRENTANTIALIAS > 0)
348	412	// display.options3[3] /= 4;
..	..	@@ -358,7 +422,7 @@
358	422	/**/
359	423	} else
360	424	{
361		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
362	426	}
363	427	} else
364	428	{
..	..	@@ -382,8 +446,8 @@
382	446	cStatic.objectstack[materialdepth++] = obj;
383	447	//System.out.println("material " + material);
384	448	//Applet3D.tracein("selected ", selected);
385		- display.vector2buffer = obj.projectedVertices;
386		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
387	451	}
388	452	}
389	453
..	..	@@ -400,8 +464,8 @@
400	464	materialdepth -= 1;
401	465	if (materialdepth > 0)
402	466	{
403		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
405	469	}
406	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
407	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -421,8 +485,8 @@
421	485	materialdepth -= 1;
422	486	if (materialdepth > 0)
423	487	{
424		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
426	490	}
427	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
428	492	//else
..	..	@@ -1433,6 +1497,8 @@
1433	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1434	1498	}
1435	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1436	1502	void SetColor(Object3D obj, Vertex p0)
1437	1503	{
1438	1504	CameraPane display = this;
..	..	@@ -1500,8 +1566,6 @@
1500	1566	{
1501	1567	return;
1502	1568	}
1503		-
1504		- float[] colorV = new float[3];
1505	1569
1506	1570	if (false) // marked)
1507	1571	{
..	..	@@ -1610,7 +1674,7 @@
1610	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1611	1675	}
1612	1676
1613		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1614	1678	{
1615	1679	CameraPane display = this;
1616	1680	//new Exception().printStackTrace();
..	..	@@ -1645,7 +1709,7 @@
1645	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1646	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1647	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1648		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1649	1713
1650	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1651	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1753,9 +1817,9 @@
1753	1817	display.modelParams7[2] = 0;
1754	1818	display.modelParams7[3] = 0;
1755	1819
1756		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1757	1821
1758		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1759	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1760	1824	{
1761	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2051,7 +2115,7 @@
2051	2115	//System.err.println("Oeil on");
2052	2116	OEIL = true;
2053	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2055	2119	//pingthread.StepToTarget(true);
2056	2120	}
2057	2121
..	..	@@ -2284,10 +2348,17 @@
2284	2348	HANDLES ^= true;
2285	2349	}
2286	2350
	2351	+ Object3D paintFolder;
	2352	+
2287	2353	void TogglePaint()
2288	2354	{
2289	2355	PAINTMODE ^= true;
2290	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2291	2362	}
2292	2363
2293	2364	void SwapCamera(int a, int b)
..	..	@@ -2384,6 +2455,21 @@
2384	2455	return currentGL;
2385	2456	}
2386	2457
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2387	2473	/**/
2388	2474	class CacheTexture
2389	2475	{
..	..	@@ -2392,28 +2478,31 @@
2392	2478
2393	2479	int resolution;
2394	2480
2395		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2396	2482	{
2397		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2398	2485	resolution = res;
2399	2486	}
2400	2487	}
2401	2488	/**/
2402	2489
2403	2490	// 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>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2407	2496	int pigmentdepth = 0;
2408	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2409	2498	int bumpdepth = 0;
2410	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2411	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2412	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2413		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2414	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2415	2504
2416		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2417	2506	{
2418	2507	TextureData texturedata = null;
2419	2508
..	..	@@ -2432,13 +2521,34 @@
2432	2521	if (bump)
2433	2522	texturedata = ConvertBump(texturedata, false);
2434	2523
2435		- com.sun.opengl.util.texture.Texture texture =
2436		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2437	2526
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);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2440	2529
2441		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2442	2552	}
2443	2553
2444	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3511,6 +3621,8 @@
3511	3621
3512	3622	System.out.println("LOADING TEXTURE : " + name);
3513	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3514	3626	//
3515	3627	if (false) // compressbit > 0)
3516	3628	{
..	..	@@ -7909,7 +8021,7 @@
7909	8021	String pigment = Object3D.GetPigment(tex);
7910	8022	String bump = Object3D.GetBump(tex);
7911	8023
7912		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7913	8025	{
7914	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7915	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7924,8 +8036,8 @@
7924	8036	pigment = null;
7925	8037	}
7926	8038
7927		- ReleaseTexture(bump, true);
7928		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7929	8041	}
7930	8042
7931	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7943,7 +8055,7 @@
7943	8055
7944	8056	String pigment = Object3D.GetPigment(tex);
7945	8057
7946		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947	8059	{
7948	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7949	8061	// System.out.println("; bump = " + bump);
..	..	@@ -7954,7 +8066,7 @@
7954	8066	pigment = null;
7955	8067	}
7956	8068
7957		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
7958	8070	}
7959	8071
7960	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7972,7 +8084,7 @@
7972	8084
7973	8085	String bump = Object3D.GetBump(tex);
7974	8086
7975		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976	8088	{
7977	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7978	8090	// System.out.println("; bump = " + bump);
..	..	@@ -7983,10 +8095,10 @@
7983	8095	bump = null;
7984	8096	}
7985	8097
7986		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
7987	8099	}
7988	8100
7989		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7990	8102	{
7991	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7992	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7997,7 +8109,7 @@
7997	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7998	8110
7999	8111	if (tex != null)
8000		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8001	8113
8002	8114	// //assert( texture != null );
8003	8115	// if (texture == null)
..	..	@@ -8091,47 +8203,50 @@
8091	8203
8092	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8093	8205	{
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		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8106	8247
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;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8135	8250	}
8136	8251
8137	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8150,9 +8265,9 @@
8150	8265
8151	8266	String pigment = Object3D.GetPigment(tex);
8152	8267
8153		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8154	8269
8155		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156	8271	{
8157	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8158	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8164,7 +8279,7 @@
8164	8279	}
8165	8280
8166	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8168	8283	}
8169	8284
8170	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8183,9 +8298,9 @@
8183	8298
8184	8299	String bump = Object3D.GetBump(tex);
8185	8300
8186		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8187	8302
8188		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189	8304	{
8190	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8191	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8197,7 +8312,7 @@
8197	8312	}
8198	8313
8199	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8201	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202	8317	}
8203	8318
..	..	@@ -8221,13 +8336,19 @@
8221	8336	return fileExists;
8222	8337	}
8223	8338
8224		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8225	8340	{
8226		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8227	8342
8228	8343	if (tex != null)
8229	8344	{
8230		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8231	8352
8232	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233	8354
..	..	@@ -8237,19 +8358,46 @@
8237	8358	// else
8238	8359	// if (!texname.startsWith("/"))
8239	8360	// texname = "/Users/nbriere/Textures/" + texname;
8240		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname))
8241	8362	{
8242	8363	texname = fallbackTextureName;
8243	8364	}
8244	8365
8245	8366	if (CACHETEXTURE)
8246		- texture = textures.get(texname); // TEXTURE CACHE
8247		-
8248		- TextureData texturedata = null;
8249		-
8250		- if (texture == null \|\| texture.resolution < resolution)
8251	8367	{
8252		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8253	8401	{
8254	8402	assert(!bump);
8255	8403	// if (bump)
..	..	@@ -8260,19 +8408,23 @@
8260	8408	// }
8261	8409	// else
8262	8410	// {
8263		- texture = textures.get(tex);
8264		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8265	8413	{
8266		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8267	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8268	8418	// }
8269	8419	} else
8270		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8271	8421	{
8272	8422	assert(bump);
8273		- texture = textures.get(tex);
8274		- if (texture == null)
8275		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8276	8428	} else
8277	8429	{
8278	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8280,11 +8432,13 @@
8280	8432	// texture = GetResourceTexture("default.png");
8281	8433	//} else
8282	8434	//{
8283		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8284	8436	{
8285		- texture = textures.get(tex);
8286		- if (texture == null)
8287		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8288	8442	} else
8289	8443	{
8290	8444	if (textureon)
..	..	@@ -8343,19 +8497,19 @@
8343	8497	if (texturedata == null)
8344	8498	throw new Exception();
8345	8499
8346		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8347	8501	//texture = GetTexture(tex, bump);
8348	8502	}
8349	8503	}
8350	8504	//}
8351	8505	}
8352	8506
8353		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8354	8508	{
8355	8509	//return false;
8356	8510
8357	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8358		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8359	8513	{
8360	8514	// String ext = "_highres";
8361	8515	// if (REDUCETEXTURE)
..	..	@@ -8372,52 +8526,17 @@
8372	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8373	8527	if (!cachefile.exists())
8374	8528	{
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))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8384	8530	{
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);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8415	8533	ImageWriter writer = null;
8416	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8417	8535	if (iter.hasNext()) {
8418	8536	writer = (ImageWriter)iter.next();
8419	8537	}
8420		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8421	8540	try
8422	8541	{
8423	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8434,18 +8553,20 @@
8434	8553	}
8435	8554	}
8436	8555	}
8437		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8438	8559	//System.out.println("Texture = " + tex);
8439		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8440	8561	{
8441		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8442	8563	thetex.texture.disable();
8443	8564	thetex.texture.dispose();
8444		- textures.remove(texname);
	8565	+ textures.remove(tex);
8445	8566	}
8446	8567
8447		- texture.texturedata = texturedata;
8448		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8449	8570
8450	8571	// newtex = true;
8451	8572	}
..	..	@@ -8461,10 +8582,44 @@
8461	8582	}
8462	8583	}
8463	8584
8464		- return texture;
	8585	+ return texturecache;
8465	8586	}
8466	8587
8467		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8468	8623	{
8469	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8470	8625
..	..	@@ -8482,21 +8637,21 @@
8482	8637	return texture!=null?texture.texture:null;
8483	8638	}
8484	8639
8485		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8486	8641	{
8487	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8488	8643
8489	8644	return texture!=null?texture.texturedata:null;
8490	8645	}
8491	8646
8492		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8493	8648	{
8494	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8495	8650	{
8496	8651	return false;
8497	8652	}
8498	8653
8499		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8500	8655
8501	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8502	8657
..	..	@@ -8528,9 +8683,75 @@
8528	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8529	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8530	8685
8531		- return newtex;
	8686	+ return true; // Warning: not used.
8532	8687	}
8533	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8534	8755	ShadowBuffer shadowPBuf;
8535	8756	AntialiasBuffer antialiasPBuf;
8536	8757	int MAXSTACK;
..	..	@@ -8723,7 +8944,7 @@
8723	8944
8724	8945	if (cubemap == null)
8725	8946	{
8726		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8727	8948	}
8728	8949
8729	8950	//cubemap.enable();
..	..	@@ -9010,37 +9231,58 @@
9010	9231	cubemap = null;
9011	9232	return;
9012	9233	case 1:
9013		- name = "cubemaps/box_";
9014		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9015	9236	reverseUP = false;
9016	9237	break;
9017	9238	case 2:
9018		- name = "cubemaps/uffizi_";
9019		- ext = "png";
9020		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9021	9243	case 3:
9022		- name = "cubemaps/CloudyHills_";
9023		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9024	9246	reverseUP = false;
9025	9247	break;
9026	9248	case 4:
9027		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9028	9250	ext = "png";
9029	9251	reverseUP = false;
9030	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
9031	9278	default:
9032		- name = "cubemaps/rgb_";
9033		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9034	9282	break;
9035	9283	}
9036		-
9037		- try
9038		- {
9039		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9040		- } catch (IOException e)
9041		- {
9042		- throw new RuntimeException(e);
9043		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9044	9286	}
9045	9287
9046	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9072,8 +9314,13 @@
9072	9314	static double[] model = new double[16];
9073	9315	double[] camera2light = new double[16];
9074	9316	double[] light2camera = new double[16];
9075		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
9076	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
9077	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9078	9325	//float[] light0 = { 0,0,0 };
9079	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9366,11 +9613,35 @@
9366	9613	jy8[3] = 0.5f;
9367	9614	}
9368	9615
9369		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9616	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9370	9617	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371	9618	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372	9619	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373	9620
	9621	+ void ResetOptions()
	9622	+ {
	9623	+ options1[0] = 100;
	9624	+ options1[1] = 0.025f;
	9625	+ options1[2] = 0.01f;
	9626	+ options1[3] = 0;
	9627	+ options1[4] = 0;
	9628	+
	9629	+ options2[0] = 0;
	9630	+ options2[1] = 0.75f;
	9631	+ options2[2] = 0;
	9632	+ options2[3] = 0;
	9633	+
	9634	+ options3[0] = 1;
	9635	+ options3[1] = 1;
	9636	+ options3[2] = 1;
	9637	+ options3[3] = 0;
	9638	+
	9639	+ options4[0] = 1;
	9640	+ options4[1] = 0;
	9641	+ options4[2] = 1;
	9642	+ options4[3] = 0;
	9643	+ }
	9644	+
9374	9645	static int imagecount = 0; // movie generation
9375	9646
9376	9647	static int jitter = 0;
..	..	@@ -9467,7 +9738,7 @@
9467	9738
9468	9739	if (renderCamera != lightCamera)
9469	9740	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9470		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9471	9742
9472	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9473	9744
..	..	@@ -9483,7 +9754,7 @@
9483	9754
9484	9755	if (renderCamera != lightCamera)
9485	9756	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9486		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9487	9758
9488	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9489	9760
..	..	@@ -9529,10 +9800,12 @@
9529	9800	rati = 1 / rati;
9530	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9531	9802	}
9532		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
9533	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9534	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9535		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
9536	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9537	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9538	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10481,6 +10754,7 @@
10481	10754	ANTIALIAS = 0;
10482	10755	//System.out.println("RESTART");
10483	10756	AAtimer.restart();
	10757	+ Globals.TIMERRUNNING = true;
10484	10758	}
10485	10759	}
10486	10760	}
..	..	@@ -10548,7 +10822,8 @@
10548	10822	ambientOcclusion = false;
10549	10823	}
10550	10824
10551		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10825	+ if (//Globals.lighttouched &&
	10826	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10552	10827	{
10553	10828	//if (RENDERSHADOW) // ?
10554	10829	if (!IsFrozen())
..	..	@@ -10682,7 +10957,7 @@
10682	10957	// if (parentcam != renderCamera) // not a light
10683	10958	if (cam != lightCamera)
10684	10959	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10685		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10686	10961
10687	10962	for (int j = 0; j < 4; j++)
10688	10963	{
..	..	@@ -10697,7 +10972,7 @@
10697	10972	// if (parentcam != renderCamera) // not a light
10698	10973	if (cam != lightCamera)
10699	10974	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10700		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10701	10976
10702	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10703	10978
..	..	@@ -10783,13 +11058,19 @@
10783	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10784	11059	}
10785	11060
10786		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
10787	11069	{
10788		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
10789	11072	}
10790		-
10791		- newenvy = -1;
10792		-
	11073	+
10793	11074	ratio = ((double) getWidth()) / getHeight();
10794	11075	//System.out.println("ratio = " + ratio);
10795	11076
..	..	@@ -10805,7 +11086,7 @@
10805	11086
10806	11087	if (!IsFrozen() && !ambientOcclusion)
10807	11088	{
10808		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
10809	11090	}
10810	11091
10811	11092	//if (selection_view == -1)
..	..	@@ -10988,9 +11269,9 @@
10988	11269
10989	11270	gl.glMatrixMode(GL.GL_MODELVIEW);
10990	11271
10991		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10992		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10993		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11272	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11273	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11274	+gl.glEnable(gl.GL_MULTISAMPLE);
10994	11275	} else
10995	11276	{
10996	11277	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11001,7 +11282,7 @@
11001	11282	//System.out.println("BLENDING ON");
11002	11283	gl.glEnable(GL.GL_BLEND);
11003	11284	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11004		-
	11285	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11005	11286	gl.glMatrixMode(gl.GL_PROJECTION);
11006	11287	gl.glLoadIdentity();
11007	11288
..	..	@@ -11250,7 +11531,7 @@
11250	11531	}
11251	11532	}
11252	11533
11253		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11254	11535	{
11255	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
11256	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11258,24 +11539,21 @@
11258	11539
11259	11540	boolean texon = textureon;
11260	11541
11261		- if (RENDERPROGRAM > 0)
11262		- {
11263		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11264		- textureon = false;
11265		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
11266	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11267	11546	//System.out.println("ALLO");
11268	11547	gl.glColorMask(false, false, false, false);
11269	11548	DrawObject(gl);
11270		- if (RENDERPROGRAM > 0)
11271		- {
11272		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11273		- textureon = texon;
11274		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
11275	11553	gl.glColorMask(true, true, true, true);
11276	11554
11277	11555	gl.glDepthFunc(GL.GL_EQUAL);
11278		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
11279	11557	}
11280	11558
11281	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -11458,7 +11736,7 @@
11458	11736
11459	11737	static boolean zoomonce = false;
11460	11738
11461		- void CreateSelectedPoint()
	11739	+ static void CreateSelectedPoint()
11462	11740	{
11463	11741	if (selectedpoint == null)
11464	11742	{
..	..	@@ -11478,13 +11756,16 @@
11478	11756
11479	11757	void DrawObject(GL gl, boolean draw)
11480	11758	{
	11759	+ // To clear camera values
	11760	+ ResetOptions();
	11761	+
11481	11762	//System.out.println("DRAW OBJECT " + mouseDown);
11482	11763	// DrawMode() = SELECTION;
11483	11764	//GL gl = getGL();
11484	11765	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11485	11766	{
11486	11767	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11487		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11768	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11488	11769	pingthread.StepToTarget(true); // true);
11489	11770	// zoomonce = false;
11490	11771	}
..	..	@@ -11612,20 +11893,32 @@
11612	11893	ReleaseTextures(DEFAULT_TEXTURES);
11613	11894
11614	11895	if (CLEANCACHE)
11615		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11616	11897	{
11617		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
11618	11899
11619	11900	// System.out.println("Texture --------- " + tex);
11620	11901
11621		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
11622	11903	continue;
11623	11904
11624		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
11625	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
11626	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11627		- textures.get(tex).texture.dispose();
11628		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
11629	11922	}
11630	11923	}
11631	11924	}
..	..	@@ -12045,7 +12338,7 @@
12045	12338	for (int i = tp.size(); --i >= 0;)
12046	12339	{
12047	12340	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12048		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12341	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12049	12342	}
12050	12343
12051	12344
..	..	@@ -12153,8 +12446,76 @@
12153	12446
12154	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12155	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
12156	12516	String program =
12157	12517	"!!ARBfp1.0\n" +
	12518	+
12158	12519	//"OPTION ARB_fragment_program_shadow;" +
12159	12520	"PARAM light2cam0 = program.env[10];" +
12160	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12269,8 +12630,7 @@
12269	12630	"TEMP shininess;" +
12270	12631	"\n" +
12271	12632	"MOV texSamp, one;" +
12272		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12273		-
	12633	+
12274	12634	"MOV mapgrid.x, one2048th.x;" +
12275	12635	"MOV temp, fragment.texcoord[1];" +
12276	12636	/*
..	..	@@ -12291,20 +12651,20 @@
12291	12651	"MUL temp, floor, mapgrid.x;" +
12292	12652	//"TEX depth0, temp, texture[1], 2D;" +
12293	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12294		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
12295	12655	"") +
12296	12656	"ADD temp.x, temp.x, mapgrid.x;" +
12297	12657	//"TEX depth1, temp, texture[1], 2D;" +
12298	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12299		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
12300	12660	"") +
12301	12661	"ADD temp.y, temp.y, mapgrid.x;" +
12302	12662	//"TEX depth2, temp, texture[1], 2D;" +
12303		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
12304	12664	"SUB temp.x, temp.x, mapgrid.x;" +
12305	12665	//"TEX depth3, temp, texture[1], 2D;" +
12306	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12307		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
12308	12668	"") +
12309	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12310	12670	//"MOV params, material;" +
..	..	@@ -12675,7 +13035,7 @@
12675	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12676	13036	"") +
12677	13037
12678		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
12679	13039	"SUB temp.x, half.x, shadow.x;" +
12680	13040	"MOV temp.y, -params5.z;" + // params6.x;" +
12681	13041	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13102,25 +13462,26 @@
13102	13462	return out;
13103	13463	}
13104	13464
13105		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
13106	13467	{
13107	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13108	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13109	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13110	13473	"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;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13115	13476	//"SWZ buffer, temp, w,w,w,w;";
13116		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13117	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13118	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13119	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13120		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13121	13482
13122		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13123		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13124	13485	}
13125	13486
13126	13487	String Shadow(String depth, String shadow)
..	..	@@ -13167,7 +13528,7 @@
13167	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13168	13529	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13169	13530
13170		- // No shadow when out of frustrum
	13531	+ // No shadow when out of frustum
13171	13532	"SGE temp.x, " + depth + ".z, one.z;" +
13172	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13173	13534	"";
..	..	@@ -13315,7 +13676,8 @@
13315	13676	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13316	13677	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13317	13678	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13318		- Object3D.cVector2[] vector2buffer;
	13679	+
	13680	+ //Object3D.cVector2[] vector2buffer;
13319	13681
13320	13682	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13321	13683	// OUT : diff, spec
..	..	@@ -13331,9 +13693,10 @@
13331	13693	"DP3 " + dest + ".z," + "normals," + "eye;" +
13332	13694	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13333	13695	//"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;" +
	13696	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13697	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13698	+
	13699	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13337	13700	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13338	13701	"RCP " + dest + ".w," + dest + ".w;" +
13339	13702	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13838,6 +14201,7 @@
13838	14201	else
13839	14202	if (evt.getSource() == AAtimer)
13840	14203	{
	14204	+ Globals.TIMERRUNNING = false;
13841	14205	if (mouseDown)
13842	14206	{
13843	14207	//new Exception().printStackTrace();
..	..	@@ -13897,7 +14261,7 @@
13897	14261
13898	14262	// fev 2014???
13899	14263	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13900		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14264	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13901	14265	pingthread.StepToTarget(true); // true);
13902	14266	}
13903	14267	// if (!LIVE)
..	..	@@ -13912,6 +14276,7 @@
13912	14276	return;
13913	14277
13914	14278	AAtimer.restart(); //
	14279	+ Globals.TIMERRUNNING = true;
13915	14280
13916	14281	// waslive = LIVE;
13917	14282	// LIVE = false;
..	..	@@ -13961,14 +14326,15 @@
13961	14326	drag = false;
13962	14327	//System.out.println("Mouse DOWN");
13963	14328	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);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
13972	14338	if (!editObj)
13973	14339	{
13974	14340	hasMarquee = true;
..	..	@@ -14250,12 +14616,12 @@
14250	14616	void GoDown(int mod)
14251	14617	{
14252	14618	MODIFIERS \|= COMMAND;
14253		- /*
	14619	+ /**/
14254	14620	if((mod&SHIFT) == SHIFT)
14255	14621	manipCamera.RotatePosition(0, -speed);
14256	14622	else
14257		- manipCamera.BackForth(0, -speed*delta, getWidth());
14258		- */
	14623	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14624	+ /**/
14259	14625	if ((mod & SHIFT) == SHIFT)
14260	14626	{
14261	14627	mouseMode = mouseMode; // VR??
..	..	@@ -14271,12 +14637,12 @@
14271	14637	void GoUp(int mod)
14272	14638	{
14273	14639	MODIFIERS \|= COMMAND;
14274		- /*
	14640	+ /**/
14275	14641	if((mod&SHIFT) == SHIFT)
14276	14642	manipCamera.RotatePosition(0, speed);
14277	14643	else
14278		- manipCamera.BackForth(0, speed*delta, getWidth());
14279		- */
	14644	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14645	+ /**/
14280	14646	if ((mod & SHIFT) == SHIFT)
14281	14647	{
14282	14648	mouseMode = mouseMode;
..	..	@@ -14292,12 +14658,12 @@
14292	14658	void GoLeft(int mod)
14293	14659	{
14294	14660	MODIFIERS \|= COMMAND;
14295		- /*
	14661	+ /**/
14296	14662	if((mod&SHIFT) == SHIFT)
14297		- manipCamera.RotatePosition(speed, 0);
14298		- else
14299	14663	manipCamera.Translate(speed*delta, 0, getWidth());
14300		- */
	14664	+ else
	14665	+ manipCamera.RotatePosition(speed, 0);
	14666	+ /**/
14301	14667	if ((mod & SHIFT) == SHIFT)
14302	14668	{
14303	14669	mouseMode = mouseMode;
..	..	@@ -14313,12 +14679,12 @@
14313	14679	void GoRight(int mod)
14314	14680	{
14315	14681	MODIFIERS \|= COMMAND;
14316		- /*
	14682	+ /**/
14317	14683	if((mod&SHIFT) == SHIFT)
14318		- manipCamera.RotatePosition(-speed, 0);
14319		- else
14320	14684	manipCamera.Translate(-speed*delta, 0, getWidth());
14321		- */
	14685	+ else
	14686	+ manipCamera.RotatePosition(-speed, 0);
	14687	+ /**/
14322	14688	if ((mod & SHIFT) == SHIFT)
14323	14689	{
14324	14690	mouseMode = mouseMode;
..	..	@@ -14368,14 +14734,16 @@
14368	14734	if (editObj)
14369	14735	{
14370	14736	drag = true;
14371		- ClickInfo info = new ClickInfo();
14372		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
14373	14739	(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);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14379	14747	} else
14380	14748	{
14381	14749	if (x < startX)
..	..	@@ -14524,22 +14892,27 @@
14524	14892	}
14525	14893	}
14526	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
14527	14897	public void mouseMoved(MouseEvent e)
14528	14898	{
14529	14899	//System.out.println("mouseMoved: " + e);
14530	14900	if (isRenderer)
14531	14901	return;
14532	14902
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;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
14540	14910	if (!isRenderer)
14541	14911	{
14542		- if (object.editWindow.copy.doEditClick(ci, 0))
	14912	+ //ObjEditor editWindow = object.editWindow;
	14913	+ //Object3D copy = editWindow.copy;
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
14543	14916	{
14544	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14545	14918	} else
..	..	@@ -14554,7 +14927,8 @@
14554	14927	Globals.MOUSEDRAGGED = false;
14555	14928
14556	14929	movingcamera = false;
14557		- X = Y = 0;
	14930	+ X = 0; // getBounds().width/2;
	14931	+ Y = 0; // getBounds().height/2;
14558	14932	//System.out.println("mouseReleased: " + e);
14559	14933	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14560	14934	}
..	..	@@ -14810,7 +15184,8 @@
14810	15184	// break;
14811	15185	case 'T':
14812	15186	CACHETEXTURE ^= true;
14813		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
14814	15189	// repaint();
14815	15190	break;
14816	15191	case 'Y':
..	..	@@ -14895,7 +15270,9 @@
14895	15270	case 'E' : COMPACT ^= true;
14896	15271	repaint();
14897	15272	break;
14898		- case 'W' : DEBUGHSB ^= true;
	15273	+ case 'W' : // Wide Window (fullscreen)
	15274	+ //DEBUGHSB ^= true;
	15275	+ ObjEditor.theFrame.ToggleFullScreen();
14899	15276	repaint();
14900	15277	break;
14901	15278	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14921,13 +15298,7 @@
14921	15298	repaint();
14922	15299	break;
14923	15300	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':
	15301	+ //case 'L':
14931	15302	if (lightMode)
14932	15303	{
14933	15304	lightMode = false;
..	..	@@ -14997,14 +15368,18 @@
14997	15368	case '3':
14998	15369	case '4':
14999	15370	case '5':
15000		- newenvy = Character.getNumericValue(key);
15001		- repaint();
15002		- break;
15003	15371	case '6':
15004	15372	case '7':
15005	15373	case '8':
15006	15374	case '9':
15007		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
15008	15383	repaint();
15009	15384	break;
15010	15385	case '!':
..	..	@@ -15070,11 +15445,14 @@
15070	15445	case '_':
15071	15446	kompactbit = 5;
15072	15447	break;
15073		- case '+':
15074		- kompactbit = 6;
15075		- break;
	15448	+// case '+':
	15449	+// kompactbit = 6;
	15450	+// break;
15076	15451	case ' ':
15077		- ObjEditor.theFrame.ToggleFullScreen();
	15452	+ lightMode ^= true;
	15453	+ Globals.lighttouched = true;
	15454	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15455	+ targetLookAt.set(manipCamera.lookAt);
15078	15456	repaint();
15079	15457	break;
15080	15458	//case '`' :
..	..	@@ -15121,8 +15499,9 @@
15121	15499	case DELETE:
15122	15500	ClearSelection();
15123	15501	break;
15124		- /*
15125	15502	case '+':
	15503	+
	15504	+ /*
15126	15505	//fontsize += 1;
15127	15506	bbzoom *= 2;
15128	15507	repaint();
..	..	@@ -15139,17 +15518,17 @@
15139	15518	case '=':
15140	15519	IncDepth();
15141	15520	//fontsize += 1;
15142		- object.editWindow.refreshContents(true);
	15521	+ object.GetWindow().refreshContents(true);
15143	15522	maskbit = 6;
15144	15523	break;
15145	15524	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15146	15525	DecDepth();
15147	15526	maskbit = 5;
15148	15527	//if(fontsize > 1) fontsize -= 1;
15149		- if (object.editWindow == null)
15150		- new Exception().printStackTrace();
15151		- else
15152		- object.editWindow.refreshContents(true);
	15528	+// if (object.editWindow == null)
	15529	+// new Exception().printStackTrace();
	15530	+// else
	15531	+ object.GetWindow().refreshContents(true);
15153	15532	break;
15154	15533	case '{':
15155	15534	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15373,7 +15752,7 @@
15373	15752	}
15374	15753	*/
15375	15754
15376		- object.editWindow.EditSelection();
	15755	+ object.GetWindow().EditSelection(false);
15377	15756	}
15378	15757
15379	15758	void SelectParent()
..	..	@@ -15390,10 +15769,10 @@
15390	15769	{
15391	15770	//selectees.remove(i);
15392	15771	System.out.println("select parent of " + elem);
15393		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15772	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15394	15773	} else
15395	15774	{
15396		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15775	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15397	15776	}
15398	15777
15399	15778	first = false;
..	..	@@ -15435,12 +15814,12 @@
15435	15814	for (int j = 0; j < group.children.size(); j++)
15436	15815	{
15437	15816	elem = (Object3D) group.children.elementAt(j);
15438		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15817	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15439	15818	first = false;
15440	15819	}
15441	15820	} else
15442	15821	{
15443		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15822	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15444	15823	}
15445	15824
15446	15825	first = false;
..	..	@@ -15451,21 +15830,21 @@
15451	15830	{
15452	15831	//Composite group = (Composite) object;
15453	15832	Object3D group = object;
15454		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15833	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15455	15834	}
15456	15835
15457	15836	void ResetTransform(int mask)
15458	15837	{
15459	15838	//Composite group = (Composite) object;
15460	15839	Object3D group = object;
15461		- group.editWindow.ResetTransform(mask);
	15840	+ group.GetWindow().ResetTransform(mask);
15462	15841	}
15463	15842
15464	15843	void FlipTransform()
15465	15844	{
15466	15845	//Composite group = (Composite) object;
15467	15846	Object3D group = object;
15468		- group.editWindow.FlipTransform();
	15847	+ group.GetWindow().FlipTransform();
15469	15848	// group.editWindow.ReduceMesh(true);
15470	15849	}
15471	15850
..	..	@@ -15473,7 +15852,7 @@
15473	15852	{
15474	15853	//Composite group = (Composite) object;
15475	15854	Object3D group = object;
15476		- group.editWindow.PrintMemory();
	15855	+ group.GetWindow().PrintMemory();
15477	15856	// group.editWindow.ReduceMesh(true);
15478	15857	}
15479	15858
..	..	@@ -15481,7 +15860,7 @@
15481	15860	{
15482	15861	//Composite group = (Composite) object;
15483	15862	Object3D group = object;
15484		- group.editWindow.ResetCentroid();
	15863	+ group.GetWindow().ResetCentroid();
15485	15864	}
15486	15865
15487	15866	void IncDepth()
..	..	@@ -15563,8 +15942,6 @@
15563	15942
15564	15943	int width = getBounds().width;
15565	15944	int height = getBounds().height;
15566		- ClickInfo info = new ClickInfo();
15567		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15568	15945	//Image img = CreateImage(width, height);
15569	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
15570	15947
..	..	@@ -15641,48 +16018,77 @@
15641	16018	}
15642	16019	if (object != null && !hasMarquee)
15643	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
15644	16027	if (isRenderer)
15645	16028	{
15646		- info.flags++;
	16029	+ object.clickInfo.flags++;
15647	16030	double frameAspect = (double) width / (double) height;
15648	16031	if (frameAspect > renderCamera.aspect)
15649	16032	{
15650	16033	int desired = (int) ((double) height * renderCamera.aspect);
15651		- info.bounds.width -= width - desired;
15652		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
15653	16036	} else
15654	16037	{
15655	16038	int desired = (int) ((double) width / renderCamera.aspect);
15656		- info.bounds.height -= height - desired;
15657		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
15658	16041	}
15659	16042	}
15660		- info.g = gr;
15661		- info.camera = renderCamera;
	16043	+
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
15662	16046	/*
15663	16047	// Memory intensive (brep.verticescopy)
15664	16048	if (!(object instanceof Composite))
15665	16049	object.draw(info, 0, false); // SLOW :
15666	16050	*/
15667		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
15668	16052	{
15669		- object.drawEditHandles(info, 0);
15670		-
15671		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16053	+ Grafreed.Assert(object != null);
	16054	+ Grafreed.Assert(object.selection != null);
	16055	+ if (object.selection.Size() > 0)
15672	16056	{
15673		- switch (object.selection.get(0).hitSomething)
	16057	+ int hitSomething = object.selection.get(0).hitSomething;
	16058	+
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
	16062	+ if (hitSomething == Object3D.hitCenter)
15674	16063	{
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;
	16064	+ info.DX = X;
	16065	+ if (X != 0)
	16066	+ info.DX -= info.bounds.width/2;
	16067	+
	16068	+ info.DY = Y;
	16069	+ if (Y != 0)
	16070	+ info.DY -= info.bounds.height/2;
15684	16071	}
15685		-
	16072	+
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
	16075	+
	16076	+ if (drag && (X != 0 \|\| Y != 0))
	16077	+ {
	16078	+ switch (hitSomething)
	16079	+ {
	16080	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16081	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16082	+ break;
	16083	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16084	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16085	+ break;
	16086	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16087	+ gr.drawLine(X, Y, 0, 0);
	16088	+ break;
	16089	+ }
	16090	+
	16091	+ }
15686	16092	}
15687	16093	}
15688	16094	}
..	..	@@ -16196,7 +16602,9 @@
16196	16602
16197	16603	float BGcolor = 0.5f;
16198	16604
16199		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
16200	16608	{
16201	16609	if (envyoff \|\| cubemap == null)
16202	16610	{
..	..	@@ -16213,7 +16621,17 @@
16213	16621	// Compensates for ExaminerViewer's modification of modelview matrix
16214	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
16215	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
16216	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
16217	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
16218	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16219	16637
..	..	@@ -16226,7 +16644,7 @@
16226	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16227	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
16228	16646	//gl.glEnable(GL.GL_LIGHTING);
16229		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
16230	16648
16231	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16232	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16385,16 +16803,16 @@
16385	16803	cStatic.objectstack[materialdepth++] = checker;
16386	16804	//System.out.println("material " + material);
16387	16805	//Applet3D.tracein(this, selected);
16388		- vector2buffer = checker.projectedVertices;
	16806	+ //vector2buffer = checker.projectedVertices;
16389	16807
16390	16808	//checker.GetMaterial().Draw(this, false); // true);
16391		- DrawMaterial(checker.GetMaterial(), false); // true);
	16809	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16392	16810
16393	16811	materialdepth -= 1;
16394	16812	if (materialdepth > 0)
16395	16813	{
16396		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16397		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16814	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16815	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16398	16816	}
16399	16817	//checker.GetMaterial().opacity = 1f;
16400	16818	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16480,6 +16898,14 @@
16480	16898	}
16481	16899	}
16482	16900
	16901	+ private Object3D GetFolder()
	16902	+ {
	16903	+ Object3D folder = object.GetWindow().copy;
	16904	+ if (object.GetWindow().copy.selection.Size() > 0)
	16905	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16906	+ return folder;
	16907	+ }
	16908	+
16483	16909	class SelectBuffer implements GLEventListener
16484	16910	{
16485	16911
..	..	@@ -16495,7 +16921,7 @@
16495	16921	//new Exception().printStackTrace();
16496	16922	System.out.println("select buffer init");
16497	16923	// Use debug pipeline
16498		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16499	16925
16500	16926	GL gl = drawable.getGL();
16501	16927
..	..	@@ -16559,6 +16985,17 @@
16559	16985
16560	16986	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16561	16987
	16988	+ if (PAINTMODE)
	16989	+ {
	16990	+ if (object.GetWindow().copy.selection.Size() > 0)
	16991	+ {
	16992	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16993	+
	16994	+ // Make what you paint not selectable.
	16995	+ paintobj.ResetSelectable();
	16996	+ }
	16997	+ }
	16998	+
16562	16999	//int tmp = selection_view;
16563	17000	//selection_view = -1;
16564	17001	int temp = DrawMode();
..	..	@@ -16570,6 +17007,17 @@
16570	17007	// temp = DEFAULT; // patch for selection debug
16571	17008	Globals.drawMode = temp; // WARNING
16572	17009
	17010	+ if (PAINTMODE)
	17011	+ {
	17012	+ if (object.GetWindow().copy.selection.Size() > 0)
	17013	+ {
	17014	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17015	+
	17016	+ // Revert.
	17017	+ paintobj.RestoreSelectable();
	17018	+ }
	17019	+ }
	17020	+
16573	17021	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16574	17022
16575	17023	// trying different ways of getting the depth info over
..	..	@@ -16617,6 +17065,8 @@
16617	17065	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16618	17066	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16619	17067	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17068	+
	17069	+ CreateSelectedPoint();
16620	17070
16621	17071	// Will fit the mesh !!!
16622	17072	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16671,29 +17121,31 @@
16671	17121	}
16672	17122
16673	17123	if (!movingcamera && !PAINTMODE)
16674		- object.editWindow.ScreenFitPoint(); // fev 2014
	17124	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16675	17125
16676		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17126	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16677	17127	{
16678		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17128	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16679	17129
16680		- Object3D group = new Object3D("inst" + paintcount++);
	17130	+ if (object.GetWindow().copy.selection.Size() > 0)
	17131	+ {
	17132	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16681	17133
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();
	17134	+ Object3D inst = new Object3D("inst" + paintcount++);
	17135	+
	17136	+ inst.CreateMaterial(); // use a void leaf to select instances
	17137	+
	17138	+ inst.add(paintobj); // link
	17139	+
	17140	+ object.GetWindow().SnapObject(inst);
	17141	+
	17142	+ Object3D folder = paintFolder; // GetFolder();
	17143	+
	17144	+ folder.add(inst);
	17145	+
	17146	+ object.GetWindow().ResetModel();
	17147	+ object.GetWindow().refreshContents();
	17148	+ }
16697	17149	}
16698	17150	else
16699	17151	paintcount = 0;
..	..	@@ -16732,6 +17184,11 @@
16732	17184	//System.out.println("objects[color] = " + objects[color]);
16733	17185	//objects[color].Select();
16734	17186	indexcount = 0;
	17187	+ ObjEditor window = object.GetWindow();
	17188	+ if (window != null && deselect)
	17189	+ {
	17190	+ window.Select(null, deselect, true);
	17191	+ }
16735	17192	object.Select(color, deselect);
16736	17193	}
16737	17194