~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +126,8 @@
92	126
93	127	static int tickcount = 0; // slow pose issue
94	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
95	131	static boolean BOXMODE = false;
96	132	static boolean IMAGEFLIP = false;
97	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -150,6 +186,20 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	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	+
153	203	void SetAsGLRenderer(boolean b)
154	204	{
155	205	isRenderer = b;
..	..	@@ -168,7 +218,8 @@
168	218
169	219	SetCamera(cam);
170	220
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	223
173	224	object = o;
174	225
..	..	@@ -223,6 +274,11 @@
223	274	public boolean IsBoxMode()
224	275	{
225	276	return BOXMODE;
	277	+ }
	278	+
	279	+ public boolean IsZoomBoxMode()
	280	+ {
	281	+ return ZOOMBOXMODE;
226	282	}
227	283
228	284	public void ClearDepth()
..	..	@@ -320,7 +376,7 @@
320	376	cStatic.objectstack[materialdepth++] = obj;
321	377	//System.out.println("material " + material);
322	378	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
324	380	if (obj instanceof Camera)
325	381	{
326	382	display.options1[0] = material.shift;
..	..	@@ -329,14 +385,28 @@
329	385	display.options1[2] = material.shadowbias;
330	386	display.options1[3] = material.aniso;
331	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]);
332	393	display.options2[0] = material.opacity;
333	394	display.options2[1] = material.diffuse;
334	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]);
335	399
336	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]);
337	404	display.options4[0] = material.cameralight/0.2f;
338	405	display.options4[1] = material.subsurface;
339	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]);
340	410
341	411	// if (display.CURRENTANTIALIAS > 0)
342	412	// display.options3[3] /= 4;
..	..	@@ -352,7 +422,7 @@
352	422	/**/
353	423	} else
354	424	{
355		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
356	426	}
357	427	} else
358	428	{
..	..	@@ -376,8 +446,8 @@
376	446	cStatic.objectstack[materialdepth++] = obj;
377	447	//System.out.println("material " + material);
378	448	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	451	}
382	452	}
383	453
..	..	@@ -394,8 +464,8 @@
394	464	materialdepth -= 1;
395	465	if (materialdepth > 0)
396	466	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- 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);
399	469	}
400	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +485,8 @@
415	485	materialdepth -= 1;
416	486	if (materialdepth > 0)
417	487	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- 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);
420	490	}
421	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	492	//else
..	..	@@ -457,10 +527,12 @@
457	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	528	{
459	529	//gl.glBegin(gl.GL_TRIANGLES);
460		- 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	+ ;
461	533	if (!hasnorm)
462	534	{
463		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
464	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1257,12 @@
1185	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1258	}
1187	1259	}
	1260	+
1188	1261	if (flipV)
1189	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1263	else
1191	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1192	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1268
..	..	@@ -1208,10 +1282,12 @@
1208	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1283	}
1210	1284	}
	1285	+
1211	1286	if (flipV)
1212	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1288	else
1214	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1215	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1293
..	..	@@ -1239,8 +1315,10 @@
1239	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1316	else
1241	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1242	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1244	1322	count2 += 2;
1245	1323	count3 += 3;
1246	1324	}
..	..	@@ -1419,6 +1497,8 @@
1419	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1420	1498	}
1421	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1422	1502	void SetColor(Object3D obj, Vertex p0)
1423	1503	{
1424	1504	CameraPane display = this;
..	..	@@ -1486,8 +1566,6 @@
1486	1566	{
1487	1567	return;
1488	1568	}
1489		-
1490		- float[] colorV = new float[3];
1491	1569
1492	1570	if (false) // marked)
1493	1571	{
..	..	@@ -1596,7 +1674,7 @@
1596	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1675	}
1598	1676
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1678	{
1601	1679	CameraPane display = this;
1602	1680	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1690,18 @@
1612	1690	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1691	if (!material.multiply)
1614	1692	{
1615		- display.color = color;
	1693	+ display.color = material.color;
1616	1694	display.saturation = material.modulation;
1617	1695	}
1618	1696	else
1619	1697	{
1620		- display.color = color2;
	1698	+ display.color = material.color2;
1621	1699	display.saturation = material.modulation2;
1622	1700	}
1623	1701
1624	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1703
1626		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
1627	1705
1628	1706	/**/
1629	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1709,7 @@
1631	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1635	1713
1636	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1817,9 @@
1739	1817	display.modelParams7[2] = 0;
1740	1818	display.modelParams7[3] = 0;
1741	1819
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1821
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1824	{
1747	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1961,7 @@
1883	1961	void PushMatrix(double[][] matrix)
1884	1962	{
1885	1963	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1887	1965	}
1888	1966
1889	1967	void PushMatrix()
..	..	@@ -2037,7 +2115,7 @@
2037	2115	//System.err.println("Oeil on");
2038	2116	OEIL = true;
2039	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2119	//pingthread.StepToTarget(true);
2042	2120	}
2043	2121
..	..	@@ -2135,7 +2213,7 @@
2135	2213	System.err.println("LIVE = " + Globals.isLIVE());
2136	2214
2137	2215	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2216	+ Grafreed.savesound = true; // wav.save();
2139	2217	// else
2140	2218	repaint(); // start loop // may 2013
2141	2219	}
..	..	@@ -2168,6 +2246,11 @@
2168	2246	public void ToggleBoxMode()
2169	2247	{
2170	2248	BOXMODE ^= true;
	2249	+ }
	2250	+
	2251	+ public void ToggleZoomBoxMode()
	2252	+ {
	2253	+ ZOOMBOXMODE ^= true;
2171	2254	}
2172	2255
2173	2256	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2330,7 @@
2247	2330
2248	2331	void ToggleDebug()
2249	2332	{
2250		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2251	2334	}
2252	2335
2253	2336	void ToggleLookAt()
..	..	@@ -2255,9 +2338,9 @@
2255	2338	LOOKAT ^= true;
2256	2339	}
2257	2340
2258		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2259	2342	{
2260		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
2261	2344	}
2262	2345
2263	2346	void ToggleHandles()
..	..	@@ -2265,10 +2348,17 @@
2265	2348	HANDLES ^= true;
2266	2349	}
2267	2350
	2351	+ Object3D paintFolder;
	2352	+
2268	2353	void TogglePaint()
2269	2354	{
2270	2355	PAINTMODE ^= true;
2271	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2272	2362	}
2273	2363
2274	2364	void SwapCamera(int a, int b)
..	..	@@ -2364,7 +2454,22 @@
2364	2454	{
2365	2455	return currentGL;
2366	2456	}
2367		-
	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	+
2368	2473	/**/
2369	2474	class CacheTexture
2370	2475	{
..	..	@@ -2373,28 +2478,31 @@
2373	2478
2374	2479	int resolution;
2375	2480
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2482	{
2378		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2379	2485	resolution = res;
2380	2486	}
2381	2487	}
2382	2488	/**/
2383	2489
2384	2490	// TEXTURE static Texture texture;
2385		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2386		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2387		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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	+
2388	2496	int pigmentdepth = 0;
2389	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2498	int bumpdepth = 0;
2391	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2504
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2506	{
2399	2507	TextureData texturedata = null;
2400	2508
..	..	@@ -2413,13 +2521,34 @@
2413	2521	if (bump)
2414	2522	texturedata = ConvertBump(texturedata, false);
2415	2523
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- 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);
2418	2526
2419		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2420		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	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);
2421	2529
2422		- 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;
2423	2552	}
2424	2553
2425	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3492,6 +3621,8 @@
3492	3621
3493	3622	System.out.println("LOADING TEXTURE : " + name);
3494	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3495	3626	//
3496	3627	if (false) // compressbit > 0)
3497	3628	{
..	..	@@ -4196,6 +4327,7 @@
4196	4327
4197	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4329	{
	4330	+ new Exception().printStackTrace();
4199	4331	System.exit(0);
4200	4332	com.sun.opengl.util.texture.Texture texture = null;
4201	4333
..	..	@@ -7889,7 +8021,7 @@
7889	8021	String pigment = Object3D.GetPigment(tex);
7890	8022	String bump = Object3D.GetBump(tex);
7891	8023
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8025	{
7894	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8036,69 @@
7904	8036	pigment = null;
7905	8037	}
7906	8038
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7909	8041	}
7910	8042
7911		- 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)
7912	8102	{
7913	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8109,7 @@
7919	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8110
7921	8111	if (tex != null)
7922		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8113
7924	8114	// //assert( texture != null );
7925	8115	// if (texture == null)
..	..	@@ -8011,7 +8201,55 @@
8011	8201	}
8012	8202	}
8013	8203
8014		- /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
8015	8253	{
8016	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8260,47 @@
8022	8260	if (tex == null)
8023	8261	{
8024	8262	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8263	return;
8027	8264	}
8028	8265
8029	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	+
8030	8299	String bump = Object3D.GetBump(tex);
8031	8300
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8034	8302
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8304	{
8037	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8310,94 @@
8042	8310	{
8043	8311	bump = null;
8044	8312	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8313
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8054	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8317	}
8058	8318
8059		- 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)
8060	8322	{
8061		- 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;
8062	8342
8063	8343	if (tex != null)
8064	8344	{
8065		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8347
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- texname = "/Users/nbriere/Textures/" + texname;
	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) && !texname.startsWith("@"))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
8073	8365
8074	8366	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8367	{
8081		- 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(""))
8082	8401	{
8083	8402	assert(!bump);
8084	8403	// if (bump)
..	..	@@ -8089,19 +8408,23 @@
8089	8408	// }
8090	8409	// else
8091	8410	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8094	8413	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8097	8418	// }
8098	8419	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8421	{
8101	8422	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- 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();
8105	8428	} else
8106	8429	{
8107	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8432,22 @@
8109	8432	// texture = GetResourceTexture("default.png");
8110	8433	//} else
8111	8434	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8113	8436	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- 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();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8117	8451	} else
8118	8452	{
8119	8453	if (textureon)
..	..	@@ -8138,7 +8472,7 @@
8138	8472	}
8139	8473
8140	8474	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
8142	8476	cachename = texname;
8143	8477	else
8144	8478	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8494,7 @@
8160	8494	}
8161	8495
8162	8496	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8497	+ if (!FileExists(cachename))
8164	8498	cachename = texname;
8165	8499	else
8166	8500	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8503,23 @@
8169	8503	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8504
8171	8505
8172		- if (texturedata != null)
8173		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8506	+ if (texturedata == null)
	8507	+ throw new Exception();
	8508	+
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8174	8510	//texture = GetTexture(tex, bump);
8175	8511	}
	8512	+ }
