~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;
..	..	@@ -92,6 +122,8 @@
92	122
93	123	static int tickcount = 0; // slow pose issue
94	124
	125	+static boolean BUTTONLESSWHEEL = false;
	126	+static boolean ZOOMBOXMODE = false;
95	127	static boolean BOXMODE = false;
96	128	static boolean IMAGEFLIP = false;
97	129	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +138,7 @@
106	138	static boolean OEIL = true;
107	139	static boolean OEILONCE = false; // do oeilon then oeiloff
108	140	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	141	+static boolean SWITCH = true; // false;
110	142	static boolean HANDLES = false; // selection doesn't work!!
111	143	static boolean PAINTMODE = false;
112	144
..	..	@@ -149,6 +181,8 @@
149	181	defaultcaps.setAccumBlueBits(16);
150	182	defaultcaps.setAccumAlphaBits(16);
151	183	}
	184	+
	185	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	186
153	187	void SetAsGLRenderer(boolean b)
154	188	{
..	..	@@ -223,6 +257,11 @@
223	257	public boolean IsBoxMode()
224	258	{
225	259	return BOXMODE;
	260	+ }
	261	+
	262	+ public boolean IsZoomBoxMode()
	263	+ {
	264	+ return ZOOMBOXMODE;
226	265	}
227	266
228	267	public void ClearDepth()
..	..	@@ -320,7 +359,7 @@
320	359	cStatic.objectstack[materialdepth++] = obj;
321	360	//System.out.println("material " + material);
322	361	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	362	+ //display.vector2buffer = obj.projectedVertices;
324	363	if (obj instanceof Camera)
325	364	{
326	365	display.options1[0] = material.shift;
..	..	@@ -329,14 +368,28 @@
329	368	display.options1[2] = material.shadowbias;
330	369	display.options1[3] = material.aniso;
331	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]);
332	376	display.options2[0] = material.opacity;
333	377	display.options2[1] = material.diffuse;
334	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]);
335	382
336	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]);
337	387	display.options4[0] = material.cameralight/0.2f;
338	388	display.options4[1] = material.subsurface;
339	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]);
340	393
341	394	// if (display.CURRENTANTIALIAS > 0)
342	395	// display.options3[3] /= 4;
..	..	@@ -352,7 +405,7 @@
352	405	/**/
353	406	} else
354	407	{
355		- DrawMaterial(material, selected);
	408	+ DrawMaterial(material, selected, obj.projectedVertices);
356	409	}
357	410	} else
358	411	{
..	..	@@ -376,8 +429,8 @@
376	429	cStatic.objectstack[materialdepth++] = obj;
377	430	//System.out.println("material " + material);
378	431	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	432	+ //display.vector2buffer = obj.projectedVertices;
	433	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	434	}
382	435	}
383	436
..	..	@@ -394,8 +447,8 @@
394	447	materialdepth -= 1;
395	448	if (materialdepth > 0)
396	449	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- 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);
399	452	}
400	453	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	454	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +468,8 @@
415	468	materialdepth -= 1;
416	469	if (materialdepth > 0)
417	470	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- 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);
420	473	}
421	474	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	475	//else
..	..	@@ -457,10 +510,12 @@
457	510	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	511	{
459	512	//gl.glBegin(gl.GL_TRIANGLES);
460		- 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	+ ;
461	516	if (!hasnorm)
462	517	{
463		- // System.out.println("FUCK!!");
	518	+ // System.out.println("Mesh normal");
464	519	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	520	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	521	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1240,12 @@
1185	1240	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1241	}
1187	1242	}
	1243	+
1188	1244	if (flipV)
1189	1245	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1246	else
1191	1247	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1248	+
1192	1249	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1250	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1251
..	..	@@ -1208,10 +1265,12 @@
1208	1265	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1266	}
1210	1267	}
	1268	+
1211	1269	if (flipV)
1212	1270	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1271	else
1214	1272	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1273	+
1215	1274	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1275	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1276
..	..	@@ -1239,8 +1298,10 @@
1239	1298	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1299	else
1241	1300	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1301	+
1242	1302	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1303	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1304	+
1244	1305	count2 += 2;
1245	1306	count3 += 3;
1246	1307	}
..	..	@@ -1596,7 +1657,7 @@
1596	1657	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1658	}
1598	1659
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1661	{
1601	1662	CameraPane display = this;
1602	1663	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1673,18 @@
1612	1673	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1674	if (!material.multiply)
1614	1675	{
1615		- display.color = color;
	1676	+ display.color = material.color;
1616	1677	display.saturation = material.modulation;
1617	1678	}
1618	1679	else
1619	1680	{
1620		- display.color = color2;
	1681	+ display.color = material.color2;
1621	1682	display.saturation = material.modulation2;
1622	1683	}
1623	1684
1624	1685	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1686
1626		- float[] colorV = GrafreeD.colorV;
	1687	+ float[] colorV = Grafreed.colorV;
1627	1688
1628	1689	/**/
1629	1690	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1692,7 @@
1631	1692	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1693	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1694	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1695	+ colorV[3] = 1; // material.opacity;
1635	1696
1636	1697	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1698	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1800,9 @@
1739	1800	display.modelParams7[2] = 0;
1740	1801	display.modelParams7[3] = 0;
1741	1802
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1804
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1806	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1807	{
1747	1808	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1944,7 @@
1883	1944	void PushMatrix(double[][] matrix)
1884	1945	{
1885	1946	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1947	+ PushMatrix(matrix, 1);
1887	1948	}
1888	1949
1889	1950	void PushMatrix()
..	..	@@ -2037,7 +2098,7 @@
2037	2098	//System.err.println("Oeil on");
2038	2099	OEIL = true;
2039	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2102	//pingthread.StepToTarget(true);
2042	2103	}
2043	2104
..	..	@@ -2135,7 +2196,7 @@
2135	2196	System.err.println("LIVE = " + Globals.isLIVE());
2136	2197
2137	2198	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2199	+ Grafreed.savesound = true; // wav.save();
2139	2200	// else
2140	2201	repaint(); // start loop // may 2013
2141	2202	}
..	..	@@ -2168,6 +2229,11 @@
2168	2229	public void ToggleBoxMode()
2169	2230	{
2170	2231	BOXMODE ^= true;
	2232	+ }
	2233	+
	2234	+ public void ToggleZoomBoxMode()
	2235	+ {
	2236	+ ZOOMBOXMODE ^= true;
2171	2237	}
2172	2238
2173	2239	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2313,7 @@
2247	2313
2248	2314	void ToggleDebug()
2249	2315	{
2250		- DEBUG ^= true;
	2316	+ Globals.DEBUG ^= true;
2251	2317	}
2252	2318
2253	2319	void ToggleLookAt()
..	..	@@ -2255,9 +2321,9 @@
2255	2321	LOOKAT ^= true;
2256	2322	}
2257	2323
2258		- void ToggleRandom()
	2324	+ void ToggleSwitch()
