~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 &&
	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
..	..	@@ -912,6 +1047,11 @@
912	1047	fromParent = null; // LA.newMatrix();
913	1048	bRep = null; // new BoundaryRep();
914	1049
	1050	+ if (oname != null && oname.equals("LeftHand"))
	1051	+ {
	1052	+ name = oname;
	1053	+ }
	1054	+
915	1055	/*
916	1056	float hue = (float)Math.random();
917	1057	Color col;
..	..	@@ -954,7 +1094,7 @@
954	1094
955	1095	public Object clone()
956	1096	{
957		- return GrafreeD.clone(this);
	1097	+ return Grafreed.clone(this);
958	1098	}
959	1099
960	1100	Object3D copyExpand()
..	..	@@ -1276,6 +1416,7 @@
1276	1416	toParent = LA.newMatrix();
1277	1417	fromParent = LA.newMatrix();
1278	1418	}
	1419	+
1279	1420	LA.matCopy(other.toParent, toParent);
1280	1421	LA.matCopy(other.fromParent, fromParent);
1281	1422
..	..	@@ -1470,7 +1611,7 @@
1470	1611	BoundaryRep.SEUIL = other.material.cameralight;
1471	1612
1472	1613	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1614	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1615	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1616	}
1476	1617
..	..	@@ -1729,7 +1870,7 @@
1729	1870	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1871	o.bRep = transientrep;
1731	1872	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1873	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1874	o.CreateMaterial();
1734	1875	o.SetAttributes(this, -1);
1735	1876	//parent
..	..	@@ -1742,7 +1883,7 @@
1742	1883	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1884	o.bRep = bRep;
1744	1885	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1886	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1887	o.CreateMaterial();
1747	1888	//o.overwriteThis(this, -1);
1748	1889	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1970,15 @@
1829	1970	if (obj.name == null)
1830	1971	continue; // can't be a null one
1831	1972
	1973	+ // Try perfect match first.
1832	1974	if (n.equals(obj.name))
1833	1975	{
1834	1976	theobj = obj;
1835	1977	count++;
1836	1978	}
1837	1979	}
	1980	+
	1981	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1982
1839	1983	if (count != 1)
1840	1984	for (int i=Size(); --i>=0;)
..	..	@@ -2294,12 +2438,17 @@
2294	2438	}
2295	2439	*/
2296	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2297	2445	}
2298	2446
2299	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2300	2448	{
2301	2449	if (newWindow)
2302	2450	{
	2451	+ new Exception().printStackTrace();
2303	2452	System.exit(0);
2304	2453	if (parent != null)
2305	2454	{
..	..	@@ -2334,6 +2483,14 @@
2334	2483	{
2335	2484	editWindow.refreshContents();
2336	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2337	2494	//if (parent != null)
2338	2495	//parent.refreshEditWindow();
2339	2496	}
..	..	@@ -2413,7 +2570,8 @@
2413	2570	private static final int editSelf = 1;
2414	2571	private static final int editChild = 2;
2415	2572
2416		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2417	2575	{
2418	2576	if (level == 0)
2419	2577	{
..	..	@@ -2421,7 +2579,8 @@
2421	2579	return;
2422	2580
2423	2581	Object3D selectee;
2424		- 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))
2425	2584	{
2426	2585	selectee = (Object3D) e.nextElement();
2427	2586	}
..	..	@@ -2429,19 +2588,22 @@
2429	2588	} else
2430	2589	{
2431	2590	//super.
2432		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2433	2593	}
2434	2594	}
2435	2595
2436		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2437	2598	{
2438	2599	doSomething = 0;
2439	2600	if (level == 0)
2440	2601	{
2441		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2442	2603	}
2443	2604	if (//super.
2444		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2445	2607	{
2446	2608	doSomething = 1;
2447	2609	return true;
..	..	@@ -2451,7 +2613,7 @@
2451	2613	}
2452	2614	}
2453	2615
2454		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2455	2617	{
2456	2618	if (selection == null)
2457	2619	{
..	..	@@ -2464,7 +2626,8 @@
2464	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2465	2627	{
2466	2628	Object3D selectee = (Object3D) e.nextElement();
2467		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2468	2631	{
2469	2632	childToDrag = selectee;
2470	2633	doSomething = 2;
..	..	@@ -2476,13 +2639,15 @@
2476	2639	return retval;
2477	2640	}
2478	2641
2479		- void doEditDrag(ClickInfo info)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2480	2644	{
2481	2645	switch (doSomething)
2482	2646	{
2483	2647	case 1: // '\001'
2484	2648	//super.
2485		- doEditDrag0(info);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2486	2651	break;
2487	2652
2488	2653	case 2: // '\002'
..	..	@@ -2495,11 +2660,13 @@
2495	2660	{
2496	2661	//sel.hitSomething = childToDrag.hitSomething;
2497	2662	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2499	2665	} else
2500	2666	{
2501	2667	//super.
2502		- doEditDrag0(info);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2503	2670	}
2504	2671	}
2505	2672	break;
..	..	@@ -2517,6 +2684,9 @@
2517	2684	{
2518	2685	deselectAll();
2519	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2520	2690	ClickInfo newInfo = new ClickInfo();
2521	2691	newInfo.flags = info.flags;
2522	2692	newInfo.bounds = info.bounds;
..	..	@@ -2609,6 +2779,18 @@
2609	2779	void GenNormalsS(boolean crease)
2610	2780	{
2611	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();
2612	2794	// for (int i=0; i<selection.size(); i++)
2613	2795	// {
2614	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2931,24 @@
2749	2931	if (child == null)
2750	2932	continue;
2751	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();
2752	2952	// Children().release(i);
2753	2953	}
2754	2954	blockloop = false;
..	..	@@ -2921,11 +3121,20 @@
2921	3121	}
2922	3122	}
2923	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2924	3133	void GenNormalsMINE0()
2925	3134	{
2926	3135	if (bRep != null)
2927	3136	{
2928		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2929	3138	Touch();
2930	3139	}
2931	3140	}
..	..	@@ -2982,6 +3191,33 @@
2982	3191	blockloop = false;
2983	3192	}
2984	3193
	3194	+ void TransformChildren()
	3195	+ {
	3196	+ if (toParent != null)
	3197	+ {
	3198	+ for (int i=Size(); --i>=0;)
	3199	+ {
	3200	+ Object3D v = get(i);
	3201	+
	3202	+ if (v.toParent == null)
	3203	+ {
	3204	+ v.toParent = LA.newMatrix();
	3205	+ v.fromParent = LA.newMatrix();
	3206	+ }
	3207	+
	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);
	3212	+ }
	3213	+
	3214	+ toParent = null; // LA.matIdentity(toParent);
	3215	+ fromParent = null; // LA.matIdentity(fromParent);
	3216	+
	3217	+ Touch();
	3218	+ }
	3219	+ }
	3220	+
2985	3221	void TransformGeometry()
2986	3222	{
2987	3223	Object3D obj = this;
..	..	@@ -3203,9 +3439,11 @@
3203	3439
3204	3440	BoundaryRep sup = bRep.support;
3205	3441	bRep.support = null;
3206		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3442	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3207	3443	// bRep.SplitInTwo(onlyone); // thread...
3208		- temprep.SplitInTwo(reduction34, onlyone);
	3444	+
	3445	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3446	+
3209	3447	bRep = temprep;
3210	3448	bRep.support = sup;
3211	3449	Touch();
..	..	@@ -3342,7 +3580,8 @@
3342	3580	if (blockloop)
3343	3581	return;
3344	3582
3345		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3346	3585	live = h;
3347	3586
3348	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,7 +3602,8 @@
3363	3602	return;
3364	3603
3365	3604	//if (bRep != null)
3366		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3367	3607	link2master = h;
3368	3608
3369	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3383,7 +3623,8 @@
3383	3623	if (blockloop)
3384	3624	return;
3385	3625
3386		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3387	3628	hide = h;
3388	3629
3389	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3403,7 +3644,7 @@
3403	3644	if (blockloop)
3404	3645	return;
3405	3646
3406		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3407	3648	marked = h;
3408	3649
3409	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3413,6 +3654,46 @@
3413	3654	continue;
3414	3655	blockloop = true;
3415	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);
3416	3697	blockloop = false;
3417	3698	// release(i);
3418	3699	}
..	..	@@ -3727,7 +4008,7 @@
3727	4008	if (child == null)
3728	4009	continue;
3729	4010
3730		- if (GrafreeD.RENDERME > 0)
	4011	+ if (Grafreed.RENDERME > 0)
3731	4012	{
3732	4013	if (child instanceof Merge)
3733	4014	((Merge)child).renderme();
..	..	@@ -3878,7 +4159,7 @@
3878	4159	if (child == null)
3879	4160	continue;
3880	4161
3881		- if (GrafreeD.RENDERME > 0)
	4162	+ if (Grafreed.RENDERME > 0)
3882	4163	{
3883	4164	if (child instanceof Merge)
3884	4165	((Merge)child).renderme();
..	..	@@ -4073,7 +4354,7 @@
4073	4354	if (child == null)
4074	4355	continue;
4075	4356
4076		- if (GrafreeD.RENDERME > 0)
	4357	+ if (Grafreed.RENDERME > 0)
4077	4358	{
4078	4359	if (child instanceof Merge)
4079	4360	((Merge)child).renderme();
..	..	@@ -4186,6 +4467,55 @@
4186	4467	{
4187	4468	blockloop = true;
4188	4469	get(i).RepairShadow();
	4470	+ blockloop = false;
	4471	+ }
	4472	+ }
	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();
4189	4519	blockloop = false;
4190	4520	}
4191	4521	}
..	..	@@ -4680,7 +5010,7 @@
4680	5010
4681	5011	cTreePath SelectLeaf(int indexcount, boolean deselect)
4682	5012	{
4683		- if (hide)
	5013	+ if (hide \|\| dontselect)
4684	5014	return null;
4685	5015
4686	5016	if (count <= 0)
..	..	@@ -4704,9 +5034,17 @@
4704	5034	}
4705	5035	}
4706	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4707	5045	cTreePath Select(int indexcount, boolean deselect)
4708	5046	{
4709		- if (hide)
	5047	+ if (hide \|\| dontselect)
4710	5048	return null;
4711	5049
4712	5050	if (count <= 0)
..	..	@@ -4740,10 +5078,11 @@
4740	5078	if (leaf != null)
4741	5079	{
4742	5080	cTreePath tp = new cTreePath(this, leaf);
4743		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4744	5083	{
4745	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4746		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4747	5086	}
4748	5087
4749	5088	return tp;
..	..	@@ -4760,6 +5099,7 @@
4760	5099
4761	5100	if (child == null)
4762	5101	continue;
	5102	+
4763	5103	if (child.HasTransparency() && child.size() != 0)
4764	5104	{
4765	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4769,9 +5109,10 @@
4769	5109	if (leaf != null)
4770	5110	{
4771	5111	cTreePath tp = new cTreePath(this, leaf);
4772		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4773	5114	{
4774		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4775	5116	}
4776	5117
4777	5118	return tp;
..	..	@@ -5096,6 +5437,51 @@
5096	5437	blockloop = false;
5097	5438	}
5098	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	+
5099	5485	boolean IsSelected()
5100	5486	{
5101	5487	if (parent == null)
..	..	@@ -5158,10 +5544,34 @@
5158	5544
5159	5545	// System.out.println("Fullname = " + fullname);
5160	5546
5161		- if (fullname.name.indexOf(":") == -1)
5162		- return fullname.name;
	5547	+ // Does not work on Windows due to C:
	5548	+// if (fullname.name.indexOf(":") == -1)
	5549	+// return fullname.name;
	5550	+//
	5551	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5163	5552
5164		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5553	+ String[] split = fullname.name.split(":");
	5554	+
	5555	+ if (split.length == 0)
	5556	+ {
	5557	+ return "";
	5558	+ }
	5559	+
	5560	+ if (split.length <= 2)
	5561	+ {
	5562	+ if (fullname.name.endsWith(":"))
	5563	+ {
	5564	+ // Windows
	5565	+ return fullname.name.substring(0, fullname.name.length()-1);
	5566	+ }
	5567	+
	5568	+ return split[0];
	5569	+ }
	5570	+
	5571	+ // Windows
	5572	+ assert(split.length == 4);
	5573	+
	5574	+ return split[0] + ":" + split[1];
5165	5575	}
5166	5576
5167	5577	static String GetBump(cTexture fullname)
..	..	@@ -5170,10 +5580,38 @@
5170	5580	return "";
5171	5581
5172	5582	// System.out.println("Fullname = " + fullname);
5173		- if (fullname.name.indexOf(":") == -1)
5174		- return "";
5175		-
5176		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5583	+ // Does not work on Windows due to C:
	5584	+// if (fullname.name.indexOf(":") == -1)
	5585	+// return "";
	5586	+//
	5587	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5588	+ String[] split = fullname.name.split(":");
	5589	+
	5590	+ if (split.length == 0)
	5591	+ {
	5592	+ return "";
	5593	+ }
	5594	+
	5595	+ if (split.length == 1)
	5596	+ {
	5597	+ return "";
	5598	+ }
	5599	+
	5600	+ if (split.length == 2)
	5601	+ {
	5602	+ if (fullname.name.endsWith(":"))
	5603	+ {
	5604	+ // Windows
	5605	+ return "";
	5606	+ }
	5607	+
	5608	+ return split[1];
	5609	+ }
	5610	+
	5611	+ // Windows
	5612	+ assert(split.length == 4);
	5613	+
	5614	+ return split[2] + ":" + split[3];
5177	5615	}
5178	5616
5179	5617	String GetPigmentTexture()
..	..	@@ -5247,7 +5685,7 @@
5247	5685	System.out.print("; textures = " + textures);
5248	5686	System.out.println("; usedtextures = " + usedtextures);
5249	5687
5250		- if (GetTextures() == null)
	5688	+ if (GetTextures() == null) // What is that??
5251	5689	GetTextures().name = ":";
5252	5690
5253	5691	String texname = tex;
..	..	@@ -5278,6 +5716,43 @@
5278	5716	child.ResetPigmentTexture();
5279	5717	blockloop = false;
5280	5718	}
	5719	+ }
	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;
5281	5756	}
5282	5757
5283	5758	void SetBumpTexture(String tex)
..	..	@@ -5316,6 +5791,38 @@
5316	5791	}
5317	5792	}
5318	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	+
5319	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5320	5827	{
5321	5828	Draw(display, root, selected, blocked);
..	..	@@ -5324,12 +5831,23 @@
5324	5831	boolean NeedSupport()
5325	5832	{
5326	5833	return
5327		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5328	5835	// PROBLEM with CROWD!!
5329		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5836	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5330	5837	}
5331	5838
5332	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	+ }
5333	5851
5334	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5853	{
..	..	@@ -5341,7 +5859,7 @@
5341	5859	}
5342	5860
5343	5861	if (display.DrawMode() == iCameraPane.SELECTION &&
5344		- hide)
	5862	+ (hide \|\| dontselect))
