~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,11 +14,20 @@
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();
	26	+
	27	+ // TEMPORARY for mocap undo
	28	+ mocap.reader.BVHReader.BVHResult bvh;
	29	+ Object3D skeleton;
	30	+ //
22	31
23	32	ScriptNode scriptnode;
24	33
..	..	@@ -100,64 +109,143 @@
100	109
101	110	// transient boolean reduced; // for morph reduction
102	111
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	112	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	113	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	114
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	115	+ transient Object3D transientsupport; // for cloning
	116	+ transient boolean transientlink2master;
108	117
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)
	118	+ void SaveSupports()
121	119	{
122		- bRep.SaveSupports();
	120	+ if (blockloop)
	121	+ return;
	122	+
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
	125	+
	126	+ support = null;
	127	+ link2master = false;
	128	+
	129	+ if (bRep != null)
	130	+ {
	131	+ bRep.SaveSupports();
	132	+ }
	133	+
	134	+ for (int i = 0; i < Size(); i++)
	135	+ {
	136	+ Object3D child = (Object3D) get(i);
	137	+ if (child == null)
	138	+ continue;
	139	+ blockloop = true;
	140	+ child.SaveSupports();
	141	+ blockloop = false;
	142	+ }
123	143	}
124		-
125		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
126	146	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	147	+ if (blockloop)
	148	+ return;
	149	+
	150	+ support = transientsupport;
	151	+ link2master = transientlink2master;
	152	+ transientsupport = null;
	153	+ transientlink2master = false;
	154	+
	155	+ if (bRep != null)
	156	+ {
	157	+ bRep.RestoreSupports();
	158	+ }
	159	+
	160	+ for (int i = 0; i < Size(); i++)
	161	+ {
	162	+ Object3D child = (Object3D) get(i);
	163	+ if (child == null)
	164	+ continue;
	165	+ blockloop = true;
	166	+ child.RestoreSupports();
	167	+ blockloop = false;
	168	+ }
	169	+ }
	170	+
	171	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	172	+ {
	173	+ if (hashtable.containsKey(GetUUID()))
	174	+ {
	175	+ Object3D o = hashtable.get(GetUUID());
	176	+
	177	+ Grafreed.Assert(this.bRep == o.bRep);
	178	+ if (this.bRep != null)
	179	+ assert(this.bRep.support == o.transientrep);
	180	+
	181	+ return;
	182	+ }
	183	+
	184	+ Object3D o = new Object3D("copy of " + this.name);
	185	+
	186	+ hashtable.put(GetUUID(), o);
	187	+
	188	+ for (int i=0; i<Size(); i++)
	189	+ {
	190	+ get(i).ExtractBigData(hashtable);
	191	+ }
	192	+
	193	+ ExtractBigData(o);
	194	+ }
	195	+
	196	+ void ExtractBigData(Object3D o)
	197	+ {
	198	+ o.bRep = this.bRep;
	199	+ if (this.bRep != null)
	200	+ {
	201	+ o.transientrep = this.bRep.support;
	202	+ o.bRep.support = null;
	203	+ }
	204	+
	205	+ // o.support = this.support;
	206	+ // o.fileparent = this.fileparent;
	207	+ // if (this.bRep != null)
	208	+ // o.bRep = this.bRep.support;
	209	+
	210	+ this.bRep = null;
	211	+ // if (this.bRep != null)
	212	+ // this.bRep.support = null;
	213	+ // this.support = null;
	214	+ // this.fileparent = null;
	215	+ }
	216	+
	217	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	218	+ {
	219	+ if (!hashtable.containsKey(GetUUID()))
	220	+ return;
	221	+
	222	+ if (blockloop)
	223	+ return;
	224	+
130	225	blockloop = true;
131		- child.SaveSupports();
	226	+
	227	+ Object3D o = hashtable.get(GetUUID());
	228	+
	229	+ RestoreBigData(o);
	230	+
	231	+ //hashtable.remove(GetUUID());
	232	+
	233	+ for (int i=0; i<Size(); i++)
	234	+ {
	235	+ get(i).RestoreBigData(hashtable);
	236	+ }
	237	+
132	238	blockloop = false;
133	239	}
134		-}
135	240
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)
	241	+ void RestoreBigData(Object3D o)
147	242	{
148		- bRep.RestoreSupports();
	243	+ this.bRep = o.bRep;
	244	+ if (this.bRep != null)
	245	+ this.bRep.support = o.transientrep;
	246	+ // this.support = o.support;
	247	+ // this.fileparent = o.fileparent;
149	248	}
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	249
162	250	// MOCAP SUPPORT
163	251	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +388,7 @@
300	388	}
301	389
302	390	boolean live = false;
	391	+ boolean dontselect = false;
303	392	boolean hide = false;
304	393	boolean link2master = false; // performs reset support/master at each frame
305	394	boolean marked = false; // animation node
..	..	@@ -481,12 +570,14 @@
481	570	toParent = LA.newMatrix();
482	571	fromParent = LA.newMatrix();
483	572	}
	573	+