8176	8513	}
8177	8514	//}
8178	8515	}
8179	8516
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8518	{
8182	8519	//return false;
8183	8520
8184	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8523	{
8187	8524	// String ext = "_highres";
8188	8525	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8536,17 @@
8199	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8537	if (!cachefile.exists())
8201	8538	{
8202		- // cache to disk
8203		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8204		- //buffers[0].
8205		-
8206		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8207		- int[] pixels = new int[bytebuf.capacity()/3];
8208		-
8209		- // squared size heuristic...
8210		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8540	{
8212		- for (int i=pixels.length; --i>=0;)
8213		- {
8214		- int i3 = i*3;
8215		- pixels[i] = 0xFF;
8216		- pixels[i] <<= 8;
8217		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8218		- pixels[i] <<= 8;
8219		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8220		- pixels[i] <<= 8;
8221		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8222		- }
8223		-
8224		- /*
8225		- int r=0,g=0,b=0,a=0;
8226		- for (int i=0; i<width; i++)
8227		- for (int j=0; j<height; j++)
8228		- {
8229		- int index = j*width+i;
8230		- int p = pixels[index];
8231		- a = ((p>>24) & 0xFF);
8232		- r = ((p>>16) & 0xFF);
8233		- g = ((p>>8) & 0xFF);
8234		- b = (p & 0xFF);
8235		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8236		- }
8237		- /**/
8238		- int width = (int)Math.sqrt(pixels.length); // squared
8239		- int height = width;
8240		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8241		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8242	8543	ImageWriter writer = null;
8243	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8545	if (iter.hasNext()) {
8245	8546	writer = (ImageWriter)iter.next();
8246	8547	}
8247		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8248	8550	try
8249	8551	{
8250	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8563,20 @@
8261	8563	}
8262	8564	}
8263	8565	}
8264		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8265	8569	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8267	8571	{
8268		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8269	8573	thetex.texture.disable();
8270	8574	thetex.texture.dispose();
8271		- textures.remove(texname);
	8575	+ textures.remove(tex);
8272	8576	}
8273	8577
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8276	8580
8277	8581	// newtex = true;
8278	8582	}
..	..	@@ -8288,10 +8592,44 @@
8288	8592	}
8289	8593	}
8290	8594
8291		- return texture;
	8595	+ return texturecache;
8292	8596	}
8293	8597
8294		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8295	8633	{
8296	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8635
..	..	@@ -8309,21 +8647,21 @@
8309	8647	return texture!=null?texture.texture:null;
8310	8648	}
8311	8649
8312		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8313	8651	{
8314	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8653
8316	8654	return texture!=null?texture.texturedata:null;
8317	8655	}
8318	8656
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8658	{
8321	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8660	{
8323	8661	return false;
8324	8662	}
8325	8663
8326		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8327	8665
8328	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8667
..	..	@@ -8355,9 +8693,75 @@
8355	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8695
8358		- return newtex;
	8696	+ return true; // Warning: not used.
8359	8697	}
8360	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8361	8765	ShadowBuffer shadowPBuf;
8362	8766	AntialiasBuffer antialiasPBuf;
8363	8767	int MAXSTACK;
..	..	@@ -8550,7 +8954,7 @@
8550	8954
8551	8955	if (cubemap == null)
8552	8956	{
8553		- LoadEnvy(5);
	8957	+ //LoadEnvy(1);
8554	8958	}
8555	8959
8556	8960	//cubemap.enable();
..	..	@@ -8837,37 +9241,58 @@
8837	9241	cubemap = null;
8838	9242	return;
8839	9243	case 1:
8840		- name = "cubemaps/box_";
8841		- ext = "png";
	9244	+ name = "cubemaps/rgb/";
	9245	+ ext = "jpg";
8842	9246	reverseUP = false;
8843	9247	break;
8844	9248	case 2:
8845		- name = "cubemaps/uffizi_";
8846		- ext = "png";
8847		- break; // reverseUP = true; break;
	9249	+ name = "cubemaps/uffizi/";
	9250	+ ext = "jpg";
	9251	+ reverseUP = false;
	9252	+ break;
8848	9253	case 3:
8849		- name = "cubemaps/CloudyHills_";
8850		- ext = "tga";
	9254	+ name = "cubemaps/CloudyHills/";
	9255	+ ext = "jpg";
8851	9256	reverseUP = false;
8852	9257	break;
8853	9258	case 4:
8854		- name = "cubemaps/cornell_";
	9259	+ name = "cubemaps/cornell/";
8855	9260	ext = "png";
8856	9261	reverseUP = false;
8857	9262	break;
	9263	+ case 5:
	9264	+ name = "cubemaps/skycube/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 6:
	9269	+ name = "cubemaps/SaintLazarusChurch3/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 7:
	9274	+ name = "cubemaps/Sodermalmsallen/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 8:
	9279	+ name = "cubemaps/Sodermalmsallen2/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 9:
	9284	+ name = "cubemaps/UnionSquare/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
8858	9288	default:
8859		- name = "cubemaps/rgb_";
8860		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9289	+ name = "cubemaps/box/";
	9290	+ ext = "png"; /mipmap = true;/
	9291	+ reverseUP = false;
8861	9292	break;
8862	9293	}
8863		-
8864		- try
8865		- {
8866		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8867		- } catch (IOException e)
8868		- {
8869		- throw new RuntimeException(e);
8870		- }
	9294	+
	9295	+ LoadSkybox(name, ext, mipmap);
8871	9296	}
8872	9297
8873	9298	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8899,8 +9324,12 @@
8899	9324	static double[] model = new double[16];
8900	9325	double[] camera2light = new double[16];
8901	9326	double[] light2camera = new double[16];
8902		- int newenvy = -1;
8903		- boolean envyoff = true; // false;
	9327	+
	9328	+ //int newenvy = -1;
	9329	+ //boolean envyoff = false;
	9330	+
	9331	+ String loadedskyboxname;
	9332	+
8904	9333	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8905	9334	//float[] light0 = { 0,0,0 };
8906	9335	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9193,11 +9622,35 @@
9193	9622	jy8[3] = 0.5f;
9194	9623	}
9195	9624
9196		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9625	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9197	9626	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9627	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9628	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	9629
	9630	+ void ResetOptions()
	9631	+ {
	9632	+ options1[0] = 100;
	9633	+ options1[1] = 0.025f;
	9634	+ options1[2] = 0.01f;
	9635	+ options1[3] = 0;
	9636	+ options1[4] = 0;
	9637	+
	9638	+ options2[0] = 0;
	9639	+ options2[1] = 0.75f;
	9640	+ options2[2] = 0;
	9641	+ options2[3] = 0;
	9642	+
	9643	+ options3[0] = 1;
	9644	+ options3[1] = 1;
	9645	+ options3[2] = 1;
	9646	+ options3[3] = 0;
	9647	+
	9648	+ options4[0] = 1;
	9649	+ options4[1] = 0;
	9650	+ options4[2] = 1;
	9651	+ options4[3] = 0;
	9652	+ }
	9653	+
9201	9654	static int imagecount = 0; // movie generation
9202	9655
9203	9656	static int jitter = 0;
..	..	@@ -9293,8 +9746,8 @@
9293	9746	assert (parentcam != renderCamera);
9294	9747
9295	9748	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9749	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9750	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9298	9751
9299	9752	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9753
..	..	@@ -9309,8 +9762,8 @@
9309	9762	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9763
9311	9764	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9765	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9766	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9314	9767
9315	9768	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9769
..	..	@@ -9356,10 +9809,12 @@
9356	9809	rati = 1 / rati;
9357	9810	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9358	9811	}
9359		- assert (newenvy == -1);
	9812	+
	9813	+ //assert (newenvy == -1);
	9814	+
