~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
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -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();
..	..	@@ -1628,7 +1651,7 @@
1628	1651
1629	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1653
1631		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1632	1655
1633	1656	/**/
1634	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -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()
..	..	@@ -2140,7 +2163,7 @@
2140	2163	System.err.println("LIVE = " + Globals.isLIVE());
2141	2164
2142	2165	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2144	2167	// else
2145	2168	repaint(); // start loop // may 2013
2146	2169	}
..	..	@@ -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,9 +2288,9 @@
2265	2288	LOOKAT ^= true;
2266	2289	}
2267	2290
2268		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2269	2292	{
2270		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
2271	2294	}
2272	2295
2273	2296	void ToggleHandles()
..	..	@@ -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,12 +8243,18 @@
8075	8243	{
8076	8244	String texname = tex;
8077	8245
8078		- String[] split = tex.split("Textures");
8079		- if (split.length > 1)
8080		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081		- else
8082		- if (!texname.startsWith("/"))
8083		- texname = "/Users/nbriere/Textures/" + texname;
	8246	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8247	+
	8248	+// String[] split = tex.split("Textures");
	8249	+// if (split.length > 1)
	8250	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8251	+// else
	8252	+// if (!texname.startsWith("/"))
	8253	+// texname = "/Users/nbriere/Textures/" + texname;
	8254	+ if (!FileExists(tex))
	8255	+ {
	8256	+ texname = fallbackTextureName;
	8257	+ }
8084	8258
8085	8259	if (CACHETEXTURE)
8086	8260	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8149,7 +8323,7 @@
8149	8323	}
8150	8324
8151	8325	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152		- if (!new File(cachename).exists())
	8326	+ if (!FileExists(cachename))
8153	8327	cachename = texname;
8154	8328	else
8155	8329	processbump = false; // don't process bump map again
..	..	@@ -8171,7 +8345,7 @@
8171	8345	}
8172	8346
8173	8347	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174		- if (!new File(cachename).exists())
	8348	+ if (!FileExists(cachename))
8175	8349	cachename = texname;
8176	8350	else
8177	8351	processbump = false; // don't process bump map again
..	..	@@ -8180,7 +8354,9 @@
8180	8354	texturedata = GetFileTexture(cachename, processbump, resolution);
8181	8355
8182	8356
8183		- if (texturedata != null)
	8357	+ if (texturedata == null)
	8358	+ throw new Exception();
	8359	+
8184	8360	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8185	8361	//texture = GetTexture(tex, bump);
8186	8362	}
..	..	@@ -8302,7 +8478,7 @@
8302	8478	return texture;
8303	8479	}
8304	8480
8305		- 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
8306	8482	{
8307	8483	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8308	8484
..	..	@@ -8320,14 +8496,14 @@
8320	8496	return texture!=null?texture.texture:null;
8321	8497	}
8322	8498
8323		- 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
8324	8500	{
8325	8501	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8326	8502
8327	8503	return texture!=null?texture.texturedata:null;
8328	8504	}
8329	8505
8330		- boolean BindTexture(String tex, boolean bump, int resolution)
	8506	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8331	8507	{
8332	8508	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8333	8509	{
..	..	@@ -9204,11 +9380,35 @@
9204	9380	jy8[3] = 0.5f;
9205	9381	}
9206	9382
9207		- 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
9208	9384	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9209	9385	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9210	9386	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9211	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	+
9212	9412	static int imagecount = 0; // movie generation
9213	9413
9214	9414	static int jitter = 0;
..	..	@@ -9304,8 +9504,8 @@
9304	9504	assert (parentcam != renderCamera);
9305	9505
9306	9506	if (renderCamera != lightCamera)
9307		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9507	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9508	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9309	9509
9310	9510	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9311	9511
..	..	@@ -9320,8 +9520,8 @@
9320	9520	LA.matCopy(renderCamera.fromScreen, matrix);
9321	9521
9322	9522	if (renderCamera != lightCamera)
9323		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9523	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9524	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9325	9525
9326	9526	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9327	9527
..	..	@@ -9538,7 +9738,7 @@
9538	9738
9539	9739	if (!BOXMODE)
9540	9740	{
9541		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9741	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9542	9742	}
9543	9743
9544	9744	if (!BOXMODE)
..	..	@@ -9576,7 +9776,7 @@
9576	9776	ABORTED = false;
9577	9777	}
9578	9778	else
9579		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9779	+ Grafreed.wav.cursor += 735 * ACSIZE;
9580	9780
9581	9781	if (false)
9582	9782	{
..	..	@@ -10239,11 +10439,11 @@
10239	10439
10240	10440	public void display(GLAutoDrawable drawable)
10241	10441	{
10242		- if (GrafreeD.savesound && GrafreeD.hassound)
	10442	+ if (Grafreed.savesound && Grafreed.hassound)
10243	10443	{
10244		- GrafreeD.wav.save();
10245		- GrafreeD.savesound = false;
10246		- GrafreeD.hassound = false;
	10444	+ Grafreed.wav.save();
	10445	+ Grafreed.savesound = false;
	10446	+ Grafreed.hassound = false;
10247	10447	}
10248	10448	// if (DEBUG_SELECTION)
10249	10449	// {
..	..	@@ -10319,6 +10519,7 @@
10319	10519	ANTIALIAS = 0;
10320	10520	//System.out.println("RESTART");
10321	10521	AAtimer.restart();
	10522	+ Globals.TIMERRUNNING = true;
10322	10523	}
10323	10524	}
10324	10525	}
..	..	@@ -10373,7 +10574,7 @@
10373	10574	Object3D theobject = object;
10374	10575	Object3D theparent = object.parent;
10375	10576	object.parent = null;
10376		- object = (Object3D)GrafreeD.clone(object);
	10577	+ object = (Object3D)Grafreed.clone(object);
