~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
..	..	@@ -56,8 +55,6 @@
56	55	static int CURRENTANTIALIAS = 0; // 1;
57	56	/static/ boolean RENDERSHADOW = true;
58	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	58
62	59	boolean DISPLAYTEXT = false;
63	60	//boolean REDUCETEXTURE = true;
..	..	@@ -86,7 +83,7 @@
86	83	static boolean FULLSCREEN = false;
87	84	static boolean SUPPORT = true;
88	85	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	86	+static boolean FAST = false;
90	87	static boolean SLOWPOSE = false;
91	88	static boolean FOOTCONTACT = true;
92	89
..	..	@@ -108,7 +105,7 @@
108	105	static boolean OEIL = true;
109	106	static boolean OEILONCE = false; // do oeilon then oeiloff
110	107	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
112	109	static boolean HANDLES = false; // selection doesn't work!!
113	110	static boolean PAINTMODE = false;
114	111
..	..	@@ -151,6 +148,8 @@
151	148	defaultcaps.setAccumBlueBits(16);
152	149	defaultcaps.setAccumAlphaBits(16);
153	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	153
155	154	void SetAsGLRenderer(boolean b)
156	155	{
..	..	@@ -327,7 +326,7 @@
327	326	cStatic.objectstack[materialdepth++] = obj;
328	327	//System.out.println("material " + material);
329	328	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
331	330	if (obj instanceof Camera)
332	331	{
333	332	display.options1[0] = material.shift;
..	..	@@ -359,7 +358,7 @@
359	358	/**/
360	359	} else
361	360	{
362		- DrawMaterial(material, selected);
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
363	362	}
364	363	} else
365	364	{
..	..	@@ -383,8 +382,8 @@
383	382	cStatic.objectstack[materialdepth++] = obj;
384	383	//System.out.println("material " + material);
385	384	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	387	}
389	388	}
390	389
..	..	@@ -401,8 +400,8 @@
401	400	materialdepth -= 1;
402	401	if (materialdepth > 0)
403	402	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- 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);
406	405	}
407	406	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	407	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +421,8 @@
422	421	materialdepth -= 1;
423	422	if (materialdepth > 0)
424	423	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- 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);
427	426	}
428	427	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	428	//else
..	..	@@ -464,10 +463,12 @@
464	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	464	{
466	465	//gl.glBegin(gl.GL_TRIANGLES);
467		- 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	+ ;
468	469	if (!hasnorm)
469	470	{
470		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
471	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1193,12 @@
1192	1193	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1194	}
1194	1195	}
	1196	+
1195	1197	if (flipV)
1196	1198	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1199	else
1198	1200	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
1199	1202	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1203	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1204
..	..	@@ -1215,10 +1218,12 @@
1215	1218	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1219	}
1217	1220	}
	1221	+
1218	1222	if (flipV)
1219	1223	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1224	else
1221	1225	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
1222	1227	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1228	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1229
..	..	@@ -1246,8 +1251,10 @@
1246	1251	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1252	else
1248	1253	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
1249	1255	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1256	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
1251	1258	count2 += 2;
1252	1259	count3 += 3;
1253	1260	}
..	..	@@ -1603,7 +1610,7 @@
1603	1610	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1611	}
1605	1612
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1614	{
1608	1615	CameraPane display = this;
1609	1616	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1637,7 @@
1630	1637
1631	1638	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1639
1633		- float[] colorV = GrafreeD.colorV;
	1640	+ float[] colorV = Grafreed.colorV;
1634	1641
1635	1642	/**/
1636	1643	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1645,7 @@
1638	1645	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1646	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1647	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1648	+ colorV[3] = 1; // material.opacity;
1642	1649
1643	1650	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1651	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1753,9 @@
1746	1753	display.modelParams7[2] = 0;
1747	1754	display.modelParams7[3] = 0;
1748	1755
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1757
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1759	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1760	{
1754	1761	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1897,7 @@
1890	1897	void PushMatrix(double[][] matrix)
1891	1898	{
1892	1899	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1894	1901	}
1895	1902
1896	1903	void PushMatrix()
..	..	@@ -2142,7 +2149,7 @@
2142	2149	System.err.println("LIVE = " + Globals.isLIVE());
2143	2150
2144	2151	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2152	+ Grafreed.savesound = true; // wav.save();
2146	2153	// else
2147	2154	repaint(); // start loop // may 2013
2148	2155	}
..	..	@@ -2259,7 +2266,7 @@
2259	2266
2260	2267	void ToggleDebug()
2261	2268	{
2262		- DEBUG ^= true;
	2269	+ Globals.DEBUG ^= true;
2263	2270	}
2264	2271
2265	2272	void ToggleLookAt()
..	..	@@ -2267,9 +2274,9 @@
2267	2274	LOOKAT ^= true;
2268	2275	}
2269	2276
2270		- void ToggleRandom()
	2277	+ void ToggleSwitch()
