~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -150,6 +186,8 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
153	191	void SetAsGLRenderer(boolean b)
154	192	{
155	193	isRenderer = b;
..	..	@@ -168,7 +206,8 @@
168	206
169	207	SetCamera(cam);
170	208
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	211
173	212	object = o;
174	213
..	..	@@ -325,7 +364,7 @@
325	364	cStatic.objectstack[materialdepth++] = obj;
326	365	//System.out.println("material " + material);
327	366	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	367	+ //display.vector2buffer = obj.projectedVertices;
329	368	if (obj instanceof Camera)
330	369	{
331	370	display.options1[0] = material.shift;
..	..	@@ -334,14 +373,28 @@
334	373	display.options1[2] = material.shadowbias;
335	374	display.options1[3] = material.aniso;
336	375	display.options1[4] = material.anisoV;
	376	+// System.out.println("display.options1[0] " + display.options1[0]);
	377	+// System.out.println("display.options1[1] " + display.options1[1]);
	378	+// System.out.println("display.options1[2] " + display.options1[2]);
	379	+// System.out.println("display.options1[3] " + display.options1[3]);
	380	+// System.out.println("display.options1[4] " + display.options1[4]);
337	381	display.options2[0] = material.opacity;
338	382	display.options2[1] = material.diffuse;
339	383	display.options2[2] = material.factor;
	384	+// System.out.println("display.options2[0] " + display.options2[0]);
	385	+// System.out.println("display.options2[1] " + display.options2[1]);
	386	+// System.out.println("display.options2[2] " + display.options2[2]);
340	387
341	388	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	389	+// System.out.println("display.options3[0] " + display.options3[0]);
	390	+// System.out.println("display.options3[1] " + display.options3[1]);
	391	+// System.out.println("display.options3[2] " + display.options3[2]);
342	392	display.options4[0] = material.cameralight/0.2f;
343	393	display.options4[1] = material.subsurface;
344	394	display.options4[2] = material.sheen;
	395	+// System.out.println("display.options4[0] " + display.options4[0]);
	396	+// System.out.println("display.options4[1] " + display.options4[1]);
	397	+// System.out.println("display.options4[2] " + display.options4[2]);
345	398
346	399	// if (display.CURRENTANTIALIAS > 0)
347	400	// display.options3[3] /= 4;
..	..	@@ -357,7 +410,7 @@
357	410	/**/
358	411	} else
359	412	{
360		- DrawMaterial(material, selected);
	413	+ DrawMaterial(material, selected, obj.projectedVertices);
361	414	}
362	415	} else
363	416	{
..	..	@@ -381,8 +434,8 @@
381	434	cStatic.objectstack[materialdepth++] = obj;
382	435	//System.out.println("material " + material);
383	436	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	437	+ //display.vector2buffer = obj.projectedVertices;
	438	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	439	}
387	440	}
388	441
..	..	@@ -399,8 +452,8 @@
399	452	materialdepth -= 1;
400	453	if (materialdepth > 0)
401	454	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	455	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	456	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	457	}
405	458	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	459	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +473,8 @@
420	473	materialdepth -= 1;
421	474	if (materialdepth > 0)
422	475	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	476	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	477	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	478	}
426	479	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	480	//else
..	..	@@ -462,10 +515,12 @@
462	515	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	516	{
464	517	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	518	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	519	+ // TEST LIVE NORMALS && !obj.dontselect
	520	+ ;
466	521	if (!hasnorm)
467	522	{
468		- // System.out.println("FUCK!!");
	523	+ // System.out.println("Mesh normal");
469	524	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	525	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	526	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1245,12 @@
1190	1245	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1246	}
1192	1247	}
	1248	+
1193	1249	if (flipV)
1194	1250	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1251	else
1196	1252	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1253	+
1197	1254	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1255	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1256
..	..	@@ -1213,10 +1270,12 @@
1213	1270	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1271	}
1215	1272	}
	1273	+
1216	1274	if (flipV)
1217	1275	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1276	else
1219	1277	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1278	+
1220	1279	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1280	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1281
..	..	@@ -1244,8 +1303,10 @@
1244	1303	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1304	else
1246	1305	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1306	+
1247	1307	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1308	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1309	+
1249	1310	count2 += 2;
1250	1311	count3 += 3;
1251	1312	}
..	..	@@ -1601,7 +1662,7 @@
1601	1662	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1663	}
1603	1664
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1665	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1666	{
1606	1667	CameraPane display = this;
1607	1668	//new Exception().printStackTrace();
..	..	@@ -1636,7 +1697,7 @@
1636	1697	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1698	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1699	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1700	+ colorV[3] = 1; // material.opacity;
1640	1701
1641	1702	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1703	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1805,9 @@
1744	1805	display.modelParams7[2] = 0;
1745	1806	display.modelParams7[3] = 0;
1746	1807
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1808	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1809
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1810	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1811	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1812	{
1752	1813	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1949,7 @@
1888	1949	void PushMatrix(double[][] matrix)
1889	1950	{
1890	1951	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1952	+ PushMatrix(matrix, 1);
1892	1953	}
1893	1954
1894	1955	void PushMatrix()
..	..	@@ -2042,7 +2103,7 @@
2042	2103	//System.err.println("Oeil on");
2043	2104	OEIL = true;
2044	2105	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2107	//pingthread.StepToTarget(true);
2047	2108	}
2048	2109
..	..	@@ -2257,7 +2318,7 @@
2257	2318
2258	2319	void ToggleDebug()
2259	2320	{
2260		- DEBUG ^= true;
	2321	+ Globals.DEBUG ^= true;
2261	2322	}
2262	2323
2263	2324	void ToggleLookAt()
..	..	@@ -2265,7 +2326,7 @@
2265	2326	LOOKAT ^= true;
2266	2327	}
2267	2328
2268		- void ToggleRandom()
	2329	+ void ToggleSwitch()
