~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,10 @@
2294	2465	}
2295	2466	*/
2296	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ }
2297	2472	}
2298	2473
2299	2474	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2335,6 +2510,14 @@
2335	2510	{
2336	2511	editWindow.refreshContents();
2337	2512	}
	2513	+ else
	2514	+ {
	2515	+ if (manipWindow != null)
	2516	+ {
	2517	+ manipWindow.refreshContents();
	2518	+ }
	2519	+ }
	2520	+
2338	2521	//if (parent != null)
2339	2522	//parent.refreshEditWindow();
2340	2523	}
..	..	@@ -2414,7 +2597,8 @@
2414	2597	private static final int editSelf = 1;
2415	2598	private static final int editChild = 2;
2416	2599
2417		- void drawEditHandles(ClickInfo info, int level)
	2600	+ void drawEditHandles(//ClickInfo info,
	2601	+ int level)
2418	2602	{
2419	2603	if (level == 0)
2420	2604	{
..	..	@@ -2422,7 +2606,8 @@
2422	2606	return;
2423	2607
2424	2608	Object3D selectee;
2425		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2609	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2610	+ level + 1))
2426	2611	{
2427	2612	selectee = (Object3D) e.nextElement();
2428	2613	}
..	..	@@ -2430,19 +2615,22 @@
2430	2615	} else
2431	2616	{
2432	2617	//super.
2433		- drawEditHandles0(info, level + 1);
	2618	+ drawEditHandles0(//info,
	2619	+ level + 1);
2434	2620	}
2435	2621	}
2436	2622
2437		- boolean doEditClick(ClickInfo info, int level)
	2623	+ boolean doEditClick(//ClickInfo info,
	2624	+ int level)
2438	2625	{
2439	2626	doSomething = 0;
2440	2627	if (level == 0)
2441	2628	{
2442		- return doParentClick(info);
	2629	+ return doParentClick(); //info);
2443	2630	}
2444	2631	if (//super.
2445		- doEditClick0(info, level))
	2632	+ doEditClick0(//info,
	2633	+ level))
2446	2634	{
2447	2635	doSomething = 1;
2448	2636	return true;
..	..	@@ -2452,7 +2640,7 @@
2452	2640	}
2453	2641	}
2454	2642
2455		- boolean doParentClick(ClickInfo info)
	2643	+ boolean doParentClick() //ClickInfo info)
