~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -61,7 +60,7 @@
61	60	//boolean REDUCETEXTURE = true;
62	61	boolean CACHETEXTURE = true;
63	62	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
65	64	boolean COMPRESSTEXTURE = false;
66	65	boolean KOMPACTTEXTURE = false; // true;
67	66	boolean RESIZETEXTURE = false;
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -325,7 +326,7 @@
325	326	cStatic.objectstack[materialdepth++] = obj;
326	327	//System.out.println("material " + material);
327	328	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
329	330	if (obj instanceof Camera)
330	331	{
331	332	display.options1[0] = material.shift;
..	..	@@ -334,14 +335,28 @@
334	335	display.options1[2] = material.shadowbias;
335	336	display.options1[3] = material.aniso;
336	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
337	343	display.options2[0] = material.opacity;
338	344	display.options2[1] = material.diffuse;
339	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
340	349
341	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
342	354	display.options4[0] = material.cameralight/0.2f;
343	355	display.options4[1] = material.subsurface;
344	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
345	360
346	361	// if (display.CURRENTANTIALIAS > 0)
347	362	// display.options3[3] /= 4;
..	..	@@ -357,7 +372,7 @@
357	372	/**/
358	373	} else
359	374	{
360		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
361	376	}
362	377	} else
363	378	{
..	..	@@ -381,8 +396,8 @@
381	396	cStatic.objectstack[materialdepth++] = obj;
382	397	//System.out.println("material " + material);
383	398	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	401	}
387	402	}
388	403
..	..	@@ -399,8 +414,8 @@
399	414	materialdepth -= 1;
400	415	if (materialdepth > 0)
401	416	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	419	}
405	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +435,8 @@
420	435	materialdepth -= 1;
421	436	if (materialdepth > 0)
422	437	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	440	}
426	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	442	//else
..	..	@@ -462,10 +477,12 @@
462	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	478	{
464	479	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
466	483	if (!hasnorm)
467	484	{
468		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
469	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1207,12 @@
1190	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1208	}
1192	1209	}
	1210	+
1193	1211	if (flipV)
1194	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1213	else
1196	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1197	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1218
..	..	@@ -1213,10 +1232,12 @@
1213	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1233	}
1215	1234	}
	1235	+
1216	1236	if (flipV)
1217	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1238	else
1219	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1220	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1243
..	..	@@ -1244,8 +1265,10 @@
1244	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1266	else
1246	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1247	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1249	1272	count2 += 2;
1250	1273	count3 += 3;
1251	1274	}
..	..	@@ -1601,7 +1624,7 @@
1601	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1625	}
1603	1626
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1628	{
1606	1629	CameraPane display = this;
1607	1630	//new Exception().printStackTrace();
..	..	@@ -1636,7 +1659,7 @@
1636	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1640	1663
1641	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1767,9 @@
1744	1767	display.modelParams7[2] = 0;
1745	1768	display.modelParams7[3] = 0;
1746	1769
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1771
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1774	{
1752	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1911,7 @@
1888	1911	void PushMatrix(double[][] matrix)
1889	1912	{
1890	1913	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1892	1915	}
1893	1916
1894	1917	void PushMatrix()
..	..	@@ -2042,7 +2065,7 @@
2042	2065	//System.err.println("Oeil on");
2043	2066	OEIL = true;
2044	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2069	//pingthread.StepToTarget(true);
2047	2070	}
2048	2071
..	..	@@ -2257,7 +2280,7 @@
2257	2280
2258	2281	void ToggleDebug()
2259	2282	{
2260		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2261	2284	}
2262	2285
2263	2286	void ToggleLookAt()
..	..	@@ -2265,7 +2288,7 @@
2265	2288	LOOKAT ^= true;
2266	2289	}
2267	2290
2268		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2269	2292	{
2270	2293	SWITCH ^= true;
2271	2294	}
..	..	@@ -2275,10 +2298,17 @@
2275	2298	HANDLES ^= true;
2276	2299	}
2277	2300
	2301	+ Object3D paintFolder;
	2302	+
2278	2303	void TogglePaint()
2279	2304	{
2280	2305	PAINTMODE ^= true;
2281	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2282	2312	}
2283	2313
2284	2314	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2404,7 @@
2374	2404	{
2375	2405	return currentGL;
2376	2406	}
2377		-
	2407	+