484	574	if (toParentMarked == null)
485	575	{
486	576	if (maxcount != 1)
487	577	{
488	578	new Exception().printStackTrace();
489	579	}
	580	+
490	581	toParentMarked = LA.newMatrix();
491	582	fromParentMarked = LA.newMatrix();
492	583	}
..	..	@@ -774,7 +865,7 @@
774	865	if (step == 0)
775	866	step = 1;
776	867	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	868	+ maxcount = 128; // 2048; // 4;
778	869	// if (acceleration == 0)
779	870	// acceleration = 10;
780	871	if (delay == 0) // serial
..	..	@@ -797,7 +888,7 @@
797	888
798	889	if (marked && Globals.isLIVE() && live &&
799	890	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	891	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	892	currentframe != Globals.framecount)
802	893	{
803	894	currentframe = Globals.framecount;
..	..	@@ -809,7 +900,8 @@
809	900
810	901	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	902
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	903	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	904	+ (step == 1 && changedir))
813	905	{
814	906	countdown = 1;
815	907	delay = speedup?8:1;
..	..	@@ -881,6 +973,7 @@
881	973	if (material == null \|\| material.multiply)
882	974	return true;
883	975
	976	+ // Transparent objects are dynamic because we have to sort the triangles.
884	977	return material.opacity > 0.99;
885	978	}
886	979
..	..	@@ -912,6 +1005,11 @@
912	1005	fromParent = null; // LA.newMatrix();
913	1006	bRep = null; // new BoundaryRep();
914	1007
	1008	+ if (oname != null && oname.equals("LeftHand"))
	1009	+ {
	1010	+ name = oname;
	1011	+ }
	1012	+
915	1013	/*
916	1014	float hue = (float)Math.random();
917	1015	Color col;
..	..	@@ -954,7 +1052,7 @@
954	1052
955	1053	public Object clone()
956	1054	{
957		- return GrafreeD.clone(this);
	1055	+ return Grafreed.clone(this);
958	1056	}
959	1057
960	1058	Object3D copyExpand()
..	..	@@ -1470,7 +1568,7 @@
1470	1568	BoundaryRep.SEUIL = other.material.cameralight;
1471	1569
1472	1570	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1571	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1572	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1573	}
1476	1574
..	..	@@ -1729,7 +1827,7 @@
1729	1827	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1828	o.bRep = transientrep;
1731	1829	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1830	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1831	o.CreateMaterial();
1734	1832	o.SetAttributes(this, -1);
1735	1833	//parent
..	..	@@ -1742,7 +1840,7 @@
1742	1840	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1841	o.bRep = bRep;
1744	1842	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1843	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1844	o.CreateMaterial();
1747	1845	//o.overwriteThis(this, -1);
1748	1846	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1927,15 @@
1829	1927	if (obj.name == null)
1830	1928	continue; // can't be a null one
1831	1929
	1930	+ // Try perfect match first.
1832	1931	if (n.equals(obj.name))
1833	1932	{
1834	1933	theobj = obj;
1835	1934	count++;
1836	1935	}
1837	1936	}
	1937	+
	1938	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1939
1839	1940	if (count != 1)
1840	1941	for (int i=Size(); --i>=0;)
..	..	@@ -2294,12 +2395,17 @@
2294	2395	}
2295	2396	*/
2296	2397	}
	2398	+ else
	2399	+ {
	2400	+ //((ObjEditor)editWindow).SetupUI2(null);
	2401	+ }
