~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;
..	..	@@ -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
..	..	@@ -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;)
..	..	@@ -2619,6 +2712,18 @@
2619	2712	//Touch();
2620	2713	}
2621	2714
	2715	+ void GenNormalsMeshS()
	2716	+ {
	2717	+ selection.GenNormalsMesh();
	2718	+// for (int i=0; i<selection.size(); i++)
	2719	+// {
	2720	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2721	+// selectee.GenNormals(crease);
	2722	+// }
	2723	+
	2724	+ //Touch();
	2725	+ }
	2726	+
2622	2727	void ClearColorsS()
2623	2728	{
2624	2729	selection.ClearColors();
..	..	@@ -2750,6 +2855,24 @@
2750	2855	if (child == null)
2751	2856	continue;
2752	2857	child.GenNormals(crease);
	2858	+// Children().release(i);
	2859	+ }
	2860	+ blockloop = false;
	2861	+ }
	2862	+
	2863	+ void GenNormalsMesh()
	2864	+ {
	2865	+ if (blockloop)
	2866	+ return;
	2867	+
	2868	+ blockloop = true;
	2869	+ GenNormalsMesh0();
	2870	+ for (int i = 0; i < Children().Size(); i++)
	2871	+ {
	2872	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2873	+ if (child == null)
	2874	+ continue;
	2875	+ child.GenNormalsMesh();
2753	2876	// Children().release(i);
2754	2877	}
2755	2878	blockloop = false;
..	..	@@ -2922,6 +3045,15 @@
2922	3045	}
2923	3046	}
2924	3047
	3048	+ void GenNormalsMesh0()
	3049	+ {
	3050	+ if (bRep != null)
	3051	+ {
	3052	+ bRep.GenerateNormalsMesh();
	3053	+ Touch();
	3054	+ }
	3055	+ }
	3056	+
2925	3057	void GenNormalsMINE0()
2926	3058	{
2927	3059	if (bRep != null)
..	..	@@ -2983,6 +3115,33 @@
2983	3115	blockloop = false;
2984	3116	}
2985	3117
	3118	+ void TransformChildren()
	3119	+ {
	3120	+ if (toParent != null)
	3121	+ {
	3122	+ for (int i=Size(); --i>=0;)
	3123	+ {
	3124	+ Object3D v = get(i);
	3125	+
	3126	+ if (v.toParent == null)
	3127	+ {
	3128	+ v.toParent = LA.newMatrix();
	3129	+ v.fromParent = LA.newMatrix();
	3130	+ }
	3131	+
	3132	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3133	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3134	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3135	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3136	+ }
	3137	+
	3138	+ toParent = null; // LA.matIdentity(toParent);
	3139	+ fromParent = null; // LA.matIdentity(fromParent);
	3140	+
	3141	+ Touch();
	3142	+ }
	3143	+ }
	3144	+
