~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 \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
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;
..	..	@@ -881,6 +966,7 @@
881	966	if (material == null \|\| material.multiply)
882	967	return true;
883	968
	969	+ // Transparent objects are dynamic because we have to sort the triangles.
884	970	return material.opacity > 0.99;
885	971	}
886	972
..	..	@@ -912,6 +998,11 @@
912	998	fromParent = null; // LA.newMatrix();
913	999	bRep = null; // new BoundaryRep();
914	1000
	1001	+ if (oname != null && oname.equals("LeftHand"))
	1002	+ {
	1003	+ name = oname;
	1004	+ }
	1005	+
915	1006	/*
916	1007	float hue = (float)Math.random();
917	1008	Color col;
..	..	@@ -1470,7 +1561,7 @@
1470	1561	BoundaryRep.SEUIL = other.material.cameralight;
1471	1562
1472	1563	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1564	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1565	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1566	}
1476	1567
..	..	@@ -1829,12 +1920,15 @@
1829	1920	if (obj.name == null)
1830	1921	continue; // can't be a null one
1831	1922
	1923	+ // Try perfect match first.
1832	1924	if (n.equals(obj.name))
1833	1925	{
1834	1926	theobj = obj;
1835	1927	count++;
1836	1928	}
1837	1929	}
	1930	+
	1931	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1932
1839	1933	if (count != 1)
1840	1934	for (int i=Size(); --i>=0;)
..	..	@@ -2294,6 +2388,10 @@
2294	2388	}
2295	2389	*/
2296	2390	}
	2391	+ else
	2392	+ {
	2393	+ //((ObjEditor)editWindow).SetupUI2(null);
	2394	+ }
2297	2395	}
2298	2396
2299	2397	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2619,6 +2717,18 @@
2619	2717	//Touch();
2620	2718	}
2621	2719
	2720	+ void GenNormalsMeshS()
	2721	+ {
	2722	+ selection.GenNormalsMesh();
	2723	+// for (int i=0; i<selection.size(); i++)
	2724	+// {
	2725	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2726	+// selectee.GenNormals(crease);
	2727	+// }
	2728	+
	2729	+ //Touch();
	2730	+ }
	2731	+
2622	2732	void ClearColorsS()
2623	2733	{
2624	2734	selection.ClearColors();
..	..	@@ -2750,6 +2860,24 @@
2750	2860	if (child == null)
2751	2861	continue;
2752	2862	child.GenNormals(crease);
	2863	+// Children().release(i);
	2864	+ }
	2865	+ blockloop = false;
	2866	+ }
	2867	+
	2868	+ void GenNormalsMesh()
	2869	+ {
	2870	+ if (blockloop)
	2871	+ return;
	2872	+
	2873	+ blockloop = true;
	2874	+ GenNormalsMesh0();
	2875	+ for (int i = 0; i < Children().Size(); i++)
	2876	+ {
	2877	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2878	+ if (child == null)
	2879	+ continue;
	2880	+ child.GenNormalsMesh();
2753	2881	// Children().release(i);
2754	2882	}
2755	2883	blockloop = false;
..	..	@@ -2922,6 +3050,15 @@
2922	3050	}
2923	3051	}
2924	3052
	3053	+ void GenNormalsMesh0()
	3054	+ {
	3055	+ if (bRep != null)
	3056	+ {
	3057	+ bRep.GenerateNormalsMesh();
	3058	+ Touch();
	3059	+ }
	3060	+ }
	3061	+
2925	3062	void GenNormalsMINE0()
2926	3063	{
2927	3064	if (bRep != null)
..	..	@@ -2983,6 +3120,33 @@
2983	3120	blockloop = false;
2984	3121	}
2985	3122
	3123	+ void TransformChildren()
	3124	+ {
	3125	+ if (toParent != null)
	3126	+ {
	3127	+ for (int i=Size(); --i>=0;)
	3128	+ {
	3129	+ Object3D v = get(i);
	3130	+
	3131	+ if (v.toParent == null)
	3132	+ {
	3133	+ v.toParent = LA.newMatrix();
	3134	+ v.fromParent = LA.newMatrix();
	3135	+ }
	3136	+
	3137	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3138	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3139	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3140	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3141	+ }
	3142	+
	3143	+ toParent = null; // LA.matIdentity(toParent);
	3144	+ fromParent = null; // LA.matIdentity(fromParent);
	3145	+
	3146	+ Touch();
	3147	+ }
	3148	+ }
	3149	+