2259	2325	{
2260		- RANDOM ^= true;
	2326	+ SWITCH ^= true;
2261	2327	}
2262	2328
2263	2329	void ToggleHandles()
..	..	@@ -2265,10 +2331,17 @@
2265	2331	HANDLES ^= true;
2266	2332	}
2267	2333
	2334	+ Object3D paintFolder;
	2335	+
2268	2336	void TogglePaint()
2269	2337	{
2270	2338	PAINTMODE ^= true;
2271	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
2272	2345	}
2273	2346
2274	2347	void SwapCamera(int a, int b)
..	..	@@ -2364,7 +2437,22 @@
2364	2437	{
2365	2438	return currentGL;
2366	2439	}
2367		-
	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	+
2368	2456	/**/
2369	2457	class CacheTexture
2370	2458	{
..	..	@@ -2373,28 +2461,31 @@
2373	2461
2374	2462	int resolution;
2375	2463
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2465	{
2378		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2379	2468	resolution = res;
2380	2469	}
2381	2470	}
2382	2471	/**/
2383	2472
2384	2473	// TEXTURE static Texture texture;
2385		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2386		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2387		- 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	+
2388	2479	int pigmentdepth = 0;
2389	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2481	int bumpdepth = 0;
2391	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2487
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2489	{
2399	2490	TextureData texturedata = null;
2400	2491
..	..	@@ -2413,13 +2504,34 @@
2413	2504	if (bump)
2414	2505	texturedata = ConvertBump(texturedata, false);
2415	2506
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- 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);
2418	2509
2419		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2420		- 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);
2421	2512
2422		- 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;
2423	2535	}
2424	2536
2425	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3492,6 +3604,8 @@
3492	3604
3493	3605	System.out.println("LOADING TEXTURE : " + name);
3494	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3495	3609	//
3496	3610	if (false) // compressbit > 0)
3497	3611	{
..	..	@@ -4196,6 +4310,7 @@
4196	4310
4197	4311	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4312	{
	4313	+ new Exception().printStackTrace();
4199	4314	System.exit(0);
4200	4315	com.sun.opengl.util.texture.Texture texture = null;
4201	4316
..	..	@@ -7889,7 +8004,7 @@
7889	8004	String pigment = Object3D.GetPigment(tex);
7890	8005	String bump = Object3D.GetBump(tex);
7891	8006
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8008	{
7894	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8010	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8019,69 @@
7904	8019	pigment = null;
7905	8020	}
7906	8021
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
7909	8024	}
7910	8025
7911		- 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)
7912	8085	{
7913	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8092,7 @@
7919	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8093
7921	8094	if (tex != null)
7922		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8096
7924	8097	// //assert( texture != null );
7925	8098	// if (texture == null)
..	..	@@ -8011,7 +8184,55 @@
8011	8184	}
8012	8185	}
8013	8186
8014		- /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
8015	8236	{
8016	8237	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8238	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8243,47 @@
8022	8243	if (tex == null)
8023	8244	{
8024	8245	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8246	return;
8027	8247	}
8028	8248
8029	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	+
8030	8282	String bump = Object3D.GetBump(tex);
8031	8283
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
8034	8285
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8287	{
8037	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8293,82 @@
8042	8293	{
8043	8294	bump = null;
8044	8295	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8296
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
8054	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8300	}
8058	8301
8059		- 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)
8060	8305	{
8061		- 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;
8062	8325
8063	8326	if (tex != null)
8064	8327	{
8065		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8330
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- 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	+ }
8073	8348
8074	8349	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8350	{
8081		- 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(""))
8082	8372	{
8083	8373	assert(!bump);
8084	8374	// if (bump)
..	..	@@ -8089,19 +8379,23 @@
8089	8379	// }
8090	8380	// else
8091	8381	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
8094	8384	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
8097	8389	// }
8098	8390	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8392	{
8101	8393	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- 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();
8105	8399	} else
8106	8400	{
8107	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8403,13 @@
8109	8403	// texture = GetResourceTexture("default.png");
8110	8404	//} else
8111	8405	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
8113	8407	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- 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();
8117	8413	} else
8118	8414	{
8119	8415	if (textureon)
..	..	@@ -8138,7 +8434,7 @@
8138	8434	}
8139	8435
8140	8436	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8437	+ if (!FileExists(cachename))
8142	8438	cachename = texname;
8143	8439	else
8144	8440	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8456,7 @@
8160	8456	}
8161	8457
8162	8458	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8459	+ if (!FileExists(cachename))
8164	8460	cachename = texname;
8165	8461	else
8166	8462	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8465,22 @@
8169	8465	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8466
8171	8467
8172		- if (texturedata != null)
8173		- 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);
8174	8472	//texture = GetTexture(tex, bump);
8175	8473	}
8176	8474	}
8177	8475	//}
8178	8476	}
8179	8477
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8479	{
8182	8480	//return false;
8183	8481
8184	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8484	{
8187	8485	// String ext = "_highres";
8188	8486	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8497,17 @@
8199	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8498	if (!cachefile.exists())
8201	8499	{
8202		- // cache to disk
8203		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8204		- //buffers[0].
8205		-
8206		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8207		- int[] pixels = new int[bytebuf.capacity()/3];
8208		-
8209		- // squared size heuristic...
8210		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8501	{
8212		- for (int i=pixels.length; --i>=0;)
8213		- {
8214		- int i3 = i*3;
8215		- pixels[i] = 0xFF;
8216		- pixels[i] <<= 8;
8217		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8218		- pixels[i] <<= 8;
8219		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8220		- pixels[i] <<= 8;
8221		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8222		- }
8223		-
8224		- /*
8225		- int r=0,g=0,b=0,a=0;
8226		- for (int i=0; i<width; i++)
8227		- for (int j=0; j<height; j++)
8228		- {
8229		- int index = j*width+i;
8230		- int p = pixels[index];
8231		- a = ((p>>24) & 0xFF);
8232		- r = ((p>>16) & 0xFF);
8233		- g = ((p>>8) & 0xFF);
8234		- b = (p & 0xFF);
8235		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8236		- }
8237		- /**/
8238		- int width = (int)Math.sqrt(pixels.length); // squared
8239		- int height = width;
8240		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8241		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
8242	8504	ImageWriter writer = null;
8243	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8506	if (iter.hasNext()) {
8245	8507	writer = (ImageWriter)iter.next();
8246	8508	}
8247		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
8248	8511	try
8249	8512	{
8250	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8524,20 @@
8261	8524	}
8262	8525	}
8263	8526	}
8264		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
8265	8530	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
8267	8532	{
8268		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
8269	8534	thetex.texture.disable();
8270	8535	thetex.texture.dispose();
8271		- textures.remove(texname);
	8536	+ textures.remove(tex);
8272	8537	}
8273	8538
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
8276	8541
8277	8542	// newtex = true;
8278	8543	}
..	..	@@ -8288,10 +8553,41 @@
8288	8553	}
8289	8554	}
8290	8555
8291		- return texture;
	8556	+ return texturecache;
