~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -44,6 +48,39 @@
44	48	static boolean ABORTED = false;
45	49
46	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
47	84
48	85	/static/ private boolean CULLFACE = false; // true;
49	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +97,7 @@
60	97	//boolean REDUCETEXTURE = true;
61	98	boolean CACHETEXTURE = true;
62	99	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
64	101	boolean COMPRESSTEXTURE = false;
65	102	boolean KOMPACTTEXTURE = false; // true;
66	103	boolean RESIZETEXTURE = false;
..	..	@@ -150,6 +187,18 @@
150	187	}
151	188
152	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
153	202
154	203	void SetAsGLRenderer(boolean b)
155	204	{
..	..	@@ -169,7 +218,8 @@
169	218
170	219	SetCamera(cam);
171	220
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	223
174	224	object = o;
175	225
..	..	@@ -1447,6 +1497,8 @@
1447	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1498	}
1449	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1450	1502	void SetColor(Object3D obj, Vertex p0)
1451	1503	{
1452	1504	CameraPane display = this;
..	..	@@ -1514,8 +1566,6 @@
1514	1566	{
1515	1567	return;
1516	1568	}
1517		-
1518		- float[] colorV = new float[3];
1519	1569
1520	1570	if (false) // marked)
1521	1571	{
..	..	@@ -2065,7 +2115,7 @@
2065	2115	//System.err.println("Oeil on");
2066	2116	OEIL = true;
2067	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2119	//pingthread.StepToTarget(true);
2070	2120	}
2071	2121
..	..	@@ -2298,10 +2348,17 @@
2298	2348	HANDLES ^= true;
2299	2349	}
2300	2350
	2351	+ Object3D paintFolder;
	2352	+
