~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
..	..	@@ -335,14 +385,28 @@
335	385	display.options1[2] = material.shadowbias;
336	386	display.options1[3] = material.aniso;
337	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
338	393	display.options2[0] = material.opacity;
339	394	display.options2[1] = material.diffuse;
340	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
341	399
342	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
343	404	display.options4[0] = material.cameralight/0.2f;
344	405	display.options4[1] = material.subsurface;
345	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
346	410
347	411	// if (display.CURRENTANTIALIAS > 0)
348	412	// display.options3[3] /= 4;
..	..	@@ -1433,6 +1497,8 @@
1433	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1434	1498	}
1435	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1436	1502	void SetColor(Object3D obj, Vertex p0)
1437	1503	{
1438	1504	CameraPane display = this;
..	..	@@ -1500,8 +1566,6 @@
1500	1566	{
1501	1567	return;
1502	1568	}
1503		-
1504		- float[] colorV = new float[3];
1505	1569
1506	1570	if (false) // marked)
1507	1571	{
..	..	@@ -2051,7 +2115,7 @@
2051	2115	//System.err.println("Oeil on");
2052	2116	OEIL = true;
2053	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2055	2119	//pingthread.StepToTarget(true);
2056	2120	}
2057	2121
..	..	@@ -2284,10 +2348,17 @@
2284	2348	HANDLES ^= true;
2285	2349	}
2286	2350
	2351	+ Object3D paintFolder;
	2352	+
2287	2353	void TogglePaint()
2288	2354	{
2289	2355	PAINTMODE ^= true;
2290	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2291	2362	}
2292	2363
2293	2364	void SwapCamera(int a, int b)
..	..	@@ -2384,6 +2455,21 @@
2384	2455	return currentGL;
2385	2456	}
2386	2457
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2387	2473	/**/
2388	2474	class CacheTexture
2389	2475	{
..	..	@@ -2392,28 +2478,31 @@
2392	2478
2393	2479	int resolution;
2394	2480
2395		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2396	2482	{
2397		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2398	2485	resolution = res;
2399	2486	}
2400	2487	}
2401	2488	/**/
2402	2489
2403	2490	// TEXTURE static Texture texture;
2404		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2405		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2406		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2407	2496	int pigmentdepth = 0;
2408	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2409	2498	int bumpdepth = 0;
2410	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2411	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2412	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2413		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2414	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2415	2504
2416		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2417	2506	{
2418	2507	TextureData texturedata = null;
2419	2508
..	..	@@ -2432,13 +2521,34 @@
2432	2521	if (bump)
2433	2522	texturedata = ConvertBump(texturedata, false);
2434	2523
2435		- com.sun.opengl.util.texture.Texture texture =
2436		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2437	2526
2438		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2439		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2440	2529
2441		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2442	2552	}
2443	2553
2444	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3511,6 +3621,8 @@
3511	3621
3512	3622	System.out.println("LOADING TEXTURE : " + name);
3513	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3514	3626	//
3515	3627	if (false) // compressbit > 0)
3516	3628	{
..	..	@@ -7909,7 +8021,7 @@
7909	8021	String pigment = Object3D.GetPigment(tex);
7910	8022	String bump = Object3D.GetBump(tex);
7911	8023
7912		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7913	8025	{
7914	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7915	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7924,8 +8036,8 @@
7924	8036	pigment = null;
7925	8037	}
7926	8038
7927		- ReleaseTexture(bump, true);
7928		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7929	8041	}
7930	8042
7931	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7943,7 +8055,7 @@
7943	8055
7944	8056	String pigment = Object3D.GetPigment(tex);
7945	8057
7946		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947	8059	{
7948	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7949	8061	// System.out.println("; bump = " + bump);
..	..	@@ -7954,7 +8066,7 @@
7954	8066	pigment = null;
7955	8067	}
7956	8068
7957		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
7958	8070	}
7959	8071
7960	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7972,7 +8084,7 @@
7972	8084
7973	8085	String bump = Object3D.GetBump(tex);
7974	8086
7975		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976	8088	{
7977	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7978	8090	// System.out.println("; bump = " + bump);
..	..	@@ -7983,10 +8095,10 @@
7983	8095	bump = null;
7984	8096	}
7985	8097
7986		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
7987	8099	}
7988	8100
7989		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7990	8102	{
7991	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7992	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7997,7 +8109,7 @@
7997	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7998	8110
7999	8111	if (tex != null)
8000		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8001	8113
8002	8114	// //assert( texture != null );
8003	8115	// if (texture == null)
..	..	@@ -8091,47 +8203,50 @@
8091	8203
8092	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8093	8205	{
8094		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8095		- ambientOcclusion ) // \|\| !textureon)
8096		- {
8097		- return; // false;
8098		- }
8099		-
8100		- if (tex == null)
8101		- {
8102		- BindTexture(null,false,resolution);
8103		- BindTexture(null,true,resolution);
8104		- return;
8105		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8106	8247
8107		- String pigment = Object3D.GetPigment(tex);
8108		- String bump = Object3D.GetBump(tex);
8109		-
8110		- usedtextures.put(pigment, pigment);
8111		- usedtextures.put(bump, bump);
8112		-
8113		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8114		- {
8115		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8116		- // System.out.println("; bump = " + bump);
8117		- }
8118		-
8119		- if (bump.equals(""))
8120		- {
8121		- bump = null;
8122		- }
8123		- if (pigment.equals(""))
8124		- {
8125		- pigment = null;
8126		- }
8127		-
8128		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8129		- BindTexture(pigment, false, resolution);
8130		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8131		- BindTexture(bump, true, resolution);
8132		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8133		-
8134		- return; // true;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8135	8250	}
8136	8251
8137	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8150,9 +8265,9 @@
8150	8265
8151	8266	String pigment = Object3D.GetPigment(tex);
8152	8267
8153		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8154	8269
8155		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156	8271	{
8157	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8158	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8164,7 +8279,7 @@
8164	8279	}
8165	8280
8166	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8168	8283	}
8169	8284
8170	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8183,9 +8298,9 @@
8183	8298
8184	8299	String bump = Object3D.GetBump(tex);
8185	8300
8186		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8187	8302
8188		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189	8304	{
8190	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8191	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8197,7 +8312,7 @@
8197	8312	}
8198	8313
8199	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8201	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202	8317	}
8203	8318
..	..	@@ -8221,13 +8336,19 @@
8221	8336	return fileExists;
8222	8337	}
8223	8338
8224		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8225	8340	{
8226		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8227	8342
8228	8343	if (tex != null)
8229	8344	{
8230		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8231	8352
8232	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233	8354
..	..	@@ -8237,19 +8358,46 @@
8237	8358	// else
8238	8359	// if (!texname.startsWith("/"))
8239	8360	// texname = "/Users/nbriere/Textures/" + texname;
8240		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8241	8362	{
8242	8363	texname = fallbackTextureName;
8243	8364	}
8244	8365
8245	8366	if (CACHETEXTURE)
8246		- texture = textures.get(texname); // TEXTURE CACHE
8247		-
8248		- TextureData texturedata = null;
8249		-
8250		- if (texture == null \|\| texture.resolution < resolution)
8251	8367	{
8252		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8253	8401	{
8254	8402	assert(!bump);
8255	8403	// if (bump)
..	..	@@ -8260,19 +8408,23 @@
8260	8408	// }
8261	8409	// else
8262	8410	// {
8263		- texture = textures.get(tex);
8264		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8265	8413	{
8266		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8267	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8268	8418	// }
8269	8419	} else
8270		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8271	8421	{
8272	8422	assert(bump);
8273		- texture = textures.get(tex);
8274		- if (texture == null)
8275		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8276	8428	} else
8277	8429	{
8278	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8280,11 +8432,22 @@
8280	8432	// texture = GetResourceTexture("default.png");
8281	8433	//} else
8282	8434	//{
8283		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8284	8436	{
8285		- texture = textures.get(tex);
8286		- if (texture == null)
8287		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	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();
8288	8451	} else
8289	8452	{
8290	8453	if (textureon)
..	..	@@ -8343,19 +8506,20 @@
8343	8506	if (texturedata == null)
8344	8507	throw new Exception();
8345	8508
8346		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8347	8510	//texture = GetTexture(tex, bump);
8348	8511	}
	8512	+ }
8349	8513	}
8350	8514	//}
8351	8515	}
8352	8516
8353		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8354	8518	{
8355	8519	//return false;
8356	8520
8357	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8358		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8359	8523	{
8360	8524	// String ext = "_highres";
8361	8525	// if (REDUCETEXTURE)
..	..	@@ -8372,52 +8536,17 @@
8372	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8373	8537	if (!cachefile.exists())
8374	8538	{
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))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8384	8540	{
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);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8415	8543	ImageWriter writer = null;
8416	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8417	8545	if (iter.hasNext()) {
8418	8546	writer = (ImageWriter)iter.next();
8419	8547	}
8420		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8421	8550	try
8422	8551	{
8423	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8434,18 +8563,20 @@
8434	8563	}
8435	8564	}
8436	8565	}
8437		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8438	8569	//System.out.println("Texture = " + tex);
8439		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8440	8571	{
8441		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8442	8573	thetex.texture.disable();
8443	8574	thetex.texture.dispose();
8444		- textures.remove(texname);
	8575	+ textures.remove(tex);
8445	8576	}
8446	8577
8447		- texture.texturedata = texturedata;
8448		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8449	8580
8450	8581	// newtex = true;
8451	8582	}
..	..	@@ -8461,10 +8592,44 @@
8461	8592	}
8462	8593	}
8463	8594
8464		- return texture;
	8595	+ return texturecache;
