~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,6 +24,14 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ byte[] versions[] = new byte[100][];
	33	+ int versionindex = -1;
	34	+
27	35	ScriptNode scriptnode;
28	36
29	37	void InitOthers()
..	..	@@ -104,117 +112,178 @@
104	112
105	113	// transient boolean reduced; // for morph reduction
106	114
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	117
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
112	120
113		-void SaveSupports()
114		-{
115		- if (blockloop)
116		- return;
117		-
118		- transientsupport = support;
119		- transientlink2master = link2master;
120		-
121		- support = null;
122		- link2master = false;
123		-
124		- if (bRep != null)
	121	+ void SaveSupports()
125	122	{
126		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
127	146	}
128		-
129		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
130	149	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
134	258	blockloop = true;
135		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
136	267	blockloop = false;
137	268	}
138		-}
139	269
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
144		-
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
	270	+ void RestoreBigData(Object3D o)
151	271	{
152		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
153	286	}
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165		-
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
169		- return;
170		-
171		- Object3D o = new Object3D();
172		- o.bRep = this.bRep;
173		- if (this.bRep != null)
174		- {
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
177		- }
178		-
179		-// o.support = this.support;
180		-// o.fileparent = this.fileparent;
181		-// if (this.bRep != null)
182		-// o.bRep = this.bRep.support;
183		-
184		- hashtable.put(GetUUID(), o);
185		-
186		- this.bRep = null;
187		-// if (this.bRep != null)
188		-// this.bRep.support = null;
189		-// this.support = null;
190		-// this.fileparent = null;
191		-
192		- for (int i=0; i<Size(); i++)
193		- {
194		- get(i).ExtractBigData(hashtable);
195		- }
196		-}
197		-
198		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199		-{
200		- if (!hashtable.containsKey(GetUUID()))
201		- return;
202		-
203		- Object3D o = hashtable.get(GetUUID());
204		-
205		- this.bRep = o.bRep;
206		- if (this.bRep != null)
207		- this.bRep.support = o.transientrep;
208		-// this.support = o.support;
209		-// this.fileparent = o.fileparent;
210		-
211		- hashtable.remove(GetUUID());
212		-
213		- for (int i=0; i<Size(); i++)
214		- {
215		- get(i).RestoreBigData(hashtable);
216		- }
217		-}
218	287
219	288	// MOCAP SUPPORT
220	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -539,12 +608,14 @@
539	608	toParent = LA.newMatrix();
540	609	fromParent = LA.newMatrix();
541	610	}
	611	+
542	612	if (toParentMarked == null)
543	613	{
544	614	if (maxcount != 1)
545	615	{
546	616	new Exception().printStackTrace();
547	617	}
	618	+
548	619	toParentMarked = LA.newMatrix();
549	620	fromParentMarked = LA.newMatrix();
550	621	}
..	..	@@ -855,7 +926,7 @@
855	926
856	927	if (marked && Globals.isLIVE() && live &&
857	928	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	929	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	930	currentframe != Globals.framecount)
860	931	{
861	932	currentframe = Globals.framecount;
..	..	@@ -867,7 +938,8 @@
867	938
868	939	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	940
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	941	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	942	+ (step == 1 && changedir))
871	943	{
872	944	countdown = 1;
873	945	delay = speedup?8:1;
..	..	@@ -939,6 +1011,7 @@
939	1011	if (material == null \|\| material.multiply)
940	1012	return true;
941	1013
	1014	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1015	return material.opacity > 0.99;
943	1016	}
944	1017
..	..	@@ -1339,6 +1412,7 @@
1339	1412	toParent = LA.newMatrix();
1340	1413	fromParent = LA.newMatrix();
1341	1414	}
	1415	+
1342	1416	LA.matCopy(other.toParent, toParent);
1343	1417	LA.matCopy(other.fromParent, fromParent);
1344	1418
..	..	@@ -2360,6 +2434,10 @@
2360	2434	}
2361	2435	*/
2362	2436	}
	2437	+ else
	2438	+ {
	2439	+ //((ObjEditor)editWindow).SetupUI2(null);
	2440	+ }
2363	2441	}
2364	2442
2365	2443	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2479,14 @@
2401	2479	{
2402	2480	editWindow.refreshContents();
2403	2481	}
	2482	+ else
	2483	+ {
	2484	+ if (manipWindow != null)
	2485	+ {
	2486	+ manipWindow.refreshContents();
	2487	+ }
	2488	+ }
	2489	+
