~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,28 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
22	24
	25	+ // Use GetUUID for backward compatibility with null.
	26	+ private UUID uuid = UUID.randomUUID();
	27	+
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+ //
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
23	39	ScriptNode scriptnode;
24	40
25	41	void InitOthers()
..	..	@@ -100,64 +116,201 @@
100	116
101	117	// transient boolean reduced; // for morph reduction
102	118
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	121
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
108	124
109		-void SaveSupports()
110		-{
111		- if (blockloop)
112		- return;
113		-
114		- transientsupport = support;
115		- transientlink2master = link2master;
116		-
117		- support = null;
118		- link2master = false;
119		-
120		- if (bRep != null)
	125	+ void SaveSupports()
121	126	{
122		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
123	150	}
124		-
125		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
126	153	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	154	+ if (blockloop)
	155	+ return;
	156	+
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
	161	+
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	179	+ {
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
	282	+ if (blockloop)
	283	+ return;
	284	+
130	285	blockloop = true;
131		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
132	294	blockloop = false;
133	295	}
134		-}
135	296
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
140		-
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
	297	+ void RestoreBigData(Object3D o)
147	298	{
148		- bRep.RestoreSupports();
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
149	313	}
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
159		- }
160		-}
161	314
162	315	// MOCAP SUPPORT
163	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +453,8 @@
300	453	}
301	454
302	455	boolean live = false;
	456	+ transient boolean keepdontselect;
	457	+ boolean dontselect = false;
303	458	boolean hide = false;
304	459	boolean link2master = false; // performs reset support/master at each frame
305	460	boolean marked = false; // animation node
..	..	@@ -481,12 +636,14 @@
481	636	toParent = LA.newMatrix();
482	637	fromParent = LA.newMatrix();
483	638	}
	639	+
484	640	if (toParentMarked == null)
485	641	{
486	642	if (maxcount != 1)
487	643	{
488	644	new Exception().printStackTrace();
489	645	}
	646	+
490	647	toParentMarked = LA.newMatrix();
491	648	fromParentMarked = LA.newMatrix();
492	649	}
..	..	@@ -774,7 +931,7 @@
774	931	if (step == 0)
775	932	step = 1;
776	933	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
778	935	// if (acceleration == 0)
779	936	// acceleration = 10;
780	937	if (delay == 0) // serial
..	..	@@ -797,7 +954,7 @@
797	954
798	955	if (marked && Globals.isLIVE() && live &&
799	956	//TEMP21aug2018
800		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	958	currentframe != Globals.framecount)
802	959	{
803	960	currentframe = Globals.framecount;
..	..	@@ -809,7 +966,8 @@
809	966
810	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	968
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
813	971	{
814	972	countdown = 1;
815	973	delay = speedup?8:1;
..	..	@@ -881,6 +1039,10 @@
881	1039	if (material == null \|\| material.multiply)
882	1040	return true;
883	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
884	1046	return material.opacity > 0.99;
885	1047	}
886	1048
..	..	@@ -1281,6 +1443,7 @@
1281	1443	toParent = LA.newMatrix();
1282	1444	fromParent = LA.newMatrix();
1283	1445	}
	1446	+
1284	1447	LA.matCopy(other.toParent, toParent);
1285	1448	LA.matCopy(other.fromParent, fromParent);
1286	1449
..	..	@@ -1834,12 +1997,15 @@
1834	1997	if (obj.name == null)
1835	1998	continue; // can't be a null one
1836	1999
	2000	+ // Try perfect match first.
