~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +126,8 @@
92	126
93	127	static int tickcount = 0; // slow pose issue
94	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
95	131	static boolean BOXMODE = false;
96	132	static boolean IMAGEFLIP = false;
97	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -150,6 +186,8 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
153	191	void SetAsGLRenderer(boolean b)
154	192	{
155	193	isRenderer = b;
..	..	@@ -168,7 +206,8 @@
168	206
169	207	SetCamera(cam);
170	208
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	211
173	212	object = o;
174	213
..	..	@@ -223,6 +262,11 @@
223	262	public boolean IsBoxMode()
224	263	{
225	264	return BOXMODE;
	265	+ }
	266	+
	267	+ public boolean IsZoomBoxMode()
	268	+ {
	269	+ return ZOOMBOXMODE;
226	270	}
227	271
228	272	public void ClearDepth()
..	..	@@ -320,7 +364,7 @@
320	364	cStatic.objectstack[materialdepth++] = obj;
321	365	//System.out.println("material " + material);
322	366	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	367	+ //display.vector2buffer = obj.projectedVertices;
324	368	if (obj instanceof Camera)
325	369	{
326	370	display.options1[0] = material.shift;
..	..	@@ -329,14 +373,28 @@
329	373	display.options1[2] = material.shadowbias;
330	374	display.options1[3] = material.aniso;
331	375	display.options1[4] = material.anisoV;
	376	+// System.out.println("display.options1[0] " + display.options1[0]);
	377	+// System.out.println("display.options1[1] " + display.options1[1]);
	378	+// System.out.println("display.options1[2] " + display.options1[2]);
	379	+// System.out.println("display.options1[3] " + display.options1[3]);
	380	+// System.out.println("display.options1[4] " + display.options1[4]);
332	381	display.options2[0] = material.opacity;
333	382	display.options2[1] = material.diffuse;
334	383	display.options2[2] = material.factor;
	384	+// System.out.println("display.options2[0] " + display.options2[0]);
	385	+// System.out.println("display.options2[1] " + display.options2[1]);
	386	+// System.out.println("display.options2[2] " + display.options2[2]);
335	387
336	388	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	389	+// System.out.println("display.options3[0] " + display.options3[0]);
	390	+// System.out.println("display.options3[1] " + display.options3[1]);
	391	+// System.out.println("display.options3[2] " + display.options3[2]);
337	392	display.options4[0] = material.cameralight/0.2f;
338	393	display.options4[1] = material.subsurface;
339	394	display.options4[2] = material.sheen;
	395	+// System.out.println("display.options4[0] " + display.options4[0]);
	396	+// System.out.println("display.options4[1] " + display.options4[1]);
	397	+// System.out.println("display.options4[2] " + display.options4[2]);
340	398
341	399	// if (display.CURRENTANTIALIAS > 0)
342	400	// display.options3[3] /= 4;
..	..	@@ -352,7 +410,7 @@
352	410	/**/
353	411	} else
354	412	{
355		- DrawMaterial(material, selected);
	413	+ DrawMaterial(material, selected, obj.projectedVertices);
356	414	}
357	415	} else
358	416	{
..	..	@@ -376,8 +434,8 @@
376	434	cStatic.objectstack[materialdepth++] = obj;
377	435	//System.out.println("material " + material);
378	436	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	437	+ //display.vector2buffer = obj.projectedVertices;
	438	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	439	}
382	440	}
383	441
..	..	@@ -394,8 +452,8 @@
394	452	materialdepth -= 1;
395	453	if (materialdepth > 0)
396	454	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	455	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	456	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
399	457	}
400	458	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	459	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +473,8 @@
415	473	materialdepth -= 1;
416	474	if (materialdepth > 0)
417	475	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	476	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	477	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
420	478	}
421	479	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	480	//else
..	..	@@ -457,10 +515,12 @@
457	515	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	516	{
459	517	//gl.glBegin(gl.GL_TRIANGLES);
460		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	518	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	519	+ // TEST LIVE NORMALS && !obj.dontselect
	520	+ ;
461	521	if (!hasnorm)
462	522	{
463		- // System.out.println("FUCK!!");
	523	+ // System.out.println("Mesh normal");
464	524	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	525	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	526	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1245,12 @@
1185	1245	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1246	}
1187	1247	}
	1248	+
1188	1249	if (flipV)
1189	1250	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1251	else
1191	1252	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1253	+
1192	1254	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1255	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1256
..	..	@@ -1208,10 +1270,12 @@
1208	1270	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1271	}
1210	1272	}
	1273	+
1211	1274	if (flipV)
1212	1275	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1276	else
1214	1277	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1278	+
1215	1279	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1280	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1281
..	..	@@ -1239,8 +1303,10 @@
1239	1303	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1304	else
1241	1305	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1306	+
1242	1307	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1308	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1309	+
1244	1310	count2 += 2;
1245	1311	count3 += 3;
1246	1312	}
..	..	@@ -1596,7 +1662,7 @@
1596	1662	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1663	}
1598	1664
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1665	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1666	{
1601	1667	CameraPane display = this;
1602	1668	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1678,18 @@
1612	1678	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1679	if (!material.multiply)
1614	1680	{
1615		- display.color = color;
	1681	+ display.color = material.color;
1616	1682	display.saturation = material.modulation;
1617	1683	}
1618	1684	else
1619	1685	{
1620		- display.color = color2;
	1686	+ display.color = material.color2;
1621	1687	display.saturation = material.modulation2;
1622	1688	}
1623	1689
1624	1690	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1691
1626		- float[] colorV = GrafreeD.colorV;
	1692	+ float[] colorV = Grafreed.colorV;
1627	1693
1628	1694	/**/
1629	1695	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1697,7 @@
1631	1697	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1698	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1699	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1700	+ colorV[3] = 1; // material.opacity;
1635	1701
1636	1702	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1703	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1805,9 @@
1739	1805	display.modelParams7[2] = 0;
1740	1806	display.modelParams7[3] = 0;
1741	1807
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1808	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1809
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1810	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1811	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1812	{
1747	1813	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1949,7 @@
1883	1949	void PushMatrix(double[][] matrix)
1884	1950	{
1885	1951	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1952	+ PushMatrix(matrix, 1);
1887	1953	}
1888	1954
1889	1955	void PushMatrix()
..	..	@@ -2037,7 +2103,7 @@
2037	2103	//System.err.println("Oeil on");
2038	2104	OEIL = true;
2039	2105	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2107	//pingthread.StepToTarget(true);
2042	2108	}
2043	2109
..	..	@@ -2135,7 +2201,7 @@
2135	2201	System.err.println("LIVE = " + Globals.isLIVE());
2136	2202
2137	2203	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2204	+ Grafreed.savesound = true; // wav.save();
2139	2205	// else
2140	2206	repaint(); // start loop // may 2013
2141	2207	}
..	..	@@ -2168,6 +2234,11 @@
2168	2234	public void ToggleBoxMode()
2169	2235	{
2170	2236	BOXMODE ^= true;
	2237	+ }
	2238	+
	2239	+ public void ToggleZoomBoxMode()
	2240	+ {
	2241	+ ZOOMBOXMODE ^= true;
2171	2242	}
2172	2243
2173	2244	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2318,7 @@
2247	2318
2248	2319	void ToggleDebug()
2249	2320	{
2250		- DEBUG ^= true;
	2321	+ Globals.DEBUG ^= true;
2251	2322	}
2252	2323
2253	2324	void ToggleLookAt()
..	..	@@ -2255,9 +2326,9 @@
2255	2326	LOOKAT ^= true;
2256	2327	}
2257	2328
2258		- void ToggleRandom()
	2329	+ void ToggleSwitch()
