~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;
..	..	@@ -76,7 +110,11 @@
76	110	//private Mat4f spotlightTransform = new Mat4f();
77	111	//private Mat4f spotlightInverseTransform = new Mat4f();
78	112	static GLContext glcontext = null;
79		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
80	118	boolean reverseUP = false;
81	119	static boolean frozen = false;
82	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -92,6 +130,8 @@
92	130
93	131	static int tickcount = 0; // slow pose issue
94	132
	133	+static boolean BUTTONLESSWHEEL = false;
	134	+static boolean ZOOMBOXMODE = false;
95	135	static boolean BOXMODE = false;
96	136	static boolean IMAGEFLIP = false;
97	137	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +146,7 @@
106	146	static boolean OEIL = true;
107	147	static boolean OEILONCE = false; // do oeilon then oeiloff
108	148	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	149	+static boolean SWITCH = true; // false;
110	150	static boolean HANDLES = false; // selection doesn't work!!
111	151	static boolean PAINTMODE = false;
112	152
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -148,6 +188,21 @@
148	188	defaultcaps.setAccumGreenBits(16);
149	189	defaultcaps.setAccumBlueBits(16);
150	190	defaultcaps.setAccumAlphaBits(16);
	191	+ }
	192	+
	193	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
151	206	}
152	207
153	208	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +223,8 @@
168	223
169	224	SetCamera(cam);
170	225
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	228
173	229	object = o;
174	230
..	..	@@ -223,6 +279,11 @@
223	279	public boolean IsBoxMode()
224	280	{
225	281	return BOXMODE;
	282	+ }
	283	+
	284	+ public boolean IsZoomBoxMode()
	285	+ {
	286	+ return ZOOMBOXMODE;
226	287	}
227	288
228	289	public void ClearDepth()
..	..	@@ -320,7 +381,7 @@
320	381	cStatic.objectstack[materialdepth++] = obj;
321	382	//System.out.println("material " + material);
322	383	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
324	385	if (obj instanceof Camera)
325	386	{
326	387	display.options1[0] = material.shift;
..	..	@@ -329,14 +390,28 @@
329	390	display.options1[2] = material.shadowbias;
330	391	display.options1[3] = material.aniso;
331	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
332	398	display.options2[0] = material.opacity;
333	399	display.options2[1] = material.diffuse;
334	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
335	404
336	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
337	409	display.options4[0] = material.cameralight/0.2f;
338	410	display.options4[1] = material.subsurface;
339	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
340	415
341	416	// if (display.CURRENTANTIALIAS > 0)
342	417	// display.options3[3] /= 4;
..	..	@@ -352,7 +427,7 @@
352	427	/**/
353	428	} else
354	429	{
355		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
356	431	}
357	432	} else
358	433	{
..	..	@@ -376,8 +451,8 @@
376	451	cStatic.objectstack[materialdepth++] = obj;
377	452	//System.out.println("material " + material);
378	453	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	456	}
382	457	}
383	458
..	..	@@ -394,8 +469,8 @@
394	469	materialdepth -= 1;
395	470	if (materialdepth > 0)
396	471	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
399	474	}
400	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +490,8 @@
415	490	materialdepth -= 1;
416	491	if (materialdepth > 0)
417	492	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
420	495	}
421	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	497	//else
..	..	@@ -457,10 +532,12 @@
457	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	533	{
459	534	//gl.glBegin(gl.GL_TRIANGLES);
460		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
461	538	if (!hasnorm)
462	539	{
463		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
464	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1262,12 @@
1185	1262	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1263	}
1187	1264	}
	1265	+
1188	1266	if (flipV)
1189	1267	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1268	else
1191	1269	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1270	+
1192	1271	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1272	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1273
..	..	@@ -1208,10 +1287,12 @@
1208	1287	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1288	}
1210	1289	}
	1290	+
1211	1291	if (flipV)
1212	1292	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1293	else
1214	1294	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1295	+
1215	1296	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1297	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1298
..	..	@@ -1239,8 +1320,10 @@
1239	1320	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1321	else
1241	1322	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1323	+
1242	1324	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1325	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1326	+
1244	1327	count2 += 2;
1245	1328	count3 += 3;
1246	1329	}
..	..	@@ -1419,6 +1502,8 @@
1419	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1420	1503	}
1421	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1422	1507	void SetColor(Object3D obj, Vertex p0)
1423	1508	{
1424	1509	CameraPane display = this;
..	..	@@ -1486,8 +1571,6 @@
1486	1571	{
1487	1572	return;
1488	1573	}
1489		-
1490		- float[] colorV = new float[3];
1491	1574
1492	1575	if (false) // marked)
1493	1576	{
..	..	@@ -1596,7 +1679,7 @@
1596	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1680	}
1598	1681
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1683	{
1601	1684	CameraPane display = this;
1602	1685	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1695,18 @@
1612	1695	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1696	if (!material.multiply)
1614	1697	{
1615		- display.color = color;
	1698	+ display.color = material.color;
1616	1699	display.saturation = material.modulation;
1617	1700	}
1618	1701	else
1619	1702	{
1620		- display.color = color2;
	1703	+ display.color = material.color2;
1621	1704	display.saturation = material.modulation2;
1622	1705	}
1623	1706
1624	1707	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1708
1626		- float[] colorV = GrafreeD.colorV;
	1709	+ float[] colorV = Grafreed.colorV;
1627	1710
1628	1711	/**/
1629	1712	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1714,7 @@
1631	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1635	1718
1636	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1822,9 @@
1739	1822	display.modelParams7[2] = 0;
1740	1823	display.modelParams7[3] = 0;
1741	1824
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1826
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1829	{
1747	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1966,7 @@
1883	1966	void PushMatrix(double[][] matrix)
1884	1967	{
1885	1968	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1969	+ PushMatrix(matrix, 1);
1887	1970	}
1888	1971
1889	1972	void PushMatrix()
..	..	@@ -2037,7 +2120,7 @@
2037	2120	//System.err.println("Oeil on");
2038	2121	OEIL = true;
2039	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2124	//pingthread.StepToTarget(true);
2042	2125	}
2043	2126
..	..	@@ -2135,7 +2218,7 @@
2135	2218	System.err.println("LIVE = " + Globals.isLIVE());
2136	2219
2137	2220	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2221	+ Grafreed.savesound = true; // wav.save();
2139	2222	// else
2140	2223	repaint(); // start loop // may 2013
2141	2224	}
..	..	@@ -2168,6 +2251,11 @@
2168	2251	public void ToggleBoxMode()
2169	2252	{
2170	2253	BOXMODE ^= true;
	2254	+ }
	2255	+
	2256	+ public void ToggleZoomBoxMode()
	2257	+ {
	2258	+ ZOOMBOXMODE ^= true;
2171	2259	}
2172	2260
2173	2261	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2335,7 @@
2247	2335
2248	2336	void ToggleDebug()
2249	2337	{
2250		- DEBUG ^= true;
	2338	+ Globals.DEBUG ^= true;
2251	2339	}
2252	2340
2253	2341	void ToggleLookAt()
..	..	@@ -2255,9 +2343,9 @@
2255	2343	LOOKAT ^= true;
2256	2344	}
2257	2345
2258		- void ToggleRandom()
	2346	+ void ToggleSwitch()
2259	2347	{
2260		- RANDOM ^= true;
	2348	+ SWITCH ^= true;
2261	2349	}
2262	2350
2263	2351	void ToggleHandles()
..	..	@@ -2265,10 +2353,17 @@
2265	2353	HANDLES ^= true;
2266	2354	}
2267	2355
	2356	+ Object3D paintFolder;
	2357	+
