~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,24 @@
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;
22	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
23	35	ScriptNode scriptnode;
24	36
25	37	void InitOthers()
..	..	@@ -100,64 +112,178 @@
100	112
101	113	// transient boolean reduced; // for morph reduction
102	114
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	117
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
108	120
109		-void SaveSupports()
110		-{
111		- if (blockloop)
112		- return;
113		-
114		- transientsupport = support;
115		- transientlink2master = link2master;
116		-
117		- support = null;
118		- link2master = false;
119		-
120		- if (bRep != null)
	121	+ void SaveSupports()
121	122	{
122		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
123	146	}
124		-
125		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
126	149	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
130	258	blockloop = true;
131		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
132	267	blockloop = false;
133	268	}
134		-}
135	269
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
140		-
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
	270	+ void RestoreBigData(Object3D o)
147	271	{
148		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
149	286	}
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
159		- }
160		-}
161	287
162	288	// MOCAP SUPPORT
163	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +426,8 @@
300	426	}
301	427
302	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
303	431	boolean hide = false;
304	432	boolean link2master = false; // performs reset support/master at each frame
305	433	boolean marked = false; // animation node
..	..	@@ -481,12 +609,14 @@
481	609	toParent = LA.newMatrix();
482	610	fromParent = LA.newMatrix();
483	611	}
	612	+