2259	2330	{
2260		- RANDOM ^= true;
	2331	+ SWITCH ^= true;
2261	2332	}
2262	2333
2263	2334	void ToggleHandles()
..	..	@@ -2265,10 +2336,17 @@
2265	2336	HANDLES ^= true;
2266	2337	}
2267	2338
	2339	+ Object3D paintFolder;
	2340	+
2268	2341	void TogglePaint()
2269	2342	{
2270	2343	PAINTMODE ^= true;
2271	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
2272	2350	}
2273	2351
2274	2352	void SwapCamera(int a, int b)
..	..	@@ -2364,7 +2442,22 @@
2364	2442	{
2365	2443	return currentGL;
2366	2444	}
2367		-
	2445	+
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
2368	2461	/**/
2369	2462	class CacheTexture
2370	2463	{
..	..	@@ -2373,28 +2466,31 @@
2373	2466
2374	2467	int resolution;
2375	2468
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2470	{
2378		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2379	2473	resolution = res;
2380	2474	}
2381	2475	}
2382	2476	/**/
2383	2477
2384	2478	// 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>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2388	2484	int pigmentdepth = 0;
2389	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2486	int bumpdepth = 0;
2391	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2492
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2494	{
2399	2495	TextureData texturedata = null;
2400	2496
..	..	@@ -2413,13 +2509,34 @@
2413	2509	if (bump)
2414	2510	texturedata = ConvertBump(texturedata, false);
2415	2511
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2418	2514
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);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2421	2517
2422		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2423	2540	}
2424	2541
2425	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3492,6 +3609,8 @@
3492	3609
3493	3610	System.out.println("LOADING TEXTURE : " + name);
3494	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3495	3614	//
3496	3615	if (false) // compressbit > 0)
3497	3616	{
..	..	@@ -4196,6 +4315,7 @@
4196	4315
4197	4316	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4317	{
	4318	+ new Exception().printStackTrace();
4199	4319	System.exit(0);
4200	4320	com.sun.opengl.util.texture.Texture texture = null;
4201	4321
..	..	@@ -7889,7 +8009,7 @@
7889	8009	String pigment = Object3D.GetPigment(tex);
7890	8010	String bump = Object3D.GetBump(tex);
7891	8011
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8013	{
7894	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8015	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8024,69 @@
7904	8024	pigment = null;
7905	8025	}
7906	8026
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
7909	8029	}
7910	8030
7911		- void ReleaseTexture(String tex, boolean bump)
	8031	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8032	+ {
	8033	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8034	+ {
	8035	+ return;
	8036	+ }
	8037	+
	8038	+ if (tex == null)
	8039	+ {
	8040	+ ReleaseTexture(null, false);
	8041	+ return;
	8042	+ }
	8043	+
	8044	+ String pigment = Object3D.GetPigment(tex);
	8045	+
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8047	+ {
	8048	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8049	+ // System.out.println("; bump = " + bump);
	8050	+ }
	8051	+
	8052	+ if (pigment.equals(""))
	8053	+ {
	8054	+ pigment = null;
	8055	+ }
	8056	+
	8057	+ ReleaseTexture(tex, false);
	8058	+ }
	8059	+
	8060	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8061	+ {
	8062	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8063	+ {
	8064	+ return;
	8065	+ }
	8066	+
	8067	+ if (tex == null)
	8068	+ {
	8069	+ ReleaseTexture(null, true);
	8070	+ return;
	8071	+ }
	8072	+
	8073	+ String bump = Object3D.GetBump(tex);
	8074	+
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ {
	8077	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8078	+ // System.out.println("; bump = " + bump);
	8079	+ }
	8080	+
	8081	+ if (bump.equals(""))
	8082	+ {
	8083	+ bump = null;
	8084	+ }
	8085	+
	8086	+ ReleaseTexture(tex, true);
	8087	+ }
	8088	+
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
7912	8090	{
7913	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8097,7 @@
7919	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8098
7921	8099	if (tex != null)
7922		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8101
7924	8102	// //assert( texture != null );
7925	8103	// if (texture == null)
..	..	@@ -8011,7 +8189,55 @@
8011	8189	}
8012	8190	}
8013	8191
8014		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8192	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8193	+ {
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
	8235	+
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
	8238	+ }
	8239	+
	8240	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8015	8241	{
8016	8242	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8243	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8248,47 @@
8022	8248	if (tex == null)
8023	8249	{
8024	8250	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8251	return;
8027	8252	}
8028	8253
8029	8254	String pigment = Object3D.GetPigment(tex);
	8255	+
	8256	+ usedtextures.add(tex);
	8257	+
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8259	+ {
	8260	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8261	+ // System.out.println("; bump = " + bump);
	8262	+ }
	8263	+
	8264	+ if (pigment.equals(""))
	8265	+ {
	8266	+ pigment = null;
	8267	+ }
	8268	+
	8269	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8270	+ BindTexture(tex, false, resolution);
	8271	+ }
	8272	+
	8273	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,true,resolution);
	8284	+ return;
	8285	+ }
	8286	+