5345	5863	return;
5346	5864
5347	5865	if (name != null && name.contains("sclera"))
..	..	@@ -5392,7 +5910,7 @@
5392	5910	support = support;
5393	5911
5394	5912	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395		- 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);
5396	5914
5397	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	5916	{
..	..	@@ -5412,10 +5930,12 @@
5412	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5931
5414	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415		- (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)))
5416	5935	{
5417	5936	Globals.lighttouched = true;
5418	5937	} // all panes...
	5938	+
5419	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5420	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5543,6 +6063,7 @@
5543	6063	if (GetBRep() != null)
5544	6064	{
5545	6065	display.NextIndex();
	6066	+
5546	6067	// vertex color conflict : gl.glCallList(list);
5547	6068	DrawNode(display, root, selected);
5548	6069	if (this instanceof BezierPatch)
..	..	@@ -5583,7 +6104,28 @@
5583	6104	tex = GetTextures();
5584	6105	}
5585	6106
5586		- 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	+ }
5587	6129
5588	6130	if (!compiled)
5589	6131	{
..	..	@@ -5605,7 +6147,11 @@
5605	6147	}
5606	6148	}
5607	6149
5608		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5609	6155
5610	6156	display.PopMaterial(this, selected);
5611	6157	}
..	..	@@ -5734,6 +6280,9 @@
5734	6280
5735	6281	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5736	6282	{
	6283	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6284	+ return;
	6285	+
5737	6286	if (hide)
5738	6287	return;
5739	6288	// shadow optimisation
..	..	@@ -5859,6 +6408,9 @@
5859	6408	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5860	6409	return; // no shadow for transparent objects
5861	6410
	6411	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6412	+ return;
	6413	+
5862	6414	if (hide)
5863	6415	return;
5864	6416
..	..	@@ -5972,6 +6524,11 @@
5972	6524	// dec 2012
5973	6525	new Exception().printStackTrace();
5974	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
5975	6532	}
5976	6533
5977	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6757,20 +7314,23 @@
6757	7314	}
6758	7315	}
6759	7316
6760		- 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)
6761	7321	{
6762		- int hc = info.bounds.x + info.bounds.width / 2;
6763		- int vc = info.bounds.y + info.bounds.height / 2;
6764		- 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;
6765	7325	if (toscreen == null)
6766	7326	{
6767		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6768	7328	}
6769	7329	cVector vec = in;
6770	7330	LA.xformPos(in, toscreen, in);
6771	7331	//System.out.println("Distance = " + info.camera.Distance());
6772		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6773		- 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();
6774	7334	outPt.x = hc + (int) vec.x;
6775	7335	outPt.y = vc - (int) vec.y;
6776	7336	outRec.x = outPt.x - 3;
..	..	@@ -6778,15 +7338,18 @@
6778	7338	outRec.width = outRec.height = 6;
6779	7339	}
6780	7340
6781		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6782	7343	{
6783	7344	Point pt = new Point(0, 0);
6784	7345	Rectangle rec = new Rectangle();
6785		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6786	7348	return rec;
6787	7349	}
6788	7350
6789		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
6790	7353	{
6791	7354	if (level == 0)
6792	7355	{
..	..	@@ -6795,16 +7358,19 @@
6795	7358	{
6796	7359	cVector origin = new cVector();
6797	7360	//LA.xformPos(origin, toParent, origin);
6798		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6799	7365	Rectangle boundary = new Rectangle();
6800	7366	boundary.x = spot.x - 30;
6801	7367	boundary.y = spot.y - 30;
6802	7368	boundary.width = spot.width + 60;
6803	7369	boundary.height = spot.height + 60;
6804		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
6805	7371	int spotw = spot.x + spot.width;
6806	7372	int spoth = spot.y + spot.height;
6807		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6808	7374	// if (CameraPane.Xmin > spot.x)
6809	7375	// {
6810	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -6824,8 +7390,8 @@
6824	7390	spot.translate(32, 32);
6825	7391	spotw = spot.x + spot.width;
6826	7392	spoth = spot.y + spot.height;
6827		- info.g.setColor(Color.blue);
6828		- 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);
6829	7395	// if (CameraPane.Xmin > spot.x)
6830	7396	// {
6831	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -6842,11 +7408,12 @@
6842	7408	// {
6843	7409	// CameraPane.Ymax = spoth;
6844	7410	// }
6845		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6846		- 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
6847	7413	spot.translate(0, -32);
6848		- info.g.setColor(Color.green);
6849		- 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);
6850	7417	// if (CameraPane.Xmin > spot.x)
6851	7418	// {
6852	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -6863,8 +7430,8 @@
6863	7430	// {
6864	7431	// CameraPane.Ymax = spoth;
6865	7432	// }
6866		- info.g.drawArc(boundary.x, boundary.y,
6867		- 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);
6868	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6869	7436	// if (CameraPane.Xmin > boundary.x)
6870	7437	// {
..	..	@@ -6886,7 +7453,8 @@
6886	7453	}
6887	7454	}
6888	7455
6889		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
6890	7458	{
6891	7459	if (level == 0)
6892	7460	{
..	..	@@ -6895,10 +7463,10 @@
6895	7463
6896	7464	boolean retval = false;
6897	7465
6898		- startX = info.x;
6899		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
6900	7468
6901		- hitSomething = 0;
	7469	+ hitSomething = -1;
6902	7470	cVector origin = new cVector();
6903	7471	//LA.xformPos(origin, toParent, origin);
6904	7472	Rectangle spot = new Rectangle();
..	..	@@ -6906,22 +7474,51 @@
6906	7474	{
6907	7475	centerPt = new Point(0, 0);
6908	7476	}
6909		- calcHotSpot(origin, info, centerPt, spot);
6910		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
6911	7480	{
6912	7481	hitSomething = hitCenter;
6913	7482	retval = true;
6914	7483	}
6915	7484	spot.translate(32, 0);
6916		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
6917	7486	{
6918	7487	hitSomething = hitRotate;
6919	7488	retval = true;
6920	7489	}
6921	7490	spot.translate(0, 32);
6922		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
6923	7492	{
6924	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	+
6925	7522	retval = true;
6926	7523	}
6927	7524
..	..	@@ -6931,7 +7528,7 @@
6931	7528	}
6932	7529
6933	7530	//System.out.println("info.modifiers = " + info.modifiers);
6934		- modified = (info.modifiers & CameraPane.META) != 0;
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6935	7532	//System.out.println("modified = " + modified);
6936	7533	//new Exception().printStackTrace();
6937	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6959,7 +7556,8 @@
6959	7556	return true;
6960	7557	}
6961	7558
6962		- void doEditDrag0(ClickInfo info)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
6963	7561	{
6964	7562	if (hitSomething == 0)
6965	7563	{
..	..	@@ -6973,7 +7571,8 @@
6973	7571
6974	7572	//System.out.println("hitSomething = " + hitSomething);
6975	7573
6976		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
	7575	+
6977	7576	cVector xlate = new cVector();
6978	7577	//cVector xlate2 = new cVector();
6979	7578	switch (hitSomething)
..	..	@@ -6986,7 +7585,7 @@
6986	7585
6987	7586	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6988	7587
6989		- if (modified)
	7588	+ if (modified \|\| opposite)
6990	7589	{
6991	7590	//assert(false);
6992	7591	/*
..	..	@@ -7006,8 +7605,8 @@
7006	7605	toParent[3][i] = xlate.get(i);
7007	7606	LA.matInvert(toParent, fromParent);
7008	7607	*/
7009		- cVector delta = LA.newVector(0, 0, startY - info.y);
7010		- 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);
7011	7610
7012	7611	LA.matCopy(startMat, toParent);
7013	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7016,7 +7615,7 @@
7016	7615	} else
7017	7616	{
7018	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7019		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7020	7619	cVector away = new cVector();
7021	7620	//cVector right2 = new cVector();
7022	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7033,19 +7632,19 @@
7033	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7034	7633	// if (!CameraPane.LOCALTRANSFORM)
7035	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7036		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7037	7636	// if (!CameraPane.LOCALTRANSFORM)
7038	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7039	7638	//LA.vecCross(up, cVector.Z, right2);
7040	7639
7041		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7042	7641
7043	7642	//System.out.println("DELTA0 = " + delta);
7044	7643	//System.out.println("AWAY = " + info.camera.away);
7045	7644	//System.out.println("UP = " + info.camera.up);
7046	7645	if (away.z > 0)
7047	7646	{
7048		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7049	7648	{
7050	7649	delta.x = -delta.x;
7051	7650	} else
..	..	@@ -7060,7 +7659,7 @@
7060	7659	//System.out.println("DELTA1 = " + delta);
7061	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7062	7661	//System.out.println("DELTA2 = " + delta);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	7663	LA.matCopy(startMat, toParent);
7065	7664	//System.out.println("DELTA3 = " + delta);
7066	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7070,8 +7669,8 @@
7070	7669	break;
7071	7670
7072	7671	case hitRotate: // rotate
7073		- int dx = info.x - centerPt.x;
7074		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7075	7674	double angle = (double) Math.atan2(dx, dy);
7076	7675	angle = -(1.570796 - angle);
7077	7676
..	..	@@ -7080,6 +7679,7 @@
7080	7679
7081	7680	if (modified)
7082	7681	{
	7682	+ // Rotate 90 degrees
7083	7683	angle /= (Math.PI / 4);
7084	7684	angle = Math.floor(angle + 0.5);
7085	7685	angle *= (Math.PI / 4);
..	..	@@ -7093,7 +7693,7 @@
7093	7693	}
7094	7694	/**/
7095	7695
7096		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7097	7697	{
7098	7698	case 1: // '\001'
7099	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7120,26 +7720,30 @@
7120	7720	break;
7121	7721
7122	7722	case hitScale: // scale
7123		- 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);
7124	7730	if (hScale < 0.01)
7125	7731	{
7126		- hScale = 0.01;
	7732	+ //hScale = 0.01;
7127	7733	}
7128		- hScale = Math.pow(hScale, scale * 50);
7129		- if (hScale < 0.01)
	7734	+
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7736	+ sign = 1;
	7737	+ if (vScale < 0)
7130	7738	{
7131		- hScale = 0.01;
	7739	+ sign = -1;
7132	7740	}
7133		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ vScale = signMath.pow(signvScale, scale * 50);
7134	7742	if (vScale < 0.01)
7135	7743	{
7136		- vScale = 0.01;
	7744	+ //vScale = 0.01;
7137	7745	}
7138		- vScale = Math.pow(vScale, scale * 50);
7139		- if (vScale < 0.01)
7140		- {
7141		- vScale = 0.01;
7142		- }
	7746	+
7143	7747	LA.matCopy(startMat, toParent);
7144	7748	/**/
7145	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7149,39 +7753,47 @@
7149	7753	}
7150	7754	/**/
7151	7755
7152		- 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)
7153	7764	{
7154	7765	case 3: // '\001'
7155		- if (modified)
	7766	+ if (modified \|\| opposite)
7156	7767	{
7157	7768	//LA.matScale(toParent, 1, hScale, vScale);
7158		- LA.matScale(toParent, vScale, 1, 1);
	7769	+ LA.matScale(toParent, totalScale, 1, 1);
7159	7770	} // vScale, 1);
7160	7771	else
7161	7772	{
7162		- LA.matScale(toParent, vScale, vScale, vScale);
	7773	+ // EXCEPTION!
	7774	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7163	7775	} // vScale, 1);
7164	7776	break;
7165	7777
7166	7778	case 2: // '\002'
7167		- if (modified)
	7779	+ if (modified \|\| opposite)
7168	7780	{
7169	7781	//LA.matScale(toParent, hScale, 1, vScale);
7170		- LA.matScale(toParent, 1, vScale, 1);
	7782	+ LA.matScale(toParent, 1, totalScale, 1);
7171	7783	} else
7172	7784	{
7173		- LA.matScale(toParent, vScale, 1, vScale);
	7785	+ LA.matScale(toParent, totalScale, 1, totalScale);
7174	7786	}
7175	7787	break;
7176	7788
7177	7789	case 1: // '\003'
7178		- if (modified)
	7790	+ if (modified \|\| opposite)
7179	7791	{
7180	7792	//LA.matScale(toParent, hScale, vScale, 1);
7181		- LA.matScale(toParent, 1, 1, vScale);
	7793	+ LA.matScale(toParent, 1, 1, totalScale);
7182	7794	} else
7183	7795	{
7184		- LA.matScale(toParent, vScale, vScale, 1);
	7796	+ LA.matScale(toParent, totalScale, totalScale, 1);
7185	7797	}
7186	7798	break;
7187	7799	}
..	..	@@ -7215,7 +7827,7 @@
7215	7827	} // NEW ...
7216	7828
7217	7829
7218		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7219	7831	}
7220	7832
7221	7833	boolean overflow = false;
..	..	@@ -7314,14 +7926,22 @@
7314	7926	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7315	7927	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7316	7928	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7929	+
	7930	+ String objname;
	7931	+
