~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -45,6 +44,39 @@
45	44	static boolean ABORTED = false;
46	45
47	46	static int STEP = 1;
	47	+
	48	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	49	+ {
	50	+ int[] pixels = new int[bytes.length/3];
	51	+ for (int i=pixels.length; --i>=0;)
	52	+ {
	53	+ int i3 = i*3;
	54	+ pixels[i] = 0xFF;
	55	+ pixels[i] <<= 8;
	56	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	57	+ pixels[i] <<= 8;
	58	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3] & 0xFF;
	61	+ }
	62	+ /*
	63	+ int r=0,g=0,b=0,a=0;
	64	+ for (int i=0; i<width; i++)
	65	+ for (int j=0; j<height; j++)
	66	+ {
	67	+ int index = j*width+i;
	68	+ int p = pixels[index];
	69	+ a = ((p>>24) & 0xFF);
	70	+ r = ((p>>16) & 0xFF);
	71	+ g = ((p>>8) & 0xFF);
	72	+ b = (p & 0xFF);
	73	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	74	+ }
	75	+ /**/
	76	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	77	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	78	+ return rendImage;
	79	+ }
48	80
49	81	/static/ private boolean CULLFACE = false; // true;
50	82	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +88,12 @@
56	88	static int CURRENTANTIALIAS = 0; // 1;
57	89	/static/ boolean RENDERSHADOW = true;
58	90	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	91
62	92	boolean DISPLAYTEXT = false;
63	93	//boolean REDUCETEXTURE = true;
64	94	boolean CACHETEXTURE = true;
65	95	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	96	+ boolean MIPMAP = true; // false; // true;
67	97	boolean COMPRESSTEXTURE = false;
68	98	boolean KOMPACTTEXTURE = false; // true;
69	99	boolean RESIZETEXTURE = false;
..	..	@@ -86,7 +116,7 @@
86	116	static boolean FULLSCREEN = false;
87	117	static boolean SUPPORT = true;
88	118	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	119	+static boolean FAST = false;
90	120	static boolean SLOWPOSE = false;
91	121	static boolean FOOTCONTACT = true;
92	122
..	..	@@ -108,7 +138,7 @@
108	138	static boolean OEIL = true;
109	139	static boolean OEILONCE = false; // do oeilon then oeiloff
110	140	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	141	+static boolean SWITCH = true; // false;
112	142	static boolean HANDLES = false; // selection doesn't work!!
113	143	static boolean PAINTMODE = false;
114	144
..	..	@@ -151,6 +181,8 @@
151	181	defaultcaps.setAccumBlueBits(16);
152	182	defaultcaps.setAccumAlphaBits(16);
153	183	}
	184	+
	185	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	186
155	187	void SetAsGLRenderer(boolean b)
156	188	{
..	..	@@ -327,7 +359,7 @@
327	359	cStatic.objectstack[materialdepth++] = obj;
328	360	//System.out.println("material " + material);
329	361	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	362	+ //display.vector2buffer = obj.projectedVertices;
331	363	if (obj instanceof Camera)
332	364	{
333	365	display.options1[0] = material.shift;
..	..	@@ -336,14 +368,28 @@
336	368	display.options1[2] = material.shadowbias;
337	369	display.options1[3] = material.aniso;
338	370	display.options1[4] = material.anisoV;
	371	+// System.out.println("display.options1[0] " + display.options1[0]);
	372	+// System.out.println("display.options1[1] " + display.options1[1]);
	373	+// System.out.println("display.options1[2] " + display.options1[2]);
	374	+// System.out.println("display.options1[3] " + display.options1[3]);
	375	+// System.out.println("display.options1[4] " + display.options1[4]);
339	376	display.options2[0] = material.opacity;
340	377	display.options2[1] = material.diffuse;
341	378	display.options2[2] = material.factor;
	379	+// System.out.println("display.options2[0] " + display.options2[0]);
	380	+// System.out.println("display.options2[1] " + display.options2[1]);
	381	+// System.out.println("display.options2[2] " + display.options2[2]);
342	382
343	383	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	384	+// System.out.println("display.options3[0] " + display.options3[0]);
	385	+// System.out.println("display.options3[1] " + display.options3[1]);
	386	+// System.out.println("display.options3[2] " + display.options3[2]);
344	387	display.options4[0] = material.cameralight/0.2f;
345	388	display.options4[1] = material.subsurface;
346	389	display.options4[2] = material.sheen;
	390	+// System.out.println("display.options4[0] " + display.options4[0]);
	391	+// System.out.println("display.options4[1] " + display.options4[1]);
	392	+// System.out.println("display.options4[2] " + display.options4[2]);
347	393
348	394	// if (display.CURRENTANTIALIAS > 0)
349	395	// display.options3[3] /= 4;
..	..	@@ -359,7 +405,7 @@
359	405	/**/
360	406	} else
361	407	{
362		- DrawMaterial(material, selected);
	408	+ DrawMaterial(material, selected, obj.projectedVertices);
363	409	}
364	410	} else
365	411	{
..	..	@@ -383,8 +429,8 @@
383	429	cStatic.objectstack[materialdepth++] = obj;
384	430	//System.out.println("material " + material);
385	431	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	432	+ //display.vector2buffer = obj.projectedVertices;
	433	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	434	}
389	435	}
390	436
..	..	@@ -401,8 +447,8 @@
401	447	materialdepth -= 1;
402	448	if (materialdepth > 0)
403	449	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	450	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	451	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	452	}
407	453	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	454	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +468,8 @@
422	468	materialdepth -= 1;
423	469	if (materialdepth > 0)
424	470	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	471	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	472	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	473	}
428	474	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	475	//else
..	..	@@ -464,10 +510,12 @@
464	510	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	511	{
466	512	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	513	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	514	+ // TEST LIVE NORMALS && !obj.dontselect
	515	+ ;
468	516	if (!hasnorm)
469	517	{
470		- // System.out.println("FUCK!!");
	518	+ // System.out.println("Mesh normal");
471	519	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	520	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	521	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1240,12 @@
1192	1240	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1241	}
1194	1242	}
	1243	+
1195	1244	if (flipV)
1196	1245	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1246	else
1198	1247	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1248	+
1199	1249	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1250	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1251
..	..	@@ -1215,10 +1265,12 @@
1215	1265	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1266	}
1217	1267	}
	1268	+