2301	2353	void TogglePaint()
2302	2354	{
2303	2355	PAINTMODE ^= true;
2304	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2305	2362	}
2306	2363
2307	2364	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2455,19 @@
2398	2455	return currentGL;
2399	2456	}
2400	2457
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2459	{
2403		- java.net.URL u;
2404		- InputStream is = null;
2405		- DataInputStream dis;
2406		- java.util.zip.ZipInputStream zis;
2407		- //String s;
2408		-
2409		- System.out.println("GetRemoteZip " + name);
2410		-
2411		- int total = 0; // dis.available();
2412		-
2413		- byte[] bytes = new byte[16384];
2414		-
2415		- try
2416		- {
2417		- u = new java.net.URL(url + name);
2418		- is = u.openStream();
2419		-
2420		- System.out.println(url + name);
2421		-
2422		- if (unzip)
2423		- {
2424		- //dis = new DataInputStream(new BufferedInputStream(is));
2425		- zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
2426		- //while ((s = dis.readLine()) != null)
2427		-
2428		- if (save)
2429		- new java.io.File(name).mkdirs();
2430		-
2431		- // FileOutputStream stream = new FileOutputStream("test.zip");
2432		- //
2433		- // int count;
2434		- //
2435		- // while ((count = dis.read(bytes)) != -1)
2436		- // {
2437		- // //System.out.println(s);
2438		- // System.out.println(count);
2439		- // total += count;
2440		- // stream.write(bytes);
2441		- // }
2442		- //
2443		- // stream.close();
2444		-
2445		- // now iterate through each item in the stream. The get next
2446		- // entry call will return a ZipEntry for each file in the
2447		- // stream
2448		- java.util.zip.ZipEntry entry;
2449		- while((entry = zis.getNextEntry())!=null)
2450		- {
2451		- if (entry.getName().endsWith(".gsm"))
2452		- {
2453		- continue;
2454		- }
2455		-
2456		- String s = String.format("Entry: %s len %d added %TD",
2457		- entry.getName(), entry.getSize(),
2458		- new java.util.Date(entry.getTime()));
2459		- System.out.println(s);
2460		-
2461		- if (save)
2462		- {
2463		- // Once we get the entry from the stream, the stream is
2464		- // positioned read to read the raw data, and we keep
2465		- // reading until read returns 0 or less.
2466		- String outpath = name + "/" + entry.getName();
2467		- FileOutputStream output = null;
2468		- try
2469		- {
2470		- output = new FileOutputStream(outpath);
2471		- int len = 0;
2472		- while ((len = zis.read(bytes)) > 0)
2473		- {
2474		- output.write(bytes, 0, len);
2475		- }
2476		- }
2477		- finally
2478		- {
2479		- // we must always close the output file
2480		- if(output!=null) output.close();
2481		- }
2482		- }
2483		- }
2484		- }
2485		- }
2486		- catch (java.net.MalformedURLException mue)
2487		- {
2488		- System.err.println("Ouch - a MalformedURLException happened.");
2489		- mue.printStackTrace();
2490		- //System.exit(2);
2491		- }
2492		- catch (IOException ioe)
2493		- {
2494		- //System.err.println("Oops - an IOException happened.");
2495		- //ioe.printStackTrace();
2496		- //System.exit(3);
2497		- }
2498		- finally
2499		- {
2500		- try
2501		- {
2502		- if (is != null)
2503		- is.close();
2504		- }
2505		- catch (IOException ioe)
2506		- {
2507		- }
2508		- }
2509		-
2510		- // System.out.println("length = " + total);
2511		-
2512		-// try
2513		-// {
2514		-// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
2515		-// }
2516		-// catch (Exception e)
2517		-// {
2518		-// e.printStackTrace();
2519		-// }
2520		-
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
2521	2471	}
2522	2472
2523	2473	/**/
..	..	@@ -2528,28 +2478,31 @@
2528	2478
2529	2479	int resolution;
2530	2480
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2482	{
2533		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2534	2485	resolution = res;
2535	2486	}
2536	2487	}
2537	2488	/**/
2538	2489
2539	2490	// TEXTURE static Texture texture;
2540		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2541		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2542		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2543	2496	int pigmentdepth = 0;
2544	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2498	int bumpdepth = 0;
2546	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2504
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2506	{
2554	2507	TextureData texturedata = null;
2555	2508
..	..	@@ -2568,13 +2521,34 @@
2568	2521	if (bump)
2569	2522	texturedata = ConvertBump(texturedata, false);
2570	2523
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2526
2574		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2575		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2529
2577		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2578	2552	}
2579	2553
2580	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3621,8 @@
3647	3621
3648	3622	System.out.println("LOADING TEXTURE : " + name);
3649	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3650	3626	//
3651	3627	if (false) // compressbit > 0)
3652	3628	{
..	..	@@ -8045,7 +8021,7 @@
8045	8021	String pigment = Object3D.GetPigment(tex);
8046	8022	String bump = Object3D.GetBump(tex);
8047	8023
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8025	{
8050	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8027	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8036,8 @@
8060	8036	pigment = null;
8061	8037	}
8062	8038
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
8065	8041	}
8066	8042
8067	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8055,7 @@
8079	8055
8080	8056	String pigment = Object3D.GetPigment(tex);
8081	8057
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8059	{
8084	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8061	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8066,7 @@
8090	8066	pigment = null;
8091	8067	}
8092	8068
8093		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
8094	8070	}
8095	8071
8096	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8084,7 @@
8108	8084
8109	8085	String bump = Object3D.GetBump(tex);
8110	8086
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8088	{
8113	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8090	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8095,10 @@
8119	8095	bump = null;
8120	8096	}
8121	8097
8122		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
8123	8099	}
8124	8100
8125		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8102	{
8127	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8109,7 @@
8133	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8110
8135	8111	if (tex != null)
8136		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8113
8138	8114	// //assert( texture != null );
8139	8115	// if (texture == null)
..	..	@@ -8227,47 +8203,50 @@
8227	8203
8228	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8205	{
8230		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8231		- ambientOcclusion ) // \|\| !textureon)
8232		- {
8233		- return; // false;
8234		- }
8235		-
8236		- if (tex == null)
8237		- {
8238		- BindTexture(null,false,resolution);
8239		- BindTexture(null,true,resolution);
8240		- return;
8241		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8242	8247
8243		- String pigment = Object3D.GetPigment(tex);
8244		- String bump = Object3D.GetBump(tex);
8245		-
8246		- usedtextures.put(pigment, pigment);
8247		- usedtextures.put(bump, bump);
8248		-
8249		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8250		- {
8251		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8252		- // System.out.println("; bump = " + bump);
8253		- }
8254		-
8255		- if (bump.equals(""))
8256		- {
8257		- bump = null;
8258		- }
8259		- if (pigment.equals(""))
8260		- {
8261		- pigment = null;
8262		- }
8263		-
8264		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8265		- BindTexture(pigment, false, resolution);
8266		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8267		- BindTexture(bump, true, resolution);
8268		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8269		-
8270		- return; // true;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8271	8250	}
8272	8251
8273	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8265,9 @@
8286	8265
8287	8266	String pigment = Object3D.GetPigment(tex);
8288	8267
8289		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8290	8269
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8271	{
8293	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8279,7 @@
8300	8279	}
8301	8280
8302	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8304	8283	}
8305	8284
8306	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8298,9 @@
8319	8298
8320	8299	String bump = Object3D.GetBump(tex);
8321	8300
8322		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8323	8302
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8304	{
8326	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8312,7 @@
8333	8312	}
8334	8313
8335	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8337	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8317	}
8339	8318
..	..	@@ -8357,13 +8336,19 @@
8357	8336	return fileExists;
8358	8337	}
8359	8338
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8340	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8363	8342
8364	8343	if (tex != null)
8365	8344	{
8366		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8367	8352
8368	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8354
..	..	@@ -8373,19 +8358,46 @@
8373	8358	// else
8374	8359	// if (!texname.startsWith("/"))
8375	8360	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8377	8362	{
8378	8363	texname = fallbackTextureName;
8379	8364	}
8380	8365
8381	8366	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8367	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8401	{
8390	8402	assert(!bump);
8391	8403	// if (bump)
..	..	@@ -8396,19 +8408,23 @@
8396	8408	// }
8397	8409	// else
8398	8410	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8401	8413	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8404	8418	// }
8405	8419	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8421	{
8408	8422	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8412	8428	} else
8413	8429	{
8414	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8432,22 @@
8416	8432	// texture = GetResourceTexture("default.png");
8417	8433	//} else
8418	8434	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8420	8436	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8424	8451	} else
8425	8452	{
8426	8453	if (textureon)
..	..	@@ -8479,19 +8506,20 @@
8479	8506	if (texturedata == null)
8480	8507	throw new Exception();
8481	8508
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8510	//texture = GetTexture(tex, bump);
8484	8511	}
	8512	+ }
8485	8513	}
8486	8514	//}
8487	8515	}
8488	8516
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8518	{
8491	8519	//return false;
8492	8520
8493	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8523	{
8496	8524	// String ext = "_highres";
8497	8525	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8536,17 @@
8508	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8537	if (!cachefile.exists())
8510	8538	{
8511		- // cache to disk
8512		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8513		- //buffers[0].
8514		-
8515		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8516		- int[] pixels = new int[bytebuf.capacity()/3];
8517		-
8518		- // squared size heuristic...
8519		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8540	{
8521		- for (int i=pixels.length; --i>=0;)
8522		- {
8523		- int i3 = i*3;
8524		- pixels[i] = 0xFF;
8525		- pixels[i] <<= 8;
8526		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8527		- pixels[i] <<= 8;
8528		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8529		- pixels[i] <<= 8;
8530		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8531		- }
8532		-
8533		- /*
8534		- int r=0,g=0,b=0,a=0;
8535		- for (int i=0; i<width; i++)
8536		- for (int j=0; j<height; j++)
8537		- {
8538		- int index = j*width+i;
8539		- int p = pixels[index];
8540		- a = ((p>>24) & 0xFF);
8541		- r = ((p>>16) & 0xFF);
8542		- g = ((p>>8) & 0xFF);
8543		- b = (p & 0xFF);
8544		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8545		- }
8546		- /**/
8547		- int width = (int)Math.sqrt(pixels.length); // squared
8548		- int height = width;
8549		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8550		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8551	8543	ImageWriter writer = null;
8552	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8545	if (iter.hasNext()) {
8554	8546	writer = (ImageWriter)iter.next();
8555	8547	}
8556		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8557	8550	try
8558	8551	{
8559	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8563,20 @@
8570	8563	}
8571	8564	}
8572	8565	}
8573		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8574	8569	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8576	8571	{
8577		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8578	8573	thetex.texture.disable();
8579	8574	thetex.texture.dispose();
8580		- textures.remove(texname);
	8575	+ textures.remove(tex);
8581	8576	}
8582	8577
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8585	8580
8586	8581	// newtex = true;
8587	8582	}
..	..	@@ -8597,10 +8592,44 @@
8597	8592	}
8598	8593	}
8599	8594
8600		- return texture;
	8595	+ return texturecache;