8030	8287	String bump = Object3D.GetBump(tex);
8031	8288
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8034	8290
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8292	{
8037	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8298,94 @@
8042	8298	{
8043	8299	bump = null;
8044	8300	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8301
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8054	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8305	}
8058	8306
8059		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8307	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8308	+
	8309	+ private boolean FileExists(String tex)
8060	8310	{
8061		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8311	+ if (missingTextures.contains(tex))
	8312	+ {
	8313	+ return false;
	8314	+ }
	8315	+
	8316	+ boolean fileExists = new File(tex).exists();
	8317	+
	8318	+ if (!fileExists)
	8319	+ {
	8320	+ // If file exists, the "new File()" is not executed sgain
	8321	+ missingTextures.add(tex);
	8322	+ }
	8323	+
	8324	+ return fileExists;
	8325	+ }
	8326	+
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8328	+ {
	8329	+ CacheTexture texturecache = null;
8062	8330
8063	8331	if (tex != null)
8064	8332	{
8065		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8335
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;
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
	8340	+
	8341	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8342	+
	8343	+// String[] split = tex.split("Textures");
	8344	+// if (split.length > 1)
	8345	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8346	+// else
	8347	+// if (!texname.startsWith("/"))
	8348	+// texname = "/Users/nbriere/Textures/" + texname;
	8349	+ if (!FileExists(texname))
	8350	+ {
	8351	+ texname = fallbackTextureName;
	8352	+ }
8073	8353
8074	8354	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8355	{
8081		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8082	8389	{
8083	8390	assert(!bump);
8084	8391	// if (bump)
..	..	@@ -8089,19 +8396,23 @@
8089	8396	// }
8090	8397	// else
8091	8398	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8094	8401	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8097	8406	// }
8098	8407	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8409	{
8101	8410	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
8105	8416	} else
8106	8417	{
8107	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8420,13 @@
8109	8420	// texture = GetResourceTexture("default.png");
8110	8421	//} else
8111	8422	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8113	8424	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
8117	8430	} else
8118	8431	{
8119	8432	if (textureon)
..	..	@@ -8138,7 +8451,7 @@
8138	8451	}
8139	8452
8140	8453	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8454	+ if (!FileExists(cachename))
8142	8455	cachename = texname;
8143	8456	else
8144	8457	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8473,7 @@
8160	8473	}
8161	8474
8162	8475	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8476	+ if (!FileExists(cachename))
8164	8477	cachename = texname;
8165	8478	else
8166	8479	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8482,22 @@
8169	8482	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8483
8171	8484
8172		- if (texturedata != null)
8173		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8485	+ if (texturedata == null)
	8486	+ throw new Exception();
	8487	+
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8174	8489	//texture = GetTexture(tex, bump);
8175	8490	}
8176	8491	}
8177	8492	//}
8178	8493	}
8179	8494
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8496	{
8182	8497	//return false;
8183	8498
8184	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8501	{
8187	8502	// String ext = "_highres";
8188	8503	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8514,17 @@
8199	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8515	if (!cachefile.exists())
8201	8516	{
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))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8518	{
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);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8242	8521	ImageWriter writer = null;
8243	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8523	if (iter.hasNext()) {
8245	8524	writer = (ImageWriter)iter.next();
8246	8525	}
8247		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8248	8528	try
8249	8529	{
8250	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8541,20 @@
8261	8541	}
8262	8542	}
8263	8543	}
8264		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8265	8547	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8267	8549	{
8268		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8269	8551	thetex.texture.disable();
8270	8552	thetex.texture.dispose();
8271		- textures.remove(texname);
	8553	+ textures.remove(tex);
8272	8554	}
8273	8555
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8276	8558
8277	8559	// newtex = true;
8278	8560	}
..	..	@@ -8288,10 +8570,44 @@
8288	8570	}
8289	8571	}
8290	8572
8291		- return texture;
	8573	+ return texturecache;
8292	8574	}
8293	8575
8294		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8295	8611	{
8296	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8613
..	..	@@ -8309,21 +8625,21 @@
8309	8625	return texture!=null?texture.texture:null;
8310	8626	}
8311	8627
8312		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8313	8629	{
8314	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8631
8316	8632	return texture!=null?texture.texturedata:null;
8317	8633	}
8318	8634
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8636	{
8321	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8638	{
8323	8639	return false;
8324	8640	}
8325	8641
8326		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8327	8643
8328	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8645
..	..	@@ -8355,9 +8671,75 @@
8355	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8673
8358		- return newtex;
	8674	+ return true; // Warning: not used.
8359	8675	}
8360	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8361	8743	ShadowBuffer shadowPBuf;
8362	8744	AntialiasBuffer antialiasPBuf;
8363	8745	int MAXSTACK;
..	..	@@ -9193,11 +9575,35 @@
9193	9575	jy8[3] = 0.5f;
9194	9576	}
9195	9577
9196		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9578	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9197	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9580	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9581	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	9582
	9583	+ void ResetOptions()
	9584	+ {
	9585	+ options1[0] = 100;
	9586	+ options1[1] = 0.025f;
	9587	+ options1[2] = 0.01f;
	9588	+ options1[3] = 0;
	9589	+ options1[4] = 0;
	9590	+
	9591	+ options2[0] = 0;
	9592	+ options2[1] = 0.75f;
	9593	+ options2[2] = 0;
	9594	+ options2[3] = 0;
	9595	+
	9596	+ options3[0] = 1;
	9597	+ options3[1] = 1;
	9598	+ options3[2] = 1;
	9599	+ options3[3] = 0;
	9600	+
	9601	+ options4[0] = 1;
	9602	+ options4[1] = 0;
	9603	+ options4[2] = 1;
	9604	+ options4[3] = 0;
	9605	+ }
	9606	+
9201	9607	static int imagecount = 0; // movie generation
9202	9608
9203	9609	static int jitter = 0;
..	..	@@ -9293,8 +9699,8 @@
9293	9699	assert (parentcam != renderCamera);
9294	9700
9295	9701	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9702	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9298	9704
9299	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9706
..	..	@@ -9309,8 +9715,8 @@
9309	9715	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9716
9311	9717	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9718	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9314	9720
9315	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9722
..	..	@@ -9382,7 +9788,7 @@
9382	9788	//gl.glFlush();
9383	9789	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9790
9385		- if (ANIMATION && ABORTED)
	9791	+ if (Globals.ANIMATION && ABORTED)