2404	2490	//if (parent != null)
2405	2491	//parent.refreshEditWindow();
2406	2492	}
..	..	@@ -2685,6 +2771,18 @@
2685	2771	//Touch();
2686	2772	}
2687	2773
	2774	+ void GenNormalsMeshS()
	2775	+ {
	2776	+ selection.GenNormalsMesh();
	2777	+// for (int i=0; i<selection.size(); i++)
	2778	+// {
	2779	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2780	+// selectee.GenNormals(crease);
	2781	+// }
	2782	+
	2783	+ //Touch();
	2784	+ }
	2785	+
2688	2786	void ClearColorsS()
2689	2787	{
2690	2788	selection.ClearColors();
..	..	@@ -2816,6 +2914,24 @@
2816	2914	if (child == null)
2817	2915	continue;
2818	2916	child.GenNormals(crease);
	2917	+// Children().release(i);
	2918	+ }
	2919	+ blockloop = false;
	2920	+ }
	2921	+
	2922	+ void GenNormalsMesh()
	2923	+ {
	2924	+ if (blockloop)
	2925	+ return;
	2926	+
	2927	+ blockloop = true;
	2928	+ GenNormalsMesh0();
	2929	+ for (int i = 0; i < Children().Size(); i++)
	2930	+ {
	2931	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2932	+ if (child == null)
	2933	+ continue;
	2934	+ child.GenNormalsMesh();
2819	2935	// Children().release(i);
2820	2936	}
2821	2937	blockloop = false;
..	..	@@ -2984,6 +3100,15 @@
2984	3100	if (bRep != null)
2985	3101	{
2986	3102	bRep.GenerateNormals(crease);
	3103	+ Touch();
	3104	+ }
	3105	+ }
	3106	+
	3107	+ void GenNormalsMesh0()
	3108	+ {
	3109	+ if (bRep != null)
	3110	+ {
	3111	+ bRep.GenerateNormalsMesh();
2987	3112	Touch();
2988	3113	}
2989	3114	}
..	..	@@ -3438,7 +3563,8 @@
3438	3563	if (blockloop)
3439	3564	return;
3440	3565
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3566	+ if (//marked \|\| // does not make sense
	3567	+ (bRep != null \|\| material != null)) // borderline...
3442	3568	live = h;
3443	3569
3444	3570	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3585,8 @@
3459	3585	return;
3460	3586
3461	3587	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3588	+ if (//marked \|\| // does not make sense
	3589	+ (bRep != null \|\| material != null)) // borderline...
3463	3590	link2master = h;
3464	3591
3465	3592	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3606,8 @@
3479	3606	if (blockloop)
3480	3607	return;
3481	3608
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3609	+ if (//marked \|\| // does not make sense
	3610	+ (bRep != null \|\| material != null)) // borderline...
3483	3611	hide = h;
3484	3612
3485	3613	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3627,7 @@
3499	3627	if (blockloop)
3500	3628	return;
3501	3629
3502		- if (bRep != null && material != null) // borderline...
	3630	+ if (bRep != null \|\| material != null) // borderline...
