~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[];
	33	+ int versionindex = -1;
	34	+
27	35	ScriptNode scriptnode;
28	36
29	37	void InitOthers()
..	..	@@ -104,125 +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++)
130		- {
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
134		- blockloop = true;
135		- child.SaveSupports();
136		- blockloop = false;
137		- }
138		-}
139	147
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	148	+ void RestoreSupports()
	149	+ {
	150	+ if (blockloop)
	151	+ return;
144	152
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
151		- {
152		- bRep.RestoreSupports();
153		- }
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		-}
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
165	157
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
	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)
169	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	+
170	251	Object3D o = hashtable.get(GetUUID());
171	252
172		- assert(this.bRep == o.bRep);
173		- if (this.bRep != null)
174		- assert(this.bRep.support == o.transientrep);
175		-
176		- return;
177		- }
178		-
179		- Object3D o = new Object3D();
180		- o.bRep = this.bRep;
181		- if (this.bRep != null)
182		- {
183		- o.transientrep = this.bRep.support;
184		- o.bRep.support = null;
185		- }
186		-
187		-// o.support = this.support;
188		-// o.fileparent = this.fileparent;
189		-// if (this.bRep != null)
190		-// o.bRep = this.bRep.support;
191		-
192		- hashtable.put(GetUUID(), o);
193		-
194		- this.bRep = null;
195		-// if (this.bRep != null)
196		-// this.bRep.support = null;
197		-// this.support = null;
198		-// this.fileparent = null;
199		-
200		- for (int i=0; i<Size(); i++)
201		- {
202		- get(i).ExtractBigData(hashtable);
203		- }
204		-}
	253	+ RestoreBigData(o);
205	254
206		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
207		-{
208		- if (!hashtable.containsKey(GetUUID()))
209		- return;
210		-
211		- Object3D o = hashtable.get(GetUUID());
212		-
213		- this.bRep = o.bRep;
214		- if (this.bRep != null)
215		- this.bRep.support = o.transientrep;
216		-// this.support = o.support;
217		-// this.fileparent = o.fileparent;
218		-
219		- hashtable.remove(GetUUID());
220		-
221		- for (int i=0; i<Size(); i++)
222		- {
223		- get(i).RestoreBigData(hashtable);
	255	+ if (blockloop)
	256	+ return;
	257	+
	258	+ blockloop = true;
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
	267	+ blockloop = false;
224	268	}
225		-}
	269	+
	270	+ void RestoreBigData(Object3D o)
	271	+ {
	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;
	286	+ }
226	287
227	288	// MOCAP SUPPORT
228	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -365,6 +426,7 @@
365	426	}
366	427
367	428	boolean live = false;
	429	+ transient boolean keepdontselect;
368	430	boolean dontselect = false;
369	431	boolean hide = false;
370	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -547,12 +609,14 @@
547	609	toParent = LA.newMatrix();
548	610	fromParent = LA.newMatrix();
549	611	}
	612	+
550	613	if (toParentMarked == null)
551	614	{
552	615	if (maxcount != 1)
553	616	{
554	617	new Exception().printStackTrace();
555	618	}
	619	+
556	620	toParentMarked = LA.newMatrix();
557	621	fromParentMarked = LA.newMatrix();
558	622	}
..	..	@@ -863,7 +927,7 @@
863	927
864	928	if (marked && Globals.isLIVE() && live &&
865	929	//TEMP21aug2018
866		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
867	931	currentframe != Globals.framecount)
868	932	{
869	933	currentframe = Globals.framecount;
..	..	@@ -875,7 +939,8 @@
875	939
876	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
877	941
878		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
879	944	{
880	945	countdown = 1;
881	946	delay = speedup?8:1;
..	..	@@ -947,6 +1012,7 @@
947	1012	if (material == null \|\| material.multiply)
948	1013	return true;
949	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
950	1016	return material.opacity > 0.99;
951	1017	}
952	1018
..	..	@@ -1347,6 +1413,7 @@
1347	1413	toParent = LA.newMatrix();
1348	1414	fromParent = LA.newMatrix();
1349	1415	}
	1416	+