2268	2358	void TogglePaint()
2269	2359	{
2270	2360	PAINTMODE ^= true;
2271	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2272	2367	}
2273	2368
2274	2369	void SwapCamera(int a, int b)
..	..	@@ -2364,7 +2459,22 @@
2364	2459	{
2365	2460	return currentGL;
2366	2461	}
2367		-
	2462	+
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2368	2478	/**/
2369	2479	class CacheTexture
2370	2480	{
..	..	@@ -2373,28 +2483,31 @@
2373	2483
2374	2484	int resolution;
2375	2485
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2487	{
2378		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2379	2490	resolution = res;
2380	2491	}
2381	2492	}
2382	2493	/**/
2383	2494
2384	2495	// 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>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2388	2501	int pigmentdepth = 0;
2389	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2503	int bumpdepth = 0;
2391	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2509
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2511	{
2399	2512	TextureData texturedata = null;
2400	2513
..	..	@@ -2404,7 +2517,7 @@
2404	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2405	2518	getClass().getClassLoader().getResourceAsStream(name),
2406	2519	true,
2407		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2408	2521	} catch (java.io.IOException e)
2409	2522	{
2410	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2413,13 +2526,34 @@
2413	2526	if (bump)
2414	2527	texturedata = ConvertBump(texturedata, false);
2415	2528
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2418	2531
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);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2421	2534
2422		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2423	2557	}
2424	2558
2425	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3492,6 +3626,8 @@
3492	3626
3493	3627	System.out.println("LOADING TEXTURE : " + name);
3494	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3495	3631	//
3496	3632	if (false) // compressbit > 0)
3497	3633	{
..	..	@@ -4196,6 +4332,7 @@
4196	4332
4197	4333	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4334	{
	4335	+ new Exception().printStackTrace();
4199	4336	System.exit(0);
4200	4337	com.sun.opengl.util.texture.Texture texture = null;
4201	4338
..	..	@@ -7889,7 +8026,7 @@
7889	8026	String pigment = Object3D.GetPigment(tex);
7890	8027	String bump = Object3D.GetBump(tex);
7891	8028
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8030	{
7894	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8041,69 @@
7904	8041	pigment = null;
7905	8042	}
7906	8043
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7909	8046	}
7910	8047
7911		- void ReleaseTexture(String tex, boolean bump)
	8048	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8049	+ {
	8050	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8051	+ {
	8052	+ return;
	8053	+ }
	8054	+
	8055	+ if (tex == null)
	8056	+ {
	8057	+ ReleaseTexture(null, false);
	8058	+ return;
	8059	+ }
	8060	+
	8061	+ String pigment = Object3D.GetPigment(tex);
	8062	+
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8064	+ {
	8065	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8066	+ // System.out.println("; bump = " + bump);
	8067	+ }
	8068	+
	8069	+ if (pigment.equals(""))
	8070	+ {
	8071	+ pigment = null;
	8072	+ }
	8073	+
	8074	+ ReleaseTexture(tex, false);
	8075	+ }
	8076	+
	8077	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8078	+ {
	8079	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8080	+ {
	8081	+ return;
	8082	+ }
	8083	+
	8084	+ if (tex == null)
	8085	+ {
	8086	+ ReleaseTexture(null, true);
	8087	+ return;
	8088	+ }
	8089	+
	8090	+ String bump = Object3D.GetBump(tex);
	8091	+
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8093	+ {
	8094	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8095	+ // System.out.println("; bump = " + bump);
	8096	+ }
	8097	+
	8098	+ if (bump.equals(""))
	8099	+ {
	8100	+ bump = null;
	8101	+ }
	8102	+
	8103	+ ReleaseTexture(tex, true);
	8104	+ }
	8105	+
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7912	8107	{
7913	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8114,7 @@
7919	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8115
7921	8116	if (tex != null)
7922		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8118
7924	8119	// //assert( texture != null );
7925	8120	// if (texture == null)
..	..	@@ -8011,7 +8206,55 @@
8011	8206	}
8012	8207	}
8013	8208
8014		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8209	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8210	+ {
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
	8252	+
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
	8255	+ }
	8256	+
	8257	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8015	8258	{
8016	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8260	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8265,47 @@
8022	8265	if (tex == null)
8023	8266	{
8024	8267	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8268	return;
8027	8269	}
8028	8270
8029	8271	String pigment = Object3D.GetPigment(tex);
	8272	+
	8273	+ usedtextures.add(tex);
	8274	+
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8276	+ {
	8277	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8278	+ // System.out.println("; bump = " + bump);
	8279	+ }
	8280	+
	8281	+ if (pigment.equals(""))
	8282	+ {
	8283	+ pigment = null;
	8284	+ }
	8285	+
	8286	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8287	+ BindTexture(tex, false, resolution);
	8288	+ }
	8289	+
	8290	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8291	+ {
	8292	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8293	+ ambientOcclusion ) // \|\| !textureon)
	8294	+ {
	8295	+ return; // false;
	8296	+ }
	8297	+
	8298	+ if (tex == null)
	8299	+ {
	8300	+ BindTexture(null,true,resolution);
	8301	+ return;
	8302	+ }
	8303	+
8030	8304	String bump = Object3D.GetBump(tex);
8031	8305
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8034	8307
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8309	{
8037	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8315,94 @@
8042	8315	{
8043	8316	bump = null;
8044	8317	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8318
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8054	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8322	}
8058	8323
8059		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8324	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8325	+
	8326	+ private boolean FileExists(String tex)
8060	8327	{
8061		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ if (missingTextures.contains(tex))
	8329	+ {
	8330	+ return false;
	8331	+ }
	8332	+
	8333	+ boolean fileExists = new File(tex).exists();
	8334	+
	8335	+ if (!fileExists)
	8336	+ {
	8337	+ // If file exists, the "new File()" is not executed sgain
	8338	+ missingTextures.add(tex);
	8339	+ }
	8340	+
	8341	+ return fileExists;
	8342	+ }
	8343	+
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8345	+ {
	8346	+ CacheTexture texturecache = null;
8062	8347
8063	8348	if (tex != null)
8064	8349	{
8065		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8352
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;
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
	8357	+
	8358	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8359	+
	8360	+// String[] split = tex.split("Textures");
	8361	+// if (split.length > 1)
	8362	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8363	+// else
	8364	+// if (!texname.startsWith("/"))
	8365	+// texname = "/Users/nbriere/Textures/" + texname;
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8367	+ {
	8368	+ texname = fallbackTextureName;
	8369	+ }
8073	8370
8074	8371	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8372	{
8081		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8082	8406	{
8083	8407	assert(!bump);
8084	8408	// if (bump)
..	..	@@ -8089,19 +8413,23 @@
8089	8413	// }
8090	8414	// else
8091	8415	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8094	8418	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8097	8423	// }
8098	8424	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8426	{
8101	8427	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8105	8433	} else
8106	8434	{
8107	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8437,22 @@
8109	8437	// texture = GetResourceTexture("default.png");
8110	8438	//} else
8111	8439	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8113	8441	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
8117	8456	} else
8118	8457	{
8119	8458	if (textureon)
..	..	@@ -8138,7 +8477,7 @@
8138	8477	}
8139	8478
8140	8479	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8480	+ if (!FileExists(cachename))
8142	8481	cachename = texname;
8143	8482	else
8144	8483	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8499,7 @@
8160	8499	}
8161	8500
8162	8501	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8502	+ if (!FileExists(cachename))
8164	8503	cachename = texname;
8165	8504	else
8166	8505	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8508,23 @@
8169	8508	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8509
8171	8510
8172		- if (texturedata != null)
8173		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8511	+ if (texturedata == null)
	8512	+ throw new Exception();
	8513	+
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8174	8515	//texture = GetTexture(tex, bump);
8175	8516	}
	8517	+ }
8176	8518	}
8177	8519	//}
8178	8520	}
8179	8521
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8523	{
8182	8524	//return false;
8183	8525
8184	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8528	{
8187	8529	// String ext = "_highres";
8188	8530	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8541,17 @@
8199	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8542	if (!cachefile.exists())
8201	8543	{
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))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8545	{
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);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8242	8548	ImageWriter writer = null;
8243	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8550	if (iter.hasNext()) {
8245	8551	writer = (ImageWriter)iter.next();
8246	8552	}
8247		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8248	8555	try
8249	8556	{
8250	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8568,20 @@
8261	8568	}
8262	8569	}
8263	8570	}
8264		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8265	8574	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8267	8576	{
8268		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8269	8578	thetex.texture.disable();
8270	8579	thetex.texture.dispose();
8271		- textures.remove(texname);
	8580	+ textures.remove(tex);
8272	8581	}
8273	8582
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8276	8585
8277	8586	// newtex = true;
8278	8587	}
..	..	@@ -8288,10 +8597,44 @@
8288	8597	}
8289	8598	}
8290	8599
8291		- return texture;
	8600	+ return texturecache;
8292	8601	}
8293	8602
8294		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8295	8638	{
8296	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8640
..	..	@@ -8309,21 +8652,21 @@
8309	8652	return texture!=null?texture.texture:null;
8310	8653	}
8311	8654
8312		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8313	8656	{
8314	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8658
8316	8659	return texture!=null?texture.texturedata:null;
8317	8660	}
8318	8661
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8663	{
8321	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8665	{
8323	8666	return false;
8324	8667	}
8325	8668
8326		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8327	8670
8328	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8672
..	..	@@ -8355,9 +8698,75 @@
8355	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8700
8358		- return newtex;
	8701	+ return true; // Warning: not used.
8359	8702	}
8360	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8361	8770	ShadowBuffer shadowPBuf;
8362	8771	AntialiasBuffer antialiasPBuf;
8363	8772	int MAXSTACK;
..	..	@@ -8374,10 +8783,12 @@
8374	8783
8375	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8376	8785	MAXSTACK = temp[0];
8377		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8378	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8379	8789	MAXSTACK = temp[0];
8380		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8381	8792
8382	8793	// Use debug pipeline
8383	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8385,7 +8796,8 @@
8385	8796	gl = drawable.getGL(); //
8386	8797
8387	8798	GL gl3 = getGL();
8388		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8389	8801
8390	8802
8391	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8550,7 +8962,7 @@
8550	8962
8551	8963	if (cubemap == null)
8552	8964	{
8553		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8554	8966	}
8555	8967
8556	8968	//cubemap.enable();
..	..	@@ -8826,6 +9238,8 @@
8826	9238
8827	9239	void LoadEnvy(int which)
8828	9240	{
	9241	+ assert(false);
	9242	+
8829	9243	String name;
8830	9244	String ext;
8831	9245
..	..	@@ -8837,37 +9251,58 @@
8837	9251	cubemap = null;
8838	9252	return;
8839	9253	case 1:
8840		- name = "cubemaps/box_";
8841		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8842	9256	reverseUP = false;
8843	9257	break;
8844	9258	case 2:
8845		- name = "cubemaps/uffizi_";
8846		- ext = "png";
8847		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8848	9263	case 3:
8849		- name = "cubemaps/CloudyHills_";
8850		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8851	9266	reverseUP = false;
8852	9267	break;
8853	9268	case 4:
8854		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8855	9270	ext = "png";
8856	9271	reverseUP = false;
8857	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
8858	9298	default:
8859		- name = "cubemaps/rgb_";
8860		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8861	9302	break;
8862	9303	}
8863		-
8864		- try
8865		- {
8866		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8867		- } catch (IOException e)
8868		- {
8869		- throw new RuntimeException(e);
8870		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8871	9306	}
8872	9307
8873	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8899,8 +9334,12 @@
8899	9334	static double[] model = new double[16];
8900	9335	double[] camera2light = new double[16];
8901	9336	double[] light2camera = new double[16];
8902		- int newenvy = -1;
8903		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8904	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8905	9344	//float[] light0 = { 0,0,0 };
8906	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9193,11 +9632,35 @@
9193	9632	jy8[3] = 0.5f;
9194	9633	}
9195	9634
9196		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9635	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9197	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	9639
	9640	+ void ResetOptions()
	9641	+ {
	9642	+ options1[0] = 100;
	9643	+ options1[1] = 0.025f;
	9644	+ options1[2] = 0.01f;
	9645	+ options1[3] = 0;
	9646	+ options1[4] = 0;
	9647	+
	9648	+ options2[0] = 0;
	9649	+ options2[1] = 0.75f;
	9650	+ options2[2] = 0;
	9651	+ options2[3] = 0;
	9652	+
	9653	+ options3[0] = 1;
	9654	+ options3[1] = 1;
	9655	+ options3[2] = 1;
	9656	+ options3[3] = 0;
	9657	+
	9658	+ options4[0] = 1;
	9659	+ options4[1] = 0;
	9660	+ options4[2] = 1;
	9661	+ options4[3] = 0;
	9662	+ }
	9663	+
