~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	+ byte[] 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,7 @@
881	1015	if (material == null \|\| material.multiply)
882	1016	return true;
883	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
884	1019	return material.opacity > 0.99;
885	1020	}
886	1021
..	..	@@ -1281,6 +1416,7 @@
1281	1416	toParent = LA.newMatrix();
1282	1417	fromParent = LA.newMatrix();
1283	1418	}
	1419	+
1284	1420	LA.matCopy(other.toParent, toParent);
1285	1421	LA.matCopy(other.fromParent, fromParent);
1286	1422
..	..	@@ -1834,12 +1970,15 @@
1834	1970	if (obj.name == null)
1835	1971	continue; // can't be a null one
1836	1972
	1973	+ // Try perfect match first.
1837	1974	if (n.equals(obj.name))
1838	1975	{
1839	1976	theobj = obj;
1840	1977	count++;
1841	1978	}
1842	1979	}
	1980	+
	1981	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1843	1982
1844	1983	if (count != 1)
1845	1984	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2438,10 @@
2299	2438	}
2300	2439	*/
2301	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2302	2445	}
2303	2446
2304	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2340,6 +2483,14 @@
2340	2483	{
2341	2484	editWindow.refreshContents();
2342	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2343	2494	//if (parent != null)
2344	2495	//parent.refreshEditWindow();
2345	2496	}
..	..	@@ -2419,7 +2570,8 @@
2419	2570	private static final int editSelf = 1;
2420	2571	private static final int editChild = 2;
2421	2572
2422		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2423	2575	{
2424	2576	if (level == 0)
2425	2577	{
..	..	@@ -2427,7 +2579,8 @@
2427	2579	return;
2428	2580
2429	2581	Object3D selectee;
2430		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2431	2584	{
2432	2585	selectee = (Object3D) e.nextElement();
2433	2586	}
..	..	@@ -2435,19 +2588,22 @@
2435	2588	} else
2436	2589	{
2437	2590	//super.
2438		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2439	2593	}
2440	2594	}
2441	2595
2442		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2443	2598	{
2444	2599	doSomething = 0;
2445	2600	if (level == 0)
2446	2601	{
2447		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2448	2603	}
2449	2604	if (//super.
2450		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2451	2607	{
2452	2608	doSomething = 1;
2453	2609	return true;
..	..	@@ -2457,7 +2613,7 @@
2457	2613	}
2458	2614	}
2459	2615
2460		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2461	2617	{
2462	2618	if (selection == null)
2463	2619	{
..	..	@@ -2470,7 +2626,8 @@
2470	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2471	2627	{
2472	2628	Object3D selectee = (Object3D) e.nextElement();
2473		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2474	2631	{
2475	2632	childToDrag = selectee;
2476	2633	doSomething = 2;
..	..	@@ -2482,13 +2639,15 @@
2482	2639	return retval;
2483	2640	}
2484	2641
2485		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2486	2644	{
2487	2645	switch (doSomething)
2488	2646	{
2489	2647	case 1: // '\001'
2490	2648	//super.
2491		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2492	2651	break;
2493	2652
2494	2653	case 2: // '\002'
..	..	@@ -2501,11 +2660,13 @@
2501	2660	{
2502	2661	//sel.hitSomething = childToDrag.hitSomething;
2503	2662	//childToDrag.doEditDrag(info);
2504		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2505	2665	} else
2506	2666	{
2507	2667	//super.
2508		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2509	2670	}
2510	2671	}
2511	2672	break;
..	..	@@ -2523,6 +2684,9 @@
2523	2684	{
2524	2685	deselectAll();
2525	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2526	2690	ClickInfo newInfo = new ClickInfo();
2527	2691	newInfo.flags = info.flags;
2528	2692	newInfo.bounds = info.bounds;
..	..	@@ -2615,6 +2779,18 @@
2615	2779	void GenNormalsS(boolean crease)
2616	2780	{
2617	2781	selection.GenNormals(crease);
	2782	+// for (int i=0; i<selection.size(); i++)
	2783	+// {
	2784	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2785	+// selectee.GenNormals(crease);
	2786	+// }
	2787	+
	2788	+ //Touch();
	2789	+ }
	2790	+
	2791	+ void GenNormalsMeshS()
	2792	+ {
	2793	+ selection.GenNormalsMesh();
2618	2794	// for (int i=0; i<selection.size(); i++)
2619	2795	// {
2620	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2755,6 +2931,24 @@
2755	2931	if (child == null)
2756	2932	continue;
2757	2933	child.GenNormals(crease);
	2934	+// Children().release(i);
	2935	+ }
	2936	+ blockloop = false;
	2937	+ }
	2938	+
	2939	+ void GenNormalsMesh()
	2940	+ {
	2941	+ if (blockloop)
	2942	+ return;
	2943	+
	2944	+ blockloop = true;
	2945	+ GenNormalsMesh0();
	2946	+ for (int i = 0; i < Children().Size(); i++)
	2947	+ {
	2948	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2949	+ if (child == null)
	2950	+ continue;
	2951	+ child.GenNormalsMesh();
2758	2952	// Children().release(i);
2759	2953	}
2760	2954	blockloop = false;
..	..	@@ -2927,11 +3121,20 @@
2927	3121	}
2928	3122	}
2929	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2930	3133	void GenNormalsMINE0()
2931	3134	{
2932	3135	if (bRep != null)
2933	3136	{
2934		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2935	3138	Touch();
2936	3139	}
2937	3140	}
..	..	@@ -3002,8 +3205,10 @@
3002	3205	v.fromParent = LA.newMatrix();
3003	3206	}
3004	3207
3005		- LA.matConcat(v.toParent, toParent, v.toParent);
3006		- LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3208	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3209	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3210	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3211	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3007	3212	}
3008	3213
3009	3214	toParent = null; // LA.matIdentity(toParent);
..	..	@@ -3236,7 +3441,9 @@
3236	3441	bRep.support = null;
3237	3442	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3238	3443	// bRep.SplitInTwo(onlyone); // thread...
3239		- temprep.SplitInTwo(reduction34, onlyone);
	3444	+
	3445	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3446	+
3240	3447	bRep = temprep;
3241	3448	bRep.support = sup;
3242	3449	Touch();
..	..	@@ -3373,7 +3580,8 @@
3373	3580	if (blockloop)
3374	3581	return;
3375	3582
3376		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3377	3585	live = h;
3378	3586
3379	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3394,7 +3602,8 @@
3394	3602	return;
3395	3603
3396	3604	//if (bRep != null)
3397		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3398	3607	link2master = h;
3399	3608
3400	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,7 +3623,8 @@
3414	3623	if (blockloop)
3415	3624	return;
3416	3625
3417		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3418	3628	hide = h;
3419	3629
3420	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3434,7 +3644,7 @@
3434	3644	if (blockloop)
3435	3645	return;
3436	3646
3437		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3438	3648	marked = h;
3439	3649
3440	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3444,6 +3654,46 @@
3444	3654	continue;
3445	3655	blockloop = true;
3446	3656	child.MarkLeaves(h);
	3657	+ blockloop = false;
	3658	+ // release(i);
	3659	+ }
	3660	+ }
	3661	+
	3662	+ void RewindLeaves(boolean h)
	3663	+ {
	3664	+ if (blockloop)
	3665	+ return;
	3666	+
	3667	+ if (bRep != null \|\| material != null) // borderline...
	3668	+ rewind = h;
	3669	+
	3670	+ for (int i = 0; i < Size(); i++)
	3671	+ {
	3672	+ Object3D child = (Object3D) get(i); // reserve(i);
	3673	+ if (child == null)
	3674	+ continue;
	3675	+ blockloop = true;
	3676	+ child.RewindLeaves(h);
	3677	+ blockloop = false;
	3678	+ // release(i);
	3679	+ }
	3680	+ }
	3681	+
	3682	+ void RandomLeaves(boolean h)
	3683	+ {
	3684	+ if (blockloop)
	3685	+ return;
	3686	+
	3687	+ if (bRep != null \|\| material != null) // borderline...
	3688	+ random = h;
	3689	+
	3690	+ for (int i = 0; i < Size(); i++)
	3691	+ {
	3692	+ Object3D child = (Object3D) get(i); // reserve(i);
	3693	+ if (child == null)
	3694	+ continue;
	3695	+ blockloop = true;
	3696	+ child.RandomLeaves(h);
3447	3697	blockloop = false;
3448	3698	// release(i);
3449	3699	}
..	..	@@ -4221,6 +4471,55 @@
4221	4471	}
4222	4472	}
4223	4473
	4474	+ void RepairSOV()
	4475	+ {
	4476	+ if (blockloop)
	4477	+ return;
	4478	+
	4479	+ String texname = this.GetPigmentTexture();
	4480	+
	4481	+ if (texname.startsWith("sov"))
	4482	+ {
	4483	+ String[] s = texname.split("/");
	4484	+
	4485	+ String[] sname = s[1].split("Color.pn");
	4486	+
	4487	+ texname = sname[0];
	4488	+
	4489	+ if (sname.length > 1)
	4490	+ {
	4491	+ texname += "Color.jpg";
	4492	+ }
	4493	+
	4494	+ this.SetPigmentTexture("sov/" + texname);
	4495	+ }
	4496	+
	4497	+ texname = this.GetBumpTexture();
	4498	+
	4499	+ if (texname.startsWith("sov"))
	4500	+ {
	4501	+ String[] s = texname.split("/");
	4502	+
	4503	+ String[] sname = s[1].split("Bump.pn");
	4504	+
	4505	+ texname = sname[0];
	4506	+
	4507	+ if (sname.length > 1)
	4508	+ {
	4509	+ texname += "Bump.jpg";
	4510	+ }
	4511	+
	4512	+ this.SetBumpTexture("sov/" + texname);
	4513	+ }
	4514	+
	4515	+ for (int i=0; i<Size(); i++)
	4516	+ {
	4517	+ blockloop = true;
	4518	+ get(i).RepairSOV();
	4519	+ blockloop = false;
	4520	+ }
	4521	+ }
	4522	+
