~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 \|\|/
..	..	@@ -8067,6 +8148,93 @@
8067	8148	return; // true;
8068	8149	}
8069	8150
	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	+
8070	8238	CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8071	8239	{
8072	8240	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
..	..	@@ -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
..	..	@@ -9210,11 +9380,35 @@
9210	9380	jy8[3] = 0.5f;
9211	9381	}
9212	9382
9213		- 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
9214	9384	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9215	9385	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9216	9386	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9217	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	+
9218	9412	static int imagecount = 0; // movie generation
9219	9413
9220	9414	static int jitter = 0;
..	..	@@ -9310,8 +9504,8 @@
9310	9504	assert (parentcam != renderCamera);
9311	9505
9312	9506	if (renderCamera != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9507	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9508	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9315	9509
9316	9510	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9317	9511
..	..	@@ -9326,8 +9520,8 @@
9326	9520	LA.matCopy(renderCamera.fromScreen, matrix);
9327	9521
9328	9522	if (renderCamera != lightCamera)
9329		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9330		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9523	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9524	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9331	9525
9332	9526	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9333	9527
..	..	@@ -10325,6 +10519,7 @@
10325	10519	ANTIALIAS = 0;
10326	10520	//System.out.println("RESTART");
10327	10521	AAtimer.restart();
	10522	+ Globals.TIMERRUNNING = true;
10328	10523	}
10329	10524	}
10330	10525	}
..	..	@@ -10392,13 +10587,14 @@
10392	10587	ambientOcclusion = false;
10393	10588	}
10394	10589
10395		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10590	+ if (//Globals.lighttouched &&
	10591	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10396	10592	{
10397	10593	//if (RENDERSHADOW) // ?
10398	10594	if (!IsFrozen())
10399	10595	{
10400	10596	// dec 2012
10401		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10597	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10402	10598	{
10403	10599	Globals.framecount++;
10404	10600	shadowbuffer.display();
..	..	@@ -10525,8 +10721,8 @@
10525	10721
10526	10722	// if (parentcam != renderCamera) // not a light
10527	10723	if (cam != lightCamera)
10528		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10529		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10724	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10725	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10530	10726
10531	10727	for (int j = 0; j < 4; j++)
10532	10728	{
..	..	@@ -10540,8 +10736,8 @@
10540	10736
10541	10737	// if (parentcam != renderCamera) // not a light
10542	10738	if (cam != lightCamera)
10543		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10544		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10740	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10545	10741
10546	10742	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10547	10743
..	..	@@ -10934,8 +11130,8 @@
10934	11130	System.err.println("parentcam != renderCamera");
10935	11131
10936	11132	// if (cam != lightCamera)
10937		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10938		- 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
10939	11135	}
10940	11136
10941	11137	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10956,8 +11152,8 @@
10956	11152	if (true) // TODO
10957	11153	{
10958	11154	if (cam != lightCamera)
10959		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10960		- 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
10961	11157	}
10962	11158
10963	11159	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11302,15 +11498,36 @@
11302	11498
11303	11499	static boolean zoomonce = false;
11304	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	+
11305	11519	void DrawObject(GL gl, boolean draw)
11306	11520	{
	11521	+ // To clear camera values
	11522	+ ResetOptions();
	11523	+
11307	11524	//System.out.println("DRAW OBJECT " + mouseDown);
11308	11525	// DrawMode() = SELECTION;
11309	11526	//GL gl = getGL();
11310	11527	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11311	11528	{
11312	11529	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11313		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11530	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11314	11531	pingthread.StepToTarget(true); // true);
11315	11532	// zoomonce = false;
11316	11533	}
..	..	@@ -11382,8 +11599,9 @@
11382	11599
11383	11600	if (DrawMode() == DEFAULT)
11384	11601	{
11385		- if (DEBUG)
	11602	+ if (Globals.DEBUG)
11386	11603	{
	11604	+ CreateSelectedPoint();
11387	11605	float radius = 0.05f;
11388	11606	if (selectedpoint.radius != radius)
11389	11607	{
..	..	@@ -11552,7 +11770,7 @@
11552	11770	return;
11553	11771	}
11554	11772
11555		- String string = obj.GetToolTip();
	11773	+ String string = obj.toString(); //.GetToolTip();
11556	11774
11557	11775	GL gl = GetGL();
11558	11776
..	..	@@ -11869,8 +12087,8 @@
11869	12087	//obj.TransformToWorld(light, light);
11870	12088	for (int i = tp.size(); --i >= 0;)
11871	12089	{
11872		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11873		- 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);
11874	12092	}
11875	12093
11876	12094
..	..	@@ -11887,8 +12105,8 @@
11887	12105	parentcam = cameras[0];
11888	12106	}
11889	12107
11890		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11891		- 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
11892	12110
11893	12111	LA.xformPos(light, renderCamera.toScreen, light);
11894	12112
..	..	@@ -12502,8 +12720,8 @@
12502	12720
12503	12721	// display shadow only (bump == 0)
12504	12722	"SUB temp.x, half.x, shadow.x;" +
12505		- "MOV temp.y, -params6.x;" +
12506		- "SLT temp.z, temp.y, zero.x;" +
	12723	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12724	+ "SLT temp.z, temp.y, -one2048th.x;" +
12507	12725	"SUB temp.y, one.x, temp.z;" +
12508	12726	"MUL temp.x, temp.x, temp.y;" +
12509	12727	"KIL temp.x;" +
..	..	@@ -12834,7 +13052,7 @@
12834	13052	//once = true;
12835	13053	}
12836	13054
12837		- System.out.print("Program #" + mode + "; length = " + program.length());
	13055	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12838	13056	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12839	13057	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12840	13058
..	..	@@ -12967,12 +13185,16 @@
12967	13185
12968	13186	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12969	13187	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13188	+
	13189	+ // Compare fragment depth in light space with shadowmap.
12970	13190	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12971	13191	"SGE temp.y, temp.x, zero.x;" +
12972		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13192	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13193	+
	13194	+ // Reverse comparison
12973	13195	"SUB temp.x, one.x, temp.x;" +
12974	13196	"MUL " + shadow + ".x, temp.x, temp.y;" +
12975		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13197	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12976	13198	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12977	13199
12978	13200	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12986,6 +13208,10 @@
12986	13208	// No shadow for backface
12987	13209	"DP3 temp.x, normal, lightd;" +
12988	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;" +
12989	13215	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12990	13216	"";
12991	13217	}
..	..	@@ -13132,7 +13358,8 @@
13132	13358	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13133	13359	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13134	13360	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13135		- Object3D.cVector2[] vector2buffer;
	13361	+
	13362	+ //Object3D.cVector2[] vector2buffer;
13136	13363
13137	13364	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13138	13365	// OUT : diff, spec
..	..	@@ -13148,9 +13375,10 @@
13148	13375	"DP3 " + dest + ".z," + "normals," + "eye;" +
13149	13376	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13150	13377	//"MOV " + dest + ".w," + "normal.z;" +
13151		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13152		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13153		- //"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
13154	13382	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13155	13383	"RCP " + dest + ".w," + dest + ".w;" +
13156	13384	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13655,6 +13883,7 @@
13655	13883	else
13656	13884	if (evt.getSource() == AAtimer)
13657	13885	{
	13886	+ Globals.TIMERRUNNING = false;
13658	13887	if (mouseDown)
13659	13888	{
13660	13889	//new Exception().printStackTrace();
..	..	@@ -13714,7 +13943,7 @@
13714	13943
13715	13944	// fev 2014???
13716	13945	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13717		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13946	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13718	13947	pingthread.StepToTarget(true); // true);
13719	13948	}
13720	13949	// if (!LIVE)
..	..	@@ -13729,6 +13958,7 @@
13729	13958	return;
13730	13959
13731	13960	AAtimer.restart(); //
	13961	+ Globals.TIMERRUNNING = true;
13732	13962
13733	13963	// waslive = LIVE;
13734	13964	// LIVE = false;
..	..	@@ -13801,9 +14031,12 @@
13801	14031
13802	14032	public void mouseDragged(MouseEvent e)
13803	14033	{
	14034	+ Globals.MOUSEDRAGGED = true;
	14035	+
13804	14036	//System.out.println("mouseDragged: " + e);
13805	14037	if (isRenderer)
13806	14038	movingcamera = true;
	14039	+
13807	14040	//if (drawing)
13808	14041	//return;
13809	14042	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14189,7 +14422,8 @@
14189	14422	info.camera = renderCamera;
14190	14423	info.x = x;
14191	14424	info.y = y;
14192		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14425	+ object.GetWindow().copy
	14426	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14193	14427	} else
14194	14428	{
14195	14429	if (x < startX)
..	..	@@ -14353,7 +14587,9 @@
14353	14587	ci.camera = renderCamera;
14354	14588	if (!isRenderer)
14355	14589	{
14356		- if (object.editWindow.copy.doEditClick(ci, 0))
	14590	+ //ObjEditor editWindow = object.editWindow;
	14591	+ //Object3D copy = editWindow.copy;
	14592	+ if (object.doEditClick(ci, 0))
14357	14593	{
14358	14594	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14359	14595	} else
..	..	@@ -14365,7 +14601,11 @@
14365	14601
14366	14602	public void mouseReleased(MouseEvent e)
14367	14603	{
	14604	+ Globals.MOUSEDRAGGED = false;
	14605	+
14368	14606	movingcamera = false;
	14607	+ X = 0; // getBounds().width/2;
	14608	+ Y = 0; // getBounds().height/2;
14369	14609	//System.out.println("mouseReleased: " + e);
14370	14610	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14371	14611	}
..	..	@@ -14731,8 +14971,14 @@
14731	14971	RevertCamera();
14732	14972	repaint();
14733	14973	break;
14734		- case 'L':
14735	14974	case 'l':
	14975	+ lightMode ^= true;
	14976	+ Globals.lighttouched = true;
	14977	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14978	+ targetLookAt.set(manipCamera.lookAt);
	14979	+ repaint();
	14980	+ break;
	14981	+ case 'L':
14736	14982	if (lightMode)
14737	14983	{
14738	14984	lightMode = false;
..	..	@@ -14875,20 +15121,18 @@
14875	15121	case '_':
14876	15122	kompactbit = 5;
14877	15123	break;
14878		- case '+':
14879		- kompactbit = 6;
14880		- break;
	15124	+// case '+':
	15125	+// kompactbit = 6;
	15126	+// break;
14881	15127	case ' ':
14882		- lightMode ^= true;
14883		- Globals.lighttouched = true;
14884		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14885		- targetLookAt.set(manipCamera.lookAt);
	15128	+ ObjEditor.theFrame.ToggleFullScreen();
14886	15129	repaint();
14887	15130	break;
14888	15131	//case '`' :
14889	15132	case ESC:
14890	15133	RENDERPROGRAM += 1;
14891	15134	RENDERPROGRAM %= 3;
	15135	+
14892	15136	repaint();
14893	15137	break;
14894	15138	case 'Z':
..	..	@@ -14928,8 +15172,9 @@
14928	15172	case DELETE:
14929	15173	ClearSelection();
14930	15174	break;
14931		- /*
14932	15175	case '+':
	15176	+
	15177	+ /*
14933	15178	//fontsize += 1;
14934	15179	bbzoom *= 2;
14935	15180	repaint();
..	..	@@ -14946,17 +15191,17 @@
14946	15191	case '=':
14947	15192	IncDepth();
14948	15193	//fontsize += 1;
14949		- object.editWindow.refreshContents(true);
	15194	+ object.GetWindow().refreshContents(true);
14950	15195	maskbit = 6;
14951	15196	break;
14952	15197	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14953	15198	DecDepth();
14954	15199	maskbit = 5;
14955	15200	//if(fontsize > 1) fontsize -= 1;
14956		- if (object.editWindow == null)
14957		- new Exception().printStackTrace();
14958		- else
14959		- object.editWindow.refreshContents(true);
	15201	+// if (object.editWindow == null)
	15202	+// new Exception().printStackTrace();
	15203	+// else
	15204	+ object.GetWindow().refreshContents(true);
14960	15205	break;
14961	15206	case '{':
14962	15207	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15180,7 +15425,7 @@
15180	15425	}
15181	15426	*/
15182	15427
15183		- object.editWindow.EditSelection();
	15428	+ object.GetWindow().EditSelection(false);
15184	15429	}
15185	15430
15186	15431	void SelectParent()
..	..	@@ -15197,10 +15442,10 @@
15197	15442	{
15198	15443	//selectees.remove(i);
15199	15444	System.out.println("select parent of " + elem);
15200		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15445	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15201	15446	} else
15202	15447	{
15203		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15448	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15204	15449	}
15205	15450
15206	15451	first = false;
..	..	@@ -15242,12 +15487,12 @@
15242	15487	for (int j = 0; j < group.children.size(); j++)
15243	15488	{
15244	15489	elem = (Object3D) group.children.elementAt(j);
15245		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15490	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15246	15491	first = false;
15247	15492	}
15248	15493	} else
15249	15494	{
15250		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15495	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15251	15496	}
15252	15497
15253	15498	first = false;
..	..	@@ -15258,21 +15503,21 @@
15258	15503	{
15259	15504	//Composite group = (Composite) object;
15260	15505	Object3D group = object;
15261		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15506	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15262	15507	}
15263	15508
15264	15509	void ResetTransform(int mask)
15265	15510	{
15266	15511	//Composite group = (Composite) object;
15267	15512	Object3D group = object;
15268		- group.editWindow.ResetTransform(mask);
	15513	+ group.GetWindow().ResetTransform(mask);
15269	15514	}
15270	15515
15271	15516	void FlipTransform()
15272	15517	{
15273	15518	//Composite group = (Composite) object;
15274	15519	Object3D group = object;
15275		- group.editWindow.FlipTransform();
	15520	+ group.GetWindow().FlipTransform();
15276	15521	// group.editWindow.ReduceMesh(true);
15277	15522	}
15278	15523
..	..	@@ -15280,7 +15525,7 @@
15280	15525	{
15281	15526	//Composite group = (Composite) object;
15282	15527	Object3D group = object;
15283		- group.editWindow.PrintMemory();
	15528	+ group.GetWindow().PrintMemory();
15284	15529	// group.editWindow.ReduceMesh(true);
15285	15530	}
15286	15531
..	..	@@ -15288,7 +15533,7 @@
15288	15533	{
15289	15534	//Composite group = (Composite) object;
15290	15535	Object3D group = object;
15291		- group.editWindow.ResetCentroid();
	15536	+ group.GetWindow().ResetCentroid();
15292	15537	}
15293	15538
15294	15539	void IncDepth()
..	..	@@ -15374,7 +15619,9 @@
15374	15619	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15375	15620	//Image img = CreateImage(width, height);
15376	15621	//System.out.println("width = " + width + "; height = " + height + "\n");
	15622	+
15377	15623	Graphics gr = g; // img.getGraphics();
	15624	+
15378	15625	if (!hasMarquee)
15379	15626	{
15380	15627	if (Xmin < Xmax) // !locked)
..	..	@@ -15471,15 +15718,53 @@
15471	15718	*/
15472	15719	if (!isRenderer)
15473	15720	{
15474		- object.drawEditHandles(info, 0);
	15721	+ if (object.selection.Size() > 0)
	15722	+ {
	15723	+ int hitSomething = object.selection.get(0).hitSomething;
	15724	+
	15725	+ info.DX = 0;
	15726	+ info.DY = 0;
	15727	+ info.W = 1;
	15728	+ if (hitSomething == Object3D.hitCenter)
	15729	+ {
	15730	+ info.DX = X;
	15731	+ if (X != 0)
	15732	+ info.DX -= info.bounds.width/2;
	15733	+
	15734	+ info.DY = Y;
	15735	+ if (Y != 0)
	15736	+ info.DY -= info.bounds.height/2;
	15737	+ }
	15738	+
	15739	+ object.drawEditHandles(info, 0);
	15740	+
	15741	+ if (drag && (X != 0 \|\| Y != 0))
	15742	+ {
	15743	+ switch (hitSomething)
	15744	+ {
	15745	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15746	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15747	+ break;
	15748	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15749	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15750	+ break;
	15751	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15752	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15753	+ break;
	15754	+ }
	15755	+
	15756	+ }
	15757	+ }
15475	15758	}
15476	15759	}
	15760	+
15477	15761	if (isRenderer)
15478	15762	{
15479	15763	//gr.setColor(Color.black);
15480	15764	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15481	15765	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15482	15766	}
	15767	+
15483	15768	if (hasMarquee)
15484	15769	{
15485	15770	gr.setXORMode(Color.white);
..	..	@@ -15886,7 +16171,7 @@
15886	16171	Object3D object;
15887	16172	static Object3D trackedobject;
15888	16173	Camera renderCamera; // Light or Eye (or Occlusion)
15889		- /static/ Camera manipCamera; // Light or Eye
	16174	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15890	16175	/static/ Camera eyeCamera;
15891	16176	/static/ Camera lightCamera;
15892	16177	int cameracount;
..	..	@@ -16171,16 +16456,16 @@
16171	16456	cStatic.objectstack[materialdepth++] = checker;
16172	16457	//System.out.println("material " + material);
16173	16458	//Applet3D.tracein(this, selected);
16174		- vector2buffer = checker.projectedVertices;
	16459	+ //vector2buffer = checker.projectedVertices;
16175	16460
16176	16461	//checker.GetMaterial().Draw(this, false); // true);
16177		- DrawMaterial(checker.GetMaterial(), false); // true);
	16462	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16178	16463
16179	16464	materialdepth -= 1;
16180	16465	if (materialdepth > 0)
16181	16466	{
16182		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16183		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16467	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16468	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16184	16469	}
16185	16470	//checker.GetMaterial().opacity = 1f;
16186	16471	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16404,6 +16689,8 @@
16404	16689	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16405	16690	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16406	16691
	16692	+ CreateSelectedPoint();
	16693	+
16407	16694	// Will fit the mesh !!!
16408	16695	selectedpoint.toParent[0][0] = 0.0001;
16409	16696	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16457,7 +16744,7 @@
16457	16744	}
16458	16745
16459	16746	if (!movingcamera && !PAINTMODE)
16460		- object.editWindow.ScreenFitPoint(); // fev 2014
	16747	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16461	16748
16462	16749	if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16463	16750	{
..	..	@@ -16469,17 +16756,17 @@
16469	16756
16470	16757	group.add(paintobj); // link
16471	16758
16472		- object.editWindow.SnapObject(group);
	16759	+ object.GetWindow().SnapObject(group);
16473	16760
16474		- Object3D folder = object.editWindow.copy;
	16761	+ Object3D folder = object.GetWindow().copy;
16475	16762
16476		- if (object.editWindow.copy.selection.Size() > 0)
16477		- folder = object.editWindow.copy.selection.elementAt(0);
	16763	+ if (object.GetWindow().copy.selection.Size() > 0)
	16764	+ folder = object.GetWindow().copy.selection.elementAt(0);
16478	16765
16479	16766	folder.add(group);
16480	16767
16481		- object.editWindow.ResetModel();
16482		- object.editWindow.refreshContents();
	16768	+ object.GetWindow().ResetModel();
	16769	+ object.GetWindow().refreshContents();
16483	16770	}
16484	16771	else
16485	16772	paintcount = 0;
..	..	@@ -16518,6 +16805,11 @@
16518	16805	//System.out.println("objects[color] = " + objects[color]);
16519	16806	//objects[color].Select();
16520	16807	indexcount = 0;
	16808	+ ObjEditor window = object.GetWindow();
	16809	+ if (window != null && deselect)
	16810	+ {
	16811	+ window.Select(null, deselect, true);
	16812	+ }
16521	16813	object.Select(color, deselect);
16522	16814	}
16523	16815
..	..	@@ -17043,23 +17335,15 @@
17043	17335	int AAbuffersize = 0;
17044	17336
17045	17337	//double[] selectedpoint = new double[3];
17046		- static Superellipsoid selectedpoint = new Superellipsoid();
	17338	+ static Superellipsoid selectedpoint;
17047	17339	static Sphere previousselectedpoint = null;
17048		- static Sphere debugpointG = new Sphere();
17049		- static Sphere debugpointP = new Sphere();
17050		- static Sphere debugpointC = new Sphere();
17051		- static Sphere debugpointR = new Sphere();
	17340	+ static Sphere debugpointG;
	17341	+ static Sphere debugpointP;
	17342	+ static Sphere debugpointC;
	17343	+ static Sphere debugpointR;
17052	17344
17053	17345	static Sphere debugpoints[] = new Sphere[8];
17054	17346
17055		- static
17056		- {
17057		- for (int i=0; i<8; i++)
17058		- {
17059		- debugpoints[i] = new Sphere();
17060		- }
17061		- }
17062		-
17063	17347	static void InitPoints(float radius)
17064	17348	{
17065	17349	for (int i=0; i<8; i++)