~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,14 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
30	30	//
31	31
	32	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
32	35	ScriptNode scriptnode;
33	36
34	37	void InitOthers()
..	..	@@ -170,24 +173,35 @@
170	173
171	174	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	175	{
	176	+ Object3D o;
	177	+
173	178	if (hashtable.containsKey(GetUUID()))
174	179	{
175		- Object3D o = hashtable.get(GetUUID());
	180	+ o = hashtable.get(GetUUID());
176	181
177		- assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	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);
180	191
181		- return;
	192	+ hashtable.put(GetUUID(), o);
182	193	}
183	194
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	195	+ if (!blockloop)
189	196	{
190		- get(i).ExtractBigData(hashtable);
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
191	205	}
192	206
193	207	ExtractBigData(o);
..	..	@@ -195,11 +209,26 @@
195	209
196	210	void ExtractBigData(Object3D o)
197	211	{
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
198	215	o.bRep = this.bRep;
199		- if (this.bRep != null)
	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)
200	226	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	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;
203	232	}
204	233
205	234	// o.support = this.support;
..	..	@@ -223,19 +252,35 @@
223	252
224	253	RestoreBigData(o);
225	254
226		- hashtable.remove(GetUUID());
	255	+ if (blockloop)
	256	+ return;
	257	+
	258	+ blockloop = true;
	259	+
	260	+ //hashtable.remove(GetUUID());
227	261
228	262	for (int i=0; i<Size(); i++)
229	263	{
230	264	get(i).RestoreBigData(hashtable);
231	265	}
	266	+
	267	+ blockloop = false;
232	268	}
233	269
234	270	void RestoreBigData(Object3D o)
235	271	{
236	272	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	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;
239	284	// this.support = o.support;
240	285	// this.fileparent = o.fileparent;
241	286	}
..	..	@@ -381,6 +426,7 @@
381	426	}
382	427
383	428	boolean live = false;
	429	+ transient boolean keepdontselect;
384	430	boolean dontselect = false;
385	431	boolean hide = false;
386	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -563,12 +609,14 @@
563	609	toParent = LA.newMatrix();
564	610	fromParent = LA.newMatrix();
565	611	}
	612	+
566	613	if (toParentMarked == null)
567	614	{
568	615	if (maxcount != 1)
569	616	{
570	617	new Exception().printStackTrace();
571	618	}
	619	+
572	620	toParentMarked = LA.newMatrix();
573	621	fromParentMarked = LA.newMatrix();
574	622	}
..	..	@@ -879,7 +927,7 @@
879	927
880	928	if (marked && Globals.isLIVE() && live &&
881	929	//TEMP21aug2018
882		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
883	931	currentframe != Globals.framecount)
884	932	{
885	933	currentframe = Globals.framecount;
..	..	@@ -891,7 +939,8 @@
891	939
892	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
893	941
894		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
895	944	{
896	945	countdown = 1;
897	946	delay = speedup?8:1;
..	..	@@ -963,6 +1012,7 @@
963	1012	if (material == null \|\| material.multiply)
964	1013	return true;
965	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
966	1016	return material.opacity > 0.99;
967	1017	}
968	1018
..	..	@@ -1363,6 +1413,7 @@
1363	1413	toParent = LA.newMatrix();
1364	1414	fromParent = LA.newMatrix();
1365	1415	}
	1416	+