2271	2278	{
2272		- RANDOM ^= true;
	2279	+ SWITCH ^= true;
2273	2280	}
2274	2281
2275	2282	void ToggleHandles()
..	..	@@ -2376,7 +2383,7 @@
2376	2383	{
2377	2384	return currentGL;
2378	2385	}
2379		-
	2386	+
2380	2387	/**/
2381	2388	class CacheTexture
2382	2389	{
..	..	@@ -4208,6 +4215,7 @@
4208	4215
4209	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4217	{
	4218	+ new Exception().printStackTrace();
4211	4219	System.exit(0);
4212	4220	com.sun.opengl.util.texture.Texture texture = null;
4213	4221
..	..	@@ -7920,6 +7928,64 @@
7920	7928	ReleaseTexture(pigment, false);
7921	7929	}
7922	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	+
7923	7989	void ReleaseTexture(String tex, boolean bump)
7924	7990	{
7925	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8023,7 +8089,7 @@
8023	8089	}
8024	8090	}
8025	8091
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8093	{
8028	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8068,7 +8134,94 @@
8068	8134	return; // true;
8069	8135	}
8070	8136
8071		- 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
8072	8225	{
8073	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8074	8227
..	..	@@ -8076,12 +8229,18 @@
8076	8229	{
8077	8230	String texname = tex;
8078	8231
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
	8234	+// String[] split = tex.split("Textures");
	8235	+// if (split.length > 1)
	8236	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8237	+// else
	8238	+// if (!texname.startsWith("/"))
	8239	+// texname = "/Users/nbriere/Textures/" + texname;
	8240	+ if (!FileExists(tex))
	8241	+ {
	8242	+ texname = fallbackTextureName;
	8243	+ }
8085	8244
8086	8245	if (CACHETEXTURE)
8087	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8150,7 +8309,7 @@
8150	8309	}
8151	8310
8152	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
8154	8313	cachename = texname;
8155	8314	else
8156	8315	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8331,7 @@
8172	8331	}
8173	8332
8174	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
8176	8335	cachename = texname;
8177	8336	else
8178	8337	processbump = false; // don't process bump map again
..	..	@@ -8181,7 +8340,9 @@
8181	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8341
8183	8342
8184		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
8185	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8186	8347	//texture = GetTexture(tex, bump);
8187	8348	}
..	..	@@ -8303,7 +8464,7 @@
8303	8464	return texture;
8304	8465	}
8305	8466
8306		- 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
8307	8468	{
8308	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8470
..	..	@@ -8321,14 +8482,14 @@
8321	8482	return texture!=null?texture.texture:null;
8322	8483	}
8323	8484
8324		- 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
8325	8486	{
8326	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8488
8328	8489	return texture!=null?texture.texturedata:null;
8329	8490	}
8330	8491
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8332	8493	{
8333	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8495	{
..	..	@@ -9205,11 +9366,35 @@
9205	9366	jy8[3] = 0.5f;
9206	9367	}
9207	9368
9208		- 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
9209	9370	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9371	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9372	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	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	+
9213	9398	static int imagecount = 0; // movie generation
9214	9399
9215	9400	static int jitter = 0;
..	..	@@ -9305,8 +9490,8 @@
9305	9490	assert (parentcam != renderCamera);
9306	9491
9307	9492	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9493	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9494	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9310	9495
9311	9496	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9497
..	..	@@ -9321,8 +9506,8 @@
9321	9506	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9507
9323	9508	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9509	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9510	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9326	9511
9327	9512	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9513
..	..	@@ -9394,7 +9579,7 @@
9394	9579	//gl.glFlush();
9395	9580	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9581
9397		- if (ANIMATION && ABORTED)
	9582	+ if (Globals.ANIMATION && ABORTED)
9398	9583	{
9399	9584	System.err.println(" ABORTED FRAME");
9400	9585	break;
..	..	@@ -9424,7 +9609,7 @@
9424	9609	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9610
9426	9611	// save image
9427		- if (ANIMATION && !ABORTED)
	9612	+ if (Globals.ANIMATION && !ABORTED)
9428	9613	{
9429	9614	VPwidth = viewport[2];
9430	9615	VPheight = viewport[3];
..	..	@@ -9535,11 +9720,11 @@
9535	9720
9536	9721	// imagecount++;
9537	9722
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9723	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9724
9540	9725	if (!BOXMODE)
9541	9726	{
9542		- 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) + ")");
9543	9728	}
9544	9729
9545	9730	if (!BOXMODE)
..	..	@@ -9577,7 +9762,7 @@
9577	9762	ABORTED = false;
9578	9763	}
9579	9764	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9765	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9766
9582	9767	if (false)
9583	9768	{
..	..	@@ -10240,11 +10425,11 @@
10240	10425
10241	10426	public void display(GLAutoDrawable drawable)
10242	10427	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10428	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10429	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10430	+ Grafreed.wav.save();
	10431	+ Grafreed.savesound = false;
	10432	+ Grafreed.hassound = false;
10248	10433	}
10249	10434	// if (DEBUG_SELECTION)
10250	10435	// {
..	..	@@ -10320,6 +10505,7 @@
10320	10505	ANTIALIAS = 0;
10321	10506	//System.out.println("RESTART");
10322	10507	AAtimer.restart();
	10508	+ Globals.TIMERRUNNING = true;