2986	3145	void TransformGeometry()
2987	3146	{
2988	3147	Object3D obj = this;
..	..	@@ -3206,7 +3365,9 @@
3206	3365	bRep.support = null;
3207	3366	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3367	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3368	+
	3369	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3370	+
3210	3371	bRep = temprep;
3211	3372	bRep.support = sup;
3212	3373	Touch();
..	..	@@ -3343,7 +3504,8 @@
3343	3504	if (blockloop)
3344	3505	return;
3345	3506
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3507	+ if (//marked \|\| // does not make sense
	3508	+ (bRep != null \|\| material != null)) // borderline...
3347	3509	live = h;
3348	3510
3349	3511	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3526,8 @@
3364	3526	return;
3365	3527
3366	3528	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3529	+ if (//marked \|\| // does not make sense
	3530	+ (bRep != null \|\| material != null)) // borderline...
3368	3531	link2master = h;
3369	3532
3370	3533	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3547,8 @@
3384	3547	if (blockloop)
3385	3548	return;
3386	3549
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3550	+ if (//marked \|\| // does not make sense
	3551	+ (bRep != null \|\| material != null)) // borderline...
3388	3552	hide = h;
3389	3553
3390	3554	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3568,7 @@
3404	3568	if (blockloop)
3405	3569	return;
3406	3570
3407		- if (bRep != null && material != null) // borderline...
	3571	+ if (bRep != null \|\| material != null) // borderline...
3408	3572	marked = h;
3409	3573
3410	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3578,46 @@
3414	3578	continue;
3415	3579	blockloop = true;
3416	3580	child.MarkLeaves(h);
	3581	+ blockloop = false;
	3582	+ // release(i);
	3583	+ }
	3584	+ }
	3585	+
	3586	+ void RewindLeaves(boolean h)
	3587	+ {
	3588	+ if (blockloop)
	3589	+ return;
	3590	+
	3591	+ if (bRep != null \|\| material != null) // borderline...
	3592	+ rewind = h;
	3593	+
	3594	+ for (int i = 0; i < Size(); i++)
	3595	+ {
	3596	+ Object3D child = (Object3D) get(i); // reserve(i);
	3597	+ if (child == null)
	3598	+ continue;
	3599	+ blockloop = true;
	3600	+ child.RewindLeaves(h);
	3601	+ blockloop = false;
	3602	+ // release(i);
	3603	+ }
	3604	+ }
	3605	+
	3606	+ void RandomLeaves(boolean h)
	3607	+ {
	3608	+ if (blockloop)
	3609	+ return;
	3610	+
	3611	+ if (bRep != null \|\| material != null) // borderline...
	3612	+ random = 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.RandomLeaves(h);
3417	3621	blockloop = false;
3418	3622	// release(i);
3419	3623	}
..	..	@@ -4191,6 +4395,55 @@
4191	4395	}
4192	4396	}
4193	4397
	4398	+ void RepairSOV()
	4399	+ {
	4400	+ if (blockloop)
	4401	+ return;
	4402	+
	4403	+ String texname = this.GetPigmentTexture();
	4404	+
	4405	+ if (texname.startsWith("sov"))
	4406	+ {
	4407	+ String[] s = texname.split("/");
	4408	+
	4409	+ String[] sname = s[1].split("Color.pn");
	4410	+
	4411	+ texname = sname[0];
	4412	+
	4413	+ if (sname.length > 1)
	4414	+ {
	4415	+ texname += "Color.jpg";
	4416	+ }
	4417	+
	4418	+ this.SetPigmentTexture("sov/" + texname);
	4419	+ }
	4420	+
	4421	+ texname = this.GetBumpTexture();
	4422	+
	4423	+ if (texname.startsWith("sov"))
	4424	+ {
	4425	+ String[] s = texname.split("/");
	4426	+
	4427	+ String[] sname = s[1].split("Bump.pn");
	4428	+
	4429	+ texname = sname[0];
	4430	+
	4431	+ if (sname.length > 1)
	4432	+ {
	4433	+ texname += "Bump.jpg";
	4434	+ }
	4435	+
	4436	+ this.SetBumpTexture("sov/" + texname);
	4437	+ }
	4438	+
	4439	+ for (int i=0; i<Size(); i++)
	4440	+ {
	4441	+ blockloop = true;
	4442	+ get(i).RepairSOV();
	4443	+ blockloop = false;
	4444	+ }
	4445	+ }
	4446	+