1837	2001	if (n.equals(obj.name))
1838	2002	{
1839	2003	theobj = obj;
1840	2004	count++;
1841	2005	}
1842	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1843	2009
1844	2010	if (count != 1)
1845	2011	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2465,11 @@
2299	2465	}
2300	2466	*/
2301	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2302	2473	}
2303	2474
2304	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2340,6 +2511,14 @@
2340	2511	{
2341	2512	editWindow.refreshContents();
2342	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2343	2522	//if (parent != null)
2344	2523	//parent.refreshEditWindow();
2345	2524	}
..	..	@@ -2419,7 +2598,8 @@
2419	2598	private static final int editSelf = 1;
2420	2599	private static final int editChild = 2;
2421	2600
2422		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2423	2603	{
2424	2604	if (level == 0)
2425	2605	{
..	..	@@ -2427,7 +2607,8 @@
2427	2607	return;
2428	2608
2429	2609	Object3D selectee;
2430		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2610	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2611	+ level + 1))
2431	2612	{
2432	2613	selectee = (Object3D) e.nextElement();
2433	2614	}
..	..	@@ -2435,19 +2616,22 @@
2435	2616	} else
2436	2617	{
2437	2618	//super.
2438		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2439	2621	}
2440	2622	}
2441	2623
2442		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2443	2626	{
2444	2627	doSomething = 0;
2445	2628	if (level == 0)
2446	2629	{
2447		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2448	2631	}
2449	2632	if (//super.
2450		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2451	2635	{
2452	2636	doSomething = 1;
2453	2637	return true;
..	..	@@ -2457,7 +2641,7 @@
2457	2641	}
2458	2642	}
2459	2643
2460		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2461	2645	{
2462	2646	if (selection == null)
2463	2647	{
..	..	@@ -2470,7 +2654,8 @@
2470	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2471	2655	{
2472	2656	Object3D selectee = (Object3D) e.nextElement();
2473		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2474	2659	{
2475	2660	childToDrag = selectee;
2476	2661	doSomething = 2;
..	..	@@ -2482,13 +2667,15 @@
2482	2667	return retval;
2483	2668	}
2484	2669
2485		- void doEditDrag(ClickInfo info, boolean opposite)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2486	2672	{
2487	2673	switch (doSomething)
2488	2674	{
2489	2675	case 1: // '\001'
2490	2676	//super.
2491		- doEditDrag0(info, opposite);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2492	2679	break;
2493	2680
2494	2681	case 2: // '\002'
..	..	@@ -2501,11 +2688,13 @@
2501	2688	{
2502	2689	//sel.hitSomething = childToDrag.hitSomething;
2503	2690	//childToDrag.doEditDrag(info);
2504		- sel.doEditDrag(info, opposite);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2505	2693	} else
2506	2694	{
2507	2695	//super.
2508		- doEditDrag0(info, opposite);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2509	2698	}
2510	2699	}
2511	2700	break;
..	..	@@ -2523,6 +2712,9 @@
2523	2712	{
2524	2713	deselectAll();
2525	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2526	2718	ClickInfo newInfo = new ClickInfo();
2527	2719	newInfo.flags = info.flags;
2528	2720	newInfo.bounds = info.bounds;
..	..	@@ -2615,6 +2807,18 @@
2615	2807	void GenNormalsS(boolean crease)
2616	2808	{
2617	2809	selection.GenNormals(crease);
	2810	+// for (int i=0; i<selection.size(); i++)
	2811	+// {
	2812	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2813	+// selectee.GenNormals(crease);
	2814	+// }
	2815	+
	2816	+ //Touch();
	2817	+ }
	2818	+
	2819	+ void GenNormalsMeshS()
	2820	+ {
	2821	+ selection.GenNormalsMesh();
2618	2822	// for (int i=0; i<selection.size(); i++)
2619	2823	// {
2620	2824	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2755,6 +2959,24 @@
2755	2959	if (child == null)
2756	2960	continue;
2757	2961	child.GenNormals(crease);
	2962	+// Children().release(i);
	2963	+ }
	2964	+ blockloop = false;
	2965	+ }
	2966	+
	2967	+ void GenNormalsMesh()
	2968	+ {
	2969	+ if (blockloop)
	2970	+ return;
	2971	+
	2972	+ blockloop = true;
	2973	+ GenNormalsMesh0();
	2974	+ for (int i = 0; i < Children().Size(); i++)
	2975	+ {
	2976	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2977	+ if (child == null)
	2978	+ continue;
	2979	+ child.GenNormalsMesh();
2758	2980	// Children().release(i);
2759	2981	}
2760	2982	blockloop = false;
..	..	@@ -2927,11 +3149,20 @@
2927	3149	}
2928	3150	}
2929	3151
	3152	+ void GenNormalsMesh0()
	3153	+ {
	3154	+ if (bRep != null)
	3155	+ {
	3156	+ bRep.GenerateNormalsMesh();
	3157	+ Touch();
	3158	+ }
	3159	+ }
	3160	+
2930	3161	void GenNormalsMINE0()
2931	3162	{
2932	3163	if (bRep != null)
2933	3164	{
2934		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2935	3166	Touch();
2936	3167	}
2937	3168	}
..	..	@@ -3002,8 +3233,10 @@
3002	3233	v.fromParent = LA.newMatrix();
3003	3234	}
3004	3235
3005		- LA.matConcat(v.toParent, toParent, v.toParent);
3006		- LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3236	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3237	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3238	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3239	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3007	3240	}
3008	3241
3009	3242	toParent = null; // LA.matIdentity(toParent);
..	..	@@ -3236,7 +3469,9 @@
3236	3469	bRep.support = null;
3237	3470	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3238	3471	// bRep.SplitInTwo(onlyone); // thread...
3239		- temprep.SplitInTwo(reduction34, onlyone);
	3472	+
	3473	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3474	+
3240	3475	bRep = temprep;
3241	3476	bRep.support = sup;
3242	3477	Touch();
..	..	@@ -3373,7 +3608,8 @@
3373	3608	if (blockloop)
3374	3609	return;
3375	3610
3376		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3377	3613	live = h;
3378	3614
3379	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3394,7 +3630,8 @@
3394	3630	return;
3395	3631
3396	3632	//if (bRep != null)
3397		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3398	3635	link2master = h;
3399	3636
3400	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,7 +3651,8 @@
3414	3651	if (blockloop)
3415	3652	return;
3416	3653
3417		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3418	3656	hide = h;
3419	3657
3420	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3434,7 +3672,7 @@
3434	3672	if (blockloop)
3435	3673	return;
3436	3674
3437		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3438	3676	marked = h;
3439	3677
3440	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3444,6 +3682,46 @@
3444	3682	continue;
3445	3683	blockloop = true;
3446	3684	child.MarkLeaves(h);
	3685	+ blockloop = false;
	3686	+ // release(i);
	3687	+ }
	3688	+ }
	3689	+
	3690	+ void RewindLeaves(boolean h)
	3691	+ {
	3692	+ if (blockloop)
	3693	+ return;
	3694	+
	3695	+ if (bRep != null \|\| material != null) // borderline...
	3696	+ rewind = h;
	3697	+
	3698	+ for (int i = 0; i < Size(); i++)
	3699	+ {
	3700	+ Object3D child = (Object3D) get(i); // reserve(i);
	3701	+ if (child == null)
	3702	+ continue;
	3703	+ blockloop = true;
	3704	+ child.RewindLeaves(h);
	3705	+ blockloop = false;
	3706	+ // release(i);
	3707	+ }
	3708	+ }
	3709	+
	3710	+ void RandomLeaves(boolean h)
	3711	+ {
	3712	+ if (blockloop)
	3713	+ return;
	3714	+
	3715	+ if (bRep != null \|\| material != null) // borderline...
	3716	+ random = h;
	3717	+
	3718	+ for (int i = 0; i < Size(); i++)
	3719	+ {
	3720	+ Object3D child = (Object3D) get(i); // reserve(i);
	3721	+ if (child == null)
	3722	+ continue;
	3723	+ blockloop = true;
	3724	+ child.RandomLeaves(h);
3447	3725	blockloop = false;
3448	3726	// release(i);
3449	3727	}
..	..	@@ -4221,6 +4499,55 @@
4221	4499	}
4222	4500	}
4223	4501
	4502	+ void RepairSOV()
	4503	+ {
	4504	+ if (blockloop)
	4505	+ return;
	4506	+
	4507	+ String texname = this.GetPigmentTexture();
	4508	+
	4509	+ if (texname.startsWith("sov"))
	4510	+ {
	4511	+ String[] s = texname.split("/");
	4512	+
	4513	+ String[] sname = s[1].split("Color.pn");
	4514	+
	4515	+ texname = sname[0];
	4516	+
	4517	+ if (sname.length > 1)
	4518	+ {
	4519	+ texname += "Color.jpg";
	4520	+ }
	4521	+
	4522	+ this.SetPigmentTexture("sov/" + texname);
	4523	+ }
	4524	+
	4525	+ texname = this.GetBumpTexture();
	4526	+
	4527	+ if (texname.startsWith("sov"))
	4528	+ {
	4529	+ String[] s = texname.split("/");
	4530	+
	4531	+ String[] sname = s[1].split("Bump.pn");
	4532	+
	4533	+ texname = sname[0];
	4534	+
	4535	+ if (sname.length > 1)
	4536	+ {
	4537	+ texname += "Bump.jpg";
	4538	+ }
	4539	+
	4540	+ this.SetBumpTexture("sov/" + texname);
	4541	+ }
	4542	+
	4543	+ for (int i=0; i<Size(); i++)
	4544	+ {
	4545	+ blockloop = true;
	4546	+ get(i).RepairSOV();
	4547	+ blockloop = false;
	4548	+ }
	4549	+ }
	4550	+
