~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,27 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
22	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ Object3D versions[];
	36	+ int versionindex = -1;
	37	+
23	38	ScriptNode scriptnode;
24	39
25	40	void InitOthers()
..	..	@@ -100,64 +115,178 @@
100	115
101	116	// transient boolean reduced; // for morph reduction
102	117
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	120
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
108	123
109		-void SaveSupports()
110		-{
111		- if (blockloop)
112		- return;
113		-
114		- transientsupport = support;
115		- transientlink2master = link2master;
116		-
117		- support = null;
118		- link2master = false;
119		-
120		- if (bRep != null)
	124	+ void SaveSupports()
121	125	{
122		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
123	149	}
124		-
125		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
126	152	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
130	261	blockloop = true;
131		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
132	270	blockloop = false;
133	271	}
134		-}
135	272
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
140		-
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
	273	+ void RestoreBigData(Object3D o)
147	274	{
148		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
149	289	}
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
159		- }
160		-}
161	290
162	291	// MOCAP SUPPORT
163	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +429,8 @@
300	429	}
301	430
302	431	boolean live = false;
	432	+ transient boolean keepdontselect;
	433	+ boolean dontselect = false;
303	434	boolean hide = false;
304	435	boolean link2master = false; // performs reset support/master at each frame
305	436	boolean marked = false; // animation node
..	..	@@ -481,12 +612,14 @@
481	612	toParent = LA.newMatrix();
482	613	fromParent = LA.newMatrix();
483	614	}
	615	+
