~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,12 +2465,17 @@
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)
2300	2475	{
2301	2476	if (newWindow)
2302	2477	{
	2478	+ new Exception().printStackTrace();
2303	2479	System.exit(0);
2304	2480	if (parent != null)
2305	2481	{
..	..	@@ -2334,6 +2510,14 @@
2334	2510	{
2335	2511	editWindow.refreshContents();
2336	2512	}
	2513	+ else
	2514	+ {
	2515	+ if (manipWindow != null)
	2516	+ {
	2517	+ manipWindow.refreshContents();
	2518	+ }
	2519	+ }
	2520	+
2337	2521	//if (parent != null)
2338	2522	//parent.refreshEditWindow();
2339	2523	}
..	..	@@ -2413,7 +2597,8 @@
2413	2597	private static final int editSelf = 1;
2414	2598	private static final int editChild = 2;
2415	2599
2416		- void drawEditHandles(ClickInfo info, int level)
	2600	+ void drawEditHandles(//ClickInfo info,
	2601	+ int level)
2417	2602	{
2418	2603	if (level == 0)
2419	2604	{
..	..	@@ -2421,7 +2606,8 @@
2421	2606	return;
2422	2607
2423	2608	Object3D selectee;
2424		- 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))
2425	2611	{
2426	2612	selectee = (Object3D) e.nextElement();
2427	2613	}
..	..	@@ -2429,19 +2615,22 @@
2429	2615	} else
2430	2616	{
2431	2617	//super.
2432		- drawEditHandles0(info, level + 1);
	2618	+ drawEditHandles0(//info,
	2619	+ level + 1);
2433	2620	}
2434	2621	}
2435	2622
2436		- boolean doEditClick(ClickInfo info, int level)
	2623	+ boolean doEditClick(//ClickInfo info,
	2624	+ int level)
2437	2625	{
2438	2626	doSomething = 0;
2439	2627	if (level == 0)
2440	2628	{
2441		- return doParentClick(info);
	2629	+ return doParentClick(); //info);
2442	2630	}
2443	2631	if (//super.
2444		- doEditClick0(info, level))
	2632	+ doEditClick0(//info,
	2633	+ level))
2445	2634	{
2446	2635	doSomething = 1;
2447	2636	return true;
..	..	@@ -2451,7 +2640,7 @@
2451	2640	}
2452	2641	}
2453	2642
2454		- boolean doParentClick(ClickInfo info)
	2643	+ boolean doParentClick() //ClickInfo info)