10377	10578	object.Stripify();
10378	10579	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10379	10580	theobject.PreprocessOcclusion(this);
..	..	@@ -10386,13 +10587,14 @@
10386	10587	ambientOcclusion = false;
10387	10588	}
10388	10589
10389		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10590	+ if (//Globals.lighttouched &&
	10591	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10390	10592	{
10391	10593	//if (RENDERSHADOW) // ?
10392	10594	if (!IsFrozen())
10393	10595	{
10394	10596	// dec 2012
10395		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10597	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10396	10598	{
10397	10599	Globals.framecount++;
10398	10600	shadowbuffer.display();
..	..	@@ -10519,8 +10721,8 @@
10519	10721
10520	10722	// if (parentcam != renderCamera) // not a light
10521	10723	if (cam != lightCamera)
10522		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10724	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10725	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10524	10726
10525	10727	for (int j = 0; j < 4; j++)
10526	10728	{
..	..	@@ -10534,8 +10736,8 @@
10534	10736
10535	10737	// if (parentcam != renderCamera) // not a light
10536	10738	if (cam != lightCamera)
10537		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10740	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10539	10741
10540	10742	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10541	10743
..	..	@@ -10794,7 +10996,16 @@
10794	10996	// Bump noise
10795	10997	gl.glActiveTexture(GL.GL_TEXTURE6);
10796	10998	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797		- 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	+
10798	11009
10799	11010	gl.glActiveTexture(GL.GL_TEXTURE0);
10800	11011	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10919,8 +11130,8 @@
10919	11130	System.err.println("parentcam != renderCamera");
10920	11131
10921	11132	// if (cam != lightCamera)
10922		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923		- 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
10924	11135	}
10925	11136
10926	11137	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10941,8 +11152,8 @@
10941	11152	if (true) // TODO
10942	11153	{
10943	11154	if (cam != lightCamera)
10944		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945		- 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
10946	11157	}
10947	11158
10948	11159	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11279,16 +11490,37 @@
11279	11490	e.printStackTrace();
11280	11491	}
11281	11492
11282		- if (GrafreeD.RENDERME > 0)
11283		- GrafreeD.RENDERME--; // mechante magouille
	11493	+ if (Grafreed.RENDERME > 0)
	11494	+ Grafreed.RENDERME--; // mechante magouille
11284	11495
11285	11496	Globals.ONESTEP = false;
11286	11497	}
11287	11498
11288	11499	static boolean zoomonce = false;
11289	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	+
11290	11519	void DrawObject(GL gl, boolean draw)
11291	11520	{
	11521	+ // To clear camera values
	11522	+ ResetOptions();
	11523	+
11292	11524	//System.out.println("DRAW OBJECT " + mouseDown);
11293	11525	// DrawMode() = SELECTION;
11294	11526	//GL gl = getGL();
..	..	@@ -11350,7 +11582,14 @@
11350	11582
11351	11583	usedtextures.clear();
11352	11584
11353		- 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	+ }
11354	11593	}
11355	11594	//System.out.println("--> " + stackdepth);
11356	11595	// GrafreeD.traceon();
..	..	@@ -11360,8 +11599,9 @@
11360	11599
11361	11600	if (DrawMode() == DEFAULT)
11362	11601	{
11363		- if (DEBUG)
	11602	+ if (Globals.DEBUG)
11364	11603	{
	11604	+ CreateSelectedPoint();
11365	11605	float radius = 0.05f;
11366	11606	if (selectedpoint.radius != radius)
11367	11607	{
..	..	@@ -11441,7 +11681,14 @@
11441	11681	if (checker != null && DrawMode() == DEFAULT)
11442	11682	{
11443	11683	//BindTexture(IMMORTAL_TEXTURE);
11444		- 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	+ }
11445	11692	// NEAREST
11446	11693	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11447	11694	DrawChecker(gl);
..	..	@@ -11523,7 +11770,7 @@
11523	11770	return;
11524	11771	}
11525	11772
11526		- String string = obj.GetToolTip();
	11773	+ String string = obj.toString(); //.GetToolTip();
11527	11774
11528	11775	GL gl = GetGL();
11529	11776
..	..	@@ -11840,8 +12087,8 @@
11840	12087	//obj.TransformToWorld(light, light);
11841	12088	for (int i = tp.size(); --i >= 0;)
11842	12089	{
11843		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844		- 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);
11845	12092	}
11846	12093
11847	12094
..	..	@@ -11858,8 +12105,8 @@
11858	12105	parentcam = cameras[0];
11859	12106	}
11860	12107
11861		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862		- 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
11863	12110
11864	12111	LA.xformPos(light, renderCamera.toScreen, light);
11865	12112
..	..	@@ -12473,8 +12720,8 @@
12473	12720
12474	12721	// display shadow only (bump == 0)
12475	12722	"SUB temp.x, half.x, shadow.x;" +
12476		- "MOV temp.y, -params6.x;" +
12477		- "SLT temp.z, temp.y, zero.x;" +
	12723	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12724	+ "SLT temp.z, temp.y, -one2048th.x;" +
12478	12725	"SUB temp.y, one.x, temp.z;" +
12479	12726	"MUL temp.x, temp.x, temp.y;" +
12480	12727	"KIL temp.x;" +
..	..	@@ -12603,8 +12850,10 @@
12603	12850	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12604	12851
12605	12852	"SUB temp.x, one.x, ndotl.x;" +
12606		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12607		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12853	+ // Tuning for default skin
	12854	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12855	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12856	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12608	12857	"MUL temp.x, temp.x, temp.y;" +
12609	12858
12610	12859	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12752,7 +13001,7 @@
12752	13001	"MUL final.y, fragment.texcoord[0].x, c256;" +
12753	13002	"FLR final.x, final.y;" +
12754	13003	"SUB final.y, final.y, final.x;" +
12755		- //"MUL final.x, final.x, c256i;" +
	13004	+ "MUL final.x, final.x, c256i;" +
12756	13005	"MOV final.z, zero.x;" +
12757	13006	"MOV final.a, one.w;":""
12758	13007	) +
..	..	@@ -12760,7 +13009,7 @@
12760	13009	"MUL final.y, fragment.texcoord[0].y, c256;" +
12761	13010	"FLR final.x, final.y;" +
12762	13011	"SUB final.y, final.y, final.x;" +
12763		- //"MUL final.x, final.x, c256i;" +
	13012	+ "MUL final.x, final.x, c256i;" +
