~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)
..	..	@@ -5157,12 +5574,41 @@
5157	5574	if (fullname == null)
5158	5575	return "";
5159	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5160	5582	// System.out.println("Fullname = " + fullname);
5161	5583
5162		- if (fullname.name.indexOf(":") == -1)
5163		- return fullname.name;
	5584	+ // Does not work on Windows due to C:
	5585	+// if (fullname.name.indexOf(":") == -1)
	5586	+// return fullname.name;
	5587	+//
	5588	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5164	5589
5165		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5590	+ String[] split = fullname.name.split(":");
	5591	+
	5592	+ if (split.length == 0)
	5593	+ {
	5594	+ return fullname.pigment = "";
	5595	+ }
	5596	+
	5597	+ if (split.length <= 2)
	5598	+ {
	5599	+ if (fullname.name.endsWith(":"))
	5600	+ {
	5601	+ // Windows
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5603	+ }
	5604	+
	5605	+ return fullname.pigment = split[0];
	5606	+ }
	5607	+
	5608	+ // Windows
	5609	+ assert(split.length == 4);
	5610	+
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5166	5612	}
5167	5613
5168	5614	static String GetBump(cTexture fullname)
..	..	@@ -5170,11 +5616,44 @@
5170	5616	if (fullname == null)
5171	5617	return "";
5172	5618
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
	5623	+
5173	5624	// System.out.println("Fullname = " + fullname);
5174		- if (fullname.name.indexOf(":") == -1)
5175		- return "";
5176		-
5177		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5625	+ // Does not work on Windows due to C:
	5626	+// if (fullname.name.indexOf(":") == -1)
	5627	+// return "";
	5628	+//
	5629	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5630	+ String[] split = fullname.name.split(":");
	5631	+
	5632	+ if (split.length == 0)
	5633	+ {
	5634	+ return fullname.bump = "";
	5635	+ }
	5636	+
	5637	+ if (split.length == 1)
	5638	+ {
	5639	+ return fullname.bump = "";
	5640	+ }
	5641	+
	5642	+ if (split.length == 2)
	5643	+ {
	5644	+ if (fullname.name.endsWith(":"))
	5645	+ {
	5646	+ // Windows
	5647	+ return fullname.bump = "";
	5648	+ }
	5649	+
	5650	+ return fullname.bump = split[1];
	5651	+ }
	5652	+
	5653	+ // Windows
	5654	+ assert(split.length == 4);
	5655	+
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5178	5657	}
5179	5658
5180	5659	String GetPigmentTexture()
..	..	@@ -5248,7 +5727,7 @@
5248	5727	System.out.print("; textures = " + textures);
5249	5728	System.out.println("; usedtextures = " + usedtextures);
5250	5729
5251		- if (GetTextures() == null)
	5730	+ if (GetTextures() == null) // What is that??
5252	5731	GetTextures().name = ":";
5253	5732
5254	5733	String texname = tex;
..	..	@@ -5257,6 +5736,9 @@
5257	5736	texname = "";
5258	5737
5259	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5260	5742	Touch();
5261	5743	}
5262	5744
..	..	@@ -5281,6 +5763,43 @@
5281	5763	}
5282	5764	}
5283	5765
	5766	+ UUID GetUUID()
	5767	+ {
	5768	+ if (uuid == null)
	5769	+ {
	5770	+ // Serial
	5771	+ uuid = UUID.randomUUID();
	5772	+ }
	5773	+
	5774	+ return uuid;
	5775	+ }
	5776	+
	5777	+ Object3D GetObject(UUID uid)
	5778	+ {
	5779	+ if (blockloop)
	5780	+ return null;
	5781	+
	5782	+ if (GetUUID().equals(uid))
	5783	+ return this;
	5784	+
	5785	+ int nb = Size();
	5786	+ for (int i = 0; i < nb; i++)
	5787	+ {
	5788	+ Object3D child = (Object3D) get(i);
	5789	+
	5790	+ if (child == null)
	5791	+ continue;
	5792	+
	5793	+ blockloop = true;
	5794	+ Object3D obj = child.GetObject(uid);
	5795	+ blockloop = false;
	5796	+ if (obj != null)
	5797	+ return obj;
	5798	+ }
	5799	+
	5800	+ return null;
	5801	+ }
	5802	+