8465	8596	}
8466	8597
8467		- 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
8468	8633	{
8469	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8470	8635
..	..	@@ -8482,21 +8647,21 @@
8482	8647	return texture!=null?texture.texture:null;
8483	8648	}
8484	8649
8485		- 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
8486	8651	{
8487	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8488	8653
8489	8654	return texture!=null?texture.texturedata:null;
8490	8655	}
8491	8656
8492		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8493	8658	{
8494	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8495	8660	{
8496	8661	return false;
8497	8662	}
8498	8663
8499		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8500	8665
8501	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8502	8667
..	..	@@ -8528,9 +8693,75 @@
8528	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8529	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8530	8695
8531		- return newtex;
	8696	+ return true; // Warning: not used.
8532	8697	}
8533	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	+
8534	8765	ShadowBuffer shadowPBuf;
8535	8766	AntialiasBuffer antialiasPBuf;
8536	8767	int MAXSTACK;
..	..	@@ -8723,7 +8954,7 @@
8723	8954
8724	8955	if (cubemap == null)
8725	8956	{
8726		- LoadEnvy(5);
	8957	+ //LoadEnvy(1);
8727	8958	}
8728	8959
8729	8960	//cubemap.enable();
..	..	@@ -9010,37 +9241,58 @@
9010	9241	cubemap = null;
9011	9242	return;
9012	9243	case 1:
9013		- name = "cubemaps/box_";
9014		- ext = "png";
	9244	+ name = "cubemaps/rgb/";
	9245	+ ext = "jpg";
9015	9246	reverseUP = false;
9016	9247	break;
9017	9248	case 2:
9018		- name = "cubemaps/uffizi_";
9019		- ext = "png";
9020		- break; // reverseUP = true; break;
	9249	+ name = "cubemaps/uffizi/";
	9250	+ ext = "jpg";
	9251	+ reverseUP = false;
	9252	+ break;
9021	9253	case 3:
9022		- name = "cubemaps/CloudyHills_";
9023		- ext = "tga";
	9254	+ name = "cubemaps/CloudyHills/";
	9255	+ ext = "jpg";
9024	9256	reverseUP = false;
9025	9257	break;
9026	9258	case 4:
9027		- name = "cubemaps/cornell_";
	9259	+ name = "cubemaps/cornell/";
9028	9260	ext = "png";
9029	9261	reverseUP = false;
9030	9262	break;
	9263	+ case 5:
	9264	+ name = "cubemaps/skycube/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 6:
	9269	+ name = "cubemaps/SaintLazarusChurch3/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 7:
	9274	+ name = "cubemaps/Sodermalmsallen/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 8:
	9279	+ name = "cubemaps/Sodermalmsallen2/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 9:
	9284	+ name = "cubemaps/UnionSquare/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
9031	9288	default:
9032		- name = "cubemaps/rgb_";
9033		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9289	+ name = "cubemaps/box/";
	9290	+ ext = "png"; /mipmap = true;/
	9291	+ reverseUP = false;
9034	9292	break;
9035	9293	}
9036		-
9037		- try
9038		- {
9039		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9040		- } catch (IOException e)
9041		- {
9042		- throw new RuntimeException(e);
9043		- }
	9294	+
	9295	+ LoadSkybox(name, ext, mipmap);
9044	9296	}
9045	9297
9046	9298	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9072,8 +9324,12 @@
9072	9324	static double[] model = new double[16];
9073	9325	double[] camera2light = new double[16];
9074	9326	double[] light2camera = new double[16];
9075		- int newenvy = -1;
9076		- boolean envyoff = true; // false;
	9327	+
	9328	+ //int newenvy = -1;
	9329	+ //boolean envyoff = false;
	9330	+
	9331	+ String loadedskyboxname;
	9332	+