1218	1269	if (flipV)
1219	1270	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1271	else
1221	1272	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1273	+
1222	1274	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1275	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1276
..	..	@@ -1246,8 +1298,10 @@
1246	1298	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1299	else
1248	1300	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1301	+
1249	1302	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1303	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1304	+
1251	1305	count2 += 2;
1252	1306	count3 += 3;
1253	1307	}
..	..	@@ -1603,7 +1657,7 @@
1603	1657	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1658	}
1605	1659
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1661	{
1608	1662	CameraPane display = this;
1609	1663	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1684,7 @@
1630	1684
1631	1685	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1686
1633		- float[] colorV = GrafreeD.colorV;
	1687	+ float[] colorV = Grafreed.colorV;
1634	1688
1635	1689	/**/
1636	1690	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1692,7 @@
1638	1692	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1693	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1694	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1695	+ colorV[3] = 1; // material.opacity;
1642	1696
1643	1697	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1698	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1800,9 @@
1746	1800	display.modelParams7[2] = 0;
1747	1801	display.modelParams7[3] = 0;
1748	1802
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1804
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1806	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1807	{
1754	1808	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1944,7 @@
1890	1944	void PushMatrix(double[][] matrix)
1891	1945	{
1892	1946	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1947	+ PushMatrix(matrix, 1);
1894	1948	}
1895	1949
1896	1950	void PushMatrix()
..	..	@@ -2044,7 +2098,7 @@
2044	2098	//System.err.println("Oeil on");
2045	2099	OEIL = true;
2046	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2102	//pingthread.StepToTarget(true);
2049	2103	}
2050	2104
..	..	@@ -2142,7 +2196,7 @@
2142	2196	System.err.println("LIVE = " + Globals.isLIVE());
2143	2197
2144	2198	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2199	+ Grafreed.savesound = true; // wav.save();
2146	2200	// else
2147	2201	repaint(); // start loop // may 2013
2148	2202	}
..	..	@@ -2259,7 +2313,7 @@
2259	2313
2260	2314	void ToggleDebug()
2261	2315	{
2262		- DEBUG ^= true;
	2316	+ Globals.DEBUG ^= true;
2263	2317	}
2264	2318
2265	2319	void ToggleLookAt()
..	..	@@ -2267,9 +2321,9 @@
2267	2321	LOOKAT ^= true;
2268	2322	}
2269	2323
2270		- void ToggleRandom()
	2324	+ void ToggleSwitch()
2271	2325	{
2272		- RANDOM ^= true;
	2326	+ SWITCH ^= true;
2273	2327	}
2274	2328
2275	2329	void ToggleHandles()
..	..	@@ -2277,10 +2331,17 @@
2277	2331	HANDLES ^= true;
2278	2332	}
2279	2333
	2334	+ Object3D paintFolder;
	2335	+
2280	2336	void TogglePaint()
2281	2337	{
2282	2338	PAINTMODE ^= true;
2283	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
2284	2345	}
2285	2346
2286	2347	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2437,22 @@
2376	2437	{
2377	2438	return currentGL;
2378	2439	}
2379		-
	2440	+
	2441	+ static private BufferedImage CreateBim(TextureData texturedata)
	2442	+ {
	2443	+ Grafreed.Assert(texturedata != null);
	2444	+
	2445	+ int width = texturedata.getWidth();
	2446	+ int height = texturedata.getHeight();
	2447	+
	2448	+ Buffer buffer = texturedata.getBuffer();
	2449	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2450	+
	2451	+ byte[] bytes = bytebuf.array();
	2452	+
	2453	+ return CreateBim(bytes, width, height);
	2454	+ }
	2455	+
2380	2456	/**/
2381	2457	class CacheTexture
2382	2458	{
..	..	@@ -2385,28 +2461,31 @@
2385	2461
2386	2462	int resolution;
2387	2463
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2465	{
2390		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2391	2468	resolution = res;
2392	2469	}
2393	2470	}
2394	2471	/**/
2395	2472
2396	2473	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2474	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2475	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2476	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2477	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2478	+
2400	2479	int pigmentdepth = 0;
2401	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2481	int bumpdepth = 0;
2403	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2487
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2489	{
2411	2490	TextureData texturedata = null;
2412	2491
..	..	@@ -2425,13 +2504,34 @@
2425	2504	if (bump)
2426	2505	texturedata = ConvertBump(texturedata, false);
2427	2506
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2507	+// com.sun.opengl.util.texture.Texture texture =
	2508	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2509
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2510	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2511	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2512
2434		- return texture;
	2513	+ return texturedata;
	2514	+ }
	2515	+
	2516	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2517	+ {
	2518	+ TextureData texturedata = null;
	2519	+
	2520	+ try
	2521	+ {
	2522	+ texturedata =
	2523	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2524	+ bim,
	2525	+ true);
	2526	+ } catch (Exception e)
	2527	+ {
	2528	+ throw new javax.media.opengl.GLException(e);
	2529	+ }
	2530	+
	2531	+ if (bump)
	2532	+ texturedata = ConvertBump(texturedata, false);
	2533	+
	2534	+ return texturedata;