2986	3150	void TransformGeometry()
2987	3151	{
2988	3152	Object3D obj = this;
..	..	@@ -3206,7 +3370,9 @@
3206	3370	bRep.support = null;
3207	3371	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3372	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3373	+
	3374	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3375	+
3210	3376	bRep = temprep;
3211	3377	bRep.support = sup;
3212	3378	Touch();
..	..	@@ -3343,7 +3509,8 @@
3343	3509	if (blockloop)
3344	3510	return;
3345	3511
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3512	+ if (//marked \|\| // does not make sense
	3513	+ (bRep != null \|\| material != null)) // borderline...
3347	3514	live = h;
3348	3515
3349	3516	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3531,8 @@
3364	3531	return;
3365	3532
3366	3533	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3534	+ if (//marked \|\| // does not make sense
	3535	+ (bRep != null \|\| material != null)) // borderline...
3368	3536	link2master = h;
3369	3537
3370	3538	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3552,8 @@
3384	3552	if (blockloop)
3385	3553	return;
3386	3554
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3555	+ if (//marked \|\| // does not make sense
	3556	+ (bRep != null \|\| material != null)) // borderline...
3388	3557	hide = h;
3389	3558
3390	3559	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3573,7 @@
3404	3573	if (blockloop)
3405	3574	return;
3406	3575
3407		- if (bRep != null && material != null) // borderline...
	3576	+ if (bRep != null \|\| material != null) // borderline...
3408	3577	marked = h;
3409	3578
3410	3579	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3583,46 @@
3414	3583	continue;
3415	3584	blockloop = true;
3416	3585	child.MarkLeaves(h);
	3586	+ blockloop = false;
	3587	+ // release(i);
	3588	+ }
	3589	+ }
	3590	+
	3591	+ void RewindLeaves(boolean h)
	3592	+ {
	3593	+ if (blockloop)
	3594	+ return;
	3595	+
	3596	+ if (bRep != null \|\| material != null) // borderline...
	3597	+ rewind = h;
	3598	+
	3599	+ for (int i = 0; i < Size(); i++)
	3600	+ {
	3601	+ Object3D child = (Object3D) get(i); // reserve(i);
	3602	+ if (child == null)
	3603	+ continue;
	3604	+ blockloop = true;
	3605	+ child.RewindLeaves(h);
	3606	+ blockloop = false;
	3607	+ // release(i);
	3608	+ }
	3609	+ }
	3610	+
	3611	+ void RandomLeaves(boolean h)
	3612	+ {
	3613	+ if (blockloop)
	3614	+ return;
	3615	+
	3616	+ if (bRep != null \|\| material != null) // borderline...
	3617	+ random = h;
	3618	+
	3619	+ for (int i = 0; i < Size(); i++)
	3620	+ {
	3621	+ Object3D child = (Object3D) get(i); // reserve(i);
	3622	+ if (child == null)
	3623	+ continue;
	3624	+ blockloop = true;
	3625	+ child.RandomLeaves(h);
3417	3626	blockloop = false;
3418	3627	// release(i);
3419	3628	}
..	..	@@ -4191,6 +4400,55 @@
4191	4400	}
4192	4401	}
4193	4402
	4403	+ void RepairSOV()
	4404	+ {
	4405	+ if (blockloop)
	4406	+ return;
	4407	+
	4408	+ String texname = this.GetPigmentTexture();
	4409	+
	4410	+ if (texname.startsWith("sov"))
	4411	+ {
	4412	+ String[] s = texname.split("/");
	4413	+
	4414	+ String[] sname = s[1].split("Color.pn");
	4415	+
	4416	+ texname = sname[0];
	4417	+
	4418	+ if (sname.length > 1)
	4419	+ {
	4420	+ texname += "Color.jpg";
	4421	+ }
	4422	+
	4423	+ this.SetPigmentTexture("sov/" + texname);
	4424	+ }
	4425	+
	4426	+ texname = this.GetBumpTexture();
	4427	+
	4428	+ if (texname.startsWith("sov"))
	4429	+ {
	4430	+ String[] s = texname.split("/");
	4431	+
	4432	+ String[] sname = s[1].split("Bump.pn");
	4433	+
	4434	+ texname = sname[0];
	4435	+
	4436	+ if (sname.length > 1)
	4437	+ {
	4438	+ texname += "Bump.jpg";
	4439	+ }
	4440	+
	4441	+ this.SetBumpTexture("sov/" + texname);
	4442	+ }
	4443	+
	4444	+ for (int i=0; i<Size(); i++)
	4445	+ {
	4446	+ blockloop = true;
	4447	+ get(i).RepairSOV();
	4448	+ blockloop = false;
	4449	+ }
	4450	+ }
	4451	+
