~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,9 @@
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;
78	116	boolean reverseUP = false;
79	117	static boolean frozen = false;
80	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -137,7 +175,7 @@
137	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	176	boolean anisotropy = true;
139	177	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	179
142	180	boolean macromode = false;
143	181
..	..	@@ -148,6 +186,21 @@
148	186	defaultcaps.setAccumGreenBits(16);
149	187	defaultcaps.setAccumBlueBits(16);
150	188	defaultcaps.setAccumAlphaBits(16);
	189	+ }
	190	+
	191	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	192	+
	193	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	194	+ {
	195	+ try
	196	+ {
	197	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	198	+ } catch (IOException e)
	199	+ {
	200	+ System.out.println("NAME = " + name);
	201	+ e.printStackTrace(); // throw new RuntimeException(e);
	202	+ return null;
	203	+ }
151	204	}
152	205
153	206	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +221,8 @@
168	221
169	222	SetCamera(cam);
170	223
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	226
173	227	object = o;
174	228
..	..	@@ -325,7 +379,7 @@
325	379	cStatic.objectstack[materialdepth++] = obj;
326	380	//System.out.println("material " + material);
327	381	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	382	+ //display.vector2buffer = obj.projectedVertices;
329	383	if (obj instanceof Camera)
330	384	{
331	385	display.options1[0] = material.shift;
..	..	@@ -334,14 +388,28 @@
334	388	display.options1[2] = material.shadowbias;
335	389	display.options1[3] = material.aniso;
336	390	display.options1[4] = material.anisoV;
	391	+// System.out.println("display.options1[0] " + display.options1[0]);
	392	+// System.out.println("display.options1[1] " + display.options1[1]);
	393	+// System.out.println("display.options1[2] " + display.options1[2]);
	394	+// System.out.println("display.options1[3] " + display.options1[3]);
	395	+// System.out.println("display.options1[4] " + display.options1[4]);
337	396	display.options2[0] = material.opacity;
338	397	display.options2[1] = material.diffuse;
339	398	display.options2[2] = material.factor;
	399	+// System.out.println("display.options2[0] " + display.options2[0]);
	400	+// System.out.println("display.options2[1] " + display.options2[1]);
	401	+// System.out.println("display.options2[2] " + display.options2[2]);
340	402
341	403	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	404	+// System.out.println("display.options3[0] " + display.options3[0]);
	405	+// System.out.println("display.options3[1] " + display.options3[1]);
	406	+// System.out.println("display.options3[2] " + display.options3[2]);
342	407	display.options4[0] = material.cameralight/0.2f;
343	408	display.options4[1] = material.subsurface;
344	409	display.options4[2] = material.sheen;
	410	+// System.out.println("display.options4[0] " + display.options4[0]);
	411	+// System.out.println("display.options4[1] " + display.options4[1]);
	412	+// System.out.println("display.options4[2] " + display.options4[2]);
345	413
346	414	// if (display.CURRENTANTIALIAS > 0)
347	415	// display.options3[3] /= 4;
..	..	@@ -357,7 +425,7 @@
357	425	/**/
358	426	} else
359	427	{
360		- DrawMaterial(material, selected);
	428	+ DrawMaterial(material, selected, obj.projectedVertices);
361	429	}
362	430	} else
363	431	{
..	..	@@ -381,8 +449,8 @@
381	449	cStatic.objectstack[materialdepth++] = obj;
382	450	//System.out.println("material " + material);
383	451	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	452	+ //display.vector2buffer = obj.projectedVertices;
	453	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	454	}
387	455	}
388	456
..	..	@@ -399,8 +467,8 @@
399	467	materialdepth -= 1;
400	468	if (materialdepth > 0)
401	469	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	470	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	471	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	472	}
405	473	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	474	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +488,8 @@
420	488	materialdepth -= 1;
421	489	if (materialdepth > 0)
422	490	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	491	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	492	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	493	}
426	494	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	495	//else
..	..	@@ -462,10 +530,12 @@
462	530	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	531	{
464	532	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	533	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	534	+ // TEST LIVE NORMALS && !obj.dontselect
	535	+ ;
466	536	if (!hasnorm)
467	537	{
468		- // System.out.println("FUCK!!");
	538	+ // System.out.println("Mesh normal");
469	539	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	540	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	541	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1260,12 @@
1190	1260	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1261	}
1192	1262	}
	1263	+
1193	1264	if (flipV)
1194	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1266	else
1196	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1197	1269	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1271
..	..	@@ -1213,10 +1285,12 @@
1213	1285	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1286	}
1215	1287	}
	1288	+
1216	1289	if (flipV)
1217	1290	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1291	else
1219	1292	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1293	+
1220	1294	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1295	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1296
..	..	@@ -1244,8 +1318,10 @@
1244	1318	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1319	else
1246	1320	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1321	+
1247	1322	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1323	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1324	+
1249	1325	count2 += 2;
1250	1326	count3 += 3;
1251	1327	}
..	..	@@ -1424,6 +1500,8 @@
1424	1500	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425	1501	}
1426	1502
	1503	+ float[] colorV = new float[4];
	1504	+
1427	1505	void SetColor(Object3D obj, Vertex p0)
1428	1506	{
1429	1507	CameraPane display = this;
..	..	@@ -1491,8 +1569,6 @@
1491	1569	{
1492	1570	return;
1493	1571	}
1494		-
1495		- float[] colorV = new float[3];
1496	1572
1497	1573	if (false) // marked)
1498	1574	{
..	..	@@ -1601,7 +1677,7 @@
1601	1677	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1678	}
1603	1679
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1680	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1681	{
1606	1682	CameraPane display = this;
1607	1683	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1704,7 @@
1628	1704
1629	1705	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1706
1631		- float[] colorV = GrafreeD.colorV;
	1707	+ float[] colorV = Grafreed.colorV;
1632	1708
1633	1709	/**/
1634	1710	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1712,7 @@
1636	1712	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1713	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1714	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1715	+ colorV[3] = 1; // material.opacity;
1640	1716
1641	1717	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1718	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1820,9 @@
1744	1820	display.modelParams7[2] = 0;
1745	1821	display.modelParams7[3] = 0;
1746	1822
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1823	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1824
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1825	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1826	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1827	{
1752	1828	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1964,7 @@
1888	1964	void PushMatrix(double[][] matrix)
1889	1965	{
1890	1966	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1967	+ PushMatrix(matrix, 1);
1892	1968	}
1893	1969
1894	1970	void PushMatrix()
..	..	@@ -2042,7 +2118,7 @@
2042	2118	//System.err.println("Oeil on");
2043	2119	OEIL = true;
2044	2120	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2121	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2122	//pingthread.StepToTarget(true);
2047	2123	}
2048	2124
..	..	@@ -2140,7 +2216,7 @@
2140	2216	System.err.println("LIVE = " + Globals.isLIVE());
2141	2217
2142	2218	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2219	+ Grafreed.savesound = true; // wav.save();
2144	2220	// else
2145	2221	repaint(); // start loop // may 2013
2146	2222	}
..	..	@@ -2257,7 +2333,7 @@
2257	2333
2258	2334	void ToggleDebug()
2259	2335	{
2260		- DEBUG ^= true;
	2336	+ Globals.DEBUG ^= true;
2261	2337	}
2262	2338
2263	2339	void ToggleLookAt()
..	..	@@ -2265,7 +2341,7 @@
2265	2341	LOOKAT ^= true;
2266	2342	}
2267	2343
2268		- void ToggleRandom()
	2344	+ void ToggleSwitch()
2269	2345	{
2270	2346	SWITCH ^= true;
2271	2347	}
..	..	@@ -2275,10 +2351,17 @@
2275	2351	HANDLES ^= true;
2276	2352	}
2277	2353
	2354	+ Object3D paintFolder;
	2355	+
2278	2356	void TogglePaint()
2279	2357	{
2280	2358	PAINTMODE ^= true;
2281	2359	paintcount = 0;
	2360	+
	2361	+ if (PAINTMODE)
	2362	+ {
	2363	+ paintFolder = GetFolder();
	2364	+ }
2282	2365	}
2283	2366
2284	2367	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2457,22 @@
2374	2457	{
2375	2458	return currentGL;
2376	2459	}
2377		-
	2460	+
	2461	+ static private BufferedImage CreateBim(TextureData texturedata)
	2462	+ {
	2463	+ Grafreed.Assert(texturedata != null);
	2464	+
	2465	+ int width = texturedata.getWidth();
	2466	+ int height = texturedata.getHeight();
	2467	+
	2468	+ Buffer buffer = texturedata.getBuffer();
	2469	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2470	+
	2471	+ byte[] bytes = bytebuf.array();
	2472	+
	2473	+ return CreateBim(bytes, width, height);
	2474	+ }
	2475	+
2378	2476	/**/
2379	2477	class CacheTexture
2380	2478	{
..	..	@@ -2383,28 +2481,31 @@
2383	2481
2384	2482	int resolution;
2385	2483
2386		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2387	2485	{
2388		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2389	2488	resolution = res;
2390	2489	}
2391	2490	}
2392	2491	/**/
2393	2492
2394	2493	// 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>();
	2494	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2495	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2496	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2497	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2498	+
2398	2499	int pigmentdepth = 0;
2399	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2501	int bumpdepth = 0;
2401	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2403	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2404		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2405	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2406	2507
2407		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2408	2509	{
2409	2510	TextureData texturedata = null;
2410	2511
..	..	@@ -2423,13 +2524,34 @@
2423	2524	if (bump)
2424	2525	texturedata = ConvertBump(texturedata, false);
2425	2526
2426		- com.sun.opengl.util.texture.Texture texture =
2427		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2527	+// com.sun.opengl.util.texture.Texture texture =
	2528	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2428	2529
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);
	2530	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2531	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2431	2532
2432		- return texture;
	2533	+ return texturedata;
	2534	+ }
	2535	+
	2536	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2537	+ {
	2538	+ TextureData texturedata = null;
	2539	+
	2540	+ try
	2541	+ {
	2542	+ texturedata =
	2543	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2544	+ bim,
	2545	+ true);
	2546	+ } catch (Exception e)
	2547	+ {
	2548	+ throw new javax.media.opengl.GLException(e);
	2549	+ }
	2550	+
	2551	+ if (bump)
	2552	+ texturedata = ConvertBump(texturedata, false);
	2553	+
	2554	+ return texturedata;
2433	2555	}
2434	2556
2435	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3502,6 +3624,8 @@
3502	3624
3503	3625	System.out.println("LOADING TEXTURE : " + name);
3504	3626
	3627	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3628	+