2378	2408	/**/
2379	2409	class CacheTexture
2380	2410	{
..	..	@@ -2392,9 +2422,10 @@
2392	2422	/**/
2393	2423
2394	2424	// TEXTURE static Texture texture;
2395		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2396		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2397		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2425	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2426	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2427	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2428	+
2398	2429	int pigmentdepth = 0;
2399	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2400	2431	int bumpdepth = 0;
..	..	@@ -2416,6 +2447,33 @@
2416	2447	true,
2417	2448	com.sun.opengl.util.texture.TextureIO.PNG);
2418	2449	} catch (java.io.IOException e)
	2450	+ {
	2451	+ throw new javax.media.opengl.GLException(e);
	2452	+ }
	2453	+
	2454	+ if (bump)
	2455	+ texturedata = ConvertBump(texturedata, false);
	2456	+
	2457	+ com.sun.opengl.util.texture.Texture texture =
	2458	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2459	+
	2460	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2461	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2462	+
	2463	+ return texture;
	2464	+ }
	2465	+
	2466	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2467	+ {
	2468	+ TextureData texturedata = null;
	2469	+
	2470	+ try
	2471	+ {
	2472	+ texturedata =
	2473	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2474	+ name,
	2475	+ true);
	2476	+ } catch (Exception e)