8292	8557	}
8293	8558
8294		- 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
8295	8591	{
8296	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8593
..	..	@@ -8309,21 +8605,21 @@
8309	8605	return texture!=null?texture.texture:null;
8310	8606	}
8311	8607
8312		- 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
8313	8609	{
8314	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8611
8316	8612	return texture!=null?texture.texturedata:null;
8317	8613	}
8318	8614
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8616	{
8321	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8618	{
8323	8619	return false;
8324	8620	}
8325	8621
8326		- boolean newtex = false;
	8622	+ //boolean newtex = false;
8327	8623
8328	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8625
..	..	@@ -8355,7 +8651,7 @@
8355	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8653
8358		- return newtex;
	8654	+ return true; // Warning: not used.
8359	8655	}
8360	8656
8361	8657	ShadowBuffer shadowPBuf;
..	..	@@ -9193,11 +9489,35 @@
9193	9489	jy8[3] = 0.5f;
9194	9490	}
9195	9491
9196		- 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
9197	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9494	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9495	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	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	+
9201	9521	static int imagecount = 0; // movie generation
9202	9522
9203	9523	static int jitter = 0;
..	..	@@ -9293,8 +9613,8 @@
9293	9613	assert (parentcam != renderCamera);
9294	9614
9295	9615	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9616	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9617	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9298	9618
9299	9619	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9620
..	..	@@ -9309,8 +9629,8 @@
9309	9629	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9630
9311	9631	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9632	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9633	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9314	9634
9315	9635	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9636
..	..	@@ -9382,7 +9702,7 @@
9382	9702	//gl.glFlush();
9383	9703	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9704
9385		- if (ANIMATION && ABORTED)
	9705	+ if (Globals.ANIMATION && ABORTED)