4194	4452	void RepairTexture()
4195	4453	{
4196	4454	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4681,7 +4939,7 @@
4681	4939
4682	4940	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	4941	{
4684		- if (hide)
	4942	+ if (hide \|\| dontselect)
4685	4943	return null;
4686	4944
4687	4945	if (count <= 0)
..	..	@@ -4707,7 +4965,7 @@
4707	4965
4708	4966	cTreePath Select(int indexcount, boolean deselect)
4709	4967	{
4710		- if (hide)
	4968	+ if (hide \|\| dontselect)
4711	4969	return null;
4712	4970
4713	4971	if (count <= 0)
..	..	@@ -5333,6 +5591,43 @@
5333	5591	}
5334	5592	}
5335	5593
	5594	+ UUID GetUUID()
	5595	+ {
	5596	+ if (uuid == null)
	5597	+ {
	5598	+ // Serial
	5599	+ uuid = UUID.randomUUID();
	5600	+ }
	5601	+
	5602	+ return uuid;
	5603	+ }
	5604	+
	5605	+ Object3D GetObject(UUID uid)
	5606	+ {
	5607	+ if (blockloop)
	5608	+ return null;
	5609	+
	5610	+ if (GetUUID().equals(uid))
	5611	+ return this;
	5612	+
	5613	+ int nb = Size();
	5614	+ for (int i = 0; i < nb; i++)
	5615	+ {
	5616	+ Object3D child = (Object3D) get(i);
	5617	+
	5618	+ if (child == null)
	5619	+ continue;
	5620	+
	5621	+ blockloop = true;
	5622	+ Object3D obj = child.GetObject(uid);
	5623	+ blockloop = false;
	5624	+ if (obj != null)
	5625	+ return obj;
	5626	+ }
	5627	+
	5628	+ return null;
	5629	+ }
	5630	+
5336	5631	void SetBumpTexture(String tex)
5337	5632	{
5338	5633	if (GetTextures() == null)
..	..	@@ -5377,12 +5672,23 @@
5377	5672	boolean NeedSupport()
5378	5673	{
5379	5674	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5675	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5381	5676	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5677	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5678	}
5384	5679
5385	5680	static boolean DEBUG_SELECTION = false;
	5681	+
	5682	+ boolean IsLive()
	5683	+ {
	5684	+ if (live)
	5685	+ return true;
	5686	+
	5687	+ if (parent == null)
	5688	+ return false;
	5689	+
	5690	+ return parent.IsLive();
	5691	+ }
5386	5692
5387	5693	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	5694	{
..	..	@@ -5394,7 +5700,7 @@
5394	5700	}
5395	5701
5396	5702	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5703	+ (hide \|\| dontselect))
5398	5704	return;
5399	5705
5400	5706	if (name != null && name.contains("sclera"))
..	..	@@ -5445,7 +5751,7 @@
5445	5751	support = support;
5446	5752
5447	5753	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5448		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5754	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5449	5755
5450	5756	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	5757	{
..	..	@@ -5465,10 +5771,12 @@
5465	5771	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	5772
5467	5773	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5774	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5775	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5469	5776	{
5470	5777	Globals.lighttouched = true;
5471	5778	} // all panes...
	5779	+
5472	5780	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	5781	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	5782	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5636,7 +5944,28 @@
5636	5944	tex = GetTextures();
5637	5945	}
5638	5946
5639		- display.BindTextures(tex, texres);
	5947	+ boolean failedPigment = false;
	5948	+ boolean failedBump = false;
	5949	+
	5950	+ try
	5951	+ {
	5952	+ display.BindPigmentTexture(tex, texres);
	5953	+ }
	5954	+ catch (Exception e)
	5955	+ {
	5956	+ System.err.println("FAILED: " + this);
	5957	+ failedPigment = true;
	5958	+ }
	5959	+
	5960	+ try
	5961	+ {
	5962	+ display.BindBumpTexture(tex, texres);
	5963	+ }
	5964	+ catch (Exception e)
	5965	+ {
	5966	+ //System.err.println("FAILED: " + this);
	5967	+ failedBump = true;
	5968	+ }
5640	5969
5641	5970	if (!compiled)
5642	5971	{
..	..	@@ -5658,7 +5987,11 @@
5658	5987	}
5659	5988	}
5660	5989
5661		- display.ReleaseTextures(tex);
	5990	+ if (!failedBump)
	5991	+ display.ReleaseBumpTexture(tex);
	5992	+
	5993	+ if (!failedPigment)
	5994	+ display.ReleasePigmentTexture(tex);
