~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,136 @@
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();
123		- }
124		-
125		- for (int i = 0; i < Size(); i++)
126		- {
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
130		- blockloop = true;
131		- child.SaveSupports();
132		- blockloop = false;
133		- }
134		-}
	120	+ if (blockloop)
	121	+ return;
135	122
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
140	125
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
147		- {
148		- bRep.RestoreSupports();
	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	+ }
149	143	}
150		-
151		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
152	146	{
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
	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	+ }
159	169	}
160		-}
	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();
	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	+ Object3D o = hashtable.get(GetUUID());
	223	+
	224	+ RestoreBigData(o);
	225	+
	226	+ hashtable.remove(GetUUID());
	227	+
	228	+ for (int i=0; i<Size(); i++)
	229	+ {
	230	+ get(i).RestoreBigData(hashtable);
	231	+ }
	232	+ }
	233	+
	234	+ void RestoreBigData(Object3D o)
	235	+ {
	236	+ this.bRep = o.bRep;
	237	+ if (this.bRep != null)
	238	+ this.bRep.support = o.transientrep;
	239	+ // this.support = o.support;
	240	+ // this.fileparent = o.fileparent;
	241	+ }
161	242
162	243	// MOCAP SUPPORT
163	244	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +381,7 @@
300	381	}
301	382
302	383	boolean live = false;
	384	+ boolean dontselect = false;
303	385	boolean hide = false;
304	386	boolean link2master = false; // performs reset support/master at each frame
305	387	boolean marked = false; // animation node
..	..	@@ -481,12 +563,14 @@
481	563	toParent = LA.newMatrix();
482	564	fromParent = LA.newMatrix();
483	565	}
	566	+
484	567	if (toParentMarked == null)
485	568	{
486	569	if (maxcount != 1)
487	570	{
488	571	new Exception().printStackTrace();
489	572	}
	573	+
490	574	toParentMarked = LA.newMatrix();
491	575	fromParentMarked = LA.newMatrix();
492	576	}
..	..	@@ -774,7 +858,7 @@
774	858	if (step == 0)
775	859	step = 1;
776	860	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	861	+ maxcount = 128; // 2048; // 4;
778	862	// if (acceleration == 0)
779	863	// acceleration = 10;
780	864	if (delay == 0) // serial
..	..	@@ -797,7 +881,7 @@
797	881
798	882	if (marked && Globals.isLIVE() && live &&
799	883	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	884	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
801	885	currentframe != Globals.framecount)
802	886	{
803	887	currentframe = Globals.framecount;
..	..	@@ -809,7 +893,8 @@
809	893
810	894	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	895
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	896	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	897	+ (step == 1 && changedir))
813	898	{
814	899	countdown = 1;
815	900	delay = speedup?8:1;
..	..	@@ -912,6 +997,11 @@
912	997	fromParent = null; // LA.newMatrix();
913	998	bRep = null; // new BoundaryRep();
914	999
	1000	+ if (oname != null && oname.equals("LeftHand"))
	1001	+ {
	1002	+ name = oname;
	1003	+ }
	1004	+
915	1005	/*
916	1006	float hue = (float)Math.random();
917	1007	Color col;
..	..	@@ -954,7 +1044,7 @@
954	1044
955	1045	public Object clone()
956	1046	{
957		- return GrafreeD.clone(this);
	1047	+ return Grafreed.clone(this);
958	1048	}
959	1049
960	1050	Object3D copyExpand()
..	..	@@ -1470,7 +1560,7 @@
1470	1560	BoundaryRep.SEUIL = other.material.cameralight;
1471	1561
1472	1562	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1563	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1564	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1565	}
1476	1566
..	..	@@ -1729,7 +1819,7 @@
1729	1819	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1820	o.bRep = transientrep;
1731	1821	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1822	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1823	o.CreateMaterial();
1734	1824	o.SetAttributes(this, -1);
1735	1825	//parent
..	..	@@ -1742,7 +1832,7 @@
1742	1832	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1833	o.bRep = bRep;
1744	1834	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1835	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1836	o.CreateMaterial();
1747	1837	//o.overwriteThis(this, -1);
1748	1838	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1919,15 @@
1829	1919	if (obj.name == null)
1830	1920	continue; // can't be a null one
1831	1921
	1922	+ // Try perfect match first.
1832	1923	if (n.equals(obj.name))
1833	1924	{
1834	1925	theobj = obj;
1835	1926	count++;
1836	1927	}
1837	1928	}
	1929	+
	1930	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1931
1839	1932	if (count != 1)
1840	1933	for (int i=Size(); --i>=0;)
..	..	@@ -2294,12 +2387,17 @@
2294	2387	}
2295	2388	*/
2296	2389	}
	2390	+ else
	2391	+ {
	2392	+ //((ObjEditor)editWindow).SetupUI2(null);
	2393	+ }