9201	9664	static int imagecount = 0; // movie generation
9202	9665
9203	9666	static int jitter = 0;
..	..	@@ -9293,8 +9756,8 @@
9293	9756	assert (parentcam != renderCamera);
9294	9757
9295	9758	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9759	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9298	9761
9299	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9763
..	..	@@ -9309,8 +9772,8 @@
9309	9772	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9773
9311	9774	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9775	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9314	9777
9315	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9779
..	..	@@ -9356,10 +9819,12 @@
9356	9819	rati = 1 / rati;
9357	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9358	9821	}
9359		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9360	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9361	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9362		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9363	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9364	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9365	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9382,7 +9847,7 @@
9382	9847	//gl.glFlush();
9383	9848	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9849
9385		- if (ANIMATION && ABORTED)
	9850	+ if (Globals.ANIMATION && ABORTED)
9386	9851	{
9387	9852	System.err.println(" ABORTED FRAME");
9388	9853	break;
..	..	@@ -9412,7 +9877,7 @@
9412	9877	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9878
9414	9879	// save image
9415		- if (ANIMATION && !ABORTED)
	9880	+ if (Globals.ANIMATION && !ABORTED)
9416	9881	{
9417	9882	VPwidth = viewport[2];
9418	9883	VPheight = viewport[3];
..	..	@@ -9523,11 +9988,11 @@
9523	9988
9524	9989	// imagecount++;
9525	9990
9526		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9991	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9527	9992
9528	9993	if (!BOXMODE)
9529	9994	{
9530		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9995	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9531	9996	}
9532	9997
9533	9998	if (!BOXMODE)
..	..	@@ -9565,7 +10030,7 @@
9565	10030	ABORTED = false;
9566	10031	}
9567	10032	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10033	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	10034
9570	10035	if (false)
9571	10036	{
..	..	@@ -10228,11 +10693,11 @@
10228	10693
10229	10694	public void display(GLAutoDrawable drawable)
10230	10695	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10696	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10697	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10698	+ Grafreed.wav.save();
	10699	+ Grafreed.savesound = false;
	10700	+ Grafreed.hassound = false;
10236	10701	}
10237	10702	// if (DEBUG_SELECTION)
10238	10703	// {
..	..	@@ -10308,6 +10773,7 @@
10308	10773	ANTIALIAS = 0;
10309	10774	//System.out.println("RESTART");
10310	10775	AAtimer.restart();
	10776	+ Globals.TIMERRUNNING = true;
10311	10777	}
10312	10778	}
10313	10779	}
..	..	@@ -10362,7 +10828,7 @@
10362	10828	Object3D theobject = object;
10363	10829	Object3D theparent = object.parent;
10364	10830	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10831	+ object = (Object3D)Grafreed.clone(object);
10366	10832	object.Stripify();
10367	10833	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10834	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10841,14 @@
10375	10841	ambientOcclusion = false;
10376	10842	}
10377	10843
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10844	+ if (//Globals.lighttouched &&
	10845	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10846	{
10380	10847	//if (RENDERSHADOW) // ?
10381	10848	if (!IsFrozen())
10382	10849	{
10383	10850	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10851	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10852	{
10386	10853	Globals.framecount++;
10387	10854	shadowbuffer.display();
..	..	@@ -10394,7 +10861,7 @@
10394	10861
10395	10862	if (wait)
10396	10863	{
10397		- Sleep(500);
	10864	+ Sleep(200); // blocks everything
10398	10865
10399	10866	wait = false;
10400	10867	}
..	..	@@ -10508,8 +10975,8 @@
10508	10975
10509	10976	// if (parentcam != renderCamera) // not a light
10510	10977	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10978	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10979	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10513	10980
10514	10981	for (int j = 0; j < 4; j++)
10515	10982	{
..	..	@@ -10523,8 +10990,8 @@
10523	10990
10524	10991	// if (parentcam != renderCamera) // not a light
10525	10992	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10993	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10994	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10528	10995
10529	10996	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10997
..	..	@@ -10610,13 +11077,43 @@
10610	11077	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10611	11078	}
10612	11079
10613		- if (newenvy > -1)
	11080	+// if (newenvy > -1)
	11081	+// {
	11082	+// LoadEnvy(newenvy);
	11083	+// }
	11084	+//
	11085	+// newenvy = -1;
	11086	+
	11087	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10614	11088	{
10615		- LoadEnvy(newenvy);
	11089	+ if (cubemaprgb == null)
	11090	+ {
	11091	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11092	+ }
	11093	+
	11094	+ cubemap = cubemaprgb;
10616	11095	}
10617		-
10618		- newenvy = -1;
10619		-
	11096	+ else
	11097	+ {
	11098	+ if (object.skyboxname != null)
	11099	+ {
	11100	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11101	+ {
	11102	+ if (cubemap != null && cubemap != cubemaprgb)
	11103	+ cubemap.dispose();
	11104	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11105	+ loadedskyboxname = object.skyboxname;
	11106	+ }
	11107	+ }
	11108	+ else
	11109	+ {
	11110	+ cubemapcustom = null;
	11111	+ loadedskyboxname = null;
	11112	+ }
	11113	+
	11114	+ cubemap = cubemapcustom;
	11115	+ }
	11116	+
10620	11117	ratio = ((double) getWidth()) / getHeight();
10621	11118	//System.out.println("ratio = " + ratio);
10622	11119
..	..	@@ -10632,7 +11129,7 @@
10632	11129
10633	11130	if (!IsFrozen() && !ambientOcclusion)
10634	11131	{
10635		- DrawSkyBox(gl);
	11132	+ DrawSkyBox(gl, (float)ratio);
10636	11133	}
10637	11134
10638	11135	//if (selection_view == -1)
..	..	@@ -10783,7 +11280,16 @@
10783	11280	// Bump noise
10784	11281	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11282	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- BindTexture(NOISE_TEXTURE, false, 2);
	11283	+
	11284	+ try
	11285	+ {
	11286	+ BindTexture(NOISE_TEXTURE, false, 2);
	11287	+ }
	11288	+ catch (Exception e)
	11289	+ {
	11290	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11291	+ }
	11292	+
10787	11293
10788	11294	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11295	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11312,9 @@
10806	11312
10807	11313	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11314
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11315	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11316	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11317	+gl.glEnable(gl.GL_MULTISAMPLE);
10812	11318	} else
10813	11319	{
10814	11320	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11325,7 @@
10819	11325	//System.out.println("BLENDING ON");
10820	11326	gl.glEnable(GL.GL_BLEND);
10821	11327	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11328	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11329	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11330	gl.glLoadIdentity();
10825	11331
..	..	@@ -10908,8 +11414,8 @@
10908	11414	System.err.println("parentcam != renderCamera");
10909	11415
10910	11416	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11417	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11418	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10913	11419	}
10914	11420
10915	11421	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11436,8 @@
10930	11436	if (true) // TODO
10931	11437	{
10932	11438	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11439	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11440	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10935	11441	}
10936	11442
10937	11443	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11068,7 +11574,7 @@
11068	11574	}
11069	11575	}
11070	11576
11071		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11577	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11072	11578	{
11073	11579	//gl.glDepthFunc(GL.GL_LEQUAL);
11074	11580	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11076,24 +11582,21 @@
11076	11582
11077	11583	boolean texon = textureon;
11078	11584
11079		- if (RENDERPROGRAM > 0)
11080		- {
11081		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11082		- textureon = false;
11083		- }
	11585	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11586	+ textureon = false;
	11587	+
11084	11588	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11085	11589	//System.out.println("ALLO");
11086	11590	gl.glColorMask(false, false, false, false);
11087	11591	DrawObject(gl);
11088		- if (RENDERPROGRAM > 0)
11089		- {
11090		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11091		- textureon = texon;
11092		- }
	11592	+
	11593	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11594	+ textureon = texon;
	11595	+
11093	11596	gl.glColorMask(true, true, true, true);
11094	11597
11095	11598	gl.glDepthFunc(GL.GL_EQUAL);
11096		- //gl.glDepthMask(false);
	11599	+ gl.glDepthMask(false);
11097	11600	}
11098	11601
11099	11602	if (false) // DrawMode() == SHADOW)
..	..	@@ -11247,8 +11750,14 @@
11247	11750	{
11248	11751	renderpass++;
11249	11752	// System.out.println("Draw object... ");
	11753	+ STEP = 1;
11250	11754	if (FAST) // in case there is no script
11251		- STEP = 16;
	11755	+ STEP = 8;
	11756	+
	11757	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11758	+ {
	11759	+ STEP *= 4;
	11760	+ }
11252	11761
11253	11762	//object.FullInvariants();
11254	11763
..	..	@@ -11262,23 +11771,44 @@
11262	11771	e.printStackTrace();
11263	11772	}
11264	11773
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11774	+ if (Grafreed.RENDERME > 0)
	11775	+ Grafreed.RENDERME--; // mechante magouille
11267	11776
11268	11777	Globals.ONESTEP = false;
11269	11778	}
11270	11779
11271	11780	static boolean zoomonce = false;
11272	11781
	11782	+ static void CreateSelectedPoint()
	11783	+ {
	11784	+ if (selectedpoint == null)
	11785	+ {
	11786	+ debugpointG = new Sphere();
	11787	+ debugpointP = new Sphere();
	11788	+ debugpointC = new Sphere();
	11789	+ debugpointR = new Sphere();
	11790	+
	11791	+ selectedpoint = new Superellipsoid();
	11792	+
	11793	+ for (int i=0; i<8; i++)
	11794	+ {
	11795	+ debugpoints[i] = new Sphere();
	11796	+ }
	11797	+ }
	11798	+ }
	11799	+
