~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 &&
	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
..	..	@@ -912,6 +1074,11 @@
912	1074	fromParent = null; // LA.newMatrix();
913	1075	bRep = null; // new BoundaryRep();
914	1076
	1077	+ if (oname != null && oname.equals("LeftHand"))
	1078	+ {
	1079	+ name = oname;
	1080	+ }
	1081	+
915	1082	/*
916	1083	float hue = (float)Math.random();
917	1084	Color col;
..	..	@@ -954,7 +1121,7 @@
954	1121
955	1122	public Object clone()
956	1123	{
957		- return GrafreeD.clone(this);
	1124	+ return Grafreed.clone(this);
958	1125	}
959	1126
960	1127	Object3D copyExpand()
..	..	@@ -1276,6 +1443,7 @@
1276	1443	toParent = LA.newMatrix();
1277	1444	fromParent = LA.newMatrix();
1278	1445	}
	1446	+
1279	1447	LA.matCopy(other.toParent, toParent);
1280	1448	LA.matCopy(other.fromParent, fromParent);
1281	1449
..	..	@@ -1470,7 +1638,7 @@
1470	1638	BoundaryRep.SEUIL = other.material.cameralight;
1471	1639
1472	1640	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1641	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1642	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1643	}
1476	1644
..	..	@@ -1729,7 +1897,7 @@
1729	1897	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1898	o.bRep = transientrep;
1731	1899	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1900	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1901	o.CreateMaterial();
1734	1902	o.SetAttributes(this, -1);
1735	1903	//parent
..	..	@@ -1742,7 +1910,7 @@
1742	1910	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1911	o.bRep = bRep;
1744	1912	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1913	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1914	o.CreateMaterial();
1747	1915	//o.overwriteThis(this, -1);
1748	1916	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1997,15 @@
1829	1997	if (obj.name == null)
1830	1998	continue; // can't be a null one
1831	1999
	2000	+ // Try perfect match first.
1832	2001	if (n.equals(obj.name))
1833	2002	{
1834	2003	theobj = obj;
1835	2004	count++;
1836	2005	}
1837	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	2009
1839	2010	if (count != 1)
1840	2011	for (int i=Size(); --i>=0;)
..	..	@@ -2294,6 +2465,15 @@
2294	2465	}
2295	2466	*/
2296	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2297	2477	}
2298	2478
2299	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2335,6 +2515,14 @@
2335	2515	{
2336	2516	editWindow.refreshContents();
2337	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2338	2526	//if (parent != null)
2339	2527	//parent.refreshEditWindow();
2340	2528	}
..	..	@@ -2414,7 +2602,8 @@
2414	2602	private static final int editSelf = 1;
2415	2603	private static final int editChild = 2;
2416	2604
2417		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2418	2607	{
2419	2608	if (level == 0)
2420	2609	{
..	..	@@ -2422,7 +2611,8 @@
2422	2611	return;
2423	2612
2424	2613	Object3D selectee;
2425		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2426	2616	{
2427	2617	selectee = (Object3D) e.nextElement();
2428	2618	}
..	..	@@ -2430,19 +2620,22 @@
2430	2620	} else
2431	2621	{
2432	2622	//super.
2433		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2434	2625	}
2435	2626	}
2436	2627
2437		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2438	2630	{
2439	2631	doSomething = 0;
2440	2632	if (level == 0)
2441	2633	{
2442		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2443	2635	}
2444	2636	if (//super.
2445		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2446	2639	{
2447	2640	doSomething = 1;
2448	2641	return true;
..	..	@@ -2452,7 +2645,7 @@
2452	2645	}
2453	2646	}
2454	2647
2455		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2456	2649	{
2457	2650	if (selection == null)
2458	2651	{
..	..	@@ -2465,7 +2658,8 @@
2465	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2466	2659	{
2467	2660	Object3D selectee = (Object3D) e.nextElement();
2468		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2469	2663	{
2470	2664	childToDrag = selectee;
2471	2665	doSomething = 2;
..	..	@@ -2477,13 +2671,15 @@
2477	2671	return retval;
2478	2672	}
2479	2673
2480		- void doEditDrag(ClickInfo info)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2481	2676	{
2482	2677	switch (doSomething)
2483	2678	{
2484	2679	case 1: // '\001'
2485	2680	//super.
2486		- doEditDrag0(info);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2487	2683	break;
2488	2684
2489	2685	case 2: // '\002'
..	..	@@ -2496,11 +2692,13 @@
2496	2692	{
2497	2693	//sel.hitSomething = childToDrag.hitSomething;
2498	2694	//childToDrag.doEditDrag(info);
2499		- sel.doEditDrag(info);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2500	2697	} else
2501	2698	{
2502	2699	//super.
2503		- doEditDrag0(info);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2504	2702	}
2505	2703	}
2506	2704	break;
..	..	@@ -2518,6 +2716,9 @@
2518	2716	{
2519	2717	deselectAll();
2520	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2521	2722	ClickInfo newInfo = new ClickInfo();
2522	2723	newInfo.flags = info.flags;
2523	2724	newInfo.bounds = info.bounds;
..	..	@@ -2610,6 +2811,18 @@
2610	2811	void GenNormalsS(boolean crease)
2611	2812	{
2612	2813	selection.GenNormals(crease);
	2814	+// for (int i=0; i<selection.size(); i++)
	2815	+// {
	2816	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2817	+// selectee.GenNormals(crease);
	2818	+// }
	2819	+
	2820	+ //Touch();
	2821	+ }
	2822	+
	2823	+ void GenNormalsMeshS()
	2824	+ {
	2825	+ selection.GenNormalsMesh();
2613	2826	// for (int i=0; i<selection.size(); i++)
2614	2827	// {
2615	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2750,6 +2963,24 @@
2750	2963	if (child == null)
2751	2964	continue;
2752	2965	child.GenNormals(crease);
	2966	+// Children().release(i);
	2967	+ }
	2968	+ blockloop = false;
	2969	+ }
	2970	+
	2971	+ void GenNormalsMesh()
	2972	+ {
	2973	+ if (blockloop)
	2974	+ return;
	2975	+
	2976	+ blockloop = true;
	2977	+ GenNormalsMesh0();
	2978	+ for (int i = 0; i < Children().Size(); i++)
	2979	+ {
	2980	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2981	+ if (child == null)
	2982	+ continue;
	2983	+ child.GenNormalsMesh();
2753	2984	// Children().release(i);
2754	2985	}
2755	2986	blockloop = false;
..	..	@@ -2922,11 +3153,20 @@
2922	3153	}
2923	3154	}
2924	3155
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2925	3165	void GenNormalsMINE0()
2926	3166	{
2927	3167	if (bRep != null)
2928	3168	{
2929		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2930	3170	Touch();
2931	3171	}
2932	3172	}
..	..	@@ -2983,6 +3223,33 @@
2983	3223	blockloop = false;
2984	3224	}
2985	3225
	3226	+ void TransformChildren()
	3227	+ {
	3228	+ if (toParent != null)
	3229	+ {
	3230	+ for (int i=Size(); --i>=0;)
	3231	+ {
	3232	+ Object3D v = get(i);
	3233	+
	3234	+ if (v.toParent == null)
	3235	+ {
	3236	+ v.toParent = LA.newMatrix();
	3237	+ v.fromParent = LA.newMatrix();
	3238	+ }
	3239	+
	3240	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3241	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3242	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3243	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3244	+ }
	3245	+
	3246	+ toParent = null; // LA.matIdentity(toParent);
	3247	+ fromParent = null; // LA.matIdentity(fromParent);
	3248	+
	3249	+ Touch();
	3250	+ }
	3251	+ }
	3252	+
2986	3253	void TransformGeometry()
2987	3254	{
2988	3255	Object3D obj = this;
..	..	@@ -3204,9 +3471,11 @@
3204	3471
3205	3472	BoundaryRep sup = bRep.support;
3206	3473	bRep.support = null;
3207		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3474	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3475	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3476	+
	3477	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3478	+
3210	3479	bRep = temprep;
3211	3480	bRep.support = sup;
3212	3481	Touch();
..	..	@@ -3343,7 +3612,8 @@
3343	3612	if (blockloop)
3344	3613	return;
3345	3614
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3347	3617	live = h;
3348	3618
3349	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3634,8 @@
3364	3634	return;
3365	3635
3366	3636	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3368	3639	link2master = h;
3369	3640
3370	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3655,8 @@
3384	3655	if (blockloop)
3385	3656	return;
3386	3657
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3388	3660	hide = h;
3389	3661
3390	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3676,7 @@
3404	3676	if (blockloop)
3405	3677	return;
3406	3678
3407		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3408	3680	marked = h;
3409	3681
3410	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3686,46 @@
3414	3686	continue;
3415	3687	blockloop = true;
3416	3688	child.MarkLeaves(h);
	3689	+ blockloop = false;
	3690	+ // release(i);
	3691	+ }
	3692	+ }
	3693	+
	3694	+ void RewindLeaves(boolean h)
	3695	+ {
	3696	+ if (blockloop)
	3697	+ return;
	3698	+
	3699	+ if (bRep != null \|\| material != null) // borderline...
	3700	+ rewind = h;
	3701	+
	3702	+ for (int i = 0; i < Size(); i++)
	3703	+ {
	3704	+ Object3D child = (Object3D) get(i); // reserve(i);
	3705	+ if (child == null)
	3706	+ continue;
	3707	+ blockloop = true;
	3708	+ child.RewindLeaves(h);
	3709	+ blockloop = false;
	3710	+ // release(i);
	3711	+ }
	3712	+ }
	3713	+
	3714	+ void RandomLeaves(boolean h)
	3715	+ {
	3716	+ if (blockloop)
	3717	+ return;
	3718	+
	3719	+ if (bRep != null \|\| material != null) // borderline...
	3720	+ random = h;
	3721	+
	3722	+ for (int i = 0; i < Size(); i++)
	3723	+ {
	3724	+ Object3D child = (Object3D) get(i); // reserve(i);
	3725	+ if (child == null)
	3726	+ continue;
	3727	+ blockloop = true;
	3728	+ child.RandomLeaves(h);
3417	3729	blockloop = false;
3418	3730	// release(i);
3419	3731	}
..	..	@@ -3728,7 +4040,7 @@
3728	4040	if (child == null)
3729	4041	continue;
3730	4042
3731		- if (GrafreeD.RENDERME > 0)
	4043	+ if (Grafreed.RENDERME > 0)
3732	4044	{
3733	4045	if (child instanceof Merge)
3734	4046	((Merge)child).renderme();
..	..	@@ -3879,7 +4191,7 @@
3879	4191	if (child == null)
3880	4192	continue;
3881	4193
3882		- if (GrafreeD.RENDERME > 0)
	4194	+ if (Grafreed.RENDERME > 0)
3883	4195	{
3884	4196	if (child instanceof Merge)
3885	4197	((Merge)child).renderme();
..	..	@@ -4074,7 +4386,7 @@
4074	4386	if (child == null)
4075	4387	continue;
4076	4388
4077		- if (GrafreeD.RENDERME > 0)
	4389	+ if (Grafreed.RENDERME > 0)
4078	4390	{
4079	4391	if (child instanceof Merge)
4080	4392	((Merge)child).renderme();
..	..	@@ -4187,6 +4499,55 @@
4187	4499	{
4188	4500	blockloop = true;
4189	4501	get(i).RepairShadow();
	4502	+ blockloop = false;
	4503	+ }
	4504	+ }
	4505	+
	4506	+ void RepairSOV()
	4507	+ {
	4508	+ if (blockloop)
	4509	+ return;
	4510	+
	4511	+ String texname = this.GetPigmentTexture();
	4512	+
	4513	+ if (texname.startsWith("sov"))
	4514	+ {
	4515	+ String[] s = texname.split("/");
	4516	+
	4517	+ String[] sname = s[1].split("Color.pn");
	4518	+
	4519	+ texname = sname[0];
	4520	+
	4521	+ if (sname.length > 1)
	4522	+ {
	4523	+ texname += "Color.jpg";
	4524	+ }
	4525	+
	4526	+ this.SetPigmentTexture("sov/" + texname);
	4527	+ }
	4528	+
	4529	+ texname = this.GetBumpTexture();
	4530	+
	4531	+ if (texname.startsWith("sov"))
	4532	+ {
	4533	+ String[] s = texname.split("/");
	4534	+
	4535	+ String[] sname = s[1].split("Bump.pn");
	4536	+
	4537	+ texname = sname[0];
	4538	+
	4539	+ if (sname.length > 1)
	4540	+ {
	4541	+ texname += "Bump.jpg";
	4542	+ }
	4543	+
	4544	+ this.SetBumpTexture("sov/" + texname);
	4545	+ }
	4546	+
	4547	+ for (int i=0; i<Size(); i++)
	4548	+ {
	4549	+ blockloop = true;
	4550	+ get(i).RepairSOV();
4190	4551	blockloop = false;
4191	4552	}
4192	4553	}
..	..	@@ -4681,7 +5042,7 @@
4681	5042
4682	5043	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	5044	{
4684		- if (hide)
	5045	+ if (hide \|\| dontselect)
4685	5046	return null;
4686	5047
4687	5048	if (count <= 0)
..	..	@@ -4705,9 +5066,17 @@
4705	5066	}
4706	5067	}
4707	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4708	5077	cTreePath Select(int indexcount, boolean deselect)
4709	5078	{
4710		- if (hide)
	5079	+ if (hide \|\| dontselect)
4711	5080	return null;
4712	5081
4713	5082	if (count <= 0)
..	..	@@ -4741,10 +5110,11 @@
4741	5110	if (leaf != null)
4742	5111	{
4743	5112	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4745	5115	{
4746	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4747		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4748	5118	}
4749	5119
4750	5120	return tp;
..	..	@@ -4761,6 +5131,7 @@
4761	5131
4762	5132	if (child == null)
4763	5133	continue;
	5134	+
4764	5135	if (child.HasTransparency() && child.size() != 0)
4765	5136	{
4766	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4770,9 +5141,10 @@
4770	5141	if (leaf != null)
4771	5142	{
4772	5143	cTreePath tp = new cTreePath(this, leaf);
4773		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4774	5146	{
4775		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4776	5148	}
4777	5149
4778	5150	return tp;
..	..	@@ -5097,6 +5469,51 @@
5097	5469	blockloop = false;
5098	5470	}
5099	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5100	5517	boolean IsSelected()
5101	5518	{
5102	5519	if (parent == null)
..	..	@@ -5333,6 +5750,43 @@
5333	5750	}
5334	5751	}
5335	5752
	5753	+ UUID GetUUID()
	5754	+ {
	5755	+ if (uuid == null)
	5756	+ {
	5757	+ // Serial
	5758	+ uuid = UUID.randomUUID();
	5759	+ }
	5760	+
	5761	+ return uuid;
	5762	+ }
	5763	+
	5764	+ Object3D GetObject(UUID uid)
	5765	+ {
	5766	+ if (blockloop)
	5767	+ return null;
	5768	+
	5769	+ if (GetUUID().equals(uid))
	5770	+ return this;
	5771	+
	5772	+ int nb = Size();
	5773	+ for (int i = 0; i < nb; i++)
	5774	+ {
	5775	+ Object3D child = (Object3D) get(i);
	5776	+
	5777	+ if (child == null)
	5778	+ continue;
	5779	+
	5780	+ blockloop = true;
	5781	+ Object3D obj = child.GetObject(uid);
	5782	+ blockloop = false;
	5783	+ if (obj != null)
	5784	+ return obj;
	5785	+ }
	5786	+
	5787	+ return null;
	5788	+ }
	5789	+
5336	5790	void SetBumpTexture(String tex)
5337	5791	{
5338	5792	if (GetTextures() == null)
..	..	@@ -5369,6 +5823,38 @@
5369	5823	}
5370	5824	}
5371	5825
	5826	+ void EmbedTextures(boolean embed)
	5827	+ {
	5828	+ if (blockloop)
	5829	+ return;
	5830	+
	5831	+ //if (GetTextures() != null)
	5832	+ if (embed)
	5833	+ CameraPane.EmbedTextures(GetTextures());
	5834	+ else
	5835	+ {
	5836	+ GetTextures().pigmentdata = null;
	5837	+ GetTextures().bumpdata = null;
	5838	+ GetTextures().pw = 0;
	5839	+ GetTextures().ph = 0;
	5840	+ GetTextures().bw = 0;
	5841	+ GetTextures().bh = 0;
	5842	+ }
	5843	+
	5844	+ int nb = Size();
	5845	+ for (int i = 0; i < nb; i++)
	5846	+ {
	5847	+ Object3D child = (Object3D) get(i);
	5848	+
	5849	+ if (child == null)
	5850	+ continue;
	5851	+
	5852	+ blockloop = true;
	5853	+ child.EmbedTextures(embed);
	5854	+ blockloop = false;
	5855	+ }
	5856	+ }
	5857	+
5372	5858	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5373	5859	{
5374	5860	Draw(display, root, selected, blocked);
..	..	@@ -5377,12 +5863,23 @@
5377	5863	boolean NeedSupport()
5378	5864	{
5379	5865	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5866	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5381	5867	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5868	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5869	}
5384	5870
5385	5871	static boolean DEBUG_SELECTION = false;
	5872	+
	5873	+ boolean IsLive()
	5874	+ {
	5875	+ if (live)
	5876	+ return true;
	5877	+
	5878	+ if (parent == null)
	5879	+ return false;
	5880	+
	5881	+ return parent.IsLive();
	5882	+ }
5386	5883
5387	5884	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	5885	{
..	..	@@ -5394,7 +5891,7 @@
5394	5891	}
5395	5892
5396	5893	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5894	+ (hide \|\| dontselect))
5398	5895	return;
5399	5896
5400	5897	if (name != null && name.contains("sclera"))
..	..	@@ -5444,8 +5941,10 @@
5444	5941	if (support != null)
5445	5942	support = support;
5446	5943
5447		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5448		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5944	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5945	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5946	+
	5947	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5449	5948
5450	5949	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	5950	{
..	..	@@ -5455,8 +5954,9 @@
5455	5954	// usecalllists &= !(parent instanceof RandomNode);
5456	5955	// usecalllists = false;
5457	5956
5458		- if (GetBRep() != null)
5459		- usecalllists = usecalllists;
	5957	+ if (display.DrawMode() == display.SHADOW)
	5958	+ //GetBRep() != null)
	5959	+ usecalllists = !!usecalllists;
5460	5960	//System.out.println("draw " + this);
5461	5961	//new Exception().printStackTrace();
5462	5962
..	..	@@ -5465,10 +5965,12 @@
5465	5965	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	5966
5467	5967	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5968	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5969	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5469	5970	{
5470	5971	Globals.lighttouched = true;
5471	5972	} // all panes...
	5973	+
5472	5974	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	5975	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	5976	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5476,7 +5978,7 @@
5476	5978	if (!(this instanceof Composite))
5477	5979	touched = false;
5478	5980	//if (displaylist == -1 && usecalllists)
5479		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5981	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5480	5982	{
5481	5983	bRep.displaylist = display.GenList();
5482	5984	assert(bRep.displaylist != 0);
..	..	@@ -5487,7 +5989,7 @@
5487	5989
5488	5990	//System.out.println("\tnew list " + list);
5489	5991	//gl.glDrawBuffer(gl.GL_NONE);
5490		- if (usecalllists)
	5992	+ if (usecalllists && bRep.displaylist > 0)
5491	5993	{
5492	5994	// System.err.println("new list " + bRep.displaylist + " for " + this);
5493	5995	display.NewList(bRep.displaylist);
..	..	@@ -5496,7 +5998,7 @@
5496	5998	CallList(display, root, selected, blocked);
5497	5999
5498	6000	// compiled = true;
5499		- if (usecalllists)
	6001	+ if (usecalllists && bRep.displaylist > 0)
5500	6002	{
5501	6003	// System.err.println("end list " + bRep.displaylist + " for " + this);
5502	6004	display.EndList();
..	..	@@ -5596,6 +6098,7 @@
5596	6098	if (GetBRep() != null)
5597	6099	{
5598	6100	display.NextIndex();
	6101	+
5599	6102	// vertex color conflict : gl.glCallList(list);
5600	6103	DrawNode(display, root, selected);
5601	6104	if (this instanceof BezierPatch)
..	..	@@ -5636,7 +6139,28 @@
5636	6139	tex = GetTextures();
5637	6140	}
5638	6141
5639		- display.BindTextures(tex, texres);
	6142	+ boolean failedPigment = false;
	6143	+ boolean failedBump = false;
	6144	+
	6145	+ try
	6146	+ {
	6147	+ display.BindPigmentTexture(tex, texres);
	6148	+ }
	6149	+ catch (Exception e)
	6150	+ {
	6151	+ System.err.println("FAILED: " + this);
	6152	+ failedPigment = true;
	6153	+ }
	6154	+
	6155	+ try
	6156	+ {
	6157	+ display.BindBumpTexture(tex, texres);
	6158	+ }
	6159	+ catch (Exception e)
	6160	+ {
	6161	+ //System.err.println("FAILED: " + this);
	6162	+ failedBump = true;
	6163	+ }
5640	6164
5641	6165	if (!compiled)
5642	6166	{
..	..	@@ -5658,7 +6182,11 @@
5658	6182	}
5659	6183	}
5660	6184
5661		- display.ReleaseTextures(tex);
	6185	+ if (!failedBump)
	6186	+ display.ReleaseBumpTexture(tex);
	6187	+
	6188	+ if (!failedPigment)
	6189	+ display.ReleasePigmentTexture(tex);
5662	6190
5663	6191	display.PopMaterial(this, selected);
5664	6192	}
..	..	@@ -5787,6 +6315,9 @@
5787	6315
5788	6316	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6317	{
	6318	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6319	+ return;
	6320	+
5790	6321	if (hide)
5791	6322	return;
5792	6323	// shadow optimisation
..	..	@@ -5912,6 +6443,9 @@
5912	6443	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6444	return; // no shadow for transparent objects
5914	6445
	6446	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6447	+ return;
	6448	+
5915	6449	if (hide)
5916	6450	return;
5917	6451
..	..	@@ -6025,6 +6559,11 @@
6025	6559	// dec 2012
6026	6560	new Exception().printStackTrace();
6027	6561	return;
	6562	+ }
	6563	+
	6564	+ if (dontselect)
	6565	+ {
	6566	+ //bRep.GenerateNormalsMINE();
6028	6567	}
6029	6568
6030	6569	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6810,20 +7349,23 @@
6810	7349	}
6811	7350	}
6812	7351
6813		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7352	+ static ClickInfo clickInfo = new ClickInfo();
	7353	+
	7354	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7355	+ Point outPt, Rectangle outRec)
6814	7356	{
6815		- int hc = info.bounds.x + info.bounds.width / 2;
6816		- int vc = info.bounds.y + info.bounds.height / 2;
6817		- double[][] toscreen = info.toScreen;
	7357	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7358	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7359	+ double[][] toscreen = clickInfo.toScreen;
6818	7360	if (toscreen == null)
6819	7361	{
6820		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7362	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6821	7363	}
6822	7364	cVector vec = in;
6823	7365	LA.xformPos(in, toscreen, in);
6824	7366	//System.out.println("Distance = " + info.camera.Distance());
6825		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6826		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7367	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7368	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6827	7369	outPt.x = hc + (int) vec.x;
6828	7370	outPt.y = vc - (int) vec.y;
6829	7371	outRec.x = outPt.x - 3;
..	..	@@ -6831,15 +7373,18 @@
6831	7373	outRec.width = outRec.height = 6;
6832	7374	}
6833	7375
6834		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7376	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7377	+ )
6835	7378	{
6836	7379	Point pt = new Point(0, 0);
6837	7380	Rectangle rec = new Rectangle();
6838		- calcHotSpot(in, info, pt, rec);
	7381	+ calcHotSpot(in, //clickInfo,
	7382	+ pt, rec);
6839	7383	return rec;
6840	7384	}
6841	7385
6842		- void drawEditHandles0(ClickInfo info, int level)
	7386	+ void drawEditHandles0(//ClickInfo clickInfo,
	7387	+ int level)
6843	7388	{
6844	7389	if (level == 0)
6845	7390	{
..	..	@@ -6848,16 +7393,19 @@
6848	7393	{
6849	7394	cVector origin = new cVector();
6850	7395	//LA.xformPos(origin, toParent, origin);
6851		- Rectangle spot = calcHotSpot(origin, info);
	7396	+ if (this.clickInfo == null)
	7397	+ this.clickInfo = new ClickInfo();
	7398	+
	7399	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6852	7400	Rectangle boundary = new Rectangle();
6853	7401	boundary.x = spot.x - 30;
6854	7402	boundary.y = spot.y - 30;
6855	7403	boundary.width = spot.width + 60;
6856	7404	boundary.height = spot.height + 60;
6857		- info.g.setColor(Color.red);
	7405	+ clickInfo.g.setColor(Color.red);
6858	7406	int spotw = spot.x + spot.width;
6859	7407	int spoth = spot.y + spot.height;
6860		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7408	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6861	7409	// if (CameraPane.Xmin > spot.x)
6862	7410	// {
6863	7411	// CameraPane.Xmin = spot.x;
..	..	@@ -6877,8 +7425,8 @@
6877	7425	spot.translate(32, 32);
6878	7426	spotw = spot.x + spot.width;
6879	7427	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
6881		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7428	+ clickInfo.g.setColor(Color.cyan);
	7429	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7430	// if (CameraPane.Xmin > spot.x)
6883	7431	// {
6884	7432	// CameraPane.Xmin = spot.x;
..	..	@@ -6895,11 +7443,12 @@
6895	7443	// {
6896	7444	// CameraPane.Ymax = spoth;
6897	7445	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7446	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7447	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6900	7448	spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
6902		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7449	+ clickInfo.g.setColor(Color.yellow);
	7450	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7451	+ clickInfo.g.setColor(Color.green);
6903	7452	// if (CameraPane.Xmin > spot.x)
6904	7453	// {
6905	7454	// CameraPane.Xmin = spot.x;
..	..	@@ -6916,8 +7465,8 @@
6916	7465	// {
6917	7466	// CameraPane.Ymax = spoth;
6918	7467	// }
6919		- info.g.drawArc(boundary.x, boundary.y,
6920		- boundary.width, boundary.height, 0, 360);
	7468	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7469	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6921	7470	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6922	7471	// if (CameraPane.Xmin > boundary.x)
6923	7472	// {
..	..	@@ -6939,7 +7488,8 @@
6939	7488	}
6940	7489	}
6941	7490
6942		- boolean doEditClick0(ClickInfo info, int level)
	7491	+ boolean doEditClick0(//ClickInfo clickInfo,
	7492	+ int level)
6943	7493	{
6944	7494	if (level == 0)
6945	7495	{
..	..	@@ -6948,10 +7498,10 @@
6948	7498
6949	7499	boolean retval = false;
6950	7500
6951		- startX = info.x;
6952		- startY = info.y;
	7501	+ startX = clickInfo.x;
	7502	+ startY = clickInfo.y;
6953	7503
6954		- hitSomething = 0;
	7504	+ hitSomething = -1;
6955	7505	cVector origin = new cVector();
6956	7506	//LA.xformPos(origin, toParent, origin);
6957	7507	Rectangle spot = new Rectangle();
..	..	@@ -6959,22 +7509,51 @@
6959	7509	{
6960	7510	centerPt = new Point(0, 0);
6961	7511	}
6962		- calcHotSpot(origin, info, centerPt, spot);
6963		- if (spot.contains(info.x, info.y))
	7512	+ calcHotSpot(origin, //info,
	7513	+ centerPt, spot);
	7514	+ if (spot.contains(clickInfo.x, clickInfo.y))
6964	7515	{
6965	7516	hitSomething = hitCenter;
6966	7517	retval = true;
6967	7518	}
6968	7519	spot.translate(32, 0);
6969		- if (spot.contains(info.x, info.y))
	7520	+ if (spot.contains(clickInfo.x, clickInfo.y))
6970	7521	{
6971	7522	hitSomething = hitRotate;
6972	7523	retval = true;
6973	7524	}
6974	7525	spot.translate(0, 32);
6975		- if (spot.contains(info.x, info.y))
	7526	+ if (spot.contains(clickInfo.x, clickInfo.y))
6976	7527	{
6977	7528	hitSomething = hitScale;
	7529	+
	7530	+ double scale = 0.005f * clickInfo.camera.Distance();
	7531	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7532	+ double sign = 1;
	7533	+ if (hScale < 0)
	7534	+ {
	7535	+ sign = -1;
	7536	+ }
	7537	+ hScale = signMath.pow(signhScale, scale * 50);
	7538	+ if (hScale < 0.01)
	7539	+ {
	7540	+ //hScale = 0.01;
	7541	+ }
	7542	+
	7543	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7544	+ sign = 1;
	7545	+ if (vScale < 0)
	7546	+ {
	7547	+ sign = -1;
	7548	+ }
	7549	+ vScale = signMath.pow(signvScale, scale * 50);
	7550	+ if (vScale < 0.01)
	7551	+ {
	7552	+ //vScale = 0.01;
	7553	+ }
	7554	+
	7555	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7556	+
6978	7557	retval = true;
6979	7558	}
6980	7559
..	..	@@ -6984,7 +7563,7 @@
6984	7563	}
6985	7564
6986	7565	//System.out.println("info.modifiers = " + info.modifiers);
6987		- modified = (info.modifiers & CameraPane.META) != 0;
	7566	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6988	7567	//System.out.println("modified = " + modified);
6989	7568	//new Exception().printStackTrace();
6990	7569	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7012,7 +7591,8 @@
7012	7591	return true;
7013	7592	}
7014	7593
7015		- void doEditDrag0(ClickInfo info)
	7594	+ void doEditDrag0(//ClickInfo info,
	7595	+ boolean opposite)
7016	7596	{
7017	7597	if (hitSomething == 0)
7018	7598	{
..	..	@@ -7026,7 +7606,8 @@
7026	7606
7027	7607	//System.out.println("hitSomething = " + hitSomething);
7028	7608
7029		- double scale = 0.005f * info.camera.Distance();
	7609	+ double scale = 0.005f * clickInfo.camera.Distance();
	7610	+
7030	7611	cVector xlate = new cVector();
7031	7612	//cVector xlate2 = new cVector();
7032	7613	switch (hitSomething)
..	..	@@ -7039,7 +7620,7 @@
7039	7620
7040	7621	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7041	7622
7042		- if (modified)
	7623	+ if (modified \|\| opposite)
7043	7624	{
7044	7625	//assert(false);
7045	7626	/*
..	..	@@ -7059,8 +7640,8 @@
7059	7640	toParent[3][i] = xlate.get(i);
7060	7641	LA.matInvert(toParent, fromParent);
7061	7642	*/
7062		- cVector delta = LA.newVector(0, 0, startY - info.y);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7643	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7644	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	7645
7065	7646	LA.matCopy(startMat, toParent);
7066	7647	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7069,7 +7650,7 @@
7069	7650	} else
7070	7651	{
7071	7652	//LA.xformDir(delta, info.camera.fromScreen, delta);
7072		- cVector up = new cVector(info.camera.up);
	7653	+ cVector up = new cVector(clickInfo.camera.up);
7073	7654	cVector away = new cVector();
7074	7655	//cVector right2 = new cVector();
7075	7656	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7086,19 +7667,19 @@
7086	7667	LA.xformDir(up, ClickInfo.matbuffer, up);
7087	7668	// if (!CameraPane.LOCALTRANSFORM)
7088	7669	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7089		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7670	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7090	7671	// if (!CameraPane.LOCALTRANSFORM)
7091	7672	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7092	7673	//LA.vecCross(up, cVector.Z, right2);
7093	7674
7094		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7675	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7095	7676
7096	7677	//System.out.println("DELTA0 = " + delta);
7097	7678	//System.out.println("AWAY = " + info.camera.away);
7098	7679	//System.out.println("UP = " + info.camera.up);
7099	7680	if (away.z > 0)
7100	7681	{
7101		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7682	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7102	7683	{
7103	7684	delta.x = -delta.x;
7104	7685	} else
..	..	@@ -7113,7 +7694,7 @@
7113	7694	//System.out.println("DELTA1 = " + delta);
7114	7695	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7115	7696	//System.out.println("DELTA2 = " + delta);
7116		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7697	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7117	7698	LA.matCopy(startMat, toParent);
7118	7699	//System.out.println("DELTA3 = " + delta);
7119	7700	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7123,8 +7704,8 @@
7123	7704	break;
7124	7705
7125	7706	case hitRotate: // rotate
7126		- int dx = info.x - centerPt.x;
7127		- int dy = -(info.y - centerPt.y);
	7707	+ int dx = clickInfo.x - centerPt.x;
	7708	+ int dy = -(clickInfo.y - centerPt.y);
7128	7709	double angle = (double) Math.atan2(dx, dy);
7129	7710	angle = -(1.570796 - angle);
7130	7711
..	..	@@ -7133,6 +7714,7 @@
7133	7714
7134	7715	if (modified)
7135	7716	{
	7717	+ // Rotate 90 degrees
7136	7718	angle /= (Math.PI / 4);
7137	7719	angle = Math.floor(angle + 0.5);
7138	7720	angle *= (Math.PI / 4);
..	..	@@ -7146,7 +7728,7 @@
7146	7728	}
7147	7729	/**/
7148	7730
7149		- switch (info.pane.RenderCamera().viewCode)
	7731	+ switch (clickInfo.pane.RenderCamera().viewCode)
7150	7732	{
7151	7733	case 1: // '\001'
7152	7734	LA.matZRotate(toParent, angle);
..	..	@@ -7173,26 +7755,30 @@
7173	7755	break;
7174	7756
7175	7757	case hitScale: // scale
7176		- double hScale = (double) (info.x - centerPt.x) / 32;
	7758	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7759	+ double sign = 1;
	7760	+ if (hScale < 0)
	7761	+ {
	7762	+ sign = -1;
	7763	+ }
	7764	+ hScale = signMath.pow(signhScale, scale * 50);
7177	7765	if (hScale < 0.01)
7178	7766	{
7179		- hScale = 0.01;
	7767	+ //hScale = 0.01;
7180	7768	}
7181		- hScale = Math.pow(hScale, scale * 50);
7182		- if (hScale < 0.01)
	7769	+
	7770	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7771	+ sign = 1;
	7772	+ if (vScale < 0)
7183	7773	{
7184		- hScale = 0.01;
	7774	+ sign = -1;
7185	7775	}
7186		- double vScale = (double) (info.y - centerPt.y) / 32;
	7776	+ vScale = signMath.pow(signvScale, scale * 50);
7187	7777	if (vScale < 0.01)
7188	7778	{
7189		- vScale = 0.01;
	7779	+ //vScale = 0.01;
7190	7780	}
7191		- vScale = Math.pow(vScale, scale * 50);
7192		- if (vScale < 0.01)
7193		- {
7194		- vScale = 0.01;
7195		- }
	7781	+
7196	7782	LA.matCopy(startMat, toParent);
7197	7783	/**/
7198	7784	for (int i = 0; i < 3; i++)
..	..	@@ -7202,39 +7788,47 @@
7202	7788	}
7203	7789	/**/
7204	7790
7205		- switch (info.pane.RenderCamera().viewCode)
	7791	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7792	+
	7793	+ if (totalScale < 0.01)
	7794	+ {
	7795	+ totalScale = 0.01;
	7796	+ }
	7797	+
	7798	+ switch (clickInfo.pane.RenderCamera().viewCode)
7206	7799	{
7207	7800	case 3: // '\001'
7208		- if (modified)
	7801	+ if (modified \|\| opposite)
7209	7802	{
7210	7803	//LA.matScale(toParent, 1, hScale, vScale);
7211		- LA.matScale(toParent, vScale, 1, 1);
	7804	+ LA.matScale(toParent, totalScale, 1, 1);
7212	7805	} // vScale, 1);
7213	7806	else
7214	7807	{
7215		- LA.matScale(toParent, vScale, vScale, vScale);
	7808	+ // EXCEPTION!
	7809	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7216	7810	} // vScale, 1);
7217	7811	break;
7218	7812
7219	7813	case 2: // '\002'
7220		- if (modified)
	7814	+ if (modified \|\| opposite)
7221	7815	{
7222	7816	//LA.matScale(toParent, hScale, 1, vScale);
7223		- LA.matScale(toParent, 1, vScale, 1);
	7817	+ LA.matScale(toParent, 1, totalScale, 1);
7224	7818	} else
7225	7819	{
7226		- LA.matScale(toParent, vScale, 1, vScale);
	7820	+ LA.matScale(toParent, totalScale, 1, totalScale);
7227	7821	}
7228	7822	break;
7229	7823
7230	7824	case 1: // '\003'
7231		- if (modified)
	7825	+ if (modified \|\| opposite)
7232	7826	{
7233	7827	//LA.matScale(toParent, hScale, vScale, 1);
7234		- LA.matScale(toParent, 1, 1, vScale);
	7828	+ LA.matScale(toParent, 1, 1, totalScale);
7235	7829	} else
7236	7830	{
7237		- LA.matScale(toParent, vScale, vScale, 1);
	7831	+ LA.matScale(toParent, totalScale, totalScale, 1);
7238	7832	}
7239	7833	break;
7240	7834	}
..	..	@@ -7268,7 +7862,7 @@
7268	7862	} // NEW ...
7269	7863
7270	7864
7271		- info.pane.repaint();
	7865	+ clickInfo.pane.repaint();
7272	7866	}
7273	7867
7274	7868	boolean overflow = false;
..	..	@@ -7367,14 +7961,22 @@
7367	7961	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7368	7962	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7369	7963	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7964	+
	7965	+ String objname;
	7966	+
7370	7967	if (false) //parent != null)
7371	7968	{
7372		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7969	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7373	7970	} else
7374	7971	{
7375		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7972	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7376	7973	} // + super.toString();
7377	7974	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7975	+
	7976	+ if (!Globals.ADVANCED)
	7977	+ return objname;
	7978	+
	7979	+ return objname + " " + System.identityHashCode(this);
7378	7980	}
7379	7981
7380	7982	public int hashCode()
..	..	@@ -7440,6 +8042,10 @@
7440	8042	editWindow = null;
7441	8043	} // ?
7442	8044	}
	8045	+ else
	8046	+ {
	8047	+ //editWindow.closeUI();
	8048	+ }
7443	8049	}
7444	8050
7445	8051	boolean root; // patch for edit windows
..	..	@@ -7451,7 +8057,7 @@
7451	8057	/transient/ cVector2[] projectedVertices = new cVector2[0];
7452	8058
7453	8059	Object3D /Composite/ parent;
7454		- Object3D /Composite/ fileparent;
	8060	+ Object3D /Composite/ fileparent; // In the case of FileObject
7455	8061
7456	8062	double[][] toParent; // dynamic matrix
7457	8063	double[][] fromParent;
..	..	@@ -7566,7 +8172,7 @@
7566	8172	{
7567	8173	assert(bRep != null);
7568	8174	if (!(support instanceof GenericJoint)) // support.bRep != null)
7569		- GrafreeD.Assert(support.bRep == bRep.support);
	8175	+ Grafreed.Assert(support.bRep == bRep.support);
7570	8176	}
7571	8177	else
7572	8178	{
..	..	@@ -7597,6 +8203,10 @@
7597	8203	}
7598	8204
7599	8205	transient ObjEditor editWindow;
	8206	+ transient ObjEditor manipWindow;
	8207	+
	8208	+ transient boolean pinned;
	8209	+
7600	8210	transient ObjectUI objectUI;
7601	8211	public static int povDepth = 0;
7602	8212	private static cVector tbMin = new cVector();
..	..	@@ -7615,9 +8225,9 @@
7615	8225	private static cVector edge2 = new cVector();
7616	8226	//private static cVector norm = new cVector();
7617	8227	/transient private/ int hitSomething;
7618		- private static final int hitCenter = 1;
7619		- private static final int hitScale = 2;
7620		- private static final int hitRotate = 3;
	8228	+ static final int hitCenter = 1;
	8229	+ static final int hitScale = 2;
	8230	+ static final int hitRotate = 3;
7621	8231	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7622	8232	/transient/ private Point centerPt;
7623	8233	/transient/ private int startX;