5284	5803	void SetBumpTexture(String tex)
5285	5804	{
5286	5805	if (GetTextures() == null)
..	..	@@ -5292,6 +5811,8 @@
5292	5811	texname = "";
5293	5812
5294	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5814	+
	5815	+ GetTextures().bump = null;
5295	5816
5296	5817	Touch();
5297	5818	}
..	..	@@ -5317,6 +5838,38 @@
5317	5838	}
5318	5839	}
5319	5840
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
	5869	+ blockloop = false;
	5870	+ }
	5871	+ }
	5872	+
5320	5873	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5321	5874	{
5322	5875	Draw(display, root, selected, blocked);
..	..	@@ -5325,12 +5878,23 @@
5325	5878	boolean NeedSupport()
5326	5879	{
5327	5880	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5881	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5329	5882	// PROBLEM with CROWD!!
5330		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5883	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5884	}
5332	5885
5333	5886	static boolean DEBUG_SELECTION = false;
	5887	+
	5888	+ boolean IsLive()
	5889	+ {
	5890	+ if (live)
	5891	+ return true;
	5892	+
	5893	+ if (parent == null)
	5894	+ return false;
	5895	+
	5896	+ return parent.IsLive();
	5897	+ }
5334	5898
5335	5899	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5336	5900	{
..	..	@@ -5342,7 +5906,7 @@
5342	5906	}
5343	5907
5344	5908	if (display.DrawMode() == iCameraPane.SELECTION &&
5345		- hide)
	5909	+ (hide \|\| dontselect))