1366	1417	LA.matCopy(other.toParent, toParent);
1367	1418	LA.matCopy(other.fromParent, fromParent);
1368	1419
..	..	@@ -2384,6 +2435,10 @@
2384	2435	}
2385	2436	*/
2386	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2387	2442	}
2388	2443
2389	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2425,6 +2480,14 @@
2425	2480	{
2426	2481	editWindow.refreshContents();
2427	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2428	2491	//if (parent != null)
2429	2492	//parent.refreshEditWindow();
2430	2493	}
..	..	@@ -3055,7 +3118,7 @@
3055	3118	{
3056	3119	if (bRep != null)
3057	3120	{
3058		- bRep.GenerateNormalsMINE();
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3059	3122	Touch();
3060	3123	}
3061	3124	}
..	..	@@ -3501,7 +3564,8 @@
3501	3564	if (blockloop)
3502	3565	return;
3503	3566
3504		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3505	3569	live = h;
3506	3570
3507	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3522,7 +3586,8 @@
3522	3586	return;
3523	3587
3524	3588	//if (bRep != null)
3525		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3526	3591	link2master = h;
3527	3592
3528	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3542,7 +3607,8 @@
3542	3607	if (blockloop)
3543	3608	return;
3544	3609
3545		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3546	3612	hide = h;
3547	3613
3548	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3562,7 +3628,7 @@
3562	3628	if (blockloop)
3563	3629	return;
3564	3630
3565		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3566	3632	marked = h;
3567	3633
3568	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3572,6 +3638,46 @@
3572	3638	continue;
3573	3639	blockloop = true;
3574	3640	child.MarkLeaves(h);
	3641	+ blockloop = false;
	3642	+ // release(i);
	3643	+ }
	3644	+ }
	3645	+
	3646	+ void RewindLeaves(boolean h)
	3647	+ {
	3648	+ if (blockloop)
	3649	+ return;
	3650	+
	3651	+ if (bRep != null \|\| material != null) // borderline...
	3652	+ rewind = h;
	3653	+
	3654	+ for (int i = 0; i < Size(); i++)
	3655	+ {
	3656	+ Object3D child = (Object3D) get(i); // reserve(i);
	3657	+ if (child == null)
	3658	+ continue;
	3659	+ blockloop = true;
	3660	+ child.RewindLeaves(h);
	3661	+ blockloop = false;
	3662	+ // release(i);
	3663	+ }
	3664	+ }
	3665	+
	3666	+ void RandomLeaves(boolean h)
	3667	+ {
	3668	+ if (blockloop)
	3669	+ return;
	3670	+
	3671	+ if (bRep != null \|\| material != null) // borderline...
	3672	+ random = h;
	3673	+
	3674	+ for (int i = 0; i < Size(); i++)
	3675	+ {
	3676	+ Object3D child = (Object3D) get(i); // reserve(i);
	3677	+ if (child == null)
	3678	+ continue;
	3679	+ blockloop = true;
	3680	+ child.RandomLeaves(h);
3575	3681	blockloop = false;
3576	3682	// release(i);
3577	3683	}
..	..	@@ -4349,6 +4455,55 @@
4349	4455	}
4350	4456	}
4351	4457
	4458	+ void RepairSOV()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ String texname = this.GetPigmentTexture();
	4464	+
	4465	+ if (texname.startsWith("sov"))
	4466	+ {
	4467	+ String[] s = texname.split("/");
	4468	+
	4469	+ String[] sname = s[1].split("Color.pn");
	4470	+
	4471	+ texname = sname[0];
	4472	+
	4473	+ if (sname.length > 1)
	4474	+ {
	4475	+ texname += "Color.jpg";
	4476	+ }
	4477	+
	4478	+ this.SetPigmentTexture("sov/" + texname);
	4479	+ }
	4480	+
	4481	+ texname = this.GetBumpTexture();
	4482	+
	4483	+ if (texname.startsWith("sov"))
	4484	+ {
	4485	+ String[] s = texname.split("/");
	4486	+
	4487	+ String[] sname = s[1].split("Bump.pn");
	4488	+
	4489	+ texname = sname[0];
	4490	+
	4491	+ if (sname.length > 1)
	4492	+ {
	4493	+ texname += "Bump.jpg";
	4494	+ }
	4495	+
	4496	+ this.SetBumpTexture("sov/" + texname);
	4497	+ }
	4498	+
	4499	+ for (int i=0; i<Size(); i++)
	4500	+ {
	4501	+ blockloop = true;
	4502	+ get(i).RepairSOV();
	4503	+ blockloop = false;
	4504	+ }
	4505	+ }
	4506	+