9360	9815	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9361	9816	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9362		- DrawSkyBox(gl);
	9817	+ DrawSkyBox(gl, (float)rati);
9363	9818	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9364	9819	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9365	9820	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9382,7 +9837,7 @@
9382	9837	//gl.glFlush();
9383	9838	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9839
9385		- if (ANIMATION && ABORTED)
	9840	+ if (Globals.ANIMATION && ABORTED)
9386	9841	{
9387	9842	System.err.println(" ABORTED FRAME");
9388	9843	break;
..	..	@@ -9412,7 +9867,7 @@
9412	9867	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9868
9414	9869	// save image
9415		- if (ANIMATION && !ABORTED)
	9870	+ if (Globals.ANIMATION && !ABORTED)
9416	9871	{
9417	9872	VPwidth = viewport[2];
9418	9873	VPheight = viewport[3];
..	..	@@ -9523,11 +9978,11 @@
9523	9978
9524	9979	// imagecount++;
9525	9980
9526		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9981	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9527	9982
9528	9983	if (!BOXMODE)
9529	9984	{
9530		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9985	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9531	9986	}
9532	9987
9533	9988	if (!BOXMODE)
..	..	@@ -9565,7 +10020,7 @@
9565	10020	ABORTED = false;
9566	10021	}
9567	10022	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10023	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	10024
9570	10025	if (false)
9571	10026	{
..	..	@@ -10228,11 +10683,11 @@
10228	10683
10229	10684	public void display(GLAutoDrawable drawable)
10230	10685	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10686	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10687	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10688	+ Grafreed.wav.save();
	10689	+ Grafreed.savesound = false;
	10690	+ Grafreed.hassound = false;
10236	10691	}
10237	10692	// if (DEBUG_SELECTION)
10238	10693	// {
..	..	@@ -10308,6 +10763,7 @@
10308	10763	ANTIALIAS = 0;
10309	10764	//System.out.println("RESTART");
10310	10765	AAtimer.restart();
	10766	+ Globals.TIMERRUNNING = true;
10311	10767	}
10312	10768	}
10313	10769	}
..	..	@@ -10362,7 +10818,7 @@
10362	10818	Object3D theobject = object;
10363	10819	Object3D theparent = object.parent;
10364	10820	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10821	+ object = (Object3D)Grafreed.clone(object);
10366	10822	object.Stripify();
10367	10823	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10824	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10831,14 @@
10375	10831	ambientOcclusion = false;
10376	10832	}
10377	10833
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10834	+ if (//Globals.lighttouched &&
	10835	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10836	{
10380	10837	//if (RENDERSHADOW) // ?
10381	10838	if (!IsFrozen())
10382	10839	{
10383	10840	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10841	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10842	{
10386	10843	Globals.framecount++;
10387	10844	shadowbuffer.display();
..	..	@@ -10394,7 +10851,7 @@
10394	10851
10395	10852	if (wait)
10396	10853	{
10397		- Sleep(500);
	10854	+ Sleep(200); // blocks everything
10398	10855
10399	10856	wait = false;
10400	10857	}
..	..	@@ -10508,8 +10965,8 @@
10508	10965
10509	10966	// if (parentcam != renderCamera) // not a light
10510	10967	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10968	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10969	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10513	10970
10514	10971	for (int j = 0; j < 4; j++)
10515	10972	{
..	..	@@ -10523,8 +10980,8 @@
10523	10980
10524	10981	// if (parentcam != renderCamera) // not a light
10525	10982	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10983	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10984	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10528	10985
10529	10986	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10987
..	..	@@ -10610,13 +11067,27 @@
10610	11067	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10611	11068	}
10612	11069
10613		- if (newenvy > -1)
	11070	+// if (newenvy > -1)
	11071	+// {
	11072	+// LoadEnvy(newenvy);
	11073	+// }
	11074	+//
	11075	+// newenvy = -1;
	11076	+
	11077	+ if (object.skyboxname != null)
10614	11078	{
10615		- LoadEnvy(newenvy);
	11079	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11080	+ {
	11081	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11082	+ loadedskyboxname = object.skyboxname;
	11083	+ }
10616	11084	}
10617		-
10618		- newenvy = -1;
10619		-
	11085	+ else
	11086	+ {
	11087	+ cubemap = null;
	11088	+ loadedskyboxname = null;
	11089	+ }
	11090	+
10620	11091	ratio = ((double) getWidth()) / getHeight();
10621	11092	//System.out.println("ratio = " + ratio);
10622	11093
..	..	@@ -10632,7 +11103,7 @@
10632	11103
10633	11104	if (!IsFrozen() && !ambientOcclusion)
10634	11105	{
10635		- DrawSkyBox(gl);
	11106	+ DrawSkyBox(gl, (float)ratio);
10636	11107	}
10637	11108
10638	11109	//if (selection_view == -1)
..	..	@@ -10783,7 +11254,16 @@
10783	11254	// Bump noise
10784	11255	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11256	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- BindTexture(NOISE_TEXTURE, false, 2);
	11257	+
	11258	+ try
	11259	+ {
	11260	+ BindTexture(NOISE_TEXTURE, false, 2);
	11261	+ }
	11262	+ catch (Exception e)
	11263	+ {
	11264	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11265	+ }
	11266	+
10787	11267
10788	11268	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11269	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11286,9 @@
10806	11286
10807	11287	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11288
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11289	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11290	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11291	+gl.glEnable(gl.GL_MULTISAMPLE);
10812	11292	} else
10813	11293	{
10814	11294	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11299,7 @@
10819	11299	//System.out.println("BLENDING ON");
10820	11300	gl.glEnable(GL.GL_BLEND);
10821	11301	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11302	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11303	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11304	gl.glLoadIdentity();
10825	11305
..	..	@@ -10908,8 +11388,8 @@
10908	11388	System.err.println("parentcam != renderCamera");
10909	11389
10910	11390	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11391	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11392	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10913	11393	}
10914	11394
10915	11395	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11410,8 @@
10930	11410	if (true) // TODO
10931	11411	{
10932	11412	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11413	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11414	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10935	11415	}
10936	11416
10937	11417	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11068,7 +11548,7 @@
11068	11548	}
11069	11549	}
11070	11550
11071		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11551	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11072	11552	{
11073	11553	//gl.glDepthFunc(GL.GL_LEQUAL);
11074	11554	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11076,24 +11556,21 @@
11076	11556
11077	11557	boolean texon = textureon;
11078	11558
11079		- if (RENDERPROGRAM > 0)
11080		- {
11081		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11082		- textureon = false;
11083		- }
	11559	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11560	+ textureon = false;
	11561	+
11084	11562	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11085	11563	//System.out.println("ALLO");
11086	11564	gl.glColorMask(false, false, false, false);
11087	11565	DrawObject(gl);
11088		- if (RENDERPROGRAM > 0)
11089		- {
11090		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11091		- textureon = texon;
11092		- }
	11566	+
	11567	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11568	+ textureon = texon;
	11569	+
11093	11570	gl.glColorMask(true, true, true, true);
11094	11571
11095	11572	gl.glDepthFunc(GL.GL_EQUAL);
11096		- //gl.glDepthMask(false);
	11573	+ gl.glDepthMask(false);
11097	11574	}
11098	11575
11099	11576	if (false) // DrawMode() == SHADOW)
..	..	@@ -11247,8 +11724,14 @@
11247	11724	{
11248	11725	renderpass++;
11249	11726	// System.out.println("Draw object... ");
	11727	+ STEP = 1;
11250	11728	if (FAST) // in case there is no script
11251		- STEP = 16;
	11729	+ STEP = 8;
	11730	+
	11731	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11732	+ {
	11733	+ STEP *= 4;
	11734	+ }
11252	11735
11253	11736	//object.FullInvariants();
11254	11737
..	..	@@ -11262,23 +11745,44 @@
11262	11745	e.printStackTrace();
11263	11746	}
11264	11747
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11748	+ if (Grafreed.RENDERME > 0)
	11749	+ Grafreed.RENDERME--; // mechante magouille
11267	11750
11268	11751	Globals.ONESTEP = false;
11269	11752	}
11270	11753
11271	11754	static boolean zoomonce = false;
11272	11755
	11756	+ static void CreateSelectedPoint()
	11757	+ {
	11758	+ if (selectedpoint == null)
	11759	+ {
	11760	+ debugpointG = new Sphere();
	11761	+ debugpointP = new Sphere();
	11762	+ debugpointC = new Sphere();
	11763	+ debugpointR = new Sphere();
	11764	+
	11765	+ selectedpoint = new Superellipsoid();
	11766	+
	11767	+ for (int i=0; i<8; i++)
	11768	+ {
	11769	+ debugpoints[i] = new Sphere();
	11770	+ }
	11771	+ }
	11772	+ }
	11773	+