5346	5910	return;
5347	5911
5348	5912	if (name != null && name.contains("sclera"))
..	..	@@ -5392,8 +5956,10 @@
5392	5956	if (support != null)
5393	5957	support = support;
5394	5958
5395		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5397	5963
5398	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5399	5965	{
..	..	@@ -5403,8 +5969,9 @@
5403	5969	// usecalllists &= !(parent instanceof RandomNode);
5404	5970	// usecalllists = false;
5405	5971
5406		- if (GetBRep() != null)
5407		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5408	5975	//System.out.println("draw " + this);
5409	5976	//new Exception().printStackTrace();
5410	5977
..	..	@@ -5413,10 +5980,12 @@
5413	5980	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5414	5981
5415	5982	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5416		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5983	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5984	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5417	5985	{
5418	5986	Globals.lighttouched = true;
5419	5987	} // all panes...
	5988	+
5420	5989	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5421	5990	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5422	5991	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5424,7 +5993,7 @@
5424	5993	if (!(this instanceof Composite))
5425	5994	touched = false;
5426	5995	//if (displaylist == -1 && usecalllists)
5427		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5428	5997	{
5429	5998	bRep.displaylist = display.GenList();
5430	5999	assert(bRep.displaylist != 0);
..	..	@@ -5435,7 +6004,7 @@
5435	6004
5436	6005	//System.out.println("\tnew list " + list);
5437	6006	//gl.glDrawBuffer(gl.GL_NONE);
5438		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5439	6008	{
5440	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5441	6010	display.NewList(bRep.displaylist);
..	..	@@ -5444,7 +6013,7 @@
5444	6013	CallList(display, root, selected, blocked);
5445	6014
5446	6015	// compiled = true;
5447		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5448	6017	{
5449	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5450	6019	display.EndList();
..	..	@@ -5544,6 +6113,7 @@
5544	6113	if (GetBRep() != null)
5545	6114	{
5546	6115	display.NextIndex();
	6116	+
5547	6117	// vertex color conflict : gl.glCallList(list);
5548	6118	DrawNode(display, root, selected);
5549	6119	if (this instanceof BezierPatch)
..	..	@@ -5584,7 +6154,28 @@
5584	6154	tex = GetTextures();
5585	6155	}
5586	6156
5587		- display.BindTextures(tex, texres);
	6157	+ boolean failedPigment = false;
	6158	+ boolean failedBump = false;
	6159	+
	6160	+ try
	6161	+ {
	6162	+ display.BindPigmentTexture(tex, texres);
	6163	+ }
	6164	+ catch (Exception e)
	6165	+ {
	6166	+ System.err.println("FAILED: " + this);
	6167	+ failedPigment = true;
	6168	+ }
	6169	+
	6170	+ try
	6171	+ {
	6172	+ display.BindBumpTexture(tex, texres);
	6173	+ }
	6174	+ catch (Exception e)
	6175	+ {
	6176	+ //System.err.println("FAILED: " + this);
	6177	+ failedBump = true;
	6178	+ }
5588	6179
5589	6180	if (!compiled)
5590	6181	{
..	..	@@ -5606,7 +6197,11 @@
5606	6197	}
5607	6198	}
5608	6199
5609		- display.ReleaseTextures(tex);
	6200	+ if (!failedBump)
	6201	+ display.ReleaseBumpTexture(tex);
	6202	+
	6203	+ if (!failedPigment)
	6204	+ display.ReleasePigmentTexture(tex);
5610	6205
5611	6206	display.PopMaterial(this, selected);
5612	6207	}
..	..	@@ -5735,6 +6330,9 @@
5735	6330
5736	6331	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5737	6332	{
	6333	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6334	+ return;
	6335	+
5738	6336	if (hide)
5739	6337	return;
5740	6338	// shadow optimisation
..	..	@@ -5860,6 +6458,9 @@
5860	6458	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5861	6459	return; // no shadow for transparent objects
5862	6460
	6461	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6462	+ return;
	6463	+
5863	6464	if (hide)
5864	6465	return;
5865	6466
..	..	@@ -5973,6 +6574,11 @@
5973	6574	// dec 2012
5974	6575	new Exception().printStackTrace();
5975	6576	return;
	6577	+ }
	6578	+
	6579	+ if (dontselect)
	6580	+ {
	6581	+ //bRep.GenerateNormalsMINE();
5976	6582	}
5977	6583
5978	6584	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6758,20 +7364,23 @@
6758	7364	}
6759	7365	}
6760	7366
6761		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
6762	7371	{
6763		- int hc = info.bounds.x + info.bounds.width / 2;
6764		- int vc = info.bounds.y + info.bounds.height / 2;
6765		- double[][] toscreen = info.toScreen;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
6766	7375	if (toscreen == null)
6767	7376	{
6768		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6769	7378	}
6770	7379	cVector vec = in;
6771	7380	LA.xformPos(in, toscreen, in);
6772	7381	//System.out.println("Distance = " + info.camera.Distance());
6773		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6774		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6775	7384	outPt.x = hc + (int) vec.x;
6776	7385	outPt.y = vc - (int) vec.y;
6777	7386	outRec.x = outPt.x - 3;
..	..	@@ -6779,15 +7388,18 @@
6779	7388	outRec.width = outRec.height = 6;
6780	7389	}
6781	7390
6782		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
6783	7393	{
6784	7394	Point pt = new Point(0, 0);
6785	7395	Rectangle rec = new Rectangle();
6786		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
6787	7398	return rec;
6788	7399	}
6789	7400
6790		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
6791	7403	{
6792	7404	if (level == 0)
6793	7405	{
..	..	@@ -6796,16 +7408,19 @@
6796	7408	{
6797	7409	cVector origin = new cVector();
6798	7410	//LA.xformPos(origin, toParent, origin);
6799		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6800	7415	Rectangle boundary = new Rectangle();
6801	7416	boundary.x = spot.x - 30;
6802	7417	boundary.y = spot.y - 30;
6803	7418	boundary.width = spot.width + 60;
6804	7419	boundary.height = spot.height + 60;
6805		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.red);
6806	7421	int spotw = spot.x + spot.width;
6807	7422	int spoth = spot.y + spot.height;
6808		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6809	7424	// if (CameraPane.Xmin > spot.x)
6810	7425	// {
6811	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -6822,11 +7437,33 @@
6822	7437	// {
6823	7438	// CameraPane.Ymax = spoth;
6824	7439	// }
6825		- spot.translate(32, 32);
	7440	+// if (CameraPane.Xmin > spot.x)
	7441	+// {
	7442	+// CameraPane.Xmin = spot.x;
	7443	+// }
	7444	+// if (CameraPane.Xmax < spotw)
	7445	+// {
	7446	+// CameraPane.Xmax = spotw;
	7447	+// }
	7448	+// if (CameraPane.Ymin > spot.y)
	7449	+// {
	7450	+// CameraPane.Ymin = spot.y;
	7451	+// }
	7452	+// if (CameraPane.Ymax < spoth)
	7453	+// {
	7454	+// CameraPane.Ymax = spoth;
	7455	+// }
	7456	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7457	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
6826	7463	spotw = spot.x + spot.width;
6827	7464	spoth = spot.y + spot.height;
6828		- info.g.setColor(Color.blue);
6829		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6830	7467	// if (CameraPane.Xmin > spot.x)
6831	7468	// {
6832	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -6843,29 +7480,9 @@
6843	7480	// {
6844	7481	// CameraPane.Ymax = spoth;
6845	7482	// }
6846		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6847		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6848		- spot.translate(0, -32);
6849		- info.g.setColor(Color.green);
6850		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6851		-// if (CameraPane.Xmin > spot.x)
6852		-// {
6853		-// CameraPane.Xmin = spot.x;
6854		-// }
6855		-// if (CameraPane.Xmax < spotw)
6856		-// {
6857		-// CameraPane.Xmax = spotw;
6858		-// }
6859		-// if (CameraPane.Ymin > spot.y)
6860		-// {
6861		-// CameraPane.Ymin = spot.y;
6862		-// }
6863		-// if (CameraPane.Ymax < spoth)
6864		-// {
6865		-// CameraPane.Ymax = spoth;
6866		-// }
6867		- info.g.drawArc(boundary.x, boundary.y,
6868		- boundary.width, boundary.height, 0, 360);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6869	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6870	7487	// if (CameraPane.Xmin > boundary.x)
6871	7488	// {
..	..	@@ -6887,7 +7504,8 @@
6887	7504	}
6888	7505	}
6889	7506
6890		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
6891	7509	{
6892	7510	if (level == 0)
6893	7511	{
..	..	@@ -6896,10 +7514,10 @@
6896	7514
6897	7515	boolean retval = false;
6898	7516
6899		- startX = info.x;
6900		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
6901	7519
6902		- hitSomething = 0;
	7520	+ hitSomething = -1;
6903	7521	cVector origin = new cVector();
6904	7522	//LA.xformPos(origin, toParent, origin);
6905	7523	Rectangle spot = new Rectangle();
..	..	@@ -6907,22 +7525,53 @@
6907	7525	{
6908	7526	centerPt = new Point(0, 0);
6909	7527	}
6910		- calcHotSpot(origin, info, centerPt, spot);
6911		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
6912	7531	{
6913	7532	hitSomething = hitCenter;
6914	7533	retval = true;
6915	7534	}
6916	7535	spot.translate(32, 0);
6917		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
6918	7537	{
6919	7538	hitSomething = hitRotate;
6920	7539	retval = true;
6921	7540	}
6922	7541	spot.translate(0, 32);
6923		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
6924	7545	{
6925	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
6926	7575	retval = true;
6927	7576	}
6928	7577
..	..	@@ -6932,7 +7581,7 @@
6932	7581	}
6933	7582
6934	7583	//System.out.println("info.modifiers = " + info.modifiers);
6935		- modified = (info.modifiers & CameraPane.META) != 0;
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6936	7585	//System.out.println("modified = " + modified);
6937	7586	//new Exception().printStackTrace();
6938	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6960,7 +7609,8 @@
6960	7609	return true;
6961	7610	}
6962	7611
6963		- void doEditDrag0(ClickInfo info)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
6964	7614	{
6965	7615	if (hitSomething == 0)
6966	7616	{
..	..	@@ -6974,7 +7624,8 @@
6974	7624
6975	7625	//System.out.println("hitSomething = " + hitSomething);
6976	7626
6977		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
	7628	+
6978	7629	cVector xlate = new cVector();
6979	7630	//cVector xlate2 = new cVector();
6980	7631	switch (hitSomething)
..	..	@@ -6987,7 +7638,7 @@
6987	7638
6988	7639	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6989	7640
6990		- if (modified)
	7641	+ if (modified \|\| opposite)
6991	7642	{
6992	7643	//assert(false);
6993	7644	/*
..	..	@@ -7007,8 +7658,8 @@
7007	7658	toParent[3][i] = xlate.get(i);
7008	7659	LA.matInvert(toParent, fromParent);
7009	7660	*/
7010		- cVector delta = LA.newVector(0, 0, startY - info.y);
7011		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7012	7663
7013	7664	LA.matCopy(startMat, toParent);
7014	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7017,7 +7668,7 @@
7017	7668	} else
7018	7669	{
7019	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7020		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7021	7672	cVector away = new cVector();
7022	7673	//cVector right2 = new cVector();
7023	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7034,19 +7685,19 @@
7034	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7035	7686	// if (!CameraPane.LOCALTRANSFORM)
7036	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7037		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7038	7689	// if (!CameraPane.LOCALTRANSFORM)
7039	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7040	7691	//LA.vecCross(up, cVector.Z, right2);
7041	7692
7042		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7043	7694
7044	7695	//System.out.println("DELTA0 = " + delta);
7045	7696	//System.out.println("AWAY = " + info.camera.away);
7046	7697	//System.out.println("UP = " + info.camera.up);
7047	7698	if (away.z > 0)
7048	7699	{
7049		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7050	7701	{
7051	7702	delta.x = -delta.x;
7052	7703	} else
..	..	@@ -7061,7 +7712,7 @@
7061	7712	//System.out.println("DELTA1 = " + delta);
7062	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7063	7714	//System.out.println("DELTA2 = " + delta);
7064		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7065	7716	LA.matCopy(startMat, toParent);
7066	7717	//System.out.println("DELTA3 = " + delta);
7067	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7071,8 +7722,8 @@
7071	7722	break;
7072	7723
7073	7724	case hitRotate: // rotate
7074		- int dx = info.x - centerPt.x;
7075		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7076	7727	double angle = (double) Math.atan2(dx, dy);
7077	7728	angle = -(1.570796 - angle);
7078	7729
..	..	@@ -7081,6 +7732,7 @@
7081	7732
7082	7733	if (modified)
7083	7734	{
	7735	+ // Rotate 90 degrees
7084	7736	angle /= (Math.PI / 4);
7085	7737	angle = Math.floor(angle + 0.5);
7086	7738	angle *= (Math.PI / 4);
..	..	@@ -7094,7 +7746,7 @@
7094	7746	}
7095	7747	/**/
7096	7748
7097		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7098	7750	{
7099	7751	case 1: // '\001'
7100	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7121,26 +7773,30 @@
7121	7773	break;
7122	7774
7123	7775	case hitScale: // scale
7124		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7777	+ double sign = 1;
	7778	+ if (hScale < 0)
	7779	+ {
	7780	+ sign = -1;
	7781	+ }
	7782	+ hScale = signMath.pow(signhScale, scale * 50);
7125	7783	if (hScale < 0.01)
7126	7784	{
7127		- hScale = 0.01;
	7785	+ //hScale = 0.01;
7128	7786	}
7129		- hScale = Math.pow(hScale, scale * 50);
7130		- if (hScale < 0.01)
	7787	+
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7789	+ sign = 1;
	7790	+ if (vScale < 0)
7131	7791	{
7132		- hScale = 0.01;
	7792	+ sign = -1;
7133	7793	}
7134		- double vScale = (double) (info.y - centerPt.y) / 32;
	7794	+ vScale = signMath.pow(signvScale, scale * 50);
7135	7795	if (vScale < 0.01)
7136	7796	{
7137		- vScale = 0.01;
	7797	+ //vScale = 0.01;
7138	7798	}
7139		- vScale = Math.pow(vScale, scale * 50);
7140		- if (vScale < 0.01)
7141		- {
7142		- vScale = 0.01;
7143		- }
	7799	+
7144	7800	LA.matCopy(startMat, toParent);
7145	7801	/**/
7146	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7150,39 +7806,47 @@
7150	7806	}
7151	7807	/**/
7152	7808
7153		- switch (info.pane.RenderCamera().viewCode)
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7810	+
	7811	+ if (totalScale < 0.01)
	7812	+ {
	7813	+ totalScale = 0.01;
	7814	+ }
	7815	+
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7154	7817	{
7155	7818	case 3: // '\001'
7156		- if (modified)
	7819	+ if (modified \|\| opposite)
7157	7820	{
7158	7821	//LA.matScale(toParent, 1, hScale, vScale);
7159		- LA.matScale(toParent, vScale, 1, 1);
	7822	+ LA.matScale(toParent, totalScale, 1, 1);
7160	7823	} // vScale, 1);
7161	7824	else
7162	7825	{
7163		- LA.matScale(toParent, vScale, vScale, vScale);
	7826	+ // EXCEPTION!
	7827	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7164	7828	} // vScale, 1);
7165	7829	break;
7166	7830
7167	7831	case 2: // '\002'
7168		- if (modified)
	7832	+ if (modified \|\| opposite)
7169	7833	{
7170	7834	//LA.matScale(toParent, hScale, 1, vScale);
7171		- LA.matScale(toParent, 1, vScale, 1);
	7835	+ LA.matScale(toParent, 1, totalScale, 1);
7172	7836	} else
7173	7837	{
7174		- LA.matScale(toParent, vScale, 1, vScale);
	7838	+ LA.matScale(toParent, totalScale, 1, totalScale);
7175	7839	}
7176	7840	break;
7177	7841
7178	7842	case 1: // '\003'
7179		- if (modified)
	7843	+ if (modified \|\| opposite)
7180	7844	{
7181	7845	//LA.matScale(toParent, hScale, vScale, 1);
7182		- LA.matScale(toParent, 1, 1, vScale);
	7846	+ LA.matScale(toParent, 1, 1, totalScale);
7183	7847	} else
7184	7848	{
7185		- LA.matScale(toParent, vScale, vScale, 1);
	7849	+ LA.matScale(toParent, totalScale, totalScale, 1);
7186	7850	}
7187	7851	break;
7188	7852	}
..	..	@@ -7216,7 +7880,7 @@
7216	7880	} // NEW ...
7217	7881
7218	7882
7219		- info.pane.repaint();
	7883	+ clickInfo.pane.repaint();
7220	7884	}
7221	7885
7222	7886	boolean overflow = false;
..	..	@@ -7315,14 +7979,22 @@
7315	7979	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7316	7980	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7317	7981	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7982	+
	7983	+ String objname;
	7984	+
7318	7985	if (false) //parent != null)
7319	7986	{
7320		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7987	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7321	7988	} else
7322	7989	{
7323		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7990	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7324	7991	} // + super.toString();
7325	7992	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7993	+
	7994	+ if (!Globals.ADVANCED)
	7995	+ return objname;
	7996	+
	7997	+ return objname + " " + System.identityHashCode(this);
7326	7998	}
7327	7999
7328	8000	public int hashCode()
..	..	@@ -7378,6 +8050,7 @@
7378	8050	objectUI.closeUI();
7379	8051	if (editWindow != null)
7380	8052	{
	8053	+ editWindow.ctrlPanel.FlushUI();
7381	8054	editWindow.refreshContents();
7382	8055	} // ? new
7383	8056	objectUI = null;
..	..	@@ -7386,6 +8059,10 @@
7386	8059	{
7387	8060	editWindow = null;
7388	8061	} // ?
	8062	+ }
	8063	+ else
	8064	+ {
	8065	+ //editWindow.closeUI();
7389	8066	}
7390	8067	}
7391	8068
..	..	@@ -7398,7 +8075,7 @@
7398	8075	/transient/ cVector2[] projectedVertices = new cVector2[0];
7399	8076
7400	8077	Object3D /Composite/ parent;
7401		- Object3D /Composite/ fileparent;
	8078	+ Object3D /Composite/ fileparent; // In the case of FileObject