2297	2394	}
2298	2395
2299	2396	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2300	2397	{
2301	2398	if (newWindow)
2302	2399	{
	2400	+ new Exception().printStackTrace();
2303	2401	System.exit(0);
2304	2402	if (parent != null)
2305	2403	{
..	..	@@ -2476,13 +2574,13 @@
2476	2574	return retval;
2477	2575	}
2478	2576
2479		- void doEditDrag(ClickInfo info)
	2577	+ void doEditDrag(ClickInfo info, boolean opposite)
2480	2578	{
2481	2579	switch (doSomething)
2482	2580	{
2483	2581	case 1: // '\001'
2484	2582	//super.
2485		- doEditDrag0(info);
	2583	+ doEditDrag0(info, opposite);
2486	2584	break;
2487	2585
2488	2586	case 2: // '\002'
..	..	@@ -2495,11 +2593,11 @@
2495	2593	{
2496	2594	//sel.hitSomething = childToDrag.hitSomething;
2497	2595	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2596	+ sel.doEditDrag(info, opposite);
2499	2597	} else
2500	2598	{
2501	2599	//super.
2502		- doEditDrag0(info);
	2600	+ doEditDrag0(info, opposite);
2503	2601	}
2504	2602	}
2505	2603	break;
..	..	@@ -2609,6 +2707,18 @@
2609	2707	void GenNormalsS(boolean crease)
2610	2708	{
2611	2709	selection.GenNormals(crease);
	2710	+// for (int i=0; i<selection.size(); i++)
	2711	+// {
	2712	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2713	+// selectee.GenNormals(crease);
	2714	+// }
	2715	+
	2716	+ //Touch();
	2717	+ }
	2718	+
	2719	+ void GenNormalsMeshS()
	2720	+ {
	2721	+ selection.GenNormalsMesh();
2612	2722	// for (int i=0; i<selection.size(); i++)
2613	2723	// {
2614	2724	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2859,24 @@
2749	2859	if (child == null)
2750	2860	continue;
2751	2861	child.GenNormals(crease);
	2862	+// Children().release(i);
	2863	+ }
	2864	+ blockloop = false;
	2865	+ }
	2866	+
	2867	+ void GenNormalsMesh()
	2868	+ {
	2869	+ if (blockloop)
	2870	+ return;
	2871	+
	2872	+ blockloop = true;
	2873	+ GenNormalsMesh0();
	2874	+ for (int i = 0; i < Children().Size(); i++)
	2875	+ {
	2876	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2877	+ if (child == null)
	2878	+ continue;
	2879	+ child.GenNormalsMesh();
2752	2880	// Children().release(i);
2753	2881	}
2754	2882	blockloop = false;
..	..	@@ -2906,7 +3034,8 @@
2906	3034	{
2907	3035	if (bRep != null)
2908	3036	{
2909		- bRep.GenUV();
	3037	+ bRep.GenUV(); //1);
	3038	+ //bRep.UnfoldUV();
2910	3039	Touch();
2911	3040	}
2912	3041	}
..	..	@@ -2916,6 +3045,15 @@
2916	3045	if (bRep != null)
2917	3046	{
2918	3047	bRep.GenerateNormals(crease);
	3048	+ Touch();
	3049	+ }
	3050	+ }
	3051	+
	3052	+ void GenNormalsMesh0()
	3053	+ {
	3054	+ if (bRep != null)
	3055	+ {
	3056	+ bRep.GenerateNormalsMesh();
2919	3057	Touch();
2920	3058	}
2921	3059	}
..	..	@@ -2981,6 +3119,33 @@
2981	3119	blockloop = false;
2982	3120	}
2983	3121
	3122	+ void TransformChildren()
	3123	+ {
	3124	+ if (toParent != null)
	3125	+ {
	3126	+ for (int i=Size(); --i>=0;)
	3127	+ {
	3128	+ Object3D v = get(i);
	3129	+
	3130	+ if (v.toParent == null)
	3131	+ {
	3132	+ v.toParent = LA.newMatrix();
	3133	+ v.fromParent = LA.newMatrix();
	3134	+ }
	3135	+
	3136	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3137	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3138	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3139	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3140	+ }
	3141	+
	3142	+ toParent = null; // LA.matIdentity(toParent);
	3143	+ fromParent = null; // LA.matIdentity(fromParent);
	3144	+
	3145	+ Touch();
	3146	+ }
	3147	+ }
	3148	+
2984	3149	void TransformGeometry()
2985	3150	{
2986	3151	Object3D obj = this;
..	..	@@ -3202,9 +3367,11 @@
3202	3367
3203	3368	BoundaryRep sup = bRep.support;
3204	3369	bRep.support = null;
3205		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3370	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3206	3371	// bRep.SplitInTwo(onlyone); // thread...
3207		- temprep.SplitInTwo(reduction34, onlyone);
	3372	+
	3373	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3374	+
3208	3375	bRep = temprep;
3209	3376	bRep.support = sup;
3210	3377	Touch();
..	..	@@ -3341,7 +3508,8 @@
3341	3508	if (blockloop)
3342	3509	return;
3343	3510
3344		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3511	+ if (//marked \|\| // does not make sense
	3512	+ (bRep != null \|\| material != null)) // borderline...
3345	3513	live = h;
3346	3514
3347	3515	for (int i = 0; i < Size(); i++)
..	..	@@ -3362,7 +3530,8 @@
3362	3530	return;
3363	3531
3364	3532	//if (bRep != null)
3365		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3533	+ if (//marked \|\| // does not make sense
	3534	+ (bRep != null \|\| material != null)) // borderline...
3366	3535	link2master = h;
3367	3536
3368	3537	for (int i = 0; i < Size(); i++)
..	..	@@ -3382,7 +3551,8 @@
3382	3551	if (blockloop)
3383	3552	return;
3384	3553
3385		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3554	+ if (//marked \|\| // does not make sense
	3555	+ (bRep != null \|\| material != null)) // borderline...
3386	3556	hide = h;
3387	3557
3388	3558	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3572,7 @@
3402	3572	if (blockloop)
3403	3573	return;
3404	3574
3405		- if (bRep != null && material != null) // borderline...
	3575	+ if (bRep != null \|\| material != null) // borderline...
3406	3576	marked = h;
3407	3577
3408	3578	for (int i = 0; i < Size(); i++)
..	..	@@ -3412,6 +3582,46 @@
3412	3582	continue;
3413	3583	blockloop = true;
3414	3584	child.MarkLeaves(h);
	3585	+ blockloop = false;
	3586	+ // release(i);
	3587	+ }
	3588	+ }
	3589	+
	3590	+ void RewindLeaves(boolean h)
	3591	+ {
	3592	+ if (blockloop)
	3593	+ return;
	3594	+
	3595	+ if (bRep != null \|\| material != null) // borderline...
	3596	+ rewind = h;
	3597	+
	3598	+ for (int i = 0; i < Size(); i++)
	3599	+ {
	3600	+ Object3D child = (Object3D) get(i); // reserve(i);
	3601	+ if (child == null)
	3602	+ continue;
	3603	+ blockloop = true;
	3604	+ child.RewindLeaves(h);
	3605	+ blockloop = false;
	3606	+ // release(i);
	3607	+ }
	3608	+ }
	3609	+
	3610	+ void RandomLeaves(boolean h)
	3611	+ {
	3612	+ if (blockloop)
	3613	+ return;
	3614	+
	3615	+ if (bRep != null \|\| material != null) // borderline...
	3616	+ random = h;
	3617	+
	3618	+ for (int i = 0; i < Size(); i++)
	3619	+ {
	3620	+ Object3D child = (Object3D) get(i); // reserve(i);
	3621	+ if (child == null)
	3622	+ continue;
	3623	+ blockloop = true;
	3624	+ child.RandomLeaves(h);
3415	3625	blockloop = false;
3416	3626	// release(i);
3417	3627	}
..	..	@@ -3726,7 +3936,7 @@
3726	3936	if (child == null)
3727	3937	continue;
3728	3938
3729		- if (GrafreeD.RENDERME > 0)
	3939	+ if (Grafreed.RENDERME > 0)
3730	3940	{
3731	3941	if (child instanceof Merge)
3732	3942	((Merge)child).renderme();
..	..	@@ -3877,7 +4087,7 @@
3877	4087	if (child == null)
3878	4088	continue;
3879	4089
3880		- if (GrafreeD.RENDERME > 0)
	4090	+ if (Grafreed.RENDERME > 0)
3881	4091	{
3882	4092	if (child instanceof Merge)
3883	4093	((Merge)child).renderme();
..	..	@@ -4072,7 +4282,7 @@
4072	4282	if (child == null)
4073	4283	continue;
4074	4284
4075		- if (GrafreeD.RENDERME > 0)
	4285	+ if (Grafreed.RENDERME > 0)
4076	4286	{
4077	4287	if (child instanceof Merge)
4078	4288	((Merge)child).renderme();
..	..	@@ -4185,6 +4395,55 @@
4185	4395	{
4186	4396	blockloop = true;
4187	4397	get(i).RepairShadow();
	4398	+ blockloop = false;
	4399	+ }
	4400	+ }
	4401	+
	4402	+ void RepairSOV()
	4403	+ {
	4404	+ if (blockloop)
	4405	+ return;
	4406	+
	4407	+ String texname = this.GetPigmentTexture();
	4408	+
	4409	+ if (texname.startsWith("sov"))
	4410	+ {
	4411	+ String[] s = texname.split("/");
	4412	+
	4413	+ String[] sname = s[1].split("Color.pn");
	4414	+
	4415	+ texname = sname[0];
	4416	+
	4417	+ if (sname.length > 1)
	4418	+ {
	4419	+ texname += "Color.jpg";
	4420	+ }
	4421	+
	4422	+ this.SetPigmentTexture("sov/" + texname);
	4423	+ }
	4424	+
	4425	+ texname = this.GetBumpTexture();
	4426	+
	4427	+ if (texname.startsWith("sov"))
	4428	+ {
	4429	+ String[] s = texname.split("/");
	4430	+
	4431	+ String[] sname = s[1].split("Bump.pn");
	4432	+
	4433	+ texname = sname[0];
	4434	+
	4435	+ if (sname.length > 1)
	4436	+ {
	4437	+ texname += "Bump.jpg";
	4438	+ }
	4439	+
	4440	+ this.SetBumpTexture("sov/" + texname);
	4441	+ }
	4442	+
	4443	+ for (int i=0; i<Size(); i++)
	4444	+ {
	4445	+ blockloop = true;
	4446	+ get(i).RepairSOV();
4188	4447	blockloop = false;
4189	4448	}
4190	4449	}
..	..	@@ -4679,7 +4938,7 @@
4679	4938
4680	4939	cTreePath SelectLeaf(int indexcount, boolean deselect)
4681	4940	{
4682		- if (hide)
	4941	+ if (hide \|\| dontselect)
4683	4942	return null;
4684	4943
4685	4944	if (count <= 0)
..	..	@@ -4705,7 +4964,7 @@
4705	4964
4706	4965	cTreePath Select(int indexcount, boolean deselect)
4707	4966	{
4708		- if (hide)
	4967	+ if (hide \|\| dontselect)
4709	4968	return null;
4710	4969
4711	4970	if (count <= 0)
..	..	@@ -5157,10 +5416,34 @@
5157	5416
5158	5417	// System.out.println("Fullname = " + fullname);
5159	5418
5160		- if (fullname.name.indexOf(":") == -1)
5161		- return fullname.name;
	5419	+ // Does not work on Windows due to C:
	5420	+// if (fullname.name.indexOf(":") == -1)
	5421	+// return fullname.name;
	5422	+//
	5423	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5162	5424
5163		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5425	+ String[] split = fullname.name.split(":");
	5426	+
	5427	+ if (split.length == 0)
	5428	+ {
	5429	+ return "";
	5430	+ }
	5431	+
	5432	+ if (split.length <= 2)
	5433	+ {
	5434	+ if (fullname.name.endsWith(":"))
	5435	+ {
	5436	+ // Windows
	5437	+ return fullname.name.substring(0, fullname.name.length()-1);
	5438	+ }
	5439	+
	5440	+ return split[0];
	5441	+ }
	5442	+
	5443	+ // Windows
	5444	+ assert(split.length == 4);
	5445	+
	5446	+ return split[0] + ":" + split[1];
5164	5447	}
5165	5448
5166	5449	static String GetBump(cTexture fullname)
..	..	@@ -5169,10 +5452,38 @@
5169	5452	return "";
5170	5453
5171	5454	// 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());
	5455	+ // Does not work on Windows due to C:
	5456	+// if (fullname.name.indexOf(":") == -1)
	5457	+// return "";
	5458	+//
	5459	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5460	+ String[] split = fullname.name.split(":");
	5461	+
	5462	+ if (split.length == 0)
	5463	+ {
	5464	+ return "";
	5465	+ }
	5466	+
	5467	+ if (split.length == 1)
	5468	+ {
	5469	+ return "";
	5470	+ }
	5471	+
	5472	+ if (split.length == 2)
	5473	+ {
	5474	+ if (fullname.name.endsWith(":"))
	5475	+ {
	5476	+ // Windows
	5477	+ return "";
	5478	+ }
	5479	+
	5480	+ return split[1];
	5481	+ }
	5482	+
	5483	+ // Windows
	5484	+ assert(split.length == 4);
	5485	+
	5486	+ return split[2] + ":" + split[3];
5176	5487	}
5177	5488
5178	5489	String GetPigmentTexture()
..	..	@@ -5246,7 +5557,7 @@
5246	5557	System.out.print("; textures = " + textures);
5247	5558	System.out.println("; usedtextures = " + usedtextures);
5248	5559
5249		- if (GetTextures() == null)
	5560	+ if (GetTextures() == null) // What is that??
5250	5561	GetTextures().name = ":";
5251	5562
5252	5563	String texname = tex;
..	..	@@ -5277,6 +5588,43 @@
5277	5588	child.ResetPigmentTexture();
5278	5589	blockloop = false;
5279	5590	}
	5591	+ }
	5592	+
	5593	+ UUID GetUUID()
	5594	+ {
	5595	+ if (uuid == null)
	5596	+ {
	5597	+ // Serial
	5598	+ uuid = UUID.randomUUID();
	5599	+ }
	5600	+
	5601	+ return uuid;
	5602	+ }
	5603	+
	5604	+ Object3D GetObject(UUID uid)
	5605	+ {
	5606	+ if (blockloop)
	5607	+ return null;
	5608	+
	5609	+ if (GetUUID().equals(uid))
	5610	+ return this;
	5611	+
	5612	+ int nb = Size();
	5613	+ for (int i = 0; i < nb; i++)
	5614	+ {
	5615	+ Object3D child = (Object3D) get(i);
	5616	+
	5617	+ if (child == null)
	5618	+ continue;
	5619	+
	5620	+ blockloop = true;
	5621	+ Object3D obj = child.GetObject(uid);
	5622	+ blockloop = false;
	5623	+ if (obj != null)
	5624	+ return obj;
	5625	+ }
	5626	+
	5627	+ return null;
5280	5628	}
5281	5629
5282	5630	void SetBumpTexture(String tex)
..	..	@@ -5323,12 +5671,23 @@
5323	5671	boolean NeedSupport()
5324	5672	{
5325	5673	return
5326		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5674	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5327	5675	// PROBLEM with CROWD!!
5328		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5676	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5329	5677	}
5330	5678
5331	5679	static boolean DEBUG_SELECTION = false;
	5680	+
	5681	+ boolean IsLive()
	5682	+ {
	5683	+ if (live)
	5684	+ return true;
	5685	+
	5686	+ if (parent == null)
	5687	+ return false;
	5688	+
	5689	+ return parent.IsLive();
	5690	+ }
5332	5691
5333	5692	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5334	5693	{
..	..	@@ -5340,7 +5699,7 @@
5340	5699	}
5341	5700
5342	5701	if (display.DrawMode() == iCameraPane.SELECTION &&
5343		- hide)
	5702	+ (hide \|\| dontselect))