2419	2477	{
2420	2478	throw new javax.media.opengl.GLException(e);
2421	2479	}
..	..	@@ -3502,6 +3560,8 @@
3502	3560
3503	3561	System.out.println("LOADING TEXTURE : " + name);
3504	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
3505	3565	//
3506	3566	if (false) // compressbit > 0)
3507	3567	{
..	..	@@ -7900,7 +7960,7 @@
7900	7960	String pigment = Object3D.GetPigment(tex);
7901	7961	String bump = Object3D.GetBump(tex);
7902	7962
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	7964	{
7905	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7917,6 +7977,64 @@
7917	7977
7918	7978	ReleaseTexture(bump, true);
7919	7979	ReleaseTexture(pigment, false);
	7980	+ }
	7981	+
	7982	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7983	+ {
	7984	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7985	+ {
	7986	+ return;
	7987	+ }
	7988	+
	7989	+ if (tex == null)
	7990	+ {
	7991	+ ReleaseTexture(null, false);
	7992	+ return;
	7993	+ }
	7994	+
	7995	+ String pigment = Object3D.GetPigment(tex);
	7996	+
	7997	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7998	+ {
	7999	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8000	+ // System.out.println("; bump = " + bump);
	8001	+ }
	8002	+
	8003	+ if (pigment.equals(""))
	8004	+ {
	8005	+ pigment = null;
	8006	+ }
	8007	+
	8008	+ ReleaseTexture(pigment, false);
	8009	+ }
	8010	+
	8011	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8012	+ {
	8013	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8014	+ {
	8015	+ return;
	8016	+ }
	8017	+
	8018	+ if (tex == null)
	8019	+ {
	8020	+ ReleaseTexture(null, true);
	8021	+ return;
	8022	+ }
	8023	+
	8024	+ String bump = Object3D.GetBump(tex);
	8025	+
	8026	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ {
	8028	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8029	+ // System.out.println("; bump = " + bump);
	8030	+ }
	8031	+
	8032	+ if (bump.equals(""))
	8033	+ {
	8034	+ bump = null;
	8035	+ }
	8036	+
	8037	+ ReleaseTexture(bump, true);
7920	8038	}
7921	8039
7922	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8024,6 +8142,54 @@
8024	8142
8025	8143	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8144	{
	8145	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8146	+// ambientOcclusion ) // \|\| !textureon)
	8147	+// {
	8148	+// return; // false;
	8149	+// }
	8150	+//
	8151	+// if (tex == null)
	8152	+// {
	8153	+// BindTexture(null,false,resolution);
	8154	+// BindTexture(null,true,resolution);
	8155	+// return;
	8156	+// }
	8157	+//
	8158	+// String pigment = Object3D.GetPigment(tex);
	8159	+// String bump = Object3D.GetBump(tex);
	8160	+//
	8161	+// usedtextures.add(pigment);
	8162	+// usedtextures.add(bump);
	8163	+//
	8164	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8165	+// {
	8166	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8167	+// // System.out.println("; bump = " + bump);
	8168	+// }
	8169	+//
	8170	+// if (bump.equals(""))
	8171	+// {
	8172	+// bump = null;
	8173	+// }
	8174	+// if (pigment.equals(""))
	8175	+// {
	8176	+// pigment = null;
	8177	+// }
	8178	+//
	8179	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8180	+// BindTexture(pigment, false, resolution);
	8181	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8182	+// BindTexture(bump, true, resolution);
	8183	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8184	+//
	8185	+// return; // true;
	8186	+
	8187	+ BindPigmentTexture(tex, resolution);
	8188	+ BindBumpTexture(tex, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
8027	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8194	ambientOcclusion ) // \|\| !textureon)
8029	8195	{
..	..	@@ -8032,18 +8198,48 @@
8032	8198
8033	8199	if (tex == null)
8034	8200	{
8035		- BindTexture(null,false,resolution);
8036		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
8037	8202	return;
8038	8203	}
8039	8204
8040	8205	String pigment = Object3D.GetPigment(tex);
	8206	+
	8207	+ usedtextures.add(pigment);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (pigment.equals(""))
	8216	+ {
	8217	+ pigment = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8221	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8222	+ }
	8223	+
	8224	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8225	+ {
	8226	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8227	+ ambientOcclusion ) // \|\| !textureon)
	8228	+ {
	8229	+ return; // false;
	8230	+ }
	8231	+
	8232	+ if (tex == null)
	8233	+ {
	8234	+ BindTexture(null, null,true,resolution);
	8235	+ return;
	8236	+ }
	8237	+
8041	8238	String bump = Object3D.GetBump(tex);
8042	8239
8043		- usedtextures.put(pigment, pigment);
8044		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
8045	8241
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8243	{
8048	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8245	// System.out.println("; bump = " + bump);
..	..	@@ -8053,46 +8249,70 @@
8053	8249	{
8054	8250	bump = null;
8055	8251	}
8056		- if (pigment.equals(""))
8057		- {
8058		- pigment = null;
8059		- }
8060	8252
8061		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8062		- BindTexture(pigment, false, resolution);
8063	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8064		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
8065	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8066		-
8067		- return; // true;
8068	8256	}
8069	8257
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8258	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8259	+
	8260	+ private boolean FileExists(String tex)
8071	8261	{
8072		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8262	+ if (missingTextures.contains(tex))
	8263	+ {
	8264	+ return false;
	8265	+ }
	8266	+
	8267	+ boolean fileExists = new File(tex).exists();
	8268	+
	8269	+ if (!fileExists)
	8270	+ {
	8271	+ // If file exists, the "new File()" is not executed sgain
	8272	+ missingTextures.add(tex);
	8273	+ }
	8274	+
	8275	+ return fileExists;
	8276	+ }
	8277	+
	8278	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8279	+ {
	8280	+ CacheTexture texturecache = null;
8073	8281
8074	8282	if (tex != null)
8075	8283	{
8076	8284	String texname = tex;
8077	8285
	8286	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8287	+
8078	8288	// String[] split = tex.split("Textures");
8079	8289	// if (split.length > 1)
8080	8290	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8291	// else
8082	8292	// if (!texname.startsWith("/"))
8083	8293	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8294	+ if (!FileExists(tex))
8085	8295	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8296	+ texname = fallbackTextureName;
8087	8297	}
8088	8298
8089	8299	if (CACHETEXTURE)
8090		- texture = textures.get(texname); // TEXTURE CACHE
8091		-
8092		- TextureData texturedata = null;
8093		-
8094		- if (texture == null \|\| texture.resolution < resolution)
8095	8300	{
	8301	+ if (bim == null)
	8302	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8303	+ else
	8304	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8305	+ }
	8306	+
	8307	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8308	+ {
	8309	+ TextureData texturedata = null;
	8310	+
	8311	+ if (bim == null)
	8312	+ {
	8313	+
	8314	+ }
	8315	+ else
8096	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8097	8317	{
8098	8318	assert(!bump);
..	..	@@ -8104,19 +8324,19 @@
8104	8324	// }
8105	8325	// else
8106	8326	// {
8107		- texture = textures.get(tex);
8108		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
8109	8329	{
8110		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8111	8331	}
8112	8332	// }
8113	8333	} else
8114	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8115	8335	{
8116	8336	assert(bump);
8117		- texture = textures.get(tex);
8118		- if (texture == null)
8119		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8337	+ texturecache = textures.get(tex);
	8338	+ if (texturecache == null)
	8339	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8120	8340	} else
8121	8341	{
8122	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -8126,9 +8346,9 @@
8126	8346	//{
8127	8347	if (tex.equals("WHITE_NOISE"))
8128	8348	{
8129		- texture = textures.get(tex);
8130		- if (texture == null)
8131		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8349	+ texturecache = textures.get(tex);
	8350	+ if (texturecache == null)
	8351	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8132	8352	} else
8133	8353	{
8134	8354	if (textureon)
..	..	@@ -8153,7 +8373,7 @@
8153	8373	}
8154	8374
8155	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
8157	8377	cachename = texname;
8158	8378	else
8159	8379	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8395,7 @@
8175	8395	}
8176	8396
8177	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
8179	8399	cachename = texname;
8180	8400	else
8181	8401	processbump = false; // don't process bump map again
..	..	@@ -8187,19 +8407,19 @@
8187	8407	if (texturedata == null)
8188	8408	throw new Exception();
8189	8409
8190		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8410	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8191	8411	//texture = GetTexture(tex, bump);
8192	8412	}
8193	8413	}
8194	8414	//}
8195	8415	}
8196	8416
8197		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8198	8418	{
8199	8419	//return false;
8200	8420
8201	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8202		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8203	8423	{
8204	8424	// String ext = "_highres";
8205	8425	// if (REDUCETEXTURE)
..	..	@@ -8288,8 +8508,8 @@
8288	8508	textures.remove(texname);
8289	8509	}
8290	8510
8291		- texture.texturedata = texturedata;
8292		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
8293	8513
8294	8514	// newtex = true;
8295	8515	}
..	..	@@ -8305,12 +8525,12 @@
8305	8525	}
8306	8526	}
8307	8527
8308		- return texture;
	8528	+ return texturecache;
