~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -61,7 +60,7 @@
61	60	//boolean REDUCETEXTURE = true;
62	61	boolean CACHETEXTURE = true;
63	62	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
65	64	boolean COMPRESSTEXTURE = false;
66	65	boolean KOMPACTTEXTURE = false; // true;
67	66	boolean RESIZETEXTURE = false;
..	..	@@ -327,7 +326,7 @@
327	326	cStatic.objectstack[materialdepth++] = obj;
328	327	//System.out.println("material " + material);
329	328	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
331	330	if (obj instanceof Camera)
332	331	{
333	332	display.options1[0] = material.shift;
..	..	@@ -336,14 +335,28 @@
336	335	display.options1[2] = material.shadowbias;
337	336	display.options1[3] = material.aniso;
338	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
339	343	display.options2[0] = material.opacity;
340	344	display.options2[1] = material.diffuse;
341	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
342	349
343	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
344	354	display.options4[0] = material.cameralight/0.2f;
345	355	display.options4[1] = material.subsurface;
346	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
347	360
348	361	// if (display.CURRENTANTIALIAS > 0)
349	362	// display.options3[3] /= 4;
..	..	@@ -359,7 +372,7 @@
359	372	/**/
360	373	} else
361	374	{
362		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
363	376	}
364	377	} else
365	378	{
..	..	@@ -383,8 +396,8 @@
383	396	cStatic.objectstack[materialdepth++] = obj;
384	397	//System.out.println("material " + material);
385	398	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	401	}
389	402	}
390	403
..	..	@@ -401,8 +414,8 @@
401	414	materialdepth -= 1;
402	415	if (materialdepth > 0)
403	416	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	419	}
407	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +435,8 @@
422	435	materialdepth -= 1;
423	436	if (materialdepth > 0)
424	437	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	440	}
428	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	442	//else
..	..	@@ -1611,7 +1624,7 @@
1611	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612	1625	}
1613	1626
1614		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615	1628	{
1616	1629	CameraPane display = this;
1617	1630	//new Exception().printStackTrace();
..	..	@@ -1646,7 +1659,7 @@
1646	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1647	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1648	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1649		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1650	1663
1651	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1754,9 +1767,9 @@
1754	1767	display.modelParams7[2] = 0;
1755	1768	display.modelParams7[3] = 0;
1756	1769
1757		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1758	1771
1759		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761	1774	{
1762	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2052,7 +2065,7 @@
2052	2065	//System.err.println("Oeil on");
2053	2066	OEIL = true;
2054	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2055		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2056	2069	//pingthread.StepToTarget(true);
2057	2070	}
2058	2071
..	..	@@ -2267,7 +2280,7 @@
2267	2280
2268	2281	void ToggleDebug()
2269	2282	{
2270		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2271	2284	}
2272	2285
2273	2286	void ToggleLookAt()
..	..	@@ -2285,10 +2298,17 @@
2285	2298	HANDLES ^= true;
2286	2299	}
2287	2300
	2301	+ Object3D paintFolder;
	2302	+
2288	2303	void TogglePaint()
2289	2304	{
2290	2305	PAINTMODE ^= true;
2291	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2292	2312	}
2293	2313
2294	2314	void SwapCamera(int a, int b)
..	..	@@ -2385,6 +2405,45 @@
2385	2405	return currentGL;
2386	2406	}
2387	2407
	2408	+ private BufferedImage CreateBim(TextureData texturedata)
	2409	+ {
	2410	+ // cache to disk
	2411	+ Buffer buffer = texturedata.getBuffer(); // getMipmapData();
	2412	+ //buffers[0].
	2413	+ ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
	2414	+ int[] pixels = new int[bytebuf.capacity()/3];
	2415	+ int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
	2416	+ int height = width;
	2417	+ for (int i=pixels.length; --i>=0;)
	2418	+ {
	2419	+ int i3 = i*3;
	2420	+ pixels[i] = 0xFF;
	2421	+ pixels[i] <<= 8;
	2422	+ pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
	2423	+ pixels[i] <<= 8;
	2424	+ pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
	2425	+ pixels[i] <<= 8;
	2426	+ pixels[i] \|= bytebuf.get(i3) & 0xFF;
	2427	+ }
	2428	+ /*
	2429	+ int r=0,g=0,b=0,a=0;
	2430	+ for (int i=0; i<width; i++)
	2431	+ for (int j=0; j<height; j++)
	2432	+ {
	2433	+ int index = j*width+i;
	2434	+ int p = pixels[index];
	2435	+ a = ((p>>24) & 0xFF);
	2436	+ r = ((p>>16) & 0xFF);
	2437	+ g = ((p>>8) & 0xFF);
	2438	+ b = (p & 0xFF);
	2439	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	2440	+ }
	2441	+ /**/
	2442	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	2443	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	2444	+ return rendImage;
	2445	+ }
	2446	+