7402	8079
7403	8080	double[][] toParent; // dynamic matrix
7404	8081	double[][] fromParent;
..	..	@@ -7513,7 +8190,7 @@
7513	8190	{
7514	8191	assert(bRep != null);
7515	8192	if (!(support instanceof GenericJoint)) // support.bRep != null)
7516		- GrafreeD.Assert(support.bRep == bRep.support);
	8193	+ Grafreed.Assert(support.bRep == bRep.support);
7517	8194	}
7518	8195	else
7519	8196	{
..	..	@@ -7544,6 +8221,10 @@
7544	8221	}
7545	8222
7546	8223	transient ObjEditor editWindow;
	8224	+ transient ObjEditor manipWindow;
	8225	+
	8226	+ transient boolean pinned;
	8227	+
7547	8228	transient ObjectUI objectUI;
7548	8229	public static int povDepth = 0;
7549	8230	private static cVector tbMin = new cVector();
..	..	@@ -7562,9 +8243,9 @@
7562	8243	private static cVector edge2 = new cVector();
7563	8244	//private static cVector norm = new cVector();
7564	8245	/transient private/ int hitSomething;
7565		- private static final int hitCenter = 1;
7566		- private static final int hitScale = 2;
7567		- private static final int hitRotate = 3;
	8246	+ static final int hitCenter = 1;
	8247	+ static final int hitScale = 2;
	8248	+ static final int hitRotate = 3;
7568	8249	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7569	8250	/transient/ private Point centerPt;
7570	8251	/transient/ private int startX;