8309	8529	}
8310	8530
8311		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8531	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8312	8532	{
8313		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8314	8534
8315	8535	if (bump)
8316	8536	{
..	..	@@ -8326,23 +8546,23 @@
8326	8546	return texture!=null?texture.texture:null;
8327	8547	}
8328	8548
8329		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8549	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8330	8550	{
8331		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8332	8552
8333	8553	return texture!=null?texture.texturedata:null;
8334	8554	}
8335	8555
8336		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8337	8557	{
8338	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8339	8559	{
8340	8560	return false;
8341	8561	}
8342	8562
8343		- boolean newtex = false;
	8563	+ //boolean newtex = false;
8344	8564
8345		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8346	8566
8347	8567	if (texture == null)
8348	8568	return false;
..	..	@@ -8372,7 +8592,7 @@
8372	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8373	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8374	8594
8375		- return newtex;
	8595	+ return true; // Warning: not used.
8376	8596	}
8377	8597
8378	8598	ShadowBuffer shadowPBuf;
..	..	@@ -9210,11 +9430,35 @@
9210	9430	jy8[3] = 0.5f;
9211	9431	}
9212	9432
9213		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9433	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9214	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	9437
	9438	+ void ResetOptions()
	9439	+ {
	9440	+ options1[0] = 100;
	9441	+ options1[1] = 0.025f;
	9442	+ options1[2] = 0.01f;
	9443	+ options1[3] = 0;
	9444	+ options1[4] = 0;
	9445	+
	9446	+ options2[0] = 0;
	9447	+ options2[1] = 0.75f;
	9448	+ options2[2] = 0;
	9449	+ options2[3] = 0;
	9450	+
	9451	+ options3[0] = 1;
	9452	+ options3[1] = 1;
	9453	+ options3[2] = 1;
	9454	+ options3[3] = 0;
	9455	+
	9456	+ options4[0] = 1;
	9457	+ options4[1] = 0;
	9458	+ options4[2] = 1;
	9459	+ options4[3] = 0;
	9460	+ }
	9461	+
