~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;
..	..	@@ -92,6 +89,8 @@
92	89
93	90	static int tickcount = 0; // slow pose issue
94	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
95	94	static boolean BOXMODE = false;
96	95	static boolean IMAGEFLIP = false;
97	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -223,6 +224,11 @@
223	224	public boolean IsBoxMode()
224	225	{
225	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
226	232	}
227	233
228	234	public void ClearDepth()
..	..	@@ -320,7 +326,7 @@
320	326	cStatic.objectstack[materialdepth++] = obj;
321	327	//System.out.println("material " + material);
322	328	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
324	330	if (obj instanceof Camera)
325	331	{
326	332	display.options1[0] = material.shift;
..	..	@@ -329,14 +335,28 @@
329	335	display.options1[2] = material.shadowbias;
330	336	display.options1[3] = material.aniso;
331	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]);
332	343	display.options2[0] = material.opacity;
333	344	display.options2[1] = material.diffuse;
334	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]);
335	349
336	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]);
337	354	display.options4[0] = material.cameralight/0.2f;
338	355	display.options4[1] = material.subsurface;
339	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]);
340	360
341	361	// if (display.CURRENTANTIALIAS > 0)
342	362	// display.options3[3] /= 4;
..	..	@@ -352,7 +372,7 @@
352	372	/**/
353	373	} else
354	374	{
355		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
356	376	}
357	377	} else
358	378	{
..	..	@@ -376,8 +396,8 @@
376	396	cStatic.objectstack[materialdepth++] = obj;
377	397	//System.out.println("material " + material);
378	398	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	401	}
382	402	}
383	403
..	..	@@ -394,8 +414,8 @@
394	414	materialdepth -= 1;
395	415	if (materialdepth > 0)
396	416	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- 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);
399	419	}
400	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +435,8 @@
415	435	materialdepth -= 1;
416	436	if (materialdepth > 0)
417	437	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- 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);
420	440	}
421	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	442	//else
..	..	@@ -457,10 +477,12 @@
457	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	478	{
459	479	//gl.glBegin(gl.GL_TRIANGLES);
460		- 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	+ ;
461	483	if (!hasnorm)
462	484	{
463		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
464	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1185,10 +1207,12 @@
1185	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1208	}
1187	1209	}
	1210	+
1188	1211	if (flipV)
1189	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1213	else
1191	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1192	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1218
..	..	@@ -1208,10 +1232,12 @@
1208	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1233	}
1210	1234	}
	1235	+
1211	1236	if (flipV)
1212	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1238	else
1214	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1215	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1243
..	..	@@ -1239,8 +1265,10 @@
1239	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1266	else
1241	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1242	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1244	1272	count2 += 2;
1245	1273	count3 += 3;
1246	1274	}
..	..	@@ -1596,7 +1624,7 @@
1596	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1625	}
1598	1626
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1628	{
1601	1629	CameraPane display = this;
1602	1630	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1640,18 @@
1612	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1641	if (!material.multiply)
1614	1642	{
1615		- display.color = color;
	1643	+ display.color = material.color;
1616	1644	display.saturation = material.modulation;
1617	1645	}
1618	1646	else
1619	1647	{
1620		- display.color = color2;
	1648	+ display.color = material.color2;
1621	1649	display.saturation = material.modulation2;
1622	1650	}
1623	1651
1624	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1653
1626		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
1627	1655
1628	1656	/**/
1629	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1659,7 @@
1631	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1635	1663
1636	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1739,9 +1767,9 @@
1739	1767	display.modelParams7[2] = 0;
1740	1768	display.modelParams7[3] = 0;
1741	1769
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1771
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1774	{
1747	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1911,7 @@
1883	1911	void PushMatrix(double[][] matrix)
1884	1912	{
1885	1913	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1887	1915	}
1888	1916
1889	1917	void PushMatrix()
..	..	@@ -2037,7 +2065,7 @@
2037	2065	//System.err.println("Oeil on");
2038	2066	OEIL = true;
2039	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2069	//pingthread.StepToTarget(true);
2042	2070	}
2043	2071
..	..	@@ -2135,7 +2163,7 @@
2135	2163	System.err.println("LIVE = " + Globals.isLIVE());
2136	2164
2137	2165	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2166	+ Grafreed.savesound = true; // wav.save();
2139	2167	// else
2140	2168	repaint(); // start loop // may 2013
2141	2169	}
..	..	@@ -2168,6 +2196,11 @@
2168	2196	public void ToggleBoxMode()
2169	2197	{
2170	2198	BOXMODE ^= true;
	2199	+ }
	2200	+
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
2171	2204	}
2172	2205
2173	2206	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2280,7 @@
2247	2280
2248	2281	void ToggleDebug()
2249	2282	{
2250		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2251	2284	}
2252	2285
2253	2286	void ToggleLookAt()
..	..	@@ -2255,9 +2288,9 @@
2255	2288	LOOKAT ^= true;
2256	2289	}
2257	2290
2258		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2259	2292	{
2260		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
2261	2294	}
2262	2295
2263	2296	void ToggleHandles()
..	..	@@ -2364,7 +2397,7 @@
2364	2397	{
2365	2398	return currentGL;
2366	2399	}
2367		-
	2400	+
