~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. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
22	31
23	32	ScriptNode scriptnode;
24	33
..	..	@@ -100,64 +109,170 @@
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();
	120	+ if (blockloop)
	121	+ return;
	122	+
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
	125	+
	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	+ }
123	143	}
124		-
125		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
126	146	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	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	+ }
	169	+ }
	170	+
	171	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	172	+ {
	173	+ Object3D o;
	174	+
	175	+ if (hashtable.containsKey(GetUUID()))
	176	+ {
	177	+ o = hashtable.get(GetUUID());
	178	+
	179	+ Grafreed.Assert(this.bRep == o.bRep);
	180	+ //if (this.bRep != null)
	181	+ // assert(this.bRep.support == o.transientrep);
	182	+ if (this.support != null)
	183	+ assert(this.support.bRep == o.transientrep);
	184	+ }
	185	+ else
	186	+ {
	187	+ o = new Object3D("copy of " + this.name);
	188	+
	189	+ hashtable.put(GetUUID(), o);
	190	+ }
	191	+
	192	+ if (!blockloop)
	193	+ {
	194	+ blockloop = true;
	195	+
	196	+ for (int i=0; i<Size(); i++)
	197	+ {
	198	+ get(i).ExtractBigData(hashtable);
	199	+ }
	200	+
	201	+ blockloop = false;
	202	+ }
	203	+
	204	+ ExtractBigData(o);
	205	+ }
	206	+
	207	+ void ExtractBigData(Object3D o)
	208	+ {
	209	+ if (o.bRep != null)
	210	+ Grafreed.Assert(o.bRep == this.bRep);
	211	+
	212	+ o.bRep = this.bRep;
	213	+// July 2019 if (this.bRep != null)
	214	+// {
	215	+// o.transientrep = this.bRep.support;
	216	+// o.bRep.support = null;
	217	+// }
	218	+
	219	+ if (this.support != null)
	220	+ {
	221	+ if (o.transientrep != null)
	222	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	223	+
	224	+ o.transientrep = this.support.bRep;
	225	+ this.support.bRep = null;
	226	+ }
	227	+
	228	+ // o.support = this.support;
	229	+ // o.fileparent = this.fileparent;
	230	+ // if (this.bRep != null)
	231	+ // o.bRep = this.bRep.support;
	232	+
	233	+ this.bRep = null;
	234	+ // if (this.bRep != null)
	235	+ // this.bRep.support = null;
	236	+ // this.support = null;
	237	+ // this.fileparent = null;
	238	+ }
	239	+
	240	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	241	+ {
	242	+ if (!hashtable.containsKey(GetUUID()))
	243	+ return;
	244	+
	245	+ Object3D o = hashtable.get(GetUUID());
	246	+
	247	+ RestoreBigData(o);
	248	+
	249	+ if (blockloop)
	250	+ return;
	251	+
130	252	blockloop = true;
131		- child.SaveSupports();
	253	+
	254	+ //hashtable.remove(GetUUID());
	255	+
	256	+ for (int i=0; i<Size(); i++)
	257	+ {
	258	+ get(i).RestoreBigData(hashtable);
	259	+ }
	260	+
132	261	blockloop = false;
133	262	}
134		-}
135	263
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
140		-
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
	264	+ void RestoreBigData(Object3D o)
147	265	{
148		- bRep.RestoreSupports();
	266	+ this.bRep = o.bRep;
	267	+ if (this.support != null && o.transientrep != null)
	268	+ {
	269	+ this.support.bRep = o.transientrep;
	270	+ }
	271	+// July 2019 if (this.bRep != null)
	272	+// this.bRep.support = o.transientrep;
	273	+ // this.support = o.support;
	274	+ // this.fileparent = o.fileparent;
149	275	}
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
159		- }
160		-}
161	276
162	277	// MOCAP SUPPORT
163	278	double tx,ty,tz,rx,ry,rz;
..	..	@@ -482,12 +597,14 @@
482	597	toParent = LA.newMatrix();
483	598	fromParent = LA.newMatrix();
484	599	}
	600	+
