~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -92,6 +126,8 @@
92	126
93	127	static int tickcount = 0; // slow pose issue
94	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
95	131	static boolean BOXMODE = false;
96	132	static boolean IMAGEFLIP = false;
97	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -150,6 +186,20 @@
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
	202	+
153	203	void SetAsGLRenderer(boolean b)
154	204	{
155	205	isRenderer = b;
..	..	@@ -168,7 +218,8 @@
168	218
169	219	SetCamera(cam);
170	220
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	223
173	224	object = o;
174	225
..	..	@@ -223,6 +274,11 @@
223	274	public boolean IsBoxMode()
224	275	{
225	276	return BOXMODE;
	277	+ }
	278	+
	279	+ public boolean IsZoomBoxMode()
	280	+ {
	281	+ return ZOOMBOXMODE;
226	282	}
227	283
228	284	public void ClearDepth()
..	..	@@ -320,7 +376,7 @@
320	376	cStatic.objectstack[materialdepth++] = obj;
321	377	//System.out.println("material " + material);
322	378	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
324	380	if (obj instanceof Camera)
325	381	{
326	382	display.options1[0] = material.shift;
..	..	@@ -329,14 +385,28 @@
329	385	display.options1[2] = material.shadowbias;
330	386	display.options1[3] = material.aniso;
331	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
332	393	display.options2[0] = material.opacity;
333	394	display.options2[1] = material.diffuse;
334	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
335	399
336	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
337	404	display.options4[0] = material.cameralight/0.2f;
338	405	display.options4[1] = material.subsurface;
339	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
340	410
341	411	// if (display.CURRENTANTIALIAS > 0)
342	412	// display.options3[3] /= 4;
..	..	@@ -352,7 +422,7 @@
352	422	/**/
353	423	} else
354	424	{
355		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
356	426	}
357	427	} else
358	428	{
..	..	@@ -376,8 +446,8 @@
376	446	cStatic.objectstack[materialdepth++] = obj;
377	447	//System.out.println("material " + material);
378	448	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	451	}
382	452	}
383	453
..	..	@@ -394,8 +464,8 @@
394	464	materialdepth -= 1;
395	465	if (materialdepth > 0)
396	466	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
399	469	}
400	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +485,8 @@
415	485	materialdepth -= 1;
416	486	if (materialdepth > 0)
417	487	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
420	490	}
421	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	492	//else
..	..	@@ -457,10 +527,12 @@
457	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	528	{
459	529	//gl.glBegin(gl.GL_TRIANGLES);
460		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
461	533	if (!hasnorm)
462	534	{
463		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
464	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1257,12 @@
1185	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1258	}
1187	1259	}
	1260	+
1188	1261	if (flipV)
1189	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1263	else
1191	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1192	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1268
..	..	@@ -1208,10 +1282,12 @@
1208	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1283	}
1210	1284	}
	1285	+
1211	1286	if (flipV)
1212	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1288	else
1214	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1215	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1293
..	..	@@ -1239,8 +1315,10 @@
1239	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1316	else
1241	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1242	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1244	1322	count2 += 2;
1245	1323	count3 += 3;
1246	1324	}
..	..	@@ -1419,6 +1497,8 @@
1419	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1420	1498	}
1421	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1422	1502	void SetColor(Object3D obj, Vertex p0)
1423	1503	{
1424	1504	CameraPane display = this;
..	..	@@ -1486,8 +1566,6 @@
1486	1566	{
1487	1567	return;
1488	1568	}
1489		-
1490		- float[] colorV = new float[3];
1491	1569
1492	1570	if (false) // marked)
1493	1571	{
..	..	@@ -1596,7 +1674,7 @@
1596	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1675	}
1598	1676
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1678	{
1601	1679	CameraPane display = this;
1602	1680	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1690,18 @@
1612	1690	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1691	if (!material.multiply)
1614	1692	{
1615		- display.color = color;
	1693	+ display.color = material.color;
1616	1694	display.saturation = material.modulation;
1617	1695	}
1618	1696	else
1619	1697	{
1620		- display.color = color2;
	1698	+ display.color = material.color2;
1621	1699	display.saturation = material.modulation2;
1622	1700	}
1623	1701
1624	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1703
1626		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
1627	1705
1628	1706	/**/
1629	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1709,7 @@
1631	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1635	1713
1636	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1817,9 @@
1739	1817	display.modelParams7[2] = 0;
1740	1818	display.modelParams7[3] = 0;
1741	1819
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1821
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1824	{
1747	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1961,7 @@
1883	1961	void PushMatrix(double[][] matrix)
1884	1962	{
1885	1963	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1887	1965	}
1888	1966
1889	1967	void PushMatrix()
..	..	@@ -2037,7 +2115,7 @@
2037	2115	//System.err.println("Oeil on");
2038	2116	OEIL = true;
2039	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2119	//pingthread.StepToTarget(true);
2042	2120	}
2043	2121
..	..	@@ -2135,7 +2213,7 @@
2135	2213	System.err.println("LIVE = " + Globals.isLIVE());
2136	2214
2137	2215	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2216	+ Grafreed.savesound = true; // wav.save();
2139	2217	// else
2140	2218	repaint(); // start loop // may 2013
2141	2219	}
..	..	@@ -2168,6 +2246,11 @@
2168	2246	public void ToggleBoxMode()
2169	2247	{
2170	2248	BOXMODE ^= true;
	2249	+ }
	2250	+
	2251	+ public void ToggleZoomBoxMode()
	2252	+ {
	2253	+ ZOOMBOXMODE ^= true;
2171	2254	}
2172	2255
2173	2256	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2330,7 @@
2247	2330
2248	2331	void ToggleDebug()
2249	2332	{
2250		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2251	2334	}
2252	2335
2253	2336	void ToggleLookAt()
..	..	@@ -2255,9 +2338,9 @@
2255	2338	LOOKAT ^= true;
2256	2339	}
2257	2340
2258		- void ToggleRandom()
	2341	+ void ToggleSwitch()
2259	2342	{
2260		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
2261	2344	}
2262	2345
2263	2346	void ToggleHandles()
..	..	@@ -2265,10 +2348,17 @@
2265	2348	HANDLES ^= true;
2266	2349	}
2267	2350
	2351	+ Object3D paintFolder;
	2352	+