3505	3629	//
3506	3630	if (false) // compressbit > 0)
3507	3631	{
..	..	@@ -7900,7 +8024,7 @@
7900	8024	String pigment = Object3D.GetPigment(tex);
7901	8025	String bump = Object3D.GetBump(tex);
7902	8026
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	8028	{
7905	8029	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	8030	// System.out.println("; bump = " + bump);
..	..	@@ -7915,11 +8039,69 @@
7915	8039	pigment = null;
7916	8040	}
7917	8041
7918		- ReleaseTexture(bump, true);
7919		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
7920	8044	}
7921	8045
7922		- void ReleaseTexture(String tex, boolean bump)
	8046	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8047	+ {
	8048	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8049	+ {
	8050	+ return;
	8051	+ }
	8052	+
	8053	+ if (tex == null)
	8054	+ {
	8055	+ ReleaseTexture(null, false);
	8056	+ return;
	8057	+ }
	8058	+
	8059	+ String pigment = Object3D.GetPigment(tex);
	8060	+
	8061	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8062	+ {
	8063	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8064	+ // System.out.println("; bump = " + bump);
	8065	+ }
	8066	+
	8067	+ if (pigment.equals(""))
	8068	+ {
	8069	+ pigment = null;
	8070	+ }
	8071	+
	8072	+ ReleaseTexture(tex, false);
	8073	+ }
	8074	+
	8075	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8076	+ {
	8077	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8078	+ {
	8079	+ return;
	8080	+ }
	8081	+
	8082	+ if (tex == null)
	8083	+ {
	8084	+ ReleaseTexture(null, true);
	8085	+ return;
	8086	+ }
	8087	+
	8088	+ String bump = Object3D.GetBump(tex);
	8089	+
	8090	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8091	+ {
	8092	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8093	+ // System.out.println("; bump = " + bump);
	8094	+ }
	8095	+
	8096	+ if (bump.equals(""))
	8097	+ {
	8098	+ bump = null;
	8099	+ }
	8100	+
	8101	+ ReleaseTexture(tex, true);
	8102	+ }
	8103	+
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
7923	8105	{
7924	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7925	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7930,7 +8112,7 @@
7930	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7931	8113
7932	8114	if (tex != null)
7933		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7934	8116
7935	8117	// //assert( texture != null );
7936	8118	// if (texture == null)
..	..	@@ -8022,7 +8204,55 @@
8022	8204	}
8023	8205	}
8024	8206
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8207	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8208	+ {
	8209	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8210	+// ambientOcclusion ) // \|\| !textureon)
	8211	+// {
	8212	+// return; // false;
	8213	+// }
	8214	+//
	8215	+// if (tex == null)
	8216	+// {
	8217	+// BindTexture(null,false,resolution);
	8218	+// BindTexture(null,true,resolution);
	8219	+// return;
	8220	+// }
	8221	+//
	8222	+// String pigment = Object3D.GetPigment(tex);
	8223	+// String bump = Object3D.GetBump(tex);
	8224	+//
	8225	+// usedtextures.add(pigment);
	8226	+// usedtextures.add(bump);
	8227	+//
	8228	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8229	+// {
	8230	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8231	+// // System.out.println("; bump = " + bump);
	8232	+// }
	8233	+//
	8234	+// if (bump.equals(""))
	8235	+// {
	8236	+// bump = null;
	8237	+// }
	8238	+// if (pigment.equals(""))
	8239	+// {
	8240	+// pigment = null;
	8241	+// }
	8242	+//
	8243	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8244	+// BindTexture(pigment, false, resolution);
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8246	+// BindTexture(bump, true, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8248	+//
	8249	+// return; // true;
	8250	+
	8251	+ BindPigmentTexture(tex, resolution);
	8252	+ BindBumpTexture(tex, resolution);
	8253	+ }
	8254	+
	8255	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8256	{
8027	8257	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8258	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8033,17 +8263,47 @@
8033	8263	if (tex == null)
8034	8264	{
8035	8265	BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
8037	8266	return;
8038	8267	}
8039	8268
8040	8269	String pigment = Object3D.GetPigment(tex);
	8270	+
	8271	+ usedtextures.add(tex);
	8272	+
	8273	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8274	+ {
	8275	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8276	+ // System.out.println("; bump = " + bump);
	8277	+ }
	8278	+
	8279	+ if (pigment.equals(""))
	8280	+ {
	8281	+ pigment = null;
	8282	+ }
	8283	+
	8284	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8285	+ BindTexture(tex, false, resolution);
	8286	+ }
	8287	+
	8288	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8289	+ {
	8290	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8291	+ ambientOcclusion ) // \|\| !textureon)
	8292	+ {
	8293	+ return; // false;
	8294	+ }
	8295	+
	8296	+ if (tex == null)
	8297	+ {
	8298	+ BindTexture(null,true,resolution);
	8299	+ return;
	8300	+ }
	8301	+
8041	8302	String bump = Object3D.GetBump(tex);
8042	8303
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8304	+ usedtextures.add(tex);
8045	8305
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8306	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8307	{
8048	8308	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8309	// System.out.println("; bump = " + bump);
..	..	@@ -8053,43 +8313,94 @@
8053	8313	{
8054	8314	bump = null;
8055	8315	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8316
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
8065	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8320	}
8069	8321
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8322	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8323	+
	8324	+ private boolean FileExists(String tex)
8071	8325	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8326	+ if (missingTextures.contains(tex))
	8327	+ {
	8328	+ return false;
	8329	+ }
	8330	+
	8331	+ boolean fileExists = new File(tex).exists();
	8332	+
	8333	+ if (!fileExists)
	8334	+ {
	8335	+ // If file exists, the "new File()" is not executed sgain
	8336	+ missingTextures.add(tex);
	8337	+ }
	8338	+
	8339	+ return fileExists;
	8340	+ }
	8341	+
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8343	+ {
	8344	+ CacheTexture texturecache = null;
8073	8345
8074	8346	if (tex != null)
8075	8347	{
8076		- String texname = tex;
	8348	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8349	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8077	8350
8078		- String[] split = tex.split("Textures");
8079		- if (split.length > 1)
8080		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081		- else
8082		- if (!texname.startsWith("/"))
8083		- texname = "/Users/nbriere/Textures/" + texname;
	8351	+ if (texname.equals("") && texdata == null)
	8352	+ {
	8353	+ return null;
	8354	+ }
	8355	+
	8356	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8357	+
	8358	+// String[] split = tex.split("Textures");
	8359	+// if (split.length > 1)
	8360	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8361	+// else
	8362	+// if (!texname.startsWith("/"))
	8363	+// texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8365	+ {
	8366	+ texname = fallbackTextureName;
	8367	+ }
8084	8368
8085	8369	if (CACHETEXTURE)
8086		- texture = textures.get(texname); // TEXTURE CACHE
8087		-
8088		- TextureData texturedata = null;
8089		-
8090		- if (texture == null \|\| texture.resolution < resolution)
8091	8370	{
8092		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8371	+ if (texdata == null)
	8372	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8373	+ else
	8374	+ texturecache = bimtextures.get(texdata);
	8375	+ }
	8376	+
	8377	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8378	+ {
	8379	+ TextureData texturedata = null;
	8380	+
	8381	+ if (texdata != null && textureon)
	8382	+ {
	8383	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8384	+
	8385	+ try
	8386	+ {
	8387	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8388	+ }
	8389	+ catch (Exception e)
	8390	+ {
	8391	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8392	+ }
	8393	+
	8394	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8395	+ bimtextures.put(texdata, texturecache);
	8396	+
	8397	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8398	+
	8399	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8400	+ //bim2 = bim;
	8401	+ }
	8402	+ else
	8403	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8093	8404	{
8094	8405	assert(!bump);
8095	8406	// if (bump)
..	..	@@ -8100,19 +8411,23 @@
8100	8411	// }
8101	8412	// else
8102	8413	// {
8103		- texture = textures.get(tex);
8104		- if (texture == null)
	8414	+ // texturecache = textures.get(texname); // suspicious
	8415	+ if (texturecache == null)
8105	8416	{
8106		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8417	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8107	8418	}
	8419	+ else
	8420	+ new Exception().printStackTrace();
8108	8421	// }
8109	8422	} else
8110		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8111	8424	{
8112	8425	assert(bump);
8113		- texture = textures.get(tex);
8114		- if (texture == null)
8115		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ // texturecache = textures.get(texname); // suspicious
	8427	+ if (texturecache == null)
	8428	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8429	+ else
	8430	+ new Exception().printStackTrace();
8116	8431	} else
8117	8432	{
8118	8433	//if (tex.equals("IMMORTAL"))
..	..	@@ -8120,11 +8435,22 @@
8120	8435	// texture = GetResourceTexture("default.png");
8121	8436	//} else
8122	8437	//{
8123		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
8124	8439	{
8125		- texture = textures.get(tex);
8126		- if (texture == null)
8127		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ // texturecache = textures.get(texname); // suspicious
	8441	+ if (texturecache == null)
	8442	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8443	+ else
	8444	+ new Exception().printStackTrace();
	8445	+ } else
	8446	+ {
	8447	+ if (texname.startsWith("@"))
	8448	+ {
	8449	+ // texturecache = textures.get(texname); // suspicious
	8450	+ if (texturecache == null)
	8451	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8452	+ else
	8453	+ new Exception().printStackTrace();
8128	8454	} else
8129	8455	{
8130	8456	if (textureon)
..	..	@@ -8149,7 +8475,7 @@
8149	8475	}
8150	8476
8151	8477	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152		- if (!new File(cachename).exists())
	8478	+ if (!FileExists(cachename))
8153	8479	cachename = texname;
8154	8480	else
8155	8481	processbump = false; // don't process bump map again
..	..	@@ -8171,7 +8497,7 @@
8171	8497	}
8172	8498
8173	8499	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174		- if (!new File(cachename).exists())
	8500	+ if (!FileExists(cachename))
8175	8501	cachename = texname;
8176	8502	else
8177	8503	processbump = false; // don't process bump map again
..	..	@@ -8180,20 +8506,23 @@
8180	8506	texturedata = GetFileTexture(cachename, processbump, resolution);
8181	8507
8182	8508
8183		- if (texturedata != null)
8184		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ if (texturedata == null)
	8510	+ throw new Exception();
	8511	+
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
8185	8513	//texture = GetTexture(tex, bump);
8186	8514	}
	8515	+ }
8187	8516	}
8188	8517	//}
8189	8518	}
8190	8519
8191		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8192	8521	{
8193	8522	//return false;
8194	8523
8195	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8196		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8525	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8197	8526	{
8198	8527	// String ext = "_highres";
8199	8528	// if (REDUCETEXTURE)
..	..	@@ -8210,52 +8539,17 @@
8210	8539	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8211	8540	if (!cachefile.exists())
8212	8541	{
8213		- // cache to disk
8214		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8215		- //buffers[0].
8216		-
8217		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8218		- int[] pixels = new int[bytebuf.capacity()/3];
8219		-
8220		- // squared size heuristic...
8221		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8542	+ //if (texturedata.getWidth() == texturedata.getHeight())
8222	8543	{
8223		- for (int i=pixels.length; --i>=0;)
8224		- {
8225		- int i3 = i*3;
8226		- pixels[i] = 0xFF;
8227		- pixels[i] <<= 8;
8228		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8229		- pixels[i] <<= 8;
8230		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8233		- }
8234		-
8235		- /*
8236		- int r=0,g=0,b=0,a=0;
8237		- for (int i=0; i<width; i++)
8238		- for (int j=0; j<height; j++)
8239		- {
8240		- int index = j*width+i;
8241		- int p = pixels[index];
8242		- a = ((p>>24) & 0xFF);
8243		- r = ((p>>16) & 0xFF);
8244		- g = ((p>>8) & 0xFF);
8245		- b = (p & 0xFF);
8246		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8247		- }
8248		- /**/
8249		- int width = (int)Math.sqrt(pixels.length); // squared
8250		- int height = width;
8251		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8252		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8544	+ BufferedImage rendImage = CreateBim(texturedata);
	8545	+
8253	8546	ImageWriter writer = null;
8254	8547	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8255	8548	if (iter.hasNext()) {
8256	8549	writer = (ImageWriter)iter.next();
8257	8550	}
8258		- float compressionQuality = 0.9f;
	8551	+
	8552	+ float compressionQuality = 0.85f;
8259	8553	try
8260	8554	{
8261	8555	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8272,18 +8566,20 @@
8272	8566	}
8273	8567	}
8274	8568	}
8275		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
8276	8572	//System.out.println("Texture = " + tex);
8277		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
8278	8574	{
8279		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
8280	8576	thetex.texture.disable();
8281	8577	thetex.texture.dispose();
8282		- textures.remove(texname);
	8578	+ textures.remove(tex);
8283	8579	}
8284	8580
8285		- texture.texturedata = texturedata;
8286		- textures.put(texname, texture);
	8581	+ //texture.texturedata = texturedata;
	8582	+ textures.put(tex, texturecache);
8287	8583
8288	8584	// newtex = true;
8289	8585	}
..	..	@@ -8299,10 +8595,44 @@
8299	8595	}
8300	8596	}
8301	8597
8302		- return texture;
	8598	+ return texturecache;
