~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;
..	..	@@ -357,7 +358,7 @@
357	358	/**/
358	359	} else
359	360	{
360		- DrawMaterial(material, selected);
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
361	362	}
362	363	} else
363	364	{
..	..	@@ -381,8 +382,8 @@
381	382	cStatic.objectstack[materialdepth++] = obj;
382	383	//System.out.println("material " + material);
383	384	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	387	}
387	388	}
388	389
..	..	@@ -399,8 +400,8 @@
399	400	materialdepth -= 1;
400	401	if (materialdepth > 0)
401	402	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	403	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	404	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	405	}
405	406	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	407	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +421,8 @@
420	421	materialdepth -= 1;
421	422	if (materialdepth > 0)
422	423	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	424	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	425	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	426	}
426	427	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	428	//else
..	..	@@ -462,10 +463,12 @@
462	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	464	{
464	465	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	466	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	467	+ // TEST LIVE NORMALS && !obj.dontselect
	468	+ ;
466	469	if (!hasnorm)
467	470	{
468		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
469	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1193,12 @@
1190	1193	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1194	}
1192	1195	}
	1196	+
1193	1197	if (flipV)
1194	1198	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1199	else
1196	1200	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
1197	1202	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1203	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1204
..	..	@@ -1213,10 +1218,12 @@
1213	1218	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1219	}
1215	1220	}
	1221	+
1216	1222	if (flipV)
1217	1223	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1224	else
1219	1225	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
1220	1227	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1228	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1229
..	..	@@ -1244,8 +1251,10 @@
1244	1251	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1252	else
1246	1253	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
1247	1255	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1256	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
1249	1258	count2 += 2;
1250	1259	count3 += 3;
1251	1260	}
..	..	@@ -1601,7 +1610,7 @@
1601	1610	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1611	}
1603	1612
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1614	{
1606	1615	CameraPane display = this;
1607	1616	//new Exception().printStackTrace();
..	..	@@ -1628,7 +1637,7 @@
1628	1637
1629	1638	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1639
1631		- float[] colorV = GrafreeD.colorV;
	1640	+ float[] colorV = Grafreed.colorV;
1632	1641
1633	1642	/**/
1634	1643	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1636,7 +1645,7 @@
1636	1645	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1646	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1647	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1648	+ colorV[3] = 1; // material.opacity;
1640	1649
1641	1650	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1651	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1753,9 @@
1744	1753	display.modelParams7[2] = 0;
1745	1754	display.modelParams7[3] = 0;
1746	1755
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1757
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1759	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1760	{
1752	1761	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1897,7 @@
1888	1897	void PushMatrix(double[][] matrix)
1889	1898	{
1890	1899	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1892	1901	}
1893	1902
1894	1903	void PushMatrix()
..	..	@@ -2140,7 +2149,7 @@
2140	2149	System.err.println("LIVE = " + Globals.isLIVE());
2141	2150
2142	2151	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2152	+ Grafreed.savesound = true; // wav.save();
2144	2153	// else
2145	2154	repaint(); // start loop // may 2013
2146	2155	}
..	..	@@ -2257,7 +2266,7 @@
2257	2266
2258	2267	void ToggleDebug()
2259	2268	{
2260		- DEBUG ^= true;
	2269	+ Globals.DEBUG ^= true;
2261	2270	}
2262	2271
2263	2272	void ToggleLookAt()
..	..	@@ -2265,7 +2274,7 @@
2265	2274	LOOKAT ^= true;
2266	2275	}
2267	2276
2268		- void ToggleRandom()
	2277	+ void ToggleSwitch()
2269	2278	{
2270	2279	SWITCH ^= true;
2271	2280	}
..	..	@@ -2374,7 +2383,7 @@
2374	2383	{
2375	2384	return currentGL;
2376	2385	}
2377		-
	2386	+