2268	2353	void TogglePaint()
2269	2354	{
2270	2355	PAINTMODE ^= true;
2271	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2272	2362	}
2273	2363
2274	2364	void SwapCamera(int a, int b)
..	..	@@ -2364,7 +2454,22 @@
2364	2454	{
2365	2455	return currentGL;
2366	2456	}
2367		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2368	2473	/**/
2369	2474	class CacheTexture
2370	2475	{
..	..	@@ -2373,28 +2478,31 @@
2373	2478
2374	2479	int resolution;
2375	2480
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2482	{
2378		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2379	2485	resolution = res;
2380	2486	}
2381	2487	}
2382	2488	/**/
2383	2489
2384	2490	// TEXTURE static Texture texture;
2385		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2386		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2387		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2388	2496	int pigmentdepth = 0;
2389	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2498	int bumpdepth = 0;
2391	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2504
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2506	{
2399	2507	TextureData texturedata = null;
2400	2508
..	..	@@ -2413,13 +2521,34 @@
2413	2521	if (bump)
2414	2522	texturedata = ConvertBump(texturedata, false);
2415	2523
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2418	2526
2419		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2420		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2421	2529
2422		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2423	2552	}
2424	2553
2425	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3492,6 +3621,8 @@
3492	3621
3493	3622	System.out.println("LOADING TEXTURE : " + name);
3494	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3495	3626	//
3496	3627	if (false) // compressbit > 0)
3497	3628	{
..	..	@@ -4196,6 +4327,7 @@
4196	4327
4197	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4329	{
	4330	+ new Exception().printStackTrace();
4199	4331	System.exit(0);
4200	4332	com.sun.opengl.util.texture.Texture texture = null;
4201	4333
..	..	@@ -7889,7 +8021,7 @@
7889	8021	String pigment = Object3D.GetPigment(tex);
7890	8022	String bump = Object3D.GetBump(tex);
7891	8023
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8025	{
7894	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8036,69 @@
7904	8036	pigment = null;
7905	8037	}
7906	8038
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7909	8041	}
7910	8042
7911		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7912	8102	{
7913	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8109,7 @@
7919	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8110
7921	8111	if (tex != null)
7922		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8113
7924	8114	// //assert( texture != null );
7925	8115	// if (texture == null)
..	..	@@ -8011,7 +8201,55 @@
8011	8201	}
8012	8202	}
8013	8203
8014		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8205	+ {
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8015	8253	{
8016	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8260,47 @@
8022	8260	if (tex == null)
8023	8261	{
8024	8262	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8263	return;
8027	8264	}
8028	8265
8029	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
8030	8299	String bump = Object3D.GetBump(tex);
8031	8300
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8034	8302
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8304	{
8037	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8310,94 @@
8042	8310	{
8043	8311	bump = null;
8044	8312	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8313
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8054	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8317	}
8058	8318
8059		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
8060	8322	{
8061		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
8062	8342
8063	8343	if (tex != null)
8064	8344	{
8065		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8347
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
	8355	+// String[] split = tex.split("Textures");
	8356	+// if (split.length > 1)
	8357	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8358	+// else
	8359	+// if (!texname.startsWith("/"))
	8360	+// texname = "/Users/nbriere/Textures/" + texname;
	8361	+ if (!FileExists(texname))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
8073	8365
8074	8366	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8367	{
8081		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8082	8401	{
8083	8402	assert(!bump);
8084	8403	// if (bump)
..	..	@@ -8089,19 +8408,23 @@
8089	8408	// }
8090	8409	// else
8091	8410	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8094	8413	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8097	8418	// }
8098	8419	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8421	{
8101	8422	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8105	8428	} else
8106	8429	{
8107	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8432,13 @@
8109	8432	// texture = GetResourceTexture("default.png");
8110	8433	//} else
8111	8434	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8113	8436	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8117	8442	} else
8118	8443	{
8119	8444	if (textureon)
..	..	@@ -8138,7 +8463,7 @@
8138	8463	}
8139	8464
8140	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
8142	8467	cachename = texname;
8143	8468	else
8144	8469	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8485,7 @@
8160	8485	}
8161	8486
8162	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
8164	8489	cachename = texname;
8165	8490	else
8166	8491	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8494,22 @@
8169	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8495
8171	8496
8172		- if (texturedata != null)
8173		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8497	+ if (texturedata == null)
	8498	+ throw new Exception();
	8499	+
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8174	8501	//texture = GetTexture(tex, bump);
8175	8502	}
8176	8503	}
8177	8504	//}
8178	8505	}
8179	8506
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8508	{
8182	8509	//return false;
8183	8510
8184	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8513	{
8187	8514	// String ext = "_highres";
8188	8515	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8526,17 @@
8199	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8527	if (!cachefile.exists())
8201	8528	{
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))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8530	{
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);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8242	8533	ImageWriter writer = null;
8243	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8535	if (iter.hasNext()) {
8245	8536	writer = (ImageWriter)iter.next();
8246	8537	}
8247		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8248	8540	try
8249	8541	{
8250	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8553,20 @@
8261	8553	}
8262	8554	}
8263	8555	}
8264		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8265	8559	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8267	8561	{
8268		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8269	8563	thetex.texture.disable();
8270	8564	thetex.texture.dispose();
8271		- textures.remove(texname);
	8565	+ textures.remove(tex);
8272	8566	}
8273	8567
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8276	8570
8277	8571	// newtex = true;
8278	8572	}
..	..	@@ -8288,10 +8582,44 @@
8288	8582	}
8289	8583	}
8290	8584
8291		- return texture;
	8585	+ return texturecache;
8292	8586	}
8293	8587
8294		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8295	8623	{
8296	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8625
..	..	@@ -8309,21 +8637,21 @@
8309	8637	return texture!=null?texture.texture:null;
8310	8638	}
8311	8639
8312		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8313	8641	{
8314	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8643
8316	8644	return texture!=null?texture.texturedata:null;
8317	8645	}
8318	8646
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8648	{
8321	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8650	{
8323	8651	return false;
8324	8652	}
8325	8653
8326		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8327	8655
8328	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8657
..	..	@@ -8355,9 +8683,75 @@
8355	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8685
8358		- return newtex;
	8686	+ return true; // Warning: not used.
8359	8687	}
8360	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8361	8755	ShadowBuffer shadowPBuf;
8362	8756	AntialiasBuffer antialiasPBuf;
8363	8757	int MAXSTACK;
..	..	@@ -8550,7 +8944,7 @@
8550	8944
8551	8945	if (cubemap == null)
8552	8946	{
8553		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8554	8948	}
8555	8949
8556	8950	//cubemap.enable();
..	..	@@ -8837,37 +9231,58 @@
8837	9231	cubemap = null;
8838	9232	return;
8839	9233	case 1:
8840		- name = "cubemaps/box_";
8841		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
8842	9236	reverseUP = false;
8843	9237	break;
8844	9238	case 2:
8845		- name = "cubemaps/uffizi_";
8846		- ext = "png";
8847		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
8848	9243	case 3:
8849		- name = "cubemaps/CloudyHills_";
8850		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
8851	9246	reverseUP = false;
8852	9247	break;
8853	9248	case 4:
8854		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
8855	9250	ext = "png";
8856	9251	reverseUP = false;
8857	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
8858	9278	default:
8859		- name = "cubemaps/rgb_";
8860		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
8861	9282	break;
8862	9283	}
8863		-
8864		- try
8865		- {
8866		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8867		- } catch (IOException e)
8868		- {
8869		- throw new RuntimeException(e);
8870		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
8871	9286	}
8872	9287
8873	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8899,8 +9314,12 @@
8899	9314	static double[] model = new double[16];
8900	9315	double[] camera2light = new double[16];
8901	9316	double[] light2camera = new double[16];
8902		- int newenvy = -1;
8903		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
8904	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8905	9324	//float[] light0 = { 0,0,0 };
8906	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9193,11 +9612,35 @@
9193	9612	jy8[3] = 0.5f;
9194	9613	}
9195	9614
9196		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9615	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9197	9616	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9617	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9618	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	9619
	9620	+ void ResetOptions()
	9621	+ {
	9622	+ options1[0] = 100;
	9623	+ options1[1] = 0.025f;
	9624	+ options1[2] = 0.01f;
	9625	+ options1[3] = 0;
	9626	+ options1[4] = 0;
	9627	+
	9628	+ options2[0] = 0;
	9629	+ options2[1] = 0.75f;
	9630	+ options2[2] = 0;
	9631	+ options2[3] = 0;
	9632	+
	9633	+ options3[0] = 1;
	9634	+ options3[1] = 1;
	9635	+ options3[2] = 1;
	9636	+ options3[3] = 0;
	9637	+
	9638	+ options4[0] = 1;
	9639	+ options4[1] = 0;
	9640	+ options4[2] = 1;
	9641	+ options4[3] = 0;
	9642	+ }
	9643	+
9201	9644	static int imagecount = 0; // movie generation
9202	9645
9203	9646	static int jitter = 0;
..	..	@@ -9293,8 +9736,8 @@
9293	9736	assert (parentcam != renderCamera);
9294	9737
9295	9738	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9740	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9298	9741
9299	9742	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9743
..	..	@@ -9309,8 +9752,8 @@
9309	9752	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9753
9311	9754	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9755	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9756	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9314	9757
9315	9758	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9759
..	..	@@ -9356,10 +9799,12 @@
9356	9799	rati = 1 / rati;
9357	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9358	9801	}
9359		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
9360	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9361	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9362		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
9363	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9364	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9365	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9382,7 +9827,7 @@
9382	9827	//gl.glFlush();
9383	9828	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9829
9385		- if (ANIMATION && ABORTED)
	9830	+ if (Globals.ANIMATION && ABORTED)