2456	2644	{
2457	2645	if (selection == null)
2458	2646	{
..	..	@@ -2465,7 +2653,8 @@
2465	2653	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2466	2654	{
2467	2655	Object3D selectee = (Object3D) e.nextElement();
2468		- if (selectee.doEditClick(info, 1))
	2656	+ if (selectee.doEditClick(//info,
	2657	+ 1))
2469	2658	{
2470	2659	childToDrag = selectee;
2471	2660	doSomething = 2;
..	..	@@ -2477,13 +2666,15 @@
2477	2666	return retval;
2478	2667	}
2479	2668
2480		- void doEditDrag(ClickInfo info)
	2669	+ void doEditDrag(//ClickInfo clickInfo,
	2670	+ boolean opposite)
2481	2671	{
2482	2672	switch (doSomething)
2483	2673	{
2484	2674	case 1: // '\001'
2485	2675	//super.
2486		- doEditDrag0(info);
	2676	+ doEditDrag0(//clickInfo,
	2677	+ opposite);
2487	2678	break;
2488	2679
2489	2680	case 2: // '\002'
..	..	@@ -2496,11 +2687,13 @@
2496	2687	{
2497	2688	//sel.hitSomething = childToDrag.hitSomething;
2498	2689	//childToDrag.doEditDrag(info);
2499		- sel.doEditDrag(info);
	2690	+ sel.doEditDrag(//clickInfo,
	2691	+ opposite);
2500	2692	} else
2501	2693	{
2502	2694	//super.
2503		- doEditDrag0(info);
	2695	+ doEditDrag0(//clickInfo,
	2696	+ opposite);
2504	2697	}
2505	2698	}
2506	2699	break;
..	..	@@ -2518,6 +2711,9 @@
2518	2711	{
2519	2712	deselectAll();
2520	2713	}
	2714	+
	2715	+ new Exception().printStackTrace();
	2716	+
2521	2717	ClickInfo newInfo = new ClickInfo();
2522	2718	newInfo.flags = info.flags;
2523	2719	newInfo.bounds = info.bounds;
..	..	@@ -2610,6 +2806,18 @@
2610	2806	void GenNormalsS(boolean crease)
2611	2807	{
2612	2808	selection.GenNormals(crease);
	2809	+// for (int i=0; i<selection.size(); i++)
	2810	+// {
	2811	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2812	+// selectee.GenNormals(crease);
	2813	+// }
	2814	+
	2815	+ //Touch();
	2816	+ }
	2817	+
	2818	+ void GenNormalsMeshS()
	2819	+ {
	2820	+ selection.GenNormalsMesh();
2613	2821	// for (int i=0; i<selection.size(); i++)
2614	2822	// {
2615	2823	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2750,6 +2958,24 @@
2750	2958	if (child == null)
2751	2959	continue;
2752	2960	child.GenNormals(crease);
	2961	+// Children().release(i);
	2962	+ }
	2963	+ blockloop = false;
	2964	+ }
	2965	+
	2966	+ void GenNormalsMesh()
	2967	+ {
	2968	+ if (blockloop)
	2969	+ return;
	2970	+
	2971	+ blockloop = true;
	2972	+ GenNormalsMesh0();
	2973	+ for (int i = 0; i < Children().Size(); i++)
	2974	+ {
	2975	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2976	+ if (child == null)
	2977	+ continue;
	2978	+ child.GenNormalsMesh();
2753	2979	// Children().release(i);
2754	2980	}
2755	2981	blockloop = false;
..	..	@@ -2922,11 +3148,20 @@
2922	3148	}
2923	3149	}
2924	3150
	3151	+ void GenNormalsMesh0()
	3152	+ {
	3153	+ if (bRep != null)
	3154	+ {
	3155	+ bRep.GenerateNormalsMesh();
	3156	+ Touch();
	3157	+ }
	3158	+ }
	3159	+
2925	3160	void GenNormalsMINE0()
2926	3161	{
2927	3162	if (bRep != null)
2928	3163	{
2929		- bRep.GenerateNormalsMINE();
	3164	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2930	3165	Touch();
2931	3166	}
2932	3167	}
..	..	@@ -2983,6 +3218,33 @@
2983	3218	blockloop = false;
2984	3219	}
2985	3220
	3221	+ void TransformChildren()
	3222	+ {
	3223	+ if (toParent != null)
	3224	+ {
	3225	+ for (int i=Size(); --i>=0;)
	3226	+ {
	3227	+ Object3D v = get(i);
	3228	+
	3229	+ if (v.toParent == null)
	3230	+ {
	3231	+ v.toParent = LA.newMatrix();
	3232	+ v.fromParent = LA.newMatrix();
	3233	+ }
	3234	+
	3235	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3236	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3237	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3238	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3239	+ }
	3240	+
	3241	+ toParent = null; // LA.matIdentity(toParent);
	3242	+ fromParent = null; // LA.matIdentity(fromParent);
	3243	+
	3244	+ Touch();
	3245	+ }
	3246	+ }
	3247	+
2986	3248	void TransformGeometry()
2987	3249	{
2988	3250	Object3D obj = this;
..	..	@@ -3204,9 +3466,11 @@
3204	3466
3205	3467	BoundaryRep sup = bRep.support;
3206	3468	bRep.support = null;
3207		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3469	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3470	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3471	+
	3472	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3473	+
3210	3474	bRep = temprep;
3211	3475	bRep.support = sup;
3212	3476	Touch();
..	..	@@ -3343,7 +3607,8 @@
3343	3607	if (blockloop)
3344	3608	return;
3345	3609
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3347	3612	live = h;
3348	3613
3349	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3629,8 @@
3364	3629	return;
3365	3630
3366	3631	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3632	+ if (//marked \|\| // does not make sense
	3633	+ (bRep != null \|\| material != null)) // borderline...
3368	3634	link2master = h;
3369	3635
3370	3636	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3650,8 @@
3384	3650	if (blockloop)
3385	3651	return;
3386	3652
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3653	+ if (//marked \|\| // does not make sense
	3654	+ (bRep != null \|\| material != null)) // borderline...
3388	3655	hide = h;
3389	3656
3390	3657	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3671,7 @@
3404	3671	if (blockloop)
3405	3672	return;
3406	3673
3407		- if (bRep != null && material != null) // borderline...
	3674	+ if (bRep != null \|\| material != null) // borderline...
3408	3675	marked = h;
3409	3676
3410	3677	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3681,46 @@
3414	3681	continue;
3415	3682	blockloop = true;
3416	3683	child.MarkLeaves(h);
	3684	+ blockloop = false;
	3685	+ // release(i);
	3686	+ }
	3687	+ }
	3688	+
	3689	+ void RewindLeaves(boolean h)
	3690	+ {
	3691	+ if (blockloop)
	3692	+ return;
	3693	+
	3694	+ if (bRep != null \|\| material != null) // borderline...
	3695	+ rewind = h;
	3696	+
	3697	+ for (int i = 0; i < Size(); i++)
	3698	+ {
	3699	+ Object3D child = (Object3D) get(i); // reserve(i);
	3700	+ if (child == null)
	3701	+ continue;
	3702	+ blockloop = true;
	3703	+ child.RewindLeaves(h);
	3704	+ blockloop = false;
	3705	+ // release(i);
	3706	+ }
	3707	+ }
	3708	+
	3709	+ void RandomLeaves(boolean h)
	3710	+ {
	3711	+ if (blockloop)
	3712	+ return;
	3713	+
	3714	+ if (bRep != null \|\| material != null) // borderline...
	3715	+ random = h;
	3716	+
	3717	+ for (int i = 0; i < Size(); i++)
	3718	+ {
	3719	+ Object3D child = (Object3D) get(i); // reserve(i);
	3720	+ if (child == null)
	3721	+ continue;
	3722	+ blockloop = true;
	3723	+ child.RandomLeaves(h);
3417	3724	blockloop = false;
3418	3725	// release(i);
3419	3726	}
..	..	@@ -3728,7 +4035,7 @@
3728	4035	if (child == null)
3729	4036	continue;
3730	4037
3731		- if (GrafreeD.RENDERME > 0)
	4038	+ if (Grafreed.RENDERME > 0)
3732	4039	{
3733	4040	if (child instanceof Merge)
3734	4041	((Merge)child).renderme();
..	..	@@ -3879,7 +4186,7 @@
3879	4186	if (child == null)
3880	4187	continue;
3881	4188
3882		- if (GrafreeD.RENDERME > 0)
	4189	+ if (Grafreed.RENDERME > 0)
3883	4190	{
3884	4191	if (child instanceof Merge)
3885	4192	((Merge)child).renderme();
..	..	@@ -4074,7 +4381,7 @@
4074	4381	if (child == null)
4075	4382	continue;
4076	4383
4077		- if (GrafreeD.RENDERME > 0)
	4384	+ if (Grafreed.RENDERME > 0)
4078	4385	{
4079	4386	if (child instanceof Merge)
4080	4387	((Merge)child).renderme();
..	..	@@ -4187,6 +4494,55 @@
4187	4494	{
4188	4495	blockloop = true;
4189	4496	get(i).RepairShadow();
	4497	+ blockloop = false;
	4498	+ }
	4499	+ }
	4500	+
	4501	+ void RepairSOV()
	4502	+ {
	4503	+ if (blockloop)
	4504	+ return;
	4505	+
	4506	+ String texname = this.GetPigmentTexture();
	4507	+
	4508	+ if (texname.startsWith("sov"))
	4509	+ {
	4510	+ String[] s = texname.split("/");
	4511	+
	4512	+ String[] sname = s[1].split("Color.pn");
	4513	+
	4514	+ texname = sname[0];
	4515	+
	4516	+ if (sname.length > 1)
	4517	+ {
	4518	+ texname += "Color.jpg";
	4519	+ }
	4520	+
	4521	+ this.SetPigmentTexture("sov/" + texname);
	4522	+ }
	4523	+
	4524	+ texname = this.GetBumpTexture();
	4525	+
	4526	+ if (texname.startsWith("sov"))
	4527	+ {
	4528	+ String[] s = texname.split("/");
	4529	+
	4530	+ String[] sname = s[1].split("Bump.pn");
	4531	+
	4532	+ texname = sname[0];
	4533	+
	4534	+ if (sname.length > 1)
	4535	+ {
	4536	+ texname += "Bump.jpg";
	4537	+ }
	4538	+
	4539	+ this.SetBumpTexture("sov/" + texname);
	4540	+ }
	4541	+
	4542	+ for (int i=0; i<Size(); i++)
	4543	+ {
	4544	+ blockloop = true;
	4545	+ get(i).RepairSOV();
4190	4546	blockloop = false;
4191	4547	}
4192	4548	}
..	..	@@ -4681,7 +5037,7 @@
4681	5037
4682	5038	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	5039	{
4684		- if (hide)
	5040	+ if (hide \|\| dontselect)
4685	5041	return null;
4686	5042
4687	5043	if (count <= 0)
..	..	@@ -4705,9 +5061,17 @@
4705	5061	}
4706	5062	}
4707	5063
	5064	+ ObjEditor GetWindow()
	5065	+ {
	5066	+ if (editWindow != null)
	5067	+ return editWindow;
	5068	+
	5069	+ return manipWindow;
	5070	+ }
	5071	+
4708	5072	cTreePath Select(int indexcount, boolean deselect)
4709	5073	{
4710		- if (hide)
	5074	+ if (hide \|\| dontselect)
4711	5075	return null;
4712	5076
4713	5077	if (count <= 0)
..	..	@@ -4741,10 +5105,11 @@
4741	5105	if (leaf != null)
4742	5106	{
4743	5107	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5108	+ ObjEditor window = GetWindow();
	5109	+ if (window != null)
4745	5110	{
4746	5111	//System.out.println("editWindow = " + editWindow + " vs " + this);
4747		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4748	5113	}
4749	5114
4750	5115	return tp;
..	..	@@ -4761,6 +5126,7 @@
4761	5126
4762	5127	if (child == null)
4763	5128	continue;
	5129	+
4764	5130	if (child.HasTransparency() && child.size() != 0)
4765	5131	{
4766	5132	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4770,9 +5136,10 @@
4770	5136	if (leaf != null)
4771	5137	{
4772	5138	cTreePath tp = new cTreePath(this, leaf);
4773		- if (editWindow != null)
	5139	+ ObjEditor window = GetWindow();
	5140	+ if (window != null)
4774	5141	{
4775		- editWindow.Select(tp, deselect, true);
	5142	+ window.Select(tp, deselect, true);
4776	5143	}
4777	5144
4778	5145	return tp;
..	..	@@ -5097,6 +5464,51 @@
5097	5464	blockloop = false;
5098	5465	}
5099	5466
	5467	+ void ResetSelectable()
	5468	+ {
	5469	+ if (blockloop)
	5470	+ return;
	5471	+
	5472	+ blockloop = true;
	5473	+
	5474	+ keepdontselect = dontselect;
	5475	+ dontselect = true;
	5476	+
	5477	+ Object3D child;
	5478	+ int nb = Size();
	5479	+ for (int i = 0; i < nb; i++)
	5480	+ {
	5481	+ child = (Object3D) get(i);
	5482	+ if (child == null)
	5483	+ continue;
	5484	+ child.ResetSelectable();
	5485	+ }
	5486	+
	5487	+ blockloop = false;
	5488	+ }
	5489	+
	5490	+ void RestoreSelectable()
	5491	+ {
	5492	+ if (blockloop)
	5493	+ return;
	5494	+
	5495	+ blockloop = true;
	5496	+
	5497	+ dontselect = keepdontselect;
	5498	+
	5499	+ Object3D child;
	5500	+ int nb = Size();
	5501	+ for (int i = 0; i < nb; i++)
	5502	+ {
	5503	+ child = (Object3D) get(i);
	5504	+ if (child == null)
	5505	+ continue;
	5506	+ child.RestoreSelectable();
	5507	+ }
	5508	+
	5509	+ blockloop = false;
	5510	+ }
	5511	+
5100	5512	boolean IsSelected()
5101	5513	{
5102	5514	if (parent == null)
..	..	@@ -5333,6 +5745,43 @@
5333	5745	}
5334	5746	}
5335	5747
	5748	+ UUID GetUUID()
	5749	+ {
	5750	+ if (uuid == null)
	5751	+ {
	5752	+ // Serial
	5753	+ uuid = UUID.randomUUID();
	5754	+ }
	5755	+
	5756	+ return uuid;
	5757	+ }
	5758	+
	5759	+ Object3D GetObject(UUID uid)
	5760	+ {
	5761	+ if (blockloop)
	5762	+ return null;
	5763	+
	5764	+ if (GetUUID().equals(uid))
	5765	+ return this;
	5766	+
	5767	+ int nb = Size();
	5768	+ for (int i = 0; i < nb; i++)
	5769	+ {
	5770	+ Object3D child = (Object3D) get(i);
	5771	+
	5772	+ if (child == null)
	5773	+ continue;
	5774	+
	5775	+ blockloop = true;
	5776	+ Object3D obj = child.GetObject(uid);
	5777	+ blockloop = false;
	5778	+ if (obj != null)
	5779	+ return obj;
	5780	+ }
	5781	+
	5782	+ return null;
	5783	+ }
	5784	+
5336	5785	void SetBumpTexture(String tex)
5337	5786	{
5338	5787	if (GetTextures() == null)
..	..	@@ -5369,6 +5818,38 @@
5369	5818	}
5370	5819	}
5371	5820
	5821	+ void EmbedTextures(boolean embed)
	5822	+ {
	5823	+ if (blockloop)
	5824	+ return;
	5825	+
	5826	+ //if (GetTextures() != null)
	5827	+ if (embed)
	5828	+ CameraPane.EmbedTextures(GetTextures());
	5829	+ else
	5830	+ {
	5831	+ GetTextures().pigmentdata = null;
	5832	+ GetTextures().bumpdata = null;
	5833	+ GetTextures().pw = 0;
	5834	+ GetTextures().ph = 0;
	5835	+ GetTextures().bw = 0;
	5836	+ GetTextures().bh = 0;
	5837	+ }
	5838	+
	5839	+ int nb = Size();
	5840	+ for (int i = 0; i < nb; i++)
	5841	+ {
	5842	+ Object3D child = (Object3D) get(i);
	5843	+
	5844	+ if (child == null)
	5845	+ continue;
	5846	+
	5847	+ blockloop = true;
	5848	+ child.EmbedTextures(embed);
	5849	+ blockloop = false;
	5850	+ }
	5851	+ }
	5852	+
5372	5853	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5373	5854	{
5374	5855	Draw(display, root, selected, blocked);
..	..	@@ -5377,12 +5858,23 @@
5377	5858	boolean NeedSupport()
5378	5859	{
5379	5860	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5861	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5381	5862	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5863	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5864	}
5384	5865
5385	5866	static boolean DEBUG_SELECTION = false;
	5867	+
	5868	+ boolean IsLive()
	5869	+ {
	5870	+ if (live)
	5871	+ return true;
	5872	+
	5873	+ if (parent == null)
	5874	+ return false;
	5875	+
	5876	+ return parent.IsLive();
	5877	+ }
5386	5878
5387	5879	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	5880	{
..	..	@@ -5394,7 +5886,7 @@
5394	5886	}
5395	5887
5396	5888	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5889	+ (hide \|\| dontselect))
5398	5890	return;
5399	5891
5400	5892	if (name != null && name.contains("sclera"))
..	..	@@ -5444,8 +5936,10 @@
5444	5936	if (support != null)
5445	5937	support = support;
5446	5938
5447		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5448		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5939	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+
	5942	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5449	5943
5450	5944	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	5945	{
..	..	@@ -5455,8 +5949,9 @@
5455	5949	// usecalllists &= !(parent instanceof RandomNode);
5456	5950	// usecalllists = false;
5457	5951
5458		- if (GetBRep() != null)
5459		- usecalllists = usecalllists;
	5952	+ if (display.DrawMode() == display.SHADOW)
	5953	+ //GetBRep() != null)
	5954	+ usecalllists = !!usecalllists;
5460	5955	//System.out.println("draw " + this);
5461	5956	//new Exception().printStackTrace();
5462	5957
..	..	@@ -5465,10 +5960,12 @@
5465	5960	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	5961
5467	5962	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5963	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5469	5965	{
5470	5966	Globals.lighttouched = true;
5471	5967	} // all panes...
	5968	+
5472	5969	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	5970	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	5971	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5476,7 +5973,7 @@
5476	5973	if (!(this instanceof Composite))
5477	5974	touched = false;
5478	5975	//if (displaylist == -1 && usecalllists)
5479		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5976	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5480	5977	{
5481	5978	bRep.displaylist = display.GenList();
5482	5979	assert(bRep.displaylist != 0);
..	..	@@ -5487,7 +5984,7 @@
5487	5984
5488	5985	//System.out.println("\tnew list " + list);
5489	5986	//gl.glDrawBuffer(gl.GL_NONE);
5490		- if (usecalllists)
	5987	+ if (usecalllists && bRep.displaylist > 0)
5491	5988	{
5492	5989	// System.err.println("new list " + bRep.displaylist + " for " + this);
5493	5990	display.NewList(bRep.displaylist);
..	..	@@ -5496,7 +5993,7 @@
5496	5993	CallList(display, root, selected, blocked);
5497	5994
5498	5995	// compiled = true;
5499		- if (usecalllists)
	5996	+ if (usecalllists && bRep.displaylist > 0)
5500	5997	{
5501	5998	// System.err.println("end list " + bRep.displaylist + " for " + this);
5502	5999	display.EndList();
..	..	@@ -5596,6 +6093,7 @@
5596	6093	if (GetBRep() != null)
5597	6094	{
5598	6095	display.NextIndex();
	6096	+
5599	6097	// vertex color conflict : gl.glCallList(list);
5600	6098	DrawNode(display, root, selected);
5601	6099	if (this instanceof BezierPatch)
..	..	@@ -5636,7 +6134,28 @@
5636	6134	tex = GetTextures();
5637	6135	}
5638	6136
5639		- display.BindTextures(tex, texres);
	6137	+ boolean failedPigment = false;
	6138	+ boolean failedBump = false;
	6139	+
	6140	+ try
	6141	+ {
	6142	+ display.BindPigmentTexture(tex, texres);
	6143	+ }
	6144	+ catch (Exception e)
	6145	+ {
	6146	+ System.err.println("FAILED: " + this);
	6147	+ failedPigment = true;
	6148	+ }
	6149	+
	6150	+ try
	6151	+ {
	6152	+ display.BindBumpTexture(tex, texres);
	6153	+ }
	6154	+ catch (Exception e)
	6155	+ {
	6156	+ //System.err.println("FAILED: " + this);
	6157	+ failedBump = true;
	6158	+ }
5640	6159
5641	6160	if (!compiled)
5642	6161	{
..	..	@@ -5658,7 +6177,11 @@
5658	6177	}
5659	6178	}
5660	6179
5661		- display.ReleaseTextures(tex);
	6180	+ if (!failedBump)
	6181	+ display.ReleaseBumpTexture(tex);
	6182	+
	6183	+ if (!failedPigment)
	6184	+ display.ReleasePigmentTexture(tex);
5662	6185
5663	6186	display.PopMaterial(this, selected);
5664	6187	}
..	..	@@ -5787,6 +6310,9 @@
5787	6310
5788	6311	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6312	{
	6313	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6314	+ return;
	6315	+
5790	6316	if (hide)
5791	6317	return;
5792	6318	// shadow optimisation
..	..	@@ -5912,6 +6438,9 @@
5912	6438	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6439	return; // no shadow for transparent objects
5914	6440
	6441	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6442	+ return;
	6443	+
5915	6444	if (hide)
5916	6445	return;
5917	6446
..	..	@@ -6025,6 +6554,11 @@
6025	6554	// dec 2012
6026	6555	new Exception().printStackTrace();
6027	6556	return;
	6557	+ }
	6558	+
	6559	+ if (dontselect)
	6560	+ {
	6561	+ //bRep.GenerateNormalsMINE();
6028	6562	}
6029	6563
6030	6564	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6810,20 +7344,23 @@
6810	7344	}
6811	7345	}
6812	7346
6813		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7347	+ static ClickInfo clickInfo = new ClickInfo();
	7348	+
	7349	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7350	+ Point outPt, Rectangle outRec)
6814	7351	{
6815		- int hc = info.bounds.x + info.bounds.width / 2;
6816		- int vc = info.bounds.y + info.bounds.height / 2;
6817		- double[][] toscreen = info.toScreen;
	7352	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7353	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7354	+ double[][] toscreen = clickInfo.toScreen;
6818	7355	if (toscreen == null)
6819	7356	{
6820		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7357	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6821	7358	}
6822	7359	cVector vec = in;
6823	7360	LA.xformPos(in, toscreen, in);
6824	7361	//System.out.println("Distance = " + info.camera.Distance());
6825		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6826		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7362	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7363	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6827	7364	outPt.x = hc + (int) vec.x;
6828	7365	outPt.y = vc - (int) vec.y;
6829	7366	outRec.x = outPt.x - 3;
..	..	@@ -6831,15 +7368,18 @@
6831	7368	outRec.width = outRec.height = 6;
6832	7369	}
6833	7370
6834		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7371	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7372	+ )
6835	7373	{
6836	7374	Point pt = new Point(0, 0);
6837	7375	Rectangle rec = new Rectangle();
6838		- calcHotSpot(in, info, pt, rec);
	7376	+ calcHotSpot(in, //clickInfo,
	7377	+ pt, rec);
6839	7378	return rec;
6840	7379	}
6841	7380
6842		- void drawEditHandles0(ClickInfo info, int level)
	7381	+ void drawEditHandles0(//ClickInfo clickInfo,
	7382	+ int level)
6843	7383	{
6844	7384	if (level == 0)
6845	7385	{
..	..	@@ -6848,16 +7388,19 @@
6848	7388	{
6849	7389	cVector origin = new cVector();
6850	7390	//LA.xformPos(origin, toParent, origin);
6851		- Rectangle spot = calcHotSpot(origin, info);
	7391	+ if (this.clickInfo == null)
	7392	+ this.clickInfo = new ClickInfo();
	7393	+
	7394	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6852	7395	Rectangle boundary = new Rectangle();
6853	7396	boundary.x = spot.x - 30;
6854	7397	boundary.y = spot.y - 30;
6855	7398	boundary.width = spot.width + 60;
6856	7399	boundary.height = spot.height + 60;
6857		- info.g.setColor(Color.red);
	7400	+ clickInfo.g.setColor(Color.red);
6858	7401	int spotw = spot.x + spot.width;
6859	7402	int spoth = spot.y + spot.height;
6860		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7403	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6861	7404	// if (CameraPane.Xmin > spot.x)
6862	7405	// {
6863	7406	// CameraPane.Xmin = spot.x;
..	..	@@ -6877,8 +7420,8 @@
6877	7420	spot.translate(32, 32);
6878	7421	spotw = spot.x + spot.width;
6879	7422	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
6881		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.setColor(Color.cyan);
	7424	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7425	// if (CameraPane.Xmin > spot.x)
6883	7426	// {
6884	7427	// CameraPane.Xmin = spot.x;
..	..	@@ -6895,11 +7438,12 @@
6895	7438	// {
6896	7439	// CameraPane.Ymax = spoth;
6897	7440	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7441	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7442	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6900	7443	spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
6902		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7444	+ clickInfo.g.setColor(Color.yellow);
	7445	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7446	+ clickInfo.g.setColor(Color.green);
6903	7447	// if (CameraPane.Xmin > spot.x)
6904	7448	// {
6905	7449	// CameraPane.Xmin = spot.x;
..	..	@@ -6916,8 +7460,8 @@
6916	7460	// {
6917	7461	// CameraPane.Ymax = spoth;
6918	7462	// }
6919		- info.g.drawArc(boundary.x, boundary.y,
6920		- boundary.width, boundary.height, 0, 360);
	7463	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7464	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6921	7465	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6922	7466	// if (CameraPane.Xmin > boundary.x)
6923	7467	// {
..	..	@@ -6939,7 +7483,8 @@
6939	7483	}
6940	7484	}
6941	7485
6942		- boolean doEditClick0(ClickInfo info, int level)
	7486	+ boolean doEditClick0(//ClickInfo clickInfo,
	7487	+ int level)
6943	7488	{
6944	7489	if (level == 0)
6945	7490	{
..	..	@@ -6948,10 +7493,10 @@
6948	7493
6949	7494	boolean retval = false;
6950	7495
6951		- startX = info.x;
6952		- startY = info.y;
	7496	+ startX = clickInfo.x;
	7497	+ startY = clickInfo.y;
6953	7498
6954		- hitSomething = 0;
	7499	+ hitSomething = -1;
6955	7500	cVector origin = new cVector();
6956	7501	//LA.xformPos(origin, toParent, origin);
6957	7502	Rectangle spot = new Rectangle();
..	..	@@ -6959,22 +7504,51 @@
6959	7504	{
6960	7505	centerPt = new Point(0, 0);
6961	7506	}
6962		- calcHotSpot(origin, info, centerPt, spot);
6963		- if (spot.contains(info.x, info.y))
	7507	+ calcHotSpot(origin, //info,
	7508	+ centerPt, spot);
	7509	+ if (spot.contains(clickInfo.x, clickInfo.y))
6964	7510	{
6965	7511	hitSomething = hitCenter;
6966	7512	retval = true;
6967	7513	}
6968	7514	spot.translate(32, 0);
6969		- if (spot.contains(info.x, info.y))
	7515	+ if (spot.contains(clickInfo.x, clickInfo.y))
6970	7516	{
6971	7517	hitSomething = hitRotate;
6972	7518	retval = true;
6973	7519	}
6974	7520	spot.translate(0, 32);
6975		- if (spot.contains(info.x, info.y))
	7521	+ if (spot.contains(clickInfo.x, clickInfo.y))
6976	7522	{
6977	7523	hitSomething = hitScale;
	7524	+
	7525	+ double scale = 0.005f * clickInfo.camera.Distance();
	7526	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7527	+ double sign = 1;
	7528	+ if (hScale < 0)
	7529	+ {
	7530	+ sign = -1;
	7531	+ }
	7532	+ hScale = signMath.pow(signhScale, scale * 50);
	7533	+ if (hScale < 0.01)
	7534	+ {
	7535	+ //hScale = 0.01;
	7536	+ }
	7537	+
	7538	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7539	+ sign = 1;
	7540	+ if (vScale < 0)
	7541	+ {
	7542	+ sign = -1;
	7543	+ }
	7544	+ vScale = signMath.pow(signvScale, scale * 50);
	7545	+ if (vScale < 0.01)
	7546	+ {
	7547	+ //vScale = 0.01;
	7548	+ }
	7549	+
	7550	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7551	+
6978	7552	retval = true;
6979	7553	}
6980	7554
..	..	@@ -6984,7 +7558,7 @@
6984	7558	}
6985	7559
6986	7560	//System.out.println("info.modifiers = " + info.modifiers);
6987		- modified = (info.modifiers & CameraPane.META) != 0;
	7561	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6988	7562	//System.out.println("modified = " + modified);
6989	7563	//new Exception().printStackTrace();
6990	7564	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7012,7 +7586,8 @@
7012	7586	return true;
7013	7587	}
7014	7588
7015		- void doEditDrag0(ClickInfo info)
	7589	+ void doEditDrag0(//ClickInfo info,
	7590	+ boolean opposite)
7016	7591	{
7017	7592	if (hitSomething == 0)
7018	7593	{
..	..	@@ -7026,7 +7601,8 @@
7026	7601
7027	7602	//System.out.println("hitSomething = " + hitSomething);
7028	7603
7029		- double scale = 0.005f * info.camera.Distance();
	7604	+ double scale = 0.005f * clickInfo.camera.Distance();
	7605	+
7030	7606	cVector xlate = new cVector();
7031	7607	//cVector xlate2 = new cVector();
7032	7608	switch (hitSomething)
..	..	@@ -7039,7 +7615,7 @@
7039	7615
7040	7616	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7041	7617
7042		- if (modified)
	7618	+ if (modified \|\| opposite)
7043	7619	{
7044	7620	//assert(false);
7045	7621	/*
..	..	@@ -7059,8 +7635,8 @@
7059	7635	toParent[3][i] = xlate.get(i);
7060	7636	LA.matInvert(toParent, fromParent);
7061	7637	*/
7062		- cVector delta = LA.newVector(0, 0, startY - info.y);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7638	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7639	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	7640
7065	7641	LA.matCopy(startMat, toParent);
7066	7642	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7069,7 +7645,7 @@
7069	7645	} else
7070	7646	{
7071	7647	//LA.xformDir(delta, info.camera.fromScreen, delta);
7072		- cVector up = new cVector(info.camera.up);
	7648	+ cVector up = new cVector(clickInfo.camera.up);
7073	7649	cVector away = new cVector();
7074	7650	//cVector right2 = new cVector();
7075	7651	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7086,19 +7662,19 @@
7086	7662	LA.xformDir(up, ClickInfo.matbuffer, up);
7087	7663	// if (!CameraPane.LOCALTRANSFORM)
7088	7664	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7089		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7665	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7090	7666	// if (!CameraPane.LOCALTRANSFORM)
7091	7667	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7092	7668	//LA.vecCross(up, cVector.Z, right2);
7093	7669
7094		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7670	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7095	7671
7096	7672	//System.out.println("DELTA0 = " + delta);
7097	7673	//System.out.println("AWAY = " + info.camera.away);
7098	7674	//System.out.println("UP = " + info.camera.up);
7099	7675	if (away.z > 0)
7100	7676	{
7101		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7677	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7102	7678	{
7103	7679	delta.x = -delta.x;
7104	7680	} else
..	..	@@ -7113,7 +7689,7 @@
7113	7689	//System.out.println("DELTA1 = " + delta);
7114	7690	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7115	7691	//System.out.println("DELTA2 = " + delta);
7116		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7692	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7117	7693	LA.matCopy(startMat, toParent);
7118	7694	//System.out.println("DELTA3 = " + delta);
7119	7695	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7123,8 +7699,8 @@
7123	7699	break;
7124	7700
7125	7701	case hitRotate: // rotate
7126		- int dx = info.x - centerPt.x;
7127		- int dy = -(info.y - centerPt.y);
	7702	+ int dx = clickInfo.x - centerPt.x;
	7703	+ int dy = -(clickInfo.y - centerPt.y);
7128	7704	double angle = (double) Math.atan2(dx, dy);
7129	7705	angle = -(1.570796 - angle);
7130	7706
..	..	@@ -7133,6 +7709,7 @@
7133	7709
7134	7710	if (modified)
7135	7711	{
	7712	+ // Rotate 90 degrees
7136	7713	angle /= (Math.PI / 4);
7137	7714	angle = Math.floor(angle + 0.5);
7138	7715	angle *= (Math.PI / 4);
..	..	@@ -7146,7 +7723,7 @@
7146	7723	}
7147	7724	/**/
7148	7725
7149		- switch (info.pane.RenderCamera().viewCode)
	7726	+ switch (clickInfo.pane.RenderCamera().viewCode)
7150	7727	{
7151	7728	case 1: // '\001'
7152	7729	LA.matZRotate(toParent, angle);
..	..	@@ -7173,26 +7750,30 @@
7173	7750	break;
7174	7751
7175	7752	case hitScale: // scale
7176		- double hScale = (double) (info.x - centerPt.x) / 32;
	7753	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7754	+ double sign = 1;
	7755	+ if (hScale < 0)
	7756	+ {
	7757	+ sign = -1;
	7758	+ }
	7759	+ hScale = signMath.pow(signhScale, scale * 50);
7177	7760	if (hScale < 0.01)
7178	7761	{
7179		- hScale = 0.01;
	7762	+ //hScale = 0.01;
7180	7763	}
7181		- hScale = Math.pow(hScale, scale * 50);
7182		- if (hScale < 0.01)
	7764	+
	7765	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7766	+ sign = 1;
	7767	+ if (vScale < 0)
7183	7768	{
7184		- hScale = 0.01;
	7769	+ sign = -1;
7185	7770	}
7186		- double vScale = (double) (info.y - centerPt.y) / 32;
	7771	+ vScale = signMath.pow(signvScale, scale * 50);
7187	7772	if (vScale < 0.01)
7188	7773	{
7189		- vScale = 0.01;
	7774	+ //vScale = 0.01;
7190	7775	}
7191		- vScale = Math.pow(vScale, scale * 50);
7192		- if (vScale < 0.01)
7193		- {
7194		- vScale = 0.01;
7195		- }
	7776	+
7196	7777	LA.matCopy(startMat, toParent);
7197	7778	/**/
7198	7779	for (int i = 0; i < 3; i++)
..	..	@@ -7202,39 +7783,47 @@
7202	7783	}
7203	7784	/**/
7204	7785
7205		- switch (info.pane.RenderCamera().viewCode)
	7786	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7787	+
	7788	+ if (totalScale < 0.01)
	7789	+ {
	7790	+ totalScale = 0.01;
	7791	+ }
	7792	+
	7793	+ switch (clickInfo.pane.RenderCamera().viewCode)
7206	7794	{
7207	7795	case 3: // '\001'
7208		- if (modified)
	7796	+ if (modified \|\| opposite)
7209	7797	{
7210	7798	//LA.matScale(toParent, 1, hScale, vScale);
7211		- LA.matScale(toParent, vScale, 1, 1);
	7799	+ LA.matScale(toParent, totalScale, 1, 1);
7212	7800	} // vScale, 1);
7213	7801	else
7214	7802	{
7215		- LA.matScale(toParent, vScale, vScale, vScale);
	7803	+ // EXCEPTION!
	7804	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7216	7805	} // vScale, 1);
7217	7806	break;
7218	7807
7219	7808	case 2: // '\002'
7220		- if (modified)
	7809	+ if (modified \|\| opposite)
7221	7810	{
7222	7811	//LA.matScale(toParent, hScale, 1, vScale);
7223		- LA.matScale(toParent, 1, vScale, 1);
	7812	+ LA.matScale(toParent, 1, totalScale, 1);
7224	7813	} else
7225	7814	{
7226		- LA.matScale(toParent, vScale, 1, vScale);
	7815	+ LA.matScale(toParent, totalScale, 1, totalScale);
7227	7816	}
7228	7817	break;
7229	7818
7230	7819	case 1: // '\003'
7231		- if (modified)
	7820	+ if (modified \|\| opposite)
7232	7821	{
7233	7822	//LA.matScale(toParent, hScale, vScale, 1);
7234		- LA.matScale(toParent, 1, 1, vScale);
	7823	+ LA.matScale(toParent, 1, 1, totalScale);
7235	7824	} else
7236	7825	{
7237		- LA.matScale(toParent, vScale, vScale, 1);
	7826	+ LA.matScale(toParent, totalScale, totalScale, 1);
7238	7827	}
7239	7828	break;
7240	7829	}
..	..	@@ -7268,7 +7857,7 @@
7268	7857	} // NEW ...
7269	7858
7270	7859
7271		- info.pane.repaint();
	7860	+ clickInfo.pane.repaint();
7272	7861	}
7273	7862
7274	7863	boolean overflow = false;
..	..	@@ -7367,14 +7956,22 @@
7367	7956	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7368	7957	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7369	7958	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7959	+
	7960	+ String objname;
	7961	+
7370	7962	if (false) //parent != null)
7371	7963	{
7372		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7964	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7373	7965	} else
7374	7966	{
7375		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7967	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7376	7968	} // + super.toString();
7377	7969	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7970	+
	7971	+ if (!Globals.ADVANCED)
	7972	+ return objname;
	7973	+
	7974	+ return objname + " " + System.identityHashCode(this);
7378	7975	}
7379	7976
7380	7977	public int hashCode()
..	..	@@ -7440,6 +8037,10 @@
7440	8037	editWindow = null;
7441	8038	} // ?
7442	8039	}
	8040	+ else
	8041	+ {
	8042	+ //editWindow.closeUI();
	8043	+ }
7443	8044	}
7444	8045
7445	8046	boolean root; // patch for edit windows
..	..	@@ -7451,7 +8052,7 @@
7451	8052	/transient/ cVector2[] projectedVertices = new cVector2[0];
7452	8053
7453	8054	Object3D /Composite/ parent;
7454		- Object3D /Composite/ fileparent;
	8055	+ Object3D /Composite/ fileparent; // In the case of FileObject
