~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,11 +14,15 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
	24	+
	25	+ private UUID uuid = UUID.randomUUID();
22	26
23	27	ScriptNode scriptnode;
24	28
..	..	@@ -300,6 +304,7 @@
300	304	}
301	305
302	306	boolean live = false;
	307	+ boolean dontselect = false;
303	308	boolean hide = false;
304	309	boolean link2master = false; // performs reset support/master at each frame
305	310	boolean marked = false; // animation node
..	..	@@ -774,7 +779,7 @@
774	779	if (step == 0)
775	780	step = 1;
776	781	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	782	+ maxcount = 128; // 2048; // 4;
778	783	// if (acceleration == 0)
779	784	// acceleration = 10;
780	785	if (delay == 0) // serial
..	..	@@ -797,7 +802,7 @@
797	802
798	803	if (marked && Globals.isLIVE() && live &&
799	804	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	805	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
801	806	currentframe != Globals.framecount)
802	807	{
803	808	currentframe = Globals.framecount;
..	..	@@ -912,6 +917,11 @@
912	917	fromParent = null; // LA.newMatrix();
913	918	bRep = null; // new BoundaryRep();
914	919
	920	+ if (oname != null && oname.equals("LeftHand"))
	921	+ {
	922	+ name = oname;
	923	+ }
	924	+
915	925	/*
916	926	float hue = (float)Math.random();
917	927	Color col;
..	..	@@ -954,7 +964,7 @@
954	964
955	965	public Object clone()
956	966	{
957		- return GrafreeD.clone(this);
	967	+ return Grafreed.clone(this);
958	968	}
959	969
960	970	Object3D copyExpand()
..	..	@@ -1470,7 +1480,7 @@
1470	1480	BoundaryRep.SEUIL = other.material.cameralight;
1471	1481
1472	1482	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1483	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1484	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1485	}
1476	1486
..	..	@@ -1729,7 +1739,7 @@
1729	1739	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1740	o.bRep = transientrep;
1731	1741	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1742	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1743	o.CreateMaterial();
1734	1744	o.SetAttributes(this, -1);
1735	1745	//parent
..	..	@@ -1742,7 +1752,7 @@
1742	1752	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1753	o.bRep = bRep;
1744	1754	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1755	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1756	o.CreateMaterial();
1747	1757	//o.overwriteThis(this, -1);
1748	1758	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1839,15 @@
1829	1839	if (obj.name == null)
1830	1840	continue; // can't be a null one
1831	1841
	1842	+ // Try perfect match first.
1832	1843	if (n.equals(obj.name))
1833	1844	{
1834	1845	theobj = obj;
1835	1846	count++;
1836	1847	}
1837	1848	}
	1849	+
	1850	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1851
1839	1852	if (count != 1)
1840	1853	for (int i=Size(); --i>=0;)
..	..	@@ -2300,6 +2313,7 @@
2300	2313	{
2301	2314	if (newWindow)
2302	2315	{
	2316	+ new Exception().printStackTrace();
2303	2317	System.exit(0);
2304	2318	if (parent != null)
2305	2319	{
..	..	@@ -2476,13 +2490,13 @@
2476	2490	return retval;
2477	2491	}
2478	2492
2479		- void doEditDrag(ClickInfo info)
	2493	+ void doEditDrag(ClickInfo info, boolean opposite)
2480	2494	{
2481	2495	switch (doSomething)
2482	2496	{
2483	2497	case 1: // '\001'
2484	2498	//super.
2485		- doEditDrag0(info);
	2499	+ doEditDrag0(info, opposite);
2486	2500	break;
2487	2501
2488	2502	case 2: // '\002'
..	..	@@ -2495,11 +2509,11 @@
2495	2509	{
2496	2510	//sel.hitSomething = childToDrag.hitSomething;
2497	2511	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2512	+ sel.doEditDrag(info, opposite);
2499	2513	} else
2500	2514	{
2501	2515	//super.
2502		- doEditDrag0(info);
	2516	+ doEditDrag0(info, opposite);
2503	2517	}
2504	2518	}
2505	2519	break;
..	..	@@ -2906,7 +2920,8 @@
2906	2920	{
2907	2921	if (bRep != null)
2908	2922	{
2909		- bRep.GenUV();
	2923	+ bRep.GenUV(); //1);
	2924	+ //bRep.UnfoldUV();
2910	2925	Touch();
2911	2926	}
2912	2927	}
..	..	@@ -2981,6 +2996,33 @@
2981	2996	blockloop = false;
2982	2997	}
2983	2998
	2999	+ void TransformChildren()
	3000	+ {
	3001	+ if (toParent != null)
	3002	+ {
	3003	+ for (int i=Size(); --i>=0;)
	3004	+ {
	3005	+ Object3D v = get(i);
	3006	+
	3007	+ if (v.toParent == null)
	3008	+ {
	3009	+ v.toParent = LA.newMatrix();
	3010	+ v.fromParent = LA.newMatrix();
	3011	+ }
	3012	+
	3013	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3014	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3015	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3016	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3017	+ }
	3018	+
	3019	+ toParent = null; // LA.matIdentity(toParent);
	3020	+ fromParent = null; // LA.matIdentity(fromParent);
	3021	+
	3022	+ Touch();
	3023	+ }
	3024	+ }
	3025	+
2984	3026	void TransformGeometry()
2985	3027	{
2986	3028	Object3D obj = this;
..	..	@@ -3202,9 +3244,11 @@
3202	3244
3203	3245	BoundaryRep sup = bRep.support;
3204	3246	bRep.support = null;
3205		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3247	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3206	3248	// bRep.SplitInTwo(onlyone); // thread...
3207		- temprep.SplitInTwo(reduction34, onlyone);
	3249	+
	3250	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3251	+
3208	3252	bRep = temprep;
3209	3253	bRep.support = sup;
3210	3254	Touch();
..	..	@@ -3726,7 +3770,7 @@
3726	3770	if (child == null)
3727	3771	continue;
3728	3772
3729		- if (GrafreeD.RENDERME > 0)
	3773	+ if (Grafreed.RENDERME > 0)
3730	3774	{
3731	3775	if (child instanceof Merge)
3732	3776	((Merge)child).renderme();
..	..	@@ -3877,7 +3921,7 @@
3877	3921	if (child == null)
3878	3922	continue;
3879	3923
3880		- if (GrafreeD.RENDERME > 0)
	3924	+ if (Grafreed.RENDERME > 0)
3881	3925	{
3882	3926	if (child instanceof Merge)
3883	3927	((Merge)child).renderme();
..	..	@@ -4072,7 +4116,7 @@
4072	4116	if (child == null)
4073	4117	continue;
4074	4118
4075		- if (GrafreeD.RENDERME > 0)
	4119	+ if (Grafreed.RENDERME > 0)
4076	4120	{
4077	4121	if (child instanceof Merge)
4078	4122	((Merge)child).renderme();
..	..	@@ -4679,7 +4723,7 @@
4679	4723
4680	4724	cTreePath SelectLeaf(int indexcount, boolean deselect)
4681	4725	{
4682		- if (hide)
	4726	+ if (hide \|\| dontselect)
4683	4727	return null;
4684	4728
4685	4729	if (count <= 0)
..	..	@@ -4705,7 +4749,7 @@
4705	4749
4706	4750	cTreePath Select(int indexcount, boolean deselect)
4707	4751	{
4708		- if (hide)
	4752	+ if (hide \|\| dontselect)
4709	4753	return null;
4710	4754
4711	4755	if (count <= 0)
..	..	@@ -5157,10 +5201,34 @@
5157	5201
5158	5202	// System.out.println("Fullname = " + fullname);
5159	5203
5160		- if (fullname.name.indexOf(":") == -1)
5161		- return fullname.name;
	5204	+ // Does not work on Windows due to C:
	5205	+// if (fullname.name.indexOf(":") == -1)
	5206	+// return fullname.name;
	5207	+//
	5208	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5162	5209
5163		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5210	+ String[] split = fullname.name.split(":");
	5211	+
	5212	+ if (split.length == 0)
	5213	+ {
	5214	+ return "";
	5215	+ }
	5216	+
	5217	+ if (split.length <= 2)
	5218	+ {
	5219	+ if (fullname.name.endsWith(":"))
	5220	+ {
	5221	+ // Windows
	5222	+ return fullname.name.substring(0, fullname.name.length()-1);
	5223	+ }
	5224	+
	5225	+ return split[0];
	5226	+ }
	5227	+
	5228	+ // Windows
	5229	+ assert(split.length == 4);
	5230	+
	5231	+ return split[0] + ":" + split[1];
5164	5232	}
5165	5233
5166	5234	static String GetBump(cTexture fullname)
..	..	@@ -5169,10 +5237,38 @@
5169	5237	return "";
5170	5238
5171	5239	// System.out.println("Fullname = " + fullname);
5172		- if (fullname.name.indexOf(":") == -1)
5173		- return "";
5174		-
5175		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5240	+ // Does not work on Windows due to C:
	5241	+// if (fullname.name.indexOf(":") == -1)
	5242	+// return "";
	5243	+//
	5244	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5245	+ String[] split = fullname.name.split(":");
	5246	+
	5247	+ if (split.length == 0)
	5248	+ {
	5249	+ return "";
	5250	+ }
	5251	+
	5252	+ if (split.length == 1)
	5253	+ {
	5254	+ return "";
	5255	+ }
	5256	+
	5257	+ if (split.length == 2)
	5258	+ {
	5259	+ if (fullname.name.endsWith(":"))
	5260	+ {
	5261	+ // Windows
	5262	+ return "";
	5263	+ }
	5264	+
	5265	+ return split[1];
	5266	+ }
	5267	+
	5268	+ // Windows
	5269	+ assert(split.length == 4);
	5270	+
	5271	+ return split[2] + ":" + split[3];
5176	5272	}
5177	5273
5178	5274	String GetPigmentTexture()
..	..	@@ -5246,7 +5342,7 @@
5246	5342	System.out.print("; textures = " + textures);
5247	5343	System.out.println("; usedtextures = " + usedtextures);
5248	5344
5249		- if (GetTextures() == null)
	5345	+ if (GetTextures() == null) // What is that??
5250	5346	GetTextures().name = ":";
5251	5347
5252	5348	String texname = tex;
..	..	@@ -5277,6 +5373,43 @@
5277	5373	child.ResetPigmentTexture();
5278	5374	blockloop = false;
5279	5375	}
	5376	+ }
	5377	+
	5378	+ UUID GetUUID()
	5379	+ {
	5380	+ if (uuid == null)
	5381	+ {
	5382	+ // Serial
	5383	+ uuid = UUID.randomUUID();
	5384	+ }
	5385	+
	5386	+ return uuid;
	5387	+ }
	5388	+
	5389	+ Object3D GetObject(UUID uid)
	5390	+ {
	5391	+ if (blockloop)
	5392	+ return null;
	5393	+
	5394	+ if (GetUUID().equals(uid))
	5395	+ return this;
	5396	+
	5397	+ int nb = Size();
	5398	+ for (int i = 0; i < nb; i++)
	5399	+ {
	5400	+ Object3D child = (Object3D) get(i);
	5401	+
	5402	+ if (child == null)
	5403	+ continue;
	5404	+
	5405	+ blockloop = true;
	5406	+ Object3D obj = child.GetObject(uid);
	5407	+ blockloop = false;
	5408	+ if (obj != null)
	5409	+ return obj;
	5410	+ }
	5411	+
	5412	+ return null;
5280	5413	}
5281	5414
5282	5415	void SetBumpTexture(String tex)
..	..	@@ -5323,9 +5456,9 @@
5323	5456	boolean NeedSupport()
5324	5457	{
5325	5458	return
5326		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5459	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5327	5460	// PROBLEM with CROWD!!
5328		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5461	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5329	5462	}
5330	5463
5331	5464	static boolean DEBUG_SELECTION = false;
..	..	@@ -5340,7 +5473,7 @@
5340	5473	}
5341	5474
5342	5475	if (display.DrawMode() == iCameraPane.SELECTION &&
5343		- hide)
	5476	+ (hide \|\| dontselect))
5344	5477	return;
5345	5478
5346	5479	if (name != null && name.contains("sclera"))
..	..	@@ -5582,7 +5715,17 @@
5582	5715	tex = GetTextures();
5583	5716	}
5584	5717
5585		- display.BindTextures(tex, texres);
	5718	+ boolean failed = false;
	5719	+
	5720	+ try
	5721	+ {
	5722	+ display.BindTextures(tex, texres);
	5723	+ }
	5724	+ catch (Exception e)
	5725	+ {
	5726	+ System.err.println("FAILED: " + this);
	5727	+ failed = true;
	5728	+ }
5586	5729
5587	5730	if (!compiled)
5588	5731	{
..	..	@@ -5604,7 +5747,8 @@
5604	5747	}
5605	5748	}
5606	5749
5607		- display.ReleaseTextures(tex);
	5750	+ if (!failed)
	5751	+ display.ReleaseTextures(tex);
5608	5752
5609	5753	display.PopMaterial(this, selected);
5610	5754	}
..	..	@@ -5733,6 +5877,9 @@
5733	5877
5734	5878	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5735	5879	{
	5880	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5881	+ return;
	5882	+
5736	5883	if (hide)
5737	5884	return;
5738	5885	// shadow optimisation
..	..	@@ -5858,6 +6005,9 @@
5858	6005	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5859	6006	return; // no shadow for transparent objects
5860	6007
	6008	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6009	+ return;
	6010	+
5861	6011	if (hide)
5862	6012	return;
5863	6013
..	..	@@ -5898,6 +6048,7 @@
5898	6048	return;
5899	6049	}
5900	6050
	6051	+ //bRep.GenUV(1/material.diffuseness);
5901	6052	// bRep.lock = true;
5902	6053
5903	6054	//javax.media.opengl.GL gl = display.GetGL();
..	..	@@ -6840,8 +6991,8 @@
6840	6991	// {
6841	6992	// CameraPane.Ymax = spoth;
6842	6993	// }
6843		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	6994	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	6995	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6845	6996	spot.translate(0, -32);
6846	6997	info.g.setColor(Color.green);
6847	6998	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -6896,7 +7047,7 @@
6896	7047	startX = info.x;
6897	7048	startY = info.y;
6898	7049
6899		- hitSomething = 0;
	7050	+ hitSomething = -1;
6900	7051	cVector origin = new cVector();
6901	7052	//LA.xformPos(origin, toParent, origin);
6902	7053	Rectangle spot = new Rectangle();
..	..	@@ -6929,7 +7080,7 @@
6929	7080	}
6930	7081
6931	7082	//System.out.println("info.modifiers = " + info.modifiers);
6932		- modified = (info.modifiers & CameraPane.META) != 0;
	7083	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
6933	7084	//System.out.println("modified = " + modified);
6934	7085	//new Exception().printStackTrace();
6935	7086	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6957,7 +7108,7 @@
6957	7108	return true;
6958	7109	}
6959	7110
6960		- void doEditDrag0(ClickInfo info)
	7111	+ void doEditDrag0(ClickInfo info, boolean opposite)
6961	7112	{
6962	7113	if (hitSomething == 0)
6963	7114	{
..	..	@@ -6972,6 +7123,7 @@
6972	7123	//System.out.println("hitSomething = " + hitSomething);
6973	7124
6974	7125	double scale = 0.005f * info.camera.Distance();
	7126	+
6975	7127	cVector xlate = new cVector();
6976	7128	//cVector xlate2 = new cVector();
6977	7129	switch (hitSomething)
..	..	@@ -6984,7 +7136,7 @@
6984	7136
6985	7137	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6986	7138
6987		- if (modified)
	7139	+ if (modified \|\| opposite)
6988	7140	{
6989	7141	//assert(false);
6990	7142	/*
..	..	@@ -7078,6 +7230,7 @@
7078	7230
7079	7231	if (modified)
7080	7232	{
	7233	+ // Rotate 90 degrees
7081	7234	angle /= (Math.PI / 4);
7082	7235	angle = Math.floor(angle + 0.5);
7083	7236	angle *= (Math.PI / 4);
..	..	@@ -7119,24 +7272,27 @@
7119	7272
7120	7273	case hitScale: // scale
7121	7274	double hScale = (double) (info.x - centerPt.x) / 32;
	7275	+ double sign = 1;
	7276	+ if (hScale < 0)
	7277	+ {
	7278	+ sign = -1;
	7279	+ }
	7280	+ hScale = signMath.pow(signhScale, scale * 50);
7122	7281	if (hScale < 0.01)
7123	7282	{
7124		- hScale = 0.01;
	7283	+ //hScale = 0.01;
7125	7284	}
7126		- hScale = Math.pow(hScale, scale * 50);
7127		- if (hScale < 0.01)
7128		- {
7129		- hScale = 0.01;
7130		- }
	7285	+
7131	7286	double vScale = (double) (info.y - centerPt.y) / 32;
7132		- if (vScale < 0.01)
	7287	+ sign = 1;
	7288	+ if (vScale < 0)
7133	7289	{
7134		- vScale = 0.01;
	7290	+ sign = -1;
7135	7291	}
7136		- vScale = Math.pow(vScale, scale * 50);
	7292	+ vScale = signMath.pow(signvScale, scale * 50);
7137	7293	if (vScale < 0.01)
7138	7294	{
7139		- vScale = 0.01;
	7295	+ //vScale = 0.01;
7140	7296	}
7141	7297	LA.matCopy(startMat, toParent);
7142	7298	/**/
..	..	@@ -7147,17 +7303,24 @@
7147	7303	}
7148	7304	/**/
7149	7305
	7306	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7307	+
	7308	+ if (totalScale < 0.01)
	7309	+ {
	7310	+ totalScale = 0.01;
	7311	+ }
	7312	+