2297	2402	}
2298	2403
2299	2404	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2300	2405	{
2301	2406	if (newWindow)
2302	2407	{
	2408	+ new Exception().printStackTrace();
2303	2409	System.exit(0);
2304	2410	if (parent != null)
2305	2411	{
..	..	@@ -2334,6 +2440,14 @@
2334	2440	{
2335	2441	editWindow.refreshContents();
2336	2442	}
	2443	+ else
	2444	+ {
	2445	+ if (manipWindow != null)
	2446	+ {
	2447	+ manipWindow.refreshContents();
	2448	+ }
	2449	+ }
	2450	+
2337	2451	//if (parent != null)
2338	2452	//parent.refreshEditWindow();
2339	2453	}
..	..	@@ -2476,13 +2590,13 @@
2476	2590	return retval;
2477	2591	}
2478	2592
2479		- void doEditDrag(ClickInfo info)
	2593	+ void doEditDrag(ClickInfo info, boolean opposite)
2480	2594	{
2481	2595	switch (doSomething)
2482	2596	{
2483	2597	case 1: // '\001'
2484	2598	//super.
2485		- doEditDrag0(info);
	2599	+ doEditDrag0(info, opposite);
2486	2600	break;
2487	2601
2488	2602	case 2: // '\002'
..	..	@@ -2495,11 +2609,11 @@
2495	2609	{
2496	2610	//sel.hitSomething = childToDrag.hitSomething;
2497	2611	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2612	+ sel.doEditDrag(info, opposite);
2499	2613	} else
2500	2614	{
2501	2615	//super.
2502		- doEditDrag0(info);
	2616	+ doEditDrag0(info, opposite);
2503	2617	}
2504	2618	}
2505	2619	break;
..	..	@@ -2609,6 +2723,18 @@
2609	2723	void GenNormalsS(boolean crease)
2610	2724	{
2611	2725	selection.GenNormals(crease);
	2726	+// for (int i=0; i<selection.size(); i++)
	2727	+// {
	2728	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2729	+// selectee.GenNormals(crease);
	2730	+// }
	2731	+
	2732	+ //Touch();
	2733	+ }
	2734	+
	2735	+ void GenNormalsMeshS()
	2736	+ {
	2737	+ selection.GenNormalsMesh();
2612	2738	// for (int i=0; i<selection.size(); i++)
2613	2739	// {
2614	2740	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2875,24 @@
2749	2875	if (child == null)
2750	2876	continue;
2751	2877	child.GenNormals(crease);
	2878	+// Children().release(i);
	2879	+ }
	2880	+ blockloop = false;
	2881	+ }
	2882	+
	2883	+ void GenNormalsMesh()
	2884	+ {
	2885	+ if (blockloop)
	2886	+ return;
	2887	+
	2888	+ blockloop = true;
	2889	+ GenNormalsMesh0();
	2890	+ for (int i = 0; i < Children().Size(); i++)
	2891	+ {
	2892	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2893	+ if (child == null)
	2894	+ continue;
	2895	+ child.GenNormalsMesh();
2752	2896	// Children().release(i);
2753	2897	}
2754	2898	blockloop = false;
..	..	@@ -2921,6 +3065,15 @@
2921	3065	}
2922	3066	}
2923	3067
	3068	+ void GenNormalsMesh0()
	3069	+ {
	3070	+ if (bRep != null)
	3071	+ {
	3072	+ bRep.GenerateNormalsMesh();
	3073	+ Touch();
	3074	+ }
	3075	+ }
	3076	+
