~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;
..	..	@@ -336,14 +335,28 @@
336	335	display.options1[2] = material.shadowbias;
337	336	display.options1[3] = material.aniso;
338	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
339	343	display.options2[0] = material.opacity;
340	344	display.options2[1] = material.diffuse;
341	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
342	349
343	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
344	354	display.options4[0] = material.cameralight/0.2f;
345	355	display.options4[1] = material.subsurface;
346	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
347	360
348	361	// if (display.CURRENTANTIALIAS > 0)
349	362	// display.options3[3] /= 4;
..	..	@@ -359,7 +372,7 @@
359	372	/**/
360	373	} else
361	374	{
362		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
363	376	}
364	377	} else
365	378	{
..	..	@@ -383,8 +396,8 @@
383	396	cStatic.objectstack[materialdepth++] = obj;
384	397	//System.out.println("material " + material);
385	398	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	401	}
389	402	}
390	403
..	..	@@ -401,8 +414,8 @@
401	414	materialdepth -= 1;
402	415	if (materialdepth > 0)
403	416	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	419	}
407	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +435,8 @@
422	435	materialdepth -= 1;
423	436	if (materialdepth > 0)
424	437	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	440	}
428	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	442	//else
..	..	@@ -464,10 +477,12 @@
464	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	478	{
466	479	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
468	483	if (!hasnorm)
469	484	{
470		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
471	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1207,12 @@
1192	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1208	}
1194	1209	}
	1210	+
1195	1211	if (flipV)
1196	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1213	else
1198	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1199	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1218
..	..	@@ -1215,10 +1232,12 @@
1215	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1233	}
1217	1234	}
	1235	+
1218	1236	if (flipV)
1219	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1238	else
1221	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1222	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1243
..	..	@@ -1246,8 +1265,10 @@
1246	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1266	else
1248	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1249	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1251	1272	count2 += 2;
1252	1273	count3 += 3;
1253	1274	}
..	..	@@ -1603,7 +1624,7 @@
1603	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1625	}
1605	1626
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1628	{
1608	1629	CameraPane display = this;
1609	1630	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1651,7 @@
1630	1651
1631	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1653
1633		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1634	1655
1635	1656	/**/
1636	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1659,7 @@
1638	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1642	1663
1643	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1767,9 @@
1746	1767	display.modelParams7[2] = 0;
1747	1768	display.modelParams7[3] = 0;
1748	1769
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1771
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1774	{
1754	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1911,7 @@
1890	1911	void PushMatrix(double[][] matrix)
1891	1912	{
1892	1913	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1894	1915	}
1895	1916
1896	1917	void PushMatrix()
..	..	@@ -2044,7 +2065,7 @@
2044	2065	//System.err.println("Oeil on");
2045	2066	OEIL = true;
2046	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2069	//pingthread.StepToTarget(true);
2049	2070	}
2050	2071
..	..	@@ -2142,7 +2163,7 @@
2142	2163	System.err.println("LIVE = " + Globals.isLIVE());
2143	2164
2144	2165	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2146	2167	// else
2147	2168	repaint(); // start loop // may 2013
2148	2169	}
..	..	@@ -2259,7 +2280,7 @@
2259	2280
2260	2281	void ToggleDebug()
2261	2282	{
2262		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2263	2284	}
2264	2285
2265	2286	void ToggleLookAt()
..	..	@@ -2267,9 +2288,9 @@
2267	2288	LOOKAT ^= true;
2268	2289	}
2269	2290
2270		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2271	2292	{
2272		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
2273	2294	}
2274	2295
2275	2296	void ToggleHandles()
..	..	@@ -2277,10 +2298,17 @@
2277	2298	HANDLES ^= true;
2278	2299	}
2279	2300
	2301	+ Object3D paintFolder;
	2302	+
2280	2303	void TogglePaint()
2281	2304	{
2282	2305	PAINTMODE ^= true;
2283	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2284	2312	}
2285	2313
2286	2314	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2404,7 @@
2376	2404	{
2377	2405	return currentGL;
2378	2406	}
2379		-
	2407	+