1350	1417	LA.matCopy(other.toParent, toParent);
1351	1418	LA.matCopy(other.fromParent, fromParent);
1352	1419
..	..	@@ -2368,6 +2435,10 @@
2368	2435	}
2369	2436	*/
2370	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2371	2442	}
2372	2443
2373	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2480,14 @@
2409	2480	{
2410	2481	editWindow.refreshContents();
2411	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2412	2491	//if (parent != null)
2413	2492	//parent.refreshEditWindow();
2414	2493	}
..	..	@@ -2488,7 +2567,8 @@
2488	2567	private static final int editSelf = 1;
2489	2568	private static final int editChild = 2;
2490	2569
2491		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2492	2572	{
2493	2573	if (level == 0)
2494	2574	{
..	..	@@ -2496,7 +2576,8 @@
2496	2576	return;
2497	2577
2498	2578	Object3D selectee;
2499		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2579	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2580	+ level + 1))
2500	2581	{
2501	2582	selectee = (Object3D) e.nextElement();
2502	2583	}
..	..	@@ -2504,19 +2585,22 @@
2504	2585	} else
2505	2586	{
2506	2587	//super.
2507		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2508	2590	}
2509	2591	}
2510	2592
2511		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2512	2595	{
2513	2596	doSomething = 0;
2514	2597	if (level == 0)
2515	2598	{
2516		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2517	2600	}
2518	2601	if (//super.
2519		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2520	2604	{
2521	2605	doSomething = 1;
2522	2606	return true;
..	..	@@ -2526,7 +2610,7 @@
2526	2610	}
2527	2611	}
2528	2612
2529		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2530	2614	{
2531	2615	if (selection == null)
2532	2616	{
..	..	@@ -2539,7 +2623,8 @@
2539	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2624	{
2541	2625	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2543	2628	{
2544	2629	childToDrag = selectee;
2545	2630	doSomething = 2;
..	..	@@ -2551,13 +2636,15 @@
2551	2636	return retval;
2552	2637	}
2553	2638
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2555	2641	{
2556	2642	switch (doSomething)
2557	2643	{
2558	2644	case 1: // '\001'
2559	2645	//super.
2560		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2561	2648	break;
2562	2649
2563	2650	case 2: // '\002'
..	..	@@ -2570,11 +2657,13 @@
2570	2657	{
2571	2658	//sel.hitSomething = childToDrag.hitSomething;
2572	2659	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2574	2662	} else
2575	2663	{
2576	2664	//super.
2577		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2578	2667	}
2579	2668	}
2580	2669	break;
..	..	@@ -2592,6 +2681,9 @@
2592	2681	{
2593	2682	deselectAll();
2594	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2595	2687	ClickInfo newInfo = new ClickInfo();
2596	2688	newInfo.flags = info.flags;
2597	2689	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2776,18 @@
2684	2776	void GenNormalsS(boolean crease)
2685	2777	{
2686	2778	selection.GenNormals(crease);
	2779	+// for (int i=0; i<selection.size(); i++)
	2780	+// {
	2781	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2782	+// selectee.GenNormals(crease);
	2783	+// }
	2784	+
	2785	+ //Touch();
	2786	+ }
	2787	+
	2788	+ void GenNormalsMeshS()
	2789	+ {
	2790	+ selection.GenNormalsMesh();
2687	2791	// for (int i=0; i<selection.size(); i++)
2688	2792	// {
2689	2793	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +2928,24 @@
2824	2928	if (child == null)
2825	2929	continue;
2826	2930	child.GenNormals(crease);
	2931	+// Children().release(i);
	2932	+ }
	2933	+ blockloop = false;
	2934	+ }
	2935	+
	2936	+ void GenNormalsMesh()
	2937	+ {
	2938	+ if (blockloop)
	2939	+ return;
	2940	+
	2941	+ blockloop = true;
	2942	+ GenNormalsMesh0();
	2943	+ for (int i = 0; i < Children().Size(); i++)
	2944	+ {
	2945	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2946	+ if (child == null)
	2947	+ continue;
	2948	+ child.GenNormalsMesh();
2827	2949	// Children().release(i);
2828	2950	}
2829	2951	blockloop = false;
..	..	@@ -2996,11 +3118,20 @@
2996	3118	}
2997	3119	}
2998	3120
	3121	+ void GenNormalsMesh0()
	3122	+ {
	3123	+ if (bRep != null)
	3124	+ {
	3125	+ bRep.GenerateNormalsMesh();
	3126	+ Touch();
	3127	+ }
	3128	+ }
	3129	+
2999	3130	void GenNormalsMINE0()
3000	3131	{
3001	3132	if (bRep != null)
3002	3133	{
3003		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3135	Touch();
3005	3136	}
3006	3137	}
..	..	@@ -3446,7 +3577,8 @@
3446	3577	if (blockloop)
3447	3578	return;
3448	3579
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3580	+ if (//marked \|\| // does not make sense
	3581	+ (bRep != null \|\| material != null)) // borderline...
3450	3582	live = h;
3451	3583
3452	3584	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3599,8 @@
3467	3599	return;
3468	3600
3469	3601	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3602	+ if (//marked \|\| // does not make sense
	3603	+ (bRep != null \|\| material != null)) // borderline...
3471	3604	link2master = h;
3472	3605
3473	3606	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3620,8 @@
3487	3620	if (blockloop)
3488	3621	return;
3489	3622
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3623	+ if (//marked \|\| // does not make sense
	3624	+ (bRep != null \|\| material != null)) // borderline...
3491	3625	hide = h;
3492	3626
3493	3627	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3641,7 @@
3507	3641	if (blockloop)
3508	3642	return;
3509	3643
3510		- if (bRep != null && material != null) // borderline...
	3644	+ if (bRep != null \|\| material != null) // borderline...
3511	3645	marked = h;
3512	3646
3513	3647	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3651,46 @@
3517	3651	continue;
3518	3652	blockloop = true;
3519	3653	child.MarkLeaves(h);
	3654	+ blockloop = false;
	3655	+ // release(i);
	3656	+ }
	3657	+ }
	3658	+
	3659	+ void RewindLeaves(boolean h)
	3660	+ {
	3661	+ if (blockloop)
	3662	+ return;
	3663	+
	3664	+ if (bRep != null \|\| material != null) // borderline...
	3665	+ rewind = h;
	3666	+
	3667	+ for (int i = 0; i < Size(); i++)
	3668	+ {
	3669	+ Object3D child = (Object3D) get(i); // reserve(i);
	3670	+ if (child == null)
	3671	+ continue;
	3672	+ blockloop = true;
	3673	+ child.RewindLeaves(h);
	3674	+ blockloop = false;
	3675	+ // release(i);
	3676	+ }
	3677	+ }
	3678	+
	3679	+ void RandomLeaves(boolean h)
	3680	+ {
	3681	+ if (blockloop)
	3682	+ return;
	3683	+
	3684	+ if (bRep != null \|\| material != null) // borderline...
	3685	+ random = h;
	3686	+
	3687	+ for (int i = 0; i < Size(); i++)
	3688	+ {
	3689	+ Object3D child = (Object3D) get(i); // reserve(i);
	3690	+ if (child == null)
	3691	+ continue;
	3692	+ blockloop = true;
	3693	+ child.RandomLeaves(h);
3520	3694	blockloop = false;
3521	3695	// release(i);
3522	3696	}
..	..	@@ -4294,6 +4468,55 @@
4294	4468	}
4295	4469	}
4296	4470
	4471	+ void RepairSOV()
	4472	+ {
	4473	+ if (blockloop)
	4474	+ return;
	4475	+
	4476	+ String texname = this.GetPigmentTexture();
	4477	+
	4478	+ if (texname.startsWith("sov"))
	4479	+ {
	4480	+ String[] s = texname.split("/");
	4481	+
	4482	+ String[] sname = s[1].split("Color.pn");
	4483	+
	4484	+ texname = sname[0];
	4485	+
	4486	+ if (sname.length > 1)
	4487	+ {
	4488	+ texname += "Color.jpg";
	4489	+ }
	4490	+
	4491	+ this.SetPigmentTexture("sov/" + texname);
	4492	+ }
	4493	+
	4494	+ texname = this.GetBumpTexture();
	4495	+
	4496	+ if (texname.startsWith("sov"))
	4497	+ {
	4498	+ String[] s = texname.split("/");
	4499	+
	4500	+ String[] sname = s[1].split("Bump.pn");
	4501	+
	4502	+ texname = sname[0];
	4503	+
	4504	+ if (sname.length > 1)
	4505	+ {
	4506	+ texname += "Bump.jpg";
	4507	+ }
	4508	+
	4509	+ this.SetBumpTexture("sov/" + texname);
	4510	+ }
	4511	+
	4512	+ for (int i=0; i<Size(); i++)
	4513	+ {
	4514	+ blockloop = true;
	4515	+ get(i).RepairSOV();
	4516	+ blockloop = false;
	4517	+ }
	4518	+ }
	4519	+
4297	4520	void RepairTexture()
4298	4521	{
4299	4522	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5031,14 @@
4808	5031	}
4809	5032	}
4810	5033
	5034	+ ObjEditor GetWindow()
	5035	+ {
	5036	+ if (editWindow != null)
	5037	+ return editWindow;
	5038	+
	5039	+ return manipWindow;
	5040	+ }
	5041	+