484	613	if (toParentMarked == null)
485	614	{
486	615	if (maxcount != 1)
487	616	{
488	617	new Exception().printStackTrace();
489	618	}
	619	+
490	620	toParentMarked = LA.newMatrix();
491	621	fromParentMarked = LA.newMatrix();
492	622	}
..	..	@@ -774,7 +904,7 @@
774	904	if (step == 0)
775	905	step = 1;
776	906	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
778	908	// if (acceleration == 0)
779	909	// acceleration = 10;
780	910	if (delay == 0) // serial
..	..	@@ -797,7 +927,7 @@
797	927
798	928	if (marked && Globals.isLIVE() && live &&
799	929	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	931	currentframe != Globals.framecount)
802	932	{
803	933	currentframe = Globals.framecount;
..	..	@@ -809,7 +939,8 @@
809	939
810	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	941
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
813	944	{
814	945	countdown = 1;
815	946	delay = speedup?8:1;
..	..	@@ -881,6 +1012,7 @@
881	1012	if (material == null \|\| material.multiply)
882	1013	return true;
883	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
884	1016	return material.opacity > 0.99;
885	1017	}
886	1018
..	..	@@ -912,6 +1044,11 @@
912	1044	fromParent = null; // LA.newMatrix();
913	1045	bRep = null; // new BoundaryRep();
914	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
915	1052	/*
916	1053	float hue = (float)Math.random();
917	1054	Color col;
..	..	@@ -954,7 +1091,7 @@
954	1091
955	1092	public Object clone()
956	1093	{
957		- return GrafreeD.clone(this);
	1094	+ return Grafreed.clone(this);
958	1095	}
959	1096
960	1097	Object3D copyExpand()
..	..	@@ -1276,6 +1413,7 @@
1276	1413	toParent = LA.newMatrix();
1277	1414	fromParent = LA.newMatrix();
1278	1415	}
	1416	+
1279	1417	LA.matCopy(other.toParent, toParent);
1280	1418	LA.matCopy(other.fromParent, fromParent);
1281	1419
..	..	@@ -1470,7 +1608,7 @@
1470	1608	BoundaryRep.SEUIL = other.material.cameralight;
1471	1609
1472	1610	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1612	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1613	}
1476	1614
..	..	@@ -1729,7 +1867,7 @@
1729	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1868	o.bRep = transientrep;
1731	1869	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1871	o.CreateMaterial();
1734	1872	o.SetAttributes(this, -1);
1735	1873	//parent
..	..	@@ -1742,7 +1880,7 @@
1742	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1881	o.bRep = bRep;
1744	1882	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1884	o.CreateMaterial();
1747	1885	//o.overwriteThis(this, -1);
1748	1886	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1967,15 @@
1829	1967	if (obj.name == null)
1830	1968	continue; // can't be a null one
1831	1969
	1970	+ // Try perfect match first.
1832	1971	if (n.equals(obj.name))
1833	1972	{
1834	1973	theobj = obj;
1835	1974	count++;
1836	1975	}
1837	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1979
1839	1980	if (count != 1)
1840	1981	for (int i=Size(); --i>=0;)
..	..	@@ -2294,12 +2435,17 @@
2294	2435	}
2295	2436	*/
2296	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2297	2442	}
2298	2443
2299	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2300	2445	{
2301	2446	if (newWindow)
2302	2447	{
	2448	+ new Exception().printStackTrace();
2303	2449	System.exit(0);
2304	2450	if (parent != null)
2305	2451	{
..	..	@@ -2334,6 +2480,14 @@
2334	2480	{
2335	2481	editWindow.refreshContents();
2336	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2337	2491	//if (parent != null)
2338	2492	//parent.refreshEditWindow();
2339	2493	}
..	..	@@ -2476,13 +2630,13 @@
2476	2630	return retval;
2477	2631	}
2478	2632
2479		- void doEditDrag(ClickInfo info)
	2633	+ void doEditDrag(ClickInfo info, boolean opposite)
2480	2634	{
2481	2635	switch (doSomething)
2482	2636	{
2483	2637	case 1: // '\001'
2484	2638	//super.
2485		- doEditDrag0(info);
	2639	+ doEditDrag0(info, opposite);
2486	2640	break;
2487	2641
2488	2642	case 2: // '\002'
..	..	@@ -2495,11 +2649,11 @@
2495	2649	{
2496	2650	//sel.hitSomething = childToDrag.hitSomething;
2497	2651	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2652	+ sel.doEditDrag(info, opposite);
2499	2653	} else
2500	2654	{
2501	2655	//super.
2502		- doEditDrag0(info);
	2656	+ doEditDrag0(info, opposite);
2503	2657	}
2504	2658	}
2505	2659	break;
..	..	@@ -2609,6 +2763,18 @@
2609	2763	void GenNormalsS(boolean crease)
2610	2764	{
2611	2765	selection.GenNormals(crease);
	2766	+// for (int i=0; i<selection.size(); i++)
	2767	+// {
	2768	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2769	+// selectee.GenNormals(crease);
	2770	+// }
	2771	+
	2772	+ //Touch();
	2773	+ }
	2774	+
	2775	+ void GenNormalsMeshS()
	2776	+ {
	2777	+ selection.GenNormalsMesh();
2612	2778	// for (int i=0; i<selection.size(); i++)
2613	2779	// {
2614	2780	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2915,24 @@
2749	2915	if (child == null)
2750	2916	continue;
2751	2917	child.GenNormals(crease);
	2918	+// Children().release(i);
	2919	+ }
	2920	+ blockloop = false;
	2921	+ }
	2922	+
	2923	+ void GenNormalsMesh()
	2924	+ {
	2925	+ if (blockloop)
	2926	+ return;
	2927	+
	2928	+ blockloop = true;
	2929	+ GenNormalsMesh0();
	2930	+ for (int i = 0; i < Children().Size(); i++)
	2931	+ {
	2932	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2933	+ if (child == null)
	2934	+ continue;
	2935	+ child.GenNormalsMesh();
2752	2936	// Children().release(i);
2753	2937	}
2754	2938	blockloop = false;
..	..	@@ -2906,7 +3090,8 @@
2906	3090	{
2907	3091	if (bRep != null)
2908	3092	{
2909		- bRep.GenUV();
	3093	+ bRep.GenUV(); //1);
	3094	+ //bRep.UnfoldUV();
2910	3095	Touch();
2911	3096	}
2912	3097	}
..	..	@@ -2920,11 +3105,20 @@
2920	3105	}
2921	3106	}
2922	3107
	3108	+ void GenNormalsMesh0()
	3109	+ {
	3110	+ if (bRep != null)
	3111	+ {
	3112	+ bRep.GenerateNormalsMesh();
	3113	+ Touch();
	3114	+ }
	3115	+ }
	3116	+
2923	3117	void GenNormalsMINE0()
2924	3118	{
2925	3119	if (bRep != null)
2926	3120	{
2927		- bRep.GenerateNormalsMINE();
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2928	3122	Touch();
2929	3123	}
2930	3124	}
..	..	@@ -2981,6 +3175,33 @@
2981	3175	blockloop = false;
2982	3176	}
2983	3177
	3178	+ void TransformChildren()
	3179	+ {
	3180	+ if (toParent != null)
	3181	+ {
	3182	+ for (int i=Size(); --i>=0;)
	3183	+ {
	3184	+ Object3D v = get(i);
	3185	+
	3186	+ if (v.toParent == null)
	3187	+ {
	3188	+ v.toParent = LA.newMatrix();
	3189	+ v.fromParent = LA.newMatrix();
	3190	+ }
	3191	+
	3192	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3193	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3194	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3195	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3196	+ }
	3197	+
	3198	+ toParent = null; // LA.matIdentity(toParent);
	3199	+ fromParent = null; // LA.matIdentity(fromParent);
	3200	+
	3201	+ Touch();
	3202	+ }
	3203	+ }
	3204	+