2924	3077	void GenNormalsMINE0()
2925	3078	{
2926	3079	if (bRep != null)
..	..	@@ -2982,6 +3135,33 @@
2982	3135	blockloop = false;
2983	3136	}
2984	3137
	3138	+ void TransformChildren()
	3139	+ {
	3140	+ if (toParent != null)
	3141	+ {
	3142	+ for (int i=Size(); --i>=0;)
	3143	+ {
	3144	+ Object3D v = get(i);
	3145	+
	3146	+ if (v.toParent == null)
	3147	+ {
	3148	+ v.toParent = LA.newMatrix();
	3149	+ v.fromParent = LA.newMatrix();
	3150	+ }
	3151	+
	3152	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3153	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3154	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3155	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3156	+ }
	3157	+
	3158	+ toParent = null; // LA.matIdentity(toParent);
	3159	+ fromParent = null; // LA.matIdentity(fromParent);
	3160	+
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2985	3165	void TransformGeometry()
2986	3166	{
2987	3167	Object3D obj = this;
..	..	@@ -3203,9 +3383,11 @@
3203	3383
3204	3384	BoundaryRep sup = bRep.support;
3205	3385	bRep.support = null;
3206		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3386	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3207	3387	// bRep.SplitInTwo(onlyone); // thread...
3208		- temprep.SplitInTwo(reduction34, onlyone);
	3388	+
	3389	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3390	+
3209	3391	bRep = temprep;
3210	3392	bRep.support = sup;
3211	3393	Touch();
..	..	@@ -3342,7 +3524,8 @@
3342	3524	if (blockloop)
3343	3525	return;
3344	3526
3345		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3527	+ if (//marked \|\| // does not make sense
	3528	+ (bRep != null \|\| material != null)) // borderline...
3346	3529	live = h;
3347	3530
3348	3531	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,7 +3546,8 @@
3363	3546	return;
3364	3547
3365	3548	//if (bRep != null)
3366		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3549	+ if (//marked \|\| // does not make sense
	3550	+ (bRep != null \|\| material != null)) // borderline...
3367	3551	link2master = h;
3368	3552
3369	3553	for (int i = 0; i < Size(); i++)
..	..	@@ -3383,7 +3567,8 @@
3383	3567	if (blockloop)
3384	3568	return;
3385	3569
3386		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3570	+ if (//marked \|\| // does not make sense
	3571	+ (bRep != null \|\| material != null)) // borderline...
3387	3572	hide = h;
3388	3573
3389	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3403,7 +3588,7 @@
3403	3588	if (blockloop)
3404	3589	return;
3405	3590
3406		- if (bRep != null && material != null) // borderline...
	3591	+ if (bRep != null \|\| material != null) // borderline...
3407	3592	marked = h;
3408	3593
3409	3594	for (int i = 0; i < Size(); i++)
..	..	@@ -3413,6 +3598,46 @@
3413	3598	continue;
3414	3599	blockloop = true;
3415	3600	child.MarkLeaves(h);
	3601	+ blockloop = false;
	3602	+ // release(i);
	3603	+ }
	3604	+ }
	3605	+
	3606	+ void RewindLeaves(boolean h)
	3607	+ {
	3608	+ if (blockloop)
	3609	+ return;
	3610	+
	3611	+ if (bRep != null \|\| material != null) // borderline...
	3612	+ rewind = h;
	3613	+
	3614	+ for (int i = 0; i < Size(); i++)
	3615	+ {
	3616	+ Object3D child = (Object3D) get(i); // reserve(i);
	3617	+ if (child == null)
	3618	+ continue;
	3619	+ blockloop = true;
	3620	+ child.RewindLeaves(h);
	3621	+ blockloop = false;
	3622	+ // release(i);
	3623	+ }
	3624	+ }
	3625	+
	3626	+ void RandomLeaves(boolean h)
	3627	+ {
	3628	+ if (blockloop)
	3629	+ return;
	3630	+
	3631	+ if (bRep != null \|\| material != null) // borderline...
	3632	+ random = h;
	3633	+
	3634	+ for (int i = 0; i < Size(); i++)
	3635	+ {
	3636	+ Object3D child = (Object3D) get(i); // reserve(i);
	3637	+ if (child == null)
	3638	+ continue;
	3639	+ blockloop = true;
	3640	+ child.RandomLeaves(h);
3416	3641	blockloop = false;
3417	3642	// release(i);
3418	3643	}
..	..	@@ -3727,7 +3952,7 @@
3727	3952	if (child == null)
3728	3953	continue;
3729	3954
3730		- if (GrafreeD.RENDERME > 0)
	3955	+ if (Grafreed.RENDERME > 0)
3731	3956	{
3732	3957	if (child instanceof Merge)
3733	3958	((Merge)child).renderme();
..	..	@@ -3878,7 +4103,7 @@
3878	4103	if (child == null)
3879	4104	continue;
3880	4105
3881		- if (GrafreeD.RENDERME > 0)
	4106	+ if (Grafreed.RENDERME > 0)
3882	4107	{
3883	4108	if (child instanceof Merge)
3884	4109	((Merge)child).renderme();
..	..	@@ -4073,7 +4298,7 @@
4073	4298	if (child == null)
4074	4299	continue;
4075	4300
4076		- if (GrafreeD.RENDERME > 0)
	4301	+ if (Grafreed.RENDERME > 0)
4077	4302	{
4078	4303	if (child instanceof Merge)
4079	4304	((Merge)child).renderme();
..	..	@@ -4186,6 +4411,55 @@
4186	4411	{
4187	4412	blockloop = true;
4188	4413	get(i).RepairShadow();
	4414	+ blockloop = false;
	4415	+ }
	4416	+ }
	4417	+
	4418	+ void RepairSOV()
	4419	+ {
	4420	+ if (blockloop)
	4421	+ return;
	4422	+
	4423	+ String texname = this.GetPigmentTexture();
	4424	+
	4425	+ if (texname.startsWith("sov"))
	4426	+ {
	4427	+ String[] s = texname.split("/");
	4428	+
	4429	+ String[] sname = s[1].split("Color.pn");
	4430	+
	4431	+ texname = sname[0];
	4432	+
	4433	+ if (sname.length > 1)
	4434	+ {
	4435	+ texname += "Color.jpg";
	4436	+ }
	4437	+
	4438	+ this.SetPigmentTexture("sov/" + texname);
	4439	+ }
	4440	+
	4441	+ texname = this.GetBumpTexture();
	4442	+
	4443	+ if (texname.startsWith("sov"))
	4444	+ {
	4445	+ String[] s = texname.split("/");
	4446	+
	4447	+ String[] sname = s[1].split("Bump.pn");
	4448	+
	4449	+ texname = sname[0];
	4450	+
	4451	+ if (sname.length > 1)
	4452	+ {
	4453	+ texname += "Bump.jpg";
	4454	+ }
	4455	+
	4456	+ this.SetBumpTexture("sov/" + texname);
	4457	+ }
	4458	+
	4459	+ for (int i=0; i<Size(); i++)
	4460	+ {
	4461	+ blockloop = true;
	4462	+ get(i).RepairSOV();
4189	4463	blockloop = false;
4190	4464	}
4191	4465	}
..	..	@@ -4680,7 +4954,7 @@
4680	4954
4681	4955	cTreePath SelectLeaf(int indexcount, boolean deselect)
4682	4956	{
4683		- if (hide)
	4957	+ if (hide \|\| dontselect)
4684	4958	return null;
4685	4959
4686	4960	if (count <= 0)
..	..	@@ -4704,9 +4978,17 @@
4704	4978	}
4705	4979	}
4706	4980
	4981	+ ObjEditor GetWindow()
	4982	+ {
	4983	+ if (editWindow != null)
	4984	+ return editWindow;
	4985	+
	4986	+ return manipWindow;
	4987	+ }
	4988	+
4707	4989	cTreePath Select(int indexcount, boolean deselect)
4708	4990	{
4709		- if (hide)
	4991	+ if (hide \|\| dontselect)
4710	4992	return null;
4711	4993
4712	4994	if (count <= 0)
..	..	@@ -4740,10 +5022,11 @@
4740	5022	if (leaf != null)
4741	5023	{
4742	5024	cTreePath tp = new cTreePath(this, leaf);
4743		- if (editWindow != null)
	5025	+ ObjEditor window = GetWindow();
	5026	+ if (window != null)
4744	5027	{
4745	5028	//System.out.println("editWindow = " + editWindow + " vs " + this);
4746		- editWindow.Select(tp, deselect, true);
	5029	+ window.Select(tp, deselect, true);
4747	5030	}
4748	5031
4749	5032	return tp;
..	..	@@ -4760,6 +5043,7 @@
4760	5043
4761	5044	if (child == null)
4762	5045	continue;
	5046	+
4763	5047	if (child.HasTransparency() && child.size() != 0)
4764	5048	{
4765	5049	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4769,9 +5053,10 @@
4769	5053	if (leaf != null)
4770	5054	{
4771	5055	cTreePath tp = new cTreePath(this, leaf);
4772		- if (editWindow != null)
	5056	+ ObjEditor window = GetWindow();
	5057	+ if (window != null)
4773	5058	{
4774		- editWindow.Select(tp, deselect, true);
	5059	+ window.Select(tp, deselect, true);
4775	5060	}
4776	5061
4777	5062	return tp;
..	..	@@ -5158,10 +5443,34 @@
5158	5443
5159	5444	// System.out.println("Fullname = " + fullname);
5160	5445
5161		- if (fullname.name.indexOf(":") == -1)
5162		- return fullname.name;
	5446	+ // Does not work on Windows due to C:
	5447	+// if (fullname.name.indexOf(":") == -1)
	5448	+// return fullname.name;
	5449	+//
	5450	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5163	5451
5164		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5452	+ String[] split = fullname.name.split(":");
	5453	+
	5454	+ if (split.length == 0)
	5455	+ {
	5456	+ return "";
	5457	+ }
	5458	+
	5459	+ if (split.length <= 2)
	5460	+ {
	5461	+ if (fullname.name.endsWith(":"))
	5462	+ {
	5463	+ // Windows
	5464	+ return fullname.name.substring(0, fullname.name.length()-1);
	5465	+ }
	5466	+
	5467	+ return split[0];
	5468	+ }
	5469	+
	5470	+ // Windows
	5471	+ assert(split.length == 4);
	5472	+
	5473	+ return split[0] + ":" + split[1];
5165	5474	}
5166	5475
5167	5476	static String GetBump(cTexture fullname)
..	..	@@ -5170,10 +5479,38 @@
5170	5479	return "";
5171	5480
5172	5481	// System.out.println("Fullname = " + fullname);
5173		- if (fullname.name.indexOf(":") == -1)
5174		- return "";
5175		-
5176		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5482	+ // Does not work on Windows due to C:
	5483	+// if (fullname.name.indexOf(":") == -1)
	5484	+// return "";
	5485	+//
	5486	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5487	+ String[] split = fullname.name.split(":");
	5488	+
	5489	+ if (split.length == 0)
	5490	+ {
	5491	+ return "";
	5492	+ }
	5493	+
	5494	+ if (split.length == 1)
	5495	+ {
	5496	+ return "";
	5497	+ }
	5498	+
	5499	+ if (split.length == 2)
	5500	+ {
	5501	+ if (fullname.name.endsWith(":"))
	5502	+ {
	5503	+ // Windows
	5504	+ return "";
	5505	+ }
	5506	+
	5507	+ return split[1];
	5508	+ }
	5509	+
	5510	+ // Windows
	5511	+ assert(split.length == 4);
	5512	+
	5513	+ return split[2] + ":" + split[3];
5177	5514	}
5178	5515
5179	5516	String GetPigmentTexture()
..	..	@@ -5247,7 +5584,7 @@
5247	5584	System.out.print("; textures = " + textures);
5248	5585	System.out.println("; usedtextures = " + usedtextures);
5249	5586
5250		- if (GetTextures() == null)
	5587	+ if (GetTextures() == null) // What is that??
5251	5588	GetTextures().name = ":";
5252	5589
5253	5590	String texname = tex;
..	..	@@ -5278,6 +5615,43 @@
5278	5615	child.ResetPigmentTexture();
5279	5616	blockloop = false;
5280	5617	}
	5618	+ }
	5619	+
	5620	+ UUID GetUUID()
	5621	+ {
	5622	+ if (uuid == null)
	5623	+ {
	5624	+ // Serial
	5625	+ uuid = UUID.randomUUID();
	5626	+ }
	5627	+
	5628	+ return uuid;
	5629	+ }
	5630	+
	5631	+ Object3D GetObject(UUID uid)
	5632	+ {
	5633	+ if (blockloop)
	5634	+ return null;
	5635	+
	5636	+ if (GetUUID().equals(uid))
	5637	+ return this;
	5638	+
	5639	+ int nb = Size();
	5640	+ for (int i = 0; i < nb; i++)
	5641	+ {
	5642	+ Object3D child = (Object3D) get(i);
	5643	+
	5644	+ if (child == null)
	5645	+ continue;
	5646	+
	5647	+ blockloop = true;
	5648	+ Object3D obj = child.GetObject(uid);
	5649	+ blockloop = false;
	5650	+ if (obj != null)
	5651	+ return obj;
	5652	+ }
	5653	+
	5654	+ return null;
5281	5655	}
5282	5656
5283	5657	void SetBumpTexture(String tex)
..	..	@@ -5324,12 +5698,23 @@
5324	5698	boolean NeedSupport()
5325	5699	{
5326	5700	return
5327		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5701	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5328	5702	// PROBLEM with CROWD!!
5329		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5703	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5330	5704	}
5331	5705
5332	5706	static boolean DEBUG_SELECTION = false;
	5707	+
	5708	+ boolean IsLive()
	5709	+ {
	5710	+ if (live)
	5711	+ return true;
	5712	+
	5713	+ if (parent == null)
	5714	+ return false;
	5715	+
	5716	+ return parent.IsLive();
	5717	+ }
5333	5718
5334	5719	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5720	{
..	..	@@ -5341,7 +5726,7 @@
5341	5726	}
5342	5727
5343	5728	if (display.DrawMode() == iCameraPane.SELECTION &&
5344		- hide)
	5729	+ (hide \|\| dontselect))
5345	5730	return;
5346	5731
5347	5732	if (name != null && name.contains("sclera"))
..	..	@@ -5392,7 +5777,7 @@
5392	5777	support = support;
5393	5778
5394	5779	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5780	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396	5781
5397	5782	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	5783	{
..	..	@@ -5412,10 +5797,12 @@
5412	5797	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5798
5414	5799	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5800	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5801	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5802	{
5417	5803	Globals.lighttouched = true;
5418	5804	} // all panes...
	5805	+
5419	5806	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5420	5807	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5808	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5543,6 +5930,7 @@
5543	5930	if (GetBRep() != null)
5544	5931	{
5545	5932	display.NextIndex();
	5933	+
5546	5934	// vertex color conflict : gl.glCallList(list);
5547	5935	DrawNode(display, root, selected);
5548	5936	if (this instanceof BezierPatch)
..	..	@@ -5583,7 +5971,28 @@
5583	5971	tex = GetTextures();
5584	5972	}
5585	5973
5586		- display.BindTextures(tex, texres);
	5974	+ boolean failedPigment = false;
	5975	+ boolean failedBump = false;
	5976	+
	5977	+ try
	5978	+ {
	5979	+ display.BindPigmentTexture(tex, texres);
	5980	+ }
	5981	+ catch (Exception e)
	5982	+ {
	5983	+ System.err.println("FAILED: " + this);
	5984	+ failedPigment = true;
	5985	+ }
	5986	+
	5987	+ try
	5988	+ {
	5989	+ display.BindBumpTexture(tex, texres);
	5990	+ }
	5991	+ catch (Exception e)
	5992	+ {
	5993	+ //System.err.println("FAILED: " + this);
	5994	+ failedBump = true;
	5995	+ }
5587	5996
5588	5997	if (!compiled)
5589	5998	{
..	..	@@ -5605,7 +6014,11 @@
5605	6014	}
5606	6015	}
5607	6016
5608		- display.ReleaseTextures(tex);
	6017	+ if (!failedBump)
	6018	+ display.ReleaseBumpTexture(tex);
	6019	+
	6020	+ if (!failedPigment)
	6021	+ display.ReleasePigmentTexture(tex);
5609	6022
5610	6023	display.PopMaterial(this, selected);
5611	6024	}
..	..	@@ -5734,6 +6147,9 @@
5734	6147
5735	6148	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5736	6149	{
	6150	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6151	+ return;
	6152	+
5737	6153	if (hide)
5738	6154	return;
5739	6155	// shadow optimisation
..	..	@@ -5859,6 +6275,9 @@
5859	6275	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5860	6276	return; // no shadow for transparent objects
5861	6277
	6278	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6279	+ return;
	6280	+
5862	6281	if (hide)
5863	6282	return;
5864	6283
..	..	@@ -5972,6 +6391,11 @@
5972	6391	// dec 2012
5973	6392	new Exception().printStackTrace();
5974	6393	return;
	6394	+ }
	6395	+
	6396	+ if (dontselect)
	6397	+ {
	6398	+ //bRep.GenerateNormalsMINE();
5975	6399	}
5976	6400
5977	6401	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6824,7 +7248,7 @@
6824	7248	spot.translate(32, 32);
6825	7249	spotw = spot.x + spot.width;
6826	7250	spoth = spot.y + spot.height;
6827		- info.g.setColor(Color.blue);
	7251	+ info.g.setColor(Color.cyan);
6828	7252	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6829	7253	// if (CameraPane.Xmin > spot.x)
6830	7254	// {
..	..	@@ -6842,11 +7266,12 @@
6842	7266	// {
6843	7267	// CameraPane.Ymax = spoth;
6844	7268	// }
6845		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6846		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7269	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7270	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6847	7271	spot.translate(0, -32);
6848		- info.g.setColor(Color.green);
	7272	+ info.g.setColor(Color.yellow);
6849	7273	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7274	+ info.g.setColor(Color.green);
6850	7275	// if (CameraPane.Xmin > spot.x)
6851	7276	// {
6852	7277	// CameraPane.Xmin = spot.x;
..	..	@@ -6898,7 +7323,7 @@
6898	7323	startX = info.x;
6899	7324	startY = info.y;
6900	7325
6901		- hitSomething = 0;
	7326	+ hitSomething = -1;
6902	7327	cVector origin = new cVector();
6903	7328	//LA.xformPos(origin, toParent, origin);
6904	7329	Rectangle spot = new Rectangle();
..	..	@@ -6931,7 +7356,7 @@
6931	7356	}
6932	7357
6933	7358	//System.out.println("info.modifiers = " + info.modifiers);
6934		- modified = (info.modifiers & CameraPane.META) != 0;
	7359	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