4352	4507	void RepairTexture()
4353	4508	{
4354	4509	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4863,6 +5018,14 @@
4863	5018	}
4864	5019	}
4865	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4866	5029	cTreePath Select(int indexcount, boolean deselect)
4867	5030	{
4868	5031	if (hide \|\| dontselect)
..	..	@@ -4899,10 +5062,11 @@
4899	5062	if (leaf != null)
4900	5063	{
4901	5064	cTreePath tp = new cTreePath(this, leaf);
4902		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4903	5067	{
4904	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4905		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4906	5070	}
4907	5071
4908	5072	return tp;
..	..	@@ -4919,6 +5083,7 @@
4919	5083
4920	5084	if (child == null)
4921	5085	continue;
	5086	+
4922	5087	if (child.HasTransparency() && child.size() != 0)
4923	5088	{
4924	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4928,9 +5093,10 @@
4928	5093	if (leaf != null)
4929	5094	{
4930	5095	cTreePath tp = new cTreePath(this, leaf);
4931		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4932	5098	{
4933		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4934	5100	}
4935	5101
4936	5102	return tp;
..	..	@@ -5255,6 +5421,51 @@
5255	5421	blockloop = false;
5256	5422	}
5257	5423
	5424	+ void ResetSelectable()
	5425	+ {
	5426	+ if (blockloop)
	5427	+ return;
	5428	+
	5429	+ blockloop = true;
	5430	+
	5431	+ keepdontselect = dontselect;
	5432	+ dontselect = true;
	5433	+
	5434	+ Object3D child;
	5435	+ int nb = Size();
	5436	+ for (int i = 0; i < nb; i++)
	5437	+ {
	5438	+ child = (Object3D) get(i);
	5439	+ if (child == null)
	5440	+ continue;
	5441	+ child.ResetSelectable();
	5442	+ }
	5443	+
	5444	+ blockloop = false;
	5445	+ }
	5446	+
	5447	+ void RestoreSelectable()
	5448	+ {
	5449	+ if (blockloop)
	5450	+ return;
	5451	+
	5452	+ blockloop = true;
	5453	+
	5454	+ dontselect = keepdontselect;
	5455	+
	5456	+ Object3D child;
	5457	+ int nb = Size();
	5458	+ for (int i = 0; i < nb; i++)
	5459	+ {
	5460	+ child = (Object3D) get(i);
	5461	+ if (child == null)
	5462	+ continue;
	5463	+ child.RestoreSelectable();
	5464	+ }
	5465	+
	5466	+ blockloop = false;
	5467	+ }
	5468	+
5258	5469	boolean IsSelected()
5259	5470	{
5260	5471	if (parent == null)
..	..	@@ -5564,6 +5775,38 @@
5564	5775	}
5565	5776	}
5566	5777
	5778	+ void EmbedTextures(boolean embed)
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ //if (GetTextures() != null)
	5784	+ if (embed)
	5785	+ CameraPane.EmbedTextures(GetTextures());
	5786	+ else
	5787	+ {
	5788	+ GetTextures().pigmentdata = null;
	5789	+ GetTextures().bumpdata = null;
	5790	+ GetTextures().pw = 0;
	5791	+ GetTextures().ph = 0;
	5792	+ GetTextures().bw = 0;
	5793	+ GetTextures().bh = 0;
	5794	+ }
	5795	+
	5796	+ int nb = Size();
	5797	+ for (int i = 0; i < nb; i++)
	5798	+ {
	5799	+ Object3D child = (Object3D) get(i);
	5800	+
	5801	+ if (child == null)
	5802	+ continue;
	5803	+
	5804	+ blockloop = true;
	5805	+ child.EmbedTextures(embed);
	5806	+ blockloop = false;
	5807	+ }
	5808	+ }
	5809	+
5567	5810	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5568	5811	{
5569	5812	Draw(display, root, selected, blocked);
..	..	@@ -5572,12 +5815,23 @@
5572	5815	boolean NeedSupport()
5573	5816	{
5574	5817	return
5575		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5818	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5576	5819	// PROBLEM with CROWD!!
5577	5820	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5578	5821	}
5579	5822
5580	5823	static boolean DEBUG_SELECTION = false;
	5824	+
	5825	+ boolean IsLive()
	5826	+ {
	5827	+ if (live)
	5828	+ return true;
	5829	+
	5830	+ if (parent == null)
	5831	+ return false;
	5832	+
	5833	+ return parent.IsLive();
	5834	+ }
5581	5835
5582	5836	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5583	5837	{
..	..	@@ -5640,7 +5894,7 @@
5640	5894	support = support;
5641	5895
5642	5896	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5897	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5644	5898
5645	5899	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646	5900	{
..	..	@@ -5660,10 +5914,12 @@
5660	5914	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5661	5915
5662	5916	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5917	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5918	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5664	5919	{
5665	5920	Globals.lighttouched = true;
5666	5921	} // all panes...
	5922	+
5667	5923	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5668	5924	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5669	5925	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5791,6 +6047,7 @@
5791	6047	if (GetBRep() != null)
5792	6048	{
5793	6049	display.NextIndex();
	6050	+
5794	6051	// vertex color conflict : gl.glCallList(list);
5795	6052	DrawNode(display, root, selected);
5796	6053	if (this instanceof BezierPatch)
..	..	@@ -5831,16 +6088,27 @@
5831	6088	tex = GetTextures();
5832	6089	}
5833	6090
5834		- boolean failed = false;
	6091	+ boolean failedPigment = false;
	6092	+ boolean failedBump = false;
5835	6093
5836	6094	try
5837	6095	{
5838		- display.BindTextures(tex, texres);
	6096	+ display.BindPigmentTexture(tex, texres);
5839	6097	}
5840	6098	catch (Exception e)
5841	6099	{
5842	6100	System.err.println("FAILED: " + this);
5843		- failed = true;
	6101	+ failedPigment = true;
	6102	+ }
	6103	+
	6104	+ try
	6105	+ {
	6106	+ display.BindBumpTexture(tex, texres);
	6107	+ }
	6108	+ catch (Exception e)
	6109	+ {
	6110	+ //System.err.println("FAILED: " + this);
	6111	+ failedBump = true;
5844	6112	}
5845	6113
5846	6114	if (!compiled)
..	..	@@ -5863,8 +6131,11 @@
5863	6131	}
5864	6132	}
5865	6133
5866		- if (!failed)
5867		- display.ReleaseTextures(tex);
	6134	+ if (!failedBump)
	6135	+ display.ReleaseBumpTexture(tex);
	6136	+
	6137	+ if (!failedPigment)
	6138	+ display.ReleasePigmentTexture(tex);
5868	6139
5869	6140	display.PopMaterial(this, selected);
5870	6141	}
..	..	@@ -6237,6 +6508,11 @@
6237	6508	// dec 2012
6238	6509	new Exception().printStackTrace();
6239	6510	return;
	6511	+ }
	6512	+
	6513	+ if (dontselect)
	6514	+ {
	6515	+ //bRep.GenerateNormalsMINE();
6240	6516	}
6241	6517
6242	6518	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7089,7 +7365,7 @@
7089	7365	spot.translate(32, 32);
7090	7366	spotw = spot.x + spot.width;
7091	7367	spoth = spot.y + spot.height;
7092		- info.g.setColor(Color.blue);
	7368	+ info.g.setColor(Color.cyan);