5344	5703	return;
5345	5704
5346	5705	if (name != null && name.contains("sclera"))
..	..	@@ -5391,7 +5750,7 @@
5391	5750	support = support;
5392	5751
5393	5752	//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);
	5753	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395	5754
5396	5755	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5397	5756	{
..	..	@@ -5411,10 +5770,12 @@
5411	5770	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5412	5771
5413	5772	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5414		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5773	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5774	+ (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5415	5775	{
5416	5776	Globals.lighttouched = true;
5417	5777	} // all panes...
	5778	+
5418	5779	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5419	5780	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5420	5781	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5582,7 +5943,28 @@
5582	5943	tex = GetTextures();
5583	5944	}
5584	5945
5585		- display.BindTextures(tex, texres);
	5946	+ boolean failedPigment = false;
	5947	+ boolean failedBump = false;
	5948	+
	5949	+ try
	5950	+ {
	5951	+ display.BindPigmentTexture(tex, texres);
	5952	+ }
	5953	+ catch (Exception e)
	5954	+ {
	5955	+ System.err.println("FAILED: " + this);
	5956	+ failedPigment = true;
	5957	+ }
	5958	+
	5959	+ try
	5960	+ {
	5961	+ display.BindBumpTexture(tex, texres);
	5962	+ }
	5963	+ catch (Exception e)
	5964	+ {
	5965	+ //System.err.println("FAILED: " + this);
	5966	+ failedBump = true;
	5967	+ }
5586	5968
5587	5969	if (!compiled)
5588	5970	{
..	..	@@ -5604,7 +5986,11 @@
5604	5986	}
5605	5987	}
5606	5988
5607		- display.ReleaseTextures(tex);
	5989	+ if (!failedBump)
	5990	+ display.ReleaseBumpTexture(tex);
	5991	+
	5992	+ if (!failedPigment)
	5993	+ display.ReleasePigmentTexture(tex);