12764	13013	"MOV final.z, zero.x;" +
12765	13014	"MOV final.a, one.w;":""
12766	13015	) +
..	..	@@ -12803,7 +13052,7 @@
12803	13052	//once = true;
12804	13053	}
12805	13054
12806		- System.out.print("Program #" + mode + "; length = " + program.length());
	13055	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12807	13056	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12808	13057	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12809	13058
..	..	@@ -12936,12 +13185,16 @@
12936	13185
12937	13186	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12938	13187	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13188	+
	13189	+ // Compare fragment depth in light space with shadowmap.
12939	13190	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12940	13191	"SGE temp.y, temp.x, zero.x;" +
12941		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13192	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13193	+
	13194	+ // Reverse comparison
12942	13195	"SUB temp.x, one.x, temp.x;" +
12943	13196	"MUL " + shadow + ".x, temp.x, temp.y;" +
12944		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13197	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12945	13198	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12946	13199
12947	13200	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12955,6 +13208,10 @@
12955	13208	// No shadow for backface
12956	13209	"DP3 temp.x, normal, lightd;" +
12957	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;" +
12958	13215	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12959	13216	"";
12960	13217	}
..	..	@@ -13101,7 +13358,8 @@
13101	13358	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13102	13359	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13103	13360	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13104		- Object3D.cVector2[] vector2buffer;
	13361	+
	13362	+ //Object3D.cVector2[] vector2buffer;