7150	7313	switch (info.pane.RenderCamera().viewCode)
7151	7314	{
7152	7315	case 3: // '\001'
7153	7316	if (modified)
7154	7317	{
7155	7318	//LA.matScale(toParent, 1, hScale, vScale);
7156		- LA.matScale(toParent, vScale, 1, 1);
	7319	+ LA.matScale(toParent, totalScale, 1, 1);
7157	7320	} // vScale, 1);
7158	7321	else
7159	7322	{
7160		- LA.matScale(toParent, vScale, vScale, vScale);
	7323	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7161	7324	} // vScale, 1);
7162	7325	break;
7163	7326
..	..	@@ -7165,10 +7328,10 @@
7165	7328	if (modified)
7166	7329	{
7167	7330	//LA.matScale(toParent, hScale, 1, vScale);
7168		- LA.matScale(toParent, 1, vScale, 1);
	7331	+ LA.matScale(toParent, 1, totalScale, 1);
7169	7332	} else
7170	7333	{
7171		- LA.matScale(toParent, vScale, 1, vScale);
	7334	+ LA.matScale(toParent, totalScale, 1, totalScale);
7172	7335	}
7173	7336	break;
7174	7337
..	..	@@ -7176,10 +7339,10 @@
7176	7339	if (modified)
7177	7340	{
7178	7341	//LA.matScale(toParent, hScale, vScale, 1);
7179		- LA.matScale(toParent, 1, 1, vScale);
	7342	+ LA.matScale(toParent, 1, 1, totalScale);
7180	7343	} else
7181	7344	{
7182		- LA.matScale(toParent, vScale, vScale, 1);
	7345	+ LA.matScale(toParent, totalScale, totalScale, 1);
7183	7346	}
7184	7347	break;
7185	7348	}
..	..	@@ -7312,14 +7475,22 @@
7312	7475	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7313	7476	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7314	7477	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7478	+
	7479	+ String objname;
	7480	+