8601	8596	}
8602	8597
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8633	{
8605	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8635
..	..	@@ -8618,21 +8647,21 @@
8618	8647	return texture!=null?texture.texture:null;
8619	8648	}
8620	8649
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8651	{
8623	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8653
8625	8654	return texture!=null?texture.texturedata:null;
8626	8655	}
8627	8656
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8658	{
8630	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8660	{
8632	8661	return false;
8633	8662	}
8634	8663
8635		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8636	8665
8637	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8667
..	..	@@ -8664,9 +8693,75 @@
8664	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8695
8667		- return newtex;
	8696	+ return true; // Warning: not used.
8668	8697	}
8669	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8670	8765	ShadowBuffer shadowPBuf;
8671	8766	AntialiasBuffer antialiasPBuf;
8672	8767	int MAXSTACK;
..	..	@@ -8683,10 +8778,12 @@
8683	8778
8684	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8685	8780	MAXSTACK = temp[0];
8686		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8687	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8688	8784	MAXSTACK = temp[0];
8689		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8690	8787
8691	8788	// Use debug pipeline
8692	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8694,7 +8791,8 @@
8694	8791	gl = drawable.getGL(); //
8695	8792
8696	8793	GL gl3 = getGL();
8697		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8698	8796
8699	8797
8700	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8859,7 +8957,7 @@
8859	8957
8860	8958	if (cubemap == null)
8861	8959	{
8862		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8863	8961	}
8864	8962
8865	8963	//cubemap.enable();
..	..	@@ -9146,37 +9244,58 @@
9146	9244	cubemap = null;
9147	9245	return;
9148	9246	case 1:
9149		- name = "cubemaps/box_";
9150		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
9151	9249	reverseUP = false;
9152	9250	break;
9153	9251	case 2:
9154		- name = "cubemaps/uffizi_";
9155		- ext = "png";
9156		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
9157	9256	case 3:
9158		- name = "cubemaps/CloudyHills_";
9159		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
9160	9259	reverseUP = false;
9161	9260	break;
9162	9261	case 4:
9163		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
9164	9263	ext = "png";
9165	9264	reverseUP = false;
9166	9265	break;
	9266	+ case 5:
	9267	+ name = "cubemaps/skycube/";
	9268	+ ext = "jpg";
	9269	+ reverseUP = false;
	9270	+ break;
	9271	+ case 6:
	9272	+ name = "cubemaps/SaintLazarusChurch3/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 7:
	9277	+ name = "cubemaps/Sodermalmsallen/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 8:
	9282	+ name = "cubemaps/Sodermalmsallen2/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 9:
	9287	+ name = "cubemaps/UnionSquare/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
