~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,27 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
22	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ Object3D versions[];
	36	+ int versionindex = -1;
	37	+
23	38	ScriptNode scriptnode;
24	39
25	40	void InitOthers()
..	..	@@ -100,64 +115,178 @@
100	115
101	116	// transient boolean reduced; // for morph reduction
102	117
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	120
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
108	123
109		-void SaveSupports()
110		-{
111		- if (blockloop)
112		- return;
113		-
114		- transientsupport = support;
115		- transientlink2master = link2master;
116		-
117		- support = null;
118		- link2master = false;
119		-
120		- if (bRep != null)
	124	+ void SaveSupports()
121	125	{
122		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
123	149	}
124		-
125		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
126	152	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
130	261	blockloop = true;
131		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
132	270	blockloop = false;
133	271	}
134		-}
135	272
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
140		-
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
	273	+ void RestoreBigData(Object3D o)
147	274	{
148		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
149	289	}
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
159		- }
160		-}
161	290
162	291	// MOCAP SUPPORT
163	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +429,8 @@
300	429	}
301	430
302	431	boolean live = false;
	432	+ transient boolean keepdontselect;
	433	+ boolean dontselect = false;
303	434	boolean hide = false;
304	435	boolean link2master = false; // performs reset support/master at each frame
305	436	boolean marked = false; // animation node
..	..	@@ -481,12 +612,14 @@
481	612	toParent = LA.newMatrix();
482	613	fromParent = LA.newMatrix();
483	614	}
	615	+
484	616	if (toParentMarked == null)
485	617	{
486	618	if (maxcount != 1)
487	619	{
488	620	new Exception().printStackTrace();
489	621	}
	622	+
490	623	toParentMarked = LA.newMatrix();
491	624	fromParentMarked = LA.newMatrix();
492	625	}
..	..	@@ -774,7 +907,7 @@
774	907	if (step == 0)
775	908	step = 1;
776	909	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
778	911	// if (acceleration == 0)
779	912	// acceleration = 10;
780	913	if (delay == 0) // serial
..	..	@@ -797,7 +930,7 @@
797	930
798	931	if (marked && Globals.isLIVE() && live &&
799	932	//TEMP21aug2018
800		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	934	currentframe != Globals.framecount)
802	935	{
803	936	currentframe = Globals.framecount;
..	..	@@ -809,7 +942,8 @@
809	942
810	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	944
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
813	947	{
814	948	countdown = 1;
815	949	delay = speedup?8:1;
..	..	@@ -881,6 +1015,10 @@
881	1015	if (material == null \|\| material.multiply)
882	1016	return true;
883	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.
884	1022	return material.opacity > 0.99;
885	1023	}
886	1024
..	..	@@ -1281,6 +1419,7 @@
1281	1419	toParent = LA.newMatrix();
1282	1420	fromParent = LA.newMatrix();
1283	1421	}
	1422	+
1284	1423	LA.matCopy(other.toParent, toParent);
1285	1424	LA.matCopy(other.fromParent, fromParent);
1286	1425
..	..	@@ -1834,12 +1973,15 @@
1834	1973	if (obj.name == null)
1835	1974	continue; // can't be a null one
1836	1975
	1976	+ // Try perfect match first.
1837	1977	if (n.equals(obj.name))
1838	1978	{
1839	1979	theobj = obj;
1840	1980	count++;
1841	1981	}
1842	1982	}
	1983	+
	1984	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1843	1985