5608	5994
5609	5995	display.PopMaterial(this, selected);
5610	5996	}
..	..	@@ -5733,6 +6119,9 @@
5733	6119
5734	6120	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5735	6121	{
	6122	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6123	+ return;
	6124	+
5736	6125	if (hide)
5737	6126	return;
5738	6127	// shadow optimisation
..	..	@@ -5858,6 +6247,9 @@
5858	6247	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5859	6248	return; // no shadow for transparent objects
5860	6249
	6250	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6251	+ return;
	6252	+
5861	6253	if (hide)
5862	6254	return;
5863	6255
..	..	@@ -5898,6 +6290,7 @@
5898	6290	return;
5899	6291	}
5900	6292
	6293	+ //bRep.GenUV(1/material.diffuseness);
5901	6294	// bRep.lock = true;
5902	6295
5903	6296	//javax.media.opengl.GL gl = display.GetGL();
..	..	@@ -5970,6 +6363,11 @@
5970	6363	// dec 2012
5971	6364	new Exception().printStackTrace();
5972	6365	return;
	6366	+ }
	6367	+
	6368	+ if (dontselect)
	6369	+ {
	6370	+ //bRep.GenerateNormalsMINE();
5973	6371	}
5974	6372
5975	6373	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6822,7 +7220,7 @@
6822	7220	spot.translate(32, 32);
6823	7221	spotw = spot.x + spot.width;
6824	7222	spoth = spot.y + spot.height;
6825		- info.g.setColor(Color.blue);
	7223	+ info.g.setColor(Color.cyan);