9167	9291	default:
9168		- name = "cubemaps/rgb_";
9169		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
9170	9295	break;
9171	9296	}
9172		-
9173		- try
9174		- {
9175		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9176		- } catch (IOException e)
9177		- {
9178		- throw new RuntimeException(e);
9179		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
9180	9299	}
9181	9300
9182	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9208,8 +9327,12 @@
9208	9327	static double[] model = new double[16];
9209	9328	double[] camera2light = new double[16];
9210	9329	double[] light2camera = new double[16];
9211		- int newenvy = -1;
9212		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
9213	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9214	9337	//float[] light0 = { 0,0,0 };
9215	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9627,7 +9750,7 @@
9627	9750
9628	9751	if (renderCamera != lightCamera)
9629	9752	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9630		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9631	9754
9632	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9633	9756
..	..	@@ -9643,7 +9766,7 @@
9643	9766
9644	9767	if (renderCamera != lightCamera)
9645	9768	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9646		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9647	9770
9648	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9649	9772
..	..	@@ -9689,10 +9812,12 @@
9689	9812	rati = 1 / rati;
9690	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9691	9814	}
9692		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9693	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9694	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9695		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9696	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9697	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9698	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10729,7 +10854,7 @@
10729	10854
10730	10855	if (wait)
10731	10856	{
10732		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10733	10858
10734	10859	wait = false;
10735	10860	}
..	..	@@ -10844,7 +10969,7 @@
10844	10969	// if (parentcam != renderCamera) // not a light
10845	10970	if (cam != lightCamera)
10846	10971	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10847		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10848	10973
10849	10974	for (int j = 0; j < 4; j++)
10850	10975	{
..	..	@@ -10859,7 +10984,7 @@
10859	10984	// if (parentcam != renderCamera) // not a light
10860	10985	if (cam != lightCamera)
10861	10986	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10862		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10863	10988
10864	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10865	10990
..	..	@@ -10945,13 +11070,27 @@
10945	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10946	11071	}
10947	11072
10948		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
10949	11081	{
10950		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
10951	11087	}
10952		-
10953		- newenvy = -1;
10954		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
10955	11094	ratio = ((double) getWidth()) / getHeight();
10956	11095	//System.out.println("ratio = " + ratio);
10957	11096
..	..	@@ -10967,7 +11106,7 @@
10967	11106
10968	11107	if (!IsFrozen() && !ambientOcclusion)
10969	11108	{
10970		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
10971	11110	}
10972	11111
10973	11112	//if (selection_view == -1)
..	..	@@ -11150,9 +11289,9 @@
11150	11289
11151	11290	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11291
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11292	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11293	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11294	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11295	} else
11157	11296	{
11158	11297	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11302,7 @@
11163	11302	//System.out.println("BLENDING ON");
11164	11303	gl.glEnable(GL.GL_BLEND);
11165	11304	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11305	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11306	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11307	gl.glLoadIdentity();
11169	11308
..	..	@@ -11253,7 +11392,7 @@
11253	11392
11254	11393	// if (cam != lightCamera)
11255	11394	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11256		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11257	11396	}
11258	11397
11259	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11412,7 +11551,7 @@
11412	11551	}
11413	11552	}
11414	11553
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11554	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11555	{
11417	11556	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11557	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11559,21 @@
11420	11559
11421	11560	boolean texon = textureon;
11422	11561
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11562	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11563	+ textureon = false;
	11564	+
11428	11565	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11566	//System.out.println("ALLO");
11430	11567	gl.glColorMask(false, false, false, false);
11431	11568	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11569	+
	11570	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11571	+ textureon = texon;
	11572	+
11437	11573	gl.glColorMask(true, true, true, true);
11438	11574
11439	11575	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11576	+ gl.glDepthMask(false);
11441	11577	}
11442	11578
11443	11579	if (false) // DrawMode() == SHADOW)
..	..	@@ -11649,7 +11785,7 @@
11649	11785	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11786	{
11651	11787	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11788	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11789	pingthread.StepToTarget(true); // true);
11654	11790	// zoomonce = false;
11655	11791	}
..	..	@@ -11777,20 +11913,32 @@
11777	11913	ReleaseTextures(DEFAULT_TEXTURES);
11778	11914
11779	11915	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11916	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11917	{
11782		- String tex = e.nextElement();
	11918	+ cTexture tex = e.nextElement();
11783	11919
11784	11920	// System.out.println("Texture --------- " + tex);
11785	11921
11786		- if (tex.equals("WHITE_NOISE"))
	11922	+ if (tex.equals("WHITE_NOISE:"))
11787	11923	continue;
11788	11924
11789		- if (!usedtextures.containsKey(tex))
	11925	+ if (!usedtextures.contains(tex))
11790	11926	{
	11927	+ CacheTexture gettex = texturepigment.get(tex);
11791	11928	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	11929	+ if (gettex != null)
	11930	+ {
	11931	+ gettex.texture.dispose();
	11932	+ texturepigment.remove(tex);
	11933	+ }
	11934	+
	11935	+ gettex = texturebump.get(tex);
	11936	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11937	+ if (gettex != null)
	11938	+ {
	11939	+ gettex.texture.dispose();
	11940	+ texturebump.remove(tex);
	11941	+ }
11794	11942	}
11795	11943	}
11796	11944	}
..	..	@@ -12318,8 +12466,76 @@
12318	12466
12319	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12468
12321		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
12322	12471	"!!ARBfp1.0\n" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12473	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12474	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12475	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12476	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12477	+ "PARAM light2cam0 = program.env[10];" +
	12478	+ "PARAM light2cam1 = program.env[11];" +
	12479	+ "PARAM light2cam2 = program.env[12];" +
	12480	+ "TEMP temp;" +
	12481	+ "TEMP light;" +
	12482	+ "TEMP ndotl;" +
	12483	+ "TEMP normal;" +
	12484	+ "TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
	12487	+
	12488	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12489	+ Normalize("normal") +
	12490	+ "MOV light, state.light[0].position;" +
	12491	+ "DP3 ndotl.x, light, normal;" +
	12492	+
	12493	+ // shadow
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
	12497	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12499	+
	12500	+ // No shadow when out of frustum
	12501	+ //"SGE temp.y, depth.z, zero123.y;" +
	12502	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12503	+
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12505	+
	12506	+ // Backlit
	12507	+ "MOV pos.w, zero123.y;" +
	12508	+ "DP4 eye.x, pos, light2cam0;" +
	12509	+ "DP4 eye.y, pos, light2cam1;" +
	12510	+ "DP4 eye.z, pos, light2cam2;" +
	12511	+ Normalize("eye") +
	12512	+
	12513	+ "DP3 ndotl.y, -eye, normal;" +
	12514	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12515	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12516	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12517	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12518	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12519	+
	12520	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12521	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12522	+
	12523	+ // Pigment
	12524	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12526	+ "MUL temp, temp, ndotl.x;" +
	12527	+
	12528	+ "MUL temp, temp, zero123.z;" +
	12529	+
	12530	+ //"MUL temp, temp, ndotl.y;" +
	12531	+
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
	12533	+ "MOV result.color, temp;" +
	12534	+ "END";
	12535	+
	12536	+ String programmax =
	12537	+ "!!ARBfp1.0\n" +
	12538	+