2269	2330	{
2270	2331	SWITCH ^= true;
2271	2332	}
..	..	@@ -2275,10 +2336,17 @@
2275	2336	HANDLES ^= true;
2276	2337	}
2277	2338
	2339	+ Object3D paintFolder;
	2340	+
2278	2341	void TogglePaint()
2279	2342	{
2280	2343	PAINTMODE ^= true;
2281	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
2282	2350	}
2283	2351
2284	2352	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2442,22 @@
2374	2442	{
2375	2443	return currentGL;
2376	2444	}
2377		-
	2445	+
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
2378	2461	/**/
2379	2462	class CacheTexture
2380	2463	{
..	..	@@ -2383,28 +2466,31 @@
2383	2466
2384	2467	int resolution;
2385	2468
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2470	{
2388		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2389	2473	resolution = res;
2390	2474	}
2391	2475	}
2392	2476	/**/
2393	2477
2394	2478	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2398	2484	int pigmentdepth = 0;
2399	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2486	int bumpdepth = 0;
2401	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2492
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2494	{
2409	2495	TextureData texturedata = null;
2410	2496
..	..	@@ -2423,13 +2509,34 @@
2423	2509	if (bump)
2424	2510	texturedata = ConvertBump(texturedata, false);
2425	2511
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2514
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2517
2432		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2433	2540	}
2434	2541
2435	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3609,8 @@
3502	3609
3503	3610	System.out.println("LOADING TEXTURE : " + name);
3504	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3505	3614	//
3506	3615	if (false) // compressbit > 0)
3507	3616	{
..	..	@@ -7900,7 +8009,7 @@
7900	8009	String pigment = Object3D.GetPigment(tex);
7901	8010	String bump = Object3D.GetBump(tex);
7902	8011
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8013	{
7905	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8015	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8024,69 @@
7915	8024	pigment = null;
7916	8025	}
7917	8026
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
7920	8029	}
7921	8030
7922		- void ReleaseTexture(String tex, boolean bump)
	8031	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8032	+ {
	8033	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8034	+ {
	8035	+ return;
	8036	+ }
	8037	+
	8038	+ if (tex == null)
	8039	+ {
	8040	+ ReleaseTexture(null, false);
	8041	+ return;
	8042	+ }
	8043	+
	8044	+ String pigment = Object3D.GetPigment(tex);
	8045	+
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8047	+ {
	8048	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8049	+ // System.out.println("; bump = " + bump);
	8050	+ }
	8051	+
	8052	+ if (pigment.equals(""))
	8053	+ {
	8054	+ pigment = null;
	8055	+ }
	8056	+
	8057	+ ReleaseTexture(tex, false);
	8058	+ }
	8059	+
	8060	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8061	+ {
	8062	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8063	+ {
	8064	+ return;
	8065	+ }
	8066	+
	8067	+ if (tex == null)
	8068	+ {
	8069	+ ReleaseTexture(null, true);
	8070	+ return;
	8071	+ }
	8072	+
	8073	+ String bump = Object3D.GetBump(tex);
	8074	+
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ {
	8077	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8078	+ // System.out.println("; bump = " + bump);
	8079	+ }
	8080	+
	8081	+ if (bump.equals(""))
	8082	+ {
	8083	+ bump = null;
	8084	+ }
	8085	+
	8086	+ ReleaseTexture(tex, true);
	8087	+ }
	8088	+
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8090	{
7924	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8097,7 @@
7930	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8098
7932	8099	if (tex != null)
7933		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8101
7935	8102	// //assert( texture != null );
7936	8103	// if (texture == null)
..	..	@@ -8024,6 +8191,54 @@
8024	8191
8025	8192	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8193	{
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
	8235	+
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
	8238	+ }
	8239	+
	8240	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8241	+ {
8027	8242	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8243	ambientOcclusion ) // \|\| !textureon)
8029	8244	{
..	..	@@ -8033,17 +8248,47 @@
8033	8248	if (tex == null)
8034	8249	{
8035	8250	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8251	return;
8038	8252	}
8039	8253
8040	8254	String pigment = Object3D.GetPigment(tex);
	8255	+
	8256	+ usedtextures.add(tex);
	8257	+
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8259	+ {
	8260	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8261	+ // System.out.println("; bump = " + bump);
	8262	+ }
	8263	+
	8264	+ if (pigment.equals(""))
	8265	+ {
	8266	+ pigment = null;
	8267	+ }
	8268	+
	8269	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8270	+ BindTexture(tex, false, resolution);
	8271	+ }
	8272	+
	8273	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,true,resolution);
	8284	+ return;
	8285	+ }
	8286	+