8303	8599	}
8304	8600
8305		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8601	+ static void EmbedTextures(cTexture tex)
	8602	+ {
	8603	+ if (tex.pigmentdata == null)
	8604	+ {
	8605	+ //String texname = Object3D.GetPigment(tex);
	8606	+
	8607	+ CacheTexture texturecache = texturepigment.get(tex);
	8608	+
	8609	+ if (texturecache != null)
	8610	+ {
	8611	+ tex.pw = texturecache.texturedata.getWidth();
	8612	+ tex.ph = texturecache.texturedata.getHeight();
	8613	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8614	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8615	+ ;
	8616	+ //, tex.pw, tex.ph), 0.5f);
	8617	+ }
	8618	+ }
	8619	+
	8620	+ if (tex.bumpdata == null)
	8621	+ {
	8622	+ //String texname = Object3D.GetBump(tex);
	8623	+
	8624	+ CacheTexture texturecache = texturebump.get(tex);
	8625	+
	8626	+ if (texturecache != null)
	8627	+ {
	8628	+ tex.bw = texturecache.texturedata.getWidth();
	8629	+ tex.bh = texturecache.texturedata.getHeight();
	8630	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8631	+ }
	8632	+ }
	8633	+ }
	8634	+
	8635	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8306	8636	{
8307	8637	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8308	8638
..	..	@@ -8320,21 +8650,21 @@
8320	8650	return texture!=null?texture.texture:null;
8321	8651	}
8322	8652
8323		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8653	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8324	8654	{
8325	8655	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8326	8656
8327	8657	return texture!=null?texture.texturedata:null;
8328	8658	}
8329	8659
8330		- boolean BindTexture(String tex, boolean bump, int resolution)
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8331	8661	{
8332	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8333	8663	{
8334	8664	return false;
8335	8665	}
8336	8666
8337		- boolean newtex = false;
	8667	+ //boolean newtex = false;
8338	8668
8339	8669	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8340	8670
..	..	@@ -8366,9 +8696,75 @@
8366	8696	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8367	8697	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8368	8698
8369		- return newtex;
	8699	+ return true; // Warning: not used.
8370	8700	}
8371	8701
	8702	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8703	+ {
	8704	+ try
	8705	+ {
	8706	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8707	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8708	+ ImageWriter writer = writers.next();
	8709	+
	8710	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8711	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8712	+ param.setCompressionQuality(quality);
	8713	+
	8714	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8715	+ writer.setOutput(ios);
	8716	+ writer.write(null, new IIOImage(image, null, null), param);
	8717	+
	8718	+ byte[] data = baos.toByteArray();
	8719	+ writer.dispose();
	8720	+ return data;
	8721	+ }
	8722	+ catch (Exception e)
	8723	+ {
	8724	+ e.printStackTrace();
	8725	+ return null;
	8726	+ }
	8727	+ }
	8728	+
	8729	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8730	+ {
	8731	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8732	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8733	+ ImageReader reader = writers.next();
	8734	+
	8735	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8736	+
	8737	+ ImageReadParam param = reader.getDefaultReadParam();
	8738	+ param.setDestination(bim);
	8739	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8740	+
	8741	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8742	+ reader.setInput(ios);
	8743	+ BufferedImage bim2 = reader.read(0, param);
	8744	+ reader.dispose();
	8745	+
	8746	+// WritableRaster raster = bim2.getRaster();
	8747	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8748	+// byte[] bytes = data.getData();
	8749	+//
	8750	+// int[] pixels = new int[bytes.length/3];
	8751	+// for (int i=pixels.length; --i>=0;)
	8752	+// {
	8753	+// int i3 = i*3;
	8754	+// pixels[i] = 0xFF;
	8755	+// pixels[i] <<= 8;
	8756	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3] & 0xFF;
	8761	+// }
	8762	+//
	8763	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8764	+
	8765	+ return bim;
	8766	+ }
	8767	+
8372	8768	ShadowBuffer shadowPBuf;
8373	8769	AntialiasBuffer antialiasPBuf;
8374	8770	int MAXSTACK;
..	..	@@ -8385,10 +8781,12 @@
8385	8781
8386	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8387	8783	MAXSTACK = temp[0];
8388		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8389	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8390	8787	MAXSTACK = temp[0];
8391		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8392	8790
8393	8791	// Use debug pipeline
8394	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8396,7 +8794,8 @@
8396	8794	gl = drawable.getGL(); //
8397	8795
8398	8796	GL gl3 = getGL();
8399		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8400	8799
8401	8800
8402	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8561,7 +8960,7 @@
8561	8960
8562	8961	if (cubemap == null)
8563	8962	{
8564		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8565	8964	}
8566	8965
8567	8966	//cubemap.enable();
..	..	@@ -8837,6 +9236,8 @@
8837	9236
8838	9237	void LoadEnvy(int which)
8839	9238	{
	9239	+ assert(false);
	9240	+
8840	9241	String name;
8841	9242	String ext;
8842	9243
..	..	@@ -8848,37 +9249,58 @@
8848	9249	cubemap = null;
8849	9250	return;
8850	9251	case 1:
8851		- name = "cubemaps/box_";
8852		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
8853	9254	reverseUP = false;
8854	9255	break;
8855	9256	case 2:
8856		- name = "cubemaps/uffizi_";
8857		- ext = "png";
8858		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
8859	9261	case 3:
8860		- name = "cubemaps/CloudyHills_";
8861		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
8862	9264	reverseUP = false;
8863	9265	break;
8864	9266	case 4:
8865		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
8866	9268	ext = "png";
8867	9269	reverseUP = false;
8868	9270	break;
	9271	+ case 5:
	9272	+ name = "cubemaps/skycube/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 6:
	9277	+ name = "cubemaps/SaintLazarusChurch3/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 7:
	9282	+ name = "cubemaps/Sodermalmsallen/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 8:
	9287	+ name = "cubemaps/Sodermalmsallen2/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 9:
	9292	+ name = "cubemaps/UnionSquare/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
8869	9296	default:
8870		- name = "cubemaps/rgb_";
8871		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
8872	9300	break;
8873	9301	}
8874		-
8875		- try
8876		- {
8877		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8878		- } catch (IOException e)
8879		- {
8880		- throw new RuntimeException(e);
8881		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
8882	9304	}
8883	9305
8884	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8910,8 +9332,12 @@
8910	9332	static double[] model = new double[16];
8911	9333	double[] camera2light = new double[16];
8912	9334	double[] light2camera = new double[16];
8913		- int newenvy = -1;
8914		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
8915	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8916	9342	//float[] light0 = { 0,0,0 };
8917	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9204,11 +9630,35 @@
9204	9630	jy8[3] = 0.5f;
9205	9631	}
9206	9632
9207		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9633	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9208	9634	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9209	9635	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9210	9636	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9211	9637
	9638	+ void ResetOptions()
	9639	+ {
	9640	+ options1[0] = 100;
	9641	+ options1[1] = 0.025f;
	9642	+ options1[2] = 0.01f;
	9643	+ options1[3] = 0;
	9644	+ options1[4] = 0;
	9645	+
	9646	+ options2[0] = 0;
	9647	+ options2[1] = 0.75f;
	9648	+ options2[2] = 0;
	9649	+ options2[3] = 0;
	9650	+
	9651	+ options3[0] = 1;
	9652	+ options3[1] = 1;
	9653	+ options3[2] = 1;
	9654	+ options3[3] = 0;
	9655	+
	9656	+ options4[0] = 1;
	9657	+ options4[1] = 0;
	9658	+ options4[2] = 1;
	9659	+ options4[3] = 0;
	9660	+ }
	9661	+