2455	2644	{
2456	2645	if (selection == null)
2457	2646	{
..	..	@@ -2464,7 +2653,8 @@
2464	2653	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2465	2654	{
2466	2655	Object3D selectee = (Object3D) e.nextElement();
2467		- if (selectee.doEditClick(info, 1))
	2656	+ if (selectee.doEditClick(//info,
	2657	+ 1))
2468	2658	{
2469	2659	childToDrag = selectee;
2470	2660	doSomething = 2;
..	..	@@ -2476,13 +2666,15 @@
2476	2666	return retval;
2477	2667	}
2478	2668
2479		- void doEditDrag(ClickInfo info)
	2669	+ void doEditDrag(//ClickInfo clickInfo,
	2670	+ boolean opposite)
2480	2671	{
2481	2672	switch (doSomething)
2482	2673	{
2483	2674	case 1: // '\001'
2484	2675	//super.
2485		- doEditDrag0(info);
	2676	+ doEditDrag0(//clickInfo,
	2677	+ opposite);
2486	2678	break;
2487	2679
2488	2680	case 2: // '\002'
..	..	@@ -2495,11 +2687,13 @@
2495	2687	{
2496	2688	//sel.hitSomething = childToDrag.hitSomething;
2497	2689	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2690	+ sel.doEditDrag(//clickInfo,
	2691	+ opposite);
2499	2692	} else
2500	2693	{
2501	2694	//super.
2502		- doEditDrag0(info);
	2695	+ doEditDrag0(//clickInfo,
	2696	+ opposite);
2503	2697	}
2504	2698	}
2505	2699	break;
..	..	@@ -2517,6 +2711,9 @@
2517	2711	{
2518	2712	deselectAll();
2519	2713	}
	2714	+
	2715	+ new Exception().printStackTrace();
	2716	+
2520	2717	ClickInfo newInfo = new ClickInfo();
2521	2718	newInfo.flags = info.flags;
2522	2719	newInfo.bounds = info.bounds;
..	..	@@ -2609,6 +2806,18 @@
2609	2806	void GenNormalsS(boolean crease)
2610	2807	{
2611	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();
2612	2821	// for (int i=0; i<selection.size(); i++)
2613	2822	// {
2614	2823	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2958,24 @@
2749	2958	if (child == null)
2750	2959	continue;
2751	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();
2752	2979	// Children().release(i);
2753	2980	}
2754	2981	blockloop = false;
..	..	@@ -2921,11 +3148,20 @@
2921	3148	}
2922	3149	}
2923	3150
	3151	+ void GenNormalsMesh0()
	3152	+ {
	3153	+ if (bRep != null)
	3154	+ {
	3155	+ bRep.GenerateNormalsMesh();
	3156	+ Touch();
	3157	+ }
	3158	+ }
	3159	+
2924	3160	void GenNormalsMINE0()
2925	3161	{
2926	3162	if (bRep != null)
2927	3163	{
2928		- bRep.GenerateNormalsMINE();
	3164	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2929	3165	Touch();
2930	3166	}
2931	3167	}
..	..	@@ -2982,6 +3218,33 @@
2982	3218	blockloop = false;
2983	3219	}
2984	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	+
2985	3248	void TransformGeometry()
2986	3249	{
2987	3250	Object3D obj = this;
..	..	@@ -3203,9 +3466,11 @@
3203	3466
3204	3467	BoundaryRep sup = bRep.support;
3205	3468	bRep.support = null;
3206		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3469	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3207	3470	// bRep.SplitInTwo(onlyone); // thread...
3208		- temprep.SplitInTwo(reduction34, onlyone);
	3471	+
	3472	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3473	+
3209	3474	bRep = temprep;
3210	3475	bRep.support = sup;
3211	3476	Touch();
..	..	@@ -3342,7 +3607,8 @@
3342	3607	if (blockloop)
3343	3608	return;
3344	3609
3345		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3346	3612	live = h;
3347	3613
3348	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,7 +3629,8 @@
3363	3629	return;
3364	3630
3365	3631	//if (bRep != null)
3366		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3632	+ if (//marked \|\| // does not make sense
	3633	+ (bRep != null \|\| material != null)) // borderline...
3367	3634	link2master = h;
3368	3635
3369	3636	for (int i = 0; i < Size(); i++)
..	..	@@ -3383,7 +3650,8 @@
3383	3650	if (blockloop)
3384	3651	return;
3385	3652
3386		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3653	+ if (//marked \|\| // does not make sense
	3654	+ (bRep != null \|\| material != null)) // borderline...
3387	3655	hide = h;
3388	3656
3389	3657	for (int i = 0; i < Size(); i++)
..	..	@@ -3403,7 +3671,7 @@
3403	3671	if (blockloop)
3404	3672	return;
3405	3673
3406		- if (bRep != null && material != null) // borderline...
	3674	+ if (bRep != null \|\| material != null) // borderline...
3407	3675	marked = h;
3408	3676
3409	3677	for (int i = 0; i < Size(); i++)
..	..	@@ -3413,6 +3681,46 @@
3413	3681	continue;
3414	3682	blockloop = true;
3415	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);
3416	3724	blockloop = false;
3417	3725	// release(i);
3418	3726	}
..	..	@@ -3727,7 +4035,7 @@
3727	4035	if (child == null)
3728	4036	continue;
3729	4037
3730		- if (GrafreeD.RENDERME > 0)
	4038	+ if (Grafreed.RENDERME > 0)