11273	11774	void DrawObject(GL gl, boolean draw)
11274	11775	{
	11776	+ // To clear camera values
	11777	+ ResetOptions();
	11778	+
11275	11779	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11780	// DrawMode() = SELECTION;
11277	11781	//GL gl = getGL();
11278	11782	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11783	{
11280	11784	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11785	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11786	pingthread.StepToTarget(true); // true);
11283	11787	// zoomonce = false;
11284	11788	}
..	..	@@ -11333,7 +11837,14 @@
11333	11837
11334	11838	usedtextures.clear();
11335	11839
11336		- BindTextures(DEFAULT_TEXTURES, 2);
	11840	+ try
	11841	+ {
	11842	+ BindTextures(DEFAULT_TEXTURES, 2);
	11843	+ }
	11844	+ catch (Exception e)
	11845	+ {
	11846	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11847	+ }
11337	11848	}
11338	11849	//System.out.println("--> " + stackdepth);
11339	11850	// GrafreeD.traceon();
..	..	@@ -11343,8 +11854,9 @@
11343	11854
11344	11855	if (DrawMode() == DEFAULT)
11345	11856	{
11346		- if (DEBUG)
	11857	+ if (Globals.DEBUG)
11347	11858	{
	11859	+ CreateSelectedPoint();
11348	11860	float radius = 0.05f;
11349	11861	if (selectedpoint.radius != radius)
11350	11862	{
..	..	@@ -11398,20 +11910,32 @@
11398	11910	ReleaseTextures(DEFAULT_TEXTURES);
11399	11911
11400	11912	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11913	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	11914	{
11403		- String tex = e.nextElement();
	11915	+ cTexture tex = e.nextElement();
11404	11916
11405	11917	// System.out.println("Texture --------- " + tex);
11406	11918
11407		- if (tex.equals("WHITE_NOISE"))
	11919	+ if (tex.equals("WHITE_NOISE:"))
11408	11920	continue;
11409	11921
11410		- if (!usedtextures.containsKey(tex))
	11922	+ if (!usedtextures.contains(tex))
11411	11923	{
	11924	+ CacheTexture gettex = texturepigment.get(tex);
11412	11925	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- textures.remove(tex);
	11926	+ if (gettex != null)
	11927	+ {
	11928	+ gettex.texture.dispose();
	11929	+ texturepigment.remove(tex);
	11930	+ }
	11931	+
	11932	+ gettex = texturebump.get(tex);
	11933	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11934	+ if (gettex != null)
	11935	+ {
	11936	+ gettex.texture.dispose();
	11937	+ texturebump.remove(tex);
	11938	+ }
11415	11939	}
11416	11940	}
11417	11941	}
..	..	@@ -11424,7 +11948,14 @@
11424	11948	if (checker != null && DrawMode() == DEFAULT)
11425	11949	{
11426	11950	//BindTexture(IMMORTAL_TEXTURE);
11427		- BindTextures(checker.GetTextures(), checker.texres);
	11951	+ try
	11952	+ {
	11953	+ BindTextures(checker.GetTextures(), checker.texres);
	11954	+ }
	11955	+ catch (Exception e)
	11956	+ {
	11957	+ System.err.println("FAILED: " + checker.GetTextures());
	11958	+ }
11428	11959	// NEAREST
11429	11960	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11961	DrawChecker(gl);
..	..	@@ -11506,7 +12037,7 @@
11506	12037	return;
11507	12038	}
11508	12039
11509		- String string = obj.GetToolTip();
	12040	+ String string = obj.toString(); //.GetToolTip();
11510	12041
11511	12042	GL gl = GetGL();
11512	12043
..	..	@@ -11823,8 +12354,8 @@
11823	12354	//obj.TransformToWorld(light, light);
11824	12355	for (int i = tp.size(); --i >= 0;)
11825	12356	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- LA.xformPos(light, tp.get(i).toParent, light);
	12357	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12358	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11828	12359	}
11829	12360
11830	12361
..	..	@@ -11841,8 +12372,8 @@
11841	12372	parentcam = cameras[0];
11842	12373	}
11843	12374
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12375	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12376	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11846	12377
11847	12378	LA.xformPos(light, renderCamera.toScreen, light);
11848	12379
..	..	@@ -11932,8 +12463,76 @@
11932	12463
11933	12464	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11934	12465
11935		- String program =
	12466	+ String programmin =
	12467	+ // Min shader
11936	12468	"!!ARBfp1.0\n" +
	12469	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12470	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12471	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12472	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12473	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12474	+ "PARAM light2cam0 = program.env[10];" +
	12475	+ "PARAM light2cam1 = program.env[11];" +
	12476	+ "PARAM light2cam2 = program.env[12];" +
	12477	+ "TEMP temp;" +
	12478	+ "TEMP light;" +
	12479	+ "TEMP ndotl;" +
	12480	+ "TEMP normal;" +
	12481	+ "TEMP depth;" +
	12482	+ "TEMP eye;" +
	12483	+ "TEMP pos;" +
	12484	+
	12485	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12486	+ Normalize("normal") +
	12487	+ "MOV light, state.light[0].position;" +
	12488	+ "DP3 ndotl.x, light, normal;" +
	12489	+
	12490	+ // shadow
	12491	+ "MOV pos, fragment.texcoord[1];" +
	12492	+ "MOV temp, pos;" +
	12493	+ ShadowTextureFetch("depth", "temp", "1") +
	12494	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12495	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12496	+
	12497	+ // No shadow when out of frustum
	12498	+ //"SGE temp.y, depth.z, zero123.y;" +
	12499	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12500	+
	12501	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12502	+
	12503	+ // Backlit
	12504	+ "MOV pos.w, zero123.y;" +
	12505	+ "DP4 eye.x, pos, light2cam0;" +
	12506	+ "DP4 eye.y, pos, light2cam1;" +
	12507	+ "DP4 eye.z, pos, light2cam2;" +
	12508	+ Normalize("eye") +
	12509	+
	12510	+ "DP3 ndotl.y, -eye, normal;" +
	12511	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12512	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12513	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12514	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12515	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12516	+
	12517	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12518	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12519	+
	12520	+ // Pigment
	12521	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12522	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12523	+ "MUL temp, temp, ndotl.x;" +
	12524	+
	12525	+ "MUL temp, temp, zero123.z;" +
	12526	+
	12527	+ //"MUL temp, temp, ndotl.y;" +
	12528	+
	12529	+ "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ "MOV result.color, temp;" +
	12531	+ "END";
	12532	+
	12533	+ String programmax =
	12534	+ "!!ARBfp1.0\n" +
	12535	+
11937	12536	//"OPTION ARB_fragment_program_shadow;" +
11938	12537	"PARAM light2cam0 = program.env[10];" +
11939	12538	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12048,8 +12647,7 @@
12048	12647	"TEMP shininess;" +
12049	12648	"\n" +
12050	12649	"MOV texSamp, one;" +
12051		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12052		-
	12650	+