9212	9662	static int imagecount = 0; // movie generation
9213	9663
9214	9664	static int jitter = 0;
..	..	@@ -9304,8 +9754,8 @@
9304	9754	assert (parentcam != renderCamera);
9305	9755
9306	9756	if (renderCamera != lightCamera)
9307		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9757	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9309	9759
9310	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9311	9761
..	..	@@ -9320,8 +9770,8 @@
9320	9770	LA.matCopy(renderCamera.fromScreen, matrix);
9321	9771
9322	9772	if (renderCamera != lightCamera)
9323		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9773	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9325	9775
9326	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9327	9777
..	..	@@ -9367,10 +9817,12 @@
9367	9817	rati = 1 / rati;
9368	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9369	9819	}
9370		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9371	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9372	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9373		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9374	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9375	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9376	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9538,7 +9990,7 @@
9538	9990
9539	9991	if (!BOXMODE)
9540	9992	{
9541		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9993	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9542	9994	}
9543	9995
9544	9996	if (!BOXMODE)
..	..	@@ -9576,7 +10028,7 @@
9576	10028	ABORTED = false;
9577	10029	}
9578	10030	else
9579		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10031	+ Grafreed.wav.cursor += 735 * ACSIZE;
9580	10032
9581	10033	if (false)
9582	10034	{
..	..	@@ -10239,11 +10691,11 @@
10239	10691
10240	10692	public void display(GLAutoDrawable drawable)
10241	10693	{
10242		- if (GrafreeD.savesound && GrafreeD.hassound)
	10694	+ if (Grafreed.savesound && Grafreed.hassound)
10243	10695	{
10244		- GrafreeD.wav.save();
10245		- GrafreeD.savesound = false;
10246		- GrafreeD.hassound = false;
	10696	+ Grafreed.wav.save();
	10697	+ Grafreed.savesound = false;
	10698	+ Grafreed.hassound = false;
10247	10699	}
10248	10700	// if (DEBUG_SELECTION)
10249	10701	// {
..	..	@@ -10319,6 +10771,7 @@
10319	10771	ANTIALIAS = 0;
10320	10772	//System.out.println("RESTART");
10321	10773	AAtimer.restart();
	10774	+ Globals.TIMERRUNNING = true;
10322	10775	}
10323	10776	}
10324	10777	}
..	..	@@ -10373,7 +10826,7 @@
10373	10826	Object3D theobject = object;
10374	10827	Object3D theparent = object.parent;
10375	10828	object.parent = null;
10376		- object = (Object3D)GrafreeD.clone(object);
	10829	+ object = (Object3D)Grafreed.clone(object);