3731	4039	{
3732	4040	if (child instanceof Merge)
3733	4041	((Merge)child).renderme();
..	..	@@ -3878,7 +4186,7 @@
3878	4186	if (child == null)
3879	4187	continue;
3880	4188
3881		- if (GrafreeD.RENDERME > 0)
	4189	+ if (Grafreed.RENDERME > 0)
3882	4190	{
3883	4191	if (child instanceof Merge)
3884	4192	((Merge)child).renderme();
..	..	@@ -4073,7 +4381,7 @@
4073	4381	if (child == null)
4074	4382	continue;
4075	4383
4076		- if (GrafreeD.RENDERME > 0)
	4384	+ if (Grafreed.RENDERME > 0)
4077	4385	{
4078	4386	if (child instanceof Merge)
4079	4387	((Merge)child).renderme();
..	..	@@ -4186,6 +4494,55 @@
4186	4494	{
4187	4495	blockloop = true;
4188	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();
4189	4546	blockloop = false;
4190	4547	}
4191	4548	}
..	..	@@ -4680,7 +5037,7 @@
4680	5037
4681	5038	cTreePath SelectLeaf(int indexcount, boolean deselect)
4682	5039	{
4683		- if (hide)
	5040	+ if (hide \|\| dontselect)
4684	5041	return null;
4685	5042
4686	5043	if (count <= 0)
..	..	@@ -4704,9 +5061,17 @@
4704	5061	}
4705	5062	}
4706	5063
	5064	+ ObjEditor GetWindow()
	5065	+ {
	5066	+ if (editWindow != null)
	5067	+ return editWindow;
	5068	+
	5069	+ return manipWindow;
	5070	+ }
	5071	+
4707	5072	cTreePath Select(int indexcount, boolean deselect)
4708	5073	{
4709		- if (hide)
	5074	+ if (hide \|\| dontselect)
4710	5075	return null;
4711	5076
4712	5077	if (count <= 0)
..	..	@@ -4740,10 +5105,11 @@
4740	5105	if (leaf != null)
4741	5106	{
4742	5107	cTreePath tp = new cTreePath(this, leaf);
4743		- if (editWindow != null)
	5108	+ ObjEditor window = GetWindow();
	5109	+ if (window != null)
4744	5110	{
4745	5111	//System.out.println("editWindow = " + editWindow + " vs " + this);
4746		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4747	5113	}
4748	5114
4749	5115	return tp;
..	..	@@ -4760,6 +5126,7 @@
4760	5126
4761	5127	if (child == null)
4762	5128	continue;
	5129	+
4763	5130	if (child.HasTransparency() && child.size() != 0)
4764	5131	{
4765	5132	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4769,9 +5136,10 @@
4769	5136	if (leaf != null)
4770	5137	{
4771	5138	cTreePath tp = new cTreePath(this, leaf);
4772		- if (editWindow != null)
	5139	+ ObjEditor window = GetWindow();
	5140	+ if (window != null)
4773	5141	{
4774		- editWindow.Select(tp, deselect, true);
	5142	+ window.Select(tp, deselect, true);
4775	5143	}
4776	5144
4777	5145	return tp;
..	..	@@ -5096,6 +5464,51 @@
5096	5464	blockloop = false;
5097	5465	}
5098	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	+
5099	5512	boolean IsSelected()
5100	5513	{
5101	5514	if (parent == null)
..	..	@@ -5158,10 +5571,34 @@
5158	5571
5159	5572	// System.out.println("Fullname = " + fullname);
5160	5573
5161		- if (fullname.name.indexOf(":") == -1)
5162		- return fullname.name;
	5574	+ // Does not work on Windows due to C:
	5575	+// if (fullname.name.indexOf(":") == -1)
	5576	+// return fullname.name;
	5577	+//
	5578	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5163	5579
5164		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5580	+ String[] split = fullname.name.split(":");
	5581	+
	5582	+ if (split.length == 0)
	5583	+ {
	5584	+ return "";
	5585	+ }
	5586	+
	5587	+ if (split.length <= 2)
	5588	+ {
	5589	+ if (fullname.name.endsWith(":"))
	5590	+ {
	5591	+ // Windows
	5592	+ return fullname.name.substring(0, fullname.name.length()-1);
	5593	+ }
	5594	+
	5595	+ return split[0];
	5596	+ }
	5597	+
	5598	+ // Windows
	5599	+ assert(split.length == 4);
	5600	+
	5601	+ return split[0] + ":" + split[1];
5165	5602	}
5166	5603
5167	5604	static String GetBump(cTexture fullname)
..	..	@@ -5170,10 +5607,38 @@
5170	5607	return "";
5171	5608
5172	5609	// System.out.println("Fullname = " + fullname);
5173		- if (fullname.name.indexOf(":") == -1)
5174		- return "";
5175		-
5176		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5610	+ // Does not work on Windows due to C:
	5611	+// if (fullname.name.indexOf(":") == -1)
	5612	+// return "";
	5613	+//
	5614	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5615	+ String[] split = fullname.name.split(":");
	5616	+
	5617	+ if (split.length == 0)
	5618	+ {
	5619	+ return "";
	5620	+ }
	5621	+
	5622	+ if (split.length == 1)
	5623	+ {
	5624	+ return "";
	5625	+ }
	5626	+
	5627	+ if (split.length == 2)
	5628	+ {
	5629	+ if (fullname.name.endsWith(":"))
	5630	+ {
	5631	+ // Windows
	5632	+ return "";
	5633	+ }
	5634	+
	5635	+ return split[1];
	5636	+ }
	5637	+
	5638	+ // Windows
	5639	+ assert(split.length == 4);
	5640	+
	5641	+ return split[2] + ":" + split[3];
5177	5642	}
5178	5643
5179	5644	String GetPigmentTexture()
..	..	@@ -5247,7 +5712,7 @@
5247	5712	System.out.print("; textures = " + textures);
5248	5713	System.out.println("; usedtextures = " + usedtextures);
5249	5714
5250		- if (GetTextures() == null)
	5715	+ if (GetTextures() == null) // What is that??
5251	5716	GetTextures().name = ":";
5252	5717
5253	5718	String texname = tex;
..	..	@@ -5278,6 +5743,43 @@
5278	5743	child.ResetPigmentTexture();
5279	5744	blockloop = false;
5280	5745	}
	5746	+ }
	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;
5281	5783	}
5282	5784
5283	5785	void SetBumpTexture(String tex)
..	..	@@ -5316,6 +5818,38 @@
5316	5818	}
5317	5819	}
5318	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	+
5319	5853	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5320	5854	{
5321	5855	Draw(display, root, selected, blocked);
..	..	@@ -5324,12 +5858,23 @@
5324	5858	boolean NeedSupport()
5325	5859	{
5326	5860	return
5327		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5861	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5328	5862	// PROBLEM with CROWD!!
5329		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5863	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5330	5864	}
5331	5865
5332	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	+ }
5333	5878
5334	5879	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5880	{
..	..	@@ -5341,7 +5886,7 @@
5341	5886	}
5342	5887
5343	5888	if (display.DrawMode() == iCameraPane.SELECTION &&
5344		- hide)
	5889	+ (hide \|\| dontselect))