5662	5995
5663	5996	display.PopMaterial(this, selected);
5664	5997	}
..	..	@@ -5787,6 +6120,9 @@
5787	6120
5788	6121	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6122	{
	6123	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6124	+ return;
	6125	+
5790	6126	if (hide)
5791	6127	return;
5792	6128	// shadow optimisation
..	..	@@ -5912,6 +6248,9 @@
5912	6248	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6249	return; // no shadow for transparent objects
5914	6250
	6251	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6252	+ return;
	6253	+
5915	6254	if (hide)
5916	6255	return;
5917	6256
..	..	@@ -6025,6 +6364,11 @@
6025	6364	// dec 2012
6026	6365	new Exception().printStackTrace();
6027	6366	return;
	6367	+ }
	6368	+
	6369	+ if (dontselect)
	6370	+ {
	6371	+ //bRep.GenerateNormalsMINE();
6028	6372	}
6029	6373
6030	6374	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6877,7 +7221,7 @@
6877	7221	spot.translate(32, 32);
6878	7222	spotw = spot.x + spot.width;
6879	7223	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
	7224	+ info.g.setColor(Color.cyan);
6881	7225	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7226	// if (CameraPane.Xmin > spot.x)
6883	7227	// {
..	..	@@ -6895,11 +7239,12 @@
6895	7239	// {
6896	7240	// CameraPane.Ymax = spoth;
6897	7241	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7242	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7243	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6900	7244	spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
	7245	+ info.g.setColor(Color.yellow);
6902	7246	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7247	+ info.g.setColor(Color.green);
6903	7248	// if (CameraPane.Xmin > spot.x)
6904	7249	// {
6905	7250	// CameraPane.Xmin = spot.x;
..	..	@@ -6951,7 +7296,7 @@
6951	7296	startX = info.x;
6952	7297	startY = info.y;
6953	7298
6954		- hitSomething = 0;
	7299	+ hitSomething = -1;
6955	7300	cVector origin = new cVector();
6956	7301	//LA.xformPos(origin, toParent, origin);
6957	7302	Rectangle spot = new Rectangle();
..	..	@@ -7027,6 +7372,7 @@
7027	7372	//System.out.println("hitSomething = " + hitSomething);
7028	7373
7029	7374	double scale = 0.005f * info.camera.Distance();
	7375	+
7030	7376	cVector xlate = new cVector();
7031	7377	//cVector xlate2 = new cVector();
7032	7378	switch (hitSomething)
..	..	@@ -7175,24 +7521,27 @@
7175	7521
7176	7522	case hitScale: // scale
7177	7523	double hScale = (double) (info.x - centerPt.x) / 32;
	7524	+ double sign = 1;
	7525	+ if (hScale < 0)
	7526	+ {
	7527	+ sign = -1;
	7528	+ }
	7529	+ hScale = signMath.pow(signhScale, scale * 50);
7178	7530	if (hScale < 0.01)
7179	7531	{
7180		- hScale = 0.01;
	7532	+ //hScale = 0.01;
7181	7533	}
7182		- hScale = Math.pow(hScale, scale * 50);
7183		- if (hScale < 0.01)
7184		- {
7185		- hScale = 0.01;
7186		- }
	7534	+
7187	7535	double vScale = (double) (info.y - centerPt.y) / 32;
7188		- if (vScale < 0.01)
	7536	+ sign = 1;
	7537	+ if (vScale < 0)
7189	7538	{
7190		- vScale = 0.01;
	7539	+ sign = -1;
7191	7540	}
7192		- vScale = Math.pow(vScale, scale * 50);
	7541	+ vScale = signMath.pow(signvScale, scale * 50);
