~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;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -74,7 +110,11 @@
74	110	//private Mat4f spotlightTransform = new Mat4f();
75	111	//private Mat4f spotlightInverseTransform = new Mat4f();
76	112	static GLContext glcontext = null;
77		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
78	118	boolean reverseUP = false;
79	119	static boolean frozen = false;
80	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -148,6 +188,21 @@
148	188	defaultcaps.setAccumGreenBits(16);
149	189	defaultcaps.setAccumBlueBits(16);
150	190	defaultcaps.setAccumAlphaBits(16);
	191	+ }
	192	+
	193	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
151	206	}
152	207
153	208	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +223,8 @@
168	223
169	224	SetCamera(cam);
170	225
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	228
173	229	object = o;
174	230
..	..	@@ -325,7 +381,7 @@
325	381	cStatic.objectstack[materialdepth++] = obj;
326	382	//System.out.println("material " + material);
327	383	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
329	385	if (obj instanceof Camera)
330	386	{
331	387	display.options1[0] = material.shift;
..	..	@@ -334,14 +390,28 @@
334	390	display.options1[2] = material.shadowbias;
335	391	display.options1[3] = material.aniso;
336	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
337	398	display.options2[0] = material.opacity;
338	399	display.options2[1] = material.diffuse;
339	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
340	404
341	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
342	409	display.options4[0] = material.cameralight/0.2f;
343	410	display.options4[1] = material.subsurface;
344	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
345	415
346	416	// if (display.CURRENTANTIALIAS > 0)
347	417	// display.options3[3] /= 4;
..	..	@@ -357,7 +427,7 @@
357	427	/**/
358	428	} else
359	429	{
360		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
361	431	}
362	432	} else
363	433	{
..	..	@@ -381,8 +451,8 @@
381	451	cStatic.objectstack[materialdepth++] = obj;
382	452	//System.out.println("material " + material);
383	453	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	456	}
387	457	}
388	458
..	..	@@ -399,8 +469,8 @@
399	469	materialdepth -= 1;
400	470	if (materialdepth > 0)
401	471	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	474	}
405	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +490,8 @@
420	490	materialdepth -= 1;
421	491	if (materialdepth > 0)
422	492	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	495	}
426	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	497	//else
..	..	@@ -462,10 +532,12 @@
462	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	533	{
464	534	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
466	538	if (!hasnorm)
467	539	{
468		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
469	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1262,12 @@
1190	1262	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1263	}
1192	1264	}
	1265	+
1193	1266	if (flipV)
1194	1267	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1268	else
1196	1269	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1270	+
1197	1271	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1272	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1273
..	..	@@ -1213,10 +1287,12 @@
1213	1287	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1288	}
1215	1289	}
	1290	+
1216	1291	if (flipV)
1217	1292	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1293	else
1219	1294	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1295	+
1220	1296	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1297	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1298
..	..	@@ -1244,8 +1320,10 @@
1244	1320	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1321	else
1246	1322	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1323	+
1247	1324	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1325	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1326	+
1249	1327	count2 += 2;
1250	1328	count3 += 3;
1251	1329	}
..	..	@@ -1424,6 +1502,8 @@
1424	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1503	}
1426	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1427	1507	void SetColor(Object3D obj, Vertex p0)
1428	1508	{
1429	1509	CameraPane display = this;
..	..	@@ -1491,8 +1571,6 @@
1491	1571	{
1492	1572	return;
1493	1573	}
1494		-
1495		- float[] colorV = new float[3];
1496	1574
1497	1575	if (false) // marked)
1498	1576	{
..	..	@@ -1601,7 +1679,7 @@
1601	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1680	}
1603	1681
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1683	{
1606	1684	CameraPane display = this;
1607	1685	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1706,7 @@
1628	1706
1629	1707	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1708
1631		- float[] colorV = GrafreeD.colorV;
	1709	+ float[] colorV = Grafreed.colorV;
1632	1710
1633	1711	/**/
1634	1712	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1714,7 @@
1636	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1640	1718
1641	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1822,9 @@
1744	1822	display.modelParams7[2] = 0;
1745	1823	display.modelParams7[3] = 0;
1746	1824
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1826
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1829	{
1752	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1966,7 @@
1888	1966	void PushMatrix(double[][] matrix)
1889	1967	{
1890	1968	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1969	+ PushMatrix(matrix, 1);
1892	1970	}
1893	1971
1894	1972	void PushMatrix()
..	..	@@ -2042,7 +2120,7 @@
2042	2120	//System.err.println("Oeil on");
2043	2121	OEIL = true;
2044	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2124	//pingthread.StepToTarget(true);
2047	2125	}
2048	2126
..	..	@@ -2140,7 +2218,7 @@
2140	2218	System.err.println("LIVE = " + Globals.isLIVE());
2141	2219
2142	2220	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2221	+ Grafreed.savesound = true; // wav.save();
2144	2222	// else
2145	2223	repaint(); // start loop // may 2013
2146	2224	}
..	..	@@ -2257,7 +2335,7 @@
2257	2335
2258	2336	void ToggleDebug()
2259	2337	{
2260		- DEBUG ^= true;
	2338	+ Globals.DEBUG ^= true;
2261	2339	}
2262	2340
2263	2341	void ToggleLookAt()
..	..	@@ -2265,7 +2343,7 @@
2265	2343	LOOKAT ^= true;
2266	2344	}
2267	2345
2268		- void ToggleRandom()
	2346	+ void ToggleSwitch()
2269	2347	{
2270	2348	SWITCH ^= true;
2271	2349	}
..	..	@@ -2275,10 +2353,17 @@
2275	2353	HANDLES ^= true;
2276	2354	}
2277	2355
	2356	+ Object3D paintFolder;
	2357	+
2278	2358	void TogglePaint()
2279	2359	{
2280	2360	PAINTMODE ^= true;
2281	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2282	2367	}
2283	2368
2284	2369	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2459,22 @@
2374	2459	{
2375	2460	return currentGL;
2376	2461	}
2377		-
	2462	+
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2378	2478	/**/
2379	2479	class CacheTexture
2380	2480	{
..	..	@@ -2383,28 +2483,31 @@
2383	2483
2384	2484	int resolution;
2385	2485
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2487	{
2388		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2389	2490	resolution = res;
2390	2491	}
2391	2492	}
2392	2493	/**/
2393	2494
2394	2495	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2398	2501	int pigmentdepth = 0;
2399	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2503	int bumpdepth = 0;
2401	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2509
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2511	{
2409	2512	TextureData texturedata = null;
2410	2513
..	..	@@ -2414,7 +2517,7 @@
2414	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2415	2518	getClass().getClassLoader().getResourceAsStream(name),
2416	2519	true,
2417		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2418	2521	} catch (java.io.IOException e)
2419	2522	{
2420	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2423,13 +2526,34 @@
2423	2526	if (bump)
2424	2527	texturedata = ConvertBump(texturedata, false);
2425	2528
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2531
2429		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2430		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2534
2432		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2433	2557	}
2434	2558
2435	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3626,8 @@
3502	3626
3503	3627	System.out.println("LOADING TEXTURE : " + name);
3504	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3505	3631	//
3506	3632	if (false) // compressbit > 0)
3507	3633	{
..	..	@@ -7900,7 +8026,7 @@
7900	8026	String pigment = Object3D.GetPigment(tex);
7901	8027	String bump = Object3D.GetBump(tex);
7902	8028
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8030	{
7905	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8041,69 @@
7915	8041	pigment = null;
7916	8042	}
7917	8043
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7920	8046	}
7921	8047
7922		- void ReleaseTexture(String tex, boolean bump)
	8048	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8049	+ {
	8050	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8051	+ {
	8052	+ return;
	8053	+ }
	8054	+
	8055	+ if (tex == null)
	8056	+ {
	8057	+ ReleaseTexture(null, false);
	8058	+ return;
	8059	+ }
	8060	+
	8061	+ String pigment = Object3D.GetPigment(tex);
	8062	+
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8064	+ {
	8065	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8066	+ // System.out.println("; bump = " + bump);
	8067	+ }
	8068	+
	8069	+ if (pigment.equals(""))
	8070	+ {
	8071	+ pigment = null;
	8072	+ }
	8073	+
	8074	+ ReleaseTexture(tex, false);
	8075	+ }
	8076	+
	8077	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8078	+ {
	8079	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8080	+ {
	8081	+ return;
	8082	+ }
	8083	+
	8084	+ if (tex == null)
	8085	+ {
	8086	+ ReleaseTexture(null, true);
	8087	+ return;
	8088	+ }
	8089	+
	8090	+ String bump = Object3D.GetBump(tex);
	8091	+
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8093	+ {
	8094	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8095	+ // System.out.println("; bump = " + bump);
	8096	+ }
	8097	+
	8098	+ if (bump.equals(""))
	8099	+ {
	8100	+ bump = null;
	8101	+ }
	8102	+
	8103	+ ReleaseTexture(tex, true);
	8104	+ }
	8105	+
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8107	{
7924	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8114,7 @@
7930	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8115
7932	8116	if (tex != null)
7933		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8118
7935	8119	// //assert( texture != null );
7936	8120	// if (texture == null)
..	..	@@ -8022,7 +8206,55 @@
8022	8206	}
8023	8207	}
8024	8208
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8209	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8210	+ {
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
	8252	+
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
	8255	+ }
	8256	+
	8257	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8258	{
8027	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8260	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,17 +8265,47 @@
8033	8265	if (tex == null)
8034	8266	{
8035	8267	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8268	return;
8038	8269	}
8039	8270
8040	8271	String pigment = Object3D.GetPigment(tex);
	8272	+
	8273	+ usedtextures.add(tex);
	8274	+
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8276	+ {
	8277	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8278	+ // System.out.println("; bump = " + bump);
	8279	+ }
	8280	+
	8281	+ if (pigment.equals(""))
	8282	+ {
	8283	+ pigment = null;
	8284	+ }
	8285	+
	8286	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8287	+ BindTexture(tex, false, resolution);
	8288	+ }
	8289	+
	8290	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8291	+ {
	8292	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8293	+ ambientOcclusion ) // \|\| !textureon)
	8294	+ {
	8295	+ return; // false;
	8296	+ }
	8297	+
	8298	+ if (tex == null)
	8299	+ {
	8300	+ BindTexture(null,true,resolution);
	8301	+ return;
	8302	+ }
	8303	+