5345	5890	return;
5346	5891
5347	5892	if (name != null && name.contains("sclera"))
..	..	@@ -5391,8 +5936,10 @@
5391	5936	if (support != null)
5392	5937	support = support;
5393	5938
5394		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	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.
5396	5943
5397	5944	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	5945	{
..	..	@@ -5402,8 +5949,9 @@
5402	5949	// usecalllists &= !(parent instanceof RandomNode);
5403	5950	// usecalllists = false;
5404	5951
5405		- if (GetBRep() != null)
5406		- usecalllists = usecalllists;
	5952	+ if (display.DrawMode() == display.SHADOW)
	5953	+ //GetBRep() != null)
	5954	+ usecalllists = !!usecalllists;
5407	5955	//System.out.println("draw " + this);
5408	5956	//new Exception().printStackTrace();
5409	5957
..	..	@@ -5412,10 +5960,12 @@
5412	5960	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5961
5414	5962	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415		- (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)))
5416	5965	{
5417	5966	Globals.lighttouched = true;
5418	5967	} // all panes...
	5968	+
5419	5969	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5420	5970	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5971	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5423,7 +5973,7 @@
5423	5973	if (!(this instanceof Composite))
5424	5974	touched = false;
5425	5975	//if (displaylist == -1 && usecalllists)
5426		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5976	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5427	5977	{
5428	5978	bRep.displaylist = display.GenList();
5429	5979	assert(bRep.displaylist != 0);
..	..	@@ -5434,7 +5984,7 @@
5434	5984
5435	5985	//System.out.println("\tnew list " + list);
5436	5986	//gl.glDrawBuffer(gl.GL_NONE);
5437		- if (usecalllists)
	5987	+ if (usecalllists && bRep.displaylist > 0)
5438	5988	{
5439	5989	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440	5990	display.NewList(bRep.displaylist);
..	..	@@ -5443,7 +5993,7 @@
5443	5993	CallList(display, root, selected, blocked);
5444	5994
5445	5995	// compiled = true;
5446		- if (usecalllists)
	5996	+ if (usecalllists && bRep.displaylist > 0)
5447	5997	{
5448	5998	// System.err.println("end list " + bRep.displaylist + " for " + this);
5449	5999	display.EndList();
..	..	@@ -5543,6 +6093,7 @@
5543	6093	if (GetBRep() != null)
5544	6094	{
5545	6095	display.NextIndex();
	6096	+
5546	6097	// vertex color conflict : gl.glCallList(list);
5547	6098	DrawNode(display, root, selected);
5548	6099	if (this instanceof BezierPatch)
..	..	@@ -5583,7 +6134,28 @@
5583	6134	tex = GetTextures();
5584	6135	}
5585	6136
5586		- 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	+ }
5587	6159
5588	6160	if (!compiled)
5589	6161	{
..	..	@@ -5605,7 +6177,11 @@
5605	6177	}
5606	6178	}
5607	6179
5608		- display.ReleaseTextures(tex);
	6180	+ if (!failedBump)
	6181	+ display.ReleaseBumpTexture(tex);
	6182	+
	6183	+ if (!failedPigment)
	6184	+ display.ReleasePigmentTexture(tex);
5609	6185
5610	6186	display.PopMaterial(this, selected);
5611	6187	}
..	..	@@ -5734,6 +6310,9 @@
5734	6310
5735	6311	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5736	6312	{
	6313	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6314	+ return;
	6315	+
5737	6316	if (hide)
5738	6317	return;
5739	6318	// shadow optimisation
..	..	@@ -5859,6 +6438,9 @@
5859	6438	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5860	6439	return; // no shadow for transparent objects
5861	6440
	6441	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6442	+ return;
	6443	+
5862	6444	if (hide)
5863	6445	return;
5864	6446
..	..	@@ -5972,6 +6554,11 @@
5972	6554	// dec 2012
5973	6555	new Exception().printStackTrace();
5974	6556	return;
	6557	+ }
	6558	+
	6559	+ if (dontselect)
	6560	+ {
	6561	+ //bRep.GenerateNormalsMINE();
5975	6562	}
5976	6563
5977	6564	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6757,20 +7344,23 @@
6757	7344	}
6758	7345	}
6759	7346
6760		- 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)
6761	7351	{
6762		- int hc = info.bounds.x + info.bounds.width / 2;
6763		- int vc = info.bounds.y + info.bounds.height / 2;
6764		- double[][] toscreen = info.toScreen;
	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;
6765	7355	if (toscreen == null)
6766	7356	{
6767		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7357	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6768	7358	}
6769	7359	cVector vec = in;
6770	7360	LA.xformPos(in, toscreen, in);
6771	7361	//System.out.println("Distance = " + info.camera.Distance());
6772		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6773		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7362	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7363	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6774	7364	outPt.x = hc + (int) vec.x;
6775	7365	outPt.y = vc - (int) vec.y;
6776	7366	outRec.x = outPt.x - 3;
..	..	@@ -6778,15 +7368,18 @@
6778	7368	outRec.width = outRec.height = 6;
6779	7369	}
6780	7370
6781		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7371	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7372	+ )
6782	7373	{
6783	7374	Point pt = new Point(0, 0);
6784	7375	Rectangle rec = new Rectangle();
6785		- calcHotSpot(in, info, pt, rec);
	7376	+ calcHotSpot(in, //clickInfo,
	7377	+ pt, rec);
6786	7378	return rec;
6787	7379	}
6788	7380
6789		- void drawEditHandles0(ClickInfo info, int level)
	7381	+ void drawEditHandles0(//ClickInfo clickInfo,
	7382	+ int level)
