~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,7 +60,7 @@
60	60	//boolean REDUCETEXTURE = true;
61	61	boolean CACHETEXTURE = true;
62	62	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
64	64	boolean COMPRESSTEXTURE = false;
65	65	boolean KOMPACTTEXTURE = false; // true;
66	66	boolean RESIZETEXTURE = false;
..	..	@@ -335,14 +335,28 @@
335	335	display.options1[2] = material.shadowbias;
336	336	display.options1[3] = material.aniso;
337	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]);
338	343	display.options2[0] = material.opacity;
339	344	display.options2[1] = material.diffuse;
340	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]);
341	349
342	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]);
343	354	display.options4[0] = material.cameralight/0.2f;
344	355	display.options4[1] = material.subsurface;
345	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]);
346	360
347	361	// if (display.CURRENTANTIALIAS > 0)
348	362	// display.options3[3] /= 4;
..	..	@@ -2051,7 +2065,7 @@
2051	2065	//System.err.println("Oeil on");
2052	2066	OEIL = true;
2053	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2055	2069	//pingthread.StepToTarget(true);
2056	2070	}
2057	2071
..	..	@@ -2284,10 +2298,17 @@
2284	2298	HANDLES ^= true;
2285	2299	}
2286	2300
	2301	+ Object3D paintFolder;
	2302	+