12053	12651	"MOV mapgrid.x, one2048th.x;" +
12054	12652	"MOV temp, fragment.texcoord[1];" +
12055	12653	/*
..	..	@@ -12070,20 +12668,20 @@
12070	12668	"MUL temp, floor, mapgrid.x;" +
12071	12669	//"TEX depth0, temp, texture[1], 2D;" +
12072	12670	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12073		- TextureFetch("depth0", "temp", "1") +
	12671	+ ShadowTextureFetch("depth0", "temp", "1") +
12074	12672	"") +
12075	12673	"ADD temp.x, temp.x, mapgrid.x;" +
12076	12674	//"TEX depth1, temp, texture[1], 2D;" +
12077	12675	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12078		- TextureFetch("depth1", "temp", "1") +
	12676	+ ShadowTextureFetch("depth1", "temp", "1") +
12079	12677	"") +
12080	12678	"ADD temp.y, temp.y, mapgrid.x;" +
12081	12679	//"TEX depth2, temp, texture[1], 2D;" +
12082		- TextureFetch("depth2", "temp", "1") +
	12680	+ ShadowTextureFetch("depth2", "temp", "1") +
12083	12681	"SUB temp.x, temp.x, mapgrid.x;" +
12084	12682	//"TEX depth3, temp, texture[1], 2D;" +
12085	12683	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12086		- TextureFetch("depth3", "temp", "1") +
	12684	+ ShadowTextureFetch("depth3", "temp", "1") +
12087	12685	"") +
12088	12686	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12089	12687	//"MOV params, material;" +
..	..	@@ -12454,10 +13052,10 @@
12454	13052	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12455	13053	"") +
12456	13054
12457		- // display shadow only (bump == 0)
	13055	+ // display shadow only (fakedepth == 0)
12458	13056	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	13057	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13058	+ "SLT temp.z, temp.y, -c256i.x;" +
12461	13059	"SUB temp.y, one.x, temp.z;" +
12462	13060	"MUL temp.x, temp.x, temp.y;" +
12463	13061	"KIL temp.x;" +
..	..	@@ -12586,8 +13184,10 @@
12586	13184	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	13185
12588	13186	"SUB temp.x, one.x, ndotl.x;" +
12589		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13187	+ // Tuning for default skin
	13188	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13189	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13190	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	13191	"MUL temp.x, temp.x, temp.y;" +
12592	13192
12593	13193	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,7 +13386,14 @@
12786	13386	//once = true;
12787	13387	}
12788	13388
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
	13389	+ String program = programmax;
	13390	+
	13391	+ if (Globals.MINSHADER)
	13392	+ {
	13393	+ program = programmin;
	13394	+ }
	13395	+
	13396	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12790	13397	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12791	13398	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13399
..	..	@@ -12879,25 +13486,26 @@
12879	13486	return out;
12880	13487	}
12881	13488
12882		- String TextureFetch(String dest, String src, String unit)
	13489	+ // Also does frustum culling
	13490	+ String ShadowTextureFetch(String dest, String src, String unit)
12883	13491	{
12884	13492	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12885	13493	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12886	13494	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13495	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13496	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12887	13497	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12888		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12889		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12890		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12891		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13498	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13499	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12892	13500	//"SWZ buffer, temp, w,w,w,w;";
12893		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13501	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12894	13502	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12895	13503	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12896	13504	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12897		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13505	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12898	13506
12899		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12900		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13507	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13508	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12901	13509	}
12902	13510
12903	13511	String Shadow(String depth, String shadow)
..	..	@@ -12919,12 +13527,16 @@
12919	13527
12920	13528	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13529	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13530	+
	13531	+ // Compare fragment depth in light space with shadowmap.
12922	13532	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13533	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13534	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13535	+
	13536	+ // Reverse comparison
12925	13537	"SUB temp.x, one.x, temp.x;" +
12926	13538	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13539	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13540	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13541
12930	13542	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13550,10 @@
12938	13550	// No shadow for backface
12939	13551	"DP3 temp.x, normal, lightd;" +
12940	13552	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13553	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13554	+
	13555	+ // No shadow when out of frustum
	13556	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13557	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13558	"";
12943	13559	}
..	..	@@ -13084,7 +13700,8 @@
13084	13700	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13701	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13702	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13703	+
	13704	+ //Object3D.cVector2[] vector2buffer;
13088	13705
13089	13706	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13707	// OUT : diff, spec
..	..	@@ -13100,9 +13717,10 @@
13100	13717	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13718	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13719	//"MOV " + dest + ".w," + "normal.z;" +
13103		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13104		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13105		- //"MOV " + dest + ".z," + "params2.w;" +
	13720	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13721	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13722	+
	13723	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13724	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13725	"RCP " + dest + ".w," + dest + ".w;" +
13108	13726	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +14114,7 @@
13496	14114	public void mousePressed(MouseEvent e)
13497	14115	{
13498	14116	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14117	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	14118	}
13501	14119
13502	14120	static long prevtime = 0;
..	..	@@ -13523,6 +14141,7 @@
13523	14141
13524	14142	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	14143
	14144	+ if (BUTTONLESSWHEEL)
13526	14145	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	14146	{
13528	14147	return;
..	..	@@ -13531,7 +14150,7 @@
13531	14150	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	14151
13533	14152	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14153	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	14154	{
13536	14155	keepboxmode = BOXMODE;
13537	14156	keepsupport = SUPPORT;
..	..	@@ -13571,8 +14190,8 @@
13571	14190	// mode \|= META;
13572	14191	//}
13573	14192
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14193	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14194	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	14195	anchorX = ax;
13577	14196	anchorY = ay;
13578	14197	prevX = px;
..	..	@@ -13606,6 +14225,7 @@
13606	14225	else
13607	14226	if (evt.getSource() == AAtimer)
13608	14227	{
	14228	+ Globals.TIMERRUNNING = false;
13609	14229	if (mouseDown)
13610	14230	{
13611	14231	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14251,10 @@
13631	14251	// LIVE = waslive;
13632	14252	// wasliveok = true;
13633	14253	// waslive = false;
	14254	+
	14255	+ // May 2019 Forget it:
	14256	+ if (true)
	14257	+ return;
13634	14258
13635	14259	// source == timer
13636	14260	if (mouseDown)
..	..	@@ -13661,7 +14285,7 @@
13661	14285
13662	14286	// fev 2014???
13663	14287	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14288	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	14289	pingthread.StepToTarget(true); // true);
13666	14290	}
13667	14291	// if (!LIVE)
..	..	@@ -13670,12 +14294,13 @@
13670	14294
13671	14295	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14296
13673		- void clickStart(int x, int y, int modifiers)
	14297	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14298	{
13675	14299	if (!wasliveok)
13676	14300	return;
13677	14301
13678	14302	AAtimer.restart(); //
	14303	+ Globals.TIMERRUNNING = true;
13679	14304
13680	14305	// waslive = LIVE;
13681	14306	// LIVE = false;
..	..	@@ -13687,7 +14312,7 @@
13687	14312	// touched = true; // main DL
13688	14313	if (isRenderer)
13689	14314	{
13690		- SetMouseMode(modifiers);
	14315	+ SetMouseMode(modifiers, modifiersex);
13691	14316	}
13692	14317
13693	14318	selectX = anchorX = x;
..	..	@@ -13700,7 +14325,7 @@
13700	14325	clicked = true;
13701	14326	hold = false;
13702	14327
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14328	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14329	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14330	{
13706	14331	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13725,14 +14350,15 @@
13725	14350	drag = false;
13726	14351	//System.out.println("Mouse DOWN");
13727	14352	editObj = false;
13728		- ClickInfo info = new ClickInfo();
13729		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13730		- info.pane = this;
13731		- info.camera = renderCamera;
13732		- info.x = x;
13733		- info.y = y;
13734		- info.modifiers = modifiers;
13735		- editObj = object.doEditClick(info, 0);
	14353	+ //ClickInfo info = new ClickInfo();
	14354	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14355	+ object.clickInfo.pane = this;
	14356	+ object.clickInfo.camera = renderCamera;
	14357	+ object.clickInfo.x = x;
	14358	+ object.clickInfo.y = y;
	14359	+ object.clickInfo.modifiers = modifiersex;
	14360	+ editObj = object.doEditClick(//info,
	14361	+ 0);
13736	14362	if (!editObj)
13737	14363	{
13738	14364	hasMarquee = true;
..	..	@@ -13748,11 +14374,14 @@
13748	14374
13749	14375	public void mouseDragged(MouseEvent e)
13750	14376	{
	14377	+ Globals.MOUSEDRAGGED = true;
	14378	+
	14379	+ //System.out.println("mouseDragged: " + e);
13751	14380	if (isRenderer)
13752	14381	movingcamera = true;
	14382	+
13753	14383	//if (drawing)
13754	14384	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14385	if ((e.getModifiersEx() & CTRL) != 0
13757	14386	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14387	{
..	..	@@ -13760,7 +14389,7 @@
13760	14389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14390	}
13762	14391	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14392	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14393
13765	14394	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14395	}
..	..	@@ -13933,6 +14562,7 @@
13933	14562
13934	14563	public void run()
13935	14564	{
	14565	+ new Exception().printStackTrace();
13936	14566	System.exit(0);
13937	14567	for (;;)
13938	14568	{
..	..	@@ -13996,7 +14626,7 @@
13996	14626	{
13997	14627	Globals.lighttouched = true;
13998	14628	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14629	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14630	}
14001	14631	//else
14002	14632	}
..	..	@@ -14010,12 +14640,12 @@
14010	14640	void GoDown(int mod)
14011	14641	{
14012	14642	MODIFIERS \|= COMMAND;
14013		- /*
	14643	+ /**/
14014	14644	if((mod&SHIFT) == SHIFT)
14015		- manipCamera.RotatePosition(0, -speed);
	14645	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14016	14646	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14647	+ manipCamera.RotatePosition(0, -speed);
	14648	+ /**/