7315	7481	if (false) //parent != null)
7316	7482	{
7317		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7483	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7318	7484	} else
7319	7485	{
7320		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7486	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7321	7487	} // + super.toString();
7322	7488	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7489	+
	7490	+ if (!Globals.ADVANCED)
	7491	+ return objname;
	7492	+
	7493	+ return objname + " " + System.identityHashCode(this);
7323	7494	}
7324	7495
7325	7496	public int hashCode()
..	..	@@ -7375,6 +7546,7 @@
7375	7546	objectUI.closeUI();
7376	7547	if (editWindow != null)
7377	7548	{
	7549	+ editWindow.ctrlPanel.FlushUI();
7378	7550	editWindow.refreshContents();
7379	7551	} // ? new
7380	7552	objectUI = null;
..	..	@@ -7510,7 +7682,7 @@
7510	7682	{
7511	7683	assert(bRep != null);
7512	7684	if (!(support instanceof GenericJoint)) // support.bRep != null)
7513		- GrafreeD.Assert(support.bRep == bRep.support);
	7685	+ Grafreed.Assert(support.bRep == bRep.support);
7514	7686	}
7515	7687	else
7516	7688	{
..	..	@@ -7559,9 +7731,9 @@
7559	7731	private static cVector edge2 = new cVector();
7560	7732	//private static cVector norm = new cVector();
7561	7733	/transient private/ int hitSomething;
7562		- private static final int hitCenter = 1;
7563		- private static final int hitScale = 2;
7564		- private static final int hitRotate = 3;
	7734	+ static final int hitCenter = 1;
	7735	+ static final int hitScale = 2;
	7736	+ static final int hitRotate = 3;
7565	7737	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7566	7738	/transient/ private Point centerPt;
7567	7739	/transient/ private int startX;