9218	9462	static int imagecount = 0; // movie generation
9219	9463
9220	9464	static int jitter = 0;
..	..	@@ -9310,8 +9554,8 @@
9310	9554	assert (parentcam != renderCamera);
9311	9555
9312	9556	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9315	9559
9316	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9561
..	..	@@ -9326,8 +9570,8 @@
9326	9570	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9571
9328	9572	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9331	9575
9332	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9577
..	..	@@ -10325,6 +10569,7 @@
10325	10569	ANTIALIAS = 0;
10326	10570	//System.out.println("RESTART");
10327	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
10328	10573	}
10329	10574	}
10330	10575	}
..	..	@@ -10392,13 +10637,14 @@
10392	10637	ambientOcclusion = false;
10393	10638	}
10394	10639
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10642	{
10397	10643	//if (RENDERSHADOW) // ?
10398	10644	if (!IsFrozen())
10399	10645	{
10400	10646	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10648	{
10403	10649	Globals.framecount++;
10404	10650	shadowbuffer.display();
..	..	@@ -10525,8 +10771,8 @@
10525	10771
10526	10772	// if (parentcam != renderCamera) // not a light
10527	10773	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10530	10776
10531	10777	for (int j = 0; j < 4; j++)
10532	10778	{
..	..	@@ -10540,8 +10786,8 @@
10540	10786
10541	10787	// if (parentcam != renderCamera) // not a light
10542	10788	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10545	10791
10546	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	10793
..	..	@@ -10803,7 +11049,7 @@
10803	11049
10804	11050	try
10805	11051	{
10806		- BindTexture(NOISE_TEXTURE, false, 2);
	11052	+ BindTexture(null, NOISE_TEXTURE, false, 2);
10807	11053	}
10808	11054	catch (Exception e)
10809	11055	{
..	..	@@ -10832,9 +11078,9 @@
10832	11078
10833	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
10834	11080
10835		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10836		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10837		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11081	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11082	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11083	+gl.glEnable(gl.GL_MULTISAMPLE);
10838	11084	} else
10839	11085	{
10840	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10845,7 +11091,7 @@
10845	11091	//System.out.println("BLENDING ON");
10846	11092	gl.glEnable(GL.GL_BLEND);
10847	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10848		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10849	11095	gl.glMatrixMode(gl.GL_PROJECTION);
10850	11096	gl.glLoadIdentity();
10851	11097
..	..	@@ -10934,8 +11180,8 @@
10934	11180	System.err.println("parentcam != renderCamera");
10935	11181
10936	11182	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11183	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11184	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10939	11185	}
10940	11186
10941	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11202,8 @@
10956	11202	if (true) // TODO
10957	11203	{
10958	11204	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11205	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11206	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10961	11207	}
10962	11208
10963	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11302,15 +11548,36 @@
11302	11548
11303	11549	static boolean zoomonce = false;
11304	11550
	11551	+ static void CreateSelectedPoint()
	11552	+ {
	11553	+ if (selectedpoint == null)
	11554	+ {
	11555	+ debugpointG = new Sphere();
	11556	+ debugpointP = new Sphere();
	11557	+ debugpointC = new Sphere();
	11558	+ debugpointR = new Sphere();
	11559	+
	11560	+ selectedpoint = new Superellipsoid();
	11561	+
	11562	+ for (int i=0; i<8; i++)
	11563	+ {
	11564	+ debugpoints[i] = new Sphere();
	11565	+ }
	11566	+ }
	11567	+ }
	11568	+
11305	11569	void DrawObject(GL gl, boolean draw)
11306	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
11307	11574	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11575	// DrawMode() = SELECTION;
11309	11576	//GL gl = getGL();
11310	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11578	{
11312	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314	11581	pingthread.StepToTarget(true); // true);
11315	11582	// zoomonce = false;
11316	11583	}
..	..	@@ -11382,8 +11649,9 @@
11382	11649
11383	11650	if (DrawMode() == DEFAULT)
11384	11651	{
11385		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
11386	11653	{
	11654	+ CreateSelectedPoint();
11387	11655	float radius = 0.05f;
11388	11656	if (selectedpoint.radius != radius)
11389	11657	{
..	..	@@ -11446,7 +11714,7 @@
11446	11714	if (tex.equals("WHITE_NOISE"))
11447	11715	continue;
11448	11716
11449		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
11450	11718	{
11451	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11452	11720	textures.get(tex).texture.dispose();
..	..	@@ -11552,7 +11820,7 @@
11552	11820	return;
11553	11821	}
11554	11822
11555		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
11556	11824
11557	11825	GL gl = GetGL();
11558	11826
..	..	@@ -11869,8 +12137,8 @@
11869	12137	//obj.TransformToWorld(light, light);
11870	12138	for (int i = tp.size(); --i >= 0;)
11871	12139	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- LA.xformPos(light, tp.get(i).toParent, light);
	12140	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12141	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11874	12142	}
11875	12143
11876	12144
..	..	@@ -11887,8 +12155,8 @@
11887	12155	parentcam = cameras[0];
11888	12156	}
11889	12157
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12158	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12159	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11892	12160
11893	12161	LA.xformPos(light, renderCamera.toScreen, light);
11894	12162
..	..	@@ -13140,7 +13408,8 @@
13140	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13141	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13142	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13143		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
13144	13413
13145	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13146	13415	// OUT : diff, spec
..	..	@@ -13156,9 +13425,10 @@
13156	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
13157	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13158	13427	//"MOV " + dest + ".w," + "normal.z;" +
13159		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13160		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13161		- //"MOV " + dest + ".z," + "params2.w;" +
	13428	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13429	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13430	+
	13431	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13162	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13163	13433	"RCP " + dest + ".w," + dest + ".w;" +
13164	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13663,6 +13933,7 @@
13663	13933	else
13664	13934	if (evt.getSource() == AAtimer)
13665	13935	{
	13936	+ Globals.TIMERRUNNING = false;
13666	13937	if (mouseDown)
13667	13938	{
13668	13939	//new Exception().printStackTrace();
..	..	@@ -13722,7 +13993,7 @@
13722	13993
13723	13994	// fev 2014???
13724	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13725		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13726	13997	pingthread.StepToTarget(true); // true);
13727	13998	}
13728	13999	// if (!LIVE)
..	..	@@ -13737,6 +14008,7 @@
13737	14008	return;
13738	14009
13739	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
13740	14012
13741	14013	// waslive = LIVE;
13742	14014	// LIVE = false;
..	..	@@ -13809,9 +14081,12 @@
13809	14081
13810	14082	public void mouseDragged(MouseEvent e)
13811	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
13812	14086	//System.out.println("mouseDragged: " + e);
13813	14087	if (isRenderer)
13814	14088	movingcamera = true;
	14089	+
13815	14090	//if (drawing)
13816	14091	//return;
13817	14092	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14072,12 +14347,12 @@
14072	14347	void GoDown(int mod)
14073	14348	{
14074	14349	MODIFIERS \|= COMMAND;
14075		- /*
	14350	+ /**/
14076	14351	if((mod&SHIFT) == SHIFT)
14077	14352	manipCamera.RotatePosition(0, -speed);
14078	14353	else
14079		- manipCamera.BackForth(0, -speed*delta, getWidth());
14080		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
14081	14356	if ((mod & SHIFT) == SHIFT)
14082	14357	{
14083	14358	mouseMode = mouseMode; // VR??
..	..	@@ -14093,12 +14368,12 @@
14093	14368	void GoUp(int mod)
14094	14369	{
14095	14370	MODIFIERS \|= COMMAND;
14096		- /*
	14371	+ /**/
14097	14372	if((mod&SHIFT) == SHIFT)
14098	14373	manipCamera.RotatePosition(0, speed);
14099	14374	else
14100		- manipCamera.BackForth(0, speed*delta, getWidth());
14101		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
14102	14377	if ((mod & SHIFT) == SHIFT)
14103	14378	{
14104	14379	mouseMode = mouseMode;
..	..	@@ -14114,12 +14389,12 @@
14114	14389	void GoLeft(int mod)
14115	14390	{
14116	14391	MODIFIERS \|= COMMAND;
14117		- /*
	14392	+ /**/
14118	14393	if((mod&SHIFT) == SHIFT)
14119		- manipCamera.RotatePosition(speed, 0);
14120		- else
14121	14394	manipCamera.Translate(speed*delta, 0, getWidth());
14122		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
14123	14398	if ((mod & SHIFT) == SHIFT)
14124	14399	{
14125	14400	mouseMode = mouseMode;
..	..	@@ -14135,12 +14410,12 @@
14135	14410	void GoRight(int mod)
14136	14411	{
14137	14412	MODIFIERS \|= COMMAND;
14138		- /*
	14413	+ /**/
14139	14414	if((mod&SHIFT) == SHIFT)
14140		- manipCamera.RotatePosition(-speed, 0);
14141		- else
14142	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
14143		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
14144	14419	if ((mod & SHIFT) == SHIFT)
14145	14420	{
14146	14421	mouseMode = mouseMode;
..	..	@@ -14197,7 +14472,8 @@
14197	14472	info.camera = renderCamera;
14198	14473	info.x = x;
14199	14474	info.y = y;
14200		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14201	14477	} else
14202	14478	{
14203	14479	if (x < startX)
..	..	@@ -14361,7 +14637,9 @@
14361	14637	ci.camera = renderCamera;
14362	14638	if (!isRenderer)
14363	14639	{
14364		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
14365	14643	{
14366	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14367	14645	} else
..	..	@@ -14373,7 +14651,11 @@
14373	14651
14374	14652	public void mouseReleased(MouseEvent e)
14375	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
14376	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
14377	14659	//System.out.println("mouseReleased: " + e);
14378	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14379	14661	}
..	..	@@ -14714,7 +14996,9 @@
14714	14996	case 'E' : COMPACT ^= true;
14715	14997	repaint();
14716	14998	break;
14717		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
14718	15002	repaint();
14719	15003	break;
14720	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14739,8 +15023,8 @@
14739	15023	RevertCamera();
14740	15024	repaint();
14741	15025	break;
14742		- case 'L':
14743	15026	case 'l':
	15027	+ //case 'L':
14744	15028	if (lightMode)
14745	15029	{
14746	15030	lightMode = false;
..	..	@@ -14883,9 +15167,9 @@
14883	15167	case '_':
14884	15168	kompactbit = 5;
14885	15169	break;
14886		- case '+':
14887		- kompactbit = 6;
14888		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
14889	15173	case ' ':
14890	15174	lightMode ^= true;
14891	15175	Globals.lighttouched = true;
..	..	@@ -14897,6 +15181,7 @@
14897	15181	case ESC:
14898	15182	RENDERPROGRAM += 1;
14899	15183	RENDERPROGRAM %= 3;
	15184	+
14900	15185	repaint();
14901	15186	break;
14902	15187	case 'Z':
..	..	@@ -14936,8 +15221,9 @@
14936	15221	case DELETE:
14937	15222	ClearSelection();
14938	15223	break;
14939		- /*
14940	15224	case '+':
	15225	+
	15226	+ /*
14941	15227	//fontsize += 1;
14942	15228	bbzoom *= 2;
14943	15229	repaint();
..	..	@@ -14954,17 +15240,17 @@
14954	15240	case '=':
14955	15241	IncDepth();
14956	15242	//fontsize += 1;
14957		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14958	15244	maskbit = 6;
14959	15245	break;
14960	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14961	15247	DecDepth();
14962	15248	maskbit = 5;
14963	15249	//if(fontsize > 1) fontsize -= 1;
14964		- if (object.editWindow == null)
14965		- new Exception().printStackTrace();
14966		- else
14967		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14968	15254	break;
14969	15255	case '{':
14970	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15188,7 +15474,7 @@
15188	15474	}
15189	15475	*/
15190	15476
15191		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
15192	15478	}
15193	15479
15194	15480	void SelectParent()
..	..	@@ -15205,10 +15491,10 @@
15205	15491	{
15206	15492	//selectees.remove(i);
15207	15493	System.out.println("select parent of " + elem);
15208		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15209	15495	} else
15210	15496	{
15211		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15212	15498	}
15213	15499
15214	15500	first = false;
..	..	@@ -15250,12 +15536,12 @@
15250	15536	for (int j = 0; j < group.children.size(); j++)
15251	15537	{
15252	15538	elem = (Object3D) group.children.elementAt(j);
15253		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15254	15540	first = false;
15255	15541	}
15256	15542	} else
15257	15543	{
15258		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15259	15545	}
15260	15546
15261	15547	first = false;
..	..	@@ -15266,21 +15552,21 @@
15266	15552	{
15267	15553	//Composite group = (Composite) object;
15268	15554	Object3D group = object;
15269		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15270	15556	}
15271	15557
15272	15558	void ResetTransform(int mask)
15273	15559	{
15274	15560	//Composite group = (Composite) object;
15275	15561	Object3D group = object;
15276		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
15277	15563	}
15278	15564
15279	15565	void FlipTransform()
15280	15566	{
15281	15567	//Composite group = (Composite) object;
15282	15568	Object3D group = object;
15283		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
15284	15570	// group.editWindow.ReduceMesh(true);
15285	15571	}
15286	15572
..	..	@@ -15288,7 +15574,7 @@
15288	15574	{
15289	15575	//Composite group = (Composite) object;
15290	15576	Object3D group = object;
15291		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
15292	15578	// group.editWindow.ReduceMesh(true);
15293	15579	}
15294	15580
..	..	@@ -15296,7 +15582,7 @@
15296	15582	{
15297	15583	//Composite group = (Composite) object;
15298	15584	Object3D group = object;
15299		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
15300	15586	}
15301	15587
15302	15588	void IncDepth()
..	..	@@ -15382,7 +15668,9 @@
15382	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15383	15669	//Image img = CreateImage(width, height);
15384	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
15385	15672	Graphics gr = g; // img.getGraphics();
	15673	+
15386	15674	if (!hasMarquee)
15387	15675	{
15388	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -15470,6 +15758,7 @@
15470	15758	info.bounds.y += (height - desired) / 2;
15471	15759	}
15472	15760	}
	15761	+
15473	15762	info.g = gr;
15474	15763	info.camera = renderCamera;
15475	15764	/*
..	..	@@ -15479,15 +15768,55 @@
15479	15768	*/
15480	15769	if (!isRenderer)
15481	15770	{
15482		- object.drawEditHandles(info, 0);
	15771	+ Grafreed.Assert(object != null);
	15772	+ Grafreed.Assert(object.selection != null);
	15773	+ if (object.selection.Size() > 0)
	15774	+ {
	15775	+ int hitSomething = object.selection.get(0).hitSomething;
	15776	+
	15777	+ info.DX = 0;
	15778	+ info.DY = 0;
	15779	+ info.W = 1;
	15780	+ if (hitSomething == Object3D.hitCenter)
	15781	+ {
	15782	+ info.DX = X;
	15783	+ if (X != 0)
	15784	+ info.DX -= info.bounds.width/2;
	15785	+
	15786	+ info.DY = Y;
	15787	+ if (Y != 0)
	15788	+ info.DY -= info.bounds.height/2;
	15789	+ }
	15790	+
	15791	+ object.drawEditHandles(info, 0);
	15792	+
	15793	+ if (drag && (X != 0 \|\| Y != 0))
	15794	+ {
	15795	+ switch (hitSomething)
	15796	+ {
	15797	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15798	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15799	+ break;
	15800	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15801	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15802	+ break;
	15803	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15804	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15805	+ break;
	15806	+ }
	15807	+
	15808	+ }
	15809	+ }
15483	15810	}
15484	15811	}
	15812	+
15485	15813	if (isRenderer)
15486	15814	{
15487	15815	//gr.setColor(Color.black);
15488	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15489	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15490	15818	}
	15819	+
15491	15820	if (hasMarquee)
15492	15821	{
15493	15822	gr.setXORMode(Color.white);
..	..	@@ -15894,7 +16223,7 @@
15894	16223	Object3D object;
15895	16224	static Object3D trackedobject;
15896	16225	Camera renderCamera; // Light or Eye (or Occlusion)
15897		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15898	16227	/static/ Camera eyeCamera;
15899	16228	/static/ Camera lightCamera;
15900	16229	int cameracount;
..	..	@@ -16179,16 +16508,16 @@
16179	16508	cStatic.objectstack[materialdepth++] = checker;
16180	16509	//System.out.println("material " + material);
16181	16510	//Applet3D.tracein(this, selected);
16182		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
16183	16512
16184	16513	//checker.GetMaterial().Draw(this, false); // true);
16185		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16186	16515
16187	16516	materialdepth -= 1;
16188	16517	if (materialdepth > 0)
16189	16518	{
16190		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16191		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16519	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16520	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16192	16521	}
16193	16522	//checker.GetMaterial().opacity = 1f;
16194	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16274,6 +16603,14 @@
16274	16603	}
16275	16604	}
16276	16605
	16606	+ private Object3D GetFolder()
	16607	+ {
	16608	+ Object3D folder = object.GetWindow().copy;
	16609	+ if (object.GetWindow().copy.selection.Size() > 0)
	16610	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16611	+ return folder;
	16612	+ }
	16613	+
16277	16614	class SelectBuffer implements GLEventListener
16278	16615	{
16279	16616
..	..	@@ -16353,6 +16690,17 @@
16353	16690
16354	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16355	16692
	16693	+ if (PAINTMODE)
	16694	+ {
	16695	+ if (object.GetWindow().copy.selection.Size() > 0)
	16696	+ {
	16697	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16698	+
	16699	+ // Make what you paint not selectable.
	16700	+ paintobj.ResetSelectable();
	16701	+ }
	16702	+ }
	16703	+
16356	16704	//int tmp = selection_view;
16357	16705	//selection_view = -1;
16358	16706	int temp = DrawMode();
..	..	@@ -16364,6 +16712,17 @@
16364	16712	// temp = DEFAULT; // patch for selection debug
16365	16713	Globals.drawMode = temp; // WARNING
16366	16714
	16715	+ if (PAINTMODE)
	16716	+ {
	16717	+ if (object.GetWindow().copy.selection.Size() > 0)
	16718	+ {
	16719	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16720	+
	16721	+ // Revert.
	16722	+ paintobj.RestoreSelectable();
	16723	+ }
	16724	+ }
	16725	+
16367	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16368	16727
16369	16728	// trying different ways of getting the depth info over
..	..	@@ -16411,6 +16770,8 @@
16411	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16412	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16413	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
16414	16775
16415	16776	// Will fit the mesh !!!
16416	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16465,29 +16826,31 @@
16465	16826	}
16466	16827
16467	16828	if (!movingcamera && !PAINTMODE)
16468		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16469	16830
16470		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16831	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16471	16832	{
16472		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16833	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16473	16834
16474		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16475	16838
16476		- group.CreateMaterial(); // use a void leaf to select instances
16477		-
16478		- group.add(paintobj); // link
16479		-
16480		- object.editWindow.SnapObject(group);
16481		-
16482		- Object3D folder = object.editWindow.copy;
16483		-
16484		- if (object.editWindow.copy.selection.Size() > 0)
16485		- folder = object.editWindow.copy.selection.elementAt(0);
16486		-
16487		- folder.add(group);
16488		-
16489		- object.editWindow.ResetModel();
16490		- object.editWindow.refreshContents();
	16839	+ Object3D inst = new Object3D("inst" + paintcount++);
	16840	+
	16841	+ inst.CreateMaterial(); // use a void leaf to select instances
	16842	+
	16843	+ inst.add(paintobj); // link
	16844	+
	16845	+ object.GetWindow().SnapObject(inst);
	16846	+
	16847	+ Object3D folder = paintFolder; // GetFolder();
	16848	+
	16849	+ folder.add(inst);
	16850	+
	16851	+ object.GetWindow().ResetModel();
	16852	+ object.GetWindow().refreshContents();
	16853	+ }
16491	16854	}
16492	16855	else
16493	16856	paintcount = 0;
..	..	@@ -16526,6 +16889,11 @@
16526	16889	//System.out.println("objects[color] = " + objects[color]);
16527	16890	//objects[color].Select();
16528	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
16529	16897	object.Select(color, deselect);
16530	16898	}
16531	16899
..	..	@@ -17051,23 +17419,15 @@
17051	17419	int AAbuffersize = 0;
17052	17420
17053	17421	//double[] selectedpoint = new double[3];
17054		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
17055	17423	static Sphere previousselectedpoint = null;
17056		- static Sphere debugpointG = new Sphere();
17057		- static Sphere debugpointP = new Sphere();
17058		- static Sphere debugpointC = new Sphere();
17059		- static Sphere debugpointR = new Sphere();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
17060	17428
17061	17429	static Sphere debugpoints[] = new Sphere[8];
17062	17430
17063		- static
17064		- {
17065		- for (int i=0; i<8; i++)
17066		- {
17067		- debugpoints[i] = new Sphere();
17068		- }
17069		- }
17070		-
17071	17431	static void InitPoints(float radius)
17072	17432	{
17073	17433	for (int i=0; i<8; i++)