~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -86,7 +120,7 @@
86	120	static boolean FULLSCREEN = false;
87	121	static boolean SUPPORT = true;
88	122	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	123	+static boolean FAST = false;
90	124	static boolean SLOWPOSE = false;
91	125	static boolean FOOTCONTACT = true;
92	126
..	..	@@ -108,7 +142,7 @@
108	142	static boolean OEIL = true;
109	143	static boolean OEILONCE = false; // do oeilon then oeiloff
110	144	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
112	146	static boolean HANDLES = false; // selection doesn't work!!
113	147	static boolean PAINTMODE = false;
114	148
..	..	@@ -152,6 +186,20 @@
152	186	defaultcaps.setAccumAlphaBits(16);
153	187	}
154	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
	202	+
155	203	void SetAsGLRenderer(boolean b)
156	204	{
157	205	isRenderer = b;
..	..	@@ -170,7 +218,8 @@
170	218
171	219	SetCamera(cam);
172	220
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	223
175	224	object = o;
176	225
..	..	@@ -327,7 +376,7 @@
327	376	cStatic.objectstack[materialdepth++] = obj;
328	377	//System.out.println("material " + material);
329	378	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
331	380	if (obj instanceof Camera)
332	381	{
333	382	display.options1[0] = material.shift;
..	..	@@ -336,14 +385,28 @@
336	385	display.options1[2] = material.shadowbias;
337	386	display.options1[3] = material.aniso;
338	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
339	393	display.options2[0] = material.opacity;
340	394	display.options2[1] = material.diffuse;
341	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
342	399
343	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
344	404	display.options4[0] = material.cameralight/0.2f;
345	405	display.options4[1] = material.subsurface;
346	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
347	410
348	411	// if (display.CURRENTANTIALIAS > 0)
349	412	// display.options3[3] /= 4;
..	..	@@ -359,7 +422,7 @@
359	422	/**/
360	423	} else
361	424	{
362		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
363	426	}
364	427	} else
365	428	{
..	..	@@ -383,8 +446,8 @@
383	446	cStatic.objectstack[materialdepth++] = obj;
384	447	//System.out.println("material " + material);
385	448	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	451	}
389	452	}
390	453
..	..	@@ -401,8 +464,8 @@
401	464	materialdepth -= 1;
402	465	if (materialdepth > 0)
403	466	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	469	}
407	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +485,8 @@
422	485	materialdepth -= 1;
423	486	if (materialdepth > 0)
424	487	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	490	}
428	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	492	//else
..	..	@@ -464,10 +527,12 @@
464	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	528	{
466	529	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
468	533	if (!hasnorm)
469	534	{
470		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
471	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1257,12 @@
1192	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1258	}
1194	1259	}
	1260	+
1195	1261	if (flipV)
1196	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1263	else
1198	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1199	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1268
..	..	@@ -1215,10 +1282,12 @@
1215	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1283	}
1217	1284	}
	1285	+
1218	1286	if (flipV)
1219	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1288	else
1221	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1222	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1293
..	..	@@ -1246,8 +1315,10 @@
1246	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1316	else
1248	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1249	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1251	1322	count2 += 2;
1252	1323	count3 += 3;
1253	1324	}
..	..	@@ -1426,6 +1497,8 @@
1426	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1498	}
1428	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1429	1502	void SetColor(Object3D obj, Vertex p0)
1430	1503	{
1431	1504	CameraPane display = this;
..	..	@@ -1493,8 +1566,6 @@
1493	1566	{
1494	1567	return;
1495	1568	}
1496		-
1497		- float[] colorV = new float[3];
1498	1569
1499	1570	if (false) // marked)
1500	1571	{
..	..	@@ -1603,7 +1674,7 @@
1603	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1675	}
1605	1676
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1678	{
1608	1679	CameraPane display = this;
1609	1680	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1701,7 @@
1630	1701
1631	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1703
1633		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
1634	1705
1635	1706	/**/
1636	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1709,7 @@
1638	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1642	1713
1643	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1817,9 @@
1746	1817	display.modelParams7[2] = 0;
1747	1818	display.modelParams7[3] = 0;
1748	1819
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1821
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1824	{
1754	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1961,7 @@
1890	1961	void PushMatrix(double[][] matrix)
1891	1962	{
1892	1963	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1894	1965	}
1895	1966
1896	1967	void PushMatrix()
..	..	@@ -2044,7 +2115,7 @@
2044	2115	//System.err.println("Oeil on");
2045	2116	OEIL = true;
2046	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2119	//pingthread.StepToTarget(true);
2049	2120	}
2050	2121
..	..	@@ -2142,7 +2213,7 @@
2142	2213	System.err.println("LIVE = " + Globals.isLIVE());
2143	2214
2144	2215	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2216	+ Grafreed.savesound = true; // wav.save();
2146	2217	// else
2147	2218	repaint(); // start loop // may 2013
2148	2219	}
..	..	@@ -2259,7 +2330,7 @@
2259	2330
2260	2331	void ToggleDebug()
2261	2332	{
2262		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2263	2334	}
2264	2335
2265	2336	void ToggleLookAt()
..	..	@@ -2267,9 +2338,9 @@
2267	2338	LOOKAT ^= true;
2268	2339	}
2269	2340
2270		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2271	2342	{
2272		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
2273	2344	}
2274	2345
2275	2346	void ToggleHandles()
..	..	@@ -2277,10 +2348,17 @@
2277	2348	HANDLES ^= true;
2278	2349	}
2279	2350
	2351	+ Object3D paintFolder;
	2352	+