2388	2447	/**/
2389	2448	class CacheTexture
2390	2449	{
..	..	@@ -2402,9 +2461,10 @@
2402	2461	/**/
2403	2462
2404	2463	// TEXTURE static Texture texture;
2405		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2406		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2407		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2464	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2465	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2466	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2467	+
2408	2468	int pigmentdepth = 0;
2409	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2410	2470	int bumpdepth = 0;
..	..	@@ -2426,6 +2486,33 @@
2426	2486	true,
2427	2487	com.sun.opengl.util.texture.TextureIO.PNG);
2428	2488	} catch (java.io.IOException e)
	2489	+ {
	2490	+ throw new javax.media.opengl.GLException(e);
	2491	+ }
	2492	+
	2493	+ if (bump)
	2494	+ texturedata = ConvertBump(texturedata, false);
	2495	+
	2496	+ com.sun.opengl.util.texture.Texture texture =
	2497	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2498	+
	2499	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2500	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2501	+
	2502	+ return texture;
	2503	+ }
	2504	+
	2505	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2506	+ {
	2507	+ TextureData texturedata = null;
	2508	+
	2509	+ try
	2510	+ {
	2511	+ texturedata =
	2512	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2513	+ name,
	2514	+ true);
	2515	+ } catch (Exception e)