9386	9792	{
9387	9793	System.err.println(" ABORTED FRAME");
9388	9794	break;
..	..	@@ -9412,7 +9818,7 @@
9412	9818	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9819
9414	9820	// save image
9415		- if (ANIMATION && !ABORTED)
	9821	+ if (Globals.ANIMATION && !ABORTED)
9416	9822	{
9417	9823	VPwidth = viewport[2];
9418	9824	VPheight = viewport[3];
..	..	@@ -9523,11 +9929,11 @@
9523	9929
9524	9930	// imagecount++;
9525	9931
9526		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9932	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9527	9933
9528	9934	if (!BOXMODE)
9529	9935	{
9530		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9936	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9531	9937	}
9532	9938
9533	9939	if (!BOXMODE)
..	..	@@ -9565,7 +9971,7 @@
9565	9971	ABORTED = false;
9566	9972	}
9567	9973	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9974	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	9975
9570	9976	if (false)
9571	9977	{
..	..	@@ -10228,11 +10634,11 @@
10228	10634
10229	10635	public void display(GLAutoDrawable drawable)
10230	10636	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10637	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10638	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10639	+ Grafreed.wav.save();
	10640	+ Grafreed.savesound = false;
	10641	+ Grafreed.hassound = false;
10236	10642	}
10237	10643	// if (DEBUG_SELECTION)
10238	10644	// {
..	..	@@ -10308,6 +10714,7 @@
10308	10714	ANTIALIAS = 0;
10309	10715	//System.out.println("RESTART");
10310	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
10311	10718	}
10312	10719	}
10313	10720	}
..	..	@@ -10362,7 +10769,7 @@
10362	10769	Object3D theobject = object;
10363	10770	Object3D theparent = object.parent;
10364	10771	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10772	+ object = (Object3D)Grafreed.clone(object);
10366	10773	object.Stripify();
10367	10774	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10775	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10782,14 @@
10375	10782	ambientOcclusion = false;
10376	10783	}
10377	10784
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10787	{
10380	10788	//if (RENDERSHADOW) // ?
10381	10789	if (!IsFrozen())
10382	10790	{
10383	10791	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10792	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10793	{
10386	10794	Globals.framecount++;
10387	10795	shadowbuffer.display();
..	..	@@ -10508,8 +10916,8 @@
10508	10916
10509	10917	// if (parentcam != renderCamera) // not a light
10510	10918	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10919	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10513	10921
10514	10922	for (int j = 0; j < 4; j++)
10515	10923	{
..	..	@@ -10523,8 +10931,8 @@
10523	10931
10524	10932	// if (parentcam != renderCamera) // not a light
10525	10933	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10934	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10528	10936
10529	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10938
..	..	@@ -10783,7 +11191,16 @@
10783	11191	// Bump noise
10784	11192	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11193	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- BindTexture(NOISE_TEXTURE, false, 2);
	11194	+
	11195	+ try
	11196	+ {
	11197	+ BindTexture(NOISE_TEXTURE, false, 2);
	11198	+ }
	11199	+ catch (Exception e)
	11200	+ {
	11201	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11202	+ }
	11203	+
10787	11204
10788	11205	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11206	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11223,9 @@
10806	11223
10807	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11225
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
10812	11229	} else
10813	11230	{
10814	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11236,7 @@
10819	11236	//System.out.println("BLENDING ON");
10820	11237	gl.glEnable(GL.GL_BLEND);
10821	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11240	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11241	gl.glLoadIdentity();
10825	11242
..	..	@@ -10908,8 +11325,8 @@
10908	11325	System.err.println("parentcam != renderCamera");
10909	11326
10910	11327	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11328	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11329	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10913	11330	}
10914	11331
10915	11332	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11347,8 @@
10930	11347	if (true) // TODO
10931	11348	{
10932	11349	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11350	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11351	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10935	11352	}
10936	11353
10937	11354	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11068,7 +11485,7 @@
11068	11485	}
11069	11486	}
11070	11487
11071		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11072	11489	{
11073	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11074	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11076,24 +11493,21 @@
11076	11493
11077	11494	boolean texon = textureon;
11078	11495
11079		- if (RENDERPROGRAM > 0)
11080		- {
11081		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11082		- textureon = false;
11083		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11084	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11085	11500	//System.out.println("ALLO");
11086	11501	gl.glColorMask(false, false, false, false);
11087	11502	DrawObject(gl);
11088		- if (RENDERPROGRAM > 0)
11089		- {
11090		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11091		- textureon = texon;
11092		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11093	11507	gl.glColorMask(true, true, true, true);
11094	11508
11095	11509	gl.glDepthFunc(GL.GL_EQUAL);
11096		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11097	11511	}
11098	11512
11099	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11247,8 +11661,14 @@
11247	11661	{
11248	11662	renderpass++;
11249	11663	// System.out.println("Draw object... ");
	11664	+ STEP = 1;
11250	11665	if (FAST) // in case there is no script
11251		- STEP = 16;
	11666	+ STEP = 8;
	11667	+
	11668	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11669	+ {
	11670	+ STEP *= 4;
	11671	+ }
11252	11672
11253	11673	//object.FullInvariants();
11254	11674
..	..	@@ -11262,23 +11682,44 @@
11262	11682	e.printStackTrace();
11263	11683	}
11264	11684
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11685	+ if (Grafreed.RENDERME > 0)
	11686	+ Grafreed.RENDERME--; // mechante magouille
11267	11687
11268	11688	Globals.ONESTEP = false;
11269	11689	}
11270	11690
11271	11691	static boolean zoomonce = false;
11272	11692
	11693	+ static void CreateSelectedPoint()
	11694	+ {
	11695	+ if (selectedpoint == null)
	11696	+ {
	11697	+ debugpointG = new Sphere();
	11698	+ debugpointP = new Sphere();
	11699	+ debugpointC = new Sphere();
	11700	+ debugpointR = new Sphere();
	11701	+
	11702	+ selectedpoint = new Superellipsoid();
	11703	+
	11704	+ for (int i=0; i<8; i++)
	11705	+ {
	11706	+ debugpoints[i] = new Sphere();
	11707	+ }
	11708	+ }
	11709	+ }
	11710	+
11273	11711	void DrawObject(GL gl, boolean draw)
11274	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
11275	11716	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11717	// DrawMode() = SELECTION;
11277	11718	//GL gl = getGL();
11278	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11720	{
11280	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11723	pingthread.StepToTarget(true); // true);
11283	11724	// zoomonce = false;
11284	11725	}
..	..	@@ -11333,7 +11774,14 @@
11333	11774
11334	11775	usedtextures.clear();
11335	11776
11336		- BindTextures(DEFAULT_TEXTURES, 2);
	11777	+ try
	11778	+ {
	11779	+ BindTextures(DEFAULT_TEXTURES, 2);
	11780	+ }
	11781	+ catch (Exception e)
	11782	+ {
	11783	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11784	+ }
11337	11785	}
11338	11786	//System.out.println("--> " + stackdepth);
11339	11787	// GrafreeD.traceon();
..	..	@@ -11343,8 +11791,9 @@
11343	11791
11344	11792	if (DrawMode() == DEFAULT)
11345	11793	{
11346		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
11347	11795	{
	11796	+ CreateSelectedPoint();
11348	11797	float radius = 0.05f;
11349	11798	if (selectedpoint.radius != radius)
11350	11799	{
..	..	@@ -11398,20 +11847,32 @@
11398	11847	ReleaseTextures(DEFAULT_TEXTURES);
11399	11848
11400	11849	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	11851	{
11403		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11404	11853
11405	11854	// System.out.println("Texture --------- " + tex);
11406	11855
11407		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11408	11857	continue;
11409	11858
11410		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11411	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11412	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11415	11876	}
11416	11877	}
11417	11878	}
..	..	@@ -11424,7 +11885,14 @@
11424	11885	if (checker != null && DrawMode() == DEFAULT)
11425	11886	{
11426	11887	//BindTexture(IMMORTAL_TEXTURE);
11427		- BindTextures(checker.GetTextures(), checker.texres);
	11888	+ try
	11889	+ {
	11890	+ BindTextures(checker.GetTextures(), checker.texres);
	11891	+ }
	11892	+ catch (Exception e)
	11893	+ {
	11894	+ System.err.println("FAILED: " + checker.GetTextures());
	11895	+ }
11428	11896	// NEAREST
11429	11897	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11898	DrawChecker(gl);
..	..	@@ -11506,7 +11974,7 @@
11506	11974	return;
11507	11975	}
11508	11976
11509		- String string = obj.GetToolTip();
	11977	+ String string = obj.toString(); //.GetToolTip();
11510	11978
11511	11979	GL gl = GetGL();
11512	11980
..	..	@@ -11823,8 +12291,8 @@
11823	12291	//obj.TransformToWorld(light, light);
11824	12292	for (int i = tp.size(); --i >= 0;)
11825	12293	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- LA.xformPos(light, tp.get(i).toParent, light);
	12294	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11828	12296	}
11829	12297
11830	12298
..	..	@@ -11841,8 +12309,8 @@
11841	12309	parentcam = cameras[0];
11842	12310	}
11843	12311
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12312	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12313	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11846	12314
11847	12315	LA.xformPos(light, renderCamera.toScreen, light);
11848	12316
..	..	@@ -11933,7 +12401,74 @@
11933	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11934	12402
11935	12403	String program =
	12404	+ // Min shader