7193	7542	if (vScale < 0.01)
7194	7543	{
7195		- vScale = 0.01;
	7544	+ //vScale = 0.01;
7196	7545	}
7197	7546	LA.matCopy(startMat, toParent);
7198	7547	/**/
..	..	@@ -7203,39 +7552,47 @@
7203	7552	}
7204	7553	/**/
7205	7554
	7555	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7556	+
	7557	+ if (totalScale < 0.01)
	7558	+ {
	7559	+ totalScale = 0.01;
	7560	+ }
	7561	+
7206	7562	switch (info.pane.RenderCamera().viewCode)
7207	7563	{
7208	7564	case 3: // '\001'
7209		- if (modified)
	7565	+ if (modified \|\| opposite)
7210	7566	{
7211	7567	//LA.matScale(toParent, 1, hScale, vScale);
7212		- LA.matScale(toParent, vScale, 1, 1);
	7568	+ LA.matScale(toParent, totalScale, 1, 1);
7213	7569	} // vScale, 1);
7214	7570	else
7215	7571	{
7216		- LA.matScale(toParent, vScale, vScale, vScale);
	7572	+ // EXCEPTION!
	7573	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7217	7574	} // vScale, 1);
7218	7575	break;
7219	7576
7220	7577	case 2: // '\002'
7221		- if (modified)
	7578	+ if (modified \|\| opposite)
7222	7579	{
7223	7580	//LA.matScale(toParent, hScale, 1, vScale);
7224		- LA.matScale(toParent, 1, vScale, 1);
	7581	+ LA.matScale(toParent, 1, totalScale, 1);
7225	7582	} else
7226	7583	{
7227		- LA.matScale(toParent, vScale, 1, vScale);
	7584	+ LA.matScale(toParent, totalScale, 1, totalScale);
7228	7585	}
7229	7586	break;
7230	7587
7231	7588	case 1: // '\003'
7232		- if (modified)
	7589	+ if (modified \|\| opposite)
7233	7590	{
7234	7591	//LA.matScale(toParent, hScale, vScale, 1);
7235		- LA.matScale(toParent, 1, 1, vScale);
	7592	+ LA.matScale(toParent, 1, 1, totalScale);
7236	7593	} else
7237	7594	{
7238		- LA.matScale(toParent, vScale, vScale, 1);
	7595	+ LA.matScale(toParent, totalScale, totalScale, 1);
7239	7596	}
7240	7597	break;
7241	7598	}
..	..	@@ -7368,14 +7725,22 @@
7368	7725	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369	7726	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370	7727	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7728	+
	7729	+ String objname;
	7730	+
7371	7731	if (false) //parent != null)
7372	7732	{
7373		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7733	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374	7734	} else
7375	7735	{
7376		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7736	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7377	7737	} // + super.toString();
7378	7738	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7739	+
	7740	+ if (!Globals.ADVANCED)
	7741	+ return objname;
	7742	+
	7743	+ return objname + " " + System.identityHashCode(this);
7379	7744	}
7380	7745
7381	7746	public int hashCode()
..	..	@@ -7441,6 +7806,10 @@
7441	7806	editWindow = null;
7442	7807	} // ?
7443	7808	}
	7809	+ else
	7810	+ {
	7811	+ //editWindow.closeUI();
	7812	+ }
7444	7813	}
7445	7814
7446	7815	boolean root; // patch for edit windows
..	..	@@ -7452,7 +7821,7 @@
7452	7821	/transient/ cVector2[] projectedVertices = new cVector2[0];
7453	7822
7454	7823	Object3D /Composite/ parent;
7455		- Object3D /Composite/ fileparent;
	7824	+ Object3D /Composite/ fileparent; // In the case of FileObject
7456	7825
7457	7826	double[][] toParent; // dynamic matrix
7458	7827	double[][] fromParent;
..	..	@@ -7616,9 +7985,9 @@
7616	7985	private static cVector edge2 = new cVector();
7617	7986	//private static cVector norm = new cVector();
7618	7987	/transient private/ int hitSomething;
7619		- private static final int hitCenter = 1;
7620		- private static final int hitScale = 2;
7621		- private static final int hitRotate = 3;
	7988	+ static final int hitCenter = 1;
	7989	+ static final int hitScale = 2;
	7990	+ static final int hitRotate = 3;
7622	7991	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7623	7992	/transient/ private Point centerPt;
7624	7993	/transient/ private int startX;