484	616	if (toParentMarked == null)
485	617	{
486	618	if (maxcount != 1)
487	619	{
488	620	new Exception().printStackTrace();
489	621	}
	622	+
490	623	toParentMarked = LA.newMatrix();
491	624	fromParentMarked = LA.newMatrix();
492	625	}
..	..	@@ -774,7 +907,7 @@
774	907	if (step == 0)
775	908	step = 1;
776	909	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
778	911	// if (acceleration == 0)
779	912	// acceleration = 10;
780	913	if (delay == 0) // serial
..	..	@@ -797,7 +930,7 @@
797	930
798	931	if (marked && Globals.isLIVE() && live &&
799	932	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	934	currentframe != Globals.framecount)
802	935	{
803	936	currentframe = Globals.framecount;
..	..	@@ -809,7 +942,8 @@
809	942
810	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	944
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
813	947	{
814	948	countdown = 1;
815	949	delay = speedup?8:1;
..	..	@@ -881,6 +1015,10 @@
881	1015	if (material == null \|\| material.multiply)
882	1016	return true;
883	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
884	1022	return material.opacity > 0.99;
885	1023	}
886	1024
..	..	@@ -912,6 +1050,11 @@
912	1050	fromParent = null; // LA.newMatrix();
913	1051	bRep = null; // new BoundaryRep();
914	1052
	1053	+ if (oname != null && oname.equals("LeftHand"))
	1054	+ {
	1055	+ name = oname;
	1056	+ }
	1057	+
915	1058	/*
916	1059	float hue = (float)Math.random();
917	1060	Color col;
..	..	@@ -954,7 +1097,7 @@
954	1097
955	1098	public Object clone()
956	1099	{
957		- return GrafreeD.clone(this);
	1100	+ return Grafreed.clone(this);
958	1101	}
959	1102
960	1103	Object3D copyExpand()
..	..	@@ -1276,6 +1419,7 @@
1276	1419	toParent = LA.newMatrix();
1277	1420	fromParent = LA.newMatrix();
1278	1421	}
	1422	+
1279	1423	LA.matCopy(other.toParent, toParent);
1280	1424	LA.matCopy(other.fromParent, fromParent);
1281	1425
..	..	@@ -1470,7 +1614,7 @@
1470	1614	BoundaryRep.SEUIL = other.material.cameralight;
1471	1615
1472	1616	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1617	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1618	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1619	}
1476	1620
..	..	@@ -1729,7 +1873,7 @@
1729	1873	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1874	o.bRep = transientrep;
1731	1875	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1876	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1877	o.CreateMaterial();
1734	1878	o.SetAttributes(this, -1);
1735	1879	//parent
..	..	@@ -1742,7 +1886,7 @@
1742	1886	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1887	o.bRep = bRep;
1744	1888	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1889	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1890	o.CreateMaterial();
1747	1891	//o.overwriteThis(this, -1);
1748	1892	o.SetAttributes(this, -1);
..	..	@@ -1829,12 +1973,15 @@
1829	1973	if (obj.name == null)
1830	1974	continue; // can't be a null one
1831	1975
	1976	+ // Try perfect match first.
1832	1977	if (n.equals(obj.name))
1833	1978	{
1834	1979	theobj = obj;
1835	1980	count++;
1836	1981	}
1837	1982	}
	1983	+
	1984	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1985
1839	1986	if (count != 1)
1840	1987	for (int i=Size(); --i>=0;)
..	..	@@ -2294,12 +2441,17 @@
2294	2441	}
2295	2442	*/
2296	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2297	2448	}
2298	2449
2299	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2300	2451	{
2301	2452	if (newWindow)
2302	2453	{
	2454	+ new Exception().printStackTrace();
2303	2455	System.exit(0);
2304	2456	if (parent != null)
2305	2457	{
..	..	@@ -2334,6 +2486,14 @@
2334	2486	{
2335	2487	editWindow.refreshContents();
2336	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2337	2497	//if (parent != null)
2338	2498	//parent.refreshEditWindow();
2339	2499	}
..	..	@@ -2413,7 +2573,8 @@
2413	2573	private static final int editSelf = 1;
2414	2574	private static final int editChild = 2;
2415	2575
2416		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2417	2578	{
2418	2579	if (level == 0)
2419	2580	{
..	..	@@ -2421,7 +2582,8 @@
2421	2582	return;
2422	2583
2423	2584	Object3D selectee;
2424		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2425	2587	{
2426	2588	selectee = (Object3D) e.nextElement();
2427	2589	}
..	..	@@ -2429,19 +2591,22 @@
2429	2591	} else
2430	2592	{
2431	2593	//super.
2432		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2433	2596	}
2434	2597	}
2435	2598
2436		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2437	2601	{
2438	2602	doSomething = 0;
2439	2603	if (level == 0)
2440	2604	{
2441		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2442	2606	}
2443	2607	if (//super.
2444		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2445	2610	{
2446	2611	doSomething = 1;
2447	2612	return true;
..	..	@@ -2451,7 +2616,7 @@
2451	2616	}
2452	2617	}
2453	2618
2454		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2455	2620	{
2456	2621	if (selection == null)
2457	2622	{
..	..	@@ -2464,7 +2629,8 @@
2464	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2465	2630	{
2466	2631	Object3D selectee = (Object3D) e.nextElement();
2467		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2468	2634	{
2469	2635	childToDrag = selectee;
2470	2636	doSomething = 2;
..	..	@@ -2476,13 +2642,15 @@
2476	2642	return retval;
2477	2643	}
2478	2644
2479		- void doEditDrag(ClickInfo info)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2480	2647	{
2481	2648	switch (doSomething)
2482	2649	{
2483	2650	case 1: // '\001'
2484	2651	//super.
2485		- doEditDrag0(info);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2486	2654	break;
2487	2655
2488	2656	case 2: // '\002'
..	..	@@ -2495,11 +2663,13 @@
2495	2663	{
2496	2664	//sel.hitSomething = childToDrag.hitSomething;
2497	2665	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2499	2668	} else
2500	2669	{
2501	2670	//super.
2502		- doEditDrag0(info);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2503	2673	}
2504	2674	}
2505	2675	break;
..	..	@@ -2517,6 +2687,9 @@
2517	2687	{
2518	2688	deselectAll();
2519	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2520	2693	ClickInfo newInfo = new ClickInfo();
2521	2694	newInfo.flags = info.flags;
2522	2695	newInfo.bounds = info.bounds;
..	..	@@ -2609,6 +2782,18 @@
2609	2782	void GenNormalsS(boolean crease)
2610	2783	{
2611	2784	selection.GenNormals(crease);
	2785	+// for (int i=0; i<selection.size(); i++)
	2786	+// {
	2787	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2788	+// selectee.GenNormals(crease);
	2789	+// }
	2790	+
	2791	+ //Touch();
	2792	+ }
	2793	+
	2794	+ void GenNormalsMeshS()
	2795	+ {
	2796	+ selection.GenNormalsMesh();
2612	2797	// for (int i=0; i<selection.size(); i++)
2613	2798	// {
2614	2799	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2934,24 @@
2749	2934	if (child == null)
2750	2935	continue;
2751	2936	child.GenNormals(crease);
	2937	+// Children().release(i);
	2938	+ }
	2939	+ blockloop = false;
	2940	+ }
	2941	+
	2942	+ void GenNormalsMesh()
	2943	+ {
	2944	+ if (blockloop)
	2945	+ return;
	2946	+
	2947	+ blockloop = true;
	2948	+ GenNormalsMesh0();
	2949	+ for (int i = 0; i < Children().Size(); i++)
	2950	+ {
	2951	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2952	+ if (child == null)
	2953	+ continue;
	2954	+ child.GenNormalsMesh();
2752	2955	// Children().release(i);
2753	2956	}
2754	2957	blockloop = false;
..	..	@@ -2906,7 +3109,8 @@
2906	3109	{
2907	3110	if (bRep != null)
2908	3111	{
2909		- bRep.GenUV();
	3112	+ bRep.GenUV(); //1);
	3113	+ //bRep.UnfoldUV();
2910	3114	Touch();
2911	3115	}
2912	3116	}
..	..	@@ -2920,11 +3124,20 @@
2920	3124	}
2921	3125	}
2922	3126
	3127	+ void GenNormalsMesh0()
	3128	+ {
	3129	+ if (bRep != null)
	3130	+ {
	3131	+ bRep.GenerateNormalsMesh();
	3132	+ Touch();
	3133	+ }
	3134	+ }
	3135	+
2923	3136	void GenNormalsMINE0()
2924	3137	{
2925	3138	if (bRep != null)
2926	3139	{
2927		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2928	3141	Touch();
2929	3142	}
2930	3143	}
..	..	@@ -2981,6 +3194,33 @@
2981	3194	blockloop = false;
2982	3195	}
2983	3196
	3197	+ void TransformChildren()
	3198	+ {
	3199	+ if (toParent != null)
	3200	+ {
	3201	+ for (int i=Size(); --i>=0;)
	3202	+ {
	3203	+ Object3D v = get(i);
	3204	+
	3205	+ if (v.toParent == null)
	3206	+ {
	3207	+ v.toParent = LA.newMatrix();
	3208	+ v.fromParent = LA.newMatrix();
	3209	+ }
	3210	+
	3211	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3212	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3213	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3214	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3215	+ }
	3216	+
	3217	+ toParent = null; // LA.matIdentity(toParent);
	3218	+ fromParent = null; // LA.matIdentity(fromParent);
	3219	+
	3220	+ Touch();
	3221	+ }
	3222	+ }
	3223	+
2984	3224	void TransformGeometry()
2985	3225	{
2986	3226	Object3D obj = this;
..	..	@@ -3202,9 +3442,11 @@
3202	3442
3203	3443	BoundaryRep sup = bRep.support;
3204	3444	bRep.support = null;
3205		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3445	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3206	3446	// bRep.SplitInTwo(onlyone); // thread...
3207		- temprep.SplitInTwo(reduction34, onlyone);
	3447	+
	3448	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3449	+
3208	3450	bRep = temprep;
3209	3451	bRep.support = sup;
3210	3452	Touch();
..	..	@@ -3341,7 +3583,8 @@
3341	3583	if (blockloop)
3342	3584	return;
3343	3585
3344		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3345	3588	live = h;
3346	3589
3347	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3362,7 +3605,8 @@
3362	3605	return;
3363	3606
3364	3607	//if (bRep != null)
3365		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3366	3610	link2master = h;
3367	3611
3368	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3382,7 +3626,8 @@
3382	3626	if (blockloop)
3383	3627	return;
3384	3628
3385		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3386	3631	hide = h;
3387	3632
3388	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3647,7 @@
3402	3647	if (blockloop)
3403	3648	return;
3404	3649
3405		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3406	3651	marked = h;
3407	3652
3408	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3412,6 +3657,46 @@
3412	3657	continue;
3413	3658	blockloop = true;
3414	3659	child.MarkLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RewindLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ rewind = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RewindLeaves(h);
	3680	+ blockloop = false;
	3681	+ // release(i);
	3682	+ }
	3683	+ }
	3684	+
	3685	+ void RandomLeaves(boolean h)
	3686	+ {
	3687	+ if (blockloop)
	3688	+ return;
	3689	+
	3690	+ if (bRep != null \|\| material != null) // borderline...
	3691	+ random = h;
	3692	+
	3693	+ for (int i = 0; i < Size(); i++)
	3694	+ {
	3695	+ Object3D child = (Object3D) get(i); // reserve(i);
	3696	+ if (child == null)
	3697	+ continue;
	3698	+ blockloop = true;
	3699	+ child.RandomLeaves(h);
3415	3700	blockloop = false;
3416	3701	// release(i);
3417	3702	}
..	..	@@ -3726,7 +4011,7 @@
3726	4011	if (child == null)
3727	4012	continue;
3728	4013
3729		- if (GrafreeD.RENDERME > 0)
	4014	+ if (Grafreed.RENDERME > 0)
3730	4015	{
3731	4016	if (child instanceof Merge)
3732	4017	((Merge)child).renderme();
..	..	@@ -3877,7 +4162,7 @@
3877	4162	if (child == null)
3878	4163	continue;
3879	4164
3880		- if (GrafreeD.RENDERME > 0)
	4165	+ if (Grafreed.RENDERME > 0)
3881	4166	{
3882	4167	if (child instanceof Merge)
3883	4168	((Merge)child).renderme();
..	..	@@ -4072,7 +4357,7 @@
4072	4357	if (child == null)
4073	4358	continue;
4074	4359
4075		- if (GrafreeD.RENDERME > 0)
	4360	+ if (Grafreed.RENDERME > 0)
4076	4361	{
4077	4362	if (child instanceof Merge)
4078	4363	((Merge)child).renderme();
..	..	@@ -4185,6 +4470,55 @@
4185	4470	{
4186	4471	blockloop = true;
4187	4472	get(i).RepairShadow();
	4473	+ blockloop = false;
	4474	+ }
	4475	+ }
	4476	+
	4477	+ void RepairSOV()
	4478	+ {
	4479	+ if (blockloop)
	4480	+ return;
	4481	+
	4482	+ String texname = this.GetPigmentTexture();
	4483	+
	4484	+ if (texname.startsWith("sov"))
	4485	+ {
	4486	+ String[] s = texname.split("/");
	4487	+
	4488	+ String[] sname = s[1].split("Color.pn");
	4489	+
	4490	+ texname = sname[0];
	4491	+
	4492	+ if (sname.length > 1)
	4493	+ {
	4494	+ texname += "Color.jpg";
	4495	+ }
	4496	+
	4497	+ this.SetPigmentTexture("sov/" + texname);
	4498	+ }
	4499	+
	4500	+ texname = this.GetBumpTexture();
	4501	+
	4502	+ if (texname.startsWith("sov"))
	4503	+ {
	4504	+ String[] s = texname.split("/");
	4505	+
	4506	+ String[] sname = s[1].split("Bump.pn");
	4507	+
	4508	+ texname = sname[0];
	4509	+
	4510	+ if (sname.length > 1)
	4511	+ {
	4512	+ texname += "Bump.jpg";
	4513	+ }
	4514	+
	4515	+ this.SetBumpTexture("sov/" + texname);
	4516	+ }
	4517	+
	4518	+ for (int i=0; i<Size(); i++)
	4519	+ {
	4520	+ blockloop = true;
	4521	+ get(i).RepairSOV();
4188	4522	blockloop = false;
4189	4523	}
4190	4524	}
..	..	@@ -4679,7 +5013,7 @@
4679	5013
4680	5014	cTreePath SelectLeaf(int indexcount, boolean deselect)
4681	5015	{
4682		- if (hide)
	5016	+ if (hide \|\| dontselect)
4683	5017	return null;
4684	5018
4685	5019	if (count <= 0)
..	..	@@ -4703,9 +5037,17 @@
4703	5037	}
4704	5038	}
4705	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4706	5048	cTreePath Select(int indexcount, boolean deselect)
4707	5049	{
4708		- if (hide)
	5050	+ if (hide \|\| dontselect)
4709	5051	return null;
4710	5052
4711	5053	if (count <= 0)
..	..	@@ -4739,10 +5081,11 @@
4739	5081	if (leaf != null)
4740	5082	{
4741	5083	cTreePath tp = new cTreePath(this, leaf);
4742		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4743	5086	{
4744	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4745		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4746	5089	}
4747	5090
4748	5091	return tp;
..	..	@@ -4759,6 +5102,7 @@
4759	5102
4760	5103	if (child == null)
4761	5104	continue;
	5105	+
4762	5106	if (child.HasTransparency() && child.size() != 0)
4763	5107	{
4764	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4768,9 +5112,10 @@
4768	5112	if (leaf != null)
4769	5113	{
4770	5114	cTreePath tp = new cTreePath(this, leaf);
4771		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4772	5117	{
4773		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4774	5119	}
4775	5120
4776	5121	return tp;
..	..	@@ -5095,6 +5440,51 @@
5095	5440	blockloop = false;
5096	5441	}
5097	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5098	5488	boolean IsSelected()
5099	5489	{
5100	5490	if (parent == null)
..	..	@@ -5157,10 +5547,34 @@
5157	5547
5158	5548	// System.out.println("Fullname = " + fullname);
5159	5549
5160		- if (fullname.name.indexOf(":") == -1)
5161		- return fullname.name;
	5550	+ // Does not work on Windows due to C:
	5551	+// if (fullname.name.indexOf(":") == -1)
	5552	+// return fullname.name;
	5553	+//
	5554	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5162	5555
5163		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5556	+ String[] split = fullname.name.split(":");
	5557	+
	5558	+ if (split.length == 0)
	5559	+ {
	5560	+ return "";
	5561	+ }
	5562	+
	5563	+ if (split.length <= 2)
	5564	+ {
	5565	+ if (fullname.name.endsWith(":"))
	5566	+ {
	5567	+ // Windows
	5568	+ return fullname.name.substring(0, fullname.name.length()-1);
	5569	+ }
	5570	+
	5571	+ return split[0];
	5572	+ }
	5573	+
	5574	+ // Windows
	5575	+ assert(split.length == 4);
	5576	+
	5577	+ return split[0] + ":" + split[1];
5164	5578	}
5165	5579
5166	5580	static String GetBump(cTexture fullname)
..	..	@@ -5169,10 +5583,38 @@
5169	5583	return "";
5170	5584
5171	5585	// System.out.println("Fullname = " + fullname);
5172		- if (fullname.name.indexOf(":") == -1)
5173		- return "";
5174		-
5175		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5586	+ // Does not work on Windows due to C:
	5587	+// if (fullname.name.indexOf(":") == -1)
	5588	+// return "";
	5589	+//
	5590	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5591	+ String[] split = fullname.name.split(":");
	5592	+
	5593	+ if (split.length == 0)
	5594	+ {
	5595	+ return "";
	5596	+ }
	5597	+
	5598	+ if (split.length == 1)
	5599	+ {
	5600	+ return "";
	5601	+ }
	5602	+
	5603	+ if (split.length == 2)
	5604	+ {
	5605	+ if (fullname.name.endsWith(":"))
	5606	+ {
	5607	+ // Windows
	5608	+ return "";
	5609	+ }
	5610	+
	5611	+ return split[1];
	5612	+ }
	5613	+
	5614	+ // Windows
	5615	+ assert(split.length == 4);
	5616	+
	5617	+ return split[2] + ":" + split[3];
5176	5618	}
5177	5619
5178	5620	String GetPigmentTexture()
..	..	@@ -5246,7 +5688,7 @@
5246	5688	System.out.print("; textures = " + textures);
5247	5689	System.out.println("; usedtextures = " + usedtextures);
5248	5690
5249		- if (GetTextures() == null)
	5691	+ if (GetTextures() == null) // What is that??
5250	5692	GetTextures().name = ":";
5251	5693
5252	5694	String texname = tex;
..	..	@@ -5277,6 +5719,43 @@
5277	5719	child.ResetPigmentTexture();
5278	5720	blockloop = false;
5279	5721	}
	5722	+ }
	5723	+
	5724	+ UUID GetUUID()
	5725	+ {
	5726	+ if (uuid == null)
	5727	+ {
	5728	+ // Serial
	5729	+ uuid = UUID.randomUUID();
	5730	+ }
	5731	+
	5732	+ return uuid;
	5733	+ }
	5734	+
	5735	+ Object3D GetObject(UUID uid)
	5736	+ {
	5737	+ if (blockloop)
	5738	+ return null;
	5739	+
	5740	+ if (GetUUID().equals(uid))
	5741	+ return this;
	5742	+
	5743	+ int nb = Size();
	5744	+ for (int i = 0; i < nb; i++)
	5745	+ {
	5746	+ Object3D child = (Object3D) get(i);
	5747	+
	5748	+ if (child == null)
	5749	+ continue;
	5750	+
	5751	+ blockloop = true;
	5752	+ Object3D obj = child.GetObject(uid);
	5753	+ blockloop = false;
	5754	+ if (obj != null)
	5755	+ return obj;
	5756	+ }
	5757	+
	5758	+ return null;
5280	5759	}
5281	5760
5282	5761	void SetBumpTexture(String tex)
..	..	@@ -5315,6 +5794,38 @@
5315	5794	}
5316	5795	}
5317	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5318	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5319	5830	{
5320	5831	Draw(display, root, selected, blocked);
..	..	@@ -5323,12 +5834,23 @@
5323	5834	boolean NeedSupport()
5324	5835	{
5325	5836	return
5326		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5837	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5327	5838	// PROBLEM with CROWD!!
5328		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5839	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5329	5840	}
5330	5841
5331	5842	static boolean DEBUG_SELECTION = false;
	5843	+
	5844	+ boolean IsLive()
	5845	+ {
	5846	+ if (live)
	5847	+ return true;
	5848	+
	5849	+ if (parent == null)
	5850	+ return false;
	5851	+
	5852	+ return parent.IsLive();
	5853	+ }
5332	5854
5333	5855	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5334	5856	{
..	..	@@ -5340,7 +5862,7 @@
5340	5862	}
5341	5863
5342	5864	if (display.DrawMode() == iCameraPane.SELECTION &&
5343		- hide)
	5865	+ (hide \|\| dontselect))
5344	5866	return;
5345	5867
5346	5868	if (name != null && name.contains("sclera"))
..	..	@@ -5390,8 +5912,10 @@
5390	5912	if (support != null)
5391	5913	support = support;
5392	5914
5393		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5395	5919
5396	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5397	5921	{
..	..	@@ -5401,8 +5925,9 @@
5401	5925	// usecalllists &= !(parent instanceof RandomNode);
5402	5926	// usecalllists = false;
5403	5927
5404		- if (GetBRep() != null)
5405		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5406	5931	//System.out.println("draw " + this);
5407	5932	//new Exception().printStackTrace();
5408	5933
..	..	@@ -5411,10 +5936,12 @@
5411	5936	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5412	5937
5413	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5414		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5939	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5415	5941	{
5416	5942	Globals.lighttouched = true;
5417	5943	} // all panes...
	5944	+
5418	5945	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5419	5946	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5420	5947	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5949,7 @@
5422	5949	if (!(this instanceof Composite))
5423	5950	touched = false;
5424	5951	//if (displaylist == -1 && usecalllists)
5425		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5426	5953	{
5427	5954	bRep.displaylist = display.GenList();
5428	5955	assert(bRep.displaylist != 0);
..	..	@@ -5433,7 +5960,7 @@
5433	5960
5434	5961	//System.out.println("\tnew list " + list);
5435	5962	//gl.glDrawBuffer(gl.GL_NONE);
5436		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5437	5964	{
5438	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5439	5966	display.NewList(bRep.displaylist);
..	..	@@ -5442,7 +5969,7 @@
5442	5969	CallList(display, root, selected, blocked);
5443	5970
5444	5971	// compiled = true;
5445		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5446	5973	{
5447	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5448	5975	display.EndList();
..	..	@@ -5542,6 +6069,7 @@
5542	6069	if (GetBRep() != null)
5543	6070	{
5544	6071	display.NextIndex();
	6072	+
5545	6073	// vertex color conflict : gl.glCallList(list);
5546	6074	DrawNode(display, root, selected);
5547	6075	if (this instanceof BezierPatch)
..	..	@@ -5582,7 +6110,28 @@
5582	6110	tex = GetTextures();
5583	6111	}
5584	6112
5585		- display.BindTextures(tex, texres);
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
	6115	+
	6116	+ try
	6117	+ {
	6118	+ display.BindPigmentTexture(tex, texres);
	6119	+ }
	6120	+ catch (Exception e)
	6121	+ {
	6122	+ System.err.println("FAILED: " + this);
	6123	+ failedPigment = true;
	6124	+ }
	6125	+
	6126	+ try
	6127	+ {
	6128	+ display.BindBumpTexture(tex, texres);
	6129	+ }
	6130	+ catch (Exception e)
	6131	+ {
	6132	+ //System.err.println("FAILED: " + this);
	6133	+ failedBump = true;
	6134	+ }
5586	6135
5587	6136	if (!compiled)
5588	6137	{
..	..	@@ -5604,7 +6153,11 @@
5604	6153	}
5605	6154	}
5606	6155
5607		- display.ReleaseTextures(tex);
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
5608	6161
5609	6162	display.PopMaterial(this, selected);
5610	6163	}
..	..	@@ -5733,6 +6286,9 @@
5733	6286
5734	6287	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5735	6288	{
	6289	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6290	+ return;
	6291	+
5736	6292	if (hide)
5737	6293	return;
5738	6294	// shadow optimisation
..	..	@@ -5858,6 +6414,9 @@
5858	6414	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5859	6415	return; // no shadow for transparent objects
5860	6416
	6417	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6418	+ return;
	6419	+
5861	6420	if (hide)
5862	6421	return;
5863	6422
..	..	@@ -5898,6 +6457,7 @@
5898	6457	return;
5899	6458	}
5900	6459
	6460	+ //bRep.GenUV(1/material.diffuseness);
5901	6461	// bRep.lock = true;
5902	6462
5903	6463	//javax.media.opengl.GL gl = display.GetGL();
..	..	@@ -5970,6 +6530,11 @@
5970	6530	// dec 2012
5971	6531	new Exception().printStackTrace();
5972	6532	return;
	6533	+ }
	6534	+
	6535	+ if (dontselect)
	6536	+ {
	6537	+ //bRep.GenerateNormalsMINE();
5973	6538	}
5974	6539
5975	6540	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6755,20 +7320,23 @@
6755	7320	}
6756	7321	}
6757	7322
6758		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
6759	7327	{
6760		- int hc = info.bounds.x + info.bounds.width / 2;
6761		- int vc = info.bounds.y + info.bounds.height / 2;
6762		- double[][] toscreen = info.toScreen;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
6763	7331	if (toscreen == null)
6764	7332	{
6765		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6766	7334	}
6767	7335	cVector vec = in;
6768	7336	LA.xformPos(in, toscreen, in);
6769	7337	//System.out.println("Distance = " + info.camera.Distance());
6770		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6771		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6772	7340	outPt.x = hc + (int) vec.x;
6773	7341	outPt.y = vc - (int) vec.y;
6774	7342	outRec.x = outPt.x - 3;
..	..	@@ -6776,15 +7344,18 @@
6776	7344	outRec.width = outRec.height = 6;
6777	7345	}
6778	7346
6779		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
6780	7349	{
6781	7350	Point pt = new Point(0, 0);
6782	7351	Rectangle rec = new Rectangle();
6783		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
6784	7354	return rec;
6785	7355	}
6786	7356
6787		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
6788	7359	{
6789	7360	if (level == 0)
6790	7361	{
..	..	@@ -6793,16 +7364,19 @@
6793	7364	{
6794	7365	cVector origin = new cVector();
6795	7366	//LA.xformPos(origin, toParent, origin);
6796		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6797	7371	Rectangle boundary = new Rectangle();
6798	7372	boundary.x = spot.x - 30;
6799	7373	boundary.y = spot.y - 30;
6800	7374	boundary.width = spot.width + 60;
6801	7375	boundary.height = spot.height + 60;
6802		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
6803	7377	int spotw = spot.x + spot.width;
6804	7378	int spoth = spot.y + spot.height;
6805		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6806	7380	// if (CameraPane.Xmin > spot.x)
6807	7381	// {
6808	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -6822,8 +7396,8 @@
6822	7396	spot.translate(32, 32);
6823	7397	spotw = spot.x + spot.width;
6824	7398	spoth = spot.y + spot.height;
6825		- info.g.setColor(Color.blue);
6826		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6827	7401	// if (CameraPane.Xmin > spot.x)
6828	7402	// {
6829	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -6840,11 +7414,12 @@
6840	7414	// {
6841	7415	// CameraPane.Ymax = spoth;
6842	7416	// }
6843		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7417	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7418	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6845	7419	spot.translate(0, -32);
6846		- info.g.setColor(Color.green);
6847		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
6848	7423	// if (CameraPane.Xmin > spot.x)
6849	7424	// {
6850	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -6861,8 +7436,8 @@
6861	7436	// {
6862	7437	// CameraPane.Ymax = spoth;
6863	7438	// }
6864		- info.g.drawArc(boundary.x, boundary.y,
6865		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6866	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6867	7442	// if (CameraPane.Xmin > boundary.x)
6868	7443	// {
..	..	@@ -6884,7 +7459,8 @@
6884	7459	}
6885	7460	}
6886	7461
6887		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
6888	7464	{
6889	7465	if (level == 0)
6890	7466	{
..	..	@@ -6893,10 +7469,10 @@
6893	7469
6894	7470	boolean retval = false;
6895	7471
6896		- startX = info.x;
6897		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
6898	7474
6899		- hitSomething = 0;
	7475	+ hitSomething = -1;
6900	7476	cVector origin = new cVector();
6901	7477	//LA.xformPos(origin, toParent, origin);
6902	7478	Rectangle spot = new Rectangle();
..	..	@@ -6904,22 +7480,51 @@
6904	7480	{
6905	7481	centerPt = new Point(0, 0);
6906	7482	}
6907		- calcHotSpot(origin, info, centerPt, spot);
6908		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
6909	7486	{
6910	7487	hitSomething = hitCenter;
6911	7488	retval = true;
6912	7489	}
6913	7490	spot.translate(32, 0);
6914		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
6915	7492	{
6916	7493	hitSomething = hitRotate;
6917	7494	retval = true;
6918	7495	}
6919	7496	spot.translate(0, 32);
6920		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
6921	7498	{
6922	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
6923	7528	retval = true;
6924	7529	}
6925	7530
..	..	@@ -6929,7 +7534,7 @@
6929	7534	}
6930	7535
6931	7536	//System.out.println("info.modifiers = " + info.modifiers);
6932		- modified = (info.modifiers & CameraPane.META) != 0;
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6933	7538	//System.out.println("modified = " + modified);
6934	7539	//new Exception().printStackTrace();
6935	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6957,7 +7562,8 @@
6957	7562	return true;
6958	7563	}
6959	7564
6960		- void doEditDrag0(ClickInfo info)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
6961	7567	{
6962	7568	if (hitSomething == 0)
6963	7569	{
..	..	@@ -6971,7 +7577,8 @@
6971	7577
6972	7578	//System.out.println("hitSomething = " + hitSomething);
6973	7579
6974		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
	7581	+
6975	7582	cVector xlate = new cVector();
6976	7583	//cVector xlate2 = new cVector();
6977	7584	switch (hitSomething)
..	..	@@ -6984,7 +7591,7 @@
6984	7591
6985	7592	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6986	7593
6987		- if (modified)
	7594	+ if (modified \|\| opposite)
6988	7595	{
6989	7596	//assert(false);
6990	7597	/*
..	..	@@ -7004,8 +7611,8 @@
7004	7611	toParent[3][i] = xlate.get(i);
7005	7612	LA.matInvert(toParent, fromParent);
7006	7613	*/
7007		- cVector delta = LA.newVector(0, 0, startY - info.y);
7008		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7009	7616
7010	7617	LA.matCopy(startMat, toParent);
7011	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7014,7 +7621,7 @@
7014	7621	} else
7015	7622	{
7016	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7017		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7018	7625	cVector away = new cVector();
7019	7626	//cVector right2 = new cVector();
7020	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7031,19 +7638,19 @@
7031	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7032	7639	// if (!CameraPane.LOCALTRANSFORM)
7033	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7034		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7035	7642	// if (!CameraPane.LOCALTRANSFORM)
7036	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7037	7644	//LA.vecCross(up, cVector.Z, right2);
7038	7645
7039		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7040	7647
7041	7648	//System.out.println("DELTA0 = " + delta);
7042	7649	//System.out.println("AWAY = " + info.camera.away);
7043	7650	//System.out.println("UP = " + info.camera.up);
7044	7651	if (away.z > 0)
7045	7652	{
7046		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7047	7654	{
7048	7655	delta.x = -delta.x;
7049	7656	} else
..	..	@@ -7058,7 +7665,7 @@
7058	7665	//System.out.println("DELTA1 = " + delta);
7059	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7060	7667	//System.out.println("DELTA2 = " + delta);
7061		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7062	7669	LA.matCopy(startMat, toParent);
7063	7670	//System.out.println("DELTA3 = " + delta);
7064	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7068,8 +7675,8 @@
7068	7675	break;
7069	7676
7070	7677	case hitRotate: // rotate
7071		- int dx = info.x - centerPt.x;
7072		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7073	7680	double angle = (double) Math.atan2(dx, dy);
7074	7681	angle = -(1.570796 - angle);
7075	7682
..	..	@@ -7078,6 +7685,7 @@
7078	7685
7079	7686	if (modified)
7080	7687	{
	7688	+ // Rotate 90 degrees
7081	7689	angle /= (Math.PI / 4);
7082	7690	angle = Math.floor(angle + 0.5);
7083	7691	angle *= (Math.PI / 4);
..	..	@@ -7091,7 +7699,7 @@
7091	7699	}
7092	7700	/**/
7093	7701
7094		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7095	7703	{
7096	7704	case 1: // '\001'
7097	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7118,26 +7726,30 @@
7118	7726	break;
7119	7727
7120	7728	case hitScale: // scale
7121		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7730	+ double sign = 1;
	7731	+ if (hScale < 0)
	7732	+ {
	7733	+ sign = -1;
	7734	+ }
	7735	+ hScale = signMath.pow(signhScale, scale * 50);
7122	7736	if (hScale < 0.01)
7123	7737	{
7124		- hScale = 0.01;
	7738	+ //hScale = 0.01;
7125	7739	}
7126		- hScale = Math.pow(hScale, scale * 50);
7127		- if (hScale < 0.01)
	7740	+
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7742	+ sign = 1;
	7743	+ if (vScale < 0)
7128	7744	{
7129		- hScale = 0.01;
	7745	+ sign = -1;
7130	7746	}
7131		- double vScale = (double) (info.y - centerPt.y) / 32;
	7747	+ vScale = signMath.pow(signvScale, scale * 50);
7132	7748	if (vScale < 0.01)
7133	7749	{
7134		- vScale = 0.01;
	7750	+ //vScale = 0.01;
7135	7751	}
7136		- vScale = Math.pow(vScale, scale * 50);
7137		- if (vScale < 0.01)
7138		- {
7139		- vScale = 0.01;
7140		- }
	7752	+
7141	7753	LA.matCopy(startMat, toParent);
7142	7754	/**/
7143	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7147,39 +7759,47 @@
7147	7759	}
7148	7760	/**/
7149	7761
7150		- switch (info.pane.RenderCamera().viewCode)
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7763	+
	7764	+ if (totalScale < 0.01)
	7765	+ {
	7766	+ totalScale = 0.01;
	7767	+ }
	7768	+
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7151	7770	{
7152	7771	case 3: // '\001'
7153		- if (modified)
	7772	+ if (modified \|\| opposite)
7154	7773	{
7155	7774	//LA.matScale(toParent, 1, hScale, vScale);
7156		- LA.matScale(toParent, vScale, 1, 1);
	7775	+ LA.matScale(toParent, totalScale, 1, 1);
7157	7776	} // vScale, 1);
7158	7777	else
7159	7778	{
7160		- LA.matScale(toParent, vScale, vScale, vScale);
	7779	+ // EXCEPTION!
	7780	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7161	7781	} // vScale, 1);
7162	7782	break;
7163	7783
7164	7784	case 2: // '\002'
7165		- if (modified)
	7785	+ if (modified \|\| opposite)
7166	7786	{
7167	7787	//LA.matScale(toParent, hScale, 1, vScale);
7168		- LA.matScale(toParent, 1, vScale, 1);
	7788	+ LA.matScale(toParent, 1, totalScale, 1);
7169	7789	} else
7170	7790	{
7171		- LA.matScale(toParent, vScale, 1, vScale);
	7791	+ LA.matScale(toParent, totalScale, 1, totalScale);
7172	7792	}
7173	7793	break;
7174	7794
7175	7795	case 1: // '\003'
7176		- if (modified)
	7796	+ if (modified \|\| opposite)
7177	7797	{
7178	7798	//LA.matScale(toParent, hScale, vScale, 1);
7179		- LA.matScale(toParent, 1, 1, vScale);
	7799	+ LA.matScale(toParent, 1, 1, totalScale);
7180	7800	} else
7181	7801	{
7182		- LA.matScale(toParent, vScale, vScale, 1);
	7802	+ LA.matScale(toParent, totalScale, totalScale, 1);
7183	7803	}
7184	7804	break;
7185	7805	}
..	..	@@ -7213,7 +7833,7 @@
7213	7833	} // NEW ...
7214	7834
7215	7835
7216		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7217	7837	}
7218	7838
7219	7839	boolean overflow = false;
..	..	@@ -7312,14 +7932,22 @@
7312	7932	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7313	7933	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7314	7934	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7935	+
	7936	+ String objname;
	7937	+
7315	7938	if (false) //parent != null)
7316	7939	{
7317		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7940	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7318	7941	} else
7319	7942	{
7320		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7943	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7321	7944	} // + super.toString();
7322	7945	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7946	+
	7947	+ if (!Globals.ADVANCED)
	7948	+ return objname;
	7949	+
	7950	+ return objname + " " + System.identityHashCode(this);
7323	7951	}
7324	7952
7325	7953	public int hashCode()
..	..	@@ -7375,6 +8003,7 @@
7375	8003	objectUI.closeUI();
7376	8004	if (editWindow != null)
7377	8005	{
	8006	+ editWindow.ctrlPanel.FlushUI();
7378	8007	editWindow.refreshContents();
7379	8008	} // ? new
7380	8009	objectUI = null;
..	..	@@ -7383,6 +8012,10 @@
7383	8012	{
7384	8013	editWindow = null;
7385	8014	} // ?
	8015	+ }
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
7386	8019	}
7387	8020	}
7388	8021
..	..	@@ -7395,7 +8028,7 @@
7395	8028	/transient/ cVector2[] projectedVertices = new cVector2[0];
7396	8029
7397	8030	Object3D /Composite/ parent;
7398		- Object3D /Composite/ fileparent;
	8031	+ Object3D /Composite/ fileparent; // In the case of FileObject
7399	8032
7400	8033	double[][] toParent; // dynamic matrix
7401	8034	double[][] fromParent;
..	..	@@ -7510,7 +8143,7 @@
7510	8143	{
7511	8144	assert(bRep != null);
7512	8145	if (!(support instanceof GenericJoint)) // support.bRep != null)
7513		- GrafreeD.Assert(support.bRep == bRep.support);
	8146	+ Grafreed.Assert(support.bRep == bRep.support);
7514	8147	}
7515	8148	else
7516	8149	{
..	..	@@ -7541,6 +8174,10 @@
7541	8174	}
7542	8175
7543	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7544	8181	transient ObjectUI objectUI;
7545	8182	public static int povDepth = 0;
7546	8183	private static cVector tbMin = new cVector();
..	..	@@ -7559,9 +8196,9 @@
7559	8196	private static cVector edge2 = new cVector();
7560	8197	//private static cVector norm = new cVector();
7561	8198	/transient private/ int hitSomething;
7562		- private static final int hitCenter = 1;
7563		- private static final int hitScale = 2;
7564		- private static final int hitRotate = 3;
	8199	+ static final int hitCenter = 1;
	8200	+ static final int hitScale = 2;
	8201	+ static final int hitRotate = 3;
7565	8202	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7566	8203	/transient/ private Point centerPt;
7567	8204	/transient/ private int startX;