9077	9333	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9078	9334	//float[] light0 = { 0,0,0 };
9079	9335	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9366,11 +9622,35 @@
9366	9622	jy8[3] = 0.5f;
9367	9623	}
9368	9624
9369		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9625	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9370	9626	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371	9627	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372	9628	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373	9629
	9630	+ void ResetOptions()
	9631	+ {
	9632	+ options1[0] = 100;
	9633	+ options1[1] = 0.025f;
	9634	+ options1[2] = 0.01f;
	9635	+ options1[3] = 0;
	9636	+ options1[4] = 0;
	9637	+
	9638	+ options2[0] = 0;
	9639	+ options2[1] = 0.75f;
	9640	+ options2[2] = 0;
	9641	+ options2[3] = 0;
	9642	+
	9643	+ options3[0] = 1;
	9644	+ options3[1] = 1;
	9645	+ options3[2] = 1;
	9646	+ options3[3] = 0;
	9647	+
	9648	+ options4[0] = 1;
	9649	+ options4[1] = 0;
	9650	+ options4[2] = 1;
	9651	+ options4[3] = 0;
	9652	+ }
	9653	+
9374	9654	static int imagecount = 0; // movie generation
9375	9655
9376	9656	static int jitter = 0;
..	..	@@ -9467,7 +9747,7 @@
9467	9747
9468	9748	if (renderCamera != lightCamera)
9469	9749	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9470		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9750	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9471	9751
9472	9752	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9473	9753
..	..	@@ -9483,7 +9763,7 @@
9483	9763
9484	9764	if (renderCamera != lightCamera)
9485	9765	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9486		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9766	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9487	9767
9488	9768	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9489	9769
..	..	@@ -9529,10 +9809,12 @@
9529	9809	rati = 1 / rati;
9530	9810	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9531	9811	}
9532		- assert (newenvy == -1);
	9812	+
	9813	+ //assert (newenvy == -1);
	9814	+
9533	9815	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9534	9816	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9535		- DrawSkyBox(gl);
	9817	+ DrawSkyBox(gl, (float)rati);
9536	9818	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9537	9819	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9538	9820	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10481,6 +10763,7 @@
10481	10763	ANTIALIAS = 0;
10482	10764	//System.out.println("RESTART");
10483	10765	AAtimer.restart();
	10766	+ Globals.TIMERRUNNING = true;
10484	10767	}
10485	10768	}
10486	10769	}
..	..	@@ -10568,7 +10851,7 @@
10568	10851
10569	10852	if (wait)
10570	10853	{
10571		- Sleep(500);
	10854	+ Sleep(200); // blocks everything
10572	10855
10573	10856	wait = false;
10574	10857	}
..	..	@@ -10683,7 +10966,7 @@
10683	10966	// if (parentcam != renderCamera) // not a light
10684	10967	if (cam != lightCamera)
10685	10968	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10686		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10969	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10687	10970
10688	10971	for (int j = 0; j < 4; j++)
10689	10972	{
..	..	@@ -10698,7 +10981,7 @@
10698	10981	// if (parentcam != renderCamera) // not a light
10699	10982	if (cam != lightCamera)
10700	10983	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10701		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10984	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10702	10985
10703	10986	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10704	10987
..	..	@@ -10784,13 +11067,27 @@
10784	11067	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10785	11068	}
10786	11069
10787		- if (newenvy > -1)
	11070	+// if (newenvy > -1)
	11071	+// {
	11072	+// LoadEnvy(newenvy);
	11073	+// }
	11074	+//
	11075	+// newenvy = -1;
	11076	+
	11077	+ if (object.skyboxname != null)
10788	11078	{
10789		- LoadEnvy(newenvy);
	11079	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11080	+ {
	11081	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11082	+ loadedskyboxname = object.skyboxname;
	11083	+ }
10790	11084	}
10791		-
10792		- newenvy = -1;
10793		-
	11085	+ else
	11086	+ {
	11087	+ cubemap = null;
	11088	+ loadedskyboxname = null;
	11089	+ }
	11090	+
10794	11091	ratio = ((double) getWidth()) / getHeight();
10795	11092	//System.out.println("ratio = " + ratio);
10796	11093
..	..	@@ -10806,7 +11103,7 @@
10806	11103
10807	11104	if (!IsFrozen() && !ambientOcclusion)
10808	11105	{
10809		- DrawSkyBox(gl);
	11106	+ DrawSkyBox(gl, (float)ratio);
10810	11107	}
10811	11108
10812	11109	//if (selection_view == -1)
..	..	@@ -10989,9 +11286,9 @@
10989	11286
10990	11287	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11288
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11289	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11290	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11291	+gl.glEnable(gl.GL_MULTISAMPLE);
10995	11292	} else
10996	11293	{
10997	11294	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11299,7 @@
11002	11299	//System.out.println("BLENDING ON");
11003	11300	gl.glEnable(GL.GL_BLEND);
11004	11301	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11302	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11303	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11304	gl.glLoadIdentity();
11008	11305
..	..	@@ -11092,7 +11389,7 @@
11092	11389
11093	11390	// if (cam != lightCamera)
11094	11391	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11095		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11392	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11096	11393	}
11097	11394
11098	11395	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11251,7 +11548,7 @@
11251	11548	}
11252	11549	}
11253	11550
11254		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11551	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11255	11552	{
11256	11553	//gl.glDepthFunc(GL.GL_LEQUAL);
11257	11554	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11259,24 +11556,21 @@
11259	11556
11260	11557	boolean texon = textureon;
11261	11558
11262		- if (RENDERPROGRAM > 0)
11263		- {
11264		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265		- textureon = false;
11266		- }
	11559	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11560	+ textureon = false;
	11561	+
11267	11562	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11268	11563	//System.out.println("ALLO");
11269	11564	gl.glColorMask(false, false, false, false);
11270	11565	DrawObject(gl);
11271		- if (RENDERPROGRAM > 0)
11272		- {
11273		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274		- textureon = texon;
11275		- }
	11566	+
	11567	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11568	+ textureon = texon;
	11569	+
11276	11570	gl.glColorMask(true, true, true, true);
11277	11571
11278	11572	gl.glDepthFunc(GL.GL_EQUAL);
11279		- //gl.glDepthMask(false);
	11573	+ gl.glDepthMask(false);
11280	11574	}
11281	11575
11282	11576	if (false) // DrawMode() == SHADOW)
..	..	@@ -11479,13 +11773,16 @@
11479	11773
11480	11774	void DrawObject(GL gl, boolean draw)
11481	11775	{
	11776	+ // To clear camera values
	11777	+ ResetOptions();
	11778	+
11482	11779	//System.out.println("DRAW OBJECT " + mouseDown);
11483	11780	// DrawMode() = SELECTION;
11484	11781	//GL gl = getGL();
11485	11782	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11486	11783	{
11487	11784	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11488		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11785	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11489	11786	pingthread.StepToTarget(true); // true);
11490	11787	// zoomonce = false;
11491	11788	}
..	..	@@ -11613,20 +11910,32 @@
11613	11910	ReleaseTextures(DEFAULT_TEXTURES);
11614	11911
11615	11912	if (CLEANCACHE)
11616		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11913	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11617	11914	{
11618		- String tex = e.nextElement();
	11915	+ cTexture tex = e.nextElement();
11619	11916
11620	11917	// System.out.println("Texture --------- " + tex);
11621	11918
11622		- if (tex.equals("WHITE_NOISE"))
	11919	+ if (tex.equals("WHITE_NOISE:"))
11623	11920	continue;
11624	11921
11625		- if (!usedtextures.containsKey(tex))
	11922	+ if (!usedtextures.contains(tex))
11626	11923	{
	11924	+ CacheTexture gettex = texturepigment.get(tex);
11627	11925	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11628		- textures.get(tex).texture.dispose();
11629		- textures.remove(tex);
	11926	+ if (gettex != null)
	11927	+ {
	11928	+ gettex.texture.dispose();
	11929	+ texturepigment.remove(tex);
	11930	+ }
	11931	+
	11932	+ gettex = texturebump.get(tex);
	11933	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11934	+ if (gettex != null)
	11935	+ {
	11936	+ gettex.texture.dispose();
	11937	+ texturebump.remove(tex);
	11938	+ }
11630	11939	}
11631	11940	}
11632	11941	}
..	..	@@ -12046,7 +12355,7 @@
12046	12355	for (int i = tp.size(); --i >= 0;)
12047	12356	{
12048	12357	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12358	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12050	12359	}
12051	12360
12052	12361
..	..	@@ -12154,8 +12463,76 @@
12154	12463
12155	12464	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12156	12465
12157		- String program =
	12466	+ String programmin =
	12467	+ // Min shader