12323	12539	//"OPTION ARB_fragment_program_shadow;" +
12324	12540	"PARAM light2cam0 = program.env[10];" +
12325	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12434,8 +12650,7 @@
12434	12650	"TEMP shininess;" +
12435	12651	"\n" +
12436	12652	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12653	+
12439	12654	"MOV mapgrid.x, one2048th.x;" +
12440	12655	"MOV temp, fragment.texcoord[1];" +
12441	12656	/*
..	..	@@ -12456,20 +12671,20 @@
12456	12671	"MUL temp, floor, mapgrid.x;" +
12457	12672	//"TEX depth0, temp, texture[1], 2D;" +
12458	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12459		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12460	12675	"") +
12461	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12462	12677	//"TEX depth1, temp, texture[1], 2D;" +
12463	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12464		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12465	12680	"") +
12466	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12467	12682	//"TEX depth2, temp, texture[1], 2D;" +
12468		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12469	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12470	12685	//"TEX depth3, temp, texture[1], 2D;" +
12471	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12472		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12473	12688	"") +
12474	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12475	12690	//"MOV params, material;" +
..	..	@@ -12840,10 +13055,10 @@
12840	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	13056	"") +
12842	13057
12843		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12844	13059	"SUB temp.x, half.x, shadow.x;" +
12845	13060	"MOV temp.y, -params5.z;" + // params6.x;" +
12846		- "SLT temp.z, temp.y, -one2048th.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12847	13062	"SUB temp.y, one.x, temp.z;" +
12848	13063	"MUL temp.x, temp.x, temp.y;" +
12849	13064	"KIL temp.x;" +
..	..	@@ -13174,6 +13389,13 @@
13174	13389	//once = true;
13175	13390	}
13176	13391
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
13177	13399	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13178	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13179	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13267,25 +13489,26 @@
13267	13489	return out;
13268	13490	}
13269	13491
13270		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
13271	13494	{
13272	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13273	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13274	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13275	13500	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13276		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13277		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13278		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13279		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13280	13503	//"SWZ buffer, temp, w,w,w,w;";
13281		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13282	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13283	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13284	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13285		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13286	13509
13287		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13288		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13510	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13511	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13289	13512	}
13290	13513
13291	13514	String Shadow(String depth, String shadow)
..	..	@@ -13332,7 +13555,7 @@
13332	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13556	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13557
13335		- // No shadow when out of frustrum
	13558	+ // No shadow when out of frustum
13336	13559	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13561	"";
..	..	@@ -14065,7 +14288,7 @@
14065	14288
14066	14289	// fev 2014???
14067	14290	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14291	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14292	pingthread.StepToTarget(true); // true);
14070	14293	}
14071	14294	// if (!LIVE)
..	..	@@ -14130,14 +14353,15 @@
14130	14353	drag = false;
14131	14354	//System.out.println("Mouse DOWN");
14132	14355	editObj = false;
14133		- ClickInfo info = new ClickInfo();
14134		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14135		- info.pane = this;
14136		- info.camera = renderCamera;
14137		- info.x = x;
14138		- info.y = y;
14139		- info.modifiers = modifiersex;
14140		- editObj = object.doEditClick(info, 0);
	14356	+ //ClickInfo info = new ClickInfo();
	14357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14358	+ object.clickInfo.pane = this;
	14359	+ object.clickInfo.camera = renderCamera;
	14360	+ object.clickInfo.x = x;
	14361	+ object.clickInfo.y = y;
	14362	+ object.clickInfo.modifiers = modifiersex;
	14363	+ editObj = object.doEditClick(//info,
	14364	+ 0);
14141	14365	if (!editObj)
14142	14366	{
14143	14367	hasMarquee = true;
..	..	@@ -14419,12 +14643,12 @@
14419	14643	void GoDown(int mod)
14420	14644	{
14421	14645	MODIFIERS \|= COMMAND;
14422		- /*
	14646	+ /**/
14423	14647	if((mod&SHIFT) == SHIFT)
14424		- manipCamera.RotatePosition(0, -speed);
	14648	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14425	14649	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14650	+ manipCamera.RotatePosition(0, -speed);
	14651	+ /**/
