~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	{
..	..	@@ -7921,6 +7928,64 @@
7921	7928	ReleaseTexture(pigment, false);
7922	7929	}
7923	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	+
7924	7989	void ReleaseTexture(String tex, boolean bump)
7925	7990	{
7926	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8024,7 +8089,7 @@
8024	8089	}
8025	8090	}
8026	8091
8027		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8093	{
8029	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8069,7 +8134,94 @@
8069	8134	return; // true;
8070	8135	}
8071	8136
8072		- 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
8073	8225	{
8074	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8075	8227
..	..	@@ -8077,12 +8229,18 @@
8077	8229	{
8078	8230	String texname = tex;
8079	8231
8080		- String[] split = tex.split("Textures");
8081		- if (split.length > 1)
8082		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8083		- else
8084		- if (!texname.startsWith("/"))
8085		- 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	+ }
8086	8244
8087	8245	if (CACHETEXTURE)
8088	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8151,7 +8309,7 @@
8151	8309	}
8152	8310
8153	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8154		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
8155	8313	cachename = texname;
8156	8314	else
8157	8315	processbump = false; // don't process bump map again
..	..	@@ -8173,7 +8331,7 @@
8173	8331	}
8174	8332
8175	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8176		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
8177	8335	cachename = texname;
8178	8336	else
8179	8337	processbump = false; // don't process bump map again
..	..	@@ -8182,7 +8340,9 @@
8182	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
8183	8341
8184	8342
8185		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
8186	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8187	8347	//texture = GetTexture(tex, bump);
8188	8348	}
..	..	@@ -8304,7 +8464,7 @@
8304	8464	return texture;
8305	8465	}
8306	8466
8307		- 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
8308	8468	{
8309	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8310	8470
..	..	@@ -8322,14 +8482,14 @@
8322	8482	return texture!=null?texture.texture:null;
8323	8483	}
8324	8484
8325		- 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
8326	8486	{
8327	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8328	8488
8329	8489	return texture!=null?texture.texturedata:null;
8330	8490	}
8331	8491
8332		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8333	8493	{
8334	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8335	8495	{
..	..	@@ -9306,8 +9466,8 @@
9306	9466	assert (parentcam != renderCamera);
9307	9467
9308	9468	if (renderCamera != lightCamera)
9309		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9310		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9311	9471
9312	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9313	9473
..	..	@@ -9322,8 +9482,8 @@
9322	9482	LA.matCopy(renderCamera.fromScreen, matrix);
9323	9483
9324	9484	if (renderCamera != lightCamera)
9325		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9326		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9327	9487
9328	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9329	9489
..	..	@@ -9395,7 +9555,7 @@
9395	9555	//gl.glFlush();
9396	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9397	9557
9398		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
9399	9559	{
9400	9560	System.err.println(" ABORTED FRAME");
9401	9561	break;
..	..	@@ -9425,7 +9585,7 @@
9425	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9426	9586
9427	9587	// save image
9428		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
9429	9589	{
9430	9590	VPwidth = viewport[2];
9431	9591	VPheight = viewport[3];
..	..	@@ -9536,11 +9696,11 @@
9536	9696
9537	9697	// imagecount++;
9538	9698
9539		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9699	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9540	9700
9541	9701	if (!BOXMODE)
9542	9702	{
9543		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9703	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9544	9704	}
9545	9705
9546	9706	if (!BOXMODE)
..	..	@@ -9578,7 +9738,7 @@
9578	9738	ABORTED = false;
9579	9739	}
9580	9740	else
9581		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
9582	9742
9583	9743	if (false)
9584	9744	{
..	..	@@ -10241,11 +10401,11 @@
10241	10401
10242	10402	public void display(GLAutoDrawable drawable)
10243	10403	{
10244		- if (GrafreeD.savesound && GrafreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
10245	10405	{
10246		- GrafreeD.wav.save();
10247		- GrafreeD.savesound = false;
10248		- GrafreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
10249	10409	}
10250	10410	// if (DEBUG_SELECTION)
10251	10411	// {
..	..	@@ -10375,7 +10535,7 @@
10375	10535	Object3D theobject = object;
10376	10536	Object3D theparent = object.parent;
10377	10537	object.parent = null;
10378		- object = (Object3D)GrafreeD.clone(object);
	10538	+ object = (Object3D)Grafreed.clone(object);
10379	10539	object.Stripify();
10380	10540	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10381	10541	theobject.PreprocessOcclusion(this);
..	..	@@ -10388,13 +10548,14 @@
10388	10548	ambientOcclusion = false;
10389	10549	}
10390	10550
10391		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10551	+ if (//Globals.lighttouched &&
	10552	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10392	10553	{
10393	10554	//if (RENDERSHADOW) // ?
10394	10555	if (!IsFrozen())
10395	10556	{
10396	10557	// dec 2012
10397		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10558	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10398	10559	{
10399	10560	Globals.framecount++;
10400	10561	shadowbuffer.display();
..	..	@@ -10521,8 +10682,8 @@
10521	10682
10522	10683	// if (parentcam != renderCamera) // not a light
10523	10684	if (cam != lightCamera)
10524		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10525		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10685	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10526	10687
10527	10688	for (int j = 0; j < 4; j++)
10528	10689	{
..	..	@@ -10536,8 +10697,8 @@
10536	10697
10537	10698	// if (parentcam != renderCamera) // not a light
10538	10699	if (cam != lightCamera)
10539		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10540		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10700	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10541	10702
10542	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10543	10704
..	..	@@ -10796,7 +10957,16 @@
10796	10957	// Bump noise
10797	10958	gl.glActiveTexture(GL.GL_TEXTURE6);
10798	10959	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10799		- BindTexture(NOISE_TEXTURE, false, 2);
	10960	+
	10961	+ try
	10962	+ {
	10963	+ BindTexture(NOISE_TEXTURE, false, 2);
	10964	+ }
	10965	+ catch (Exception e)
	10966	+ {
	10967	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10968	+ }
	10969	+
10800	10970
10801	10971	gl.glActiveTexture(GL.GL_TEXTURE0);
10802	10972	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10921,8 +11091,8 @@
10921	11091	System.err.println("parentcam != renderCamera");
10922	11092
10923	11093	// if (cam != lightCamera)
10924		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10925		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11094	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11095	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10926	11096	}
10927	11097
10928	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10943,8 +11113,8 @@
10943	11113	if (true) // TODO
10944	11114	{
10945	11115	if (cam != lightCamera)
10946		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10947		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11116	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11117	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10948	11118	}
10949	11119
10950	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11260,8 +11430,14 @@
11260	11430	{
11261	11431	renderpass++;
11262	11432	// System.out.println("Draw object... ");
	11433	+ STEP = 1;
11263	11434	if (FAST) // in case there is no script
11264		- STEP = 16;
	11435	+ STEP = 8;
	11436	+
	11437	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11438	+ {
	11439	+ STEP *= 4;
	11440	+ }
11265	11441
11266	11442	//object.FullInvariants();
11267	11443
..	..	@@ -11275,13 +11451,31 @@
11275	11451	e.printStackTrace();
11276	11452	}
11277	11453
11278		- if (GrafreeD.RENDERME > 0)
11279		- GrafreeD.RENDERME--; // mechante magouille
	11454	+ if (Grafreed.RENDERME > 0)
	11455	+ Grafreed.RENDERME--; // mechante magouille
11280	11456
11281	11457	Globals.ONESTEP = false;
11282	11458	}
11283	11459
11284	11460	static boolean zoomonce = false;
	11461	+
	11462	+ void CreateSelectedPoint()
	11463	+ {
	11464	+ if (selectedpoint == null)
	11465	+ {
	11466	+ debugpointG = new Sphere();
	11467	+ debugpointP = new Sphere();
	11468	+ debugpointC = new Sphere();
	11469	+ debugpointR = new Sphere();
	11470	+
	11471	+ selectedpoint = new Superellipsoid();
	11472	+
	11473	+ for (int i=0; i<8; i++)
	11474	+ {
	11475	+ debugpoints[i] = new Sphere();
	11476	+ }
	11477	+ }
	11478	+ }
11285	11479
11286	11480	void DrawObject(GL gl, boolean draw)
11287	11481	{
..	..	@@ -11346,7 +11540,14 @@
11346	11540
11347	11541	usedtextures.clear();
11348	11542
11349		- BindTextures(DEFAULT_TEXTURES, 2);
	11543	+ try
	11544	+ {
	11545	+ BindTextures(DEFAULT_TEXTURES, 2);
	11546	+ }
	11547	+ catch (Exception e)
	11548	+ {
	11549	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11550	+ }
11350	11551	}
11351	11552	//System.out.println("--> " + stackdepth);
11352	11553	// GrafreeD.traceon();
..	..	@@ -11356,8 +11557,9 @@
11356	11557
11357	11558	if (DrawMode() == DEFAULT)
11358	11559	{
11359		- if (DEBUG)
	11560	+ if (Globals.DEBUG)
11360	11561	{
	11562	+ CreateSelectedPoint();
11361	11563	float radius = 0.05f;
11362	11564	if (selectedpoint.radius != radius)
11363	11565	{
..	..	@@ -11437,7 +11639,14 @@
11437	11639	if (checker != null && DrawMode() == DEFAULT)
11438	11640	{
11439	11641	//BindTexture(IMMORTAL_TEXTURE);
11440		- BindTextures(checker.GetTextures(), checker.texres);
	11642	+ try
	11643	+ {
	11644	+ BindTextures(checker.GetTextures(), checker.texres);
	11645	+ }
	11646	+ catch (Exception e)
	11647	+ {
	11648	+ System.err.println("FAILED: " + checker.GetTextures());
	11649	+ }
11441	11650	// NEAREST
11442	11651	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11443	11652	DrawChecker(gl);
..	..	@@ -11519,7 +11728,7 @@
11519	11728	return;
11520	11729	}
11521	11730
11522		- String string = obj.GetToolTip();
	11731	+ String string = obj.toString(); //.GetToolTip();
11523	11732
11524	11733	GL gl = GetGL();
11525	11734
..	..	@@ -11836,8 +12045,8 @@
11836	12045	//obj.TransformToWorld(light, light);
11837	12046	for (int i = tp.size(); --i >= 0;)
11838	12047	{
11839		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11840		- LA.xformPos(light, tp.get(i).toParent, light);
	12048	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12049	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11841	12050	}
11842	12051
11843	12052
..	..	@@ -11854,8 +12063,8 @@
11854	12063	parentcam = cameras[0];
11855	12064	}
11856	12065
11857		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11858		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12066	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12067	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11859	12068
11860	12069	LA.xformPos(light, renderCamera.toScreen, light);
11861	12070
..	..	@@ -12469,8 +12678,8 @@
12469	12678
12470	12679	// display shadow only (bump == 0)
12471	12680	"SUB temp.x, half.x, shadow.x;" +
12472		- "MOV temp.y, -params6.x;" +
12473		- "SLT temp.z, temp.y, zero.x;" +
	12681	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12682	+ "SLT temp.z, temp.y, -one2048th.x;" +
12474	12683	"SUB temp.y, one.x, temp.z;" +
12475	12684	"MUL temp.x, temp.x, temp.y;" +
12476	12685	"KIL temp.x;" +
..	..	@@ -12599,8 +12808,10 @@
12599	12808	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12600	12809
12601	12810	"SUB temp.x, one.x, ndotl.x;" +
12602		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12603		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12811	+ // Tuning for default skin
	12812	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12813	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12814	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12604	12815	"MUL temp.x, temp.x, temp.y;" +
12605	12816
12606	12817	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12748,7 +12959,7 @@
12748	12959	"MUL final.y, fragment.texcoord[0].x, c256;" +
12749	12960	"FLR final.x, final.y;" +
12750	12961	"SUB final.y, final.y, final.x;" +
12751		- //"MUL final.x, final.x, c256i;" +
	12962	+ "MUL final.x, final.x, c256i;" +
12752	12963	"MOV final.z, zero.x;" +
12753	12964	"MOV final.a, one.w;":""
12754	12965	) +
..	..	@@ -12756,7 +12967,7 @@
12756	12967	"MUL final.y, fragment.texcoord[0].y, c256;" +
12757	12968	"FLR final.x, final.y;" +
12758	12969	"SUB final.y, final.y, final.x;" +
12759		- //"MUL final.x, final.x, c256i;" +
	12970	+ "MUL final.x, final.x, c256i;" +
12760	12971	"MOV final.z, zero.x;" +
12761	12972	"MOV final.a, one.w;":""
12762	12973	) +
..	..	@@ -12799,7 +13010,7 @@
12799	13010	//once = true;
12800	13011	}
12801	13012
12802		- System.out.print("Program #" + mode + "; length = " + program.length());
	13013	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12803	13014	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12804	13015	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12805	13016
..	..	@@ -12932,12 +13143,16 @@
12932	13143
12933	13144	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12934	13145	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13146	+
	13147	+ // Compare fragment depth in light space with shadowmap.
12935	13148	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12936	13149	"SGE temp.y, temp.x, zero.x;" +
12937		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13150	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13151	+
	13152	+ // Reverse comparison
12938	13153	"SUB temp.x, one.x, temp.x;" +
12939	13154	"MUL " + shadow + ".x, temp.x, temp.y;" +
12940		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13155	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12941	13156	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12942	13157
12943	13158	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12951,6 +13166,10 @@
12951	13166	// No shadow for backface
12952	13167	"DP3 temp.x, normal, lightd;" +
12953	13168	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13169	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13170	+
	13171	+ // No shadow when out of frustrum
	13172	+ "SGE temp.x, " + depth + ".z, one.z;" +
12954	13173	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12955	13174	"";
12956	13175	}
..	..	@@ -13097,7 +13316,8 @@
13097	13316	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13098	13317	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13099	13318	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13100		- Object3D.cVector2[] vector2buffer;
	13319	+
	13320	+ //Object3D.cVector2[] vector2buffer;
13101	13321
13102	13322	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13103	13323	// OUT : diff, spec
..	..	@@ -13509,7 +13729,7 @@
13509	13729	public void mousePressed(MouseEvent e)
13510	13730	{
13511	13731	//System.out.println("mousePressed: " + e);
13512		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13732	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13513	13733	}
13514	13734
13515	13735	static long prevtime = 0;
..	..	@@ -13585,8 +13805,8 @@
13585	13805	// mode \|= META;
13586	13806	//}
13587	13807
13588		- SetMouseMode(WHEEL \| e.getModifiersEx());
13589		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13808	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13809	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13590	13810	anchorX = ax;
13591	13811	anchorY = ay;
13592	13812	prevX = px;
..	..	@@ -13646,6 +13866,10 @@
13646	13866	// wasliveok = true;
13647	13867	// waslive = false;
13648	13868
	13869	+ // May 2019 Forget it:
	13870	+ if (true)
	13871	+ return;
	13872	+
13649	13873	// source == timer
13650	13874	if (mouseDown)
13651	13875	{
..	..	@@ -13684,7 +13908,7 @@
13684	13908
13685	13909	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13686	13910
13687		- void clickStart(int x, int y, int modifiers)
	13911	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13688	13912	{
13689	13913	if (!wasliveok)
13690	13914	return;
..	..	@@ -13701,7 +13925,7 @@
13701	13925	// touched = true; // main DL
13702	13926	if (isRenderer)
13703	13927	{
13704		- SetMouseMode(modifiers);
	13928	+ SetMouseMode(modifiers, modifiersex);
13705	13929	}
13706	13930
13707	13931	selectX = anchorX = x;
..	..	@@ -13714,7 +13938,7 @@
13714	13938	clicked = true;
13715	13939	hold = false;
13716	13940
13717		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13941	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13718	13942	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13719	13943	{
13720	13944	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,7 +13969,7 @@
13745	13969	info.camera = renderCamera;
13746	13970	info.x = x;
13747	13971	info.y = y;
13748		- info.modifiers = modifiers;
	13972	+ info.modifiers = modifiersex;
13749	13973	editObj = object.doEditClick(info, 0);
13750	13974	if (!editObj)
13751	13975	{
..	..	@@ -13762,9 +13986,12 @@
13762	13986
13763	13987	public void mouseDragged(MouseEvent e)
13764	13988	{
	13989	+ Globals.MOUSEDRAGGED = true;
	13990	+
13765	13991	//System.out.println("mouseDragged: " + e);
13766	13992	if (isRenderer)
13767	13993	movingcamera = true;
	13994	+
13768	13995	//if (drawing)
13769	13996	//return;
13770	13997	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13774,7 +14001,7 @@
13774	14001	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13775	14002	}
13776	14003	else
13777		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14004	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13778	14005
13779	14006	//try { Thread.sleep(1); } catch (Exception ex) {}
13780	14007	}
..	..	@@ -14011,7 +14238,7 @@
14011	14238	{
14012	14239	Globals.lighttouched = true;
14013	14240	}
14014		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14241	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14015	14242	}
14016	14243	//else
14017	14244	}
..	..	@@ -14111,7 +14338,7 @@
14111	14338	int X, Y;
14112	14339	boolean SX, SY;
14113	14340
14114		- void drag(int x, int y, int modifiers)
	14341	+ void drag(int x, int y, int modifiers, int modifiersex)
14115	14342	{
14116	14343	if (IsFrozen())
14117	14344	{
..	..	@@ -14120,17 +14347,17 @@
14120	14347
14121	14348	drag = true; // NEW
14122	14349
14123		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14350	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14124	14351
14125	14352	X = x;
14126	14353	Y = y;
14127	14354	// floating state for animation
14128		- MODIFIERS = modifiers;
14129		- modifiers &= ~1024;
	14355	+ MODIFIERS = modifiersex;
	14356	+ modifiersex &= ~1024;
14130	14357	if (false) // modifiers != 0)
14131	14358	{
14132	14359	//new Exception().printStackTrace();
14133		- System.out.println("mouseDragged: " + modifiers);
	14360	+ System.out.println("mouseDragged: " + modifiersex);
14134	14361	System.out.println("SHIFT = " + SHIFT);
14135	14362	System.out.println("CONTROL = " + COMMAND);
14136	14363	System.out.println("META = " + META);
..	..	@@ -14150,7 +14377,7 @@
14150	14377	info.camera = renderCamera;
14151	14378	info.x = x;
14152	14379	info.y = y;
14153		- object.editWindow.copy.doEditDrag(info);
	14380	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14154	14381	} else
14155	14382	{
14156	14383	if (x < startX)
..	..	@@ -14314,7 +14541,9 @@
14314	14541	ci.camera = renderCamera;
14315	14542	if (!isRenderer)
14316	14543	{
14317		- if (object.editWindow.copy.doEditClick(ci, 0))
	14544	+ ObjEditor editWindow = object.editWindow;
	14545	+ Object3D copy = editWindow.copy;
	14546	+ if (copy.doEditClick(ci, 0))
14318	14547	{
14319	14548	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14320	14549	} else
..	..	@@ -14326,7 +14555,10 @@
14326	14555
14327	14556	public void mouseReleased(MouseEvent e)
14328	14557	{
	14558	+ Globals.MOUSEDRAGGED = false;
	14559	+
14329	14560	movingcamera = false;
	14561	+ X = Y = 0;
14330	14562	//System.out.println("mouseReleased: " + e);
14331	14563	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14332	14564	}
..	..	@@ -14349,9 +14581,9 @@
14349	14581	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14350	14582	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14351	14583
14352		- if (control \|\| command \|\| IsFrozen())
	14584	+// No delay if (control \|\| command \|\| IsFrozen())
14353	14585	timeout = true;
14354		- else
	14586	+// ?? May 2019 else
14355	14587	// timer.setDelay((modifiers & 128) != 0?0:350);
14356	14588	mouseDown = false;
14357	14589	if (!control && !command) // june 2013
..	..	@@ -14461,7 +14693,7 @@
14461	14693	System.out.println("keyReleased: " + e);
14462	14694	}
14463	14695
14464		- void SetMouseMode(int modifiers)
	14696	+ void SetMouseMode(int modifiers, int modifiersex)
14465	14697	{
14466	14698	//System.out.println("SetMouseMode = " + modifiers);
14467	14699	//modifiers &= ~1024;
..	..	@@ -14473,25 +14705,25 @@
14473	14705	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14474	14706	// return;
14475	14707	//System.out.println("SetMode = " + modifiers);
14476		- if ((modifiers & WHEEL) == WHEEL)
	14708	+ if ((modifiersex & WHEEL) == WHEEL)
14477	14709	{
14478	14710	mouseMode \|= ZOOM;
14479	14711	}
14480	14712
14481	14713	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482		- if (capsLocked \|\| (modifiers & META) == META)
	14714	+ if (capsLocked) // \|\| (modifiers & META) == META)
14483	14715	{
14484	14716	mouseMode \|= VR; // BACKFORTH;
14485	14717	}
14486		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14718	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14487	14719	{
14488	14720	mouseMode \|= SELECT;
14489	14721	}
14490		- if ((modifiers & COMMAND) == COMMAND)
	14722	+ if ((modifiersex & COMMAND) == COMMAND)
14491	14723	{
14492	14724	mouseMode \|= SELECT;
14493	14725	}
14494		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14726	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14495	14727	{
14496	14728	mouseMode &= ~VR;
14497	14729	mouseMode \|= TRANSLATE;
..	..	@@ -14520,7 +14752,7 @@
14520	14752
14521	14753	if (isRenderer) //
14522	14754	{
14523		- SetMouseMode(modifiers);
	14755	+ SetMouseMode(0, modifiers);
14524	14756	}
14525	14757
14526	14758	Globals.theRenderer.keyPressed(key);
..	..	@@ -14692,8 +14924,14 @@
14692	14924	RevertCamera();
14693	14925	repaint();
14694	14926	break;
14695		- case 'L':
14696	14927	case 'l':
	14928	+ lightMode ^= true;
	14929	+ Globals.lighttouched = true;
	14930	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14931	+ targetLookAt.set(manipCamera.lookAt);
	14932	+ repaint();
	14933	+ break;
	14934	+ case 'L':
14697	14935	if (lightMode)
14698	14936	{
14699	14937	lightMode = false;
..	..	@@ -14840,23 +15078,21 @@
14840	15078	kompactbit = 6;
14841	15079	break;
14842	15080	case ' ':
14843		- lightMode ^= true;
14844		- Globals.lighttouched = true;
14845		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14846		- targetLookAt.set(manipCamera.lookAt);
	15081	+ ObjEditor.theFrame.ToggleFullScreen();
14847	15082	repaint();
14848	15083	break;
14849	15084	//case '`' :
14850	15085	case ESC:
14851	15086	RENDERPROGRAM += 1;
14852	15087	RENDERPROGRAM %= 3;
	15088	+
14853	15089	repaint();
14854	15090	break;
14855	15091	case 'Z':
14856	15092	//RESIZETEXTURE ^= true;
14857	15093	//break;
14858	15094	case 'z':
14859		- RENDERSHADOW ^= true;
	15095	+ Globals.RENDERSHADOW ^= true;
14860	15096	Globals.lighttouched = true;
14861	15097	repaint();
14862	15098	break;
..	..	@@ -14980,7 +15216,7 @@
14980	15216	//mode = ROTATE;
14981	15217	if ((MODIFIERS & COMMAND) == 0) // VR??
14982	15218	{
14983		- SetMouseMode(modifiers);
	15219	+ SetMouseMode(0, modifiers);
14984	15220	}
14985	15221	}
14986	15222
..	..	@@ -15116,7 +15352,7 @@
15116	15352	{
15117	15353	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15118	15354	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15355	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15120	15356	{
15121	15357	mouseMoved(e);
15122	15358	} else
..	..	@@ -15335,7 +15571,9 @@
15335	15571	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15336	15572	//Image img = CreateImage(width, height);
15337	15573	//System.out.println("width = " + width + "; height = " + height + "\n");
	15574	+
15338	15575	Graphics gr = g; // img.getGraphics();
	15576	+
15339	15577	if (!hasMarquee)
15340	15578	{
15341	15579	if (Xmin < Xmax) // !locked)
..	..	@@ -15433,14 +15671,33 @@
15433	15671	if (!isRenderer)
15434	15672	{
15435	15673	object.drawEditHandles(info, 0);
	15674	+
	15675	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15676	+ {
	15677	+ switch (object.selection.get(0).hitSomething)
	15678	+ {
	15679	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15680	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15681	+ break;
	15682	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15683	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15684	+ break;
	15685	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15686	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15687	+ break;
	15688	+ }
	15689	+
	15690	+ }
15436	15691	}
15437	15692	}
	15693	+
15438	15694	if (isRenderer)
15439	15695	{
15440	15696	//gr.setColor(Color.black);
15441	15697	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15442	15698	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15443	15699	}
	15700	+
15444	15701	if (hasMarquee)
15445	15702	{
15446	15703	gr.setXORMode(Color.white);
..	..	@@ -15553,6 +15810,7 @@
15553	15810	public boolean mouseDown(Event evt, int x, int y)
15554	15811	{
15555	15812	System.out.println("mouseDown: " + evt);
	15813	+ System.exit(0);
15556	15814	/*
15557	15815	locked = true;
15558	15816	drag = false;
..	..	@@ -15596,7 +15854,7 @@
15596	15854	{
15597	15855	keyPressed(0, modifiers);
15598	15856	}
15599		- clickStart(x, y, modifiers);
	15857	+ // clickStart(x, y, modifiers);
15600	15858	return true;
15601	15859	}
15602	15860
..	..	@@ -15714,7 +15972,7 @@
15714	15972	{
15715	15973	keyReleased(0, 0);
15716	15974	}
15717		- drag(x, y, modifiers);
	15975	+ drag(x, y, 0, modifiers);
15718	15976	return true;
15719	15977	}
15720	15978
..	..	@@ -15846,7 +16104,7 @@
15846	16104	Object3D object;
15847	16105	static Object3D trackedobject;
15848	16106	Camera renderCamera; // Light or Eye (or Occlusion)
15849		- /static/ Camera manipCamera; // Light or Eye
	16107	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15850	16108	/static/ Camera eyeCamera;
15851	16109	/static/ Camera lightCamera;
15852	16110	int cameracount;
..	..	@@ -16131,16 +16389,16 @@
16131	16389	cStatic.objectstack[materialdepth++] = checker;
16132	16390	//System.out.println("material " + material);
16133	16391	//Applet3D.tracein(this, selected);
16134		- vector2buffer = checker.projectedVertices;
	16392	+ //vector2buffer = checker.projectedVertices;
16135	16393
16136	16394	//checker.GetMaterial().Draw(this, false); // true);
16137		- DrawMaterial(checker.GetMaterial(), false); // true);
	16395	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16138	16396
16139	16397	materialdepth -= 1;
16140	16398	if (materialdepth > 0)
16141	16399	{
16142		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16143		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16400	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16401	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16144	16402	}
16145	16403	//checker.GetMaterial().opacity = 1f;
16146	16404	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16412,16 +16670,16 @@
16412	16670	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]));
16413	16671	}
16414	16672
16415		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16673	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16416	16674	}
16417	16675	}
16418	16676
16419	16677	if (!movingcamera && !PAINTMODE)
16420	16678	object.editWindow.ScreenFitPoint(); // fev 2014
16421	16679
16422		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16680	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16423	16681	{
16424		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16682	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16425	16683
16426	16684	Object3D group = new Object3D("inst" + paintcount++);
16427	16685
..	..	@@ -16577,7 +16835,7 @@
16577	16835	gl.glDisable(gl.GL_CULL_FACE);
16578	16836	}
16579	16837
16580		- if (!RENDERSHADOW)
	16838	+ if (!Globals.RENDERSHADOW)
16581	16839	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16582	16840
16583	16841	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16587,7 +16845,7 @@
16587	16845	//gl.glColorMask(false, false, false, false);
16588	16846
16589	16847	//render_scene_from_light_view(gl, drawable, 0, 0);
16590		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16848	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16591	16849	{
16592	16850	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	16851
..	..	@@ -17003,23 +17261,15 @@
17003	17261	int AAbuffersize = 0;
17004	17262
17005	17263	//double[] selectedpoint = new double[3];
17006		- static Superellipsoid selectedpoint = new Superellipsoid();
	17264	+ static Superellipsoid selectedpoint;
17007	17265	static Sphere previousselectedpoint = null;
17008		- static Sphere debugpointG = new Sphere();
17009		- static Sphere debugpointP = new Sphere();
17010		- static Sphere debugpointC = new Sphere();
17011		- static Sphere debugpointR = new Sphere();
	17266	+ static Sphere debugpointG;
	17267	+ static Sphere debugpointP;
	17268	+ static Sphere debugpointC;
	17269	+ static Sphere debugpointR;
17012	17270
17013	17271	static Sphere debugpoints[] = new Sphere[8];
17014	17272
17015		- static
17016		- {
17017		- for (int i=0; i<8; i++)
17018		- {
17019		- debugpoints[i] = new Sphere();
17020		- }
17021		- }
17022		-
17023	17273	static void InitPoints(float radius)
17024	17274	{
17025	17275	for (int i=0; i<8; i++)