2435	2535	}
2436	2536
2437	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3604,8 @@
3504	3604
3505	3605	System.out.println("LOADING TEXTURE : " + name);
3506	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3507	3609	//
3508	3610	if (false) // compressbit > 0)
3509	3611	{
..	..	@@ -4208,6 +4310,7 @@
4208	4310
4209	4311	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4312	{
	4313	+ new Exception().printStackTrace();
4211	4314	System.exit(0);
4212	4315	com.sun.opengl.util.texture.Texture texture = null;
4213	4316
..	..	@@ -7901,7 +8004,7 @@
7901	8004	String pigment = Object3D.GetPigment(tex);
7902	8005	String bump = Object3D.GetBump(tex);
7903	8006
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8008	{
7906	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8010	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8019,69 @@
7916	8019	pigment = null;
7917	8020	}
7918	8021
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
7921	8024	}
7922	8025
7923		- void ReleaseTexture(String tex, boolean bump)
	8026	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8027	+ {
	8028	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8029	+ {
	8030	+ return;
	8031	+ }
	8032	+
	8033	+ if (tex == null)
	8034	+ {
	8035	+ ReleaseTexture(null, false);
	8036	+ return;
	8037	+ }
	8038	+
	8039	+ String pigment = Object3D.GetPigment(tex);
	8040	+
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ {
	8043	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8044	+ // System.out.println("; bump = " + bump);
	8045	+ }
	8046	+
	8047	+ if (pigment.equals(""))
	8048	+ {
	8049	+ pigment = null;
	8050	+ }
	8051	+
	8052	+ ReleaseTexture(tex, false);
	8053	+ }
	8054	+
	8055	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8056	+ {
	8057	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8058	+ {
	8059	+ return;
	8060	+ }
	8061	+
	8062	+ if (tex == null)
	8063	+ {
	8064	+ ReleaseTexture(null, true);
	8065	+ return;
	8066	+ }
	8067	+
	8068	+ String bump = Object3D.GetBump(tex);
	8069	+
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8071	+ {
	8072	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8073	+ // System.out.println("; bump = " + bump);
	8074	+ }
	8075	+
	8076	+ if (bump.equals(""))
	8077	+ {
	8078	+ bump = null;
	8079	+ }
	8080	+
	8081	+ ReleaseTexture(tex, true);
	8082	+ }
	8083	+
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8085	{
7925	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8092,7 @@
7931	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8093
7933	8094	if (tex != null)
7934		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8096
7936	8097	// //assert( texture != null );
7937	8098	// if (texture == null)
..	..	@@ -8023,7 +8184,55 @@
8023	8184	}
8024	8185	}
8025	8186
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8187	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8188	+ {
	8189	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8190	+// ambientOcclusion ) // \|\| !textureon)
	8191	+// {
	8192	+// return; // false;
	8193	+// }
	8194	+//
	8195	+// if (tex == null)
	8196	+// {
	8197	+// BindTexture(null,false,resolution);
	8198	+// BindTexture(null,true,resolution);
	8199	+// return;
	8200	+// }
	8201	+//
	8202	+// String pigment = Object3D.GetPigment(tex);
	8203	+// String bump = Object3D.GetBump(tex);
	8204	+//
	8205	+// usedtextures.add(pigment);
	8206	+// usedtextures.add(bump);
	8207	+//
	8208	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8209	+// {
	8210	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8211	+// // System.out.println("; bump = " + bump);
	8212	+// }
	8213	+//
	8214	+// if (bump.equals(""))
	8215	+// {
	8216	+// bump = null;
	8217	+// }
	8218	+// if (pigment.equals(""))
	8219	+// {
	8220	+// pigment = null;
	8221	+// }
	8222	+//
	8223	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8224	+// BindTexture(pigment, false, resolution);
	8225	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8226	+// BindTexture(bump, true, resolution);
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+//
	8229	+// return; // true;
	8230	+
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
	8233	+ }
	8234	+
	8235	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8236	{
8028	8237	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8238	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8243,47 @@
8034	8243	if (tex == null)
8035	8244	{
8036	8245	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8246	return;
8039	8247	}
8040	8248
8041	8249	String pigment = Object3D.GetPigment(tex);
	8250	+
	8251	+ usedtextures.add(tex);
	8252	+
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8254	+ {
	8255	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8256	+ // System.out.println("; bump = " + bump);
	8257	+ }
	8258	+
	8259	+ if (pigment.equals(""))
	8260	+ {
	8261	+ pigment = null;
	8262	+ }
	8263	+
	8264	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8265	+ BindTexture(tex, false, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8269	+ {
	8270	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8271	+ ambientOcclusion ) // \|\| !textureon)
	8272	+ {
	8273	+ return; // false;
	8274	+ }
	8275	+
	8276	+ if (tex == null)
	8277	+ {
	8278	+ BindTexture(null,true,resolution);
	8279	+ return;
	8280	+ }
	8281	+
8042	8282	String bump = Object3D.GetBump(tex);
8043	8283
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
8046	8285
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8287	{
8049	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8293,82 @@
8054	8293	{
8055	8294	bump = null;
8056	8295	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8296
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
8066	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8300	}
8070	8301
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8302	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8303	+
	8304	+ private boolean FileExists(String tex)
8072	8305	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8306	+ if (missingTextures.contains(tex))
	8307	+ {
	8308	+ return false;
	8309	+ }
	8310	+
	8311	+ boolean fileExists = new File(tex).exists();
	8312	+
	8313	+ if (!fileExists)
	8314	+ {
	8315	+ // If file exists, the "new File()" is not executed sgain
	8316	+ missingTextures.add(tex);
	8317	+ }
	8318	+
	8319	+ return fileExists;
	8320	+ }
	8321	+
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8323	+ {
	8324	+ CacheTexture texturecache = null;
8074	8325
8075	8326	if (tex != null)
8076	8327	{
8077		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8330
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8331	+ if (texname.equals("") && texdata == null)
	8332	+ {
	8333	+ return null;
	8334	+ }
	8335	+
	8336	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8337	+
	8338	+// String[] split = tex.split("Textures");
	8339	+// if (split.length > 1)
	8340	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8341	+// else
	8342	+// if (!texname.startsWith("/"))
	8343	+// texname = "/Users/nbriere/Textures/" + texname;
	8344	+ if (!FileExists(texname))
	8345	+ {
	8346	+ texname = fallbackTextureName;
	8347	+ }
8085	8348
8086	8349	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8350	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8351	+ if (texdata == null)
	8352	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8353	+ else
	8354	+ texturecache = bimtextures.get(texdata);
	8355	+ }
	8356	+
	8357	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8358	+ {
	8359	+ TextureData texturedata = null;
	8360	+
	8361	+ if (texdata != null)
	8362	+ {
	8363	+ BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8364	+
	8365	+ CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8366	+
	8367	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8368	+ bimtextures.put(texdata, texturecache);
	8369	+ }
	8370	+ else
	8371	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8372	{
8095	8373	assert(!bump);
8096	8374	// if (bump)
..	..	@@ -8101,19 +8379,23 @@
8101	8379	// }
8102	8380	// else
8103	8381	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
8106	8384	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
8109	8389	// }
8110	8390	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8392	{
8113	8393	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8394	+ // texturecache = textures.get(texname); // suspicious
	8395	+ if (texturecache == null)
	8396	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8397	+ else
	8398	+ new Exception().printStackTrace();
8117	8399	} else
8118	8400	{
8119	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8403,13 @@
8121	8403	// texture = GetResourceTexture("default.png");
8122	8404	//} else
8123	8405	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
8125	8407	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8408	+ // texturecache = textures.get(texname); // suspicious
	8409	+ if (texturecache == null)
	8410	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8411	+ else
	8412	+ new Exception().printStackTrace();
8129	8413	} else
8130	8414	{
8131	8415	if (textureon)
..	..	@@ -8150,7 +8434,7 @@
8150	8434	}
8151	8435
8152	8436	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8437	+ if (!FileExists(cachename))
8154	8438	cachename = texname;
8155	8439	else
8156	8440	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8456,7 @@
8172	8456	}
8173	8457
8174	8458	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8459	+ if (!FileExists(cachename))
8176	8460	cachename = texname;
8177	8461	else
8178	8462	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8465,22 @@
8181	8465	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8466
8183	8467
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8468	+ if (texturedata == null)
	8469	+ throw new Exception();
	8470	+
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8472	//texture = GetTexture(tex, bump);
8187	8473	}
8188	8474	}
8189	8475	//}
8190	8476	}
8191	8477
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8479	{
8194	8480	//return false;
8195	8481
8196	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8484	{
8199	8485	// String ext = "_highres";
8200	8486	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8497,17 @@
8211	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8498	if (!cachefile.exists())
8213	8499	{
8214		- // cache to disk
8215		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8216		- //buffers[0].
8217		-
8218		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8219		- int[] pixels = new int[bytebuf.capacity()/3];
8220		-
8221		- // squared size heuristic...
8222		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8501	{
8224		- for (int i=pixels.length; --i>=0;)
8225		- {
8226		- int i3 = i*3;
8227		- pixels[i] = 0xFF;
8228		- pixels[i] <<= 8;
8229		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8230		- pixels[i] <<= 8;
8231		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8232		- pixels[i] <<= 8;
8233		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8234		- }
8235		-
8236		- /*
8237		- int r=0,g=0,b=0,a=0;
8238		- for (int i=0; i<width; i++)
8239		- for (int j=0; j<height; j++)
8240		- {
8241		- int index = j*width+i;
8242		- int p = pixels[index];
8243		- a = ((p>>24) & 0xFF);
8244		- r = ((p>>16) & 0xFF);
8245		- g = ((p>>8) & 0xFF);
8246		- b = (p & 0xFF);
8247		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8248		- }
8249		- /**/
8250		- int width = (int)Math.sqrt(pixels.length); // squared
8251		- int height = width;
8252		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8253		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
8254	8504	ImageWriter writer = null;
8255	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8506	if (iter.hasNext()) {
8257	8507	writer = (ImageWriter)iter.next();
8258	8508	}
8259		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
8260	8511	try
8261	8512	{
8262	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8524,20 @@
8273	8524	}
8274	8525	}
8275	8526	}
8276		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
8277	8530	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
8279	8532	{
8280		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
8281	8534	thetex.texture.disable();
8282	8535	thetex.texture.dispose();
8283		- textures.remove(texname);
	8536	+ textures.remove(tex);
8284	8537	}
8285	8538
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
8288	8541
8289	8542	// newtex = true;
8290	8543	}
..	..	@@ -8300,10 +8553,41 @@
8300	8553	}
8301	8554	}
8302	8555
8303		- return texture;
	8556	+ return texturecache;
