~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[] = new byte[100][];
	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,7 @@
300	426	}
301	427
302	428	boolean live = false;
	429	+ boolean dontselect = false;
303	430	boolean hide = false;
304	431	boolean link2master = false; // performs reset support/master at each frame
305	432	boolean marked = false; // animation node
..	..	@@ -481,12 +608,14 @@
481	608	toParent = LA.newMatrix();
482	609	fromParent = LA.newMatrix();
483	610	}
	611	+
484	612	if (toParentMarked == null)
485	613	{
486	614	if (maxcount != 1)
487	615	{
488	616	new Exception().printStackTrace();
489	617	}
	618	+
490	619	toParentMarked = LA.newMatrix();
491	620	fromParentMarked = LA.newMatrix();
492	621	}
..	..	@@ -774,7 +903,7 @@
774	903	if (step == 0)
775	904	step = 1;
776	905	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	906	+ maxcount = 128; // 2048; // 4;
778	907	// if (acceleration == 0)
779	908	// acceleration = 10;
780	909	if (delay == 0) // serial
..	..	@@ -797,7 +926,7 @@
797	926
798	927	if (marked && Globals.isLIVE() && live &&
799	928	//TEMP21aug2018
800		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	929	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	930	currentframe != Globals.framecount)
802	931	{
803	932	currentframe = Globals.framecount;
..	..	@@ -809,7 +938,8 @@
809	938
810	939	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	940
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	941	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	942	+ (step == 1 && changedir))
813	943	{
814	944	countdown = 1;
815	945	delay = speedup?8:1;
..	..	@@ -881,6 +1011,7 @@
881	1011	if (material == null \|\| material.multiply)
882	1012	return true;
883	1013
	1014	+ // Transparent objects are dynamic because we have to sort the triangles.
884	1015	return material.opacity > 0.99;
885	1016	}
886	1017
..	..	@@ -1281,6 +1412,7 @@
1281	1412	toParent = LA.newMatrix();
1282	1413	fromParent = LA.newMatrix();
1283	1414	}
	1415	+
1284	1416	LA.matCopy(other.toParent, toParent);
1285	1417	LA.matCopy(other.fromParent, fromParent);
1286	1418
..	..	@@ -1834,12 +1966,15 @@
1834	1966	if (obj.name == null)
1835	1967	continue; // can't be a null one
1836	1968
	1969	+ // Try perfect match first.
1837	1970	if (n.equals(obj.name))
1838	1971	{
1839	1972	theobj = obj;
1840	1973	count++;
1841	1974	}
1842	1975	}
	1976	+
	1977	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1843	1978
1844	1979	if (count != 1)
1845	1980	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2434,10 @@
2299	2434	}
2300	2435	*/
2301	2436	}
	2437	+ else
	2438	+ {
	2439	+ //((ObjEditor)editWindow).SetupUI2(null);
	2440	+ }
2302	2441	}
2303	2442
2304	2443	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2340,6 +2479,14 @@
2340	2479	{
2341	2480	editWindow.refreshContents();
2342	2481	}
	2482	+ else
	2483	+ {
	2484	+ if (manipWindow != null)
	2485	+ {
	2486	+ manipWindow.refreshContents();
	2487	+ }
	2488	+ }
	2489	+
2343	2490	//if (parent != null)
2344	2491	//parent.refreshEditWindow();
2345	2492	}
..	..	@@ -2624,6 +2771,18 @@
2624	2771	//Touch();
2625	2772	}
2626	2773
	2774	+ void GenNormalsMeshS()
	2775	+ {
	2776	+ selection.GenNormalsMesh();
	2777	+// for (int i=0; i<selection.size(); i++)
	2778	+// {
	2779	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2780	+// selectee.GenNormals(crease);
	2781	+// }
	2782	+
	2783	+ //Touch();
	2784	+ }
	2785	+