2429	2516	{
2430	2517	throw new javax.media.opengl.GLException(e);
2431	2518	}
..	..	@@ -3512,6 +3599,8 @@
3512	3599
3513	3600	System.out.println("LOADING TEXTURE : " + name);
3514	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
3515	3604	//
3516	3605	if (false) // compressbit > 0)
3517	3606	{
..	..	@@ -7910,7 +7999,7 @@
7910	7999	String pigment = Object3D.GetPigment(tex);
7911	8000	String bump = Object3D.GetBump(tex);
7912	8001
7913		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7914	8003	{
7915	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7916	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7944,7 +8033,7 @@
7944	8033
7945	8034	String pigment = Object3D.GetPigment(tex);
7946	8035
7947		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948	8037	{
7949	8038	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7950	8039	// System.out.println("; bump = " + bump);
..	..	@@ -7973,7 +8062,7 @@
7973	8062
7974	8063	String bump = Object3D.GetBump(tex);
7975	8064
7976		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977	8066	{
7978	8067	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7979	8068	// System.out.println("; bump = " + bump);
..	..	@@ -8092,47 +8181,50 @@
8092	8181
8093	8182	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8094	8183	{
8095		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8096		- ambientOcclusion ) // \|\| !textureon)
8097		- {
8098		- return; // false;
8099		- }
8100		-
8101		- if (tex == null)
8102		- {
8103		- BindTexture(null,false,resolution);
8104		- BindTexture(null,true,resolution);
8105		- return;
8106		- }
	8184	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8185	+// ambientOcclusion ) // \|\| !textureon)
	8186	+// {
	8187	+// return; // false;
	8188	+// }
	8189	+//
	8190	+// if (tex == null)
	8191	+// {
	8192	+// BindTexture(null,false,resolution);
	8193	+// BindTexture(null,true,resolution);
	8194	+// return;
	8195	+// }
	8196	+//
	8197	+// String pigment = Object3D.GetPigment(tex);
	8198	+// String bump = Object3D.GetBump(tex);
	8199	+//
	8200	+// usedtextures.add(pigment);
	8201	+// usedtextures.add(bump);
	8202	+//
	8203	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8204	+// {
	8205	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8206	+// // System.out.println("; bump = " + bump);
	8207	+// }
	8208	+//
	8209	+// if (bump.equals(""))
	8210	+// {
	8211	+// bump = null;
	8212	+// }
	8213	+// if (pigment.equals(""))
	8214	+// {
	8215	+// pigment = null;
	8216	+// }
	8217	+//
	8218	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8219	+// BindTexture(pigment, false, resolution);
	8220	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+// BindTexture(bump, true, resolution);
	8222	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+//
	8224	+// return; // true;
8107	8225
8108		- String pigment = Object3D.GetPigment(tex);
8109		- String bump = Object3D.GetBump(tex);
8110		-
8111		- usedtextures.put(pigment, pigment);
8112		- usedtextures.put(bump, bump);
8113		-
8114		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8115		- {
8116		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8117		- // System.out.println("; bump = " + bump);
8118		- }
8119		-
8120		- if (bump.equals(""))
8121		- {
8122		- bump = null;
8123		- }
8124		- if (pigment.equals(""))
8125		- {
8126		- pigment = null;
8127		- }
8128		-
8129		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8130		- BindTexture(pigment, false, resolution);
8131		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8132		- BindTexture(bump, true, resolution);
8133		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8134		-
8135		- return; // true;
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
8136	8228	}
8137	8229
8138	8230	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8145,15 +8237,15 @@
8145	8237
8146	8238	if (tex == null)
8147	8239	{
8148		- BindTexture(null,false,resolution);
	8240	+ BindTexture(null, null,false,resolution);
8149	8241	return;
8150	8242	}
8151	8243
8152	8244	String pigment = Object3D.GetPigment(tex);
8153	8245
8154		- usedtextures.put(pigment, pigment);
	8246	+ usedtextures.add(pigment);
8155	8247
8156		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157	8249	{
8158	8250	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8159	8251	// System.out.println("; bump = " + bump);
..	..	@@ -8165,7 +8257,7 @@
8165	8257	}
8166	8258
8167	8259	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168		- BindTexture(pigment, false, resolution);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
8169	8261	}
8170	8262
8171	8263	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8178,15 +8270,15 @@
8178	8270
8179	8271	if (tex == null)
8180	8272	{
8181		- BindTexture(null,true,resolution);
	8273	+ BindTexture(null, null,true,resolution);
8182	8274	return;
8183	8275	}
8184	8276
8185	8277	String bump = Object3D.GetBump(tex);
8186	8278
8187		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
8188	8280
8189		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190	8282	{
8191	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8192	8284	// System.out.println("; bump = " + bump);
..	..	@@ -8198,7 +8290,7 @@
8198	8290	}
8199	8291
8200	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
8202	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203	8295	}
8204	8296
..	..	@@ -8222,9 +8314,9 @@
8222	8314	return fileExists;
8223	8315	}
8224	8316
8225		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8317	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
8226	8318	{
8227		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8319	+ CacheTexture texturecache = null;
8228	8320
8229	8321	if (tex != null)
8230	8322	{
..	..	@@ -8244,12 +8336,22 @@
8244	8336	}
8245	8337
8246	8338	if (CACHETEXTURE)
8247		- texture = textures.get(texname); // TEXTURE CACHE
8248		-
8249		- TextureData texturedata = null;
8250		-
8251		- if (texture == null \|\| texture.resolution < resolution)
8252	8339	{
	8340	+ if (bim == null)
	8341	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8342	+ else
	8343	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8344	+ }
	8345	+
	8346	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8347	+ {
	8348	+ TextureData texturedata = null;
	8349	+
	8350	+ if (bim != null)
	8351	+ {
	8352	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8353	+ }
	8354	+ else
8253	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8254	8356	{
8255	8357	assert(!bump);
..	..	@@ -8261,19 +8363,23 @@
8261	8363	// }
8262	8364	// else
8263	8365	// {
8264		- texture = textures.get(tex);
8265		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
8266	8368	{
8267		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8268	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
8269	8373	// }
8270	8374	} else
8271	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8272	8376	{
8273	8377	assert(bump);
8274		- texture = textures.get(tex);
8275		- if (texture == null)
8276		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8378	+ texturecache = textures.get(tex);
	8379	+ if (texturecache == null)
	8380	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8381	+ else
	8382	+ new Exception().printStackTrace();
8277	8383	} else
8278	8384	{
8279	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -8283,9 +8389,11 @@
8283	8389	//{
8284	8390	if (tex.equals("WHITE_NOISE"))
8285	8391	{
8286		- texture = textures.get(tex);
8287		- if (texture == null)
8288		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8392	+ texturecache = textures.get(tex);
	8393	+ if (texturecache == null)
	8394	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8395	+ else
	8396	+ new Exception().printStackTrace();
8289	8397	} else
8290	8398	{
8291	8399	if (textureon)
..	..	@@ -8344,19 +8452,20 @@
8344	8452	if (texturedata == null)
8345	8453	throw new Exception();
8346	8454
8347		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8455	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8348	8456	//texture = GetTexture(tex, bump);
8349	8457	}
8350	8458	}
8351	8459	//}
8352	8460	}
8353	8461
8354		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8355	8463	{
8356	8464	//return false;
	8465	+ assert(bim == null);
8357	8466
8358	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8359		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8360	8469	{
8361	8470	// String ext = "_highres";
8362	8471	// if (REDUCETEXTURE)
..	..	@@ -8373,52 +8482,17 @@
8373	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8374	8483	if (!cachefile.exists())
8375	8484	{
8376		- // cache to disk
8377		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8378		- //buffers[0].
8379		-
8380		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8381		- int[] pixels = new int[bytebuf.capacity()/3];
8382		-
8383		- // squared size heuristic...
8384		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
8385	8486	{
8386		- for (int i=pixels.length; --i>=0;)
8387		- {
8388		- int i3 = i*3;
8389		- pixels[i] = 0xFF;
8390		- pixels[i] <<= 8;
8391		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8392		- pixels[i] <<= 8;
8393		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8394		- pixels[i] <<= 8;
8395		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8396		- }
8397		-
8398		- /*
8399		- int r=0,g=0,b=0,a=0;
8400		- for (int i=0; i<width; i++)
8401		- for (int j=0; j<height; j++)
8402		- {
8403		- int index = j*width+i;
8404		- int p = pixels[index];
8405		- a = ((p>>24) & 0xFF);
8406		- r = ((p>>16) & 0xFF);
8407		- g = ((p>>8) & 0xFF);
8408		- b = (p & 0xFF);
8409		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8410		- }
8411		- /**/
8412		- int width = (int)Math.sqrt(pixels.length); // squared
8413		- int height = width;
8414		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8415		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
8416	8489	ImageWriter writer = null;
8417	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8418	8491	if (iter.hasNext()) {
8419	8492	writer = (ImageWriter)iter.next();
8420	8493	}
8421		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
8422	8496	try
8423	8497	{
8424	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8445,8 +8519,8 @@
8445	8519	textures.remove(texname);
8446	8520	}
8447	8521
8448		- texture.texturedata = texturedata;
8449		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
8450	8524
8451	8525	// newtex = true;
8452	8526	}
..	..	@@ -8462,12 +8536,17 @@
8462	8536	}
8463	8537	}
8464	8538
8465		- return texture;
	8539	+ return texturecache;
8466	8540	}
8467	8541
8468		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8542	+ static void EmbedTextures(cTexture tex)
8469	8543	{
8470		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8544	+
	8545	+ }
	8546	+
	8547	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8548	+ {
	8549	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8471	8550
8472	8551	if (bump)
8473	8552	{
..	..	@@ -8483,23 +8562,23 @@
8483	8562	return texture!=null?texture.texture:null;
8484	8563	}
8485	8564
8486		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8565	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8487	8566	{
8488		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8489	8568
8490	8569	return texture!=null?texture.texturedata:null;
8491	8570	}
8492	8571
8493		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8494	8573	{
8495	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8496	8575	{
8497	8576	return false;
8498	8577	}
8499	8578
8500		- boolean newtex = false;
	8579	+ //boolean newtex = false;
8501	8580
8502		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8503	8582
8504	8583	if (texture == null)
8505	8584	return false;
..	..	@@ -8529,7 +8608,7 @@
8529	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8530	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8531	8610
8532		- return newtex;
	8611	+ return true; // Warning: not used.
8533	8612	}
8534	8613
8535	8614	ShadowBuffer shadowPBuf;
..	..	@@ -9367,11 +9446,35 @@
9367	9446	jy8[3] = 0.5f;
9368	9447	}
9369	9448
9370		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9449	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9371	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9372	9451	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9373	9452	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9374	9453
	9454	+ void ResetOptions()
	9455	+ {
	9456	+ options1[0] = 100;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
	9459	+ options1[3] = 0;
	9460	+ options1[4] = 0;
	9461	+
	9462	+ options2[0] = 0;
	9463	+ options2[1] = 0.75f;
	9464	+ options2[2] = 0;
	9465	+ options2[3] = 0;
	9466	+
	9467	+ options3[0] = 1;
	9468	+ options3[1] = 1;
	9469	+ options3[2] = 1;
	9470	+ options3[3] = 0;
	9471	+
	9472	+ options4[0] = 1;
	9473	+ options4[1] = 0;
	9474	+ options4[2] = 1;
	9475	+ options4[3] = 0;
	9476	+ }
	9477	+
9375	9478	static int imagecount = 0; // movie generation
9376	9479
9377	9480	static int jitter = 0;
..	..	@@ -10482,6 +10585,7 @@
10482	10585	ANTIALIAS = 0;
10483	10586	//System.out.println("RESTART");
10484	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
10485	10589	}
10486	10590	}
10487	10591	}
..	..	@@ -10549,7 +10653,8 @@
10549	10653	ambientOcclusion = false;
10550	10654	}
10551	10655
10552		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553	10658	{
10554	10659	//if (RENDERSHADOW) // ?
10555	10660	if (!IsFrozen())
..	..	@@ -10960,7 +11065,7 @@
10960	11065
10961	11066	try
10962	11067	{
10963		- BindTexture(NOISE_TEXTURE, false, 2);
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
10964	11069	}
10965	11070	catch (Exception e)
10966	11071	{
..	..	@@ -10989,9 +11094,9 @@
10989	11094
10990	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11096
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11097	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11098	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11099	+gl.glEnable(gl.GL_MULTISAMPLE);
10995	11100	} else
10996	11101	{
10997	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11107,7 @@
11002	11107	//System.out.println("BLENDING ON");
11003	11108	gl.glEnable(GL.GL_BLEND);
11004	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11111	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11112	gl.glLoadIdentity();
11008	11113
..	..	@@ -11459,15 +11564,36 @@
11459	11564
11460	11565	static boolean zoomonce = false;
11461	11566
	11567	+ static void CreateSelectedPoint()
	11568	+ {
	11569	+ if (selectedpoint == null)
	11570	+ {
	11571	+ debugpointG = new Sphere();
	11572	+ debugpointP = new Sphere();
	11573	+ debugpointC = new Sphere();
	11574	+ debugpointR = new Sphere();
	11575	+
	11576	+ selectedpoint = new Superellipsoid();
	11577	+
	11578	+ for (int i=0; i<8; i++)
	11579	+ {
	11580	+ debugpoints[i] = new Sphere();
	11581	+ }
	11582	+ }
	11583	+ }
	11584	+
11462	11585	void DrawObject(GL gl, boolean draw)
11463	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
11464	11590	//System.out.println("DRAW OBJECT " + mouseDown);
11465	11591	// DrawMode() = SELECTION;
11466	11592	//GL gl = getGL();
11467	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11468	11594	{
11469	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11470		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11471	11597	pingthread.StepToTarget(true); // true);
11472	11598	// zoomonce = false;
11473	11599	}
..	..	@@ -11539,8 +11665,9 @@
11539	11665
11540	11666	if (DrawMode() == DEFAULT)
11541	11667	{
11542		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
11543	11669	{
	11670	+ CreateSelectedPoint();
11544	11671	float radius = 0.05f;
11545	11672	if (selectedpoint.radius != radius)
11546	11673	{
..	..	@@ -11603,7 +11730,7 @@
11603	11730	if (tex.equals("WHITE_NOISE"))
11604	11731	continue;
11605	11732
11606		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
11607	11734	{
11608	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11609	11736	textures.get(tex).texture.dispose();
..	..	@@ -12027,7 +12154,7 @@
12027	12154	for (int i = tp.size(); --i >= 0;)
12028	12155	{
12029	12156	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12157	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12031	12158	}
12032	12159
12033	12160
..	..	@@ -13297,7 +13424,8 @@
13297	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
13301	13429
13302	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303	13431	// OUT : diff, spec
..	..	@@ -13313,9 +13441,10 @@
13313	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
13314	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13315	13443	//"MOV " + dest + ".w," + "normal.z;" +
13316		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13317		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13318		- //"MOV " + dest + ".z," + "params2.w;" +
	13444	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13445	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13446	+
	13447	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13319	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13320	13449	"RCP " + dest + ".w," + dest + ".w;" +
13321	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13820,6 +13949,7 @@
13820	13949	else
13821	13950	if (evt.getSource() == AAtimer)
13822	13951	{
	13952	+ Globals.TIMERRUNNING = false;
13823	13953	if (mouseDown)
13824	13954	{
13825	13955	//new Exception().printStackTrace();
..	..	@@ -13879,7 +14009,7 @@
13879	14009
13880	14010	// fev 2014???
13881	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13882		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13883	14013	pingthread.StepToTarget(true); // true);
13884	14014	}
13885	14015	// if (!LIVE)
..	..	@@ -13894,6 +14024,7 @@
13894	14024	return;
13895	14025
13896	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
13897	14028
13898	14029	// waslive = LIVE;
13899	14030	// LIVE = false;
..	..	@@ -14232,12 +14363,12 @@
14232	14363	void GoDown(int mod)
14233	14364	{
14234	14365	MODIFIERS \|= COMMAND;
14235		- /*
	14366	+ /**/
14236	14367	if((mod&SHIFT) == SHIFT)
14237	14368	manipCamera.RotatePosition(0, -speed);
14238	14369	else
14239		- manipCamera.BackForth(0, -speed*delta, getWidth());
14240		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
14241	14372	if ((mod & SHIFT) == SHIFT)
14242	14373	{
14243	14374	mouseMode = mouseMode; // VR??
..	..	@@ -14253,12 +14384,12 @@
14253	14384	void GoUp(int mod)
14254	14385	{
14255	14386	MODIFIERS \|= COMMAND;
14256		- /*
	14387	+ /**/
14257	14388	if((mod&SHIFT) == SHIFT)
14258	14389	manipCamera.RotatePosition(0, speed);
14259	14390	else
14260		- manipCamera.BackForth(0, speed*delta, getWidth());
14261		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
14262	14393	if ((mod & SHIFT) == SHIFT)
14263	14394	{
14264	14395	mouseMode = mouseMode;
..	..	@@ -14274,12 +14405,12 @@
14274	14405	void GoLeft(int mod)
14275	14406	{
14276	14407	MODIFIERS \|= COMMAND;
14277		- /*
	14408	+ /**/
14278	14409	if((mod&SHIFT) == SHIFT)
14279		- manipCamera.RotatePosition(speed, 0);
14280		- else
14281	14410	manipCamera.Translate(speed*delta, 0, getWidth());
14282		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
14283	14414	if ((mod & SHIFT) == SHIFT)
14284	14415	{
14285	14416	mouseMode = mouseMode;
..	..	@@ -14295,12 +14426,12 @@
14295	14426	void GoRight(int mod)
14296	14427	{
14297	14428	MODIFIERS \|= COMMAND;
14298		- /*
	14429	+ /**/
14299	14430	if((mod&SHIFT) == SHIFT)
14300		- manipCamera.RotatePosition(-speed, 0);
14301		- else
14302	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
14303		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
14304	14435	if ((mod & SHIFT) == SHIFT)
14305	14436	{
14306	14437	mouseMode = mouseMode;
..	..	@@ -14357,7 +14488,8 @@
14357	14488	info.camera = renderCamera;
14358	14489	info.x = x;
14359	14490	info.y = y;
14360		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14361	14493	} else
14362	14494	{
14363	14495	if (x < startX)
..	..	@@ -14521,7 +14653,9 @@
14521	14653	ci.camera = renderCamera;
14522	14654	if (!isRenderer)
14523	14655	{
14524		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
14525	14659	{
14526	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527	14661	} else
..	..	@@ -14536,7 +14670,8 @@
14536	14670	Globals.MOUSEDRAGGED = false;
14537	14671
14538	14672	movingcamera = false;
14539		- X = Y = 0;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
14540	14675	//System.out.println("mouseReleased: " + e);
14541	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14542	14677	}
..	..	@@ -14877,7 +15012,9 @@
14877	15012	case 'E' : COMPACT ^= true;
14878	15013	repaint();
14879	15014	break;
14880		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
14881	15018	repaint();
14882	15019	break;
14883	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14902,8 +15039,8 @@
14902	15039	RevertCamera();
14903	15040	repaint();
14904	15041	break;
14905		- case 'L':
14906	15042	case 'l':
	15043	+ //case 'L':
14907	15044	if (lightMode)
14908	15045	{
14909	15046	lightMode = false;
..	..	@@ -15046,9 +15183,9 @@
15046	15183	case '_':
15047	15184	kompactbit = 5;
15048	15185	break;
15049		- case '+':
15050		- kompactbit = 6;
15051		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
15052	15189	case ' ':
15053	15190	lightMode ^= true;
15054	15191	Globals.lighttouched = true;
..	..	@@ -15060,6 +15197,7 @@
15060	15197	case ESC:
15061	15198	RENDERPROGRAM += 1;
15062	15199	RENDERPROGRAM %= 3;
	15200	+
15063	15201	repaint();
15064	15202	break;
15065	15203	case 'Z':
..	..	@@ -15099,8 +15237,9 @@
15099	15237	case DELETE:
15100	15238	ClearSelection();
15101	15239	break;
15102		- /*
15103	15240	case '+':
	15241	+
	15242	+ /*
15104	15243	//fontsize += 1;
15105	15244	bbzoom *= 2;
15106	15245	repaint();
..	..	@@ -15117,17 +15256,17 @@
15117	15256	case '=':
15118	15257	IncDepth();
15119	15258	//fontsize += 1;
15120		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
15121	15260	maskbit = 6;
15122	15261	break;
15123	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15124	15263	DecDepth();
15125	15264	maskbit = 5;
15126	15265	//if(fontsize > 1) fontsize -= 1;
15127		- if (object.editWindow == null)
15128		- new Exception().printStackTrace();
15129		- else
15130		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
15131	15270	break;
15132	15271	case '{':
15133	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15351,7 +15490,7 @@
15351	15490	}
15352	15491	*/
15353	15492
15354		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
15355	15494	}
15356	15495
15357	15496	void SelectParent()
..	..	@@ -15368,10 +15507,10 @@
15368	15507	{
15369	15508	//selectees.remove(i);
15370	15509	System.out.println("select parent of " + elem);
15371		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15372	15511	} else
15373	15512	{
15374		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15375	15514	}
15376	15515
15377	15516	first = false;
..	..	@@ -15413,12 +15552,12 @@
15413	15552	for (int j = 0; j < group.children.size(); j++)
15414	15553	{
15415	15554	elem = (Object3D) group.children.elementAt(j);
15416		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15417	15556	first = false;
15418	15557	}
15419	15558	} else
15420	15559	{
15421		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15422	15561	}
15423	15562
15424	15563	first = false;
..	..	@@ -15429,21 +15568,21 @@
15429	15568	{
15430	15569	//Composite group = (Composite) object;
15431	15570	Object3D group = object;
15432		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15433	15572	}
15434	15573
15435	15574	void ResetTransform(int mask)
15436	15575	{
15437	15576	//Composite group = (Composite) object;
15438	15577	Object3D group = object;
15439		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
15440	15579	}
15441	15580
15442	15581	void FlipTransform()
15443	15582	{
15444	15583	//Composite group = (Composite) object;
15445	15584	Object3D group = object;
15446		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
15447	15586	// group.editWindow.ReduceMesh(true);
15448	15587	}
15449	15588
..	..	@@ -15451,7 +15590,7 @@
15451	15590	{
15452	15591	//Composite group = (Composite) object;
15453	15592	Object3D group = object;
15454		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
15455	15594	// group.editWindow.ReduceMesh(true);
15456	15595	}
15457	15596
..	..	@@ -15459,7 +15598,7 @@
15459	15598	{
15460	15599	//Composite group = (Composite) object;
15461	15600	Object3D group = object;
15462		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
15463	15602	}
15464	15603
15465	15604	void IncDepth()
..	..	@@ -15635,6 +15774,7 @@
15635	15774	info.bounds.y += (height - desired) / 2;
15636	15775	}
15637	15776	}
	15777	+
15638	15778	info.g = gr;
15639	15779	info.camera = renderCamera;
15640	15780	/*
..	..	@@ -15644,23 +15784,44 @@
15644	15784	*/
15645	15785	if (!isRenderer)
15646	15786	{
15647		- object.drawEditHandles(info, 0);
15648		-
15649		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15787	+ Grafreed.Assert(object != null);
	15788	+ Grafreed.Assert(object.selection != null);
	15789	+ if (object.selection.Size() > 0)
15650	15790	{
15651		- switch (object.selection.get(0).hitSomething)
	15791	+ int hitSomething = object.selection.get(0).hitSomething;
	15792	+
	15793	+ info.DX = 0;
	15794	+ info.DY = 0;
	15795	+ info.W = 1;
	15796	+ if (hitSomething == Object3D.hitCenter)
15652	15797	{
15653		- case Object3D.hitCenter: gr.setColor(Color.pink);
15654		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15655		- break;
15656		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15657		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15658		- break;
15659		- case Object3D.hitScale: gr.setColor(Color.cyan);
15660		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15661		- break;
	15798	+ info.DX = X;
	15799	+ if (X != 0)
	15800	+ info.DX -= info.bounds.width/2;
	15801	+
	15802	+ info.DY = Y;
	15803	+ if (Y != 0)
	15804	+ info.DY -= info.bounds.height/2;
15662	15805	}
15663		-
	15806	+
	15807	+ object.drawEditHandles(info, 0);
	15808	+
	15809	+ if (drag && (X != 0 \|\| Y != 0))
	15810	+ {
	15811	+ switch (hitSomething)
	15812	+ {
	15813	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15814	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15815	+ break;
	15816	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15817	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15818	+ break;
	15819	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15820	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15821	+ break;
	15822	+ }
	15823	+
	15824	+ }
15664	15825	}
15665	15826	}
15666	15827	}
..	..	@@ -16363,16 +16524,16 @@
16363	16524	cStatic.objectstack[materialdepth++] = checker;
16364	16525	//System.out.println("material " + material);
16365	16526	//Applet3D.tracein(this, selected);
16366		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
16367	16528
16368	16529	//checker.GetMaterial().Draw(this, false); // true);
16369		- DrawMaterial(checker.GetMaterial(), false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370	16531
16371	16532	materialdepth -= 1;
16372	16533	if (materialdepth > 0)
16373	16534	{
16374		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16535	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16536	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16376	16537	}
16377	16538	//checker.GetMaterial().opacity = 1f;
16378	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16458,6 +16619,14 @@
16458	16619	}
16459	16620	}
16460	16621
	16622	+ private Object3D GetFolder()
	16623	+ {
	16624	+ Object3D folder = object.GetWindow().copy;
	16625	+ if (object.GetWindow().copy.selection.Size() > 0)
	16626	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16627	+ return folder;
	16628	+ }
	16629	+
16461	16630	class SelectBuffer implements GLEventListener
16462	16631	{
16463	16632
..	..	@@ -16537,6 +16706,17 @@
16537	16706
16538	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16539	16708
	16709	+ if (PAINTMODE)
	16710	+ {
	16711	+ if (object.GetWindow().copy.selection.Size() > 0)
	16712	+ {
	16713	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16714	+
	16715	+ // Make what you paint not selectable.
	16716	+ paintobj.ResetSelectable();
	16717	+ }
	16718	+ }
	16719	+
16540	16720	//int tmp = selection_view;
16541	16721	//selection_view = -1;
16542	16722	int temp = DrawMode();
..	..	@@ -16548,6 +16728,17 @@
16548	16728	// temp = DEFAULT; // patch for selection debug
16549	16729	Globals.drawMode = temp; // WARNING
16550	16730
	16731	+ if (PAINTMODE)
	16732	+ {
	16733	+ if (object.GetWindow().copy.selection.Size() > 0)
	16734	+ {
	16735	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16736	+
	16737	+ // Revert.
	16738	+ paintobj.RestoreSelectable();
	16739	+ }
	16740	+ }
	16741	+
16551	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16552	16743
16553	16744	// trying different ways of getting the depth info over
..	..	@@ -16595,6 +16786,8 @@
16595	16786	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16789	+
	16790	+ CreateSelectedPoint();
16598	16791
16599	16792	// Will fit the mesh !!!
16600	16793	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16649,29 +16842,31 @@
16649	16842	}
16650	16843
16651	16844	if (!movingcamera && !PAINTMODE)
16652		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16653	16846
16654		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16847	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16655	16848	{
16656		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16849	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16657	16850
16658		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16659	16854
16660		- group.CreateMaterial(); // use a void leaf to select instances
16661		-
16662		- group.add(paintobj); // link
16663		-
16664		- object.editWindow.SnapObject(group);
16665		-
16666		- Object3D folder = object.editWindow.copy;
16667		-
16668		- if (object.editWindow.copy.selection.Size() > 0)
16669		- folder = object.editWindow.copy.selection.elementAt(0);
16670		-
16671		- folder.add(group);
16672		-
16673		- object.editWindow.ResetModel();
16674		- object.editWindow.refreshContents();
	16855	+ Object3D inst = new Object3D("inst" + paintcount++);
	16856	+
	16857	+ inst.CreateMaterial(); // use a void leaf to select instances
	16858	+
	16859	+ inst.add(paintobj); // link
	16860	+
	16861	+ object.GetWindow().SnapObject(inst);
	16862	+
	16863	+ Object3D folder = paintFolder; // GetFolder();
	16864	+
	16865	+ folder.add(inst);
	16866	+
	16867	+ object.GetWindow().ResetModel();
	16868	+ object.GetWindow().refreshContents();
	16869	+ }
16675	16870	}
16676	16871	else
16677	16872	paintcount = 0;
..	..	@@ -16710,6 +16905,11 @@
16710	16905	//System.out.println("objects[color] = " + objects[color]);
16711	16906	//objects[color].Select();
16712	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
16713	16913	object.Select(color, deselect);
16714	16914	}
16715	16915
..	..	@@ -17235,23 +17435,15 @@
17235	17435	int AAbuffersize = 0;
17236	17436
17237	17437	//double[] selectedpoint = new double[3];
17238		- static Superellipsoid selectedpoint = new Superellipsoid();
	17438	+ static Superellipsoid selectedpoint;
17239	17439	static Sphere previousselectedpoint = null;
17240		- static Sphere debugpointG = new Sphere();
17241		- static Sphere debugpointP = new Sphere();
17242		- static Sphere debugpointC = new Sphere();
17243		- static Sphere debugpointR = new Sphere();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
17244	17444
17245	17445	static Sphere debugpoints[] = new Sphere[8];
17246	17446
17247		- static
17248		- {
17249		- for (int i=0; i<8; i++)
17250		- {
17251		- debugpoints[i] = new Sphere();
17252		- }
17253		- }
17254		-
17255	17447	static void InitPoints(float radius)
17256	17448	{
17257	17449	for (int i=0; i<8; i++)