2280	2353	void TogglePaint()
2281	2354	{
2282	2355	PAINTMODE ^= true;
2283	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2284	2362	}
2285	2363
2286	2364	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2454,22 @@
2376	2454	{
2377	2455	return currentGL;
2378	2456	}
2379		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2380	2473	/**/
2381	2474	class CacheTexture
2382	2475	{
..	..	@@ -2385,28 +2478,31 @@
2385	2478
2386	2479	int resolution;
2387	2480
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2482	{
2390		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2391	2485	resolution = res;
2392	2486	}
2393	2487	}
2394	2488	/**/
2395	2489
2396	2490	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2400	2496	int pigmentdepth = 0;
2401	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2498	int bumpdepth = 0;
2403	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2504
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2506	{
2411	2507	TextureData texturedata = null;
2412	2508
..	..	@@ -2425,13 +2521,34 @@
2425	2521	if (bump)
2426	2522	texturedata = ConvertBump(texturedata, false);
2427	2523
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2526
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2529
2434		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2435	2552	}
2436	2553
2437	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3621,8 @@
3504	3621
3505	3622	System.out.println("LOADING TEXTURE : " + name);
3506	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3507	3626	//
3508	3627	if (false) // compressbit > 0)
3509	3628	{
..	..	@@ -4208,6 +4327,7 @@
4208	4327
4209	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4329	{
	4330	+ new Exception().printStackTrace();
4211	4331	System.exit(0);
4212	4332	com.sun.opengl.util.texture.Texture texture = null;
4213	4333
..	..	@@ -7901,7 +8021,7 @@
7901	8021	String pigment = Object3D.GetPigment(tex);
7902	8022	String bump = Object3D.GetBump(tex);
7903	8023
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8025	{
7906	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8036,69 @@
7916	8036	pigment = null;
7917	8037	}
7918	8038
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7921	8041	}
7922	8042
7923		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8102	{
7925	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8109,7 @@
7931	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8110
7933	8111	if (tex != null)
7934		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8113
7936	8114	// //assert( texture != null );
7937	8115	// if (texture == null)
..	..	@@ -8023,7 +8201,55 @@
8023	8201	}
8024	8202	}
8025	8203
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8205	+ {
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8253	{
8028	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8260,47 @@
8034	8260	if (tex == null)
8035	8261	{
8036	8262	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8263	return;
8039	8264	}
8040	8265
8041	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
8042	8299	String bump = Object3D.GetBump(tex);
8043	8300
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8046	8302
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8304	{
8049	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8310,94 @@
8054	8310	{
8055	8311	bump = null;
8056	8312	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8313
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8066	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8317	}
8070	8318
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
8072	8322	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
8074	8342
8075	8343	if (tex != null)
8076	8344	{
8077		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8347
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
	8355	+// String[] split = tex.split("Textures");
	8356	+// if (split.length > 1)
	8357	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8358	+// else
	8359	+// if (!texname.startsWith("/"))
	8360	+// texname = "/Users/nbriere/Textures/" + texname;
	8361	+ if (!FileExists(texname))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
8085	8365
8086	8366	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8367	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8401	{
8095	8402	assert(!bump);
8096	8403	// if (bump)
..	..	@@ -8101,19 +8408,23 @@
8101	8408	// }
8102	8409	// else
8103	8410	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8106	8413	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8109	8418	// }
8110	8419	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8421	{
8113	8422	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8117	8428	} else
8118	8429	{
8119	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8432,13 @@
8121	8432	// texture = GetResourceTexture("default.png");
8122	8433	//} else
8123	8434	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8125	8436	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8129	8442	} else
8130	8443	{
8131	8444	if (textureon)
..	..	@@ -8150,7 +8463,7 @@
8150	8463	}
8151	8464
8152	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
8154	8467	cachename = texname;
8155	8468	else
8156	8469	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8485,7 @@
8172	8485	}
8173	8486
8174	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
8176	8489	cachename = texname;
8177	8490	else
8178	8491	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8494,22 @@
8181	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8495
8183	8496
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8497	+ if (texturedata == null)
	8498	+ throw new Exception();
	8499	+
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8501	//texture = GetTexture(tex, bump);
8187	8502	}
8188	8503	}
8189	8504	//}
8190	8505	}
8191	8506
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8508	{
8194	8509	//return false;
8195	8510
8196	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8513	{
8199	8514	// String ext = "_highres";
8200	8515	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8526,17 @@
8211	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8527	if (!cachefile.exists())
8213	8528	{
8214		- // cache to disk
8215		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8216		- //buffers[0].
8217		-
8218		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8219		- int[] pixels = new int[bytebuf.capacity()/3];
8220		-
8221		- // squared size heuristic...
8222		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8530	{
8224		- for (int i=pixels.length; --i>=0;)
8225		- {
8226		- int i3 = i*3;
8227		- pixels[i] = 0xFF;
8228		- pixels[i] <<= 8;
8229		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8230		- pixels[i] <<= 8;
8231		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8232		- pixels[i] <<= 8;
8233		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8234		- }
8235		-
8236		- /*
8237		- int r=0,g=0,b=0,a=0;
8238		- for (int i=0; i<width; i++)
8239		- for (int j=0; j<height; j++)
8240		- {
8241		- int index = j*width+i;
8242		- int p = pixels[index];
8243		- a = ((p>>24) & 0xFF);
8244		- r = ((p>>16) & 0xFF);
8245		- g = ((p>>8) & 0xFF);
8246		- b = (p & 0xFF);
8247		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8248		- }
8249		- /**/
8250		- int width = (int)Math.sqrt(pixels.length); // squared
8251		- int height = width;
8252		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8253		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8254	8533	ImageWriter writer = null;
8255	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8535	if (iter.hasNext()) {
8257	8536	writer = (ImageWriter)iter.next();
8258	8537	}
8259		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8260	8540	try
8261	8541	{
8262	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8553,20 @@
8273	8553	}
8274	8554	}
8275	8555	}
8276		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8277	8559	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8279	8561	{
8280		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8281	8563	thetex.texture.disable();
8282	8564	thetex.texture.dispose();
8283		- textures.remove(texname);
	8565	+ textures.remove(tex);
8284	8566	}
8285	8567
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8288	8570
8289	8571	// newtex = true;
8290	8572	}
..	..	@@ -8300,10 +8582,44 @@
8300	8582	}
8301	8583	}
8302	8584
8303		- return texture;
	8585	+ return texturecache;
8304	8586	}
8305	8587
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8307	8623	{
8308	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8625
..	..	@@ -8321,21 +8637,21 @@
8321	8637	return texture!=null?texture.texture:null;
8322	8638	}
8323	8639
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8641	{
8326	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8643
8328	8644	return texture!=null?texture.texturedata:null;
8329	8645	}
8330	8646
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8648	{
8333	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8650	{
8335	8651	return false;
8336	8652	}
8337	8653
8338		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8339	8655
8340	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8657
..	..	@@ -8367,9 +8683,75 @@
8367	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8685
8370		- return newtex;
	8686	+ return true; // Warning: not used.
8371	8687	}
8372	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8373	8755	ShadowBuffer shadowPBuf;
8374	8756	AntialiasBuffer antialiasPBuf;
8375	8757	int MAXSTACK;
..	..	@@ -8562,7 +8944,7 @@
8562	8944
8563	8945	if (cubemap == null)
8564	8946	{
8565		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8566	8948	}
8567	8949
8568	8950	//cubemap.enable();
..	..	@@ -8849,37 +9231,58 @@
8849	9231	cubemap = null;
8850	9232	return;
8851	9233	case 1:
8852		- name = "cubemaps/box_";
8853		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
8854	9236	reverseUP = false;
8855	9237	break;
8856	9238	case 2:
8857		- name = "cubemaps/uffizi_";
8858		- ext = "png";
8859		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
8860	9243	case 3:
8861		- name = "cubemaps/CloudyHills_";
8862		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
8863	9246	reverseUP = false;
8864	9247	break;
8865	9248	case 4:
8866		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
8867	9250	ext = "png";
8868	9251	reverseUP = false;
8869	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
8870	9278	default:
8871		- name = "cubemaps/rgb_";
8872		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
8873	9282	break;
8874	9283	}
8875		-
8876		- try
8877		- {
8878		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8879		- } catch (IOException e)
8880		- {
8881		- throw new RuntimeException(e);
8882		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
8883	9286	}
8884	9287
8885	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8911,8 +9314,12 @@
8911	9314	static double[] model = new double[16];
8912	9315	double[] camera2light = new double[16];
8913	9316	double[] light2camera = new double[16];
8914		- int newenvy = -1;
8915		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
8916	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8917	9324	//float[] light0 = { 0,0,0 };
8918	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9205,11 +9612,35 @@
9205	9612	jy8[3] = 0.5f;
9206	9613	}
9207	9614
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9615	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9616	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9617	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9618	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9619
	9620	+ void ResetOptions()
	9621	+ {
	9622	+ options1[0] = 100;
	9623	+ options1[1] = 0.025f;
	9624	+ options1[2] = 0.01f;
	9625	+ options1[3] = 0;
	9626	+ options1[4] = 0;
	9627	+
	9628	+ options2[0] = 0;
	9629	+ options2[1] = 0.75f;
	9630	+ options2[2] = 0;
	9631	+ options2[3] = 0;
	9632	+
	9633	+ options3[0] = 1;
	9634	+ options3[1] = 1;
	9635	+ options3[2] = 1;
	9636	+ options3[3] = 0;
	9637	+
	9638	+ options4[0] = 1;
	9639	+ options4[1] = 0;
	9640	+ options4[2] = 1;
	9641	+ options4[3] = 0;
	9642	+ }
	9643	+
9213	9644	static int imagecount = 0; // movie generation
9214	9645
9215	9646	static int jitter = 0;
..	..	@@ -9305,8 +9736,8 @@
9305	9736	assert (parentcam != renderCamera);
9306	9737
9307	9738	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9740	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9310	9741
9311	9742	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9743
..	..	@@ -9321,8 +9752,8 @@
9321	9752	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9753
9323	9754	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9755	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9756	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9326	9757
9327	9758	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9759
..	..	@@ -9368,10 +9799,12 @@
9368	9799	rati = 1 / rati;
9369	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9370	9801	}
9371		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
9372	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9373	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9374		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
9375	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9377	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9394,7 +9827,7 @@
9394	9827	//gl.glFlush();
9395	9828	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9829
9397		- if (ANIMATION && ABORTED)
	9830	+ if (Globals.ANIMATION && ABORTED)