6935	7360	//System.out.println("modified = " + modified);
6936	7361	//new Exception().printStackTrace();
6937	7362	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6959,7 +7384,7 @@
6959	7384	return true;
6960	7385	}
6961	7386
6962		- void doEditDrag0(ClickInfo info)
	7387	+ void doEditDrag0(ClickInfo info, boolean opposite)
6963	7388	{
6964	7389	if (hitSomething == 0)
6965	7390	{
..	..	@@ -6974,6 +7399,7 @@
6974	7399	//System.out.println("hitSomething = " + hitSomething);
6975	7400
6976	7401	double scale = 0.005f * info.camera.Distance();
	7402	+
6977	7403	cVector xlate = new cVector();
6978	7404	//cVector xlate2 = new cVector();
6979	7405	switch (hitSomething)
..	..	@@ -6986,7 +7412,7 @@
6986	7412
6987	7413	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6988	7414
6989		- if (modified)
	7415	+ if (modified \|\| opposite)
6990	7416	{
6991	7417	//assert(false);
6992	7418	/*
..	..	@@ -7080,6 +7506,7 @@
7080	7506
7081	7507	if (modified)
7082	7508	{
	7509	+ // Rotate 90 degrees
7083	7510	angle /= (Math.PI / 4);
7084	7511	angle = Math.floor(angle + 0.5);
7085	7512	angle *= (Math.PI / 4);
..	..	@@ -7121,24 +7548,27 @@
7121	7548
7122	7549	case hitScale: // scale
7123	7550	double hScale = (double) (info.x - centerPt.x) / 32;
	7551	+ double sign = 1;
	7552	+ if (hScale < 0)
	7553	+ {
	7554	+ sign = -1;
	7555	+ }
	7556	+ hScale = signMath.pow(signhScale, scale * 50);
7124	7557	if (hScale < 0.01)
7125	7558	{
7126		- hScale = 0.01;
	7559	+ //hScale = 0.01;
7127	7560	}
7128		- hScale = Math.pow(hScale, scale * 50);
7129		- if (hScale < 0.01)
7130		- {
7131		- hScale = 0.01;
7132		- }
	7561	+
7133	7562	double vScale = (double) (info.y - centerPt.y) / 32;
7134		- if (vScale < 0.01)
	7563	+ sign = 1;
	7564	+ if (vScale < 0)
7135	7565	{
7136		- vScale = 0.01;
	7566	+ sign = -1;
7137	7567	}
7138		- vScale = Math.pow(vScale, scale * 50);
	7568	+ vScale = signMath.pow(signvScale, scale * 50);
7139	7569	if (vScale < 0.01)
7140	7570	{
7141		- vScale = 0.01;
	7571	+ //vScale = 0.01;
7142	7572	}
7143	7573	LA.matCopy(startMat, toParent);
7144	7574	/**/
..	..	@@ -7149,39 +7579,47 @@
7149	7579	}
7150	7580	/**/
7151	7581
	7582	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7583	+
	7584	+ if (totalScale < 0.01)
	7585	+ {
	7586	+ totalScale = 0.01;
	7587	+ }
	7588	+
7152	7589	switch (info.pane.RenderCamera().viewCode)
7153	7590	{
7154	7591	case 3: // '\001'
7155		- if (modified)
	7592	+ if (modified \|\| opposite)
7156	7593	{
7157	7594	//LA.matScale(toParent, 1, hScale, vScale);
7158		- LA.matScale(toParent, vScale, 1, 1);
	7595	+ LA.matScale(toParent, totalScale, 1, 1);
7159	7596	} // vScale, 1);
7160	7597	else
7161	7598	{
7162		- LA.matScale(toParent, vScale, vScale, vScale);
	7599	+ // EXCEPTION!
	7600	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7163	7601	} // vScale, 1);
7164	7602	break;
7165	7603
7166	7604	case 2: // '\002'
7167		- if (modified)
	7605	+ if (modified \|\| opposite)
7168	7606	{
7169	7607	//LA.matScale(toParent, hScale, 1, vScale);
7170		- LA.matScale(toParent, 1, vScale, 1);
	7608	+ LA.matScale(toParent, 1, totalScale, 1);
7171	7609	} else
7172	7610	{
7173		- LA.matScale(toParent, vScale, 1, vScale);
	7611	+ LA.matScale(toParent, totalScale, 1, totalScale);
7174	7612	}
7175	7613	break;
7176	7614
7177	7615	case 1: // '\003'
7178		- if (modified)
	7616	+ if (modified \|\| opposite)
7179	7617	{
7180	7618	//LA.matScale(toParent, hScale, vScale, 1);
7181		- LA.matScale(toParent, 1, 1, vScale);
	7619	+ LA.matScale(toParent, 1, 1, totalScale);
7182	7620	} else
7183	7621	{
7184		- LA.matScale(toParent, vScale, vScale, 1);
	7622	+ LA.matScale(toParent, totalScale, totalScale, 1);
7185	7623	}
7186	7624	break;
7187	7625	}
..	..	@@ -7314,14 +7752,22 @@
7314	7752	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7315	7753	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7316	7754	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7755	+
	7756	+ String objname;
	7757	+
7317	7758	if (false) //parent != null)
7318	7759	{
7319		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7760	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7320	7761	} else
7321	7762	{
7322		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7763	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7323	7764	} // + super.toString();
7324	7765	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7766	+
	7767	+ if (!Globals.ADVANCED)
	7768	+ return objname;
	7769	+
	7770	+ return objname + " " + System.identityHashCode(this);
7325	7771	}
7326	7772
7327	7773	public int hashCode()
..	..	@@ -7377,6 +7823,7 @@
7377	7823	objectUI.closeUI();
7378	7824	if (editWindow != null)
7379	7825	{
	7826	+ editWindow.ctrlPanel.FlushUI();
7380	7827	editWindow.refreshContents();
7381	7828	} // ? new
7382	7829	objectUI = null;
..	..	@@ -7385,6 +7832,10 @@
7385	7832	{
7386	7833	editWindow = null;
7387	7834	} // ?
	7835	+ }
	7836	+ else
	7837	+ {
	7838	+ //editWindow.closeUI();
7388	7839	}
7389	7840	}
7390	7841
..	..	@@ -7397,7 +7848,7 @@
7397	7848	/transient/ cVector2[] projectedVertices = new cVector2[0];
7398	7849
7399	7850	Object3D /Composite/ parent;
7400		- Object3D /Composite/ fileparent;
	7851	+ Object3D /Composite/ fileparent; // In the case of FileObject