9386	9706	{
9387	9707	System.err.println(" ABORTED FRAME");
9388	9708	break;
..	..	@@ -9412,7 +9732,7 @@
9412	9732	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9733
9414	9734	// save image
9415		- if (ANIMATION && !ABORTED)
	9735	+ if (Globals.ANIMATION && !ABORTED)
9416	9736	{
9417	9737	VPwidth = viewport[2];
9418	9738	VPheight = viewport[3];
..	..	@@ -9523,11 +9843,11 @@
9523	9843
9524	9844	// imagecount++;
9525	9845
9526		- 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;
9527	9847
9528	9848	if (!BOXMODE)
9529	9849	{
9530		- 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) + ")");
9531	9851	}
9532	9852
9533	9853	if (!BOXMODE)
..	..	@@ -9565,7 +9885,7 @@
9565	9885	ABORTED = false;
9566	9886	}
9567	9887	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9888	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	9889
9570	9890	if (false)
9571	9891	{
..	..	@@ -10228,11 +10548,11 @@
10228	10548
10229	10549	public void display(GLAutoDrawable drawable)
10230	10550	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10551	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10552	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10553	+ Grafreed.wav.save();
	10554	+ Grafreed.savesound = false;
	10555	+ Grafreed.hassound = false;
10236	10556	}
10237	10557	// if (DEBUG_SELECTION)
10238	10558	// {
..	..	@@ -10308,6 +10628,7 @@
10308	10628	ANTIALIAS = 0;
10309	10629	//System.out.println("RESTART");
10310	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
10311	10632	}
10312	10633	}
10313	10634	}
..	..	@@ -10362,7 +10683,7 @@
10362	10683	Object3D theobject = object;
10363	10684	Object3D theparent = object.parent;
10364	10685	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10686	+ object = (Object3D)Grafreed.clone(object);
10366	10687	object.Stripify();
10367	10688	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10689	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10696,14 @@
10375	10696	ambientOcclusion = false;
10376	10697	}
10377	10698
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10701	{
10380	10702	//if (RENDERSHADOW) // ?
10381	10703	if (!IsFrozen())
10382	10704	{
10383	10705	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10706	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10707	{
10386	10708	Globals.framecount++;
10387	10709	shadowbuffer.display();
..	..	@@ -10508,8 +10830,8 @@
10508	10830
10509	10831	// if (parentcam != renderCamera) // not a light
10510	10832	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10833	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10834	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10513	10835
10514	10836	for (int j = 0; j < 4; j++)
10515	10837	{
..	..	@@ -10523,8 +10845,8 @@
10523	10845
10524	10846	// if (parentcam != renderCamera) // not a light
10525	10847	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10848	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10849	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10528	10850
10529	10851	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10852
..	..	@@ -10783,7 +11105,16 @@
10783	11105	// Bump noise
10784	11106	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11107	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- 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	+
10787	11118
10788	11119	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11120	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11137,9 @@
10806	11137
10807	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11139
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//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);
10812	11143	} else
10813	11144	{
10814	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11150,7 @@
10819	11150	//System.out.println("BLENDING ON");
10820	11151	gl.glEnable(GL.GL_BLEND);
10821	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11154	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11155	gl.glLoadIdentity();
10825	11156
..	..	@@ -10908,8 +11239,8 @@
10908	11239	System.err.println("parentcam != renderCamera");
10909	11240
10910	11241	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- 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
10913	11244	}
10914	11245
10915	11246	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11261,8 @@
10930	11261	if (true) // TODO
10931	11262	{
10932	11263	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- 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
10935	11266	}
10936	11267
10937	11268	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11247,8 +11578,14 @@
11247	11578	{
11248	11579	renderpass++;
11249	11580	// System.out.println("Draw object... ");
	11581	+ STEP = 1;
11250	11582	if (FAST) // in case there is no script
11251		- STEP = 16;
	11583	+ STEP = 8;
	11584	+
	11585	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11586	+ {
	11587	+ STEP *= 4;
	11588	+ }
11252	11589
11253	11590	//object.FullInvariants();
11254	11591
..	..	@@ -11262,23 +11599,44 @@
11262	11599	e.printStackTrace();
11263	11600	}
11264	11601
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11602	+ if (Grafreed.RENDERME > 0)
	11603	+ Grafreed.RENDERME--; // mechante magouille
11267	11604
11268	11605	Globals.ONESTEP = false;
11269	11606	}
11270	11607
11271	11608	static boolean zoomonce = false;
11272	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	+
11273	11628	void DrawObject(GL gl, boolean draw)
11274	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
11275	11633	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11634	// DrawMode() = SELECTION;
11277	11635	//GL gl = getGL();
11278	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11637	{
11280	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11640	pingthread.StepToTarget(true); // true);
11283	11641	// zoomonce = false;
11284	11642	}
..	..	@@ -11333,7 +11691,14 @@
11333	11691
11334	11692	usedtextures.clear();
11335	11693
11336		- 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	+ }
11337	11702	}
11338	11703	//System.out.println("--> " + stackdepth);
11339	11704	// GrafreeD.traceon();
..	..	@@ -11343,8 +11708,9 @@
11343	11708
11344	11709	if (DrawMode() == DEFAULT)
11345	11710	{
11346		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
11347	11712	{
	11713	+ CreateSelectedPoint();
11348	11714	float radius = 0.05f;
11349	11715	if (selectedpoint.radius != radius)
11350	11716	{
..	..	@@ -11398,20 +11764,32 @@
11398	11764	ReleaseTextures(DEFAULT_TEXTURES);
11399	11765
11400	11766	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	11768	{
11403		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11404	11770
11405	11771	// System.out.println("Texture --------- " + tex);
11406	11772
11407		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11408	11774	continue;
11409	11775
11410		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11411	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11412	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- 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	+ }
11415	11793	}
11416	11794	}
11417	11795	}
..	..	@@ -11424,7 +11802,14 @@
11424	11802	if (checker != null && DrawMode() == DEFAULT)
11425	11803	{
11426	11804	//BindTexture(IMMORTAL_TEXTURE);
11427		- 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	+ }
11428	11813	// NEAREST
11429	11814	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11815	DrawChecker(gl);
..	..	@@ -11506,7 +11891,7 @@
11506	11891	return;
11507	11892	}
11508	11893
11509		- String string = obj.GetToolTip();
	11894	+ String string = obj.toString(); //.GetToolTip();
