~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
..	..	@@ -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;
..	..	@@ -1834,12 +1919,15 @@
1834	1919	if (obj.name == null)
1835	1920	continue; // can't be a null one
1836	1921
	1922	+ // Try perfect match first.
1837	1923	if (n.equals(obj.name))
1838	1924	{
1839	1925	theobj = obj;
1840	1926	count++;
1841	1927	}
1842	1928	}
	1929	+
	1930	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1843	1931
1844	1932	if (count != 1)
1845	1933	for (int i=Size(); --i>=0;)
..	..	@@ -2624,6 +2712,18 @@
2624	2712	//Touch();
2625	2713	}
2626	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	+
2627	2727	void ClearColorsS()
2628	2728	{
2629	2729	selection.ClearColors();
..	..	@@ -2755,6 +2855,24 @@
2755	2855	if (child == null)
2756	2856	continue;
2757	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();
2758	2876	// Children().release(i);
2759	2877	}
2760	2878	blockloop = false;
..	..	@@ -2927,6 +3045,15 @@
2927	3045	}
2928	3046	}
2929	3047
	3048	+ void GenNormalsMesh0()
	3049	+ {
	3050	+ if (bRep != null)
	3051	+ {
	3052	+ bRep.GenerateNormalsMesh();
	3053	+ Touch();
	3054	+ }
	3055	+ }
	3056	+
2930	3057	void GenNormalsMINE0()
2931	3058	{
2932	3059	if (bRep != null)
..	..	@@ -3002,8 +3129,10 @@
3002	3129	v.fromParent = LA.newMatrix();
3003	3130	}
3004	3131
3005		- LA.matConcat(v.toParent, toParent, v.toParent);
3006		- LA.matConcat(fromParent, v.fromParent, v.fromParent);
	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);
3007	3136	}
3008	3137
3009	3138	toParent = null; // LA.matIdentity(toParent);
..	..	@@ -3236,7 +3365,9 @@
3236	3365	bRep.support = null;
3237	3366	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3238	3367	// bRep.SplitInTwo(onlyone); // thread...
3239		- temprep.SplitInTwo(reduction34, onlyone);
	3368	+
	3369	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3370	+
3240	3371	bRep = temprep;
3241	3372	bRep.support = sup;
3242	3373	Touch();
..	..	@@ -3373,7 +3504,8 @@
3373	3504	if (blockloop)
3374	3505	return;
3375	3506
3376		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3507	+ if (//marked \|\| // does not make sense
	3508	+ (bRep != null \|\| material != null)) // borderline...
3377	3509	live = h;
3378	3510
3379	3511	for (int i = 0; i < Size(); i++)
..	..	@@ -3394,7 +3526,8 @@
3394	3526	return;
3395	3527
3396	3528	//if (bRep != null)
3397		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3529	+ if (//marked \|\| // does not make sense
	3530	+ (bRep != null \|\| material != null)) // borderline...
3398	3531	link2master = h;
3399	3532
3400	3533	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,7 +3547,8 @@
3414	3547	if (blockloop)
3415	3548	return;
3416	3549
3417		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3550	+ if (//marked \|\| // does not make sense
	3551	+ (bRep != null \|\| material != null)) // borderline...
3418	3552	hide = h;
3419	3553
3420	3554	for (int i = 0; i < Size(); i++)
..	..	@@ -3434,7 +3568,7 @@
3434	3568	if (blockloop)
3435	3569	return;
3436	3570
3437		- if (bRep != null && material != null) // borderline...
	3571	+ if (bRep != null \|\| material != null) // borderline...
3438	3572	marked = h;
3439	3573
3440	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3444,6 +3578,46 @@
3444	3578	continue;
3445	3579	blockloop = true;
3446	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);
3447	3621	blockloop = false;
3448	3622	// release(i);
3449	3623	}
..	..	@@ -4221,6 +4395,55 @@
4221	4395	}
4222	4396	}
4223	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	+
4224	4447	void RepairTexture()
4225	4448	{
4226	4449	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4711,7 +4934,7 @@
4711	4934
4712	4935	cTreePath SelectLeaf(int indexcount, boolean deselect)
4713	4936	{
4714		- if (hide)
	4937	+ if (hide \|\| dontselect)
4715	4938	return null;
4716	4939
4717	4940	if (count <= 0)
..	..	@@ -4737,7 +4960,7 @@
4737	4960
4738	4961	cTreePath Select(int indexcount, boolean deselect)
4739	4962	{
4740		- if (hide)
	4963	+ if (hide \|\| dontselect)
4741	4964	return null;
4742	4965
4743	4966	if (count <= 0)
..	..	@@ -5363,6 +5586,43 @@
5363	5586	}
5364	5587	}
5365	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	+
5366	5626	void SetBumpTexture(String tex)
5367	5627	{
5368	5628	if (GetTextures() == null)
..	..	@@ -5407,12 +5667,23 @@
5407	5667	boolean NeedSupport()
5408	5668	{
5409	5669	return
5410		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5670	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5411	5671	// PROBLEM with CROWD!!
5412	5672	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5413	5673	}
5414	5674
5415	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	+ }
5416	5687
5417	5688	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5418	5689	{
..	..	@@ -5424,7 +5695,7 @@
5424	5695	}
5425	5696
5426	5697	if (display.DrawMode() == iCameraPane.SELECTION &&
5427		- hide)
	5698	+ (hide \|\| dontselect))