2380	2408	/**/
2381	2409	class CacheTexture
2382	2410	{
..	..	@@ -7902,7 +7930,7 @@
7902	7930	String pigment = Object3D.GetPigment(tex);
7903	7931	String bump = Object3D.GetBump(tex);
7904	7932
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7933	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	7934	{
7907	7935	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	7936	// System.out.println("; bump = " + bump);
..	..	@@ -7919,6 +7947,64 @@
7919	7947
7920	7948	ReleaseTexture(bump, true);
7921	7949	ReleaseTexture(pigment, false);
	7950	+ }
	7951	+
	7952	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7953	+ {
	7954	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7955	+ {
	7956	+ return;
	7957	+ }
	7958	+
	7959	+ if (tex == null)
	7960	+ {
	7961	+ ReleaseTexture(null, false);
	7962	+ return;
	7963	+ }
	7964	+
	7965	+ String pigment = Object3D.GetPigment(tex);
	7966	+
	7967	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7968	+ {
	7969	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7970	+ // System.out.println("; bump = " + bump);
	7971	+ }
	7972	+
	7973	+ if (pigment.equals(""))
	7974	+ {
	7975	+ pigment = null;
	7976	+ }
	7977	+
	7978	+ ReleaseTexture(pigment, false);
	7979	+ }
	7980	+
	7981	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7982	+ {
	7983	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7984	+ {
	7985	+ return;
	7986	+ }
	7987	+
	7988	+ if (tex == null)
	7989	+ {
	7990	+ ReleaseTexture(null, true);
	7991	+ return;
	7992	+ }
	7993	+
	7994	+ String bump = Object3D.GetBump(tex);
	7995	+
	7996	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7997	+ {
	7998	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7999	+ // System.out.println("; bump = " + bump);
	8000	+ }
	8001	+
	8002	+ if (bump.equals(""))
	8003	+ {
	8004	+ bump = null;
	8005	+ }
	8006	+
	8007	+ ReleaseTexture(bump, true);
7922	8008	}
7923	8009
7924	8010	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8024,7 +8110,7 @@
8024	8110	}
8025	8111	}
8026	8112
8027		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8113	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8114	{
8029	8115	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8116	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8045,7 +8131,7 @@
8045	8131	usedtextures.put(pigment, pigment);
8046	8132	usedtextures.put(bump, bump);
8047	8133
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8134	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8135	{
8050	8136	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8137	// System.out.println("; bump = " + bump);
..	..	@@ -8069,7 +8155,94 @@
8069	8155	return; // true;
8070	8156	}
8071	8157
8072		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8158	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8159	+ {
	8160	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8161	+ ambientOcclusion ) // \|\| !textureon)
	8162	+ {
	8163	+ return; // false;
	8164	+ }
	8165	+
	8166	+ if (tex == null)
	8167	+ {
	8168	+ BindTexture(null,false,resolution);
	8169	+ return;
	8170	+ }
	8171	+
	8172	+ String pigment = Object3D.GetPigment(tex);
	8173	+
	8174	+ usedtextures.put(pigment, pigment);
	8175	+
	8176	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8177	+ {
	8178	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8179	+ // System.out.println("; bump = " + bump);
	8180	+ }
	8181	+
	8182	+ if (pigment.equals(""))
	8183	+ {
	8184	+ pigment = null;
	8185	+ }
	8186	+
	8187	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8188	+ BindTexture(pigment, false, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+ ambientOcclusion ) // \|\| !textureon)
	8195	+ {
	8196	+ return; // false;
	8197	+ }
	8198	+
	8199	+ if (tex == null)
	8200	+ {
	8201	+ BindTexture(null,true,resolution);
	8202	+ return;
	8203	+ }
	8204	+
	8205	+ String bump = Object3D.GetBump(tex);
	8206	+
	8207	+ usedtextures.put(bump, bump);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (bump.equals(""))
	8216	+ {
	8217	+ bump = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+ BindTexture(bump, true, resolution);
	8222	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+ }
	8224	+
	8225	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8226	+
	8227	+ private boolean FileExists(String tex)
	8228	+ {
	8229	+ if (missingTextures.contains(tex))
	8230	+ {
	8231	+ return false;
	8232	+ }
	8233	+
	8234	+ boolean fileExists = new File(tex).exists();
	8235	+
	8236	+ if (!fileExists)
	8237	+ {
	8238	+ // If file exists, the "new File()" is not executed sgain
	8239	+ missingTextures.add(tex);
	8240	+ }
	8241	+
	8242	+ return fileExists;
	8243	+ }
	8244	+
	8245	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8073	8246	{
8074	8247	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8075	8248
..	..	@@ -8077,12 +8250,18 @@
8077	8250	{
8078	8251	String texname = tex;
8079	8252
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;
	8253	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8254	+
	8255	+// String[] split = tex.split("Textures");
	8256	+// if (split.length > 1)
	8257	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8258	+// else
	8259	+// if (!texname.startsWith("/"))
	8260	+// texname = "/Users/nbriere/Textures/" + texname;
	8261	+ if (!FileExists(tex))
	8262	+ {
	8263	+ texname = fallbackTextureName;
	8264	+ }
8086	8265
8087	8266	if (CACHETEXTURE)
8088	8267	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8151,7 +8330,7 @@
8151	8330	}
8152	8331
8153	8332	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8154		- if (!new File(cachename).exists())
	8333	+ if (!FileExists(cachename))
8155	8334	cachename = texname;
8156	8335	else
8157	8336	processbump = false; // don't process bump map again
..	..	@@ -8173,7 +8352,7 @@
8173	8352	}
8174	8353
8175	8354	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8176		- if (!new File(cachename).exists())
	8355	+ if (!FileExists(cachename))
8177	8356	cachename = texname;
8178	8357	else
8179	8358	processbump = false; // don't process bump map again
..	..	@@ -8182,7 +8361,9 @@
8182	8361	texturedata = GetFileTexture(cachename, processbump, resolution);
8183	8362
8184	8363
8185		- if (texturedata != null)
	8364	+ if (texturedata == null)
	8365	+ throw new Exception();
	8366	+
8186	8367	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8187	8368	//texture = GetTexture(tex, bump);
8188	8369	}
..	..	@@ -8304,7 +8485,7 @@
8304	8485	return texture;
8305	8486	}
8306	8487
8307		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8488	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8308	8489	{
8309	8490	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8310	8491
..	..	@@ -8322,21 +8503,21 @@
8322	8503	return texture!=null?texture.texture:null;
8323	8504	}
8324	8505
8325		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8506	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8326	8507	{
8327	8508	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8328	8509
8329	8510	return texture!=null?texture.texturedata:null;
8330	8511	}
8331	8512
8332		- boolean BindTexture(String tex, boolean bump, int resolution)
	8513	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8333	8514	{
8334	8515	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8335	8516	{
8336	8517	return false;
8337	8518	}
8338	8519
8339		- boolean newtex = false;
	8520	+ //boolean newtex = false;
8340	8521
8341	8522	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8342	8523
..	..	@@ -8368,7 +8549,7 @@
8368	8549	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8369	8550	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8370	8551
8371		- return newtex;
	8552	+ return true; // Warning: not used.
8372	8553	}
8373	8554
8374	8555	ShadowBuffer shadowPBuf;
..	..	@@ -9206,11 +9387,35 @@
9206	9387	jy8[3] = 0.5f;
9207	9388	}
9208	9389
9209		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9390	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9210	9391	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9211	9392	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9212	9393	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9213	9394
	9395	+ void ResetOptions()
	9396	+ {
	9397	+ options1[0] = 100;
	9398	+ options1[1] = 0.025f;
	9399	+ options1[2] = 0.01f;
	9400	+ options1[3] = 0;
	9401	+ options1[4] = 0;
	9402	+
	9403	+ options2[0] = 0;
	9404	+ options2[1] = 0.75f;
	9405	+ options2[2] = 0;
	9406	+ options2[3] = 0;
	9407	+
	9408	+ options3[0] = 1;
	9409	+ options3[1] = 1;
	9410	+ options3[2] = 1;
	9411	+ options3[3] = 0;
	9412	+
	9413	+ options4[0] = 1;
	9414	+ options4[1] = 0;
	9415	+ options4[2] = 1;
	9416	+ options4[3] = 0;
	9417	+ }
	9418	+
9214	9419	static int imagecount = 0; // movie generation
9215	9420
9216	9421	static int jitter = 0;
..	..	@@ -9306,8 +9511,8 @@
9306	9511	assert (parentcam != renderCamera);
9307	9512
9308	9513	if (renderCamera != lightCamera)
9309		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9310		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9514	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9515	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9311	9516
9312	9517	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9313	9518
..	..	@@ -9322,8 +9527,8 @@
9322	9527	LA.matCopy(renderCamera.fromScreen, matrix);
9323	9528
9324	9529	if (renderCamera != lightCamera)
9325		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9326		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9530	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9531	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9327	9532
9328	9533	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9329	9534
..	..	@@ -9395,7 +9600,7 @@
9395	9600	//gl.glFlush();
9396	9601	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9397	9602
9398		- if (ANIMATION && ABORTED)
	9603	+ if (Globals.ANIMATION && ABORTED)