8041	8304	String bump = Object3D.GetBump(tex);
8042	8305
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8045	8307
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8309	{
8048	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8053,47 +8315,94 @@
8053	8315	{
8054	8316	bump = null;
8055	8317	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8318
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8065	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8322	}
8069	8323
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8324	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8325	+
	8326	+ private boolean FileExists(String tex)
8071	8327	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ if (missingTextures.contains(tex))
	8329	+ {
	8330	+ return false;
	8331	+ }
	8332	+
	8333	+ boolean fileExists = new File(tex).exists();
	8334	+
	8335	+ if (!fileExists)
	8336	+ {
	8337	+ // If file exists, the "new File()" is not executed sgain
	8338	+ missingTextures.add(tex);
	8339	+ }
	8340	+
	8341	+ return fileExists;
	8342	+ }
	8343	+
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8345	+ {
	8346	+ CacheTexture texturecache = null;
8073	8347
8074	8348	if (tex != null)
8075	8349	{
8076		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8352
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
	8357	+
	8358	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8359	+
8078	8360	// String[] split = tex.split("Textures");
8079	8361	// if (split.length > 1)
8080	8362	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8363	// else
8082	8364	// if (!texname.startsWith("/"))
8083	8365	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8085	8367	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8368	+ texname = fallbackTextureName;
8087	8369	}
8088	8370
8089	8371	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8372	{
8096		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8406	{
8098	8407	assert(!bump);
8099	8408	// if (bump)
..	..	@@ -8104,19 +8413,23 @@
8104	8413	// }
8105	8414	// else
8106	8415	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8109	8418	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8112	8423	// }
8113	8424	} else
8114		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8426	{
8116	8427	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8120	8433	} else
8121	8434	{
8122	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8124,11 +8437,22 @@
8124	8437	// texture = GetResourceTexture("default.png");
8125	8438	//} else
8126	8439	//{
8127		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8128	8441	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
8132	8456	} else
8133	8457	{
8134	8458	if (textureon)
..	..	@@ -8153,7 +8477,7 @@
8153	8477	}
8154	8478
8155	8479	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8480	+ if (!FileExists(cachename))
8157	8481	cachename = texname;
8158	8482	else
8159	8483	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8499,7 @@
8175	8499	}
8176	8500
8177	8501	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8502	+ if (!FileExists(cachename))
8179	8503	cachename = texname;
8180	8504	else
8181	8505	processbump = false; // don't process bump map again
..	..	@@ -8184,20 +8508,23 @@
8184	8508	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8509
8186	8510
8187		- if (texturedata != null)
8188		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8511	+ if (texturedata == null)
	8512	+ throw new Exception();
	8513	+
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8189	8515	//texture = GetTexture(tex, bump);
8190	8516	}
	8517	+ }
8191	8518	}
8192	8519	//}
8193	8520	}
8194	8521
8195		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8196	8523	{
8197	8524	//return false;
8198	8525
8199	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8200		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8201	8528	{
8202	8529	// String ext = "_highres";
8203	8530	// if (REDUCETEXTURE)
..	..	@@ -8214,52 +8541,17 @@
8214	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8215	8542	if (!cachefile.exists())
8216	8543	{
8217		- // cache to disk
8218		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8219		- //buffers[0].
8220		-
8221		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8222		- int[] pixels = new int[bytebuf.capacity()/3];
8223		-
8224		- // squared size heuristic...
8225		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8226	8545	{
8227		- for (int i=pixels.length; --i>=0;)
8228		- {
8229		- int i3 = i*3;
8230		- pixels[i] = 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8235		- pixels[i] <<= 8;
8236		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8237		- }
8238		-
8239		- /*
8240		- int r=0,g=0,b=0,a=0;
8241		- for (int i=0; i<width; i++)
8242		- for (int j=0; j<height; j++)
8243		- {
8244		- int index = j*width+i;
8245		- int p = pixels[index];
8246		- a = ((p>>24) & 0xFF);
8247		- r = ((p>>16) & 0xFF);
8248		- g = ((p>>8) & 0xFF);
8249		- b = (p & 0xFF);
8250		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8251		- }
8252		- /**/
8253		- int width = (int)Math.sqrt(pixels.length); // squared
8254		- int height = width;
8255		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8256		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8257	8548	ImageWriter writer = null;
8258	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8259	8550	if (iter.hasNext()) {
8260	8551	writer = (ImageWriter)iter.next();
8261	8552	}
8262		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8263	8555	try
8264	8556	{
8265	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8276,18 +8568,20 @@
8276	8568	}
8277	8569	}
8278	8570	}
8279		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8280	8574	//System.out.println("Texture = " + tex);
8281		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8282	8576	{
8283		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8284	8578	thetex.texture.disable();
8285	8579	thetex.texture.dispose();
8286		- textures.remove(texname);
	8580	+ textures.remove(tex);
8287	8581	}
8288	8582
8289		- texture.texturedata = texturedata;
8290		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8291	8585
8292	8586	// newtex = true;
8293	8587	}
..	..	@@ -8303,10 +8597,44 @@
8303	8597	}
8304	8598	}
8305	8599
8306		- return texture;
	8600	+ return texturecache;
8307	8601	}
8308	8602
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8310	8638	{
8311	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8640
..	..	@@ -8324,21 +8652,21 @@
8324	8652	return texture!=null?texture.texture:null;
8325	8653	}
8326	8654
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8328	8656	{
8329	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8658
8331	8659	return texture!=null?texture.texturedata:null;
8332	8660	}
8333	8661
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8335	8663	{
8336	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8665	{
8338	8666	return false;
8339	8667	}
8340	8668
8341		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8342	8670
8343	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8344	8672
..	..	@@ -8370,9 +8698,75 @@
8370	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8371	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8372	8700
8373		- return newtex;
	8701	+ return true; // Warning: not used.
8374	8702	}
8375	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8376	8770	ShadowBuffer shadowPBuf;
8377	8771	AntialiasBuffer antialiasPBuf;
8378	8772	int MAXSTACK;
..	..	@@ -8389,10 +8783,12 @@
8389	8783
8390	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8391	8785	MAXSTACK = temp[0];
8392		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8393	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8394	8789	MAXSTACK = temp[0];
8395		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8396	8792
8397	8793	// Use debug pipeline
8398	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8400,7 +8796,8 @@
8400	8796	gl = drawable.getGL(); //
8401	8797
8402	8798	GL gl3 = getGL();
8403		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8404	8801
8405	8802
8406	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8565,7 +8962,7 @@
8565	8962
8566	8963	if (cubemap == null)
8567	8964	{
8568		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8569	8966	}
8570	8967
8571	8968	//cubemap.enable();
..	..	@@ -8841,6 +9238,8 @@
8841	9238
8842	9239	void LoadEnvy(int which)
8843	9240	{
	9241	+ assert(false);
	9242	+
8844	9243	String name;
8845	9244	String ext;
8846	9245
..	..	@@ -8852,37 +9251,58 @@
8852	9251	cubemap = null;
8853	9252	return;
8854	9253	case 1:
8855		- name = "cubemaps/box_";
8856		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8857	9256	reverseUP = false;
8858	9257	break;
8859	9258	case 2:
8860		- name = "cubemaps/uffizi_";
8861		- ext = "png";
8862		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8863	9263	case 3:
8864		- name = "cubemaps/CloudyHills_";
8865		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8866	9266	reverseUP = false;
8867	9267	break;
8868	9268	case 4:
8869		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8870	9270	ext = "png";
8871	9271	reverseUP = false;
8872	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
8873	9298	default:
8874		- name = "cubemaps/rgb_";
8875		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8876	9302	break;
8877	9303	}
8878		-
8879		- try
8880		- {
8881		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8882		- } catch (IOException e)
8883		- {
8884		- throw new RuntimeException(e);
8885		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8886	9306	}
8887	9307
8888	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8914,8 +9334,12 @@
8914	9334	static double[] model = new double[16];
8915	9335	double[] camera2light = new double[16];
8916	9336	double[] light2camera = new double[16];
8917		- int newenvy = -1;
8918		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8919	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8920	9344	//float[] light0 = { 0,0,0 };
8921	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9208,11 +9632,35 @@
9208	9632	jy8[3] = 0.5f;
9209	9633	}
9210	9634
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9635	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9639
	9640	+ void ResetOptions()
	9641	+ {
	9642	+ options1[0] = 100;
	9643	+ options1[1] = 0.025f;
	9644	+ options1[2] = 0.01f;
	9645	+ options1[3] = 0;
	9646	+ options1[4] = 0;
	9647	+
	9648	+ options2[0] = 0;
	9649	+ options2[1] = 0.75f;
	9650	+ options2[2] = 0;
	9651	+ options2[3] = 0;
	9652	+
	9653	+ options3[0] = 1;
	9654	+ options3[1] = 1;
	9655	+ options3[2] = 1;
	9656	+ options3[3] = 0;
	9657	+
	9658	+ options4[0] = 1;
	9659	+ options4[1] = 0;
	9660	+ options4[2] = 1;
	9661	+ options4[3] = 0;
	9662	+ }
	9663	+