2627	2786	void ClearColorsS()
2628	2787	{
2629	2788	selection.ClearColors();
..	..	@@ -2755,6 +2914,24 @@
2755	2914	if (child == null)
2756	2915	continue;
2757	2916	child.GenNormals(crease);
	2917	+// Children().release(i);
	2918	+ }
	2919	+ blockloop = false;
	2920	+ }
	2921	+
	2922	+ void GenNormalsMesh()
	2923	+ {
	2924	+ if (blockloop)
	2925	+ return;
	2926	+
	2927	+ blockloop = true;
	2928	+ GenNormalsMesh0();
	2929	+ for (int i = 0; i < Children().Size(); i++)
	2930	+ {
	2931	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2932	+ if (child == null)
	2933	+ continue;
	2934	+ child.GenNormalsMesh();
2758	2935	// Children().release(i);
2759	2936	}
2760	2937	blockloop = false;
..	..	@@ -2927,11 +3104,20 @@
2927	3104	}
2928	3105	}
2929	3106
	3107	+ void GenNormalsMesh0()
	3108	+ {
	3109	+ if (bRep != null)
	3110	+ {
	3111	+ bRep.GenerateNormalsMesh();
	3112	+ Touch();
	3113	+ }
	3114	+ }
	3115	+
2930	3116	void GenNormalsMINE0()
2931	3117	{
2932	3118	if (bRep != null)
2933	3119	{
2934		- bRep.GenerateNormalsMINE();
	3120	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2935	3121	Touch();
2936	3122	}
2937	3123	}
..	..	@@ -3002,8 +3188,10 @@
3002	3188	v.fromParent = LA.newMatrix();
3003	3189	}
3004	3190
3005		- LA.matConcat(v.toParent, toParent, v.toParent);
3006		- LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3191	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3192	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3193	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3194	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3007	3195	}
3008	3196
3009	3197	toParent = null; // LA.matIdentity(toParent);
..	..	@@ -3236,7 +3424,9 @@
3236	3424	bRep.support = null;
3237	3425	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3238	3426	// bRep.SplitInTwo(onlyone); // thread...
3239		- temprep.SplitInTwo(reduction34, onlyone);
	3427	+
	3428	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3429	+
3240	3430	bRep = temprep;
3241	3431	bRep.support = sup;
3242	3432	Touch();
..	..	@@ -3373,7 +3563,8 @@
3373	3563	if (blockloop)
3374	3564	return;
3375	3565
3376		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3566	+ if (//marked \|\| // does not make sense
	3567	+ (bRep != null \|\| material != null)) // borderline...
3377	3568	live = h;
3378	3569
3379	3570	for (int i = 0; i < Size(); i++)
..	..	@@ -3394,7 +3585,8 @@
3394	3585	return;
3395	3586
3396	3587	//if (bRep != null)
3397		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3588	+ if (//marked \|\| // does not make sense
	3589	+ (bRep != null \|\| material != null)) // borderline...
3398	3590	link2master = h;
3399	3591
3400	3592	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,7 +3606,8 @@
3414	3606	if (blockloop)
3415	3607	return;
3416	3608
3417		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3609	+ if (//marked \|\| // does not make sense
	3610	+ (bRep != null \|\| material != null)) // borderline...
3418	3611	hide = h;
3419	3612
3420	3613	for (int i = 0; i < Size(); i++)
..	..	@@ -3434,7 +3627,7 @@
3434	3627	if (blockloop)
3435	3628	return;
3436	3629
3437		- if (bRep != null && material != null) // borderline...
	3630	+ if (bRep != null \|\| material != null) // borderline...
