~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
..	..	@@ -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	}
..	..	@@ -2374,7 +2397,7 @@
2374	2397	{
2375	2398	return currentGL;
2376	2399	}
2377		-
	2400	+
2378	2401	/**/
2379	2402	class CacheTexture
2380	2403	{
..	..	@@ -7919,6 +7942,64 @@
7919	7942	ReleaseTexture(pigment, false);
7920	7943	}
7921	7944
	7945	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7946	+ {
	7947	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7948	+ {
	7949	+ return;
	7950	+ }
	7951	+
	7952	+ if (tex == null)
	7953	+ {
	7954	+ ReleaseTexture(null, false);
	7955	+ return;
	7956	+ }
	7957	+
	7958	+ String pigment = Object3D.GetPigment(tex);
	7959	+
	7960	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7961	+ {
	7962	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7963	+ // System.out.println("; bump = " + bump);
	7964	+ }
	7965	+
	7966	+ if (pigment.equals(""))
	7967	+ {
	7968	+ pigment = null;
	7969	+ }
	7970	+
	7971	+ ReleaseTexture(pigment, false);
	7972	+ }
	7973	+
	7974	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7975	+ {
	7976	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7977	+ {
	7978	+ return;
	7979	+ }
	7980	+
	7981	+ if (tex == null)
	7982	+ {
	7983	+ ReleaseTexture(null, true);
	7984	+ return;
	7985	+ }
	7986	+
	7987	+ String bump = Object3D.GetBump(tex);
	7988	+
	7989	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7990	+ {
	7991	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7992	+ // System.out.println("; bump = " + bump);
	7993	+ }
	7994	+
	7995	+ if (bump.equals(""))
	7996	+ {
	7997	+ bump = null;
	7998	+ }
	7999	+
	8000	+ ReleaseTexture(bump, true);
	8001	+ }
	8002	+
7922	8003	void ReleaseTexture(String tex, boolean bump)
7923	8004	{
7924	8005	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8022,7 +8103,7 @@
8022	8103	}
8023	8104	}
8024	8105
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8106	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8107	{
8027	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8067,7 +8148,94 @@
8067	8148	return; // true;
8068	8149	}
8069	8150
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8151	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8152	+ {
	8153	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8154	+ ambientOcclusion ) // \|\| !textureon)
	8155	+ {
	8156	+ return; // false;
	8157	+ }
	8158	+
	8159	+ if (tex == null)
	8160	+ {
	8161	+ BindTexture(null,false,resolution);
	8162	+ return;
	8163	+ }
	8164	+
	8165	+ String pigment = Object3D.GetPigment(tex);
	8166	+
	8167	+ usedtextures.put(pigment, pigment);
	8168	+
	8169	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8170	+ {
	8171	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8172	+ // System.out.println("; bump = " + bump);
	8173	+ }
	8174	+
	8175	+ if (pigment.equals(""))
	8176	+ {
	8177	+ pigment = null;
	8178	+ }
	8179	+
	8180	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8181	+ BindTexture(pigment, false, resolution);
	8182	+ }
	8183	+
	8184	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8185	+ {
	8186	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8187	+ ambientOcclusion ) // \|\| !textureon)
	8188	+ {
	8189	+ return; // false;
	8190	+ }
	8191	+
	8192	+ if (tex == null)
	8193	+ {
	8194	+ BindTexture(null,true,resolution);
	8195	+ return;
	8196	+ }
	8197	+
	8198	+ String bump = Object3D.GetBump(tex);
	8199	+
	8200	+ usedtextures.put(bump, bump);
	8201	+
	8202	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8203	+ {
	8204	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8205	+ // System.out.println("; bump = " + bump);
	8206	+ }
	8207	+
	8208	+ if (bump.equals(""))
	8209	+ {
	8210	+ bump = null;
	8211	+ }
	8212	+
	8213	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8214	+ BindTexture(bump, true, resolution);
	8215	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8216	+ }
	8217	+
	8218	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8219	+
	8220	+ private boolean FileExists(String tex)
	8221	+ {
	8222	+ if (missingTextures.contains(tex))
	8223	+ {
	8224	+ return false;
	8225	+ }
	8226	+
	8227	+ boolean fileExists = new File(tex).exists();
	8228	+
	8229	+ if (!fileExists)
	8230	+ {
	8231	+ // If file exists, the "new File()" is not executed sgain
	8232	+ missingTextures.add(tex);
	8233	+ }
	8234	+
	8235	+ return fileExists;
	8236	+ }
	8237	+
	8238	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8071	8239	{
8072	8240	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8073	8241
..	..	@@ -8075,15 +8243,17 @@
8075	8243	{
8076	8244	String texname = tex;
8077	8245
	8246	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8247	+
8078	8248	// String[] split = tex.split("Textures");
8079	8249	// if (split.length > 1)
8080	8250	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8251	// else
8082	8252	// if (!texname.startsWith("/"))
8083	8253	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8254	+ if (!FileExists(tex))
8085	8255	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8256	+ texname = fallbackTextureName;
8087	8257	}
8088	8258
8089	8259	if (CACHETEXTURE)
..	..	@@ -8153,7 +8323,7 @@
8153	8323	}
8154	8324
8155	8325	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8326	+ if (!FileExists(cachename))
8157	8327	cachename = texname;
8158	8328	else
8159	8329	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8345,7 @@
8175	8345	}
8176	8346
8177	8347	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8348	+ if (!FileExists(cachename))
8179	8349	cachename = texname;
8180	8350	else
8181	8351	processbump = false; // don't process bump map again
..	..	@@ -8184,7 +8354,9 @@
8184	8354	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8355
8186	8356
8187		- if (texturedata != null)
	8357	+ if (texturedata == null)
	8358	+ throw new Exception();
	8359	+