11273	11800	void DrawObject(GL gl, boolean draw)
11274	11801	{
	11802	+ // To clear camera values
	11803	+ ResetOptions();
	11804	+
11275	11805	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11806	// DrawMode() = SELECTION;
11277	11807	//GL gl = getGL();
11278	11808	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11809	{
11280	11810	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11811	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11812	pingthread.StepToTarget(true); // true);
11283	11813	// zoomonce = false;
11284	11814	}
..	..	@@ -11333,7 +11863,14 @@
11333	11863
11334	11864	usedtextures.clear();
11335	11865
11336		- BindTextures(DEFAULT_TEXTURES, 2);
	11866	+ try
	11867	+ {
	11868	+ BindTextures(DEFAULT_TEXTURES, 2);
	11869	+ }
	11870	+ catch (Exception e)
	11871	+ {
	11872	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11873	+ }
11337	11874	}
11338	11875	//System.out.println("--> " + stackdepth);
11339	11876	// GrafreeD.traceon();
..	..	@@ -11343,8 +11880,9 @@
11343	11880
11344	11881	if (DrawMode() == DEFAULT)
11345	11882	{
11346		- if (DEBUG)
	11883	+ if (Globals.DEBUG)
11347	11884	{
	11885	+ CreateSelectedPoint();
11348	11886	float radius = 0.05f;
11349	11887	if (selectedpoint.radius != radius)
11350	11888	{
..	..	@@ -11398,20 +11936,32 @@
11398	11936	ReleaseTextures(DEFAULT_TEXTURES);
11399	11937
11400	11938	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11939	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	11940	{
11403		- String tex = e.nextElement();
	11941	+ cTexture tex = e.nextElement();
11404	11942
11405	11943	// System.out.println("Texture --------- " + tex);
11406	11944
11407		- if (tex.equals("WHITE_NOISE"))
	11945	+ if (tex.equals("WHITE_NOISE:"))
11408	11946	continue;
11409	11947
11410		- if (!usedtextures.containsKey(tex))
	11948	+ if (!usedtextures.contains(tex))
11411	11949	{
	11950	+ CacheTexture gettex = texturepigment.get(tex);
11412	11951	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- textures.remove(tex);
	11952	+ if (gettex != null)
	11953	+ {
	11954	+ gettex.texture.dispose();
	11955	+ texturepigment.remove(tex);
	11956	+ }
	11957	+
	11958	+ gettex = texturebump.get(tex);
	11959	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11960	+ if (gettex != null)
	11961	+ {
	11962	+ gettex.texture.dispose();
	11963	+ texturebump.remove(tex);
	11964	+ }
11415	11965	}
11416	11966	}
11417	11967	}
..	..	@@ -11424,7 +11974,14 @@
11424	11974	if (checker != null && DrawMode() == DEFAULT)
11425	11975	{
11426	11976	//BindTexture(IMMORTAL_TEXTURE);
11427		- BindTextures(checker.GetTextures(), checker.texres);
	11977	+ try
	11978	+ {
	11979	+ BindTextures(checker.GetTextures(), checker.texres);
	11980	+ }
	11981	+ catch (Exception e)
	11982	+ {
	11983	+ System.err.println("FAILED: " + checker.GetTextures());
	11984	+ }
11428	11985	// NEAREST
11429	11986	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11987	DrawChecker(gl);
..	..	@@ -11506,7 +12063,7 @@
11506	12063	return;
11507	12064	}
11508	12065
11509		- String string = obj.GetToolTip();
	12066	+ String string = obj.toString(); //.GetToolTip();
11510	12067
11511	12068	GL gl = GetGL();
11512	12069
..	..	@@ -11823,8 +12380,8 @@
11823	12380	//obj.TransformToWorld(light, light);
11824	12381	for (int i = tp.size(); --i >= 0;)
11825	12382	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- LA.xformPos(light, tp.get(i).toParent, light);
	12383	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12384	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11828	12385	}
11829	12386
11830	12387
..	..	@@ -11841,8 +12398,8 @@
11841	12398	parentcam = cameras[0];
11842	12399	}
11843	12400
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12401	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12402	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11846	12403
11847	12404	LA.xformPos(light, renderCamera.toScreen, light);
11848	12405
..	..	@@ -11932,8 +12489,76 @@
11932	12489
11933	12490	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11934	12491
11935		- String program =
	12492	+ String programmin =
	12493	+ // Min shader
11936	12494	"!!ARBfp1.0\n" +
	12495	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12496	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12497	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12498	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12499	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12500	+ "PARAM light2cam0 = program.env[10];" +
	12501	+ "PARAM light2cam1 = program.env[11];" +
	12502	+ "PARAM light2cam2 = program.env[12];" +
	12503	+ "TEMP temp;" +
	12504	+ "TEMP light;" +
	12505	+ "TEMP ndotl;" +
	12506	+ "TEMP normal;" +
	12507	+ "TEMP depth;" +
	12508	+ "TEMP eye;" +
	12509	+ "TEMP pos;" +
	12510	+
	12511	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12512	+ Normalize("normal") +
	12513	+ "MOV light, state.light[0].position;" +
	12514	+ "DP3 ndotl.x, light, normal;" +
	12515	+
	12516	+ // shadow
	12517	+ "MOV pos, fragment.texcoord[1];" +
	12518	+ "MOV temp, pos;" +
	12519	+ ShadowTextureFetch("depth", "temp", "1") +
	12520	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12521	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12522	+
	12523	+ // No shadow when out of frustum
	12524	+ //"SGE temp.y, depth.z, zero123.y;" +
	12525	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12526	+
	12527	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12528	+
	12529	+ // Backlit
	12530	+ "MOV pos.w, zero123.y;" +
	12531	+ "DP4 eye.x, pos, light2cam0;" +
	12532	+ "DP4 eye.y, pos, light2cam1;" +
	12533	+ "DP4 eye.z, pos, light2cam2;" +
	12534	+ Normalize("eye") +
	12535	+
	12536	+ "DP3 ndotl.y, -eye, normal;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12538	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12539	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12540	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12541	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12542	+
	12543	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12544	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12545	+
	12546	+ // Pigment
	12547	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12548	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12549	+ "MUL temp, temp, ndotl.x;" +
	12550	+
	12551	+ "MUL temp, temp, zero123.z;" +
	12552	+
	12553	+ //"MUL temp, temp, ndotl.y;" +
	12554	+
	12555	+ "MOV temp.w, zero123.y;" + // reset alpha
	12556	+ "MOV result.color, temp;" +
	12557	+ "END";
	12558	+
	12559	+ String programmax =
	12560	+ "!!ARBfp1.0\n" +
	12561	+
11937	12562	//"OPTION ARB_fragment_program_shadow;" +
11938	12563	"PARAM light2cam0 = program.env[10];" +
11939	12564	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12048,8 +12673,7 @@
12048	12673	"TEMP shininess;" +
12049	12674	"\n" +
12050	12675	"MOV texSamp, one;" +
12051		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12052		-
	12676	+