2984	3205	void TransformGeometry()
2985	3206	{
2986	3207	Object3D obj = this;
..	..	@@ -3202,9 +3423,11 @@
3202	3423
3203	3424	BoundaryRep sup = bRep.support;
3204	3425	bRep.support = null;
3205		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3426	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3206	3427	// bRep.SplitInTwo(onlyone); // thread...
3207		- temprep.SplitInTwo(reduction34, onlyone);
	3428	+
	3429	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3430	+
3208	3431	bRep = temprep;
3209	3432	bRep.support = sup;
3210	3433	Touch();
..	..	@@ -3341,7 +3564,8 @@
3341	3564	if (blockloop)
3342	3565	return;
3343	3566
3344		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3345	3569	live = h;
3346	3570
3347	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3362,7 +3586,8 @@
3362	3586	return;
3363	3587
3364	3588	//if (bRep != null)
3365		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3366	3591	link2master = h;
3367	3592
3368	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3382,7 +3607,8 @@
3382	3607	if (blockloop)
3383	3608	return;
3384	3609
3385		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3386	3612	hide = h;
3387	3613
3388	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3628,7 @@
3402	3628	if (blockloop)
3403	3629	return;
3404	3630
3405		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3406	3632	marked = h;
3407	3633
3408	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3412,6 +3638,46 @@
3412	3638	continue;
3413	3639	blockloop = true;
3414	3640	child.MarkLeaves(h);
	3641	+ blockloop = false;
	3642	+ // release(i);
	3643	+ }
	3644	+ }
	3645	+
	3646	+ void RewindLeaves(boolean h)
	3647	+ {
	3648	+ if (blockloop)
	3649	+ return;
	3650	+
	3651	+ if (bRep != null \|\| material != null) // borderline...
	3652	+ rewind = h;
	3653	+
	3654	+ for (int i = 0; i < Size(); i++)
	3655	+ {
	3656	+ Object3D child = (Object3D) get(i); // reserve(i);
	3657	+ if (child == null)
	3658	+ continue;
	3659	+ blockloop = true;
	3660	+ child.RewindLeaves(h);
	3661	+ blockloop = false;
	3662	+ // release(i);
	3663	+ }
	3664	+ }
	3665	+
	3666	+ void RandomLeaves(boolean h)
	3667	+ {
	3668	+ if (blockloop)
	3669	+ return;
	3670	+
	3671	+ if (bRep != null \|\| material != null) // borderline...
	3672	+ random = h;
	3673	+
	3674	+ for (int i = 0; i < Size(); i++)
	3675	+ {
	3676	+ Object3D child = (Object3D) get(i); // reserve(i);
	3677	+ if (child == null)
	3678	+ continue;
	3679	+ blockloop = true;
	3680	+ child.RandomLeaves(h);
3415	3681	blockloop = false;
3416	3682	// release(i);
3417	3683	}
..	..	@@ -3726,7 +3992,7 @@
3726	3992	if (child == null)
3727	3993	continue;
3728	3994
3729		- if (GrafreeD.RENDERME > 0)
	3995	+ if (Grafreed.RENDERME > 0)
3730	3996	{
3731	3997	if (child instanceof Merge)
3732	3998	((Merge)child).renderme();
..	..	@@ -3877,7 +4143,7 @@
3877	4143	if (child == null)
3878	4144	continue;
3879	4145
3880		- if (GrafreeD.RENDERME > 0)
	4146	+ if (Grafreed.RENDERME > 0)
3881	4147	{
3882	4148	if (child instanceof Merge)
3883	4149	((Merge)child).renderme();
..	..	@@ -4072,7 +4338,7 @@
4072	4338	if (child == null)
4073	4339	continue;
4074	4340
4075		- if (GrafreeD.RENDERME > 0)
	4341	+ if (Grafreed.RENDERME > 0)
4076	4342	{
4077	4343	if (child instanceof Merge)
4078	4344	((Merge)child).renderme();
..	..	@@ -4185,6 +4451,55 @@
4185	4451	{
4186	4452	blockloop = true;
4187	4453	get(i).RepairShadow();
	4454	+ blockloop = false;
	4455	+ }
	4456	+ }
	4457	+
	4458	+ void RepairSOV()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ String texname = this.GetPigmentTexture();
	4464	+
	4465	+ if (texname.startsWith("sov"))
	4466	+ {
	4467	+ String[] s = texname.split("/");
	4468	+
	4469	+ String[] sname = s[1].split("Color.pn");
	4470	+
	4471	+ texname = sname[0];
	4472	+
	4473	+ if (sname.length > 1)
	4474	+ {
	4475	+ texname += "Color.jpg";
	4476	+ }
	4477	+
	4478	+ this.SetPigmentTexture("sov/" + texname);
	4479	+ }
	4480	+
	4481	+ texname = this.GetBumpTexture();
	4482	+
	4483	+ if (texname.startsWith("sov"))
	4484	+ {
	4485	+ String[] s = texname.split("/");
	4486	+
	4487	+ String[] sname = s[1].split("Bump.pn");
	4488	+
	4489	+ texname = sname[0];
	4490	+
	4491	+ if (sname.length > 1)
	4492	+ {
	4493	+ texname += "Bump.jpg";
	4494	+ }
	4495	+
	4496	+ this.SetBumpTexture("sov/" + texname);
	4497	+ }
	4498	+
	4499	+ for (int i=0; i<Size(); i++)
	4500	+ {
	4501	+ blockloop = true;
	4502	+ get(i).RepairSOV();
4188	4503	blockloop = false;
4189	4504	}
4190	4505	}
..	..	@@ -4679,7 +4994,7 @@
4679	4994
4680	4995	cTreePath SelectLeaf(int indexcount, boolean deselect)
4681	4996	{
4682		- if (hide)
	4997	+ if (hide \|\| dontselect)
4683	4998	return null;
4684	4999
4685	5000	if (count <= 0)
..	..	@@ -4703,9 +5018,17 @@
4703	5018	}
4704	5019	}
4705	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4706	5029	cTreePath Select(int indexcount, boolean deselect)
4707	5030	{
4708		- if (hide)
	5031	+ if (hide \|\| dontselect)
4709	5032	return null;
4710	5033
4711	5034	if (count <= 0)
..	..	@@ -4739,10 +5062,11 @@
4739	5062	if (leaf != null)
4740	5063	{
4741	5064	cTreePath tp = new cTreePath(this, leaf);
4742		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4743	5067	{
4744	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4745		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4746	5070	}
4747	5071
4748	5072	return tp;
..	..	@@ -4759,6 +5083,7 @@
4759	5083
4760	5084	if (child == null)
4761	5085	continue;
	5086	+
4762	5087	if (child.HasTransparency() && child.size() != 0)
4763	5088	{
4764	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4768,9 +5093,10 @@
4768	5093	if (leaf != null)
4769	5094	{
4770	5095	cTreePath tp = new cTreePath(this, leaf);
4771		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4772	5098	{
4773		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4774	5100	}
4775	5101
4776	5102	return tp;
..	..	@@ -5095,6 +5421,51 @@
5095	5421	blockloop = false;
5096	5422	}
5097	5423
	5424	+ void ResetSelectable()
	5425	+ {
	5426	+ if (blockloop)
	5427	+ return;
	5428	+
	5429	+ blockloop = true;
	5430	+
	5431	+ keepdontselect = dontselect;
	5432	+ dontselect = true;
	5433	+
	5434	+ Object3D child;
	5435	+ int nb = Size();
	5436	+ for (int i = 0; i < nb; i++)
	5437	+ {
	5438	+ child = (Object3D) get(i);
	5439	+ if (child == null)
	5440	+ continue;
	5441	+ child.ResetSelectable();
	5442	+ }
	5443	+
	5444	+ blockloop = false;
	5445	+ }
	5446	+
	5447	+ void RestoreSelectable()
	5448	+ {
	5449	+ if (blockloop)
	5450	+ return;
	5451	+
	5452	+ blockloop = true;
	5453	+
	5454	+ dontselect = keepdontselect;
	5455	+
	5456	+ Object3D child;
	5457	+ int nb = Size();
	5458	+ for (int i = 0; i < nb; i++)
	5459	+ {
	5460	+ child = (Object3D) get(i);
	5461	+ if (child == null)
	5462	+ continue;
	5463	+ child.RestoreSelectable();
	5464	+ }
	5465	+
	5466	+ blockloop = false;
	5467	+ }
	5468	+
5098	5469	boolean IsSelected()
5099	5470	{
5100	5471	if (parent == null)
..	..	@@ -5157,10 +5528,34 @@
5157	5528
5158	5529	// System.out.println("Fullname = " + fullname);
5159	5530
5160		- if (fullname.name.indexOf(":") == -1)
5161		- return fullname.name;
	5531	+ // Does not work on Windows due to C:
	5532	+// if (fullname.name.indexOf(":") == -1)
	5533	+// return fullname.name;
	5534	+//
	5535	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5162	5536
5163		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5537	+ String[] split = fullname.name.split(":");
	5538	+
	5539	+ if (split.length == 0)
	5540	+ {
	5541	+ return "";
	5542	+ }
	5543	+
	5544	+ if (split.length <= 2)
	5545	+ {
	5546	+ if (fullname.name.endsWith(":"))
	5547	+ {
	5548	+ // Windows
	5549	+ return fullname.name.substring(0, fullname.name.length()-1);
	5550	+ }
	5551	+
	5552	+ return split[0];
	5553	+ }
	5554	+
	5555	+ // Windows
	5556	+ assert(split.length == 4);
	5557	+
	5558	+ return split[0] + ":" + split[1];
5164	5559	}
5165	5560
5166	5561	static String GetBump(cTexture fullname)
..	..	@@ -5169,10 +5564,38 @@
5169	5564	return "";
5170	5565
5171	5566	// 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());
	5567	+ // Does not work on Windows due to C:
	5568	+// if (fullname.name.indexOf(":") == -1)
	5569	+// return "";
	5570	+//
	5571	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5572	+ String[] split = fullname.name.split(":");
	5573	+
	5574	+ if (split.length == 0)
	5575	+ {
	5576	+ return "";
	5577	+ }
	5578	+
	5579	+ if (split.length == 1)
	5580	+ {
	5581	+ return "";
	5582	+ }
	5583	+
	5584	+ if (split.length == 2)
	5585	+ {
	5586	+ if (fullname.name.endsWith(":"))
	5587	+ {
	5588	+ // Windows
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ return split[1];
	5593	+ }
	5594	+
	5595	+ // Windows
	5596	+ assert(split.length == 4);
	5597	+
	5598	+ return split[2] + ":" + split[3];
5176	5599	}
5177	5600
5178	5601	String GetPigmentTexture()
..	..	@@ -5246,7 +5669,7 @@
5246	5669	System.out.print("; textures = " + textures);
5247	5670	System.out.println("; usedtextures = " + usedtextures);
5248	5671
5249		- if (GetTextures() == null)
	5672	+ if (GetTextures() == null) // What is that??
5250	5673	GetTextures().name = ":";
5251	5674
5252	5675	String texname = tex;
..	..	@@ -5277,6 +5700,43 @@
5277	5700	child.ResetPigmentTexture();
5278	5701	blockloop = false;
5279	5702	}
	5703	+ }
	5704	+
	5705	+ UUID GetUUID()
	5706	+ {
	5707	+ if (uuid == null)
	5708	+ {
	5709	+ // Serial
	5710	+ uuid = UUID.randomUUID();
	5711	+ }
	5712	+
	5713	+ return uuid;
	5714	+ }
	5715	+
	5716	+ Object3D GetObject(UUID uid)
	5717	+ {
	5718	+ if (blockloop)
	5719	+ return null;
	5720	+
	5721	+ if (GetUUID().equals(uid))
	5722	+ return this;
	5723	+
	5724	+ int nb = Size();
	5725	+ for (int i = 0; i < nb; i++)
	5726	+ {
	5727	+ Object3D child = (Object3D) get(i);
	5728	+
	5729	+ if (child == null)
	5730	+ continue;
	5731	+
	5732	+ blockloop = true;
	5733	+ Object3D obj = child.GetObject(uid);
	5734	+ blockloop = false;
	5735	+ if (obj != null)
	5736	+ return obj;
	5737	+ }
	5738	+
	5739	+ return null;
5280	5740	}
5281	5741
5282	5742	void SetBumpTexture(String tex)
..	..	@@ -5315,6 +5775,38 @@
5315	5775	}
5316	5776	}
5317	5777
	5778	+ void EmbedTextures(boolean embed)
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ //if (GetTextures() != null)
	5784	+ if (embed)
	5785	+ CameraPane.EmbedTextures(GetTextures());
	5786	+ else
	5787	+ {
	5788	+ GetTextures().pigmentdata = null;
	5789	+ GetTextures().bumpdata = null;
	5790	+ GetTextures().pw = 0;
	5791	+ GetTextures().ph = 0;
	5792	+ GetTextures().bw = 0;
	5793	+ GetTextures().bh = 0;
	5794	+ }
	5795	+
	5796	+ int nb = Size();
	5797	+ for (int i = 0; i < nb; i++)
	5798	+ {
	5799	+ Object3D child = (Object3D) get(i);
	5800	+
	5801	+ if (child == null)
	5802	+ continue;
	5803	+
	5804	+ blockloop = true;
	5805	+ child.EmbedTextures(embed);
	5806	+ blockloop = false;
	5807	+ }
	5808	+ }
	5809	+
