~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;
..	..	@@ -912,6 +996,11 @@
912	996	fromParent = null; // LA.newMatrix();
913	997	bRep = null; // new BoundaryRep();
914	998
	999	+ if (oname != null && oname.equals("LeftHand"))
	1000	+ {
	1001	+ name = oname;
	1002	+ }
	1003	+
915	1004	/*
916	1005	float hue = (float)Math.random();
917	1006	Color col;
..	..	@@ -954,7 +1043,7 @@
954	1043
955	1044	public Object clone()
956	1045	{
957		- return GrafreeD.clone(this);
	1046	+ return Grafreed.clone(this);
958	1047	}
959	1048
960	1049	Object3D copyExpand()
..	..	@@ -1470,7 +1559,7 @@
1470	1559	BoundaryRep.SEUIL = other.material.cameralight;
1471	1560
1472	1561	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1562	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1563	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1564	}
1476	1565
..	..	@@ -1729,7 +1818,7 @@
1729	1818	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1819	o.bRep = transientrep;
1731	1820	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1821	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1822	o.CreateMaterial();
1734	1823	o.SetAttributes(this, -1);
1735	1824	//parent
..	..	@@ -1742,7 +1831,7 @@
1742	1831	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1832	o.bRep = bRep;
1744	1833	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1834	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1835	o.CreateMaterial();
1747	1836	//o.overwriteThis(this, -1);
1748	1837	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1918,15 @@
1829	1918	if (obj.name == null)
1830	1919	continue; // can't be a null one
1831	1920
	1921	+ // Try perfect match first.
1832	1922	if (n.equals(obj.name))
1833	1923	{
1834	1924	theobj = obj;
1835	1925	count++;
1836	1926	}
1837	1927	}
	1928	+
	1929	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1930
1839	1931	if (count != 1)
1840	1932	for (int i=Size(); --i>=0;)
..	..	@@ -2477,13 +2569,13 @@
2477	2569	return retval;
2478	2570	}
2479	2571
2480		- void doEditDrag(ClickInfo info)
	2572	+ void doEditDrag(ClickInfo info, boolean opposite)
2481	2573	{
2482	2574	switch (doSomething)
2483	2575	{
2484	2576	case 1: // '\001'
2485	2577	//super.
2486		- doEditDrag0(info);
	2578	+ doEditDrag0(info, opposite);
2487	2579	break;
2488	2580
2489	2581	case 2: // '\002'
..	..	@@ -2496,11 +2588,11 @@
2496	2588	{
2497	2589	//sel.hitSomething = childToDrag.hitSomething;
2498	2590	//childToDrag.doEditDrag(info);
2499		- sel.doEditDrag(info);
	2591	+ sel.doEditDrag(info, opposite);
2500	2592	} else
2501	2593	{
2502	2594	//super.
2503		- doEditDrag0(info);
	2595	+ doEditDrag0(info, opposite);
2504	2596	}
2505	2597	}
2506	2598	break;
..	..	@@ -2610,6 +2702,18 @@
2610	2702	void GenNormalsS(boolean crease)
2611	2703	{
2612	2704	selection.GenNormals(crease);
	2705	+// for (int i=0; i<selection.size(); i++)
	2706	+// {
	2707	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2708	+// selectee.GenNormals(crease);
	2709	+// }
	2710	+
	2711	+ //Touch();
	2712	+ }
	2713	+
	2714	+ void GenNormalsMeshS()
	2715	+ {
	2716	+ selection.GenNormalsMesh();
2613	2717	// for (int i=0; i<selection.size(); i++)
2614	2718	// {
2615	2719	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2750,6 +2854,24 @@
2750	2854	if (child == null)
2751	2855	continue;
2752	2856	child.GenNormals(crease);
	2857	+// Children().release(i);
	2858	+ }
	2859	+ blockloop = false;
	2860	+ }
	2861	+
	2862	+ void GenNormalsMesh()
	2863	+ {
	2864	+ if (blockloop)
	2865	+ return;
	2866	+
	2867	+ blockloop = true;
	2868	+ GenNormalsMesh0();
	2869	+ for (int i = 0; i < Children().Size(); i++)
	2870	+ {
	2871	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2872	+ if (child == null)
	2873	+ continue;
	2874	+ child.GenNormalsMesh();
2753	2875	// Children().release(i);
2754	2876	}
2755	2877	blockloop = false;
..	..	@@ -2922,6 +3044,15 @@
2922	3044	}
2923	3045	}
2924	3046
	3047	+ void GenNormalsMesh0()
	3048	+ {
	3049	+ if (bRep != null)
	3050	+ {
	3051	+ bRep.GenerateNormalsMesh();
	3052	+ Touch();
	3053	+ }
	3054	+ }
	3055	+
2925	3056	void GenNormalsMINE0()
2926	3057	{
2927	3058	if (bRep != null)
..	..	@@ -2983,6 +3114,33 @@
2983	3114	blockloop = false;
2984	3115	}
2985	3116
	3117	+ void TransformChildren()
	3118	+ {
	3119	+ if (toParent != null)
	3120	+ {
	3121	+ for (int i=Size(); --i>=0;)
	3122	+ {
	3123	+ Object3D v = get(i);
	3124	+
	3125	+ if (v.toParent == null)
	3126	+ {
	3127	+ v.toParent = LA.newMatrix();
	3128	+ v.fromParent = LA.newMatrix();
	3129	+ }
	3130	+
	3131	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3132	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3133	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3134	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3135	+ }
	3136	+
	3137	+ toParent = null; // LA.matIdentity(toParent);
	3138	+ fromParent = null; // LA.matIdentity(fromParent);
	3139	+
	3140	+ Touch();
	3141	+ }
	3142	+ }
	3143	+
2986	3144	void TransformGeometry()
2987	3145	{
2988	3146	Object3D obj = this;
..	..	@@ -3204,9 +3362,11 @@
3204	3362
3205	3363	BoundaryRep sup = bRep.support;
3206	3364	bRep.support = null;
3207		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3365	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3366	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3367	+
	3368	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3369	+
3210	3370	bRep = temprep;
3211	3371	bRep.support = sup;
3212	3372	Touch();
..	..	@@ -3728,7 +3888,7 @@
3728	3888	if (child == null)
3729	3889	continue;
3730	3890
3731		- if (GrafreeD.RENDERME > 0)
	3891	+ if (Grafreed.RENDERME > 0)
3732	3892	{
3733	3893	if (child instanceof Merge)
3734	3894	((Merge)child).renderme();
..	..	@@ -3879,7 +4039,7 @@
3879	4039	if (child == null)
3880	4040	continue;
3881	4041
3882		- if (GrafreeD.RENDERME > 0)
	4042	+ if (Grafreed.RENDERME > 0)
3883	4043	{
3884	4044	if (child instanceof Merge)
3885	4045	((Merge)child).renderme();
..	..	@@ -4074,7 +4234,7 @@
4074	4234	if (child == null)
4075	4235	continue;
4076	4236
4077		- if (GrafreeD.RENDERME > 0)
	4237	+ if (Grafreed.RENDERME > 0)
4078	4238	{
4079	4239	if (child instanceof Merge)
4080	4240	((Merge)child).renderme();
..	..	@@ -4187,6 +4347,55 @@
4187	4347	{
4188	4348	blockloop = true;
4189	4349	get(i).RepairShadow();
	4350	+ blockloop = false;
	4351	+ }
	4352	+ }
	4353	+
	4354	+ void RepairSOV()
	4355	+ {
	4356	+ if (blockloop)
	4357	+ return;
	4358	+
	4359	+ String texname = this.GetPigmentTexture();
	4360	+
	4361	+ if (texname.startsWith("sov"))
	4362	+ {
	4363	+ String[] s = texname.split("/");
	4364	+
	4365	+ String[] sname = s[1].split("Color.pn");
	4366	+
	4367	+ texname = sname[0];
	4368	+
	4369	+ if (sname.length > 1)
	4370	+ {
	4371	+ texname += "Color.jpg";
	4372	+ }
	4373	+
	4374	+ this.SetPigmentTexture("sov/" + texname);
	4375	+ }
	4376	+
	4377	+ texname = this.GetBumpTexture();
	4378	+
	4379	+ if (texname.startsWith("sov"))
	4380	+ {
	4381	+ String[] s = texname.split("/");
	4382	+
	4383	+ String[] sname = s[1].split("Bump.pn");
	4384	+
	4385	+ texname = sname[0];
	4386	+
	4387	+ if (sname.length > 1)
	4388	+ {
	4389	+ texname += "Bump.jpg";
	4390	+ }
	4391	+
	4392	+ this.SetBumpTexture("sov/" + texname);
	4393	+ }
	4394	+
	4395	+ for (int i=0; i<Size(); i++)
	4396	+ {
	4397	+ blockloop = true;
	4398	+ get(i).RepairSOV();
4190	4399	blockloop = false;
4191	4400	}
4192	4401	}
..	..	@@ -4681,7 +4890,7 @@
4681	4890
4682	4891	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	4892	{
4684		- if (hide)
	4893	+ if (hide \|\| dontselect)
4685	4894	return null;
4686	4895
4687	4896	if (count <= 0)
..	..	@@ -4707,7 +4916,7 @@
4707	4916
4708	4917	cTreePath Select(int indexcount, boolean deselect)
4709	4918	{
4710		- if (hide)
	4919	+ if (hide \|\| dontselect)
4711	4920	return null;
4712	4921
4713	4922	if (count <= 0)
..	..	@@ -5333,6 +5542,43 @@
5333	5542	}
5334	5543	}
5335	5544
	5545	+ UUID GetUUID()
	5546	+ {
	5547	+ if (uuid == null)
	5548	+ {
	5549	+ // Serial
	5550	+ uuid = UUID.randomUUID();
	5551	+ }
	5552	+
	5553	+ return uuid;
	5554	+ }
	5555	+
	5556	+ Object3D GetObject(UUID uid)
	5557	+ {
	5558	+ if (blockloop)
	5559	+ return null;
	5560	+
	5561	+ if (GetUUID().equals(uid))
	5562	+ return this;
	5563	+
	5564	+ int nb = Size();
	5565	+ for (int i = 0; i < nb; i++)
	5566	+ {
	5567	+ Object3D child = (Object3D) get(i);
	5568	+
	5569	+ if (child == null)
	5570	+ continue;
	5571	+
	5572	+ blockloop = true;
	5573	+ Object3D obj = child.GetObject(uid);
	5574	+ blockloop = false;
	5575	+ if (obj != null)
	5576	+ return obj;
	5577	+ }
	5578	+
	5579	+ return null;
	5580	+ }
	5581	+
5336	5582	void SetBumpTexture(String tex)
5337	5583	{
5338	5584	if (GetTextures() == null)
..	..	@@ -5377,12 +5623,23 @@
5377	5623	boolean NeedSupport()
5378	5624	{
5379	5625	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5626	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5381	5627	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5628	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5629	}
5384	5630
5385	5631	static boolean DEBUG_SELECTION = false;
	5632	+
	5633	+ boolean IsLive()
	5634	+ {
	5635	+ if (live)
	5636	+ return true;
	5637	+
	5638	+ if (parent == null)
	5639	+ return false;
	5640	+
	5641	+ return parent.IsLive();
	5642	+ }
5386	5643
5387	5644	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	5645	{
..	..	@@ -5394,7 +5651,7 @@
5394	5651	}
5395	5652
5396	5653	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5654	+ (hide \|\| dontselect))
5398	5655	return;
5399	5656
5400	5657	if (name != null && name.contains("sclera"))
..	..	@@ -5445,7 +5702,7 @@
5445	5702	support = support;
5446	5703
5447	5704	//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);
	5705	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5449	5706
5450	5707	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	5708	{
..	..	@@ -5465,10 +5722,12 @@
5465	5722	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	5723
5467	5724	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5725	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5726	+ (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5469	5727	{
5470	5728	Globals.lighttouched = true;
5471	5729	} // all panes...
	5730	+
5472	5731	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	5732	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	5733	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5636,7 +5895,28 @@
5636	5895	tex = GetTextures();
5637	5896	}
5638	5897
5639		- display.BindTextures(tex, texres);
	5898	+ boolean failedPigment = false;
	5899	+ boolean failedBump = false;
	5900	+
	5901	+ try
	5902	+ {
	5903	+ display.BindPigmentTexture(tex, texres);
	5904	+ }
	5905	+ catch (Exception e)
	5906	+ {
	5907	+ System.err.println("FAILED: " + this);
	5908	+ failedPigment = true;
	5909	+ }
	5910	+
	5911	+ try
	5912	+ {
	5913	+ display.BindBumpTexture(tex, texres);
	5914	+ }
	5915	+ catch (Exception e)
	5916	+ {
	5917	+ //System.err.println("FAILED: " + this);
	5918	+ failedBump = true;
	5919	+ }
5640	5920
5641	5921	if (!compiled)
5642	5922	{
..	..	@@ -5658,7 +5938,11 @@
5658	5938	}
5659	5939	}
5660	5940
5661		- display.ReleaseTextures(tex);
	5941	+ if (!failedBump)
	5942	+ display.ReleaseBumpTexture(tex);
	5943	+
	5944	+ if (!failedPigment)
	5945	+ display.ReleasePigmentTexture(tex);
5662	5946
5663	5947	display.PopMaterial(this, selected);
5664	5948	}
..	..	@@ -5787,6 +6071,9 @@
5787	6071
5788	6072	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6073	{
	6074	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6075	+ return;
	6076	+
5790	6077	if (hide)
5791	6078	return;
5792	6079	// shadow optimisation
..	..	@@ -5911,6 +6198,9 @@
5911	6198	{
5912	6199	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6200	return; // no shadow for transparent objects
	6201	+
	6202	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6203	+ return;
5914	6204
5915	6205	if (hide)
5916	6206	return;
..	..	@@ -6877,7 +7167,7 @@
6877	7167	spot.translate(32, 32);
6878	7168	spotw = spot.x + spot.width;
6879	7169	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
	7170	+ info.g.setColor(Color.cyan);
6881	7171	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7172	// if (CameraPane.Xmin > spot.x)
6883	7173	// {
..	..	@@ -6895,11 +7185,12 @@
6895	7185	// {
6896	7186	// CameraPane.Ymax = spoth;
6897	7187	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7188	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7189	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6900	7190	spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
	7191	+ info.g.setColor(Color.yellow);
6902	7192	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7193	+ info.g.setColor(Color.green);
6903	7194	// if (CameraPane.Xmin > spot.x)
6904	7195	// {
6905	7196	// CameraPane.Xmin = spot.x;
..	..	@@ -6951,7 +7242,7 @@
6951	7242	startX = info.x;
6952	7243	startY = info.y;
6953	7244
6954		- hitSomething = 0;
	7245	+ hitSomething = -1;
6955	7246	cVector origin = new cVector();
6956	7247	//LA.xformPos(origin, toParent, origin);
6957	7248	Rectangle spot = new Rectangle();
..	..	@@ -6984,7 +7275,7 @@
6984	7275	}
6985	7276
6986	7277	//System.out.println("info.modifiers = " + info.modifiers);
6987		- modified = (info.modifiers & CameraPane.META) != 0;
	7278	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
6988	7279	//System.out.println("modified = " + modified);
6989	7280	//new Exception().printStackTrace();
6990	7281	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7012,7 +7303,7 @@
7012	7303	return true;
7013	7304	}
7014	7305
7015		- void doEditDrag0(ClickInfo info)
	7306	+ void doEditDrag0(ClickInfo info, boolean opposite)
7016	7307	{
7017	7308	if (hitSomething == 0)
7018	7309	{
..	..	@@ -7027,6 +7318,7 @@
7027	7318	//System.out.println("hitSomething = " + hitSomething);
7028	7319
7029	7320	double scale = 0.005f * info.camera.Distance();
	7321	+
7030	7322	cVector xlate = new cVector();
7031	7323	//cVector xlate2 = new cVector();
7032	7324	switch (hitSomething)
..	..	@@ -7039,7 +7331,7 @@
7039	7331
7040	7332	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7041	7333
7042		- if (modified)
	7334	+ if (modified \|\| opposite)
7043	7335	{
7044	7336	//assert(false);
7045	7337	/*
..	..	@@ -7133,6 +7425,7 @@
7133	7425
7134	7426	if (modified)
7135	7427	{
	7428	+ // Rotate 90 degrees
7136	7429	angle /= (Math.PI / 4);
7137	7430	angle = Math.floor(angle + 0.5);
7138	7431	angle *= (Math.PI / 4);
..	..	@@ -7174,24 +7467,27 @@
7174	7467
7175	7468	case hitScale: // scale
7176	7469	double hScale = (double) (info.x - centerPt.x) / 32;
	7470	+ double sign = 1;
	7471	+ if (hScale < 0)
	7472	+ {
	7473	+ sign = -1;
	7474	+ }
	7475	+ hScale = signMath.pow(signhScale, scale * 50);
7177	7476	if (hScale < 0.01)
7178	7477	{
7179		- hScale = 0.01;
	7478	+ //hScale = 0.01;
7180	7479	}
7181		- hScale = Math.pow(hScale, scale * 50);
7182		- if (hScale < 0.01)
7183		- {
7184		- hScale = 0.01;
7185		- }
	7480	+
7186	7481	double vScale = (double) (info.y - centerPt.y) / 32;
7187		- if (vScale < 0.01)
	7482	+ sign = 1;
	7483	+ if (vScale < 0)
7188	7484	{
7189		- vScale = 0.01;
	7485	+ sign = -1;
7190	7486	}
7191		- vScale = Math.pow(vScale, scale * 50);
	7487	+ vScale = signMath.pow(signvScale, scale * 50);
7192	7488	if (vScale < 0.01)
7193	7489	{
7194		- vScale = 0.01;
	7490	+ //vScale = 0.01;
7195	7491	}
7196	7492	LA.matCopy(startMat, toParent);
7197	7493	/**/
..	..	@@ -7202,39 +7498,47 @@
7202	7498	}
7203	7499	/**/
7204	7500
	7501	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7502	+
	7503	+ if (totalScale < 0.01)
	7504	+ {
	7505	+ totalScale = 0.01;
	7506	+ }
	7507	+