9399	9604	{
9400	9605	System.err.println(" ABORTED FRAME");
9401	9606	break;
..	..	@@ -9425,7 +9630,7 @@
9425	9630	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9426	9631
9427	9632	// save image
9428		- if (ANIMATION && !ABORTED)
	9633	+ if (Globals.ANIMATION && !ABORTED)
9429	9634	{
9430	9635	VPwidth = viewport[2];
9431	9636	VPheight = viewport[3];
..	..	@@ -9536,11 +9741,11 @@
9536	9741
9537	9742	// imagecount++;
9538	9743
9539		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9744	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9540	9745
9541	9746	if (!BOXMODE)
9542	9747	{
9543		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9748	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9544	9749	}
9545	9750
9546	9751	if (!BOXMODE)
..	..	@@ -9578,7 +9783,7 @@
9578	9783	ABORTED = false;
9579	9784	}
9580	9785	else
9581		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9786	+ Grafreed.wav.cursor += 735 * ACSIZE;
9582	9787
9583	9788	if (false)
9584	9789	{
..	..	@@ -10241,11 +10446,11 @@
10241	10446
10242	10447	public void display(GLAutoDrawable drawable)
10243	10448	{
10244		- if (GrafreeD.savesound && GrafreeD.hassound)
	10449	+ if (Grafreed.savesound && Grafreed.hassound)
10245	10450	{
10246		- GrafreeD.wav.save();
10247		- GrafreeD.savesound = false;
10248		- GrafreeD.hassound = false;
	10451	+ Grafreed.wav.save();
	10452	+ Grafreed.savesound = false;
	10453	+ Grafreed.hassound = false;
10249	10454	}
10250	10455	// if (DEBUG_SELECTION)
10251	10456	// {
..	..	@@ -10321,6 +10526,7 @@
10321	10526	ANTIALIAS = 0;
10322	10527	//System.out.println("RESTART");
10323	10528	AAtimer.restart();
	10529	+ Globals.TIMERRUNNING = true;
10324	10530	}
10325	10531	}
10326	10532	}
..	..	@@ -10375,7 +10581,7 @@
10375	10581	Object3D theobject = object;
10376	10582	Object3D theparent = object.parent;
10377	10583	object.parent = null;
10378		- object = (Object3D)GrafreeD.clone(object);
	10584	+ object = (Object3D)Grafreed.clone(object);