485	601	if (toParentMarked == null)
486	602	{
487	603	if (maxcount != 1)
488	604	{
489	605	new Exception().printStackTrace();
490	606	}
	607	+
491	608	toParentMarked = LA.newMatrix();
492	609	fromParentMarked = LA.newMatrix();
493	610	}
..	..	@@ -775,7 +892,7 @@
775	892	if (step == 0)
776	893	step = 1;
777	894	if (maxcount == 0)
778		- maxcount = 2048; // 4;
	895	+ maxcount = 128; // 2048; // 4;
779	896	// if (acceleration == 0)
780	897	// acceleration = 10;
781	898	if (delay == 0) // serial
..	..	@@ -798,7 +915,7 @@
798	915
799	916	if (marked && Globals.isLIVE() && live &&
800	917	//TEMP21aug2018
801		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	918	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
802	919	currentframe != Globals.framecount)
803	920	{
804	921	currentframe = Globals.framecount;
..	..	@@ -810,7 +927,8 @@
810	927
811	928	boolean changedir = random && Math.random() < 0.01; // && !link2master;
812	929
813		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	930	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	931	+ (step == 1 && changedir))
814	932	{
815	933	countdown = 1;
816	934	delay = speedup?8:1;
..	..	@@ -882,6 +1000,7 @@
882	1000	if (material == null \|\| material.multiply)
883	1001	return true;
884	1002
	1003	+ // Transparent objects are dynamic because we have to sort the triangles.
885	1004	return material.opacity > 0.99;
886	1005	}
887	1006
..	..	@@ -1282,6 +1401,7 @@
1282	1401	toParent = LA.newMatrix();
1283	1402	fromParent = LA.newMatrix();
1284	1403	}
	1404	+
1285	1405	LA.matCopy(other.toParent, toParent);
1286	1406	LA.matCopy(other.fromParent, fromParent);
1287	1407
..	..	@@ -2303,6 +2423,10 @@
2303	2423	}
2304	2424	*/
2305	2425	}
	2426	+ else
	2427	+ {
	2428	+ //((ObjEditor)editWindow).SetupUI2(null);
	2429	+ }
2306	2430	}
2307	2431
2308	2432	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2344,6 +2468,14 @@
2344	2468	{
2345	2469	editWindow.refreshContents();
2346	2470	}
	2471	+ else
	2472	+ {
	2473	+ if (manipWindow != null)
	2474	+ {
	2475	+ manipWindow.refreshContents();
	2476	+ }
	2477	+ }
	2478	+
2347	2479	//if (parent != null)
2348	2480	//parent.refreshEditWindow();
2349	2481	}
..	..	@@ -2628,6 +2760,18 @@
2628	2760	//Touch();
2629	2761	}
2630	2762
	2763	+ void GenNormalsMeshS()
	2764	+ {
	2765	+ selection.GenNormalsMesh();
	2766	+// for (int i=0; i<selection.size(); i++)
	2767	+// {
	2768	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2769	+// selectee.GenNormals(crease);
	2770	+// }
	2771	+
	2772	+ //Touch();
	2773	+ }
	2774	+