14428	14652	if ((mod & SHIFT) == SHIFT)
14429	14653	{
14430	14654	mouseMode = mouseMode; // VR??
..	..	@@ -14440,12 +14664,12 @@
14440	14664	void GoUp(int mod)
14441	14665	{
14442	14666	MODIFIERS \|= COMMAND;
14443		- /*
	14667	+ /**/
14444	14668	if((mod&SHIFT) == SHIFT)
14445		- manipCamera.RotatePosition(0, speed);
	14669	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14446	14670	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14671	+ manipCamera.RotatePosition(0, speed);
	14672	+ /**/
14449	14673	if ((mod & SHIFT) == SHIFT)
14450	14674	{
14451	14675	mouseMode = mouseMode;
..	..	@@ -14461,12 +14685,12 @@
14461	14685	void GoLeft(int mod)
14462	14686	{
14463	14687	MODIFIERS \|= COMMAND;
14464		- /*
	14688	+ /**/
14465	14689	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
14467		- else
14468	14690	manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14691	+ else
	14692	+ manipCamera.RotatePosition(speed, 0);
	14693	+ /**/
14470	14694	if ((mod & SHIFT) == SHIFT)
14471	14695	{
14472	14696	mouseMode = mouseMode;
..	..	@@ -14482,12 +14706,12 @@
14482	14706	void GoRight(int mod)
14483	14707	{
14484	14708	MODIFIERS \|= COMMAND;
14485		- /*
	14709	+ /**/
14486	14710	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
14488		- else
14489	14711	manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14712	+ else
	14713	+ manipCamera.RotatePosition(-speed, 0);
	14714	+ /**/
14491	14715	if ((mod & SHIFT) == SHIFT)
14492	14716	{
14493	14717	mouseMode = mouseMode;
..	..	@@ -14537,15 +14761,16 @@
14537	14761	if (editObj)
14538	14762	{
14539	14763	drag = true;
14540		- ClickInfo info = new ClickInfo();
14541		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14542	14766	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14543		- info.pane = this;
14544		- info.camera = renderCamera;
14545		- info.x = x;
14546		- info.y = y;
14547		- object.GetWindow().copy
14548		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14767	+ object.clickInfo.pane = this;
	14768	+ object.clickInfo.camera = renderCamera;
	14769	+ object.clickInfo.x = x;
	14770	+ object.clickInfo.y = y;
	14771	+ object //.GetWindow().copy
	14772	+ .doEditDrag(//info,
	14773	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14549	14774	} else
14550	14775	{
14551	14776	if (x < startX)
..	..	@@ -14694,24 +14919,27 @@
14694	14919	}
14695	14920	}
14696	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14697	14924	public void mouseMoved(MouseEvent e)
14698	14925	{
14699	14926	//System.out.println("mouseMoved: " + e);
14700	14927	if (isRenderer)
14701	14928	return;
14702	14929
14703		- ClickInfo ci = new ClickInfo();
14704		- ci.x = e.getX();
14705		- ci.y = e.getY();
14706		- ci.modifiers = e.getModifiersEx();
14707		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14708		- ci.pane = this;
14709		- ci.camera = renderCamera;
	14930	+ // Mouse cursor feedback
	14931	+ object.clickInfo.x = e.getX();
	14932	+ object.clickInfo.y = e.getY();
	14933	+ object.clickInfo.modifiers = e.getModifiersEx();
	14934	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14935	+ object.clickInfo.pane = this;
	14936	+ object.clickInfo.camera = renderCamera;
14710	14937	if (!isRenderer)
14711	14938	{
14712	14939	//ObjEditor editWindow = object.editWindow;
14713	14940	//Object3D copy = editWindow.copy;
14714		- if (object.doEditClick(ci, 0))
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14715	14943	{
14716	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14717	14945	} else
..	..	@@ -14726,7 +14954,8 @@
14726	14954	Globals.MOUSEDRAGGED = false;
14727	14955
14728	14956	movingcamera = false;
14729		- X = Y = 0;
	14957	+ X = 0; // getBounds().width/2;
	14958	+ Y = 0; // getBounds().height/2;
14730	14959	//System.out.println("mouseReleased: " + e);
14731	14960	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	14961	}
..	..	@@ -14982,7 +15211,8 @@
14982	15211	// break;
14983	15212	case 'T':
14984	15213	CACHETEXTURE ^= true;
14985		- textures.clear();
	15214	+ texturepigment.clear();
	15215	+ texturebump.clear();
14986	15216	// repaint();
14987	15217	break;
14988	15218	case 'Y':
..	..	@@ -15067,7 +15297,9 @@
15067	15297	case 'E' : COMPACT ^= true;
15068	15298	repaint();
15069	15299	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15300	+ case 'W' : // Wide Window (fullscreen)
	15301	+ //DEBUGHSB ^= true;
	15302	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15303	repaint();
15072	15304	break;
15073	15305	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15325,7 @@
15093	15325	repaint();
15094	15326	break;
15095	15327	case 'l':
15096		- lightMode ^= true;
15097		- Globals.lighttouched = true;
15098		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15099		- targetLookAt.set(manipCamera.lookAt);
15100		- repaint();
15101		- break;
15102		- case 'L':
	15328	+ //case 'L':
15103	15329	if (lightMode)
15104	15330	{
15105	15331	lightMode = false;
..	..	@@ -15163,20 +15389,24 @@
15163	15389	OCCLUSION_CULLING ^= true;
15164	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15165	15391	break;
15166		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
15167	15393	case '1':
15168	15394	case '2':
15169	15395	case '3':
15170	15396	case '4':
15171	15397	case '5':
15172		- newenvy = Character.getNumericValue(key);
15173		- repaint();
15174		- break;
15175	15398	case '6':
15176	15399	case '7':
15177	15400	case '8':
15178	15401	case '9':
15179		- BGcolor = (key - '6')/3.f;
	15402	+ if (true) // envyoff)
	15403	+ {
	15404	+ BGcolor = (key - '1')/8.f;
	15405	+ }
	15406	+ else
	15407	+ {
	15408	+ //newenvy = Character.getNumericValue(key);
	15409	+ }
15180	15410	repaint();
15181	15411	break;
15182	15412	case '!':
..	..	@@ -15246,7 +15476,10 @@
15246	15476	// kompactbit = 6;
15247	15477	// break;
15248	15478	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15479	+ lightMode ^= true;
	15480	+ Globals.lighttouched = true;
	15481	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15482	+ targetLookAt.set(manipCamera.lookAt);
15250	15483	repaint();
15251	15484	break;
15252	15485	//case '`' :
..	..	@@ -15295,12 +15528,6 @@
15295	15528	break;
15296	15529	case '+':
15297	15530
15298		- //for (int i=0; i<0x7FFFFFFF; i++)
15299		- {
15300		- //String.format("%08X", i); // "7caca905"
15301		- GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
15302		- }
15303		-
15304	15531	/*
15305	15532	//fontsize += 1;
15306	15533	bbzoom *= 2;
..	..	@@ -15318,17 +15545,17 @@
15318	15545	case '=':
15319	15546	IncDepth();
15320	15547	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15548	+ object.GetWindow().refreshContents(true);
15322	15549	maskbit = 6;
15323	15550	break;
15324	15551	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15552	DecDepth();
15326	15553	maskbit = 5;
15327	15554	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15555	+// if (object.editWindow == null)
	15556	+// new Exception().printStackTrace();
	15557	+// else
	15558	+ object.GetWindow().refreshContents(true);
15332	15559	break;
15333	15560	case '{':
15334	15561	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15779,7 @@
15552	15779	}
15553	15780	*/
15554	15781
15555		- object.editWindow.EditSelection(false);
	15782	+ object.GetWindow().EditSelection(false);
15556	15783	}
15557	15784
15558	15785	void SelectParent()
..	..	@@ -15569,10 +15796,10 @@
15569	15796	{
15570	15797	//selectees.remove(i);
15571	15798	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15800	} else
15574	15801	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15802	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15803	}
15577	15804
15578	15805	first = false;
..	..	@@ -15614,12 +15841,12 @@
15614	15841	for (int j = 0; j < group.children.size(); j++)
15615	15842	{
15616	15843	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15844	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15845	first = false;
15619	15846	}
15620	15847	} else
15621	15848	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15849	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15850	}
15624	15851
15625	15852	first = false;
..	..	@@ -15630,21 +15857,21 @@
15630	15857	{
15631	15858	//Composite group = (Composite) object;
15632	15859	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15860	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15861	}
15635	15862
15636	15863	void ResetTransform(int mask)
15637	15864	{
15638	15865	//Composite group = (Composite) object;
15639	15866	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15867	+ group.GetWindow().ResetTransform(mask);
15641	15868	}
15642	15869
15643	15870	void FlipTransform()
15644	15871	{
15645	15872	//Composite group = (Composite) object;
15646	15873	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15874	+ group.GetWindow().FlipTransform();
15648	15875	// group.editWindow.ReduceMesh(true);
15649	15876	}
15650	15877
..	..	@@ -15652,7 +15879,7 @@
15652	15879	{
15653	15880	//Composite group = (Composite) object;
15654	15881	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15882	+ group.GetWindow().PrintMemory();
15656	15883	// group.editWindow.ReduceMesh(true);
15657	15884	}
15658	15885
..	..	@@ -15660,7 +15887,7 @@
15660	15887	{
15661	15888	//Composite group = (Composite) object;
15662	15889	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15890	+ group.GetWindow().ResetCentroid();
15664	15891	}
15665	15892
15666	15893	void IncDepth()
..	..	@@ -15742,8 +15969,6 @@
15742	15969
15743	15970	int width = getBounds().width;
15744	15971	int height = getBounds().height;
15745		- ClickInfo info = new ClickInfo();
15746		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15747	15972	//Image img = CreateImage(width, height);
15748	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
15749	15974
..	..	@@ -15820,48 +16045,77 @@
15820	16045	}
15821	16046	if (object != null && !hasMarquee)
15822	16047	{
	16048	+ if (object.clickInfo == null)
	16049	+ object.clickInfo = new ClickInfo();
	16050	+ ClickInfo info = object.clickInfo;
	16051	+ //ClickInfo info = new ClickInfo();
	16052	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16053	+
15823	16054	if (isRenderer)
15824	16055	{
15825		- info.flags++;
	16056	+ object.clickInfo.flags++;
15826	16057	double frameAspect = (double) width / (double) height;
15827	16058	if (frameAspect > renderCamera.aspect)
15828	16059	{
15829	16060	int desired = (int) ((double) height * renderCamera.aspect);
15830		- info.bounds.width -= width - desired;
15831		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15832	16063	} else
15833	16064	{
15834	16065	int desired = (int) ((double) width / renderCamera.aspect);
15835		- info.bounds.height -= height - desired;
15836		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15837	16068	}
15838	16069	}
15839		- info.g = gr;
15840		- info.camera = renderCamera;
	16070	+
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15841	16073	/*
15842	16074	// Memory intensive (brep.verticescopy)
15843	16075	if (!(object instanceof Composite))
15844	16076	object.draw(info, 0, false); // SLOW :
15845	16077	*/
15846		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15847	16079	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16080	+ Grafreed.Assert(object != null);
	16081	+ Grafreed.Assert(object.selection != null);
	16082	+ if (object.selection.Size() > 0)
15851	16083	{
15852		- switch (object.selection.get(0).hitSomething)
	16084	+ int hitSomething = object.selection.get(0).hitSomething;
	16085	+
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
	16089	+ if (hitSomething == Object3D.hitCenter)
15853	16090	{
15854		- case Object3D.hitCenter: gr.setColor(Color.pink);
15855		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15856		- break;
15857		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15858		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15859		- break;
15860		- case Object3D.hitScale: gr.setColor(Color.cyan);
15861		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15862		- break;
	16091	+ info.DX = X;
	16092	+ if (X != 0)
	16093	+ info.DX -= info.bounds.width/2;
	16094	+
	16095	+ info.DY = Y;
	16096	+ if (Y != 0)
	16097	+ info.DY -= info.bounds.height/2;
15863	16098	}
15864		-
	16099	+
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
	16102	+
	16103	+ if (drag && (X != 0 \|\| Y != 0))
	16104	+ {
	16105	+ switch (hitSomething)
	16106	+ {
	16107	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16114	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16115	+ break;
	16116	+ }
	16117	+
	16118	+ }
15865	16119	}
15866	16120	}
15867	16121	}
..	..	@@ -16343,6 +16597,8 @@
16343	16597	private /static/ boolean firstime;
16344	16598	private /static/ cVector newView = new cVector();
16345	16599	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16600	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16601	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16346	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16347	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16348	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16355,29 +16611,67 @@
16355	16611	{
16356	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16357	16613
	16614	+ int usedsuf = 0;
	16615	+
16358	16616	for (int i = 0; i < suffixes.length; i++)
16359	16617	{
16360		- String resourceName = basename + suffixes[i] + "." + suffix;
16361		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16362		- mipmapped,
16363		- FileUtil.getFileSuffix(resourceName));
16364		- if (data == null)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
16365	16623	{
16366		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
16367	16628	}
	16629	+
	16630	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16631	+ TextureData data;
	16632	+
	16633	+ try
	16634	+ {
	16635	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16636	+ mipmapped,
	16637	+ FileUtil.getFileSuffix(resourceName));
	16638	+ }
	16639	+ catch (Exception e)
	16640	+ {
	16641	+ try
	16642	+ {
	16643	+ resourceName = basename + fallback[i] + "." + suffix;
	16644	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16645	+ mipmapped,
	16646	+ FileUtil.getFileSuffix(resourceName));
	16647	+ }
	16648	+ catch (Exception e2)
	16649	+ {
	16650	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16651	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16652	+ mipmapped,
	16653	+ FileUtil.getFileSuffix(resourceName));
	16654	+ }
	16655	+ }
	16656	+
16368	16657	//System.out.println("Target = " + targets[i]);
16369	16658	cubemap.updateImage(data, targets[i]);
16370	16659	}
16371	16660
16372	16661	return cubemap;
16373	16662	}
	16663	+
