~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	+ Object3D 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,10 @@
947	1015	if (material == null \|\| material.multiply)
948	1016	return true;
949	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
950	1022	return material.opacity > 0.99;
951	1023	}
952	1024
..	..	@@ -1347,6 +1419,7 @@
1347	1419	toParent = LA.newMatrix();
1348	1420	fromParent = LA.newMatrix();
1349	1421	}
	1422	+
1350	1423	LA.matCopy(other.toParent, toParent);
1351	1424	LA.matCopy(other.fromParent, fromParent);
1352	1425
..	..	@@ -2368,6 +2441,10 @@
2368	2441	}
2369	2442	*/
2370	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2371	2448	}
2372	2449
2373	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2486,14 @@
2409	2486	{
2410	2487	editWindow.refreshContents();
2411	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2412	2497	//if (parent != null)
2413	2498	//parent.refreshEditWindow();
2414	2499	}
..	..	@@ -2488,7 +2573,8 @@
2488	2573	private static final int editSelf = 1;
2489	2574	private static final int editChild = 2;
2490	2575
2491		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2492	2578	{
2493	2579	if (level == 0)
2494	2580	{
..	..	@@ -2496,7 +2582,8 @@
2496	2582	return;
2497	2583
2498	2584	Object3D selectee;
2499		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2500	2587	{
2501	2588	selectee = (Object3D) e.nextElement();
2502	2589	}
..	..	@@ -2504,19 +2591,22 @@
2504	2591	} else
2505	2592	{
2506	2593	//super.
2507		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2508	2596	}
2509	2597	}
2510	2598
2511		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2512	2601	{
2513	2602	doSomething = 0;
2514	2603	if (level == 0)
2515	2604	{
2516		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2517	2606	}
2518	2607	if (//super.
2519		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2520	2610	{
2521	2611	doSomething = 1;
2522	2612	return true;
..	..	@@ -2526,7 +2616,7 @@
2526	2616	}
2527	2617	}
2528	2618
2529		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2530	2620	{
2531	2621	if (selection == null)
2532	2622	{
..	..	@@ -2539,7 +2629,8 @@
2539	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2630	{
2541	2631	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2543	2634	{
2544	2635	childToDrag = selectee;
2545	2636	doSomething = 2;
..	..	@@ -2551,13 +2642,15 @@
2551	2642	return retval;
2552	2643	}
2553	2644
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2555	2647	{
2556	2648	switch (doSomething)
2557	2649	{
2558	2650	case 1: // '\001'
2559	2651	//super.
2560		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2561	2654	break;
2562	2655
2563	2656	case 2: // '\002'
..	..	@@ -2570,11 +2663,13 @@
2570	2663	{
2571	2664	//sel.hitSomething = childToDrag.hitSomething;
2572	2665	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2574	2668	} else
2575	2669	{
2576	2670	//super.
2577		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2578	2673	}
2579	2674	}
2580	2675	break;
..	..	@@ -2592,6 +2687,9 @@
2592	2687	{
2593	2688	deselectAll();
2594	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2595	2693	ClickInfo newInfo = new ClickInfo();
2596	2694	newInfo.flags = info.flags;
2597	2695	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2782,18 @@
2684	2782	void GenNormalsS(boolean crease)
2685	2783	{
2686	2784	selection.GenNormals(crease);
	2785	+// for (int i=0; i<selection.size(); i++)
	2786	+// {
	2787	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2788	+// selectee.GenNormals(crease);
	2789	+// }
	2790	+
	2791	+ //Touch();
	2792	+ }
	2793	+
	2794	+ void GenNormalsMeshS()
	2795	+ {
	2796	+ selection.GenNormalsMesh();
2687	2797	// for (int i=0; i<selection.size(); i++)
2688	2798	// {
2689	2799	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +2934,24 @@
2824	2934	if (child == null)
2825	2935	continue;
2826	2936	child.GenNormals(crease);
	2937	+// Children().release(i);
	2938	+ }
	2939	+ blockloop = false;
	2940	+ }
	2941	+
	2942	+ void GenNormalsMesh()
	2943	+ {
	2944	+ if (blockloop)
	2945	+ return;
	2946	+
	2947	+ blockloop = true;
	2948	+ GenNormalsMesh0();
	2949	+ for (int i = 0; i < Children().Size(); i++)
	2950	+ {
	2951	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2952	+ if (child == null)
	2953	+ continue;
	2954	+ child.GenNormalsMesh();
2827	2955	// Children().release(i);
2828	2956	}
2829	2957	blockloop = false;
..	..	@@ -2996,11 +3124,20 @@
2996	3124	}
2997	3125	}
2998	3126
	3127	+ void GenNormalsMesh0()
	3128	+ {
	3129	+ if (bRep != null)
	3130	+ {
	3131	+ bRep.GenerateNormalsMesh();
	3132	+ Touch();
	3133	+ }
	3134	+ }
	3135	+
2999	3136	void GenNormalsMINE0()
3000	3137	{
3001	3138	if (bRep != null)
3002	3139	{
3003		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3141	Touch();
3005	3142	}
3006	3143	}
..	..	@@ -3446,7 +3583,8 @@
3446	3583	if (blockloop)
3447	3584	return;
3448	3585
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3450	3588	live = h;
3451	3589
3452	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3605,8 @@
3467	3605	return;
3468	3606
3469	3607	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3471	3610	link2master = h;
3472	3611
3473	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3626,8 @@
3487	3626	if (blockloop)
3488	3627	return;
3489	3628
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3491	3631	hide = h;
3492	3632
3493	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3647,7 @@
3507	3647	if (blockloop)
3508	3648	return;
3509	3649
3510		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3511	3651	marked = h;
3512	3652
3513	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3657,46 @@
3517	3657	continue;
3518	3658	blockloop = true;
3519	3659	child.MarkLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RewindLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ rewind = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RewindLeaves(h);
	3680	+ blockloop = false;
	3681	+ // release(i);
	3682	+ }
	3683	+ }
	3684	+
	3685	+ void RandomLeaves(boolean h)
	3686	+ {
	3687	+ if (blockloop)
	3688	+ return;
	3689	+
	3690	+ if (bRep != null \|\| material != null) // borderline...
	3691	+ random = h;
	3692	+
	3693	+ for (int i = 0; i < Size(); i++)
	3694	+ {
	3695	+ Object3D child = (Object3D) get(i); // reserve(i);
	3696	+ if (child == null)
	3697	+ continue;
	3698	+ blockloop = true;
	3699	+ child.RandomLeaves(h);
3520	3700	blockloop = false;
3521	3701	// release(i);
3522	3702	}
..	..	@@ -4294,6 +4474,55 @@
4294	4474	}
4295	4475	}
4296	4476
	4477	+ void RepairSOV()
	4478	+ {
	4479	+ if (blockloop)
	4480	+ return;
	4481	+
	4482	+ String texname = this.GetPigmentTexture();
	4483	+
	4484	+ if (texname.startsWith("sov"))
	4485	+ {
	4486	+ String[] s = texname.split("/");
	4487	+
	4488	+ String[] sname = s[1].split("Color.pn");
	4489	+
	4490	+ texname = sname[0];
	4491	+
	4492	+ if (sname.length > 1)
	4493	+ {
	4494	+ texname += "Color.jpg";
	4495	+ }
	4496	+
	4497	+ this.SetPigmentTexture("sov/" + texname);
	4498	+ }
	4499	+
	4500	+ texname = this.GetBumpTexture();
	4501	+
	4502	+ if (texname.startsWith("sov"))
	4503	+ {
	4504	+ String[] s = texname.split("/");
	4505	+
	4506	+ String[] sname = s[1].split("Bump.pn");
	4507	+
	4508	+ texname = sname[0];
	4509	+
	4510	+ if (sname.length > 1)
	4511	+ {
	4512	+ texname += "Bump.jpg";
	4513	+ }
	4514	+
	4515	+ this.SetBumpTexture("sov/" + texname);
	4516	+ }
	4517	+
	4518	+ for (int i=0; i<Size(); i++)
	4519	+ {
	4520	+ blockloop = true;
	4521	+ get(i).RepairSOV();
	4522	+ blockloop = false;
	4523	+ }
	4524	+ }
	4525	+
4297	4526	void RepairTexture()
4298	4527	{
4299	4528	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5037,14 @@
4808	5037	}
4809	5038	}
4810	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4811	5048	cTreePath Select(int indexcount, boolean deselect)
4812	5049	{
4813	5050	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5081,11 @@
4844	5081	if (leaf != null)
4845	5082	{
4846	5083	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4848	5086	{
4849	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4851	5089	}
4852	5090
4853	5091	return tp;
..	..	@@ -4864,6 +5102,7 @@
4864	5102
4865	5103	if (child == null)
4866	5104	continue;
	5105	+
4867	5106	if (child.HasTransparency() && child.size() != 0)
4868	5107	{
4869	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5112,10 @@
4873	5112	if (leaf != null)
4874	5113	{
4875	5114	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4877	5117	{
4878		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4879	5119	}
4880	5120
4881	5121	return tp;
..	..	@@ -5200,6 +5440,51 @@
5200	5440	blockloop = false;
5201	5441	}
5202	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5203	5488	boolean IsSelected()
5204	5489	{
5205	5490	if (parent == null)
..	..	@@ -5509,6 +5794,38 @@
5509	5794	}
5510	5795	}
5511	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5512	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	5830	{
5514	5831	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +5834,23 @@
5517	5834	boolean NeedSupport()
5518	5835	{
5519	5836	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5837	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	5838	// PROBLEM with CROWD!!
5522	5839	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	5840	}
5524	5841
5525	5842	static boolean DEBUG_SELECTION = false;
	5843	+
	5844	+ boolean IsLive()
	5845	+ {
	5846	+ if (live)
	5847	+ return true;
	5848	+
	5849	+ if (parent == null)
	5850	+ return false;
	5851	+
	5852	+ return parent.IsLive();
	5853	+ }
5526	5854
5527	5855	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	5856	{
..	..	@@ -5584,8 +5912,10 @@
5584	5912	if (support != null)
5585	5913	support = support;
5586	5914
5587		- //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);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5589	5919
5590	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	5921	{
..	..	@@ -5595,8 +5925,9 @@
5595	5925	// usecalllists &= !(parent instanceof RandomNode);
5596	5926	// usecalllists = false;
5597	5927
5598		- if (GetBRep() != null)
5599		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5600	5931	//System.out.println("draw " + this);
5601	5932	//new Exception().printStackTrace();
5602	5933
..	..	@@ -5605,10 +5936,12 @@
5605	5936	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	5937
5607	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5939	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5609	5941	{
5610	5942	Globals.lighttouched = true;
5611	5943	} // all panes...
	5944	+
5612	5945	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	5946	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	5947	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5616,7 +5949,7 @@
5616	5949	if (!(this instanceof Composite))
5617	5950	touched = false;
5618	5951	//if (displaylist == -1 && usecalllists)
5619		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5620	5953	{
5621	5954	bRep.displaylist = display.GenList();
5622	5955	assert(bRep.displaylist != 0);
..	..	@@ -5627,7 +5960,7 @@
5627	5960
5628	5961	//System.out.println("\tnew list " + list);
5629	5962	//gl.glDrawBuffer(gl.GL_NONE);
5630		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5631	5964	{
5632	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5633	5966	display.NewList(bRep.displaylist);
..	..	@@ -5636,7 +5969,7 @@
5636	5969	CallList(display, root, selected, blocked);
5637	5970
5638	5971	// compiled = true;
5639		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5640	5973	{
5641	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5642	5975	display.EndList();
..	..	@@ -5736,6 +6069,7 @@
5736	6069	if (GetBRep() != null)
5737	6070	{
5738	6071	display.NextIndex();
	6072	+
5739	6073	// vertex color conflict : gl.glCallList(list);
5740	6074	DrawNode(display, root, selected);
5741	6075	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6110,27 @@
5776	6110	tex = GetTextures();
5777	6111	}
5778	6112
5779		- boolean failed = false;
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
5780	6115
5781	6116	try
5782	6117	{
5783		- display.BindTextures(tex, texres);
	6118	+ display.BindPigmentTexture(tex, texres);
5784	6119	}
5785	6120	catch (Exception e)
5786	6121	{
5787	6122	System.err.println("FAILED: " + this);
5788		- failed = true;
	6123	+ failedPigment = true;
	6124	+ }
	6125	+
	6126	+ try
	6127	+ {
	6128	+ display.BindBumpTexture(tex, texres);
	6129	+ }
	6130	+ catch (Exception e)
	6131	+ {
	6132	+ //System.err.println("FAILED: " + this);
	6133	+ failedBump = true;
5789	6134	}
5790	6135
5791	6136	if (!compiled)
..	..	@@ -5808,8 +6153,11 @@
5808	6153	}
5809	6154	}
5810	6155
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
5813	6161
5814	6162	display.PopMaterial(this, selected);
5815	6163	}
..	..	@@ -6182,6 +6530,11 @@
6182	6530	// dec 2012
6183	6531	new Exception().printStackTrace();
6184	6532	return;
	6533	+ }
	6534	+
	6535	+ if (dontselect)
	6536	+ {
	6537	+ //bRep.GenerateNormalsMINE();
6185	6538	}
6186	6539
6187	6540	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7320,23 @@
6967	7320	}
6968	7321	}
6969	7322
6970		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
6971	7327	{
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;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
6975	7331	if (toscreen == null)
6976	7332	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7334	}
6979	7335	cVector vec = in;
6980	7336	LA.xformPos(in, toscreen, in);
6981	7337	//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();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6984	7340	outPt.x = hc + (int) vec.x;
6985	7341	outPt.y = vc - (int) vec.y;
6986	7342	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7344,18 @@
6988	7344	outRec.width = outRec.height = 6;
6989	7345	}
6990	7346
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
6992	7349	{
6993	7350	Point pt = new Point(0, 0);
6994	7351	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
6996	7354	return rec;
6997	7355	}
6998	7356
6999		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
7000	7359	{
7001	7360	if (level == 0)
7002	7361	{
..	..	@@ -7005,16 +7364,19 @@
7005	7364	{
7006	7365	cVector origin = new cVector();
7007	7366	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7371	Rectangle boundary = new Rectangle();
7010	7372	boundary.x = spot.x - 30;
7011	7373	boundary.y = spot.y - 30;
7012	7374	boundary.width = spot.width + 60;
7013	7375	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
7015	7377	int spotw = spot.x + spot.width;
7016	7378	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7380	// if (CameraPane.Xmin > spot.x)
7019	7381	// {
7020	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -7034,8 +7396,8 @@
7034	7396	spot.translate(32, 32);
7035	7397	spotw = spot.x + spot.width;
7036	7398	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039	7401	// if (CameraPane.Xmin > spot.x)
7040	7402	// {
7041	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,11 +7414,12 @@
7052	7414	// {
7053	7415	// CameraPane.Ymax = spoth;
7054	7416	// }
7055		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7417	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7418	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7057	7419	spot.translate(0, -32);
7058		- info.g.setColor(Color.green);
7059		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
7060	7423	// if (CameraPane.Xmin > spot.x)
7061	7424	// {
7062	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -7073,8 +7436,8 @@
7073	7436	// {
7074	7437	// CameraPane.Ymax = spoth;
7075	7438	// }
7076		- info.g.drawArc(boundary.x, boundary.y,
7077		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7078	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7442	// if (CameraPane.Xmin > boundary.x)
7080	7443	// {
..	..	@@ -7096,7 +7459,8 @@
7096	7459	}
7097	7460	}
7098	7461
7099		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7100	7464	{
7101	7465	if (level == 0)
7102	7466	{
..	..	@@ -7105,8 +7469,8 @@
7105	7469
7106	7470	boolean retval = false;
7107	7471
7108		- startX = info.x;
7109		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7110	7474
7111	7475	hitSomething = -1;
7112	7476	cVector origin = new cVector();
..	..	@@ -7116,22 +7480,51 @@
7116	7480	{
7117	7481	centerPt = new Point(0, 0);
7118	7482	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7486	{
7122	7487	hitSomething = hitCenter;
7123	7488	retval = true;
7124	7489	}
7125	7490	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7492	{
7128	7493	hitSomething = hitRotate;
7129	7494	retval = true;
7130	7495	}
7131	7496	spot.translate(0, 32);
7132		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7133	7498	{
7134	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7135	7528	retval = true;
7136	7529	}
7137	7530
..	..	@@ -7141,7 +7534,7 @@
7141	7534	}
7142	7535
7143	7536	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7538	//System.out.println("modified = " + modified);
7146	7539	//new Exception().printStackTrace();
7147	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7562,8 @@
7169	7562	return true;
7170	7563	}
7171	7564
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7173	7567	{
7174	7568	if (hitSomething == 0)
7175	7569	{
..	..	@@ -7183,7 +7577,7 @@
7183	7577
7184	7578	//System.out.println("hitSomething = " + hitSomething);
7185	7579
7186		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7581
7188	7582	cVector xlate = new cVector();
7189	7583	//cVector xlate2 = new cVector();
..	..	@@ -7217,8 +7611,8 @@
7217	7611	toParent[3][i] = xlate.get(i);
7218	7612	LA.matInvert(toParent, fromParent);
7219	7613	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7222	7616
7223	7617	LA.matCopy(startMat, toParent);
7224	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7621,7 @@
7227	7621	} else
7228	7622	{
7229	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7231	7625	cVector away = new cVector();
7232	7626	//cVector right2 = new cVector();
7233	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7638,19 @@
7244	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7639	// if (!CameraPane.LOCALTRANSFORM)
7246	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7642	// if (!CameraPane.LOCALTRANSFORM)
7249	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7644	//LA.vecCross(up, cVector.Z, right2);
7251	7645
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7647
7254	7648	//System.out.println("DELTA0 = " + delta);
7255	7649	//System.out.println("AWAY = " + info.camera.away);
7256	7650	//System.out.println("UP = " + info.camera.up);
7257	7651	if (away.z > 0)
7258	7652	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7654	{
7261	7655	delta.x = -delta.x;
7262	7656	} else
..	..	@@ -7271,7 +7665,7 @@
7271	7665	//System.out.println("DELTA1 = " + delta);
7272	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7667	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7669	LA.matCopy(startMat, toParent);
7276	7670	//System.out.println("DELTA3 = " + delta);
7277	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7675,8 @@
7281	7675	break;
7282	7676
7283	7677	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7286	7680	double angle = (double) Math.atan2(dx, dy);
7287	7681	angle = -(1.570796 - angle);
7288	7682
..	..	@@ -7305,7 +7699,7 @@
7305	7699	}
7306	7700	/**/
7307	7701
7308		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7703	{
7310	7704	case 1: // '\001'
7311	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7726,7 @@
7332	7726	break;
7333	7727
7334	7728	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7336	7730	double sign = 1;
7337	7731	if (hScale < 0)
7338	7732	{
..	..	@@ -7344,7 +7738,7 @@
7344	7738	//hScale = 0.01;
7345	7739	}
7346	7740
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7348	7742	sign = 1;
7349	7743	if (vScale < 0)
7350	7744	{
..	..	@@ -7355,6 +7749,7 @@
7355	7749	{
7356	7750	//vScale = 0.01;
7357	7751	}
	7752	+
7358	7753	LA.matCopy(startMat, toParent);
7359	7754	/**/
7360	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7364,29 +7759,30 @@
7364	7759	}
7365	7760	/**/
7366	7761
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7763
7369	7764	if (totalScale < 0.01)
7370	7765	{
7371	7766	totalScale = 0.01;
7372	7767	}
7373	7768
7374		- switch (info.pane.RenderCamera().viewCode)
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7770	{
7376	7771	case 3: // '\001'
7377		- if (modified)
	7772	+ if (modified \|\| opposite)
7378	7773	{
7379	7774	//LA.matScale(toParent, 1, hScale, vScale);
7380	7775	LA.matScale(toParent, totalScale, 1, 1);
7381	7776	} // vScale, 1);
7382	7777	else
7383	7778	{
	7779	+ // EXCEPTION!
7384	7780	LA.matScale(toParent, totalScale, totalScale, totalScale);
7385	7781	} // vScale, 1);
7386	7782	break;
7387	7783
7388	7784	case 2: // '\002'
7389		- if (modified)
	7785	+ if (modified \|\| opposite)
7390	7786	{
7391	7787	//LA.matScale(toParent, hScale, 1, vScale);
7392	7788	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7397,7 +7793,7 @@
7397	7793	break;
7398	7794
7399	7795	case 1: // '\003'
7400		- if (modified)
	7796	+ if (modified \|\| opposite)
7401	7797	{
7402	7798	//LA.matScale(toParent, hScale, vScale, 1);
7403	7799	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7437,7 +7833,7 @@
7437	7833	} // NEW ...
7438	7834
7439	7835
7440		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7441	7837	}
7442	7838
7443	7839	boolean overflow = false;
..	..	@@ -7617,6 +8013,10 @@
7617	8013	editWindow = null;
7618	8014	} // ?
7619	8015	}
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
	8019	+ }
7620	8020	}
7621	8021
7622	8022	boolean root; // patch for edit windows
..	..	@@ -7774,6 +8174,10 @@
7774	8174	}
7775	8175
7776	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7777	8181	transient ObjectUI objectUI;
7778	8182	public static int povDepth = 0;
7779	8183	private static cVector tbMin = new cVector();