11936	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
11937	12472	//"OPTION ARB_fragment_program_shadow;" +
11938	12473	"PARAM light2cam0 = program.env[10];" +
11939	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12048,8 +12583,7 @@
12048	12583	"TEMP shininess;" +
12049	12584	"\n" +
12050	12585	"MOV texSamp, one;" +
12051		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12052		-
	12586	+
12053	12587	"MOV mapgrid.x, one2048th.x;" +
12054	12588	"MOV temp, fragment.texcoord[1];" +
12055	12589	/*
..	..	@@ -12070,20 +12604,20 @@
12070	12604	"MUL temp, floor, mapgrid.x;" +
12071	12605	//"TEX depth0, temp, texture[1], 2D;" +
12072	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12073		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12074	12608	"") +
12075	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12076	12610	//"TEX depth1, temp, texture[1], 2D;" +
12077	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12078		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12079	12613	"") +
12080	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12081	12615	//"TEX depth2, temp, texture[1], 2D;" +
12082		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12083	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12084	12618	//"TEX depth3, temp, texture[1], 2D;" +
12085	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12086		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12087	12621	"") +
12088	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12089	12623	//"MOV params, material;" +
..	..	@@ -12454,10 +12988,10 @@
12454	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12455	12989	"") +
12456	12990
12457		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12458	12992	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	12993	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12994	+ "SLT temp.z, temp.y, -one2048th.x;" +
12461	12995	"SUB temp.y, one.x, temp.z;" +
12462	12996	"MUL temp.x, temp.x, temp.y;" +
12463	12997	"KIL temp.x;" +
..	..	@@ -12586,8 +13120,10 @@
12586	13120	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	13121
12588	13122	"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
	13123	+ // Tuning for default skin
	13124	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13125	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13126	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	13127	"MUL temp.x, temp.x, temp.y;" +
12592	13128
12593	13129	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,7 +13322,7 @@
12786	13322	//once = true;
12787	13323	}
12788	13324
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
	13325	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12790	13326	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12791	13327	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13328
..	..	@@ -12879,25 +13415,26 @@
12879	13415	return out;
12880	13416	}
12881	13417
12882		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
12883	13420	{
12884	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12885	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12886	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12887	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12888		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12889		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12890		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12891		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12892	13429	//"SWZ buffer, temp, w,w,w,w;";
12893		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12894	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12895	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12896	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12897		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12898	13435
12899		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12900		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12901	13438	}
12902	13439
12903	13440	String Shadow(String depth, String shadow)
..	..	@@ -12919,12 +13456,16 @@
12919	13456
12920	13457	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13458	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13459	+
	13460	+ // Compare fragment depth in light space with shadowmap.
12922	13461	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13462	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13463	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13464	+
	13465	+ // Reverse comparison
12925	13466	"SUB temp.x, one.x, temp.x;" +
12926	13467	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13468	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13469	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13470
12930	13471	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13479,10 @@
12938	13479	// No shadow for backface
12939	13480	"DP3 temp.x, normal, lightd;" +
12940	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13482	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13483	+
	13484	+ // No shadow when out of frustum
	13485	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13487	"";
12943	13488	}
..	..	@@ -13084,7 +13629,8 @@
13084	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
13088	13634
13089	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13636	// OUT : diff, spec
..	..	@@ -13100,9 +13646,10 @@
13100	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13648	//"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;" +
	13649	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13650	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13651	+
	13652	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13654	"RCP " + dest + ".w," + dest + ".w;" +
13108	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +14043,7 @@
13496	14043	public void mousePressed(MouseEvent e)
13497	14044	{
13498	14045	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14046	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	14047	}
13501	14048
13502	14049	static long prevtime = 0;
..	..	@@ -13523,6 +14070,7 @@
13523	14070
13524	14071	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	14072
	14073	+ if (BUTTONLESSWHEEL)
13526	14074	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	14075	{
13528	14076	return;
..	..	@@ -13531,7 +14079,7 @@
13531	14079	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	14080
13533	14081	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14082	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	14083	{
13536	14084	keepboxmode = BOXMODE;
13537	14085	keepsupport = SUPPORT;
..	..	@@ -13571,8 +14119,8 @@
13571	14119	// mode \|= META;
13572	14120	//}
13573	14121
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14122	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14123	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	14124	anchorX = ax;
13577	14125	anchorY = ay;
13578	14126	prevX = px;
..	..	@@ -13606,6 +14154,7 @@
13606	14154	else
13607	14155	if (evt.getSource() == AAtimer)
13608	14156	{
	14157	+ Globals.TIMERRUNNING = false;
13609	14158	if (mouseDown)
13610	14159	{
13611	14160	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14180,10 @@
13631	14180	// LIVE = waslive;
13632	14181	// wasliveok = true;
13633	14182	// waslive = false;
	14183	+
	14184	+ // May 2019 Forget it:
	14185	+ if (true)
	14186	+ return;
13634	14187
13635	14188	// source == timer
13636	14189	if (mouseDown)
..	..	@@ -13661,7 +14214,7 @@
13661	14214
13662	14215	// fev 2014???
13663	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	14218	pingthread.StepToTarget(true); // true);
13666	14219	}
13667	14220	// if (!LIVE)
..	..	@@ -13670,12 +14223,13 @@
13670	14223
13671	14224	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14225
13673		- void clickStart(int x, int y, int modifiers)
	14226	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14227	{
13675	14228	if (!wasliveok)
13676	14229	return;
13677	14230
13678	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
13679	14233
13680	14234	// waslive = LIVE;
13681	14235	// LIVE = false;
..	..	@@ -13687,7 +14241,7 @@
13687	14241	// touched = true; // main DL
13688	14242	if (isRenderer)
13689	14243	{
13690		- SetMouseMode(modifiers);
	14244	+ SetMouseMode(modifiers, modifiersex);
13691	14245	}
13692	14246
13693	14247	selectX = anchorX = x;
..	..	@@ -13700,7 +14254,7 @@
13700	14254	clicked = true;
13701	14255	hold = false;
13702	14256
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14257	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14258	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14259	{
13706	14260	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13725,14 +14279,15 @@
13725	14279	drag = false;
13726	14280	//System.out.println("Mouse DOWN");
13727	14281	editObj = false;
13728		- ClickInfo info = new ClickInfo();
13729		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13730		- info.pane = this;
13731		- info.camera = renderCamera;
13732		- info.x = x;
13733		- info.y = y;
13734		- info.modifiers = modifiers;
13735		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
13736	14291	if (!editObj)
13737	14292	{
13738	14293	hasMarquee = true;
..	..	@@ -13748,11 +14303,14 @@
13748	14303
13749	14304	public void mouseDragged(MouseEvent e)
13750	14305	{
	14306	+ Globals.MOUSEDRAGGED = true;
	14307	+
	14308	+ //System.out.println("mouseDragged: " + e);
13751	14309	if (isRenderer)
13752	14310	movingcamera = true;
	14311	+
13753	14312	//if (drawing)
13754	14313	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14314	if ((e.getModifiersEx() & CTRL) != 0
13757	14315	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14316	{
..	..	@@ -13760,7 +14318,7 @@
13760	14318	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14319	}
13762	14320	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14321	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14322
13765	14323	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14324	}
..	..	@@ -13933,6 +14491,7 @@
13933	14491
13934	14492	public void run()
13935	14493	{
	14494	+ new Exception().printStackTrace();
13936	14495	System.exit(0);
13937	14496	for (;;)
13938	14497	{
..	..	@@ -13996,7 +14555,7 @@
13996	14555	{
13997	14556	Globals.lighttouched = true;
13998	14557	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14558	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14559	}
14001	14560	//else
14002	14561	}
..	..	@@ -14010,12 +14569,12 @@
14010	14569	void GoDown(int mod)
14011	14570	{
14012	14571	MODIFIERS \|= COMMAND;
14013		- /*
	14572	+ /**/