1844	1986	if (count != 1)
1845	1987	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2441,10 @@
2299	2441	}
2300	2442	*/
2301	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2302	2448	}
2303	2449
2304	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2340,6 +2486,14 @@
2340	2486	{
2341	2487	editWindow.refreshContents();
2342	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2343	2497	//if (parent != null)
2344	2498	//parent.refreshEditWindow();
2345	2499	}
..	..	@@ -2419,7 +2573,8 @@
2419	2573	private static final int editSelf = 1;
2420	2574	private static final int editChild = 2;
2421	2575
2422		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2423	2578	{
2424	2579	if (level == 0)
2425	2580	{
..	..	@@ -2427,7 +2582,8 @@
2427	2582	return;
2428	2583
2429	2584	Object3D selectee;
2430		- 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))
2431	2587	{
2432	2588	selectee = (Object3D) e.nextElement();
2433	2589	}
..	..	@@ -2435,19 +2591,22 @@
2435	2591	} else
2436	2592	{
2437	2593	//super.
2438		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2439	2596	}
2440	2597	}
2441	2598
2442		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2443	2601	{
2444	2602	doSomething = 0;
2445	2603	if (level == 0)
2446	2604	{
2447		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2448	2606	}
2449	2607	if (//super.
2450		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2451	2610	{
2452	2611	doSomething = 1;
2453	2612	return true;
..	..	@@ -2457,7 +2616,7 @@
2457	2616	}
2458	2617	}
2459	2618
2460		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2461	2620	{
2462	2621	if (selection == null)
2463	2622	{
..	..	@@ -2470,7 +2629,8 @@
2470	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2471	2630	{
2472	2631	Object3D selectee = (Object3D) e.nextElement();
2473		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2474	2634	{
2475	2635	childToDrag = selectee;
2476	2636	doSomething = 2;
..	..	@@ -2482,13 +2642,15 @@
2482	2642	return retval;
2483	2643	}
2484	2644
2485		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2486	2647	{
2487	2648	switch (doSomething)
2488	2649	{
2489	2650	case 1: // '\001'
2490	2651	//super.
2491		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2492	2654	break;
2493	2655
2494	2656	case 2: // '\002'
..	..	@@ -2501,11 +2663,13 @@
2501	2663	{
2502	2664	//sel.hitSomething = childToDrag.hitSomething;
2503	2665	//childToDrag.doEditDrag(info);
2504		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2505	2668	} else
2506	2669	{
2507	2670	//super.
2508		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2509	2673	}
2510	2674	}
2511	2675	break;
..	..	@@ -2523,6 +2687,9 @@
2523	2687	{
2524	2688	deselectAll();
2525	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2526	2693	ClickInfo newInfo = new ClickInfo();
2527	2694	newInfo.flags = info.flags;
2528	2695	newInfo.bounds = info.bounds;
..	..	@@ -2615,6 +2782,18 @@
2615	2782	void GenNormalsS(boolean crease)
2616	2783	{
2617	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();
2618	2797	// for (int i=0; i<selection.size(); i++)
2619	2798	// {
2620	2799	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2755,6 +2934,24 @@
2755	2934	if (child == null)
2756	2935	continue;
2757	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();
2758	2955	// Children().release(i);
2759	2956	}
2760	2957	blockloop = false;
..	..	@@ -2927,11 +3124,20 @@
2927	3124	}
2928	3125	}
2929	3126
	3127	+ void GenNormalsMesh0()
	3128	+ {
	3129	+ if (bRep != null)
	3130	+ {
	3131	+ bRep.GenerateNormalsMesh();
	3132	+ Touch();
	3133	+ }
	3134	+ }
	3135	+
2930	3136	void GenNormalsMINE0()
2931	3137	{
2932	3138	if (bRep != null)
2933	3139	{
2934		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2935	3141	Touch();
2936	3142	}
2937	3143	}
..	..	@@ -3002,8 +3208,10 @@
3002	3208	v.fromParent = LA.newMatrix();
3003	3209	}
3004	3210
3005		- LA.matConcat(v.toParent, toParent, v.toParent);
3006		- LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3211	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3212	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3213	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3214	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3007	3215	}
3008	3216
3009	3217	toParent = null; // LA.matIdentity(toParent);
..	..	@@ -3236,7 +3444,9 @@
3236	3444	bRep.support = null;
3237	3445	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3238	3446	// bRep.SplitInTwo(onlyone); // thread...
3239		- temprep.SplitInTwo(reduction34, onlyone);
	3447	+
	3448	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3449	+
3240	3450	bRep = temprep;
3241	3451	bRep.support = sup;
3242	3452	Touch();
..	..	@@ -3373,7 +3583,8 @@
3373	3583	if (blockloop)
3374	3584	return;
3375	3585
3376		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3377	3588	live = h;
3378	3589
3379	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3394,7 +3605,8 @@
3394	3605	return;
3395	3606
3396	3607	//if (bRep != null)
3397		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3398	3610	link2master = h;
3399	3611
3400	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,7 +3626,8 @@
3414	3626	if (blockloop)
3415	3627	return;
3416	3628
3417		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3418	3631	hide = h;
3419	3632
3420	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3434,7 +3647,7 @@
3434	3647	if (blockloop)
3435	3648	return;
3436	3649
3437		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3438	3651	marked = h;
3439	3652
3440	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3444,6 +3657,46 @@
3444	3657	continue;
3445	3658	blockloop = true;
3446	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);
3447	3700	blockloop = false;
3448	3701	// release(i);
3449	3702	}
..	..	@@ -4221,6 +4474,55 @@
4221	4474	}
4222	4475	}
4223	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	+
4224	4526	void RepairTexture()
4225	4527	{
4226	4528	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4711,7 +5013,7 @@
4711	5013
4712	5014	cTreePath SelectLeaf(int indexcount, boolean deselect)
4713	5015	{
4714		- if (hide)
	5016	+ if (hide \|\| dontselect)
4715	5017	return null;
4716	5018
4717	5019	if (count <= 0)
..	..	@@ -4735,9 +5037,17 @@
4735	5037	}
4736	5038	}
4737	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4738	5048	cTreePath Select(int indexcount, boolean deselect)
4739	5049	{
4740		- if (hide)
	5050	+ if (hide \|\| dontselect)
4741	5051	return null;
4742	5052
4743	5053	if (count <= 0)
..	..	@@ -4771,10 +5081,11 @@
4771	5081	if (leaf != null)
4772	5082	{
4773	5083	cTreePath tp = new cTreePath(this, leaf);
4774		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4775	5086	{
4776	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4777		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4778	5089	}
4779	5090
4780	5091	return tp;
..	..	@@ -4791,6 +5102,7 @@
4791	5102
4792	5103	if (child == null)
4793	5104	continue;
	5105	+
4794	5106	if (child.HasTransparency() && child.size() != 0)
4795	5107	{
4796	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4800,9 +5112,10 @@
4800	5112	if (leaf != null)
4801	5113	{
4802	5114	cTreePath tp = new cTreePath(this, leaf);
4803		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4804	5117	{
4805		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4806	5119	}
4807	5120
4808	5121	return tp;
..	..	@@ -5127,6 +5440,51 @@
5127	5440	blockloop = false;
5128	5441	}
5129	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	+
5130	5488	boolean IsSelected()
5131	5489	{
5132	5490	if (parent == null)
..	..	@@ -5363,6 +5721,43 @@
5363	5721	}
5364	5722	}
5365	5723
	5724	+ UUID GetUUID()
	5725	+ {
	5726	+ if (uuid == null)
	5727	+ {
	5728	+ // Serial
	5729	+ uuid = UUID.randomUUID();
	5730	+ }
	5731	+
	5732	+ return uuid;
	5733	+ }
	5734	+
	5735	+ Object3D GetObject(UUID uid)
	5736	+ {
	5737	+ if (blockloop)
	5738	+ return null;
	5739	+
	5740	+ if (GetUUID().equals(uid))
	5741	+ return this;
	5742	+
	5743	+ int nb = Size();
	5744	+ for (int i = 0; i < nb; i++)
	5745	+ {
	5746	+ Object3D child = (Object3D) get(i);
	5747	+
	5748	+ if (child == null)
	5749	+ continue;
	5750	+
	5751	+ blockloop = true;
	5752	+ Object3D obj = child.GetObject(uid);
	5753	+ blockloop = false;
	5754	+ if (obj != null)
	5755	+ return obj;
	5756	+ }
	5757	+
	5758	+ return null;
	5759	+ }
	5760	+
5366	5761	void SetBumpTexture(String tex)
5367	5762	{
5368	5763	if (GetTextures() == null)
..	..	@@ -5399,6 +5794,38 @@
5399	5794	}
5400	5795	}
5401	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	+
5402	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5403	5830	{
5404	5831	Draw(display, root, selected, blocked);
..	..	@@ -5407,12 +5834,23 @@
5407	5834	boolean NeedSupport()
5408	5835	{
5409	5836	return
5410		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5837	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5411	5838	// PROBLEM with CROWD!!
5412	5839	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5413	5840	}
5414	5841
5415	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	+ }
5416	5854
5417	5855	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5418	5856	{
..	..	@@ -5424,7 +5862,7 @@
5424	5862	}
5425	5863
5426	5864	if (display.DrawMode() == iCameraPane.SELECTION &&
5427		- hide)
	5865	+ (hide \|\| dontselect))