5428	5699	return;
5429	5700
5430	5701	if (name != null && name.contains("sclera"))
..	..	@@ -5475,7 +5746,7 @@
5475	5746	support = support;
5476	5747
5477	5748	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5478		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5749	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5479	5750
5480	5751	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5481	5752	{
..	..	@@ -5495,10 +5766,12 @@
5495	5766	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5496	5767
5497	5768	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5498		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5769	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5770	+ (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5499	5771	{
5500	5772	Globals.lighttouched = true;
5501	5773	} // all panes...
	5774	+
5502	5775	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5503	5776	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5504	5777	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5666,7 +5939,28 @@
5666	5939	tex = GetTextures();
5667	5940	}
5668	5941
5669		- 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	+ }
5670	5964
5671	5965	if (!compiled)
5672	5966	{
..	..	@@ -5688,7 +5982,11 @@
5688	5982	}
5689	5983	}
5690	5984
5691		- display.ReleaseTextures(tex);
	5985	+ if (!failedBump)
	5986	+ display.ReleaseBumpTexture(tex);
	5987	+
	5988	+ if (!failedPigment)
	5989	+ display.ReleasePigmentTexture(tex);
5692	5990
5693	5991	display.PopMaterial(this, selected);
5694	5992	}
..	..	@@ -5817,6 +6115,9 @@
5817	6115
5818	6116	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5819	6117	{
	6118	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6119	+ return;
	6120	+
5820	6121	if (hide)
5821	6122	return;
5822	6123	// shadow optimisation
..	..	@@ -5941,6 +6242,9 @@
5941	6242	{
5942	6243	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5943	6244	return; // no shadow for transparent objects
	6245	+
	6246	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6247	+ return;
5944	6248
5945	6249	if (hide)
5946	6250	return;
..	..	@@ -6907,7 +7211,7 @@
6907	7211	spot.translate(32, 32);
6908	7212	spotw = spot.x + spot.width;
6909	7213	spoth = spot.y + spot.height;
6910		- info.g.setColor(Color.blue);
	7214	+ info.g.setColor(Color.cyan);
6911	7215	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6912	7216	// if (CameraPane.Xmin > spot.x)
6913	7217	// {
..	..	@@ -6925,11 +7229,12 @@
6925	7229	// {
6926	7230	// CameraPane.Ymax = spoth;
6927	7231	// }
6928		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6929		- 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
6930	7234	spot.translate(0, -32);
6931		- info.g.setColor(Color.green);
	7235	+ info.g.setColor(Color.yellow);
6932	7236	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7237	+ info.g.setColor(Color.green);
6933	7238	// if (CameraPane.Xmin > spot.x)
6934	7239	// {
6935	7240	// CameraPane.Xmin = spot.x;
..	..	@@ -6981,7 +7286,7 @@
6981	7286	startX = info.x;
6982	7287	startY = info.y;
6983	7288
6984		- hitSomething = 0;
	7289	+ hitSomething = -1;
6985	7290	cVector origin = new cVector();
6986	7291	//LA.xformPos(origin, toParent, origin);
6987	7292	Rectangle spot = new Rectangle();
..	..	@@ -7057,6 +7362,7 @@
7057	7362	//System.out.println("hitSomething = " + hitSomething);
7058	7363
7059	7364	double scale = 0.005f * info.camera.Distance();
	7365	+
7060	7366	cVector xlate = new cVector();
7061	7367	//cVector xlate2 = new cVector();
7062	7368	switch (hitSomething)
..	..	@@ -7205,24 +7511,27 @@
7205	7511
7206	7512	case hitScale: // scale
7207	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);
7208	7520	if (hScale < 0.01)
7209	7521	{
7210		- hScale = 0.01;
	7522	+ //hScale = 0.01;
7211	7523	}
7212		- hScale = Math.pow(hScale, scale * 50);
7213		- if (hScale < 0.01)
7214		- {
7215		- hScale = 0.01;
7216		- }
	7524	+
7217	7525	double vScale = (double) (info.y - centerPt.y) / 32;
7218		- if (vScale < 0.01)
	7526	+ sign = 1;
	7527	+ if (vScale < 0)
7219	7528	{
7220		- vScale = 0.01;
	7529	+ sign = -1;
7221	7530	}
7222		- vScale = Math.pow(vScale, scale * 50);
	7531	+ vScale = signMath.pow(signvScale, scale * 50);
7223	7532	if (vScale < 0.01)
7224	7533	{
7225		- vScale = 0.01;
	7534	+ //vScale = 0.01;
7226	7535	}
7227	7536	LA.matCopy(startMat, toParent);
7228	7537	/**/
..	..	@@ -7233,39 +7542,47 @@
7233	7542	}
7234	7543	/**/
7235	7544
	7545	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7546	+
	7547	+ if (totalScale < 0.01)
	7548	+ {
	7549	+ totalScale = 0.01;
	7550	+ }
	7551	+