8304	8557	}
8305	8558
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8559	+ static void EmbedTextures(cTexture tex)
	8560	+ {
	8561	+ if (tex.pigmentdata == null)
	8562	+ {
	8563	+ String texname = Object3D.GetPigment(tex);
	8564	+
	8565	+ CacheTexture texturecache = texturepigment.get(tex);
	8566	+
	8567	+ if (texturecache != null)
	8568	+ {
	8569	+ tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8570	+ tex.pw = texturecache.texturedata.getWidth();
	8571	+ tex.ph = texturecache.texturedata.getHeight();
	8572	+ }
	8573	+ }
	8574	+
	8575	+ if (tex.bumpdata == null)
	8576	+ {
	8577	+ String texname = Object3D.GetBump(tex);
	8578	+
	8579	+ CacheTexture texturecache = texturebump.get(tex);
	8580	+
	8581	+ if (texturecache != null)
	8582	+ {
	8583	+ tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8584	+ tex.bw = texturecache.texturedata.getWidth();
	8585	+ tex.bh = texturecache.texturedata.getHeight();
	8586	+ }
	8587	+ }
	8588	+ }
	8589	+
	8590	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8307	8591	{
8308	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8593
..	..	@@ -8321,21 +8605,21 @@
8321	8605	return texture!=null?texture.texture:null;
8322	8606	}
8323	8607
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8608	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8609	{
8326	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8611
8328	8612	return texture!=null?texture.texturedata:null;
8329	8613	}
8330	8614
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8616	{
8333	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8618	{
8335	8619	return false;
8336	8620	}
8337	8621
8338		- boolean newtex = false;
	8622	+ //boolean newtex = false;
8339	8623
8340	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8625
..	..	@@ -8367,7 +8651,7 @@
8367	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8653
8370		- return newtex;
	8654	+ return true; // Warning: not used.
8371	8655	}
8372	8656
8373	8657	ShadowBuffer shadowPBuf;
..	..	@@ -9205,11 +9489,35 @@
9205	9489	jy8[3] = 0.5f;
9206	9490	}
9207	9491
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9492	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9494	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9495	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9496
	9497	+ void ResetOptions()
	9498	+ {
	9499	+ options1[0] = 100;
	9500	+ options1[1] = 0.025f;
	9501	+ options1[2] = 0.01f;
	9502	+ options1[3] = 0;
	9503	+ options1[4] = 0;
	9504	+
	9505	+ options2[0] = 0;
	9506	+ options2[1] = 0.75f;
	9507	+ options2[2] = 0;
	9508	+ options2[3] = 0;
	9509	+
	9510	+ options3[0] = 1;
	9511	+ options3[1] = 1;
	9512	+ options3[2] = 1;
	9513	+ options3[3] = 0;
	9514	+
	9515	+ options4[0] = 1;
	9516	+ options4[1] = 0;
	9517	+ options4[2] = 1;
	9518	+ options4[3] = 0;
	9519	+ }
	9520	+
9213	9521	static int imagecount = 0; // movie generation
9214	9522
9215	9523	static int jitter = 0;
..	..	@@ -9305,8 +9613,8 @@
9305	9613	assert (parentcam != renderCamera);
9306	9614
9307	9615	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9616	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9617	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9310	9618
9311	9619	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9620
..	..	@@ -9321,8 +9629,8 @@
9321	9629	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9630
9323	9631	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9632	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9633	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9326	9634
9327	9635	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9636
..	..	@@ -9394,7 +9702,7 @@
9394	9702	//gl.glFlush();
9395	9703	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9704
9397		- if (ANIMATION && ABORTED)
	9705	+ if (Globals.ANIMATION && ABORTED)