9398	9831	{
9399	9832	System.err.println(" ABORTED FRAME");
9400	9833	break;
..	..	@@ -9424,7 +9857,7 @@
9424	9857	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9858
9426	9859	// save image
9427		- if (ANIMATION && !ABORTED)
	9860	+ if (Globals.ANIMATION && !ABORTED)
9428	9861	{
9429	9862	VPwidth = viewport[2];
9430	9863	VPheight = viewport[3];
..	..	@@ -9535,11 +9968,11 @@
9535	9968
9536	9969	// imagecount++;
9537	9970
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9971	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9972
9540	9973	if (!BOXMODE)
9541	9974	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9975	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9976	}
9544	9977
9545	9978	if (!BOXMODE)
..	..	@@ -9577,7 +10010,7 @@
9577	10010	ABORTED = false;
9578	10011	}
9579	10012	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10013	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	10014
9582	10015	if (false)
9583	10016	{
..	..	@@ -10240,11 +10673,11 @@
10240	10673
10241	10674	public void display(GLAutoDrawable drawable)
10242	10675	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10676	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10677	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10678	+ Grafreed.wav.save();
	10679	+ Grafreed.savesound = false;
	10680	+ Grafreed.hassound = false;
10248	10681	}
10249	10682	// if (DEBUG_SELECTION)
10250	10683	// {
..	..	@@ -10320,6 +10753,7 @@
10320	10753	ANTIALIAS = 0;
10321	10754	//System.out.println("RESTART");
10322	10755	AAtimer.restart();
	10756	+ Globals.TIMERRUNNING = true;
10323	10757	}
10324	10758	}
10325	10759	}
..	..	@@ -10374,7 +10808,7 @@
10374	10808	Object3D theobject = object;
10375	10809	Object3D theparent = object.parent;
10376	10810	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10811	+ object = (Object3D)Grafreed.clone(object);
10378	10812	object.Stripify();
10379	10813	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10814	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10821,14 @@
10387	10821	ambientOcclusion = false;
10388	10822	}
10389	10823
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10824	+ if (//Globals.lighttouched &&
	10825	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10826	{
10392	10827	//if (RENDERSHADOW) // ?
10393	10828	if (!IsFrozen())
10394	10829	{
10395	10830	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10831	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10832	{
10398	10833	Globals.framecount++;
10399	10834	shadowbuffer.display();
..	..	@@ -10520,8 +10955,8 @@
10520	10955
10521	10956	// if (parentcam != renderCamera) // not a light
10522	10957	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10958	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10959	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10525	10960
10526	10961	for (int j = 0; j < 4; j++)
10527	10962	{
..	..	@@ -10535,8 +10970,8 @@
10535	10970
10536	10971	// if (parentcam != renderCamera) // not a light
10537	10972	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10973	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10974	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10540	10975
10541	10976	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10977
..	..	@@ -10622,13 +11057,27 @@
10622	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10623	11058	}
10624	11059
10625		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
10626	11068	{
10627		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
10628	11074	}
10629		-
10630		- newenvy = -1;
10631		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
10632	11081	ratio = ((double) getWidth()) / getHeight();
10633	11082	//System.out.println("ratio = " + ratio);
10634	11083
..	..	@@ -10644,7 +11093,7 @@
10644	11093
10645	11094	if (!IsFrozen() && !ambientOcclusion)
10646	11095	{
10647		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
10648	11097	}
10649	11098
10650	11099	//if (selection_view == -1)
..	..	@@ -10795,7 +11244,16 @@
10795	11244	// Bump noise
10796	11245	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11246	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11247	+
	11248	+ try
	11249	+ {
	11250	+ BindTexture(NOISE_TEXTURE, false, 2);
	11251	+ }
	11252	+ catch (Exception e)
	11253	+ {
	11254	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11255	+ }
	11256	+
10799	11257
10800	11258	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11259	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11276,9 @@
10818	11276
10819	11277	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11278
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11279	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11280	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11281	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11282	} else
10825	11283	{
10826	11284	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11289,7 @@
10831	11289	//System.out.println("BLENDING ON");
10832	11290	gl.glEnable(GL.GL_BLEND);
10833	11291	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11292	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11293	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11294	gl.glLoadIdentity();
10837	11295
..	..	@@ -10920,8 +11378,8 @@
10920	11378	System.err.println("parentcam != renderCamera");
10921	11379
10922	11380	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11381	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11382	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10925	11383	}
10926	11384
10927	11385	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11400,8 @@
10942	11400	if (true) // TODO
10943	11401	{
10944	11402	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11403	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11404	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11405	}
10948	11406
10949	11407	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11538,7 @@
11080	11538	}
11081	11539	}
11082	11540
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11541	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11542	{
11085	11543	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11544	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11546,21 @@
11088	11546
11089	11547	boolean texon = textureon;
11090	11548
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11549	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11550	+ textureon = false;
	11551	+
11096	11552	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11553	//System.out.println("ALLO");
11098	11554	gl.glColorMask(false, false, false, false);
11099	11555	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11556	+
	11557	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11558	+ textureon = texon;
	11559	+
11105	11560	gl.glColorMask(true, true, true, true);
11106	11561
11107	11562	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11563	+ gl.glDepthMask(false);
11109	11564	}
11110	11565
11111	11566	if (false) // DrawMode() == SHADOW)
..	..	@@ -11259,8 +11714,14 @@
11259	11714	{
11260	11715	renderpass++;
11261	11716	// System.out.println("Draw object... ");
	11717	+ STEP = 1;
11262	11718	if (FAST) // in case there is no script
11263		- STEP = 16;
	11719	+ STEP = 8;
	11720	+
	11721	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11722	+ {
	11723	+ STEP *= 4;
	11724	+ }
11264	11725
11265	11726	//object.FullInvariants();
11266	11727
..	..	@@ -11274,23 +11735,44 @@
11274	11735	e.printStackTrace();
11275	11736	}
11276	11737
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11738	+ if (Grafreed.RENDERME > 0)
	11739	+ Grafreed.RENDERME--; // mechante magouille
11279	11740
11280	11741	Globals.ONESTEP = false;
11281	11742	}
11282	11743
11283	11744	static boolean zoomonce = false;
11284	11745
	11746	+ static void CreateSelectedPoint()
	11747	+ {
	11748	+ if (selectedpoint == null)
	11749	+ {
	11750	+ debugpointG = new Sphere();
	11751	+ debugpointP = new Sphere();
	11752	+ debugpointC = new Sphere();
	11753	+ debugpointR = new Sphere();
	11754	+
	11755	+ selectedpoint = new Superellipsoid();
	11756	+
	11757	+ for (int i=0; i<8; i++)
	11758	+ {
	11759	+ debugpoints[i] = new Sphere();
	11760	+ }
	11761	+ }
	11762	+ }
	11763	+