12158	12468	"!!ARBfp1.0\n" +
	12469	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12470	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12471	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12472	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12473	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12474	+ "PARAM light2cam0 = program.env[10];" +
	12475	+ "PARAM light2cam1 = program.env[11];" +
	12476	+ "PARAM light2cam2 = program.env[12];" +
	12477	+ "TEMP temp;" +
	12478	+ "TEMP light;" +
	12479	+ "TEMP ndotl;" +
	12480	+ "TEMP normal;" +
	12481	+ "TEMP depth;" +
	12482	+ "TEMP eye;" +
	12483	+ "TEMP pos;" +
	12484	+
	12485	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12486	+ Normalize("normal") +
	12487	+ "MOV light, state.light[0].position;" +
	12488	+ "DP3 ndotl.x, light, normal;" +
	12489	+
	12490	+ // shadow
	12491	+ "MOV pos, fragment.texcoord[1];" +
	12492	+ "MOV temp, pos;" +
	12493	+ ShadowTextureFetch("depth", "temp", "1") +
	12494	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12495	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12496	+
	12497	+ // No shadow when out of frustum
	12498	+ //"SGE temp.y, depth.z, zero123.y;" +
	12499	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12500	+
	12501	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12502	+
	12503	+ // Backlit
	12504	+ "MOV pos.w, zero123.y;" +
	12505	+ "DP4 eye.x, pos, light2cam0;" +
	12506	+ "DP4 eye.y, pos, light2cam1;" +
	12507	+ "DP4 eye.z, pos, light2cam2;" +
	12508	+ Normalize("eye") +
	12509	+
	12510	+ "DP3 ndotl.y, -eye, normal;" +
	12511	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12512	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12513	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12514	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12515	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12516	+
	12517	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12518	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12519	+
	12520	+ // Pigment
	12521	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12522	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12523	+ "MUL temp, temp, ndotl.x;" +
	12524	+
	12525	+ "MUL temp, temp, zero123.z;" +
	12526	+
	12527	+ //"MUL temp, temp, ndotl.y;" +
	12528	+
	12529	+ "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ "MOV result.color, temp;" +
	12531	+ "END";
	12532	+
	12533	+ String programmax =
	12534	+ "!!ARBfp1.0\n" +
	12535	+
12159	12536	//"OPTION ARB_fragment_program_shadow;" +
12160	12537	"PARAM light2cam0 = program.env[10];" +
12161	12538	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12270,8 +12647,7 @@
12270	12647	"TEMP shininess;" +
12271	12648	"\n" +
12272	12649	"MOV texSamp, one;" +
12273		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12274		-
	12650	+