2631	2775	void ClearColorsS()
2632	2776	{
2633	2777	selection.ClearColors();
..	..	@@ -2759,6 +2903,24 @@
2759	2903	if (child == null)
2760	2904	continue;
2761	2905	child.GenNormals(crease);
	2906	+// Children().release(i);
	2907	+ }
	2908	+ blockloop = false;
	2909	+ }
	2910	+
	2911	+ void GenNormalsMesh()
	2912	+ {
	2913	+ if (blockloop)
	2914	+ return;
	2915	+
	2916	+ blockloop = true;
	2917	+ GenNormalsMesh0();
	2918	+ for (int i = 0; i < Children().Size(); i++)
	2919	+ {
	2920	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2921	+ if (child == null)
	2922	+ continue;
	2923	+ child.GenNormalsMesh();
2762	2924	// Children().release(i);
2763	2925	}
2764	2926	blockloop = false;
..	..	@@ -2927,6 +3089,15 @@
2927	3089	if (bRep != null)
2928	3090	{
2929	3091	bRep.GenerateNormals(crease);
	3092	+ Touch();
	3093	+ }
	3094	+ }
	3095	+
	3096	+ void GenNormalsMesh0()
	3097	+ {
	3098	+ if (bRep != null)
	3099	+ {
	3100	+ bRep.GenerateNormalsMesh();
2930	3101	Touch();
2931	3102	}
2932	3103	}
..	..	@@ -3381,7 +3552,8 @@
3381	3552	if (blockloop)
3382	3553	return;
3383	3554
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3555	+ if (//marked \|\| // does not make sense
	3556	+ (bRep != null \|\| material != null)) // borderline...
3385	3557	live = h;
3386	3558
3387	3559	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3574,8 @@
3402	3574	return;
3403	3575
3404	3576	//if (bRep != null)
3405		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3577	+ if (//marked \|\| // does not make sense
	3578	+ (bRep != null \|\| material != null)) // borderline...
3406	3579	link2master = h;
3407	3580
3408	3581	for (int i = 0; i < Size(); i++)
..	..	@@ -3422,7 +3595,8 @@
3422	3595	if (blockloop)
3423	3596	return;
3424	3597
3425		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3598	+ if (//marked \|\| // does not make sense
	3599	+ (bRep != null \|\| material != null)) // borderline...
3426	3600	hide = h;
3427	3601
3428	3602	for (int i = 0; i < Size(); i++)
..	..	@@ -3442,7 +3616,7 @@
3442	3616	if (blockloop)
3443	3617	return;
3444	3618
3445		- if (bRep != null && material != null) // borderline...
	3619	+ if (bRep != null \|\| material != null) // borderline...
3446	3620	marked = h;
3447	3621
3448	3622	for (int i = 0; i < Size(); i++)
..	..	@@ -3452,6 +3626,46 @@
3452	3626	continue;
3453	3627	blockloop = true;
3454	3628	child.MarkLeaves(h);
	3629	+ blockloop = false;
	3630	+ // release(i);
	3631	+ }
	3632	+ }
	3633	+
	3634	+ void RewindLeaves(boolean h)
	3635	+ {
	3636	+ if (blockloop)
	3637	+ return;
	3638	+
	3639	+ if (bRep != null \|\| material != null) // borderline...
	3640	+ rewind = h;
	3641	+
	3642	+ for (int i = 0; i < Size(); i++)
	3643	+ {
	3644	+ Object3D child = (Object3D) get(i); // reserve(i);
	3645	+ if (child == null)
	3646	+ continue;
	3647	+ blockloop = true;
	3648	+ child.RewindLeaves(h);
	3649	+ blockloop = false;
	3650	+ // release(i);
	3651	+ }
	3652	+ }
	3653	+
	3654	+ void RandomLeaves(boolean h)
	3655	+ {
	3656	+ if (blockloop)
	3657	+ return;
	3658	+
	3659	+ if (bRep != null \|\| material != null) // borderline...
	3660	+ random = h;
	3661	+
	3662	+ for (int i = 0; i < Size(); i++)
	3663	+ {
	3664	+ Object3D child = (Object3D) get(i); // reserve(i);
	3665	+ if (child == null)
	3666	+ continue;
	3667	+ blockloop = true;
	3668	+ child.RandomLeaves(h);
3455	3669	blockloop = false;
3456	3670	// release(i);
3457	3671	}
..	..	@@ -4229,6 +4443,55 @@
4229	4443	}
4230	4444	}
4231	4445
	4446	+ void RepairSOV()
	4447	+ {
	4448	+ if (blockloop)
	4449	+ return;
	4450	+
	4451	+ String texname = this.GetPigmentTexture();
	4452	+
	4453	+ if (texname.startsWith("sov"))
	4454	+ {
	4455	+ String[] s = texname.split("/");
	4456	+
	4457	+ String[] sname = s[1].split("Color.pn");
	4458	+
	4459	+ texname = sname[0];
	4460	+
	4461	+ if (sname.length > 1)
	4462	+ {
	4463	+ texname += "Color.jpg";
	4464	+ }
	4465	+
	4466	+ this.SetPigmentTexture("sov/" + texname);
	4467	+ }
	4468	+
	4469	+ texname = this.GetBumpTexture();
	4470	+
	4471	+ if (texname.startsWith("sov"))
	4472	+ {
	4473	+ String[] s = texname.split("/");
	4474	+
	4475	+ String[] sname = s[1].split("Bump.pn");
	4476	+
	4477	+ texname = sname[0];
	4478	+
	4479	+ if (sname.length > 1)
	4480	+ {
	4481	+ texname += "Bump.jpg";
	4482	+ }
	4483	+
	4484	+ this.SetBumpTexture("sov/" + texname);
	4485	+ }
	4486	+
	4487	+ for (int i=0; i<Size(); i++)
	4488	+ {
	4489	+ blockloop = true;
	4490	+ get(i).RepairSOV();
	4491	+ blockloop = false;
	4492	+ }
	4493	+ }
	4494	+