3438	3631	marked = h;
3439	3632
3440	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3444,6 +3637,46 @@
3444	3637	continue;
3445	3638	blockloop = true;
3446	3639	child.MarkLeaves(h);
	3640	+ blockloop = false;
	3641	+ // release(i);
	3642	+ }
	3643	+ }
	3644	+
	3645	+ void RewindLeaves(boolean h)
	3646	+ {
	3647	+ if (blockloop)
	3648	+ return;
	3649	+
	3650	+ if (bRep != null \|\| material != null) // borderline...
	3651	+ rewind = h;
	3652	+
	3653	+ for (int i = 0; i < Size(); i++)
	3654	+ {
	3655	+ Object3D child = (Object3D) get(i); // reserve(i);
	3656	+ if (child == null)
	3657	+ continue;
	3658	+ blockloop = true;
	3659	+ child.RewindLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RandomLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ random = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RandomLeaves(h);
3447	3680	blockloop = false;
3448	3681	// release(i);
3449	3682	}
..	..	@@ -4221,6 +4454,55 @@
4221	4454	}
4222	4455	}
4223	4456
	4457	+ void RepairSOV()
	4458	+ {
	4459	+ if (blockloop)
	4460	+ return;
	4461	+
	4462	+ String texname = this.GetPigmentTexture();
	4463	+
	4464	+ if (texname.startsWith("sov"))
	4465	+ {
	4466	+ String[] s = texname.split("/");
	4467	+
	4468	+ String[] sname = s[1].split("Color.pn");
	4469	+
	4470	+ texname = sname[0];
	4471	+
	4472	+ if (sname.length > 1)
	4473	+ {
	4474	+ texname += "Color.jpg";
	4475	+ }
	4476	+
	4477	+ this.SetPigmentTexture("sov/" + texname);
	4478	+ }
	4479	+
	4480	+ texname = this.GetBumpTexture();
	4481	+
	4482	+ if (texname.startsWith("sov"))
	4483	+ {
	4484	+ String[] s = texname.split("/");
	4485	+
	4486	+ String[] sname = s[1].split("Bump.pn");
	4487	+
	4488	+ texname = sname[0];
	4489	+
	4490	+ if (sname.length > 1)
	4491	+ {
	4492	+ texname += "Bump.jpg";
	4493	+ }
	4494	+
	4495	+ this.SetBumpTexture("sov/" + texname);
	4496	+ }
	4497	+
	4498	+ for (int i=0; i<Size(); i++)
	4499	+ {
	4500	+ blockloop = true;
	4501	+ get(i).RepairSOV();
	4502	+ blockloop = false;
	4503	+ }
	4504	+ }
	4505	+
4224	4506	void RepairTexture()
4225	4507	{
4226	4508	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4711,7 +4993,7 @@
4711	4993
4712	4994	cTreePath SelectLeaf(int indexcount, boolean deselect)
4713	4995	{
4714		- if (hide)
	4996	+ if (hide \|\| dontselect)
4715	4997	return null;
4716	4998
4717	4999	if (count <= 0)
..	..	@@ -4735,9 +5017,17 @@
4735	5017	}
4736	5018	}
4737	5019
	5020	+ ObjEditor GetWindow()
	5021	+ {
	5022	+ if (editWindow != null)
	5023	+ return editWindow;
	5024	+
	5025	+ return manipWindow;
	5026	+ }
	5027	+