4811	5042	cTreePath Select(int indexcount, boolean deselect)
4812	5043	{
4813	5044	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5075,11 @@
4844	5075	if (leaf != null)
4845	5076	{
4846	5077	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5078	+ ObjEditor window = GetWindow();
	5079	+ if (window != null)
4848	5080	{
4849	5081	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5082	+ window.Select(tp, deselect, true);
4851	5083	}
4852	5084
4853	5085	return tp;
..	..	@@ -4864,6 +5096,7 @@
4864	5096
4865	5097	if (child == null)
4866	5098	continue;
	5099	+
4867	5100	if (child.HasTransparency() && child.size() != 0)
4868	5101	{
4869	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5106,10 @@
4873	5106	if (leaf != null)
4874	5107	{
4875	5108	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4877	5111	{
4878		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4879	5113	}
4880	5114
4881	5115	return tp;
..	..	@@ -5200,6 +5434,51 @@
5200	5434	blockloop = false;
5201	5435	}
5202	5436
	5437	+ void ResetSelectable()
	5438	+ {
	5439	+ if (blockloop)
	5440	+ return;
	5441	+
	5442	+ blockloop = true;
	5443	+
	5444	+ keepdontselect = dontselect;
	5445	+ dontselect = true;
	5446	+
	5447	+ Object3D child;
	5448	+ int nb = Size();
	5449	+ for (int i = 0; i < nb; i++)
	5450	+ {
	5451	+ child = (Object3D) get(i);
	5452	+ if (child == null)
	5453	+ continue;
	5454	+ child.ResetSelectable();
	5455	+ }
	5456	+
	5457	+ blockloop = false;
	5458	+ }
	5459	+
	5460	+ void RestoreSelectable()
	5461	+ {
	5462	+ if (blockloop)
	5463	+ return;
	5464	+
	5465	+ blockloop = true;
	5466	+
	5467	+ dontselect = keepdontselect;
	5468	+
	5469	+ Object3D child;
	5470	+ int nb = Size();
	5471	+ for (int i = 0; i < nb; i++)
	5472	+ {
	5473	+ child = (Object3D) get(i);
	5474	+ if (child == null)
	5475	+ continue;
	5476	+ child.RestoreSelectable();
	5477	+ }
	5478	+
	5479	+ blockloop = false;
	5480	+ }
	5481	+
5203	5482	boolean IsSelected()
5204	5483	{
5205	5484	if (parent == null)
..	..	@@ -5509,6 +5788,38 @@
5509	5788	}
5510	5789	}
5511	5790
	5791	+ void EmbedTextures(boolean embed)
	5792	+ {
	5793	+ if (blockloop)
	5794	+ return;
	5795	+
	5796	+ //if (GetTextures() != null)
	5797	+ if (embed)
	5798	+ CameraPane.EmbedTextures(GetTextures());
	5799	+ else
	5800	+ {
	5801	+ GetTextures().pigmentdata = null;
	5802	+ GetTextures().bumpdata = null;
	5803	+ GetTextures().pw = 0;
	5804	+ GetTextures().ph = 0;
	5805	+ GetTextures().bw = 0;
	5806	+ GetTextures().bh = 0;
	5807	+ }
	5808	+
	5809	+ int nb = Size();
	5810	+ for (int i = 0; i < nb; i++)
	5811	+ {
	5812	+ Object3D child = (Object3D) get(i);
	5813	+
	5814	+ if (child == null)
	5815	+ continue;
	5816	+
	5817	+ blockloop = true;
	5818	+ child.EmbedTextures(embed);
	5819	+ blockloop = false;
	5820	+ }
	5821	+ }
	5822	+
5512	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	5824	{
5514	5825	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +5828,23 @@
5517	5828	boolean NeedSupport()
5518	5829	{
5519	5830	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5831	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	5832	// PROBLEM with CROWD!!
5522	5833	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	5834	}
5524	5835
5525	5836	static boolean DEBUG_SELECTION = false;
	5837	+
	5838	+ boolean IsLive()
	5839	+ {
	5840	+ if (live)
	5841	+ return true;
	5842	+
	5843	+ if (parent == null)
	5844	+ return false;
	5845	+
	5846	+ return parent.IsLive();
	5847	+ }
5526	5848
5527	5849	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	5850	{
..	..	@@ -5585,7 +5907,7 @@
5585	5907	support = support;
5586	5908
5587	5909	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5588		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5589	5911
5590	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	5913	{
..	..	@@ -5605,10 +5927,12 @@
5605	5927	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	5928
5607	5929	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5930	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5609	5932	{
5610	5933	Globals.lighttouched = true;
5611	5934	} // all panes...
	5935	+
5612	5936	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	5937	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	5938	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5736,6 +6060,7 @@
5736	6060	if (GetBRep() != null)
5737	6061	{
5738	6062	display.NextIndex();
	6063	+
5739	6064	// vertex color conflict : gl.glCallList(list);
5740	6065	DrawNode(display, root, selected);
5741	6066	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6101,27 @@
5776	6101	tex = GetTextures();
5777	6102	}
5778	6103
5779		- boolean failed = false;
	6104	+ boolean failedPigment = false;
	6105	+ boolean failedBump = false;
5780	6106
5781	6107	try
5782	6108	{
5783		- display.BindTextures(tex, texres);
	6109	+ display.BindPigmentTexture(tex, texres);
5784	6110	}
5785	6111	catch (Exception e)
5786	6112	{
5787	6113	System.err.println("FAILED: " + this);
5788		- failed = true;
	6114	+ failedPigment = true;
	6115	+ }
	6116	+
	6117	+ try
	6118	+ {
	6119	+ display.BindBumpTexture(tex, texres);
	6120	+ }
	6121	+ catch (Exception e)
	6122	+ {
	6123	+ //System.err.println("FAILED: " + this);
	6124	+ failedBump = true;
5789	6125	}
5790	6126
5791	6127	if (!compiled)
..	..	@@ -5808,8 +6144,11 @@
5808	6144	}
5809	6145	}
5810	6146
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6147	+ if (!failedBump)
	6148	+ display.ReleaseBumpTexture(tex);
	6149	+
	6150	+ if (!failedPigment)
	6151	+ display.ReleasePigmentTexture(tex);
5813	6152
5814	6153	display.PopMaterial(this, selected);
5815	6154	}
..	..	@@ -6182,6 +6521,11 @@
6182	6521	// dec 2012
6183	6522	new Exception().printStackTrace();
6184	6523	return;
	6524	+ }
	6525	+
	6526	+ if (dontselect)
	6527	+ {
	6528	+ //bRep.GenerateNormalsMINE();
6185	6529	}
6186	6530
6187	6531	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7311,23 @@
6967	7311	}
6968	7312	}
6969	7313
6970		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7314	+ static ClickInfo clickInfo = new ClickInfo();
	7315	+
	7316	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7317	+ Point outPt, Rectangle outRec)