10377	10830	object.Stripify();
10378	10831	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10379	10832	theobject.PreprocessOcclusion(this);
..	..	@@ -10386,13 +10839,14 @@
10386	10839	ambientOcclusion = false;
10387	10840	}
10388	10841
10389		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10842	+ if (//Globals.lighttouched &&
	10843	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10390	10844	{
10391	10845	//if (RENDERSHADOW) // ?
10392	10846	if (!IsFrozen())
10393	10847	{
10394	10848	// dec 2012
10395		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10849	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10396	10850	{
10397	10851	Globals.framecount++;
10398	10852	shadowbuffer.display();
..	..	@@ -10405,7 +10859,7 @@
10405	10859
10406	10860	if (wait)
10407	10861	{
10408		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10409	10863
10410	10864	wait = false;
10411	10865	}
..	..	@@ -10519,8 +10973,8 @@
10519	10973
10520	10974	// if (parentcam != renderCamera) // not a light
10521	10975	if (cam != lightCamera)
10522		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10976	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10524	10978
10525	10979	for (int j = 0; j < 4; j++)
10526	10980	{
..	..	@@ -10534,8 +10988,8 @@
10534	10988
10535	10989	// if (parentcam != renderCamera) // not a light
10536	10990	if (cam != lightCamera)
10537		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10991	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10539	10993
10540	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10541	10995
..	..	@@ -10621,13 +11075,41 @@
10621	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10622	11076	}
10623	11077
10624		- if (newenvy > -1)
	11078	+// if (newenvy > -1)
	11079	+// {
	11080	+// LoadEnvy(newenvy);
	11081	+// }
	11082	+//
	11083	+// newenvy = -1;
	11084	+
	11085	+ if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10625	11086	{
10626		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10627	11093	}
10628		-
10629		- newenvy = -1;
10630		-
	11094	+ else
	11095	+ {
	11096	+ if (object.skyboxname != null)
	11097	+ {
	11098	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11099	+ {
	11100	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11101	+ loadedskyboxname = object.skyboxname;
	11102	+ }
	11103	+ }
	11104	+ else
	11105	+ {
	11106	+ cubemapcustom = null;
	11107	+ loadedskyboxname = null;
	11108	+ }
	11109	+
	11110	+ cubemap = cubemapcustom;
	11111	+ }
	11112	+
10631	11113	ratio = ((double) getWidth()) / getHeight();
10632	11114	//System.out.println("ratio = " + ratio);
10633	11115
..	..	@@ -10643,7 +11125,7 @@
10643	11125
10644	11126	if (!IsFrozen() && !ambientOcclusion)
10645	11127	{
10646		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10647	11129	}
10648	11130
10649	11131	//if (selection_view == -1)
..	..	@@ -10794,7 +11276,16 @@
10794	11276	// Bump noise
10795	11277	gl.glActiveTexture(GL.GL_TEXTURE6);
10796	11278	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797		- BindTexture(NOISE_TEXTURE, false, 2);
	11279	+
	11280	+ try
	11281	+ {
	11282	+ BindTexture(NOISE_TEXTURE, false, 2);
	11283	+ }
	11284	+ catch (Exception e)
	11285	+ {
	11286	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11287	+ }
	11288	+
10798	11289
10799	11290	gl.glActiveTexture(GL.GL_TEXTURE0);
10800	11291	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10817,9 +11308,9 @@
10817	11308
10818	11309	gl.glMatrixMode(GL.GL_MODELVIEW);
10819	11310
10820		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10821		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10822		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11311	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11312	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11313	+gl.glEnable(gl.GL_MULTISAMPLE);
10823	11314	} else
10824	11315	{
10825	11316	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10830,7 +11321,7 @@
10830	11321	//System.out.println("BLENDING ON");
10831	11322	gl.glEnable(GL.GL_BLEND);
10832	11323	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10833		-
	11324	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10834	11325	gl.glMatrixMode(gl.GL_PROJECTION);
10835	11326	gl.glLoadIdentity();
10836	11327
..	..	@@ -10919,8 +11410,8 @@
10919	11410	System.err.println("parentcam != renderCamera");
10920	11411
10921	11412	// if (cam != lightCamera)
10922		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11413	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10924	11415	}
10925	11416
10926	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10941,8 +11432,8 @@
10941	11432	if (true) // TODO
10942	11433	{
10943	11434	if (cam != lightCamera)
10944		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11435	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11436	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10946	11437	}
10947	11438
10948	11439	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11079,7 +11570,7 @@
11079	11570	}
11080	11571	}
11081	11572
11082		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11083	11574	{
11084	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
11085	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11087,24 +11578,21 @@
11087	11578
11088	11579	boolean texon = textureon;
11089	11580
11090		- if (RENDERPROGRAM > 0)
11091		- {
11092		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11093		- textureon = false;
11094		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
11095	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11096	11585	//System.out.println("ALLO");
11097	11586	gl.glColorMask(false, false, false, false);
11098	11587	DrawObject(gl);
11099		- if (RENDERPROGRAM > 0)
11100		- {
11101		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11102		- textureon = texon;
11103		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
11104	11592	gl.glColorMask(true, true, true, true);
11105	11593
11106	11594	gl.glDepthFunc(GL.GL_EQUAL);
11107		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
11108	11596	}
11109	11597
11110	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -11279,23 +11767,44 @@
11279	11767	e.printStackTrace();
11280	11768	}
11281	11769
11282		- if (GrafreeD.RENDERME > 0)
11283		- GrafreeD.RENDERME--; // mechante magouille
	11770	+ if (Grafreed.RENDERME > 0)
	11771	+ Grafreed.RENDERME--; // mechante magouille
11284	11772
11285	11773	Globals.ONESTEP = false;
11286	11774	}
11287	11775
11288	11776	static boolean zoomonce = false;
11289	11777
	11778	+ static void CreateSelectedPoint()
	11779	+ {
	11780	+ if (selectedpoint == null)
	11781	+ {
	11782	+ debugpointG = new Sphere();
	11783	+ debugpointP = new Sphere();
	11784	+ debugpointC = new Sphere();
	11785	+ debugpointR = new Sphere();
	11786	+
	11787	+ selectedpoint = new Superellipsoid();
	11788	+
	11789	+ for (int i=0; i<8; i++)
	11790	+ {
	11791	+ debugpoints[i] = new Sphere();
	11792	+ }
	11793	+ }
	11794	+ }
	11795	+
11290	11796	void DrawObject(GL gl, boolean draw)
11291	11797	{
	11798	+ // To clear camera values
	11799	+ ResetOptions();
	11800	+
11292	11801	//System.out.println("DRAW OBJECT " + mouseDown);
11293	11802	// DrawMode() = SELECTION;
11294	11803	//GL gl = getGL();
11295	11804	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11296	11805	{
11297	11806	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11298		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11807	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11299	11808	pingthread.StepToTarget(true); // true);
11300	11809	// zoomonce = false;
11301	11810	}
..	..	@@ -11350,7 +11859,14 @@
11350	11859
11351	11860	usedtextures.clear();
11352	11861
11353		- BindTextures(DEFAULT_TEXTURES, 2);
	11862	+ try
	11863	+ {
	11864	+ BindTextures(DEFAULT_TEXTURES, 2);
	11865	+ }
	11866	+ catch (Exception e)
	11867	+ {
	11868	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11869	+ }
11354	11870	}
11355	11871	//System.out.println("--> " + stackdepth);
11356	11872	// GrafreeD.traceon();
..	..	@@ -11360,8 +11876,9 @@
11360	11876
11361	11877	if (DrawMode() == DEFAULT)
11362	11878	{
11363		- if (DEBUG)
	11879	+ if (Globals.DEBUG)
11364	11880	{
	11881	+ CreateSelectedPoint();
11365	11882	float radius = 0.05f;
11366	11883	if (selectedpoint.radius != radius)
11367	11884	{
..	..	@@ -11415,20 +11932,32 @@
11415	11932	ReleaseTextures(DEFAULT_TEXTURES);
11416	11933
11417	11934	if (CLEANCACHE)
11418		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11419	11936	{
11420		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11421	11938
11422	11939	// System.out.println("Texture --------- " + tex);
11423	11940
11424		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11425	11942	continue;
11426	11943
11427		- if (!usedtextures.containsKey(tex))
	11944	+ if (!usedtextures.contains(tex))
11428	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11429	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11430		- textures.get(tex).texture.dispose();
11431		- textures.remove(tex);
	11948	+ if (gettex != null)
	11949	+ {
	11950	+ gettex.texture.dispose();
	11951	+ texturepigment.remove(tex);
	11952	+ }
	11953	+
	11954	+ gettex = texturebump.get(tex);
	11955	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11956	+ if (gettex != null)
	11957	+ {
	11958	+ gettex.texture.dispose();
	11959	+ texturebump.remove(tex);
	11960	+ }
11432	11961	}
11433	11962	}
11434	11963	}
..	..	@@ -11441,7 +11970,14 @@
11441	11970	if (checker != null && DrawMode() == DEFAULT)
11442	11971	{
11443	11972	//BindTexture(IMMORTAL_TEXTURE);
11444		- BindTextures(checker.GetTextures(), checker.texres);
	11973	+ try
	11974	+ {
	11975	+ BindTextures(checker.GetTextures(), checker.texres);
	11976	+ }
	11977	+ catch (Exception e)
	11978	+ {
	11979	+ System.err.println("FAILED: " + checker.GetTextures());
	11980	+ }
11445	11981	// NEAREST
11446	11982	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11447	11983	DrawChecker(gl);
..	..	@@ -11523,7 +12059,7 @@
11523	12059	return;
11524	12060	}
11525	12061
11526		- String string = obj.GetToolTip();
	12062	+ String string = obj.toString(); //.GetToolTip();
11527	12063
11528	12064	GL gl = GetGL();
11529	12065
..	..	@@ -11840,8 +12376,8 @@
11840	12376	//obj.TransformToWorld(light, light);
11841	12377	for (int i = tp.size(); --i >= 0;)
11842	12378	{
11843		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844		- LA.xformPos(light, tp.get(i).toParent, light);
	12379	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12380	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11845	12381	}
11846	12382
11847	12383
..	..	@@ -11858,8 +12394,8 @@
11858	12394	parentcam = cameras[0];
11859	12395	}
11860	12396
11861		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12397	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12398	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11863	12399
11864	12400	LA.xformPos(light, renderCamera.toScreen, light);
11865	12401
..	..	@@ -11949,8 +12485,76 @@
11949	12485
11950	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11951	12487
11952		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
11953	12490	"!!ARBfp1.0\n" +
	12491	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12492	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12493	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12494	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12495	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12496	+ "PARAM light2cam0 = program.env[10];" +
	12497	+ "PARAM light2cam1 = program.env[11];" +
	12498	+ "PARAM light2cam2 = program.env[12];" +
	12499	+ "TEMP temp;" +
	12500	+ "TEMP light;" +
	12501	+ "TEMP ndotl;" +
	12502	+ "TEMP normal;" +
	12503	+ "TEMP depth;" +
	12504	+ "TEMP eye;" +
	12505	+ "TEMP pos;" +
	12506	+
	12507	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12508	+ Normalize("normal") +
	12509	+ "MOV light, state.light[0].position;" +
	12510	+ "DP3 ndotl.x, light, normal;" +
	12511	+
	12512	+ // shadow
	12513	+ "MOV pos, fragment.texcoord[1];" +
	12514	+ "MOV temp, pos;" +
	12515	+ ShadowTextureFetch("depth", "temp", "1") +
	12516	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12517	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12518	+
	12519	+ // No shadow when out of frustum
	12520	+ //"SGE temp.y, depth.z, zero123.y;" +
	12521	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12522	+
	12523	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12524	+
	12525	+ // Backlit
	12526	+ "MOV pos.w, zero123.y;" +
	12527	+ "DP4 eye.x, pos, light2cam0;" +
	12528	+ "DP4 eye.y, pos, light2cam1;" +
	12529	+ "DP4 eye.z, pos, light2cam2;" +
	12530	+ Normalize("eye") +
	12531	+
	12532	+ "DP3 ndotl.y, -eye, normal;" +
	12533	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12534	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12535	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12536	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12538	+
	12539	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12540	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12541	+
	12542	+ // Pigment
	12543	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12544	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12545	+ "MUL temp, temp, ndotl.x;" +
	12546	+
	12547	+ "MUL temp, temp, zero123.z;" +
	12548	+
	12549	+ //"MUL temp, temp, ndotl.y;" +
	12550	+
	12551	+ "MOV temp.w, zero123.y;" + // reset alpha
	12552	+ "MOV result.color, temp;" +
	12553	+ "END";
	12554	+
	12555	+ String programmax =
	12556	+ "!!ARBfp1.0\n" +
	12557	+
11954	12558	//"OPTION ARB_fragment_program_shadow;" +
11955	12559	"PARAM light2cam0 = program.env[10];" +
11956	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12065,8 +12669,7 @@
12065	12669	"TEMP shininess;" +
12066	12670	"\n" +
12067	12671	"MOV texSamp, one;" +
12068		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12069		-
	12672	+
12070	12673	"MOV mapgrid.x, one2048th.x;" +
12071	12674	"MOV temp, fragment.texcoord[1];" +
12072	12675	/*
..	..	@@ -12087,20 +12690,20 @@
12087	12690	"MUL temp, floor, mapgrid.x;" +
12088	12691	//"TEX depth0, temp, texture[1], 2D;" +
12089	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
12091	12694	"") +
12092	12695	"ADD temp.x, temp.x, mapgrid.x;" +
12093	12696	//"TEX depth1, temp, texture[1], 2D;" +
12094	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12095		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
12096	12699	"") +
12097	12700	"ADD temp.y, temp.y, mapgrid.x;" +
12098	12701	//"TEX depth2, temp, texture[1], 2D;" +
12099		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
12100	12703	"SUB temp.x, temp.x, mapgrid.x;" +
12101	12704	//"TEX depth3, temp, texture[1], 2D;" +
12102	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12103		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
12104	12707	"") +
12105	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12106	12709	//"MOV params, material;" +
..	..	@@ -12471,10 +13074,10 @@
12471	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12472	13075	"") +
12473	13076
12474		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12475	13078	"SUB temp.x, half.x, shadow.x;" +
12476		- "MOV temp.y, -params6.x;" +
12477		- "SLT temp.z, temp.y, zero.x;" +
	13079	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12478	13081	"SUB temp.y, one.x, temp.z;" +
12479	13082	"MUL temp.x, temp.x, temp.y;" +
12480	13083	"KIL temp.x;" +
..	..	@@ -12754,7 +13357,7 @@
12754	13357	"MUL final.y, fragment.texcoord[0].x, c256;" +
12755	13358	"FLR final.x, final.y;" +
12756	13359	"SUB final.y, final.y, final.x;" +
12757		- //"MUL final.x, final.x, c256i;" +
	13360	+ "MUL final.x, final.x, c256i;" +
12758	13361	"MOV final.z, zero.x;" +
12759	13362	"MOV final.a, one.w;":""
12760	13363	) +
..	..	@@ -12762,7 +13365,7 @@
12762	13365	"MUL final.y, fragment.texcoord[0].y, c256;" +
12763	13366	"FLR final.x, final.y;" +
12764	13367	"SUB final.y, final.y, final.x;" +
12765		- //"MUL final.x, final.x, c256i;" +
	13368	+ "MUL final.x, final.x, c256i;" +
12766	13369	"MOV final.z, zero.x;" +
12767	13370	"MOV final.a, one.w;":""
12768	13371	) +
..	..	@@ -12805,7 +13408,14 @@
12805	13408	//once = true;
12806	13409	}
12807	13410
12808		- System.out.print("Program #" + mode + "; length = " + program.length());
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
	13418	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12809	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12810	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12811	13421
..	..	@@ -12898,25 +13508,26 @@
12898	13508	return out;
12899	13509	}
12900	13510
12901		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
12902	13513	{
12903	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12904	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12905	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12906	13519	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12907		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12908		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12909		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12910		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12911	13522	//"SWZ buffer, temp, w,w,w,w;";
12912		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12913	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12914	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12915	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12916		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12917	13528
12918		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12919		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13529	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13530	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12920	13531	}
12921	13532
12922	13533	String Shadow(String depth, String shadow)
..	..	@@ -12938,12 +13549,16 @@
12938	13549
12939	13550	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12940	13551	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13552	+
	13553	+ // Compare fragment depth in light space with shadowmap.
12941	13554	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12942	13555	"SGE temp.y, temp.x, zero.x;" +
12943		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13556	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13557	+
	13558	+ // Reverse comparison
12944	13559	"SUB temp.x, one.x, temp.x;" +
12945	13560	"MUL " + shadow + ".x, temp.x, temp.y;" +
12946		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13561	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12947	13562	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12948	13563
12949	13564	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12957,6 +13572,10 @@
12957	13572	// No shadow for backface
12958	13573	"DP3 temp.x, normal, lightd;" +
12959	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13575	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13576	+
	13577	+ // No shadow when out of frustum
	13578	+ "SGE temp.x, " + depth + ".z, one.z;" +
12960	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12961	13580	"";
12962	13581	}
..	..	@@ -13103,7 +13722,8 @@
13103	13722	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13104	13723	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13105	13724	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13106		- Object3D.cVector2[] vector2buffer;
	13725	+
	13726	+ //Object3D.cVector2[] vector2buffer;
13107	13727
13108	13728	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13109	13729	// OUT : diff, spec
..	..	@@ -13119,9 +13739,10 @@
13119	13739	"DP3 " + dest + ".z," + "normals," + "eye;" +
13120	13740	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13121	13741	//"MOV " + dest + ".w," + "normal.z;" +
13122		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13123		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13124		- //"MOV " + dest + ".z," + "params2.w;" +
	13742	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13743	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13744	+
	13745	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13125	13746	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13126	13747	"RCP " + dest + ".w," + dest + ".w;" +
13127	13748	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13515,7 +14136,7 @@
13515	14136	public void mousePressed(MouseEvent e)
13516	14137	{
13517	14138	//System.out.println("mousePressed: " + e);
13518		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14139	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13519	14140	}
13520	14141
13521	14142	static long prevtime = 0;
..	..	@@ -13591,8 +14212,8 @@
13591	14212	// mode \|= META;
13592	14213	//}
13593	14214
13594		- SetMouseMode(WHEEL \| e.getModifiersEx());
13595		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14215	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14216	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13596	14217	anchorX = ax;
13597	14218	anchorY = ay;
13598	14219	prevX = px;
..	..	@@ -13626,6 +14247,7 @@
13626	14247	else
13627	14248	if (evt.getSource() == AAtimer)
13628	14249	{
	14250	+ Globals.TIMERRUNNING = false;
13629	14251	if (mouseDown)
13630	14252	{
13631	14253	//new Exception().printStackTrace();
..	..	@@ -13651,6 +14273,10 @@
13651	14273	// LIVE = waslive;
13652	14274	// wasliveok = true;
13653	14275	// waslive = false;
	14276	+
	14277	+ // May 2019 Forget it:
	14278	+ if (true)
	14279	+ return;
13654	14280
13655	14281	// source == timer
13656	14282	if (mouseDown)
..	..	@@ -13681,7 +14307,7 @@
13681	14307
13682	14308	// fev 2014???
13683	14309	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14310	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13685	14311	pingthread.StepToTarget(true); // true);
13686	14312	}
13687	14313	// if (!LIVE)
..	..	@@ -13690,12 +14316,13 @@
13690	14316
13691	14317	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13692	14318
13693		- void clickStart(int x, int y, int modifiers)
	14319	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13694	14320	{
13695	14321	if (!wasliveok)
13696	14322	return;
13697	14323
13698	14324	AAtimer.restart(); //
	14325	+ Globals.TIMERRUNNING = true;
13699	14326
13700	14327	// waslive = LIVE;
13701	14328	// LIVE = false;
..	..	@@ -13707,7 +14334,7 @@
13707	14334	// touched = true; // main DL
13708	14335	if (isRenderer)
13709	14336	{
13710		- SetMouseMode(modifiers);
	14337	+ SetMouseMode(modifiers, modifiersex);
13711	14338	}
13712	14339
13713	14340	selectX = anchorX = x;
..	..	@@ -13720,7 +14347,7 @@
13720	14347	clicked = true;
13721	14348	hold = false;
13722	14349
13723		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14350	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13724	14351	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13725	14352	{
13726	14353	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,14 +14372,15 @@
13745	14372	drag = false;
13746	14373	//System.out.println("Mouse DOWN");
13747	14374	editObj = false;
13748		- ClickInfo info = new ClickInfo();
13749		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13750		- info.pane = this;
13751		- info.camera = renderCamera;
13752		- info.x = x;
13753		- info.y = y;
13754		- info.modifiers = modifiers;
13755		- editObj = object.doEditClick(info, 0);
	14375	+ //ClickInfo info = new ClickInfo();
	14376	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14377	+ object.clickInfo.pane = this;
	14378	+ object.clickInfo.camera = renderCamera;
	14379	+ object.clickInfo.x = x;
	14380	+ object.clickInfo.y = y;
	14381	+ object.clickInfo.modifiers = modifiersex;
	14382	+ editObj = object.doEditClick(//info,
	14383	+ 0);
13756	14384	if (!editObj)
13757	14385	{
13758	14386	hasMarquee = true;
..	..	@@ -13768,9 +14396,12 @@
13768	14396
13769	14397	public void mouseDragged(MouseEvent e)
13770	14398	{
	14399	+ Globals.MOUSEDRAGGED = true;
	14400	+
13771	14401	//System.out.println("mouseDragged: " + e);
13772	14402	if (isRenderer)
13773	14403	movingcamera = true;
	14404	+
13774	14405	//if (drawing)
13775	14406	//return;
13776	14407	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13780,7 +14411,7 @@
13780	14411	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13781	14412	}
13782	14413	else
13783		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14414	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13784	14415
13785	14416	//try { Thread.sleep(1); } catch (Exception ex) {}
13786	14417	}
..	..	@@ -14017,7 +14648,7 @@
14017	14648	{
14018	14649	Globals.lighttouched = true;
14019	14650	}
14020		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14651	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14021	14652	}
14022	14653	//else
14023	14654	}
..	..	@@ -14031,12 +14662,12 @@
14031	14662	void GoDown(int mod)
14032	14663	{
14033	14664	MODIFIERS \|= COMMAND;
14034		- /*
	14665	+ /**/
14035	14666	if((mod&SHIFT) == SHIFT)
14036		- manipCamera.RotatePosition(0, -speed);
	14667	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14037	14668	else
14038		- manipCamera.BackForth(0, -speed*delta, getWidth());
14039		- */
	14669	+ manipCamera.RotatePosition(0, -speed);
	14670	+ /**/
14040	14671	if ((mod & SHIFT) == SHIFT)
14041	14672	{
14042	14673	mouseMode = mouseMode; // VR??
..	..	@@ -14052,12 +14683,12 @@
14052	14683	void GoUp(int mod)
14053	14684	{
14054	14685	MODIFIERS \|= COMMAND;
14055		- /*
	14686	+ /**/
14056	14687	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(0, speed);
	14688	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14058	14689	else
14059		- manipCamera.BackForth(0, speed*delta, getWidth());
14060		- */
	14690	+ manipCamera.RotatePosition(0, speed);
	14691	+ /**/
14061	14692	if ((mod & SHIFT) == SHIFT)
14062	14693	{
14063	14694	mouseMode = mouseMode;
..	..	@@ -14073,12 +14704,12 @@
14073	14704	void GoLeft(int mod)
14074	14705	{
14075	14706	MODIFIERS \|= COMMAND;
14076		- /*
	14707	+ /**/
14077	14708	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(speed, 0);
14079		- else
14080	14709	manipCamera.Translate(speed*delta, 0, getWidth());
14081		- */
	14710	+ else
	14711	+ manipCamera.RotatePosition(speed, 0);
	14712	+ /**/
14082	14713	if ((mod & SHIFT) == SHIFT)
14083	14714	{
14084	14715	mouseMode = mouseMode;
..	..	@@ -14094,12 +14725,12 @@
14094	14725	void GoRight(int mod)
14095	14726	{
14096	14727	MODIFIERS \|= COMMAND;
14097		- /*
	14728	+ /**/
14098	14729	if((mod&SHIFT) == SHIFT)
14099		- manipCamera.RotatePosition(-speed, 0);
14100		- else
14101	14730	manipCamera.Translate(-speed*delta, 0, getWidth());
14102		- */
	14731	+ else
	14732	+ manipCamera.RotatePosition(-speed, 0);
	14733	+ /**/
14103	14734	if ((mod & SHIFT) == SHIFT)
14104	14735	{
14105	14736	mouseMode = mouseMode;
..	..	@@ -14117,7 +14748,7 @@
14117	14748	int X, Y;
14118	14749	boolean SX, SY;
14119	14750
14120		- void drag(int x, int y, int modifiers)
	14751	+ void drag(int x, int y, int modifiers, int modifiersex)
14121	14752	{
14122	14753	if (IsFrozen())
14123	14754	{
..	..	@@ -14126,17 +14757,17 @@
14126	14757
14127	14758	drag = true; // NEW
14128	14759
14129		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14760	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14130	14761
14131	14762	X = x;
14132	14763	Y = y;
14133	14764	// floating state for animation
14134		- MODIFIERS = modifiers;
14135		- modifiers &= ~1024;
	14765	+ MODIFIERS = modifiersex;
	14766	+ modifiersex &= ~1024;
14136	14767	if (false) // modifiers != 0)
14137	14768	{
14138	14769	//new Exception().printStackTrace();
14139		- System.out.println("mouseDragged: " + modifiers);
	14770	+ System.out.println("mouseDragged: " + modifiersex);
14140	14771	System.out.println("SHIFT = " + SHIFT);
14141	14772	System.out.println("CONTROL = " + COMMAND);
14142	14773	System.out.println("META = " + META);
..	..	@@ -14149,14 +14780,16 @@
14149	14780	if (editObj)
14150	14781	{
14151	14782	drag = true;
14152		- ClickInfo info = new ClickInfo();
14153		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
14154	14785	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14155		- info.pane = this;
14156		- info.camera = renderCamera;
14157		- info.x = x;
14158		- info.y = y;
14159		- object.editWindow.copy.doEditDrag(info);
	14786	+ object.clickInfo.pane = this;
	14787	+ object.clickInfo.camera = renderCamera;
	14788	+ object.clickInfo.x = x;
	14789	+ object.clickInfo.y = y;
	14790	+ object //.GetWindow().copy
	14791	+ .doEditDrag(//info,
	14792	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14160	14793	} else
14161	14794	{
14162	14795	if (x < startX)
..	..	@@ -14305,22 +14938,27 @@
14305	14938	}
14306	14939	}
14307	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
14308	14943	public void mouseMoved(MouseEvent e)
14309	14944	{
14310	14945	//System.out.println("mouseMoved: " + e);
14311	14946	if (isRenderer)
14312	14947	return;
14313	14948
14314		- ClickInfo ci = new ClickInfo();
14315		- ci.x = e.getX();
14316		- ci.y = e.getY();
14317		- ci.modifiers = e.getModifiersEx();
14318		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14319		- ci.pane = this;
14320		- ci.camera = renderCamera;
	14949	+ // Mouse cursor feedback
	14950	+ object.clickInfo.x = e.getX();
	14951	+ object.clickInfo.y = e.getY();
	14952	+ object.clickInfo.modifiers = e.getModifiersEx();
	14953	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14954	+ object.clickInfo.pane = this;
	14955	+ object.clickInfo.camera = renderCamera;
14321	14956	if (!isRenderer)
14322	14957	{
14323		- if (object.editWindow.copy.doEditClick(ci, 0))
	14958	+ //ObjEditor editWindow = object.editWindow;
	14959	+ //Object3D copy = editWindow.copy;
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
14324	14962	{
14325	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14326	14964	} else
..	..	@@ -14332,7 +14970,11 @@
14332	14970
14333	14971	public void mouseReleased(MouseEvent e)
14334	14972	{
	14973	+ Globals.MOUSEDRAGGED = false;
	14974	+
14335	14975	movingcamera = false;
	14976	+ X = 0; // getBounds().width/2;
	14977	+ Y = 0; // getBounds().height/2;
14336	14978	//System.out.println("mouseReleased: " + e);
14337	14979	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14338	14980	}
..	..	@@ -14355,9 +14997,9 @@
14355	14997	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14356	14998	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14357	14999
14358		- if (control \|\| command \|\| IsFrozen())
	15000	+// No delay if (control \|\| command \|\| IsFrozen())
14359	15001	timeout = true;
14360		- else
	15002	+// ?? May 2019 else
14361	15003	// timer.setDelay((modifiers & 128) != 0?0:350);
14362	15004	mouseDown = false;
14363	15005	if (!control && !command) // june 2013
..	..	@@ -14467,7 +15109,7 @@
14467	15109	System.out.println("keyReleased: " + e);
14468	15110	}
14469	15111
14470		- void SetMouseMode(int modifiers)
	15112	+ void SetMouseMode(int modifiers, int modifiersex)
14471	15113	{
14472	15114	//System.out.println("SetMouseMode = " + modifiers);
14473	15115	//modifiers &= ~1024;
..	..	@@ -14479,25 +15121,25 @@
14479	15121	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14480	15122	// return;
14481	15123	//System.out.println("SetMode = " + modifiers);
14482		- if ((modifiers & WHEEL) == WHEEL)
	15124	+ if ((modifiersex & WHEEL) == WHEEL)
14483	15125	{
14484	15126	mouseMode \|= ZOOM;
14485	15127	}
14486	15128
14487	15129	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14488		- if (capsLocked \|\| (modifiers & META) == META)
	15130	+ if (capsLocked) // \|\| (modifiers & META) == META)
14489	15131	{
14490	15132	mouseMode \|= VR; // BACKFORTH;
14491	15133	}
14492		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15134	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14493	15135	{
14494	15136	mouseMode \|= SELECT;
14495	15137	}
14496		- if ((modifiers & COMMAND) == COMMAND)
	15138	+ if ((modifiersex & COMMAND) == COMMAND)
14497	15139	{
14498	15140	mouseMode \|= SELECT;
14499	15141	}
14500		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15142	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14501	15143	{
14502	15144	mouseMode &= ~VR;
14503	15145	mouseMode \|= TRANSLATE;
..	..	@@ -14526,7 +15168,7 @@
14526	15168
14527	15169	if (isRenderer) //
14528	15170	{
14529		- SetMouseMode(modifiers);
	15171	+ SetMouseMode(0, modifiers);
14530	15172	}
14531	15173
14532	15174	Globals.theRenderer.keyPressed(key);
..	..	@@ -14588,7 +15230,8 @@
14588	15230	// break;
14589	15231	case 'T':
14590	15232	CACHETEXTURE ^= true;
14591		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14592	15235	// repaint();
14593	15236	break;
14594	15237	case 'Y':
..	..	@@ -14673,7 +15316,9 @@
14673	15316	case 'E' : COMPACT ^= true;
14674	15317	repaint();
14675	15318	break;
14676		- case 'W' : DEBUGHSB ^= true;
	15319	+ case 'W' : // Wide Window (fullscreen)
	15320	+ //DEBUGHSB ^= true;
	15321	+ ObjEditor.theFrame.ToggleFullScreen();
14677	15322	repaint();
14678	15323	break;
14679	15324	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14698,8 +15343,8 @@
14698	15343	RevertCamera();
14699	15344	repaint();
14700	15345	break;
14701		- case 'L':
14702	15346	case 'l':
	15347	+ //case 'L':
14703	15348	if (lightMode)
14704	15349	{
14705	15350	lightMode = false;
..	..	@@ -14763,20 +15408,24 @@
14763	15408	OCCLUSION_CULLING ^= true;
14764	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14765	15410	break;
14766		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
14767	15412	case '1':
14768	15413	case '2':
14769	15414	case '3':
14770	15415	case '4':
14771	15416	case '5':
14772		- newenvy = Character.getNumericValue(key);
14773		- repaint();
14774		- break;
14775	15417	case '6':
14776	15418	case '7':
14777	15419	case '8':
14778	15420	case '9':
14779		- BGcolor = (key - '6')/3.f;
	15421	+ if (true) // envyoff)
	15422	+ {
	15423	+ BGcolor = (key - '1')/8.f;
	15424	+ }
	15425	+ else
	15426	+ {
	15427	+ //newenvy = Character.getNumericValue(key);
	15428	+ }
14780	15429	repaint();
14781	15430	break;
14782	15431	case '!':
..	..	@@ -14842,9 +15491,9 @@
14842	15491	case '_':
14843	15492	kompactbit = 5;
14844	15493	break;
14845		- case '+':
14846		- kompactbit = 6;
14847		- break;
	15494	+// case '+':
	15495	+// kompactbit = 6;
	15496	+// break;
14848	15497	case ' ':
14849	15498	lightMode ^= true;
14850	15499	Globals.lighttouched = true;
..	..	@@ -14856,13 +15505,14 @@
14856	15505	case ESC:
14857	15506	RENDERPROGRAM += 1;
14858	15507	RENDERPROGRAM %= 3;
	15508	+
14859	15509	repaint();
14860	15510	break;
14861	15511	case 'Z':
14862	15512	//RESIZETEXTURE ^= true;
14863	15513	//break;
14864	15514	case 'z':
14865		- RENDERSHADOW ^= true;
	15515	+ Globals.RENDERSHADOW ^= true;
14866	15516	Globals.lighttouched = true;
14867	15517	repaint();
14868	15518	break;
..	..	@@ -14895,8 +15545,9 @@
14895	15545	case DELETE:
14896	15546	ClearSelection();
14897	15547	break;
14898		- /*
14899	15548	case '+':
	15549	+
	15550	+ /*
14900	15551	//fontsize += 1;
14901	15552	bbzoom *= 2;
14902	15553	repaint();
..	..	@@ -14913,17 +15564,17 @@
14913	15564	case '=':
14914	15565	IncDepth();
14915	15566	//fontsize += 1;
14916		- object.editWindow.refreshContents(true);
	15567	+ object.GetWindow().refreshContents(true);
14917	15568	maskbit = 6;
14918	15569	break;
14919	15570	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14920	15571	DecDepth();
14921	15572	maskbit = 5;
14922	15573	//if(fontsize > 1) fontsize -= 1;
14923		- if (object.editWindow == null)
14924		- new Exception().printStackTrace();
14925		- else
14926		- object.editWindow.refreshContents(true);
	15574	+// if (object.editWindow == null)
	15575	+// new Exception().printStackTrace();
	15576	+// else
	15577	+ object.GetWindow().refreshContents(true);
14927	15578	break;
14928	15579	case '{':
14929	15580	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14986,7 +15637,7 @@
14986	15637	//mode = ROTATE;
14987	15638	if ((MODIFIERS & COMMAND) == 0) // VR??
14988	15639	{
14989		- SetMouseMode(modifiers);
	15640	+ SetMouseMode(0, modifiers);
14990	15641	}
14991	15642	}
14992	15643
..	..	@@ -15122,7 +15773,7 @@
15122	15773	{
15123	15774	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15124	15775	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15125		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15776	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15126	15777	{
15127	15778	mouseMoved(e);
15128	15779	} else
..	..	@@ -15147,7 +15798,7 @@
15147	15798	}
15148	15799	*/
15149	15800
15150		- object.editWindow.EditSelection();
	15801	+ object.GetWindow().EditSelection(false);
15151	15802	}
15152	15803
15153	15804	void SelectParent()
..	..	@@ -15164,10 +15815,10 @@
15164	15815	{
15165	15816	//selectees.remove(i);
15166	15817	System.out.println("select parent of " + elem);
15167		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15818	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15168	15819	} else
15169	15820	{
15170		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15821	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15171	15822	}
15172	15823
15173	15824	first = false;
..	..	@@ -15209,12 +15860,12 @@
15209	15860	for (int j = 0; j < group.children.size(); j++)
15210	15861	{
15211	15862	elem = (Object3D) group.children.elementAt(j);
15212		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15863	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15213	15864	first = false;
15214	15865	}
15215	15866	} else
15216	15867	{
15217		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15868	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15218	15869	}
15219	15870
15220	15871	first = false;
..	..	@@ -15225,21 +15876,21 @@
15225	15876	{
15226	15877	//Composite group = (Composite) object;
15227	15878	Object3D group = object;
15228		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15879	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15229	15880	}
15230	15881
15231	15882	void ResetTransform(int mask)
15232	15883	{
15233	15884	//Composite group = (Composite) object;
15234	15885	Object3D group = object;
15235		- group.editWindow.ResetTransform(mask);
	15886	+ group.GetWindow().ResetTransform(mask);
15236	15887	}
15237	15888
15238	15889	void FlipTransform()
15239	15890	{
15240	15891	//Composite group = (Composite) object;
15241	15892	Object3D group = object;
15242		- group.editWindow.FlipTransform();
	15893	+ group.GetWindow().FlipTransform();
15243	15894	// group.editWindow.ReduceMesh(true);
15244	15895	}
15245	15896
..	..	@@ -15247,7 +15898,7 @@
15247	15898	{
15248	15899	//Composite group = (Composite) object;
15249	15900	Object3D group = object;
15250		- group.editWindow.PrintMemory();
	15901	+ group.GetWindow().PrintMemory();
15251	15902	// group.editWindow.ReduceMesh(true);
15252	15903	}
15253	15904
..	..	@@ -15255,7 +15906,7 @@
15255	15906	{
15256	15907	//Composite group = (Composite) object;
15257	15908	Object3D group = object;
15258		- group.editWindow.ResetCentroid();
	15909	+ group.GetWindow().ResetCentroid();
15259	15910	}
15260	15911
15261	15912	void IncDepth()
..	..	@@ -15337,11 +15988,11 @@
15337	15988
15338	15989	int width = getBounds().width;
15339	15990	int height = getBounds().height;
15340		- ClickInfo info = new ClickInfo();
15341		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15342	15991	//Image img = CreateImage(width, height);
15343	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
	15993	+
15344	15994	Graphics gr = g; // img.getGraphics();
	15995	+
15345	15996	if (!hasMarquee)
15346	15997	{
15347	15998	if (Xmin < Xmax) // !locked)
..	..	@@ -15413,40 +16064,88 @@
15413	16064	}
15414	16065	if (object != null && !hasMarquee)
15415	16066	{
	16067	+ if (object.clickInfo == null)
	16068	+ object.clickInfo = new ClickInfo();
	16069	+ ClickInfo info = object.clickInfo;
	16070	+ //ClickInfo info = new ClickInfo();
	16071	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16072	+
15416	16073	if (isRenderer)
15417	16074	{
15418		- info.flags++;
	16075	+ object.clickInfo.flags++;
15419	16076	double frameAspect = (double) width / (double) height;
15420	16077	if (frameAspect > renderCamera.aspect)
15421	16078	{
15422	16079	int desired = (int) ((double) height * renderCamera.aspect);
15423		- info.bounds.width -= width - desired;
15424		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15425	16082	} else
15426	16083	{
15427	16084	int desired = (int) ((double) width / renderCamera.aspect);
15428		- info.bounds.height -= height - desired;
15429		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15430	16087	}
15431	16088	}
15432		- info.g = gr;
15433		- info.camera = renderCamera;
	16089	+
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15434	16092	/*
15435	16093	// Memory intensive (brep.verticescopy)
15436	16094	if (!(object instanceof Composite))
15437	16095	object.draw(info, 0, false); // SLOW :
15438	16096	*/
15439		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15440	16098	{
15441		- object.drawEditHandles(info, 0);
	16099	+ Grafreed.Assert(object != null);
	16100	+ Grafreed.Assert(object.selection != null);
	16101	+ if (object.selection.Size() > 0)
	16102	+ {
	16103	+ int hitSomething = object.selection.get(0).hitSomething;
	16104	+
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
	16108	+ if (hitSomething == Object3D.hitCenter)
	16109	+ {
	16110	+ info.DX = X;
	16111	+ if (X != 0)
	16112	+ info.DX -= info.bounds.width/2;
	16113	+
	16114	+ info.DY = Y;
	16115	+ if (Y != 0)
	16116	+ info.DY -= info.bounds.height/2;
	16117	+ }
	16118	+
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
	16121	+
	16122	+ if (drag && (X != 0 \|\| Y != 0))
	16123	+ {
	16124	+ switch (hitSomething)
	16125	+ {
	16126	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16127	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16128	+ break;
	16129	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16130	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16131	+ break;
	16132	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16133	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16134	+ break;
	16135	+ }
	16136	+
	16137	+ }
	16138	+ }
15442	16139	}
15443	16140	}
	16141	+
15444	16142	if (isRenderer)
15445	16143	{
15446	16144	//gr.setColor(Color.black);
15447	16145	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15448	16146	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15449	16147	}
	16148	+
15450	16149	if (hasMarquee)
15451	16150	{
15452	16151	gr.setXORMode(Color.white);
..	..	@@ -15559,6 +16258,7 @@
15559	16258	public boolean mouseDown(Event evt, int x, int y)
15560	16259	{
15561	16260	System.out.println("mouseDown: " + evt);
	16261	+ System.exit(0);
15562	16262	/*
15563	16263	locked = true;
15564	16264	drag = false;
..	..	@@ -15602,7 +16302,7 @@
15602	16302	{
15603	16303	keyPressed(0, modifiers);
15604	16304	}
15605		- clickStart(x, y, modifiers);
	16305	+ // clickStart(x, y, modifiers);
15606	16306	return true;
15607	16307	}
15608	16308
..	..	@@ -15720,7 +16420,7 @@
15720	16420	{
15721	16421	keyReleased(0, 0);
15722	16422	}
15723		- drag(x, y, modifiers);
	16423	+ drag(x, y, 0, modifiers);
15724	16424	return true;
15725	16425	}
15726	16426
..	..	@@ -15852,7 +16552,7 @@
15852	16552	Object3D object;
15853	16553	static Object3D trackedobject;
15854	16554	Camera renderCamera; // Light or Eye (or Occlusion)
15855		- /static/ Camera manipCamera; // Light or Eye
	16555	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15856	16556	/static/ Camera eyeCamera;
15857	16557	/static/ Camera lightCamera;
15858	16558	int cameracount;
..	..	@@ -15916,6 +16616,8 @@
15916	16616	private /static/ boolean firstime;
15917	16617	private /static/ cVector newView = new cVector();
15918	16618	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16619	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16620	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15919	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15920	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15921	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15928,29 +16630,67 @@
15928	16630	{
15929	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15930	16632
	16633	+ int usedsuf = 0;
	16634	+
15931	16635	for (int i = 0; i < suffixes.length; i++)
15932	16636	{
15933		- String resourceName = basename + suffixes[i] + "." + suffix;
15934		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15935		- mipmapped,
15936		- FileUtil.getFileSuffix(resourceName));
15937		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
15938	16642	{
15939		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
15940	16647	}
	16648	+
	16649	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16650	+ TextureData data;
	16651	+
	16652	+ try
	16653	+ {
	16654	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16655	+ mipmapped,
	16656	+ FileUtil.getFileSuffix(resourceName));
	16657	+ }
	16658	+ catch (Exception e)
	16659	+ {
	16660	+ try
	16661	+ {
	16662	+ resourceName = basename + fallback[i] + "." + suffix;
	16663	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16664	+ mipmapped,
	16665	+ FileUtil.getFileSuffix(resourceName));
	16666	+ }
	16667	+ catch (Exception e2)
	16668	+ {
	16669	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16670	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16671	+ mipmapped,
	16672	+ FileUtil.getFileSuffix(resourceName));
	16673	+ }
	16674	+ }
	16675	+
15941	16676	//System.out.println("Target = " + targets[i]);
15942	16677	cubemap.updateImage(data, targets[i]);
15943	16678	}
15944	16679
15945	16680	return cubemap;
15946	16681	}
	16682	+
15947	16683	int bigsphere = -1;
15948	16684
15949	16685	float BGcolor = 0.5f;
15950	16686
15951		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
15952	16690	{
15953		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
15954	16694	{
15955	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15956	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15965,7 +16705,17 @@
15965	16705	// Compensates for ExaminerViewer's modification of modelview matrix
15966	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
15967	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
15968	16709
	16710	+// colorV[0] = 2;
	16711	+// colorV[1] = 2;
	16712	+// colorV[2] = 2;
	16713	+// colorV[3] = 1;
	16714	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16715	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16716	+//
	16717	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16718	+
15969	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
15970	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15971	16721
..	..	@@ -15997,6 +16747,7 @@
15997	16747	{
15998	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
15999	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16000	16751	gl.glMultMatrixd(viewrot_1, 0);
16001	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16002	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -16137,16 +16888,16 @@
16137	16888	cStatic.objectstack[materialdepth++] = checker;
16138	16889	//System.out.println("material " + material);
16139	16890	//Applet3D.tracein(this, selected);
16140		- vector2buffer = checker.projectedVertices;
	16891	+ //vector2buffer = checker.projectedVertices;
16141	16892
16142	16893	//checker.GetMaterial().Draw(this, false); // true);
16143		- DrawMaterial(checker.GetMaterial(), false); // true);
	16894	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16144	16895
16145	16896	materialdepth -= 1;
16146	16897	if (materialdepth > 0)
16147	16898	{
16148		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16149		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16899	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16900	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16150	16901	}
16151	16902	//checker.GetMaterial().opacity = 1f;
16152	16903	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16232,6 +16983,14 @@
16232	16983	}
16233	16984	}
16234	16985
	16986	+ private Object3D GetFolder()
	16987	+ {
	16988	+ Object3D folder = object.GetWindow().copy;
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16991	+ return folder;
	16992	+ }
	16993	+
16235	16994	class SelectBuffer implements GLEventListener
16236	16995	{
16237	16996
..	..	@@ -16247,7 +17006,7 @@
16247	17006	//new Exception().printStackTrace();
16248	17007	System.out.println("select buffer init");
16249	17008	// Use debug pipeline
16250		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16251	17010
16252	17011	GL gl = drawable.getGL();
16253	17012
..	..	@@ -16311,6 +17070,17 @@
16311	17070
16312	17071	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16313	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Make what you paint not selectable.
	17080	+ paintobj.ResetSelectable();
	17081	+ }
	17082	+ }
	17083	+
16314	17084	//int tmp = selection_view;
16315	17085	//selection_view = -1;
16316	17086	int temp = DrawMode();
..	..	@@ -16322,6 +17092,17 @@
16322	17092	// temp = DEFAULT; // patch for selection debug
16323	17093	Globals.drawMode = temp; // WARNING
16324	17094
	17095	+ if (PAINTMODE)
	17096	+ {
	17097	+ if (object.GetWindow().copy.selection.Size() > 0)
	17098	+ {
	17099	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17100	+
	17101	+ // Revert.
	17102	+ paintobj.RestoreSelectable();
	17103	+ }
	17104	+ }
	17105	+
16325	17106	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16326	17107
16327	17108	// trying different ways of getting the depth info over
..	..	@@ -16369,6 +17150,8 @@
16369	17150	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16370	17151	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16371	17152	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17153	+
	17154	+ CreateSelectedPoint();
16372	17155
16373	17156	// Will fit the mesh !!!
16374	17157	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16418,34 +17201,36 @@
16418	17201	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]));
16419	17202	}
16420	17203
16421		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17204	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16422	17205	}
16423	17206	}
16424	17207
16425	17208	if (!movingcamera && !PAINTMODE)
16426		- object.editWindow.ScreenFitPoint(); // fev 2014
	17209	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16427	17210
16428		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17211	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16429	17212	{
16430		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17213	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16431	17214
16432		- Object3D group = new Object3D("inst" + paintcount++);
	17215	+ if (object.GetWindow().copy.selection.Size() > 0)
	17216	+ {
	17217	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16433	17218
16434		- group.CreateMaterial(); // use a void leaf to select instances
16435		-
16436		- group.add(paintobj); // link
16437		-
16438		- object.editWindow.SnapObject(group);
16439		-
16440		- Object3D folder = object.editWindow.copy;
16441		-
16442		- if (object.editWindow.copy.selection.Size() > 0)
16443		- folder = object.editWindow.copy.selection.elementAt(0);
16444		-
16445		- folder.add(group);
16446		-
16447		- object.editWindow.ResetModel();
16448		- object.editWindow.refreshContents();
	17219	+ Object3D inst = new Object3D("inst" + paintcount++);
	17220	+
	17221	+ inst.CreateMaterial(); // use a void leaf to select instances
	17222	+
	17223	+ inst.add(paintobj); // link
	17224	+
	17225	+ object.GetWindow().SnapObject(inst);
	17226	+
	17227	+ Object3D folder = paintFolder; // GetFolder();
	17228	+
	17229	+ folder.add(inst);
	17230	+
	17231	+ object.GetWindow().ResetModel();
	17232	+ object.GetWindow().refreshContents();
	17233	+ }
16449	17234	}
16450	17235	else
16451	17236	paintcount = 0;
..	..	@@ -16484,6 +17269,11 @@
16484	17269	//System.out.println("objects[color] = " + objects[color]);
16485	17270	//objects[color].Select();
16486	17271	indexcount = 0;
	17272	+ ObjEditor window = object.GetWindow();
	17273	+ if (window != null && deselect)
	17274	+ {
	17275	+ window.Select(null, deselect, true);
	17276	+ }
16487	17277	object.Select(color, deselect);
16488	17278	}
16489	17279
..	..	@@ -16583,7 +17373,7 @@
16583	17373	gl.glDisable(gl.GL_CULL_FACE);
16584	17374	}
16585	17375
16586		- if (!RENDERSHADOW)
	17376	+ if (!Globals.RENDERSHADOW)
16587	17377	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17378
16589	17379	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16593,7 +17383,7 @@
16593	17383	//gl.glColorMask(false, false, false, false);
16594	17384
16595	17385	//render_scene_from_light_view(gl, drawable, 0, 0);
16596		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17386	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16597	17387	{
16598	17388	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16599	17389
..	..	@@ -16762,10 +17552,14 @@
16762	17552	gl.glFlush();
16763	17553
16764	17554	/**/
16765		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17555	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16766	17556
16767		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
16768	17558
	17559	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17560	+
	17561	+ int[] pixels = selectsizebuffer.array();
	17562	+
16769	17563	double r = 0, g = 0, b = 0;
16770	17564
16771	17565	double count = 0;
..	..	@@ -16776,7 +17570,7 @@
16776	17570
16777	17571	double FACTOR = 1;
16778	17572
16779		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
16780	17574	{
16781	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16782	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16859,7 +17653,7 @@
16859	17653
16860	17654	double scale = ray.z; // 1; // cos
16861	17655
16862		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
16863	17657
16864	17658	/*
16865	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17009,23 +17803,15 @@
17009	17803	int AAbuffersize = 0;
17010	17804
17011	17805	//double[] selectedpoint = new double[3];
17012		- static Superellipsoid selectedpoint = new Superellipsoid();
	17806	+ static Superellipsoid selectedpoint;
17013	17807	static Sphere previousselectedpoint = null;
17014		- static Sphere debugpointG = new Sphere();
17015		- static Sphere debugpointP = new Sphere();
17016		- static Sphere debugpointC = new Sphere();
17017		- static Sphere debugpointR = new Sphere();
	17808	+ static Sphere debugpointG;
	17809	+ static Sphere debugpointP;
	17810	+ static Sphere debugpointC;
	17811	+ static Sphere debugpointR;
17018	17812
17019	17813	static Sphere debugpoints[] = new Sphere[8];
17020	17814
17021		- static
17022		- {
17023		- for (int i=0; i<8; i++)
17024		- {
17025		- debugpoints[i] = new Sphere();
17026		- }
17027		- }
17028		-
17029	17815	static void InitPoints(float radius)
17030	17816	{
17031	17817	for (int i=0; i<8; i++)
..	..	@@ -17064,11 +17850,14 @@
17064	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17065	17851	static IntBuffer bigAAbuffer;
17066	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17067		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17068	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17069	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17070	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17071		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17857	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17858	+
	17859	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17860	+
17072	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17073	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17074	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();