4738	5028	cTreePath Select(int indexcount, boolean deselect)
4739	5029	{
4740		- if (hide)
	5030	+ if (hide \|\| dontselect)
4741	5031	return null;
4742	5032
4743	5033	if (count <= 0)
..	..	@@ -4771,10 +5061,11 @@
4771	5061	if (leaf != null)
4772	5062	{
4773	5063	cTreePath tp = new cTreePath(this, leaf);
4774		- if (editWindow != null)
	5064	+ ObjEditor window = GetWindow();
	5065	+ if (window != null)
4775	5066	{
4776	5067	//System.out.println("editWindow = " + editWindow + " vs " + this);
4777		- editWindow.Select(tp, deselect, true);
	5068	+ window.Select(tp, deselect, true);
4778	5069	}
4779	5070
4780	5071	return tp;
..	..	@@ -4791,6 +5082,7 @@
4791	5082
4792	5083	if (child == null)
4793	5084	continue;
	5085	+
4794	5086	if (child.HasTransparency() && child.size() != 0)
4795	5087	{
4796	5088	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4800,9 +5092,10 @@
4800	5092	if (leaf != null)
4801	5093	{
4802	5094	cTreePath tp = new cTreePath(this, leaf);
4803		- if (editWindow != null)
	5095	+ ObjEditor window = GetWindow();
	5096	+ if (window != null)
4804	5097	{
4805		- editWindow.Select(tp, deselect, true);
	5098	+ window.Select(tp, deselect, true);
4806	5099	}
4807	5100
4808	5101	return tp;
..	..	@@ -5363,6 +5656,43 @@
5363	5656	}
5364	5657	}
5365	5658
	5659	+ UUID GetUUID()
	5660	+ {
	5661	+ if (uuid == null)
	5662	+ {
	5663	+ // Serial
	5664	+ uuid = UUID.randomUUID();
	5665	+ }
	5666	+
	5667	+ return uuid;
	5668	+ }
	5669	+
	5670	+ Object3D GetObject(UUID uid)
	5671	+ {
	5672	+ if (blockloop)
	5673	+ return null;
	5674	+
	5675	+ if (GetUUID().equals(uid))
	5676	+ return this;
	5677	+
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ Object3D child = (Object3D) get(i);
	5682	+
	5683	+ if (child == null)
	5684	+ continue;
	5685	+
	5686	+ blockloop = true;
	5687	+ Object3D obj = child.GetObject(uid);
	5688	+ blockloop = false;
	5689	+ if (obj != null)
	5690	+ return obj;
	5691	+ }
	5692	+
	5693	+ return null;
	5694	+ }
	5695	+
5366	5696	void SetBumpTexture(String tex)
5367	5697	{
5368	5698	if (GetTextures() == null)
..	..	@@ -5407,12 +5737,23 @@
5407	5737	boolean NeedSupport()
5408	5738	{
5409	5739	return
5410		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5740	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5411	5741	// PROBLEM with CROWD!!
5412	5742	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5413	5743	}
5414	5744
5415	5745	static boolean DEBUG_SELECTION = false;
	5746	+
	5747	+ boolean IsLive()
	5748	+ {
	5749	+ if (live)
	5750	+ return true;
	5751	+
	5752	+ if (parent == null)
	5753	+ return false;
	5754	+
	5755	+ return parent.IsLive();
	5756	+ }
5416	5757
5417	5758	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5418	5759	{
..	..	@@ -5424,7 +5765,7 @@
5424	5765	}
5425	5766
5426	5767	if (display.DrawMode() == iCameraPane.SELECTION &&
5427		- hide)
	5768	+ (hide \|\| dontselect))
5428	5769	return;
5429	5770
5430	5771	if (name != null && name.contains("sclera"))
..	..	@@ -5475,7 +5816,7 @@
5475	5816	support = support;
5476	5817
5477	5818	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5478		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5819	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5479	5820
5480	5821	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5481	5822	{
..	..	@@ -5495,10 +5836,12 @@
5495	5836	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5496	5837
5497	5838	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5498		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5839	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5840	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5499	5841	{
5500	5842	Globals.lighttouched = true;
5501	5843	} // all panes...
	5844	+
5502	5845	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5503	5846	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5504	5847	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5626,6 +5969,7 @@
5626	5969	if (GetBRep() != null)
5627	5970	{
5628	5971	display.NextIndex();
	5972	+
5629	5973	// vertex color conflict : gl.glCallList(list);
5630	5974	DrawNode(display, root, selected);
5631	5975	if (this instanceof BezierPatch)
..	..	@@ -5666,7 +6010,28 @@
5666	6010	tex = GetTextures();
5667	6011	}
5668	6012
5669		- display.BindTextures(tex, texres);
	6013	+ boolean failedPigment = false;
	6014	+ boolean failedBump = false;
	6015	+
	6016	+ try
	6017	+ {
	6018	+ display.BindPigmentTexture(tex, texres);
	6019	+ }
	6020	+ catch (Exception e)
	6021	+ {
	6022	+ System.err.println("FAILED: " + this);
	6023	+ failedPigment = true;
	6024	+ }
	6025	+
	6026	+ try
	6027	+ {
	6028	+ display.BindBumpTexture(tex, texres);
	6029	+ }
	6030	+ catch (Exception e)
	6031	+ {
	6032	+ //System.err.println("FAILED: " + this);
	6033	+ failedBump = true;
	6034	+ }
5670	6035
5671	6036	if (!compiled)
5672	6037	{
..	..	@@ -5688,7 +6053,11 @@
5688	6053	}
5689	6054	}
5690	6055
5691		- display.ReleaseTextures(tex);
	6056	+ if (!failedBump)
	6057	+ display.ReleaseBumpTexture(tex);
	6058	+
	6059	+ if (!failedPigment)
	6060	+ display.ReleasePigmentTexture(tex);
5692	6061
5693	6062	display.PopMaterial(this, selected);
5694	6063	}
..	..	@@ -5817,6 +6186,9 @@
5817	6186
5818	6187	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5819	6188	{
	6189	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6190	+ return;
	6191	+
5820	6192	if (hide)
5821	6193	return;
5822	6194	// shadow optimisation
..	..	@@ -5942,6 +6314,9 @@
5942	6314	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5943	6315	return; // no shadow for transparent objects
5944	6316
	6317	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6318	+ return;
	6319	+
5945	6320	if (hide)
5946	6321	return;
5947	6322
..	..	@@ -6055,6 +6430,11 @@
6055	6430	// dec 2012
6056	6431	new Exception().printStackTrace();
6057	6432	return;
	6433	+ }
	6434	+
	6435	+ if (dontselect)
	6436	+ {
	6437	+ //bRep.GenerateNormalsMINE();
6058	6438	}
6059	6439
6060	6440	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6907,7 +7287,7 @@
6907	7287	spot.translate(32, 32);
6908	7288	spotw = spot.x + spot.width;
6909	7289	spoth = spot.y + spot.height;
6910		- info.g.setColor(Color.blue);
	7290	+ info.g.setColor(Color.cyan);