11285	11764	void DrawObject(GL gl, boolean draw)
11286	11765	{
	11766	+ // To clear camera values
	11767	+ ResetOptions();
	11768	+
11287	11769	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11770	// DrawMode() = SELECTION;
11289	11771	//GL gl = getGL();
11290	11772	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11773	{
11292	11774	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11775	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11776	pingthread.StepToTarget(true); // true);
11295	11777	// zoomonce = false;
11296	11778	}
..	..	@@ -11345,7 +11827,14 @@
11345	11827
11346	11828	usedtextures.clear();
11347	11829
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11830	+ try
	11831	+ {
	11832	+ BindTextures(DEFAULT_TEXTURES, 2);
	11833	+ }
	11834	+ catch (Exception e)
	11835	+ {
	11836	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11837	+ }
11349	11838	}
11350	11839	//System.out.println("--> " + stackdepth);
11351	11840	// GrafreeD.traceon();
..	..	@@ -11355,8 +11844,9 @@
11355	11844
11356	11845	if (DrawMode() == DEFAULT)
11357	11846	{
11358		- if (DEBUG)
	11847	+ if (Globals.DEBUG)
11359	11848	{
	11849	+ CreateSelectedPoint();
11360	11850	float radius = 0.05f;
11361	11851	if (selectedpoint.radius != radius)
11362	11852	{
..	..	@@ -11410,20 +11900,32 @@
11410	11900	ReleaseTextures(DEFAULT_TEXTURES);
11411	11901
11412	11902	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11903	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11904	{
11415		- String tex = e.nextElement();
	11905	+ cTexture tex = e.nextElement();
11416	11906
11417	11907	// System.out.println("Texture --------- " + tex);
11418	11908
11419		- if (tex.equals("WHITE_NOISE"))
	11909	+ if (tex.equals("WHITE_NOISE:"))
11420	11910	continue;
11421	11911
11422		- if (!usedtextures.containsKey(tex))
	11912	+ if (!usedtextures.contains(tex))
11423	11913	{
	11914	+ CacheTexture gettex = texturepigment.get(tex);
11424	11915	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	11916	+ if (gettex != null)
	11917	+ {
	11918	+ gettex.texture.dispose();
	11919	+ texturepigment.remove(tex);
	11920	+ }
	11921	+
	11922	+ gettex = texturebump.get(tex);
	11923	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11924	+ if (gettex != null)
	11925	+ {
	11926	+ gettex.texture.dispose();
	11927	+ texturebump.remove(tex);
	11928	+ }
11427	11929	}
11428	11930	}
11429	11931	}
..	..	@@ -11436,7 +11938,14 @@
11436	11938	if (checker != null && DrawMode() == DEFAULT)
11437	11939	{
11438	11940	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11941	+ try
	11942	+ {
	11943	+ BindTextures(checker.GetTextures(), checker.texres);
	11944	+ }
	11945	+ catch (Exception e)
	11946	+ {
	11947	+ System.err.println("FAILED: " + checker.GetTextures());
	11948	+ }
11440	11949	// NEAREST
11441	11950	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11951	DrawChecker(gl);
..	..	@@ -11518,7 +12027,7 @@
11518	12027	return;
11519	12028	}
11520	12029
11521		- String string = obj.GetToolTip();
	12030	+ String string = obj.toString(); //.GetToolTip();
11522	12031
11523	12032	GL gl = GetGL();
11524	12033
..	..	@@ -11835,8 +12344,8 @@
11835	12344	//obj.TransformToWorld(light, light);
11836	12345	for (int i = tp.size(); --i >= 0;)
11837	12346	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12347	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12348	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12349	}
11841	12350
11842	12351
..	..	@@ -11853,8 +12362,8 @@
11853	12362	parentcam = cameras[0];
11854	12363	}
11855	12364
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12365	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12366	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12367
11859	12368	LA.xformPos(light, renderCamera.toScreen, light);
11860	12369
..	..	@@ -11944,8 +12453,76 @@
11944	12453
11945	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12455
11947		- String program =
	12456	+ String programmin =
	12457	+ // Min shader
11948	12458	"!!ARBfp1.0\n" +
	12459	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12460	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12461	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12462	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12463	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12464	+ "PARAM light2cam0 = program.env[10];" +
	12465	+ "PARAM light2cam1 = program.env[11];" +
	12466	+ "PARAM light2cam2 = program.env[12];" +
	12467	+ "TEMP temp;" +
	12468	+ "TEMP light;" +
	12469	+ "TEMP ndotl;" +
	12470	+ "TEMP normal;" +
	12471	+ "TEMP depth;" +
	12472	+ "TEMP eye;" +
	12473	+ "TEMP pos;" +
	12474	+
	12475	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12476	+ Normalize("normal") +
	12477	+ "MOV light, state.light[0].position;" +
	12478	+ "DP3 ndotl.x, light, normal;" +
	12479	+
	12480	+ // shadow
	12481	+ "MOV pos, fragment.texcoord[1];" +
	12482	+ "MOV temp, pos;" +
	12483	+ ShadowTextureFetch("depth", "temp", "1") +
	12484	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12485	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12486	+
	12487	+ // No shadow when out of frustum
	12488	+ //"SGE temp.y, depth.z, zero123.y;" +
	12489	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12490	+
	12491	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12492	+
	12493	+ // Backlit
	12494	+ "MOV pos.w, zero123.y;" +
	12495	+ "DP4 eye.x, pos, light2cam0;" +
	12496	+ "DP4 eye.y, pos, light2cam1;" +
	12497	+ "DP4 eye.z, pos, light2cam2;" +
	12498	+ Normalize("eye") +
	12499	+
	12500	+ "DP3 ndotl.y, -eye, normal;" +
	12501	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12502	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12503	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12504	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12505	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12506	+
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12509	+
	12510	+ // Pigment
	12511	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12512	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12513	+ "MUL temp, temp, ndotl.x;" +
	12514	+
	12515	+ "MUL temp, temp, zero123.z;" +
	12516	+
	12517	+ //"MUL temp, temp, ndotl.y;" +
	12518	+
	12519	+ "MOV temp.w, zero123.y;" + // reset alpha
	12520	+ "MOV result.color, temp;" +
	12521	+ "END";
	12522	+
	12523	+ String programmax =
	12524	+ "!!ARBfp1.0\n" +
	12525	+