9216	9664	static int imagecount = 0; // movie generation
9217	9665
9218	9666	static int jitter = 0;
..	..	@@ -9308,8 +9756,8 @@
9308	9756	assert (parentcam != renderCamera);
9309	9757
9310	9758	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9759	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9313	9761
9314	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9763
..	..	@@ -9324,8 +9772,8 @@
9324	9772	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9773
9326	9774	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9775	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9329	9777
9330	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9779
..	..	@@ -9371,10 +9819,12 @@
9371	9819	rati = 1 / rati;
9372	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9373	9821	}
9374		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9375	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9377		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9378	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9379	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9380	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9542,7 +9992,7 @@
9542	9992
9543	9993	if (!BOXMODE)
9544	9994	{
9545		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9995	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9546	9996	}
9547	9997
9548	9998	if (!BOXMODE)
..	..	@@ -9580,7 +10030,7 @@
9580	10030	ABORTED = false;
9581	10031	}
9582	10032	else
9583		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10033	+ Grafreed.wav.cursor += 735 * ACSIZE;
9584	10034
9585	10035	if (false)
9586	10036	{
..	..	@@ -10243,11 +10693,11 @@
10243	10693
10244	10694	public void display(GLAutoDrawable drawable)
10245	10695	{
10246		- if (GrafreeD.savesound && GrafreeD.hassound)
	10696	+ if (Grafreed.savesound && Grafreed.hassound)
10247	10697	{
10248		- GrafreeD.wav.save();
10249		- GrafreeD.savesound = false;
10250		- GrafreeD.hassound = false;
	10698	+ Grafreed.wav.save();
	10699	+ Grafreed.savesound = false;
	10700	+ Grafreed.hassound = false;
10251	10701	}
10252	10702	// if (DEBUG_SELECTION)
10253	10703	// {
..	..	@@ -10323,6 +10773,7 @@
10323	10773	ANTIALIAS = 0;
10324	10774	//System.out.println("RESTART");
10325	10775	AAtimer.restart();
	10776	+ Globals.TIMERRUNNING = true;
10326	10777	}
10327	10778	}
10328	10779	}
..	..	@@ -10377,7 +10828,7 @@
10377	10828	Object3D theobject = object;
10378	10829	Object3D theparent = object.parent;
10379	10830	object.parent = null;
10380		- object = (Object3D)GrafreeD.clone(object);
	10831	+ object = (Object3D)Grafreed.clone(object);
10381	10832	object.Stripify();
10382	10833	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10383	10834	theobject.PreprocessOcclusion(this);
..	..	@@ -10390,13 +10841,14 @@
10390	10841	ambientOcclusion = false;
10391	10842	}
10392	10843
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10844	+ if (//Globals.lighttouched &&
	10845	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10846	{
10395	10847	//if (RENDERSHADOW) // ?
10396	10848	if (!IsFrozen())
10397	10849	{
10398	10850	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10851	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10852	{
10401	10853	Globals.framecount++;
10402	10854	shadowbuffer.display();
..	..	@@ -10409,7 +10861,7 @@
10409	10861
10410	10862	if (wait)
10411	10863	{
10412		- Sleep(500);
	10864	+ Sleep(200); // blocks everything
10413	10865
10414	10866	wait = false;
10415	10867	}
..	..	@@ -10523,8 +10975,8 @@
10523	10975
10524	10976	// if (parentcam != renderCamera) // not a light
10525	10977	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10978	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10979	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10528	10980
10529	10981	for (int j = 0; j < 4; j++)
10530	10982	{
..	..	@@ -10538,8 +10990,8 @@
10538	10990
10539	10991	// if (parentcam != renderCamera) // not a light
10540	10992	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10993	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10994	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10543	10995
10544	10996	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10997
..	..	@@ -10625,13 +11077,43 @@
10625	11077	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10626	11078	}
10627	11079
10628		- if (newenvy > -1)
	11080	+// if (newenvy > -1)
	11081	+// {
	11082	+// LoadEnvy(newenvy);
	11083	+// }
	11084	+//
	11085	+// newenvy = -1;
	11086	+
	11087	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10629	11088	{
10630		- LoadEnvy(newenvy);
	11089	+ if (cubemaprgb == null)
	11090	+ {
	11091	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
	11092	+ }
	11093	+
	11094	+ cubemap = cubemaprgb;
10631	11095	}
10632		-
10633		- newenvy = -1;
10634		-
	11096	+ else
	11097	+ {
	11098	+ if (object.skyboxname != null)
	11099	+ {
	11100	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11101	+ {
	11102	+ if (cubemap != null && cubemap != cubemaprgb)
	11103	+ cubemap.dispose();
	11104	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11105	+ loadedskyboxname = object.skyboxname;
	11106	+ }
	11107	+ }
	11108	+ else
	11109	+ {
	11110	+ cubemapcustom = null;
	11111	+ loadedskyboxname = null;
	11112	+ }
	11113	+
	11114	+ cubemap = cubemapcustom;
	11115	+ }
	11116	+
10635	11117	ratio = ((double) getWidth()) / getHeight();
10636	11118	//System.out.println("ratio = " + ratio);
10637	11119
..	..	@@ -10647,7 +11129,7 @@
10647	11129
10648	11130	if (!IsFrozen() && !ambientOcclusion)
10649	11131	{
10650		- DrawSkyBox(gl);
	11132	+ DrawSkyBox(gl, (float)ratio);
10651	11133	}
10652	11134
10653	11135	//if (selection_view == -1)
..	..	@@ -10798,7 +11280,16 @@
10798	11280	// Bump noise
10799	11281	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	11282	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	11283	+
	11284	+ try
	11285	+ {
	11286	+ BindTexture(NOISE_TEXTURE, false, 2);
	11287	+ }
	11288	+ catch (Exception e)
	11289	+ {
	11290	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11291	+ }
	11292	+
10802	11293
10803	11294	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	11295	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10821,9 +11312,9 @@
10821	11312
10822	11313	gl.glMatrixMode(GL.GL_MODELVIEW);
10823	11314
10824		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10825		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10826		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11315	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11316	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11317	+gl.glEnable(gl.GL_MULTISAMPLE);
10827	11318	} else
10828	11319	{
10829	11320	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10834,7 +11325,7 @@
10834	11325	//System.out.println("BLENDING ON");
10835	11326	gl.glEnable(GL.GL_BLEND);
10836	11327	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837		-
	11328	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10838	11329	gl.glMatrixMode(gl.GL_PROJECTION);
10839	11330	gl.glLoadIdentity();
10840	11331
..	..	@@ -10923,8 +11414,8 @@
10923	11414	System.err.println("parentcam != renderCamera");
10924	11415
10925	11416	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11417	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11418	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10928	11419	}
10929	11420
10930	11421	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11436,8 @@
10945	11436	if (true) // TODO
10946	11437	{
10947	11438	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11439	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11440	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11441	}
10951	11442
10952	11443	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11083,7 +11574,7 @@
11083	11574	}
11084	11575	}
11085	11576
11086		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11577	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11087	11578	{
11088	11579	//gl.glDepthFunc(GL.GL_LEQUAL);
11089	11580	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11091,24 +11582,21 @@
11091	11582
11092	11583	boolean texon = textureon;
11093	11584
11094		- if (RENDERPROGRAM > 0)
11095		- {
11096		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11097		- textureon = false;
11098		- }
	11585	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11586	+ textureon = false;
	11587	+
11099	11588	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11100	11589	//System.out.println("ALLO");
11101	11590	gl.glColorMask(false, false, false, false);
11102	11591	DrawObject(gl);
11103		- if (RENDERPROGRAM > 0)
11104		- {
11105		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11106		- textureon = texon;
11107		- }
	11592	+
	11593	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11594	+ textureon = texon;
	11595	+
11108	11596	gl.glColorMask(true, true, true, true);
11109	11597
11110	11598	gl.glDepthFunc(GL.GL_EQUAL);
11111		- //gl.glDepthMask(false);
	11599	+ gl.glDepthMask(false);
11112	11600	}
11113	11601
11114	11602	if (false) // DrawMode() == SHADOW)
..	..	@@ -11283,23 +11771,44 @@
11283	11771	e.printStackTrace();
11284	11772	}
11285	11773
11286		- if (GrafreeD.RENDERME > 0)
11287		- GrafreeD.RENDERME--; // mechante magouille
	11774	+ if (Grafreed.RENDERME > 0)
	11775	+ Grafreed.RENDERME--; // mechante magouille
11288	11776
11289	11777	Globals.ONESTEP = false;
11290	11778	}
11291	11779
11292	11780	static boolean zoomonce = false;
11293	11781
	11782	+ static void CreateSelectedPoint()
	11783	+ {
	11784	+ if (selectedpoint == null)
	11785	+ {
	11786	+ debugpointG = new Sphere();
	11787	+ debugpointP = new Sphere();
	11788	+ debugpointC = new Sphere();
	11789	+ debugpointR = new Sphere();
	11790	+
	11791	+ selectedpoint = new Superellipsoid();
	11792	+
	11793	+ for (int i=0; i<8; i++)
	11794	+ {
	11795	+ debugpoints[i] = new Sphere();
	11796	+ }
	11797	+ }
	11798	+ }
	11799	+