16374	16664	int bigsphere = -1;
16375	16665
16376	16666	float BGcolor = 0.5f;
16377	16667
16378		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
16379	16671	{
16380		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
16381	16675	{
16382	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16383	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16392,7 +16686,17 @@
16392	16686	// Compensates for ExaminerViewer's modification of modelview matrix
16393	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
16394	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
16395	16690
	16691	+// colorV[0] = 2;
	16692	+// colorV[1] = 2;
	16693	+// colorV[2] = 2;
	16694	+// colorV[3] = 1;
	16695	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16696	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16697	+//
	16698	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16699	+
16396	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
16397	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16398	16702
..	..	@@ -16424,6 +16728,7 @@
16424	16728	{
16425	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
16426	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16427	16732	gl.glMultMatrixd(viewrot_1, 0);
16428	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16429	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16659,6 +16964,14 @@
16659	16964	}
16660	16965	}
16661	16966
	16967	+ private Object3D GetFolder()
	16968	+ {
	16969	+ Object3D folder = object.GetWindow().copy;
	16970	+ if (object.GetWindow().copy.selection.Size() > 0)
	16971	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16972	+ return folder;
	16973	+ }
	16974	+
16662	16975	class SelectBuffer implements GLEventListener
16663	16976	{
16664	16977
..	..	@@ -16674,7 +16987,7 @@
16674	16987	//new Exception().printStackTrace();
16675	16988	System.out.println("select buffer init");
16676	16989	// Use debug pipeline
16677		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16678	16991
16679	16992	GL gl = drawable.getGL();
16680	16993
..	..	@@ -16738,6 +17051,17 @@
16738	17051
16739	17052	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	17053
	17054	+ if (PAINTMODE)
	17055	+ {
	17056	+ if (object.GetWindow().copy.selection.Size() > 0)
	17057	+ {
	17058	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17059	+
	17060	+ // Make what you paint not selectable.
	17061	+ paintobj.ResetSelectable();
	17062	+ }
	17063	+ }
	17064	+
16741	17065	//int tmp = selection_view;
16742	17066	//selection_view = -1;
16743	17067	int temp = DrawMode();
..	..	@@ -16749,6 +17073,17 @@
16749	17073	// temp = DEFAULT; // patch for selection debug
16750	17074	Globals.drawMode = temp; // WARNING
16751	17075
	17076	+ if (PAINTMODE)
	17077	+ {
	17078	+ if (object.GetWindow().copy.selection.Size() > 0)
	17079	+ {
	17080	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17081	+
	17082	+ // Revert.
	17083	+ paintobj.RestoreSelectable();
	17084	+ }
	17085	+ }
	17086	+
16752	17087	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	17088
16754	17089	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +17187,31 @@
16852	17187	}
16853	17188
16854	17189	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17190	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17191
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17192	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17193	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17194	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17195
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17196	+ if (object.GetWindow().copy.selection.Size() > 0)
	17197	+ {
	17198	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17199
16863		- group.CreateMaterial(); // use a void leaf to select instances
16864		-
16865		- group.add(paintobj); // link
16866		-
16867		- object.editWindow.SnapObject(group);
16868		-
16869		- Object3D folder = object.editWindow.copy;
16870		-
16871		- if (object.editWindow.copy.selection.Size() > 0)
16872		- folder = object.editWindow.copy.selection.elementAt(0);
16873		-
16874		- folder.add(group);
16875		-
16876		- object.editWindow.ResetModel();
16877		- object.editWindow.refreshContents();
	17200	+ Object3D inst = new Object3D("inst" + paintcount++);
	17201	+
	17202	+ inst.CreateMaterial(); // use a void leaf to select instances
	17203	+
	17204	+ inst.add(paintobj); // link
	17205	+
	17206	+ object.GetWindow().SnapObject(inst);
	17207	+
	17208	+ Object3D folder = paintFolder; // GetFolder();
	17209	+
	17210	+ folder.add(inst);
	17211	+
	17212	+ object.GetWindow().ResetModel();
	17213	+ object.GetWindow().refreshContents();
	17214	+ }
16878	17215	}
16879	17216	else
16880	17217	paintcount = 0;