3503	3631	marked = h;
3504	3632
3505	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3637,46 @@
3509	3637	continue;
3510	3638	blockloop = true;
3511	3639	child.MarkLeaves(h);
	3640	+ blockloop = false;
	3641	+ // release(i);
	3642	+ }
	3643	+ }
	3644	+
	3645	+ void RewindLeaves(boolean h)
	3646	+ {
	3647	+ if (blockloop)
	3648	+ return;
	3649	+
	3650	+ if (bRep != null \|\| material != null) // borderline...
	3651	+ rewind = h;
	3652	+
	3653	+ for (int i = 0; i < Size(); i++)
	3654	+ {
	3655	+ Object3D child = (Object3D) get(i); // reserve(i);
	3656	+ if (child == null)
	3657	+ continue;
	3658	+ blockloop = true;
	3659	+ child.RewindLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RandomLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ random = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RandomLeaves(h);
3512	3680	blockloop = false;
3513	3681	// release(i);
3514	3682	}
..	..	@@ -4286,6 +4454,55 @@
4286	4454	}
4287	4455	}
4288	4456
	4457	+ void RepairSOV()
	4458	+ {
	4459	+ if (blockloop)
	4460	+ return;
	4461	+
	4462	+ String texname = this.GetPigmentTexture();
	4463	+
	4464	+ if (texname.startsWith("sov"))
	4465	+ {
	4466	+ String[] s = texname.split("/");
	4467	+
	4468	+ String[] sname = s[1].split("Color.pn");
	4469	+
	4470	+ texname = sname[0];
	4471	+
	4472	+ if (sname.length > 1)
	4473	+ {
	4474	+ texname += "Color.jpg";
	4475	+ }
	4476	+
	4477	+ this.SetPigmentTexture("sov/" + texname);
	4478	+ }
	4479	+
	4480	+ texname = this.GetBumpTexture();
	4481	+
	4482	+ if (texname.startsWith("sov"))
	4483	+ {
	4484	+ String[] s = texname.split("/");
	4485	+
	4486	+ String[] sname = s[1].split("Bump.pn");
	4487	+
	4488	+ texname = sname[0];
	4489	+
	4490	+ if (sname.length > 1)
	4491	+ {
	4492	+ texname += "Bump.jpg";
	4493	+ }
	4494	+
	4495	+ this.SetBumpTexture("sov/" + texname);
	4496	+ }
	4497	+
	4498	+ for (int i=0; i<Size(); i++)
	4499	+ {
	4500	+ blockloop = true;
	4501	+ get(i).RepairSOV();
	4502	+ blockloop = false;
	4503	+ }
	4504	+ }
	4505	+
4289	4506	void RepairTexture()
4290	4507	{
4291	4508	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5017,14 @@
4800	5017	}
4801	5018	}
4802	5019
	5020	+ ObjEditor GetWindow()
	5021	+ {
	5022	+ if (editWindow != null)
	5023	+ return editWindow;
	5024	+
	5025	+ return manipWindow;
	5026	+ }
	5027	+