11294	11800	void DrawObject(GL gl, boolean draw)
11295	11801	{
	11802	+ // To clear camera values
	11803	+ ResetOptions();
	11804	+
11296	11805	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11806	// DrawMode() = SELECTION;
11298	11807	//GL gl = getGL();
11299	11808	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11300	11809	{
11301	11810	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11811	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303	11812	pingthread.StepToTarget(true); // true);
11304	11813	// zoomonce = false;
11305	11814	}
..	..	@@ -11354,7 +11863,14 @@
11354	11863
11355	11864	usedtextures.clear();
11356	11865
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11866	+ try
	11867	+ {
	11868	+ BindTextures(DEFAULT_TEXTURES, 2);
	11869	+ }
	11870	+ catch (Exception e)
	11871	+ {
	11872	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11873	+ }
11358	11874	}
11359	11875	//System.out.println("--> " + stackdepth);
11360	11876	// GrafreeD.traceon();
..	..	@@ -11364,8 +11880,9 @@
11364	11880
11365	11881	if (DrawMode() == DEFAULT)
11366	11882	{
11367		- if (DEBUG)
	11883	+ if (Globals.DEBUG)
11368	11884	{
	11885	+ CreateSelectedPoint();
11369	11886	float radius = 0.05f;
11370	11887	if (selectedpoint.radius != radius)
11371	11888	{
..	..	@@ -11419,20 +11936,32 @@
11419	11936	ReleaseTextures(DEFAULT_TEXTURES);
11420	11937
11421	11938	if (CLEANCACHE)
11422		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11939	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11423	11940	{
11424		- String tex = e.nextElement();
	11941	+ cTexture tex = e.nextElement();
11425	11942
11426	11943	// System.out.println("Texture --------- " + tex);
11427	11944
11428		- if (tex.equals("WHITE_NOISE"))
	11945	+ if (tex.equals("WHITE_NOISE:"))
11429	11946	continue;
11430	11947
11431		- if (!usedtextures.containsKey(tex))
	11948	+ if (!usedtextures.contains(tex))
11432	11949	{
	11950	+ CacheTexture gettex = texturepigment.get(tex);
11433	11951	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11434		- textures.get(tex).texture.dispose();
11435		- textures.remove(tex);
	11952	+ if (gettex != null)
	11953	+ {
	11954	+ gettex.texture.dispose();
	11955	+ texturepigment.remove(tex);
	11956	+ }
	11957	+
	11958	+ gettex = texturebump.get(tex);
	11959	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11960	+ if (gettex != null)
	11961	+ {
	11962	+ gettex.texture.dispose();
	11963	+ texturebump.remove(tex);
	11964	+ }
11436	11965	}
11437	11966	}
11438	11967	}
..	..	@@ -11445,7 +11974,14 @@
11445	11974	if (checker != null && DrawMode() == DEFAULT)
11446	11975	{
11447	11976	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11977	+ try
	11978	+ {
	11979	+ BindTextures(checker.GetTextures(), checker.texres);
	11980	+ }
	11981	+ catch (Exception e)
	11982	+ {
	11983	+ System.err.println("FAILED: " + checker.GetTextures());
	11984	+ }
11449	11985	// NEAREST
11450	11986	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11987	DrawChecker(gl);
..	..	@@ -11527,7 +12063,7 @@
11527	12063	return;
11528	12064	}
11529	12065
11530		- String string = obj.GetToolTip();
	12066	+ String string = obj.toString(); //.GetToolTip();
11531	12067
11532	12068	GL gl = GetGL();
11533	12069
..	..	@@ -11844,8 +12380,8 @@
11844	12380	//obj.TransformToWorld(light, light);
11845	12381	for (int i = tp.size(); --i >= 0;)
11846	12382	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12383	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12384	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12385	}
11850	12386
11851	12387
..	..	@@ -11862,8 +12398,8 @@
11862	12398	parentcam = cameras[0];
11863	12399	}
11864	12400
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12401	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12402	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12403
11868	12404	LA.xformPos(light, renderCamera.toScreen, light);
11869	12405
..	..	@@ -11953,8 +12489,76 @@
11953	12489
11954	12490	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11955	12491
11956		- String program =
	12492	+ String programmin =
	12493	+ // Min shader
11957	12494	"!!ARBfp1.0\n" +
	12495	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12496	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12497	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12498	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12499	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12500	+ "PARAM light2cam0 = program.env[10];" +
	12501	+ "PARAM light2cam1 = program.env[11];" +
	12502	+ "PARAM light2cam2 = program.env[12];" +
	12503	+ "TEMP temp;" +
	12504	+ "TEMP light;" +
	12505	+ "TEMP ndotl;" +
	12506	+ "TEMP normal;" +
	12507	+ "TEMP depth;" +
	12508	+ "TEMP eye;" +
	12509	+ "TEMP pos;" +
	12510	+
	12511	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12512	+ Normalize("normal") +
	12513	+ "MOV light, state.light[0].position;" +
	12514	+ "DP3 ndotl.x, light, normal;" +
	12515	+
	12516	+ // shadow
	12517	+ "MOV pos, fragment.texcoord[1];" +
	12518	+ "MOV temp, pos;" +
	12519	+ ShadowTextureFetch("depth", "temp", "1") +
	12520	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12521	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12522	+
	12523	+ // No shadow when out of frustum
	12524	+ //"SGE temp.y, depth.z, zero123.y;" +
	12525	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12526	+
	12527	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12528	+
	12529	+ // Backlit
	12530	+ "MOV pos.w, zero123.y;" +
	12531	+ "DP4 eye.x, pos, light2cam0;" +
	12532	+ "DP4 eye.y, pos, light2cam1;" +
	12533	+ "DP4 eye.z, pos, light2cam2;" +
	12534	+ Normalize("eye") +
	12535	+
	12536	+ "DP3 ndotl.y, -eye, normal;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12538	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12539	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12540	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12541	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12542	+
	12543	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12544	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12545	+
	12546	+ // Pigment
	12547	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12548	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12549	+ "MUL temp, temp, ndotl.x;" +
	12550	+
	12551	+ "MUL temp, temp, zero123.z;" +
	12552	+
	12553	+ //"MUL temp, temp, ndotl.y;" +
	12554	+
	12555	+ "MOV temp.w, zero123.y;" + // reset alpha
	12556	+ "MOV result.color, temp;" +
	12557	+ "END";
	12558	+
	12559	+ String programmax =
	12560	+ "!!ARBfp1.0\n" +
	12561	+
11958	12562	//"OPTION ARB_fragment_program_shadow;" +
11959	12563	"PARAM light2cam0 = program.env[10];" +
11960	12564	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12069,8 +12673,7 @@
12069	12673	"TEMP shininess;" +
12070	12674	"\n" +
12071	12675	"MOV texSamp, one;" +
12072		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12073		-
	12676	+