7205	7508	switch (info.pane.RenderCamera().viewCode)
7206	7509	{
7207	7510	case 3: // '\001'
7208		- if (modified)
	7511	+ if (modified \|\| opposite)
7209	7512	{
7210	7513	//LA.matScale(toParent, 1, hScale, vScale);
7211		- LA.matScale(toParent, vScale, 1, 1);
	7514	+ LA.matScale(toParent, totalScale, 1, 1);
7212	7515	} // vScale, 1);
7213	7516	else
7214	7517	{
7215		- LA.matScale(toParent, vScale, vScale, vScale);
	7518	+ // EXCEPTION!
	7519	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7216	7520	} // vScale, 1);
7217	7521	break;
7218	7522
7219	7523	case 2: // '\002'
7220		- if (modified)
	7524	+ if (modified \|\| opposite)
7221	7525	{
7222	7526	//LA.matScale(toParent, hScale, 1, vScale);
7223		- LA.matScale(toParent, 1, vScale, 1);
	7527	+ LA.matScale(toParent, 1, totalScale, 1);
7224	7528	} else
7225	7529	{
7226		- LA.matScale(toParent, vScale, 1, vScale);
	7530	+ LA.matScale(toParent, totalScale, 1, totalScale);
7227	7531	}
7228	7532	break;
7229	7533
7230	7534	case 1: // '\003'
7231		- if (modified)
	7535	+ if (modified \|\| opposite)
7232	7536	{
7233	7537	//LA.matScale(toParent, hScale, vScale, 1);
7234		- LA.matScale(toParent, 1, 1, vScale);
	7538	+ LA.matScale(toParent, 1, 1, totalScale);
7235	7539	} else
7236	7540	{
7237		- LA.matScale(toParent, vScale, vScale, 1);
	7541	+ LA.matScale(toParent, totalScale, totalScale, 1);
7238	7542	}
7239	7543	break;
7240	7544	}
..	..	@@ -7367,14 +7671,22 @@
7367	7671	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7368	7672	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7369	7673	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7674	+
	7675	+ String objname;
	7676	+