4232	4495	void RepairTexture()
4233	4496	{
4234	4497	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4743,6 +5006,14 @@
4743	5006	}
4744	5007	}
4745	5008
	5009	+ ObjEditor GetWindow()
	5010	+ {
	5011	+ if (editWindow != null)
	5012	+ return editWindow;
	5013	+
	5014	+ return manipWindow;
	5015	+ }
	5016	+
4746	5017	cTreePath Select(int indexcount, boolean deselect)
4747	5018	{
4748	5019	if (hide \|\| dontselect)
..	..	@@ -4779,10 +5050,11 @@
4779	5050	if (leaf != null)
4780	5051	{
4781	5052	cTreePath tp = new cTreePath(this, leaf);
4782		- if (editWindow != null)
	5053	+ ObjEditor window = GetWindow();
	5054	+ if (window != null)
4783	5055	{
4784	5056	//System.out.println("editWindow = " + editWindow + " vs " + this);
4785		- editWindow.Select(tp, deselect, true);
	5057	+ window.Select(tp, deselect, true);
4786	5058	}
4787	5059
4788	5060	return tp;
..	..	@@ -4799,6 +5071,7 @@
4799	5071
4800	5072	if (child == null)
4801	5073	continue;
	5074	+
4802	5075	if (child.HasTransparency() && child.size() != 0)
4803	5076	{
4804	5077	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4808,9 +5081,10 @@
4808	5081	if (leaf != null)
4809	5082	{
4810	5083	cTreePath tp = new cTreePath(this, leaf);
4811		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4812	5086	{
4813		- editWindow.Select(tp, deselect, true);
	5087	+ window.Select(tp, deselect, true);
4814	5088	}
4815	5089
4816	5090	return tp;
..	..	@@ -5371,6 +5645,43 @@
5371	5645	}
5372	5646	}
5373	5647
	5648	+ UUID GetUUID()
	5649	+ {
	5650	+ if (uuid == null)
	5651	+ {
	5652	+ // Serial
	5653	+ uuid = UUID.randomUUID();
	5654	+ }
	5655	+
	5656	+ return uuid;
	5657	+ }
	5658	+
	5659	+ Object3D GetObject(UUID uid)
	5660	+ {
	5661	+ if (blockloop)
	5662	+ return null;
	5663	+
	5664	+ if (GetUUID().equals(uid))
	5665	+ return this;
	5666	+
	5667	+ int nb = Size();
	5668	+ for (int i = 0; i < nb; i++)
	5669	+ {
	5670	+ Object3D child = (Object3D) get(i);
	5671	+
	5672	+ if (child == null)
	5673	+ continue;
	5674	+
	5675	+ blockloop = true;
	5676	+ Object3D obj = child.GetObject(uid);
	5677	+ blockloop = false;
	5678	+ if (obj != null)
	5679	+ return obj;
	5680	+ }
	5681	+
	5682	+ return null;
	5683	+ }
	5684	+
5374	5685	void SetBumpTexture(String tex)
5375	5686	{
5376	5687	if (GetTextures() == null)
..	..	@@ -5415,12 +5726,23 @@
5415	5726	boolean NeedSupport()
5416	5727	{
5417	5728	return
5418		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5729	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5419	5730	// PROBLEM with CROWD!!
5420	5731	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5421	5732	}
5422	5733
5423	5734	static boolean DEBUG_SELECTION = false;
	5735	+
	5736	+ boolean IsLive()
	5737	+ {
	5738	+ if (live)
	5739	+ return true;
	5740	+
	5741	+ if (parent == null)
	5742	+ return false;
	5743	+
	5744	+ return parent.IsLive();
	5745	+ }
5424	5746
5425	5747	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5426	5748	{
..	..	@@ -5483,7 +5805,7 @@
5483	5805	support = support;
5484	5806
5485	5807	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5486		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5808	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5487	5809
5488	5810	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5489	5811	{
..	..	@@ -5503,10 +5825,12 @@
5503	5825	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5504	5826
5505	5827	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5506		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5828	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5829	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5507	5830	{
5508	5831	Globals.lighttouched = true;
5509	5832	} // all panes...
	5833	+
5510	5834	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5511	5835	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5512	5836	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5634,6 +5958,7 @@
5634	5958	if (GetBRep() != null)
5635	5959	{
5636	5960	display.NextIndex();
	5961	+
5637	5962	// vertex color conflict : gl.glCallList(list);
5638	5963	DrawNode(display, root, selected);
5639	5964	if (this instanceof BezierPatch)
..	..	@@ -5674,16 +5999,27 @@
5674	5999	tex = GetTextures();
5675	6000	}
5676	6001
5677		- boolean failed = false;
	6002	+ boolean failedPigment = false;
	6003	+ boolean failedBump = false;
5678	6004
5679	6005	try
5680	6006	{
5681		- display.BindTextures(tex, texres);
	6007	+ display.BindPigmentTexture(tex, texres);
5682	6008	}
5683	6009	catch (Exception e)
5684	6010	{
5685	6011	System.err.println("FAILED: " + this);
5686		- failed = true;
	6012	+ failedPigment = true;
	6013	+ }
	6014	+
	6015	+ try
	6016	+ {
	6017	+ display.BindBumpTexture(tex, texres);
	6018	+ }
	6019	+ catch (Exception e)
	6020	+ {
	6021	+ //System.err.println("FAILED: " + this);
	6022	+ failedBump = true;
5687	6023	}
5688	6024
5689	6025	if (!compiled)
..	..	@@ -5706,8 +6042,11 @@
5706	6042	}
5707	6043	}
5708	6044
5709		- if (!failed)
5710		- display.ReleaseTextures(tex);
	6045	+ if (!failedBump)
	6046	+ display.ReleaseBumpTexture(tex);
	6047	+
	6048	+ if (!failedPigment)
	6049	+ display.ReleasePigmentTexture(tex);
5711	6050
5712	6051	display.PopMaterial(this, selected);
5713	6052	}
..	..	@@ -6080,6 +6419,11 @@
6080	6419	// dec 2012
6081	6420	new Exception().printStackTrace();
6082	6421	return;
	6422	+ }
	6423	+
	6424	+ if (dontselect)
	6425	+ {
	6426	+ //bRep.GenerateNormalsMINE();
6083	6427	}
6084	6428
6085	6429	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6932,7 +7276,7 @@
6932	7276	spot.translate(32, 32);
6933	7277	spotw = spot.x + spot.width;
6934	7278	spoth = spot.y + spot.height;
6935		- info.g.setColor(Color.blue);
	7279	+ info.g.setColor(Color.cyan);
6936	7280	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6937	7281	// if (CameraPane.Xmin > spot.x)
6938	7282	// {
..	..	@@ -6950,11 +7294,12 @@
6950	7294	// {
6951	7295	// CameraPane.Ymax = spoth;
6952	7296	// }
6953		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7297	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7298	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6955	7299	spot.translate(0, -32);
6956		- info.g.setColor(Color.green);
	7300	+ info.g.setColor(Color.yellow);
6957	7301	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7302	+ info.g.setColor(Color.green);
6958	7303	// if (CameraPane.Xmin > spot.x)
6959	7304	// {
6960	7305	// CameraPane.Xmin = spot.x;
..	..	@@ -6971,8 +7316,8 @@
6971	7316	// {
6972	7317	// CameraPane.Ymax = spoth;
6973	7318	// }
6974		- info.g.drawArc(boundary.x, boundary.y,
6975		- boundary.width, boundary.height, 0, 360);
	7319	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7320	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
6976	7321	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6977	7322	// if (CameraPane.Xmin > boundary.x)
6978	7323	// {
..	..	@@ -7006,7 +7351,7 @@
7006	7351	startX = info.x;
7007	7352	startY = info.y;
7008	7353
7009		- hitSomething = 0;
	7354	+ hitSomething = -1;
7010	7355	cVector origin = new cVector();
7011	7356	//LA.xformPos(origin, toParent, origin);
7012	7357	Rectangle spot = new Rectangle();
..	..	@@ -7082,6 +7427,7 @@
7082	7427	//System.out.println("hitSomething = " + hitSomething);
7083	7428
7084	7429	double scale = 0.005f * info.camera.Distance();
	7430	+
7085	7431	cVector xlate = new cVector();
7086	7432	//cVector xlate2 = new cVector();
7087	7433	switch (hitSomething)
..	..	@@ -7230,24 +7576,27 @@
7230	7576
7231	7577	case hitScale: // scale
7232	7578	double hScale = (double) (info.x - centerPt.x) / 32;
	7579	+ double sign = 1;
	7580	+ if (hScale < 0)
	7581	+ {
	7582	+ sign = -1;
	7583	+ }
	7584	+ hScale = signMath.pow(signhScale, scale * 50);
7233	7585	if (hScale < 0.01)
7234	7586	{
7235		- hScale = 0.01;
	7587	+ //hScale = 0.01;
7236	7588	}
7237		- hScale = Math.pow(hScale, scale * 50);
7238		- if (hScale < 0.01)
7239		- {
7240		- hScale = 0.01;
7241		- }
	7589	+
7242	7590	double vScale = (double) (info.y - centerPt.y) / 32;
7243		- if (vScale < 0.01)
	7591	+ sign = 1;
	7592	+ if (vScale < 0)
7244	7593	{
7245		- vScale = 0.01;
	7594	+ sign = -1;
7246	7595	}
7247		- vScale = Math.pow(vScale, scale * 50);
	7596	+ vScale = signMath.pow(signvScale, scale * 50);
7248	7597	if (vScale < 0.01)
7249	7598	{
7250		- vScale = 0.01;
	7599	+ //vScale = 0.01;
7251	7600	}
7252	7601	LA.matCopy(startMat, toParent);
7253	7602	/**/
..	..	@@ -7258,39 +7607,47 @@
7258	7607	}
7259	7608	/**/
7260	7609
	7610	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7611	+
	7612	+ if (totalScale < 0.01)
	7613	+ {
	7614	+ totalScale = 0.01;
	7615	+ }
	7616	+