7455	8056
7456	8057	double[][] toParent; // dynamic matrix
7457	8058	double[][] fromParent;
..	..	@@ -7566,7 +8167,7 @@
7566	8167	{
7567	8168	assert(bRep != null);
7568	8169	if (!(support instanceof GenericJoint)) // support.bRep != null)
7569		- GrafreeD.Assert(support.bRep == bRep.support);
	8170	+ Grafreed.Assert(support.bRep == bRep.support);
7570	8171	}
7571	8172	else
7572	8173	{
..	..	@@ -7597,6 +8198,10 @@
7597	8198	}
7598	8199
7599	8200	transient ObjEditor editWindow;
	8201	+ transient ObjEditor manipWindow;
	8202	+
	8203	+ transient boolean pinned;
	8204	+
7600	8205	transient ObjectUI objectUI;
7601	8206	public static int povDepth = 0;
7602	8207	private static cVector tbMin = new cVector();
..	..	@@ -7615,9 +8220,9 @@
7615	8220	private static cVector edge2 = new cVector();
7616	8221	//private static cVector norm = new cVector();
7617	8222	/transient private/ int hitSomething;
7618		- private static final int hitCenter = 1;
7619		- private static final int hitScale = 2;
7620		- private static final int hitRotate = 3;
	8223	+ static final int hitCenter = 1;
	8224	+ static final int hitScale = 2;
	8225	+ static final int hitRotate = 3;
7621	8226	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7622	8227	/transient/ private Point centerPt;
7623	8228	/transient/ private int startX;