5318	5810	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5319	5811	{
5320	5812	Draw(display, root, selected, blocked);
..	..	@@ -5323,12 +5815,23 @@
5323	5815	boolean NeedSupport()
5324	5816	{
5325	5817	return
5326		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5818	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5327	5819	// PROBLEM with CROWD!!
5328		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5820	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5329	5821	}
5330	5822
5331	5823	static boolean DEBUG_SELECTION = false;
	5824	+
	5825	+ boolean IsLive()
	5826	+ {
	5827	+ if (live)
	5828	+ return true;
	5829	+
	5830	+ if (parent == null)
	5831	+ return false;
	5832	+
	5833	+ return parent.IsLive();
	5834	+ }
5332	5835
5333	5836	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5334	5837	{
..	..	@@ -5340,7 +5843,7 @@
5340	5843	}
5341	5844
5342	5845	if (display.DrawMode() == iCameraPane.SELECTION &&
5343		- hide)
	5846	+ (hide \|\| dontselect))
5344	5847	return;
5345	5848
5346	5849	if (name != null && name.contains("sclera"))
..	..	@@ -5391,7 +5894,7 @@
5391	5894	support = support;
5392	5895
5393	5896	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5897	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395	5898
5396	5899	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5397	5900	{
..	..	@@ -5411,10 +5914,12 @@
5411	5914	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5412	5915
5413	5916	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5414		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5917	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5918	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5415	5919	{
5416	5920	Globals.lighttouched = true;
5417	5921	} // all panes...
	5922	+
5418	5923	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5419	5924	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5420	5925	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5542,6 +6047,7 @@
5542	6047	if (GetBRep() != null)
5543	6048	{
5544	6049	display.NextIndex();
	6050	+
5545	6051	// vertex color conflict : gl.glCallList(list);
5546	6052	DrawNode(display, root, selected);
5547	6053	if (this instanceof BezierPatch)
..	..	@@ -5582,7 +6088,28 @@
5582	6088	tex = GetTextures();
5583	6089	}
5584	6090
5585		- display.BindTextures(tex, texres);
	6091	+ boolean failedPigment = false;
	6092	+ boolean failedBump = false;
	6093	+
	6094	+ try
	6095	+ {
	6096	+ display.BindPigmentTexture(tex, texres);
	6097	+ }
	6098	+ catch (Exception e)
	6099	+ {
	6100	+ System.err.println("FAILED: " + this);
	6101	+ failedPigment = true;
	6102	+ }
	6103	+
	6104	+ try
	6105	+ {
	6106	+ display.BindBumpTexture(tex, texres);
	6107	+ }
	6108	+ catch (Exception e)
	6109	+ {
	6110	+ //System.err.println("FAILED: " + this);
	6111	+ failedBump = true;
	6112	+ }
5586	6113
5587	6114	if (!compiled)
5588	6115	{
..	..	@@ -5604,7 +6131,11 @@
5604	6131	}
5605	6132	}
5606	6133
5607		- display.ReleaseTextures(tex);
	6134	+ if (!failedBump)
	6135	+ display.ReleaseBumpTexture(tex);
	6136	+
	6137	+ if (!failedPigment)
	6138	+ display.ReleasePigmentTexture(tex);