12074	12677	"MOV mapgrid.x, one2048th.x;" +
12075	12678	"MOV temp, fragment.texcoord[1];" +
12076	12679	/*
..	..	@@ -12091,20 +12694,20 @@
12091	12694	"MUL temp, floor, mapgrid.x;" +
12092	12695	//"TEX depth0, temp, texture[1], 2D;" +
12093	12696	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12094		- TextureFetch("depth0", "temp", "1") +
	12697	+ ShadowTextureFetch("depth0", "temp", "1") +
12095	12698	"") +
12096	12699	"ADD temp.x, temp.x, mapgrid.x;" +
12097	12700	//"TEX depth1, temp, texture[1], 2D;" +
12098	12701	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12099		- TextureFetch("depth1", "temp", "1") +
	12702	+ ShadowTextureFetch("depth1", "temp", "1") +
12100	12703	"") +
12101	12704	"ADD temp.y, temp.y, mapgrid.x;" +
12102	12705	//"TEX depth2, temp, texture[1], 2D;" +
12103		- TextureFetch("depth2", "temp", "1") +
	12706	+ ShadowTextureFetch("depth2", "temp", "1") +
12104	12707	"SUB temp.x, temp.x, mapgrid.x;" +
12105	12708	//"TEX depth3, temp, texture[1], 2D;" +
12106	12709	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12107		- TextureFetch("depth3", "temp", "1") +
	12710	+ ShadowTextureFetch("depth3", "temp", "1") +
12108	12711	"") +
12109	12712	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12110	12713	//"MOV params, material;" +
..	..	@@ -12475,10 +13078,10 @@
12475	13078	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12476	13079	"") +
12477	13080
12478		- // display shadow only (bump == 0)
	13081	+ // display shadow only (fakedepth == 0)
12479	13082	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	13083	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13084	+ "SLT temp.z, temp.y, -c256i.x;" +
12482	13085	"SUB temp.y, one.x, temp.z;" +
12483	13086	"MUL temp.x, temp.x, temp.y;" +
12484	13087	"KIL temp.x;" +
..	..	@@ -12809,7 +13412,14 @@
12809	13412	//once = true;
12810	13413	}
12811	13414
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13415	+ String program = programmax;
	13416	+
	13417	+ if (Globals.MINSHADER)
	13418	+ {
	13419	+ program = programmin;
	13420	+ }
	13421	+
	13422	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13423	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13424	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13425
..	..	@@ -12902,25 +13512,26 @@
12902	13512	return out;
12903	13513	}
12904	13514
12905		- String TextureFetch(String dest, String src, String unit)
	13515	+ // Also does frustum culling
	13516	+ String ShadowTextureFetch(String dest, String src, String unit)
12906	13517	{
12907	13518	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12908	13519	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12909	13520	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13521	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13522	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12910	13523	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12911		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12912		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12913		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12914		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13524	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13525	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12915	13526	//"SWZ buffer, temp, w,w,w,w;";
12916		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13527	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12917	13528	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12918	13529	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12919	13530	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12920		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13531	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12921	13532
12922		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12923		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13533	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13534	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12924	13535	}
12925	13536
12926	13537	String Shadow(String depth, String shadow)
..	..	@@ -12942,12 +13553,16 @@
12942	13553
12943	13554	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13555	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13556	+
	13557	+ // Compare fragment depth in light space with shadowmap.
12945	13558	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13559	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13560	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13561	+
	13562	+ // Reverse comparison
12948	13563	"SUB temp.x, one.x, temp.x;" +
12949	13564	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13565	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13566	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13567
12953	13568	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13576,10 @@
12961	13576	// No shadow for backface
12962	13577	"DP3 temp.x, normal, lightd;" +
12963	13578	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13579	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13580	+
	13581	+ // No shadow when out of frustum
	13582	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13583	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13584	"";
12966	13585	}
..	..	@@ -13107,7 +13726,8 @@
13107	13726	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13727	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13728	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13729	+
	13730	+ //Object3D.cVector2[] vector2buffer;
13111	13731
13112	13732	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13733	// OUT : diff, spec
..	..	@@ -13123,9 +13743,10 @@
13123	13743	"DP3 " + dest + ".z," + "normals," + "eye;" +
13124	13744	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13125	13745	//"MOV " + dest + ".w," + "normal.z;" +
13126		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13127		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13128		- //"MOV " + dest + ".z," + "params2.w;" +
	13746	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13747	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13748	+
	13749	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13129	13750	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13130	13751	"RCP " + dest + ".w," + dest + ".w;" +
13131	13752	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13519,7 +14140,7 @@
13519	14140	public void mousePressed(MouseEvent e)
13520	14141	{
13521	14142	//System.out.println("mousePressed: " + e);
13522		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14143	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13523	14144	}
13524	14145
13525	14146	static long prevtime = 0;
..	..	@@ -13595,8 +14216,8 @@
13595	14216	// mode \|= META;
13596	14217	//}
13597	14218
13598		- SetMouseMode(WHEEL \| e.getModifiersEx());
13599		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14219	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14220	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13600	14221	anchorX = ax;
13601	14222	anchorY = ay;
13602	14223	prevX = px;
..	..	@@ -13630,6 +14251,7 @@
13630	14251	else
13631	14252	if (evt.getSource() == AAtimer)
13632	14253	{
	14254	+ Globals.TIMERRUNNING = false;
13633	14255	if (mouseDown)
13634	14256	{
13635	14257	//new Exception().printStackTrace();
..	..	@@ -13655,6 +14277,10 @@
13655	14277	// LIVE = waslive;
13656	14278	// wasliveok = true;
13657	14279	// waslive = false;
	14280	+
	14281	+ // May 2019 Forget it:
	14282	+ if (true)
	14283	+ return;
13658	14284
13659	14285	// source == timer
13660	14286	if (mouseDown)
..	..	@@ -13685,7 +14311,7 @@
13685	14311
13686	14312	// fev 2014???
13687	14313	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13688		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14314	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13689	14315	pingthread.StepToTarget(true); // true);
13690	14316	}
13691	14317	// if (!LIVE)
..	..	@@ -13694,12 +14320,13 @@
13694	14320
13695	14321	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13696	14322
13697		- void clickStart(int x, int y, int modifiers)
	14323	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13698	14324	{
13699	14325	if (!wasliveok)
13700	14326	return;
13701	14327
13702	14328	AAtimer.restart(); //
	14329	+ Globals.TIMERRUNNING = true;
13703	14330
13704	14331	// waslive = LIVE;
13705	14332	// LIVE = false;
..	..	@@ -13711,7 +14338,7 @@
13711	14338	// touched = true; // main DL
13712	14339	if (isRenderer)
13713	14340	{
13714		- SetMouseMode(modifiers);
	14341	+ SetMouseMode(modifiers, modifiersex);
13715	14342	}
13716	14343
13717	14344	selectX = anchorX = x;
..	..	@@ -13724,7 +14351,7 @@
13724	14351	clicked = true;
13725	14352	hold = false;
13726	14353
13727		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14354	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13728	14355	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13729	14356	{
13730	14357	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13749,14 +14376,15 @@
13749	14376	drag = false;
13750	14377	//System.out.println("Mouse DOWN");
13751	14378	editObj = false;
13752		- ClickInfo info = new ClickInfo();
13753		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13754		- info.pane = this;
13755		- info.camera = renderCamera;
13756		- info.x = x;
13757		- info.y = y;
13758		- info.modifiers = modifiers;
13759		- editObj = object.doEditClick(info, 0);
	14379	+ //ClickInfo info = new ClickInfo();
	14380	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14381	+ object.clickInfo.pane = this;
	14382	+ object.clickInfo.camera = renderCamera;
	14383	+ object.clickInfo.x = x;
	14384	+ object.clickInfo.y = y;
	14385	+ object.clickInfo.modifiers = modifiersex;
	14386	+ editObj = object.doEditClick(//info,
	14387	+ 0);
13760	14388	if (!editObj)
13761	14389	{
13762	14390	hasMarquee = true;
..	..	@@ -13772,9 +14400,12 @@
13772	14400
13773	14401	public void mouseDragged(MouseEvent e)
13774	14402	{
	14403	+ Globals.MOUSEDRAGGED = true;
	14404	+
13775	14405	//System.out.println("mouseDragged: " + e);
13776	14406	if (isRenderer)
13777	14407	movingcamera = true;
	14408	+
13778	14409	//if (drawing)
13779	14410	//return;
13780	14411	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13784,7 +14415,7 @@
13784	14415	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13785	14416	}
13786	14417	else
13787		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14418	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13788	14419
13789	14420	//try { Thread.sleep(1); } catch (Exception ex) {}
13790	14421	}
..	..	@@ -14021,7 +14652,7 @@
14021	14652	{
14022	14653	Globals.lighttouched = true;
14023	14654	}
14024		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14655	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14025	14656	}
14026	14657	//else
14027	14658	}
..	..	@@ -14035,12 +14666,12 @@
14035	14666	void GoDown(int mod)
14036	14667	{
14037	14668	MODIFIERS \|= COMMAND;
14038		- /*
	14669	+ /**/
14039	14670	if((mod&SHIFT) == SHIFT)
14040		- manipCamera.RotatePosition(0, -speed);
	14671	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14041	14672	else
14042		- manipCamera.BackForth(0, -speed*delta, getWidth());
14043		- */
	14673	+ manipCamera.RotatePosition(0, -speed);
	14674	+ /**/