10323	10509	}
10324	10510	}
10325	10511	}
..	..	@@ -10374,7 +10560,7 @@
10374	10560	Object3D theobject = object;
10375	10561	Object3D theparent = object.parent;
10376	10562	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10563	+ object = (Object3D)Grafreed.clone(object);
10378	10564	object.Stripify();
10379	10565	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10566	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10573,14 @@
10387	10573	ambientOcclusion = false;
10388	10574	}
10389	10575
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10576	+ if (//Globals.lighttouched &&
	10577	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10578	{
10392	10579	//if (RENDERSHADOW) // ?
10393	10580	if (!IsFrozen())
10394	10581	{
10395	10582	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10583	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10584	{
10398	10585	Globals.framecount++;
10399	10586	shadowbuffer.display();
..	..	@@ -10520,8 +10707,8 @@
10520	10707
10521	10708	// if (parentcam != renderCamera) // not a light
10522	10709	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10710	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10711	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10525	10712
10526	10713	for (int j = 0; j < 4; j++)
10527	10714	{
..	..	@@ -10535,8 +10722,8 @@
10535	10722
10536	10723	// if (parentcam != renderCamera) // not a light
10537	10724	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10725	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10726	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10540	10727
10541	10728	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10729
..	..	@@ -10795,7 +10982,16 @@
10795	10982	// Bump noise
10796	10983	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	10984	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- 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	+
10799	10995
10800	10996	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	10997	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10920,8 +11116,8 @@
10920	11116	System.err.println("parentcam != renderCamera");
10921	11117
10922	11118	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- 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
10925	11121	}
10926	11122
10927	11123	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11138,8 @@
10942	11138	if (true) // TODO
10943	11139	{
10944	11140	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- 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
10947	11143	}
10948	11144
10949	11145	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11259,8 +11455,14 @@
11259	11455	{
11260	11456	renderpass++;
11261	11457	// System.out.println("Draw object... ");
	11458	+ STEP = 1;
11262	11459	if (FAST) // in case there is no script
11263		- STEP = 16;
	11460	+ STEP = 8;
	11461	+
	11462	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11463	+ {
	11464	+ STEP *= 4;
	11465	+ }
11264	11466
11265	11467	//object.FullInvariants();
11266	11468
..	..	@@ -11274,16 +11476,37 @@
11274	11476	e.printStackTrace();
11275	11477	}
11276	11478
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11479	+ if (Grafreed.RENDERME > 0)
	11480	+ Grafreed.RENDERME--; // mechante magouille
11279	11481
11280	11482	Globals.ONESTEP = false;
11281	11483	}
11282	11484
11283	11485	static boolean zoomonce = false;
11284	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	+
11285	11505	void DrawObject(GL gl, boolean draw)
11286	11506	{
	11507	+ // To clear camera values
	11508	+ ResetOptions();
	11509	+
11287	11510	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11511	// DrawMode() = SELECTION;
11289	11512	//GL gl = getGL();
..	..	@@ -11345,7 +11568,14 @@
11345	11568
11346	11569	usedtextures.clear();
11347	11570
11348		- 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	+ }
11349	11579	}
11350	11580	//System.out.println("--> " + stackdepth);
11351	11581	// GrafreeD.traceon();
..	..	@@ -11355,8 +11585,9 @@
11355	11585
11356	11586	if (DrawMode() == DEFAULT)
11357	11587	{
11358		- if (DEBUG)
	11588	+ if (Globals.DEBUG)
11359	11589	{
	11590	+ CreateSelectedPoint();
11360	11591	float radius = 0.05f;
11361	11592	if (selectedpoint.radius != radius)
11362	11593	{
..	..	@@ -11436,7 +11667,14 @@
11436	11667	if (checker != null && DrawMode() == DEFAULT)
11437	11668	{
11438	11669	//BindTexture(IMMORTAL_TEXTURE);
11439		- 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	+ }
11440	11678	// NEAREST
11441	11679	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11680	DrawChecker(gl);
..	..	@@ -11518,7 +11756,7 @@
11518	11756	return;
11519	11757	}
11520	11758
11521		- String string = obj.GetToolTip();
	11759	+ String string = obj.toString(); //.GetToolTip();
11522	11760
11523	11761	GL gl = GetGL();
11524	11762
..	..	@@ -11835,8 +12073,8 @@
11835	12073	//obj.TransformToWorld(light, light);
11836	12074	for (int i = tp.size(); --i >= 0;)
11837	12075	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- 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);
11840	12078	}
11841	12079
11842	12080
..	..	@@ -11853,8 +12091,8 @@
11853	12091	parentcam = cameras[0];
11854	12092	}
11855	12093
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- 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
11858	12096
11859	12097	LA.xformPos(light, renderCamera.toScreen, light);
11860	12098
..	..	@@ -12468,8 +12706,8 @@
12468	12706
12469	12707	// display shadow only (bump == 0)
12470	12708	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12709	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12710	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12711	"SUB temp.y, one.x, temp.z;" +
12474	12712	"MUL temp.x, temp.x, temp.y;" +
12475	12713	"KIL temp.x;" +
..	..	@@ -12598,8 +12836,10 @@
12598	12836	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	12837
12600	12838	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12839	+ // Tuning for default skin
	12840	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12841	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12842	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	12843	"MUL temp.x, temp.x, temp.y;" +
12604	12844
12605	12845	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12798,7 +13038,7 @@
12798	13038	//once = true;
12799	13039	}
12800	13040
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13041	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13042	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13043	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13044
..	..	@@ -12931,12 +13171,16 @@
12931	13171
12932	13172	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13173	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13174	+
	13175	+ // Compare fragment depth in light space with shadowmap.