5608	6139
5609	6140	display.PopMaterial(this, selected);
5610	6141	}
..	..	@@ -5733,6 +6264,9 @@
5733	6264
5734	6265	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5735	6266	{
	6267	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6268	+ return;
	6269	+
5736	6270	if (hide)
5737	6271	return;
5738	6272	// shadow optimisation
..	..	@@ -5858,6 +6392,9 @@
5858	6392	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5859	6393	return; // no shadow for transparent objects
5860	6394
	6395	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6396	+ return;
	6397	+
5861	6398	if (hide)
5862	6399	return;
5863	6400
..	..	@@ -5898,6 +6435,7 @@
5898	6435	return;
5899	6436	}
5900	6437
	6438	+ //bRep.GenUV(1/material.diffuseness);
5901	6439	// bRep.lock = true;
5902	6440
5903	6441	//javax.media.opengl.GL gl = display.GetGL();
..	..	@@ -5970,6 +6508,11 @@
5970	6508	// dec 2012
5971	6509	new Exception().printStackTrace();
5972	6510	return;
	6511	+ }
	6512	+
	6513	+ if (dontselect)
	6514	+ {
	6515	+ //bRep.GenerateNormalsMINE();
5973	6516	}
5974	6517
5975	6518	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6822,7 +7365,7 @@
6822	7365	spot.translate(32, 32);
6823	7366	spotw = spot.x + spot.width;
6824	7367	spoth = spot.y + spot.height;
6825		- info.g.setColor(Color.blue);
	7368	+ info.g.setColor(Color.cyan);