2287	2303	void TogglePaint()
2288	2304	{
2289	2305	PAINTMODE ^= true;
2290	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2291	2312	}
2292	2313
2293	2314	void SwapCamera(int a, int b)
..	..	@@ -2384,6 +2405,45 @@
2384	2405	return currentGL;
2385	2406	}
2386	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	+
2387	2447	/**/
2388	2448	class CacheTexture
2389	2449	{
..	..	@@ -2401,9 +2461,10 @@
2401	2461	/**/
2402	2462
2403	2463	// TEXTURE static Texture texture;
2404		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2405		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2406		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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	+
2407	2468	int pigmentdepth = 0;
2408	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2409	2470	int bumpdepth = 0;
..	..	@@ -2425,6 +2486,33 @@
2425	2486	true,
2426	2487	com.sun.opengl.util.texture.TextureIO.PNG);
2427	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)
2428	2516	{
2429	2517	throw new javax.media.opengl.GLException(e);
2430	2518	}
..	..	@@ -3511,6 +3599,8 @@
3511	3599
3512	3600	System.out.println("LOADING TEXTURE : " + name);
3513	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
3514	3604	//
3515	3605	if (false) // compressbit > 0)
3516	3606	{
..	..	@@ -7909,7 +7999,7 @@
7909	7999	String pigment = Object3D.GetPigment(tex);
7910	8000	String bump = Object3D.GetBump(tex);
7911	8001
7912		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7913	8003	{
7914	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7915	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7943,7 +8033,7 @@
7943	8033
7944	8034	String pigment = Object3D.GetPigment(tex);
7945	8035
7946		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947	8037	{
7948	8038	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7949	8039	// System.out.println("; bump = " + bump);
..	..	@@ -7972,7 +8062,7 @@
7972	8062
7973	8063	String bump = Object3D.GetBump(tex);
7974	8064
7975		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976	8066	{
7977	8067	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7978	8068	// System.out.println("; bump = " + bump);
..	..	@@ -8091,47 +8181,50 @@
8091	8181
8092	8182	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8093	8183	{
8094		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8095		- ambientOcclusion ) // \|\| !textureon)
8096		- {
8097		- return; // false;
8098		- }
8099		-
8100		- if (tex == null)
8101		- {
8102		- BindTexture(null,false,resolution);
8103		- BindTexture(null,true,resolution);
8104		- return;
8105		- }
	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;
8106	8225
8107		- String pigment = Object3D.GetPigment(tex);
8108		- String bump = Object3D.GetBump(tex);
8109		-
8110		- usedtextures.put(pigment, pigment);
8111		- usedtextures.put(bump, bump);
8112		-
8113		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8114		- {
8115		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8116		- // System.out.println("; bump = " + bump);
8117		- }
8118		-
8119		- if (bump.equals(""))
8120		- {
8121		- bump = null;
8122		- }
8123		- if (pigment.equals(""))
8124		- {
8125		- pigment = null;
8126		- }
8127		-
8128		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8129		- BindTexture(pigment, false, resolution);
8130		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8131		- BindTexture(bump, true, resolution);
8132		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8133		-
8134		- return; // true;
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
8135	8228	}
8136	8229
8137	8230	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8144,15 +8237,15 @@
8144	8237
8145	8238	if (tex == null)
8146	8239	{
8147		- BindTexture(null,false,resolution);
	8240	+ BindTexture(null, null,false,resolution);
8148	8241	return;
8149	8242	}
8150	8243
8151	8244	String pigment = Object3D.GetPigment(tex);
8152	8245
8153		- usedtextures.put(pigment, pigment);
	8246	+ usedtextures.add(pigment);
8154	8247
8155		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156	8249	{
8157	8250	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8158	8251	// System.out.println("; bump = " + bump);
..	..	@@ -8164,7 +8257,7 @@
8164	8257	}
8165	8258
8166	8259	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167		- BindTexture(pigment, false, resolution);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
8168	8261	}
8169	8262
8170	8263	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8177,15 +8270,15 @@
8177	8270
8178	8271	if (tex == null)
8179	8272	{
8180		- BindTexture(null,true,resolution);
	8273	+ BindTexture(null, null,true,resolution);
8181	8274	return;
8182	8275	}
8183	8276
8184	8277	String bump = Object3D.GetBump(tex);
8185	8278
8186		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
8187	8280
8188		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189	8282	{
8190	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8191	8284	// System.out.println("; bump = " + bump);
..	..	@@ -8197,7 +8290,7 @@
8197	8290	}
8198	8291
8199	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
8201	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202	8295	}
8203	8296
..	..	@@ -8221,9 +8314,9 @@
8221	8314	return fileExists;
8222	8315	}
8223	8316
8224		- 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
8225	8318	{
8226		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8319	+ CacheTexture texturecache = null;
8227	8320
8228	8321	if (tex != null)
8229	8322	{
..	..	@@ -8243,12 +8336,22 @@
8243	8336	}
8244	8337
8245	8338	if (CACHETEXTURE)
8246		- texture = textures.get(texname); // TEXTURE CACHE
8247		-
8248		- TextureData texturedata = null;
8249		-
8250		- if (texture == null \|\| texture.resolution < resolution)
8251	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
8252	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8253	8356	{
8254	8357	assert(!bump);
..	..	@@ -8260,19 +8363,23 @@
8260	8363	// }
8261	8364	// else
8262	8365	// {
8263		- texture = textures.get(tex);
8264		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
8265	8368	{
8266		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8267	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
8268	8373	// }
8269	8374	} else
8270	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8271	8376	{
8272	8377	assert(bump);
8273		- texture = textures.get(tex);
8274		- if (texture == null)
8275		- 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();
8276	8383	} else
8277	8384	{
8278	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -8282,9 +8389,11 @@
8282	8389	//{
8283	8390	if (tex.equals("WHITE_NOISE"))
8284	8391	{
8285		- texture = textures.get(tex);
8286		- if (texture == null)
8287		- 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();
8288	8397	} else
8289	8398	{
8290	8399	if (textureon)
..	..	@@ -8343,19 +8452,20 @@
8343	8452	if (texturedata == null)
8344	8453	throw new Exception();
8345	8454
8346		- 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);
8347	8456	//texture = GetTexture(tex, bump);
8348	8457	}
8349	8458	}
8350	8459	//}
8351	8460	}
8352	8461
8353		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8354	8463	{
8355	8464	//return false;
	8465	+ assert(bim == null);
8356	8466
8357	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8358		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8359	8469	{
8360	8470	// String ext = "_highres";
8361	8471	// if (REDUCETEXTURE)
..	..	@@ -8372,52 +8482,17 @@
8372	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8373	8483	if (!cachefile.exists())
8374	8484	{
8375		- // cache to disk
8376		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8377		- //buffers[0].
8378		-
8379		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8380		- int[] pixels = new int[bytebuf.capacity()/3];
8381		-
8382		- // squared size heuristic...
8383		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
8384	8486	{
8385		- for (int i=pixels.length; --i>=0;)
8386		- {
8387		- int i3 = i*3;
8388		- pixels[i] = 0xFF;
8389		- pixels[i] <<= 8;
8390		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8391		- pixels[i] <<= 8;
8392		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8393		- pixels[i] <<= 8;
8394		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8395		- }
8396		-
8397		- /*
8398		- int r=0,g=0,b=0,a=0;
8399		- for (int i=0; i<width; i++)
8400		- for (int j=0; j<height; j++)
8401		- {
8402		- int index = j*width+i;
8403		- int p = pixels[index];
8404		- a = ((p>>24) & 0xFF);
8405		- r = ((p>>16) & 0xFF);
8406		- g = ((p>>8) & 0xFF);
8407		- b = (p & 0xFF);
8408		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8409		- }
8410		- /**/
8411		- int width = (int)Math.sqrt(pixels.length); // squared
8412		- int height = width;
8413		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8414		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
8415	8489	ImageWriter writer = null;
8416	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8417	8491	if (iter.hasNext()) {
8418	8492	writer = (ImageWriter)iter.next();
8419	8493	}
8420		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
8421	8496	try
8422	8497	{
8423	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8444,8 +8519,8 @@
8444	8519	textures.remove(texname);
8445	8520	}
8446	8521
8447		- texture.texturedata = texturedata;
8448		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
8449	8524
8450	8525	// newtex = true;
8451	8526	}
..	..	@@ -8461,12 +8536,17 @@
8461	8536	}
8462	8537	}
8463	8538
8464		- return texture;
	8539	+ return texturecache;
8465	8540	}
8466	8541
8467		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8542	+ static void EmbedTextures(cTexture tex)
8468	8543	{
8469		- 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);
8470	8550
8471	8551	if (bump)
8472	8552	{
..	..	@@ -8482,23 +8562,23 @@
8482	8562	return texture!=null?texture.texture:null;
8483	8563	}
8484	8564
8485		- 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
8486	8566	{
8487		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8488	8568
8489	8569	return texture!=null?texture.texturedata:null;
8490	8570	}
8491	8571
8492		- 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
8493	8573	{
8494	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8495	8575	{
8496	8576	return false;
8497	8577	}
8498	8578
8499		- boolean newtex = false;
	8579	+ //boolean newtex = false;
8500	8580
8501		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8502	8582
8503	8583	if (texture == null)
8504	8584	return false;
..	..	@@ -8528,7 +8608,7 @@
8528	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8529	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8530	8610
8531		- return newtex;
	8611	+ return true; // Warning: not used.
8532	8612	}
8533	8613
8534	8614	ShadowBuffer shadowPBuf;
..	..	@@ -9374,13 +9454,13 @@
9374	9454	void ResetOptions()
9375	9455	{
9376	9456	options1[0] = 100;
9377		- options1[1] = 0.00001f;
9378		- options1[2] = 20;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
9379	9459	options1[3] = 0;
9380	9460	options1[4] = 0;
9381	9461
9382	9462	options2[0] = 0;
9383		- options2[1] = 1;
	9463	+ options2[1] = 0.75f;
9384	9464	options2[2] = 0;
9385	9465	options2[3] = 0;
9386	9466
..	..	@@ -10985,7 +11065,7 @@
10985	11065
10986	11066	try
10987	11067	{
10988		- BindTexture(NOISE_TEXTURE, false, 2);
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
10989	11069	}
10990	11070	catch (Exception e)
10991	11071	{
..	..	@@ -11014,9 +11094,9 @@
11014	11094
11015	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
11016	11096
11017		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11018		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11019		-//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);
11020	11100	} else
11021	11101	{
11022	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11027,7 +11107,7 @@
11027	11107	//System.out.println("BLENDING ON");
11028	11108	gl.glEnable(GL.GL_BLEND);
11029	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11030		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11031	11111	gl.glMatrixMode(gl.GL_PROJECTION);
11032	11112	gl.glLoadIdentity();
11033	11113
..	..	@@ -11513,7 +11593,7 @@
11513	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11514	11594	{
11515	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11516		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11517	11597	pingthread.StepToTarget(true); // true);
11518	11598	// zoomonce = false;
11519	11599	}
..	..	@@ -11650,7 +11730,7 @@
11650	11730	if (tex.equals("WHITE_NOISE"))
11651	11731	continue;
11652	11732
11653		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
11654	11734	{
11655	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11656	11736	textures.get(tex).texture.dispose();
..	..	@@ -13361,9 +13441,10 @@
13361	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
13362	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13363	13443	//"MOV " + dest + ".w," + "normal.z;" +
13364		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13365		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13366		- //"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
13367	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13368	13449	"RCP " + dest + ".w," + dest + ".w;" +
13369	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13928,7 +14009,7 @@
13928	14009
13929	14010	// fev 2014???
13930	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13931		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13932	14013	pingthread.StepToTarget(true); // true);
13933	14014	}
13934	14015	// if (!LIVE)
..	..	@@ -14282,12 +14363,12 @@
14282	14363	void GoDown(int mod)
14283	14364	{
14284	14365	MODIFIERS \|= COMMAND;
14285		- /*
	14366	+ /**/
14286	14367	if((mod&SHIFT) == SHIFT)
14287	14368	manipCamera.RotatePosition(0, -speed);
14288	14369	else
14289		- manipCamera.BackForth(0, -speed*delta, getWidth());
14290		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
14291	14372	if ((mod & SHIFT) == SHIFT)
14292	14373	{
14293	14374	mouseMode = mouseMode; // VR??
..	..	@@ -14303,12 +14384,12 @@
14303	14384	void GoUp(int mod)
14304	14385	{
14305	14386	MODIFIERS \|= COMMAND;
14306		- /*
	14387	+ /**/
14307	14388	if((mod&SHIFT) == SHIFT)
14308	14389	manipCamera.RotatePosition(0, speed);
14309	14390	else
14310		- manipCamera.BackForth(0, speed*delta, getWidth());
14311		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
14312	14393	if ((mod & SHIFT) == SHIFT)
14313	14394	{
14314	14395	mouseMode = mouseMode;
..	..	@@ -14324,12 +14405,12 @@
14324	14405	void GoLeft(int mod)
14325	14406	{
14326	14407	MODIFIERS \|= COMMAND;
14327		- /*
	14408	+ /**/
14328	14409	if((mod&SHIFT) == SHIFT)
14329		- manipCamera.RotatePosition(speed, 0);
14330		- else
14331	14410	manipCamera.Translate(speed*delta, 0, getWidth());
14332		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
14333	14414	if ((mod & SHIFT) == SHIFT)
14334	14415	{
14335	14416	mouseMode = mouseMode;
..	..	@@ -14345,12 +14426,12 @@
14345	14426	void GoRight(int mod)
14346	14427	{
14347	14428	MODIFIERS \|= COMMAND;
14348		- /*
	14429	+ /**/
14349	14430	if((mod&SHIFT) == SHIFT)
14350		- manipCamera.RotatePosition(-speed, 0);
14351		- else
14352	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
14353		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
14354	14435	if ((mod & SHIFT) == SHIFT)
14355	14436	{
14356	14437	mouseMode = mouseMode;
..	..	@@ -14589,7 +14670,8 @@
14589	14670	Globals.MOUSEDRAGGED = false;
14590	14671
14591	14672	movingcamera = false;
14592		- X = Y = 0;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
14593	14675	//System.out.println("mouseReleased: " + e);
14594	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14595	14677	}
..	..	@@ -14930,7 +15012,9 @@
14930	15012	case 'E' : COMPACT ^= true;
14931	15013	repaint();
14932	15014	break;
14933		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
14934	15018	repaint();
14935	15019	break;
14936	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14956,13 +15040,7 @@
14956	15040	repaint();
14957	15041	break;
14958	15042	case 'l':
14959		- lightMode ^= true;
14960		- Globals.lighttouched = true;
14961		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14962		- targetLookAt.set(manipCamera.lookAt);
14963		- repaint();
14964		- break;
14965		- case 'L':
	15043	+ //case 'L':
14966	15044	if (lightMode)
14967	15045	{
14968	15046	lightMode = false;
..	..	@@ -15105,11 +15183,14 @@
15105	15183	case '_':
15106	15184	kompactbit = 5;
15107	15185	break;
15108		- case '+':
15109		- kompactbit = 6;
15110		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
15111	15189	case ' ':
15112		- ObjEditor.theFrame.ToggleFullScreen();
	15190	+ lightMode ^= true;
	15191	+ Globals.lighttouched = true;
	15192	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15193	+ targetLookAt.set(manipCamera.lookAt);
15113	15194	repaint();
15114	15195	break;
15115	15196	//case '`' :
..	..	@@ -15156,8 +15237,9 @@
15156	15237	case DELETE:
15157	15238	ClearSelection();
15158	15239	break;
15159		- /*
15160	15240	case '+':
	15241	+
	15242	+ /*
15161	15243	//fontsize += 1;
15162	15244	bbzoom *= 2;
15163	15245	repaint();
..	..	@@ -15174,17 +15256,17 @@
15174	15256	case '=':
15175	15257	IncDepth();
15176	15258	//fontsize += 1;
15177		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
15178	15260	maskbit = 6;
15179	15261	break;
15180	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15181	15263	DecDepth();
15182	15264	maskbit = 5;
15183	15265	//if(fontsize > 1) fontsize -= 1;
15184		- if (object.editWindow == null)
15185		- new Exception().printStackTrace();
15186		- else
15187		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
15188	15270	break;
15189	15271	case '{':
15190	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15408,7 +15490,7 @@
15408	15490	}
15409	15491	*/
15410	15492
15411		- object.editWindow.EditSelection(false);
	15493	+ object.GetWindow().EditSelection(false);
15412	15494	}
15413	15495
15414	15496	void SelectParent()
..	..	@@ -15425,10 +15507,10 @@
15425	15507	{
15426	15508	//selectees.remove(i);
15427	15509	System.out.println("select parent of " + elem);
15428		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15429	15511	} else
15430	15512	{
15431		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15432	15514	}
15433	15515
15434	15516	first = false;
..	..	@@ -15470,12 +15552,12 @@
15470	15552	for (int j = 0; j < group.children.size(); j++)
15471	15553	{
15472	15554	elem = (Object3D) group.children.elementAt(j);
15473		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15474	15556	first = false;
15475	15557	}
15476	15558	} else
15477	15559	{
15478		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15479	15561	}
15480	15562
15481	15563	first = false;
..	..	@@ -15486,21 +15568,21 @@
15486	15568	{
15487	15569	//Composite group = (Composite) object;
15488	15570	Object3D group = object;
15489		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15490	15572	}
15491	15573
15492	15574	void ResetTransform(int mask)
15493	15575	{
15494	15576	//Composite group = (Composite) object;
15495	15577	Object3D group = object;
15496		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
15497	15579	}
15498	15580
15499	15581	void FlipTransform()
15500	15582	{
15501	15583	//Composite group = (Composite) object;
15502	15584	Object3D group = object;
15503		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
15504	15586	// group.editWindow.ReduceMesh(true);
15505	15587	}
15506	15588
..	..	@@ -15508,7 +15590,7 @@
15508	15590	{
15509	15591	//Composite group = (Composite) object;
15510	15592	Object3D group = object;
15511		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
15512	15594	// group.editWindow.ReduceMesh(true);
15513	15595	}
15514	15596
..	..	@@ -15516,7 +15598,7 @@
15516	15598	{
15517	15599	//Composite group = (Composite) object;
15518	15600	Object3D group = object;
15519		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
15520	15602	}
15521	15603
15522	15604	void IncDepth()
..	..	@@ -15692,6 +15774,7 @@
15692	15774	info.bounds.y += (height - desired) / 2;
15693	15775	}
15694	15776	}
	15777	+
15695	15778	info.g = gr;
15696	15779	info.camera = renderCamera;
15697	15780	/*
..	..	@@ -15701,23 +15784,44 @@
15701	15784	*/
15702	15785	if (!isRenderer)
15703	15786	{
15704		- object.drawEditHandles(info, 0);
15705		-
15706		- 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)
15707	15790	{
15708		- 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)
15709	15797	{
15710		- case Object3D.hitCenter: gr.setColor(Color.pink);
15711		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15712		- break;
15713		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15714		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15715		- break;
15716		- case Object3D.hitScale: gr.setColor(Color.cyan);
15717		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15718		- 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;
15719	15805	}
15720		-
	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	+ }
15721	15825	}
15722	15826	}
15723	15827	}
..	..	@@ -16515,6 +16619,14 @@
16515	16619	}
16516	16620	}
16517	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	+
16518	16630	class SelectBuffer implements GLEventListener
16519	16631	{
16520	16632
..	..	@@ -16594,6 +16706,17 @@
16594	16706
16595	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16596	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	+
16597	16720	//int tmp = selection_view;
16598	16721	//selection_view = -1;
16599	16722	int temp = DrawMode();
..	..	@@ -16605,6 +16728,17 @@
16605	16728	// temp = DEFAULT; // patch for selection debug
16606	16729	Globals.drawMode = temp; // WARNING
16607	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	+
16608	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16609	16743
16610	16744	// trying different ways of getting the depth info over
..	..	@@ -16708,29 +16842,31 @@
16708	16842	}
16709	16843
16710	16844	if (!movingcamera && !PAINTMODE)
16711		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16712	16846
16713		- 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)
16714	16848	{
16715		- 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);
16716	16850
16717		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16718	16854
16719		- group.CreateMaterial(); // use a void leaf to select instances
16720		-
16721		- group.add(paintobj); // link
16722		-
16723		- object.editWindow.SnapObject(group);
16724		-
16725		- Object3D folder = object.editWindow.copy;
16726		-
16727		- if (object.editWindow.copy.selection.Size() > 0)
16728		- folder = object.editWindow.copy.selection.elementAt(0);
16729		-
16730		- folder.add(group);
16731		-
16732		- object.editWindow.ResetModel();
16733		- 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	+ }
16734	16870	}
16735	16871	else
16736	16872	paintcount = 0;
..	..	@@ -16769,6 +16905,11 @@
16769	16905	//System.out.println("objects[color] = " + objects[color]);
16770	16906	//objects[color].Select();
16771	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
16772	16913	object.Select(color, deselect);
16773	16914	}
16774	16915