2378	2387	/**/
2379	2388	class CacheTexture
2380	2389	{
..	..	@@ -7919,6 +7928,64 @@
7919	7928	ReleaseTexture(pigment, false);
7920	7929	}
7921	7930
	7931	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7932	+ {
	7933	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7934	+ {
	7935	+ return;
	7936	+ }
	7937	+
	7938	+ if (tex == null)
	7939	+ {
	7940	+ ReleaseTexture(null, false);
	7941	+ return;
	7942	+ }
	7943	+
	7944	+ String pigment = Object3D.GetPigment(tex);
	7945	+
	7946	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7947	+ {
	7948	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7949	+ // System.out.println("; bump = " + bump);
	7950	+ }
	7951	+
	7952	+ if (pigment.equals(""))
	7953	+ {
	7954	+ pigment = null;
	7955	+ }
	7956	+
	7957	+ ReleaseTexture(pigment, false);
	7958	+ }
	7959	+
	7960	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7961	+ {
	7962	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7963	+ {
	7964	+ return;
	7965	+ }
	7966	+
	7967	+ if (tex == null)
	7968	+ {
	7969	+ ReleaseTexture(null, true);
	7970	+ return;
	7971	+ }
	7972	+
	7973	+ String bump = Object3D.GetBump(tex);
	7974	+
	7975	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7976	+ {
	7977	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7978	+ // System.out.println("; bump = " + bump);
	7979	+ }
	7980	+
	7981	+ if (bump.equals(""))
	7982	+ {
	7983	+ bump = null;
	7984	+ }
	7985	+
	7986	+ ReleaseTexture(bump, true);
	7987	+ }
	7988	+