6971	7318	{
6972		- int hc = info.bounds.x + info.bounds.width / 2;
6973		- int vc = info.bounds.y + info.bounds.height / 2;
6974		- double[][] toscreen = info.toScreen;
	7319	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7320	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7321	+ double[][] toscreen = clickInfo.toScreen;
6975	7322	if (toscreen == null)
6976	7323	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7325	}
6979	7326	cVector vec = in;
6980	7327	LA.xformPos(in, toscreen, in);
6981	7328	//System.out.println("Distance = " + info.camera.Distance());
6982		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6983		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6984	7331	outPt.x = hc + (int) vec.x;
6985	7332	outPt.y = vc - (int) vec.y;
6986	7333	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7335,18 @@
6988	7335	outRec.width = outRec.height = 6;
6989	7336	}
6990	7337
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
6992	7340	{
6993	7341	Point pt = new Point(0, 0);
6994	7342	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
6996	7345	return rec;
6997	7346	}
6998	7347
6999		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7000	7350	{
7001	7351	if (level == 0)
7002	7352	{
..	..	@@ -7005,16 +7355,19 @@
7005	7355	{
7006	7356	cVector origin = new cVector();
7007	7357	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7362	Rectangle boundary = new Rectangle();
7010	7363	boundary.x = spot.x - 30;
7011	7364	boundary.y = spot.y - 30;
7012	7365	boundary.width = spot.width + 60;
7013	7366	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7015	7368	int spotw = spot.x + spot.width;
7016	7369	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7371	// if (CameraPane.Xmin > spot.x)
7019	7372	// {
7020	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7034,8 +7387,8 @@
7034	7387	spot.translate(32, 32);
7035	7388	spotw = spot.x + spot.width;
7036	7389	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7390	+ clickInfo.g.setColor(Color.cyan);
	7391	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039	7392	// if (CameraPane.Xmin > spot.x)
7040	7393	// {
7041	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,11 +7405,12 @@
7052	7405	// {
7053	7406	// CameraPane.Ymax = spoth;
7054	7407	// }
7055		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7408	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7409	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7057	7410	spot.translate(0, -32);
7058		- info.g.setColor(Color.green);
7059		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
7060	7414	// if (CameraPane.Xmin > spot.x)
7061	7415	// {
7062	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7073,8 +7427,8 @@
7073	7427	// {
7074	7428	// CameraPane.Ymax = spoth;
7075	7429	// }
7076		- info.g.drawArc(boundary.x, boundary.y,
7077		- boundary.width, boundary.height, 0, 360);
	7430	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7431	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7078	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7433	// if (CameraPane.Xmin > boundary.x)
7080	7434	// {
..	..	@@ -7096,7 +7450,8 @@
7096	7450	}
7097	7451	}
7098	7452
7099		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7100	7455	{
7101	7456	if (level == 0)
7102	7457	{
..	..	@@ -7105,8 +7460,8 @@
7105	7460
7106	7461	boolean retval = false;
7107	7462
7108		- startX = info.x;
7109		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7110	7465
7111	7466	hitSomething = -1;
7112	7467	cVector origin = new cVector();
..	..	@@ -7116,22 +7471,51 @@
7116	7471	{
7117	7472	centerPt = new Point(0, 0);
7118	7473	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7477	{
7122	7478	hitSomething = hitCenter;
7123	7479	retval = true;
7124	7480	}
7125	7481	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7483	{
7128	7484	hitSomething = hitRotate;
7129	7485	retval = true;
7130	7486	}
7131	7487	spot.translate(0, 32);
7132		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7133	7489	{
7134	7490	hitSomething = hitScale;
	7491	+
	7492	+ double scale = 0.005f * clickInfo.camera.Distance();
	7493	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7494	+ double sign = 1;
	7495	+ if (hScale < 0)
	7496	+ {
	7497	+ sign = -1;
	7498	+ }
	7499	+ hScale = signMath.pow(signhScale, scale * 50);
	7500	+ if (hScale < 0.01)
	7501	+ {
	7502	+ //hScale = 0.01;
	7503	+ }
	7504	+
	7505	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7506	+ sign = 1;
	7507	+ if (vScale < 0)
	7508	+ {
	7509	+ sign = -1;
	7510	+ }
	7511	+ vScale = signMath.pow(signvScale, scale * 50);
	7512	+ if (vScale < 0.01)
	7513	+ {
	7514	+ //vScale = 0.01;
	7515	+ }
	7516	+
	7517	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7518	+
7135	7519	retval = true;
7136	7520	}
7137	7521
..	..	@@ -7141,7 +7525,7 @@
7141	7525	}
7142	7526
7143	7527	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7529	//System.out.println("modified = " + modified);
7146	7530	//new Exception().printStackTrace();
7147	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7553,8 @@
7169	7553	return true;
7170	7554	}
7171	7555
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7173	7558	{
7174	7559	if (hitSomething == 0)
7175	7560	{
..	..	@@ -7183,7 +7568,7 @@
7183	7568
7184	7569	//System.out.println("hitSomething = " + hitSomething);
7185	7570
7186		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7572
7188	7573	cVector xlate = new cVector();
7189	7574	//cVector xlate2 = new cVector();
..	..	@@ -7217,8 +7602,8 @@
7217	7602	toParent[3][i] = xlate.get(i);
7218	7603	LA.matInvert(toParent, fromParent);
7219	7604	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7605	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7606	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7222	7607
7223	7608	LA.matCopy(startMat, toParent);
7224	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7612,7 @@
7227	7612	} else
7228	7613	{
7229	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7231	7616	cVector away = new cVector();
7232	7617	//cVector right2 = new cVector();
7233	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7629,19 @@
7244	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7630	// if (!CameraPane.LOCALTRANSFORM)
7246	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7633	// if (!CameraPane.LOCALTRANSFORM)
7249	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7635	//LA.vecCross(up, cVector.Z, right2);
7251	7636
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7638
7254	7639	//System.out.println("DELTA0 = " + delta);
7255	7640	//System.out.println("AWAY = " + info.camera.away);
7256	7641	//System.out.println("UP = " + info.camera.up);
7257	7642	if (away.z > 0)
7258	7643	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7645	{
7261	7646	delta.x = -delta.x;
7262	7647	} else
..	..	@@ -7271,7 +7656,7 @@
7271	7656	//System.out.println("DELTA1 = " + delta);
7272	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7658	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7660	LA.matCopy(startMat, toParent);
7276	7661	//System.out.println("DELTA3 = " + delta);
7277	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7666,8 @@
7281	7666	break;
7282	7667
7283	7668	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7286	7671	double angle = (double) Math.atan2(dx, dy);
7287	7672	angle = -(1.570796 - angle);
7288	7673
..	..	@@ -7305,7 +7690,7 @@
7305	7690	}
7306	7691	/**/
7307	7692
7308		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7694	{
7310	7695	case 1: // '\001'
7311	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7717,7 @@
7332	7717	break;
7333	7718
7334	7719	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7336	7721	double sign = 1;
7337	7722	if (hScale < 0)
7338	7723	{
..	..	@@ -7344,7 +7729,7 @@
7344	7729	//hScale = 0.01;
7345	7730	}
7346	7731
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7348	7733	sign = 1;
7349	7734	if (vScale < 0)
7350	7735	{
..	..	@@ -7355,6 +7740,7 @@
7355	7740	{
7356	7741	//vScale = 0.01;
7357	7742	}
	7743	+
7358	7744	LA.matCopy(startMat, toParent);
7359	7745	/**/
7360	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7364,29 +7750,30 @@
7364	7750	}
7365	7751	/**/
7366	7752
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7754
7369	7755	if (totalScale < 0.01)
7370	7756	{
7371	7757	totalScale = 0.01;
7372	7758	}
7373	7759
7374		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7761	{
7376	7762	case 3: // '\001'
7377		- if (modified)
	7763	+ if (modified \|\| opposite)
7378	7764	{
7379	7765	//LA.matScale(toParent, 1, hScale, vScale);
7380	7766	LA.matScale(toParent, totalScale, 1, 1);
7381	7767	} // vScale, 1);
7382	7768	else
7383	7769	{
	7770	+ // EXCEPTION!
7384	7771	LA.matScale(toParent, totalScale, totalScale, totalScale);
7385	7772	} // vScale, 1);
7386	7773	break;
7387	7774
7388	7775	case 2: // '\002'
7389		- if (modified)
	7776	+ if (modified \|\| opposite)
7390	7777	{
7391	7778	//LA.matScale(toParent, hScale, 1, vScale);
7392	7779	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7397,7 +7784,7 @@
7397	7784	break;
7398	7785
7399	7786	case 1: // '\003'
7400		- if (modified)
	7787	+ if (modified \|\| opposite)
7401	7788	{
7402	7789	//LA.matScale(toParent, hScale, vScale, 1);
7403	7790	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7437,7 +7824,7 @@
7437	7824	} // NEW ...
7438	7825
7439	7826
7440		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7441	7828	}
7442	7829
7443	7830	boolean overflow = false;
..	..	@@ -7617,6 +8004,10 @@
7617	8004	editWindow = null;
7618	8005	} // ?
7619	8006	}
	8007	+ else
	8008	+ {
	8009	+ //editWindow.closeUI();
	8010	+ }
7620	8011	}
7621	8012
7622	8013	boolean root; // patch for edit windows
..	..	@@ -7774,6 +8165,10 @@
7774	8165	}
7775	8166
7776	8167	transient ObjEditor editWindow;
	8168	+ transient ObjEditor manipWindow;
	8169	+
	8170	+ transient boolean pinned;
	8171	+
7777	8172	transient ObjectUI objectUI;
7778	8173	public static int povDepth = 0;
7779	8174	private static cVector tbMin = new cVector();