13105	13363
13106	13364	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13107	13365	// OUT : diff, spec
..	..	@@ -13513,7 +13771,7 @@
13513	13771	public void mousePressed(MouseEvent e)
13514	13772	{
13515	13773	//System.out.println("mousePressed: " + e);
13516		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13774	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13517	13775	}
13518	13776
13519	13777	static long prevtime = 0;
..	..	@@ -13589,8 +13847,8 @@
13589	13847	// mode \|= META;
13590	13848	//}
13591	13849
13592		- SetMouseMode(WHEEL \| e.getModifiersEx());
13593		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13850	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13851	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13594	13852	anchorX = ax;
13595	13853	anchorY = ay;
13596	13854	prevX = px;
..	..	@@ -13624,6 +13882,7 @@
13624	13882	else
13625	13883	if (evt.getSource() == AAtimer)
13626	13884	{
	13885	+ Globals.TIMERRUNNING = false;
13627	13886	if (mouseDown)
13628	13887	{
13629	13888	//new Exception().printStackTrace();
..	..	@@ -13649,6 +13908,10 @@
13649	13908	// LIVE = waslive;
13650	13909	// wasliveok = true;
13651	13910	// waslive = false;
	13911	+
	13912	+ // May 2019 Forget it:
	13913	+ if (true)
	13914	+ return;
13652	13915
13653	13916	// source == timer
13654	13917	if (mouseDown)
..	..	@@ -13688,12 +13951,13 @@
13688	13951
13689	13952	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13690	13953
13691		- void clickStart(int x, int y, int modifiers)
	13954	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13692	13955	{
13693	13956	if (!wasliveok)
13694	13957	return;
13695	13958
13696	13959	AAtimer.restart(); //
	13960	+ Globals.TIMERRUNNING = true;
13697	13961
13698	13962	// waslive = LIVE;
13699	13963	// LIVE = false;
..	..	@@ -13705,7 +13969,7 @@
13705	13969	// touched = true; // main DL
13706	13970	if (isRenderer)
13707	13971	{
13708		- SetMouseMode(modifiers);
	13972	+ SetMouseMode(modifiers, modifiersex);
13709	13973	}
13710	13974
13711	13975	selectX = anchorX = x;
..	..	@@ -13718,7 +13982,7 @@
13718	13982	clicked = true;
13719	13983	hold = false;
13720	13984
13721		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13985	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13722	13986	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13723	13987	{
13724	13988	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13749,7 +14013,7 @@
13749	14013	info.camera = renderCamera;
13750	14014	info.x = x;
13751	14015	info.y = y;
13752		- info.modifiers = modifiers;
	14016	+ info.modifiers = modifiersex;
13753	14017	editObj = object.doEditClick(info, 0);
13754	14018	if (!editObj)
13755	14019	{
..	..	@@ -13766,9 +14030,12 @@
13766	14030
13767	14031	public void mouseDragged(MouseEvent e)
13768	14032	{
	14033	+ Globals.MOUSEDRAGGED = true;
	14034	+
13769	14035	//System.out.println("mouseDragged: " + e);
13770	14036	if (isRenderer)
13771	14037	movingcamera = true;
	14038	+
13772	14039	//if (drawing)
13773	14040	//return;
13774	14041	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13778,7 +14045,7 @@
13778	14045	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13779	14046	}
13780	14047	else
13781		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14048	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13782	14049
13783	14050	//try { Thread.sleep(1); } catch (Exception ex) {}
13784	14051	}
..	..	@@ -14015,7 +14282,7 @@
14015	14282	{
14016	14283	Globals.lighttouched = true;
14017	14284	}
14018		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14285	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14019	14286	}
14020	14287	//else
14021	14288	}
..	..	@@ -14115,7 +14382,7 @@
14115	14382	int X, Y;
14116	14383	boolean SX, SY;
14117	14384
14118		- void drag(int x, int y, int modifiers)
	14385	+ void drag(int x, int y, int modifiers, int modifiersex)
14119	14386	{
14120	14387	if (IsFrozen())
14121	14388	{
..	..	@@ -14124,17 +14391,17 @@
14124	14391
14125	14392	drag = true; // NEW
14126	14393
14127		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14394	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14128	14395
14129	14396	X = x;
14130	14397	Y = y;
14131	14398	// floating state for animation
14132		- MODIFIERS = modifiers;
14133		- modifiers &= ~1024;
	14399	+ MODIFIERS = modifiersex;
	14400	+ modifiersex &= ~1024;
14134	14401	if (false) // modifiers != 0)
14135	14402	{
14136	14403	//new Exception().printStackTrace();
14137		- System.out.println("mouseDragged: " + modifiers);
	14404	+ System.out.println("mouseDragged: " + modifiersex);
14138	14405	System.out.println("SHIFT = " + SHIFT);
14139	14406	System.out.println("CONTROL = " + COMMAND);
14140	14407	System.out.println("META = " + META);
..	..	@@ -14154,7 +14421,8 @@
14154	14421	info.camera = renderCamera;
14155	14422	info.x = x;
14156	14423	info.y = y;
14157		- object.editWindow.copy.doEditDrag(info);
	14424	+ object.GetWindow().copy
	14425	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14158	14426	} else
14159	14427	{
14160	14428	if (x < startX)
..	..	@@ -14318,7 +14586,9 @@
14318	14586	ci.camera = renderCamera;
14319	14587	if (!isRenderer)
14320	14588	{
14321		- if (object.editWindow.copy.doEditClick(ci, 0))
	14589	+ //ObjEditor editWindow = object.editWindow;
	14590	+ //Object3D copy = editWindow.copy;
	14591	+ if (object.doEditClick(ci, 0))
14322	14592	{
14323	14593	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14324	14594	} else
..	..	@@ -14330,7 +14600,10 @@
14330	14600
14331	14601	public void mouseReleased(MouseEvent e)
14332	14602	{
	14603	+ Globals.MOUSEDRAGGED = false;
	14604	+
14333	14605	movingcamera = false;
	14606	+ X = Y = 0;
14334	14607	//System.out.println("mouseReleased: " + e);
14335	14608	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14336	14609	}
..	..	@@ -14353,9 +14626,9 @@
14353	14626	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14354	14627	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14355	14628
14356		- if (control \|\| command \|\| IsFrozen())
	14629	+// No delay if (control \|\| command \|\| IsFrozen())
14357	14630	timeout = true;
14358		- else
	14631	+// ?? May 2019 else
14359	14632	// timer.setDelay((modifiers & 128) != 0?0:350);
14360	14633	mouseDown = false;
14361	14634	if (!control && !command) // june 2013
..	..	@@ -14465,7 +14738,7 @@
14465	14738	System.out.println("keyReleased: " + e);
14466	14739	}
14467	14740
14468		- void SetMouseMode(int modifiers)
	14741	+ void SetMouseMode(int modifiers, int modifiersex)
14469	14742	{
14470	14743	//System.out.println("SetMouseMode = " + modifiers);
14471	14744	//modifiers &= ~1024;
..	..	@@ -14477,25 +14750,25 @@
14477	14750	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14478	14751	// return;
14479	14752	//System.out.println("SetMode = " + modifiers);
14480		- if ((modifiers & WHEEL) == WHEEL)
	14753	+ if ((modifiersex & WHEEL) == WHEEL)
14481	14754	{
14482	14755	mouseMode \|= ZOOM;
14483	14756	}
14484	14757
14485	14758	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14486		- if (capsLocked \|\| (modifiers & META) == META)
	14759	+ if (capsLocked) // \|\| (modifiers & META) == META)
14487	14760	{
14488	14761	mouseMode \|= VR; // BACKFORTH;
14489	14762	}
14490		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14763	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14491	14764	{
14492	14765	mouseMode \|= SELECT;
14493	14766	}
14494		- if ((modifiers & COMMAND) == COMMAND)
	14767	+ if ((modifiersex & COMMAND) == COMMAND)
14495	14768	{
14496	14769	mouseMode \|= SELECT;
14497	14770	}
14498		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14771	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14499	14772	{
14500	14773	mouseMode &= ~VR;
14501	14774	mouseMode \|= TRANSLATE;
..	..	@@ -14524,7 +14797,7 @@
14524	14797
14525	14798	if (isRenderer) //
14526	14799	{
14527		- SetMouseMode(modifiers);
	14800	+ SetMouseMode(0, modifiers);
14528	14801	}
14529	14802
14530	14803	Globals.theRenderer.keyPressed(key);
..	..	@@ -14696,8 +14969,14 @@
14696	14969	RevertCamera();
14697	14970	repaint();
14698	14971	break;
14699		- case 'L':
14700	14972	case 'l':
	14973	+ lightMode ^= true;
	14974	+ Globals.lighttouched = true;
	14975	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14976	+ targetLookAt.set(manipCamera.lookAt);
	14977	+ repaint();
	14978	+ break;
	14979	+ case 'L':
14701	14980	if (lightMode)
14702	14981	{
14703	14982	lightMode = false;
..	..	@@ -14844,23 +15123,21 @@
14844	15123	kompactbit = 6;
14845	15124	break;
14846	15125	case ' ':
14847		- lightMode ^= true;
14848		- Globals.lighttouched = true;
14849		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14850		- targetLookAt.set(manipCamera.lookAt);
	15126	+ ObjEditor.theFrame.ToggleFullScreen();
14851	15127	repaint();
14852	15128	break;
14853	15129	//case '`' :
14854	15130	case ESC:
14855	15131	RENDERPROGRAM += 1;
14856	15132	RENDERPROGRAM %= 3;
	15133	+
14857	15134	repaint();
14858	15135	break;
14859	15136	case 'Z':
14860	15137	//RESIZETEXTURE ^= true;
14861	15138	//break;
14862	15139	case 'z':
14863		- RENDERSHADOW ^= true;
	15140	+ Globals.RENDERSHADOW ^= true;
14864	15141	Globals.lighttouched = true;
14865	15142	repaint();
14866	15143	break;
..	..	@@ -14984,7 +15261,7 @@
14984	15261	//mode = ROTATE;
14985	15262	if ((MODIFIERS & COMMAND) == 0) // VR??
14986	15263	{
14987		- SetMouseMode(modifiers);
	15264	+ SetMouseMode(0, modifiers);
14988	15265	}
14989	15266	}
14990	15267
..	..	@@ -15120,7 +15397,7 @@
15120	15397	{
15121	15398	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15122	15399	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15123		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15400	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15124	15401	{
15125	15402	mouseMoved(e);
15126	15403	} else
..	..	@@ -15145,7 +15422,7 @@
15145	15422	}
15146	15423	*/
15147	15424
15148		- object.editWindow.EditSelection();
	15425	+ object.editWindow.EditSelection(false);
15149	15426	}
15150	15427
15151	15428	void SelectParent()
..	..	@@ -15339,7 +15616,9 @@
15339	15616	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15340	15617	//Image img = CreateImage(width, height);
15341	15618	//System.out.println("width = " + width + "; height = " + height + "\n");
	15619	+
15342	15620	Graphics gr = g; // img.getGraphics();
	15621	+
15343	15622	if (!hasMarquee)
15344	15623	{
15345	15624	if (Xmin < Xmax) // !locked)
..	..	@@ -15437,14 +15716,33 @@
15437	15716	if (!isRenderer)
15438	15717	{
15439	15718	object.drawEditHandles(info, 0);
	15719	+
	15720	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15721	+ {
	15722	+ switch (object.selection.get(0).hitSomething)
	15723	+ {
	15724	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15725	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15726	+ break;
	15727	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15728	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15729	+ break;
	15730	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15731	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15732	+ break;
	15733	+ }
	15734	+
	15735	+ }
15440	15736	}
15441	15737	}
	15738	+
15442	15739	if (isRenderer)
15443	15740	{
15444	15741	//gr.setColor(Color.black);
15445	15742	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15446	15743	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15447	15744	}
	15745	+
15448	15746	if (hasMarquee)
15449	15747	{
15450	15748	gr.setXORMode(Color.white);
..	..	@@ -15557,6 +15855,7 @@
15557	15855	public boolean mouseDown(Event evt, int x, int y)
15558	15856	{
15559	15857	System.out.println("mouseDown: " + evt);
	15858	+ System.exit(0);
15560	15859	/*
15561	15860	locked = true;
15562	15861	drag = false;
..	..	@@ -15600,7 +15899,7 @@
15600	15899	{
15601	15900	keyPressed(0, modifiers);
15602	15901	}
15603		- clickStart(x, y, modifiers);
	15902	+ // clickStart(x, y, modifiers);
15604	15903	return true;
15605	15904	}
15606	15905
..	..	@@ -15718,7 +16017,7 @@
15718	16017	{
15719	16018	keyReleased(0, 0);
15720	16019	}
15721		- drag(x, y, modifiers);
	16020	+ drag(x, y, 0, modifiers);
15722	16021	return true;
15723	16022	}
15724	16023
..	..	@@ -15850,7 +16149,7 @@
15850	16149	Object3D object;
15851	16150	static Object3D trackedobject;
15852	16151	Camera renderCamera; // Light or Eye (or Occlusion)
15853		- /static/ Camera manipCamera; // Light or Eye
	16152	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15854	16153	/static/ Camera eyeCamera;
15855	16154	/static/ Camera lightCamera;
15856	16155	int cameracount;
..	..	@@ -16135,16 +16434,16 @@
16135	16434	cStatic.objectstack[materialdepth++] = checker;
16136	16435	//System.out.println("material " + material);
16137	16436	//Applet3D.tracein(this, selected);
16138		- vector2buffer = checker.projectedVertices;
	16437	+ //vector2buffer = checker.projectedVertices;
16139	16438
16140	16439	//checker.GetMaterial().Draw(this, false); // true);
16141		- DrawMaterial(checker.GetMaterial(), false); // true);
	16440	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16142	16441
16143	16442	materialdepth -= 1;
16144	16443	if (materialdepth > 0)
16145	16444	{
16146		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16147		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16445	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16446	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16148	16447	}
16149	16448	//checker.GetMaterial().opacity = 1f;
16150	16449	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16368,6 +16667,8 @@
16368	16667	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16369	16668	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16370	16669
	16670	+ CreateSelectedPoint();
	16671	+
16371	16672	// Will fit the mesh !!!
16372	16673	selectedpoint.toParent[0][0] = 0.0001;
16373	16674	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16416,16 +16717,16 @@
16416	16717	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]));
16417	16718	}
16418	16719
16419		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16720	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16420	16721	}
16421	16722	}
16422	16723
16423	16724	if (!movingcamera && !PAINTMODE)
16424	16725	object.editWindow.ScreenFitPoint(); // fev 2014
16425	16726
16426		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16727	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16427	16728	{
16428		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16729	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16429	16730
16430	16731	Object3D group = new Object3D("inst" + paintcount++);
16431	16732
..	..	@@ -16581,7 +16882,7 @@
16581	16882	gl.glDisable(gl.GL_CULL_FACE);
16582	16883	}
16583	16884
16584		- if (!RENDERSHADOW)
	16885	+ if (!Globals.RENDERSHADOW)
16585	16886	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16586	16887
16587	16888	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16591,7 +16892,7 @@
16591	16892	//gl.glColorMask(false, false, false, false);
16592	16893
16593	16894	//render_scene_from_light_view(gl, drawable, 0, 0);
16594		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16895	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16595	16896	{
16596	16897	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16597	16898
..	..	@@ -17007,23 +17308,15 @@
17007	17308	int AAbuffersize = 0;
17008	17309
17009	17310	//double[] selectedpoint = new double[3];
17010		- static Superellipsoid selectedpoint = new Superellipsoid();
	17311	+ static Superellipsoid selectedpoint;
17011	17312	static Sphere previousselectedpoint = null;
17012		- static Sphere debugpointG = new Sphere();
17013		- static Sphere debugpointP = new Sphere();
17014		- static Sphere debugpointC = new Sphere();
17015		- static Sphere debugpointR = new Sphere();
	17313	+ static Sphere debugpointG;
	17314	+ static Sphere debugpointP;
	17315	+ static Sphere debugpointC;
	17316	+ static Sphere debugpointR;
17016	17317
17017	17318	static Sphere debugpoints[] = new Sphere[8];
17018	17319
17019		- static
17020		- {
17021		- for (int i=0; i<8; i++)
17022		- {
17023		- debugpoints[i] = new Sphere();
17024		- }
17025		- }
17026		-
17027	17320	static void InitPoints(float radius)
17028	17321	{
17029	17322	for (int i=0; i<8; i++)