6826	7369	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6827	7370	// if (CameraPane.Xmin > spot.x)
6828	7371	// {
..	..	@@ -6840,11 +7383,12 @@
6840	7383	// {
6841	7384	// CameraPane.Ymax = spoth;
6842	7385	// }
6843		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7386	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7387	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6845	7388	spot.translate(0, -32);
6846		- info.g.setColor(Color.green);
	7389	+ info.g.setColor(Color.yellow);
6847	7390	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7391	+ info.g.setColor(Color.green);
6848	7392	// if (CameraPane.Xmin > spot.x)
6849	7393	// {
6850	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -6861,8 +7405,8 @@
6861	7405	// {
6862	7406	// CameraPane.Ymax = spoth;
6863	7407	// }
6864		- info.g.drawArc(boundary.x, boundary.y,
6865		- boundary.width, boundary.height, 0, 360);
	7408	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7409	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
6866	7410	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6867	7411	// if (CameraPane.Xmin > boundary.x)
6868	7412	// {
..	..	@@ -6896,7 +7440,7 @@
6896	7440	startX = info.x;
6897	7441	startY = info.y;
6898	7442
6899		- hitSomething = 0;
	7443	+ hitSomething = -1;
6900	7444	cVector origin = new cVector();
6901	7445	//LA.xformPos(origin, toParent, origin);
6902	7446	Rectangle spot = new Rectangle();
..	..	@@ -6929,7 +7473,7 @@
6929	7473	}
6930	7474
6931	7475	//System.out.println("info.modifiers = " + info.modifiers);
6932		- modified = (info.modifiers & CameraPane.META) != 0;
	7476	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