12053	12677	"MOV mapgrid.x, one2048th.x;" +
12054	12678	"MOV temp, fragment.texcoord[1];" +
12055	12679	/*
..	..	@@ -12070,20 +12694,20 @@
12070	12694	"MUL temp, floor, mapgrid.x;" +
12071	12695	//"TEX depth0, temp, texture[1], 2D;" +
12072	12696	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12073		- TextureFetch("depth0", "temp", "1") +
	12697	+ ShadowTextureFetch("depth0", "temp", "1") +
12074	12698	"") +
12075	12699	"ADD temp.x, temp.x, mapgrid.x;" +
12076	12700	//"TEX depth1, temp, texture[1], 2D;" +
12077	12701	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12078		- TextureFetch("depth1", "temp", "1") +
	12702	+ ShadowTextureFetch("depth1", "temp", "1") +
12079	12703	"") +
12080	12704	"ADD temp.y, temp.y, mapgrid.x;" +
12081	12705	//"TEX depth2, temp, texture[1], 2D;" +
12082		- TextureFetch("depth2", "temp", "1") +
	12706	+ ShadowTextureFetch("depth2", "temp", "1") +
12083	12707	"SUB temp.x, temp.x, mapgrid.x;" +
12084	12708	//"TEX depth3, temp, texture[1], 2D;" +
12085	12709	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12086		- TextureFetch("depth3", "temp", "1") +
	12710	+ ShadowTextureFetch("depth3", "temp", "1") +
12087	12711	"") +
12088	12712	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12089	12713	//"MOV params, material;" +
..	..	@@ -12454,10 +13078,10 @@
12454	13078	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12455	13079	"") +
12456	13080
12457		- // display shadow only (bump == 0)
	13081	+ // display shadow only (fakedepth == 0)
12458	13082	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	13083	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13084	+ "SLT temp.z, temp.y, -c256i.x;" +
12461	13085	"SUB temp.y, one.x, temp.z;" +
12462	13086	"MUL temp.x, temp.x, temp.y;" +
12463	13087	"KIL temp.x;" +
..	..	@@ -12586,8 +13210,10 @@
12586	13210	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	13211
12588	13212	"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
	13213	+ // Tuning for default skin
	13214	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13215	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13216	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	13217	"MUL temp.x, temp.x, temp.y;" +
12592	13218
12593	13219	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,8 +13412,19 @@
12786	13412	//once = true;
12787	13413	}
12788	13414
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
12790		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13415	+ String program = programmax;
	13416	+
	13417	+ if (Globals.MINSHADER)
	13418	+ {
	13419	+ program = programmin;
	13420	+ }
	13421	+
	13422	+ if (Globals.DEBUG)
	13423	+ {
	13424	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13425	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13426	+ }
	13427	+
12791	13428	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13429
12793	13430	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12834,7 +13471,8 @@
12834	13471	"\n" +
12835	13472	"END\n";
12836	13473
12837		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13474	+ if (Globals.DEBUG)
	13475	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12838	13476	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12839	13477
12840	13478	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12879,25 +13517,26 @@
12879	13517	return out;
12880	13518	}
12881	13519
12882		- String TextureFetch(String dest, String src, String unit)
	13520	+ // Also does frustum culling
	13521	+ String ShadowTextureFetch(String dest, String src, String unit)
12883	13522	{
12884	13523	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12885	13524	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12886	13525	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13526	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13527	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12887	13528	"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;" +
	13529	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13530	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12892	13531	//"SWZ buffer, temp, w,w,w,w;";
12893		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13532	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12894	13533	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12895	13534	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12896	13535	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12897		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13536	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12898	13537
12899		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12900		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13538	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13539	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12901	13540	}
12902	13541
12903	13542	String Shadow(String depth, String shadow)
..	..	@@ -12919,12 +13558,16 @@
12919	13558
12920	13559	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13560	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13561	+
	13562	+ // Compare fragment depth in light space with shadowmap.
12922	13563	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13564	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13565	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13566	+
	13567	+ // Reverse comparison
12925	13568	"SUB temp.x, one.x, temp.x;" +
12926	13569	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13570	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13571	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13572
12930	13573	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13581,10 @@
12938	13581	// No shadow for backface
12939	13582	"DP3 temp.x, normal, lightd;" +
12940	13583	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13584	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13585	+
	13586	+ // No shadow when out of frustum
	13587	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13588	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13589	"";
12943	13590	}
..	..	@@ -13084,7 +13731,8 @@
13084	13731	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13732	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13733	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13734	+
	13735	+ //Object3D.cVector2[] vector2buffer;
13088	13736
13089	13737	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13738	// OUT : diff, spec
..	..	@@ -13100,9 +13748,10 @@
13100	13748	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13749	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13750	//"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;" +
	13751	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13752	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13753	+
	13754	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13755	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13756	"RCP " + dest + ".w," + dest + ".w;" +
13108	13757	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +14145,7 @@
13496	14145	public void mousePressed(MouseEvent e)
13497	14146	{
13498	14147	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14148	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	14149	}
13501	14150
13502	14151	static long prevtime = 0;
..	..	@@ -13523,6 +14172,7 @@
13523	14172
13524	14173	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	14174
	14175	+ if (BUTTONLESSWHEEL)
13526	14176	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	14177	{
13528	14178	return;
..	..	@@ -13531,7 +14181,7 @@
13531	14181	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	14182
13533	14183	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14184	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	14185	{
13536	14186	keepboxmode = BOXMODE;
13537	14187	keepsupport = SUPPORT;
..	..	@@ -13571,8 +14221,8 @@
13571	14221	// mode \|= META;
13572	14222	//}
13573	14223
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14224	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14225	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	14226	anchorX = ax;
13577	14227	anchorY = ay;
13578	14228	prevX = px;
..	..	@@ -13606,6 +14256,7 @@
13606	14256	else
13607	14257	if (evt.getSource() == AAtimer)
13608	14258	{
	14259	+ Globals.TIMERRUNNING = false;
13609	14260	if (mouseDown)
13610	14261	{
13611	14262	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14282,10 @@
13631	14282	// LIVE = waslive;
13632	14283	// wasliveok = true;
13633	14284	// waslive = false;
	14285	+
	14286	+ // May 2019 Forget it:
	14287	+ if (true)
	14288	+ return;
13634	14289
13635	14290	// source == timer
13636	14291	if (mouseDown)
..	..	@@ -13661,7 +14316,7 @@
13661	14316
13662	14317	// fev 2014???
13663	14318	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14319	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	14320	pingthread.StepToTarget(true); // true);
13666	14321	}
13667	14322	// if (!LIVE)
..	..	@@ -13670,12 +14325,13 @@
13670	14325
13671	14326	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14327
13673		- void clickStart(int x, int y, int modifiers)
	14328	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14329	{
13675	14330	if (!wasliveok)
13676	14331	return;
13677	14332
13678	14333	AAtimer.restart(); //
	14334	+ Globals.TIMERRUNNING = true;
13679	14335
13680	14336	// waslive = LIVE;
13681	14337	// LIVE = false;
..	..	@@ -13687,7 +14343,7 @@
13687	14343	// touched = true; // main DL
13688	14344	if (isRenderer)
13689	14345	{
13690		- SetMouseMode(modifiers);
	14346	+ SetMouseMode(modifiers, modifiersex);
13691	14347	}
13692	14348
13693	14349	selectX = anchorX = x;
..	..	@@ -13700,7 +14356,7 @@
13700	14356	clicked = true;
13701	14357	hold = false;
13702	14358
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14359	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14360	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14361	{
13706	14362	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13725,14 +14381,15 @@
13725	14381	drag = false;
13726	14382	//System.out.println("Mouse DOWN");
13727	14383	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);
	14384	+ //ClickInfo info = new ClickInfo();
	14385	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14386	+ object.clickInfo.pane = this;
	14387	+ object.clickInfo.camera = renderCamera;
	14388	+ object.clickInfo.x = x;
	14389	+ object.clickInfo.y = y;
	14390	+ object.clickInfo.modifiers = modifiersex;
	14391	+ editObj = object.doEditClick(//info,
	14392	+ 0);
13736	14393	if (!editObj)
13737	14394	{
13738	14395	hasMarquee = true;
..	..	@@ -13748,11 +14405,14 @@
13748	14405
13749	14406	public void mouseDragged(MouseEvent e)
13750	14407	{
	14408	+ Globals.MOUSEDRAGGED = true;
	14409	+
	14410	+ //System.out.println("mouseDragged: " + e);
13751	14411	if (isRenderer)
13752	14412	movingcamera = true;
	14413	+
13753	14414	//if (drawing)
13754	14415	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14416	if ((e.getModifiersEx() & CTRL) != 0
13757	14417	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14418	{
..	..	@@ -13760,7 +14420,7 @@
13760	14420	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14421	}
13762	14422	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14423	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14424
13765	14425	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14426	}
..	..	@@ -13933,6 +14593,7 @@
13933	14593
13934	14594	public void run()
13935	14595	{
	14596	+ new Exception().printStackTrace();
13936	14597	System.exit(0);
13937	14598	for (;;)
13938	14599	{
..	..	@@ -13996,7 +14657,7 @@
13996	14657	{
13997	14658	Globals.lighttouched = true;
13998	14659	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14660	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14661	}
14001	14662	//else
14002	14663	}
..	..	@@ -14010,12 +14671,18 @@
14010	14671	void GoDown(int mod)
14011	14672	{
14012	14673	MODIFIERS \|= COMMAND;
14013		- /*
	14674	+ boolean isVR = (mouseMode&VR)!=0;
	14675	+ /**/
14014	14676	if((mod&SHIFT) == SHIFT)
14015		- manipCamera.RotatePosition(0, -speed);
	14677	+ {
	14678	+ if (isVR)
	14679	+ manipCamera.RotateInterest(0, -speed);
	14680	+ else
	14681	+ manipCamera.RotatePosition(0, -speed);
	14682	+ }
14016	14683	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14684	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14685	+ /**/
14019	14686	if ((mod & SHIFT) == SHIFT)
14020	14687	{
14021	14688	mouseMode = mouseMode; // VR??
..	..	@@ -14024,6 +14691,8 @@
14024	14691	mouseMode \|= BACKFORTH;
14025	14692	}
14026	14693
	14694	+ targetLookAt.set(manipCamera.lookAt);
	14695	+