5428	5866	return;
5429	5867
5430	5868	if (name != null && name.contains("sclera"))
..	..	@@ -5474,8 +5912,10 @@
5474	5912	if (support != null)
5475	5913	support = support;
5476	5914
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);
	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.
5479	5919
5480	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5481	5921	{
..	..	@@ -5485,8 +5925,9 @@
5485	5925	// usecalllists &= !(parent instanceof RandomNode);
5486	5926	// usecalllists = false;
5487	5927
5488		- if (GetBRep() != null)
5489		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5490	5931	//System.out.println("draw " + this);
5491	5932	//new Exception().printStackTrace();
5492	5933
..	..	@@ -5495,10 +5936,12 @@
5495	5936	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5496	5937
5497	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5498		- (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)))
5499	5941	{
5500	5942	Globals.lighttouched = true;
5501	5943	} // all panes...
	5944	+
5502	5945	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5503	5946	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5504	5947	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5506,7 +5949,7 @@
5506	5949	if (!(this instanceof Composite))
5507	5950	touched = false;
5508	5951	//if (displaylist == -1 && usecalllists)
5509		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5510	5953	{
5511	5954	bRep.displaylist = display.GenList();
5512	5955	assert(bRep.displaylist != 0);
..	..	@@ -5517,7 +5960,7 @@
5517	5960
5518	5961	//System.out.println("\tnew list " + list);
5519	5962	//gl.glDrawBuffer(gl.GL_NONE);
5520		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5521	5964	{
5522	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5523	5966	display.NewList(bRep.displaylist);
..	..	@@ -5526,7 +5969,7 @@
5526	5969	CallList(display, root, selected, blocked);
5527	5970
5528	5971	// compiled = true;
5529		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5530	5973	{
5531	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5532	5975	display.EndList();
..	..	@@ -5626,6 +6069,7 @@
5626	6069	if (GetBRep() != null)
5627	6070	{
5628	6071	display.NextIndex();
	6072	+
5629	6073	// vertex color conflict : gl.glCallList(list);
5630	6074	DrawNode(display, root, selected);
5631	6075	if (this instanceof BezierPatch)
..	..	@@ -5666,7 +6110,28 @@
5666	6110	tex = GetTextures();
5667	6111	}
5668	6112
5669		- display.BindTextures(tex, texres);
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
	6115	+
	6116	+ try
	6117	+ {
	6118	+ display.BindPigmentTexture(tex, texres);
	6119	+ }
	6120	+ catch (Exception e)
	6121	+ {
	6122	+ System.err.println("FAILED: " + this);
	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;
	6134	+ }
5670	6135
5671	6136	if (!compiled)
5672	6137	{
..	..	@@ -5688,7 +6153,11 @@
5688	6153	}
5689	6154	}
5690	6155
5691		- display.ReleaseTextures(tex);
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
5692	6161
5693	6162	display.PopMaterial(this, selected);
5694	6163	}
..	..	@@ -5817,6 +6286,9 @@
5817	6286
5818	6287	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5819	6288	{
	6289	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6290	+ return;
	6291	+
5820	6292	if (hide)
5821	6293	return;
5822	6294	// shadow optimisation
..	..	@@ -5942,6 +6414,9 @@
5942	6414	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5943	6415	return; // no shadow for transparent objects
5944	6416
	6417	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6418	+ return;
	6419	+
5945	6420	if (hide)
5946	6421	return;
5947	6422
..	..	@@ -6055,6 +6530,11 @@
6055	6530	// dec 2012
6056	6531	new Exception().printStackTrace();
6057	6532	return;
	6533	+ }
	6534	+
	6535	+ if (dontselect)
	6536	+ {
	6537	+ //bRep.GenerateNormalsMINE();
6058	6538	}
6059	6539
6060	6540	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6840,20 +7320,23 @@
6840	7320	}
6841	7321	}
6842	7322
6843		- 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)
6844	7327	{
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;
	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;
6848	7331	if (toscreen == null)
6849	7332	{
6850		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6851	7334	}
6852	7335	cVector vec = in;
6853	7336	LA.xformPos(in, toscreen, in);
6854	7337	//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();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6857	7340	outPt.x = hc + (int) vec.x;
6858	7341	outPt.y = vc - (int) vec.y;
6859	7342	outRec.x = outPt.x - 3;
..	..	@@ -6861,15 +7344,18 @@
6861	7344	outRec.width = outRec.height = 6;
6862	7345	}
6863	7346
6864		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
6865	7349	{
6866	7350	Point pt = new Point(0, 0);
6867	7351	Rectangle rec = new Rectangle();
6868		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
6869	7354	return rec;
6870	7355	}
6871	7356
6872		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
6873	7359	{
6874	7360	if (level == 0)
6875	7361	{
..	..	@@ -6878,16 +7364,19 @@
6878	7364	{
6879	7365	cVector origin = new cVector();
6880	7366	//LA.xformPos(origin, toParent, origin);
6881		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6882	7371	Rectangle boundary = new Rectangle();
6883	7372	boundary.x = spot.x - 30;
6884	7373	boundary.y = spot.y - 30;
6885	7374	boundary.width = spot.width + 60;
6886	7375	boundary.height = spot.height + 60;
6887		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
6888	7377	int spotw = spot.x + spot.width;
6889	7378	int spoth = spot.y + spot.height;
6890		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6891	7380	// if (CameraPane.Xmin > spot.x)
6892	7381	// {
6893	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -6907,8 +7396,8 @@
6907	7396	spot.translate(32, 32);
6908	7397	spotw = spot.x + spot.width;
6909	7398	spoth = spot.y + spot.height;
6910		- info.g.setColor(Color.blue);
6911		- 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);
6912	7401	// if (CameraPane.Xmin > spot.x)
6913	7402	// {
6914	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -6925,11 +7414,12 @@
6925	7414	// {
6926	7415	// CameraPane.Ymax = spoth;
6927	7416	// }
6928		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6929		- 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
6930	7419	spot.translate(0, -32);
6931		- info.g.setColor(Color.green);
6932		- 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);
6933	7423	// if (CameraPane.Xmin > spot.x)
6934	7424	// {
6935	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -6946,8 +7436,8 @@
6946	7436	// {
6947	7437	// CameraPane.Ymax = spoth;
6948	7438	// }
6949		- info.g.drawArc(boundary.x, boundary.y,
6950		- 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);
6951	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6952	7442	// if (CameraPane.Xmin > boundary.x)
6953	7443	// {
..	..	@@ -6969,7 +7459,8 @@
6969	7459	}
6970	7460	}
6971	7461
6972		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
6973	7464	{
6974	7465	if (level == 0)
6975	7466	{
..	..	@@ -6978,10 +7469,10 @@
6978	7469
6979	7470	boolean retval = false;
6980	7471
6981		- startX = info.x;
6982		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
6983	7474
6984		- hitSomething = 0;
	7475	+ hitSomething = -1;
6985	7476	cVector origin = new cVector();
6986	7477	//LA.xformPos(origin, toParent, origin);
6987	7478	Rectangle spot = new Rectangle();
..	..	@@ -6989,22 +7480,51 @@
6989	7480	{
6990	7481	centerPt = new Point(0, 0);
6991	7482	}
6992		- calcHotSpot(origin, info, centerPt, spot);
6993		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
6994	7486	{
6995	7487	hitSomething = hitCenter;
6996	7488	retval = true;
6997	7489	}
6998	7490	spot.translate(32, 0);
6999		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7000	7492	{
7001	7493	hitSomething = hitRotate;
7002	7494	retval = true;
7003	7495	}
7004	7496	spot.translate(0, 32);
7005		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7006	7498	{
7007	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	+
7008	7528	retval = true;
7009	7529	}
7010	7530
..	..	@@ -7014,7 +7534,7 @@
7014	7534	}
7015	7535
7016	7536	//System.out.println("info.modifiers = " + info.modifiers);
7017		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7018	7538	//System.out.println("modified = " + modified);
7019	7539	//new Exception().printStackTrace();
7020	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7042,7 +7562,8 @@
7042	7562	return true;
7043	7563	}
7044	7564
7045		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7046	7567	{
7047	7568	if (hitSomething == 0)
7048	7569	{
..	..	@@ -7056,7 +7577,8 @@
7056	7577
7057	7578	//System.out.println("hitSomething = " + hitSomething);
7058	7579
7059		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
	7581	+
7060	7582	cVector xlate = new cVector();
7061	7583	//cVector xlate2 = new cVector();
7062	7584	switch (hitSomething)
..	..	@@ -7089,8 +7611,8 @@
7089	7611	toParent[3][i] = xlate.get(i);
7090	7612	LA.matInvert(toParent, fromParent);
7091	7613	*/
7092		- cVector delta = LA.newVector(0, 0, startY - info.y);
7093		- 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);
7094	7616
7095	7617	LA.matCopy(startMat, toParent);
7096	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7099,7 +7621,7 @@
7099	7621	} else
7100	7622	{
7101	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7102		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7103	7625	cVector away = new cVector();
7104	7626	//cVector right2 = new cVector();
7105	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7116,19 +7638,19 @@
7116	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7117	7639	// if (!CameraPane.LOCALTRANSFORM)
7118	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7119		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7120	7642	// if (!CameraPane.LOCALTRANSFORM)
7121	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7122	7644	//LA.vecCross(up, cVector.Z, right2);
7123	7645
7124		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7125	7647
7126	7648	//System.out.println("DELTA0 = " + delta);
7127	7649	//System.out.println("AWAY = " + info.camera.away);
7128	7650	//System.out.println("UP = " + info.camera.up);
7129	7651	if (away.z > 0)
7130	7652	{
7131		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7132	7654	{
7133	7655	delta.x = -delta.x;
7134	7656	} else
..	..	@@ -7143,7 +7665,7 @@
7143	7665	//System.out.println("DELTA1 = " + delta);
7144	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7145	7667	//System.out.println("DELTA2 = " + delta);
7146		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7147	7669	LA.matCopy(startMat, toParent);
7148	7670	//System.out.println("DELTA3 = " + delta);
7149	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7153,8 +7675,8 @@
7153	7675	break;
7154	7676
7155	7677	case hitRotate: // rotate
7156		- int dx = info.x - centerPt.x;
7157		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7158	7680	double angle = (double) Math.atan2(dx, dy);
7159	7681	angle = -(1.570796 - angle);
7160	7682
..	..	@@ -7177,7 +7699,7 @@
7177	7699	}
7178	7700	/**/
7179	7701
7180		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7181	7703	{
7182	7704	case 1: // '\001'
7183	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7204,26 +7726,30 @@
7204	7726	break;
7205	7727
7206	7728	case hitScale: // scale
7207		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7730	+ double sign = 1;
	7731	+ if (hScale < 0)
	7732	+ {
	7733	+ sign = -1;
	7734	+ }
	7735	+ hScale = signMath.pow(signhScale, scale * 50);
7208	7736	if (hScale < 0.01)
7209	7737	{
7210		- hScale = 0.01;
	7738	+ //hScale = 0.01;
7211	7739	}
7212		- hScale = Math.pow(hScale, scale * 50);
7213		- if (hScale < 0.01)
	7740	+
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7742	+ sign = 1;
	7743	+ if (vScale < 0)
7214	7744	{
7215		- hScale = 0.01;
	7745	+ sign = -1;
7216	7746	}
7217		- double vScale = (double) (info.y - centerPt.y) / 32;
	7747	+ vScale = signMath.pow(signvScale, scale * 50);
7218	7748	if (vScale < 0.01)
7219	7749	{
7220		- vScale = 0.01;
	7750	+ //vScale = 0.01;
7221	7751	}
7222		- vScale = Math.pow(vScale, scale * 50);
7223		- if (vScale < 0.01)
7224		- {
7225		- vScale = 0.01;
7226		- }
	7752	+
7227	7753	LA.matCopy(startMat, toParent);
7228	7754	/**/
7229	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7233,39 +7759,47 @@
7233	7759	}
7234	7760	/**/
7235	7761
7236		- switch (info.pane.RenderCamera().viewCode)
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7763	+
	7764	+ if (totalScale < 0.01)
	7765	+ {
	7766	+ totalScale = 0.01;
	7767	+ }
	7768	+
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7237	7770	{
7238	7771	case 3: // '\001'
7239		- if (modified)
	7772	+ if (modified \|\| opposite)
7240	7773	{
7241	7774	//LA.matScale(toParent, 1, hScale, vScale);
7242		- LA.matScale(toParent, vScale, 1, 1);
	7775	+ LA.matScale(toParent, totalScale, 1, 1);
7243	7776	} // vScale, 1);
7244	7777	else
7245	7778	{
7246		- LA.matScale(toParent, vScale, vScale, vScale);
	7779	+ // EXCEPTION!
	7780	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7247	7781	} // vScale, 1);
7248	7782	break;
7249	7783
7250	7784	case 2: // '\002'
7251		- if (modified)
	7785	+ if (modified \|\| opposite)
7252	7786	{
7253	7787	//LA.matScale(toParent, hScale, 1, vScale);
7254		- LA.matScale(toParent, 1, vScale, 1);
	7788	+ LA.matScale(toParent, 1, totalScale, 1);
7255	7789	} else
7256	7790	{
7257		- LA.matScale(toParent, vScale, 1, vScale);
	7791	+ LA.matScale(toParent, totalScale, 1, totalScale);
7258	7792	}
7259	7793	break;
7260	7794
7261	7795	case 1: // '\003'
7262		- if (modified)
	7796	+ if (modified \|\| opposite)
7263	7797	{
7264	7798	//LA.matScale(toParent, hScale, vScale, 1);
7265		- LA.matScale(toParent, 1, 1, vScale);
	7799	+ LA.matScale(toParent, 1, 1, totalScale);
7266	7800	} else
7267	7801	{
7268		- LA.matScale(toParent, vScale, vScale, 1);
	7802	+ LA.matScale(toParent, totalScale, totalScale, 1);
7269	7803	}
7270	7804	break;
7271	7805	}
..	..	@@ -7299,7 +7833,7 @@
7299	7833	} // NEW ...
7300	7834
7301	7835
7302		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7303	7837	}
7304	7838
7305	7839	boolean overflow = false;
..	..	@@ -7406,7 +7940,7 @@
7406	7940	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7407	7941	} else
7408	7942	{
7409		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7943	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7410	7944	} // + super.toString();
7411	7945	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7412	7946
..	..	@@ -7479,6 +8013,10 @@
7479	8013	editWindow = null;
7480	8014	} // ?
7481	8015	}
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
	8019	+ }
7482	8020	}
7483	8021
7484	8022	boolean root; // patch for edit windows
..	..	@@ -7490,7 +8028,7 @@
7490	8028	/transient/ cVector2[] projectedVertices = new cVector2[0];
7491	8029
7492	8030	Object3D /Composite/ parent;
7493		- Object3D /Composite/ fileparent;
	8031	+ Object3D /Composite/ fileparent; // In the case of FileObject
7494	8032
7495	8033	double[][] toParent; // dynamic matrix
7496	8034	double[][] fromParent;
..	..	@@ -7636,6 +8174,10 @@
7636	8174	}
7637	8175
7638	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7639	8181	transient ObjectUI objectUI;
7640	8182	public static int povDepth = 0;
7641	8183	private static cVector tbMin = new cVector();
..	..	@@ -7654,9 +8196,9 @@
7654	8196	private static cVector edge2 = new cVector();
7655	8197	//private static cVector norm = new cVector();
7656	8198	/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;
	8199	+ static final int hitCenter = 1;
	8200	+ static final int hitScale = 2;
	8201	+ static final int hitRotate = 3;
7660	8202	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7661	8203	/transient/ private Point centerPt;
7662	8204	/transient/ private int startX;