7922	7989	void ReleaseTexture(String tex, boolean bump)
7923	7990	{
7924	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8022,7 +8089,7 @@
8022	8089	}
8023	8090	}
8024	8091
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8093	{
8027	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8067,7 +8134,94 @@
8067	8134	return; // true;
8068	8135	}
8069	8136
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8137	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8138	+ {
	8139	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8140	+ ambientOcclusion ) // \|\| !textureon)
	8141	+ {
	8142	+ return; // false;
	8143	+ }
	8144	+
	8145	+ if (tex == null)
	8146	+ {
	8147	+ BindTexture(null,false,resolution);
	8148	+ return;
	8149	+ }
	8150	+
	8151	+ String pigment = Object3D.GetPigment(tex);
	8152	+
	8153	+ usedtextures.put(pigment, pigment);
	8154	+
	8155	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8156	+ {
	8157	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8158	+ // System.out.println("; bump = " + bump);
	8159	+ }
	8160	+
	8161	+ if (pigment.equals(""))
	8162	+ {
	8163	+ pigment = null;
	8164	+ }
	8165	+
	8166	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8167	+ BindTexture(pigment, false, resolution);
	8168	+ }
	8169	+
	8170	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8171	+ {
	8172	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8173	+ ambientOcclusion ) // \|\| !textureon)
	8174	+ {
	8175	+ return; // false;
	8176	+ }
	8177	+
	8178	+ if (tex == null)
	8179	+ {
	8180	+ BindTexture(null,true,resolution);
	8181	+ return;
	8182	+ }
	8183	+
	8184	+ String bump = Object3D.GetBump(tex);
	8185	+
	8186	+ usedtextures.put(bump, bump);
	8187	+
	8188	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8189	+ {
	8190	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8191	+ // System.out.println("; bump = " + bump);
	8192	+ }
	8193	+
	8194	+ if (bump.equals(""))
	8195	+ {
	8196	+ bump = null;
	8197	+ }
	8198	+
	8199	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8200	+ BindTexture(bump, true, resolution);
	8201	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8202	+ }
	8203	+
	8204	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8205	+
	8206	+ private boolean FileExists(String tex)
	8207	+ {
	8208	+ if (missingTextures.contains(tex))
	8209	+ {
	8210	+ return false;
	8211	+ }
	8212	+
	8213	+ boolean fileExists = new File(tex).exists();
	8214	+
	8215	+ if (!fileExists)
	8216	+ {
	8217	+ // If file exists, the "new File()" is not executed sgain
	8218	+ missingTextures.add(tex);
	8219	+ }
	8220	+
	8221	+ return fileExists;
	8222	+ }
	8223	+
	8224	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8071	8225	{
8072	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8073	8227
..	..	@@ -8075,15 +8229,17 @@
8075	8229	{
8076	8230	String texname = tex;
8077	8231
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
8078	8234	// String[] split = tex.split("Textures");
8079	8235	// if (split.length > 1)
8080	8236	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8237	// else
8082	8238	// if (!texname.startsWith("/"))
8083	8239	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8240	+ if (!FileExists(tex))
8085	8241	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8242	+ texname = fallbackTextureName;
8087	8243	}
8088	8244
8089	8245	if (CACHETEXTURE)
..	..	@@ -8153,7 +8309,7 @@
8153	8309	}
8154	8310
8155	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
8157	8313	cachename = texname;
8158	8314	else
8159	8315	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8331,7 @@
8175	8331	}
8176	8332
8177	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
8179	8335	cachename = texname;
8180	8336	else
8181	8337	processbump = false; // don't process bump map again
..	..	@@ -8184,7 +8340,9 @@
8184	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8341
8186	8342
8187		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
8188	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8189	8347	//texture = GetTexture(tex, bump);
8190	8348	}
..	..	@@ -8306,7 +8464,7 @@
8306	8464	return texture;
8307	8465	}
8308	8466
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8467	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8310	8468	{
8311	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8470
..	..	@@ -8324,14 +8482,14 @@
8324	8482	return texture!=null?texture.texture:null;
8325	8483	}
8326	8484
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8485	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8328	8486	{
8329	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8488
8331	8489	return texture!=null?texture.texturedata:null;
8332	8490	}
8333	8491
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8335	8493	{
8336	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8495	{
..	..	@@ -9208,11 +9366,35 @@
9208	9366	jy8[3] = 0.5f;
9209	9367	}
9210	9368
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9369	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9370	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9371	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9372	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9373
	9374	+ void ResetOptions()
	9375	+ {
	9376	+ options1[0] = 100;
	9377	+ options1[1] = 0.00001f;
	9378	+ options1[2] = 20;
	9379	+ options1[3] = 0;
	9380	+ options1[4] = 0;
	9381	+
	9382	+ options2[0] = 0;
	9383	+ options2[1] = 1;
	9384	+ options2[2] = 0;
	9385	+ options2[3] = 0;
	9386	+
	9387	+ options3[0] = 1;
	9388	+ options3[1] = 1;
	9389	+ options3[2] = 1;
	9390	+ options3[3] = 0;
	9391	+
	9392	+ options4[0] = 1;
	9393	+ options4[1] = 0;
	9394	+ options4[2] = 1;
	9395	+ options4[3] = 0;
	9396	+ }
	9397	+
9216	9398	static int imagecount = 0; // movie generation
9217	9399
9218	9400	static int jitter = 0;
..	..	@@ -9308,8 +9490,8 @@
9308	9490	assert (parentcam != renderCamera);
9309	9491
9310	9492	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9493	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9494	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9313	9495
9314	9496	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9497
..	..	@@ -9324,8 +9506,8 @@
9324	9506	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9507
9326	9508	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9509	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9510	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9329	9511
9330	9512	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9513
..	..	@@ -9542,7 +9724,7 @@
9542	9724
9543	9725	if (!BOXMODE)
9544	9726	{
9545		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9727	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9546	9728	}
9547	9729
9548	9730	if (!BOXMODE)
..	..	@@ -9580,7 +9762,7 @@
9580	9762	ABORTED = false;
9581	9763	}
9582	9764	else
9583		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9765	+ Grafreed.wav.cursor += 735 * ACSIZE;
9584	9766
9585	9767	if (false)
9586	9768	{
..	..	@@ -10243,11 +10425,11 @@
10243	10425
10244	10426	public void display(GLAutoDrawable drawable)
10245	10427	{
10246		- if (GrafreeD.savesound && GrafreeD.hassound)
	10428	+ if (Grafreed.savesound && Grafreed.hassound)
10247	10429	{
10248		- GrafreeD.wav.save();
10249		- GrafreeD.savesound = false;
10250		- GrafreeD.hassound = false;
	10430	+ Grafreed.wav.save();
	10431	+ Grafreed.savesound = false;
	10432	+ Grafreed.hassound = false;
10251	10433	}
10252	10434	// if (DEBUG_SELECTION)
10253	10435	// {
..	..	@@ -10323,6 +10505,7 @@
10323	10505	ANTIALIAS = 0;
10324	10506	//System.out.println("RESTART");
10325	10507	AAtimer.restart();
	10508	+ Globals.TIMERRUNNING = true;
10326	10509	}
10327	10510	}
10328	10511	}
..	..	@@ -10377,7 +10560,7 @@
10377	10560	Object3D theobject = object;
10378	10561	Object3D theparent = object.parent;
10379	10562	object.parent = null;
10380		- object = (Object3D)GrafreeD.clone(object);
	10563	+ object = (Object3D)Grafreed.clone(object);