12275	12651	"MOV mapgrid.x, one2048th.x;" +
12276	12652	"MOV temp, fragment.texcoord[1];" +
12277	12653	/*
..	..	@@ -12292,20 +12668,20 @@
12292	12668	"MUL temp, floor, mapgrid.x;" +
12293	12669	//"TEX depth0, temp, texture[1], 2D;" +
12294	12670	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12295		- TextureFetch("depth0", "temp", "1") +
	12671	+ ShadowTextureFetch("depth0", "temp", "1") +
12296	12672	"") +
12297	12673	"ADD temp.x, temp.x, mapgrid.x;" +
12298	12674	//"TEX depth1, temp, texture[1], 2D;" +
12299	12675	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12300		- TextureFetch("depth1", "temp", "1") +
	12676	+ ShadowTextureFetch("depth1", "temp", "1") +
12301	12677	"") +
12302	12678	"ADD temp.y, temp.y, mapgrid.x;" +
12303	12679	//"TEX depth2, temp, texture[1], 2D;" +
12304		- TextureFetch("depth2", "temp", "1") +
	12680	+ ShadowTextureFetch("depth2", "temp", "1") +
12305	12681	"SUB temp.x, temp.x, mapgrid.x;" +
12306	12682	//"TEX depth3, temp, texture[1], 2D;" +
12307	12683	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12308		- TextureFetch("depth3", "temp", "1") +
	12684	+ ShadowTextureFetch("depth3", "temp", "1") +
12309	12685	"") +
12310	12686	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12311	12687	//"MOV params, material;" +
..	..	@@ -12676,10 +13052,10 @@
12676	13052	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12677	13053	"") +
12678	13054
12679		- // display shadow only (bump == 0)
	13055	+ // display shadow only (fakedepth == 0)
12680	13056	"SUB temp.x, half.x, shadow.x;" +
12681	13057	"MOV temp.y, -params5.z;" + // params6.x;" +
12682		- "SLT temp.z, temp.y, -one2048th.x;" +
	13058	+ "SLT temp.z, temp.y, -c256i.x;" +
12683	13059	"SUB temp.y, one.x, temp.z;" +
12684	13060	"MUL temp.x, temp.x, temp.y;" +
12685	13061	"KIL temp.x;" +
..	..	@@ -13010,6 +13386,13 @@
13010	13386	//once = true;
13011	13387	}
13012	13388
	13389	+ String program = programmax;
	13390	+
	13391	+ if (Globals.MINSHADER)
	13392	+ {
	13393	+ program = programmin;
	13394	+ }
	13395	+
13013	13396	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13014	13397	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13015	13398	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13103,25 +13486,26 @@
13103	13486	return out;
13104	13487	}
13105	13488
13106		- String TextureFetch(String dest, String src, String unit)
	13489	+ // Also does frustum culling
	13490	+ String ShadowTextureFetch(String dest, String src, String unit)
13107	13491	{
13108	13492	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13109	13493	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13110	13494	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13495	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13496	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13111	13497	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13112		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13113		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13114		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13115		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13498	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13499	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13116	13500	//"SWZ buffer, temp, w,w,w,w;";
13117		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13501	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13118	13502	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13119	13503	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13120	13504	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13121		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13505	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13122	13506
13123		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13124		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13507	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13508	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13125	13509	}
13126	13510
13127	13511	String Shadow(String depth, String shadow)
..	..	@@ -13168,7 +13552,7 @@
13168	13552	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13169	13553	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13170	13554
13171		- // No shadow when out of frustrum
	13555	+ // No shadow when out of frustum
13172	13556	"SGE temp.x, " + depth + ".z, one.z;" +
13173	13557	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13174	13558	"";
..	..	@@ -13333,9 +13717,10 @@
13333	13717	"DP3 " + dest + ".z," + "normals," + "eye;" +
13334	13718	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13335	13719	//"MOV " + dest + ".w," + "normal.z;" +
13336		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13337		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13338		- //"MOV " + dest + ".z," + "params2.w;" +
	13720	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13721	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13722	+
	13723	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13339	13724	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13340	13725	"RCP " + dest + ".w," + dest + ".w;" +
13341	13726	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13840,6 +14225,7 @@
13840	14225	else
13841	14226	if (evt.getSource() == AAtimer)
13842	14227	{
	14228	+ Globals.TIMERRUNNING = false;
13843	14229	if (mouseDown)
13844	14230	{
13845	14231	//new Exception().printStackTrace();
..	..	@@ -13899,7 +14285,7 @@
13899	14285
13900	14286	// fev 2014???
13901	14287	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13902		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14288	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13903	14289	pingthread.StepToTarget(true); // true);
13904	14290	}
13905	14291	// if (!LIVE)
..	..	@@ -13914,6 +14300,7 @@
13914	14300	return;
13915	14301
13916	14302	AAtimer.restart(); //
	14303	+ Globals.TIMERRUNNING = true;
13917	14304
13918	14305	// waslive = LIVE;
13919	14306	// LIVE = false;
..	..	@@ -13963,14 +14350,15 @@
13963	14350	drag = false;
13964	14351	//System.out.println("Mouse DOWN");
13965	14352	editObj = false;
13966		- ClickInfo info = new ClickInfo();
13967		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13968		- info.pane = this;
13969		- info.camera = renderCamera;
13970		- info.x = x;
13971		- info.y = y;
13972		- info.modifiers = modifiersex;
13973		- editObj = object.doEditClick(info, 0);
	14353	+ //ClickInfo info = new ClickInfo();
	14354	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14355	+ object.clickInfo.pane = this;
	14356	+ object.clickInfo.camera = renderCamera;
	14357	+ object.clickInfo.x = x;
	14358	+ object.clickInfo.y = y;
	14359	+ object.clickInfo.modifiers = modifiersex;
	14360	+ editObj = object.doEditClick(//info,
	14361	+ 0);
13974	14362	if (!editObj)
13975	14363	{
13976	14364	hasMarquee = true;
..	..	@@ -14252,12 +14640,12 @@
14252	14640	void GoDown(int mod)
14253	14641	{
14254	14642	MODIFIERS \|= COMMAND;
14255		- /*
	14643	+ /**/
14256	14644	if((mod&SHIFT) == SHIFT)
14257		- manipCamera.RotatePosition(0, -speed);
	14645	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14258	14646	else
14259		- manipCamera.BackForth(0, -speed*delta, getWidth());
14260		- */
	14647	+ manipCamera.RotatePosition(0, -speed);
	14648	+ /**/