7261	7617	switch (info.pane.RenderCamera().viewCode)
7262	7618	{
7263	7619	case 3: // '\001'
7264		- if (modified)
	7620	+ if (modified \|\| opposite)
7265	7621	{
7266	7622	//LA.matScale(toParent, 1, hScale, vScale);
7267		- LA.matScale(toParent, vScale, 1, 1);
	7623	+ LA.matScale(toParent, totalScale, 1, 1);
7268	7624	} // vScale, 1);
7269	7625	else
7270	7626	{
7271		- LA.matScale(toParent, vScale, vScale, vScale);
	7627	+ // EXCEPTION!
	7628	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7272	7629	} // vScale, 1);
7273	7630	break;
7274	7631
7275	7632	case 2: // '\002'
7276		- if (modified)
	7633	+ if (modified \|\| opposite)
7277	7634	{
7278	7635	//LA.matScale(toParent, hScale, 1, vScale);
7279		- LA.matScale(toParent, 1, vScale, 1);
	7636	+ LA.matScale(toParent, 1, totalScale, 1);
7280	7637	} else
7281	7638	{
7282		- LA.matScale(toParent, vScale, 1, vScale);
	7639	+ LA.matScale(toParent, totalScale, 1, totalScale);
7283	7640	}
7284	7641	break;
7285	7642
7286	7643	case 1: // '\003'
7287		- if (modified)
	7644	+ if (modified \|\| opposite)
7288	7645	{
7289	7646	//LA.matScale(toParent, hScale, vScale, 1);
7290		- LA.matScale(toParent, 1, 1, vScale);
	7647	+ LA.matScale(toParent, 1, 1, totalScale);
7291	7648	} else
7292	7649	{
7293		- LA.matScale(toParent, vScale, vScale, 1);
	7650	+ LA.matScale(toParent, totalScale, totalScale, 1);
7294	7651	}
7295	7652	break;
7296	7653	}
..	..	@@ -7431,7 +7788,7 @@
7431	7788	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7432	7789	} else
7433	7790	{
7434		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7791	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7435	7792	} // + super.toString();
7436	7793	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7437	7794
..	..	@@ -7504,6 +7861,10 @@
7504	7861	editWindow = null;
7505	7862	} // ?
7506	7863	}
	7864	+ else
	7865	+ {
	7866	+ //editWindow.closeUI();
	7867	+ }