6911	7291	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6912	7292	// if (CameraPane.Xmin > spot.x)
6913	7293	// {
..	..	@@ -6925,11 +7305,12 @@
6925	7305	// {
6926	7306	// CameraPane.Ymax = spoth;
6927	7307	// }
6928		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6929		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7308	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7309	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6930	7310	spot.translate(0, -32);
6931		- info.g.setColor(Color.green);
	7311	+ info.g.setColor(Color.yellow);
6932	7312	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7313	+ info.g.setColor(Color.green);
6933	7314	// if (CameraPane.Xmin > spot.x)
6934	7315	// {
6935	7316	// CameraPane.Xmin = spot.x;
..	..	@@ -6946,8 +7327,8 @@
6946	7327	// {
6947	7328	// CameraPane.Ymax = spoth;
6948	7329	// }
6949		- info.g.drawArc(boundary.x, boundary.y,
6950		- boundary.width, boundary.height, 0, 360);
	7330	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7331	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
6951	7332	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6952	7333	// if (CameraPane.Xmin > boundary.x)
6953	7334	// {
..	..	@@ -6981,7 +7362,7 @@
6981	7362	startX = info.x;
6982	7363	startY = info.y;
6983	7364
6984		- hitSomething = 0;
	7365	+ hitSomething = -1;
6985	7366	cVector origin = new cVector();
6986	7367	//LA.xformPos(origin, toParent, origin);
6987	7368	Rectangle spot = new Rectangle();
..	..	@@ -7057,6 +7438,7 @@
7057	7438	//System.out.println("hitSomething = " + hitSomething);
7058	7439
7059	7440	double scale = 0.005f * info.camera.Distance();
	7441	+
7060	7442	cVector xlate = new cVector();
7061	7443	//cVector xlate2 = new cVector();
7062	7444	switch (hitSomething)
..	..	@@ -7205,24 +7587,27 @@
7205	7587
7206	7588	case hitScale: // scale
7207	7589	double hScale = (double) (info.x - centerPt.x) / 32;
	7590	+ double sign = 1;
	7591	+ if (hScale < 0)
	7592	+ {
	7593	+ sign = -1;
	7594	+ }
	7595	+ hScale = signMath.pow(signhScale, scale * 50);
7208	7596	if (hScale < 0.01)
7209	7597	{
7210		- hScale = 0.01;
	7598	+ //hScale = 0.01;
7211	7599	}
7212		- hScale = Math.pow(hScale, scale * 50);
7213		- if (hScale < 0.01)
7214		- {
7215		- hScale = 0.01;
7216		- }
	7600	+
7217	7601	double vScale = (double) (info.y - centerPt.y) / 32;
7218		- if (vScale < 0.01)
	7602	+ sign = 1;
	7603	+ if (vScale < 0)
7219	7604	{
7220		- vScale = 0.01;
	7605	+ sign = -1;
7221	7606	}
7222		- vScale = Math.pow(vScale, scale * 50);
	7607	+ vScale = signMath.pow(signvScale, scale * 50);