7370	7677	if (false) //parent != null)
7371	7678	{
7372		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7679	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7373	7680	} else
7374	7681	{
7375		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7682	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7376	7683	} // + super.toString();
7377	7684	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7685	+
	7686	+ if (!Globals.ADVANCED)
	7687	+ return objname;
	7688	+
	7689	+ return objname + " " + System.identityHashCode(this);
7378	7690	}
7379	7691
7380	7692	public int hashCode()
..	..	@@ -7451,7 +7763,7 @@
7451	7763	/transient/ cVector2[] projectedVertices = new cVector2[0];
7452	7764
7453	7765	Object3D /Composite/ parent;
7454		- Object3D /Composite/ fileparent;
	7766	+ Object3D /Composite/ fileparent; // In the case of FileObject
7455	7767
7456	7768	double[][] toParent; // dynamic matrix
7457	7769	double[][] fromParent;
..	..	@@ -7566,7 +7878,7 @@
7566	7878	{
7567	7879	assert(bRep != null);
7568	7880	if (!(support instanceof GenericJoint)) // support.bRep != null)
7569		- GrafreeD.Assert(support.bRep == bRep.support);
	7881	+ Grafreed.Assert(support.bRep == bRep.support);
7570	7882	}
7571	7883	else
7572	7884	{
..	..	@@ -7615,9 +7927,9 @@
7615	7927	private static cVector edge2 = new cVector();
7616	7928	//private static cVector norm = new cVector();
7617	7929	/transient private/ int hitSomething;
7618		- private static final int hitCenter = 1;
7619		- private static final int hitScale = 2;
7620		- private static final int hitRotate = 3;
	7930	+ static final int hitCenter = 1;
	7931	+ static final int hitScale = 2;
	7932	+ static final int hitRotate = 3;
7621	7933	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7622	7934	/transient/ private Point centerPt;
7623	7935	/transient/ private int startX;