8041	8287	String bump = Object3D.GetBump(tex);
8042	8288
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8045	8290
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8292	{
8048	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8053,47 +8298,94 @@
8053	8298	{
8054	8299	bump = null;
8055	8300	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8301
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8065	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8305	}
8069	8306
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8307	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8308	+
	8309	+ private boolean FileExists(String tex)
8071	8310	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8311	+ if (missingTextures.contains(tex))
	8312	+ {
	8313	+ return false;
	8314	+ }
	8315	+
	8316	+ boolean fileExists = new File(tex).exists();
	8317	+
	8318	+ if (!fileExists)
	8319	+ {
	8320	+ // If file exists, the "new File()" is not executed sgain
	8321	+ missingTextures.add(tex);
	8322	+ }
	8323	+
	8324	+ return fileExists;
	8325	+ }
	8326	+
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8328	+ {
	8329	+ CacheTexture texturecache = null;
8073	8330
8074	8331	if (tex != null)
8075	8332	{
8076		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8335
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
	8340	+
	8341	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8342	+
8078	8343	// String[] split = tex.split("Textures");
8079	8344	// if (split.length > 1)
8080	8345	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8346	// else
8082	8347	// if (!texname.startsWith("/"))
8083	8348	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8349	+ if (!FileExists(texname))
8085	8350	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8351	+ texname = fallbackTextureName;
8087	8352	}
8088	8353
8089	8354	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8355	{
8096		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8389	{
8098	8390	assert(!bump);
8099	8391	// if (bump)
..	..	@@ -8104,19 +8396,23 @@
8104	8396	// }
8105	8397	// else
8106	8398	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8109	8401	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8112	8406	// }
8113	8407	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8409	{
8116	8410	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
8120	8416	} else
8121	8417	{
8122	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8420,13 @@
8124	8420	// texture = GetResourceTexture("default.png");
8125	8421	//} else
8126	8422	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8128	8424	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
8132	8430	} else
8133	8431	{
8134	8432	if (textureon)
..	..	@@ -8153,7 +8451,7 @@
8153	8451	}
8154	8452
8155	8453	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8454	+ if (!FileExists(cachename))
8157	8455	cachename = texname;
8158	8456	else
8159	8457	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8473,7 @@
8175	8473	}
8176	8474
8177	8475	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8476	+ if (!FileExists(cachename))
8179	8477	cachename = texname;
8180	8478	else
8181	8479	processbump = false; // don't process bump map again
..	..	@@ -8187,19 +8485,19 @@
8187	8485	if (texturedata == null)
8188	8486	throw new Exception();
8189	8487
8190		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8191	8489	//texture = GetTexture(tex, bump);
8192	8490	}
8193	8491	}
8194	8492	//}
8195	8493	}
8196	8494
8197		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8198	8496	{
8199	8497	//return false;
8200	8498
8201	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8202		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8203	8501	{
8204	8502	// String ext = "_highres";
8205	8503	// if (REDUCETEXTURE)
..	..	@@ -8216,52 +8514,17 @@
8216	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8217	8515	if (!cachefile.exists())
8218	8516	{
8219		- // cache to disk
8220		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8221		- //buffers[0].
8222		-
8223		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8224		- int[] pixels = new int[bytebuf.capacity()/3];
8225		-
8226		- // squared size heuristic...
8227		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8228	8518	{
8229		- for (int i=pixels.length; --i>=0;)
8230		- {
8231		- int i3 = i*3;
8232		- pixels[i] = 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8237		- pixels[i] <<= 8;
8238		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8239		- }
8240		-
8241		- /*
8242		- int r=0,g=0,b=0,a=0;
8243		- for (int i=0; i<width; i++)
8244		- for (int j=0; j<height; j++)
8245		- {
8246		- int index = j*width+i;
8247		- int p = pixels[index];
8248		- a = ((p>>24) & 0xFF);
8249		- r = ((p>>16) & 0xFF);
8250		- g = ((p>>8) & 0xFF);
8251		- b = (p & 0xFF);
8252		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8253		- }
8254		- /**/
8255		- int width = (int)Math.sqrt(pixels.length); // squared
8256		- int height = width;
8257		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8258		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8259	8521	ImageWriter writer = null;
8260	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8261	8523	if (iter.hasNext()) {
8262	8524	writer = (ImageWriter)iter.next();
8263	8525	}
8264		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8265	8528	try
8266	8529	{
8267	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8278,18 +8541,20 @@
8278	8541	}
8279	8542	}
8280	8543	}
8281		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8282	8547	//System.out.println("Texture = " + tex);
8283		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8284	8549	{
8285		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8286	8551	thetex.texture.disable();
8287	8552	thetex.texture.dispose();
8288		- textures.remove(texname);
	8553	+ textures.remove(tex);
8289	8554	}
8290	8555
8291		- texture.texturedata = texturedata;
8292		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8293	8558
8294	8559	// newtex = true;
8295	8560	}
..	..	@@ -8305,10 +8570,44 @@
8305	8570	}
8306	8571	}
8307	8572
8308		- return texture;
	8573	+ return texturecache;