11510	11895
11511	11896	GL gl = GetGL();
11512	11897
..	..	@@ -11823,8 +12208,8 @@
11823	12208	//obj.TransformToWorld(light, light);
11824	12209	for (int i = tp.size(); --i >= 0;)
11825	12210	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- 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);
11828	12213	}
11829	12214
11830	12215
..	..	@@ -11841,8 +12226,8 @@
11841	12226	parentcam = cameras[0];
11842	12227	}
11843	12228
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- 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
11846	12231
11847	12232	LA.xformPos(light, renderCamera.toScreen, light);
11848	12233
..	..	@@ -12456,8 +12841,8 @@
12456	12841
12457	12842	// display shadow only (bump == 0)
12458	12843	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	12844	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12845	+ "SLT temp.z, temp.y, -one2048th.x;" +
12461	12846	"SUB temp.y, one.x, temp.z;" +
12462	12847	"MUL temp.x, temp.x, temp.y;" +
12463	12848	"KIL temp.x;" +
..	..	@@ -12586,8 +12971,10 @@
12586	12971	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	12972
12588	12973	"SUB temp.x, one.x, ndotl.x;" +
12589		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590		- "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
12591	12978	"MUL temp.x, temp.x, temp.y;" +
12592	12979
12593	12980	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,7 +13173,7 @@
12786	13173	//once = true;
12787	13174	}
12788	13175
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
	13176	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12790	13177	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12791	13178	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13179
..	..	@@ -12919,12 +13306,16 @@
12919	13306
12920	13307	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13308	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13309	+
	13310	+ // Compare fragment depth in light space with shadowmap.
12922	13311	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13312	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13313	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13314	+
	13315	+ // Reverse comparison
12925	13316	"SUB temp.x, one.x, temp.x;" +
12926	13317	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13318	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13319	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13320
12930	13321	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13329,10 @@
12938	13329	// No shadow for backface
12939	13330	"DP3 temp.x, normal, lightd;" +
12940	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;" +
12941	13336	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13337	"";
12943	13338	}
..	..	@@ -13084,7 +13479,8 @@
13084	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
13088	13484
13089	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13486	// OUT : diff, spec
..	..	@@ -13100,9 +13496,10 @@
13100	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13498	//"MOV " + dest + ".w," + "normal.z;" +
13103		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13104		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13105		- //"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
13106	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13504	"RCP " + dest + ".w," + dest + ".w;" +
13108	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +13893,7 @@
13496	13893	public void mousePressed(MouseEvent e)
13497	13894	{
13498	13895	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13896	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	13897	}
13501	13898
13502	13899	static long prevtime = 0;
..	..	@@ -13523,6 +13920,7 @@
13523	13920
13524	13921	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	13922
	13923	+ if (BUTTONLESSWHEEL)
