~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,6 +24,17 @@
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	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
27	38	ScriptNode scriptnode;
28	39
29	40	void InitOthers()
..	..	@@ -104,125 +115,178 @@
104	115
105	116	// transient boolean reduced; // for morph reduction
106	117
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-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
109	120
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
112	123
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)
	124	+ void SaveSupports()
125	125	{
126		- 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	+ }
127	149	}
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	150
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	151	+ void RestoreSupports()
	152	+ {
	153	+ if (blockloop)
	154	+ return;
144	155
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		-}
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
165	160
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
	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)
169	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	+
170	254	Object3D o = hashtable.get(GetUUID());
171	255
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		-}
	256	+ RestoreBigData(o);
205	257
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);
	258	+ if (blockloop)
	259	+ return;
	260	+
	261	+ blockloop = true;
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
	270	+ blockloop = false;
224	271	}
225		-}
	272	+
	273	+ void RestoreBigData(Object3D o)
	274	+ {
	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;
	289	+ }
226	290
227	291	// MOCAP SUPPORT
228	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -365,6 +429,7 @@
365	429	}
366	430
367	431	boolean live = false;
	432	+ transient boolean keepdontselect;
368	433	boolean dontselect = false;
369	434	boolean hide = false;
370	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -547,12 +612,14 @@
547	612	toParent = LA.newMatrix();
548	613	fromParent = LA.newMatrix();
549	614	}
	615	+
550	616	if (toParentMarked == null)
551	617	{
552	618	if (maxcount != 1)
553	619	{
554	620	new Exception().printStackTrace();
555	621	}
	622	+
556	623	toParentMarked = LA.newMatrix();
557	624	fromParentMarked = LA.newMatrix();
558	625	}
..	..	@@ -863,7 +930,7 @@
863	930
864	931	if (marked && Globals.isLIVE() && live &&
865	932	//TEMP21aug2018
866		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
867	934	currentframe != Globals.framecount)
868	935	{
869	936	currentframe = Globals.framecount;
..	..	@@ -875,7 +942,8 @@
875	942
876	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
877	944
878		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
879	947	{
880	948	countdown = 1;
881	949	delay = speedup?8:1;
..	..	@@ -947,6 +1015,7 @@
947	1015	if (material == null \|\| material.multiply)
948	1016	return true;
949	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
950	1019	return material.opacity > 0.99;
951	1020	}
952	1021
..	..	@@ -1347,6 +1416,7 @@
1347	1416	toParent = LA.newMatrix();
1348	1417	fromParent = LA.newMatrix();
1349	1418	}
	1419	+