7317	7932	if (false) //parent != null)
7318	7933	{
7319		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7934	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7320	7935	} else
7321	7936	{
7322		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7937	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7323	7938	} // + super.toString();
7324	7939	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7940	+
	7941	+ if (!Globals.ADVANCED)
	7942	+ return objname;
	7943	+
	7944	+ return objname + " " + System.identityHashCode(this);
7325	7945	}
7326	7946
7327	7947	public int hashCode()
..	..	@@ -7377,6 +7997,7 @@
7377	7997	objectUI.closeUI();
7378	7998	if (editWindow != null)
7379	7999	{
	8000	+ editWindow.ctrlPanel.FlushUI();
7380	8001	editWindow.refreshContents();
7381	8002	} // ? new
7382	8003	objectUI = null;
..	..	@@ -7385,6 +8006,10 @@
7385	8006	{
7386	8007	editWindow = null;
7387	8008	} // ?
	8009	+ }
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
7388	8013	}
7389	8014	}
7390	8015
..	..	@@ -7397,7 +8022,7 @@
7397	8022	/transient/ cVector2[] projectedVertices = new cVector2[0];
7398	8023
7399	8024	Object3D /Composite/ parent;
7400		- Object3D /Composite/ fileparent;
	8025	+ Object3D /Composite/ fileparent; // In the case of FileObject