13526	13924	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	13925	{
13528	13926	return;
..	..	@@ -13531,7 +13929,7 @@
13531	13929	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	13930
13533	13931	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13932	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	13933	{
13536	13934	keepboxmode = BOXMODE;
13537	13935	keepsupport = SUPPORT;
..	..	@@ -13571,8 +13969,8 @@
13571	13969	// mode \|= META;
13572	13970	//}
13573	13971
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13972	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13973	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	13974	anchorX = ax;
13577	13975	anchorY = ay;
13578	13976	prevX = px;
..	..	@@ -13606,6 +14004,7 @@
13606	14004	else
13607	14005	if (evt.getSource() == AAtimer)
13608	14006	{
	14007	+ Globals.TIMERRUNNING = false;
13609	14008	if (mouseDown)
13610	14009	{
13611	14010	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14030,10 @@
13631	14030	// LIVE = waslive;
13632	14031	// wasliveok = true;
13633	14032	// waslive = false;
	14033	+
	14034	+ // May 2019 Forget it:
	14035	+ if (true)
	14036	+ return;
13634	14037
13635	14038	// source == timer
13636	14039	if (mouseDown)
..	..	@@ -13661,7 +14064,7 @@
13661	14064
13662	14065	// fev 2014???
13663	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	14068	pingthread.StepToTarget(true); // true);
13666	14069	}
13667	14070	// if (!LIVE)
..	..	@@ -13670,12 +14073,13 @@
13670	14073
13671	14074	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14075
13673		- void clickStart(int x, int y, int modifiers)
	14076	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14077	{
13675	14078	if (!wasliveok)
13676	14079	return;
13677	14080
13678	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
13679	14083
13680	14084	// waslive = LIVE;
13681	14085	// LIVE = false;
..	..	@@ -13687,7 +14091,7 @@
13687	14091	// touched = true; // main DL
13688	14092	if (isRenderer)
13689	14093	{
13690		- SetMouseMode(modifiers);
	14094	+ SetMouseMode(modifiers, modifiersex);
13691	14095	}
13692	14096
13693	14097	selectX = anchorX = x;
..	..	@@ -13700,7 +14104,7 @@
13700	14104	clicked = true;
13701	14105	hold = false;
13702	14106
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14107	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14108	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14109	{
13706	14110	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13731,7 +14135,7 @@
13731	14135	info.camera = renderCamera;
13732	14136	info.x = x;
13733	14137	info.y = y;
13734		- info.modifiers = modifiers;
	14138	+ info.modifiers = modifiersex;
13735	14139	editObj = object.doEditClick(info, 0);
13736	14140	if (!editObj)
13737	14141	{
..	..	@@ -13748,11 +14152,14 @@
13748	14152
13749	14153	public void mouseDragged(MouseEvent e)
13750	14154	{
	14155	+ Globals.MOUSEDRAGGED = true;
	14156	+
	14157	+ //System.out.println("mouseDragged: " + e);
13751	14158	if (isRenderer)
13752	14159	movingcamera = true;
	14160	+
13753	14161	//if (drawing)
13754	14162	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14163	if ((e.getModifiersEx() & CTRL) != 0
13757	14164	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14165	{
..	..	@@ -13760,7 +14167,7 @@
13760	14167	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14168	}
13762	14169	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14170	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14171
13765	14172	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14173	}
..	..	@@ -13933,6 +14340,7 @@
13933	14340
13934	14341	public void run()
13935	14342	{
	14343	+ new Exception().printStackTrace();
13936	14344	System.exit(0);
13937	14345	for (;;)
13938	14346	{
..	..	@@ -13996,7 +14404,7 @@
13996	14404	{
13997	14405	Globals.lighttouched = true;
13998	14406	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14407	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14408	}
14001	14409	//else
14002	14410	}
..	..	@@ -14010,12 +14418,12 @@
14010	14418	void GoDown(int mod)
14011	14419	{
14012	14420	MODIFIERS \|= COMMAND;
14013		- /*
	14421	+ /**/
14014	14422	if((mod&SHIFT) == SHIFT)
14015	14423	manipCamera.RotatePosition(0, -speed);
14016	14424	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
14019	14427	if ((mod & SHIFT) == SHIFT)
14020	14428	{
14021	14429	mouseMode = mouseMode; // VR??
..	..	@@ -14031,12 +14439,12 @@
14031	14439	void GoUp(int mod)
14032	14440	{
14033	14441	MODIFIERS \|= COMMAND;
14034		- /*
	14442	+ /**/
14035	14443	if((mod&SHIFT) == SHIFT)
14036	14444	manipCamera.RotatePosition(0, speed);
14037	14445	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
14040	14448	if ((mod & SHIFT) == SHIFT)
14041	14449	{
14042	14450	mouseMode = mouseMode;
..	..	@@ -14052,12 +14460,12 @@
14052	14460	void GoLeft(int mod)
14053	14461	{
14054	14462	MODIFIERS \|= COMMAND;
14055		- /*
	14463	+ /**/
14056	14464	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
14058		- else
14059	14465	manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
14061	14469	if ((mod & SHIFT) == SHIFT)
14062	14470	{
14063	14471	mouseMode = mouseMode;
..	..	@@ -14073,12 +14481,12 @@
14073	14481	void GoRight(int mod)
14074	14482	{
14075	14483	MODIFIERS \|= COMMAND;
14076		- /*
	14484	+ /**/
14077	14485	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
14079		- else
14080	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
14082	14490	if ((mod & SHIFT) == SHIFT)
14083	14491	{
14084	14492	mouseMode = mouseMode;
..	..	@@ -14096,7 +14504,7 @@
14096	14504	int X, Y;
14097	14505	boolean SX, SY;
14098	14506
14099		- void drag(int x, int y, int modifiers)
	14507	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14508	{
14101	14509	if (IsFrozen())
14102	14510	{
..	..	@@ -14105,17 +14513,17 @@
14105	14513
14106	14514	drag = true; // NEW
14107	14515
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14516	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14517
14110	14518	X = x;
14111	14519	Y = y;
14112	14520	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14521	+ MODIFIERS = modifiersex;
	14522	+ modifiersex &= ~1024;
14115	14523	if (false) // modifiers != 0)
14116	14524	{
14117	14525	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14526	+ System.out.println("mouseDragged: " + modifiersex);
14119	14527	System.out.println("SHIFT = " + SHIFT);
14120	14528	System.out.println("CONTROL = " + COMMAND);
14121	14529	System.out.println("META = " + META);
..	..	@@ -14135,7 +14543,8 @@
14135	14543	info.camera = renderCamera;
14136	14544	info.x = x;
14137	14545	info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14548	} else
14140	14549	{
14141	14550	if (x < startX)
..	..	@@ -14287,7 +14696,6 @@
14287	14696	public void mouseMoved(MouseEvent e)
14288	14697	{
14289	14698	//System.out.println("mouseMoved: " + e);
14290		-
14291	14699	if (isRenderer)
14292	14700	return;
14293	14701
..	..	@@ -14300,7 +14708,9 @@
14300	14708	ci.camera = renderCamera;
14301	14709	if (!isRenderer)
14302	14710	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
14304	14714	{
14305	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	14716	} else
..	..	@@ -14312,7 +14722,11 @@
14312	14722
14313	14723	public void mouseReleased(MouseEvent e)
14314	14724	{
	14725	+ Globals.MOUSEDRAGGED = false;
	14726	+
14315	14727	movingcamera = false;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
14316	14730	//System.out.println("mouseReleased: " + e);
14317	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	14732	}
..	..	@@ -14335,9 +14749,9 @@
14335	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	14751
14338		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
14339	14753	timeout = true;
14340		- else
	14754	+// ?? May 2019 else
14341	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	14756	mouseDown = false;
14343	14757	if (!control && !command) // june 2013
..	..	@@ -14447,7 +14861,7 @@
14447	14861	System.out.println("keyReleased: " + e);
14448	14862	}
14449	14863
14450		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
14451	14865	{
14452	14866	//System.out.println("SetMouseMode = " + modifiers);
14453	14867	//modifiers &= ~1024;
..	..	@@ -14459,25 +14873,25 @@
14459	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	14874	// return;
14461	14875	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
14463	14877	{
14464	14878	mouseMode \|= ZOOM;
14465	14879	}
14466	14880
14467	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	14883	{
14470	14884	mouseMode \|= VR; // BACKFORTH;
14471	14885	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	14887	{
14474	14888	mouseMode \|= SELECT;
14475	14889	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
14477	14891	{
14478	14892	mouseMode \|= SELECT;
14479	14893	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	14895	{
14482	14896	mouseMode &= ~VR;
14483	14897	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +14920,7 @@
14506	14920
14507	14921	if (isRenderer) //
14508	14922	{
14509		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
14510	14924	}
14511	14925
14512	14926	Globals.theRenderer.keyPressed(key);
..	..	@@ -14568,7 +14982,8 @@
14568	14982	// break;
14569	14983	case 'T':
14570	14984	CACHETEXTURE ^= true;
14571		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14572	14987	// repaint();
14573	14988	break;
14574	14989	case 'Y':
..	..	@@ -14653,7 +15068,9 @@
14653	15068	case 'E' : COMPACT ^= true;
14654	15069	repaint();
14655	15070	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15074	repaint();
14658	15075	break;
14659	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15095,8 @@
14678	15095	RevertCamera();
14679	15096	repaint();
14680	15097	break;
14681		- case 'L':
14682	15098	case 'l':
	15099	+ //case 'L':
14683	15100	if (lightMode)
14684	15101	{
14685	15102	lightMode = false;
..	..	@@ -14822,9 +15239,9 @@
14822	15239	case '_':
14823	15240	kompactbit = 5;
14824	15241	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
14828	15245	case ' ':
14829	15246	lightMode ^= true;
14830	15247	Globals.lighttouched = true;
..	..	@@ -14836,13 +15253,14 @@
14836	15253	case ESC:
14837	15254	RENDERPROGRAM += 1;
14838	15255	RENDERPROGRAM %= 3;
	15256	+
14839	15257	repaint();
14840	15258	break;
14841	15259	case 'Z':
14842	15260	//RESIZETEXTURE ^= true;
14843	15261	//break;
14844	15262	case 'z':
14845		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14846	15264	Globals.lighttouched = true;
14847	15265	repaint();
14848	15266	break;
..	..	@@ -14875,8 +15293,9 @@
14875	15293	case DELETE:
14876	15294	ClearSelection();
14877	15295	break;
14878		- /*
14879	15296	case '+':
	15297	+
	15298	+ /*
14880	15299	//fontsize += 1;
14881	15300	bbzoom *= 2;
14882	15301	repaint();
..	..	@@ -14893,17 +15312,17 @@
14893	15312	case '=':
14894	15313	IncDepth();
14895	15314	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
14897	15316	maskbit = 6;
14898	15317	break;
14899	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15319	DecDepth();
14901	15320	maskbit = 5;
14902	15321	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
14907	15326	break;
14908	15327	case '{':
14909	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15385,7 @@
14966	15385	//mode = ROTATE;
14967	15386	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15387	{
14969		- SetMouseMode(modifiers);
	15388	+ SetMouseMode(0, modifiers);
14970	15389	}
14971	15390	}
14972	15391
..	..	@@ -15100,8 +15519,9 @@
15100	15519
15101	15520	protected void processMouseMotionEvent(MouseEvent e)
15102	15521	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15522	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15523	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15524	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15525	{
15106	15526	mouseMoved(e);
15107	15527	} else
..	..	@@ -15126,11 +15546,12 @@
15126	15546	}
15127	15547	*/
15128	15548
15129		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
15130	15550	}
15131	15551
15132	15552	void SelectParent()
15133	15553	{
	15554	+ new Exception().printStackTrace();
15134	15555	System.exit(0);
15135	15556	Composite group = (Composite) object;
15136	15557	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15563,10 @@
15142	15563	{
15143	15564	//selectees.remove(i);
15144	15565	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15567	} else
15147	15568	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15570	}
15150	15571
15151	15572	first = false;
..	..	@@ -15154,6 +15575,7 @@
15154	15575
15155	15576	void SelectChildren()
15156	15577	{
	15578	+ new Exception().printStackTrace();
15157	15579	System.exit(0);
15158	15580	/*
15159	15581	Composite group = (Composite) object;
..	..	@@ -15186,12 +15608,12 @@
15186	15608	for (int j = 0; j < group.children.size(); j++)
15187	15609	{
15188	15610	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15612	first = false;
15191	15613	}
15192	15614	} else
15193	15615	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15617	}
15196	15618
15197	15619	first = false;
..	..	@@ -15202,21 +15624,21 @@
15202	15624	{
15203	15625	//Composite group = (Composite) object;
15204	15626	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15628	}
15207	15629
15208	15630	void ResetTransform(int mask)
15209	15631	{
15210	15632	//Composite group = (Composite) object;
15211	15633	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
15213	15635	}
15214	15636
15215	15637	void FlipTransform()
15216	15638	{
15217	15639	//Composite group = (Composite) object;
15218	15640	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
15220	15642	// group.editWindow.ReduceMesh(true);
15221	15643	}
15222	15644
..	..	@@ -15224,7 +15646,7 @@
15224	15646	{
15225	15647	//Composite group = (Composite) object;
15226	15648	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
15228	15650	// group.editWindow.ReduceMesh(true);
15229	15651	}
15230	15652
..	..	@@ -15232,7 +15654,7 @@
15232	15654	{
15233	15655	//Composite group = (Composite) object;
15234	15656	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
15236	15658	}
15237	15659
15238	15660	void IncDepth()
..	..	@@ -15318,7 +15740,9 @@
15318	15740	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	15741	//Image img = CreateImage(width, height);
15320	15742	//System.out.println("width = " + width + "; height = " + height + "\n");
	15743	+
15321	15744	Graphics gr = g; // img.getGraphics();
	15745	+
15322	15746	if (!hasMarquee)
15323	15747	{
15324	15748	if (Xmin < Xmax) // !locked)
..	..	@@ -15406,6 +15830,7 @@
15406	15830	info.bounds.y += (height - desired) / 2;
15407	15831	}
15408	15832	}
	15833	+
15409	15834	info.g = gr;
15410	15835	info.camera = renderCamera;
15411	15836	/*
..	..	@@ -15415,15 +15840,55 @@
15415	15840	*/
15416	15841	if (!isRenderer)
15417	15842	{
15418		- 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	+ }
15419	15882	}
15420	15883	}
	15884	+
15421	15885	if (isRenderer)
15422	15886	{
15423	15887	//gr.setColor(Color.black);
15424	15888	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	15889	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	15890	}
	15891	+
15427	15892	if (hasMarquee)
15428	15893	{
15429	15894	gr.setXORMode(Color.white);
..	..	@@ -15536,6 +16001,7 @@
15536	16001	public boolean mouseDown(Event evt, int x, int y)
15537	16002	{
15538	16003	System.out.println("mouseDown: " + evt);
	16004	+ System.exit(0);
15539	16005	/*
15540	16006	locked = true;
15541	16007	drag = false;
..	..	@@ -15579,7 +16045,7 @@
15579	16045	{
15580	16046	keyPressed(0, modifiers);
15581	16047	}
15582		- clickStart(x, y, modifiers);
	16048	+ // clickStart(x, y, modifiers);
15583	16049	return true;
15584	16050	}
15585	16051
..	..	@@ -15697,7 +16163,7 @@
15697	16163	{
15698	16164	keyReleased(0, 0);
15699	16165	}
15700		- drag(x, y, modifiers);
	16166	+ drag(x, y, 0, modifiers);
15701	16167	return true;
15702	16168	}
15703	16169
..	..	@@ -15829,7 +16295,7 @@
15829	16295	Object3D object;
15830	16296	static Object3D trackedobject;
15831	16297	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16298	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16299	/static/ Camera eyeCamera;
15834	16300	/static/ Camera lightCamera;
15835	16301	int cameracount;
..	..	@@ -16114,16 +16580,16 @@
16114	16580	cStatic.objectstack[materialdepth++] = checker;
16115	16581	//System.out.println("material " + material);
16116	16582	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
16118	16584
16119	16585	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16587
16122	16588	materialdepth -= 1;
16123	16589	if (materialdepth > 0)
16124	16590	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- 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);
16127	16593	}
16128	16594	//checker.GetMaterial().opacity = 1f;
16129	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +16675,14 @@
16209	16675	}
16210	16676	}
16211	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	+
16212	16686	class SelectBuffer implements GLEventListener
16213	16687	{
16214	16688
..	..	@@ -16267,6 +16741,7 @@
16267	16741	{
16268	16742	if (!selection)
16269	16743	{
	16744	+ new Exception().printStackTrace();
16270	16745	System.exit(0);
16271	16746	return;
16272	16747	}
..	..	@@ -16287,6 +16762,17 @@
16287	16762
16288	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	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	+
16290	16776	//int tmp = selection_view;
16291	16777	//selection_view = -1;
16292	16778	int temp = DrawMode();
..	..	@@ -16298,6 +16784,17 @@
16298	16784	// temp = DEFAULT; // patch for selection debug
16299	16785	Globals.drawMode = temp; // WARNING
16300	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	+
16301	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	16799
16303	16800	// trying different ways of getting the depth info over
..	..	@@ -16345,6 +16842,8 @@
16345	16842	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16845	+
	16846	+ CreateSelectedPoint();
16348	16847
16349	16848	// Will fit the mesh !!!
16350	16849	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +16893,36 @@
16394	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]));
16395	16894	}
16396	16895
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16896	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	16897	}
16399	16898	}
16400	16899
16401	16900	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	16902
16404		- 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)
16405	16904	{
16406		- 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);
16407	16906
16408		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	16910
16410		- group.CreateMaterial(); // use a void leaf to select instances
16411		-
16412		- group.add(paintobj); // link
16413		-
16414		- object.editWindow.SnapObject(group);
16415		-
16416		- Object3D folder = object.editWindow.copy;
16417		-
16418		- if (object.editWindow.copy.selection.Size() > 0)
16419		- folder = object.editWindow.copy.selection.elementAt(0);
16420		-
16421		- folder.add(group);
16422		-
16423		- object.editWindow.ResetModel();
16424		- 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	+ }
16425	16926	}
16426	16927	else
16427	16928	paintcount = 0;
..	..	@@ -16460,6 +16961,11 @@
16460	16961	//System.out.println("objects[color] = " + objects[color]);
16461	16962	//objects[color].Select();
16462	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
16463	16969	object.Select(color, deselect);
16464	16970	}
16465	16971
..	..	@@ -16559,7 +17065,7 @@
16559	17065	gl.glDisable(gl.GL_CULL_FACE);
16560	17066	}
16561	17067
16562		- if (!RENDERSHADOW)
	17068	+ if (!Globals.RENDERSHADOW)
16563	17069	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17070
16565	17071	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17075,7 @@
16569	17075	//gl.glColorMask(false, false, false, false);
16570	17076
16571	17077	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17078	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17079	{
16574	17080	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17081
..	..	@@ -16985,23 +17491,15 @@
16985	17491	int AAbuffersize = 0;
16986	17492
16987	17493	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17494	+ static Superellipsoid selectedpoint;
16989	17495	static Sphere previousselectedpoint = null;
16990		- static Sphere debugpointG = new Sphere();
16991		- static Sphere debugpointP = new Sphere();
16992		- static Sphere debugpointC = new Sphere();
16993		- static Sphere debugpointR = new Sphere();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
16994	17500
16995	17501	static Sphere debugpoints[] = new Sphere[8];
16996	17502
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17503	static void InitPoints(float radius)
17006	17504	{
17007	17505	for (int i=0; i<8; i++)