4224	4551	void RepairTexture()
4225	4552	{
4226	4553	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4711,7 +5038,7 @@
4711	5038
4712	5039	cTreePath SelectLeaf(int indexcount, boolean deselect)
4713	5040	{
4714		- if (hide)
	5041	+ if (hide \|\| dontselect)
4715	5042	return null;
4716	5043
4717	5044	if (count <= 0)
..	..	@@ -4735,9 +5062,17 @@
4735	5062	}
4736	5063	}
4737	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4738	5073	cTreePath Select(int indexcount, boolean deselect)
4739	5074	{
4740		- if (hide)
	5075	+ if (hide \|\| dontselect)
4741	5076	return null;
4742	5077
4743	5078	if (count <= 0)
..	..	@@ -4771,10 +5106,11 @@
4771	5106	if (leaf != null)
4772	5107	{
4773	5108	cTreePath tp = new cTreePath(this, leaf);
4774		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4775	5111	{
4776	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4777		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4778	5114	}
4779	5115
4780	5116	return tp;
..	..	@@ -4791,6 +5127,7 @@
4791	5127
4792	5128	if (child == null)
4793	5129	continue;
	5130	+
4794	5131	if (child.HasTransparency() && child.size() != 0)
4795	5132	{
4796	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4800,9 +5137,10 @@
4800	5137	if (leaf != null)
4801	5138	{
4802	5139	cTreePath tp = new cTreePath(this, leaf);
4803		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4804	5142	{
4805		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4806	5144	}
4807	5145
4808	5146	return tp;
..	..	@@ -5127,6 +5465,51 @@
5127	5465	blockloop = false;
5128	5466	}
5129	5467
	5468	+ void ResetSelectable()
	5469	+ {
	5470	+ if (blockloop)
	5471	+ return;
	5472	+
	5473	+ blockloop = true;
	5474	+
	5475	+ keepdontselect = dontselect;
	5476	+ dontselect = true;
	5477	+
	5478	+ Object3D child;
	5479	+ int nb = Size();
	5480	+ for (int i = 0; i < nb; i++)
	5481	+ {
	5482	+ child = (Object3D) get(i);
	5483	+ if (child == null)
	5484	+ continue;
	5485	+ child.ResetSelectable();
	5486	+ }
	5487	+
	5488	+ blockloop = false;
	5489	+ }
	5490	+
	5491	+ void RestoreSelectable()
	5492	+ {
	5493	+ if (blockloop)
	5494	+ return;
	5495	+
	5496	+ blockloop = true;
	5497	+
	5498	+ dontselect = keepdontselect;
	5499	+
	5500	+ Object3D child;
	5501	+ int nb = Size();
	5502	+ for (int i = 0; i < nb; i++)
	5503	+ {
	5504	+ child = (Object3D) get(i);
	5505	+ if (child == null)
	5506	+ continue;
	5507	+ child.RestoreSelectable();
	5508	+ }
	5509	+
	5510	+ blockloop = false;
	5511	+ }
	5512	+
5130	5513	boolean IsSelected()
5131	5514	{
5132	5515	if (parent == null)
..	..	@@ -5363,6 +5746,43 @@
5363	5746	}
5364	5747	}
5365	5748
	5749	+ UUID GetUUID()
	5750	+ {
	5751	+ if (uuid == null)
	5752	+ {
	5753	+ // Serial
	5754	+ uuid = UUID.randomUUID();
	5755	+ }
	5756	+
	5757	+ return uuid;
	5758	+ }
	5759	+
	5760	+ Object3D GetObject(UUID uid)
	5761	+ {
	5762	+ if (blockloop)
	5763	+ return null;
	5764	+
	5765	+ if (GetUUID().equals(uid))
	5766	+ return this;
	5767	+
	5768	+ int nb = Size();
	5769	+ for (int i = 0; i < nb; i++)
	5770	+ {
	5771	+ Object3D child = (Object3D) get(i);
	5772	+
	5773	+ if (child == null)
	5774	+ continue;
	5775	+
	5776	+ blockloop = true;
	5777	+ Object3D obj = child.GetObject(uid);
	5778	+ blockloop = false;
	5779	+ if (obj != null)
	5780	+ return obj;
	5781	+ }
	5782	+
	5783	+ return null;
	5784	+ }
	5785	+
5366	5786	void SetBumpTexture(String tex)
5367	5787	{
5368	5788	if (GetTextures() == null)
..	..	@@ -5399,6 +5819,38 @@
5399	5819	}
5400	5820	}
5401	5821
	5822	+ void EmbedTextures(boolean embed)
	5823	+ {
	5824	+ if (blockloop)
	5825	+ return;
	5826	+
	5827	+ //if (GetTextures() != null)
	5828	+ if (embed)
	5829	+ CameraPane.EmbedTextures(GetTextures());
	5830	+ else
	5831	+ {
	5832	+ GetTextures().pigmentdata = null;
	5833	+ GetTextures().bumpdata = null;
	5834	+ GetTextures().pw = 0;
	5835	+ GetTextures().ph = 0;
	5836	+ GetTextures().bw = 0;
	5837	+ GetTextures().bh = 0;
	5838	+ }
	5839	+
	5840	+ int nb = Size();
	5841	+ for (int i = 0; i < nb; i++)
	5842	+ {
	5843	+ Object3D child = (Object3D) get(i);
	5844	+
	5845	+ if (child == null)
	5846	+ continue;
	5847	+
	5848	+ blockloop = true;
	5849	+ child.EmbedTextures(embed);
	5850	+ blockloop = false;
	5851	+ }
	5852	+ }
	5853	+
5402	5854	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5403	5855	{
5404	5856	Draw(display, root, selected, blocked);
..	..	@@ -5407,12 +5859,23 @@
5407	5859	boolean NeedSupport()
5408	5860	{
5409	5861	return
5410		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5862	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5411	5863	// PROBLEM with CROWD!!
5412	5864	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5413	5865	}
5414	5866
5415	5867	static boolean DEBUG_SELECTION = false;
	5868	+
	5869	+ boolean IsLive()
	5870	+ {
	5871	+ if (live)
	5872	+ return true;
	5873	+
	5874	+ if (parent == null)
	5875	+ return false;
	5876	+
	5877	+ return parent.IsLive();
	5878	+ }
5416	5879
5417	5880	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5418	5881	{
..	..	@@ -5424,7 +5887,7 @@
5424	5887	}
5425	5888
5426	5889	if (display.DrawMode() == iCameraPane.SELECTION &&
5427		- hide)
	5890	+ (hide \|\| dontselect))
5428	5891	return;
5429	5892
5430	5893	if (name != null && name.contains("sclera"))
..	..	@@ -5474,8 +5937,10 @@
5474	5937	if (support != null)
5475	5938	support = support;
5476	5939
5477		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5478		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5942	+
	5943	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5479	5944
5480	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5481	5946	{
..	..	@@ -5485,8 +5950,9 @@
5485	5950	// usecalllists &= !(parent instanceof RandomNode);
5486	5951	// usecalllists = false;
5487	5952
5488		- if (GetBRep() != null)
5489		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5490	5956	//System.out.println("draw " + this);
5491	5957	//new Exception().printStackTrace();
5492	5958
..	..	@@ -5495,10 +5961,12 @@
5495	5961	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5496	5962
5497	5963	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5498		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5499	5966	{
5500	5967	Globals.lighttouched = true;
5501	5968	} // all panes...
	5969	+
5502	5970	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5503	5971	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5504	5972	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5506,7 +5974,7 @@
5506	5974	if (!(this instanceof Composite))
5507	5975	touched = false;
5508	5976	//if (displaylist == -1 && usecalllists)
5509		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5510	5978	{
5511	5979	bRep.displaylist = display.GenList();
5512	5980	assert(bRep.displaylist != 0);
..	..	@@ -5517,7 +5985,7 @@
5517	5985
5518	5986	//System.out.println("\tnew list " + list);
5519	5987	//gl.glDrawBuffer(gl.GL_NONE);
5520		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5521	5989	{
5522	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5523	5991	display.NewList(bRep.displaylist);
..	..	@@ -5526,7 +5994,7 @@
5526	5994	CallList(display, root, selected, blocked);
5527	5995
5528	5996	// compiled = true;
5529		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5530	5998	{
5531	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5532	6000	display.EndList();
..	..	@@ -5626,6 +6094,7 @@
5626	6094	if (GetBRep() != null)
5627	6095	{
5628	6096	display.NextIndex();
	6097	+
5629	6098	// vertex color conflict : gl.glCallList(list);
5630	6099	DrawNode(display, root, selected);
5631	6100	if (this instanceof BezierPatch)
..	..	@@ -5666,7 +6135,28 @@
5666	6135	tex = GetTextures();
5667	6136	}
5668	6137
5669		- display.BindTextures(tex, texres);
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
	6140	+
	6141	+ try
	6142	+ {
	6143	+ display.BindPigmentTexture(tex, texres);
	6144	+ }
	6145	+ catch (Exception e)
	6146	+ {
	6147	+ System.err.println("FAILED: " + this);
	6148	+ failedPigment = true;
	6149	+ }
	6150	+
	6151	+ try
	6152	+ {
	6153	+ display.BindBumpTexture(tex, texres);
	6154	+ }
	6155	+ catch (Exception e)
	6156	+ {
	6157	+ //System.err.println("FAILED: " + this);
	6158	+ failedBump = true;
	6159	+ }
5670	6160
5671	6161	if (!compiled)
5672	6162	{
..	..	@@ -5688,7 +6178,11 @@
5688	6178	}
5689	6179	}
5690	6180
5691		- display.ReleaseTextures(tex);
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
5692	6186
5693	6187	display.PopMaterial(this, selected);
5694	6188	}
..	..	@@ -5817,6 +6311,9 @@
5817	6311
5818	6312	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5819	6313	{
	6314	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6315	+ return;
	6316	+
5820	6317	if (hide)
5821	6318	return;
5822	6319	// shadow optimisation
..	..	@@ -5942,6 +6439,9 @@
5942	6439	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5943	6440	return; // no shadow for transparent objects
5944	6441
	6442	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6443	+ return;
	6444	+
5945	6445	if (hide)
5946	6446	return;
5947	6447
..	..	@@ -6055,6 +6555,11 @@
6055	6555	// dec 2012
6056	6556	new Exception().printStackTrace();
6057	6557	return;
	6558	+ }
	6559	+
	6560	+ if (dontselect)
	6561	+ {
	6562	+ //bRep.GenerateNormalsMINE();
6058	6563	}
6059	6564
6060	6565	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6840,20 +7345,23 @@
6840	7345	}
6841	7346	}
6842	7347
6843		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7348	+ static ClickInfo clickInfo = new ClickInfo();
	7349	+
	7350	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7351	+ Point outPt, Rectangle outRec)