4224	4523	void RepairTexture()
4225	4524	{
4226	4525	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4711,7 +5010,7 @@
4711	5010
4712	5011	cTreePath SelectLeaf(int indexcount, boolean deselect)
4713	5012	{
4714		- if (hide)
	5013	+ if (hide \|\| dontselect)
4715	5014	return null;
4716	5015
4717	5016	if (count <= 0)
..	..	@@ -4735,9 +5034,17 @@
4735	5034	}
4736	5035	}
4737	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4738	5045	cTreePath Select(int indexcount, boolean deselect)
4739	5046	{
4740		- if (hide)
	5047	+ if (hide \|\| dontselect)
4741	5048	return null;
4742	5049
4743	5050	if (count <= 0)
..	..	@@ -4771,10 +5078,11 @@
4771	5078	if (leaf != null)
4772	5079	{
4773	5080	cTreePath tp = new cTreePath(this, leaf);
4774		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4775	5083	{
4776	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4777		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4778	5086	}
4779	5087
4780	5088	return tp;
..	..	@@ -4791,6 +5099,7 @@
4791	5099
4792	5100	if (child == null)
4793	5101	continue;
	5102	+
4794	5103	if (child.HasTransparency() && child.size() != 0)
4795	5104	{
4796	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4800,9 +5109,10 @@
4800	5109	if (leaf != null)
4801	5110	{
4802	5111	cTreePath tp = new cTreePath(this, leaf);
4803		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4804	5114	{
4805		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4806	5116	}
4807	5117
4808	5118	return tp;
..	..	@@ -5127,6 +5437,51 @@
5127	5437	blockloop = false;
5128	5438	}
5129	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5130	5485	boolean IsSelected()
5131	5486	{
5132	5487	if (parent == null)
..	..	@@ -5363,6 +5718,43 @@
5363	5718	}
5364	5719	}
5365	5720
	5721	+ UUID GetUUID()
	5722	+ {
	5723	+ if (uuid == null)
	5724	+ {
	5725	+ // Serial
	5726	+ uuid = UUID.randomUUID();
	5727	+ }
	5728	+
	5729	+ return uuid;
	5730	+ }
	5731	+
	5732	+ Object3D GetObject(UUID uid)
	5733	+ {
	5734	+ if (blockloop)
	5735	+ return null;
	5736	+
	5737	+ if (GetUUID().equals(uid))
	5738	+ return this;
	5739	+
	5740	+ int nb = Size();
	5741	+ for (int i = 0; i < nb; i++)
	5742	+ {
	5743	+ Object3D child = (Object3D) get(i);
	5744	+
	5745	+ if (child == null)
	5746	+ continue;
	5747	+
	5748	+ blockloop = true;
	5749	+ Object3D obj = child.GetObject(uid);
	5750	+ blockloop = false;
	5751	+ if (obj != null)
	5752	+ return obj;
	5753	+ }
	5754	+
	5755	+ return null;
	5756	+ }
	5757	+
5366	5758	void SetBumpTexture(String tex)
5367	5759	{
5368	5760	if (GetTextures() == null)
..	..	@@ -5399,6 +5791,38 @@
5399	5791	}
5400	5792	}
5401	5793
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
5402	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5403	5827	{
5404	5828	Draw(display, root, selected, blocked);
..	..	@@ -5407,12 +5831,23 @@
5407	5831	boolean NeedSupport()
5408	5832	{
5409	5833	return
5410		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5411	5835	// PROBLEM with CROWD!!
5412	5836	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5413	5837	}
5414	5838
5415	5839	static boolean DEBUG_SELECTION = false;
	5840	+
	5841	+ boolean IsLive()
	5842	+ {
	5843	+ if (live)
	5844	+ return true;
	5845	+
	5846	+ if (parent == null)
	5847	+ return false;
	5848	+
	5849	+ return parent.IsLive();
	5850	+ }
5416	5851
5417	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5418	5853	{
..	..	@@ -5424,7 +5859,7 @@
5424	5859	}
5425	5860
5426	5861	if (display.DrawMode() == iCameraPane.SELECTION &&
5427		- hide)
	5862	+ (hide \|\| dontselect))
5428	5863	return;
5429	5864
5430	5865	if (name != null && name.contains("sclera"))
..	..	@@ -5475,7 +5910,7 @@
5475	5910	support = support;
5476	5911
5477	5912	//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);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5479	5914
5480	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5481	5916	{
..	..	@@ -5495,10 +5930,12 @@
5495	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5496	5931
5497	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5498		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5933	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5499	5935	{
5500	5936	Globals.lighttouched = true;
5501	5937	} // all panes...
	5938	+
5502	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5503	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5504	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5626,6 +6063,7 @@
5626	6063	if (GetBRep() != null)
5627	6064	{
5628	6065	display.NextIndex();
	6066	+
5629	6067	// vertex color conflict : gl.glCallList(list);
5630	6068	DrawNode(display, root, selected);
5631	6069	if (this instanceof BezierPatch)
..	..	@@ -5666,7 +6104,28 @@
5666	6104	tex = GetTextures();
5667	6105	}
5668	6106
5669		- display.BindTextures(tex, texres);
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
	6109	+
	6110	+ try
	6111	+ {
	6112	+ display.BindPigmentTexture(tex, texres);
	6113	+ }
	6114	+ catch (Exception e)
	6115	+ {
	6116	+ System.err.println("FAILED: " + this);
	6117	+ failedPigment = true;
	6118	+ }
	6119	+
	6120	+ try
	6121	+ {
	6122	+ display.BindBumpTexture(tex, texres);
	6123	+ }
	6124	+ catch (Exception e)
	6125	+ {
	6126	+ //System.err.println("FAILED: " + this);
	6127	+ failedBump = true;
	6128	+ }
5670	6129
5671	6130	if (!compiled)
5672	6131	{
..	..	@@ -5688,7 +6147,11 @@
5688	6147	}
5689	6148	}
5690	6149
5691		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5692	6155
5693	6156	display.PopMaterial(this, selected);
5694	6157	}
..	..	@@ -5817,6 +6280,9 @@
5817	6280
5818	6281	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5819	6282	{
	6283	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6284	+ return;
	6285	+
5820	6286	if (hide)
5821	6287	return;
5822	6288	// shadow optimisation
..	..	@@ -5942,6 +6408,9 @@
5942	6408	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5943	6409	return; // no shadow for transparent objects
5944	6410
	6411	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6412	+ return;
	6413	+
5945	6414	if (hide)
5946	6415	return;
5947	6416
..	..	@@ -6055,6 +6524,11 @@
6055	6524	// dec 2012
6056	6525	new Exception().printStackTrace();
6057	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6058	6532	}
6059	6533
6060	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6840,20 +7314,23 @@
6840	7314	}
6841	7315	}
6842	7316
6843		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
6844	7321	{
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;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
6848	7325	if (toscreen == null)
6849	7326	{
6850		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6851	7328	}
6852	7329	cVector vec = in;
6853	7330	LA.xformPos(in, toscreen, in);
6854	7331	//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();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6857	7334	outPt.x = hc + (int) vec.x;
6858	7335	outPt.y = vc - (int) vec.y;
6859	7336	outRec.x = outPt.x - 3;
..	..	@@ -6861,15 +7338,18 @@
6861	7338	outRec.width = outRec.height = 6;
6862	7339	}
6863	7340
6864		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6865	7343	{
6866	7344	Point pt = new Point(0, 0);
6867	7345	Rectangle rec = new Rectangle();
6868		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6869	7348	return rec;
6870	7349	}
6871	7350
6872		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
6873	7353	{
6874	7354	if (level == 0)
6875	7355	{
..	..	@@ -6878,16 +7358,19 @@
6878	7358	{
6879	7359	cVector origin = new cVector();
6880	7360	//LA.xformPos(origin, toParent, origin);
6881		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6882	7365	Rectangle boundary = new Rectangle();
6883	7366	boundary.x = spot.x - 30;
6884	7367	boundary.y = spot.y - 30;
6885	7368	boundary.width = spot.width + 60;
6886	7369	boundary.height = spot.height + 60;
6887		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
6888	7371	int spotw = spot.x + spot.width;
6889	7372	int spoth = spot.y + spot.height;
6890		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6891	7374	// if (CameraPane.Xmin > spot.x)
6892	7375	// {
6893	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -6907,8 +7390,8 @@
6907	7390	spot.translate(32, 32);
6908	7391	spotw = spot.x + spot.width;
6909	7392	spoth = spot.y + spot.height;
6910		- info.g.setColor(Color.blue);
6911		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6912	7395	// if (CameraPane.Xmin > spot.x)
6913	7396	// {
6914	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -6925,11 +7408,12 @@
6925	7408	// {
6926	7409	// CameraPane.Ymax = spoth;
6927	7410	// }
6928		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6929		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7411	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7412	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6930	7413	spot.translate(0, -32);
6931		- info.g.setColor(Color.green);
6932		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
6933	7417	// if (CameraPane.Xmin > spot.x)
6934	7418	// {
6935	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -6946,8 +7430,8 @@
6946	7430	// {
6947	7431	// CameraPane.Ymax = spoth;
6948	7432	// }
6949		- info.g.drawArc(boundary.x, boundary.y,
6950		- boundary.width, boundary.height, 0, 360);
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6951	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6952	7436	// if (CameraPane.Xmin > boundary.x)
6953	7437	// {
..	..	@@ -6969,7 +7453,8 @@
6969	7453	}
6970	7454	}
6971	7455
6972		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
6973	7458	{
6974	7459	if (level == 0)
6975	7460	{
..	..	@@ -6978,10 +7463,10 @@
6978	7463
6979	7464	boolean retval = false;
6980	7465
6981		- startX = info.x;
6982		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
6983	7468
6984		- hitSomething = 0;
	7469	+ hitSomething = -1;
6985	7470	cVector origin = new cVector();
6986	7471	//LA.xformPos(origin, toParent, origin);
6987	7472	Rectangle spot = new Rectangle();
..	..	@@ -6989,22 +7474,51 @@
6989	7474	{
6990	7475	centerPt = new Point(0, 0);
6991	7476	}
6992		- calcHotSpot(origin, info, centerPt, spot);
6993		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
6994	7480	{
6995	7481	hitSomething = hitCenter;
6996	7482	retval = true;
6997	7483	}
6998	7484	spot.translate(32, 0);
6999		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7000	7486	{
7001	7487	hitSomething = hitRotate;
7002	7488	retval = true;
7003	7489	}
7004	7490	spot.translate(0, 32);
7005		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7006	7492	{
7007	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7008	7522	retval = true;
7009	7523	}
7010	7524
..	..	@@ -7014,7 +7528,7 @@
7014	7528	}
7015	7529
7016	7530	//System.out.println("info.modifiers = " + info.modifiers);
7017		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7018	7532	//System.out.println("modified = " + modified);
7019	7533	//new Exception().printStackTrace();
7020	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7042,7 +7556,8 @@
7042	7556	return true;
7043	7557	}
7044	7558
7045		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7046	7561	{
7047	7562	if (hitSomething == 0)
7048	7563	{
..	..	@@ -7056,7 +7571,8 @@
7056	7571
7057	7572	//System.out.println("hitSomething = " + hitSomething);
7058	7573
7059		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
	7575	+
7060	7576	cVector xlate = new cVector();
7061	7577	//cVector xlate2 = new cVector();
7062	7578	switch (hitSomething)
..	..	@@ -7089,8 +7605,8 @@
7089	7605	toParent[3][i] = xlate.get(i);
7090	7606	LA.matInvert(toParent, fromParent);
7091	7607	*/
7092		- cVector delta = LA.newVector(0, 0, startY - info.y);
7093		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7094	7610
7095	7611	LA.matCopy(startMat, toParent);
7096	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7099,7 +7615,7 @@
7099	7615	} else
7100	7616	{
7101	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7102		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7103	7619	cVector away = new cVector();
7104	7620	//cVector right2 = new cVector();
7105	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7116,19 +7632,19 @@
7116	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7117	7633	// if (!CameraPane.LOCALTRANSFORM)
7118	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7119		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7120	7636	// if (!CameraPane.LOCALTRANSFORM)
7121	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7122	7638	//LA.vecCross(up, cVector.Z, right2);
7123	7639
7124		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7125	7641
7126	7642	//System.out.println("DELTA0 = " + delta);
7127	7643	//System.out.println("AWAY = " + info.camera.away);
7128	7644	//System.out.println("UP = " + info.camera.up);
7129	7645	if (away.z > 0)
7130	7646	{
7131		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7132	7648	{
7133	7649	delta.x = -delta.x;
7134	7650	} else
..	..	@@ -7143,7 +7659,7 @@
7143	7659	//System.out.println("DELTA1 = " + delta);
7144	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7145	7661	//System.out.println("DELTA2 = " + delta);
7146		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7147	7663	LA.matCopy(startMat, toParent);
7148	7664	//System.out.println("DELTA3 = " + delta);
7149	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7153,8 +7669,8 @@
7153	7669	break;
7154	7670
7155	7671	case hitRotate: // rotate
7156		- int dx = info.x - centerPt.x;
7157		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7158	7674	double angle = (double) Math.atan2(dx, dy);
7159	7675	angle = -(1.570796 - angle);
7160	7676
..	..	@@ -7177,7 +7693,7 @@
7177	7693	}
7178	7694	/**/
7179	7695
7180		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7181	7697	{
7182	7698	case 1: // '\001'
7183	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7204,26 +7720,30 @@
7204	7720	break;
7205	7721
7206	7722	case hitScale: // scale
7207		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7724	+ double sign = 1;
	7725	+ if (hScale < 0)
	7726	+ {
	7727	+ sign = -1;
	7728	+ }
	7729	+ hScale = signMath.pow(signhScale, scale * 50);
7208	7730	if (hScale < 0.01)
7209	7731	{
7210		- hScale = 0.01;
	7732	+ //hScale = 0.01;
7211	7733	}
7212		- hScale = Math.pow(hScale, scale * 50);
7213		- if (hScale < 0.01)
	7734	+
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7736	+ sign = 1;
	7737	+ if (vScale < 0)
7214	7738	{
7215		- hScale = 0.01;
	7739	+ sign = -1;
7216	7740	}
7217		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ vScale = signMath.pow(signvScale, scale * 50);
7218	7742	if (vScale < 0.01)
7219	7743	{
7220		- vScale = 0.01;
	7744	+ //vScale = 0.01;
7221	7745	}
7222		- vScale = Math.pow(vScale, scale * 50);
7223		- if (vScale < 0.01)
7224		- {
7225		- vScale = 0.01;
7226		- }
	7746	+
7227	7747	LA.matCopy(startMat, toParent);
7228	7748	/**/
7229	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7233,39 +7753,47 @@
7233	7753	}
7234	7754	/**/
7235	7755
7236		- switch (info.pane.RenderCamera().viewCode)
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7757	+
	7758	+ if (totalScale < 0.01)
	7759	+ {
	7760	+ totalScale = 0.01;
	7761	+ }
	7762	+
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7237	7764	{
7238	7765	case 3: // '\001'
7239		- if (modified)
	7766	+ if (modified \|\| opposite)
7240	7767	{
7241	7768	//LA.matScale(toParent, 1, hScale, vScale);
7242		- LA.matScale(toParent, vScale, 1, 1);
	7769	+ LA.matScale(toParent, totalScale, 1, 1);
7243	7770	} // vScale, 1);
7244	7771	else
7245	7772	{
7246		- LA.matScale(toParent, vScale, vScale, vScale);
	7773	+ // EXCEPTION!
	7774	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7247	7775	} // vScale, 1);
7248	7776	break;
7249	7777
7250	7778	case 2: // '\002'
7251		- if (modified)
	7779	+ if (modified \|\| opposite)
7252	7780	{
7253	7781	//LA.matScale(toParent, hScale, 1, vScale);
7254		- LA.matScale(toParent, 1, vScale, 1);
	7782	+ LA.matScale(toParent, 1, totalScale, 1);
7255	7783	} else
7256	7784	{
7257		- LA.matScale(toParent, vScale, 1, vScale);
	7785	+ LA.matScale(toParent, totalScale, 1, totalScale);
7258	7786	}
7259	7787	break;
7260	7788
7261	7789	case 1: // '\003'
7262		- if (modified)
	7790	+ if (modified \|\| opposite)
7263	7791	{
7264	7792	//LA.matScale(toParent, hScale, vScale, 1);
7265		- LA.matScale(toParent, 1, 1, vScale);
	7793	+ LA.matScale(toParent, 1, 1, totalScale);
7266	7794	} else
7267	7795	{
7268		- LA.matScale(toParent, vScale, vScale, 1);
	7796	+ LA.matScale(toParent, totalScale, totalScale, 1);
7269	7797	}
7270	7798	break;
7271	7799	}
..	..	@@ -7299,7 +7827,7 @@
7299	7827	} // NEW ...
7300	7828
7301	7829
7302		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7303	7831	}
7304	7832
7305	7833	boolean overflow = false;
..	..	@@ -7406,7 +7934,7 @@
7406	7934	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7407	7935	} else
7408	7936	{
7409		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7937	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7410	7938	} // + super.toString();
7411	7939	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7412	7940
..	..	@@ -7479,6 +8007,10 @@
7479	8007	editWindow = null;
7480	8008	} // ?
7481	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7482	8014	}
7483	8015
7484	8016	boolean root; // patch for edit windows
..	..	@@ -7490,7 +8022,7 @@
7490	8022	/transient/ cVector2[] projectedVertices = new cVector2[0];
7491	8023
7492	8024	Object3D /Composite/ parent;
7493		- Object3D /Composite/ fileparent;
	8025	+ Object3D /Composite/ fileparent; // In the case of FileObject
7494	8026
7495	8027	double[][] toParent; // dynamic matrix
7496	8028	double[][] fromParent;
..	..	@@ -7636,6 +8168,10 @@
7636	8168	}
7637	8169
7638	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7639	8175	transient ObjectUI objectUI;
7640	8176	public static int povDepth = 0;
7641	8177	private static cVector tbMin = new cVector();
..	..	@@ -7654,9 +8190,9 @@
7654	8190	private static cVector edge2 = new cVector();
7655	8191	//private static cVector norm = new cVector();
7656	8192	/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;
	8193	+ static final int hitCenter = 1;
	8194	+ static final int hitScale = 2;
	8195	+ static final int hitRotate = 3;
7660	8196	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7661	8197	/transient/ private Point centerPt;
7662	8198	/transient/ private int startX;