11949	12526	//"OPTION ARB_fragment_program_shadow;" +
11950	12527	"PARAM light2cam0 = program.env[10];" +
11951	12528	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12060,8 +12637,7 @@
12060	12637	"TEMP shininess;" +
12061	12638	"\n" +
12062	12639	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12640	+
12065	12641	"MOV mapgrid.x, one2048th.x;" +
12066	12642	"MOV temp, fragment.texcoord[1];" +
12067	12643	/*
..	..	@@ -12082,20 +12658,20 @@
12082	12658	"MUL temp, floor, mapgrid.x;" +
12083	12659	//"TEX depth0, temp, texture[1], 2D;" +
12084	12660	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12085		- TextureFetch("depth0", "temp", "1") +
	12661	+ ShadowTextureFetch("depth0", "temp", "1") +
12086	12662	"") +
12087	12663	"ADD temp.x, temp.x, mapgrid.x;" +
12088	12664	//"TEX depth1, temp, texture[1], 2D;" +
12089	12665	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth1", "temp", "1") +
	12666	+ ShadowTextureFetch("depth1", "temp", "1") +
12091	12667	"") +
12092	12668	"ADD temp.y, temp.y, mapgrid.x;" +
12093	12669	//"TEX depth2, temp, texture[1], 2D;" +
12094		- TextureFetch("depth2", "temp", "1") +
	12670	+ ShadowTextureFetch("depth2", "temp", "1") +
12095	12671	"SUB temp.x, temp.x, mapgrid.x;" +
12096	12672	//"TEX depth3, temp, texture[1], 2D;" +
12097	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12098		- TextureFetch("depth3", "temp", "1") +
	12674	+ ShadowTextureFetch("depth3", "temp", "1") +
12099	12675	"") +
12100	12676	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12101	12677	//"MOV params, material;" +
..	..	@@ -12466,10 +13042,10 @@
12466	13042	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	13043	"") +
12468	13044
12469		- // display shadow only (bump == 0)
	13045	+ // display shadow only (fakedepth == 0)
12470	13046	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	13047	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
12473	13049	"SUB temp.y, one.x, temp.z;" +
12474	13050	"MUL temp.x, temp.x, temp.y;" +
12475	13051	"KIL temp.x;" +
..	..	@@ -12598,8 +13174,10 @@
12598	13174	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13175
12600	13176	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13177	+ // Tuning for default skin
	13178	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13179	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13180	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13181	"MUL temp.x, temp.x, temp.y;" +
12604	13182
12605	13183	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +13325,7 @@
12747	13325	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	13326	"FLR final.x, final.y;" +
12749	13327	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	13328	+ "MUL final.x, final.x, c256i;" +
12751	13329	"MOV final.z, zero.x;" +
12752	13330	"MOV final.a, one.w;":""
12753	13331	) +
..	..	@@ -12755,7 +13333,7 @@
12755	13333	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	13334	"FLR final.x, final.y;" +
12757	13335	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	13336	+ "MUL final.x, final.x, c256i;" +
12759	13337	"MOV final.z, zero.x;" +
12760	13338	"MOV final.a, one.w;":""
12761	13339	) +
..	..	@@ -12798,7 +13376,14 @@
12798	13376	//once = true;
12799	13377	}
12800	13378
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
	13386	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13389
..	..	@@ -12891,25 +13476,26 @@
12891	13476	return out;
12892	13477	}
12893	13478
12894		- String TextureFetch(String dest, String src, String unit)
	13479	+ // Also does frustum culling
	13480	+ String ShadowTextureFetch(String dest, String src, String unit)
12895	13481	{
12896	13482	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13483	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13484	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13485	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13486	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13487	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12900		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12901		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12902		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12903		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13488	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13489	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13490	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13491	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13492	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13493	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13494	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13495	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13496
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13497	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13498	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12913	13499	}
12914	13500
12915	13501	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13517,16 @@
12931	13517
12932	13518	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13519	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13520	+
	13521	+ // Compare fragment depth in light space with shadowmap.
12934	13522	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13523	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13524	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13525	+
	13526	+ // Reverse comparison
12937	13527	"SUB temp.x, one.x, temp.x;" +
12938	13528	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13529	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13530	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13531
12942	13532	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13540,10 @@
12950	13540	// No shadow for backface
12951	13541	"DP3 temp.x, normal, lightd;" +
12952	13542	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13543	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13544	+
	13545	+ // No shadow when out of frustum
	13546	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13547	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13548	"";
12955	13549	}
..	..	@@ -13096,7 +13690,8 @@
13096	13690	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13691	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13692	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13693	+
	13694	+ //Object3D.cVector2[] vector2buffer;
13100	13695
13101	13696	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13697	// OUT : diff, spec
..	..	@@ -13112,9 +13707,10 @@
13112	13707	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13708	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13709	//"MOV " + dest + ".w," + "normal.z;" +
13115		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13116		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13117		- //"MOV " + dest + ".z," + "params2.w;" +
	13710	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13711	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13712	+
	13713	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13714	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13715	"RCP " + dest + ".w," + dest + ".w;" +
13120	13716	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +14104,7 @@
13508	14104	public void mousePressed(MouseEvent e)
13509	14105	{
13510	14106	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14107	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14108	}
13513	14109
13514	14110	static long prevtime = 0;
..	..	@@ -13584,8 +14180,8 @@
13584	14180	// mode \|= META;
13585	14181	//}
13586	14182
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14183	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14184	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	14185	anchorX = ax;
13590	14186	anchorY = ay;
13591	14187	prevX = px;
..	..	@@ -13619,6 +14215,7 @@
13619	14215	else
13620	14216	if (evt.getSource() == AAtimer)
13621	14217	{
	14218	+ Globals.TIMERRUNNING = false;
13622	14219	if (mouseDown)
13623	14220	{
13624	14221	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14241,10 @@
13644	14241	// LIVE = waslive;
13645	14242	// wasliveok = true;
13646	14243	// waslive = false;
	14244	+
	14245	+ // May 2019 Forget it:
	14246	+ if (true)
	14247	+ return;
13647	14248
13648	14249	// source == timer
13649	14250	if (mouseDown)
..	..	@@ -13674,7 +14275,7 @@
13674	14275
13675	14276	// fev 2014???
13676	14277	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14278	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14279	pingthread.StepToTarget(true); // true);
13679	14280	}
13680	14281	// if (!LIVE)
..	..	@@ -13683,12 +14284,13 @@
13683	14284
13684	14285	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14286
13686		- void clickStart(int x, int y, int modifiers)
	14287	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14288	{
13688	14289	if (!wasliveok)
13689	14290	return;
13690	14291
13691	14292	AAtimer.restart(); //
	14293	+ Globals.TIMERRUNNING = true;
13692	14294
13693	14295	// waslive = LIVE;
13694	14296	// LIVE = false;
..	..	@@ -13700,7 +14302,7 @@
13700	14302	// touched = true; // main DL
13701	14303	if (isRenderer)
13702	14304	{
13703		- SetMouseMode(modifiers);
	14305	+ SetMouseMode(modifiers, modifiersex);
13704	14306	}
13705	14307
13706	14308	selectX = anchorX = x;
..	..	@@ -13713,7 +14315,7 @@
13713	14315	clicked = true;
13714	14316	hold = false;
13715	14317
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14318	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14319	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14320	{
13719	14321	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14340,15 @@
13738	14340	drag = false;
13739	14341	//System.out.println("Mouse DOWN");
13740	14342	editObj = false;
13741		- ClickInfo info = new ClickInfo();
13742		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13743		- info.pane = this;
13744		- info.camera = renderCamera;
13745		- info.x = x;
13746		- info.y = y;
13747		- info.modifiers = modifiers;
13748		- editObj = object.doEditClick(info, 0);
	14343	+ //ClickInfo info = new ClickInfo();
	14344	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14345	+ object.clickInfo.pane = this;
	14346	+ object.clickInfo.camera = renderCamera;
	14347	+ object.clickInfo.x = x;
	14348	+ object.clickInfo.y = y;
	14349	+ object.clickInfo.modifiers = modifiersex;
	14350	+ editObj = object.doEditClick(//info,
	14351	+ 0);
13749	14352	if (!editObj)
13750	14353	{
13751	14354	hasMarquee = true;
..	..	@@ -13761,9 +14364,12 @@
13761	14364
13762	14365	public void mouseDragged(MouseEvent e)
13763	14366	{
	14367	+ Globals.MOUSEDRAGGED = true;
	14368	+
13764	14369	//System.out.println("mouseDragged: " + e);
13765	14370	if (isRenderer)
13766	14371	movingcamera = true;
	14372	+
13767	14373	//if (drawing)
13768	14374	//return;
13769	14375	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14379,7 @@
13773	14379	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14380	}
13775	14381	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14382	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14383
13778	14384	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14385	}
..	..	@@ -13946,6 +14552,7 @@
13946	14552
13947	14553	public void run()
13948	14554	{
	14555	+ new Exception().printStackTrace();
13949	14556	System.exit(0);
13950	14557	for (;;)
13951	14558	{
..	..	@@ -14009,7 +14616,7 @@
14009	14616	{
14010	14617	Globals.lighttouched = true;
14011	14618	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14619	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14620	}
14014	14621	//else
14015	14622	}
..	..	@@ -14023,12 +14630,12 @@
14023	14630	void GoDown(int mod)
14024	14631	{
14025	14632	MODIFIERS \|= COMMAND;
14026		- /*
	14633	+ /**/