14261	14649	if ((mod & SHIFT) == SHIFT)
14262	14650	{
14263	14651	mouseMode = mouseMode; // VR??
..	..	@@ -14273,12 +14661,12 @@
14273	14661	void GoUp(int mod)
14274	14662	{
14275	14663	MODIFIERS \|= COMMAND;
14276		- /*
	14664	+ /**/
14277	14665	if((mod&SHIFT) == SHIFT)
14278		- manipCamera.RotatePosition(0, speed);
	14666	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14279	14667	else
14280		- manipCamera.BackForth(0, speed*delta, getWidth());
14281		- */
	14668	+ manipCamera.RotatePosition(0, speed);
	14669	+ /**/
14282	14670	if ((mod & SHIFT) == SHIFT)
14283	14671	{
14284	14672	mouseMode = mouseMode;
..	..	@@ -14294,12 +14682,12 @@
14294	14682	void GoLeft(int mod)
14295	14683	{
14296	14684	MODIFIERS \|= COMMAND;
14297		- /*
	14685	+ /**/
14298	14686	if((mod&SHIFT) == SHIFT)
14299		- manipCamera.RotatePosition(speed, 0);
14300		- else
14301	14687	manipCamera.Translate(speed*delta, 0, getWidth());
14302		- */
	14688	+ else
	14689	+ manipCamera.RotatePosition(speed, 0);
	14690	+ /**/
14303	14691	if ((mod & SHIFT) == SHIFT)
14304	14692	{
14305	14693	mouseMode = mouseMode;
..	..	@@ -14315,12 +14703,12 @@
14315	14703	void GoRight(int mod)
14316	14704	{
14317	14705	MODIFIERS \|= COMMAND;
14318		- /*
	14706	+ /**/
14319	14707	if((mod&SHIFT) == SHIFT)
14320		- manipCamera.RotatePosition(-speed, 0);
14321		- else
14322	14708	manipCamera.Translate(-speed*delta, 0, getWidth());
14323		- */
	14709	+ else
	14710	+ manipCamera.RotatePosition(-speed, 0);
	14711	+ /**/
14324	14712	if ((mod & SHIFT) == SHIFT)
14325	14713	{
14326	14714	mouseMode = mouseMode;
..	..	@@ -14370,15 +14758,16 @@
14370	14758	if (editObj)
14371	14759	{
14372	14760	drag = true;
14373		- ClickInfo info = new ClickInfo();
14374		- info.bounds.setBounds(0, 0,
	14761	+ //ClickInfo info = new ClickInfo();
	14762	+ object.clickInfo.bounds.setBounds(0, 0,
14375	14763	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14376		- info.pane = this;
14377		- info.camera = renderCamera;
14378		- info.x = x;
14379		- info.y = y;
14380		- object.GetWindow().copy
14381		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14764	+ object.clickInfo.pane = this;
	14765	+ object.clickInfo.camera = renderCamera;
	14766	+ object.clickInfo.x = x;
	14767	+ object.clickInfo.y = y;
	14768	+ object //.GetWindow().copy
	14769	+ .doEditDrag(//info,
	14770	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14382	14771	} else
14383	14772	{
14384	14773	if (x < startX)
..	..	@@ -14527,24 +14916,27 @@
14527	14916	}
14528	14917	}
14529	14918
	14919	+// ClickInfo clickInfo = new ClickInfo();
	14920	+
14530	14921	public void mouseMoved(MouseEvent e)
14531	14922	{
14532	14923	//System.out.println("mouseMoved: " + e);
14533	14924	if (isRenderer)
14534	14925	return;
14535	14926
14536		- ClickInfo ci = new ClickInfo();
14537		- ci.x = e.getX();
14538		- ci.y = e.getY();
14539		- ci.modifiers = e.getModifiersEx();
14540		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14541		- ci.pane = this;
14542		- ci.camera = renderCamera;
	14927	+ // Mouse cursor feedback
	14928	+ object.clickInfo.x = e.getX();
	14929	+ object.clickInfo.y = e.getY();
	14930	+ object.clickInfo.modifiers = e.getModifiersEx();
	14931	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14932	+ object.clickInfo.pane = this;
	14933	+ object.clickInfo.camera = renderCamera;
14543	14934	if (!isRenderer)
14544	14935	{
14545	14936	//ObjEditor editWindow = object.editWindow;
14546	14937	//Object3D copy = editWindow.copy;
14547		- if (object.doEditClick(ci, 0))
	14938	+ if (object.doEditClick(//clickInfo,
	14939	+ 0))
14548	14940	{
14549	14941	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14550	14942	} else
..	..	@@ -14559,7 +14951,8 @@
14559	14951	Globals.MOUSEDRAGGED = false;
14560	14952
14561	14953	movingcamera = false;
14562		- X = Y = 0;
	14954	+ X = 0; // getBounds().width/2;
	14955	+ Y = 0; // getBounds().height/2;
14563	14956	//System.out.println("mouseReleased: " + e);
14564	14957	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14565	14958	}
..	..	@@ -14815,7 +15208,8 @@
14815	15208	// break;
14816	15209	case 'T':
14817	15210	CACHETEXTURE ^= true;
14818		- textures.clear();
	15211	+ texturepigment.clear();
	15212	+ texturebump.clear();
14819	15213	// repaint();
14820	15214	break;
14821	15215	case 'Y':
..	..	@@ -14900,7 +15294,9 @@
14900	15294	case 'E' : COMPACT ^= true;
14901	15295	repaint();
14902	15296	break;
14903		- case 'W' : DEBUGHSB ^= true;
	15297	+ case 'W' : // Wide Window (fullscreen)
	15298	+ //DEBUGHSB ^= true;
	15299	+ ObjEditor.theFrame.ToggleFullScreen();
14904	15300	repaint();
14905	15301	break;
14906	15302	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14926,13 +15322,7 @@
14926	15322	repaint();
14927	15323	break;
14928	15324	case 'l':
14929		- lightMode ^= true;
14930		- Globals.lighttouched = true;
14931		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14932		- targetLookAt.set(manipCamera.lookAt);
14933		- repaint();
14934		- break;
14935		- case 'L':
	15325	+ //case 'L':
14936	15326	if (lightMode)
14937	15327	{
14938	15328	lightMode = false;
..	..	@@ -14996,20 +15386,24 @@
14996	15386	OCCLUSION_CULLING ^= true;
14997	15387	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14998	15388	break;
14999		- case '0': envyoff ^= true; repaint(); break;
	15389	+ //case '0': envyoff ^= true; repaint(); break;
15000	15390	case '1':
15001	15391	case '2':
15002	15392	case '3':
15003	15393	case '4':
15004	15394	case '5':
15005		- newenvy = Character.getNumericValue(key);
15006		- repaint();
15007		- break;
15008	15395	case '6':
15009	15396	case '7':
15010	15397	case '8':
15011	15398	case '9':
15012		- BGcolor = (key - '6')/3.f;
	15399	+ if (true) // envyoff)
	15400	+ {
	15401	+ BGcolor = (key - '1')/8.f;
	15402	+ }
	15403	+ else
	15404	+ {
	15405	+ //newenvy = Character.getNumericValue(key);
	15406	+ }
15013	15407	repaint();
15014	15408	break;
15015	15409	case '!':
..	..	@@ -15075,11 +15469,14 @@
15075	15469	case '_':
15076	15470	kompactbit = 5;
15077	15471	break;
15078		- case '+':
15079		- kompactbit = 6;
15080		- break;
	15472	+// case '+':
	15473	+// kompactbit = 6;
	15474	+// break;
15081	15475	case ' ':
15082		- ObjEditor.theFrame.ToggleFullScreen();
	15476	+ lightMode ^= true;
	15477	+ Globals.lighttouched = true;
	15478	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15479	+ targetLookAt.set(manipCamera.lookAt);
15083	15480	repaint();
15084	15481	break;
15085	15482	//case '`' :
..	..	@@ -15126,8 +15523,9 @@
15126	15523	case DELETE:
15127	15524	ClearSelection();
15128	15525	break;
15129		- /*
15130	15526	case '+':
	15527	+
	15528	+ /*
15131	15529	//fontsize += 1;
15132	15530	bbzoom *= 2;
15133	15531	repaint();
..	..	@@ -15144,17 +15542,17 @@
15144	15542	case '=':
15145	15543	IncDepth();
15146	15544	//fontsize += 1;
15147		- object.editWindow.refreshContents(true);
	15545	+ object.GetWindow().refreshContents(true);
15148	15546	maskbit = 6;
15149	15547	break;
15150	15548	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15151	15549	DecDepth();
15152	15550	maskbit = 5;
15153	15551	//if(fontsize > 1) fontsize -= 1;
15154		- if (object.editWindow == null)
15155		- new Exception().printStackTrace();
15156		- else
15157		- object.editWindow.refreshContents(true);
	15552	+// if (object.editWindow == null)
	15553	+// new Exception().printStackTrace();
	15554	+// else
	15555	+ object.GetWindow().refreshContents(true);
15158	15556	break;
15159	15557	case '{':
15160	15558	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15378,7 +15776,7 @@
15378	15776	}
15379	15777	*/
15380	15778
15381		- object.editWindow.EditSelection(false);
	15779	+ object.GetWindow().EditSelection(false);
15382	15780	}
15383	15781
15384	15782	void SelectParent()
..	..	@@ -15395,10 +15793,10 @@
15395	15793	{
15396	15794	//selectees.remove(i);
15397	15795	System.out.println("select parent of " + elem);
15398		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15796	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15399	15797	} else
15400	15798	{
15401		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15402	15800	}
15403	15801
15404	15802	first = false;
..	..	@@ -15440,12 +15838,12 @@
15440	15838	for (int j = 0; j < group.children.size(); j++)
15441	15839	{
15442	15840	elem = (Object3D) group.children.elementAt(j);
15443		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15841	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15444	15842	first = false;
15445	15843	}
15446	15844	} else
15447	15845	{
15448		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15846	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15449	15847	}
15450	15848
15451	15849	first = false;
..	..	@@ -15456,21 +15854,21 @@
15456	15854	{
15457	15855	//Composite group = (Composite) object;
15458	15856	Object3D group = object;
15459		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15857	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15460	15858	}
15461	15859
15462	15860	void ResetTransform(int mask)
15463	15861	{
15464	15862	//Composite group = (Composite) object;
15465	15863	Object3D group = object;
15466		- group.editWindow.ResetTransform(mask);
	15864	+ group.GetWindow().ResetTransform(mask);
15467	15865	}
15468	15866
15469	15867	void FlipTransform()
15470	15868	{
15471	15869	//Composite group = (Composite) object;
15472	15870	Object3D group = object;
15473		- group.editWindow.FlipTransform();
	15871	+ group.GetWindow().FlipTransform();
15474	15872	// group.editWindow.ReduceMesh(true);
15475	15873	}
15476	15874
..	..	@@ -15478,7 +15876,7 @@
15478	15876	{
15479	15877	//Composite group = (Composite) object;
15480	15878	Object3D group = object;
15481		- group.editWindow.PrintMemory();
	15879	+ group.GetWindow().PrintMemory();
15482	15880	// group.editWindow.ReduceMesh(true);
15483	15881	}
15484	15882
..	..	@@ -15486,7 +15884,7 @@
15486	15884	{
15487	15885	//Composite group = (Composite) object;
15488	15886	Object3D group = object;
15489		- group.editWindow.ResetCentroid();
	15887	+ group.GetWindow().ResetCentroid();
15490	15888	}
15491	15889
15492	15890	void IncDepth()
..	..	@@ -15568,8 +15966,6 @@
15568	15966
15569	15967	int width = getBounds().width;
15570	15968	int height = getBounds().height;
15571		- ClickInfo info = new ClickInfo();
15572		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15573	15969	//Image img = CreateImage(width, height);
15574	15970	//System.out.println("width = " + width + "; height = " + height + "\n");
15575	15971
..	..	@@ -15646,48 +16042,77 @@
15646	16042	}
15647	16043	if (object != null && !hasMarquee)
15648	16044	{
	16045	+ if (object.clickInfo == null)
	16046	+ object.clickInfo = new ClickInfo();
	16047	+ ClickInfo info = object.clickInfo;
	16048	+ //ClickInfo info = new ClickInfo();
	16049	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16050	+
15649	16051	if (isRenderer)
15650	16052	{
15651		- info.flags++;
	16053	+ object.clickInfo.flags++;
15652	16054	double frameAspect = (double) width / (double) height;
15653	16055	if (frameAspect > renderCamera.aspect)
15654	16056	{
15655	16057	int desired = (int) ((double) height * renderCamera.aspect);
15656		- info.bounds.width -= width - desired;
15657		- info.bounds.x += (width - desired) / 2;
	16058	+ object.clickInfo.bounds.width -= width - desired;
	16059	+ object.clickInfo.bounds.x += (width - desired) / 2;
15658	16060	} else
15659	16061	{
15660	16062	int desired = (int) ((double) width / renderCamera.aspect);
15661		- info.bounds.height -= height - desired;
15662		- info.bounds.y += (height - desired) / 2;
	16063	+ object.clickInfo.bounds.height -= height - desired;
	16064	+ object.clickInfo.bounds.y += (height - desired) / 2;
15663	16065	}
15664	16066	}
15665		- info.g = gr;
15666		- info.camera = renderCamera;
	16067	+
	16068	+ object.clickInfo.g = gr;
	16069	+ object.clickInfo.camera = renderCamera;
15667	16070	/*
15668	16071	// Memory intensive (brep.verticescopy)
15669	16072	if (!(object instanceof Composite))
15670	16073	object.draw(info, 0, false); // SLOW :
15671	16074	*/
15672		- if (!isRenderer)
	16075	+ if (!isRenderer) // && drag)
15673	16076	{
15674		- object.drawEditHandles(info, 0);
15675		-
15676		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16077	+ Grafreed.Assert(object != null);
	16078	+ Grafreed.Assert(object.selection != null);
	16079	+ if (object.selection.Size() > 0)
15677	16080	{
15678		- switch (object.selection.get(0).hitSomething)
	16081	+ int hitSomething = object.selection.get(0).hitSomething;
	16082	+
	16083	+ object.clickInfo.DX = 0;
	16084	+ object.clickInfo.DY = 0;
	16085	+ object.clickInfo.W = 1;
	16086	+ if (hitSomething == Object3D.hitCenter)
15679	16087	{
15680		- case Object3D.hitCenter: gr.setColor(Color.pink);
15681		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15682		- break;
15683		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15684		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685		- break;
15686		- case Object3D.hitScale: gr.setColor(Color.cyan);
15687		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688		- break;
	16088	+ info.DX = X;
	16089	+ if (X != 0)
	16090	+ info.DX -= info.bounds.width/2;
	16091	+
	16092	+ info.DY = Y;
	16093	+ if (Y != 0)
	16094	+ info.DY -= info.bounds.height/2;
15689	16095	}
15690		-
	16096	+
	16097	+ object.drawEditHandles(//info,
	16098	+ 0);
	16099	+
	16100	+ if (drag && (X != 0 \|\| Y != 0))
	16101	+ {
	16102	+ switch (hitSomething)
	16103	+ {
	16104	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16105	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16106	+ break;
	16107	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ }
	16114	+
	16115	+ }
15691	16116	}
15692	16117	}
15693	16118	}
..	..	@@ -16169,6 +16594,8 @@
16169	16594	private /static/ boolean firstime;
16170	16595	private /static/ cVector newView = new cVector();
16171	16596	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16597	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16598	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16172	16599	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16173	16600	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16174	16601	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16181,29 +16608,67 @@
16181	16608	{
16182	16609	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16183	16610
	16611	+ int usedsuf = 0;
	16612	+
16184	16613	for (int i = 0; i < suffixes.length; i++)
16185	16614	{
16186		- String resourceName = basename + suffixes[i] + "." + suffix;
16187		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16188		- mipmapped,
16189		- FileUtil.getFileSuffix(resourceName));
16190		- if (data == null)
	16615	+ String[] suffixe = suffixes;
	16616	+ String[] fallback = suffixes2;
	16617	+ String[] fallfallback = suffixes3;
	16618	+
	16619	+ for (int c=usedsuf; --c>=0;)
16191	16620	{
16192		- throw new IOException("Unable to load texture " + resourceName);
	16621	+// String[] temp = suffixe;
	16622	+// suffixe = fallback;
	16623	+// fallback = fallfallback;
	16624	+// fallfallback = temp;
16193	16625	}
	16626	+
	16627	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16628	+ TextureData data;
	16629	+
	16630	+ try
	16631	+ {
	16632	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16633	+ mipmapped,
	16634	+ FileUtil.getFileSuffix(resourceName));
	16635	+ }
	16636	+ catch (Exception e)
	16637	+ {
	16638	+ try
	16639	+ {
	16640	+ resourceName = basename + fallback[i] + "." + suffix;
	16641	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16642	+ mipmapped,
	16643	+ FileUtil.getFileSuffix(resourceName));
	16644	+ }
	16645	+ catch (Exception e2)
	16646	+ {
	16647	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16648	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16649	+ mipmapped,
	16650	+ FileUtil.getFileSuffix(resourceName));
	16651	+ }
	16652	+ }
	16653	+
16194	16654	//System.out.println("Target = " + targets[i]);
16195	16655	cubemap.updateImage(data, targets[i]);
16196	16656	}
16197	16657
16198	16658	return cubemap;
16199	16659	}
	16660	+
16200	16661	int bigsphere = -1;
16201	16662
16202	16663	float BGcolor = 0.5f;
16203	16664
16204		- private void DrawSkyBox(GL gl)
	16665	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16666	+
	16667	+ private void DrawSkyBox(GL gl, float ratio)
16205	16668	{
16206		- if (envyoff \|\| cubemap == null)
	16669	+ if (//envyoff \|\|
	16670	+ WIREFRAME \|\|
	16671	+ cubemap == null)
16207	16672	{
16208	16673	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16209	16674	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16218,7 +16683,17 @@
16218	16683	// Compensates for ExaminerViewer's modification of modelview matrix
16219	16684	gl.glMatrixMode(GL.GL_MODELVIEW);
16220	16685	gl.glLoadIdentity();
	16686	+ gl.glScalef(1,ratio,1);
16221	16687
	16688	+// colorV[0] = 2;
	16689	+// colorV[1] = 2;
	16690	+// colorV[2] = 2;
	16691	+// colorV[3] = 1;
	16692	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16693	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16694	+//
	16695	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16696	+
16222	16697	//gl.glActiveTexture(GL.GL_TEXTURE1);
16223	16698	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16224	16699
..	..	@@ -16250,6 +16725,7 @@
16250	16725	{
16251	16726	gl.glScalef(1.0f, -1.0f, 1.0f);
16252	16727	}
	16728	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16253	16729	gl.glMultMatrixd(viewrot_1, 0);
16254	16730	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16255	16731	//viewer.updateInverseRotation(gl);
..	..	@@ -16485,6 +16961,14 @@
16485	16961	}
16486	16962	}
16487	16963
	16964	+ private Object3D GetFolder()
	16965	+ {
	16966	+ Object3D folder = object.GetWindow().copy;
	16967	+ if (object.GetWindow().copy.selection.Size() > 0)
	16968	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16969	+ return folder;
	16970	+ }
	16971	+
16488	16972	class SelectBuffer implements GLEventListener
16489	16973	{
16490	16974
..	..	@@ -16500,7 +16984,7 @@
16500	16984	//new Exception().printStackTrace();
16501	16985	System.out.println("select buffer init");
16502	16986	// Use debug pipeline
16503		- drawable.setGL(new DebugGL(drawable.getGL()));
	16987	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16504	16988
16505	16989	GL gl = drawable.getGL();
16506	16990
..	..	@@ -16564,6 +17048,17 @@
16564	17048
16565	17049	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16566	17050
	17051	+ if (PAINTMODE)
	17052	+ {
	17053	+ if (object.GetWindow().copy.selection.Size() > 0)
	17054	+ {
	17055	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17056	+
	17057	+ // Make what you paint not selectable.
	17058	+ paintobj.ResetSelectable();
	17059	+ }
	17060	+ }
	17061	+
16567	17062	//int tmp = selection_view;
16568	17063	//selection_view = -1;
16569	17064	int temp = DrawMode();
..	..	@@ -16575,6 +17070,17 @@
16575	17070	// temp = DEFAULT; // patch for selection debug
16576	17071	Globals.drawMode = temp; // WARNING
16577	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Revert.
	17080	+ paintobj.RestoreSelectable();
	17081	+ }
	17082	+ }
	17083	+
16578	17084	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16579	17085
16580	17086	// trying different ways of getting the depth info over
..	..	@@ -16678,29 +17184,31 @@
16678	17184	}
16679	17185
16680	17186	if (!movingcamera && !PAINTMODE)
16681		- object.editWindow.ScreenFitPoint(); // fev 2014
	17187	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16682	17188
16683		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17189	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16684	17190	{
16685		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17191	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16686	17192
16687		- Object3D group = new Object3D("inst" + paintcount++);
	17193	+ if (object.GetWindow().copy.selection.Size() > 0)
	17194	+ {
	17195	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16688	17196
16689		- group.CreateMaterial(); // use a void leaf to select instances
16690		-
16691		- group.add(paintobj); // link
16692		-
16693		- object.editWindow.SnapObject(group);
16694		-
16695		- Object3D folder = object.editWindow.copy;
16696		-
16697		- if (object.editWindow.copy.selection.Size() > 0)
16698		- folder = object.editWindow.copy.selection.elementAt(0);
16699		-
16700		- folder.add(group);
16701		-
16702		- object.editWindow.ResetModel();
16703		- object.editWindow.refreshContents();
	17197	+ Object3D inst = new Object3D("inst" + paintcount++);
	17198	+
	17199	+ inst.CreateMaterial(); // use a void leaf to select instances
	17200	+
	17201	+ inst.add(paintobj); // link
	17202	+
	17203	+ object.GetWindow().SnapObject(inst);
	17204	+
	17205	+ Object3D folder = paintFolder; // GetFolder();
	17206	+
	17207	+ folder.add(inst);
	17208	+
	17209	+ object.GetWindow().ResetModel();
	17210	+ object.GetWindow().refreshContents();
	17211	+ }
16704	17212	}
16705	17213	else
16706	17214	paintcount = 0;
..	..	@@ -16739,6 +17247,11 @@
16739	17247	//System.out.println("objects[color] = " + objects[color]);
16740	17248	//objects[color].Select();
16741	17249	indexcount = 0;
	17250	+ ObjEditor window = object.GetWindow();
	17251	+ if (window != null && deselect)
	17252	+ {
	17253	+ window.Select(null, deselect, true);
	17254	+ }
16742	17255	object.Select(color, deselect);
16743	17256	}
16744	17257