6790	7383	{
6791	7384	if (level == 0)
6792	7385	{
..	..	@@ -6795,16 +7388,19 @@
6795	7388	{
6796	7389	cVector origin = new cVector();
6797	7390	//LA.xformPos(origin, toParent, origin);
6798		- Rectangle spot = calcHotSpot(origin, info);
	7391	+ if (this.clickInfo == null)
	7392	+ this.clickInfo = new ClickInfo();
	7393	+
	7394	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6799	7395	Rectangle boundary = new Rectangle();
6800	7396	boundary.x = spot.x - 30;
6801	7397	boundary.y = spot.y - 30;
6802	7398	boundary.width = spot.width + 60;
6803	7399	boundary.height = spot.height + 60;
6804		- info.g.setColor(Color.red);
	7400	+ clickInfo.g.setColor(Color.red);
6805	7401	int spotw = spot.x + spot.width;
6806	7402	int spoth = spot.y + spot.height;
6807		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7403	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6808	7404	// if (CameraPane.Xmin > spot.x)
6809	7405	// {
6810	7406	// CameraPane.Xmin = spot.x;
..	..	@@ -6824,8 +7420,8 @@
6824	7420	spot.translate(32, 32);
6825	7421	spotw = spot.x + spot.width;
6826	7422	spoth = spot.y + spot.height;
6827		- info.g.setColor(Color.blue);
6828		- 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);
6829	7425	// if (CameraPane.Xmin > spot.x)
6830	7426	// {
6831	7427	// CameraPane.Xmin = spot.x;
..	..	@@ -6842,11 +7438,12 @@
6842	7438	// {
6843	7439	// CameraPane.Ymax = spoth;
6844	7440	// }
6845		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6846		- 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
6847	7443	spot.translate(0, -32);
6848		- info.g.setColor(Color.green);
6849		- 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);
6850	7447	// if (CameraPane.Xmin > spot.x)
6851	7448	// {
6852	7449	// CameraPane.Xmin = spot.x;
..	..	@@ -6863,8 +7460,8 @@
6863	7460	// {
6864	7461	// CameraPane.Ymax = spoth;
6865	7462	// }
6866		- info.g.drawArc(boundary.x, boundary.y,
6867		- 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);
6868	7465	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6869	7466	// if (CameraPane.Xmin > boundary.x)
6870	7467	// {
..	..	@@ -6886,7 +7483,8 @@
6886	7483	}
6887	7484	}
6888	7485
6889		- boolean doEditClick0(ClickInfo info, int level)
	7486	+ boolean doEditClick0(//ClickInfo clickInfo,
	7487	+ int level)