7236	7552	switch (info.pane.RenderCamera().viewCode)
7237	7553	{
7238	7554	case 3: // '\001'
7239		- if (modified)
	7555	+ if (modified \|\| opposite)
7240	7556	{
7241	7557	//LA.matScale(toParent, 1, hScale, vScale);
7242		- LA.matScale(toParent, vScale, 1, 1);
	7558	+ LA.matScale(toParent, totalScale, 1, 1);
7243	7559	} // vScale, 1);
7244	7560	else
7245	7561	{
7246		- LA.matScale(toParent, vScale, vScale, vScale);
	7562	+ // EXCEPTION!
	7563	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7247	7564	} // vScale, 1);
7248	7565	break;
7249	7566
7250	7567	case 2: // '\002'
7251		- if (modified)
	7568	+ if (modified \|\| opposite)
7252	7569	{
7253	7570	//LA.matScale(toParent, hScale, 1, vScale);
7254		- LA.matScale(toParent, 1, vScale, 1);
	7571	+ LA.matScale(toParent, 1, totalScale, 1);
7255	7572	} else
7256	7573	{
7257		- LA.matScale(toParent, vScale, 1, vScale);
	7574	+ LA.matScale(toParent, totalScale, 1, totalScale);
7258	7575	}
7259	7576	break;
7260	7577
7261	7578	case 1: // '\003'
7262		- if (modified)
	7579	+ if (modified \|\| opposite)
7263	7580	{
7264	7581	//LA.matScale(toParent, hScale, vScale, 1);
7265		- LA.matScale(toParent, 1, 1, vScale);
	7582	+ LA.matScale(toParent, 1, 1, totalScale);
7266	7583	} else
7267	7584	{
7268		- LA.matScale(toParent, vScale, vScale, 1);
	7585	+ LA.matScale(toParent, totalScale, totalScale, 1);
7269	7586	}
7270	7587	break;
7271	7588	}
..	..	@@ -7406,7 +7723,7 @@
7406	7723	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7407	7724	} else
7408	7725	{
7409		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7726	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7410	7727	} // + super.toString();
7411	7728	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7412	7729
..	..	@@ -7490,7 +7807,7 @@
7490	7807	/transient/ cVector2[] projectedVertices = new cVector2[0];
7491	7808
7492	7809	Object3D /Composite/ parent;
7493		- Object3D /Composite/ fileparent;
	7810	+ Object3D /Composite/ fileparent; // In the case of FileObject
7494	7811
7495	7812	double[][] toParent; // dynamic matrix
7496	7813	double[][] fromParent;
..	..	@@ -7654,9 +7971,9 @@
7654	7971	private static cVector edge2 = new cVector();
7655	7972	//private static cVector norm = new cVector();
7656	7973	/transient private/ int hitSomething;
7657		- private static final int hitCenter = 1;
7658		- private static final int hitScale = 2;
7659		- private static final int hitRotate = 3;
	7974	+ static final int hitCenter = 1;
	7975	+ static final int hitScale = 2;
	7976	+ static final int hitRotate = 3;
7660	7977	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7661	7978	/transient/ private Point centerPt;
7662	7979	/transient/ private int startX;