6826	7224	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6827	7225	// if (CameraPane.Xmin > spot.x)
6828	7226	// {
..	..	@@ -6840,11 +7238,12 @@
6840	7238	// {
6841	7239	// CameraPane.Ymax = spoth;
6842	7240	// }
6843		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7241	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7242	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6845	7243	spot.translate(0, -32);
6846		- info.g.setColor(Color.green);
	7244	+ info.g.setColor(Color.yellow);
6847	7245	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7246	+ info.g.setColor(Color.green);
6848	7247	// if (CameraPane.Xmin > spot.x)
6849	7248	// {
6850	7249	// CameraPane.Xmin = spot.x;
..	..	@@ -6896,7 +7295,7 @@
6896	7295	startX = info.x;
6897	7296	startY = info.y;
6898	7297
6899		- hitSomething = 0;
	7298	+ hitSomething = -1;
6900	7299	cVector origin = new cVector();
6901	7300	//LA.xformPos(origin, toParent, origin);
6902	7301	Rectangle spot = new Rectangle();
..	..	@@ -6929,7 +7328,7 @@
6929	7328	}
6930	7329
6931	7330	//System.out.println("info.modifiers = " + info.modifiers);
6932		- modified = (info.modifiers & CameraPane.META) != 0;
	7331	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