9386	9831	{
9387	9832	System.err.println(" ABORTED FRAME");
9388	9833	break;
..	..	@@ -9412,7 +9857,7 @@
9412	9857	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9858
9414	9859	// save image
9415		- if (ANIMATION && !ABORTED)
	9860	+ if (Globals.ANIMATION && !ABORTED)
9416	9861	{
9417	9862	VPwidth = viewport[2];
9418	9863	VPheight = viewport[3];
..	..	@@ -9523,11 +9968,11 @@
9523	9968
9524	9969	// imagecount++;
9525	9970
9526		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9971	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9527	9972
9528	9973	if (!BOXMODE)
9529	9974	{
9530		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9975	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9531	9976	}
9532	9977
9533	9978	if (!BOXMODE)
..	..	@@ -9565,7 +10010,7 @@
9565	10010	ABORTED = false;
9566	10011	}
9567	10012	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10013	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	10014
9570	10015	if (false)
9571	10016	{
..	..	@@ -10228,11 +10673,11 @@
10228	10673
10229	10674	public void display(GLAutoDrawable drawable)
10230	10675	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10676	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10677	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10678	+ Grafreed.wav.save();
	10679	+ Grafreed.savesound = false;
	10680	+ Grafreed.hassound = false;
10236	10681	}
10237	10682	// if (DEBUG_SELECTION)
10238	10683	// {
..	..	@@ -10308,6 +10753,7 @@
10308	10753	ANTIALIAS = 0;
10309	10754	//System.out.println("RESTART");
10310	10755	AAtimer.restart();
	10756	+ Globals.TIMERRUNNING = true;
10311	10757	}
10312	10758	}
10313	10759	}
..	..	@@ -10362,7 +10808,7 @@
10362	10808	Object3D theobject = object;
10363	10809	Object3D theparent = object.parent;
10364	10810	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10811	+ object = (Object3D)Grafreed.clone(object);
10366	10812	object.Stripify();
10367	10813	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10814	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10821,14 @@
10375	10821	ambientOcclusion = false;
10376	10822	}
10377	10823
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10824	+ if (//Globals.lighttouched &&
	10825	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10826	{
10380	10827	//if (RENDERSHADOW) // ?
10381	10828	if (!IsFrozen())
10382	10829	{
10383	10830	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10831	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10832	{
10386	10833	Globals.framecount++;
10387	10834	shadowbuffer.display();
..	..	@@ -10508,8 +10955,8 @@
10508	10955
10509	10956	// if (parentcam != renderCamera) // not a light
10510	10957	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10958	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10959	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10513	10960
10514	10961	for (int j = 0; j < 4; j++)
10515	10962	{
..	..	@@ -10523,8 +10970,8 @@
10523	10970
10524	10971	// if (parentcam != renderCamera) // not a light
10525	10972	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10973	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10974	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10528	10975
10529	10976	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10977
..	..	@@ -10610,13 +11057,27 @@
10610	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10611	11058	}
10612	11059
10613		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
10614	11068	{
10615		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
10616	11074	}
10617		-
10618		- newenvy = -1;
10619		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
10620	11081	ratio = ((double) getWidth()) / getHeight();
10621	11082	//System.out.println("ratio = " + ratio);
10622	11083
..	..	@@ -10632,7 +11093,7 @@
10632	11093
10633	11094	if (!IsFrozen() && !ambientOcclusion)
10634	11095	{
10635		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
10636	11097	}
10637	11098
10638	11099	//if (selection_view == -1)
..	..	@@ -10783,7 +11244,16 @@
10783	11244	// Bump noise
10784	11245	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11246	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- BindTexture(NOISE_TEXTURE, false, 2);
	11247	+
	11248	+ try
	11249	+ {
	11250	+ BindTexture(NOISE_TEXTURE, false, 2);
	11251	+ }
	11252	+ catch (Exception e)
	11253	+ {
	11254	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11255	+ }
	11256	+
10787	11257
10788	11258	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11259	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11276,9 @@
10806	11276
10807	11277	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11278
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11279	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11280	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11281	+gl.glEnable(gl.GL_MULTISAMPLE);
10812	11282	} else
10813	11283	{
10814	11284	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11289,7 @@
10819	11289	//System.out.println("BLENDING ON");
10820	11290	gl.glEnable(GL.GL_BLEND);
10821	11291	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11292	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11293	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11294	gl.glLoadIdentity();
10825	11295
..	..	@@ -10908,8 +11378,8 @@
10908	11378	System.err.println("parentcam != renderCamera");
10909	11379
10910	11380	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11381	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11382	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10913	11383	}
10914	11384
10915	11385	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11400,8 @@
10930	11400	if (true) // TODO
10931	11401	{
10932	11402	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11403	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11404	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10935	11405	}
10936	11406
10937	11407	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11068,7 +11538,7 @@
11068	11538	}
11069	11539	}
11070	11540
11071		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11541	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11072	11542	{
11073	11543	//gl.glDepthFunc(GL.GL_LEQUAL);
11074	11544	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11076,24 +11546,21 @@
11076	11546
11077	11547	boolean texon = textureon;
11078	11548
11079		- if (RENDERPROGRAM > 0)
11080		- {
11081		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11082		- textureon = false;
11083		- }
	11549	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11550	+ textureon = false;
	11551	+
11084	11552	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11085	11553	//System.out.println("ALLO");
11086	11554	gl.glColorMask(false, false, false, false);
11087	11555	DrawObject(gl);
11088		- if (RENDERPROGRAM > 0)
11089		- {
11090		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11091		- textureon = texon;
11092		- }
	11556	+
	11557	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11558	+ textureon = texon;
	11559	+
11093	11560	gl.glColorMask(true, true, true, true);
11094	11561
11095	11562	gl.glDepthFunc(GL.GL_EQUAL);
11096		- //gl.glDepthMask(false);
	11563	+ gl.glDepthMask(false);
11097	11564	}
11098	11565
11099	11566	if (false) // DrawMode() == SHADOW)
..	..	@@ -11247,8 +11714,14 @@
11247	11714	{
11248	11715	renderpass++;
11249	11716	// System.out.println("Draw object... ");
	11717	+ STEP = 1;
11250	11718	if (FAST) // in case there is no script
11251		- STEP = 16;
	11719	+ STEP = 8;
	11720	+
	11721	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11722	+ {
	11723	+ STEP *= 4;
	11724	+ }
11252	11725
11253	11726	//object.FullInvariants();
11254	11727
..	..	@@ -11262,23 +11735,44 @@
11262	11735	e.printStackTrace();
11263	11736	}
11264	11737
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11738	+ if (Grafreed.RENDERME > 0)
	11739	+ Grafreed.RENDERME--; // mechante magouille
11267	11740
11268	11741	Globals.ONESTEP = false;
11269	11742	}
11270	11743
11271	11744	static boolean zoomonce = false;
11272	11745
	11746	+ static void CreateSelectedPoint()
	11747	+ {
	11748	+ if (selectedpoint == null)
	11749	+ {
	11750	+ debugpointG = new Sphere();
	11751	+ debugpointP = new Sphere();
	11752	+ debugpointC = new Sphere();
	11753	+ debugpointR = new Sphere();
	11754	+
	11755	+ selectedpoint = new Superellipsoid();
	11756	+
	11757	+ for (int i=0; i<8; i++)
	11758	+ {
	11759	+ debugpoints[i] = new Sphere();
	11760	+ }
	11761	+ }
	11762	+ }
	11763	+