4803	5028	cTreePath Select(int indexcount, boolean deselect)
4804	5029	{
4805	5030	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5061,11 @@
4836	5061	if (leaf != null)
4837	5062	{
4838	5063	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5064	+ ObjEditor window = GetWindow();
	5065	+ if (window != null)
4840	5066	{
4841	5067	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5068	+ window.Select(tp, deselect, true);
4843	5069	}
4844	5070
4845	5071	return tp;
..	..	@@ -4856,6 +5082,7 @@
4856	5082
4857	5083	if (child == null)
4858	5084	continue;
	5085	+
4859	5086	if (child.HasTransparency() && child.size() != 0)
4860	5087	{
4861	5088	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5092,10 @@
4865	5092	if (leaf != null)
4866	5093	{
4867	5094	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5095	+ ObjEditor window = GetWindow();
	5096	+ if (window != null)
4869	5097	{
4870		- editWindow.Select(tp, deselect, true);
	5098	+ window.Select(tp, deselect, true);
4871	5099	}
4872	5100
4873	5101	return tp;
..	..	@@ -5509,12 +5737,23 @@
5509	5737	boolean NeedSupport()
5510	5738	{
5511	5739	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5740	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5741	// PROBLEM with CROWD!!
5514	5742	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5743	}
5516	5744
5517	5745	static boolean DEBUG_SELECTION = false;
	5746	+
	5747	+ boolean IsLive()
	5748	+ {
	5749	+ if (live)
	5750	+ return true;
	5751	+
	5752	+ if (parent == null)
	5753	+ return false;
	5754	+
	5755	+ return parent.IsLive();
	5756	+ }
5518	5757
5519	5758	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5759	{
..	..	@@ -5577,7 +5816,7 @@
5577	5816	support = support;
5578	5817
5579	5818	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5819	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5581	5820
5582	5821	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	5822	{
..	..	@@ -5597,10 +5836,12 @@
5597	5836	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	5837
5599	5838	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5839	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5840	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	5841	{
5602	5842	Globals.lighttouched = true;
5603	5843	} // all panes...
	5844	+
5604	5845	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	5846	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	5847	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5728,6 +5969,7 @@
5728	5969	if (GetBRep() != null)
5729	5970	{
5730	5971	display.NextIndex();
	5972	+
5731	5973	// vertex color conflict : gl.glCallList(list);
5732	5974	DrawNode(display, root, selected);
5733	5975	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6010,27 @@
5768	6010	tex = GetTextures();
5769	6011	}
5770	6012
5771		- boolean failed = false;
	6013	+ boolean failedPigment = false;
	6014	+ boolean failedBump = false;
5772	6015
5773	6016	try
5774	6017	{
5775		- display.BindTextures(tex, texres);
	6018	+ display.BindPigmentTexture(tex, texres);
5776	6019	}
5777	6020	catch (Exception e)
5778	6021	{
5779	6022	System.err.println("FAILED: " + this);
5780		- failed = true;
	6023	+ failedPigment = true;
	6024	+ }
	6025	+
	6026	+ try
	6027	+ {
	6028	+ display.BindBumpTexture(tex, texres);
	6029	+ }
	6030	+ catch (Exception e)
	6031	+ {
	6032	+ //System.err.println("FAILED: " + this);
	6033	+ failedBump = true;
5781	6034	}
5782	6035
5783	6036	if (!compiled)
..	..	@@ -5800,8 +6053,11 @@
5800	6053	}
5801	6054	}
5802	6055
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6056	+ if (!failedBump)
	6057	+ display.ReleaseBumpTexture(tex);
	6058	+
	6059	+ if (!failedPigment)
	6060	+ display.ReleasePigmentTexture(tex);
5805	6061
5806	6062	display.PopMaterial(this, selected);
5807	6063	}
..	..	@@ -6174,6 +6430,11 @@
6174	6430	// dec 2012
6175	6431	new Exception().printStackTrace();
6176	6432	return;
	6433	+ }
	6434	+
	6435	+ if (dontselect)
	6436	+ {
	6437	+ //bRep.GenerateNormalsMINE();
6177	6438	}
6178	6439
6179	6440	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7026,7 +7287,7 @@
7026	7287	spot.translate(32, 32);
7027	7288	spotw = spot.x + spot.width;
7028	7289	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
	7290	+ info.g.setColor(Color.cyan);
7030	7291	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7292	// if (CameraPane.Xmin > spot.x)
7032	7293	// {
..	..	@@ -7044,11 +7305,12 @@
7044	7305	// {
7045	7306	// CameraPane.Ymax = spoth;
7046	7307	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7308	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7309	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7049	7310	spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
	7311	+ info.g.setColor(Color.yellow);
7051	7312	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7313	+ info.g.setColor(Color.green);
7052	7314	// if (CameraPane.Xmin > spot.x)
7053	7315	// {
7054	7316	// CameraPane.Xmin = spot.x;
..	..	@@ -7065,8 +7327,8 @@
7065	7327	// {
7066	7328	// CameraPane.Ymax = spoth;
7067	7329	// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- boundary.width, boundary.height, 0, 360);
	7330	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7331	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7070	7332	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7333	// if (CameraPane.Xmin > boundary.x)
7072	7334	// {
..	..	@@ -7366,19 +7628,20 @@
7366	7628	switch (info.pane.RenderCamera().viewCode)
7367	7629	{
7368	7630	case 3: // '\001'
7369		- if (modified)
	7631	+ if (modified \|\| opposite)
7370	7632	{
7371	7633	//LA.matScale(toParent, 1, hScale, vScale);
7372	7634	LA.matScale(toParent, totalScale, 1, 1);
7373	7635	} // vScale, 1);
7374	7636	else
7375	7637	{
	7638	+ // EXCEPTION!
7376	7639	LA.matScale(toParent, totalScale, totalScale, totalScale);
7377	7640	} // vScale, 1);
7378	7641	break;
7379	7642
7380	7643	case 2: // '\002'
7381		- if (modified)
	7644	+ if (modified \|\| opposite)
7382	7645	{
7383	7646	//LA.matScale(toParent, hScale, 1, vScale);
7384	7647	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7389,7 +7652,7 @@
7389	7652	break;
7390	7653
7391	7654	case 1: // '\003'
7392		- if (modified)
	7655	+ if (modified \|\| opposite)
7393	7656	{
7394	7657	//LA.matScale(toParent, hScale, vScale, 1);
7395	7658	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7609,6 +7872,10 @@
7609	7872	editWindow = null;
7610	7873	} // ?
7611	7874	}
	7875	+ else
	7876	+ {
	7877	+ //editWindow.closeUI();
	7878	+ }
7612	7879	}
7613	7880
7614	7881	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8033,10 @@
7766	8033	}
7767	8034
7768	8035	transient ObjEditor editWindow;
	8036	+ transient ObjEditor manipWindow;
	8037	+
	8038	+ transient boolean pinned;
	8039	+
7769	8040	transient ObjectUI objectUI;
7770	8041	public static int povDepth = 0;
7771	8042	private static cVector tbMin = new cVector();