4194	4447	void RepairTexture()
4195	4448	{
4196	4449	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4681,7 +4934,7 @@
4681	4934
4682	4935	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	4936	{
4684		- if (hide)
	4937	+ if (hide \|\| dontselect)
4685	4938	return null;
4686	4939
4687	4940	if (count <= 0)
..	..	@@ -4707,7 +4960,7 @@
4707	4960
4708	4961	cTreePath Select(int indexcount, boolean deselect)
4709	4962	{
4710		- if (hide)
	4963	+ if (hide \|\| dontselect)
4711	4964	return null;
4712	4965
4713	4966	if (count <= 0)
..	..	@@ -5333,6 +5586,43 @@
5333	5586	}
5334	5587	}
5335	5588
	5589	+ UUID GetUUID()
	5590	+ {
	5591	+ if (uuid == null)
	5592	+ {
	5593	+ // Serial
	5594	+ uuid = UUID.randomUUID();
	5595	+ }
	5596	+
	5597	+ return uuid;
	5598	+ }
	5599	+
	5600	+ Object3D GetObject(UUID uid)
	5601	+ {
	5602	+ if (blockloop)
	5603	+ return null;
	5604	+
	5605	+ if (GetUUID().equals(uid))
	5606	+ return this;
	5607	+
	5608	+ int nb = Size();
	5609	+ for (int i = 0; i < nb; i++)
	5610	+ {
	5611	+ Object3D child = (Object3D) get(i);
	5612	+
	5613	+ if (child == null)
	5614	+ continue;
	5615	+
	5616	+ blockloop = true;
	5617	+ Object3D obj = child.GetObject(uid);
	5618	+ blockloop = false;
	5619	+ if (obj != null)
	5620	+ return obj;
	5621	+ }
	5622	+
	5623	+ return null;
	5624	+ }
	5625	+
5336	5626	void SetBumpTexture(String tex)
5337	5627	{
5338	5628	if (GetTextures() == null)
..	..	@@ -5377,12 +5667,23 @@
5377	5667	boolean NeedSupport()
5378	5668	{
5379	5669	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5670	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5381	5671	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5672	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5673	}
5384	5674
5385	5675	static boolean DEBUG_SELECTION = false;
	5676	+
	5677	+ boolean IsLive()
	5678	+ {
	5679	+ if (live)
	5680	+ return true;
	5681	+
	5682	+ if (parent == null)
	5683	+ return false;
	5684	+
	5685	+ return parent.IsLive();
	5686	+ }
5386	5687
5387	5688	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	5689	{
..	..	@@ -5394,7 +5695,7 @@
5394	5695	}
5395	5696
5396	5697	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5698	+ (hide \|\| dontselect))
5398	5699	return;
5399	5700
5400	5701	if (name != null && name.contains("sclera"))
..	..	@@ -5445,7 +5746,7 @@
5445	5746	support = support;
5446	5747
5447	5748	//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);
	5749	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5449	5750
5450	5751	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	5752	{
..	..	@@ -5465,10 +5766,12 @@
5465	5766	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	5767
5467	5768	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5769	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5770	+ (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5469	5771	{
5470	5772	Globals.lighttouched = true;
5471	5773	} // all panes...
	5774	+
5472	5775	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	5776	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	5777	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5636,7 +5939,28 @@
5636	5939	tex = GetTextures();
5637	5940	}
5638	5941
5639		- display.BindTextures(tex, texres);
	5942	+ boolean failedPigment = false;
	5943	+ boolean failedBump = false;
	5944	+
	5945	+ try
	5946	+ {
	5947	+ display.BindPigmentTexture(tex, texres);
	5948	+ }
	5949	+ catch (Exception e)
	5950	+ {
	5951	+ System.err.println("FAILED: " + this);
	5952	+ failedPigment = true;
	5953	+ }
	5954	+
	5955	+ try
	5956	+ {
	5957	+ display.BindBumpTexture(tex, texres);
	5958	+ }
	5959	+ catch (Exception e)
	5960	+ {
	5961	+ //System.err.println("FAILED: " + this);
	5962	+ failedBump = true;
	5963	+ }
5640	5964
5641	5965	if (!compiled)
5642	5966	{
..	..	@@ -5658,7 +5982,11 @@
5658	5982	}
5659	5983	}
5660	5984
5661		- display.ReleaseTextures(tex);
	5985	+ if (!failedBump)
	5986	+ display.ReleaseBumpTexture(tex);
	5987	+
	5988	+ if (!failedPigment)
	5989	+ display.ReleasePigmentTexture(tex);
5662	5990
5663	5991	display.PopMaterial(this, selected);
5664	5992	}
..	..	@@ -5787,6 +6115,9 @@
5787	6115
5788	6116	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6117	{
	6118	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6119	+ return;
	6120	+
5790	6121	if (hide)
5791	6122	return;
5792	6123	// shadow optimisation
..	..	@@ -5911,6 +6242,9 @@
5911	6242	{
5912	6243	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6244	return; // no shadow for transparent objects
	6245	+
	6246	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6247	+ return;
5914	6248
5915	6249	if (hide)
5916	6250	return;
..	..	@@ -6877,7 +7211,7 @@
6877	7211	spot.translate(32, 32);
6878	7212	spotw = spot.x + spot.width;
6879	7213	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
	7214	+ info.g.setColor(Color.cyan);
6881	7215	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7216	// if (CameraPane.Xmin > spot.x)
6883	7217	// {
..	..	@@ -6895,11 +7229,12 @@
6895	7229	// {
6896	7230	// CameraPane.Ymax = spoth;
6897	7231	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7232	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7233	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6900	7234	spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
	7235	+ info.g.setColor(Color.yellow);
6902	7236	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7237	+ info.g.setColor(Color.green);
6903	7238	// if (CameraPane.Xmin > spot.x)
6904	7239	// {
6905	7240	// CameraPane.Xmin = spot.x;
..	..	@@ -6951,7 +7286,7 @@
6951	7286	startX = info.x;
6952	7287	startY = info.y;
6953	7288
6954		- hitSomething = 0;
	7289	+ hitSomething = -1;
6955	7290	cVector origin = new cVector();
6956	7291	//LA.xformPos(origin, toParent, origin);
6957	7292	Rectangle spot = new Rectangle();
..	..	@@ -7027,6 +7362,7 @@
7027	7362	//System.out.println("hitSomething = " + hitSomething);
7028	7363
7029	7364	double scale = 0.005f * info.camera.Distance();
	7365	+
7030	7366	cVector xlate = new cVector();
7031	7367	//cVector xlate2 = new cVector();
7032	7368	switch (hitSomething)
..	..	@@ -7175,24 +7511,27 @@
7175	7511
7176	7512	case hitScale: // scale
7177	7513	double hScale = (double) (info.x - centerPt.x) / 32;
	7514	+ double sign = 1;
	7515	+ if (hScale < 0)
	7516	+ {
	7517	+ sign = -1;
	7518	+ }
	7519	+ hScale = signMath.pow(signhScale, scale * 50);
7178	7520	if (hScale < 0.01)
7179	7521	{
7180		- hScale = 0.01;
	7522	+ //hScale = 0.01;
7181	7523	}
7182		- hScale = Math.pow(hScale, scale * 50);
7183		- if (hScale < 0.01)
7184		- {
7185		- hScale = 0.01;
7186		- }
	7524	+
7187	7525	double vScale = (double) (info.y - centerPt.y) / 32;
7188		- if (vScale < 0.01)
	7526	+ sign = 1;
	7527	+ if (vScale < 0)
7189	7528	{
7190		- vScale = 0.01;
	7529	+ sign = -1;
7191	7530	}
7192		- vScale = Math.pow(vScale, scale * 50);
	7531	+ vScale = signMath.pow(signvScale, scale * 50);
7193	7532	if (vScale < 0.01)
7194	7533	{
7195		- vScale = 0.01;
	7534	+ //vScale = 0.01;
7196	7535	}
7197	7536	LA.matCopy(startMat, toParent);
7198	7537	/**/
..	..	@@ -7203,39 +7542,47 @@
7203	7542	}
7204	7543	/**/
7205	7544
	7545	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7546	+
	7547	+ if (totalScale < 0.01)
	7548	+ {
	7549	+ totalScale = 0.01;
	7550	+ }
	7551	+
7206	7552	switch (info.pane.RenderCamera().viewCode)
7207	7553	{
7208	7554	case 3: // '\001'
7209		- if (modified)
	7555	+ if (modified \|\| opposite)
7210	7556	{
7211	7557	//LA.matScale(toParent, 1, hScale, vScale);
7212		- LA.matScale(toParent, vScale, 1, 1);
	7558	+ LA.matScale(toParent, totalScale, 1, 1);
7213	7559	} // vScale, 1);
7214	7560	else
7215	7561	{
7216		- LA.matScale(toParent, vScale, vScale, vScale);
	7562	+ // EXCEPTION!
	7563	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7217	7564	} // vScale, 1);
7218	7565	break;
7219	7566
7220	7567	case 2: // '\002'
7221		- if (modified)
	7568	+ if (modified \|\| opposite)
7222	7569	{
7223	7570	//LA.matScale(toParent, hScale, 1, vScale);
7224		- LA.matScale(toParent, 1, vScale, 1);
	7571	+ LA.matScale(toParent, 1, totalScale, 1);
7225	7572	} else
7226	7573	{
7227		- LA.matScale(toParent, vScale, 1, vScale);
	7574	+ LA.matScale(toParent, totalScale, 1, totalScale);
7228	7575	}
7229	7576	break;
7230	7577
7231	7578	case 1: // '\003'
7232		- if (modified)
	7579	+ if (modified \|\| opposite)
7233	7580	{
7234	7581	//LA.matScale(toParent, hScale, vScale, 1);
7235		- LA.matScale(toParent, 1, 1, vScale);
	7582	+ LA.matScale(toParent, 1, 1, totalScale);
7236	7583	} else
7237	7584	{
7238		- LA.matScale(toParent, vScale, vScale, 1);
	7585	+ LA.matScale(toParent, totalScale, totalScale, 1);
7239	7586	}
7240	7587	break;
7241	7588	}
..	..	@@ -7368,14 +7715,22 @@
7368	7715	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369	7716	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370	7717	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7718	+
	7719	+ String objname;
	7720	+
7371	7721	if (false) //parent != null)
7372	7722	{
7373		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7723	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374	7724	} else
7375	7725	{
7376		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7726	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7377	7727	} // + super.toString();
7378	7728	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7729	+
	7730	+ if (!Globals.ADVANCED)
	7731	+ return objname;
	7732	+
	7733	+ return objname + " " + System.identityHashCode(this);
7379	7734	}
7380	7735
7381	7736	public int hashCode()
..	..	@@ -7452,7 +7807,7 @@
7452	7807	/transient/ cVector2[] projectedVertices = new cVector2[0];
7453	7808
7454	7809	Object3D /Composite/ parent;
7455		- Object3D /Composite/ fileparent;
	7810	+ Object3D /Composite/ fileparent; // In the case of FileObject
7456	7811
7457	7812	double[][] toParent; // dynamic matrix
7458	7813	double[][] fromParent;
..	..	@@ -7616,9 +7971,9 @@
7616	7971	private static cVector edge2 = new cVector();
7617	7972	//private static cVector norm = new cVector();
7618	7973	/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;
	7974	+ static final int hitCenter = 1;
	7975	+ static final int hitScale = 2;
	7976	+ static final int hitRotate = 3;
7622	7977	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7623	7978	/transient/ private Point centerPt;
7624	7979	/transient/ private int startX;