8188	8360	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8189	8361	//texture = GetTexture(tex, bump);
8190	8362	}
..	..	@@ -8306,7 +8478,7 @@
8306	8478	return texture;
8307	8479	}
8308	8480
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8481	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8310	8482	{
8311	8483	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8484
..	..	@@ -8324,14 +8496,14 @@
8324	8496	return texture!=null?texture.texture:null;
8325	8497	}
8326	8498
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8499	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8328	8500	{
8329	8501	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8502
8331	8503	return texture!=null?texture.texturedata:null;
8332	8504	}
8333	8505
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8506	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8335	8507	{
8336	8508	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8509	{
..	..	@@ -9208,11 +9380,35 @@
9208	9380	jy8[3] = 0.5f;
9209	9381	}
9210	9382
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9383	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9384	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9385	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9386	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9387
	9388	+ void ResetOptions()
	9389	+ {
	9390	+ options1[0] = 100;
	9391	+ options1[1] = 0.025f;
	9392	+ options1[2] = 0.01f;
	9393	+ options1[3] = 0;
	9394	+ options1[4] = 0;
	9395	+
	9396	+ options2[0] = 0;
	9397	+ options2[1] = 0.75f;
	9398	+ options2[2] = 0;
	9399	+ options2[3] = 0;
	9400	+
	9401	+ options3[0] = 1;
	9402	+ options3[1] = 1;
	9403	+ options3[2] = 1;
	9404	+ options3[3] = 0;
	9405	+
	9406	+ options4[0] = 1;
	9407	+ options4[1] = 0;
	9408	+ options4[2] = 1;
	9409	+ options4[3] = 0;
	9410	+ }
	9411	+
9216	9412	static int imagecount = 0; // movie generation
9217	9413
9218	9414	static int jitter = 0;
..	..	@@ -9308,8 +9504,8 @@
9308	9504	assert (parentcam != renderCamera);
9309	9505
9310	9506	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9507	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9508	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9313	9509
9314	9510	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9511
..	..	@@ -9324,8 +9520,8 @@
9324	9520	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9521
9326	9522	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9523	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9524	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9329	9525
9330	9526	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9527
..	..	@@ -10323,6 +10519,7 @@
10323	10519	ANTIALIAS = 0;
10324	10520	//System.out.println("RESTART");
10325	10521	AAtimer.restart();
	10522	+ Globals.TIMERRUNNING = true;
10326	10523	}
10327	10524	}
10328	10525	}
..	..	@@ -10390,13 +10587,14 @@
10390	10587	ambientOcclusion = false;
10391	10588	}
10392	10589
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10590	+ if (//Globals.lighttouched &&
	10591	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10592	{
10395	10593	//if (RENDERSHADOW) // ?
10396	10594	if (!IsFrozen())
10397	10595	{
10398	10596	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10597	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10598	{
10401	10599	Globals.framecount++;
10402	10600	shadowbuffer.display();
..	..	@@ -10523,8 +10721,8 @@
10523	10721
10524	10722	// if (parentcam != renderCamera) // not a light
10525	10723	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10724	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10725	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10528	10726
10529	10727	for (int j = 0; j < 4; j++)
10530	10728	{
..	..	@@ -10538,8 +10736,8 @@
10538	10736
10539	10737	// if (parentcam != renderCamera) // not a light
10540	10738	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10740	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10543	10741
10544	10742	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10743
..	..	@@ -10798,7 +10996,16 @@
10798	10996	// Bump noise
10799	10997	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	10998	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	10999	+
	11000	+ try
	11001	+ {
	11002	+ BindTexture(NOISE_TEXTURE, false, 2);
	11003	+ }
	11004	+ catch (Exception e)
	11005	+ {
	11006	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11007	+ }
	11008	+
10802	11009
10803	11010	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	11011	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10821,9 +11028,9 @@
10821	11028
10822	11029	gl.glMatrixMode(GL.GL_MODELVIEW);
10823	11030
10824		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10825		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10826		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11031	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11032	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11033	+gl.glEnable(gl.GL_MULTISAMPLE);
10827	11034	} else
10828	11035	{
10829	11036	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10834,7 +11041,7 @@
10834	11041	//System.out.println("BLENDING ON");
10835	11042	gl.glEnable(GL.GL_BLEND);
10836	11043	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837		-
	11044	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10838	11045	gl.glMatrixMode(gl.GL_PROJECTION);
10839	11046	gl.glLoadIdentity();
10840	11047
..	..	@@ -10923,8 +11130,8 @@
10923	11130	System.err.println("parentcam != renderCamera");
10924	11131
10925	11132	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11133	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11134	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10928	11135	}
10929	11136
10930	11137	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11152,8 @@
10945	11152	if (true) // TODO
10946	11153	{
10947	11154	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11155	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11156	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11157	}
10951	11158
10952	11159	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11291,15 +11498,36 @@
11291	11498
11292	11499	static boolean zoomonce = false;
11293	11500
	11501	+ static void CreateSelectedPoint()
	11502	+ {
	11503	+ if (selectedpoint == null)
	11504	+ {
	11505	+ debugpointG = new Sphere();
	11506	+ debugpointP = new Sphere();
	11507	+ debugpointC = new Sphere();
	11508	+ debugpointR = new Sphere();
	11509	+
	11510	+ selectedpoint = new Superellipsoid();
	11511	+
	11512	+ for (int i=0; i<8; i++)
	11513	+ {
	11514	+ debugpoints[i] = new Sphere();
	11515	+ }
	11516	+ }
	11517	+ }
	11518	+
11294	11519	void DrawObject(GL gl, boolean draw)
11295	11520	{
	11521	+ // To clear camera values
	11522	+ ResetOptions();
	11523	+
11296	11524	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11525	// DrawMode() = SELECTION;
11298	11526	//GL gl = getGL();
11299	11527	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11300	11528	{
11301	11529	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11530	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303	11531	pingthread.StepToTarget(true); // true);
11304	11532	// zoomonce = false;
11305	11533	}
..	..	@@ -11354,7 +11582,14 @@
11354	11582
11355	11583	usedtextures.clear();
11356	11584
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11585	+ try
	11586	+ {
	11587	+ BindTextures(DEFAULT_TEXTURES, 2);
	11588	+ }
	11589	+ catch (Exception e)
	11590	+ {
	11591	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11592	+ }
11358	11593	}
11359	11594	//System.out.println("--> " + stackdepth);
11360	11595	// GrafreeD.traceon();
..	..	@@ -11364,8 +11599,9 @@
11364	11599
11365	11600	if (DrawMode() == DEFAULT)
11366	11601	{
11367		- if (DEBUG)
	11602	+ if (Globals.DEBUG)
11368	11603	{
	11604	+ CreateSelectedPoint();
11369	11605	float radius = 0.05f;
11370	11606	if (selectedpoint.radius != radius)
11371	11607	{
..	..	@@ -11445,7 +11681,14 @@
11445	11681	if (checker != null && DrawMode() == DEFAULT)
11446	11682	{
11447	11683	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11684	+ try
	11685	+ {
	11686	+ BindTextures(checker.GetTextures(), checker.texres);
	11687	+ }
	11688	+ catch (Exception e)
	11689	+ {
	11690	+ System.err.println("FAILED: " + checker.GetTextures());
	11691	+ }
11449	11692	// NEAREST
11450	11693	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11694	DrawChecker(gl);
..	..	@@ -11527,7 +11770,7 @@
11527	11770	return;
11528	11771	}
11529	11772
11530		- String string = obj.GetToolTip();
	11773	+ String string = obj.toString(); //.GetToolTip();
11531	11774
11532	11775	GL gl = GetGL();
11533	11776
..	..	@@ -11844,8 +12087,8 @@
11844	12087	//obj.TransformToWorld(light, light);
11845	12088	for (int i = tp.size(); --i >= 0;)
11846	12089	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12090	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12091	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12092	}
11850	12093
11851	12094
..	..	@@ -11862,8 +12105,8 @@
11862	12105	parentcam = cameras[0];
11863	12106	}
11864	12107
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12108	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12109	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12110
11868	12111	LA.xformPos(light, renderCamera.toScreen, light);
11869	12112
..	..	@@ -12477,8 +12720,8 @@
12477	12720
12478	12721	// display shadow only (bump == 0)
12479	12722	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	12723	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12724	+ "SLT temp.z, temp.y, -one2048th.x;" +
12482	12725	"SUB temp.y, one.x, temp.z;" +
12483	12726	"MUL temp.x, temp.x, temp.y;" +
12484	12727	"KIL temp.x;" +
..	..	@@ -12809,7 +13052,7 @@
12809	13052	//once = true;
12810	13053	}
12811	13054
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13055	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13056	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13057	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13058
..	..	@@ -12942,12 +13185,16 @@
12942	13185
12943	13186	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13187	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13188	+
	13189	+ // Compare fragment depth in light space with shadowmap.
12945	13190	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13191	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13192	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13193	+
	13194	+ // Reverse comparison
12948	13195	"SUB temp.x, one.x, temp.x;" +
12949	13196	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13197	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13198	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13199
12953	13200	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13208,10 @@
12961	13208	// No shadow for backface
12962	13209	"DP3 temp.x, normal, lightd;" +
12963	13210	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13211	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13212	+
	13213	+ // No shadow when out of frustrum
	13214	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13215	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13216	"";
12966	13217	}
..	..	@@ -13107,7 +13358,8 @@
13107	13358	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13359	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13360	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13361	+
	13362	+ //Object3D.cVector2[] vector2buffer;
13111	13363
13112	13364	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13365	// OUT : diff, spec
..	..	@@ -13123,9 +13375,10 @@
13123	13375	"DP3 " + dest + ".z," + "normals," + "eye;" +
13124	13376	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13125	13377	//"MOV " + dest + ".w," + "normal.z;" +
13126		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13127		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13128		- //"MOV " + dest + ".z," + "params2.w;" +
	13378	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13379	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13380	+
	13381	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13129	13382	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13130	13383	"RCP " + dest + ".w," + dest + ".w;" +
13131	13384	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13630,6 +13883,7 @@
13630	13883	else
13631	13884	if (evt.getSource() == AAtimer)
13632	13885	{
	13886	+ Globals.TIMERRUNNING = false;
13633	13887	if (mouseDown)
13634	13888	{
13635	13889	//new Exception().printStackTrace();
..	..	@@ -13689,7 +13943,7 @@
13689	13943
13690	13944	// fev 2014???
13691	13945	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13692		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13946	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13693	13947	pingthread.StepToTarget(true); // true);
13694	13948	}
13695	13949	// if (!LIVE)
..	..	@@ -13704,6 +13958,7 @@
13704	13958	return;
13705	13959
13706	13960	AAtimer.restart(); //
	13961	+ Globals.TIMERRUNNING = true;
13707	13962
13708	13963	// waslive = LIVE;
13709	13964	// LIVE = false;
..	..	@@ -13776,9 +14031,12 @@
13776	14031
13777	14032	public void mouseDragged(MouseEvent e)
13778	14033	{
	14034	+ Globals.MOUSEDRAGGED = true;
	14035	+
13779	14036	//System.out.println("mouseDragged: " + e);
13780	14037	if (isRenderer)
13781	14038	movingcamera = true;
	14039	+
13782	14040	//if (drawing)
13783	14041	//return;
13784	14042	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14039,12 +14297,12 @@
14039	14297	void GoDown(int mod)
14040	14298	{
14041	14299	MODIFIERS \|= COMMAND;
14042		- /*
	14300	+ /**/
14043	14301	if((mod&SHIFT) == SHIFT)
14044	14302	manipCamera.RotatePosition(0, -speed);
14045	14303	else
14046		- manipCamera.BackForth(0, -speed*delta, getWidth());
14047		- */
	14304	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14305	+ /**/
14048	14306	if ((mod & SHIFT) == SHIFT)
14049	14307	{
14050	14308	mouseMode = mouseMode; // VR??
..	..	@@ -14060,12 +14318,12 @@
14060	14318	void GoUp(int mod)
14061	14319	{
14062	14320	MODIFIERS \|= COMMAND;
14063		- /*
	14321	+ /**/
14064	14322	if((mod&SHIFT) == SHIFT)
14065	14323	manipCamera.RotatePosition(0, speed);
14066	14324	else
14067		- manipCamera.BackForth(0, speed*delta, getWidth());
14068		- */
	14325	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14326	+ /**/
14069	14327	if ((mod & SHIFT) == SHIFT)
14070	14328	{
14071	14329	mouseMode = mouseMode;
..	..	@@ -14081,12 +14339,12 @@
14081	14339	void GoLeft(int mod)
14082	14340	{
14083	14341	MODIFIERS \|= COMMAND;
14084		- /*
	14342	+ /**/
14085	14343	if((mod&SHIFT) == SHIFT)
14086		- manipCamera.RotatePosition(speed, 0);
14087		- else
14088	14344	manipCamera.Translate(speed*delta, 0, getWidth());
14089		- */
	14345	+ else
	14346	+ manipCamera.RotatePosition(speed, 0);
	14347	+ /**/
14090	14348	if ((mod & SHIFT) == SHIFT)
14091	14349	{
14092	14350	mouseMode = mouseMode;
..	..	@@ -14102,12 +14360,12 @@
14102	14360	void GoRight(int mod)
14103	14361	{
14104	14362	MODIFIERS \|= COMMAND;
14105		- /*
	14363	+ /**/
14106	14364	if((mod&SHIFT) == SHIFT)
14107		- manipCamera.RotatePosition(-speed, 0);
14108		- else
14109	14365	manipCamera.Translate(-speed*delta, 0, getWidth());
14110		- */
	14366	+ else
	14367	+ manipCamera.RotatePosition(-speed, 0);
	14368	+ /**/
14111	14369	if ((mod & SHIFT) == SHIFT)
14112	14370	{
14113	14371	mouseMode = mouseMode;
..	..	@@ -14164,7 +14422,8 @@
14164	14422	info.camera = renderCamera;
14165	14423	info.x = x;
14166	14424	info.y = y;
14167		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14425	+ object.GetWindow().copy
	14426	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14168	14427	} else
14169	14428	{
14170	14429	if (x < startX)
..	..	@@ -14328,7 +14587,9 @@
14328	14587	ci.camera = renderCamera;
14329	14588	if (!isRenderer)
14330	14589	{
14331		- if (object.editWindow.copy.doEditClick(ci, 0))
	14590	+ //ObjEditor editWindow = object.editWindow;
	14591	+ //Object3D copy = editWindow.copy;
	14592	+ if (object.doEditClick(ci, 0))
14332	14593	{
14333	14594	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14334	14595	} else
..	..	@@ -14340,7 +14601,11 @@
14340	14601
14341	14602	public void mouseReleased(MouseEvent e)
14342	14603	{
	14604	+ Globals.MOUSEDRAGGED = false;
	14605	+
14343	14606	movingcamera = false;
	14607	+ X = 0; // getBounds().width/2;
	14608	+ Y = 0; // getBounds().height/2;
14344	14609	//System.out.println("mouseReleased: " + e);
14345	14610	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14346	14611	}
..	..	@@ -14681,7 +14946,9 @@
14681	14946	case 'E' : COMPACT ^= true;
14682	14947	repaint();
14683	14948	break;
14684		- case 'W' : DEBUGHSB ^= true;
	14949	+ case 'W' : // Wide Window (fullscreen)
	14950	+ //DEBUGHSB ^= true;
	14951	+ ObjEditor.theFrame.ToggleFullScreen();
14685	14952	repaint();
14686	14953	break;
14687	14954	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14706,8 +14973,8 @@
14706	14973	RevertCamera();
14707	14974	repaint();
14708	14975	break;
14709		- case 'L':
14710	14976	case 'l':
	14977	+ //case 'L':
14711	14978	if (lightMode)
14712	14979	{
14713	14980	lightMode = false;
..	..	@@ -14850,9 +15117,9 @@
14850	15117	case '_':
14851	15118	kompactbit = 5;
14852	15119	break;
14853		- case '+':
14854		- kompactbit = 6;
14855		- break;
	15120	+// case '+':
	15121	+// kompactbit = 6;
	15122	+// break;
14856	15123	case ' ':
14857	15124	lightMode ^= true;
14858	15125	Globals.lighttouched = true;
..	..	@@ -14864,13 +15131,14 @@
14864	15131	case ESC:
14865	15132	RENDERPROGRAM += 1;
14866	15133	RENDERPROGRAM %= 3;
	15134	+
14867	15135	repaint();
14868	15136	break;
14869	15137	case 'Z':
14870	15138	//RESIZETEXTURE ^= true;
14871	15139	//break;
14872	15140	case 'z':
14873		- RENDERSHADOW ^= true;
	15141	+ Globals.RENDERSHADOW ^= true;
14874	15142	Globals.lighttouched = true;
14875	15143	repaint();
14876	15144	break;
..	..	@@ -14903,8 +15171,9 @@
14903	15171	case DELETE:
14904	15172	ClearSelection();
14905	15173	break;
14906		- /*
14907	15174	case '+':
	15175	+
	15176	+ /*
14908	15177	//fontsize += 1;
14909	15178	bbzoom *= 2;
14910	15179	repaint();
..	..	@@ -14921,17 +15190,17 @@
14921	15190	case '=':
14922	15191	IncDepth();
14923	15192	//fontsize += 1;
14924		- object.editWindow.refreshContents(true);
	15193	+ object.GetWindow().refreshContents(true);
14925	15194	maskbit = 6;
14926	15195	break;
14927	15196	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14928	15197	DecDepth();
14929	15198	maskbit = 5;
14930	15199	//if(fontsize > 1) fontsize -= 1;
14931		- if (object.editWindow == null)
14932		- new Exception().printStackTrace();
14933		- else
14934		- object.editWindow.refreshContents(true);
	15200	+// if (object.editWindow == null)
	15201	+// new Exception().printStackTrace();
	15202	+// else
	15203	+ object.GetWindow().refreshContents(true);
14935	15204	break;
14936	15205	case '{':
14937	15206	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15155,7 +15424,7 @@
15155	15424	}
15156	15425	*/
15157	15426
15158		- object.editWindow.EditSelection();
	15427	+ object.GetWindow().EditSelection(false);
15159	15428	}
15160	15429
15161	15430	void SelectParent()
..	..	@@ -15172,10 +15441,10 @@
15172	15441	{
15173	15442	//selectees.remove(i);
15174	15443	System.out.println("select parent of " + elem);
15175		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15444	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15176	15445	} else
15177	15446	{
15178		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15447	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15179	15448	}
15180	15449
15181	15450	first = false;
..	..	@@ -15217,12 +15486,12 @@
15217	15486	for (int j = 0; j < group.children.size(); j++)
15218	15487	{
15219	15488	elem = (Object3D) group.children.elementAt(j);
15220		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15489	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15221	15490	first = false;
15222	15491	}
15223	15492	} else
15224	15493	{
15225		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15494	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15226	15495	}
15227	15496
15228	15497	first = false;
..	..	@@ -15233,21 +15502,21 @@
15233	15502	{
15234	15503	//Composite group = (Composite) object;
15235	15504	Object3D group = object;
15236		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15505	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15237	15506	}
15238	15507
15239	15508	void ResetTransform(int mask)
15240	15509	{
15241	15510	//Composite group = (Composite) object;
15242	15511	Object3D group = object;
15243		- group.editWindow.ResetTransform(mask);
	15512	+ group.GetWindow().ResetTransform(mask);
15244	15513	}
15245	15514
15246	15515	void FlipTransform()
15247	15516	{
15248	15517	//Composite group = (Composite) object;
15249	15518	Object3D group = object;
15250		- group.editWindow.FlipTransform();
	15519	+ group.GetWindow().FlipTransform();
15251	15520	// group.editWindow.ReduceMesh(true);
15252	15521	}
15253	15522
..	..	@@ -15255,7 +15524,7 @@
15255	15524	{
15256	15525	//Composite group = (Composite) object;
15257	15526	Object3D group = object;
15258		- group.editWindow.PrintMemory();
	15527	+ group.GetWindow().PrintMemory();
15259	15528	// group.editWindow.ReduceMesh(true);
15260	15529	}
15261	15530
..	..	@@ -15263,7 +15532,7 @@
15263	15532	{
15264	15533	//Composite group = (Composite) object;
15265	15534	Object3D group = object;
15266		- group.editWindow.ResetCentroid();
	15535	+ group.GetWindow().ResetCentroid();
15267	15536	}
15268	15537
15269	15538	void IncDepth()
..	..	@@ -15349,7 +15618,9 @@
15349	15618	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15350	15619	//Image img = CreateImage(width, height);
15351	15620	//System.out.println("width = " + width + "; height = " + height + "\n");
	15621	+
15352	15622	Graphics gr = g; // img.getGraphics();
	15623	+
15353	15624	if (!hasMarquee)
15354	15625	{
15355	15626	if (Xmin < Xmax) // !locked)
..	..	@@ -15437,6 +15708,7 @@
15437	15708	info.bounds.y += (height - desired) / 2;
15438	15709	}
15439	15710	}
	15711	+
15440	15712	info.g = gr;
15441	15713	info.camera = renderCamera;
15442	15714	/*
..	..	@@ -15446,15 +15718,55 @@
15446	15718	*/
15447	15719	if (!isRenderer)
15448	15720	{
15449		- object.drawEditHandles(info, 0);
	15721	+ Grafreed.Assert(object != null);
	15722	+ Grafreed.Assert(object.selection != null);
	15723	+ if (object.selection.Size() > 0)
	15724	+ {
	15725	+ int hitSomething = object.selection.get(0).hitSomething;
	15726	+
	15727	+ info.DX = 0;
	15728	+ info.DY = 0;
	15729	+ info.W = 1;
	15730	+ if (hitSomething == Object3D.hitCenter)
	15731	+ {
	15732	+ info.DX = X;
	15733	+ if (X != 0)
	15734	+ info.DX -= info.bounds.width/2;
	15735	+
	15736	+ info.DY = Y;
	15737	+ if (Y != 0)
	15738	+ info.DY -= info.bounds.height/2;
	15739	+ }
	15740	+
	15741	+ object.drawEditHandles(info, 0);
	15742	+
	15743	+ if (drag && (X != 0 \|\| Y != 0))
	15744	+ {
	15745	+ switch (hitSomething)
	15746	+ {
	15747	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15748	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15749	+ break;
	15750	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15751	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15752	+ break;
	15753	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15754	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15755	+ break;
	15756	+ }
	15757	+
	15758	+ }
	15759	+ }
15450	15760	}
15451	15761	}
	15762	+
15452	15763	if (isRenderer)
15453	15764	{
15454	15765	//gr.setColor(Color.black);
15455	15766	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15456	15767	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15457	15768	}
	15769	+
15458	15770	if (hasMarquee)
15459	15771	{
15460	15772	gr.setXORMode(Color.white);
..	..	@@ -15861,7 +16173,7 @@
15861	16173	Object3D object;
15862	16174	static Object3D trackedobject;
15863	16175	Camera renderCamera; // Light or Eye (or Occlusion)
15864		- /static/ Camera manipCamera; // Light or Eye
	16176	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15865	16177	/static/ Camera eyeCamera;
15866	16178	/static/ Camera lightCamera;
15867	16179	int cameracount;
..	..	@@ -16146,16 +16458,16 @@
16146	16458	cStatic.objectstack[materialdepth++] = checker;
16147	16459	//System.out.println("material " + material);
16148	16460	//Applet3D.tracein(this, selected);
16149		- vector2buffer = checker.projectedVertices;
	16461	+ //vector2buffer = checker.projectedVertices;
16150	16462
16151	16463	//checker.GetMaterial().Draw(this, false); // true);
16152		- DrawMaterial(checker.GetMaterial(), false); // true);
	16464	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16153	16465
16154	16466	materialdepth -= 1;
16155	16467	if (materialdepth > 0)
16156	16468	{
16157		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16158		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16469	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16470	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16159	16471	}
16160	16472	//checker.GetMaterial().opacity = 1f;
16161	16473	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16379,6 +16691,8 @@
16379	16691	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16380	16692	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16381	16693
	16694	+ CreateSelectedPoint();
	16695	+
16382	16696	// Will fit the mesh !!!
16383	16697	selectedpoint.toParent[0][0] = 0.0001;
16384	16698	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16432,7 +16746,7 @@
16432	16746	}
16433	16747
16434	16748	if (!movingcamera && !PAINTMODE)
16435		- object.editWindow.ScreenFitPoint(); // fev 2014
	16749	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16436	16750
16437	16751	if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16438	16752	{
..	..	@@ -16444,17 +16758,17 @@
16444	16758
16445	16759	group.add(paintobj); // link
16446	16760
16447		- object.editWindow.SnapObject(group);
	16761	+ object.GetWindow().SnapObject(group);
16448	16762
16449		- Object3D folder = object.editWindow.copy;
	16763	+ Object3D folder = object.GetWindow().copy;
16450	16764
16451		- if (object.editWindow.copy.selection.Size() > 0)
16452		- folder = object.editWindow.copy.selection.elementAt(0);
	16765	+ if (object.GetWindow().copy.selection.Size() > 0)
	16766	+ folder = object.GetWindow().copy.selection.elementAt(0);
16453	16767
16454	16768	folder.add(group);
16455	16769
16456		- object.editWindow.ResetModel();
16457		- object.editWindow.refreshContents();
	16770	+ object.GetWindow().ResetModel();
	16771	+ object.GetWindow().refreshContents();
16458	16772	}
16459	16773	else
16460	16774	paintcount = 0;
..	..	@@ -16493,6 +16807,11 @@
16493	16807	//System.out.println("objects[color] = " + objects[color]);
16494	16808	//objects[color].Select();
16495	16809	indexcount = 0;
	16810	+ ObjEditor window = object.GetWindow();
	16811	+ if (window != null && deselect)
	16812	+ {
	16813	+ window.Select(null, deselect, true);
	16814	+ }
16496	16815	object.Select(color, deselect);
16497	16816	}
16498	16817
..	..	@@ -16592,7 +16911,7 @@
16592	16911	gl.glDisable(gl.GL_CULL_FACE);
16593	16912	}
16594	16913
16595		- if (!RENDERSHADOW)
	16914	+ if (!Globals.RENDERSHADOW)
16596	16915	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16597	16916
16598	16917	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16602,7 +16921,7 @@
16602	16921	//gl.glColorMask(false, false, false, false);
16603	16922
16604	16923	//render_scene_from_light_view(gl, drawable, 0, 0);
16605		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16924	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16606	16925	{
16607	16926	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16608	16927
..	..	@@ -17018,23 +17337,15 @@
17018	17337	int AAbuffersize = 0;
17019	17338
17020	17339	//double[] selectedpoint = new double[3];
17021		- static Superellipsoid selectedpoint = new Superellipsoid();
	17340	+ static Superellipsoid selectedpoint;
17022	17341	static Sphere previousselectedpoint = null;
17023		- static Sphere debugpointG = new Sphere();
17024		- static Sphere debugpointP = new Sphere();
17025		- static Sphere debugpointC = new Sphere();
17026		- static Sphere debugpointR = new Sphere();
	17342	+ static Sphere debugpointG;
	17343	+ static Sphere debugpointP;
	17344	+ static Sphere debugpointC;
	17345	+ static Sphere debugpointR;
17027	17346
17028	17347	static Sphere debugpoints[] = new Sphere[8];
17029	17348
17030		- static
17031		- {
17032		- for (int i=0; i<8; i++)
17033		- {
17034		- debugpoints[i] = new Sphere();
17035		- }
17036		- }
17037		-
17038	17349	static void InitPoints(float radius)
17039	17350	{
17040	17351	for (int i=0; i<8; i++)