8309	8574	}
8310	8575
8311		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8312	8611	{
8313	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8314	8613
..	..	@@ -8326,21 +8625,21 @@
8326	8625	return texture!=null?texture.texture:null;
8327	8626	}
8328	8627
8329		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8330	8629	{
8331	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8332	8631
8333	8632	return texture!=null?texture.texturedata:null;
8334	8633	}
8335	8634
8336		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8337	8636	{
8338	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8339	8638	{
8340	8639	return false;
8341	8640	}
8342	8641
8343		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8344	8643
8345	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8346	8645
..	..	@@ -8372,9 +8671,75 @@
8372	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8373	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8374	8673
8375		- return newtex;
	8674	+ return true; // Warning: not used.
8376	8675	}
8377	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8378	8743	ShadowBuffer shadowPBuf;
8379	8744	AntialiasBuffer antialiasPBuf;
8380	8745	int MAXSTACK;
..	..	@@ -9210,11 +9575,35 @@
9210	9575	jy8[3] = 0.5f;
9211	9576	}
9212	9577
9213		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9578	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9214	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9580	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9581	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	9582
	9583	+ void ResetOptions()
	9584	+ {
	9585	+ options1[0] = 100;
	9586	+ options1[1] = 0.025f;
	9587	+ options1[2] = 0.01f;
	9588	+ options1[3] = 0;
	9589	+ options1[4] = 0;
	9590	+
	9591	+ options2[0] = 0;
	9592	+ options2[1] = 0.75f;
	9593	+ options2[2] = 0;
	9594	+ options2[3] = 0;
	9595	+
	9596	+ options3[0] = 1;
	9597	+ options3[1] = 1;
	9598	+ options3[2] = 1;
	9599	+ options3[3] = 0;
	9600	+
	9601	+ options4[0] = 1;
	9602	+ options4[1] = 0;
	9603	+ options4[2] = 1;
	9604	+ options4[3] = 0;
	9605	+ }
	9606	+