11273	11764	void DrawObject(GL gl, boolean draw)
11274	11765	{
	11766	+ // To clear camera values
	11767	+ ResetOptions();
	11768	+
11275	11769	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11770	// DrawMode() = SELECTION;
11277	11771	//GL gl = getGL();
11278	11772	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11773	{
11280	11774	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11775	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11776	pingthread.StepToTarget(true); // true);
11283	11777	// zoomonce = false;
11284	11778	}
..	..	@@ -11333,7 +11827,14 @@
11333	11827
11334	11828	usedtextures.clear();
11335	11829
11336		- BindTextures(DEFAULT_TEXTURES, 2);
	11830	+ try
	11831	+ {
	11832	+ BindTextures(DEFAULT_TEXTURES, 2);
	11833	+ }
	11834	+ catch (Exception e)
	11835	+ {
	11836	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11837	+ }
11337	11838	}
11338	11839	//System.out.println("--> " + stackdepth);
11339	11840	// GrafreeD.traceon();
..	..	@@ -11343,8 +11844,9 @@
11343	11844
11344	11845	if (DrawMode() == DEFAULT)
11345	11846	{
11346		- if (DEBUG)
	11847	+ if (Globals.DEBUG)
11347	11848	{
	11849	+ CreateSelectedPoint();
11348	11850	float radius = 0.05f;
11349	11851	if (selectedpoint.radius != radius)
11350	11852	{
..	..	@@ -11398,20 +11900,32 @@
11398	11900	ReleaseTextures(DEFAULT_TEXTURES);
11399	11901
11400	11902	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11903	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	11904	{
11403		- String tex = e.nextElement();
	11905	+ cTexture tex = e.nextElement();
11404	11906
11405	11907	// System.out.println("Texture --------- " + tex);
11406	11908
11407		- if (tex.equals("WHITE_NOISE"))
	11909	+ if (tex.equals("WHITE_NOISE:"))
11408	11910	continue;
11409	11911
11410		- if (!usedtextures.containsKey(tex))
	11912	+ if (!usedtextures.contains(tex))
11411	11913	{
	11914	+ CacheTexture gettex = texturepigment.get(tex);
11412	11915	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- textures.remove(tex);
	11916	+ if (gettex != null)
	11917	+ {
	11918	+ gettex.texture.dispose();
	11919	+ texturepigment.remove(tex);
	11920	+ }
	11921	+
	11922	+ gettex = texturebump.get(tex);
	11923	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11924	+ if (gettex != null)
	11925	+ {
	11926	+ gettex.texture.dispose();
	11927	+ texturebump.remove(tex);
	11928	+ }
11415	11929	}
11416	11930	}
11417	11931	}
..	..	@@ -11424,7 +11938,14 @@
11424	11938	if (checker != null && DrawMode() == DEFAULT)
11425	11939	{
11426	11940	//BindTexture(IMMORTAL_TEXTURE);
11427		- BindTextures(checker.GetTextures(), checker.texres);
	11941	+ try
	11942	+ {
	11943	+ BindTextures(checker.GetTextures(), checker.texres);
	11944	+ }
	11945	+ catch (Exception e)
	11946	+ {
	11947	+ System.err.println("FAILED: " + checker.GetTextures());
	11948	+ }
11428	11949	// NEAREST
11429	11950	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11951	DrawChecker(gl);
..	..	@@ -11506,7 +12027,7 @@
11506	12027	return;
11507	12028	}
11508	12029
11509		- String string = obj.GetToolTip();
	12030	+ String string = obj.toString(); //.GetToolTip();
11510	12031
11511	12032	GL gl = GetGL();
11512	12033
..	..	@@ -11823,8 +12344,8 @@
11823	12344	//obj.TransformToWorld(light, light);
11824	12345	for (int i = tp.size(); --i >= 0;)
11825	12346	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- LA.xformPos(light, tp.get(i).toParent, light);
	12347	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12348	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11828	12349	}
11829	12350
11830	12351
..	..	@@ -11841,8 +12362,8 @@
11841	12362	parentcam = cameras[0];
11842	12363	}
11843	12364
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12365	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12366	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11846	12367
11847	12368	LA.xformPos(light, renderCamera.toScreen, light);
11848	12369
..	..	@@ -11932,8 +12453,76 @@
11932	12453
11933	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11934	12455
11935		- String program =
	12456	+ String programmin =
	12457	+ // Min shader
11936	12458	"!!ARBfp1.0\n" +
	12459	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12460	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12461	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12462	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12463	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12464	+ "PARAM light2cam0 = program.env[10];" +
	12465	+ "PARAM light2cam1 = program.env[11];" +
	12466	+ "PARAM light2cam2 = program.env[12];" +
	12467	+ "TEMP temp;" +
	12468	+ "TEMP light;" +
	12469	+ "TEMP ndotl;" +
	12470	+ "TEMP normal;" +
	12471	+ "TEMP depth;" +
	12472	+ "TEMP eye;" +
	12473	+ "TEMP pos;" +
	12474	+
	12475	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12476	+ Normalize("normal") +
	12477	+ "MOV light, state.light[0].position;" +
	12478	+ "DP3 ndotl.x, light, normal;" +
	12479	+
	12480	+ // shadow
	12481	+ "MOV pos, fragment.texcoord[1];" +
	12482	+ "MOV temp, pos;" +
	12483	+ ShadowTextureFetch("depth", "temp", "1") +
	12484	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12485	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12486	+
	12487	+ // No shadow when out of frustum
	12488	+ //"SGE temp.y, depth.z, zero123.y;" +
	12489	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12490	+
	12491	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12492	+
	12493	+ // Backlit
	12494	+ "MOV pos.w, zero123.y;" +
	12495	+ "DP4 eye.x, pos, light2cam0;" +
	12496	+ "DP4 eye.y, pos, light2cam1;" +
	12497	+ "DP4 eye.z, pos, light2cam2;" +
	12498	+ Normalize("eye") +
	12499	+
	12500	+ "DP3 ndotl.y, -eye, normal;" +
	12501	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12502	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12503	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12504	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12505	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12506	+
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12509	+
	12510	+ // Pigment
	12511	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12512	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12513	+ "MUL temp, temp, ndotl.x;" +
	12514	+
	12515	+ "MUL temp, temp, zero123.z;" +
	12516	+
	12517	+ //"MUL temp, temp, ndotl.y;" +
	12518	+
	12519	+ "MOV temp.w, zero123.y;" + // reset alpha
	12520	+ "MOV result.color, temp;" +
	12521	+ "END";
	12522	+
	12523	+ String programmax =
	12524	+ "!!ARBfp1.0\n" +
	12525	+
11937	12526	//"OPTION ARB_fragment_program_shadow;" +
11938	12527	"PARAM light2cam0 = program.env[10];" +
11939	12528	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12048,8 +12637,7 @@
12048	12637	"TEMP shininess;" +
12049	12638	"\n" +
12050	12639	"MOV texSamp, one;" +
12051		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12052		-
	12640	+