6890	7488	{
6891	7489	if (level == 0)
6892	7490	{
..	..	@@ -6895,10 +7493,10 @@
6895	7493
6896	7494	boolean retval = false;
6897	7495
6898		- startX = info.x;
6899		- startY = info.y;
	7496	+ startX = clickInfo.x;
	7497	+ startY = clickInfo.y;
6900	7498
6901		- hitSomething = 0;
	7499	+ hitSomething = -1;
6902	7500	cVector origin = new cVector();
6903	7501	//LA.xformPos(origin, toParent, origin);
6904	7502	Rectangle spot = new Rectangle();
..	..	@@ -6906,22 +7504,51 @@
6906	7504	{
6907	7505	centerPt = new Point(0, 0);
6908	7506	}
6909		- calcHotSpot(origin, info, centerPt, spot);
6910		- if (spot.contains(info.x, info.y))
	7507	+ calcHotSpot(origin, //info,
	7508	+ centerPt, spot);
	7509	+ if (spot.contains(clickInfo.x, clickInfo.y))
6911	7510	{
6912	7511	hitSomething = hitCenter;
6913	7512	retval = true;
6914	7513	}
6915	7514	spot.translate(32, 0);
6916		- if (spot.contains(info.x, info.y))
	7515	+ if (spot.contains(clickInfo.x, clickInfo.y))
6917	7516	{
6918	7517	hitSomething = hitRotate;
6919	7518	retval = true;
6920	7519	}
6921	7520	spot.translate(0, 32);
6922		- if (spot.contains(info.x, info.y))
	7521	+ if (spot.contains(clickInfo.x, clickInfo.y))
6923	7522	{
6924	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	+
6925	7552	retval = true;
6926	7553	}
6927	7554
..	..	@@ -6931,7 +7558,7 @@
6931	7558	}
6932	7559
6933	7560	//System.out.println("info.modifiers = " + info.modifiers);
6934		- modified = (info.modifiers & CameraPane.META) != 0;
	7561	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6935	7562	//System.out.println("modified = " + modified);
6936	7563	//new Exception().printStackTrace();
6937	7564	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6959,7 +7586,8 @@
6959	7586	return true;
6960	7587	}
6961	7588
6962		- void doEditDrag0(ClickInfo info)
	7589	+ void doEditDrag0(//ClickInfo info,
	7590	+ boolean opposite)