2368	2401	/**/
2369	2402	class CacheTexture
2370	2403	{
..	..	@@ -4196,6 +4229,7 @@
4196	4229
4197	4230	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4231	{
	4232	+ new Exception().printStackTrace();
4199	4233	System.exit(0);
4200	4234	com.sun.opengl.util.texture.Texture texture = null;
4201	4235
..	..	@@ -7908,6 +7942,64 @@
7908	7942	ReleaseTexture(pigment, false);
7909	7943	}
7910	7944
	7945	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7946	+ {
	7947	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7948	+ {
	7949	+ return;
	7950	+ }
	7951	+
	7952	+ if (tex == null)
	7953	+ {
	7954	+ ReleaseTexture(null, false);
	7955	+ return;
	7956	+ }
	7957	+
	7958	+ String pigment = Object3D.GetPigment(tex);
	7959	+
	7960	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7961	+ {
	7962	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7963	+ // System.out.println("; bump = " + bump);
	7964	+ }
	7965	+
	7966	+ if (pigment.equals(""))
	7967	+ {
	7968	+ pigment = null;
	7969	+ }
	7970	+
	7971	+ ReleaseTexture(pigment, false);
	7972	+ }
	7973	+
	7974	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7975	+ {
	7976	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7977	+ {
	7978	+ return;
	7979	+ }
	7980	+
	7981	+ if (tex == null)
	7982	+ {
	7983	+ ReleaseTexture(null, true);
	7984	+ return;
	7985	+ }
	7986	+
	7987	+ String bump = Object3D.GetBump(tex);
	7988	+
	7989	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7990	+ {
	7991	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7992	+ // System.out.println("; bump = " + bump);
	7993	+ }
	7994	+
	7995	+ if (bump.equals(""))
	7996	+ {
	7997	+ bump = null;
	7998	+ }
	7999	+
	8000	+ ReleaseTexture(bump, true);
	8001	+ }
	8002	+
7911	8003	void ReleaseTexture(String tex, boolean bump)
7912	8004	{
7913	8005	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -8011,7 +8103,7 @@
8011	8103	}
8012	8104	}
8013	8105
8014		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8106	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8015	8107	{
8016	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8056,7 +8148,94 @@
8056	8148	return; // true;
8057	8149	}
8058	8150
8059		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8151	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8152	+ {
	8153	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8154	+ ambientOcclusion ) // \|\| !textureon)
	8155	+ {
	8156	+ return; // false;
	8157	+ }
	8158	+
	8159	+ if (tex == null)
	8160	+ {
	8161	+ BindTexture(null,false,resolution);
	8162	+ return;
	8163	+ }
	8164	+
	8165	+ String pigment = Object3D.GetPigment(tex);
	8166	+
	8167	+ usedtextures.put(pigment, pigment);
	8168	+
	8169	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8170	+ {
	8171	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8172	+ // System.out.println("; bump = " + bump);
	8173	+ }
	8174	+
	8175	+ if (pigment.equals(""))
	8176	+ {
	8177	+ pigment = null;
	8178	+ }
	8179	+
	8180	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8181	+ BindTexture(pigment, false, resolution);
	8182	+ }
	8183	+
	8184	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8185	+ {
	8186	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8187	+ ambientOcclusion ) // \|\| !textureon)
	8188	+ {
	8189	+ return; // false;
	8190	+ }
	8191	+
	8192	+ if (tex == null)
	8193	+ {
	8194	+ BindTexture(null,true,resolution);
	8195	+ return;
	8196	+ }
	8197	+
	8198	+ String bump = Object3D.GetBump(tex);
	8199	+
	8200	+ usedtextures.put(bump, bump);
	8201	+
	8202	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8203	+ {
	8204	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8205	+ // System.out.println("; bump = " + bump);
	8206	+ }
	8207	+
	8208	+ if (bump.equals(""))
	8209	+ {
	8210	+ bump = null;
	8211	+ }
	8212	+
	8213	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8214	+ BindTexture(bump, true, resolution);
	8215	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8216	+ }
	8217	+
	8218	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8219	+
	8220	+ private boolean FileExists(String tex)
	8221	+ {
	8222	+ if (missingTextures.contains(tex))
	8223	+ {
	8224	+ return false;
	8225	+ }
	8226	+
	8227	+ boolean fileExists = new File(tex).exists();
	8228	+
	8229	+ if (!fileExists)
	8230	+ {
	8231	+ // If file exists, the "new File()" is not executed sgain
	8232	+ missingTextures.add(tex);
	8233	+ }
	8234	+
	8235	+ return fileExists;
	8236	+ }
	8237	+
	8238	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8060	8239	{
8061	8240	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8062	8241
..	..	@@ -8064,12 +8243,18 @@
8064	8243	{
8065	8244	String texname = tex;
8066	8245
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- texname = "/Users/nbriere/Textures/" + texname;
	8246	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8247	+
	8248	+// String[] split = tex.split("Textures");
	8249	+// if (split.length > 1)
	8250	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8251	+// else
	8252	+// if (!texname.startsWith("/"))
	8253	+// texname = "/Users/nbriere/Textures/" + texname;
	8254	+ if (!FileExists(tex))
	8255	+ {
	8256	+ texname = fallbackTextureName;
	8257	+ }
8073	8258
8074	8259	if (CACHETEXTURE)
8075	8260	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8138,7 +8323,7 @@
8138	8323	}
8139	8324
8140	8325	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8326	+ if (!FileExists(cachename))
8142	8327	cachename = texname;
8143	8328	else
8144	8329	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8345,7 @@
8160	8345	}
8161	8346
8162	8347	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8348	+ if (!FileExists(cachename))
8164	8349	cachename = texname;
8165	8350	else
8166	8351	processbump = false; // don't process bump map again
..	..	@@ -8169,7 +8354,9 @@
8169	8354	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8355
8171	8356
8172		- if (texturedata != null)
	8357	+ if (texturedata == null)
	8358	+ throw new Exception();
	8359	+