14014	14573	if((mod&SHIFT) == SHIFT)
14015	14574	manipCamera.RotatePosition(0, -speed);
14016	14575	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
14019	14578	if ((mod & SHIFT) == SHIFT)
14020	14579	{
14021	14580	mouseMode = mouseMode; // VR??
..	..	@@ -14031,12 +14590,12 @@
14031	14590	void GoUp(int mod)
14032	14591	{
14033	14592	MODIFIERS \|= COMMAND;
14034		- /*
	14593	+ /**/
14035	14594	if((mod&SHIFT) == SHIFT)
14036	14595	manipCamera.RotatePosition(0, speed);
14037	14596	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
14040	14599	if ((mod & SHIFT) == SHIFT)
14041	14600	{
14042	14601	mouseMode = mouseMode;
..	..	@@ -14052,12 +14611,12 @@
14052	14611	void GoLeft(int mod)
14053	14612	{
14054	14613	MODIFIERS \|= COMMAND;
14055		- /*
	14614	+ /**/
14056	14615	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
14058		- else
14059	14616	manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
14061	14620	if ((mod & SHIFT) == SHIFT)
14062	14621	{
14063	14622	mouseMode = mouseMode;
..	..	@@ -14073,12 +14632,12 @@
14073	14632	void GoRight(int mod)
14074	14633	{
14075	14634	MODIFIERS \|= COMMAND;
14076		- /*
	14635	+ /**/
14077	14636	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
14079		- else
14080	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
14082	14641	if ((mod & SHIFT) == SHIFT)
14083	14642	{
14084	14643	mouseMode = mouseMode;
..	..	@@ -14096,7 +14655,7 @@
14096	14655	int X, Y;
14097	14656	boolean SX, SY;
14098	14657
14099		- void drag(int x, int y, int modifiers)
	14658	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14659	{
14101	14660	if (IsFrozen())
14102	14661	{
..	..	@@ -14105,17 +14664,17 @@
14105	14664
14106	14665	drag = true; // NEW
14107	14666
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14667	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14668
14110	14669	X = x;
14111	14670	Y = y;
14112	14671	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14672	+ MODIFIERS = modifiersex;
	14673	+ modifiersex &= ~1024;
14115	14674	if (false) // modifiers != 0)
14116	14675	{
14117	14676	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14677	+ System.out.println("mouseDragged: " + modifiersex);
14119	14678	System.out.println("SHIFT = " + SHIFT);
14120	14679	System.out.println("CONTROL = " + COMMAND);
14121	14680	System.out.println("META = " + META);
..	..	@@ -14128,14 +14687,16 @@
14128	14687	if (editObj)
14129	14688	{
14130	14689	drag = true;
14131		- ClickInfo info = new ClickInfo();
14132		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14133	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14134		- info.pane = this;
14135		- info.camera = renderCamera;
14136		- info.x = x;
14137		- info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14700	} else
14140	14701	{
14141	14702	if (x < startX)
..	..	@@ -14284,23 +14845,27 @@
14284	14845	}
14285	14846	}
14286	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14287	14850	public void mouseMoved(MouseEvent e)
14288	14851	{
14289	14852	//System.out.println("mouseMoved: " + e);
14290		-
14291	14853	if (isRenderer)
14292	14854	return;
14293	14855
14294		- ClickInfo ci = new ClickInfo();
14295		- ci.x = e.getX();
14296		- ci.y = e.getY();
14297		- ci.modifiers = e.getModifiersEx();
14298		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14299		- ci.pane = this;
14300		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
14301	14863	if (!isRenderer)
14302	14864	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14304	14869	{
14305	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	14871	} else
..	..	@@ -14312,7 +14877,11 @@
14312	14877
14313	14878	public void mouseReleased(MouseEvent e)
14314	14879	{
	14880	+ Globals.MOUSEDRAGGED = false;
	14881	+
14315	14882	movingcamera = false;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
14316	14885	//System.out.println("mouseReleased: " + e);
14317	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	14887	}
..	..	@@ -14335,9 +14904,9 @@
14335	14904	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	14905	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	14906
14338		- if (control \|\| command \|\| IsFrozen())
	14907	+// No delay if (control \|\| command \|\| IsFrozen())
14339	14908	timeout = true;
14340		- else
	14909	+// ?? May 2019 else
14341	14910	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	14911	mouseDown = false;
14343	14912	if (!control && !command) // june 2013
..	..	@@ -14447,7 +15016,7 @@
14447	15016	System.out.println("keyReleased: " + e);
14448	15017	}
14449	15018
14450		- void SetMouseMode(int modifiers)
	15019	+ void SetMouseMode(int modifiers, int modifiersex)
14451	15020	{
14452	15021	//System.out.println("SetMouseMode = " + modifiers);
14453	15022	//modifiers &= ~1024;
..	..	@@ -14459,25 +15028,25 @@
14459	15028	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	15029	// return;
14461	15030	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	15031	+ if ((modifiersex & WHEEL) == WHEEL)
14463	15032	{
14464	15033	mouseMode \|= ZOOM;
14465	15034	}
14466	15035
14467	15036	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	15037	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	15038	{
14470	15039	mouseMode \|= VR; // BACKFORTH;
14471	15040	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15041	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	15042	{
14474	15043	mouseMode \|= SELECT;
14475	15044	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	15045	+ if ((modifiersex & COMMAND) == COMMAND)
14477	15046	{
14478	15047	mouseMode \|= SELECT;
14479	15048	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15049	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	15050	{
14482	15051	mouseMode &= ~VR;
14483	15052	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +15075,7 @@
14506	15075
14507	15076	if (isRenderer) //
14508	15077	{
14509		- SetMouseMode(modifiers);
	15078	+ SetMouseMode(0, modifiers);
14510	15079	}
14511	15080
14512	15081	Globals.theRenderer.keyPressed(key);
..	..	@@ -14568,7 +15137,8 @@
14568	15137	// break;
14569	15138	case 'T':
14570	15139	CACHETEXTURE ^= true;
14571		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14572	15142	// repaint();
14573	15143	break;
14574	15144	case 'Y':
..	..	@@ -14653,7 +15223,9 @@
14653	15223	case 'E' : COMPACT ^= true;
14654	15224	repaint();
14655	15225	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15229	repaint();
14658	15230	break;
14659	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15250,8 @@
14678	15250	RevertCamera();
14679	15251	repaint();
14680	15252	break;
14681		- case 'L':
14682	15253	case 'l':
	15254	+ //case 'L':
14683	15255	if (lightMode)
14684	15256	{
14685	15257	lightMode = false;
..	..	@@ -14822,9 +15394,9 @@
14822	15394	case '_':
14823	15395	kompactbit = 5;
14824	15396	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
14828	15400	case ' ':
14829	15401	lightMode ^= true;
14830	15402	Globals.lighttouched = true;
..	..	@@ -14836,13 +15408,14 @@
14836	15408	case ESC:
14837	15409	RENDERPROGRAM += 1;
14838	15410	RENDERPROGRAM %= 3;
	15411	+
14839	15412	repaint();
14840	15413	break;
14841	15414	case 'Z':
14842	15415	//RESIZETEXTURE ^= true;
14843	15416	//break;
14844	15417	case 'z':
14845		- RENDERSHADOW ^= true;
	15418	+ Globals.RENDERSHADOW ^= true;
14846	15419	Globals.lighttouched = true;
14847	15420	repaint();
14848	15421	break;
..	..	@@ -14875,8 +15448,9 @@
14875	15448	case DELETE:
14876	15449	ClearSelection();
14877	15450	break;
14878		- /*
14879	15451	case '+':
	15452	+
	15453	+ /*
14880	15454	//fontsize += 1;
14881	15455	bbzoom *= 2;
14882	15456	repaint();
..	..	@@ -14893,17 +15467,17 @@
14893	15467	case '=':
14894	15468	IncDepth();
14895	15469	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
14897	15471	maskbit = 6;
14898	15472	break;
14899	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15474	DecDepth();
14901	15475	maskbit = 5;
14902	15476	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
14907	15481	break;
14908	15482	case '{':
14909	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15540,7 @@
14966	15540	//mode = ROTATE;
14967	15541	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15542	{
14969		- SetMouseMode(modifiers);
	15543	+ SetMouseMode(0, modifiers);
14970	15544	}
14971	15545	}
14972	15546
..	..	@@ -15100,8 +15674,9 @@
15100	15674
15101	15675	protected void processMouseMotionEvent(MouseEvent e)
15102	15676	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15677	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15678	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15679	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15680	{
15106	15681	mouseMoved(e);
15107	15682	} else
..	..	@@ -15126,11 +15701,12 @@
15126	15701	}
15127	15702	*/
15128	15703
15129		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
15130	15705	}
15131	15706
15132	15707	void SelectParent()
15133	15708	{
	15709	+ new Exception().printStackTrace();
15134	15710	System.exit(0);
15135	15711	Composite group = (Composite) object;
15136	15712	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15718,10 @@
15142	15718	{
15143	15719	//selectees.remove(i);
15144	15720	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15722	} else
15147	15723	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15725	}
15150	15726
15151	15727	first = false;
..	..	@@ -15154,6 +15730,7 @@
15154	15730
15155	15731	void SelectChildren()
15156	15732	{
	15733	+ new Exception().printStackTrace();
15157	15734	System.exit(0);
15158	15735	/*
15159	15736	Composite group = (Composite) object;
..	..	@@ -15186,12 +15763,12 @@
15186	15763	for (int j = 0; j < group.children.size(); j++)
15187	15764	{
15188	15765	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15767	first = false;
15191	15768	}
15192	15769	} else
15193	15770	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15772	}
15196	15773
15197	15774	first = false;
..	..	@@ -15202,21 +15779,21 @@
15202	15779	{
15203	15780	//Composite group = (Composite) object;
15204	15781	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15783	}
15207	15784
15208	15785	void ResetTransform(int mask)
15209	15786	{
15210	15787	//Composite group = (Composite) object;
15211	15788	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
15213	15790	}
15214	15791
15215	15792	void FlipTransform()
15216	15793	{
15217	15794	//Composite group = (Composite) object;
15218	15795	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
15220	15797	// group.editWindow.ReduceMesh(true);
15221	15798	}
15222	15799
..	..	@@ -15224,7 +15801,7 @@
15224	15801	{
15225	15802	//Composite group = (Composite) object;
15226	15803	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
15228	15805	// group.editWindow.ReduceMesh(true);
15229	15806	}
15230	15807
..	..	@@ -15232,7 +15809,7 @@
15232	15809	{
15233	15810	//Composite group = (Composite) object;
15234	15811	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
15236	15813	}
15237	15814
15238	15815	void IncDepth()
..	..	@@ -15314,11 +15891,11 @@
15314	15891
15315	15892	int width = getBounds().width;
15316	15893	int height = getBounds().height;
15317		- ClickInfo info = new ClickInfo();
15318		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	15894	//Image img = CreateImage(width, height);
15320	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
	15896	+
15321	15897	Graphics gr = g; // img.getGraphics();
	15898	+
15322	15899	if (!hasMarquee)
15323	15900	{
15324	15901	if (Xmin < Xmax) // !locked)
..	..	@@ -15390,40 +15967,88 @@
15390	15967	}
15391	15968	if (object != null && !hasMarquee)
15392	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15393	15976	if (isRenderer)
15394	15977	{
15395		- info.flags++;
	15978	+ object.clickInfo.flags++;
15396	15979	double frameAspect = (double) width / (double) height;
15397	15980	if (frameAspect > renderCamera.aspect)
15398	15981	{
15399	15982	int desired = (int) ((double) height * renderCamera.aspect);
15400		- info.bounds.width -= width - desired;
15401		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15402	15985	} else
15403	15986	{
15404	15987	int desired = (int) ((double) width / renderCamera.aspect);
15405		- info.bounds.height -= height - desired;
15406		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15407	15990	}
15408	15991	}
15409		- info.g = gr;
15410		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15411	15995	/*
15412	15996	// Memory intensive (brep.verticescopy)
15413	15997	if (!(object instanceof Composite))
15414	15998	object.draw(info, 0, false); // SLOW :
15415	15999	*/
15416		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15417	16001	{
15418		- object.drawEditHandles(info, 0);
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
	16005	+ {
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
	16012	+ {
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
	16020	+ }
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
	16041	+ }
15419	16042	}
15420	16043	}
	16044	+
15421	16045	if (isRenderer)
15422	16046	{
15423	16047	//gr.setColor(Color.black);
15424	16048	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	16049	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	16050	}
	16051	+
15427	16052	if (hasMarquee)
15428	16053	{
15429	16054	gr.setXORMode(Color.white);
..	..	@@ -15536,6 +16161,7 @@
15536	16161	public boolean mouseDown(Event evt, int x, int y)
15537	16162	{
15538	16163	System.out.println("mouseDown: " + evt);
	16164	+ System.exit(0);
15539	16165	/*
15540	16166	locked = true;
15541	16167	drag = false;
..	..	@@ -15579,7 +16205,7 @@
15579	16205	{
15580	16206	keyPressed(0, modifiers);
15581	16207	}
15582		- clickStart(x, y, modifiers);
	16208	+ // clickStart(x, y, modifiers);
15583	16209	return true;
15584	16210	}
15585	16211
..	..	@@ -15697,7 +16323,7 @@
15697	16323	{
15698	16324	keyReleased(0, 0);
15699	16325	}
15700		- drag(x, y, modifiers);
	16326	+ drag(x, y, 0, modifiers);
15701	16327	return true;
15702	16328	}
15703	16329
..	..	@@ -15829,7 +16455,7 @@
15829	16455	Object3D object;
15830	16456	static Object3D trackedobject;
15831	16457	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16458	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16459	/static/ Camera eyeCamera;
15834	16460	/static/ Camera lightCamera;
15835	16461	int cameracount;
..	..	@@ -16114,16 +16740,16 @@
16114	16740	cStatic.objectstack[materialdepth++] = checker;
16115	16741	//System.out.println("material " + material);
16116	16742	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
16118	16744
16119	16745	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16747
16122	16748	materialdepth -= 1;
16123	16749	if (materialdepth > 0)
16124	16750	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16751	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16752	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	16753	}
16128	16754	//checker.GetMaterial().opacity = 1f;
16129	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +16835,14 @@
16209	16835	}
16210	16836	}
16211	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
16212	16846	class SelectBuffer implements GLEventListener
16213	16847	{
16214	16848
..	..	@@ -16267,6 +16901,7 @@
16267	16901	{
16268	16902	if (!selection)
16269	16903	{
	16904	+ new Exception().printStackTrace();
16270	16905	System.exit(0);
16271	16906	return;
16272	16907	}
..	..	@@ -16287,6 +16922,17 @@
16287	16922
16288	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
16290	16936	//int tmp = selection_view;
16291	16937	//selection_view = -1;
16292	16938	int temp = DrawMode();
..	..	@@ -16298,6 +16944,17 @@
16298	16944	// temp = DEFAULT; // patch for selection debug
16299	16945	Globals.drawMode = temp; // WARNING
16300	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
16301	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	16959
16303	16960	// trying different ways of getting the depth info over
..	..	@@ -16345,6 +17002,8 @@
16345	17002	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17005	+
	17006	+ CreateSelectedPoint();
16348	17007
16349	17008	// Will fit the mesh !!!
16350	17009	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +17053,36 @@
16394	17053	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	17054	}
16396	17055
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17056	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	17057	}
16399	17058	}
16400	17059
16401	17060	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	17062
16404		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16405	17064	{
16406		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16407	17066
16408		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	17070
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();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
16425	17086	}
16426	17087	else
16427	17088	paintcount = 0;
..	..	@@ -16460,6 +17121,11 @@
16460	17121	//System.out.println("objects[color] = " + objects[color]);
16461	17122	//objects[color].Select();
16462	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
16463	17129	object.Select(color, deselect);
16464	17130	}
16465	17131
..	..	@@ -16559,7 +17225,7 @@
16559	17225	gl.glDisable(gl.GL_CULL_FACE);
16560	17226	}
16561	17227
16562		- if (!RENDERSHADOW)
	17228	+ if (!Globals.RENDERSHADOW)
16563	17229	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17230
16565	17231	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17235,7 @@
16569	17235	//gl.glColorMask(false, false, false, false);
16570	17236
16571	17237	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17238	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17239	{
16574	17240	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17241
..	..	@@ -16985,23 +17651,15 @@
16985	17651	int AAbuffersize = 0;
16986	17652
16987	17653	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17654	+ static Superellipsoid selectedpoint;
16989	17655	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();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
16994	17660
16995	17661	static Sphere debugpoints[] = new Sphere[8];
16996	17662
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17663	static void InitPoints(float radius)
17006	17664	{
17007	17665	for (int i=0; i<8; i++)