10379	10585	object.Stripify();
10380	10586	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10381	10587	theobject.PreprocessOcclusion(this);
..	..	@@ -10388,13 +10594,14 @@
10388	10594	ambientOcclusion = false;
10389	10595	}
10390	10596
10391		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10597	+ if (//Globals.lighttouched &&
	10598	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10392	10599	{
10393	10600	//if (RENDERSHADOW) // ?
10394	10601	if (!IsFrozen())
10395	10602	{
10396	10603	// dec 2012
10397		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10604	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10398	10605	{
10399	10606	Globals.framecount++;
10400	10607	shadowbuffer.display();
..	..	@@ -10521,8 +10728,8 @@
10521	10728
10522	10729	// if (parentcam != renderCamera) // not a light
10523	10730	if (cam != lightCamera)
10524		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10525		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10731	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10732	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10526	10733
10527	10734	for (int j = 0; j < 4; j++)
10528	10735	{
..	..	@@ -10536,8 +10743,8 @@
10536	10743
10537	10744	// if (parentcam != renderCamera) // not a light
10538	10745	if (cam != lightCamera)
10539		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10540		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10746	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10747	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10541	10748
10542	10749	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10543	10750
..	..	@@ -10796,7 +11003,16 @@
10796	11003	// Bump noise
10797	11004	gl.glActiveTexture(GL.GL_TEXTURE6);
10798	11005	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10799		- BindTexture(NOISE_TEXTURE, false, 2);
	11006	+
	11007	+ try
	11008	+ {
	11009	+ BindTexture(NOISE_TEXTURE, false, 2);
	11010	+ }
	11011	+ catch (Exception e)
	11012	+ {
	11013	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11014	+ }
	11015	+
10800	11016
10801	11017	gl.glActiveTexture(GL.GL_TEXTURE0);
10802	11018	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,9 +11035,9 @@
10819	11035
10820	11036	gl.glMatrixMode(GL.GL_MODELVIEW);
10821	11037
10822		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10823		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10824		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11038	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11039	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11040	+gl.glEnable(gl.GL_MULTISAMPLE);
10825	11041	} else
10826	11042	{
10827	11043	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10832,7 +11048,7 @@
10832	11048	//System.out.println("BLENDING ON");
10833	11049	gl.glEnable(GL.GL_BLEND);
10834	11050	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10835		-
	11051	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10836	11052	gl.glMatrixMode(gl.GL_PROJECTION);
10837	11053	gl.glLoadIdentity();
10838	11054
..	..	@@ -10921,8 +11137,8 @@
10921	11137	System.err.println("parentcam != renderCamera");
10922	11138
10923	11139	// if (cam != lightCamera)
10924		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10925		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11140	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11141	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10926	11142	}
10927	11143
10928	11144	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10943,8 +11159,8 @@
10943	11159	if (true) // TODO
10944	11160	{
10945	11161	if (cam != lightCamera)
10946		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10947		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11162	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11163	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10948	11164	}
10949	11165
10950	11166	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11260,8 +11476,14 @@
11260	11476	{
11261	11477	renderpass++;
11262	11478	// System.out.println("Draw object... ");
	11479	+ STEP = 1;
11263	11480	if (FAST) // in case there is no script
11264		- STEP = 16;
	11481	+ STEP = 8;
	11482	+
	11483	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11484	+ {
	11485	+ STEP *= 4;
	11486	+ }
11265	11487
11266	11488	//object.FullInvariants();
11267	11489
..	..	@@ -11275,23 +11497,44 @@
11275	11497	e.printStackTrace();
11276	11498	}
11277	11499
11278		- if (GrafreeD.RENDERME > 0)
11279		- GrafreeD.RENDERME--; // mechante magouille
	11500	+ if (Grafreed.RENDERME > 0)
	11501	+ Grafreed.RENDERME--; // mechante magouille
11280	11502
11281	11503	Globals.ONESTEP = false;
11282	11504	}
11283	11505
11284	11506	static boolean zoomonce = false;
11285	11507
	11508	+ static void CreateSelectedPoint()
	11509	+ {
	11510	+ if (selectedpoint == null)
	11511	+ {
	11512	+ debugpointG = new Sphere();
	11513	+ debugpointP = new Sphere();
	11514	+ debugpointC = new Sphere();
	11515	+ debugpointR = new Sphere();
	11516	+
	11517	+ selectedpoint = new Superellipsoid();
	11518	+
	11519	+ for (int i=0; i<8; i++)
	11520	+ {
	11521	+ debugpoints[i] = new Sphere();
	11522	+ }
	11523	+ }
	11524	+ }
	11525	+
11286	11526	void DrawObject(GL gl, boolean draw)
11287	11527	{
	11528	+ // To clear camera values
	11529	+ ResetOptions();
	11530	+
11288	11531	//System.out.println("DRAW OBJECT " + mouseDown);
11289	11532	// DrawMode() = SELECTION;
11290	11533	//GL gl = getGL();
11291	11534	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11292	11535	{
11293	11536	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11294		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11537	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11295	11538	pingthread.StepToTarget(true); // true);
11296	11539	// zoomonce = false;
11297	11540	}
..	..	@@ -11346,7 +11589,14 @@
11346	11589
11347	11590	usedtextures.clear();
11348	11591
11349		- BindTextures(DEFAULT_TEXTURES, 2);
	11592	+ try
	11593	+ {
	11594	+ BindTextures(DEFAULT_TEXTURES, 2);
	11595	+ }
	11596	+ catch (Exception e)
	11597	+ {
	11598	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11599	+ }
11350	11600	}
11351	11601	//System.out.println("--> " + stackdepth);
11352	11602	// GrafreeD.traceon();
..	..	@@ -11356,8 +11606,9 @@
11356	11606
11357	11607	if (DrawMode() == DEFAULT)
11358	11608	{
11359		- if (DEBUG)
	11609	+ if (Globals.DEBUG)
11360	11610	{
	11611	+ CreateSelectedPoint();
11361	11612	float radius = 0.05f;
11362	11613	if (selectedpoint.radius != radius)
11363	11614	{
..	..	@@ -11437,7 +11688,14 @@
11437	11688	if (checker != null && DrawMode() == DEFAULT)
11438	11689	{
11439	11690	//BindTexture(IMMORTAL_TEXTURE);
11440		- BindTextures(checker.GetTextures(), checker.texres);
	11691	+ try
	11692	+ {
	11693	+ BindTextures(checker.GetTextures(), checker.texres);
	11694	+ }
	11695	+ catch (Exception e)
	11696	+ {
	11697	+ System.err.println("FAILED: " + checker.GetTextures());
	11698	+ }
11441	11699	// NEAREST
11442	11700	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11443	11701	DrawChecker(gl);
..	..	@@ -11519,7 +11777,7 @@
11519	11777	return;
11520	11778	}
11521	11779
11522		- String string = obj.GetToolTip();
	11780	+ String string = obj.toString(); //.GetToolTip();
11523	11781
11524	11782	GL gl = GetGL();
11525	11783
..	..	@@ -11836,8 +12094,8 @@
11836	12094	//obj.TransformToWorld(light, light);
11837	12095	for (int i = tp.size(); --i >= 0;)
11838	12096	{
11839		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11840		- LA.xformPos(light, tp.get(i).toParent, light);
	12097	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12098	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11841	12099	}
11842	12100
11843	12101
..	..	@@ -11854,8 +12112,8 @@
11854	12112	parentcam = cameras[0];
11855	12113	}
11856	12114
11857		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11858		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12115	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12116	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11859	12117
11860	12118	LA.xformPos(light, renderCamera.toScreen, light);
11861	12119
..	..	@@ -12469,8 +12727,8 @@
12469	12727
12470	12728	// display shadow only (bump == 0)
12471	12729	"SUB temp.x, half.x, shadow.x;" +
12472		- "MOV temp.y, -params6.x;" +
12473		- "SLT temp.z, temp.y, zero.x;" +
	12730	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12731	+ "SLT temp.z, temp.y, -one2048th.x;" +
12474	12732	"SUB temp.y, one.x, temp.z;" +
12475	12733	"MUL temp.x, temp.x, temp.y;" +
12476	12734	"KIL temp.x;" +
..	..	@@ -12599,8 +12857,10 @@
12599	12857	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12600	12858
12601	12859	"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
	12860	+ // Tuning for default skin
	12861	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12862	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12863	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12604	12864	"MUL temp.x, temp.x, temp.y;" +
12605	12865
12606	12866	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12748,7 +13008,7 @@
12748	13008	"MUL final.y, fragment.texcoord[0].x, c256;" +
12749	13009	"FLR final.x, final.y;" +
12750	13010	"SUB final.y, final.y, final.x;" +
12751		- //"MUL final.x, final.x, c256i;" +
	13011	+ "MUL final.x, final.x, c256i;" +
12752	13012	"MOV final.z, zero.x;" +
12753	13013	"MOV final.a, one.w;":""
12754	13014	) +
..	..	@@ -12756,7 +13016,7 @@
12756	13016	"MUL final.y, fragment.texcoord[0].y, c256;" +
12757	13017	"FLR final.x, final.y;" +
12758	13018	"SUB final.y, final.y, final.x;" +
12759		- //"MUL final.x, final.x, c256i;" +
	13019	+ "MUL final.x, final.x, c256i;" +
12760	13020	"MOV final.z, zero.x;" +
12761	13021	"MOV final.a, one.w;":""
12762	13022	) +
..	..	@@ -12799,7 +13059,7 @@
12799	13059	//once = true;
12800	13060	}
12801	13061
12802		- System.out.print("Program #" + mode + "; length = " + program.length());
	13062	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12803	13063	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12804	13064	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12805	13065
..	..	@@ -12932,12 +13192,16 @@
12932	13192
12933	13193	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12934	13194	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13195	+
	13196	+ // Compare fragment depth in light space with shadowmap.
12935	13197	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12936	13198	"SGE temp.y, temp.x, zero.x;" +
12937		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13199	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13200	+
	13201	+ // Reverse comparison
12938	13202	"SUB temp.x, one.x, temp.x;" +
12939	13203	"MUL " + shadow + ".x, temp.x, temp.y;" +
12940		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13204	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12941	13205	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12942	13206
12943	13207	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12951,6 +13215,10 @@
12951	13215	// No shadow for backface
12952	13216	"DP3 temp.x, normal, lightd;" +
12953	13217	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13218	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13219	+
	13220	+ // No shadow when out of frustrum
	13221	+ "SGE temp.x, " + depth + ".z, one.z;" +
12954	13222	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12955	13223	"";
12956	13224	}
..	..	@@ -13097,7 +13365,8 @@
13097	13365	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13098	13366	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13099	13367	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13100		- Object3D.cVector2[] vector2buffer;
	13368	+
	13369	+ //Object3D.cVector2[] vector2buffer;
13101	13370
13102	13371	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13103	13372	// OUT : diff, spec
..	..	@@ -13113,9 +13382,10 @@
13113	13382	"DP3 " + dest + ".z," + "normals," + "eye;" +
13114	13383	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13115	13384	//"MOV " + dest + ".w," + "normal.z;" +
13116		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13117		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13118		- //"MOV " + dest + ".z," + "params2.w;" +
	13385	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13386	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13387	+
	13388	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13119	13389	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13120	13390	"RCP " + dest + ".w," + dest + ".w;" +
13121	13391	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13509,7 +13779,7 @@
13509	13779	public void mousePressed(MouseEvent e)
13510	13780	{
13511	13781	//System.out.println("mousePressed: " + e);
13512		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13782	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13513	13783	}
13514	13784
13515	13785	static long prevtime = 0;
..	..	@@ -13585,8 +13855,8 @@
13585	13855	// mode \|= META;
13586	13856	//}
13587	13857
13588		- SetMouseMode(WHEEL \| e.getModifiersEx());
13589		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13858	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13859	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13590	13860	anchorX = ax;
13591	13861	anchorY = ay;
13592	13862	prevX = px;
..	..	@@ -13620,6 +13890,7 @@
13620	13890	else
13621	13891	if (evt.getSource() == AAtimer)
13622	13892	{
	13893	+ Globals.TIMERRUNNING = false;
13623	13894	if (mouseDown)
13624	13895	{
13625	13896	//new Exception().printStackTrace();
..	..	@@ -13645,6 +13916,10 @@
13645	13916	// LIVE = waslive;
13646	13917	// wasliveok = true;
13647	13918	// waslive = false;
	13919	+
	13920	+ // May 2019 Forget it:
	13921	+ if (true)
	13922	+ return;
13648	13923
13649	13924	// source == timer
13650	13925	if (mouseDown)
..	..	@@ -13675,7 +13950,7 @@
13675	13950
13676	13951	// fev 2014???
13677	13952	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13678		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13953	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13679	13954	pingthread.StepToTarget(true); // true);
13680	13955	}
13681	13956	// if (!LIVE)
..	..	@@ -13684,12 +13959,13 @@
13684	13959
13685	13960	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13686	13961
13687		- void clickStart(int x, int y, int modifiers)
	13962	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13688	13963	{
13689	13964	if (!wasliveok)
13690	13965	return;
13691	13966
13692	13967	AAtimer.restart(); //
	13968	+ Globals.TIMERRUNNING = true;
13693	13969
13694	13970	// waslive = LIVE;
13695	13971	// LIVE = false;
..	..	@@ -13701,7 +13977,7 @@
13701	13977	// touched = true; // main DL
13702	13978	if (isRenderer)
13703	13979	{
13704		- SetMouseMode(modifiers);
	13980	+ SetMouseMode(modifiers, modifiersex);
13705	13981	}
13706	13982
13707	13983	selectX = anchorX = x;
..	..	@@ -13714,7 +13990,7 @@
13714	13990	clicked = true;
13715	13991	hold = false;
13716	13992
13717		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13993	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13718	13994	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13719	13995	{
13720	13996	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,7 +14021,7 @@
13745	14021	info.camera = renderCamera;
13746	14022	info.x = x;
13747	14023	info.y = y;
13748		- info.modifiers = modifiers;
	14024	+ info.modifiers = modifiersex;
13749	14025	editObj = object.doEditClick(info, 0);
13750	14026	if (!editObj)
13751	14027	{
..	..	@@ -13762,9 +14038,12 @@
13762	14038
13763	14039	public void mouseDragged(MouseEvent e)
13764	14040	{
	14041	+ Globals.MOUSEDRAGGED = true;
	14042	+
13765	14043	//System.out.println("mouseDragged: " + e);
13766	14044	if (isRenderer)
13767	14045	movingcamera = true;
	14046	+
13768	14047	//if (drawing)
13769	14048	//return;
13770	14049	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13774,7 +14053,7 @@
13774	14053	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13775	14054	}
13776	14055	else
13777		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14056	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13778	14057
13779	14058	//try { Thread.sleep(1); } catch (Exception ex) {}
13780	14059	}
..	..	@@ -14011,7 +14290,7 @@
14011	14290	{
14012	14291	Globals.lighttouched = true;
14013	14292	}
14014		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14293	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14015	14294	}
14016	14295	//else
14017	14296	}
..	..	@@ -14025,12 +14304,12 @@
14025	14304	void GoDown(int mod)
14026	14305	{
14027	14306	MODIFIERS \|= COMMAND;
14028		- /*
	14307	+ /**/
14029	14308	if((mod&SHIFT) == SHIFT)
14030	14309	manipCamera.RotatePosition(0, -speed);
14031	14310	else
14032		- manipCamera.BackForth(0, -speed*delta, getWidth());
14033		- */
	14311	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14312	+ /**/
14034	14313	if ((mod & SHIFT) == SHIFT)
14035	14314	{
14036	14315	mouseMode = mouseMode; // VR??
..	..	@@ -14046,12 +14325,12 @@
14046	14325	void GoUp(int mod)
14047	14326	{
14048	14327	MODIFIERS \|= COMMAND;
14049		- /*
	14328	+ /**/
14050	14329	if((mod&SHIFT) == SHIFT)
14051	14330	manipCamera.RotatePosition(0, speed);
14052	14331	else
14053		- manipCamera.BackForth(0, speed*delta, getWidth());
14054		- */
	14332	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14333	+ /**/
14055	14334	if ((mod & SHIFT) == SHIFT)
14056	14335	{
14057	14336	mouseMode = mouseMode;
..	..	@@ -14067,12 +14346,12 @@
14067	14346	void GoLeft(int mod)
14068	14347	{
14069	14348	MODIFIERS \|= COMMAND;
14070		- /*
	14349	+ /**/
14071	14350	if((mod&SHIFT) == SHIFT)
14072		- manipCamera.RotatePosition(speed, 0);
14073		- else
14074	14351	manipCamera.Translate(speed*delta, 0, getWidth());
14075		- */
	14352	+ else
	14353	+ manipCamera.RotatePosition(speed, 0);
	14354	+ /**/
14076	14355	if ((mod & SHIFT) == SHIFT)
14077	14356	{
14078	14357	mouseMode = mouseMode;
..	..	@@ -14088,12 +14367,12 @@
14088	14367	void GoRight(int mod)
14089	14368	{
14090	14369	MODIFIERS \|= COMMAND;
14091		- /*
	14370	+ /**/
14092	14371	if((mod&SHIFT) == SHIFT)
14093		- manipCamera.RotatePosition(-speed, 0);
14094		- else
14095	14372	manipCamera.Translate(-speed*delta, 0, getWidth());
14096		- */
	14373	+ else
	14374	+ manipCamera.RotatePosition(-speed, 0);
	14375	+ /**/
14097	14376	if ((mod & SHIFT) == SHIFT)
14098	14377	{
14099	14378	mouseMode = mouseMode;
..	..	@@ -14111,7 +14390,7 @@
14111	14390	int X, Y;
14112	14391	boolean SX, SY;
14113	14392
14114		- void drag(int x, int y, int modifiers)
	14393	+ void drag(int x, int y, int modifiers, int modifiersex)
14115	14394	{
14116	14395	if (IsFrozen())
14117	14396	{
..	..	@@ -14120,17 +14399,17 @@
14120	14399
14121	14400	drag = true; // NEW
14122	14401
14123		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14402	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14124	14403
14125	14404	X = x;
14126	14405	Y = y;
14127	14406	// floating state for animation
14128		- MODIFIERS = modifiers;
14129		- modifiers &= ~1024;
	14407	+ MODIFIERS = modifiersex;
	14408	+ modifiersex &= ~1024;
14130	14409	if (false) // modifiers != 0)
14131	14410	{
14132	14411	//new Exception().printStackTrace();
14133		- System.out.println("mouseDragged: " + modifiers);
	14412	+ System.out.println("mouseDragged: " + modifiersex);
14134	14413	System.out.println("SHIFT = " + SHIFT);
14135	14414	System.out.println("CONTROL = " + COMMAND);
14136	14415	System.out.println("META = " + META);
..	..	@@ -14150,7 +14429,8 @@
14150	14429	info.camera = renderCamera;
14151	14430	info.x = x;
14152	14431	info.y = y;
14153		- object.editWindow.copy.doEditDrag(info);
	14432	+ object.GetWindow().copy
	14433	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14154	14434	} else
14155	14435	{
14156	14436	if (x < startX)
..	..	@@ -14314,7 +14594,9 @@
14314	14594	ci.camera = renderCamera;
14315	14595	if (!isRenderer)
14316	14596	{
14317		- if (object.editWindow.copy.doEditClick(ci, 0))
	14597	+ //ObjEditor editWindow = object.editWindow;
	14598	+ //Object3D copy = editWindow.copy;
	14599	+ if (object.doEditClick(ci, 0))
14318	14600	{
14319	14601	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14320	14602	} else
..	..	@@ -14326,7 +14608,11 @@
14326	14608
14327	14609	public void mouseReleased(MouseEvent e)
14328	14610	{
	14611	+ Globals.MOUSEDRAGGED = false;
	14612	+
14329	14613	movingcamera = false;
	14614	+ X = 0; // getBounds().width/2;
	14615	+ Y = 0; // getBounds().height/2;
14330	14616	//System.out.println("mouseReleased: " + e);
14331	14617	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14332	14618	}
..	..	@@ -14349,9 +14635,9 @@
14349	14635	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14350	14636	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14351	14637
14352		- if (control \|\| command \|\| IsFrozen())
	14638	+// No delay if (control \|\| command \|\| IsFrozen())
14353	14639	timeout = true;
14354		- else
	14640	+// ?? May 2019 else
14355	14641	// timer.setDelay((modifiers & 128) != 0?0:350);
14356	14642	mouseDown = false;
14357	14643	if (!control && !command) // june 2013
..	..	@@ -14461,7 +14747,7 @@
14461	14747	System.out.println("keyReleased: " + e);
14462	14748	}
14463	14749
14464		- void SetMouseMode(int modifiers)
	14750	+ void SetMouseMode(int modifiers, int modifiersex)
14465	14751	{
14466	14752	//System.out.println("SetMouseMode = " + modifiers);
14467	14753	//modifiers &= ~1024;
..	..	@@ -14473,25 +14759,25 @@
14473	14759	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14474	14760	// return;
14475	14761	//System.out.println("SetMode = " + modifiers);
14476		- if ((modifiers & WHEEL) == WHEEL)
	14762	+ if ((modifiersex & WHEEL) == WHEEL)
14477	14763	{
14478	14764	mouseMode \|= ZOOM;
14479	14765	}
14480	14766
14481	14767	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482		- if (capsLocked \|\| (modifiers & META) == META)
	14768	+ if (capsLocked) // \|\| (modifiers & META) == META)
14483	14769	{
14484	14770	mouseMode \|= VR; // BACKFORTH;
14485	14771	}
14486		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14772	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14487	14773	{
14488	14774	mouseMode \|= SELECT;
14489	14775	}
14490		- if ((modifiers & COMMAND) == COMMAND)
	14776	+ if ((modifiersex & COMMAND) == COMMAND)
14491	14777	{
14492	14778	mouseMode \|= SELECT;
14493	14779	}
14494		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14780	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14495	14781	{
14496	14782	mouseMode &= ~VR;
14497	14783	mouseMode \|= TRANSLATE;
..	..	@@ -14520,7 +14806,7 @@
14520	14806
14521	14807	if (isRenderer) //
14522	14808	{
14523		- SetMouseMode(modifiers);
	14809	+ SetMouseMode(0, modifiers);
14524	14810	}
14525	14811
14526	14812	Globals.theRenderer.keyPressed(key);
..	..	@@ -14667,7 +14953,9 @@
14667	14953	case 'E' : COMPACT ^= true;
14668	14954	repaint();
14669	14955	break;
14670		- case 'W' : DEBUGHSB ^= true;
	14956	+ case 'W' : // Wide Window (fullscreen)
	14957	+ //DEBUGHSB ^= true;
	14958	+ ObjEditor.theFrame.ToggleFullScreen();
14671	14959	repaint();
14672	14960	break;
14673	14961	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14692,8 +14980,8 @@
14692	14980	RevertCamera();
14693	14981	repaint();
14694	14982	break;
14695		- case 'L':
14696	14983	case 'l':
	14984	+ //case 'L':
14697	14985	if (lightMode)
14698	14986	{
14699	14987	lightMode = false;
..	..	@@ -14836,9 +15124,9 @@
14836	15124	case '_':
14837	15125	kompactbit = 5;
14838	15126	break;
14839		- case '+':
14840		- kompactbit = 6;
14841		- break;
	15127	+// case '+':
	15128	+// kompactbit = 6;
	15129	+// break;
14842	15130	case ' ':
14843	15131	lightMode ^= true;
14844	15132	Globals.lighttouched = true;
..	..	@@ -14850,13 +15138,14 @@
14850	15138	case ESC:
14851	15139	RENDERPROGRAM += 1;
14852	15140	RENDERPROGRAM %= 3;
	15141	+
14853	15142	repaint();
14854	15143	break;
14855	15144	case 'Z':
14856	15145	//RESIZETEXTURE ^= true;
14857	15146	//break;
14858	15147	case 'z':
14859		- RENDERSHADOW ^= true;
	15148	+ Globals.RENDERSHADOW ^= true;
14860	15149	Globals.lighttouched = true;
14861	15150	repaint();
14862	15151	break;
..	..	@@ -14889,8 +15178,9 @@
14889	15178	case DELETE:
14890	15179	ClearSelection();
14891	15180	break;
14892		- /*
14893	15181	case '+':
	15182	+
	15183	+ /*
14894	15184	//fontsize += 1;
14895	15185	bbzoom *= 2;
14896	15186	repaint();
..	..	@@ -14907,17 +15197,17 @@
14907	15197	case '=':
14908	15198	IncDepth();
14909	15199	//fontsize += 1;
14910		- object.editWindow.refreshContents(true);
	15200	+ object.GetWindow().refreshContents(true);
14911	15201	maskbit = 6;
14912	15202	break;
14913	15203	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14914	15204	DecDepth();
14915	15205	maskbit = 5;
14916	15206	//if(fontsize > 1) fontsize -= 1;
14917		- if (object.editWindow == null)
14918		- new Exception().printStackTrace();
14919		- else
14920		- object.editWindow.refreshContents(true);
	15207	+// if (object.editWindow == null)
	15208	+// new Exception().printStackTrace();
	15209	+// else
	15210	+ object.GetWindow().refreshContents(true);
14921	15211	break;
14922	15212	case '{':
14923	15213	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14980,7 +15270,7 @@
14980	15270	//mode = ROTATE;
14981	15271	if ((MODIFIERS & COMMAND) == 0) // VR??
14982	15272	{
14983		- SetMouseMode(modifiers);
	15273	+ SetMouseMode(0, modifiers);
14984	15274	}
14985	15275	}
14986	15276
..	..	@@ -15116,7 +15406,7 @@
15116	15406	{
15117	15407	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15118	15408	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15409	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15120	15410	{
15121	15411	mouseMoved(e);
15122	15412	} else
..	..	@@ -15141,7 +15431,7 @@
15141	15431	}
15142	15432	*/
15143	15433
15144		- object.editWindow.EditSelection();
	15434	+ object.GetWindow().EditSelection(false);
15145	15435	}
15146	15436
15147	15437	void SelectParent()
..	..	@@ -15158,10 +15448,10 @@
15158	15448	{
15159	15449	//selectees.remove(i);
15160	15450	System.out.println("select parent of " + elem);
15161		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15451	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15162	15452	} else
15163	15453	{
15164		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15454	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15165	15455	}
15166	15456
15167	15457	first = false;
..	..	@@ -15203,12 +15493,12 @@
15203	15493	for (int j = 0; j < group.children.size(); j++)
15204	15494	{
15205	15495	elem = (Object3D) group.children.elementAt(j);
15206		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15496	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15207	15497	first = false;
15208	15498	}
15209	15499	} else
15210	15500	{
15211		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15501	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15212	15502	}
15213	15503
15214	15504	first = false;
..	..	@@ -15219,21 +15509,21 @@
15219	15509	{
15220	15510	//Composite group = (Composite) object;
15221	15511	Object3D group = object;
15222		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15512	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15223	15513	}
15224	15514
15225	15515	void ResetTransform(int mask)
15226	15516	{
15227	15517	//Composite group = (Composite) object;
15228	15518	Object3D group = object;
15229		- group.editWindow.ResetTransform(mask);
	15519	+ group.GetWindow().ResetTransform(mask);
15230	15520	}
15231	15521
15232	15522	void FlipTransform()
15233	15523	{
15234	15524	//Composite group = (Composite) object;
15235	15525	Object3D group = object;
15236		- group.editWindow.FlipTransform();
	15526	+ group.GetWindow().FlipTransform();
15237	15527	// group.editWindow.ReduceMesh(true);
15238	15528	}
15239	15529
..	..	@@ -15241,7 +15531,7 @@
15241	15531	{
15242	15532	//Composite group = (Composite) object;
15243	15533	Object3D group = object;
15244		- group.editWindow.PrintMemory();
	15534	+ group.GetWindow().PrintMemory();
15245	15535	// group.editWindow.ReduceMesh(true);
15246	15536	}
15247	15537
..	..	@@ -15249,7 +15539,7 @@
15249	15539	{
15250	15540	//Composite group = (Composite) object;
15251	15541	Object3D group = object;
15252		- group.editWindow.ResetCentroid();
	15542	+ group.GetWindow().ResetCentroid();
15253	15543	}
15254	15544
15255	15545	void IncDepth()
..	..	@@ -15335,7 +15625,9 @@
15335	15625	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15336	15626	//Image img = CreateImage(width, height);
15337	15627	//System.out.println("width = " + width + "; height = " + height + "\n");
	15628	+
15338	15629	Graphics gr = g; // img.getGraphics();
	15630	+
15339	15631	if (!hasMarquee)
15340	15632	{
15341	15633	if (Xmin < Xmax) // !locked)
..	..	@@ -15423,6 +15715,7 @@
15423	15715	info.bounds.y += (height - desired) / 2;
15424	15716	}
15425	15717	}
	15718	+
15426	15719	info.g = gr;
15427	15720	info.camera = renderCamera;
15428	15721	/*
..	..	@@ -15432,15 +15725,55 @@
15432	15725	*/
15433	15726	if (!isRenderer)
15434	15727	{
15435		- object.drawEditHandles(info, 0);
	15728	+ Grafreed.Assert(object != null);
	15729	+ Grafreed.Assert(object.selection != null);
	15730	+ if (object.selection.Size() > 0)
	15731	+ {
	15732	+ int hitSomething = object.selection.get(0).hitSomething;
	15733	+
	15734	+ info.DX = 0;
	15735	+ info.DY = 0;
	15736	+ info.W = 1;
	15737	+ if (hitSomething == Object3D.hitCenter)
	15738	+ {
	15739	+ info.DX = X;
	15740	+ if (X != 0)
	15741	+ info.DX -= info.bounds.width/2;
	15742	+
	15743	+ info.DY = Y;
	15744	+ if (Y != 0)
	15745	+ info.DY -= info.bounds.height/2;
	15746	+ }
	15747	+
	15748	+ object.drawEditHandles(info, 0);
	15749	+
	15750	+ if (drag && (X != 0 \|\| Y != 0))
	15751	+ {
	15752	+ switch (hitSomething)
	15753	+ {
	15754	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15755	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15756	+ break;
	15757	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15758	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15759	+ break;
	15760	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15761	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15762	+ break;
	15763	+ }
	15764	+
	15765	+ }
	15766	+ }
15436	15767	}
15437	15768	}
	15769	+
15438	15770	if (isRenderer)
15439	15771	{
15440	15772	//gr.setColor(Color.black);
15441	15773	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15442	15774	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15443	15775	}
	15776	+
15444	15777	if (hasMarquee)
15445	15778	{
15446	15779	gr.setXORMode(Color.white);
..	..	@@ -15553,6 +15886,7 @@
15553	15886	public boolean mouseDown(Event evt, int x, int y)
15554	15887	{
15555	15888	System.out.println("mouseDown: " + evt);
	15889	+ System.exit(0);
15556	15890	/*
15557	15891	locked = true;
15558	15892	drag = false;
..	..	@@ -15596,7 +15930,7 @@
15596	15930	{
15597	15931	keyPressed(0, modifiers);
15598	15932	}
15599		- clickStart(x, y, modifiers);
	15933	+ // clickStart(x, y, modifiers);
15600	15934	return true;
15601	15935	}
15602	15936
..	..	@@ -15714,7 +16048,7 @@
15714	16048	{
15715	16049	keyReleased(0, 0);
15716	16050	}
15717		- drag(x, y, modifiers);
	16051	+ drag(x, y, 0, modifiers);
15718	16052	return true;
15719	16053	}
15720	16054
..	..	@@ -15846,7 +16180,7 @@
15846	16180	Object3D object;
15847	16181	static Object3D trackedobject;
15848	16182	Camera renderCamera; // Light or Eye (or Occlusion)
15849		- /static/ Camera manipCamera; // Light or Eye
	16183	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15850	16184	/static/ Camera eyeCamera;
15851	16185	/static/ Camera lightCamera;
15852	16186	int cameracount;
..	..	@@ -16131,16 +16465,16 @@
16131	16465	cStatic.objectstack[materialdepth++] = checker;
16132	16466	//System.out.println("material " + material);
16133	16467	//Applet3D.tracein(this, selected);
16134		- vector2buffer = checker.projectedVertices;
	16468	+ //vector2buffer = checker.projectedVertices;
16135	16469
16136	16470	//checker.GetMaterial().Draw(this, false); // true);
16137		- DrawMaterial(checker.GetMaterial(), false); // true);
	16471	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16138	16472
16139	16473	materialdepth -= 1;
16140	16474	if (materialdepth > 0)
16141	16475	{
16142		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16143		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16476	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16477	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16144	16478	}
16145	16479	//checker.GetMaterial().opacity = 1f;
16146	16480	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16226,6 +16560,14 @@
16226	16560	}
16227	16561	}
16228	16562
	16563	+ private Object3D GetFolder()
	16564	+ {
	16565	+ Object3D folder = object.GetWindow().copy;
	16566	+ if (object.GetWindow().copy.selection.Size() > 0)
	16567	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16568	+ return folder;
	16569	+ }
	16570	+
16229	16571	class SelectBuffer implements GLEventListener
16230	16572	{
16231	16573
..	..	@@ -16305,6 +16647,17 @@
16305	16647
16306	16648	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16307	16649
	16650	+ if (PAINTMODE)
	16651	+ {
	16652	+ if (object.GetWindow().copy.selection.Size() > 0)
	16653	+ {
	16654	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16655	+
	16656	+ // Make what you paint not selectable.
	16657	+ paintobj.ResetSelectable();
	16658	+ }
	16659	+ }
	16660	+
16308	16661	//int tmp = selection_view;
16309	16662	//selection_view = -1;
16310	16663	int temp = DrawMode();
..	..	@@ -16316,6 +16669,17 @@
16316	16669	// temp = DEFAULT; // patch for selection debug
16317	16670	Globals.drawMode = temp; // WARNING
16318	16671
	16672	+ if (PAINTMODE)
	16673	+ {
	16674	+ if (object.GetWindow().copy.selection.Size() > 0)
	16675	+ {
	16676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16677	+
	16678	+ // Revert.
	16679	+ paintobj.RestoreSelectable();
	16680	+ }
	16681	+ }
	16682	+
16319	16683	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16320	16684
16321	16685	// trying different ways of getting the depth info over
..	..	@@ -16363,6 +16727,8 @@
16363	16727	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16364	16728	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16365	16729	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16730	+
	16731	+ CreateSelectedPoint();
16366	16732
16367	16733	// Will fit the mesh !!!
16368	16734	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16412,34 +16778,36 @@
16412	16778	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	16779	}
16414	16780
16415		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16781	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16416	16782	}
16417	16783	}
16418	16784
16419	16785	if (!movingcamera && !PAINTMODE)
16420		- object.editWindow.ScreenFitPoint(); // fev 2014
	16786	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16421	16787
16422		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16788	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16423	16789	{
16424		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16790	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16425	16791
16426		- Object3D group = new Object3D("inst" + paintcount++);
	16792	+ if (object.GetWindow().copy.selection.Size() > 0)
	16793	+ {
	16794	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16427	16795
16428		- group.CreateMaterial(); // use a void leaf to select instances
16429		-
16430		- group.add(paintobj); // link
16431		-
16432		- object.editWindow.SnapObject(group);
16433		-
16434		- Object3D folder = object.editWindow.copy;
16435		-
16436		- if (object.editWindow.copy.selection.Size() > 0)
16437		- folder = object.editWindow.copy.selection.elementAt(0);
16438		-
16439		- folder.add(group);
16440		-
16441		- object.editWindow.ResetModel();
16442		- object.editWindow.refreshContents();
	16796	+ Object3D inst = new Object3D("inst" + paintcount++);
	16797	+
	16798	+ inst.CreateMaterial(); // use a void leaf to select instances
	16799	+
	16800	+ inst.add(paintobj); // link
	16801	+
	16802	+ object.GetWindow().SnapObject(inst);
	16803	+
	16804	+ Object3D folder = paintFolder; // GetFolder();
	16805	+
	16806	+ folder.add(inst);
	16807	+
	16808	+ object.GetWindow().ResetModel();
	16809	+ object.GetWindow().refreshContents();
	16810	+ }
16443	16811	}
16444	16812	else
16445	16813	paintcount = 0;
..	..	@@ -16478,6 +16846,11 @@
16478	16846	//System.out.println("objects[color] = " + objects[color]);
16479	16847	//objects[color].Select();
16480	16848	indexcount = 0;
	16849	+ ObjEditor window = object.GetWindow();
	16850	+ if (window != null && deselect)
	16851	+ {
	16852	+ window.Select(null, deselect, true);
	16853	+ }
16481	16854	object.Select(color, deselect);
16482	16855	}
16483	16856
..	..	@@ -16577,7 +16950,7 @@
16577	16950	gl.glDisable(gl.GL_CULL_FACE);
16578	16951	}
16579	16952
16580		- if (!RENDERSHADOW)
	16953	+ if (!Globals.RENDERSHADOW)
16581	16954	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16582	16955
16583	16956	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16587,7 +16960,7 @@
16587	16960	//gl.glColorMask(false, false, false, false);
16588	16961
16589	16962	//render_scene_from_light_view(gl, drawable, 0, 0);
16590		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16963	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16591	16964	{
16592	16965	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	16966
..	..	@@ -17003,23 +17376,15 @@
17003	17376	int AAbuffersize = 0;
17004	17377
17005	17378	//double[] selectedpoint = new double[3];
17006		- static Superellipsoid selectedpoint = new Superellipsoid();
	17379	+ static Superellipsoid selectedpoint;
17007	17380	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();
	17381	+ static Sphere debugpointG;
	17382	+ static Sphere debugpointP;
	17383	+ static Sphere debugpointC;
	17384	+ static Sphere debugpointR;
17012	17385
17013	17386	static Sphere debugpoints[] = new Sphere[8];
17014	17387
17015		- static
17016		- {
17017		- for (int i=0; i<8; i++)
17018		- {
17019		- debugpoints[i] = new Sphere();
17020		- }
17021		- }
17022		-
17023	17388	static void InitPoints(float radius)
17024	17389	{
17025	17390	for (int i=0; i<8; i++)