9398	9706	{
9399	9707	System.err.println(" ABORTED FRAME");
9400	9708	break;
..	..	@@ -9424,7 +9732,7 @@
9424	9732	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9733
9426	9734	// save image
9427		- if (ANIMATION && !ABORTED)
	9735	+ if (Globals.ANIMATION && !ABORTED)
9428	9736	{
9429	9737	VPwidth = viewport[2];
9430	9738	VPheight = viewport[3];
..	..	@@ -9535,11 +9843,11 @@
9535	9843
9536	9844	// imagecount++;
9537	9845
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9846	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9847
9540	9848	if (!BOXMODE)
9541	9849	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9850	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9851	}
9544	9852
9545	9853	if (!BOXMODE)
..	..	@@ -9577,7 +9885,7 @@
9577	9885	ABORTED = false;
9578	9886	}
9579	9887	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9888	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9889
9582	9890	if (false)
9583	9891	{
..	..	@@ -10240,11 +10548,11 @@
10240	10548
10241	10549	public void display(GLAutoDrawable drawable)
10242	10550	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10551	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10552	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10553	+ Grafreed.wav.save();
	10554	+ Grafreed.savesound = false;
	10555	+ Grafreed.hassound = false;
10248	10556	}
10249	10557	// if (DEBUG_SELECTION)
10250	10558	// {
..	..	@@ -10320,6 +10628,7 @@
10320	10628	ANTIALIAS = 0;
10321	10629	//System.out.println("RESTART");
10322	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
10323	10632	}
10324	10633	}
10325	10634	}
..	..	@@ -10374,7 +10683,7 @@
10374	10683	Object3D theobject = object;
10375	10684	Object3D theparent = object.parent;
10376	10685	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10686	+ object = (Object3D)Grafreed.clone(object);
10378	10687	object.Stripify();
10379	10688	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10689	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10696,14 @@
10387	10696	ambientOcclusion = false;
10388	10697	}
10389	10698
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10701	{
10392	10702	//if (RENDERSHADOW) // ?
10393	10703	if (!IsFrozen())
10394	10704	{
10395	10705	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10706	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10707	{
10398	10708	Globals.framecount++;
10399	10709	shadowbuffer.display();
..	..	@@ -10520,8 +10830,8 @@
10520	10830
10521	10831	// if (parentcam != renderCamera) // not a light
10522	10832	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10833	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10834	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10525	10835
10526	10836	for (int j = 0; j < 4; j++)
10527	10837	{
..	..	@@ -10535,8 +10845,8 @@
10535	10845
10536	10846	// if (parentcam != renderCamera) // not a light
10537	10847	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10848	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10849	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10540	10850
10541	10851	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10852
..	..	@@ -10795,7 +11105,16 @@
10795	11105	// Bump noise
10796	11106	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11107	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11108	+
	11109	+ try
	11110	+ {
	11111	+ BindTexture(NOISE_TEXTURE, false, 2);
	11112	+ }
	11113	+ catch (Exception e)
	11114	+ {
	11115	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11116	+ }
	11117	+
10799	11118
10800	11119	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11120	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11137,9 @@
10818	11137
10819	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11139
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11140	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11141	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11142	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11143	} else
10825	11144	{
10826	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11150,7 @@
10831	11150	//System.out.println("BLENDING ON");
10832	11151	gl.glEnable(GL.GL_BLEND);
10833	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11154	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11155	gl.glLoadIdentity();
10837	11156
..	..	@@ -10920,8 +11239,8 @@
10920	11239	System.err.println("parentcam != renderCamera");
10921	11240
10922	11241	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11242	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11243	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10925	11244	}
10926	11245
10927	11246	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11261,8 @@
10942	11261	if (true) // TODO
10943	11262	{
10944	11263	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11264	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11265	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11266	}
10948	11267
10949	11268	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11259,8 +11578,14 @@
11259	11578	{
11260	11579	renderpass++;
11261	11580	// System.out.println("Draw object... ");
	11581	+ STEP = 1;
11262	11582	if (FAST) // in case there is no script
11263		- STEP = 16;
	11583	+ STEP = 8;
	11584	+
	11585	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11586	+ {
	11587	+ STEP *= 4;
	11588	+ }
11264	11589
11265	11590	//object.FullInvariants();
11266	11591
..	..	@@ -11274,23 +11599,44 @@
11274	11599	e.printStackTrace();
11275	11600	}
11276	11601
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11602	+ if (Grafreed.RENDERME > 0)
	11603	+ Grafreed.RENDERME--; // mechante magouille
11279	11604
11280	11605	Globals.ONESTEP = false;
11281	11606	}
11282	11607
11283	11608	static boolean zoomonce = false;
11284	11609
	11610	+ static void CreateSelectedPoint()
	11611	+ {
	11612	+ if (selectedpoint == null)
	11613	+ {
	11614	+ debugpointG = new Sphere();
	11615	+ debugpointP = new Sphere();
	11616	+ debugpointC = new Sphere();
	11617	+ debugpointR = new Sphere();
	11618	+
	11619	+ selectedpoint = new Superellipsoid();
	11620	+
	11621	+ for (int i=0; i<8; i++)
	11622	+ {
	11623	+ debugpoints[i] = new Sphere();
	11624	+ }
	11625	+ }
	11626	+ }
	11627	+
11285	11628	void DrawObject(GL gl, boolean draw)
11286	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
11287	11633	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11634	// DrawMode() = SELECTION;
11289	11635	//GL gl = getGL();
11290	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11637	{
11292	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11640	pingthread.StepToTarget(true); // true);
11295	11641	// zoomonce = false;
11296	11642	}
..	..	@@ -11345,7 +11691,14 @@
11345	11691
11346	11692	usedtextures.clear();
11347	11693
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11694	+ try
	11695	+ {
	11696	+ BindTextures(DEFAULT_TEXTURES, 2);
	11697	+ }
	11698	+ catch (Exception e)
	11699	+ {
	11700	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11701	+ }
11349	11702	}
11350	11703	//System.out.println("--> " + stackdepth);
11351	11704	// GrafreeD.traceon();
..	..	@@ -11355,8 +11708,9 @@
11355	11708
11356	11709	if (DrawMode() == DEFAULT)
11357	11710	{
11358		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
11359	11712	{
	11713	+ CreateSelectedPoint();
11360	11714	float radius = 0.05f;
11361	11715	if (selectedpoint.radius != radius)
11362	11716	{
..	..	@@ -11410,20 +11764,32 @@
11410	11764	ReleaseTextures(DEFAULT_TEXTURES);
11411	11765
11412	11766	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11768	{
11415		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11416	11770
11417	11771	// System.out.println("Texture --------- " + tex);
11418	11772
11419		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11420	11774	continue;
11421	11775
11422		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11423	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11424	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	11780	+ if (gettex != null)
	11781	+ {
	11782	+ gettex.texture.dispose();
	11783	+ texturepigment.remove(tex);
	11784	+ }
	11785	+
	11786	+ gettex = texturebump.get(tex);
	11787	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11788	+ if (gettex != null)
	11789	+ {
	11790	+ gettex.texture.dispose();
	11791	+ texturebump.remove(tex);
	11792	+ }
11427	11793	}
11428	11794	}
11429	11795	}
..	..	@@ -11436,7 +11802,14 @@
11436	11802	if (checker != null && DrawMode() == DEFAULT)
11437	11803	{
11438	11804	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11805	+ try
	11806	+ {
	11807	+ BindTextures(checker.GetTextures(), checker.texres);
	11808	+ }
	11809	+ catch (Exception e)
	11810	+ {
	11811	+ System.err.println("FAILED: " + checker.GetTextures());
	11812	+ }
11440	11813	// NEAREST
11441	11814	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11815	DrawChecker(gl);
..	..	@@ -11518,7 +11891,7 @@
11518	11891	return;
11519	11892	}
11520	11893
11521		- String string = obj.GetToolTip();
	11894	+ String string = obj.toString(); //.GetToolTip();
11522	11895
11523	11896	GL gl = GetGL();
11524	11897
..	..	@@ -11835,8 +12208,8 @@
11835	12208	//obj.TransformToWorld(light, light);
11836	12209	for (int i = tp.size(); --i >= 0;)
11837	12210	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12211	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12212	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12213	}
11841	12214
11842	12215
..	..	@@ -11853,8 +12226,8 @@
11853	12226	parentcam = cameras[0];
11854	12227	}
11855	12228
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12229	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12230	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12231
11859	12232	LA.xformPos(light, renderCamera.toScreen, light);
11860	12233
..	..	@@ -12468,8 +12841,8 @@
12468	12841
12469	12842	// display shadow only (bump == 0)
12470	12843	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12844	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12845	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12846	"SUB temp.y, one.x, temp.z;" +
12474	12847	"MUL temp.x, temp.x, temp.y;" +
12475	12848	"KIL temp.x;" +
..	..	@@ -12598,8 +12971,10 @@
12598	12971	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	12972
12600	12973	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12974	+ // Tuning for default skin
	12975	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12976	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12977	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	12978	"MUL temp.x, temp.x, temp.y;" +
12604	12979
12605	12980	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +13122,7 @@
12747	13122	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	13123	"FLR final.x, final.y;" +
12749	13124	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	13125	+ "MUL final.x, final.x, c256i;" +
12751	13126	"MOV final.z, zero.x;" +
12752	13127	"MOV final.a, one.w;":""
12753	13128	) +
..	..	@@ -12755,7 +13130,7 @@
12755	13130	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	13131	"FLR final.x, final.y;" +
12757	13132	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	13133	+ "MUL final.x, final.x, c256i;" +
12759	13134	"MOV final.z, zero.x;" +
12760	13135	"MOV final.a, one.w;":""
12761	13136	) +
..	..	@@ -12798,7 +13173,7 @@
12798	13173	//once = true;
12799	13174	}
12800	13175
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13176	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13177	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13178	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13179
..	..	@@ -12931,12 +13306,16 @@
12931	13306
12932	13307	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13308	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13309	+
	13310	+ // Compare fragment depth in light space with shadowmap.
12934	13311	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13312	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13313	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13314	+
	13315	+ // Reverse comparison
12937	13316	"SUB temp.x, one.x, temp.x;" +
12938	13317	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13318	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13319	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13320
12942	13321	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13329,10 @@
12950	13329	// No shadow for backface
12951	13330	"DP3 temp.x, normal, lightd;" +
12952	13331	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13332	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13333	+
	13334	+ // No shadow when out of frustrum
	13335	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13336	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13337	"";