6963	7591	{
6964	7592	if (hitSomething == 0)
6965	7593	{
..	..	@@ -6973,7 +7601,8 @@
6973	7601
6974	7602	//System.out.println("hitSomething = " + hitSomething);
6975	7603
6976		- double scale = 0.005f * info.camera.Distance();
	7604	+ double scale = 0.005f * clickInfo.camera.Distance();
	7605	+
6977	7606	cVector xlate = new cVector();
6978	7607	//cVector xlate2 = new cVector();
6979	7608	switch (hitSomething)
..	..	@@ -6986,7 +7615,7 @@
6986	7615
6987	7616	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6988	7617
6989		- if (modified)
	7618	+ if (modified \|\| opposite)
6990	7619	{
6991	7620	//assert(false);
6992	7621	/*
..	..	@@ -7006,8 +7635,8 @@
7006	7635	toParent[3][i] = xlate.get(i);
7007	7636	LA.matInvert(toParent, fromParent);
7008	7637	*/
7009		- cVector delta = LA.newVector(0, 0, startY - info.y);
7010		- 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);
7011	7640
7012	7641	LA.matCopy(startMat, toParent);
7013	7642	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7016,7 +7645,7 @@
7016	7645	} else
7017	7646	{
7018	7647	//LA.xformDir(delta, info.camera.fromScreen, delta);
7019		- cVector up = new cVector(info.camera.up);
	7648	+ cVector up = new cVector(clickInfo.camera.up);
7020	7649	cVector away = new cVector();
7021	7650	//cVector right2 = new cVector();
7022	7651	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7033,19 +7662,19 @@
7033	7662	LA.xformDir(up, ClickInfo.matbuffer, up);
7034	7663	// if (!CameraPane.LOCALTRANSFORM)
7035	7664	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7036		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7665	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7037	7666	// if (!CameraPane.LOCALTRANSFORM)
7038	7667	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7039	7668	//LA.vecCross(up, cVector.Z, right2);
7040	7669
7041		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7670	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7042	7671
7043	7672	//System.out.println("DELTA0 = " + delta);
7044	7673	//System.out.println("AWAY = " + info.camera.away);
7045	7674	//System.out.println("UP = " + info.camera.up);
7046	7675	if (away.z > 0)
7047	7676	{
7048		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7677	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7049	7678	{
7050	7679	delta.x = -delta.x;
7051	7680	} else
..	..	@@ -7060,7 +7689,7 @@
7060	7689	//System.out.println("DELTA1 = " + delta);
7061	7690	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7062	7691	//System.out.println("DELTA2 = " + delta);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7692	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	7693	LA.matCopy(startMat, toParent);
7065	7694	//System.out.println("DELTA3 = " + delta);
7066	7695	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7070,8 +7699,8 @@
7070	7699	break;
7071	7700
7072	7701	case hitRotate: // rotate
7073		- int dx = info.x - centerPt.x;
7074		- int dy = -(info.y - centerPt.y);
	7702	+ int dx = clickInfo.x - centerPt.x;
	7703	+ int dy = -(clickInfo.y - centerPt.y);
7075	7704	double angle = (double) Math.atan2(dx, dy);
7076	7705	angle = -(1.570796 - angle);
7077	7706
..	..	@@ -7080,6 +7709,7 @@
7080	7709
7081	7710	if (modified)
7082	7711	{
	7712	+ // Rotate 90 degrees
7083	7713	angle /= (Math.PI / 4);
7084	7714	angle = Math.floor(angle + 0.5);
7085	7715	angle *= (Math.PI / 4);
..	..	@@ -7093,7 +7723,7 @@
7093	7723	}
7094	7724	/**/
7095	7725
7096		- switch (info.pane.RenderCamera().viewCode)
	7726	+ switch (clickInfo.pane.RenderCamera().viewCode)
7097	7727	{
7098	7728	case 1: // '\001'
7099	7729	LA.matZRotate(toParent, angle);
..	..	@@ -7120,26 +7750,30 @@
7120	7750	break;
7121	7751
7122	7752	case hitScale: // scale
7123		- 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);
7124	7760	if (hScale < 0.01)
7125	7761	{
7126		- hScale = 0.01;
	7762	+ //hScale = 0.01;
7127	7763	}
7128		- hScale = Math.pow(hScale, scale * 50);
7129		- if (hScale < 0.01)
	7764	+
	7765	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7766	+ sign = 1;
	7767	+ if (vScale < 0)
7130	7768	{
7131		- hScale = 0.01;
	7769	+ sign = -1;
7132	7770	}
7133		- double vScale = (double) (info.y - centerPt.y) / 32;
	7771	+ vScale = signMath.pow(signvScale, scale * 50);
7134	7772	if (vScale < 0.01)
7135	7773	{
7136		- vScale = 0.01;
	7774	+ //vScale = 0.01;
7137	7775	}
7138		- vScale = Math.pow(vScale, scale * 50);
7139		- if (vScale < 0.01)
7140		- {
7141		- vScale = 0.01;
7142		- }
	7776	+
7143	7777	LA.matCopy(startMat, toParent);
7144	7778	/**/
7145	7779	for (int i = 0; i < 3; i++)
..	..	@@ -7149,39 +7783,47 @@
7149	7783	}
7150	7784	/**/
7151	7785
7152		- 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)
7153	7794	{
7154	7795	case 3: // '\001'
7155		- if (modified)
	7796	+ if (modified \|\| opposite)
7156	7797	{
7157	7798	//LA.matScale(toParent, 1, hScale, vScale);
7158		- LA.matScale(toParent, vScale, 1, 1);
	7799	+ LA.matScale(toParent, totalScale, 1, 1);
7159	7800	} // vScale, 1);
7160	7801	else
7161	7802	{
7162		- LA.matScale(toParent, vScale, vScale, vScale);
	7803	+ // EXCEPTION!
	7804	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7163	7805	} // vScale, 1);
7164	7806	break;
7165	7807
7166	7808	case 2: // '\002'
7167		- if (modified)
	7809	+ if (modified \|\| opposite)
7168	7810	{
7169	7811	//LA.matScale(toParent, hScale, 1, vScale);
7170		- LA.matScale(toParent, 1, vScale, 1);
	7812	+ LA.matScale(toParent, 1, totalScale, 1);
7171	7813	} else
7172	7814	{
7173		- LA.matScale(toParent, vScale, 1, vScale);
	7815	+ LA.matScale(toParent, totalScale, 1, totalScale);
7174	7816	}
7175	7817	break;
7176	7818
7177	7819	case 1: // '\003'
7178		- if (modified)
	7820	+ if (modified \|\| opposite)
7179	7821	{
7180	7822	//LA.matScale(toParent, hScale, vScale, 1);
7181		- LA.matScale(toParent, 1, 1, vScale);
	7823	+ LA.matScale(toParent, 1, 1, totalScale);
7182	7824	} else
7183	7825	{
7184		- LA.matScale(toParent, vScale, vScale, 1);
	7826	+ LA.matScale(toParent, totalScale, totalScale, 1);
7185	7827	}
7186	7828	break;
7187	7829	}
..	..	@@ -7215,7 +7857,7 @@
7215	7857	} // NEW ...
7216	7858
7217	7859
7218		- info.pane.repaint();
	7860	+ clickInfo.pane.repaint();