7401	8026
7402	8027	double[][] toParent; // dynamic matrix
7403	8028	double[][] fromParent;
..	..	@@ -7512,7 +8137,7 @@
7512	8137	{
7513	8138	assert(bRep != null);
7514	8139	if (!(support instanceof GenericJoint)) // support.bRep != null)
7515		- GrafreeD.Assert(support.bRep == bRep.support);
	8140	+ Grafreed.Assert(support.bRep == bRep.support);
7516	8141	}
7517	8142	else
7518	8143	{
..	..	@@ -7543,6 +8168,10 @@
7543	8168	}
7544	8169
7545	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7546	8175	transient ObjectUI objectUI;
7547	8176	public static int povDepth = 0;
7548	8177	private static cVector tbMin = new cVector();
..	..	@@ -7561,9 +8190,9 @@
7561	8190	private static cVector edge2 = new cVector();
7562	8191	//private static cVector norm = new cVector();
7563	8192	/transient private/ int hitSomething;
7564		- private static final int hitCenter = 1;
7565		- private static final int hitScale = 2;
7566		- private static final int hitRotate = 3;
	8193	+ static final int hitCenter = 1;
	8194	+ static final int hitScale = 2;
	8195	+ static final int hitRotate = 3;
7567	8196	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7568	8197	/transient/ private Point centerPt;
7569	8198	/transient/ private int startX;