~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,27 @@
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;
22	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	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
23	38	ScriptNode scriptnode;
24	39
25	40	void InitOthers()
..	..	@@ -100,64 +115,178 @@
100	115
101	116	// transient boolean reduced; // for morph reduction
102	117
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	120
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
108	123
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)
	124	+ void SaveSupports()
121	125	{
122		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
123	149	}
124		-
125		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
126	152	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
130	261	blockloop = true;
131		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
132	270	blockloop = false;
133	271	}
134		-}
135	272
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)
	273	+ void RestoreBigData(Object3D o)
147	274	{
148		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
149	289	}
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	290
162	291	// MOCAP SUPPORT
163	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +429,7 @@
300	429	}
301	430
302	431	boolean live = false;
	432	+ transient boolean keepdontselect;
303	433	boolean dontselect = false;
304	434	boolean hide = false;
305	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -482,12 +612,14 @@
482	612	toParent = LA.newMatrix();
483	613	fromParent = LA.newMatrix();
484	614	}
	615	+
485	616	if (toParentMarked == null)
486	617	{
487	618	if (maxcount != 1)
488	619	{
489	620	new Exception().printStackTrace();
490	621	}
	622	+
491	623	toParentMarked = LA.newMatrix();
492	624	fromParentMarked = LA.newMatrix();
493	625	}
..	..	@@ -798,7 +930,7 @@
798	930
799	931	if (marked && Globals.isLIVE() && live &&
800	932	//TEMP21aug2018
801		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
802	934	currentframe != Globals.framecount)
803	935	{
804	936	currentframe = Globals.framecount;
..	..	@@ -810,7 +942,8 @@
810	942
811	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
812	944
813		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
814	947	{
815	948	countdown = 1;
816	949	delay = speedup?8:1;
..	..	@@ -882,6 +1015,7 @@
882	1015	if (material == null \|\| material.multiply)
883	1016	return true;
884	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
885	1019	return material.opacity > 0.99;
886	1020	}
887	1021
..	..	@@ -1282,6 +1416,7 @@
1282	1416	toParent = LA.newMatrix();
1283	1417	fromParent = LA.newMatrix();
1284	1418	}
	1419	+