7219	7861	}
7220	7862
7221	7863	boolean overflow = false;
..	..	@@ -7314,14 +7956,22 @@
7314	7956	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7315	7957	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7316	7958	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7959	+
	7960	+ String objname;
	7961	+
7317	7962	if (false) //parent != null)
7318	7963	{
7319		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7964	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7320	7965	} else
7321	7966	{
7322		- 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) ":"") / "";
7323	7968	} // + super.toString();
7324	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);
7325	7975	}
7326	7976
7327	7977	public int hashCode()
..	..	@@ -7377,6 +8027,7 @@
7377	8027	objectUI.closeUI();
7378	8028	if (editWindow != null)
7379	8029	{
	8030	+ editWindow.ctrlPanel.FlushUI();
7380	8031	editWindow.refreshContents();
7381	8032	} // ? new
7382	8033	objectUI = null;
..	..	@@ -7385,6 +8036,10 @@
7385	8036	{
7386	8037	editWindow = null;
7387	8038	} // ?
	8039	+ }
	8040	+ else
	8041	+ {
	8042	+ //editWindow.closeUI();
7388	8043	}
7389	8044	}
7390	8045
..	..	@@ -7397,7 +8052,7 @@
7397	8052	/transient/ cVector2[] projectedVertices = new cVector2[0];
7398	8053
7399	8054	Object3D /Composite/ parent;
7400		- Object3D /Composite/ fileparent;
	8055	+ Object3D /Composite/ fileparent; // In the case of FileObject
7401	8056
7402	8057	double[][] toParent; // dynamic matrix
7403	8058	double[][] fromParent;
..	..	@@ -7512,7 +8167,7 @@
7512	8167	{
7513	8168	assert(bRep != null);
7514	8169	if (!(support instanceof GenericJoint)) // support.bRep != null)
7515		- GrafreeD.Assert(support.bRep == bRep.support);
	8170	+ Grafreed.Assert(support.bRep == bRep.support);
7516	8171	}
7517	8172	else
7518	8173	{
..	..	@@ -7543,6 +8198,10 @@
7543	8198	}
7544	8199
7545	8200	transient ObjEditor editWindow;
	8201	+ transient ObjEditor manipWindow;
	8202	+
	8203	+ transient boolean pinned;
	8204	+
7546	8205	transient ObjectUI objectUI;
7547	8206	public static int povDepth = 0;
7548	8207	private static cVector tbMin = new cVector();
..	..	@@ -7561,9 +8220,9 @@
7561	8220	private static cVector edge2 = new cVector();
7562	8221	//private static cVector norm = new cVector();
7563	8222	/transient private/ int hitSomething;
7564		- private static final int hitCenter = 1;
7565		- private static final int hitScale = 2;
7566		- private static final int hitRotate = 3;
	8223	+ static final int hitCenter = 1;
	8224	+ static final int hitScale = 2;
	8225	+ static final int hitRotate = 3;
7567	8226	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7568	8227	/transient/ private Point centerPt;
7569	8228	/transient/ private int startX;