7401	7852
7402	7853	double[][] toParent; // dynamic matrix
7403	7854	double[][] fromParent;
..	..	@@ -7512,7 +7963,7 @@
7512	7963	{
7513	7964	assert(bRep != null);
7514	7965	if (!(support instanceof GenericJoint)) // support.bRep != null)
7515		- GrafreeD.Assert(support.bRep == bRep.support);
	7966	+ Grafreed.Assert(support.bRep == bRep.support);
7516	7967	}
7517	7968	else
7518	7969	{
..	..	@@ -7543,6 +7994,10 @@
7543	7994	}
7544	7995
7545	7996	transient ObjEditor editWindow;
	7997	+ transient ObjEditor manipWindow;
	7998	+
	7999	+ transient boolean pinned;
	8000	+
7546	8001	transient ObjectUI objectUI;
7547	8002	public static int povDepth = 0;
7548	8003	private static cVector tbMin = new cVector();
..	..	@@ -7561,9 +8016,9 @@
7561	8016	private static cVector edge2 = new cVector();
7562	8017	//private static cVector norm = new cVector();
7563	8018	/transient private/ int hitSomething;
7564		- private static final int hitCenter = 1;
7565		- private static final int hitScale = 2;
7566		- private static final int hitRotate = 3;
	8019	+ static final int hitCenter = 1;
	8020	+ static final int hitScale = 2;
	8021	+ static final int hitRotate = 3;
7567	8022	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7568	8023	/transient/ private Point centerPt;
7569	8024	/transient/ private int startX;