9218	9607	static int imagecount = 0; // movie generation
9219	9608
9220	9609	static int jitter = 0;
..	..	@@ -9310,8 +9699,8 @@
9310	9699	assert (parentcam != renderCamera);
9311	9700
9312	9701	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9702	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9315	9704
9316	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9706
..	..	@@ -9326,8 +9715,8 @@
9326	9715	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9716
9328	9717	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9718	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9331	9720
9332	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9722
..	..	@@ -10325,6 +10714,7 @@
10325	10714	ANTIALIAS = 0;
10326	10715	//System.out.println("RESTART");
10327	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
10328	10718	}
10329	10719	}
10330	10720	}
..	..	@@ -10392,13 +10782,14 @@
10392	10782	ambientOcclusion = false;
10393	10783	}
10394	10784
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10787	{
10397	10788	//if (RENDERSHADOW) // ?
10398	10789	if (!IsFrozen())
10399	10790	{
10400	10791	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10792	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10793	{
10403	10794	Globals.framecount++;
10404	10795	shadowbuffer.display();
..	..	@@ -10525,8 +10916,8 @@
10525	10916
10526	10917	// if (parentcam != renderCamera) // not a light
10527	10918	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10919	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10530	10921
10531	10922	for (int j = 0; j < 4; j++)
10532	10923	{
..	..	@@ -10540,8 +10931,8 @@
10540	10931
10541	10932	// if (parentcam != renderCamera) // not a light
10542	10933	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10934	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10545	10936
10546	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	10938
..	..	@@ -10832,9 +11223,9 @@
10832	11223
10833	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
10834	11225
10835		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10836		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10837		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
10838	11229	} else
10839	11230	{
10840	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10845,7 +11236,7 @@
10845	11236	//System.out.println("BLENDING ON");
10846	11237	gl.glEnable(GL.GL_BLEND);
10847	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10848		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10849	11240	gl.glMatrixMode(gl.GL_PROJECTION);
10850	11241	gl.glLoadIdentity();
10851	11242
..	..	@@ -10934,8 +11325,8 @@
10934	11325	System.err.println("parentcam != renderCamera");
10935	11326
10936	11327	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11328	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11329	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10939	11330	}
10940	11331
10941	11332	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11347,8 @@
10956	11347	if (true) // TODO
10957	11348	{
10958	11349	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11350	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11351	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10961	11352	}
10962	11353
10963	11354	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11094,7 +11485,7 @@
11094	11485	}
11095	11486	}
11096	11487
11097		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11098	11489	{
11099	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11100	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11102,24 +11493,21 @@
11102	11493
11103	11494	boolean texon = textureon;
11104	11495
11105		- if (RENDERPROGRAM > 0)
11106		- {
11107		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11108		- textureon = false;
11109		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11110	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11111	11500	//System.out.println("ALLO");
11112	11501	gl.glColorMask(false, false, false, false);
11113	11502	DrawObject(gl);
11114		- if (RENDERPROGRAM > 0)
11115		- {
11116		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11117		- textureon = texon;
11118		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11119	11507	gl.glColorMask(true, true, true, true);
11120	11508
11121	11509	gl.glDepthFunc(GL.GL_EQUAL);
11122		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11123	11511	}
11124	11512
11125	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11302,15 +11690,36 @@
11302	11690
11303	11691	static boolean zoomonce = false;
11304	11692
	11693	+ static void CreateSelectedPoint()
	11694	+ {
	11695	+ if (selectedpoint == null)
	11696	+ {
	11697	+ debugpointG = new Sphere();
	11698	+ debugpointP = new Sphere();
	11699	+ debugpointC = new Sphere();
	11700	+ debugpointR = new Sphere();
	11701	+
	11702	+ selectedpoint = new Superellipsoid();
	11703	+
	11704	+ for (int i=0; i<8; i++)
	11705	+ {
	11706	+ debugpoints[i] = new Sphere();
	11707	+ }
	11708	+ }
	11709	+ }
	11710	+
11305	11711	void DrawObject(GL gl, boolean draw)
11306	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
11307	11716	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11717	// DrawMode() = SELECTION;
11309	11718	//GL gl = getGL();
11310	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11720	{
11312	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314	11723	pingthread.StepToTarget(true); // true);
11315	11724	// zoomonce = false;
11316	11725	}
..	..	@@ -11382,8 +11791,9 @@
11382	11791
11383	11792	if (DrawMode() == DEFAULT)
11384	11793	{
11385		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
11386	11795	{
	11796	+ CreateSelectedPoint();
11387	11797	float radius = 0.05f;
11388	11798	if (selectedpoint.radius != radius)
11389	11799	{
..	..	@@ -11437,20 +11847,32 @@
11437	11847	ReleaseTextures(DEFAULT_TEXTURES);
11438	11848
11439	11849	if (CLEANCACHE)
11440		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11441	11851	{
11442		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11443	11853
11444	11854	// System.out.println("Texture --------- " + tex);
11445	11855
11446		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11447	11857	continue;
11448	11858
11449		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11450	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11451	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11452		- textures.get(tex).texture.dispose();
11453		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11454	11876	}
11455	11877	}
11456	11878	}
..	..	@@ -11869,8 +12291,8 @@
11869	12291	//obj.TransformToWorld(light, light);
11870	12292	for (int i = tp.size(); --i >= 0;)
11871	12293	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- LA.xformPos(light, tp.get(i).toParent, light);
	12294	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11874	12296	}
11875	12297
11876	12298
..	..	@@ -11887,8 +12309,8 @@
11887	12309	parentcam = cameras[0];
11888	12310	}
11889	12311
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12312	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12313	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11892	12314
11893	12315	LA.xformPos(light, renderCamera.toScreen, light);
11894	12316
..	..	@@ -11979,7 +12401,74 @@
11979	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11980	12402
11981	12403	String program =
	12404	+ // Min shader
11982	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
11983	12472	//"OPTION ARB_fragment_program_shadow;" +
11984	12473	"PARAM light2cam0 = program.env[10];" +
11985	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12094,8 +12583,7 @@
12094	12583	"TEMP shininess;" +
12095	12584	"\n" +
12096	12585	"MOV texSamp, one;" +
12097		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12098		-
	12586	+
12099	12587	"MOV mapgrid.x, one2048th.x;" +
12100	12588	"MOV temp, fragment.texcoord[1];" +
12101	12589	/*
..	..	@@ -12116,20 +12604,20 @@
12116	12604	"MUL temp, floor, mapgrid.x;" +
12117	12605	//"TEX depth0, temp, texture[1], 2D;" +
12118	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12119		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12120	12608	"") +
12121	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12122	12610	//"TEX depth1, temp, texture[1], 2D;" +
12123	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12124		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12125	12613	"") +
12126	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12127	12615	//"TEX depth2, temp, texture[1], 2D;" +
12128		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12129	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12130	12618	//"TEX depth3, temp, texture[1], 2D;" +
12131	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12132		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12133	12621	"") +
12134	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12135	12623	//"MOV params, material;" +
..	..	@@ -12500,7 +12988,7 @@
12500	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12501	12989	"") +
12502	12990
12503		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12504	12992	"SUB temp.x, half.x, shadow.x;" +
12505	12993	"MOV temp.y, -params5.z;" + // params6.x;" +
12506	12994	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -12927,25 +13415,26 @@
12927	13415	return out;
12928	13416	}
12929	13417
12930		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
12931	13420	{
12932	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12933	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12934	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12935	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12936		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12937		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12938		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12939		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12940	13429	//"SWZ buffer, temp, w,w,w,w;";
12941		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12942	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12943	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12944	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12945		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12946	13435
12947		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12948		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12949	13438	}
12950	13439
12951	13440	String Shadow(String depth, String shadow)
..	..	@@ -12992,7 +13481,7 @@
12992	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
12993	13482	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12994	13483
12995		- // No shadow when out of frustrum
	13484	+ // No shadow when out of frustum
12996	13485	"SGE temp.x, " + depth + ".z, one.z;" +
12997	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12998	13487	"";
..	..	@@ -13140,7 +13629,8 @@
13140	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13141	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13142	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13143		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
13144	13634
13145	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13146	13636	// OUT : diff, spec
..	..	@@ -13156,9 +13646,10 @@
13156	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
13157	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13158	13648	//"MOV " + dest + ".w," + "normal.z;" +
13159		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13160		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13161		- //"MOV " + dest + ".z," + "params2.w;" +
	13649	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13650	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13651	+
	13652	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13162	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13163	13654	"RCP " + dest + ".w," + dest + ".w;" +
13164	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13663,6 +14154,7 @@
13663	14154	else
13664	14155	if (evt.getSource() == AAtimer)
13665	14156	{
	14157	+ Globals.TIMERRUNNING = false;
13666	14158	if (mouseDown)
13667	14159	{
13668	14160	//new Exception().printStackTrace();
..	..	@@ -13722,7 +14214,7 @@
13722	14214
13723	14215	// fev 2014???
13724	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13725		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13726	14218	pingthread.StepToTarget(true); // true);
13727	14219	}
13728	14220	// if (!LIVE)
..	..	@@ -13737,6 +14229,7 @@
13737	14229	return;
13738	14230
13739	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
13740	14233
13741	14234	// waslive = LIVE;
13742	14235	// LIVE = false;
..	..	@@ -13786,14 +14279,15 @@
13786	14279	drag = false;
13787	14280	//System.out.println("Mouse DOWN");
13788	14281	editObj = false;
13789		- ClickInfo info = new ClickInfo();
13790		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13791		- info.pane = this;
13792		- info.camera = renderCamera;
13793		- info.x = x;
13794		- info.y = y;
13795		- info.modifiers = modifiersex;
13796		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
13797	14291	if (!editObj)
13798	14292	{
13799	14293	hasMarquee = true;
..	..	@@ -13809,9 +14303,12 @@
13809	14303
13810	14304	public void mouseDragged(MouseEvent e)
13811	14305	{
	14306	+ Globals.MOUSEDRAGGED = true;
	14307	+
13812	14308	//System.out.println("mouseDragged: " + e);
13813	14309	if (isRenderer)
13814	14310	movingcamera = true;
	14311	+
13815	14312	//if (drawing)
13816	14313	//return;
13817	14314	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14072,12 +14569,12 @@
14072	14569	void GoDown(int mod)
14073	14570	{
14074	14571	MODIFIERS \|= COMMAND;
14075		- /*
	14572	+ /**/
14076	14573	if((mod&SHIFT) == SHIFT)
14077	14574	manipCamera.RotatePosition(0, -speed);
14078	14575	else
14079		- manipCamera.BackForth(0, -speed*delta, getWidth());
14080		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
14081	14578	if ((mod & SHIFT) == SHIFT)
14082	14579	{
14083	14580	mouseMode = mouseMode; // VR??
..	..	@@ -14093,12 +14590,12 @@
14093	14590	void GoUp(int mod)
14094	14591	{
14095	14592	MODIFIERS \|= COMMAND;
14096		- /*
	14593	+ /**/
14097	14594	if((mod&SHIFT) == SHIFT)
14098	14595	manipCamera.RotatePosition(0, speed);
14099	14596	else
14100		- manipCamera.BackForth(0, speed*delta, getWidth());
14101		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
14102	14599	if ((mod & SHIFT) == SHIFT)
14103	14600	{
14104	14601	mouseMode = mouseMode;
..	..	@@ -14114,12 +14611,12 @@
14114	14611	void GoLeft(int mod)
14115	14612	{
14116	14613	MODIFIERS \|= COMMAND;
14117		- /*
	14614	+ /**/
14118	14615	if((mod&SHIFT) == SHIFT)
14119		- manipCamera.RotatePosition(speed, 0);
14120		- else
14121	14616	manipCamera.Translate(speed*delta, 0, getWidth());
14122		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
14123	14620	if ((mod & SHIFT) == SHIFT)
14124	14621	{
14125	14622	mouseMode = mouseMode;
..	..	@@ -14135,12 +14632,12 @@
14135	14632	void GoRight(int mod)
14136	14633	{
14137	14634	MODIFIERS \|= COMMAND;
14138		- /*
	14635	+ /**/
14139	14636	if((mod&SHIFT) == SHIFT)
14140		- manipCamera.RotatePosition(-speed, 0);
14141		- else
14142	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
14143		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
14144	14641	if ((mod & SHIFT) == SHIFT)
14145	14642	{
14146	14643	mouseMode = mouseMode;
..	..	@@ -14190,14 +14687,16 @@
14190	14687	if (editObj)
14191	14688	{
14192	14689	drag = true;
14193		- ClickInfo info = new ClickInfo();
14194		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14195	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14196		- info.pane = this;
14197		- info.camera = renderCamera;
14198		- info.x = x;
14199		- info.y = y;
14200		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14201	14700	} else
14202	14701	{
14203	14702	if (x < startX)
..	..	@@ -14346,22 +14845,27 @@
14346	14845	}
14347	14846	}
14348	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14349	14850	public void mouseMoved(MouseEvent e)
14350	14851	{
14351	14852	//System.out.println("mouseMoved: " + e);
14352	14853	if (isRenderer)
14353	14854	return;
14354	14855
14355		- ClickInfo ci = new ClickInfo();
14356		- ci.x = e.getX();
14357		- ci.y = e.getY();
14358		- ci.modifiers = e.getModifiersEx();
14359		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14360		- ci.pane = this;
14361		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
14362	14863	if (!isRenderer)
14363	14864	{
14364		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14365	14869	{
14366	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14367	14871	} else
..	..	@@ -14373,8 +14877,11 @@
14373	14877
14374	14878	public void mouseReleased(MouseEvent e)
14375	14879	{
	14880	+ Globals.MOUSEDRAGGED = false;
	14881	+
14376	14882	movingcamera = false;
14377		- X = Y = 0;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
14378	14885	//System.out.println("mouseReleased: " + e);
14379	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14380	14887	}
..	..	@@ -14630,7 +15137,8 @@
14630	15137	// break;
14631	15138	case 'T':
14632	15139	CACHETEXTURE ^= true;
14633		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14634	15142	// repaint();
14635	15143	break;
14636	15144	case 'Y':
..	..	@@ -14715,7 +15223,9 @@
14715	15223	case 'E' : COMPACT ^= true;
14716	15224	repaint();
14717	15225	break;
14718		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
14719	15229	repaint();
14720	15230	break;
14721	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14740,8 +15250,8 @@
14740	15250	RevertCamera();
14741	15251	repaint();
14742	15252	break;
14743		- case 'L':
14744	15253	case 'l':
	15254	+ //case 'L':
14745	15255	if (lightMode)
14746	15256	{
14747	15257	lightMode = false;
..	..	@@ -14884,9 +15394,9 @@
14884	15394	case '_':
14885	15395	kompactbit = 5;
14886	15396	break;
14887		- case '+':
14888		- kompactbit = 6;
14889		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
14890	15400	case ' ':
14891	15401	lightMode ^= true;
14892	15402	Globals.lighttouched = true;
..	..	@@ -14898,6 +15408,7 @@
14898	15408	case ESC:
14899	15409	RENDERPROGRAM += 1;
14900	15410	RENDERPROGRAM %= 3;
	15411	+
14901	15412	repaint();
14902	15413	break;
14903	15414	case 'Z':
..	..	@@ -14937,8 +15448,9 @@
14937	15448	case DELETE:
14938	15449	ClearSelection();
14939	15450	break;
14940		- /*
14941	15451	case '+':
	15452	+
	15453	+ /*
14942	15454	//fontsize += 1;
14943	15455	bbzoom *= 2;
14944	15456	repaint();
..	..	@@ -14955,17 +15467,17 @@
14955	15467	case '=':
14956	15468	IncDepth();
14957	15469	//fontsize += 1;
14958		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
14959	15471	maskbit = 6;
14960	15472	break;
14961	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14962	15474	DecDepth();
14963	15475	maskbit = 5;
14964	15476	//if(fontsize > 1) fontsize -= 1;
14965		- if (object.editWindow == null)
14966		- new Exception().printStackTrace();
14967		- else
14968		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
14969	15481	break;
14970	15482	case '{':
14971	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15189,7 +15701,7 @@
15189	15701	}
15190	15702	*/
15191	15703
15192		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
15193	15705	}
15194	15706
15195	15707	void SelectParent()
..	..	@@ -15206,10 +15718,10 @@
15206	15718	{
15207	15719	//selectees.remove(i);
15208	15720	System.out.println("select parent of " + elem);
15209		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15210	15722	} else
15211	15723	{
15212		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15213	15725	}
15214	15726
15215	15727	first = false;
..	..	@@ -15251,12 +15763,12 @@
15251	15763	for (int j = 0; j < group.children.size(); j++)
15252	15764	{
15253	15765	elem = (Object3D) group.children.elementAt(j);
15254		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15255	15767	first = false;
15256	15768	}
15257	15769	} else
15258	15770	{
15259		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15260	15772	}
15261	15773
15262	15774	first = false;
..	..	@@ -15267,21 +15779,21 @@
15267	15779	{
15268	15780	//Composite group = (Composite) object;
15269	15781	Object3D group = object;
15270		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15271	15783	}
15272	15784
15273	15785	void ResetTransform(int mask)
15274	15786	{
15275	15787	//Composite group = (Composite) object;
15276	15788	Object3D group = object;
15277		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
15278	15790	}
15279	15791
15280	15792	void FlipTransform()
15281	15793	{
15282	15794	//Composite group = (Composite) object;
15283	15795	Object3D group = object;
15284		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
15285	15797	// group.editWindow.ReduceMesh(true);
15286	15798	}
15287	15799
..	..	@@ -15289,7 +15801,7 @@
15289	15801	{
15290	15802	//Composite group = (Composite) object;
15291	15803	Object3D group = object;
15292		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
15293	15805	// group.editWindow.ReduceMesh(true);
15294	15806	}
15295	15807
..	..	@@ -15297,7 +15809,7 @@
15297	15809	{
15298	15810	//Composite group = (Composite) object;
15299	15811	Object3D group = object;
15300		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
15301	15813	}
15302	15814
15303	15815	void IncDepth()
..	..	@@ -15379,8 +15891,6 @@
15379	15891
15380	15892	int width = getBounds().width;
15381	15893	int height = getBounds().height;
15382		- ClickInfo info = new ClickInfo();
15383		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15384	15894	//Image img = CreateImage(width, height);
15385	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
15386	15896
..	..	@@ -15457,43 +15967,77 @@
15457	15967	}
15458	15968	if (object != null && !hasMarquee)
15459	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15460	15976	if (isRenderer)
15461	15977	{
15462		- info.flags++;
	15978	+ object.clickInfo.flags++;
15463	15979	double frameAspect = (double) width / (double) height;
15464	15980	if (frameAspect > renderCamera.aspect)
15465	15981	{
15466	15982	int desired = (int) ((double) height * renderCamera.aspect);
15467		- info.bounds.width -= width - desired;
15468		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15469	15985	} else
15470	15986	{
15471	15987	int desired = (int) ((double) width / renderCamera.aspect);
15472		- info.bounds.height -= height - desired;
15473		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15474	15990	}
15475	15991	}
15476		- info.g = gr;
15477		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15478	15995	/*
15479	15996	// Memory intensive (brep.verticescopy)
15480	15997	if (!(object instanceof Composite))
15481	15998	object.draw(info, 0, false); // SLOW :
15482	15999	*/
15483		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15484	16001	{
15485		- object.drawEditHandles(info, 0);
15486		-
15487		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
15488	16005	{
15489		- switch (object.selection.get(0).hitSomething)
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
15490	16012	{
15491		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15493		- case Object3D.hitScale: gr.setColor(Color.cyan); break;
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
15494	16020	}
15495		-
15496		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
15497	16041	}
15498	16042	}
15499	16043	}
..	..	@@ -15911,7 +16455,7 @@
15911	16455	Object3D object;
15912	16456	static Object3D trackedobject;
15913	16457	Camera renderCamera; // Light or Eye (or Occlusion)
15914		- /static/ Camera manipCamera; // Light or Eye
	16458	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15915	16459	/static/ Camera eyeCamera;
15916	16460	/static/ Camera lightCamera;
15917	16461	int cameracount;
..	..	@@ -16196,16 +16740,16 @@
16196	16740	cStatic.objectstack[materialdepth++] = checker;
16197	16741	//System.out.println("material " + material);
16198	16742	//Applet3D.tracein(this, selected);
16199		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
16200	16744
16201	16745	//checker.GetMaterial().Draw(this, false); // true);
16202		- DrawMaterial(checker.GetMaterial(), false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16203	16747
16204	16748	materialdepth -= 1;
16205	16749	if (materialdepth > 0)
16206	16750	{
16207		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16208		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16751	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16752	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16209	16753	}
16210	16754	//checker.GetMaterial().opacity = 1f;
16211	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16291,6 +16835,14 @@
16291	16835	}
16292	16836	}
16293	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
16294	16846	class SelectBuffer implements GLEventListener
16295	16847	{
16296	16848
..	..	@@ -16370,6 +16922,17 @@
16370	16922
16371	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16372	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
16373	16936	//int tmp = selection_view;
16374	16937	//selection_view = -1;
16375	16938	int temp = DrawMode();
..	..	@@ -16381,6 +16944,17 @@
16381	16944	// temp = DEFAULT; // patch for selection debug
16382	16945	Globals.drawMode = temp; // WARNING
16383	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
16384	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16385	16959
16386	16960	// trying different ways of getting the depth info over
..	..	@@ -16428,6 +17002,8 @@
16428	17002	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16429	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16430	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17005	+
	17006	+ CreateSelectedPoint();
16431	17007
16432	17008	// Will fit the mesh !!!
16433	17009	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16482,29 +17058,31 @@
16482	17058	}
16483	17059
16484	17060	if (!movingcamera && !PAINTMODE)
16485		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16486	17062
16487		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16488	17064	{
16489		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16490	17066
16491		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16492	17070
16493		- group.CreateMaterial(); // use a void leaf to select instances
16494		-
16495		- group.add(paintobj); // link
16496		-
16497		- object.editWindow.SnapObject(group);
16498		-
16499		- Object3D folder = object.editWindow.copy;
16500		-
16501		- if (object.editWindow.copy.selection.Size() > 0)
16502		- folder = object.editWindow.copy.selection.elementAt(0);
16503		-
16504		- folder.add(group);
16505		-
16506		- object.editWindow.ResetModel();
16507		- object.editWindow.refreshContents();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
16508	17086	}
16509	17087	else
16510	17088	paintcount = 0;
..	..	@@ -16543,6 +17121,11 @@
16543	17121	//System.out.println("objects[color] = " + objects[color]);
16544	17122	//objects[color].Select();
16545	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
16546	17129	object.Select(color, deselect);
16547	17130	}
16548	17131
..	..	@@ -17068,23 +17651,15 @@
17068	17651	int AAbuffersize = 0;
17069	17652
17070	17653	//double[] selectedpoint = new double[3];
17071		- static Superellipsoid selectedpoint = new Superellipsoid();
	17654	+ static Superellipsoid selectedpoint;
17072	17655	static Sphere previousselectedpoint = null;
17073		- static Sphere debugpointG = new Sphere();
17074		- static Sphere debugpointP = new Sphere();
17075		- static Sphere debugpointC = new Sphere();
17076		- static Sphere debugpointR = new Sphere();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
17077	17660
17078	17661	static Sphere debugpoints[] = new Sphere[8];
17079	17662
17080		- static
17081		- {
17082		- for (int i=0; i<8; i++)
17083		- {
17084		- debugpoints[i] = new Sphere();
17085		- }
17086		- }
17087		-
17088	17663	static void InitPoints(float radius)
17089	17664	{
17090	17665	for (int i=0; i<8; i++)