8173	8360	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8174	8361	//texture = GetTexture(tex, bump);
8175	8362	}
..	..	@@ -8291,7 +8478,7 @@
8291	8478	return texture;
8292	8479	}
8293	8480
8294		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8481	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8295	8482	{
8296	8483	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8484
..	..	@@ -8309,14 +8496,14 @@
8309	8496	return texture!=null?texture.texture:null;
8310	8497	}
8311	8498
8312		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8499	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8313	8500	{
8314	8501	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8502
8316	8503	return texture!=null?texture.texturedata:null;
8317	8504	}
8318	8505
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8506	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8320	8507	{
8321	8508	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8509	{
..	..	@@ -9193,11 +9380,35 @@
9193	9380	jy8[3] = 0.5f;
9194	9381	}
9195	9382
9196		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9383	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9197	9384	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9385	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9386	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	9387
	9388	+ void ResetOptions()
	9389	+ {
	9390	+ options1[0] = 100;
	9391	+ options1[1] = 0.025f;
	9392	+ options1[2] = 0.01f;
	9393	+ options1[3] = 0;
	9394	+ options1[4] = 0;
	9395	+
	9396	+ options2[0] = 0;
	9397	+ options2[1] = 0.75f;
	9398	+ options2[2] = 0;
	9399	+ options2[3] = 0;
	9400	+
	9401	+ options3[0] = 1;
	9402	+ options3[1] = 1;
	9403	+ options3[2] = 1;
	9404	+ options3[3] = 0;
	9405	+
	9406	+ options4[0] = 1;
	9407	+ options4[1] = 0;
	9408	+ options4[2] = 1;
	9409	+ options4[3] = 0;
	9410	+ }
	9411	+
9201	9412	static int imagecount = 0; // movie generation
9202	9413
9203	9414	static int jitter = 0;
..	..	@@ -9293,8 +9504,8 @@
9293	9504	assert (parentcam != renderCamera);
9294	9505
9295	9506	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9507	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9508	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9298	9509
9299	9510	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9511
..	..	@@ -9309,8 +9520,8 @@
9309	9520	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9521
9311	9522	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9523	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9524	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9314	9525
9315	9526	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9527
..	..	@@ -9382,7 +9593,7 @@
9382	9593	//gl.glFlush();
9383	9594	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9595
9385		- if (ANIMATION && ABORTED)
	9596	+ if (Globals.ANIMATION && ABORTED)
9386	9597	{
9387	9598	System.err.println(" ABORTED FRAME");
9388	9599	break;
..	..	@@ -9412,7 +9623,7 @@
9412	9623	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9624
9414	9625	// save image
9415		- if (ANIMATION && !ABORTED)
	9626	+ if (Globals.ANIMATION && !ABORTED)
9416	9627	{
9417	9628	VPwidth = viewport[2];
9418	9629	VPheight = viewport[3];
..	..	@@ -9523,11 +9734,11 @@
9523	9734
9524	9735	// imagecount++;
9525	9736
9526		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9737	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9527	9738
9528	9739	if (!BOXMODE)
9529	9740	{
9530		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9741	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9531	9742	}
9532	9743
9533	9744	if (!BOXMODE)
..	..	@@ -9565,7 +9776,7 @@
9565	9776	ABORTED = false;
9566	9777	}
9567	9778	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9779	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	9780
9570	9781	if (false)
9571	9782	{
..	..	@@ -10228,11 +10439,11 @@
10228	10439
10229	10440	public void display(GLAutoDrawable drawable)
10230	10441	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10442	+ if (Grafreed.savesound && Grafreed.hassound)
10232	10443	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10444	+ Grafreed.wav.save();
	10445	+ Grafreed.savesound = false;
	10446	+ Grafreed.hassound = false;
10236	10447	}
10237	10448	// if (DEBUG_SELECTION)
10238	10449	// {
..	..	@@ -10308,6 +10519,7 @@
10308	10519	ANTIALIAS = 0;
10309	10520	//System.out.println("RESTART");
10310	10521	AAtimer.restart();
	10522	+ Globals.TIMERRUNNING = true;
10311	10523	}
10312	10524	}
10313	10525	}
..	..	@@ -10362,7 +10574,7 @@
10362	10574	Object3D theobject = object;
10363	10575	Object3D theparent = object.parent;
10364	10576	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10577	+ object = (Object3D)Grafreed.clone(object);
10366	10578	object.Stripify();
10367	10579	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10580	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10587,14 @@
10375	10587	ambientOcclusion = false;
10376	10588	}
10377	10589
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10590	+ if (//Globals.lighttouched &&
	10591	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10592	{
10380	10593	//if (RENDERSHADOW) // ?
10381	10594	if (!IsFrozen())
10382	10595	{
10383	10596	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10597	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10598	{
10386	10599	Globals.framecount++;
10387	10600	shadowbuffer.display();
..	..	@@ -10508,8 +10721,8 @@
10508	10721
10509	10722	// if (parentcam != renderCamera) // not a light
10510	10723	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10724	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10725	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10513	10726
10514	10727	for (int j = 0; j < 4; j++)
10515	10728	{
..	..	@@ -10523,8 +10736,8 @@
10523	10736
10524	10737	// if (parentcam != renderCamera) // not a light
10525	10738	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10740	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10528	10741
10529	10742	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	10743
..	..	@@ -10783,7 +10996,16 @@
10783	10996	// Bump noise
10784	10997	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	10998	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- BindTexture(NOISE_TEXTURE, false, 2);
	10999	+
	11000	+ try
	11001	+ {
	11002	+ BindTexture(NOISE_TEXTURE, false, 2);
	11003	+ }
	11004	+ catch (Exception e)
	11005	+ {
	11006	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11007	+ }
	11008	+
10787	11009
10788	11010	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11011	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11028,9 @@
10806	11028
10807	11029	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11030
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11031	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11032	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11033	+gl.glEnable(gl.GL_MULTISAMPLE);
10812	11034	} else
10813	11035	{
10814	11036	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11041,7 @@
10819	11041	//System.out.println("BLENDING ON");
10820	11042	gl.glEnable(GL.GL_BLEND);
10821	11043	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11044	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11045	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11046	gl.glLoadIdentity();
10825	11047
..	..	@@ -10908,8 +11130,8 @@
10908	11130	System.err.println("parentcam != renderCamera");
10909	11131
10910	11132	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11133	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11134	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10913	11135	}
10914	11136
10915	11137	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11152,8 @@
10930	11152	if (true) // TODO
10931	11153	{
10932	11154	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11155	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11156	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10935	11157	}
10936	11158
10937	11159	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11247,8 +11469,14 @@
11247	11469	{
11248	11470	renderpass++;
11249	11471	// System.out.println("Draw object... ");
	11472	+ STEP = 1;
11250	11473	if (FAST) // in case there is no script
11251		- STEP = 16;
	11474	+ STEP = 8;
	11475	+
	11476	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11477	+ {
	11478	+ STEP *= 4;
	11479	+ }
11252	11480
11253	11481	//object.FullInvariants();
11254	11482
..	..	@@ -11262,23 +11490,44 @@
11262	11490	e.printStackTrace();
11263	11491	}
11264	11492
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11493	+ if (Grafreed.RENDERME > 0)
	11494	+ Grafreed.RENDERME--; // mechante magouille
11267	11495
11268	11496	Globals.ONESTEP = false;
11269	11497	}
11270	11498
11271	11499	static boolean zoomonce = false;
11272	11500
	11501	+ static void CreateSelectedPoint()
	11502	+ {
	11503	+ if (selectedpoint == null)
	11504	+ {
	11505	+ debugpointG = new Sphere();
	11506	+ debugpointP = new Sphere();
	11507	+ debugpointC = new Sphere();
	11508	+ debugpointR = new Sphere();
	11509	+
	11510	+ selectedpoint = new Superellipsoid();
	11511	+
	11512	+ for (int i=0; i<8; i++)
	11513	+ {
	11514	+ debugpoints[i] = new Sphere();
	11515	+ }
	11516	+ }
	11517	+ }
	11518	+
11273	11519	void DrawObject(GL gl, boolean draw)
11274	11520	{
	11521	+ // To clear camera values
	11522	+ ResetOptions();
	11523	+
11275	11524	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11525	// DrawMode() = SELECTION;
11277	11526	//GL gl = getGL();
11278	11527	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11528	{
11280	11529	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11530	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11531	pingthread.StepToTarget(true); // true);
11283	11532	// zoomonce = false;
11284	11533	}
..	..	@@ -11333,7 +11582,14 @@
11333	11582
11334	11583	usedtextures.clear();
11335	11584
11336		- BindTextures(DEFAULT_TEXTURES, 2);
	11585	+ try
	11586	+ {
	11587	+ BindTextures(DEFAULT_TEXTURES, 2);
	11588	+ }
	11589	+ catch (Exception e)
	11590	+ {
	11591	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11592	+ }
11337	11593	}
11338	11594	//System.out.println("--> " + stackdepth);
11339	11595	// GrafreeD.traceon();
..	..	@@ -11343,8 +11599,9 @@
11343	11599
11344	11600	if (DrawMode() == DEFAULT)
11345	11601	{
11346		- if (DEBUG)
	11602	+ if (Globals.DEBUG)
11347	11603	{
	11604	+ CreateSelectedPoint();
11348	11605	float radius = 0.05f;
11349	11606	if (selectedpoint.radius != radius)
11350	11607	{
..	..	@@ -11424,7 +11681,14 @@
11424	11681	if (checker != null && DrawMode() == DEFAULT)
11425	11682	{
11426	11683	//BindTexture(IMMORTAL_TEXTURE);
11427		- BindTextures(checker.GetTextures(), checker.texres);
	11684	+ try
	11685	+ {
	11686	+ BindTextures(checker.GetTextures(), checker.texres);
	11687	+ }
	11688	+ catch (Exception e)
	11689	+ {
	11690	+ System.err.println("FAILED: " + checker.GetTextures());
	11691	+ }
11428	11692	// NEAREST
11429	11693	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	11694	DrawChecker(gl);
..	..	@@ -11506,7 +11770,7 @@
11506	11770	return;
11507	11771	}
11508	11772
11509		- String string = obj.GetToolTip();
	11773	+ String string = obj.toString(); //.GetToolTip();
11510	11774
11511	11775	GL gl = GetGL();
11512	11776
..	..	@@ -11823,8 +12087,8 @@
11823	12087	//obj.TransformToWorld(light, light);
11824	12088	for (int i = tp.size(); --i >= 0;)
11825	12089	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- LA.xformPos(light, tp.get(i).toParent, light);
	12090	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12091	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11828	12092	}
11829	12093
11830	12094
..	..	@@ -11841,8 +12105,8 @@
11841	12105	parentcam = cameras[0];
11842	12106	}
11843	12107
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12108	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12109	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11846	12110
11847	12111	LA.xformPos(light, renderCamera.toScreen, light);
11848	12112
..	..	@@ -12456,8 +12720,8 @@
12456	12720
12457	12721	// display shadow only (bump == 0)
12458	12722	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	12723	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12724	+ "SLT temp.z, temp.y, -one2048th.x;" +
12461	12725	"SUB temp.y, one.x, temp.z;" +
12462	12726	"MUL temp.x, temp.x, temp.y;" +
12463	12727	"KIL temp.x;" +
..	..	@@ -12586,8 +12850,10 @@
12586	12850	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	12851
12588	12852	"SUB temp.x, one.x, ndotl.x;" +
12589		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12853	+ // Tuning for default skin
	12854	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12855	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12856	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	12857	"MUL temp.x, temp.x, temp.y;" +
12592	12858
12593	12859	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,7 +13052,7 @@
12786	13052	//once = true;
12787	13053	}
12788	13054
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
	13055	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12790	13056	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12791	13057	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13058
..	..	@@ -12919,12 +13185,16 @@
12919	13185
12920	13186	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13187	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13188	+
	13189	+ // Compare fragment depth in light space with shadowmap.
12922	13190	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13191	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13192	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13193	+
	13194	+ // Reverse comparison
12925	13195	"SUB temp.x, one.x, temp.x;" +
12926	13196	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13197	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13198	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13199
12930	13200	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13208,10 @@
12938	13208	// No shadow for backface
12939	13209	"DP3 temp.x, normal, lightd;" +
12940	13210	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13211	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13212	+
	13213	+ // No shadow when out of frustrum
	13214	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13215	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13216	"";
12943	13217	}
..	..	@@ -13084,7 +13358,8 @@
13084	13358	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13359	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086	13360	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13361	+
	13362	+ //Object3D.cVector2[] vector2buffer;
13088	13363
13089	13364	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13365	// OUT : diff, spec
..	..	@@ -13100,9 +13375,10 @@
13100	13375	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13376	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13377	//"MOV " + dest + ".w," + "normal.z;" +
13103		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13104		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13105		- //"MOV " + dest + ".z," + "params2.w;" +
	13378	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13379	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13380	+
	13381	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13382	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13383	"RCP " + dest + ".w," + dest + ".w;" +
13108	13384	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13496,7 +13772,7 @@
13496	13772	public void mousePressed(MouseEvent e)
13497	13773	{
13498	13774	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13775	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	13776	}
13501	13777
13502	13778	static long prevtime = 0;
..	..	@@ -13523,6 +13799,7 @@
13523	13799
13524	13800	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	13801
	13802	+ if (BUTTONLESSWHEEL)
13526	13803	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	13804	{
13528	13805	return;
..	..	@@ -13531,7 +13808,7 @@
13531	13808	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	13809
13533	13810	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13811	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	13812	{
13536	13813	keepboxmode = BOXMODE;
13537	13814	keepsupport = SUPPORT;
..	..	@@ -13571,8 +13848,8 @@
13571	13848	// mode \|= META;
13572	13849	//}
13573	13850
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13851	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13852	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	13853	anchorX = ax;
13577	13854	anchorY = ay;
13578	13855	prevX = px;
..	..	@@ -13606,6 +13883,7 @@
13606	13883	else
13607	13884	if (evt.getSource() == AAtimer)
13608	13885	{
	13886	+ Globals.TIMERRUNNING = false;
13609	13887	if (mouseDown)
13610	13888	{
13611	13889	//new Exception().printStackTrace();
..	..	@@ -13631,6 +13909,10 @@
13631	13909	// LIVE = waslive;
13632	13910	// wasliveok = true;
13633	13911	// waslive = false;
	13912	+
	13913	+ // May 2019 Forget it:
	13914	+ if (true)
	13915	+ return;
13634	13916
13635	13917	// source == timer
13636	13918	if (mouseDown)
..	..	@@ -13661,7 +13943,7 @@
13661	13943
13662	13944	// fev 2014???
13663	13945	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13946	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	13947	pingthread.StepToTarget(true); // true);
13666	13948	}
13667	13949	// if (!LIVE)
..	..	@@ -13670,12 +13952,13 @@
13670	13952
13671	13953	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	13954
13673		- void clickStart(int x, int y, int modifiers)
	13955	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	13956	{
13675	13957	if (!wasliveok)
13676	13958	return;
13677	13959
13678	13960	AAtimer.restart(); //
	13961	+ Globals.TIMERRUNNING = true;
13679	13962
13680	13963	// waslive = LIVE;
13681	13964	// LIVE = false;
..	..	@@ -13687,7 +13970,7 @@
13687	13970	// touched = true; // main DL
13688	13971	if (isRenderer)
13689	13972	{
13690		- SetMouseMode(modifiers);
	13973	+ SetMouseMode(modifiers, modifiersex);
13691	13974	}
13692	13975
13693	13976	selectX = anchorX = x;
..	..	@@ -13700,7 +13983,7 @@
13700	13983	clicked = true;
13701	13984	hold = false;
13702	13985
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13986	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	13987	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	13988	{
13706	13989	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13731,7 +14014,7 @@
13731	14014	info.camera = renderCamera;
13732	14015	info.x = x;
13733	14016	info.y = y;
13734		- info.modifiers = modifiers;
	14017	+ info.modifiers = modifiersex;
13735	14018	editObj = object.doEditClick(info, 0);
13736	14019	if (!editObj)
13737	14020	{
..	..	@@ -13748,11 +14031,14 @@
13748	14031
13749	14032	public void mouseDragged(MouseEvent e)
13750	14033	{
	14034	+ Globals.MOUSEDRAGGED = true;
	14035	+
	14036	+ //System.out.println("mouseDragged: " + e);
13751	14037	if (isRenderer)
13752	14038	movingcamera = true;
	14039	+
13753	14040	//if (drawing)
13754	14041	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14042	if ((e.getModifiersEx() & CTRL) != 0
13757	14043	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14044	{
..	..	@@ -13760,7 +14046,7 @@
13760	14046	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14047	}
13762	14048	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14049	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14050
13765	14051	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14052	}
..	..	@@ -13933,6 +14219,7 @@
13933	14219
13934	14220	public void run()
13935	14221	{
	14222	+ new Exception().printStackTrace();
13936	14223	System.exit(0);
13937	14224	for (;;)
13938	14225	{
..	..	@@ -13996,7 +14283,7 @@
13996	14283	{
13997	14284	Globals.lighttouched = true;
13998	14285	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14286	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14287	}
14001	14288	//else
14002	14289	}
..	..	@@ -14010,12 +14297,12 @@
14010	14297	void GoDown(int mod)
14011	14298	{
14012	14299	MODIFIERS \|= COMMAND;
14013		- /*
	14300	+ /**/
14014	14301	if((mod&SHIFT) == SHIFT)
14015	14302	manipCamera.RotatePosition(0, -speed);
14016	14303	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14304	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14305	+ /**/
14019	14306	if ((mod & SHIFT) == SHIFT)
14020	14307	{
14021	14308	mouseMode = mouseMode; // VR??
..	..	@@ -14031,12 +14318,12 @@
14031	14318	void GoUp(int mod)
14032	14319	{
14033	14320	MODIFIERS \|= COMMAND;
14034		- /*
	14321	+ /**/
14035	14322	if((mod&SHIFT) == SHIFT)
14036	14323	manipCamera.RotatePosition(0, speed);
14037	14324	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14325	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14326	+ /**/
14040	14327	if ((mod & SHIFT) == SHIFT)
14041	14328	{
14042	14329	mouseMode = mouseMode;
..	..	@@ -14052,12 +14339,12 @@
14052	14339	void GoLeft(int mod)
14053	14340	{
14054	14341	MODIFIERS \|= COMMAND;
14055		- /*
	14342	+ /**/
14056	14343	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
14058		- else
14059	14344	manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14345	+ else
	14346	+ manipCamera.RotatePosition(speed, 0);
	14347	+ /**/
14061	14348	if ((mod & SHIFT) == SHIFT)
14062	14349	{
14063	14350	mouseMode = mouseMode;
..	..	@@ -14073,12 +14360,12 @@
14073	14360	void GoRight(int mod)
14074	14361	{
14075	14362	MODIFIERS \|= COMMAND;
14076		- /*
	14363	+ /**/
14077	14364	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
14079		- else
14080	14365	manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14366	+ else
	14367	+ manipCamera.RotatePosition(-speed, 0);
	14368	+ /**/
14082	14369	if ((mod & SHIFT) == SHIFT)
14083	14370	{
14084	14371	mouseMode = mouseMode;
..	..	@@ -14096,7 +14383,7 @@
14096	14383	int X, Y;
14097	14384	boolean SX, SY;
14098	14385
14099		- void drag(int x, int y, int modifiers)
	14386	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14387	{
14101	14388	if (IsFrozen())
14102	14389	{
..	..	@@ -14105,17 +14392,17 @@
14105	14392
14106	14393	drag = true; // NEW
14107	14394
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14395	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14396
14110	14397	X = x;
14111	14398	Y = y;
14112	14399	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14400	+ MODIFIERS = modifiersex;
	14401	+ modifiersex &= ~1024;
14115	14402	if (false) // modifiers != 0)
14116	14403	{
14117	14404	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14405	+ System.out.println("mouseDragged: " + modifiersex);
14119	14406	System.out.println("SHIFT = " + SHIFT);
14120	14407	System.out.println("CONTROL = " + COMMAND);
14121	14408	System.out.println("META = " + META);
..	..	@@ -14135,7 +14422,8 @@
14135	14422	info.camera = renderCamera;
14136	14423	info.x = x;
14137	14424	info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	14425	+ object.GetWindow().copy
	14426	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14427	} else
14140	14428	{
14141	14429	if (x < startX)
..	..	@@ -14287,7 +14575,6 @@
14287	14575	public void mouseMoved(MouseEvent e)
14288	14576	{
14289	14577	//System.out.println("mouseMoved: " + e);
14290		-
14291	14578	if (isRenderer)
14292	14579	return;
14293	14580
..	..	@@ -14300,7 +14587,9 @@
14300	14587	ci.camera = renderCamera;
14301	14588	if (!isRenderer)
14302	14589	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	14590	+ //ObjEditor editWindow = object.editWindow;
	14591	+ //Object3D copy = editWindow.copy;
	14592	+ if (object.doEditClick(ci, 0))
14304	14593	{
14305	14594	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	14595	} else
..	..	@@ -14312,7 +14601,11 @@
14312	14601
14313	14602	public void mouseReleased(MouseEvent e)
14314	14603	{
	14604	+ Globals.MOUSEDRAGGED = false;
	14605	+
14315	14606	movingcamera = false;
	14607	+ X = 0; // getBounds().width/2;
	14608	+ Y = 0; // getBounds().height/2;
14316	14609	//System.out.println("mouseReleased: " + e);
14317	14610	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	14611	}
..	..	@@ -14335,9 +14628,9 @@
14335	14628	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	14629	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	14630
14338		- if (control \|\| command \|\| IsFrozen())
	14631	+// No delay if (control \|\| command \|\| IsFrozen())
14339	14632	timeout = true;
14340		- else
	14633	+// ?? May 2019 else
14341	14634	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	14635	mouseDown = false;
14343	14636	if (!control && !command) // june 2013
..	..	@@ -14447,7 +14740,7 @@
14447	14740	System.out.println("keyReleased: " + e);
14448	14741	}
14449	14742
14450		- void SetMouseMode(int modifiers)
	14743	+ void SetMouseMode(int modifiers, int modifiersex)
14451	14744	{
14452	14745	//System.out.println("SetMouseMode = " + modifiers);
14453	14746	//modifiers &= ~1024;
..	..	@@ -14459,25 +14752,25 @@
14459	14752	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	14753	// return;
14461	14754	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	14755	+ if ((modifiersex & WHEEL) == WHEEL)
14463	14756	{
14464	14757	mouseMode \|= ZOOM;
14465	14758	}
14466	14759
14467	14760	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	14761	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	14762	{
14470	14763	mouseMode \|= VR; // BACKFORTH;
14471	14764	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14765	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	14766	{
14474	14767	mouseMode \|= SELECT;
14475	14768	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	14769	+ if ((modifiersex & COMMAND) == COMMAND)
14477	14770	{
14478	14771	mouseMode \|= SELECT;
14479	14772	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14773	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	14774	{
14482	14775	mouseMode &= ~VR;
14483	14776	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +14799,7 @@
14506	14799
14507	14800	if (isRenderer) //
14508	14801	{
14509		- SetMouseMode(modifiers);
	14802	+ SetMouseMode(0, modifiers);
14510	14803	}
14511	14804
14512	14805	Globals.theRenderer.keyPressed(key);
..	..	@@ -14653,7 +14946,9 @@
14653	14946	case 'E' : COMPACT ^= true;
14654	14947	repaint();
14655	14948	break;
14656		- case 'W' : DEBUGHSB ^= true;
	14949	+ case 'W' : // Wide Window (fullscreen)
	14950	+ //DEBUGHSB ^= true;
	14951	+ ObjEditor.theFrame.ToggleFullScreen();
14657	14952	repaint();
14658	14953	break;
14659	14954	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +14973,8 @@
14678	14973	RevertCamera();
14679	14974	repaint();
14680	14975	break;
14681		- case 'L':
14682	14976	case 'l':
	14977	+ //case 'L':
14683	14978	if (lightMode)
14684	14979	{
14685	14980	lightMode = false;
..	..	@@ -14822,9 +15117,9 @@
14822	15117	case '_':
14823	15118	kompactbit = 5;
14824	15119	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15120	+// case '+':
	15121	+// kompactbit = 6;
	15122	+// break;
14828	15123	case ' ':
14829	15124	lightMode ^= true;
14830	15125	Globals.lighttouched = true;
..	..	@@ -14836,13 +15131,14 @@
14836	15131	case ESC:
14837	15132	RENDERPROGRAM += 1;
14838	15133	RENDERPROGRAM %= 3;
	15134	+
14839	15135	repaint();
14840	15136	break;
14841	15137	case 'Z':
14842	15138	//RESIZETEXTURE ^= true;
14843	15139	//break;
14844	15140	case 'z':
14845		- RENDERSHADOW ^= true;
	15141	+ Globals.RENDERSHADOW ^= true;
14846	15142	Globals.lighttouched = true;
14847	15143	repaint();
14848	15144	break;
..	..	@@ -14875,8 +15171,9 @@
14875	15171	case DELETE:
14876	15172	ClearSelection();
14877	15173	break;
14878		- /*
14879	15174	case '+':
	15175	+
	15176	+ /*
14880	15177	//fontsize += 1;
14881	15178	bbzoom *= 2;
14882	15179	repaint();
..	..	@@ -14893,17 +15190,17 @@
14893	15190	case '=':
14894	15191	IncDepth();
14895	15192	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15193	+ object.GetWindow().refreshContents(true);
14897	15194	maskbit = 6;
14898	15195	break;
14899	15196	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15197	DecDepth();
14901	15198	maskbit = 5;
14902	15199	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15200	+// if (object.editWindow == null)
	15201	+// new Exception().printStackTrace();
	15202	+// else
	15203	+ object.GetWindow().refreshContents(true);
14907	15204	break;
14908	15205	case '{':
14909	15206	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15263,7 @@
14966	15263	//mode = ROTATE;
14967	15264	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15265	{
14969		- SetMouseMode(modifiers);
	15266	+ SetMouseMode(0, modifiers);
14970	15267	}
14971	15268	}
14972	15269
..	..	@@ -15100,8 +15397,9 @@
15100	15397
15101	15398	protected void processMouseMotionEvent(MouseEvent e)
15102	15399	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15400	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15401	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15402	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15403	{
15106	15404	mouseMoved(e);
15107	15405	} else
..	..	@@ -15126,11 +15424,12 @@
15126	15424	}
15127	15425	*/
15128	15426
15129		- object.editWindow.EditSelection();
	15427	+ object.GetWindow().EditSelection(false);
15130	15428	}
15131	15429
15132	15430	void SelectParent()
15133	15431	{
	15432	+ new Exception().printStackTrace();
15134	15433	System.exit(0);
15135	15434	Composite group = (Composite) object;
15136	15435	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15441,10 @@
15142	15441	{
15143	15442	//selectees.remove(i);
15144	15443	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15444	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15445	} else
15147	15446	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15447	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15448	}
15150	15449
15151	15450	first = false;
..	..	@@ -15154,6 +15453,7 @@
15154	15453
15155	15454	void SelectChildren()
15156	15455	{
	15456	+ new Exception().printStackTrace();
15157	15457	System.exit(0);
15158	15458	/*
15159	15459	Composite group = (Composite) object;
..	..	@@ -15186,12 +15486,12 @@
15186	15486	for (int j = 0; j < group.children.size(); j++)
15187	15487	{
15188	15488	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15489	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15490	first = false;
15191	15491	}
15192	15492	} else
15193	15493	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15494	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15495	}
15196	15496
15197	15497	first = false;
..	..	@@ -15202,21 +15502,21 @@
15202	15502	{
15203	15503	//Composite group = (Composite) object;
15204	15504	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15505	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15506	}
15207	15507
15208	15508	void ResetTransform(int mask)
15209	15509	{
15210	15510	//Composite group = (Composite) object;
15211	15511	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15512	+ group.GetWindow().ResetTransform(mask);
15213	15513	}
15214	15514
15215	15515	void FlipTransform()
15216	15516	{
15217	15517	//Composite group = (Composite) object;
15218	15518	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	15519	+ group.GetWindow().FlipTransform();
15220	15520	// group.editWindow.ReduceMesh(true);
15221	15521	}
15222	15522
..	..	@@ -15224,7 +15524,7 @@
15224	15524	{
15225	15525	//Composite group = (Composite) object;
15226	15526	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	15527	+ group.GetWindow().PrintMemory();
15228	15528	// group.editWindow.ReduceMesh(true);
15229	15529	}
15230	15530
..	..	@@ -15232,7 +15532,7 @@
15232	15532	{
15233	15533	//Composite group = (Composite) object;
15234	15534	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	15535	+ group.GetWindow().ResetCentroid();
15236	15536	}
15237	15537
15238	15538	void IncDepth()
..	..	@@ -15318,7 +15618,9 @@
15318	15618	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	15619	//Image img = CreateImage(width, height);
15320	15620	//System.out.println("width = " + width + "; height = " + height + "\n");
	15621	+
15321	15622	Graphics gr = g; // img.getGraphics();
	15623	+
15322	15624	if (!hasMarquee)
15323	15625	{
15324	15626	if (Xmin < Xmax) // !locked)
..	..	@@ -15406,6 +15708,7 @@
15406	15708	info.bounds.y += (height - desired) / 2;
15407	15709	}
15408	15710	}
	15711	+
15409	15712	info.g = gr;
15410	15713	info.camera = renderCamera;
15411	15714	/*
..	..	@@ -15415,15 +15718,55 @@
15415	15718	*/
15416	15719	if (!isRenderer)
15417	15720	{
15418		- object.drawEditHandles(info, 0);
	15721	+ Grafreed.Assert(object != null);
	15722	+ Grafreed.Assert(object.selection != null);
	15723	+ if (object.selection.Size() > 0)
	15724	+ {
	15725	+ int hitSomething = object.selection.get(0).hitSomething;
	15726	+
	15727	+ info.DX = 0;
	15728	+ info.DY = 0;
	15729	+ info.W = 1;
	15730	+ if (hitSomething == Object3D.hitCenter)
	15731	+ {
	15732	+ info.DX = X;
	15733	+ if (X != 0)
	15734	+ info.DX -= info.bounds.width/2;
	15735	+
	15736	+ info.DY = Y;
	15737	+ if (Y != 0)
	15738	+ info.DY -= info.bounds.height/2;
	15739	+ }
	15740	+
	15741	+ object.drawEditHandles(info, 0);
	15742	+
	15743	+ if (drag && (X != 0 \|\| Y != 0))
	15744	+ {
	15745	+ switch (hitSomething)
	15746	+ {
	15747	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15748	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15749	+ break;
	15750	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15751	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15752	+ break;
	15753	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15754	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15755	+ break;
	15756	+ }
	15757	+
	15758	+ }
	15759	+ }
15419	15760	}
15420	15761	}
	15762	+
15421	15763	if (isRenderer)
15422	15764	{
15423	15765	//gr.setColor(Color.black);
15424	15766	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	15767	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	15768	}
	15769	+
15427	15770	if (hasMarquee)
15428	15771	{
15429	15772	gr.setXORMode(Color.white);
..	..	@@ -15536,6 +15879,7 @@
15536	15879	public boolean mouseDown(Event evt, int x, int y)
15537	15880	{
15538	15881	System.out.println("mouseDown: " + evt);
	15882	+ System.exit(0);
15539	15883	/*
15540	15884	locked = true;
15541	15885	drag = false;
..	..	@@ -15579,7 +15923,7 @@
15579	15923	{
15580	15924	keyPressed(0, modifiers);
15581	15925	}
15582		- clickStart(x, y, modifiers);
	15926	+ // clickStart(x, y, modifiers);
15583	15927	return true;
15584	15928	}
15585	15929
..	..	@@ -15697,7 +16041,7 @@
15697	16041	{
15698	16042	keyReleased(0, 0);
15699	16043	}
15700		- drag(x, y, modifiers);
	16044	+ drag(x, y, 0, modifiers);
15701	16045	return true;
15702	16046	}
15703	16047
..	..	@@ -15829,7 +16173,7 @@
15829	16173	Object3D object;
15830	16174	static Object3D trackedobject;
15831	16175	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16176	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16177	/static/ Camera eyeCamera;
15834	16178	/static/ Camera lightCamera;
15835	16179	int cameracount;
..	..	@@ -16114,16 +16458,16 @@
16114	16458	cStatic.objectstack[materialdepth++] = checker;
16115	16459	//System.out.println("material " + material);
16116	16460	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	16461	+ //vector2buffer = checker.projectedVertices;
16118	16462
16119	16463	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	16464	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	16465
16122	16466	materialdepth -= 1;
16123	16467	if (materialdepth > 0)
16124	16468	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16469	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16470	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	16471	}
16128	16472	//checker.GetMaterial().opacity = 1f;
16129	16473	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16267,6 +16611,7 @@
16267	16611	{
16268	16612	if (!selection)
16269	16613	{
	16614	+ new Exception().printStackTrace();
16270	16615	System.exit(0);
16271	16616	return;
16272	16617	}
..	..	@@ -16346,6 +16691,8 @@
16346	16691	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	16692	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16348	16693
	16694	+ CreateSelectedPoint();
	16695	+
16349	16696	// Will fit the mesh !!!
16350	16697	selectedpoint.toParent[0][0] = 0.0001;
16351	16698	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -16394,16 +16741,16 @@
16394	16741	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]));
16395	16742	}
16396	16743
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16744	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	16745	}
16399	16746	}
16400	16747
16401	16748	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	16749	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	16750
16404		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16751	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16405	16752	{
16406		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16753	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16407	16754
16408	16755	Object3D group = new Object3D("inst" + paintcount++);
16409	16756
..	..	@@ -16411,17 +16758,17 @@
16411	16758
16412	16759	group.add(paintobj); // link
16413	16760
16414		- object.editWindow.SnapObject(group);
	16761	+ object.GetWindow().SnapObject(group);
16415	16762
16416		- Object3D folder = object.editWindow.copy;
	16763	+ Object3D folder = object.GetWindow().copy;
16417	16764
16418		- if (object.editWindow.copy.selection.Size() > 0)
16419		- folder = object.editWindow.copy.selection.elementAt(0);
	16765	+ if (object.GetWindow().copy.selection.Size() > 0)
	16766	+ folder = object.GetWindow().copy.selection.elementAt(0);
16420	16767
16421	16768	folder.add(group);
16422	16769
16423		- object.editWindow.ResetModel();
16424		- object.editWindow.refreshContents();
	16770	+ object.GetWindow().ResetModel();
	16771	+ object.GetWindow().refreshContents();
16425	16772	}
16426	16773	else
16427	16774	paintcount = 0;
..	..	@@ -16460,6 +16807,11 @@
16460	16807	//System.out.println("objects[color] = " + objects[color]);
16461	16808	//objects[color].Select();
16462	16809	indexcount = 0;
	16810	+ ObjEditor window = object.GetWindow();
	16811	+ if (window != null && deselect)
	16812	+ {
	16813	+ window.Select(null, deselect, true);
	16814	+ }
16463	16815	object.Select(color, deselect);
16464	16816	}
16465	16817
..	..	@@ -16559,7 +16911,7 @@
16559	16911	gl.glDisable(gl.GL_CULL_FACE);
16560	16912	}
16561	16913
16562		- if (!RENDERSHADOW)
	16914	+ if (!Globals.RENDERSHADOW)
16563	16915	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	16916
16565	16917	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +16921,7 @@
16569	16921	//gl.glColorMask(false, false, false, false);
16570	16922
16571	16923	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16924	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	16925	{
16574	16926	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	16927
..	..	@@ -16985,23 +17337,15 @@
16985	17337	int AAbuffersize = 0;
16986	17338
16987	17339	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17340	+ static Superellipsoid selectedpoint;
16989	17341	static Sphere previousselectedpoint = null;
16990		- static Sphere debugpointG = new Sphere();
16991		- static Sphere debugpointP = new Sphere();
16992		- static Sphere debugpointC = new Sphere();
16993		- static Sphere debugpointR = new Sphere();
	17342	+ static Sphere debugpointG;
	17343	+ static Sphere debugpointP;
	17344	+ static Sphere debugpointC;
	17345	+ static Sphere debugpointR;
16994	17346
16995	17347	static Sphere debugpoints[] = new Sphere[8];
16996	17348
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17349	static void InitPoints(float radius)
17006	17350	{
17007	17351	for (int i=0; i<8; i++)