6844	7352	{
6845		- int hc = info.bounds.x + info.bounds.width / 2;
6846		- int vc = info.bounds.y + info.bounds.height / 2;
6847		- double[][] toscreen = info.toScreen;
	7353	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7354	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7355	+ double[][] toscreen = clickInfo.toScreen;
6848	7356	if (toscreen == null)
6849	7357	{
6850		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6851	7359	}
6852	7360	cVector vec = in;
6853	7361	LA.xformPos(in, toscreen, in);
6854	7362	//System.out.println("Distance = " + info.camera.Distance());
6855		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6856		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6857	7365	outPt.x = hc + (int) vec.x;
6858	7366	outPt.y = vc - (int) vec.y;
6859	7367	outRec.x = outPt.x - 3;
..	..	@@ -6861,15 +7369,18 @@
6861	7369	outRec.width = outRec.height = 6;
6862	7370	}
6863	7371
6864		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
6865	7374	{
6866	7375	Point pt = new Point(0, 0);
6867	7376	Rectangle rec = new Rectangle();
6868		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
6869	7379	return rec;
6870	7380	}
6871	7381
6872		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
6873	7384	{
6874	7385	if (level == 0)
6875	7386	{
..	..	@@ -6878,16 +7389,19 @@
6878	7389	{
6879	7390	cVector origin = new cVector();
6880	7391	//LA.xformPos(origin, toParent, origin);
6881		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6882	7396	Rectangle boundary = new Rectangle();
6883	7397	boundary.x = spot.x - 30;
6884	7398	boundary.y = spot.y - 30;
6885	7399	boundary.width = spot.width + 60;
6886	7400	boundary.height = spot.height + 60;
6887		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
6888	7402	int spotw = spot.x + spot.width;
6889	7403	int spoth = spot.y + spot.height;
6890		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6891	7405	// if (CameraPane.Xmin > spot.x)
6892	7406	// {
6893	7407	// CameraPane.Xmin = spot.x;
..	..	@@ -6907,8 +7421,8 @@
6907	7421	spot.translate(32, 32);
6908	7422	spotw = spot.x + spot.width;
6909	7423	spoth = spot.y + spot.height;
6910		- info.g.setColor(Color.blue);
6911		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7424	+ clickInfo.g.setColor(Color.cyan);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6912	7426	// if (CameraPane.Xmin > spot.x)
6913	7427	// {
6914	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -6925,11 +7439,12 @@
6925	7439	// {
6926	7440	// CameraPane.Ymax = spoth;
6927	7441	// }
6928		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6929		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7442	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7443	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6930	7444	spot.translate(0, -32);
6931		- info.g.setColor(Color.green);
6932		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
6933	7448	// if (CameraPane.Xmin > spot.x)
6934	7449	// {
6935	7450	// CameraPane.Xmin = spot.x;
..	..	@@ -6946,8 +7461,8 @@
6946	7461	// {
6947	7462	// CameraPane.Ymax = spoth;
6948	7463	// }
6949		- info.g.drawArc(boundary.x, boundary.y,
6950		- boundary.width, boundary.height, 0, 360);
	7464	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7465	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6951	7466	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6952	7467	// if (CameraPane.Xmin > boundary.x)
6953	7468	// {
..	..	@@ -6969,7 +7484,8 @@
6969	7484	}
6970	7485	}
6971	7486
6972		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
6973	7489	{
6974	7490	if (level == 0)
6975	7491	{
..	..	@@ -6978,10 +7494,10 @@
6978	7494
6979	7495	boolean retval = false;
6980	7496
6981		- startX = info.x;
6982		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
6983	7499
6984		- hitSomething = 0;
	7500	+ hitSomething = -1;
6985	7501	cVector origin = new cVector();
6986	7502	//LA.xformPos(origin, toParent, origin);
6987	7503	Rectangle spot = new Rectangle();
..	..	@@ -6989,22 +7505,51 @@
6989	7505	{
6990	7506	centerPt = new Point(0, 0);
6991	7507	}
6992		- calcHotSpot(origin, info, centerPt, spot);
6993		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
6994	7511	{
6995	7512	hitSomething = hitCenter;
6996	7513	retval = true;
6997	7514	}
6998	7515	spot.translate(32, 0);
6999		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
7000	7517	{
7001	7518	hitSomething = hitRotate;
7002	7519	retval = true;
7003	7520	}
7004	7521	spot.translate(0, 32);
7005		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
7006	7523	{
7007	7524	hitSomething = hitScale;
	7525	+
	7526	+ double scale = 0.005f * clickInfo.camera.Distance();
	7527	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7528	+ double sign = 1;
	7529	+ if (hScale < 0)
	7530	+ {
	7531	+ sign = -1;
	7532	+ }
	7533	+ hScale = signMath.pow(signhScale, scale * 50);
	7534	+ if (hScale < 0.01)
	7535	+ {
	7536	+ //hScale = 0.01;
	7537	+ }
	7538	+
	7539	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7540	+ sign = 1;
	7541	+ if (vScale < 0)
	7542	+ {
	7543	+ sign = -1;
	7544	+ }
	7545	+ vScale = signMath.pow(signvScale, scale * 50);
	7546	+ if (vScale < 0.01)
	7547	+ {
	7548	+ //vScale = 0.01;
	7549	+ }
	7550	+
	7551	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7552	+
7008	7553	retval = true;
7009	7554	}
7010	7555
..	..	@@ -7014,7 +7559,7 @@
7014	7559	}
7015	7560
7016	7561	//System.out.println("info.modifiers = " + info.modifiers);
7017		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7018	7563	//System.out.println("modified = " + modified);
7019	7564	//new Exception().printStackTrace();
7020	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7042,7 +7587,8 @@
7042	7587	return true;
7043	7588	}
7044	7589
7045		- void doEditDrag0(ClickInfo info, boolean opposite)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
7046	7592	{
7047	7593	if (hitSomething == 0)
7048	7594	{
..	..	@@ -7056,7 +7602,8 @@
7056	7602
7057	7603	//System.out.println("hitSomething = " + hitSomething);
7058	7604
7059		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
	7606	+
7060	7607	cVector xlate = new cVector();
7061	7608	//cVector xlate2 = new cVector();
7062	7609	switch (hitSomething)
..	..	@@ -7089,8 +7636,8 @@
7089	7636	toParent[3][i] = xlate.get(i);
7090	7637	LA.matInvert(toParent, fromParent);
7091	7638	*/
7092		- cVector delta = LA.newVector(0, 0, startY - info.y);
7093		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7639	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7640	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7094	7641
7095	7642	LA.matCopy(startMat, toParent);
7096	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7099,7 +7646,7 @@
7099	7646	} else
7100	7647	{
7101	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7102		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7103	7650	cVector away = new cVector();
7104	7651	//cVector right2 = new cVector();
7105	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7116,19 +7663,19 @@
7116	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7117	7664	// if (!CameraPane.LOCALTRANSFORM)
7118	7665	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7119		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7120	7667	// if (!CameraPane.LOCALTRANSFORM)
7121	7668	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7122	7669	//LA.vecCross(up, cVector.Z, right2);
7123	7670
7124		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7125	7672
7126	7673	//System.out.println("DELTA0 = " + delta);
7127	7674	//System.out.println("AWAY = " + info.camera.away);
7128	7675	//System.out.println("UP = " + info.camera.up);
7129	7676	if (away.z > 0)
7130	7677	{
7131		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7132	7679	{
7133	7680	delta.x = -delta.x;
7134	7681	} else
..	..	@@ -7143,7 +7690,7 @@
7143	7690	//System.out.println("DELTA1 = " + delta);
7144	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7145	7692	//System.out.println("DELTA2 = " + delta);
7146		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7147	7694	LA.matCopy(startMat, toParent);
7148	7695	//System.out.println("DELTA3 = " + delta);
7149	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7153,8 +7700,8 @@
7153	7700	break;
7154	7701
7155	7702	case hitRotate: // rotate
7156		- int dx = info.x - centerPt.x;
7157		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7158	7705	double angle = (double) Math.atan2(dx, dy);
7159	7706	angle = -(1.570796 - angle);
7160	7707
..	..	@@ -7177,7 +7724,7 @@
7177	7724	}
7178	7725	/**/
7179	7726
7180		- switch (info.pane.RenderCamera().viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7181	7728	{
7182	7729	case 1: // '\001'
7183	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7204,26 +7751,30 @@
7204	7751	break;
7205	7752
7206	7753	case hitScale: // scale
7207		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7755	+ double sign = 1;
	7756	+ if (hScale < 0)
	7757	+ {
	7758	+ sign = -1;
	7759	+ }
	7760	+ hScale = signMath.pow(signhScale, scale * 50);
7208	7761	if (hScale < 0.01)
7209	7762	{
7210		- hScale = 0.01;
	7763	+ //hScale = 0.01;
7211	7764	}
7212		- hScale = Math.pow(hScale, scale * 50);
7213		- if (hScale < 0.01)
	7765	+
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7767	+ sign = 1;
	7768	+ if (vScale < 0)
7214	7769	{
7215		- hScale = 0.01;
	7770	+ sign = -1;
7216	7771	}
7217		- double vScale = (double) (info.y - centerPt.y) / 32;
	7772	+ vScale = signMath.pow(signvScale, scale * 50);
7218	7773	if (vScale < 0.01)
7219	7774	{
7220		- vScale = 0.01;
	7775	+ //vScale = 0.01;
7221	7776	}
7222		- vScale = Math.pow(vScale, scale * 50);
7223		- if (vScale < 0.01)
7224		- {
7225		- vScale = 0.01;
7226		- }
	7777	+
7227	7778	LA.matCopy(startMat, toParent);
7228	7779	/**/
7229	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7233,39 +7784,47 @@
7233	7784	}
7234	7785	/**/
7235	7786
7236		- switch (info.pane.RenderCamera().viewCode)
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7788	+
	7789	+ if (totalScale < 0.01)
	7790	+ {
	7791	+ totalScale = 0.01;
	7792	+ }
	7793	+
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7237	7795	{
7238	7796	case 3: // '\001'
7239		- if (modified)
	7797	+ if (modified \|\| opposite)
7240	7798	{
7241	7799	//LA.matScale(toParent, 1, hScale, vScale);
7242		- LA.matScale(toParent, vScale, 1, 1);
	7800	+ LA.matScale(toParent, totalScale, 1, 1);
7243	7801	} // vScale, 1);
7244	7802	else
7245	7803	{
7246		- LA.matScale(toParent, vScale, vScale, vScale);
	7804	+ // EXCEPTION!
	7805	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7247	7806	} // vScale, 1);
7248	7807	break;
7249	7808
7250	7809	case 2: // '\002'
7251		- if (modified)
	7810	+ if (modified \|\| opposite)
7252	7811	{
7253	7812	//LA.matScale(toParent, hScale, 1, vScale);
7254		- LA.matScale(toParent, 1, vScale, 1);
	7813	+ LA.matScale(toParent, 1, totalScale, 1);
7255	7814	} else
7256	7815	{
7257		- LA.matScale(toParent, vScale, 1, vScale);
	7816	+ LA.matScale(toParent, totalScale, 1, totalScale);
7258	7817	}
7259	7818	break;
7260	7819
7261	7820	case 1: // '\003'
7262		- if (modified)
	7821	+ if (modified \|\| opposite)
7263	7822	{
7264	7823	//LA.matScale(toParent, hScale, vScale, 1);
7265		- LA.matScale(toParent, 1, 1, vScale);
	7824	+ LA.matScale(toParent, 1, 1, totalScale);
7266	7825	} else
7267	7826	{
7268		- LA.matScale(toParent, vScale, vScale, 1);
	7827	+ LA.matScale(toParent, totalScale, totalScale, 1);
7269	7828	}
7270	7829	break;
7271	7830	}
..	..	@@ -7299,7 +7858,7 @@
7299	7858	} // NEW ...
7300	7859
7301	7860
7302		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7303	7862	}
7304	7863
7305	7864	boolean overflow = false;
..	..	@@ -7406,7 +7965,7 @@
7406	7965	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7407	7966	} else
7408	7967	{
7409		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7968	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7410	7969	} // + super.toString();
7411	7970	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7412	7971
..	..	@@ -7479,6 +8038,10 @@
7479	8038	editWindow = null;
7480	8039	} // ?
7481	8040	}
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
	8044	+ }