6933	7477	//System.out.println("modified = " + modified);
6934	7478	//new Exception().printStackTrace();
6935	7479	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6957,7 +7501,7 @@
6957	7501	return true;
6958	7502	}
6959	7503
6960		- void doEditDrag0(ClickInfo info)
	7504	+ void doEditDrag0(ClickInfo info, boolean opposite)
6961	7505	{
6962	7506	if (hitSomething == 0)
6963	7507	{
..	..	@@ -6972,6 +7516,7 @@
6972	7516	//System.out.println("hitSomething = " + hitSomething);
6973	7517
6974	7518	double scale = 0.005f * info.camera.Distance();
	7519	+
6975	7520	cVector xlate = new cVector();
6976	7521	//cVector xlate2 = new cVector();
6977	7522	switch (hitSomething)
..	..	@@ -6984,7 +7529,7 @@
6984	7529
6985	7530	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6986	7531
6987		- if (modified)
	7532	+ if (modified \|\| opposite)
6988	7533	{
6989	7534	//assert(false);
6990	7535	/*
..	..	@@ -7078,6 +7623,7 @@
7078	7623
7079	7624	if (modified)
7080	7625	{
	7626	+ // Rotate 90 degrees
7081	7627	angle /= (Math.PI / 4);
7082	7628	angle = Math.floor(angle + 0.5);
7083	7629	angle *= (Math.PI / 4);
..	..	@@ -7119,24 +7665,27 @@
7119	7665
7120	7666	case hitScale: // scale
7121	7667	double hScale = (double) (info.x - centerPt.x) / 32;
	7668	+ double sign = 1;
	7669	+ if (hScale < 0)
	7670	+ {
	7671	+ sign = -1;
	7672	+ }
	7673	+ hScale = signMath.pow(signhScale, scale * 50);
7122	7674	if (hScale < 0.01)
7123	7675	{
7124		- hScale = 0.01;
	7676	+ //hScale = 0.01;
7125	7677	}
7126		- hScale = Math.pow(hScale, scale * 50);
7127		- if (hScale < 0.01)
7128		- {
7129		- hScale = 0.01;
7130		- }
	7678	+
7131	7679	double vScale = (double) (info.y - centerPt.y) / 32;
7132		- if (vScale < 0.01)
	7680	+ sign = 1;
	7681	+ if (vScale < 0)
7133	7682	{
7134		- vScale = 0.01;
	7683	+ sign = -1;
7135	7684	}
7136		- vScale = Math.pow(vScale, scale * 50);
	7685	+ vScale = signMath.pow(signvScale, scale * 50);
7137	7686	if (vScale < 0.01)
7138	7687	{
7139		- vScale = 0.01;
	7688	+ //vScale = 0.01;
7140	7689	}
7141	7690	LA.matCopy(startMat, toParent);
7142	7691	/**/
..	..	@@ -7147,39 +7696,47 @@
7147	7696	}
7148	7697	/**/
7149	7698
	7699	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7700	+
	7701	+ if (totalScale < 0.01)
	7702	+ {
	7703	+ totalScale = 0.01;
	7704	+ }
	7705	+
7150	7706	switch (info.pane.RenderCamera().viewCode)
7151	7707	{
7152	7708	case 3: // '\001'
7153		- if (modified)
	7709	+ if (modified \|\| opposite)
7154	7710	{
7155	7711	//LA.matScale(toParent, 1, hScale, vScale);
7156		- LA.matScale(toParent, vScale, 1, 1);
	7712	+ LA.matScale(toParent, totalScale, 1, 1);
7157	7713	} // vScale, 1);
7158	7714	else
7159	7715	{
7160		- LA.matScale(toParent, vScale, vScale, vScale);
	7716	+ // EXCEPTION!
	7717	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7161	7718	} // vScale, 1);
7162	7719	break;
7163	7720
7164	7721	case 2: // '\002'
7165		- if (modified)
	7722	+ if (modified \|\| opposite)
7166	7723	{
7167	7724	//LA.matScale(toParent, hScale, 1, vScale);
7168		- LA.matScale(toParent, 1, vScale, 1);
	7725	+ LA.matScale(toParent, 1, totalScale, 1);
7169	7726	} else
7170	7727	{
7171		- LA.matScale(toParent, vScale, 1, vScale);
	7728	+ LA.matScale(toParent, totalScale, 1, totalScale);
7172	7729	}
7173	7730	break;
7174	7731
7175	7732	case 1: // '\003'
7176		- if (modified)
	7733	+ if (modified \|\| opposite)
7177	7734	{
7178	7735	//LA.matScale(toParent, hScale, vScale, 1);
7179		- LA.matScale(toParent, 1, 1, vScale);
	7736	+ LA.matScale(toParent, 1, 1, totalScale);
7180	7737	} else
7181	7738	{
7182		- LA.matScale(toParent, vScale, vScale, 1);
	7739	+ LA.matScale(toParent, totalScale, totalScale, 1);
7183	7740	}
7184	7741	break;
7185	7742	}
..	..	@@ -7312,14 +7869,22 @@
7312	7869	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7313	7870	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7314	7871	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7872	+
	7873	+ String objname;
	7874	+
7315	7875	if (false) //parent != null)
7316	7876	{
7317		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7877	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7318	7878	} else
7319	7879	{
7320		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7880	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7321	7881	} // + super.toString();
7322	7882	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7883	+
	7884	+ if (!Globals.ADVANCED)
	7885	+ return objname;
	7886	+
	7887	+ return objname + " " + System.identityHashCode(this);
7323	7888	}
7324	7889
7325	7890	public int hashCode()
..	..	@@ -7375,6 +7940,7 @@
7375	7940	objectUI.closeUI();
7376	7941	if (editWindow != null)
7377	7942	{
	7943	+ editWindow.ctrlPanel.FlushUI();
7378	7944	editWindow.refreshContents();
7379	7945	} // ? new
7380	7946	objectUI = null;
..	..	@@ -7383,6 +7949,10 @@
7383	7949	{
7384	7950	editWindow = null;
7385	7951	} // ?
	7952	+ }
	7953	+ else
	7954	+ {
	7955	+ //editWindow.closeUI();
7386	7956	}
7387	7957	}
7388	7958
..	..	@@ -7395,7 +7965,7 @@
7395	7965	/transient/ cVector2[] projectedVertices = new cVector2[0];
7396	7966
7397	7967	Object3D /Composite/ parent;
7398		- Object3D /Composite/ fileparent;
	7968	+ Object3D /Composite/ fileparent; // In the case of FileObject