6933	7332	//System.out.println("modified = " + modified);
6934	7333	//new Exception().printStackTrace();
6935	7334	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6957,7 +7356,7 @@
6957	7356	return true;
6958	7357	}
6959	7358
6960		- void doEditDrag0(ClickInfo info)
	7359	+ void doEditDrag0(ClickInfo info, boolean opposite)
6961	7360	{
6962	7361	if (hitSomething == 0)
6963	7362	{
..	..	@@ -6972,6 +7371,7 @@
6972	7371	//System.out.println("hitSomething = " + hitSomething);
6973	7372
6974	7373	double scale = 0.005f * info.camera.Distance();
	7374	+
6975	7375	cVector xlate = new cVector();
6976	7376	//cVector xlate2 = new cVector();
6977	7377	switch (hitSomething)
..	..	@@ -6984,7 +7384,7 @@
6984	7384
6985	7385	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6986	7386
6987		- if (modified)
	7387	+ if (modified \|\| opposite)
6988	7388	{
6989	7389	//assert(false);
6990	7390	/*
..	..	@@ -7078,6 +7478,7 @@
7078	7478
7079	7479	if (modified)
7080	7480	{
	7481	+ // Rotate 90 degrees
7081	7482	angle /= (Math.PI / 4);
7082	7483	angle = Math.floor(angle + 0.5);
7083	7484	angle *= (Math.PI / 4);
..	..	@@ -7119,24 +7520,27 @@
7119	7520
7120	7521	case hitScale: // scale
7121	7522	double hScale = (double) (info.x - centerPt.x) / 32;
	7523	+ double sign = 1;
	7524	+ if (hScale < 0)
	7525	+ {
	7526	+ sign = -1;
	7527	+ }
	7528	+ hScale = signMath.pow(signhScale, scale * 50);
7122	7529	if (hScale < 0.01)
7123	7530	{
7124		- hScale = 0.01;
	7531	+ //hScale = 0.01;
7125	7532	}
7126		- hScale = Math.pow(hScale, scale * 50);
7127		- if (hScale < 0.01)
7128		- {
7129		- hScale = 0.01;
7130		- }
	7533	+
7131	7534	double vScale = (double) (info.y - centerPt.y) / 32;
7132		- if (vScale < 0.01)
	7535	+ sign = 1;
	7536	+ if (vScale < 0)
7133	7537	{
7134		- vScale = 0.01;
	7538	+ sign = -1;
7135	7539	}
7136		- vScale = Math.pow(vScale, scale * 50);
	7540	+ vScale = signMath.pow(signvScale, scale * 50);
7137	7541	if (vScale < 0.01)
7138	7542	{
7139		- vScale = 0.01;
	7543	+ //vScale = 0.01;
7140	7544	}
7141	7545	LA.matCopy(startMat, toParent);
7142	7546	/**/
..	..	@@ -7147,39 +7551,47 @@
7147	7551	}
7148	7552	/**/
7149	7553
	7554	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7555	+
	7556	+ if (totalScale < 0.01)
	7557	+ {
	7558	+ totalScale = 0.01;
	7559	+ }
	7560	+
7150	7561	switch (info.pane.RenderCamera().viewCode)
7151	7562	{
7152	7563	case 3: // '\001'
7153		- if (modified)
	7564	+ if (modified \|\| opposite)
7154	7565	{
7155	7566	//LA.matScale(toParent, 1, hScale, vScale);
7156		- LA.matScale(toParent, vScale, 1, 1);
	7567	+ LA.matScale(toParent, totalScale, 1, 1);
7157	7568	} // vScale, 1);
7158	7569	else
7159	7570	{
7160		- LA.matScale(toParent, vScale, vScale, vScale);
	7571	+ // EXCEPTION!
	7572	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7161	7573	} // vScale, 1);
7162	7574	break;
7163	7575
7164	7576	case 2: // '\002'
7165		- if (modified)
	7577	+ if (modified \|\| opposite)
7166	7578	{
7167	7579	//LA.matScale(toParent, hScale, 1, vScale);
7168		- LA.matScale(toParent, 1, vScale, 1);
	7580	+ LA.matScale(toParent, 1, totalScale, 1);
7169	7581	} else
7170	7582	{
7171		- LA.matScale(toParent, vScale, 1, vScale);
	7583	+ LA.matScale(toParent, totalScale, 1, totalScale);
7172	7584	}
7173	7585	break;
7174	7586
7175	7587	case 1: // '\003'
7176		- if (modified)
	7588	+ if (modified \|\| opposite)
7177	7589	{
7178	7590	//LA.matScale(toParent, hScale, vScale, 1);
7179		- LA.matScale(toParent, 1, 1, vScale);
	7591	+ LA.matScale(toParent, 1, 1, totalScale);
7180	7592	} else
7181	7593	{
7182		- LA.matScale(toParent, vScale, vScale, 1);
	7594	+ LA.matScale(toParent, totalScale, totalScale, 1);
7183	7595	}
7184	7596	break;
7185	7597	}
..	..	@@ -7312,14 +7724,22 @@
7312	7724	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7313	7725	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7314	7726	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7727	+
	7728	+ String objname;
	7729	+
7315	7730	if (false) //parent != null)
7316	7731	{
7317		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7732	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7318	7733	} else
7319	7734	{
7320		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7735	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7321	7736	} // + super.toString();
7322	7737	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7738	+
	7739	+ if (!Globals.ADVANCED)
	7740	+ return objname;
	7741	+
	7742	+ return objname + " " + System.identityHashCode(this);
7323	7743	}
7324	7744
7325	7745	public int hashCode()
..	..	@@ -7375,6 +7795,7 @@
7375	7795	objectUI.closeUI();
7376	7796	if (editWindow != null)
7377	7797	{
	7798	+ editWindow.ctrlPanel.FlushUI();
7378	7799	editWindow.refreshContents();
7379	7800	} // ? new
7380	7801	objectUI = null;
..	..	@@ -7383,6 +7804,10 @@
7383	7804	{
7384	7805	editWindow = null;
7385	7806	} // ?
	7807	+ }
	7808	+ else
	7809	+ {
	7810	+ //editWindow.closeUI();
7386	7811	}
7387	7812	}
7388	7813
..	..	@@ -7395,7 +7820,7 @@
7395	7820	/transient/ cVector2[] projectedVertices = new cVector2[0];
7396	7821
7397	7822	Object3D /Composite/ parent;
7398		- Object3D /Composite/ fileparent;
	7823	+ Object3D /Composite/ fileparent; // In the case of FileObject
7399	7824
7400	7825	double[][] toParent; // dynamic matrix
7401	7826	double[][] fromParent;
..	..	@@ -7510,7 +7935,7 @@
7510	7935	{
7511	7936	assert(bRep != null);
7512	7937	if (!(support instanceof GenericJoint)) // support.bRep != null)
7513		- GrafreeD.Assert(support.bRep == bRep.support);
	7938	+ Grafreed.Assert(support.bRep == bRep.support);
7514	7939	}
7515	7940	else
7516	7941	{
..	..	@@ -7559,9 +7984,9 @@
7559	7984	private static cVector edge2 = new cVector();
7560	7985	//private static cVector norm = new cVector();
7561	7986	/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;
	7987	+ static final int hitCenter = 1;
	7988	+ static final int hitScale = 2;
	7989	+ static final int hitRotate = 3;
7565	7990	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7566	7991	/transient/ private Point centerPt;
7567	7992	/transient/ private int startX;