12053	12641	"MOV mapgrid.x, one2048th.x;" +
12054	12642	"MOV temp, fragment.texcoord[1];" +
12055	12643	/*
..	..	@@ -12070,20 +12658,20 @@
12070	12658	"MUL temp, floor, mapgrid.x;" +
12071	12659	//"TEX depth0, temp, texture[1], 2D;" +
12072	12660	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12073		- TextureFetch("depth0", "temp", "1") +
	12661	+ ShadowTextureFetch("depth0", "temp", "1") +
12074	12662	"") +
12075	12663	"ADD temp.x, temp.x, mapgrid.x;" +
12076	12664	//"TEX depth1, temp, texture[1], 2D;" +
12077	12665	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12078		- TextureFetch("depth1", "temp", "1") +
	12666	+ ShadowTextureFetch("depth1", "temp", "1") +
12079	12667	"") +
12080	12668	"ADD temp.y, temp.y, mapgrid.x;" +
12081	12669	//"TEX depth2, temp, texture[1], 2D;" +
12082		- TextureFetch("depth2", "temp", "1") +
	12670	+ ShadowTextureFetch("depth2", "temp", "1") +
12083	12671	"SUB temp.x, temp.x, mapgrid.x;" +
12084	12672	//"TEX depth3, temp, texture[1], 2D;" +
12085	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12086		- TextureFetch("depth3", "temp", "1") +
	12674	+ ShadowTextureFetch("depth3", "temp", "1") +
12087	12675	"") +
12088	12676	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12089	12677	//"MOV params, material;" +
..	..	@@ -12454,10 +13042,10 @@
12454	13042	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12455	13043	"") +
12456	13044
12457		- // display shadow only (bump == 0)
	13045	+ // display shadow only (fakedepth == 0)
12458	13046	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	13047	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
12461	13049	"SUB temp.y, one.x, temp.z;" +
12462	13050	"MUL temp.x, temp.x, temp.y;" +
12463	13051	"KIL temp.x;" +
..	..	@@ -12586,8 +13174,10 @@
12586	13174	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	13175
12588	13176	"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
	13177	+ // Tuning for default skin
	13178	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13179	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13180	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	13181	"MUL temp.x, temp.x, temp.y;" +
12592	13182
12593	13183	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,7 +13376,14 @@
12786	13376	//once = true;
12787	13377	}
12788	13378
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
	13386	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12790	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12791	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13389
..	..	@@ -12879,25 +13476,26 @@
12879	13476	return out;
12880	13477	}
12881	13478
12882		- String TextureFetch(String dest, String src, String unit)
	13479	+ // Also does frustum culling
	13480	+ String ShadowTextureFetch(String dest, String src, String unit)
12883	13481	{
12884	13482	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12885	13483	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12886	13484	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13485	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13486	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12887	13487	"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;" +
	13488	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13489	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12892	13490	//"SWZ buffer, temp, w,w,w,w;";
12893		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13491	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12894	13492	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12895	13493	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12896	13494	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12897		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13495	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12898	13496
12899		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12900		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13497	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13498	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12901	13499	}
12902	13500
12903	13501	String Shadow(String depth, String shadow)
..	..	@@ -12919,12 +13517,16 @@
12919	13517
12920	13518	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13519	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13520	+
	13521	+ // Compare fragment depth in light space with shadowmap.
12922	13522	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13523	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13524	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13525	+
	13526	+ // Reverse comparison
12925	13527	"SUB temp.x, one.x, temp.x;" +
12926	13528	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13529	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13530	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13531
12930	13532	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13540,10 @@
12938	13540	// No shadow for backface
12939	13541	"DP3 temp.x, normal, lightd;" +
12940	13542	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13543	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13544	+
	13545	+ // No shadow when out of frustum
	13546	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13547	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13548	"";
12943	13549	}
..	..	@@ -13084,7 +13690,8 @@
13084	13690	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13691	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13692	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13693	+
	13694	+ //Object3D.cVector2[] vector2buffer;
13088	13695
13089	13696	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13697	// OUT : diff, spec
..	..	@@ -13100,9 +13707,10 @@
13100	13707	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13708	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13709	//"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;" +
	13710	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13711	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13712	+
	13713	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13714	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13715	"RCP " + dest + ".w," + dest + ".w;" +
13108	13716	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +14104,7 @@
13496	14104	public void mousePressed(MouseEvent e)
13497	14105	{
13498	14106	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14107	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	14108	}
13501	14109
13502	14110	static long prevtime = 0;
..	..	@@ -13523,6 +14131,7 @@
13523	14131
13524	14132	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	14133
	14134	+ if (BUTTONLESSWHEEL)
13526	14135	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	14136	{
13528	14137	return;
..	..	@@ -13531,7 +14140,7 @@
13531	14140	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	14141
13533	14142	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14143	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	14144	{
13536	14145	keepboxmode = BOXMODE;
13537	14146	keepsupport = SUPPORT;
..	..	@@ -13571,8 +14180,8 @@
13571	14180	// mode \|= META;
13572	14181	//}
13573	14182
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14183	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14184	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	14185	anchorX = ax;
13577	14186	anchorY = ay;
13578	14187	prevX = px;
..	..	@@ -13606,6 +14215,7 @@
13606	14215	else
13607	14216	if (evt.getSource() == AAtimer)
13608	14217	{
	14218	+ Globals.TIMERRUNNING = false;
13609	14219	if (mouseDown)
13610	14220	{
13611	14221	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14241,10 @@
13631	14241	// LIVE = waslive;
13632	14242	// wasliveok = true;
13633	14243	// waslive = false;
	14244	+
	14245	+ // May 2019 Forget it:
	14246	+ if (true)
	14247	+ return;
13634	14248
13635	14249	// source == timer
13636	14250	if (mouseDown)
..	..	@@ -13661,7 +14275,7 @@
13661	14275
13662	14276	// fev 2014???
13663	14277	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14278	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	14279	pingthread.StepToTarget(true); // true);
13666	14280	}
13667	14281	// if (!LIVE)
..	..	@@ -13670,12 +14284,13 @@
13670	14284
13671	14285	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14286
13673		- void clickStart(int x, int y, int modifiers)
	14287	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14288	{
13675	14289	if (!wasliveok)
13676	14290	return;
13677	14291
13678	14292	AAtimer.restart(); //
	14293	+ Globals.TIMERRUNNING = true;
13679	14294
13680	14295	// waslive = LIVE;
13681	14296	// LIVE = false;
..	..	@@ -13687,7 +14302,7 @@
13687	14302	// touched = true; // main DL
13688	14303	if (isRenderer)
13689	14304	{
13690		- SetMouseMode(modifiers);
	14305	+ SetMouseMode(modifiers, modifiersex);
13691	14306	}
13692	14307
13693	14308	selectX = anchorX = x;
..	..	@@ -13700,7 +14315,7 @@
13700	14315	clicked = true;
13701	14316	hold = false;
13702	14317
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14318	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14319	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14320	{
13706	14321	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13725,14 +14340,15 @@
13725	14340	drag = false;
13726	14341	//System.out.println("Mouse DOWN");
13727	14342	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);
	14343	+ //ClickInfo info = new ClickInfo();
	14344	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14345	+ object.clickInfo.pane = this;
	14346	+ object.clickInfo.camera = renderCamera;
	14347	+ object.clickInfo.x = x;
	14348	+ object.clickInfo.y = y;
	14349	+ object.clickInfo.modifiers = modifiersex;
	14350	+ editObj = object.doEditClick(//info,
	14351	+ 0);
13736	14352	if (!editObj)
13737	14353	{
13738	14354	hasMarquee = true;
..	..	@@ -13748,11 +14364,14 @@
13748	14364
13749	14365	public void mouseDragged(MouseEvent e)
13750	14366	{
	14367	+ Globals.MOUSEDRAGGED = true;
	14368	+
	14369	+ //System.out.println("mouseDragged: " + e);
13751	14370	if (isRenderer)
13752	14371	movingcamera = true;
	14372	+
13753	14373	//if (drawing)
13754	14374	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14375	if ((e.getModifiersEx() & CTRL) != 0
13757	14376	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14377	{
..	..	@@ -13760,7 +14379,7 @@
13760	14379	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14380	}
13762	14381	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14382	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14383
13765	14384	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14385	}
..	..	@@ -13933,6 +14552,7 @@
13933	14552
13934	14553	public void run()
13935	14554	{
	14555	+ new Exception().printStackTrace();
13936	14556	System.exit(0);
13937	14557	for (;;)
13938	14558	{
..	..	@@ -13996,7 +14616,7 @@
13996	14616	{
13997	14617	Globals.lighttouched = true;
13998	14618	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14619	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14620	}
14001	14621	//else
14002	14622	}
..	..	@@ -14010,12 +14630,12 @@
14010	14630	void GoDown(int mod)
14011	14631	{
14012	14632	MODIFIERS \|= COMMAND;
14013		- /*
	14633	+ /**/
14014	14634	if((mod&SHIFT) == SHIFT)
14015		- manipCamera.RotatePosition(0, -speed);
	14635	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14016	14636	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14637	+ manipCamera.RotatePosition(0, -speed);
	14638	+ /**/