7507	7868	}
7508	7869
7509	7870	boolean root; // patch for edit windows
..	..	@@ -7515,7 +7876,7 @@
7515	7876	/transient/ cVector2[] projectedVertices = new cVector2[0];
7516	7877
7517	7878	Object3D /Composite/ parent;
7518		- Object3D /Composite/ fileparent;
	7879	+ Object3D /Composite/ fileparent; // In the case of FileObject
7519	7880
7520	7881	double[][] toParent; // dynamic matrix
7521	7882	double[][] fromParent;
..	..	@@ -7661,6 +8022,10 @@
7661	8022	}
7662	8023
7663	8024	transient ObjEditor editWindow;
	8025	+ transient ObjEditor manipWindow;
	8026	+
	8027	+ transient boolean pinned;
	8028	+
7664	8029	transient ObjectUI objectUI;
7665	8030	public static int povDepth = 0;
7666	8031	private static cVector tbMin = new cVector();
..	..	@@ -7679,9 +8044,9 @@
7679	8044	private static cVector edge2 = new cVector();
7680	8045	//private static cVector norm = new cVector();
7681	8046	/transient private/ int hitSomething;
7682		- private static final int hitCenter = 1;
7683		- private static final int hitScale = 2;
7684		- private static final int hitRotate = 3;
	8047	+ static final int hitCenter = 1;
	8048	+ static final int hitScale = 2;
	8049	+ static final int hitRotate = 3;
7685	8050	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7686	8051	/transient/ private Point centerPt;
7687	8052	/transient/ private int startX;