1285	1420	LA.matCopy(other.toParent, toParent);
1286	1421	LA.matCopy(other.fromParent, fromParent);
1287	1422
..	..	@@ -2303,6 +2438,10 @@
2303	2438	}
2304	2439	*/
2305	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2306	2445	}
2307	2446
2308	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2344,6 +2483,14 @@
2344	2483	{
2345	2484	editWindow.refreshContents();
2346	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2347	2494	//if (parent != null)
2348	2495	//parent.refreshEditWindow();
2349	2496	}
..	..	@@ -2423,7 +2570,8 @@
2423	2570	private static final int editSelf = 1;
2424	2571	private static final int editChild = 2;
2425	2572
2426		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2427	2575	{
2428	2576	if (level == 0)
2429	2577	{
..	..	@@ -2431,7 +2579,8 @@
2431	2579	return;
2432	2580
2433	2581	Object3D selectee;
2434		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2435	2584	{
2436	2585	selectee = (Object3D) e.nextElement();
2437	2586	}
..	..	@@ -2439,19 +2588,22 @@
2439	2588	} else
2440	2589	{
2441	2590	//super.
2442		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2443	2593	}
2444	2594	}
2445	2595
2446		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2447	2598	{
2448	2599	doSomething = 0;
2449	2600	if (level == 0)
2450	2601	{
2451		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2452	2603	}
2453	2604	if (//super.
2454		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2455	2607	{
2456	2608	doSomething = 1;
2457	2609	return true;
..	..	@@ -2461,7 +2613,7 @@
2461	2613	}
2462	2614	}
2463	2615
2464		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2465	2617	{
2466	2618	if (selection == null)
2467	2619	{
..	..	@@ -2474,7 +2626,8 @@
2474	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2475	2627	{
2476	2628	Object3D selectee = (Object3D) e.nextElement();
2477		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2478	2631	{
2479	2632	childToDrag = selectee;
2480	2633	doSomething = 2;
..	..	@@ -2486,13 +2639,15 @@
2486	2639	return retval;
2487	2640	}
2488	2641
2489		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2490	2644	{
2491	2645	switch (doSomething)
2492	2646	{
2493	2647	case 1: // '\001'
2494	2648	//super.
2495		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2496	2651	break;
2497	2652
2498	2653	case 2: // '\002'
..	..	@@ -2505,11 +2660,13 @@
2505	2660	{
2506	2661	//sel.hitSomething = childToDrag.hitSomething;
2507	2662	//childToDrag.doEditDrag(info);
2508		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2509	2665	} else
2510	2666	{
2511	2667	//super.
2512		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2513	2670	}
2514	2671	}
2515	2672	break;
..	..	@@ -2527,6 +2684,9 @@
2527	2684	{
2528	2685	deselectAll();
2529	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2530	2690	ClickInfo newInfo = new ClickInfo();
2531	2691	newInfo.flags = info.flags;
2532	2692	newInfo.bounds = info.bounds;
..	..	@@ -2619,6 +2779,18 @@
2619	2779	void GenNormalsS(boolean crease)
2620	2780	{
2621	2781	selection.GenNormals(crease);
	2782	+// for (int i=0; i<selection.size(); i++)
	2783	+// {
	2784	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2785	+// selectee.GenNormals(crease);
	2786	+// }
	2787	+
	2788	+ //Touch();
	2789	+ }
	2790	+
	2791	+ void GenNormalsMeshS()
	2792	+ {
	2793	+ selection.GenNormalsMesh();
2622	2794	// for (int i=0; i<selection.size(); i++)
2623	2795	// {
2624	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2759,6 +2931,24 @@
2759	2931	if (child == null)
2760	2932	continue;
2761	2933	child.GenNormals(crease);
	2934	+// Children().release(i);
	2935	+ }
	2936	+ blockloop = false;
	2937	+ }
	2938	+
	2939	+ void GenNormalsMesh()
	2940	+ {
	2941	+ if (blockloop)
	2942	+ return;
	2943	+
	2944	+ blockloop = true;
	2945	+ GenNormalsMesh0();
	2946	+ for (int i = 0; i < Children().Size(); i++)
	2947	+ {
	2948	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2949	+ if (child == null)
	2950	+ continue;
	2951	+ child.GenNormalsMesh();
2762	2952	// Children().release(i);
2763	2953	}
2764	2954	blockloop = false;
..	..	@@ -2931,11 +3121,20 @@
2931	3121	}
2932	3122	}
2933	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2934	3133	void GenNormalsMINE0()
2935	3134	{
2936	3135	if (bRep != null)
2937	3136	{
2938		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2939	3138	Touch();
2940	3139	}
2941	3140	}
..	..	@@ -3381,7 +3580,8 @@
3381	3580	if (blockloop)
3382	3581	return;
3383	3582
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3385	3585	live = h;
3386	3586
3387	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3602,8 @@
3402	3602	return;
3403	3603
3404	3604	//if (bRep != null)
3405		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3406	3607	link2master = h;
3407	3608
3408	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3422,7 +3623,8 @@
3422	3623	if (blockloop)
3423	3624	return;
3424	3625
3425		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3426	3628	hide = h;
3427	3629
3428	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3442,7 +3644,7 @@
3442	3644	if (blockloop)
3443	3645	return;
3444	3646
3445		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3446	3648	marked = h;
3447	3649
3448	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3452,6 +3654,46 @@
3452	3654	continue;
3453	3655	blockloop = true;
3454	3656	child.MarkLeaves(h);
	3657	+ blockloop = false;
	3658	+ // release(i);
	3659	+ }
	3660	+ }
	3661	+
	3662	+ void RewindLeaves(boolean h)
	3663	+ {
	3664	+ if (blockloop)
	3665	+ return;
	3666	+
	3667	+ if (bRep != null \|\| material != null) // borderline...
	3668	+ rewind = h;
	3669	+
	3670	+ for (int i = 0; i < Size(); i++)
	3671	+ {
	3672	+ Object3D child = (Object3D) get(i); // reserve(i);
	3673	+ if (child == null)
	3674	+ continue;
	3675	+ blockloop = true;
	3676	+ child.RewindLeaves(h);
	3677	+ blockloop = false;
	3678	+ // release(i);
	3679	+ }
	3680	+ }
	3681	+
	3682	+ void RandomLeaves(boolean h)
	3683	+ {
	3684	+ if (blockloop)
	3685	+ return;
	3686	+
	3687	+ if (bRep != null \|\| material != null) // borderline...
	3688	+ random = h;
	3689	+
	3690	+ for (int i = 0; i < Size(); i++)
	3691	+ {
	3692	+ Object3D child = (Object3D) get(i); // reserve(i);
	3693	+ if (child == null)
	3694	+ continue;
	3695	+ blockloop = true;
	3696	+ child.RandomLeaves(h);
3455	3697	blockloop = false;
3456	3698	// release(i);
3457	3699	}
..	..	@@ -4229,6 +4471,55 @@
4229	4471	}
4230	4472	}
4231	4473
	4474	+ void RepairSOV()
	4475	+ {
	4476	+ if (blockloop)
	4477	+ return;
	4478	+
	4479	+ String texname = this.GetPigmentTexture();
	4480	+
	4481	+ if (texname.startsWith("sov"))
	4482	+ {
	4483	+ String[] s = texname.split("/");
	4484	+
	4485	+ String[] sname = s[1].split("Color.pn");
	4486	+
	4487	+ texname = sname[0];
	4488	+
	4489	+ if (sname.length > 1)
	4490	+ {
	4491	+ texname += "Color.jpg";
	4492	+ }
	4493	+
	4494	+ this.SetPigmentTexture("sov/" + texname);
	4495	+ }
	4496	+
	4497	+ texname = this.GetBumpTexture();
	4498	+
	4499	+ if (texname.startsWith("sov"))
	4500	+ {
	4501	+ String[] s = texname.split("/");
	4502	+
	4503	+ String[] sname = s[1].split("Bump.pn");
	4504	+
	4505	+ texname = sname[0];
	4506	+
	4507	+ if (sname.length > 1)
	4508	+ {
	4509	+ texname += "Bump.jpg";
	4510	+ }
	4511	+
	4512	+ this.SetBumpTexture("sov/" + texname);
	4513	+ }
	4514	+
	4515	+ for (int i=0; i<Size(); i++)
	4516	+ {
	4517	+ blockloop = true;
	4518	+ get(i).RepairSOV();
	4519	+ blockloop = false;
	4520	+ }
	4521	+ }
	4522	+
4232	4523	void RepairTexture()
4233	4524	{
4234	4525	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4743,6 +5034,14 @@
4743	5034	}
4744	5035	}
4745	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4746	5045	cTreePath Select(int indexcount, boolean deselect)
4747	5046	{
4748	5047	if (hide \|\| dontselect)
..	..	@@ -4779,10 +5078,11 @@
4779	5078	if (leaf != null)
4780	5079	{
4781	5080	cTreePath tp = new cTreePath(this, leaf);
4782		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4783	5083	{
4784	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4785		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4786	5086	}
4787	5087
4788	5088	return tp;
..	..	@@ -4799,6 +5099,7 @@
4799	5099
4800	5100	if (child == null)
4801	5101	continue;
	5102	+
4802	5103	if (child.HasTransparency() && child.size() != 0)
4803	5104	{
4804	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4808,9 +5109,10 @@
4808	5109	if (leaf != null)
4809	5110	{
4810	5111	cTreePath tp = new cTreePath(this, leaf);
4811		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4812	5114	{
4813		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4814	5116	}
4815	5117
4816	5118	return tp;
..	..	@@ -5135,6 +5437,51 @@
5135	5437	blockloop = false;
5136	5438	}
5137	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5138	5485	boolean IsSelected()
5139	5486	{
5140	5487	if (parent == null)
..	..	@@ -5371,6 +5718,43 @@
5371	5718	}
5372	5719	}
5373	5720
	5721	+ UUID GetUUID()
	5722	+ {
	5723	+ if (uuid == null)
	5724	+ {
	5725	+ // Serial
	5726	+ uuid = UUID.randomUUID();
	5727	+ }
	5728	+
	5729	+ return uuid;
	5730	+ }
	5731	+
	5732	+ Object3D GetObject(UUID uid)
	5733	+ {
	5734	+ if (blockloop)
	5735	+ return null;
	5736	+
	5737	+ if (GetUUID().equals(uid))
	5738	+ return this;
	5739	+
	5740	+ int nb = Size();
	5741	+ for (int i = 0; i < nb; i++)
	5742	+ {
	5743	+ Object3D child = (Object3D) get(i);
	5744	+
	5745	+ if (child == null)
	5746	+ continue;
	5747	+
	5748	+ blockloop = true;
	5749	+ Object3D obj = child.GetObject(uid);
	5750	+ blockloop = false;
	5751	+ if (obj != null)
	5752	+ return obj;
	5753	+ }
	5754	+
	5755	+ return null;
	5756	+ }
	5757	+
5374	5758	void SetBumpTexture(String tex)
5375	5759	{
5376	5760	if (GetTextures() == null)
..	..	@@ -5407,6 +5791,38 @@
5407	5791	}
5408	5792	}
5409	5793
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
5410	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5411	5827	{
5412	5828	Draw(display, root, selected, blocked);
..	..	@@ -5415,12 +5831,23 @@
5415	5831	boolean NeedSupport()
5416	5832	{
5417	5833	return
5418		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5419	5835	// PROBLEM with CROWD!!
5420	5836	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5421	5837	}
5422	5838
5423	5839	static boolean DEBUG_SELECTION = false;
	5840	+
	5841	+ boolean IsLive()
	5842	+ {
	5843	+ if (live)
	5844	+ return true;
	5845	+
	5846	+ if (parent == null)
	5847	+ return false;
	5848	+
	5849	+ return parent.IsLive();
	5850	+ }
5424	5851
5425	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5426	5853	{
..	..	@@ -5483,7 +5910,7 @@
5483	5910	support = support;
5484	5911
5485	5912	//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);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5487	5914
5488	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5489	5916	{
..	..	@@ -5503,10 +5930,12 @@
5503	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5504	5931
5505	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5506		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5933	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5507	5935	{
5508	5936	Globals.lighttouched = true;
5509	5937	} // all panes...
	5938	+
5510	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5511	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5512	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5634,6 +6063,7 @@
5634	6063	if (GetBRep() != null)
5635	6064	{
5636	6065	display.NextIndex();
	6066	+
5637	6067	// vertex color conflict : gl.glCallList(list);
5638	6068	DrawNode(display, root, selected);
5639	6069	if (this instanceof BezierPatch)
..	..	@@ -5674,16 +6104,27 @@
5674	6104	tex = GetTextures();
5675	6105	}
5676	6106
5677		- boolean failed = false;
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
5678	6109
5679	6110	try
5680	6111	{
5681		- display.BindTextures(tex, texres);
	6112	+ display.BindPigmentTexture(tex, texres);
5682	6113	}
5683	6114	catch (Exception e)
5684	6115	{
5685	6116	System.err.println("FAILED: " + this);
5686		- failed = true;
	6117	+ failedPigment = true;
	6118	+ }
	6119	+
	6120	+ try
	6121	+ {
	6122	+ display.BindBumpTexture(tex, texres);
	6123	+ }
	6124	+ catch (Exception e)
	6125	+ {
	6126	+ //System.err.println("FAILED: " + this);
	6127	+ failedBump = true;
5687	6128	}
5688	6129
5689	6130	if (!compiled)
..	..	@@ -5706,8 +6147,11 @@
5706	6147	}
5707	6148	}
5708	6149
5709		- if (!failed)
5710		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5711	6155
5712	6156	display.PopMaterial(this, selected);
5713	6157	}
..	..	@@ -6080,6 +6524,11 @@
6080	6524	// dec 2012
6081	6525	new Exception().printStackTrace();
6082	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6083	6532	}
6084	6533
6085	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6865,20 +7314,23 @@
6865	7314	}
6866	7315	}
6867	7316
6868		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
6869	7321	{
6870		- int hc = info.bounds.x + info.bounds.width / 2;
6871		- int vc = info.bounds.y + info.bounds.height / 2;
6872		- double[][] toscreen = info.toScreen;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
6873	7325	if (toscreen == null)
6874	7326	{
6875		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6876	7328	}
6877	7329	cVector vec = in;
6878	7330	LA.xformPos(in, toscreen, in);
6879	7331	//System.out.println("Distance = " + info.camera.Distance());
6880		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6881		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6882	7334	outPt.x = hc + (int) vec.x;
6883	7335	outPt.y = vc - (int) vec.y;
6884	7336	outRec.x = outPt.x - 3;
..	..	@@ -6886,15 +7338,18 @@
6886	7338	outRec.width = outRec.height = 6;
6887	7339	}
6888	7340
6889		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6890	7343	{
6891	7344	Point pt = new Point(0, 0);
6892	7345	Rectangle rec = new Rectangle();
6893		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6894	7348	return rec;
6895	7349	}
6896	7350
6897		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
6898	7353	{
6899	7354	if (level == 0)
6900	7355	{
..	..	@@ -6903,16 +7358,19 @@
6903	7358	{
6904	7359	cVector origin = new cVector();
6905	7360	//LA.xformPos(origin, toParent, origin);
6906		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6907	7365	Rectangle boundary = new Rectangle();
6908	7366	boundary.x = spot.x - 30;
6909	7367	boundary.y = spot.y - 30;
6910	7368	boundary.width = spot.width + 60;
6911	7369	boundary.height = spot.height + 60;
6912		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
6913	7371	int spotw = spot.x + spot.width;
6914	7372	int spoth = spot.y + spot.height;
6915		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6916	7374	// if (CameraPane.Xmin > spot.x)
6917	7375	// {
6918	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -6932,8 +7390,8 @@
6932	7390	spot.translate(32, 32);
6933	7391	spotw = spot.x + spot.width;
6934	7392	spoth = spot.y + spot.height;
6935		- info.g.setColor(Color.blue);
6936		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6937	7395	// if (CameraPane.Xmin > spot.x)
6938	7396	// {
6939	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -6950,11 +7408,12 @@
6950	7408	// {
6951	7409	// CameraPane.Ymax = spoth;
6952	7410	// }
6953		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7411	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7412	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6955	7413	spot.translate(0, -32);
6956		- info.g.setColor(Color.green);
6957		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
6958	7417	// if (CameraPane.Xmin > spot.x)
6959	7418	// {
6960	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -6971,8 +7430,8 @@
6971	7430	// {
6972	7431	// CameraPane.Ymax = spoth;
6973	7432	// }
6974		- info.g.drawArc(boundary.x, boundary.y,
6975		- boundary.width, boundary.height, 0, 360);
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6976	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6977	7436	// if (CameraPane.Xmin > boundary.x)
6978	7437	// {
..	..	@@ -6994,7 +7453,8 @@
6994	7453	}
6995	7454	}
6996	7455
6997		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
6998	7458	{
6999	7459	if (level == 0)
7000	7460	{
..	..	@@ -7003,8 +7463,8 @@
7003	7463
7004	7464	boolean retval = false;
7005	7465
7006		- startX = info.x;
7007		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7008	7468
7009	7469	hitSomething = -1;
7010	7470	cVector origin = new cVector();
..	..	@@ -7014,22 +7474,51 @@
7014	7474	{
7015	7475	centerPt = new Point(0, 0);
7016	7476	}
7017		- calcHotSpot(origin, info, centerPt, spot);
7018		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7019	7480	{
7020	7481	hitSomething = hitCenter;
7021	7482	retval = true;
7022	7483	}
7023	7484	spot.translate(32, 0);
7024		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7025	7486	{
7026	7487	hitSomething = hitRotate;
7027	7488	retval = true;
7028	7489	}
7029	7490	spot.translate(0, 32);
7030		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7031	7492	{
7032	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7033	7522	retval = true;
7034	7523	}
7035	7524
..	..	@@ -7039,7 +7528,7 @@
7039	7528	}
7040	7529
7041	7530	//System.out.println("info.modifiers = " + info.modifiers);
7042		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7043	7532	//System.out.println("modified = " + modified);
7044	7533	//new Exception().printStackTrace();
7045	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7067,7 +7556,8 @@
7067	7556	return true;
7068	7557	}
7069	7558
7070		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7071	7561	{
7072	7562	if (hitSomething == 0)
7073	7563	{
..	..	@@ -7081,7 +7571,7 @@
7081	7571
7082	7572	//System.out.println("hitSomething = " + hitSomething);
7083	7573
7084		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
7085	7575
7086	7576	cVector xlate = new cVector();
7087	7577	//cVector xlate2 = new cVector();
..	..	@@ -7115,8 +7605,8 @@
7115	7605	toParent[3][i] = xlate.get(i);
7116	7606	LA.matInvert(toParent, fromParent);
7117	7607	*/
7118		- cVector delta = LA.newVector(0, 0, startY - info.y);
7119		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7120	7610
7121	7611	LA.matCopy(startMat, toParent);
7122	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7125,7 +7615,7 @@
7125	7615	} else
7126	7616	{
7127	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7128		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7129	7619	cVector away = new cVector();
7130	7620	//cVector right2 = new cVector();
7131	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7142,19 +7632,19 @@
7142	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7143	7633	// if (!CameraPane.LOCALTRANSFORM)
7144	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7145		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7146	7636	// if (!CameraPane.LOCALTRANSFORM)
7147	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7148	7638	//LA.vecCross(up, cVector.Z, right2);
7149	7639
7150		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7151	7641
7152	7642	//System.out.println("DELTA0 = " + delta);
7153	7643	//System.out.println("AWAY = " + info.camera.away);
7154	7644	//System.out.println("UP = " + info.camera.up);
7155	7645	if (away.z > 0)
7156	7646	{
7157		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7158	7648	{
7159	7649	delta.x = -delta.x;
7160	7650	} else
..	..	@@ -7169,7 +7659,7 @@
7169	7659	//System.out.println("DELTA1 = " + delta);
7170	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7171	7661	//System.out.println("DELTA2 = " + delta);
7172		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7173	7663	LA.matCopy(startMat, toParent);
7174	7664	//System.out.println("DELTA3 = " + delta);
7175	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7179,8 +7669,8 @@
7179	7669	break;
7180	7670
7181	7671	case hitRotate: // rotate
7182		- int dx = info.x - centerPt.x;
7183		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7184	7674	double angle = (double) Math.atan2(dx, dy);
7185	7675	angle = -(1.570796 - angle);
7186	7676
..	..	@@ -7203,7 +7693,7 @@
7203	7693	}
7204	7694	/**/
7205	7695
7206		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7207	7697	{
7208	7698	case 1: // '\001'
7209	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7230,7 +7720,7 @@
7230	7720	break;
7231	7721
7232	7722	case hitScale: // scale
7233		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7234	7724	double sign = 1;
7235	7725	if (hScale < 0)
7236	7726	{
..	..	@@ -7242,7 +7732,7 @@
7242	7732	//hScale = 0.01;
7243	7733	}
7244	7734
7245		- double vScale = (double) (info.y - centerPt.y) / 32;
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7246	7736	sign = 1;
7247	7737	if (vScale < 0)
7248	7738	{
..	..	@@ -7253,6 +7743,7 @@
7253	7743	{
7254	7744	//vScale = 0.01;
7255	7745	}
	7746	+
7256	7747	LA.matCopy(startMat, toParent);
7257	7748	/**/
7258	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7262,29 +7753,30 @@
7262	7753	}
7263	7754	/**/
7264	7755
7265		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7266	7757
7267	7758	if (totalScale < 0.01)
7268	7759	{
7269	7760	totalScale = 0.01;
7270	7761	}
7271	7762
7272		- switch (info.pane.RenderCamera().viewCode)
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7273	7764	{
7274	7765	case 3: // '\001'
7275		- if (modified)
	7766	+ if (modified \|\| opposite)
7276	7767	{
7277	7768	//LA.matScale(toParent, 1, hScale, vScale);
7278	7769	LA.matScale(toParent, totalScale, 1, 1);
7279	7770	} // vScale, 1);
7280	7771	else
7281	7772	{
	7773	+ // EXCEPTION!
7282	7774	LA.matScale(toParent, totalScale, totalScale, totalScale);
7283	7775	} // vScale, 1);
7284	7776	break;
7285	7777
7286	7778	case 2: // '\002'
7287		- if (modified)
	7779	+ if (modified \|\| opposite)
7288	7780	{
7289	7781	//LA.matScale(toParent, hScale, 1, vScale);
7290	7782	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7295,7 +7787,7 @@
7295	7787	break;
7296	7788
7297	7789	case 1: // '\003'
7298		- if (modified)
	7790	+ if (modified \|\| opposite)
7299	7791	{
7300	7792	//LA.matScale(toParent, hScale, vScale, 1);
7301	7793	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7335,7 +7827,7 @@
7335	7827	} // NEW ...
7336	7828
7337	7829
7338		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7339	7831	}
7340	7832
7341	7833	boolean overflow = false;
..	..	@@ -7515,6 +8007,10 @@
7515	8007	editWindow = null;
7516	8008	} // ?
7517	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7518	8014	}
7519	8015
7520	8016	boolean root; // patch for edit windows
..	..	@@ -7526,7 +8022,7 @@
7526	8022	/transient/ cVector2[] projectedVertices = new cVector2[0];
7527	8023
7528	8024	Object3D /Composite/ parent;
7529		- Object3D /Composite/ fileparent;
	8025	+ Object3D /Composite/ fileparent; // In the case of FileObject
7530	8026
7531	8027	double[][] toParent; // dynamic matrix
7532	8028	double[][] fromParent;
..	..	@@ -7672,6 +8168,10 @@
7672	8168	}
7673	8169
7674	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7675	8175	transient ObjectUI objectUI;
7676	8176	public static int povDepth = 0;
7677	8177	private static cVector tbMin = new cVector();