14019	14639	if ((mod & SHIFT) == SHIFT)
14020	14640	{
14021	14641	mouseMode = mouseMode; // VR??
..	..	@@ -14031,12 +14651,12 @@
14031	14651	void GoUp(int mod)
14032	14652	{
14033	14653	MODIFIERS \|= COMMAND;
14034		- /*
	14654	+ /**/
14035	14655	if((mod&SHIFT) == SHIFT)
14036		- manipCamera.RotatePosition(0, speed);
	14656	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14037	14657	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14658	+ manipCamera.RotatePosition(0, speed);
	14659	+ /**/
14040	14660	if ((mod & SHIFT) == SHIFT)
14041	14661	{
14042	14662	mouseMode = mouseMode;
..	..	@@ -14052,12 +14672,12 @@
14052	14672	void GoLeft(int mod)
14053	14673	{
14054	14674	MODIFIERS \|= COMMAND;
14055		- /*
	14675	+ /**/
14056	14676	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
14058		- else
14059	14677	manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14678	+ else
	14679	+ manipCamera.RotatePosition(speed, 0);
	14680	+ /**/
14061	14681	if ((mod & SHIFT) == SHIFT)
14062	14682	{
14063	14683	mouseMode = mouseMode;
..	..	@@ -14073,12 +14693,12 @@
14073	14693	void GoRight(int mod)
14074	14694	{
14075	14695	MODIFIERS \|= COMMAND;
14076		- /*
	14696	+ /**/
14077	14697	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
14079		- else
14080	14698	manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14699	+ else
	14700	+ manipCamera.RotatePosition(-speed, 0);
	14701	+ /**/
14082	14702	if ((mod & SHIFT) == SHIFT)
14083	14703	{
14084	14704	mouseMode = mouseMode;
..	..	@@ -14096,7 +14716,7 @@
14096	14716	int X, Y;
14097	14717	boolean SX, SY;
14098	14718
14099		- void drag(int x, int y, int modifiers)
	14719	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14720	{
14101	14721	if (IsFrozen())
14102	14722	{
..	..	@@ -14105,17 +14725,17 @@
14105	14725
14106	14726	drag = true; // NEW
14107	14727
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14728	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14729
14110	14730	X = x;
14111	14731	Y = y;
14112	14732	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14733	+ MODIFIERS = modifiersex;
	14734	+ modifiersex &= ~1024;
14115	14735	if (false) // modifiers != 0)
14116	14736	{
14117	14737	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14738	+ System.out.println("mouseDragged: " + modifiersex);
14119	14739	System.out.println("SHIFT = " + SHIFT);
14120	14740	System.out.println("CONTROL = " + COMMAND);
14121	14741	System.out.println("META = " + META);
..	..	@@ -14128,14 +14748,16 @@
14128	14748	if (editObj)
14129	14749	{
14130	14750	drag = true;
14131		- ClickInfo info = new ClickInfo();
14132		- info.bounds.setBounds(0, 0,
	14751	+ //ClickInfo info = new ClickInfo();
	14752	+ object.clickInfo.bounds.setBounds(0, 0,
14133	14753	(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);
	14754	+ object.clickInfo.pane = this;
	14755	+ object.clickInfo.camera = renderCamera;
	14756	+ object.clickInfo.x = x;
	14757	+ object.clickInfo.y = y;
	14758	+ object //.GetWindow().copy
	14759	+ .doEditDrag(//info,
	14760	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14761	} else
14140	14762	{
14141	14763	if (x < startX)
..	..	@@ -14284,23 +14906,27 @@
14284	14906	}
14285	14907	}
14286	14908
	14909	+// ClickInfo clickInfo = new ClickInfo();
	14910	+
14287	14911	public void mouseMoved(MouseEvent e)
14288	14912	{
14289	14913	//System.out.println("mouseMoved: " + e);
14290		-
14291	14914	if (isRenderer)
14292	14915	return;
14293	14916
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;
	14917	+ // Mouse cursor feedback
	14918	+ object.clickInfo.x = e.getX();
	14919	+ object.clickInfo.y = e.getY();
	14920	+ object.clickInfo.modifiers = e.getModifiersEx();
	14921	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14922	+ object.clickInfo.pane = this;
	14923	+ object.clickInfo.camera = renderCamera;
14301	14924	if (!isRenderer)
14302	14925	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14926	+ //ObjEditor editWindow = object.editWindow;
	14927	+ //Object3D copy = editWindow.copy;
	14928	+ if (object.doEditClick(//clickInfo,
	14929	+ 0))
14304	14930	{
14305	14931	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	14932	} else
..	..	@@ -14312,7 +14938,11 @@
14312	14938
14313	14939	public void mouseReleased(MouseEvent e)
14314	14940	{
	14941	+ Globals.MOUSEDRAGGED = false;
	14942	+
14315	14943	movingcamera = false;
	14944	+ X = 0; // getBounds().width/2;
	14945	+ Y = 0; // getBounds().height/2;
14316	14946	//System.out.println("mouseReleased: " + e);
14317	14947	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	14948	}
..	..	@@ -14335,9 +14965,9 @@
14335	14965	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	14966	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	14967
14338		- if (control \|\| command \|\| IsFrozen())
	14968	+// No delay if (control \|\| command \|\| IsFrozen())
14339	14969	timeout = true;
14340		- else
	14970	+// ?? May 2019 else
14341	14971	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	14972	mouseDown = false;
14343	14973	if (!control && !command) // june 2013
..	..	@@ -14447,7 +15077,7 @@
14447	15077	System.out.println("keyReleased: " + e);
14448	15078	}
14449	15079
14450		- void SetMouseMode(int modifiers)
	15080	+ void SetMouseMode(int modifiers, int modifiersex)
14451	15081	{
14452	15082	//System.out.println("SetMouseMode = " + modifiers);
14453	15083	//modifiers &= ~1024;
..	..	@@ -14459,25 +15089,25 @@
14459	15089	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	15090	// return;
14461	15091	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	15092	+ if ((modifiersex & WHEEL) == WHEEL)
14463	15093	{
14464	15094	mouseMode \|= ZOOM;
14465	15095	}
14466	15096
14467	15097	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	15098	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	15099	{
14470	15100	mouseMode \|= VR; // BACKFORTH;
14471	15101	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15102	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	15103	{
14474	15104	mouseMode \|= SELECT;
14475	15105	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	15106	+ if ((modifiersex & COMMAND) == COMMAND)
14477	15107	{
14478	15108	mouseMode \|= SELECT;
14479	15109	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15110	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	15111	{
14482	15112	mouseMode &= ~VR;
14483	15113	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +15136,7 @@
14506	15136
14507	15137	if (isRenderer) //
14508	15138	{
14509		- SetMouseMode(modifiers);
	15139	+ SetMouseMode(0, modifiers);
14510	15140	}
14511	15141
14512	15142	Globals.theRenderer.keyPressed(key);
..	..	@@ -14568,7 +15198,8 @@
14568	15198	// break;
14569	15199	case 'T':
14570	15200	CACHETEXTURE ^= true;
14571		- textures.clear();
	15201	+ texturepigment.clear();
	15202	+ texturebump.clear();
14572	15203	// repaint();
14573	15204	break;
14574	15205	case 'Y':
..	..	@@ -14653,7 +15284,9 @@
14653	15284	case 'E' : COMPACT ^= true;
14654	15285	repaint();
14655	15286	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15287	+ case 'W' : // Wide Window (fullscreen)
	15288	+ //DEBUGHSB ^= true;
	15289	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15290	repaint();
14658	15291	break;
14659	15292	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15311,8 @@
14678	15311	RevertCamera();
14679	15312	repaint();
14680	15313	break;
14681		- case 'L':
14682	15314	case 'l':
	15315	+ //case 'L':
14683	15316	if (lightMode)
14684	15317	{
14685	15318	lightMode = false;
..	..	@@ -14743,20 +15376,24 @@
14743	15376	OCCLUSION_CULLING ^= true;
14744	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14745	15378	break;
14746		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
14747	15380	case '1':
14748	15381	case '2':
14749	15382	case '3':
14750	15383	case '4':
14751	15384	case '5':
14752		- newenvy = Character.getNumericValue(key);
14753		- repaint();
14754		- break;
14755	15385	case '6':
14756	15386	case '7':
14757	15387	case '8':
14758	15388	case '9':
14759		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
14760	15397	repaint();
14761	15398	break;
14762	15399	case '!':
..	..	@@ -14822,9 +15459,9 @@
14822	15459	case '_':
14823	15460	kompactbit = 5;
14824	15461	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15462	+// case '+':
	15463	+// kompactbit = 6;
	15464	+// break;
14828	15465	case ' ':
14829	15466	lightMode ^= true;
14830	15467	Globals.lighttouched = true;
..	..	@@ -14836,13 +15473,14 @@
14836	15473	case ESC:
14837	15474	RENDERPROGRAM += 1;
14838	15475	RENDERPROGRAM %= 3;
	15476	+
14839	15477	repaint();
14840	15478	break;
14841	15479	case 'Z':
14842	15480	//RESIZETEXTURE ^= true;
14843	15481	//break;
14844	15482	case 'z':
14845		- RENDERSHADOW ^= true;
	15483	+ Globals.RENDERSHADOW ^= true;
14846	15484	Globals.lighttouched = true;
14847	15485	repaint();
14848	15486	break;
..	..	@@ -14875,8 +15513,9 @@
14875	15513	case DELETE:
14876	15514	ClearSelection();
14877	15515	break;
14878		- /*
14879	15516	case '+':
	15517	+
	15518	+ /*
14880	15519	//fontsize += 1;
14881	15520	bbzoom *= 2;
14882	15521	repaint();
..	..	@@ -14893,17 +15532,17 @@
14893	15532	case '=':
14894	15533	IncDepth();
14895	15534	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15535	+ object.GetWindow().refreshContents(true);
14897	15536	maskbit = 6;
14898	15537	break;
14899	15538	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15539	DecDepth();
14901	15540	maskbit = 5;
14902	15541	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15542	+// if (object.editWindow == null)
	15543	+// new Exception().printStackTrace();
	15544	+// else
	15545	+ object.GetWindow().refreshContents(true);
14907	15546	break;
14908	15547	case '{':
14909	15548	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15605,7 @@
14966	15605	//mode = ROTATE;
14967	15606	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15607	{
14969		- SetMouseMode(modifiers);
	15608	+ SetMouseMode(0, modifiers);
14970	15609	}
14971	15610	}
14972	15611
..	..	@@ -15100,8 +15739,9 @@
15100	15739
15101	15740	protected void processMouseMotionEvent(MouseEvent e)
15102	15741	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15742	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15743	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15744	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15745	{
15106	15746	mouseMoved(e);
15107	15747	} else
..	..	@@ -15126,11 +15766,12 @@
15126	15766	}
15127	15767	*/
15128	15768
15129		- object.editWindow.EditSelection();
	15769	+ object.GetWindow().EditSelection(false);
15130	15770	}
15131	15771
15132	15772	void SelectParent()
15133	15773	{
	15774	+ new Exception().printStackTrace();
15134	15775	System.exit(0);
15135	15776	Composite group = (Composite) object;
15136	15777	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15783,10 @@
15142	15783	{
15143	15784	//selectees.remove(i);
15144	15785	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15786	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15787	} else
15147	15788	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15789	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15790	}
15150	15791
15151	15792	first = false;
..	..	@@ -15154,6 +15795,7 @@
15154	15795
15155	15796	void SelectChildren()
15156	15797	{
	15798	+ new Exception().printStackTrace();
15157	15799	System.exit(0);
15158	15800	/*
15159	15801	Composite group = (Composite) object;
..	..	@@ -15186,12 +15828,12 @@
15186	15828	for (int j = 0; j < group.children.size(); j++)
15187	15829	{
15188	15830	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15831	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15832	first = false;
15191	15833	}
15192	15834	} else
15193	15835	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15836	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15837	}
15196	15838
15197	15839	first = false;
..	..	@@ -15202,21 +15844,21 @@
15202	15844	{
15203	15845	//Composite group = (Composite) object;
15204	15846	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15847	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15848	}
15207	15849
15208	15850	void ResetTransform(int mask)
15209	15851	{
15210	15852	//Composite group = (Composite) object;
15211	15853	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15854	+ group.GetWindow().ResetTransform(mask);
15213	15855	}
15214	15856
15215	15857	void FlipTransform()
15216	15858	{
15217	15859	//Composite group = (Composite) object;
15218	15860	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	15861	+ group.GetWindow().FlipTransform();
15220	15862	// group.editWindow.ReduceMesh(true);
15221	15863	}
15222	15864
..	..	@@ -15224,7 +15866,7 @@
15224	15866	{
15225	15867	//Composite group = (Composite) object;
15226	15868	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	15869	+ group.GetWindow().PrintMemory();
15228	15870	// group.editWindow.ReduceMesh(true);
15229	15871	}
15230	15872
..	..	@@ -15232,7 +15874,7 @@
15232	15874	{
15233	15875	//Composite group = (Composite) object;
15234	15876	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	15877	+ group.GetWindow().ResetCentroid();
15236	15878	}
15237	15879
15238	15880	void IncDepth()
..	..	@@ -15314,11 +15956,11 @@
15314	15956
15315	15957	int width = getBounds().width;
15316	15958	int height = getBounds().height;
15317		- ClickInfo info = new ClickInfo();
15318		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	15959	//Image img = CreateImage(width, height);
15320	15960	//System.out.println("width = " + width + "; height = " + height + "\n");
	15961	+
15321	15962	Graphics gr = g; // img.getGraphics();
	15963	+
15322	15964	if (!hasMarquee)
15323	15965	{
15324	15966	if (Xmin < Xmax) // !locked)
..	..	@@ -15390,40 +16032,88 @@
15390	16032	}
15391	16033	if (object != null && !hasMarquee)
15392	16034	{
	16035	+ if (object.clickInfo == null)
	16036	+ object.clickInfo = new ClickInfo();
	16037	+ ClickInfo info = object.clickInfo;
	16038	+ //ClickInfo info = new ClickInfo();
	16039	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16040	+
15393	16041	if (isRenderer)
15394	16042	{
15395		- info.flags++;
	16043	+ object.clickInfo.flags++;
15396	16044	double frameAspect = (double) width / (double) height;
15397	16045	if (frameAspect > renderCamera.aspect)
15398	16046	{
15399	16047	int desired = (int) ((double) height * renderCamera.aspect);
15400		- info.bounds.width -= width - desired;
15401		- info.bounds.x += (width - desired) / 2;
	16048	+ object.clickInfo.bounds.width -= width - desired;
	16049	+ object.clickInfo.bounds.x += (width - desired) / 2;
15402	16050	} else
15403	16051	{
15404	16052	int desired = (int) ((double) width / renderCamera.aspect);
15405		- info.bounds.height -= height - desired;
15406		- info.bounds.y += (height - desired) / 2;
	16053	+ object.clickInfo.bounds.height -= height - desired;
	16054	+ object.clickInfo.bounds.y += (height - desired) / 2;
15407	16055	}
15408	16056	}
15409		- info.g = gr;
15410		- info.camera = renderCamera;
	16057	+
	16058	+ object.clickInfo.g = gr;
	16059	+ object.clickInfo.camera = renderCamera;
15411	16060	/*
15412	16061	// Memory intensive (brep.verticescopy)
15413	16062	if (!(object instanceof Composite))
15414	16063	object.draw(info, 0, false); // SLOW :
15415	16064	*/
15416		- if (!isRenderer)
	16065	+ if (!isRenderer) // && drag)
15417	16066	{
15418		- object.drawEditHandles(info, 0);
	16067	+ Grafreed.Assert(object != null);
	16068	+ Grafreed.Assert(object.selection != null);
	16069	+ if (object.selection.Size() > 0)
	16070	+ {
	16071	+ int hitSomething = object.selection.get(0).hitSomething;
	16072	+
	16073	+ object.clickInfo.DX = 0;
	16074	+ object.clickInfo.DY = 0;
	16075	+ object.clickInfo.W = 1;
	16076	+ if (hitSomething == Object3D.hitCenter)
	16077	+ {
	16078	+ info.DX = X;
	16079	+ if (X != 0)
	16080	+ info.DX -= info.bounds.width/2;
	16081	+
	16082	+ info.DY = Y;
	16083	+ if (Y != 0)
	16084	+ info.DY -= info.bounds.height/2;
	16085	+ }
	16086	+
	16087	+ object.drawEditHandles(//info,
	16088	+ 0);
	16089	+
	16090	+ if (drag && (X != 0 \|\| Y != 0))
	16091	+ {
	16092	+ switch (hitSomething)
	16093	+ {
	16094	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16095	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16096	+ break;
	16097	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16098	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16099	+ break;
	16100	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16101	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16102	+ break;
	16103	+ }
	16104	+
	16105	+ }
	16106	+ }
15419	16107	}
15420	16108	}
	16109	+
15421	16110	if (isRenderer)
15422	16111	{
15423	16112	//gr.setColor(Color.black);
15424	16113	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	16114	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	16115	}
	16116	+
15427	16117	if (hasMarquee)
15428	16118	{
15429	16119	gr.setXORMode(Color.white);
..	..	@@ -15536,6 +16226,7 @@
15536	16226	public boolean mouseDown(Event evt, int x, int y)
15537	16227	{
15538	16228	System.out.println("mouseDown: " + evt);
	16229	+ System.exit(0);
15539	16230	/*
15540	16231	locked = true;
15541	16232	drag = false;
..	..	@@ -15579,7 +16270,7 @@
15579	16270	{
15580	16271	keyPressed(0, modifiers);
15581	16272	}
15582		- clickStart(x, y, modifiers);
	16273	+ // clickStart(x, y, modifiers);
15583	16274	return true;
15584	16275	}
15585	16276
..	..	@@ -15697,7 +16388,7 @@
15697	16388	{
15698	16389	keyReleased(0, 0);
15699	16390	}
15700		- drag(x, y, modifiers);
	16391	+ drag(x, y, 0, modifiers);
15701	16392	return true;
15702	16393	}
15703	16394
..	..	@@ -15829,7 +16520,7 @@
15829	16520	Object3D object;
15830	16521	static Object3D trackedobject;
15831	16522	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16523	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16524	/static/ Camera eyeCamera;
15834	16525	/static/ Camera lightCamera;
15835	16526	int cameracount;
..	..	@@ -15893,6 +16584,8 @@
15893	16584	private /static/ boolean firstime;
15894	16585	private /static/ cVector newView = new cVector();
15895	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15896	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15897	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15898	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15905,29 +16598,66 @@
15905	16598	{
15906	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15907	16600
	16601	+ int usedsuf = 0;
	16602	+
15908	16603	for (int i = 0; i < suffixes.length; i++)
15909	16604	{
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)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
15915	16610	{
15916		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
15917	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
15918	16644	//System.out.println("Target = " + targets[i]);
15919	16645	cubemap.updateImage(data, targets[i]);
15920	16646	}
15921	16647
15922	16648	return cubemap;
15923	16649	}
	16650	+
15924	16651	int bigsphere = -1;
15925	16652
15926	16653	float BGcolor = 0.5f;
15927	16654
15928		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
15929	16658	{
15930		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
15931	16661	{
15932	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15933	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15942,7 +16672,17 @@
15942	16672	// Compensates for ExaminerViewer's modification of modelview matrix
15943	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
15944	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
15945	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
15946	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
15947	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15948	16688
..	..	@@ -15974,6 +16714,7 @@
15974	16714	{
15975	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
15976	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15977	16718	gl.glMultMatrixd(viewrot_1, 0);
15978	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15979	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -16114,16 +16855,16 @@
16114	16855	cStatic.objectstack[materialdepth++] = checker;
16115	16856	//System.out.println("material " + material);
16116	16857	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16858	+ //vector2buffer = checker.projectedVertices;
16118	16859
16119	16860	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16861	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16862
16122	16863	materialdepth -= 1;
16123	16864	if (materialdepth > 0)
16124	16865	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16866	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16867	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	16868	}
16128	16869	//checker.GetMaterial().opacity = 1f;
16129	16870	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +16950,14 @@
16209	16950	}
16210	16951	}
16211	16952
	16953	+ private Object3D GetFolder()
	16954	+ {
	16955	+ Object3D folder = object.GetWindow().copy;
	16956	+ if (object.GetWindow().copy.selection.Size() > 0)
	16957	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16958	+ return folder;
	16959	+ }
	16960	+
16212	16961	class SelectBuffer implements GLEventListener
16213	16962	{
16214	16963
..	..	@@ -16224,7 +16973,7 @@
16224	16973	//new Exception().printStackTrace();
16225	16974	System.out.println("select buffer init");
16226	16975	// Use debug pipeline
16227		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16228	16977
16229	16978	GL gl = drawable.getGL();
16230	16979
..	..	@@ -16267,6 +17016,7 @@
16267	17016	{
16268	17017	if (!selection)
16269	17018	{
	17019	+ new Exception().printStackTrace();
16270	17020	System.exit(0);
16271	17021	return;
16272	17022	}
..	..	@@ -16287,6 +17037,17 @@
16287	17037
16288	17038	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	17039
	17040	+ if (PAINTMODE)
	17041	+ {
	17042	+ if (object.GetWindow().copy.selection.Size() > 0)
	17043	+ {
	17044	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17045	+
	17046	+ // Make what you paint not selectable.
	17047	+ paintobj.ResetSelectable();
	17048	+ }
	17049	+ }
	17050	+
16290	17051	//int tmp = selection_view;
16291	17052	//selection_view = -1;
16292	17053	int temp = DrawMode();
..	..	@@ -16298,6 +17059,17 @@
16298	17059	// temp = DEFAULT; // patch for selection debug
16299	17060	Globals.drawMode = temp; // WARNING
16300	17061
	17062	+ if (PAINTMODE)
	17063	+ {
	17064	+ if (object.GetWindow().copy.selection.Size() > 0)
	17065	+ {
	17066	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17067	+
	17068	+ // Revert.
	17069	+ paintobj.RestoreSelectable();
	17070	+ }
	17071	+ }
	17072	+
16301	17073	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	17074
16303	17075	// trying different ways of getting the depth info over
..	..	@@ -16345,6 +17117,8 @@
16345	17117	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	17118	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	17119	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17120	+
	17121	+ CreateSelectedPoint();
16348	17122
16349	17123	// Will fit the mesh !!!
16350	17124	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +17168,36 @@
16394	17168	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16395	17169	}
16396	17170
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17171	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	17172	}
16399	17173	}
16400	17174
16401	17175	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	17176	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	17177
16404		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17178	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16405	17179	{
16406		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17180	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16407	17181
16408		- Object3D group = new Object3D("inst" + paintcount++);
	17182	+ if (object.GetWindow().copy.selection.Size() > 0)
	17183	+ {
	17184	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	17185
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();
	17186	+ Object3D inst = new Object3D("inst" + paintcount++);
	17187	+
	17188	+ inst.CreateMaterial(); // use a void leaf to select instances
	17189	+
	17190	+ inst.add(paintobj); // link
	17191	+
	17192	+ object.GetWindow().SnapObject(inst);
	17193	+
	17194	+ Object3D folder = paintFolder; // GetFolder();
	17195	+
	17196	+ folder.add(inst);
	17197	+
	17198	+ object.GetWindow().ResetModel();
	17199	+ object.GetWindow().refreshContents();
	17200	+ }
16425	17201	}
16426	17202	else
16427	17203	paintcount = 0;
..	..	@@ -16460,6 +17236,11 @@
16460	17236	//System.out.println("objects[color] = " + objects[color]);
16461	17237	//objects[color].Select();
16462	17238	indexcount = 0;
	17239	+ ObjEditor window = object.GetWindow();
	17240	+ if (window != null && deselect)
	17241	+ {
	17242	+ window.Select(null, deselect, true);
	17243	+ }
16463	17244	object.Select(color, deselect);
16464	17245	}
16465	17246
..	..	@@ -16559,7 +17340,7 @@
16559	17340	gl.glDisable(gl.GL_CULL_FACE);
16560	17341	}
16561	17342
16562		- if (!RENDERSHADOW)
	17343	+ if (!Globals.RENDERSHADOW)
16563	17344	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17345
16565	17346	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17350,7 @@
16569	17350	//gl.glColorMask(false, false, false, false);
16570	17351
16571	17352	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17353	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17354	{
16574	17355	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17356
..	..	@@ -16985,23 +17766,15 @@
16985	17766	int AAbuffersize = 0;
16986	17767
16987	17768	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17769	+ static Superellipsoid selectedpoint;
16989	17770	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();
	17771	+ static Sphere debugpointG;
	17772	+ static Sphere debugpointP;
	17773	+ static Sphere debugpointC;
	17774	+ static Sphere debugpointR;
16994	17775
16995	17776	static Sphere debugpoints[] = new Sphere[8];
16996	17777
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17778	static void InitPoints(float radius)
17006	17779	{
17007	17780	for (int i=0; i<8; i++)