7093	7369	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7094	7370	// if (CameraPane.Xmin > spot.x)
7095	7371	// {
..	..	@@ -7107,11 +7383,12 @@
7107	7383	// {
7108	7384	// CameraPane.Ymax = spoth;
7109	7385	// }
7110		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7386	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7387	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7112	7388	spot.translate(0, -32);
7113		- info.g.setColor(Color.green);
	7389	+ info.g.setColor(Color.yellow);
7114	7390	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7391	+ info.g.setColor(Color.green);
7115	7392	// if (CameraPane.Xmin > spot.x)
7116	7393	// {
7117	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7128,8 +7405,8 @@
7128	7405	// {
7129	7406	// CameraPane.Ymax = spoth;
7130	7407	// }
7131		- info.g.drawArc(boundary.x, boundary.y,
7132		- boundary.width, boundary.height, 0, 360);
	7408	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7409	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7133	7410	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7134	7411	// if (CameraPane.Xmin > boundary.x)
7135	7412	// {
..	..	@@ -7429,19 +7706,20 @@
7429	7706	switch (info.pane.RenderCamera().viewCode)
7430	7707	{
7431	7708	case 3: // '\001'
7432		- if (modified)
	7709	+ if (modified \|\| opposite)
7433	7710	{
7434	7711	//LA.matScale(toParent, 1, hScale, vScale);
7435	7712	LA.matScale(toParent, totalScale, 1, 1);
7436	7713	} // vScale, 1);
7437	7714	else
7438	7715	{
	7716	+ // EXCEPTION!
7439	7717	LA.matScale(toParent, totalScale, totalScale, totalScale);
7440	7718	} // vScale, 1);
7441	7719	break;
7442	7720
7443	7721	case 2: // '\002'
7444		- if (modified)
	7722	+ if (modified \|\| opposite)
7445	7723	{
7446	7724	//LA.matScale(toParent, hScale, 1, vScale);
7447	7725	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7452,7 +7730,7 @@
7452	7730	break;
7453	7731
7454	7732	case 1: // '\003'
7455		- if (modified)
	7733	+ if (modified \|\| opposite)
7456	7734	{
7457	7735	//LA.matScale(toParent, hScale, vScale, 1);
7458	7736	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7672,6 +7950,10 @@
7672	7950	editWindow = null;
7673	7951	} // ?
7674	7952	}
	7953	+ else
	7954	+ {
	7955	+ //editWindow.closeUI();
	7956	+ }
7675	7957	}
7676	7958
7677	7959	boolean root; // patch for edit windows
..	..	@@ -7829,6 +8111,10 @@
7829	8111	}
7830	8112
7831	8113	transient ObjEditor editWindow;
	8114	+ transient ObjEditor manipWindow;
	8115	+
	8116	+ transient boolean pinned;
	8117	+
7832	8118	transient ObjectUI objectUI;
7833	8119	public static int povDepth = 0;
7834	8120	private static cVector tbMin = new cVector();