12955	13338	}
..	..	@@ -13096,7 +13479,8 @@
13096	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
13100	13484
13101	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13486	// OUT : diff, spec
..	..	@@ -13112,9 +13496,10 @@
13112	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13498	//"MOV " + dest + ".w," + "normal.z;" +
13115		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13116		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13117		- //"MOV " + dest + ".z," + "params2.w;" +
	13499	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13500	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13501	+
	13502	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13504	"RCP " + dest + ".w," + dest + ".w;" +
13120	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +13893,7 @@
13508	13893	public void mousePressed(MouseEvent e)
13509	13894	{
13510	13895	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13896	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	13897	}
13513	13898
13514	13899	static long prevtime = 0;
..	..	@@ -13584,8 +13969,8 @@
13584	13969	// mode \|= META;
13585	13970	//}
13586	13971
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13972	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13973	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	13974	anchorX = ax;
13590	13975	anchorY = ay;
13591	13976	prevX = px;
..	..	@@ -13619,6 +14004,7 @@
13619	14004	else
13620	14005	if (evt.getSource() == AAtimer)
13621	14006	{
	14007	+ Globals.TIMERRUNNING = false;
13622	14008	if (mouseDown)
13623	14009	{
13624	14010	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14030,10 @@
13644	14030	// LIVE = waslive;
13645	14031	// wasliveok = true;
13646	14032	// waslive = false;
	14033	+
	14034	+ // May 2019 Forget it:
	14035	+ if (true)
	14036	+ return;
13647	14037
13648	14038	// source == timer
13649	14039	if (mouseDown)
..	..	@@ -13674,7 +14064,7 @@
13674	14064
13675	14065	// fev 2014???
13676	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14068	pingthread.StepToTarget(true); // true);
13679	14069	}
13680	14070	// if (!LIVE)
..	..	@@ -13683,12 +14073,13 @@
13683	14073
13684	14074	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14075
13686		- void clickStart(int x, int y, int modifiers)
	14076	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14077	{
13688	14078	if (!wasliveok)
13689	14079	return;
13690	14080
13691	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
13692	14083
13693	14084	// waslive = LIVE;
13694	14085	// LIVE = false;
..	..	@@ -13700,7 +14091,7 @@
13700	14091	// touched = true; // main DL
13701	14092	if (isRenderer)
13702	14093	{
13703		- SetMouseMode(modifiers);
	14094	+ SetMouseMode(modifiers, modifiersex);
13704	14095	}
13705	14096
13706	14097	selectX = anchorX = x;
..	..	@@ -13713,7 +14104,7 @@
13713	14104	clicked = true;
13714	14105	hold = false;
13715	14106
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14107	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14108	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14109	{
13719	14110	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13744,7 +14135,7 @@
13744	14135	info.camera = renderCamera;
13745	14136	info.x = x;
13746	14137	info.y = y;
13747		- info.modifiers = modifiers;
	14138	+ info.modifiers = modifiersex;
13748	14139	editObj = object.doEditClick(info, 0);
13749	14140	if (!editObj)
13750	14141	{
..	..	@@ -13761,9 +14152,12 @@
13761	14152
13762	14153	public void mouseDragged(MouseEvent e)
13763	14154	{
	14155	+ Globals.MOUSEDRAGGED = true;
	14156	+
13764	14157	//System.out.println("mouseDragged: " + e);
13765	14158	if (isRenderer)
13766	14159	movingcamera = true;
	14160	+
13767	14161	//if (drawing)
13768	14162	//return;
13769	14163	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14167,7 @@
13773	14167	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14168	}
13775	14169	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14170	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14171
13778	14172	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14173	}
..	..	@@ -13946,6 +14340,7 @@
13946	14340
13947	14341	public void run()
13948	14342	{
	14343	+ new Exception().printStackTrace();
13949	14344	System.exit(0);
13950	14345	for (;;)
13951	14346	{
..	..	@@ -14009,7 +14404,7 @@
14009	14404	{
14010	14405	Globals.lighttouched = true;
14011	14406	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14407	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14408	}
14014	14409	//else
14015	14410	}
..	..	@@ -14023,12 +14418,12 @@
14023	14418	void GoDown(int mod)
14024	14419	{
14025	14420	MODIFIERS \|= COMMAND;
14026		- /*
	14421	+ /**/
14027	14422	if((mod&SHIFT) == SHIFT)
14028	14423	manipCamera.RotatePosition(0, -speed);
14029	14424	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
14032	14427	if ((mod & SHIFT) == SHIFT)
14033	14428	{
14034	14429	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14439,12 @@
14044	14439	void GoUp(int mod)
14045	14440	{
14046	14441	MODIFIERS \|= COMMAND;
14047		- /*
	14442	+ /**/
14048	14443	if((mod&SHIFT) == SHIFT)
14049	14444	manipCamera.RotatePosition(0, speed);
14050	14445	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
14053	14448	if ((mod & SHIFT) == SHIFT)
14054	14449	{
14055	14450	mouseMode = mouseMode;
..	..	@@ -14065,12 +14460,12 @@
14065	14460	void GoLeft(int mod)
14066	14461	{
14067	14462	MODIFIERS \|= COMMAND;
14068		- /*
	14463	+ /**/
14069	14464	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14465	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
14074	14469	if ((mod & SHIFT) == SHIFT)
14075	14470	{
14076	14471	mouseMode = mouseMode;
..	..	@@ -14086,12 +14481,12 @@
14086	14481	void GoRight(int mod)
14087	14482	{
14088	14483	MODIFIERS \|= COMMAND;
14089		- /*
	14484	+ /**/
14090	14485	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
14095	14490	if ((mod & SHIFT) == SHIFT)
14096	14491	{
14097	14492	mouseMode = mouseMode;
..	..	@@ -14109,7 +14504,7 @@
14109	14504	int X, Y;
14110	14505	boolean SX, SY;
14111	14506
14112		- void drag(int x, int y, int modifiers)
	14507	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14508	{
14114	14509	if (IsFrozen())
14115	14510	{
..	..	@@ -14118,17 +14513,17 @@
14118	14513
14119	14514	drag = true; // NEW
14120	14515
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14516	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14517
14123	14518	X = x;
14124	14519	Y = y;
14125	14520	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14521	+ MODIFIERS = modifiersex;
	14522	+ modifiersex &= ~1024;
14128	14523	if (false) // modifiers != 0)
14129	14524	{
14130	14525	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14526	+ System.out.println("mouseDragged: " + modifiersex);
14132	14527	System.out.println("SHIFT = " + SHIFT);
14133	14528	System.out.println("CONTROL = " + COMMAND);
14134	14529	System.out.println("META = " + META);
..	..	@@ -14148,7 +14543,8 @@
14148	14543	info.camera = renderCamera;
14149	14544	info.x = x;
14150	14545	info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14548	} else
14153	14549	{
14154	14550	if (x < startX)
..	..	@@ -14312,7 +14708,9 @@
14312	14708	ci.camera = renderCamera;
14313	14709	if (!isRenderer)
14314	14710	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
14316	14714	{
14317	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14716	} else
..	..	@@ -14324,7 +14722,11 @@
14324	14722
14325	14723	public void mouseReleased(MouseEvent e)
14326	14724	{
	14725	+ Globals.MOUSEDRAGGED = false;
	14726	+
14327	14727	movingcamera = false;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
14328	14730	//System.out.println("mouseReleased: " + e);
14329	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14732	}
..	..	@@ -14347,9 +14749,9 @@
14347	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14751
14350		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14753	timeout = true;
14352		- else
	14754	+// ?? May 2019 else
14353	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14756	mouseDown = false;
14355	14757	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14861,7 @@
14459	14861	System.out.println("keyReleased: " + e);
14460	14862	}
14461	14863
14462		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14865	{
14464	14866	//System.out.println("SetMouseMode = " + modifiers);
14465	14867	//modifiers &= ~1024;
..	..	@@ -14471,25 +14873,25 @@
14471	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	14874	// return;
14473	14875	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
14475	14877	{
14476	14878	mouseMode \|= ZOOM;
14477	14879	}
14478	14880
14479	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	14883	{
14482	14884	mouseMode \|= VR; // BACKFORTH;
14483	14885	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	14887	{
14486	14888	mouseMode \|= SELECT;
14487	14889	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
14489	14891	{
14490	14892	mouseMode \|= SELECT;
14491	14893	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	14895	{
14494	14896	mouseMode &= ~VR;
14495	14897	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +14920,7 @@
14518	14920
14519	14921	if (isRenderer) //
14520	14922	{
14521		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
14522	14924	}
14523	14925
14524	14926	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +14982,8 @@
14580	14982	// break;
14581	14983	case 'T':
14582	14984	CACHETEXTURE ^= true;
14583		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14584	14987	// repaint();
14585	14988	break;
14586	14989	case 'Y':
..	..	@@ -14665,7 +15068,9 @@
14665	15068	case 'E' : COMPACT ^= true;
14666	15069	repaint();
14667	15070	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15074	repaint();
14670	15075	break;
14671	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15095,8 @@
14690	15095	RevertCamera();
14691	15096	repaint();
14692	15097	break;
14693		- case 'L':
14694	15098	case 'l':
	15099	+ //case 'L':
14695	15100	if (lightMode)
14696	15101	{
14697	15102	lightMode = false;
..	..	@@ -14834,9 +15239,9 @@
14834	15239	case '_':
14835	15240	kompactbit = 5;
14836	15241	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
14840	15245	case ' ':
14841	15246	lightMode ^= true;
14842	15247	Globals.lighttouched = true;
..	..	@@ -14848,13 +15253,14 @@
14848	15253	case ESC:
14849	15254	RENDERPROGRAM += 1;
14850	15255	RENDERPROGRAM %= 3;
	15256	+
14851	15257	repaint();
14852	15258	break;
14853	15259	case 'Z':
14854	15260	//RESIZETEXTURE ^= true;
14855	15261	//break;
14856	15262	case 'z':
14857		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14858	15264	Globals.lighttouched = true;
14859	15265	repaint();
14860	15266	break;
..	..	@@ -14887,8 +15293,9 @@
14887	15293	case DELETE:
14888	15294	ClearSelection();
14889	15295	break;
14890		- /*
14891	15296	case '+':
	15297	+
	15298	+ /*
14892	15299	//fontsize += 1;
14893	15300	bbzoom *= 2;
14894	15301	repaint();
..	..	@@ -14905,17 +15312,17 @@
14905	15312	case '=':
14906	15313	IncDepth();
14907	15314	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
14909	15316	maskbit = 6;
14910	15317	break;
14911	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15319	DecDepth();
14913	15320	maskbit = 5;
14914	15321	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
14919	15326	break;
14920	15327	case '{':
14921	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15385,7 @@
14978	15385	//mode = ROTATE;
14979	15386	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15387	{
14981		- SetMouseMode(modifiers);
	15388	+ SetMouseMode(0, modifiers);
14982	15389	}
14983	15390	}
14984	15391
..	..	@@ -15114,7 +15521,7 @@
15114	15521	{
15115	15522	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15523	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15524	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15525	{
15119	15526	mouseMoved(e);
15120	15527	} else
..	..	@@ -15139,11 +15546,12 @@
15139	15546	}
15140	15547	*/
15141	15548
15142		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
15143	15550	}
15144	15551
15145	15552	void SelectParent()
15146	15553	{
	15554	+ new Exception().printStackTrace();
15147	15555	System.exit(0);
15148	15556	Composite group = (Composite) object;
15149	15557	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15563,10 @@
15155	15563	{
15156	15564	//selectees.remove(i);
15157	15565	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15567	} else
15160	15568	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15570	}
15163	15571
15164	15572	first = false;
..	..	@@ -15167,6 +15575,7 @@
15167	15575
15168	15576	void SelectChildren()
15169	15577	{
	15578	+ new Exception().printStackTrace();
15170	15579	System.exit(0);
15171	15580	/*
15172	15581	Composite group = (Composite) object;
..	..	@@ -15199,12 +15608,12 @@
15199	15608	for (int j = 0; j < group.children.size(); j++)
15200	15609	{
15201	15610	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15612	first = false;
15204	15613	}
15205	15614	} else
15206	15615	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15617	}
15209	15618
15210	15619	first = false;
..	..	@@ -15215,21 +15624,21 @@
15215	15624	{
15216	15625	//Composite group = (Composite) object;
15217	15626	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15628	}
15220	15629
15221	15630	void ResetTransform(int mask)
15222	15631	{
15223	15632	//Composite group = (Composite) object;
15224	15633	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
15226	15635	}
15227	15636
15228	15637	void FlipTransform()
15229	15638	{
15230	15639	//Composite group = (Composite) object;
15231	15640	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
15233	15642	// group.editWindow.ReduceMesh(true);
15234	15643	}
15235	15644
..	..	@@ -15237,7 +15646,7 @@
15237	15646	{
15238	15647	//Composite group = (Composite) object;
15239	15648	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
15241	15650	// group.editWindow.ReduceMesh(true);
15242	15651	}
15243	15652
..	..	@@ -15245,7 +15654,7 @@
15245	15654	{
15246	15655	//Composite group = (Composite) object;
15247	15656	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
15249	15658	}
15250	15659
15251	15660	void IncDepth()
..	..	@@ -15331,7 +15740,9 @@
15331	15740	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15741	//Image img = CreateImage(width, height);
15333	15742	//System.out.println("width = " + width + "; height = " + height + "\n");
	15743	+
15334	15744	Graphics gr = g; // img.getGraphics();
	15745	+
15335	15746	if (!hasMarquee)
15336	15747	{
15337	15748	if (Xmin < Xmax) // !locked)
..	..	@@ -15419,6 +15830,7 @@
15419	15830	info.bounds.y += (height - desired) / 2;
15420	15831	}
15421	15832	}
	15833	+
15422	15834	info.g = gr;
15423	15835	info.camera = renderCamera;
15424	15836	/*
..	..	@@ -15428,15 +15840,55 @@
15428	15840	*/
15429	15841	if (!isRenderer)
15430	15842	{
15431		- object.drawEditHandles(info, 0);
	15843	+ Grafreed.Assert(object != null);
	15844	+ Grafreed.Assert(object.selection != null);
	15845	+ if (object.selection.Size() > 0)
	15846	+ {
	15847	+ int hitSomething = object.selection.get(0).hitSomething;
	15848	+
	15849	+ info.DX = 0;
	15850	+ info.DY = 0;
	15851	+ info.W = 1;
	15852	+ if (hitSomething == Object3D.hitCenter)
	15853	+ {
	15854	+ info.DX = X;
	15855	+ if (X != 0)
	15856	+ info.DX -= info.bounds.width/2;
	15857	+
	15858	+ info.DY = Y;
	15859	+ if (Y != 0)
	15860	+ info.DY -= info.bounds.height/2;
	15861	+ }
	15862	+
	15863	+ object.drawEditHandles(info, 0);
	15864	+
	15865	+ if (drag && (X != 0 \|\| Y != 0))
	15866	+ {
	15867	+ switch (hitSomething)
	15868	+ {
	15869	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15870	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15871	+ break;
	15872	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15873	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15874	+ break;
	15875	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15876	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15877	+ break;
	15878	+ }
	15879	+
	15880	+ }
	15881	+ }
15432	15882	}
15433	15883	}
	15884	+
15434	15885	if (isRenderer)
15435	15886	{
15436	15887	//gr.setColor(Color.black);
15437	15888	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	15889	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	15890	}
	15891	+
15440	15892	if (hasMarquee)
15441	15893	{
15442	15894	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +16001,7 @@
15549	16001	public boolean mouseDown(Event evt, int x, int y)
15550	16002	{
15551	16003	System.out.println("mouseDown: " + evt);
	16004	+ System.exit(0);
15552	16005	/*
15553	16006	locked = true;
15554	16007	drag = false;
..	..	@@ -15592,7 +16045,7 @@
15592	16045	{
15593	16046	keyPressed(0, modifiers);
15594	16047	}
15595		- clickStart(x, y, modifiers);
	16048	+ // clickStart(x, y, modifiers);
15596	16049	return true;
15597	16050	}
15598	16051
..	..	@@ -15710,7 +16163,7 @@
15710	16163	{
15711	16164	keyReleased(0, 0);
15712	16165	}
15713		- drag(x, y, modifiers);
	16166	+ drag(x, y, 0, modifiers);
15714	16167	return true;
15715	16168	}
15716	16169
..	..	@@ -15842,7 +16295,7 @@
15842	16295	Object3D object;
15843	16296	static Object3D trackedobject;
15844	16297	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16298	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16299	/static/ Camera eyeCamera;
15847	16300	/static/ Camera lightCamera;
15848	16301	int cameracount;
..	..	@@ -16127,16 +16580,16 @@
16127	16580	cStatic.objectstack[materialdepth++] = checker;
16128	16581	//System.out.println("material " + material);
16129	16582	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
16131	16584
16132	16585	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16587
16135	16588	materialdepth -= 1;
16136	16589	if (materialdepth > 0)
16137	16590	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16591	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16592	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	16593	}
16141	16594	//checker.GetMaterial().opacity = 1f;
16142	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16675,14 @@
16222	16675	}
16223	16676	}
16224	16677
	16678	+ private Object3D GetFolder()
	16679	+ {
	16680	+ Object3D folder = object.GetWindow().copy;
	16681	+ if (object.GetWindow().copy.selection.Size() > 0)
	16682	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16683	+ return folder;
	16684	+ }
	16685	+
16225	16686	class SelectBuffer implements GLEventListener
16226	16687	{
16227	16688
..	..	@@ -16280,6 +16741,7 @@
16280	16741	{
16281	16742	if (!selection)
16282	16743	{
	16744	+ new Exception().printStackTrace();
16283	16745	System.exit(0);
16284	16746	return;
16285	16747	}
..	..	@@ -16300,6 +16762,17 @@
16300	16762
16301	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	16764
	16765	+ if (PAINTMODE)
	16766	+ {
	16767	+ if (object.GetWindow().copy.selection.Size() > 0)
	16768	+ {
	16769	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16770	+
	16771	+ // Make what you paint not selectable.
	16772	+ paintobj.ResetSelectable();
	16773	+ }
	16774	+ }
	16775	+
16303	16776	//int tmp = selection_view;
16304	16777	//selection_view = -1;
16305	16778	int temp = DrawMode();
..	..	@@ -16311,6 +16784,17 @@
16311	16784	// temp = DEFAULT; // patch for selection debug
16312	16785	Globals.drawMode = temp; // WARNING
16313	16786
	16787	+ if (PAINTMODE)
	16788	+ {
	16789	+ if (object.GetWindow().copy.selection.Size() > 0)
	16790	+ {
	16791	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16792	+
	16793	+ // Revert.
	16794	+ paintobj.RestoreSelectable();
	16795	+ }
	16796	+ }
	16797	+
16314	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	16799
16316	16800	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +16842,8 @@
16358	16842	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16845	+
	16846	+ CreateSelectedPoint();
16361	16847
16362	16848	// Will fit the mesh !!!
16363	16849	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +16893,36 @@
16407	16893	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16408	16894	}
16409	16895
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16896	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	16897	}
16412	16898	}
16413	16899
16414	16900	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	16902
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16903	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	16904	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16905	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	16906
16421		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	16910
16423		- group.CreateMaterial(); // use a void leaf to select instances
16424		-
16425		- group.add(paintobj); // link
16426		-
16427		- object.editWindow.SnapObject(group);
16428		-
16429		- Object3D folder = object.editWindow.copy;
16430		-
16431		- if (object.editWindow.copy.selection.Size() > 0)
16432		- folder = object.editWindow.copy.selection.elementAt(0);
16433		-
16434		- folder.add(group);
16435		-
16436		- object.editWindow.ResetModel();
16437		- object.editWindow.refreshContents();
	16911	+ Object3D inst = new Object3D("inst" + paintcount++);
	16912	+
	16913	+ inst.CreateMaterial(); // use a void leaf to select instances
	16914	+
	16915	+ inst.add(paintobj); // link
	16916	+
	16917	+ object.GetWindow().SnapObject(inst);
	16918	+
	16919	+ Object3D folder = paintFolder; // GetFolder();
	16920	+
	16921	+ folder.add(inst);
	16922	+
	16923	+ object.GetWindow().ResetModel();
	16924	+ object.GetWindow().refreshContents();
	16925	+ }
16438	16926	}
16439	16927	else
16440	16928	paintcount = 0;
..	..	@@ -16473,6 +16961,11 @@
16473	16961	//System.out.println("objects[color] = " + objects[color]);
16474	16962	//objects[color].Select();
16475	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
16476	16969	object.Select(color, deselect);
16477	16970	}
16478	16971
..	..	@@ -16572,7 +17065,7 @@
16572	17065	gl.glDisable(gl.GL_CULL_FACE);
16573	17066	}
16574	17067
16575		- if (!RENDERSHADOW)
	17068	+ if (!Globals.RENDERSHADOW)
16576	17069	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17070
16578	17071	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17075,7 @@
16582	17075	//gl.glColorMask(false, false, false, false);
16583	17076
16584	17077	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17078	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17079	{
16587	17080	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17081
..	..	@@ -16998,23 +17491,15 @@
16998	17491	int AAbuffersize = 0;
16999	17492
17000	17493	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17494	+ static Superellipsoid selectedpoint;
17002	17495	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
17007	17500
17008	17501	static Sphere debugpoints[] = new Sphere[8];
17009	17502
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17503	static void InitPoints(float radius)
17019	17504	{
17020	17505	for (int i=0; i<8; i++)