14019	14649	if ((mod & SHIFT) == SHIFT)
14020	14650	{
14021	14651	mouseMode = mouseMode; // VR??
..	..	@@ -14031,12 +14661,12 @@
14031	14661	void GoUp(int mod)
14032	14662	{
14033	14663	MODIFIERS \|= COMMAND;
14034		- /*
	14664	+ /**/
14035	14665	if((mod&SHIFT) == SHIFT)
14036		- manipCamera.RotatePosition(0, speed);
	14666	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14037	14667	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14668	+ manipCamera.RotatePosition(0, speed);
	14669	+ /**/
14040	14670	if ((mod & SHIFT) == SHIFT)
14041	14671	{
14042	14672	mouseMode = mouseMode;
..	..	@@ -14052,12 +14682,12 @@
14052	14682	void GoLeft(int mod)
14053	14683	{
14054	14684	MODIFIERS \|= COMMAND;
14055		- /*
	14685	+ /**/
14056	14686	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
14058		- else
14059	14687	manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14688	+ else
	14689	+ manipCamera.RotatePosition(speed, 0);
	14690	+ /**/
14061	14691	if ((mod & SHIFT) == SHIFT)
14062	14692	{
14063	14693	mouseMode = mouseMode;
..	..	@@ -14073,12 +14703,12 @@
14073	14703	void GoRight(int mod)
14074	14704	{
14075	14705	MODIFIERS \|= COMMAND;
14076		- /*
	14706	+ /**/
14077	14707	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
14079		- else
14080	14708	manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14709	+ else
	14710	+ manipCamera.RotatePosition(-speed, 0);
	14711	+ /**/
14082	14712	if ((mod & SHIFT) == SHIFT)
14083	14713	{
14084	14714	mouseMode = mouseMode;
..	..	@@ -14096,7 +14726,7 @@
14096	14726	int X, Y;
14097	14727	boolean SX, SY;
14098	14728
14099		- void drag(int x, int y, int modifiers)
	14729	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14730	{
14101	14731	if (IsFrozen())
14102	14732	{
..	..	@@ -14105,17 +14735,17 @@
14105	14735
14106	14736	drag = true; // NEW
14107	14737
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14738	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14739
14110	14740	X = x;
14111	14741	Y = y;
14112	14742	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14743	+ MODIFIERS = modifiersex;
	14744	+ modifiersex &= ~1024;
14115	14745	if (false) // modifiers != 0)
14116	14746	{
14117	14747	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14748	+ System.out.println("mouseDragged: " + modifiersex);
14119	14749	System.out.println("SHIFT = " + SHIFT);
14120	14750	System.out.println("CONTROL = " + COMMAND);
14121	14751	System.out.println("META = " + META);
..	..	@@ -14128,14 +14758,16 @@
14128	14758	if (editObj)
14129	14759	{
14130	14760	drag = true;
14131		- ClickInfo info = new ClickInfo();
14132		- info.bounds.setBounds(0, 0,
	14761	+ //ClickInfo info = new ClickInfo();
	14762	+ object.clickInfo.bounds.setBounds(0, 0,
14133	14763	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14134		- info.pane = this;
14135		- info.camera = renderCamera;
14136		- info.x = x;
14137		- info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	14764	+ object.clickInfo.pane = this;
	14765	+ object.clickInfo.camera = renderCamera;
	14766	+ object.clickInfo.x = x;
	14767	+ object.clickInfo.y = y;
	14768	+ object //.GetWindow().copy
	14769	+ .doEditDrag(//info,
	14770	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14771	} else
14140	14772	{
14141	14773	if (x < startX)
..	..	@@ -14284,23 +14916,27 @@
14284	14916	}
14285	14917	}
14286	14918
	14919	+// ClickInfo clickInfo = new ClickInfo();
	14920	+
14287	14921	public void mouseMoved(MouseEvent e)
14288	14922	{
14289	14923	//System.out.println("mouseMoved: " + e);
14290		-
14291	14924	if (isRenderer)
14292	14925	return;
14293	14926
14294		- ClickInfo ci = new ClickInfo();
14295		- ci.x = e.getX();
14296		- ci.y = e.getY();
14297		- ci.modifiers = e.getModifiersEx();
14298		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14299		- ci.pane = this;
14300		- ci.camera = renderCamera;
	14927	+ // Mouse cursor feedback
	14928	+ object.clickInfo.x = e.getX();
	14929	+ object.clickInfo.y = e.getY();
	14930	+ object.clickInfo.modifiers = e.getModifiersEx();
	14931	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14932	+ object.clickInfo.pane = this;
	14933	+ object.clickInfo.camera = renderCamera;
14301	14934	if (!isRenderer)
14302	14935	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14936	+ //ObjEditor editWindow = object.editWindow;
	14937	+ //Object3D copy = editWindow.copy;
	14938	+ if (object.doEditClick(//clickInfo,
	14939	+ 0))
14304	14940	{
14305	14941	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	14942	} else
..	..	@@ -14312,7 +14948,11 @@
14312	14948
14313	14949	public void mouseReleased(MouseEvent e)
14314	14950	{
	14951	+ Globals.MOUSEDRAGGED = false;
	14952	+
14315	14953	movingcamera = false;
	14954	+ X = 0; // getBounds().width/2;
	14955	+ Y = 0; // getBounds().height/2;
14316	14956	//System.out.println("mouseReleased: " + e);
14317	14957	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	14958	}
..	..	@@ -14335,9 +14975,9 @@
14335	14975	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	14976	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	14977
14338		- if (control \|\| command \|\| IsFrozen())
	14978	+// No delay if (control \|\| command \|\| IsFrozen())
14339	14979	timeout = true;
14340		- else
	14980	+// ?? May 2019 else
14341	14981	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	14982	mouseDown = false;
14343	14983	if (!control && !command) // june 2013
..	..	@@ -14447,7 +15087,7 @@
14447	15087	System.out.println("keyReleased: " + e);
14448	15088	}
14449	15089
14450		- void SetMouseMode(int modifiers)
	15090	+ void SetMouseMode(int modifiers, int modifiersex)
14451	15091	{
14452	15092	//System.out.println("SetMouseMode = " + modifiers);
14453	15093	//modifiers &= ~1024;
..	..	@@ -14459,25 +15099,25 @@
14459	15099	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	15100	// return;
14461	15101	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	15102	+ if ((modifiersex & WHEEL) == WHEEL)
14463	15103	{
14464	15104	mouseMode \|= ZOOM;
14465	15105	}
14466	15106
14467	15107	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	15108	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	15109	{
14470	15110	mouseMode \|= VR; // BACKFORTH;
14471	15111	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15112	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	15113	{
14474	15114	mouseMode \|= SELECT;
14475	15115	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	15116	+ if ((modifiersex & COMMAND) == COMMAND)
14477	15117	{
14478	15118	mouseMode \|= SELECT;
14479	15119	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15120	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	15121	{
14482	15122	mouseMode &= ~VR;
14483	15123	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +15146,7 @@
14506	15146
14507	15147	if (isRenderer) //
14508	15148	{
14509		- SetMouseMode(modifiers);
	15149	+ SetMouseMode(0, modifiers);
14510	15150	}
14511	15151
14512	15152	Globals.theRenderer.keyPressed(key);
..	..	@@ -14568,7 +15208,8 @@
14568	15208	// break;
14569	15209	case 'T':
14570	15210	CACHETEXTURE ^= true;
14571		- textures.clear();
	15211	+ texturepigment.clear();
	15212	+ texturebump.clear();
14572	15213	// repaint();
14573	15214	break;
14574	15215	case 'Y':
..	..	@@ -14653,7 +15294,9 @@
14653	15294	case 'E' : COMPACT ^= true;
14654	15295	repaint();
14655	15296	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15297	+ case 'W' : // Wide Window (fullscreen)
	15298	+ //DEBUGHSB ^= true;
	15299	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15300	repaint();
14658	15301	break;
14659	15302	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15321,8 @@
14678	15321	RevertCamera();
14679	15322	repaint();
14680	15323	break;
14681		- case 'L':
14682	15324	case 'l':
	15325	+ //case 'L':
14683	15326	if (lightMode)
14684	15327	{
14685	15328	lightMode = false;
..	..	@@ -14743,20 +15386,24 @@
14743	15386	OCCLUSION_CULLING ^= true;
14744	15387	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14745	15388	break;
14746		- case '0': envyoff ^= true; repaint(); break;
	15389	+ //case '0': envyoff ^= true; repaint(); break;
14747	15390	case '1':
14748	15391	case '2':
14749	15392	case '3':
14750	15393	case '4':
14751	15394	case '5':
14752		- newenvy = Character.getNumericValue(key);
14753		- repaint();
14754		- break;
14755	15395	case '6':
14756	15396	case '7':
14757	15397	case '8':
14758	15398	case '9':
14759		- BGcolor = (key - '6')/3.f;
	15399	+ if (true) // envyoff)
	15400	+ {
	15401	+ BGcolor = (key - '1')/8.f;
	15402	+ }
	15403	+ else
	15404	+ {
	15405	+ //newenvy = Character.getNumericValue(key);
	15406	+ }
14760	15407	repaint();
14761	15408	break;
14762	15409	case '!':
..	..	@@ -14822,9 +15469,9 @@
14822	15469	case '_':
14823	15470	kompactbit = 5;
14824	15471	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15472	+// case '+':
	15473	+// kompactbit = 6;
	15474	+// break;
14828	15475	case ' ':
14829	15476	lightMode ^= true;
14830	15477	Globals.lighttouched = true;
..	..	@@ -14836,13 +15483,14 @@
14836	15483	case ESC:
14837	15484	RENDERPROGRAM += 1;
14838	15485	RENDERPROGRAM %= 3;
	15486	+
14839	15487	repaint();
14840	15488	break;
14841	15489	case 'Z':
14842	15490	//RESIZETEXTURE ^= true;
14843	15491	//break;
14844	15492	case 'z':
14845		- RENDERSHADOW ^= true;
	15493	+ Globals.RENDERSHADOW ^= true;
14846	15494	Globals.lighttouched = true;
14847	15495	repaint();
14848	15496	break;
..	..	@@ -14875,8 +15523,9 @@
14875	15523	case DELETE:
14876	15524	ClearSelection();
14877	15525	break;
14878		- /*
14879	15526	case '+':
	15527	+
	15528	+ /*
14880	15529	//fontsize += 1;
14881	15530	bbzoom *= 2;
14882	15531	repaint();
..	..	@@ -14893,17 +15542,17 @@
14893	15542	case '=':
14894	15543	IncDepth();
14895	15544	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15545	+ object.GetWindow().refreshContents(true);
14897	15546	maskbit = 6;
14898	15547	break;
14899	15548	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15549	DecDepth();
14901	15550	maskbit = 5;
14902	15551	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15552	+// if (object.editWindow == null)
	15553	+// new Exception().printStackTrace();
	15554	+// else
	15555	+ object.GetWindow().refreshContents(true);
14907	15556	break;
14908	15557	case '{':
14909	15558	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15615,7 @@
14966	15615	//mode = ROTATE;
14967	15616	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15617	{
14969		- SetMouseMode(modifiers);
	15618	+ SetMouseMode(0, modifiers);
14970	15619	}
14971	15620	}
14972	15621
..	..	@@ -15100,8 +15749,9 @@
15100	15749
15101	15750	protected void processMouseMotionEvent(MouseEvent e)
15102	15751	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15752	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15753	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15754	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15755	{
15106	15756	mouseMoved(e);
15107	15757	} else
..	..	@@ -15126,11 +15776,12 @@
15126	15776	}
15127	15777	*/
15128	15778
15129		- object.editWindow.EditSelection();
	15779	+ object.GetWindow().EditSelection(false);
15130	15780	}
15131	15781
15132	15782	void SelectParent()
15133	15783	{
	15784	+ new Exception().printStackTrace();
15134	15785	System.exit(0);
15135	15786	Composite group = (Composite) object;
15136	15787	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15793,10 @@
15142	15793	{
15143	15794	//selectees.remove(i);
15144	15795	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15796	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15797	} else
15147	15798	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15800	}
15150	15801
15151	15802	first = false;
..	..	@@ -15154,6 +15805,7 @@
15154	15805
15155	15806	void SelectChildren()
15156	15807	{
	15808	+ new Exception().printStackTrace();
15157	15809	System.exit(0);
15158	15810	/*
15159	15811	Composite group = (Composite) object;
..	..	@@ -15186,12 +15838,12 @@
15186	15838	for (int j = 0; j < group.children.size(); j++)
15187	15839	{
15188	15840	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15841	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15842	first = false;
15191	15843	}
15192	15844	} else
15193	15845	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15846	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15847	}
15196	15848
15197	15849	first = false;
..	..	@@ -15202,21 +15854,21 @@
15202	15854	{
15203	15855	//Composite group = (Composite) object;
15204	15856	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15857	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15858	}
15207	15859
15208	15860	void ResetTransform(int mask)
15209	15861	{
15210	15862	//Composite group = (Composite) object;
15211	15863	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15864	+ group.GetWindow().ResetTransform(mask);
15213	15865	}
15214	15866
15215	15867	void FlipTransform()
15216	15868	{
15217	15869	//Composite group = (Composite) object;
15218	15870	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	15871	+ group.GetWindow().FlipTransform();
15220	15872	// group.editWindow.ReduceMesh(true);
15221	15873	}
15222	15874
..	..	@@ -15224,7 +15876,7 @@
15224	15876	{
15225	15877	//Composite group = (Composite) object;
15226	15878	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	15879	+ group.GetWindow().PrintMemory();
15228	15880	// group.editWindow.ReduceMesh(true);
15229	15881	}
15230	15882
..	..	@@ -15232,7 +15884,7 @@
15232	15884	{
15233	15885	//Composite group = (Composite) object;
15234	15886	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	15887	+ group.GetWindow().ResetCentroid();
15236	15888	}
15237	15889
15238	15890	void IncDepth()
..	..	@@ -15314,11 +15966,11 @@
15314	15966
15315	15967	int width = getBounds().width;
15316	15968	int height = getBounds().height;
15317		- ClickInfo info = new ClickInfo();
15318		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	15969	//Image img = CreateImage(width, height);
15320	15970	//System.out.println("width = " + width + "; height = " + height + "\n");
	15971	+
15321	15972	Graphics gr = g; // img.getGraphics();
	15973	+
15322	15974	if (!hasMarquee)
15323	15975	{
15324	15976	if (Xmin < Xmax) // !locked)
..	..	@@ -15390,40 +16042,88 @@
15390	16042	}
15391	16043	if (object != null && !hasMarquee)
15392	16044	{
	16045	+ if (object.clickInfo == null)
	16046	+ object.clickInfo = new ClickInfo();
	16047	+ ClickInfo info = object.clickInfo;
	16048	+ //ClickInfo info = new ClickInfo();
	16049	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16050	+
15393	16051	if (isRenderer)
15394	16052	{
15395		- info.flags++;
	16053	+ object.clickInfo.flags++;
15396	16054	double frameAspect = (double) width / (double) height;
15397	16055	if (frameAspect > renderCamera.aspect)
15398	16056	{
15399	16057	int desired = (int) ((double) height * renderCamera.aspect);
15400		- info.bounds.width -= width - desired;
15401		- info.bounds.x += (width - desired) / 2;
	16058	+ object.clickInfo.bounds.width -= width - desired;
	16059	+ object.clickInfo.bounds.x += (width - desired) / 2;
15402	16060	} else
15403	16061	{
15404	16062	int desired = (int) ((double) width / renderCamera.aspect);
15405		- info.bounds.height -= height - desired;
15406		- info.bounds.y += (height - desired) / 2;
	16063	+ object.clickInfo.bounds.height -= height - desired;
	16064	+ object.clickInfo.bounds.y += (height - desired) / 2;
15407	16065	}
15408	16066	}
15409		- info.g = gr;
15410		- info.camera = renderCamera;
	16067	+
	16068	+ object.clickInfo.g = gr;
	16069	+ object.clickInfo.camera = renderCamera;
15411	16070	/*
15412	16071	// Memory intensive (brep.verticescopy)
15413	16072	if (!(object instanceof Composite))
15414	16073	object.draw(info, 0, false); // SLOW :
15415	16074	*/
15416		- if (!isRenderer)
	16075	+ if (!isRenderer) // && drag)
15417	16076	{
15418		- object.drawEditHandles(info, 0);
	16077	+ Grafreed.Assert(object != null);
	16078	+ Grafreed.Assert(object.selection != null);
	16079	+ if (object.selection.Size() > 0)
	16080	+ {
	16081	+ int hitSomething = object.selection.get(0).hitSomething;
	16082	+
	16083	+ object.clickInfo.DX = 0;
	16084	+ object.clickInfo.DY = 0;
	16085	+ object.clickInfo.W = 1;
	16086	+ if (hitSomething == Object3D.hitCenter)
	16087	+ {
	16088	+ info.DX = X;
	16089	+ if (X != 0)
	16090	+ info.DX -= info.bounds.width/2;
	16091	+
	16092	+ info.DY = Y;
	16093	+ if (Y != 0)
	16094	+ info.DY -= info.bounds.height/2;
	16095	+ }
	16096	+
	16097	+ object.drawEditHandles(//info,
	16098	+ 0);
	16099	+
	16100	+ if (drag && (X != 0 \|\| Y != 0))
	16101	+ {
	16102	+ switch (hitSomething)
	16103	+ {
	16104	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16105	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16106	+ break;
	16107	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ }
	16114	+
	16115	+ }
	16116	+ }
15419	16117	}
15420	16118	}
	16119	+
15421	16120	if (isRenderer)
15422	16121	{
15423	16122	//gr.setColor(Color.black);
15424	16123	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	16124	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	16125	}
	16126	+
15427	16127	if (hasMarquee)
15428	16128	{
15429	16129	gr.setXORMode(Color.white);
..	..	@@ -15536,6 +16236,7 @@
15536	16236	public boolean mouseDown(Event evt, int x, int y)
15537	16237	{
15538	16238	System.out.println("mouseDown: " + evt);
	16239	+ System.exit(0);
15539	16240	/*
15540	16241	locked = true;
15541	16242	drag = false;
..	..	@@ -15579,7 +16280,7 @@
15579	16280	{
15580	16281	keyPressed(0, modifiers);
15581	16282	}
15582		- clickStart(x, y, modifiers);
	16283	+ // clickStart(x, y, modifiers);
15583	16284	return true;
15584	16285	}
15585	16286
..	..	@@ -15697,7 +16398,7 @@
15697	16398	{
15698	16399	keyReleased(0, 0);
15699	16400	}
15700		- drag(x, y, modifiers);
	16401	+ drag(x, y, 0, modifiers);
15701	16402	return true;
15702	16403	}
15703	16404
..	..	@@ -15829,7 +16530,7 @@
15829	16530	Object3D object;
15830	16531	static Object3D trackedobject;
15831	16532	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16533	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16534	/static/ Camera eyeCamera;
15834	16535	/static/ Camera lightCamera;
15835	16536	int cameracount;
..	..	@@ -15893,6 +16594,8 @@
15893	16594	private /static/ boolean firstime;
15894	16595	private /static/ cVector newView = new cVector();
15895	16596	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16597	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16598	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15896	16599	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15897	16600	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15898	16601	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15905,29 +16608,67 @@
15905	16608	{
15906	16609	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15907	16610
	16611	+ int usedsuf = 0;
	16612	+
15908	16613	for (int i = 0; i < suffixes.length; i++)
15909	16614	{
15910		- String resourceName = basename + suffixes[i] + "." + suffix;
15911		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15912		- mipmapped,
15913		- FileUtil.getFileSuffix(resourceName));
15914		- if (data == null)
	16615	+ String[] suffixe = suffixes;
	16616	+ String[] fallback = suffixes2;
	16617	+ String[] fallfallback = suffixes3;
	16618	+
	16619	+ for (int c=usedsuf; --c>=0;)
15915	16620	{
15916		- throw new IOException("Unable to load texture " + resourceName);
	16621	+// String[] temp = suffixe;
	16622	+// suffixe = fallback;
	16623	+// fallback = fallfallback;
	16624	+// fallfallback = temp;
15917	16625	}
	16626	+
	16627	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16628	+ TextureData data;
	16629	+
	16630	+ try
	16631	+ {
	16632	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16633	+ mipmapped,
	16634	+ FileUtil.getFileSuffix(resourceName));
	16635	+ }
	16636	+ catch (Exception e)
	16637	+ {
	16638	+ try
	16639	+ {
	16640	+ resourceName = basename + fallback[i] + "." + suffix;
	16641	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16642	+ mipmapped,
	16643	+ FileUtil.getFileSuffix(resourceName));
	16644	+ }
	16645	+ catch (Exception e2)
	16646	+ {
	16647	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16648	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16649	+ mipmapped,
	16650	+ FileUtil.getFileSuffix(resourceName));
	16651	+ }
	16652	+ }
	16653	+
15918	16654	//System.out.println("Target = " + targets[i]);
15919	16655	cubemap.updateImage(data, targets[i]);
15920	16656	}
15921	16657
15922	16658	return cubemap;
15923	16659	}
	16660	+
15924	16661	int bigsphere = -1;
15925	16662
15926	16663	float BGcolor = 0.5f;
15927	16664
15928		- private void DrawSkyBox(GL gl)
	16665	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16666	+
	16667	+ private void DrawSkyBox(GL gl, float ratio)
15929	16668	{
15930		- if (envyoff \|\| cubemap == null)
	16669	+ if (//envyoff \|\|
	16670	+ WIREFRAME \|\|
	16671	+ cubemap == null)
15931	16672	{
15932	16673	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15933	16674	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15942,7 +16683,17 @@
15942	16683	// Compensates for ExaminerViewer's modification of modelview matrix
15943	16684	gl.glMatrixMode(GL.GL_MODELVIEW);
15944	16685	gl.glLoadIdentity();
	16686	+ gl.glScalef(1,ratio,1);
15945	16687
	16688	+// colorV[0] = 2;
	16689	+// colorV[1] = 2;
	16690	+// colorV[2] = 2;
	16691	+// colorV[3] = 1;
	16692	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16693	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16694	+//
	16695	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16696	+
15946	16697	//gl.glActiveTexture(GL.GL_TEXTURE1);
15947	16698	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15948	16699
..	..	@@ -15974,6 +16725,7 @@
15974	16725	{
15975	16726	gl.glScalef(1.0f, -1.0f, 1.0f);
15976	16727	}
	16728	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15977	16729	gl.glMultMatrixd(viewrot_1, 0);
15978	16730	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15979	16731	//viewer.updateInverseRotation(gl);
..	..	@@ -16114,16 +16866,16 @@
16114	16866	cStatic.objectstack[materialdepth++] = checker;
16115	16867	//System.out.println("material " + material);
16116	16868	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16869	+ //vector2buffer = checker.projectedVertices;
16118	16870
16119	16871	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16872	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16873
16122	16874	materialdepth -= 1;
16123	16875	if (materialdepth > 0)
16124	16876	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16877	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16878	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	16879	}
16128	16880	//checker.GetMaterial().opacity = 1f;
16129	16881	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +16961,14 @@
16209	16961	}
16210	16962	}
16211	16963
	16964	+ private Object3D GetFolder()
	16965	+ {
	16966	+ Object3D folder = object.GetWindow().copy;
	16967	+ if (object.GetWindow().copy.selection.Size() > 0)
	16968	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16969	+ return folder;
	16970	+ }
	16971	+
16212	16972	class SelectBuffer implements GLEventListener
16213	16973	{
16214	16974
..	..	@@ -16224,7 +16984,7 @@
16224	16984	//new Exception().printStackTrace();
16225	16985	System.out.println("select buffer init");
16226	16986	// Use debug pipeline
16227		- drawable.setGL(new DebugGL(drawable.getGL()));
	16987	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16228	16988
16229	16989	GL gl = drawable.getGL();
16230	16990
..	..	@@ -16267,6 +17027,7 @@
16267	17027	{
16268	17028	if (!selection)
16269	17029	{
	17030	+ new Exception().printStackTrace();
16270	17031	System.exit(0);
16271	17032	return;
16272	17033	}
..	..	@@ -16287,6 +17048,17 @@
16287	17048
16288	17049	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	17050
	17051	+ if (PAINTMODE)
	17052	+ {
	17053	+ if (object.GetWindow().copy.selection.Size() > 0)
	17054	+ {
	17055	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17056	+
	17057	+ // Make what you paint not selectable.
	17058	+ paintobj.ResetSelectable();
	17059	+ }
	17060	+ }
	17061	+
16290	17062	//int tmp = selection_view;
16291	17063	//selection_view = -1;
16292	17064	int temp = DrawMode();
..	..	@@ -16298,6 +17070,17 @@
16298	17070	// temp = DEFAULT; // patch for selection debug
16299	17071	Globals.drawMode = temp; // WARNING
16300	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Revert.
	17080	+ paintobj.RestoreSelectable();
	17081	+ }
	17082	+ }
	17083	+
16301	17084	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	17085
16303	17086	// trying different ways of getting the depth info over
..	..	@@ -16345,6 +17128,8 @@
16345	17128	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	17129	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	17130	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17131	+
	17132	+ CreateSelectedPoint();
16348	17133
16349	17134	// Will fit the mesh !!!
16350	17135	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +17179,36 @@
16394	17179	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16395	17180	}
16396	17181
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17182	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	17183	}
16399	17184	}
16400	17185
16401	17186	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	17187	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	17188
16404		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17189	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16405	17190	{
16406		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17191	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16407	17192
16408		- Object3D group = new Object3D("inst" + paintcount++);
	17193	+ if (object.GetWindow().copy.selection.Size() > 0)
	17194	+ {
	17195	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	17196
16410		- group.CreateMaterial(); // use a void leaf to select instances
16411		-
16412		- group.add(paintobj); // link
16413		-
16414		- object.editWindow.SnapObject(group);
16415		-
16416		- Object3D folder = object.editWindow.copy;
16417		-
16418		- if (object.editWindow.copy.selection.Size() > 0)
16419		- folder = object.editWindow.copy.selection.elementAt(0);
16420		-
16421		- folder.add(group);
16422		-
16423		- object.editWindow.ResetModel();
16424		- object.editWindow.refreshContents();
	17197	+ Object3D inst = new Object3D("inst" + paintcount++);
	17198	+
	17199	+ inst.CreateMaterial(); // use a void leaf to select instances
	17200	+
	17201	+ inst.add(paintobj); // link
	17202	+
	17203	+ object.GetWindow().SnapObject(inst);
	17204	+
	17205	+ Object3D folder = paintFolder; // GetFolder();
	17206	+
	17207	+ folder.add(inst);
	17208	+
	17209	+ object.GetWindow().ResetModel();
	17210	+ object.GetWindow().refreshContents();
	17211	+ }
16425	17212	}
16426	17213	else
16427	17214	paintcount = 0;
..	..	@@ -16460,6 +17247,11 @@
16460	17247	//System.out.println("objects[color] = " + objects[color]);
16461	17248	//objects[color].Select();
16462	17249	indexcount = 0;
	17250	+ ObjEditor window = object.GetWindow();
	17251	+ if (window != null && deselect)
	17252	+ {
	17253	+ window.Select(null, deselect, true);
	17254	+ }
16463	17255	object.Select(color, deselect);
16464	17256	}
16465	17257
..	..	@@ -16559,7 +17351,7 @@
16559	17351	gl.glDisable(gl.GL_CULL_FACE);
16560	17352	}
16561	17353
16562		- if (!RENDERSHADOW)
	17354	+ if (!Globals.RENDERSHADOW)
16563	17355	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17356
16565	17357	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17361,7 @@
16569	17361	//gl.glColorMask(false, false, false, false);
16570	17362
16571	17363	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17364	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17365	{
16574	17366	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17367
..	..	@@ -16985,23 +17777,15 @@
16985	17777	int AAbuffersize = 0;
16986	17778
16987	17779	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17780	+ static Superellipsoid selectedpoint;
16989	17781	static Sphere previousselectedpoint = null;
16990		- static Sphere debugpointG = new Sphere();
16991		- static Sphere debugpointP = new Sphere();
16992		- static Sphere debugpointC = new Sphere();
16993		- static Sphere debugpointR = new Sphere();
	17782	+ static Sphere debugpointG;
	17783	+ static Sphere debugpointP;
	17784	+ static Sphere debugpointC;
	17785	+ static Sphere debugpointR;
16994	17786
16995	17787	static Sphere debugpoints[] = new Sphere[8];
16996	17788
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17789	static void InitPoints(float radius)
17006	17790	{
17007	17791	for (int i=0; i<8; i++)