14027	14696	//prevX = X = anchorX;
14028	14697	prevY = Y = anchorY - (int) (renderCamera.Distance());
14029	14698	}
..	..	@@ -14031,12 +14700,19 @@
14031	14700	void GoUp(int mod)
14032	14701	{
14033	14702	MODIFIERS \|= COMMAND;
14034		- /*
	14703	+ /**/
	14704	+ boolean isVR = (mouseMode&VR)!=0;
	14705	+
14035	14706	if((mod&SHIFT) == SHIFT)
14036		- manipCamera.RotatePosition(0, speed);
	14707	+ {
	14708	+ if (isVR)
	14709	+ manipCamera.RotateInterest(0, speed);
	14710	+ else
	14711	+ manipCamera.RotatePosition(0, speed);
	14712	+ }
14037	14713	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14714	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14715	+ /**/
14040	14716	if ((mod & SHIFT) == SHIFT)
14041	14717	{
14042	14718	mouseMode = mouseMode;
..	..	@@ -14045,6 +14721,8 @@
14045	14721	mouseMode \|= BACKFORTH;
14046	14722	}
14047	14723
	14724	+ targetLookAt.set(manipCamera.lookAt);
	14725	+
14048	14726	//prevX = X = anchorX;
14049	14727	prevY = Y = anchorY + (int) (renderCamera.Distance());
14050	14728	}
..	..	@@ -14052,12 +14730,17 @@
14052	14730	void GoLeft(int mod)
14053	14731	{
14054	14732	MODIFIERS \|= COMMAND;
14055		- /*
	14733	+ /**/
14056	14734	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
	14735	+ manipCamera.Translate(speed*delta, 0, getWidth());
14058	14736	else
14059		- manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14737	+ {
	14738	+ if ((mouseMode&VR)!=0)
	14739	+ manipCamera.RotateInterest(-speed, 0);
	14740	+ else
	14741	+ manipCamera.RotatePosition(speed, 0);
	14742	+ }
	14743	+ /**/
14061	14744	if ((mod & SHIFT) == SHIFT)
14062	14745	{
14063	14746	mouseMode = mouseMode;
..	..	@@ -14066,6 +14749,8 @@
14066	14749	mouseMode \|= ROTATE;
14067	14750	} // TRANSLATE;
14068	14751
	14752	+ targetLookAt.set(manipCamera.lookAt);
	14753	+
14069	14754	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14070	14755	prevY = Y = anchorY;
14071	14756	}
..	..	@@ -14073,12 +14758,18 @@
14073	14758	void GoRight(int mod)
14074	14759	{
14075	14760	MODIFIERS \|= COMMAND;
14076		- /*
	14761	+ /**/
14077	14762	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
	14763	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14079	14764	else
14080		- manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14765	+ {
	14766	+ if ((mouseMode&VR)!=0)
	14767	+ manipCamera.RotateInterest(speed, 0);
	14768	+ else
	14769	+ manipCamera.RotatePosition(-speed, 0);
	14770	+ }
	14771	+
	14772	+ /**/
14082	14773	if ((mod & SHIFT) == SHIFT)
14083	14774	{
14084	14775	mouseMode = mouseMode;
..	..	@@ -14087,6 +14778,8 @@
14087	14778	mouseMode \|= ROTATE;
14088	14779	} // TRANSLATE;
14089	14780
	14781	+ targetLookAt.set(manipCamera.lookAt);
	14782	+
14090	14783	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14091	14784	prevY = Y = anchorY;
14092	14785	}
..	..	@@ -14096,7 +14789,7 @@
14096	14789	int X, Y;
14097	14790	boolean SX, SY;
14098	14791
14099		- void drag(int x, int y, int modifiers)
	14792	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14793	{
14101	14794	if (IsFrozen())
14102	14795	{
..	..	@@ -14105,17 +14798,17 @@
14105	14798
14106	14799	drag = true; // NEW
14107	14800
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14801	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14802
14110	14803	X = x;
14111	14804	Y = y;
14112	14805	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14806	+ MODIFIERS = modifiersex;
	14807	+ modifiersex &= ~1024;
14115	14808	if (false) // modifiers != 0)
14116	14809	{
14117	14810	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14811	+ System.out.println("mouseDragged: " + modifiersex);
14119	14812	System.out.println("SHIFT = " + SHIFT);
14120	14813	System.out.println("CONTROL = " + COMMAND);
14121	14814	System.out.println("META = " + META);
..	..	@@ -14128,14 +14821,16 @@
14128	14821	if (editObj)
14129	14822	{
14130	14823	drag = true;
14131		- ClickInfo info = new ClickInfo();
14132		- info.bounds.setBounds(0, 0,
	14824	+ //ClickInfo info = new ClickInfo();
	14825	+ object.clickInfo.bounds.setBounds(0, 0,
14133	14826	(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);
	14827	+ object.clickInfo.pane = this;
	14828	+ object.clickInfo.camera = renderCamera;
	14829	+ object.clickInfo.x = x;
	14830	+ object.clickInfo.y = y;
	14831	+ object //.GetWindow().copy
	14832	+ .doEditDrag(//info,
	14833	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14834	} else
14140	14835	{
14141	14836	if (x < startX)
..	..	@@ -14284,23 +14979,27 @@
14284	14979	}
14285	14980	}
14286	14981
	14982	+// ClickInfo clickInfo = new ClickInfo();
	14983	+
14287	14984	public void mouseMoved(MouseEvent e)
14288	14985	{
14289	14986	//System.out.println("mouseMoved: " + e);
14290		-
14291	14987	if (isRenderer)
14292	14988	return;
14293	14989
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;
	14990	+ // Mouse cursor feedback
	14991	+ object.clickInfo.x = e.getX();
	14992	+ object.clickInfo.y = e.getY();
	14993	+ object.clickInfo.modifiers = e.getModifiersEx();
	14994	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14995	+ object.clickInfo.pane = this;
	14996	+ object.clickInfo.camera = renderCamera;
14301	14997	if (!isRenderer)
14302	14998	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14999	+ //ObjEditor editWindow = object.editWindow;
	15000	+ //Object3D copy = editWindow.copy;
	15001	+ if (object.doEditClick(//clickInfo,
	15002	+ 0))
14304	15003	{
14305	15004	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	15005	} else
..	..	@@ -14312,7 +15011,11 @@
14312	15011
14313	15012	public void mouseReleased(MouseEvent e)
14314	15013	{
	15014	+ Globals.MOUSEDRAGGED = false;
	15015	+
14315	15016	movingcamera = false;
	15017	+ X = 0; // getBounds().width/2;
	15018	+ Y = 0; // getBounds().height/2;
14316	15019	//System.out.println("mouseReleased: " + e);
14317	15020	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	15021	}
..	..	@@ -14335,9 +15038,9 @@
14335	15038	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	15039	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	15040
14338		- if (control \|\| command \|\| IsFrozen())
	15041	+// No delay if (control \|\| command \|\| IsFrozen())
14339	15042	timeout = true;
14340		- else
	15043	+// ?? May 2019 else
14341	15044	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	15045	mouseDown = false;
14343	15046	if (!control && !command) // june 2013
..	..	@@ -14447,7 +15150,7 @@
14447	15150	System.out.println("keyReleased: " + e);
14448	15151	}
14449	15152
14450		- void SetMouseMode(int modifiers)
	15153	+ void SetMouseMode(int modifiers, int modifiersex)
14451	15154	{
14452	15155	//System.out.println("SetMouseMode = " + modifiers);
14453	15156	//modifiers &= ~1024;
..	..	@@ -14459,25 +15162,25 @@
14459	15162	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	15163	// return;
14461	15164	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	15165	+ if ((modifiersex & WHEEL) == WHEEL)
14463	15166	{
14464	15167	mouseMode \|= ZOOM;
14465	15168	}
14466	15169
14467	15170	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	15171	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	15172	{
14470	15173	mouseMode \|= VR; // BACKFORTH;
14471	15174	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15175	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	15176	{
14474	15177	mouseMode \|= SELECT;
14475	15178	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	15179	+ if ((modifiersex & COMMAND) == COMMAND)
14477	15180	{
14478	15181	mouseMode \|= SELECT;
14479	15182	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15183	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	15184	{
14482	15185	mouseMode &= ~VR;
14483	15186	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +15209,7 @@
14506	15209
14507	15210	if (isRenderer) //
14508	15211	{
14509		- SetMouseMode(modifiers);
	15212	+ SetMouseMode(0, modifiers);
14510	15213	}
14511	15214
14512	15215	Globals.theRenderer.keyPressed(key);
..	..	@@ -14568,7 +15271,8 @@
14568	15271	// break;
14569	15272	case 'T':
14570	15273	CACHETEXTURE ^= true;
14571		- textures.clear();
	15274	+ texturepigment.clear();
	15275	+ texturebump.clear();
14572	15276	// repaint();
14573	15277	break;
14574	15278	case 'Y':
..	..	@@ -14653,7 +15357,9 @@
14653	15357	case 'E' : COMPACT ^= true;
14654	15358	repaint();
14655	15359	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15360	+ case 'W' : // Wide Window (fullscreen)
	15361	+ //DEBUGHSB ^= true;
	15362	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15363	repaint();
14658	15364	break;
14659	15365	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15384,8 @@
14678	15384	RevertCamera();
14679	15385	repaint();
14680	15386	break;
14681		- case 'L':
14682	15387	case 'l':
	15388	+ //case 'L':
14683	15389	if (lightMode)
14684	15390	{
14685	15391	lightMode = false;
..	..	@@ -14743,20 +15449,24 @@
14743	15449	OCCLUSION_CULLING ^= true;
14744	15450	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14745	15451	break;
14746		- case '0': envyoff ^= true; repaint(); break;
	15452	+ //case '0': envyoff ^= true; repaint(); break;
14747	15453	case '1':
14748	15454	case '2':
14749	15455	case '3':
14750	15456	case '4':
14751	15457	case '5':
14752		- newenvy = Character.getNumericValue(key);
14753		- repaint();
14754		- break;
14755	15458	case '6':
14756	15459	case '7':
14757	15460	case '8':
14758	15461	case '9':
14759		- BGcolor = (key - '6')/3.f;
	15462	+ if (true) // envyoff)
	15463	+ {
	15464	+ BGcolor = (key - '1')/8.f;
	15465	+ }
	15466	+ else
	15467	+ {
	15468	+ //newenvy = Character.getNumericValue(key);
	15469	+ }
14760	15470	repaint();
14761	15471	break;
14762	15472	case '!':
..	..	@@ -14822,9 +15532,9 @@
14822	15532	case '_':
14823	15533	kompactbit = 5;
14824	15534	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15535	+// case '+':
	15536	+// kompactbit = 6;
	15537	+// break;
14828	15538	case ' ':
14829	15539	lightMode ^= true;
14830	15540	Globals.lighttouched = true;
..	..	@@ -14836,13 +15546,14 @@
14836	15546	case ESC:
14837	15547	RENDERPROGRAM += 1;
14838	15548	RENDERPROGRAM %= 3;
	15549	+
14839	15550	repaint();
14840	15551	break;
14841	15552	case 'Z':
14842	15553	//RESIZETEXTURE ^= true;
14843	15554	//break;
14844	15555	case 'z':
14845		- RENDERSHADOW ^= true;
	15556	+ Globals.RENDERSHADOW ^= true;
14846	15557	Globals.lighttouched = true;
14847	15558	repaint();
14848	15559	break;
..	..	@@ -14875,8 +15586,9 @@
14875	15586	case DELETE:
14876	15587	ClearSelection();
14877	15588	break;
14878		- /*
14879	15589	case '+':
	15590	+
	15591	+ /*
14880	15592	//fontsize += 1;
14881	15593	bbzoom *= 2;
14882	15594	repaint();
..	..	@@ -14893,17 +15605,17 @@
14893	15605	case '=':
14894	15606	IncDepth();
14895	15607	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15608	+ object.GetWindow().refreshContents(true);
14897	15609	maskbit = 6;
14898	15610	break;
14899	15611	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15612	DecDepth();
14901	15613	maskbit = 5;
14902	15614	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15615	+// if (object.editWindow == null)
	15616	+// new Exception().printStackTrace();
	15617	+// else
	15618	+ object.GetWindow().refreshContents(true);
14907	15619	break;
14908	15620	case '{':
14909	15621	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15678,7 @@
14966	15678	//mode = ROTATE;
14967	15679	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15680	{
14969		- SetMouseMode(modifiers);
	15681	+ SetMouseMode(0, modifiers);
14970	15682	}
14971	15683	}
14972	15684
..	..	@@ -15100,8 +15812,9 @@
15100	15812
15101	15813	protected void processMouseMotionEvent(MouseEvent e)
15102	15814	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15815	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15816	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15817	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15818	{
15106	15819	mouseMoved(e);
15107	15820	} else
..	..	@@ -15126,11 +15839,12 @@
15126	15839	}
15127	15840	*/
15128	15841
15129		- object.editWindow.EditSelection();
	15842	+ object.GetWindow().EditSelection(false);
15130	15843	}
15131	15844
15132	15845	void SelectParent()
15133	15846	{
	15847	+ new Exception().printStackTrace();
15134	15848	System.exit(0);
15135	15849	Composite group = (Composite) object;
15136	15850	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15856,10 @@
15142	15856	{
15143	15857	//selectees.remove(i);
15144	15858	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15859	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15860	} else
15147	15861	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15862	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15863	}
15150	15864
15151	15865	first = false;
..	..	@@ -15154,6 +15868,7 @@
15154	15868
15155	15869	void SelectChildren()
15156	15870	{
	15871	+ new Exception().printStackTrace();
15157	15872	System.exit(0);
15158	15873	/*
15159	15874	Composite group = (Composite) object;
..	..	@@ -15186,12 +15901,12 @@
15186	15901	for (int j = 0; j < group.children.size(); j++)
15187	15902	{
15188	15903	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15904	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15905	first = false;
15191	15906	}
15192	15907	} else
15193	15908	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15909	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15910	}
15196	15911
15197	15912	first = false;
..	..	@@ -15202,21 +15917,21 @@
15202	15917	{
15203	15918	//Composite group = (Composite) object;
15204	15919	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15920	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15921	}
15207	15922
15208	15923	void ResetTransform(int mask)
15209	15924	{
15210	15925	//Composite group = (Composite) object;
15211	15926	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15927	+ group.GetWindow().ResetTransform(mask);
15213	15928	}
15214	15929
15215	15930	void FlipTransform()
15216	15931	{
15217	15932	//Composite group = (Composite) object;
15218	15933	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	15934	+ group.GetWindow().FlipTransform();
15220	15935	// group.editWindow.ReduceMesh(true);
15221	15936	}
15222	15937
..	..	@@ -15224,7 +15939,7 @@
15224	15939	{
15225	15940	//Composite group = (Composite) object;
15226	15941	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	15942	+ group.GetWindow().PrintMemory();
15228	15943	// group.editWindow.ReduceMesh(true);
15229	15944	}
15230	15945
..	..	@@ -15232,7 +15947,7 @@
15232	15947	{
15233	15948	//Composite group = (Composite) object;
15234	15949	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	15950	+ group.GetWindow().ResetCentroid();
15236	15951	}
15237	15952
15238	15953	void IncDepth()
..	..	@@ -15314,11 +16029,11 @@
15314	16029
15315	16030	int width = getBounds().width;
15316	16031	int height = getBounds().height;
15317		- ClickInfo info = new ClickInfo();
15318		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	16032	//Image img = CreateImage(width, height);
15320	16033	//System.out.println("width = " + width + "; height = " + height + "\n");
	16034	+
15321	16035	Graphics gr = g; // img.getGraphics();
	16036	+
15322	16037	if (!hasMarquee)
15323	16038	{
15324	16039	if (Xmin < Xmax) // !locked)
..	..	@@ -15390,44 +16105,92 @@
15390	16105	}
15391	16106	if (object != null && !hasMarquee)
15392	16107	{
	16108	+ if (object.clickInfo == null)
	16109	+ object.clickInfo = new ClickInfo();
	16110	+ ClickInfo info = object.clickInfo;
	16111	+ //ClickInfo info = new ClickInfo();
	16112	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16113	+
15393	16114	if (isRenderer)
15394	16115	{
15395		- info.flags++;
	16116	+ object.clickInfo.flags++;
15396	16117	double frameAspect = (double) width / (double) height;
15397	16118	if (frameAspect > renderCamera.aspect)
15398	16119	{
15399	16120	int desired = (int) ((double) height * renderCamera.aspect);
15400		- info.bounds.width -= width - desired;
15401		- info.bounds.x += (width - desired) / 2;
	16121	+ object.clickInfo.bounds.width -= width - desired;
	16122	+ object.clickInfo.bounds.x += (width - desired) / 2;
15402	16123	} else
15403	16124	{
15404	16125	int desired = (int) ((double) width / renderCamera.aspect);
15405		- info.bounds.height -= height - desired;
15406		- info.bounds.y += (height - desired) / 2;
	16126	+ object.clickInfo.bounds.height -= height - desired;
	16127	+ object.clickInfo.bounds.y += (height - desired) / 2;
15407	16128	}
15408	16129	}
15409		- info.g = gr;
15410		- info.camera = renderCamera;
	16130	+
	16131	+ object.clickInfo.g = gr;
	16132	+ object.clickInfo.camera = renderCamera;
15411	16133	/*
15412	16134	// Memory intensive (brep.verticescopy)
15413	16135	if (!(object instanceof Composite))
15414	16136	object.draw(info, 0, false); // SLOW :
15415	16137	*/
15416		- if (!isRenderer)
	16138	+ if (!isRenderer) // && drag)
15417	16139	{
15418		- object.drawEditHandles(info, 0);
	16140	+ Grafreed.Assert(object != null);
	16141	+ Grafreed.Assert(object.selection != null);
	16142	+ if (object.selection.Size() > 0)
	16143	+ {
	16144	+ int hitSomething = object.selection.get(0).hitSomething;
	16145	+
	16146	+ object.clickInfo.DX = 0;
	16147	+ object.clickInfo.DY = 0;
	16148	+ object.clickInfo.W = 1;
	16149	+ if (hitSomething == Object3D.hitCenter)
	16150	+ {
	16151	+ info.DX = X;
	16152	+ if (X != 0)
	16153	+ info.DX -= info.bounds.width/2;
	16154	+
	16155	+ info.DY = Y;
	16156	+ if (Y != 0)
	16157	+ info.DY -= info.bounds.height/2;
	16158	+ }
	16159	+
	16160	+ object.drawEditHandles(//info,
	16161	+ 0);
	16162	+
	16163	+ if (drag && (X != 0 \|\| Y != 0))
	16164	+ {
	16165	+ switch (hitSomething)
	16166	+ {
	16167	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16168	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16169	+ break;
	16170	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16171	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16172	+ break;
	16173	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16174	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16175	+ break;
	16176	+ }
	16177	+
	16178	+ }
	16179	+ }
15419	16180	}
15420	16181	}
	16182	+
15421	16183	if (isRenderer)
15422	16184	{
15423	16185	//gr.setColor(Color.black);
15424	16186	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	16187	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	16188	}
	16189	+
15427	16190	if (hasMarquee)
15428	16191	{
15429	16192	gr.setXORMode(Color.white);
15430		- gr.setColor(Color.red);
	16193	+ gr.setColor(Color.white);
15431	16194	if (!firstime)
15432	16195	{
15433	16196	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15536,6 +16299,7 @@
15536	16299	public boolean mouseDown(Event evt, int x, int y)
15537	16300	{
15538	16301	System.out.println("mouseDown: " + evt);
	16302	+ System.exit(0);
15539	16303	/*
15540	16304	locked = true;
15541	16305	drag = false;
..	..	@@ -15579,7 +16343,7 @@
15579	16343	{
15580	16344	keyPressed(0, modifiers);
15581	16345	}
15582		- clickStart(x, y, modifiers);
	16346	+ // clickStart(x, y, modifiers);
15583	16347	return true;
15584	16348	}
15585	16349
..	..	@@ -15697,7 +16461,7 @@
15697	16461	{
15698	16462	keyReleased(0, 0);
15699	16463	}
15700		- drag(x, y, modifiers);
	16464	+ drag(x, y, 0, modifiers);
15701	16465	return true;
15702	16466	}
15703	16467
..	..	@@ -15829,7 +16593,7 @@
15829	16593	Object3D object;
15830	16594	static Object3D trackedobject;
15831	16595	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16596	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16597	/static/ Camera eyeCamera;
15834	16598	/static/ Camera lightCamera;
15835	16599	int cameracount;
..	..	@@ -15893,6 +16657,8 @@
15893	16657	private /static/ boolean firstime;
15894	16658	private /static/ cVector newView = new cVector();
15895	16659	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16660	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16661	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15896	16662	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15897	16663	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15898	16664	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15905,29 +16671,67 @@
15905	16671	{
15906	16672	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15907	16673
	16674	+ int usedsuf = 0;
	16675	+
15908	16676	for (int i = 0; i < suffixes.length; i++)
15909	16677	{
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)
	16678	+ String[] suffixe = suffixes;
	16679	+ String[] fallback = suffixes2;
	16680	+ String[] fallfallback = suffixes3;
	16681	+
	16682	+ for (int c=usedsuf; --c>=0;)
15915	16683	{
15916		- throw new IOException("Unable to load texture " + resourceName);
	16684	+// String[] temp = suffixe;
	16685	+// suffixe = fallback;
	16686	+// fallback = fallfallback;
	16687	+// fallfallback = temp;
15917	16688	}
	16689	+
	16690	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16691	+ TextureData data;
	16692	+
	16693	+ try
	16694	+ {
	16695	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16696	+ mipmapped,
	16697	+ FileUtil.getFileSuffix(resourceName));
	16698	+ }
	16699	+ catch (Exception e)
	16700	+ {
	16701	+ try
	16702	+ {
	16703	+ resourceName = basename + fallback[i] + "." + suffix;
	16704	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16705	+ mipmapped,
	16706	+ FileUtil.getFileSuffix(resourceName));
	16707	+ }
	16708	+ catch (Exception e2)
	16709	+ {
	16710	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16711	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16712	+ mipmapped,
	16713	+ FileUtil.getFileSuffix(resourceName));
	16714	+ }
	16715	+ }
	16716	+
15918	16717	//System.out.println("Target = " + targets[i]);
15919	16718	cubemap.updateImage(data, targets[i]);
15920	16719	}
15921	16720
15922	16721	return cubemap;
15923	16722	}
	16723	+
15924	16724	int bigsphere = -1;
15925	16725
15926	16726	float BGcolor = 0.5f;
15927	16727
15928		- private void DrawSkyBox(GL gl)
	16728	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16729	+
	16730	+ private void DrawSkyBox(GL gl, float ratio)
15929	16731	{
15930		- if (envyoff \|\| cubemap == null)
	16732	+ if (//envyoff \|\|
	16733	+ WIREFRAME \|\|
	16734	+ cubemap == null)
15931	16735	{
15932	16736	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15933	16737	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15942,7 +16746,17 @@
15942	16746	// Compensates for ExaminerViewer's modification of modelview matrix
15943	16747	gl.glMatrixMode(GL.GL_MODELVIEW);
15944	16748	gl.glLoadIdentity();
	16749	+ gl.glScalef(1,ratio,1);
15945	16750
	16751	+// colorV[0] = 2;
	16752	+// colorV[1] = 2;
	16753	+// colorV[2] = 2;
	16754	+// colorV[3] = 1;
	16755	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16756	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16757	+//
	16758	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16759	+
15946	16760	//gl.glActiveTexture(GL.GL_TEXTURE1);
15947	16761	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15948	16762
..	..	@@ -15974,6 +16788,7 @@
15974	16788	{
15975	16789	gl.glScalef(1.0f, -1.0f, 1.0f);
15976	16790	}
	16791	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15977	16792	gl.glMultMatrixd(viewrot_1, 0);
15978	16793	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15979	16794	//viewer.updateInverseRotation(gl);
..	..	@@ -16014,7 +16829,8 @@
16014	16829	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16015	16830
16016	16831	cubemap.disable();
16017		- ////cubemap.unbind();
	16832	+ //cubemap.dispose();
	16833	+
16018	16834	if (CULLFACE)
16019	16835	{
16020	16836	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16114,16 +16930,16 @@
16114	16930	cStatic.objectstack[materialdepth++] = checker;
16115	16931	//System.out.println("material " + material);
16116	16932	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16933	+ //vector2buffer = checker.projectedVertices;
16118	16934
16119	16935	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16936	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16937
16122	16938	materialdepth -= 1;
16123	16939	if (materialdepth > 0)
16124	16940	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16941	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16942	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	16943	}
16128	16944	//checker.GetMaterial().opacity = 1f;
16129	16945	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +17025,14 @@
16209	17025	}
16210	17026	}
16211	17027
	17028	+ private Object3D GetFolder()
	17029	+ {
	17030	+ Object3D folder = object.GetWindow().copy;
	17031	+ if (object.GetWindow().copy.selection.Size() > 0)
	17032	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17033	+ return folder;
	17034	+ }
	17035	+
16212	17036	class SelectBuffer implements GLEventListener
16213	17037	{
16214	17038
..	..	@@ -16224,7 +17048,7 @@
16224	17048	//new Exception().printStackTrace();
16225	17049	System.out.println("select buffer init");
16226	17050	// Use debug pipeline
16227		- drawable.setGL(new DebugGL(drawable.getGL()));
	17051	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16228	17052
16229	17053	GL gl = drawable.getGL();
16230	17054
..	..	@@ -16267,6 +17091,7 @@
16267	17091	{
16268	17092	if (!selection)
16269	17093	{
	17094	+ new Exception().printStackTrace();
16270	17095	System.exit(0);
16271	17096	return;
16272	17097	}
..	..	@@ -16287,6 +17112,17 @@
16287	17112
16288	17113	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	17114
	17115	+ if (PAINTMODE)
	17116	+ {
	17117	+ if (object.GetWindow().copy.selection.Size() > 0)
	17118	+ {
	17119	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17120	+
	17121	+ // Make what you paint not selectable.
	17122	+ paintobj.ResetSelectable();
	17123	+ }
	17124	+ }
	17125	+
16290	17126	//int tmp = selection_view;
16291	17127	//selection_view = -1;
16292	17128	int temp = DrawMode();
..	..	@@ -16298,6 +17134,17 @@
16298	17134	// temp = DEFAULT; // patch for selection debug
16299	17135	Globals.drawMode = temp; // WARNING
16300	17136
	17137	+ if (PAINTMODE)
	17138	+ {
	17139	+ if (object.GetWindow().copy.selection.Size() > 0)
	17140	+ {
	17141	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17142	+
	17143	+ // Revert.
	17144	+ paintobj.RestoreSelectable();
	17145	+ }
	17146	+ }
	17147	+
16301	17148	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	17149
16303	17150	// trying different ways of getting the depth info over
..	..	@@ -16345,6 +17192,8 @@
16345	17192	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	17193	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	17194	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17195	+
	17196	+ CreateSelectedPoint();
16348	17197
16349	17198	// Will fit the mesh !!!
16350	17199	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +17243,36 @@
16394	17243	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	17244	}
16396	17245
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17246	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	17247	}
16399	17248	}
16400	17249
16401	17250	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	17251	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	17252
16404		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17253	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16405	17254	{
16406		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17255	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16407	17256
16408		- Object3D group = new Object3D("inst" + paintcount++);
	17257	+ if (object.GetWindow().copy.selection.Size() > 0)
	17258	+ {
	17259	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	17260
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();
	17261	+ Object3D inst = new Object3D("inst" + paintcount++);
	17262	+
	17263	+ inst.CreateMaterial(); // use a void leaf to select instances
	17264	+
	17265	+ inst.add(paintobj); // link
	17266	+
	17267	+ object.GetWindow().SnapObject(inst);
	17268	+
	17269	+ Object3D folder = paintFolder; // GetFolder();
	17270	+
	17271	+ folder.add(inst);
	17272	+
	17273	+ object.GetWindow().ResetModel();
	17274	+ object.GetWindow().refreshContents();
	17275	+ }
16425	17276	}
16426	17277	else
16427	17278	paintcount = 0;
..	..	@@ -16460,6 +17311,11 @@
16460	17311	//System.out.println("objects[color] = " + objects[color]);
16461	17312	//objects[color].Select();
16462	17313	indexcount = 0;
	17314	+ ObjEditor window = object.GetWindow();
	17315	+ if (window != null && deselect)
	17316	+ {
	17317	+ window.Select(null, deselect, true);
	17318	+ }
16463	17319	object.Select(color, deselect);
16464	17320	}
16465	17321
..	..	@@ -16510,6 +17366,7 @@
16510	17366
16511	17367	public void init(GLAutoDrawable drawable)
16512	17368	{
	17369	+ if (Globals.DEBUG)
16513	17370	System.out.println("shadow buffer init");
16514	17371
16515	17372	GL gl = drawable.getGL();
..	..	@@ -16559,7 +17416,7 @@
16559	17416	gl.glDisable(gl.GL_CULL_FACE);
16560	17417	}
16561	17418
16562		- if (!RENDERSHADOW)
	17419	+ if (!Globals.RENDERSHADOW)
16563	17420	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17421
16565	17422	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17426,7 @@
16569	17426	//gl.glColorMask(false, false, false, false);
16570	17427
16571	17428	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17429	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17430	{
16574	17431	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17432
..	..	@@ -16738,10 +17595,14 @@
16738	17595	gl.glFlush();
16739	17596
16740	17597	/**/
16741		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17598	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16742	17599
16743		- float[] pixels = occlusionsizebuffer.array();
	17600	+ float[] depths = occlusiondepthbuffer.array();
16744	17601
	17602	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17603	+
	17604	+ int[] pixels = selectsizebuffer.array();
	17605	+
16745	17606	double r = 0, g = 0, b = 0;
16746	17607
16747	17608	double count = 0;
..	..	@@ -16752,7 +17613,7 @@
16752	17613
16753	17614	double FACTOR = 1;
16754	17615
16755		- for (int i = 0; i < pixels.length; i++)
	17616	+ for (int i = 0; i < depths.length; i++)
16756	17617	{
16757	17618	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16758	17619	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16835,7 +17696,7 @@
16835	17696
16836	17697	double scale = ray.z; // 1; // cos
16837	17698
16838		- float depth = pixels[newindex];
	17699	+ float depth = depths[newindex];
16839	17700
16840	17701	/*
16841	17702	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16985,23 +17846,15 @@
16985	17846	int AAbuffersize = 0;
16986	17847
16987	17848	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17849	+ static Superellipsoid selectedpoint;
16989	17850	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();
	17851	+ static Sphere debugpointG;
	17852	+ static Sphere debugpointP;
	17853	+ static Sphere debugpointC;
	17854	+ static Sphere debugpointR;
16994	17855
16995	17856	static Sphere debugpoints[] = new Sphere[8];
16996	17857
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17858	static void InitPoints(float radius)
17006	17859	{
17007	17860	for (int i=0; i<8; i++)
..	..	@@ -17040,11 +17893,14 @@
17040	17893	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17041	17894	static IntBuffer bigAAbuffer;
17042	17895	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17043		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17896	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17044	17897	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17045	17898	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17046	17899	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17047		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17900	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17901	+
	17902	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17903	+
17048	17904	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17049	17905	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17050	17906	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();