7399	7969
7400	7970	double[][] toParent; // dynamic matrix
7401	7971	double[][] fromParent;
..	..	@@ -7510,7 +8080,7 @@
7510	8080	{
7511	8081	assert(bRep != null);
7512	8082	if (!(support instanceof GenericJoint)) // support.bRep != null)
7513		- GrafreeD.Assert(support.bRep == bRep.support);
	8083	+ Grafreed.Assert(support.bRep == bRep.support);
7514	8084	}
7515	8085	else
7516	8086	{
..	..	@@ -7541,6 +8111,10 @@
7541	8111	}
7542	8112
7543	8113	transient ObjEditor editWindow;
	8114	+ transient ObjEditor manipWindow;
	8115	+
	8116	+ transient boolean pinned;
	8117	+
7544	8118	transient ObjectUI objectUI;
7545	8119	public static int povDepth = 0;
7546	8120	private static cVector tbMin = new cVector();
..	..	@@ -7559,9 +8133,9 @@
7559	8133	private static cVector edge2 = new cVector();
7560	8134	//private static cVector norm = new cVector();
7561	8135	/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;
	8136	+ static final int hitCenter = 1;
	8137	+ static final int hitScale = 2;
	8138	+ static final int hitRotate = 3;
7565	8139	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7566	8140	/transient/ private Point centerPt;
7567	8141	/transient/ private int startX;