7482	8045	}
7483	8046
7484	8047	boolean root; // patch for edit windows
..	..	@@ -7490,7 +8053,7 @@
7490	8053	/transient/ cVector2[] projectedVertices = new cVector2[0];
7491	8054
7492	8055	Object3D /Composite/ parent;
7493		- Object3D /Composite/ fileparent;
	8056	+ Object3D /Composite/ fileparent; // In the case of FileObject
7494	8057
7495	8058	double[][] toParent; // dynamic matrix
7496	8059	double[][] fromParent;
..	..	@@ -7636,6 +8199,10 @@
7636	8199	}
7637	8200
7638	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
7639	8206	transient ObjectUI objectUI;
7640	8207	public static int povDepth = 0;
7641	8208	private static cVector tbMin = new cVector();
..	..	@@ -7654,9 +8221,9 @@
7654	8221	private static cVector edge2 = new cVector();
7655	8222	//private static cVector norm = new cVector();
7656	8223	/transient private/ int hitSomething;
7657		- private static final int hitCenter = 1;
7658		- private static final int hitScale = 2;
7659		- private static final int hitRotate = 3;
	8224	+ static final int hitCenter = 1;
	8225	+ static final int hitScale = 2;
	8226	+ static final int hitRotate = 3;
7660	8227	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7661	8228	/transient/ private Point centerPt;
7662	8229	/transient/ private int startX;