12934	13176	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13177	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13178	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13179	+
	13180	+ // Reverse comparison
12937	13181	"SUB temp.x, one.x, temp.x;" +
12938	13182	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13183	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13184	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13185
12942	13186	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13194,10 @@
12950	13194	// No shadow for backface
12951	13195	"DP3 temp.x, normal, lightd;" +
12952	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;" +
12953	13201	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13202	"";
12955	13203	}
..	..	@@ -13096,7 +13344,8 @@
13096	13344	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13345	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13346	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13347	+
	13348	+ //Object3D.cVector2[] vector2buffer;
13100	13349
13101	13350	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13351	// OUT : diff, spec
..	..	@@ -13508,7 +13757,7 @@
13508	13757	public void mousePressed(MouseEvent e)
13509	13758	{
13510	13759	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13760	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	13761	}
13513	13762
13514	13763	static long prevtime = 0;
..	..	@@ -13584,8 +13833,8 @@
13584	13833	// mode \|= META;
13585	13834	//}
13586	13835
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13836	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13837	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	13838	anchorX = ax;
13590	13839	anchorY = ay;
13591	13840	prevX = px;
..	..	@@ -13619,6 +13868,7 @@
13619	13868	else
13620	13869	if (evt.getSource() == AAtimer)
13621	13870	{
	13871	+ Globals.TIMERRUNNING = false;
13622	13872	if (mouseDown)
13623	13873	{
13624	13874	//new Exception().printStackTrace();
..	..	@@ -13644,6 +13894,10 @@
13644	13894	// LIVE = waslive;
13645	13895	// wasliveok = true;
13646	13896	// waslive = false;
	13897	+
	13898	+ // May 2019 Forget it:
	13899	+ if (true)
	13900	+ return;
13647	13901
13648	13902	// source == timer
13649	13903	if (mouseDown)
..	..	@@ -13683,12 +13937,13 @@
13683	13937
13684	13938	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	13939
13686		- void clickStart(int x, int y, int modifiers)
	13940	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	13941	{
13688	13942	if (!wasliveok)
13689	13943	return;
13690	13944
13691	13945	AAtimer.restart(); //
	13946	+ Globals.TIMERRUNNING = true;
13692	13947
13693	13948	// waslive = LIVE;
13694	13949	// LIVE = false;
..	..	@@ -13700,7 +13955,7 @@
13700	13955	// touched = true; // main DL
13701	13956	if (isRenderer)
13702	13957	{
13703		- SetMouseMode(modifiers);
	13958	+ SetMouseMode(modifiers, modifiersex);
13704	13959	}
13705	13960
13706	13961	selectX = anchorX = x;
..	..	@@ -13713,7 +13968,7 @@
13713	13968	clicked = true;
13714	13969	hold = false;
13715	13970
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13971	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	13972	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	13973	{
13719	13974	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13744,7 +13999,7 @@
13744	13999	info.camera = renderCamera;
13745	14000	info.x = x;
13746	14001	info.y = y;
13747		- info.modifiers = modifiers;
	14002	+ info.modifiers = modifiersex;
13748	14003	editObj = object.doEditClick(info, 0);
13749	14004	if (!editObj)
13750	14005	{
..	..	@@ -13761,9 +14016,12 @@
13761	14016
13762	14017	public void mouseDragged(MouseEvent e)
13763	14018	{
	14019	+ Globals.MOUSEDRAGGED = true;
	14020	+
13764	14021	//System.out.println("mouseDragged: " + e);
13765	14022	if (isRenderer)
13766	14023	movingcamera = true;
	14024	+
13767	14025	//if (drawing)
13768	14026	//return;
13769	14027	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14031,7 @@
13773	14031	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14032	}
13775	14033	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14034	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14035
13778	14036	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14037	}
..	..	@@ -13946,6 +14204,7 @@
13946	14204
13947	14205	public void run()
13948	14206	{
	14207	+ new Exception().printStackTrace();
13949	14208	System.exit(0);
13950	14209	for (;;)
13951	14210	{
..	..	@@ -14009,7 +14268,7 @@
14009	14268	{
14010	14269	Globals.lighttouched = true;
14011	14270	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14271	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14272	}
14014	14273	//else
14015	14274	}
..	..	@@ -14109,7 +14368,7 @@
14109	14368	int X, Y;
14110	14369	boolean SX, SY;
14111	14370
14112		- void drag(int x, int y, int modifiers)
	14371	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14372	{
14114	14373	if (IsFrozen())
14115	14374	{
..	..	@@ -14118,17 +14377,17 @@
14118	14377
14119	14378	drag = true; // NEW
14120	14379
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14380	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14381
14123	14382	X = x;
14124	14383	Y = y;
14125	14384	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14385	+ MODIFIERS = modifiersex;
	14386	+ modifiersex &= ~1024;
14128	14387	if (false) // modifiers != 0)
14129	14388	{
14130	14389	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14390	+ System.out.println("mouseDragged: " + modifiersex);
14132	14391	System.out.println("SHIFT = " + SHIFT);
14133	14392	System.out.println("CONTROL = " + COMMAND);
14134	14393	System.out.println("META = " + META);
..	..	@@ -14148,7 +14407,8 @@
14148	14407	info.camera = renderCamera;
14149	14408	info.x = x;
14150	14409	info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14410	+ object.GetWindow().copy
	14411	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14412	} else
14153	14413	{
14154	14414	if (x < startX)
..	..	@@ -14312,7 +14572,9 @@
14312	14572	ci.camera = renderCamera;
14313	14573	if (!isRenderer)
14314	14574	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14575	+ //ObjEditor editWindow = object.editWindow;
	14576	+ //Object3D copy = editWindow.copy;
	14577	+ if (object.doEditClick(ci, 0))
14316	14578	{
14317	14579	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14580	} else
..	..	@@ -14324,7 +14586,10 @@
14324	14586
14325	14587	public void mouseReleased(MouseEvent e)
14326	14588	{
	14589	+ Globals.MOUSEDRAGGED = false;
	14590	+
14327	14591	movingcamera = false;
	14592	+ X = Y = 0;
14328	14593	//System.out.println("mouseReleased: " + e);
14329	14594	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14595	}
..	..	@@ -14347,9 +14612,9 @@
14347	14612	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14613	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14614
14350		- if (control \|\| command \|\| IsFrozen())
	14615	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14616	timeout = true;
14352		- else
	14617	+// ?? May 2019 else
14353	14618	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14619	mouseDown = false;
14355	14620	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14724,7 @@
14459	14724	System.out.println("keyReleased: " + e);
14460	14725	}
14461	14726
14462		- void SetMouseMode(int modifiers)
	14727	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14728	{
14464	14729	//System.out.println("SetMouseMode = " + modifiers);
14465	14730	//modifiers &= ~1024;
..	..	@@ -14471,25 +14736,25 @@
14471	14736	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	14737	// return;
14473	14738	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	14739	+ if ((modifiersex & WHEEL) == WHEEL)
14475	14740	{
14476	14741	mouseMode \|= ZOOM;
14477	14742	}
14478	14743
14479	14744	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	14745	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	14746	{
14482	14747	mouseMode \|= VR; // BACKFORTH;
14483	14748	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14749	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	14750	{
14486	14751	mouseMode \|= SELECT;
14487	14752	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	14753	+ if ((modifiersex & COMMAND) == COMMAND)
14489	14754	{
14490	14755	mouseMode \|= SELECT;
14491	14756	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14757	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	14758	{
14494	14759	mouseMode &= ~VR;
14495	14760	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +14783,7 @@
14518	14783
14519	14784	if (isRenderer) //
14520	14785	{
14521		- SetMouseMode(modifiers);
	14786	+ SetMouseMode(0, modifiers);
14522	14787	}
14523	14788
14524	14789	Globals.theRenderer.keyPressed(key);
..	..	@@ -14690,8 +14955,14 @@
14690	14955	RevertCamera();
14691	14956	repaint();
14692	14957	break;
14693		- case 'L':
14694	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':
14695	14966	if (lightMode)
14696	14967	{
14697	14968	lightMode = false;
..	..	@@ -14838,23 +15109,21 @@
14838	15109	kompactbit = 6;
14839	15110	break;
14840	15111	case ' ':
14841		- lightMode ^= true;
14842		- Globals.lighttouched = true;
14843		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14844		- targetLookAt.set(manipCamera.lookAt);
	15112	+ ObjEditor.theFrame.ToggleFullScreen();
14845	15113	repaint();
14846	15114	break;
14847	15115	//case '`' :
14848	15116	case ESC:
14849	15117	RENDERPROGRAM += 1;
14850	15118	RENDERPROGRAM %= 3;
	15119	+
14851	15120	repaint();
14852	15121	break;
14853	15122	case 'Z':
14854	15123	//RESIZETEXTURE ^= true;
14855	15124	//break;
14856	15125	case 'z':
14857		- RENDERSHADOW ^= true;
	15126	+ Globals.RENDERSHADOW ^= true;
14858	15127	Globals.lighttouched = true;
14859	15128	repaint();
14860	15129	break;
..	..	@@ -14978,7 +15247,7 @@
14978	15247	//mode = ROTATE;
14979	15248	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15249	{
14981		- SetMouseMode(modifiers);
	15250	+ SetMouseMode(0, modifiers);
14982	15251	}
14983	15252	}
14984	15253
..	..	@@ -15114,7 +15383,7 @@
15114	15383	{
15115	15384	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15385	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15386	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15387	{
15119	15388	mouseMoved(e);
15120	15389	} else
..	..	@@ -15139,11 +15408,12 @@
15139	15408	}
15140	15409	*/
15141	15410
15142		- object.editWindow.EditSelection();
	15411	+ object.editWindow.EditSelection(false);
15143	15412	}
15144	15413
15145	15414	void SelectParent()
15146	15415	{
	15416	+ new Exception().printStackTrace();
15147	15417	System.exit(0);
15148	15418	Composite group = (Composite) object;
15149	15419	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15167,6 +15437,7 @@
15167	15437
15168	15438	void SelectChildren()
15169	15439	{
	15440	+ new Exception().printStackTrace();
15170	15441	System.exit(0);
15171	15442	/*
15172	15443	Composite group = (Composite) object;
..	..	@@ -15331,7 +15602,9 @@
15331	15602	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15603	//Image img = CreateImage(width, height);
15333	15604	//System.out.println("width = " + width + "; height = " + height + "\n");
	15605	+
15334	15606	Graphics gr = g; // img.getGraphics();
	15607	+
15335	15608	if (!hasMarquee)
15336	15609	{
15337	15610	if (Xmin < Xmax) // !locked)
..	..	@@ -15429,14 +15702,33 @@
15429	15702	if (!isRenderer)
15430	15703	{
15431	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	+ }
15432	15722	}
15433	15723	}
	15724	+
15434	15725	if (isRenderer)
15435	15726	{
15436	15727	//gr.setColor(Color.black);
15437	15728	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	15729	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	15730	}
	15731	+
15440	15732	if (hasMarquee)
15441	15733	{
15442	15734	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +15841,7 @@
15549	15841	public boolean mouseDown(Event evt, int x, int y)
15550	15842	{
15551	15843	System.out.println("mouseDown: " + evt);
	15844	+ System.exit(0);
15552	15845	/*
15553	15846	locked = true;
15554	15847	drag = false;
..	..	@@ -15592,7 +15885,7 @@
15592	15885	{
15593	15886	keyPressed(0, modifiers);
15594	15887	}
15595		- clickStart(x, y, modifiers);
	15888	+ // clickStart(x, y, modifiers);
15596	15889	return true;
15597	15890	}
15598	15891
..	..	@@ -15710,7 +16003,7 @@
15710	16003	{
15711	16004	keyReleased(0, 0);
15712	16005	}
15713		- drag(x, y, modifiers);
	16006	+ drag(x, y, 0, modifiers);
15714	16007	return true;
15715	16008	}
15716	16009
..	..	@@ -15842,7 +16135,7 @@
15842	16135	Object3D object;
15843	16136	static Object3D trackedobject;
15844	16137	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16138	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16139	/static/ Camera eyeCamera;
15847	16140	/static/ Camera lightCamera;
15848	16141	int cameracount;
..	..	@@ -16127,16 +16420,16 @@
16127	16420	cStatic.objectstack[materialdepth++] = checker;
16128	16421	//System.out.println("material " + material);
16129	16422	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16423	+ //vector2buffer = checker.projectedVertices;
16131	16424
16132	16425	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16426	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16427
16135	16428	materialdepth -= 1;
16136	16429	if (materialdepth > 0)
16137	16430	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- 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);
16140	16433	}
16141	16434	//checker.GetMaterial().opacity = 1f;
16142	16435	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16280,6 +16573,7 @@
16280	16573	{
16281	16574	if (!selection)
16282	16575	{
	16576	+ new Exception().printStackTrace();
16283	16577	System.exit(0);
16284	16578	return;
16285	16579	}
..	..	@@ -16359,6 +16653,8 @@
16359	16653	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	16654	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16361	16655
	16656	+ CreateSelectedPoint();
	16657	+
16362	16658	// Will fit the mesh !!!
16363	16659	selectedpoint.toParent[0][0] = 0.0001;
16364	16660	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16407,16 +16703,16 @@
16407	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]));
16408	16704	}
16409	16705
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16706	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	16707	}
16412	16708	}
16413	16709
16414	16710	if (!movingcamera && !PAINTMODE)
16415	16711	object.editWindow.ScreenFitPoint(); // fev 2014
16416	16712
16417		- 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)
16418	16714	{
16419		- 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);
16420	16716
16421	16717	Object3D group = new Object3D("inst" + paintcount++);
16422	16718
..	..	@@ -16572,7 +16868,7 @@
16572	16868	gl.glDisable(gl.GL_CULL_FACE);
16573	16869	}
16574	16870
16575		- if (!RENDERSHADOW)
	16871	+ if (!Globals.RENDERSHADOW)
16576	16872	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	16873
16578	16874	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +16878,7 @@
16582	16878	//gl.glColorMask(false, false, false, false);
16583	16879
16584	16880	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16881	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	16882	{
16587	16883	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	16884
..	..	@@ -16998,23 +17294,15 @@
16998	17294	int AAbuffersize = 0;
16999	17295
17000	17296	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17297	+ static Superellipsoid selectedpoint;
17002	17298	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	17299	+ static Sphere debugpointG;
	17300	+ static Sphere debugpointP;
	17301	+ static Sphere debugpointC;
	17302	+ static Sphere debugpointR;
17007	17303
17008	17304	static Sphere debugpoints[] = new Sphere[8];
17009	17305
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17306	static void InitPoints(float radius)
17019	17307	{
17020	17308	for (int i=0; i<8; i++)