14027	14634	if((mod&SHIFT) == SHIFT)
14028	14635	manipCamera.RotatePosition(0, -speed);
14029	14636	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14637	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14638	+ /**/
14032	14639	if ((mod & SHIFT) == SHIFT)
14033	14640	{
14034	14641	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14651,12 @@
14044	14651	void GoUp(int mod)
14045	14652	{
14046	14653	MODIFIERS \|= COMMAND;
14047		- /*
	14654	+ /**/
14048	14655	if((mod&SHIFT) == SHIFT)
14049	14656	manipCamera.RotatePosition(0, speed);
14050	14657	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14658	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14659	+ /**/
14053	14660	if ((mod & SHIFT) == SHIFT)
14054	14661	{
14055	14662	mouseMode = mouseMode;
..	..	@@ -14065,12 +14672,12 @@
14065	14672	void GoLeft(int mod)
14066	14673	{
14067	14674	MODIFIERS \|= COMMAND;
14068		- /*
	14675	+ /**/
14069	14676	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14677	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14678	+ else
	14679	+ manipCamera.RotatePosition(speed, 0);
	14680	+ /**/
14074	14681	if ((mod & SHIFT) == SHIFT)
14075	14682	{
14076	14683	mouseMode = mouseMode;
..	..	@@ -14086,12 +14693,12 @@
14086	14693	void GoRight(int mod)
14087	14694	{
14088	14695	MODIFIERS \|= COMMAND;
14089		- /*
	14696	+ /**/
14090	14697	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14698	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14699	+ else
	14700	+ manipCamera.RotatePosition(-speed, 0);
	14701	+ /**/
14095	14702	if ((mod & SHIFT) == SHIFT)
14096	14703	{
14097	14704	mouseMode = mouseMode;
..	..	@@ -14109,7 +14716,7 @@
14109	14716	int X, Y;
14110	14717	boolean SX, SY;
14111	14718
14112		- void drag(int x, int y, int modifiers)
	14719	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14720	{
14114	14721	if (IsFrozen())
14115	14722	{
..	..	@@ -14118,17 +14725,17 @@
14118	14725
14119	14726	drag = true; // NEW
14120	14727
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14728	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14729
14123	14730	X = x;
14124	14731	Y = y;
14125	14732	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14733	+ MODIFIERS = modifiersex;
	14734	+ modifiersex &= ~1024;
14128	14735	if (false) // modifiers != 0)
14129	14736	{
14130	14737	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14738	+ System.out.println("mouseDragged: " + modifiersex);
14132	14739	System.out.println("SHIFT = " + SHIFT);
14133	14740	System.out.println("CONTROL = " + COMMAND);
14134	14741	System.out.println("META = " + META);
..	..	@@ -14141,14 +14748,16 @@
14141	14748	if (editObj)
14142	14749	{
14143	14750	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	14751	+ //ClickInfo info = new ClickInfo();
	14752	+ object.clickInfo.bounds.setBounds(0, 0,
14146	14753	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14147		- info.pane = this;
14148		- info.camera = renderCamera;
14149		- info.x = x;
14150		- info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14754	+ object.clickInfo.pane = this;
	14755	+ object.clickInfo.camera = renderCamera;
	14756	+ object.clickInfo.x = x;
	14757	+ object.clickInfo.y = y;
	14758	+ object //.GetWindow().copy
	14759	+ .doEditDrag(//info,
	14760	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14761	} else
14153	14762	{
14154	14763	if (x < startX)
..	..	@@ -14297,22 +14906,27 @@
14297	14906	}
14298	14907	}
14299	14908
	14909	+// ClickInfo clickInfo = new ClickInfo();
	14910	+
14300	14911	public void mouseMoved(MouseEvent e)
14301	14912	{
14302	14913	//System.out.println("mouseMoved: " + e);
14303	14914	if (isRenderer)
14304	14915	return;
14305	14916
14306		- ClickInfo ci = new ClickInfo();
14307		- ci.x = e.getX();
14308		- ci.y = e.getY();
14309		- ci.modifiers = e.getModifiersEx();
14310		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14311		- ci.pane = this;
14312		- ci.camera = renderCamera;
	14917	+ // Mouse cursor feedback
	14918	+ object.clickInfo.x = e.getX();
	14919	+ object.clickInfo.y = e.getY();
	14920	+ object.clickInfo.modifiers = e.getModifiersEx();
	14921	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14922	+ object.clickInfo.pane = this;
	14923	+ object.clickInfo.camera = renderCamera;
14313	14924	if (!isRenderer)
14314	14925	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14926	+ //ObjEditor editWindow = object.editWindow;
	14927	+ //Object3D copy = editWindow.copy;
	14928	+ if (object.doEditClick(//clickInfo,
	14929	+ 0))
14316	14930	{
14317	14931	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14932	} else
..	..	@@ -14324,7 +14938,11 @@
14324	14938
14325	14939	public void mouseReleased(MouseEvent e)
14326	14940	{
	14941	+ Globals.MOUSEDRAGGED = false;
	14942	+
14327	14943	movingcamera = false;
	14944	+ X = 0; // getBounds().width/2;
	14945	+ Y = 0; // getBounds().height/2;
14328	14946	//System.out.println("mouseReleased: " + e);
14329	14947	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14948	}
..	..	@@ -14347,9 +14965,9 @@
14347	14965	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14966	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14967
14350		- if (control \|\| command \|\| IsFrozen())
	14968	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14969	timeout = true;
14352		- else
	14970	+// ?? May 2019 else
14353	14971	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14972	mouseDown = false;
14355	14973	if (!control && !command) // june 2013
..	..	@@ -14459,7 +15077,7 @@
14459	15077	System.out.println("keyReleased: " + e);
14460	15078	}
14461	15079
14462		- void SetMouseMode(int modifiers)
	15080	+ void SetMouseMode(int modifiers, int modifiersex)
14463	15081	{
14464	15082	//System.out.println("SetMouseMode = " + modifiers);
14465	15083	//modifiers &= ~1024;
..	..	@@ -14471,25 +15089,25 @@
14471	15089	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15090	// return;
14473	15091	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15092	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15093	{
14476	15094	mouseMode \|= ZOOM;
14477	15095	}
14478	15096
14479	15097	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15098	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	15099	{
14482	15100	mouseMode \|= VR; // BACKFORTH;
14483	15101	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15102	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15103	{
14486	15104	mouseMode \|= SELECT;
14487	15105	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15106	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15107	{
14490	15108	mouseMode \|= SELECT;
14491	15109	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15110	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15111	{
14494	15112	mouseMode &= ~VR;
14495	15113	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15136,7 @@
14518	15136
14519	15137	if (isRenderer) //
14520	15138	{
14521		- SetMouseMode(modifiers);
	15139	+ SetMouseMode(0, modifiers);
14522	15140	}
14523	15141
14524	15142	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +15198,8 @@
14580	15198	// break;
14581	15199	case 'T':
14582	15200	CACHETEXTURE ^= true;
14583		- textures.clear();
	15201	+ texturepigment.clear();
	15202	+ texturebump.clear();
14584	15203	// repaint();
14585	15204	break;
14586	15205	case 'Y':
..	..	@@ -14665,7 +15284,9 @@
14665	15284	case 'E' : COMPACT ^= true;
14666	15285	repaint();
14667	15286	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15287	+ case 'W' : // Wide Window (fullscreen)
	15288	+ //DEBUGHSB ^= true;
	15289	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15290	repaint();
14670	15291	break;
14671	15292	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15311,8 @@
14690	15311	RevertCamera();
14691	15312	repaint();
14692	15313	break;
14693		- case 'L':
14694	15314	case 'l':
	15315	+ //case 'L':
14695	15316	if (lightMode)
14696	15317	{
14697	15318	lightMode = false;
..	..	@@ -14755,20 +15376,24 @@
14755	15376	OCCLUSION_CULLING ^= true;
14756	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14757	15378	break;
14758		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
14759	15380	case '1':
14760	15381	case '2':
14761	15382	case '3':
14762	15383	case '4':
14763	15384	case '5':
14764		- newenvy = Character.getNumericValue(key);
14765		- repaint();
14766		- break;
14767	15385	case '6':
14768	15386	case '7':
14769	15387	case '8':
14770	15388	case '9':
14771		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
14772	15397	repaint();
14773	15398	break;
14774	15399	case '!':
..	..	@@ -14834,9 +15459,9 @@
14834	15459	case '_':
14835	15460	kompactbit = 5;
14836	15461	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15462	+// case '+':
	15463	+// kompactbit = 6;
	15464	+// break;
14840	15465	case ' ':
14841	15466	lightMode ^= true;
14842	15467	Globals.lighttouched = true;
..	..	@@ -14848,13 +15473,14 @@
14848	15473	case ESC:
14849	15474	RENDERPROGRAM += 1;
14850	15475	RENDERPROGRAM %= 3;
	15476	+
14851	15477	repaint();
14852	15478	break;
14853	15479	case 'Z':
14854	15480	//RESIZETEXTURE ^= true;
14855	15481	//break;
14856	15482	case 'z':
14857		- RENDERSHADOW ^= true;
	15483	+ Globals.RENDERSHADOW ^= true;
14858	15484	Globals.lighttouched = true;
14859	15485	repaint();
14860	15486	break;
..	..	@@ -14887,8 +15513,9 @@
14887	15513	case DELETE:
14888	15514	ClearSelection();
14889	15515	break;
14890		- /*
14891	15516	case '+':
	15517	+
	15518	+ /*
14892	15519	//fontsize += 1;
14893	15520	bbzoom *= 2;
14894	15521	repaint();
..	..	@@ -14905,17 +15532,17 @@
14905	15532	case '=':
14906	15533	IncDepth();
14907	15534	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15535	+ object.GetWindow().refreshContents(true);
14909	15536	maskbit = 6;
14910	15537	break;
14911	15538	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15539	DecDepth();
14913	15540	maskbit = 5;
14914	15541	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15542	+// if (object.editWindow == null)
	15543	+// new Exception().printStackTrace();
	15544	+// else
	15545	+ object.GetWindow().refreshContents(true);
14919	15546	break;
14920	15547	case '{':
14921	15548	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15605,7 @@
14978	15605	//mode = ROTATE;
14979	15606	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15607	{
14981		- SetMouseMode(modifiers);
	15608	+ SetMouseMode(0, modifiers);
14982	15609	}
14983	15610	}
14984	15611
..	..	@@ -15114,7 +15741,7 @@
15114	15741	{
15115	15742	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15743	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15744	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15745	{
15119	15746	mouseMoved(e);
15120	15747	} else
..	..	@@ -15139,11 +15766,12 @@
15139	15766	}
15140	15767	*/
15141	15768
15142		- object.editWindow.EditSelection();
	15769	+ object.GetWindow().EditSelection(false);
15143	15770	}
15144	15771
15145	15772	void SelectParent()
15146	15773	{
	15774	+ new Exception().printStackTrace();
15147	15775	System.exit(0);
15148	15776	Composite group = (Composite) object;
15149	15777	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15783,10 @@
15155	15783	{
15156	15784	//selectees.remove(i);
15157	15785	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15786	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15787	} else
15160	15788	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15789	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15790	}
15163	15791
15164	15792	first = false;
..	..	@@ -15167,6 +15795,7 @@
15167	15795
15168	15796	void SelectChildren()
15169	15797	{
	15798	+ new Exception().printStackTrace();
15170	15799	System.exit(0);
15171	15800	/*
15172	15801	Composite group = (Composite) object;
..	..	@@ -15199,12 +15828,12 @@
15199	15828	for (int j = 0; j < group.children.size(); j++)
15200	15829	{
15201	15830	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15831	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15832	first = false;
15204	15833	}
15205	15834	} else
15206	15835	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15836	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15837	}
15209	15838
15210	15839	first = false;
..	..	@@ -15215,21 +15844,21 @@
15215	15844	{
15216	15845	//Composite group = (Composite) object;
15217	15846	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15847	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15848	}
15220	15849
15221	15850	void ResetTransform(int mask)
15222	15851	{
15223	15852	//Composite group = (Composite) object;
15224	15853	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15854	+ group.GetWindow().ResetTransform(mask);
15226	15855	}
15227	15856
15228	15857	void FlipTransform()
15229	15858	{
15230	15859	//Composite group = (Composite) object;
15231	15860	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15861	+ group.GetWindow().FlipTransform();
15233	15862	// group.editWindow.ReduceMesh(true);
15234	15863	}
15235	15864
..	..	@@ -15237,7 +15866,7 @@
15237	15866	{
15238	15867	//Composite group = (Composite) object;
15239	15868	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15869	+ group.GetWindow().PrintMemory();
15241	15870	// group.editWindow.ReduceMesh(true);
15242	15871	}
15243	15872
..	..	@@ -15245,7 +15874,7 @@
15245	15874	{
15246	15875	//Composite group = (Composite) object;
15247	15876	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15877	+ group.GetWindow().ResetCentroid();
15249	15878	}
15250	15879
15251	15880	void IncDepth()
..	..	@@ -15327,11 +15956,11 @@
15327	15956
15328	15957	int width = getBounds().width;
15329	15958	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15959	//Image img = CreateImage(width, height);
15333	15960	//System.out.println("width = " + width + "; height = " + height + "\n");
	15961	+
15334	15962	Graphics gr = g; // img.getGraphics();
	15963	+
15335	15964	if (!hasMarquee)
15336	15965	{
15337	15966	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,40 +16032,88 @@
15403	16032	}
15404	16033	if (object != null && !hasMarquee)
15405	16034	{
	16035	+ if (object.clickInfo == null)
	16036	+ object.clickInfo = new ClickInfo();
	16037	+ ClickInfo info = object.clickInfo;
	16038	+ //ClickInfo info = new ClickInfo();
	16039	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16040	+
15406	16041	if (isRenderer)
15407	16042	{
15408		- info.flags++;
	16043	+ object.clickInfo.flags++;
15409	16044	double frameAspect = (double) width / (double) height;
15410	16045	if (frameAspect > renderCamera.aspect)
15411	16046	{
15412	16047	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	16048	+ object.clickInfo.bounds.width -= width - desired;
	16049	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	16050	} else
15416	16051	{
15417	16052	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	16053	+ object.clickInfo.bounds.height -= height - desired;
	16054	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	16055	}
15421	16056	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	16057	+
	16058	+ object.clickInfo.g = gr;
	16059	+ object.clickInfo.camera = renderCamera;
15424	16060	/*
15425	16061	// Memory intensive (brep.verticescopy)
15426	16062	if (!(object instanceof Composite))
15427	16063	object.draw(info, 0, false); // SLOW :
15428	16064	*/
15429		- if (!isRenderer)
	16065	+ if (!isRenderer) // && drag)
15430	16066	{
15431		- object.drawEditHandles(info, 0);
	16067	+ Grafreed.Assert(object != null);
	16068	+ Grafreed.Assert(object.selection != null);
	16069	+ if (object.selection.Size() > 0)
	16070	+ {
	16071	+ int hitSomething = object.selection.get(0).hitSomething;
	16072	+
	16073	+ object.clickInfo.DX = 0;
	16074	+ object.clickInfo.DY = 0;
	16075	+ object.clickInfo.W = 1;
	16076	+ if (hitSomething == Object3D.hitCenter)
	16077	+ {
	16078	+ info.DX = X;
	16079	+ if (X != 0)
	16080	+ info.DX -= info.bounds.width/2;
	16081	+
	16082	+ info.DY = Y;
	16083	+ if (Y != 0)
	16084	+ info.DY -= info.bounds.height/2;
	16085	+ }
	16086	+
	16087	+ object.drawEditHandles(//info,
	16088	+ 0);
	16089	+
	16090	+ if (drag && (X != 0 \|\| Y != 0))
	16091	+ {
	16092	+ switch (hitSomething)
	16093	+ {
	16094	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16095	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16096	+ break;
	16097	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16098	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16099	+ break;
	16100	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16101	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16102	+ break;
	16103	+ }
	16104	+
	16105	+ }
	16106	+ }
15432	16107	}
15433	16108	}
	16109	+
15434	16110	if (isRenderer)
15435	16111	{
15436	16112	//gr.setColor(Color.black);
15437	16113	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16114	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16115	}
	16116	+
15440	16117	if (hasMarquee)
15441	16118	{
15442	16119	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +16226,7 @@
15549	16226	public boolean mouseDown(Event evt, int x, int y)
15550	16227	{
15551	16228	System.out.println("mouseDown: " + evt);
	16229	+ System.exit(0);
15552	16230	/*
15553	16231	locked = true;
15554	16232	drag = false;
..	..	@@ -15592,7 +16270,7 @@
15592	16270	{
15593	16271	keyPressed(0, modifiers);
15594	16272	}
15595		- clickStart(x, y, modifiers);
	16273	+ // clickStart(x, y, modifiers);
15596	16274	return true;
15597	16275	}
15598	16276
..	..	@@ -15710,7 +16388,7 @@
15710	16388	{
15711	16389	keyReleased(0, 0);
15712	16390	}
15713		- drag(x, y, modifiers);
	16391	+ drag(x, y, 0, modifiers);
15714	16392	return true;
15715	16393	}
15716	16394
..	..	@@ -15842,7 +16520,7 @@
15842	16520	Object3D object;
15843	16521	static Object3D trackedobject;
15844	16522	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16523	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16524	/static/ Camera eyeCamera;
15847	16525	/static/ Camera lightCamera;
15848	16526	int cameracount;
..	..	@@ -15906,6 +16584,8 @@
15906	16584	private /static/ boolean firstime;
15907	16585	private /static/ cVector newView = new cVector();
15908	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15909	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15910	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15911	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15918,29 +16598,66 @@
15918	16598	{
15919	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15920	16600
	16601	+ int usedsuf = 0;
	16602	+
15921	16603	for (int i = 0; i < suffixes.length; i++)
15922	16604	{
15923		- String resourceName = basename + suffixes[i] + "." + suffix;
15924		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15925		- mipmapped,
15926		- FileUtil.getFileSuffix(resourceName));
15927		- if (data == null)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
15928	16610	{
15929		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
15930	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
15931	16644	//System.out.println("Target = " + targets[i]);
15932	16645	cubemap.updateImage(data, targets[i]);
15933	16646	}
15934	16647
15935	16648	return cubemap;
15936	16649	}
	16650	+
15937	16651	int bigsphere = -1;
15938	16652
15939	16653	float BGcolor = 0.5f;
15940	16654
15941		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
15942	16658	{
15943		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
15944	16661	{
15945	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15946	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15955,7 +16672,17 @@
15955	16672	// Compensates for ExaminerViewer's modification of modelview matrix
15956	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
15957	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
15958	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
15959	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
15960	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15961	16688
..	..	@@ -15987,6 +16714,7 @@
15987	16714	{
15988	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
15989	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15990	16718	gl.glMultMatrixd(viewrot_1, 0);
15991	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15992	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -16127,16 +16855,16 @@
16127	16855	cStatic.objectstack[materialdepth++] = checker;
16128	16856	//System.out.println("material " + material);
16129	16857	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16858	+ //vector2buffer = checker.projectedVertices;
16131	16859
16132	16860	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16861	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16862
16135	16863	materialdepth -= 1;
16136	16864	if (materialdepth > 0)
16137	16865	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16866	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16867	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	16868	}
16141	16869	//checker.GetMaterial().opacity = 1f;
16142	16870	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16950,14 @@
16222	16950	}
16223	16951	}
16224	16952
	16953	+ private Object3D GetFolder()
	16954	+ {
	16955	+ Object3D folder = object.GetWindow().copy;
	16956	+ if (object.GetWindow().copy.selection.Size() > 0)
	16957	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16958	+ return folder;
	16959	+ }
	16960	+
16225	16961	class SelectBuffer implements GLEventListener
16226	16962	{
16227	16963
..	..	@@ -16237,7 +16973,7 @@
16237	16973	//new Exception().printStackTrace();
16238	16974	System.out.println("select buffer init");
16239	16975	// Use debug pipeline
16240		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16241	16977
16242	16978	GL gl = drawable.getGL();
16243	16979
..	..	@@ -16280,6 +17016,7 @@
16280	17016	{
16281	17017	if (!selection)
16282	17018	{
	17019	+ new Exception().printStackTrace();
16283	17020	System.exit(0);
16284	17021	return;
16285	17022	}
..	..	@@ -16300,6 +17037,17 @@
16300	17037
16301	17038	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	17039
	17040	+ if (PAINTMODE)
	17041	+ {
	17042	+ if (object.GetWindow().copy.selection.Size() > 0)
	17043	+ {
	17044	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17045	+
	17046	+ // Make what you paint not selectable.
	17047	+ paintobj.ResetSelectable();
	17048	+ }
	17049	+ }
	17050	+
16303	17051	//int tmp = selection_view;
16304	17052	//selection_view = -1;
16305	17053	int temp = DrawMode();
..	..	@@ -16311,6 +17059,17 @@
16311	17059	// temp = DEFAULT; // patch for selection debug
16312	17060	Globals.drawMode = temp; // WARNING
16313	17061
	17062	+ if (PAINTMODE)
	17063	+ {
	17064	+ if (object.GetWindow().copy.selection.Size() > 0)
	17065	+ {
	17066	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17067	+
	17068	+ // Revert.
	17069	+ paintobj.RestoreSelectable();
	17070	+ }
	17071	+ }
	17072	+
16314	17073	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	17074
16316	17075	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +17117,8 @@
16358	17117	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	17118	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	17119	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17120	+
	17121	+ CreateSelectedPoint();
16361	17122
16362	17123	// Will fit the mesh !!!
16363	17124	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17168,36 @@
16407	17168	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16408	17169	}
16409	17170
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17171	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17172	}
16412	17173	}
16413	17174
16414	17175	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17176	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17177
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17178	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	17179	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17180	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	17181
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17182	+ if (object.GetWindow().copy.selection.Size() > 0)
	17183	+ {
	17184	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17185
16423		- group.CreateMaterial(); // use a void leaf to select instances
16424		-
16425		- group.add(paintobj); // link
16426		-
16427		- object.editWindow.SnapObject(group);
16428		-
16429		- Object3D folder = object.editWindow.copy;
16430		-
16431		- if (object.editWindow.copy.selection.Size() > 0)
16432		- folder = object.editWindow.copy.selection.elementAt(0);
16433		-
16434		- folder.add(group);
16435		-
16436		- object.editWindow.ResetModel();
16437		- object.editWindow.refreshContents();
	17186	+ Object3D inst = new Object3D("inst" + paintcount++);
	17187	+
	17188	+ inst.CreateMaterial(); // use a void leaf to select instances
	17189	+
	17190	+ inst.add(paintobj); // link
	17191	+
	17192	+ object.GetWindow().SnapObject(inst);
	17193	+
	17194	+ Object3D folder = paintFolder; // GetFolder();
	17195	+
	17196	+ folder.add(inst);
	17197	+
	17198	+ object.GetWindow().ResetModel();
	17199	+ object.GetWindow().refreshContents();
	17200	+ }
16438	17201	}
16439	17202	else
16440	17203	paintcount = 0;
..	..	@@ -16473,6 +17236,11 @@
16473	17236	//System.out.println("objects[color] = " + objects[color]);
16474	17237	//objects[color].Select();
16475	17238	indexcount = 0;
	17239	+ ObjEditor window = object.GetWindow();
	17240	+ if (window != null && deselect)
	17241	+ {
	17242	+ window.Select(null, deselect, true);
	17243	+ }
16476	17244	object.Select(color, deselect);
16477	17245	}
16478	17246
..	..	@@ -16572,7 +17340,7 @@
16572	17340	gl.glDisable(gl.GL_CULL_FACE);
16573	17341	}
16574	17342
16575		- if (!RENDERSHADOW)
	17343	+ if (!Globals.RENDERSHADOW)
16576	17344	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17345
16578	17346	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17350,7 @@
16582	17350	//gl.glColorMask(false, false, false, false);
16583	17351
16584	17352	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17353	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17354	{
16587	17355	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17356
..	..	@@ -16998,23 +17766,15 @@
16998	17766	int AAbuffersize = 0;
16999	17767
17000	17768	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17769	+ static Superellipsoid selectedpoint;
17002	17770	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	17771	+ static Sphere debugpointG;
	17772	+ static Sphere debugpointP;
	17773	+ static Sphere debugpointC;
	17774	+ static Sphere debugpointR;
17007	17775
17008	17776	static Sphere debugpoints[] = new Sphere[8];
17009	17777
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17778	static void InitPoints(float radius)
17019	17779	{
17020	17780	for (int i=0; i<8; i++)