7223	7608	if (vScale < 0.01)
7224	7609	{
7225		- vScale = 0.01;
	7610	+ //vScale = 0.01;
7226	7611	}
7227	7612	LA.matCopy(startMat, toParent);
7228	7613	/**/
..	..	@@ -7233,39 +7618,47 @@
7233	7618	}
7234	7619	/**/
7235	7620
	7621	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7622	+
	7623	+ if (totalScale < 0.01)
	7624	+ {
	7625	+ totalScale = 0.01;
	7626	+ }
	7627	+
7236	7628	switch (info.pane.RenderCamera().viewCode)
7237	7629	{
7238	7630	case 3: // '\001'
7239		- if (modified)
	7631	+ if (modified \|\| opposite)
7240	7632	{
7241	7633	//LA.matScale(toParent, 1, hScale, vScale);
7242		- LA.matScale(toParent, vScale, 1, 1);
	7634	+ LA.matScale(toParent, totalScale, 1, 1);
7243	7635	} // vScale, 1);
7244	7636	else
7245	7637	{
7246		- LA.matScale(toParent, vScale, vScale, vScale);
	7638	+ // EXCEPTION!
	7639	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7247	7640	} // vScale, 1);
7248	7641	break;
7249	7642
7250	7643	case 2: // '\002'
7251		- if (modified)
	7644	+ if (modified \|\| opposite)
7252	7645	{
7253	7646	//LA.matScale(toParent, hScale, 1, vScale);
7254		- LA.matScale(toParent, 1, vScale, 1);
	7647	+ LA.matScale(toParent, 1, totalScale, 1);
7255	7648	} else
7256	7649	{
7257		- LA.matScale(toParent, vScale, 1, vScale);
	7650	+ LA.matScale(toParent, totalScale, 1, totalScale);
7258	7651	}
7259	7652	break;
7260	7653
7261	7654	case 1: // '\003'
7262		- if (modified)
	7655	+ if (modified \|\| opposite)
7263	7656	{
7264	7657	//LA.matScale(toParent, hScale, vScale, 1);
7265		- LA.matScale(toParent, 1, 1, vScale);
	7658	+ LA.matScale(toParent, 1, 1, totalScale);
7266	7659	} else
7267	7660	{
7268		- LA.matScale(toParent, vScale, vScale, 1);
	7661	+ LA.matScale(toParent, totalScale, totalScale, 1);
7269	7662	}
7270	7663	break;
7271	7664	}
..	..	@@ -7406,7 +7799,7 @@
7406	7799	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7407	7800	} else
7408	7801	{
7409		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7802	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7410	7803	} // + super.toString();
7411	7804	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7412	7805
..	..	@@ -7479,6 +7872,10 @@
7479	7872	editWindow = null;
7480	7873	} // ?
7481	7874	}
	7875	+ else
	7876	+ {
	7877	+ //editWindow.closeUI();
	7878	+ }
7482	7879	}
7483	7880
7484	7881	boolean root; // patch for edit windows
..	..	@@ -7490,7 +7887,7 @@
7490	7887	/transient/ cVector2[] projectedVertices = new cVector2[0];
7491	7888
7492	7889	Object3D /Composite/ parent;
7493		- Object3D /Composite/ fileparent;
	7890	+ Object3D /Composite/ fileparent; // In the case of FileObject
7494	7891
7495	7892	double[][] toParent; // dynamic matrix
7496	7893	double[][] fromParent;
..	..	@@ -7636,6 +8033,10 @@
7636	8033	}
7637	8034
7638	8035	transient ObjEditor editWindow;
	8036	+ transient ObjEditor manipWindow;
	8037	+
	8038	+ transient boolean pinned;
	8039	+
7639	8040	transient ObjectUI objectUI;
7640	8041	public static int povDepth = 0;
7641	8042	private static cVector tbMin = new cVector();
..	..	@@ -7654,9 +8055,9 @@
7654	8055	private static cVector edge2 = new cVector();
7655	8056	//private static cVector norm = new cVector();
7656	8057	/transient private/ int hitSomething;
7657		- private static final int hitCenter = 1;
7658		- private static final int hitScale = 2;
7659		- private static final int hitRotate = 3;
	8058	+ static final int hitCenter = 1;
	8059	+ static final int hitScale = 2;
	8060	+ static final int hitRotate = 3;
7660	8061	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7661	8062	/transient/ private Point centerPt;
7662	8063	/transient/ private int startX;