1350	1420	LA.matCopy(other.toParent, toParent);
1351	1421	LA.matCopy(other.fromParent, fromParent);
1352	1422
..	..	@@ -2368,6 +2438,10 @@
2368	2438	}
2369	2439	*/
2370	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2371	2445	}
2372	2446
2373	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2483,14 @@
2409	2483	{
2410	2484	editWindow.refreshContents();
2411	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2412	2494	//if (parent != null)
2413	2495	//parent.refreshEditWindow();
2414	2496	}
..	..	@@ -2488,7 +2570,8 @@
2488	2570	private static final int editSelf = 1;
2489	2571	private static final int editChild = 2;
2490	2572
2491		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2492	2575	{
2493	2576	if (level == 0)
2494	2577	{
..	..	@@ -2496,7 +2579,8 @@
2496	2579	return;
2497	2580
2498	2581	Object3D selectee;
2499		- 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))
2500	2584	{
2501	2585	selectee = (Object3D) e.nextElement();
2502	2586	}
..	..	@@ -2504,19 +2588,22 @@
2504	2588	} else
2505	2589	{
2506	2590	//super.
2507		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2508	2593	}
2509	2594	}
2510	2595
2511		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2512	2598	{
2513	2599	doSomething = 0;
2514	2600	if (level == 0)
2515	2601	{
2516		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2517	2603	}
2518	2604	if (//super.
2519		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2520	2607	{
2521	2608	doSomething = 1;
2522	2609	return true;
..	..	@@ -2526,7 +2613,7 @@
2526	2613	}
2527	2614	}
2528	2615
2529		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2530	2617	{
2531	2618	if (selection == null)
2532	2619	{
..	..	@@ -2539,7 +2626,8 @@
2539	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2627	{
2541	2628	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2543	2631	{
2544	2632	childToDrag = selectee;
2545	2633	doSomething = 2;
..	..	@@ -2551,13 +2639,15 @@
2551	2639	return retval;
2552	2640	}
2553	2641
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2555	2644	{
2556	2645	switch (doSomething)
2557	2646	{
2558	2647	case 1: // '\001'
2559	2648	//super.
2560		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2561	2651	break;
2562	2652
2563	2653	case 2: // '\002'
..	..	@@ -2570,11 +2660,13 @@
2570	2660	{
2571	2661	//sel.hitSomething = childToDrag.hitSomething;
2572	2662	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2574	2665	} else
2575	2666	{
2576	2667	//super.
2577		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2578	2670	}
2579	2671	}
2580	2672	break;
..	..	@@ -2592,6 +2684,9 @@
2592	2684	{
2593	2685	deselectAll();
2594	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2595	2690	ClickInfo newInfo = new ClickInfo();
2596	2691	newInfo.flags = info.flags;
2597	2692	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2779,18 @@
2684	2779	void GenNormalsS(boolean crease)
2685	2780	{
2686	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();
2687	2794	// for (int i=0; i<selection.size(); i++)
2688	2795	// {
2689	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +2931,24 @@
2824	2931	if (child == null)
2825	2932	continue;
2826	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();
2827	2952	// Children().release(i);
2828	2953	}
2829	2954	blockloop = false;
..	..	@@ -2996,11 +3121,20 @@
2996	3121	}
2997	3122	}
2998	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2999	3133	void GenNormalsMINE0()
3000	3134	{
3001	3135	if (bRep != null)
3002	3136	{
3003		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3138	Touch();
3005	3139	}
3006	3140	}
..	..	@@ -3446,7 +3580,8 @@
3446	3580	if (blockloop)
3447	3581	return;
3448	3582
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3450	3585	live = h;
3451	3586
3452	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3602,8 @@
3467	3602	return;
3468	3603
3469	3604	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3471	3607	link2master = h;
3472	3608
3473	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3623,8 @@
3487	3623	if (blockloop)
3488	3624	return;
3489	3625
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3491	3628	hide = h;
3492	3629
3493	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3644,7 @@
3507	3644	if (blockloop)
3508	3645	return;
3509	3646
3510		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3511	3648	marked = h;
3512	3649
3513	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3654,46 @@
3517	3654	continue;
3518	3655	blockloop = true;
3519	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);
3520	3697	blockloop = false;
3521	3698	// release(i);
3522	3699	}
..	..	@@ -4294,6 +4471,55 @@
4294	4471	}
4295	4472	}
4296	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	+
4297	4523	void RepairTexture()
4298	4524	{
4299	4525	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5034,14 @@
4808	5034	}
4809	5035	}
4810	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4811	5045	cTreePath Select(int indexcount, boolean deselect)
4812	5046	{
4813	5047	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5078,11 @@
4844	5078	if (leaf != null)
4845	5079	{
4846	5080	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4848	5083	{
4849	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4851	5086	}
4852	5087
4853	5088	return tp;
..	..	@@ -4864,6 +5099,7 @@
4864	5099
4865	5100	if (child == null)
4866	5101	continue;
	5102	+
4867	5103	if (child.HasTransparency() && child.size() != 0)
4868	5104	{
4869	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5109,10 @@
4873	5109	if (leaf != null)
4874	5110	{
4875	5111	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4877	5114	{
4878		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4879	5116	}
4880	5117
4881	5118	return tp;
..	..	@@ -5200,6 +5437,51 @@
5200	5437	blockloop = false;
5201	5438	}
5202	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	+
5203	5485	boolean IsSelected()
5204	5486	{
5205	5487	if (parent == null)
..	..	@@ -5509,6 +5791,38 @@
5509	5791	}
5510	5792	}
5511	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	+
5512	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	5827	{
5514	5828	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +5831,23 @@
5517	5831	boolean NeedSupport()
5518	5832	{
5519	5833	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	5835	// PROBLEM with CROWD!!
5522	5836	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	5837	}
5524	5838
5525	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	+ }
5526	5851
5527	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	5853	{
..	..	@@ -5585,7 +5910,7 @@
5585	5910	support = support;
5586	5911
5587	5912	//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);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5589	5914
5590	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	5916	{
..	..	@@ -5605,10 +5930,12 @@
5605	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	5931
5607	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (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)))
5609	5935	{
5610	5936	Globals.lighttouched = true;
5611	5937	} // all panes...
	5938	+
5612	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5736,6 +6063,7 @@
5736	6063	if (GetBRep() != null)
5737	6064	{
5738	6065	display.NextIndex();
	6066	+
5739	6067	// vertex color conflict : gl.glCallList(list);
5740	6068	DrawNode(display, root, selected);
5741	6069	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6104,27 @@
5776	6104	tex = GetTextures();
5777	6105	}
5778	6106
5779		- boolean failed = false;
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
5780	6109
5781	6110	try
5782	6111	{
5783		- display.BindTextures(tex, texres);
	6112	+ display.BindPigmentTexture(tex, texres);
5784	6113	}
5785	6114	catch (Exception e)
5786	6115	{
5787	6116	System.err.println("FAILED: " + this);
5788		- 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;
5789	6128	}
5790	6129
5791	6130	if (!compiled)
..	..	@@ -5808,8 +6147,11 @@
5808	6147	}
5809	6148	}
5810	6149
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5813	6155
5814	6156	display.PopMaterial(this, selected);
5815	6157	}
..	..	@@ -6182,6 +6524,11 @@
6182	6524	// dec 2012
6183	6525	new Exception().printStackTrace();
6184	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6185	6532	}
6186	6533
6187	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7314,23 @@
6967	7314	}
6968	7315	}
6969	7316
6970		- 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)
6971	7321	{
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;
	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;
6975	7325	if (toscreen == null)
6976	7326	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7328	}
6979	7329	cVector vec = in;
6980	7330	LA.xformPos(in, toscreen, in);
6981	7331	//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();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6984	7334	outPt.x = hc + (int) vec.x;
6985	7335	outPt.y = vc - (int) vec.y;
6986	7336	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7338,18 @@
6988	7338	outRec.width = outRec.height = 6;
6989	7339	}
6990	7340
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6992	7343	{
6993	7344	Point pt = new Point(0, 0);
6994	7345	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6996	7348	return rec;
6997	7349	}
6998	7350
6999		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
7000	7353	{
7001	7354	if (level == 0)
7002	7355	{
..	..	@@ -7005,16 +7358,19 @@
7005	7358	{
7006	7359	cVector origin = new cVector();
7007	7360	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7365	Rectangle boundary = new Rectangle();
7010	7366	boundary.x = spot.x - 30;
7011	7367	boundary.y = spot.y - 30;
7012	7368	boundary.width = spot.width + 60;
7013	7369	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
7015	7371	int spotw = spot.x + spot.width;
7016	7372	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7374	// if (CameraPane.Xmin > spot.x)
7019	7375	// {
7020	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -7034,8 +7390,8 @@
7034	7390	spot.translate(32, 32);
7035	7391	spotw = spot.x + spot.width;
7036	7392	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- 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);
7039	7395	// if (CameraPane.Xmin > spot.x)
7040	7396	// {
7041	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,11 +7408,12 @@
7052	7408	// {
7053	7409	// CameraPane.Ymax = spoth;
7054	7410	// }
7055		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056		- //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
7057	7413	spot.translate(0, -32);
7058		- info.g.setColor(Color.green);
7059		- 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);
7060	7417	// if (CameraPane.Xmin > spot.x)
7061	7418	// {
7062	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -7073,8 +7430,8 @@
7073	7430	// {
7074	7431	// CameraPane.Ymax = spoth;
7075	7432	// }
7076		- info.g.drawArc(boundary.x, boundary.y,
7077		- 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);
7078	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7436	// if (CameraPane.Xmin > boundary.x)
7080	7437	// {
..	..	@@ -7096,7 +7453,8 @@
7096	7453	}
7097	7454	}
7098	7455
7099		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7100	7458	{
7101	7459	if (level == 0)
7102	7460	{
..	..	@@ -7105,8 +7463,8 @@
7105	7463
7106	7464	boolean retval = false;
7107	7465
7108		- startX = info.x;
7109		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7110	7468
7111	7469	hitSomething = -1;
7112	7470	cVector origin = new cVector();
..	..	@@ -7116,22 +7474,51 @@
7116	7474	{
7117	7475	centerPt = new Point(0, 0);
7118	7476	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7480	{
7122	7481	hitSomething = hitCenter;
7123	7482	retval = true;
7124	7483	}
7125	7484	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7486	{
7128	7487	hitSomething = hitRotate;
7129	7488	retval = true;
7130	7489	}
7131	7490	spot.translate(0, 32);
7132		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7133	7492	{
7134	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	+
7135	7522	retval = true;
7136	7523	}
7137	7524
..	..	@@ -7141,7 +7528,7 @@
7141	7528	}
7142	7529
7143	7530	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7532	//System.out.println("modified = " + modified);
7146	7533	//new Exception().printStackTrace();
7147	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7556,8 @@
7169	7556	return true;
7170	7557	}
7171	7558
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7173	7561	{
7174	7562	if (hitSomething == 0)
7175	7563	{
..	..	@@ -7183,7 +7571,7 @@
7183	7571
7184	7572	//System.out.println("hitSomething = " + hitSomething);
7185	7573
7186		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7575
7188	7576	cVector xlate = new cVector();
7189	7577	//cVector xlate2 = new cVector();
..	..	@@ -7217,8 +7605,8 @@
7217	7605	toParent[3][i] = xlate.get(i);
7218	7606	LA.matInvert(toParent, fromParent);
7219	7607	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- 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);
7222	7610
7223	7611	LA.matCopy(startMat, toParent);
7224	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7615,7 @@
7227	7615	} else
7228	7616	{
7229	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7231	7619	cVector away = new cVector();
7232	7620	//cVector right2 = new cVector();
7233	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7632,19 @@
7244	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7633	// if (!CameraPane.LOCALTRANSFORM)
7246	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7636	// if (!CameraPane.LOCALTRANSFORM)
7249	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7638	//LA.vecCross(up, cVector.Z, right2);
7251	7639
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7641
7254	7642	//System.out.println("DELTA0 = " + delta);
7255	7643	//System.out.println("AWAY = " + info.camera.away);
7256	7644	//System.out.println("UP = " + info.camera.up);
7257	7645	if (away.z > 0)
7258	7646	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7648	{
7261	7649	delta.x = -delta.x;
7262	7650	} else
..	..	@@ -7271,7 +7659,7 @@
7271	7659	//System.out.println("DELTA1 = " + delta);
7272	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7661	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7663	LA.matCopy(startMat, toParent);
7276	7664	//System.out.println("DELTA3 = " + delta);
7277	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7669,8 @@
7281	7669	break;
7282	7670
7283	7671	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7286	7674	double angle = (double) Math.atan2(dx, dy);
7287	7675	angle = -(1.570796 - angle);
7288	7676
..	..	@@ -7305,7 +7693,7 @@
7305	7693	}
7306	7694	/**/
7307	7695
7308		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7697	{
7310	7698	case 1: // '\001'
7311	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7720,7 @@
7332	7720	break;
7333	7721
7334	7722	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7336	7724	double sign = 1;
7337	7725	if (hScale < 0)
7338	7726	{
..	..	@@ -7344,7 +7732,7 @@
7344	7732	//hScale = 0.01;
7345	7733	}
7346	7734
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7348	7736	sign = 1;
7349	7737	if (vScale < 0)
7350	7738	{
..	..	@@ -7355,6 +7743,7 @@
7355	7743	{
7356	7744	//vScale = 0.01;
7357	7745	}
	7746	+
7358	7747	LA.matCopy(startMat, toParent);
7359	7748	/**/
7360	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7364,29 +7753,30 @@
7364	7753	}
7365	7754	/**/
7366	7755
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7757
7369	7758	if (totalScale < 0.01)
7370	7759	{
7371	7760	totalScale = 0.01;
7372	7761	}
7373	7762
7374		- switch (info.pane.RenderCamera().viewCode)
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7764	{
7376	7765	case 3: // '\001'
7377		- if (modified)
	7766	+ if (modified \|\| opposite)
7378	7767	{
7379	7768	//LA.matScale(toParent, 1, hScale, vScale);
7380	7769	LA.matScale(toParent, totalScale, 1, 1);
7381	7770	} // vScale, 1);
7382	7771	else
7383	7772	{
	7773	+ // EXCEPTION!
7384	7774	LA.matScale(toParent, totalScale, totalScale, totalScale);
7385	7775	} // vScale, 1);
7386	7776	break;
7387	7777
7388	7778	case 2: // '\002'
7389		- if (modified)
	7779	+ if (modified \|\| opposite)
7390	7780	{
7391	7781	//LA.matScale(toParent, hScale, 1, vScale);
7392	7782	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7397,7 +7787,7 @@
7397	7787	break;
7398	7788
7399	7789	case 1: // '\003'
7400		- if (modified)
	7790	+ if (modified \|\| opposite)
7401	7791	{
7402	7792	//LA.matScale(toParent, hScale, vScale, 1);
7403	7793	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7437,7 +7827,7 @@
7437	7827	} // NEW ...
7438	7828
7439	7829
7440		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7441	7831	}
7442	7832
7443	7833	boolean overflow = false;
..	..	@@ -7617,6 +8007,10 @@
7617	8007	editWindow = null;
7618	8008	} // ?
7619	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7620	8014	}
7621	8015
7622	8016	boolean root; // patch for edit windows
..	..	@@ -7774,6 +8168,10 @@
7774	8168	}
7775	8169
7776	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7777	8175	transient ObjectUI objectUI;
7778	8176	public static int povDepth = 0;
7779	8177	private static cVector tbMin = new cVector();