14044	14675	if ((mod & SHIFT) == SHIFT)
14045	14676	{
14046	14677	mouseMode = mouseMode; // VR??
..	..	@@ -14056,12 +14687,12 @@
14056	14687	void GoUp(int mod)
14057	14688	{
14058	14689	MODIFIERS \|= COMMAND;
14059		- /*
	14690	+ /**/
14060	14691	if((mod&SHIFT) == SHIFT)
14061		- manipCamera.RotatePosition(0, speed);
	14692	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14062	14693	else
14063		- manipCamera.BackForth(0, speed*delta, getWidth());
14064		- */
	14694	+ manipCamera.RotatePosition(0, speed);
	14695	+ /**/
14065	14696	if ((mod & SHIFT) == SHIFT)
14066	14697	{
14067	14698	mouseMode = mouseMode;
..	..	@@ -14077,12 +14708,12 @@
14077	14708	void GoLeft(int mod)
14078	14709	{
14079	14710	MODIFIERS \|= COMMAND;
14080		- /*
	14711	+ /**/
14081	14712	if((mod&SHIFT) == SHIFT)
14082		- manipCamera.RotatePosition(speed, 0);
14083		- else
14084	14713	manipCamera.Translate(speed*delta, 0, getWidth());
14085		- */
	14714	+ else
	14715	+ manipCamera.RotatePosition(speed, 0);
	14716	+ /**/
14086	14717	if ((mod & SHIFT) == SHIFT)
14087	14718	{
14088	14719	mouseMode = mouseMode;
..	..	@@ -14098,12 +14729,12 @@
14098	14729	void GoRight(int mod)
14099	14730	{
14100	14731	MODIFIERS \|= COMMAND;
14101		- /*
	14732	+ /**/
14102	14733	if((mod&SHIFT) == SHIFT)
14103		- manipCamera.RotatePosition(-speed, 0);
14104		- else
14105	14734	manipCamera.Translate(-speed*delta, 0, getWidth());
14106		- */
	14735	+ else
	14736	+ manipCamera.RotatePosition(-speed, 0);
	14737	+ /**/
14107	14738	if ((mod & SHIFT) == SHIFT)
14108	14739	{
14109	14740	mouseMode = mouseMode;
..	..	@@ -14121,7 +14752,7 @@
14121	14752	int X, Y;
14122	14753	boolean SX, SY;
14123	14754
14124		- void drag(int x, int y, int modifiers)
	14755	+ void drag(int x, int y, int modifiers, int modifiersex)
14125	14756	{
14126	14757	if (IsFrozen())
14127	14758	{
..	..	@@ -14130,17 +14761,17 @@
14130	14761
14131	14762	drag = true; // NEW
14132	14763
14133		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14764	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14134	14765
14135	14766	X = x;
14136	14767	Y = y;
14137	14768	// floating state for animation
14138		- MODIFIERS = modifiers;
14139		- modifiers &= ~1024;
	14769	+ MODIFIERS = modifiersex;
	14770	+ modifiersex &= ~1024;
14140	14771	if (false) // modifiers != 0)
14141	14772	{
14142	14773	//new Exception().printStackTrace();
14143		- System.out.println("mouseDragged: " + modifiers);
	14774	+ System.out.println("mouseDragged: " + modifiersex);
14144	14775	System.out.println("SHIFT = " + SHIFT);
14145	14776	System.out.println("CONTROL = " + COMMAND);
14146	14777	System.out.println("META = " + META);
..	..	@@ -14153,14 +14784,16 @@
14153	14784	if (editObj)
14154	14785	{
14155	14786	drag = true;
14156		- ClickInfo info = new ClickInfo();
14157		- info.bounds.setBounds(0, 0,
	14787	+ //ClickInfo info = new ClickInfo();
	14788	+ object.clickInfo.bounds.setBounds(0, 0,
14158	14789	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14159		- info.pane = this;
14160		- info.camera = renderCamera;
14161		- info.x = x;
14162		- info.y = y;
14163		- object.editWindow.copy.doEditDrag(info);
	14790	+ object.clickInfo.pane = this;
	14791	+ object.clickInfo.camera = renderCamera;
	14792	+ object.clickInfo.x = x;
	14793	+ object.clickInfo.y = y;
	14794	+ object //.GetWindow().copy
	14795	+ .doEditDrag(//info,
	14796	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14164	14797	} else
14165	14798	{
14166	14799	if (x < startX)
..	..	@@ -14309,22 +14942,27 @@
14309	14942	}
14310	14943	}
14311	14944
	14945	+// ClickInfo clickInfo = new ClickInfo();
	14946	+
14312	14947	public void mouseMoved(MouseEvent e)
14313	14948	{
14314	14949	//System.out.println("mouseMoved: " + e);
14315	14950	if (isRenderer)
14316	14951	return;
14317	14952
14318		- ClickInfo ci = new ClickInfo();
14319		- ci.x = e.getX();
14320		- ci.y = e.getY();
14321		- ci.modifiers = e.getModifiersEx();
14322		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14323		- ci.pane = this;
14324		- ci.camera = renderCamera;
	14953	+ // Mouse cursor feedback
	14954	+ object.clickInfo.x = e.getX();
	14955	+ object.clickInfo.y = e.getY();
	14956	+ object.clickInfo.modifiers = e.getModifiersEx();
	14957	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14958	+ object.clickInfo.pane = this;
	14959	+ object.clickInfo.camera = renderCamera;
14325	14960	if (!isRenderer)
14326	14961	{
14327		- if (object.editWindow.copy.doEditClick(ci, 0))
	14962	+ //ObjEditor editWindow = object.editWindow;
	14963	+ //Object3D copy = editWindow.copy;
	14964	+ if (object.doEditClick(//clickInfo,
	14965	+ 0))
14328	14966	{
14329	14967	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14330	14968	} else
..	..	@@ -14336,7 +14974,11 @@
14336	14974
14337	14975	public void mouseReleased(MouseEvent e)
14338	14976	{
	14977	+ Globals.MOUSEDRAGGED = false;
	14978	+
14339	14979	movingcamera = false;
	14980	+ X = 0; // getBounds().width/2;
	14981	+ Y = 0; // getBounds().height/2;
14340	14982	//System.out.println("mouseReleased: " + e);
14341	14983	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14342	14984	}
..	..	@@ -14359,9 +15001,9 @@
14359	15001	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360	15002	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361	15003
14362		- if (control \|\| command \|\| IsFrozen())
	15004	+// No delay if (control \|\| command \|\| IsFrozen())
14363	15005	timeout = true;
14364		- else
	15006	+// ?? May 2019 else
14365	15007	// timer.setDelay((modifiers & 128) != 0?0:350);
14366	15008	mouseDown = false;
14367	15009	if (!control && !command) // june 2013
..	..	@@ -14471,7 +15113,7 @@
14471	15113	System.out.println("keyReleased: " + e);
14472	15114	}
14473	15115
14474		- void SetMouseMode(int modifiers)
	15116	+ void SetMouseMode(int modifiers, int modifiersex)
14475	15117	{
14476	15118	//System.out.println("SetMouseMode = " + modifiers);
14477	15119	//modifiers &= ~1024;
..	..	@@ -14483,7 +15125,7 @@
14483	15125	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14484	15126	// return;
14485	15127	//System.out.println("SetMode = " + modifiers);
14486		- if ((modifiers & WHEEL) == WHEEL)
	15128	+ if ((modifiersex & WHEEL) == WHEEL)
14487	15129	{
14488	15130	mouseMode \|= ZOOM;
14489	15131	}
..	..	@@ -14493,15 +15135,15 @@
14493	15135	{
14494	15136	mouseMode \|= VR; // BACKFORTH;
14495	15137	}
14496		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15138	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14497	15139	{
14498	15140	mouseMode \|= SELECT;
14499	15141	}
14500		- if ((modifiers & COMMAND) == COMMAND)
	15142	+ if ((modifiersex & COMMAND) == COMMAND)
14501	15143	{
14502	15144	mouseMode \|= SELECT;
14503	15145	}
14504		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15146	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14505	15147	{
14506	15148	mouseMode &= ~VR;
14507	15149	mouseMode \|= TRANSLATE;
..	..	@@ -14530,7 +15172,7 @@
14530	15172
14531	15173	if (isRenderer) //
14532	15174	{
14533		- SetMouseMode(modifiers);
	15175	+ SetMouseMode(0, modifiers);
14534	15176	}
14535	15177
14536	15178	Globals.theRenderer.keyPressed(key);
..	..	@@ -14592,7 +15234,8 @@
14592	15234	// break;
14593	15235	case 'T':
14594	15236	CACHETEXTURE ^= true;
14595		- textures.clear();
	15237	+ texturepigment.clear();
	15238	+ texturebump.clear();
14596	15239	// repaint();
14597	15240	break;
14598	15241	case 'Y':
..	..	@@ -14677,7 +15320,9 @@
14677	15320	case 'E' : COMPACT ^= true;
14678	15321	repaint();
14679	15322	break;
14680		- case 'W' : DEBUGHSB ^= true;
	15323	+ case 'W' : // Wide Window (fullscreen)
	15324	+ //DEBUGHSB ^= true;
	15325	+ ObjEditor.theFrame.ToggleFullScreen();
14681	15326	repaint();
14682	15327	break;
14683	15328	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14702,8 +15347,8 @@
14702	15347	RevertCamera();
14703	15348	repaint();
14704	15349	break;
14705		- case 'L':
14706	15350	case 'l':
	15351	+ //case 'L':
14707	15352	if (lightMode)
14708	15353	{
14709	15354	lightMode = false;
..	..	@@ -14767,20 +15412,24 @@
14767	15412	OCCLUSION_CULLING ^= true;
14768	15413	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14769	15414	break;
14770		- case '0': envyoff ^= true; repaint(); break;
	15415	+ //case '0': envyoff ^= true; repaint(); break;
14771	15416	case '1':
14772	15417	case '2':
14773	15418	case '3':
14774	15419	case '4':
14775	15420	case '5':
14776		- newenvy = Character.getNumericValue(key);
14777		- repaint();
14778		- break;
14779	15421	case '6':
14780	15422	case '7':
14781	15423	case '8':
14782	15424	case '9':
14783		- BGcolor = (key - '6')/3.f;
	15425	+ if (true) // envyoff)
	15426	+ {
	15427	+ BGcolor = (key - '1')/8.f;
	15428	+ }
	15429	+ else
	15430	+ {
	15431	+ //newenvy = Character.getNumericValue(key);
	15432	+ }
14784	15433	repaint();
14785	15434	break;
14786	15435	case '!':
..	..	@@ -14846,9 +15495,9 @@
14846	15495	case '_':
14847	15496	kompactbit = 5;
14848	15497	break;
14849		- case '+':
14850		- kompactbit = 6;
14851		- break;
	15498	+// case '+':
	15499	+// kompactbit = 6;
	15500	+// break;
14852	15501	case ' ':
14853	15502	lightMode ^= true;
14854	15503	Globals.lighttouched = true;
..	..	@@ -14860,13 +15509,14 @@
14860	15509	case ESC:
14861	15510	RENDERPROGRAM += 1;
14862	15511	RENDERPROGRAM %= 3;
	15512	+
14863	15513	repaint();
14864	15514	break;
14865	15515	case 'Z':
14866	15516	//RESIZETEXTURE ^= true;
14867	15517	//break;
14868	15518	case 'z':
14869		- RENDERSHADOW ^= true;
	15519	+ Globals.RENDERSHADOW ^= true;
14870	15520	Globals.lighttouched = true;
14871	15521	repaint();
14872	15522	break;
..	..	@@ -14899,8 +15549,9 @@
14899	15549	case DELETE:
14900	15550	ClearSelection();
14901	15551	break;
14902		- /*
14903	15552	case '+':
	15553	+
	15554	+ /*
14904	15555	//fontsize += 1;
14905	15556	bbzoom *= 2;
14906	15557	repaint();
..	..	@@ -14917,17 +15568,17 @@
14917	15568	case '=':
14918	15569	IncDepth();
14919	15570	//fontsize += 1;
14920		- object.editWindow.refreshContents(true);
	15571	+ object.GetWindow().refreshContents(true);
14921	15572	maskbit = 6;
14922	15573	break;
14923	15574	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14924	15575	DecDepth();
14925	15576	maskbit = 5;
14926	15577	//if(fontsize > 1) fontsize -= 1;
14927		- if (object.editWindow == null)
14928		- new Exception().printStackTrace();
14929		- else
14930		- object.editWindow.refreshContents(true);
	15578	+// if (object.editWindow == null)
	15579	+// new Exception().printStackTrace();
	15580	+// else
	15581	+ object.GetWindow().refreshContents(true);
14931	15582	break;
14932	15583	case '{':
14933	15584	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14990,7 +15641,7 @@
14990	15641	//mode = ROTATE;
14991	15642	if ((MODIFIERS & COMMAND) == 0) // VR??
14992	15643	{
14993		- SetMouseMode(modifiers);
	15644	+ SetMouseMode(0, modifiers);
14994	15645	}
14995	15646	}
14996	15647
..	..	@@ -15151,7 +15802,7 @@
15151	15802	}
15152	15803	*/
15153	15804
15154		- object.editWindow.EditSelection();
	15805	+ object.GetWindow().EditSelection(false);
15155	15806	}
15156	15807
15157	15808	void SelectParent()
..	..	@@ -15168,10 +15819,10 @@
15168	15819	{
15169	15820	//selectees.remove(i);
15170	15821	System.out.println("select parent of " + elem);
15171		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15822	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15172	15823	} else
15173	15824	{
15174		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15825	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15175	15826	}
15176	15827
15177	15828	first = false;
..	..	@@ -15213,12 +15864,12 @@
15213	15864	for (int j = 0; j < group.children.size(); j++)
15214	15865	{
15215	15866	elem = (Object3D) group.children.elementAt(j);
15216		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15867	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15217	15868	first = false;
15218	15869	}
15219	15870	} else
15220	15871	{
15221		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15872	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15222	15873	}
15223	15874
15224	15875	first = false;
..	..	@@ -15229,21 +15880,21 @@
15229	15880	{
15230	15881	//Composite group = (Composite) object;
15231	15882	Object3D group = object;
15232		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15883	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15233	15884	}
15234	15885
15235	15886	void ResetTransform(int mask)
15236	15887	{
15237	15888	//Composite group = (Composite) object;
15238	15889	Object3D group = object;
15239		- group.editWindow.ResetTransform(mask);
	15890	+ group.GetWindow().ResetTransform(mask);
15240	15891	}
15241	15892
15242	15893	void FlipTransform()
15243	15894	{
15244	15895	//Composite group = (Composite) object;
15245	15896	Object3D group = object;
15246		- group.editWindow.FlipTransform();
	15897	+ group.GetWindow().FlipTransform();
15247	15898	// group.editWindow.ReduceMesh(true);
15248	15899	}
15249	15900
..	..	@@ -15251,7 +15902,7 @@
15251	15902	{
15252	15903	//Composite group = (Composite) object;
15253	15904	Object3D group = object;
15254		- group.editWindow.PrintMemory();
	15905	+ group.GetWindow().PrintMemory();
15255	15906	// group.editWindow.ReduceMesh(true);
15256	15907	}
15257	15908
..	..	@@ -15259,7 +15910,7 @@
15259	15910	{
15260	15911	//Composite group = (Composite) object;
15261	15912	Object3D group = object;
15262		- group.editWindow.ResetCentroid();
	15913	+ group.GetWindow().ResetCentroid();
15263	15914	}
15264	15915
15265	15916	void IncDepth()
..	..	@@ -15341,11 +15992,11 @@
15341	15992
15342	15993	int width = getBounds().width;
15343	15994	int height = getBounds().height;
15344		- ClickInfo info = new ClickInfo();
15345		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15346	15995	//Image img = CreateImage(width, height);
15347	15996	//System.out.println("width = " + width + "; height = " + height + "\n");
	15997	+
15348	15998	Graphics gr = g; // img.getGraphics();
	15999	+
15349	16000	if (!hasMarquee)
15350	16001	{
15351	16002	if (Xmin < Xmax) // !locked)
..	..	@@ -15417,40 +16068,88 @@
15417	16068	}
15418	16069	if (object != null && !hasMarquee)
15419	16070	{
	16071	+ if (object.clickInfo == null)
	16072	+ object.clickInfo = new ClickInfo();
	16073	+ ClickInfo info = object.clickInfo;
	16074	+ //ClickInfo info = new ClickInfo();
	16075	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16076	+
15420	16077	if (isRenderer)
15421	16078	{
15422		- info.flags++;
	16079	+ object.clickInfo.flags++;
15423	16080	double frameAspect = (double) width / (double) height;
15424	16081	if (frameAspect > renderCamera.aspect)
15425	16082	{
15426	16083	int desired = (int) ((double) height * renderCamera.aspect);
15427		- info.bounds.width -= width - desired;
15428		- info.bounds.x += (width - desired) / 2;
	16084	+ object.clickInfo.bounds.width -= width - desired;
	16085	+ object.clickInfo.bounds.x += (width - desired) / 2;
15429	16086	} else
15430	16087	{
15431	16088	int desired = (int) ((double) width / renderCamera.aspect);
15432		- info.bounds.height -= height - desired;
15433		- info.bounds.y += (height - desired) / 2;
	16089	+ object.clickInfo.bounds.height -= height - desired;
	16090	+ object.clickInfo.bounds.y += (height - desired) / 2;
15434	16091	}
15435	16092	}
15436		- info.g = gr;
15437		- info.camera = renderCamera;
	16093	+
	16094	+ object.clickInfo.g = gr;
	16095	+ object.clickInfo.camera = renderCamera;
15438	16096	/*
15439	16097	// Memory intensive (brep.verticescopy)
15440	16098	if (!(object instanceof Composite))
15441	16099	object.draw(info, 0, false); // SLOW :
15442	16100	*/
15443		- if (!isRenderer)
	16101	+ if (!isRenderer) // && drag)
15444	16102	{
15445		- object.drawEditHandles(info, 0);
	16103	+ Grafreed.Assert(object != null);
	16104	+ Grafreed.Assert(object.selection != null);
	16105	+ if (object.selection.Size() > 0)
	16106	+ {
	16107	+ int hitSomething = object.selection.get(0).hitSomething;
	16108	+
	16109	+ object.clickInfo.DX = 0;
	16110	+ object.clickInfo.DY = 0;
	16111	+ object.clickInfo.W = 1;
	16112	+ if (hitSomething == Object3D.hitCenter)
	16113	+ {
	16114	+ info.DX = X;
	16115	+ if (X != 0)
	16116	+ info.DX -= info.bounds.width/2;
	16117	+
	16118	+ info.DY = Y;
	16119	+ if (Y != 0)
	16120	+ info.DY -= info.bounds.height/2;
	16121	+ }
	16122	+
	16123	+ object.drawEditHandles(//info,
	16124	+ 0);
	16125	+
	16126	+ if (drag && (X != 0 \|\| Y != 0))
	16127	+ {
	16128	+ switch (hitSomething)
	16129	+ {
	16130	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16131	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16132	+ break;
	16133	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16134	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16135	+ break;
	16136	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16137	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16138	+ break;
	16139	+ }
	16140	+
	16141	+ }
	16142	+ }
15446	16143	}
15447	16144	}
	16145	+
15448	16146	if (isRenderer)
15449	16147	{
15450	16148	//gr.setColor(Color.black);
15451	16149	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15452	16150	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15453	16151	}
	16152	+
15454	16153	if (hasMarquee)
15455	16154	{
15456	16155	gr.setXORMode(Color.white);
..	..	@@ -15563,6 +16262,7 @@
15563	16262	public boolean mouseDown(Event evt, int x, int y)
15564	16263	{
15565	16264	System.out.println("mouseDown: " + evt);
	16265	+ System.exit(0);
15566	16266	/*
15567	16267	locked = true;
15568	16268	drag = false;
..	..	@@ -15606,7 +16306,7 @@
15606	16306	{
15607	16307	keyPressed(0, modifiers);
15608	16308	}
15609		- clickStart(x, y, modifiers);
	16309	+ // clickStart(x, y, modifiers);
15610	16310	return true;
15611	16311	}
15612	16312
..	..	@@ -15724,7 +16424,7 @@
15724	16424	{
15725	16425	keyReleased(0, 0);
15726	16426	}
15727		- drag(x, y, modifiers);
	16427	+ drag(x, y, 0, modifiers);
15728	16428	return true;
15729	16429	}
15730	16430
..	..	@@ -15856,7 +16556,7 @@
15856	16556	Object3D object;
15857	16557	static Object3D trackedobject;
15858	16558	Camera renderCamera; // Light or Eye (or Occlusion)
15859		- /static/ Camera manipCamera; // Light or Eye
	16559	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15860	16560	/static/ Camera eyeCamera;
15861	16561	/static/ Camera lightCamera;
15862	16562	int cameracount;
..	..	@@ -15920,6 +16620,8 @@
15920	16620	private /static/ boolean firstime;
15921	16621	private /static/ cVector newView = new cVector();
15922	16622	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16623	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16624	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15923	16625	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15924	16626	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15925	16627	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15932,29 +16634,67 @@
15932	16634	{
15933	16635	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15934	16636
	16637	+ int usedsuf = 0;
	16638	+
15935	16639	for (int i = 0; i < suffixes.length; i++)
15936	16640	{
15937		- String resourceName = basename + suffixes[i] + "." + suffix;
15938		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15939		- mipmapped,
15940		- FileUtil.getFileSuffix(resourceName));
15941		- if (data == null)
	16641	+ String[] suffixe = suffixes;
	16642	+ String[] fallback = suffixes2;
	16643	+ String[] fallfallback = suffixes3;
	16644	+
	16645	+ for (int c=usedsuf; --c>=0;)
15942	16646	{
15943		- throw new IOException("Unable to load texture " + resourceName);
	16647	+// String[] temp = suffixe;
	16648	+// suffixe = fallback;
	16649	+// fallback = fallfallback;
	16650	+// fallfallback = temp;
15944	16651	}
	16652	+
	16653	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16654	+ TextureData data;
	16655	+
	16656	+ try
	16657	+ {
	16658	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16659	+ mipmapped,
	16660	+ FileUtil.getFileSuffix(resourceName));
	16661	+ }
	16662	+ catch (Exception e)
	16663	+ {
	16664	+ try
	16665	+ {
	16666	+ resourceName = basename + fallback[i] + "." + suffix;
	16667	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16668	+ mipmapped,
	16669	+ FileUtil.getFileSuffix(resourceName));
	16670	+ }
	16671	+ catch (Exception e2)
	16672	+ {
	16673	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16674	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16675	+ mipmapped,
	16676	+ FileUtil.getFileSuffix(resourceName));
	16677	+ }
	16678	+ }
	16679	+
15945	16680	//System.out.println("Target = " + targets[i]);
15946	16681	cubemap.updateImage(data, targets[i]);
15947	16682	}
15948	16683
15949	16684	return cubemap;
15950	16685	}
	16686	+
15951	16687	int bigsphere = -1;
15952	16688
15953	16689	float BGcolor = 0.5f;
15954	16690
15955		- private void DrawSkyBox(GL gl)
	16691	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16692	+
	16693	+ private void DrawSkyBox(GL gl, float ratio)
15956	16694	{
15957		- if (envyoff \|\| cubemap == null)
	16695	+ if (//envyoff \|\|
	16696	+ WIREFRAME \|\|
	16697	+ cubemap == null)
15958	16698	{
15959	16699	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15960	16700	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15969,7 +16709,17 @@
15969	16709	// Compensates for ExaminerViewer's modification of modelview matrix
15970	16710	gl.glMatrixMode(GL.GL_MODELVIEW);
15971	16711	gl.glLoadIdentity();
	16712	+ gl.glScalef(1,ratio,1);
15972	16713
	16714	+// colorV[0] = 2;
	16715	+// colorV[1] = 2;
	16716	+// colorV[2] = 2;
	16717	+// colorV[3] = 1;
	16718	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16719	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16720	+//
	16721	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16722	+
15973	16723	//gl.glActiveTexture(GL.GL_TEXTURE1);
15974	16724	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15975	16725
..	..	@@ -16001,6 +16751,7 @@
16001	16751	{
16002	16752	gl.glScalef(1.0f, -1.0f, 1.0f);
16003	16753	}
	16754	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16004	16755	gl.glMultMatrixd(viewrot_1, 0);
16005	16756	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16006	16757	//viewer.updateInverseRotation(gl);
..	..	@@ -16041,7 +16792,8 @@
16041	16792	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16042	16793
16043	16794	cubemap.disable();
16044		- ////cubemap.unbind();
	16795	+ //cubemap.dispose();
	16796	+
16045	16797	if (CULLFACE)
16046	16798	{
16047	16799	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16141,16 +16893,16 @@
16141	16893	cStatic.objectstack[materialdepth++] = checker;
16142	16894	//System.out.println("material " + material);
16143	16895	//Applet3D.tracein(this, selected);
16144		- vector2buffer = checker.projectedVertices;
	16896	+ //vector2buffer = checker.projectedVertices;
16145	16897
16146	16898	//checker.GetMaterial().Draw(this, false); // true);
16147		- DrawMaterial(checker.GetMaterial(), false); // true);
	16899	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16148	16900
16149	16901	materialdepth -= 1;
16150	16902	if (materialdepth > 0)
16151	16903	{
16152		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16153		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16904	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16905	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16154	16906	}
16155	16907	//checker.GetMaterial().opacity = 1f;
16156	16908	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16236,6 +16988,14 @@
16236	16988	}
16237	16989	}
16238	16990
	16991	+ private Object3D GetFolder()
	16992	+ {
	16993	+ Object3D folder = object.GetWindow().copy;
	16994	+ if (object.GetWindow().copy.selection.Size() > 0)
	16995	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16996	+ return folder;
	16997	+ }
	16998	+
16239	16999	class SelectBuffer implements GLEventListener
16240	17000	{
16241	17001
..	..	@@ -16251,7 +17011,7 @@
16251	17011	//new Exception().printStackTrace();
16252	17012	System.out.println("select buffer init");
16253	17013	// Use debug pipeline
16254		- drawable.setGL(new DebugGL(drawable.getGL()));
	17014	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16255	17015
16256	17016	GL gl = drawable.getGL();
16257	17017
..	..	@@ -16315,6 +17075,17 @@
16315	17075
16316	17076	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16317	17077
	17078	+ if (PAINTMODE)
	17079	+ {
	17080	+ if (object.GetWindow().copy.selection.Size() > 0)
	17081	+ {
	17082	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17083	+
	17084	+ // Make what you paint not selectable.
	17085	+ paintobj.ResetSelectable();
	17086	+ }
	17087	+ }
	17088	+
16318	17089	//int tmp = selection_view;
16319	17090	//selection_view = -1;
16320	17091	int temp = DrawMode();
..	..	@@ -16326,6 +17097,17 @@
16326	17097	// temp = DEFAULT; // patch for selection debug
16327	17098	Globals.drawMode = temp; // WARNING
16328	17099
	17100	+ if (PAINTMODE)
	17101	+ {
	17102	+ if (object.GetWindow().copy.selection.Size() > 0)
	17103	+ {
	17104	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17105	+
	17106	+ // Revert.
	17107	+ paintobj.RestoreSelectable();
	17108	+ }
	17109	+ }
	17110	+
16329	17111	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16330	17112
16331	17113	// trying different ways of getting the depth info over
..	..	@@ -16373,6 +17155,8 @@
16373	17155	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16374	17156	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16375	17157	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17158	+
	17159	+ CreateSelectedPoint();
16376	17160
16377	17161	// Will fit the mesh !!!
16378	17162	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16422,34 +17206,36 @@
16422	17206	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]));
16423	17207	}
16424	17208
16425		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17209	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16426	17210	}
16427	17211	}
16428	17212
16429	17213	if (!movingcamera && !PAINTMODE)
16430		- object.editWindow.ScreenFitPoint(); // fev 2014
	17214	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16431	17215
16432		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17216	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16433	17217	{
16434		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17218	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16435	17219
16436		- Object3D group = new Object3D("inst" + paintcount++);
	17220	+ if (object.GetWindow().copy.selection.Size() > 0)
	17221	+ {
	17222	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16437	17223
16438		- group.CreateMaterial(); // use a void leaf to select instances
16439		-
16440		- group.add(paintobj); // link
16441		-
16442		- object.editWindow.SnapObject(group);
16443		-
16444		- Object3D folder = object.editWindow.copy;
16445		-
16446		- if (object.editWindow.copy.selection.Size() > 0)
16447		- folder = object.editWindow.copy.selection.elementAt(0);
16448		-
16449		- folder.add(group);
16450		-
16451		- object.editWindow.ResetModel();
16452		- object.editWindow.refreshContents();
	17224	+ Object3D inst = new Object3D("inst" + paintcount++);
	17225	+
	17226	+ inst.CreateMaterial(); // use a void leaf to select instances
	17227	+
	17228	+ inst.add(paintobj); // link
	17229	+
	17230	+ object.GetWindow().SnapObject(inst);
	17231	+
	17232	+ Object3D folder = paintFolder; // GetFolder();
	17233	+
	17234	+ folder.add(inst);
	17235	+
	17236	+ object.GetWindow().ResetModel();
	17237	+ object.GetWindow().refreshContents();
	17238	+ }
16453	17239	}
16454	17240	else
16455	17241	paintcount = 0;
..	..	@@ -16488,6 +17274,11 @@
16488	17274	//System.out.println("objects[color] = " + objects[color]);
16489	17275	//objects[color].Select();
16490	17276	indexcount = 0;
	17277	+ ObjEditor window = object.GetWindow();
	17278	+ if (window != null && deselect)
	17279	+ {
	17280	+ window.Select(null, deselect, true);
	17281	+ }
16491	17282	object.Select(color, deselect);
16492	17283	}
16493	17284
..	..	@@ -16587,7 +17378,7 @@
16587	17378	gl.glDisable(gl.GL_CULL_FACE);
16588	17379	}
16589	17380
16590		- if (!RENDERSHADOW)
	17381	+ if (!Globals.RENDERSHADOW)
16591	17382	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16592	17383
16593	17384	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16597,7 +17388,7 @@
16597	17388	//gl.glColorMask(false, false, false, false);
16598	17389
16599	17390	//render_scene_from_light_view(gl, drawable, 0, 0);
16600		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17391	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16601	17392	{
16602	17393	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16603	17394
..	..	@@ -16766,10 +17557,14 @@
16766	17557	gl.glFlush();
16767	17558
16768	17559	/**/
16769		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17560	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16770	17561
16771		- float[] pixels = occlusionsizebuffer.array();
	17562	+ float[] depths = occlusiondepthbuffer.array();
16772	17563
	17564	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17565	+
	17566	+ int[] pixels = selectsizebuffer.array();
	17567	+
16773	17568	double r = 0, g = 0, b = 0;
16774	17569
16775	17570	double count = 0;
..	..	@@ -16780,7 +17575,7 @@
16780	17575
16781	17576	double FACTOR = 1;
16782	17577
16783		- for (int i = 0; i < pixels.length; i++)
	17578	+ for (int i = 0; i < depths.length; i++)
16784	17579	{
16785	17580	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16786	17581	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16863,7 +17658,7 @@
16863	17658
16864	17659	double scale = ray.z; // 1; // cos
16865	17660
16866		- float depth = pixels[newindex];
	17661	+ float depth = depths[newindex];
16867	17662
16868	17663	/*
16869	17664	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17013,23 +17808,15 @@
17013	17808	int AAbuffersize = 0;
17014	17809
17015	17810	//double[] selectedpoint = new double[3];
17016		- static Superellipsoid selectedpoint = new Superellipsoid();
	17811	+ static Superellipsoid selectedpoint;
17017	17812	static Sphere previousselectedpoint = null;
17018		- static Sphere debugpointG = new Sphere();
17019		- static Sphere debugpointP = new Sphere();
17020		- static Sphere debugpointC = new Sphere();
17021		- static Sphere debugpointR = new Sphere();
	17813	+ static Sphere debugpointG;
	17814	+ static Sphere debugpointP;
	17815	+ static Sphere debugpointC;
	17816	+ static Sphere debugpointR;
17022	17817
17023	17818	static Sphere debugpoints[] = new Sphere[8];
17024	17819
17025		- static
17026		- {
17027		- for (int i=0; i<8; i++)
17028		- {
17029		- debugpoints[i] = new Sphere();
17030		- }
17031		- }
17032		-
17033	17820	static void InitPoints(float radius)
17034	17821	{
17035	17822	for (int i=0; i<8; i++)
..	..	@@ -17068,11 +17855,14 @@
17068	17855	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17069	17856	static IntBuffer bigAAbuffer;
17070	17857	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17071		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17858	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17072	17859	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17073	17860	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17074	17861	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17075		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17862	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17863	+
	17864	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17865	+
17076	17866	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17077	17867	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17078	17868	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();