10381	10564	object.Stripify();
10382	10565	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10383	10566	theobject.PreprocessOcclusion(this);
..	..	@@ -10390,13 +10573,14 @@
10390	10573	ambientOcclusion = false;
10391	10574	}
10392	10575
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10576	+ if (//Globals.lighttouched &&
	10577	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10578	{
10395	10579	//if (RENDERSHADOW) // ?
10396	10580	if (!IsFrozen())
10397	10581	{
10398	10582	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10583	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10584	{
10401	10585	Globals.framecount++;
10402	10586	shadowbuffer.display();
..	..	@@ -10523,8 +10707,8 @@
10523	10707
10524	10708	// if (parentcam != renderCamera) // not a light
10525	10709	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10710	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10711	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10528	10712
10529	10713	for (int j = 0; j < 4; j++)
10530	10714	{
..	..	@@ -10538,8 +10722,8 @@
10538	10722
10539	10723	// if (parentcam != renderCamera) // not a light
10540	10724	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10725	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10726	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10543	10727
10544	10728	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10729
..	..	@@ -10798,7 +10982,16 @@
10798	10982	// Bump noise
10799	10983	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	10984	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	10985	+
	10986	+ try
	10987	+ {
	10988	+ BindTexture(NOISE_TEXTURE, false, 2);
	10989	+ }
	10990	+ catch (Exception e)
	10991	+ {
	10992	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10993	+ }
	10994	+
10802	10995
10803	10996	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	10997	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10923,8 +11116,8 @@
10923	11116	System.err.println("parentcam != renderCamera");
10924	11117
10925	11118	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11119	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11120	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10928	11121	}
10929	11122
10930	11123	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11138,8 @@
10945	11138	if (true) // TODO
10946	11139	{
10947	11140	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11141	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11142	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11143	}
10951	11144
10952	11145	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11283,16 +11476,37 @@
11283	11476	e.printStackTrace();
11284	11477	}
11285	11478
11286		- if (GrafreeD.RENDERME > 0)
11287		- GrafreeD.RENDERME--; // mechante magouille
	11479	+ if (Grafreed.RENDERME > 0)
	11480	+ Grafreed.RENDERME--; // mechante magouille
11288	11481
11289	11482	Globals.ONESTEP = false;
11290	11483	}
11291	11484
11292	11485	static boolean zoomonce = false;
11293	11486
	11487	+ static void CreateSelectedPoint()
	11488	+ {
	11489	+ if (selectedpoint == null)
	11490	+ {
	11491	+ debugpointG = new Sphere();
	11492	+ debugpointP = new Sphere();
	11493	+ debugpointC = new Sphere();
	11494	+ debugpointR = new Sphere();
	11495	+
	11496	+ selectedpoint = new Superellipsoid();
	11497	+
	11498	+ for (int i=0; i<8; i++)
	11499	+ {
	11500	+ debugpoints[i] = new Sphere();
	11501	+ }
	11502	+ }
	11503	+ }
	11504	+
11294	11505	void DrawObject(GL gl, boolean draw)
11295	11506	{
	11507	+ // To clear camera values
	11508	+ ResetOptions();
	11509	+
11296	11510	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11511	// DrawMode() = SELECTION;
11298	11512	//GL gl = getGL();
..	..	@@ -11354,7 +11568,14 @@
11354	11568
11355	11569	usedtextures.clear();
11356	11570
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11571	+ try
	11572	+ {
	11573	+ BindTextures(DEFAULT_TEXTURES, 2);
	11574	+ }
	11575	+ catch (Exception e)
	11576	+ {
	11577	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11578	+ }
11358	11579	}
11359	11580	//System.out.println("--> " + stackdepth);
11360	11581	// GrafreeD.traceon();
..	..	@@ -11364,8 +11585,9 @@
11364	11585
11365	11586	if (DrawMode() == DEFAULT)
11366	11587	{
11367		- if (DEBUG)
	11588	+ if (Globals.DEBUG)
11368	11589	{
	11590	+ CreateSelectedPoint();
11369	11591	float radius = 0.05f;
11370	11592	if (selectedpoint.radius != radius)
11371	11593	{
..	..	@@ -11445,7 +11667,14 @@
11445	11667	if (checker != null && DrawMode() == DEFAULT)
11446	11668	{
11447	11669	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11670	+ try
	11671	+ {
	11672	+ BindTextures(checker.GetTextures(), checker.texres);
	11673	+ }
	11674	+ catch (Exception e)
	11675	+ {
	11676	+ System.err.println("FAILED: " + checker.GetTextures());
	11677	+ }
11449	11678	// NEAREST
11450	11679	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11680	DrawChecker(gl);
..	..	@@ -11527,7 +11756,7 @@
11527	11756	return;
11528	11757	}
11529	11758
11530		- String string = obj.GetToolTip();
	11759	+ String string = obj.toString(); //.GetToolTip();
11531	11760
11532	11761	GL gl = GetGL();
11533	11762
..	..	@@ -11844,8 +12073,8 @@
11844	12073	//obj.TransformToWorld(light, light);
11845	12074	for (int i = tp.size(); --i >= 0;)
11846	12075	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12076	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12077	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12078	}
11850	12079
11851	12080
..	..	@@ -11862,8 +12091,8 @@
11862	12091	parentcam = cameras[0];
11863	12092	}
11864	12093
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12094	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12095	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12096
11868	12097	LA.xformPos(light, renderCamera.toScreen, light);
11869	12098
..	..	@@ -12477,8 +12706,8 @@
12477	12706
12478	12707	// display shadow only (bump == 0)
12479	12708	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	12709	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12710	+ "SLT temp.z, temp.y, -one2048th.x;" +
12482	12711	"SUB temp.y, one.x, temp.z;" +
12483	12712	"MUL temp.x, temp.x, temp.y;" +
12484	12713	"KIL temp.x;" +
..	..	@@ -12809,7 +13038,7 @@
12809	13038	//once = true;
12810	13039	}
12811	13040
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13041	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13042	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13043	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13044
..	..	@@ -12942,12 +13171,16 @@
12942	13171
12943	13172	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13173	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13174	+
	13175	+ // Compare fragment depth in light space with shadowmap.
12945	13176	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13177	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13178	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13179	+
	13180	+ // Reverse comparison
12948	13181	"SUB temp.x, one.x, temp.x;" +
12949	13182	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13183	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13184	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13185
12953	13186	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13194,10 @@
12961	13194	// No shadow for backface
12962	13195	"DP3 temp.x, normal, lightd;" +
12963	13196	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13197	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13198	+
	13199	+ // No shadow when out of frustrum
	13200	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13201	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13202	"";
12966	13203	}
..	..	@@ -13107,7 +13344,8 @@
13107	13344	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13345	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13346	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13347	+
	13348	+ //Object3D.cVector2[] vector2buffer;
13111	13349
13112	13350	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13351	// OUT : diff, spec
..	..	@@ -13519,7 +13757,7 @@
13519	13757	public void mousePressed(MouseEvent e)
13520	13758	{
13521	13759	//System.out.println("mousePressed: " + e);
13522		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13760	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13523	13761	}
13524	13762
13525	13763	static long prevtime = 0;
..	..	@@ -13595,8 +13833,8 @@
13595	13833	// mode \|= META;
13596	13834	//}
13597	13835
13598		- SetMouseMode(WHEEL \| e.getModifiersEx());
13599		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13836	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13837	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13600	13838	anchorX = ax;
13601	13839	anchorY = ay;
13602	13840	prevX = px;
..	..	@@ -13630,6 +13868,7 @@
13630	13868	else
13631	13869	if (evt.getSource() == AAtimer)
13632	13870	{
	13871	+ Globals.TIMERRUNNING = false;
13633	13872	if (mouseDown)
13634	13873	{
13635	13874	//new Exception().printStackTrace();
..	..	@@ -13655,6 +13894,10 @@
13655	13894	// LIVE = waslive;
13656	13895	// wasliveok = true;
13657	13896	// waslive = false;
	13897	+
	13898	+ // May 2019 Forget it:
	13899	+ if (true)
	13900	+ return;
13658	13901
13659	13902	// source == timer
13660	13903	if (mouseDown)
..	..	@@ -13694,12 +13937,13 @@
13694	13937
13695	13938	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13696	13939
13697		- void clickStart(int x, int y, int modifiers)
	13940	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13698	13941	{
13699	13942	if (!wasliveok)
13700	13943	return;
13701	13944
13702	13945	AAtimer.restart(); //
	13946	+ Globals.TIMERRUNNING = true;
13703	13947
13704	13948	// waslive = LIVE;
13705	13949	// LIVE = false;
..	..	@@ -13711,7 +13955,7 @@
13711	13955	// touched = true; // main DL
13712	13956	if (isRenderer)
13713	13957	{
13714		- SetMouseMode(modifiers);
	13958	+ SetMouseMode(modifiers, modifiersex);
13715	13959	}
13716	13960
13717	13961	selectX = anchorX = x;
..	..	@@ -13724,7 +13968,7 @@
13724	13968	clicked = true;
13725	13969	hold = false;
13726	13970
13727		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13971	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13728	13972	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13729	13973	{
13730	13974	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13755,7 +13999,7 @@
13755	13999	info.camera = renderCamera;
13756	14000	info.x = x;
13757	14001	info.y = y;
13758		- info.modifiers = modifiers;
	14002	+ info.modifiers = modifiersex;
13759	14003	editObj = object.doEditClick(info, 0);
13760	14004	if (!editObj)
13761	14005	{
..	..	@@ -13772,9 +14016,12 @@
13772	14016
13773	14017	public void mouseDragged(MouseEvent e)
13774	14018	{
	14019	+ Globals.MOUSEDRAGGED = true;
	14020	+
13775	14021	//System.out.println("mouseDragged: " + e);
13776	14022	if (isRenderer)
13777	14023	movingcamera = true;
	14024	+
13778	14025	//if (drawing)
13779	14026	//return;
13780	14027	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13784,7 +14031,7 @@
13784	14031	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13785	14032	}
13786	14033	else
13787		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14034	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13788	14035
13789	14036	//try { Thread.sleep(1); } catch (Exception ex) {}
13790	14037	}
..	..	@@ -14021,7 +14268,7 @@
14021	14268	{
14022	14269	Globals.lighttouched = true;
14023	14270	}
14024		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14271	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14025	14272	}
14026	14273	//else
14027	14274	}
..	..	@@ -14121,7 +14368,7 @@
14121	14368	int X, Y;
14122	14369	boolean SX, SY;
14123	14370
14124		- void drag(int x, int y, int modifiers)
	14371	+ void drag(int x, int y, int modifiers, int modifiersex)
14125	14372	{
14126	14373	if (IsFrozen())
14127	14374	{
..	..	@@ -14130,17 +14377,17 @@
14130	14377
14131	14378	drag = true; // NEW
14132	14379
14133		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14380	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14134	14381
14135	14382	X = x;
14136	14383	Y = y;
14137	14384	// floating state for animation
14138		- MODIFIERS = modifiers;
14139		- modifiers &= ~1024;
	14385	+ MODIFIERS = modifiersex;
	14386	+ modifiersex &= ~1024;
14140	14387	if (false) // modifiers != 0)
14141	14388	{
14142	14389	//new Exception().printStackTrace();
14143		- System.out.println("mouseDragged: " + modifiers);
	14390	+ System.out.println("mouseDragged: " + modifiersex);
14144	14391	System.out.println("SHIFT = " + SHIFT);
14145	14392	System.out.println("CONTROL = " + COMMAND);
14146	14393	System.out.println("META = " + META);
..	..	@@ -14160,7 +14407,8 @@
14160	14407	info.camera = renderCamera;
14161	14408	info.x = x;
14162	14409	info.y = y;
14163		- object.editWindow.copy.doEditDrag(info);
	14410	+ object.GetWindow().copy
	14411	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14164	14412	} else
14165	14413	{
14166	14414	if (x < startX)
..	..	@@ -14324,7 +14572,9 @@
14324	14572	ci.camera = renderCamera;
14325	14573	if (!isRenderer)
14326	14574	{
14327		- if (object.editWindow.copy.doEditClick(ci, 0))
	14575	+ //ObjEditor editWindow = object.editWindow;
	14576	+ //Object3D copy = editWindow.copy;
	14577	+ if (object.doEditClick(ci, 0))
14328	14578	{
14329	14579	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14330	14580	} else
..	..	@@ -14336,7 +14586,10 @@
14336	14586
14337	14587	public void mouseReleased(MouseEvent e)
14338	14588	{
	14589	+ Globals.MOUSEDRAGGED = false;
	14590	+
14339	14591	movingcamera = false;
	14592	+ X = Y = 0;
14340	14593	//System.out.println("mouseReleased: " + e);
14341	14594	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14342	14595	}
..	..	@@ -14359,9 +14612,9 @@
14359	14612	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360	14613	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361	14614
14362		- if (control \|\| command \|\| IsFrozen())
	14615	+// No delay if (control \|\| command \|\| IsFrozen())
14363	14616	timeout = true;
14364		- else
	14617	+// ?? May 2019 else
14365	14618	// timer.setDelay((modifiers & 128) != 0?0:350);
14366	14619	mouseDown = false;
14367	14620	if (!control && !command) // june 2013
..	..	@@ -14471,7 +14724,7 @@
14471	14724	System.out.println("keyReleased: " + e);
14472	14725	}
14473	14726
14474		- void SetMouseMode(int modifiers)
	14727	+ void SetMouseMode(int modifiers, int modifiersex)
14475	14728	{
14476	14729	//System.out.println("SetMouseMode = " + modifiers);
14477	14730	//modifiers &= ~1024;
..	..	@@ -14483,7 +14736,7 @@
14483	14736	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14484	14737	// return;
14485	14738	//System.out.println("SetMode = " + modifiers);
14486		- if ((modifiers & WHEEL) == WHEEL)
	14739	+ if ((modifiersex & WHEEL) == WHEEL)
14487	14740	{
14488	14741	mouseMode \|= ZOOM;
14489	14742	}
..	..	@@ -14493,15 +14746,15 @@
14493	14746	{
14494	14747	mouseMode \|= VR; // BACKFORTH;
14495	14748	}
14496		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14749	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14497	14750	{
14498	14751	mouseMode \|= SELECT;
14499	14752	}
14500		- if ((modifiers & COMMAND) == COMMAND)
	14753	+ if ((modifiersex & COMMAND) == COMMAND)
14501	14754	{
14502	14755	mouseMode \|= SELECT;
14503	14756	}
14504		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14757	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14505	14758	{
14506	14759	mouseMode &= ~VR;
14507	14760	mouseMode \|= TRANSLATE;
..	..	@@ -14530,7 +14783,7 @@
14530	14783
14531	14784	if (isRenderer) //
14532	14785	{
14533		- SetMouseMode(modifiers);
	14786	+ SetMouseMode(0, modifiers);
14534	14787	}
14535	14788
14536	14789	Globals.theRenderer.keyPressed(key);
..	..	@@ -14702,8 +14955,14 @@
14702	14955	RevertCamera();
14703	14956	repaint();
14704	14957	break;
14705		- case 'L':
14706	14958	case 'l':
	14959	+ lightMode ^= true;
	14960	+ Globals.lighttouched = true;
	14961	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14962	+ targetLookAt.set(manipCamera.lookAt);
	14963	+ repaint();
	14964	+ break;
	14965	+ case 'L':
14707	14966	if (lightMode)
14708	14967	{
14709	14968	lightMode = false;
..	..	@@ -14850,23 +15109,21 @@
14850	15109	kompactbit = 6;
14851	15110	break;
14852	15111	case ' ':
14853		- lightMode ^= true;
14854		- Globals.lighttouched = true;
14855		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14856		- targetLookAt.set(manipCamera.lookAt);
	15112	+ ObjEditor.theFrame.ToggleFullScreen();
14857	15113	repaint();
14858	15114	break;
14859	15115	//case '`' :
14860	15116	case ESC:
14861	15117	RENDERPROGRAM += 1;
14862	15118	RENDERPROGRAM %= 3;
	15119	+
14863	15120	repaint();
14864	15121	break;
14865	15122	case 'Z':
14866	15123	//RESIZETEXTURE ^= true;
14867	15124	//break;
14868	15125	case 'z':
14869		- RENDERSHADOW ^= true;
	15126	+ Globals.RENDERSHADOW ^= true;
14870	15127	Globals.lighttouched = true;
14871	15128	repaint();
14872	15129	break;
..	..	@@ -14990,7 +15247,7 @@
14990	15247	//mode = ROTATE;
14991	15248	if ((MODIFIERS & COMMAND) == 0) // VR??
14992	15249	{
14993		- SetMouseMode(modifiers);
	15250	+ SetMouseMode(0, modifiers);
14994	15251	}
14995	15252	}
14996	15253
..	..	@@ -15151,7 +15408,7 @@
15151	15408	}
15152	15409	*/
15153	15410
15154		- object.editWindow.EditSelection();
	15411	+ object.editWindow.EditSelection(false);
15155	15412	}
15156	15413
15157	15414	void SelectParent()
..	..	@@ -15345,7 +15602,9 @@
15345	15602	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15346	15603	//Image img = CreateImage(width, height);
15347	15604	//System.out.println("width = " + width + "; height = " + height + "\n");
	15605	+
15348	15606	Graphics gr = g; // img.getGraphics();
	15607	+
15349	15608	if (!hasMarquee)
15350	15609	{
15351	15610	if (Xmin < Xmax) // !locked)
..	..	@@ -15443,14 +15702,33 @@
15443	15702	if (!isRenderer)
15444	15703	{
15445	15704	object.drawEditHandles(info, 0);
	15705	+
	15706	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15707	+ {
	15708	+ switch (object.selection.get(0).hitSomething)
	15709	+ {
	15710	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15711	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15712	+ break;
	15713	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15714	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15715	+ break;
	15716	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15717	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15718	+ break;
	15719	+ }
	15720	+
	15721	+ }
15446	15722	}
15447	15723	}
	15724	+
15448	15725	if (isRenderer)
15449	15726	{
15450	15727	//gr.setColor(Color.black);
15451	15728	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15452	15729	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15453	15730	}
	15731	+
15454	15732	if (hasMarquee)
15455	15733	{
15456	15734	gr.setXORMode(Color.white);
..	..	@@ -15563,6 +15841,7 @@
15563	15841	public boolean mouseDown(Event evt, int x, int y)
15564	15842	{
15565	15843	System.out.println("mouseDown: " + evt);
	15844	+ System.exit(0);
15566	15845	/*
15567	15846	locked = true;
15568	15847	drag = false;
..	..	@@ -15606,7 +15885,7 @@
15606	15885	{
15607	15886	keyPressed(0, modifiers);
15608	15887	}
15609		- clickStart(x, y, modifiers);
	15888	+ // clickStart(x, y, modifiers);
15610	15889	return true;
15611	15890	}
15612	15891
..	..	@@ -15724,7 +16003,7 @@
15724	16003	{
15725	16004	keyReleased(0, 0);
15726	16005	}
15727		- drag(x, y, modifiers);
	16006	+ drag(x, y, 0, modifiers);
15728	16007	return true;
15729	16008	}
15730	16009
..	..	@@ -15856,7 +16135,7 @@
15856	16135	Object3D object;
15857	16136	static Object3D trackedobject;
15858	16137	Camera renderCamera; // Light or Eye (or Occlusion)
15859		- /static/ Camera manipCamera; // Light or Eye
	16138	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15860	16139	/static/ Camera eyeCamera;
15861	16140	/static/ Camera lightCamera;
15862	16141	int cameracount;
..	..	@@ -16141,16 +16420,16 @@
16141	16420	cStatic.objectstack[materialdepth++] = checker;
16142	16421	//System.out.println("material " + material);
16143	16422	//Applet3D.tracein(this, selected);
16144		- vector2buffer = checker.projectedVertices;
	16423	+ //vector2buffer = checker.projectedVertices;
16145	16424
16146	16425	//checker.GetMaterial().Draw(this, false); // true);
16147		- DrawMaterial(checker.GetMaterial(), false); // true);
	16426	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16148	16427
16149	16428	materialdepth -= 1;
16150	16429	if (materialdepth > 0)
16151	16430	{
16152		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16153		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16431	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16432	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16154	16433	}
16155	16434	//checker.GetMaterial().opacity = 1f;
16156	16435	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16374,6 +16653,8 @@
16374	16653	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16375	16654	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16376	16655
	16656	+ CreateSelectedPoint();
	16657	+
16377	16658	// Will fit the mesh !!!
16378	16659	selectedpoint.toParent[0][0] = 0.0001;
16379	16660	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16422,16 +16703,16 @@
16422	16703	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16423	16704	}
16424	16705
16425		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16706	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16426	16707	}
16427	16708	}
16428	16709
16429	16710	if (!movingcamera && !PAINTMODE)
16430	16711	object.editWindow.ScreenFitPoint(); // fev 2014
16431	16712
16432		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16713	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16433	16714	{
16434		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16715	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16435	16716
16436	16717	Object3D group = new Object3D("inst" + paintcount++);
16437	16718
..	..	@@ -16587,7 +16868,7 @@
16587	16868	gl.glDisable(gl.GL_CULL_FACE);
16588	16869	}
16589	16870
16590		- if (!RENDERSHADOW)
	16871	+ if (!Globals.RENDERSHADOW)
16591	16872	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16592	16873
16593	16874	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16597,7 +16878,7 @@
16597	16878	//gl.glColorMask(false, false, false, false);
16598	16879
16599	16880	//render_scene_from_light_view(gl, drawable, 0, 0);
16600		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16881	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16601	16882	{
16602	16883	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16603	16884
..	..	@@ -17013,23 +17294,15 @@
17013	17294	int AAbuffersize = 0;
17014	17295
17015	17296	//double[] selectedpoint = new double[3];
17016		- static Superellipsoid selectedpoint = new Superellipsoid();
	17297	+ static Superellipsoid selectedpoint;
17017	17298	static Sphere previousselectedpoint = null;
17018		- static Sphere debugpointG = new Sphere();
17019		- static Sphere debugpointP = new Sphere();
17020		- static Sphere debugpointC = new Sphere();
17021		- static Sphere debugpointR = new Sphere();
	17299	+ static Sphere debugpointG;
	17300	+ static Sphere debugpointP;
	17301	+ static Sphere debugpointC;
	17302	+ static Sphere debugpointR;
17022	17303
17023	17304	static Sphere debugpoints[] = new Sphere[8];
17024	17305
17025		- static
17026		- {
17027		- for (int i=0; i<8; i++)
17028		- {
17029		- debugpoints[i] = new Sphere();
17030		- }
17031		- }
17032		-
17033	17306	static void InitPoints(float radius)
17034	17307	{
17035	17308	for (int i=0; i<8; i++)