~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,18 @@
2294	2465	}
2295	2466	*/
2296	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2297	2473	}
2298	2474
2299	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2300	2476	{
2301	2477	if (newWindow)
2302	2478	{
	2479	+ new Exception().printStackTrace();
2303	2480	System.exit(0);
2304	2481	if (parent != null)
2305	2482	{
..	..	@@ -2334,6 +2511,14 @@
2334	2511	{
2335	2512	editWindow.refreshContents();
2336	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2337	2522	//if (parent != null)
2338	2523	//parent.refreshEditWindow();
2339	2524	}
..	..	@@ -2413,7 +2598,8 @@
2413	2598	private static final int editSelf = 1;
2414	2599	private static final int editChild = 2;
2415	2600
2416		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2417	2603	{
2418	2604	if (level == 0)
2419	2605	{
..	..	@@ -2421,7 +2607,8 @@
2421	2607	return;
2422	2608
2423	2609	Object3D selectee;
2424		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2610	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2611	+ level + 1))
2425	2612	{
2426	2613	selectee = (Object3D) e.nextElement();
2427	2614	}
..	..	@@ -2429,19 +2616,22 @@
2429	2616	} else
2430	2617	{
2431	2618	//super.
2432		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2433	2621	}
2434	2622	}
2435	2623
2436		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2437	2626	{
2438	2627	doSomething = 0;
2439	2628	if (level == 0)
2440	2629	{
2441		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2442	2631	}
2443	2632	if (//super.
2444		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2445	2635	{
2446	2636	doSomething = 1;
2447	2637	return true;
..	..	@@ -2451,7 +2641,7 @@
2451	2641	}
2452	2642	}
2453	2643
2454		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2455	2645	{
2456	2646	if (selection == null)
2457	2647	{
..	..	@@ -2464,7 +2654,8 @@
2464	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2465	2655	{
2466	2656	Object3D selectee = (Object3D) e.nextElement();
2467		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2468	2659	{
2469	2660	childToDrag = selectee;
2470	2661	doSomething = 2;
..	..	@@ -2476,13 +2667,15 @@
2476	2667	return retval;
2477	2668	}
2478	2669
2479		- void doEditDrag(ClickInfo info)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2480	2672	{
2481	2673	switch (doSomething)
2482	2674	{
2483	2675	case 1: // '\001'
2484	2676	//super.
2485		- doEditDrag0(info);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2486	2679	break;
2487	2680
2488	2681	case 2: // '\002'
..	..	@@ -2495,11 +2688,13 @@
2495	2688	{
2496	2689	//sel.hitSomething = childToDrag.hitSomething;
2497	2690	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2499	2693	} else
2500	2694	{
2501	2695	//super.
2502		- doEditDrag0(info);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2503	2698	}
2504	2699	}
2505	2700	break;
..	..	@@ -2517,6 +2712,9 @@
2517	2712	{
2518	2713	deselectAll();
2519	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2520	2718	ClickInfo newInfo = new ClickInfo();
2521	2719	newInfo.flags = info.flags;
2522	2720	newInfo.bounds = info.bounds;
..	..	@@ -2609,6 +2807,18 @@
2609	2807	void GenNormalsS(boolean crease)
2610	2808	{
2611	2809	selection.GenNormals(crease);
	2810	+// for (int i=0; i<selection.size(); i++)
	2811	+// {
	2812	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2813	+// selectee.GenNormals(crease);
	2814	+// }
	2815	+
	2816	+ //Touch();
	2817	+ }
	2818	+
	2819	+ void GenNormalsMeshS()
	2820	+ {
	2821	+ selection.GenNormalsMesh();
2612	2822	// for (int i=0; i<selection.size(); i++)
2613	2823	// {
2614	2824	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2749,6 +2959,24 @@
2749	2959	if (child == null)
2750	2960	continue;
2751	2961	child.GenNormals(crease);
	2962	+// Children().release(i);
	2963	+ }
	2964	+ blockloop = false;
	2965	+ }
	2966	+
	2967	+ void GenNormalsMesh()
	2968	+ {
	2969	+ if (blockloop)
	2970	+ return;
	2971	+
	2972	+ blockloop = true;
	2973	+ GenNormalsMesh0();
	2974	+ for (int i = 0; i < Children().Size(); i++)
	2975	+ {
	2976	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2977	+ if (child == null)
	2978	+ continue;
	2979	+ child.GenNormalsMesh();
2752	2980	// Children().release(i);
2753	2981	}
2754	2982	blockloop = false;
..	..	@@ -2906,7 +3134,8 @@
2906	3134	{
2907	3135	if (bRep != null)
2908	3136	{
2909		- bRep.GenUV();
	3137	+ bRep.GenUV(); //1);
	3138	+ //bRep.UnfoldUV();
2910	3139	Touch();
2911	3140	}
2912	3141	}
..	..	@@ -2920,11 +3149,20 @@
2920	3149	}
2921	3150	}
2922	3151
	3152	+ void GenNormalsMesh0()
	3153	+ {
	3154	+ if (bRep != null)
	3155	+ {
	3156	+ bRep.GenerateNormalsMesh();
	3157	+ Touch();
	3158	+ }
	3159	+ }
	3160	+
2923	3161	void GenNormalsMINE0()
2924	3162	{
2925	3163	if (bRep != null)
2926	3164	{
2927		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2928	3166	Touch();
2929	3167	}
2930	3168	}
..	..	@@ -2981,6 +3219,33 @@
2981	3219	blockloop = false;
2982	3220	}
2983	3221
	3222	+ void TransformChildren()
	3223	+ {
	3224	+ if (toParent != null)
	3225	+ {
	3226	+ for (int i=Size(); --i>=0;)
	3227	+ {
	3228	+ Object3D v = get(i);
	3229	+
	3230	+ if (v.toParent == null)
	3231	+ {
	3232	+ v.toParent = LA.newMatrix();
	3233	+ v.fromParent = LA.newMatrix();
	3234	+ }
	3235	+
	3236	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3237	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3238	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3239	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3240	+ }
	3241	+
	3242	+ toParent = null; // LA.matIdentity(toParent);
	3243	+ fromParent = null; // LA.matIdentity(fromParent);
	3244	+
	3245	+ Touch();
	3246	+ }
	3247	+ }
	3248	+
2984	3249	void TransformGeometry()
2985	3250	{
2986	3251	Object3D obj = this;
..	..	@@ -3202,9 +3467,11 @@
3202	3467
3203	3468	BoundaryRep sup = bRep.support;
3204	3469	bRep.support = null;
3205		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3470	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3206	3471	// bRep.SplitInTwo(onlyone); // thread...
3207		- temprep.SplitInTwo(reduction34, onlyone);
	3472	+
	3473	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3474	+
3208	3475	bRep = temprep;
3209	3476	bRep.support = sup;
3210	3477	Touch();
..	..	@@ -3341,7 +3608,8 @@
3341	3608	if (blockloop)
3342	3609	return;
3343	3610
3344		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3345	3613	live = h;
3346	3614
3347	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3362,7 +3630,8 @@
3362	3630	return;
3363	3631
3364	3632	//if (bRep != null)
3365		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3366	3635	link2master = h;
3367	3636
3368	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3382,7 +3651,8 @@
3382	3651	if (blockloop)
3383	3652	return;
3384	3653
3385		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3386	3656	hide = h;
3387	3657
3388	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3672,7 @@
3402	3672	if (blockloop)
3403	3673	return;
3404	3674
3405		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3406	3676	marked = h;
3407	3677
3408	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3412,6 +3682,46 @@
3412	3682	continue;
3413	3683	blockloop = true;
3414	3684	child.MarkLeaves(h);
	3685	+ blockloop = false;
	3686	+ // release(i);
	3687	+ }
	3688	+ }
	3689	+
	3690	+ void RewindLeaves(boolean h)
	3691	+ {
	3692	+ if (blockloop)
	3693	+ return;
	3694	+
	3695	+ if (bRep != null \|\| material != null) // borderline...
	3696	+ rewind = h;
	3697	+
	3698	+ for (int i = 0; i < Size(); i++)
	3699	+ {
	3700	+ Object3D child = (Object3D) get(i); // reserve(i);
	3701	+ if (child == null)
	3702	+ continue;
	3703	+ blockloop = true;
	3704	+ child.RewindLeaves(h);
	3705	+ blockloop = false;
	3706	+ // release(i);
	3707	+ }
	3708	+ }
	3709	+
	3710	+ void RandomLeaves(boolean h)
	3711	+ {
	3712	+ if (blockloop)
	3713	+ return;
	3714	+
	3715	+ if (bRep != null \|\| material != null) // borderline...
	3716	+ random = h;
	3717	+
	3718	+ for (int i = 0; i < Size(); i++)
	3719	+ {
	3720	+ Object3D child = (Object3D) get(i); // reserve(i);
	3721	+ if (child == null)
	3722	+ continue;
	3723	+ blockloop = true;
	3724	+ child.RandomLeaves(h);
3415	3725	blockloop = false;
3416	3726	// release(i);
3417	3727	}
..	..	@@ -3726,7 +4036,7 @@
3726	4036	if (child == null)
3727	4037	continue;
3728	4038
3729		- if (GrafreeD.RENDERME > 0)
	4039	+ if (Grafreed.RENDERME > 0)
3730	4040	{
3731	4041	if (child instanceof Merge)
3732	4042	((Merge)child).renderme();
..	..	@@ -3877,7 +4187,7 @@
3877	4187	if (child == null)
3878	4188	continue;
3879	4189
3880		- if (GrafreeD.RENDERME > 0)
	4190	+ if (Grafreed.RENDERME > 0)
3881	4191	{
3882	4192	if (child instanceof Merge)
3883	4193	((Merge)child).renderme();
..	..	@@ -4072,7 +4382,7 @@
4072	4382	if (child == null)
4073	4383	continue;
4074	4384
4075		- if (GrafreeD.RENDERME > 0)
	4385	+ if (Grafreed.RENDERME > 0)
4076	4386	{
4077	4387	if (child instanceof Merge)
4078	4388	((Merge)child).renderme();
..	..	@@ -4185,6 +4495,55 @@
4185	4495	{
4186	4496	blockloop = true;
4187	4497	get(i).RepairShadow();
	4498	+ blockloop = false;
	4499	+ }
	4500	+ }
	4501	+
	4502	+ void RepairSOV()
	4503	+ {
	4504	+ if (blockloop)
	4505	+ return;
	4506	+
	4507	+ String texname = this.GetPigmentTexture();
	4508	+
	4509	+ if (texname.startsWith("sov"))
	4510	+ {
	4511	+ String[] s = texname.split("/");
	4512	+
	4513	+ String[] sname = s[1].split("Color.pn");
	4514	+
	4515	+ texname = sname[0];
	4516	+
	4517	+ if (sname.length > 1)
	4518	+ {
	4519	+ texname += "Color.jpg";
	4520	+ }
	4521	+
	4522	+ this.SetPigmentTexture("sov/" + texname);
	4523	+ }
	4524	+
	4525	+ texname = this.GetBumpTexture();
	4526	+
	4527	+ if (texname.startsWith("sov"))
	4528	+ {
	4529	+ String[] s = texname.split("/");
	4530	+
	4531	+ String[] sname = s[1].split("Bump.pn");
	4532	+
	4533	+ texname = sname[0];
	4534	+
	4535	+ if (sname.length > 1)
	4536	+ {
	4537	+ texname += "Bump.jpg";
	4538	+ }
	4539	+
	4540	+ this.SetBumpTexture("sov/" + texname);
	4541	+ }
	4542	+
	4543	+ for (int i=0; i<Size(); i++)
	4544	+ {
	4545	+ blockloop = true;
	4546	+ get(i).RepairSOV();
4188	4547	blockloop = false;
4189	4548	}
4190	4549	}
..	..	@@ -4679,7 +5038,7 @@
4679	5038
4680	5039	cTreePath SelectLeaf(int indexcount, boolean deselect)
4681	5040	{
4682		- if (hide)
	5041	+ if (hide \|\| dontselect)
4683	5042	return null;
4684	5043
4685	5044	if (count <= 0)
..	..	@@ -4703,9 +5062,17 @@
4703	5062	}
4704	5063	}
4705	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4706	5073	cTreePath Select(int indexcount, boolean deselect)
4707	5074	{
4708		- if (hide)
	5075	+ if (hide \|\| dontselect)
4709	5076	return null;
4710	5077
4711	5078	if (count <= 0)
..	..	@@ -4739,10 +5106,11 @@
4739	5106	if (leaf != null)
4740	5107	{
4741	5108	cTreePath tp = new cTreePath(this, leaf);
4742		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4743	5111	{
4744	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4745		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4746	5114	}
4747	5115
4748	5116	return tp;
..	..	@@ -4759,6 +5127,7 @@
4759	5127
4760	5128	if (child == null)
4761	5129	continue;
	5130	+
4762	5131	if (child.HasTransparency() && child.size() != 0)
4763	5132	{
4764	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4768,9 +5137,10 @@
4768	5137	if (leaf != null)
4769	5138	{
4770	5139	cTreePath tp = new cTreePath(this, leaf);
4771		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4772	5142	{
4773		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4774	5144	}
4775	5145
4776	5146	return tp;
..	..	@@ -5095,6 +5465,51 @@
5095	5465	blockloop = false;
5096	5466	}
5097	5467
	5468	+ void ResetSelectable()
	5469	+ {
	5470	+ if (blockloop)
	5471	+ return;
	5472	+
	5473	+ blockloop = true;
	5474	+
	5475	+ keepdontselect = dontselect;
	5476	+ dontselect = true;
	5477	+
	5478	+ Object3D child;
	5479	+ int nb = Size();
	5480	+ for (int i = 0; i < nb; i++)
	5481	+ {
	5482	+ child = (Object3D) get(i);
	5483	+ if (child == null)
	5484	+ continue;
	5485	+ child.ResetSelectable();
	5486	+ }
	5487	+
	5488	+ blockloop = false;
	5489	+ }
	5490	+
	5491	+ void RestoreSelectable()
	5492	+ {
	5493	+ if (blockloop)
	5494	+ return;
	5495	+
	5496	+ blockloop = true;
	5497	+
	5498	+ dontselect = keepdontselect;
	5499	+
	5500	+ Object3D child;
	5501	+ int nb = Size();
	5502	+ for (int i = 0; i < nb; i++)
	5503	+ {
	5504	+ child = (Object3D) get(i);
	5505	+ if (child == null)
	5506	+ continue;
	5507	+ child.RestoreSelectable();
	5508	+ }
	5509	+
	5510	+ blockloop = false;
	5511	+ }
	5512	+
5098	5513	boolean IsSelected()
5099	5514	{
5100	5515	if (parent == null)
..	..	@@ -5157,10 +5572,34 @@
5157	5572
5158	5573	// System.out.println("Fullname = " + fullname);
5159	5574
5160		- if (fullname.name.indexOf(":") == -1)
5161		- return fullname.name;
	5575	+ // Does not work on Windows due to C:
	5576	+// if (fullname.name.indexOf(":") == -1)
	5577	+// return fullname.name;
	5578	+//
	5579	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5162	5580
5163		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5581	+ String[] split = fullname.name.split(":");
	5582	+
	5583	+ if (split.length == 0)
	5584	+ {
	5585	+ return "";
	5586	+ }
	5587	+
	5588	+ if (split.length <= 2)
	5589	+ {
	5590	+ if (fullname.name.endsWith(":"))
	5591	+ {
	5592	+ // Windows
	5593	+ return fullname.name.substring(0, fullname.name.length()-1);
	5594	+ }
	5595	+
	5596	+ return split[0];
	5597	+ }
	5598	+
	5599	+ // Windows
	5600	+ assert(split.length == 4);
	5601	+
	5602	+ return split[0] + ":" + split[1];
5164	5603	}
5165	5604
5166	5605	static String GetBump(cTexture fullname)
..	..	@@ -5169,10 +5608,38 @@
5169	5608	return "";
5170	5609
5171	5610	// System.out.println("Fullname = " + fullname);
5172		- if (fullname.name.indexOf(":") == -1)
5173		- return "";
5174		-
5175		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5611	+ // Does not work on Windows due to C:
	5612	+// if (fullname.name.indexOf(":") == -1)
	5613	+// return "";
	5614	+//
	5615	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5616	+ String[] split = fullname.name.split(":");
	5617	+
	5618	+ if (split.length == 0)
	5619	+ {
	5620	+ return "";
	5621	+ }
	5622	+
	5623	+ if (split.length == 1)
	5624	+ {
	5625	+ return "";
	5626	+ }
	5627	+
	5628	+ if (split.length == 2)
	5629	+ {
	5630	+ if (fullname.name.endsWith(":"))
	5631	+ {
	5632	+ // Windows
	5633	+ return "";
	5634	+ }
	5635	+
	5636	+ return split[1];
	5637	+ }
	5638	+
	5639	+ // Windows
	5640	+ assert(split.length == 4);
	5641	+
	5642	+ return split[2] + ":" + split[3];
5176	5643	}
5177	5644
5178	5645	String GetPigmentTexture()
..	..	@@ -5246,7 +5713,7 @@
5246	5713	System.out.print("; textures = " + textures);
5247	5714	System.out.println("; usedtextures = " + usedtextures);
5248	5715
5249		- if (GetTextures() == null)
	5716	+ if (GetTextures() == null) // What is that??
5250	5717	GetTextures().name = ":";
5251	5718
5252	5719	String texname = tex;
..	..	@@ -5277,6 +5744,43 @@
5277	5744	child.ResetPigmentTexture();
5278	5745	blockloop = false;
5279	5746	}
	5747	+ }
	5748	+
	5749	+ UUID GetUUID()
	5750	+ {
	5751	+ if (uuid == null)
	5752	+ {
	5753	+ // Serial
	5754	+ uuid = UUID.randomUUID();
	5755	+ }
	5756	+
	5757	+ return uuid;
	5758	+ }
	5759	+
	5760	+ Object3D GetObject(UUID uid)
	5761	+ {
	5762	+ if (blockloop)
	5763	+ return null;
	5764	+
	5765	+ if (GetUUID().equals(uid))
	5766	+ return this;
	5767	+
	5768	+ int nb = Size();
	5769	+ for (int i = 0; i < nb; i++)
	5770	+ {
	5771	+ Object3D child = (Object3D) get(i);
	5772	+
	5773	+ if (child == null)
	5774	+ continue;
	5775	+
	5776	+ blockloop = true;
	5777	+ Object3D obj = child.GetObject(uid);
	5778	+ blockloop = false;
	5779	+ if (obj != null)
	5780	+ return obj;
	5781	+ }
	5782	+
	5783	+ return null;
5280	5784	}
5281	5785
5282	5786	void SetBumpTexture(String tex)
..	..	@@ -5315,6 +5819,38 @@
5315	5819	}
5316	5820	}
5317	5821
	5822	+ void EmbedTextures(boolean embed)
	5823	+ {
	5824	+ if (blockloop)
	5825	+ return;
	5826	+
	5827	+ //if (GetTextures() != null)
	5828	+ if (embed)
	5829	+ CameraPane.EmbedTextures(GetTextures());
	5830	+ else
	5831	+ {
	5832	+ GetTextures().pigmentdata = null;
	5833	+ GetTextures().bumpdata = null;
	5834	+ GetTextures().pw = 0;
	5835	+ GetTextures().ph = 0;
	5836	+ GetTextures().bw = 0;
	5837	+ GetTextures().bh = 0;
	5838	+ }
	5839	+
	5840	+ int nb = Size();
	5841	+ for (int i = 0; i < nb; i++)
	5842	+ {
	5843	+ Object3D child = (Object3D) get(i);
	5844	+
	5845	+ if (child == null)
	5846	+ continue;
	5847	+
	5848	+ blockloop = true;
	5849	+ child.EmbedTextures(embed);
	5850	+ blockloop = false;
	5851	+ }
	5852	+ }
	5853	+
5318	5854	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5319	5855	{
5320	5856	Draw(display, root, selected, blocked);
..	..	@@ -5323,12 +5859,23 @@
5323	5859	boolean NeedSupport()
5324	5860	{
5325	5861	return
5326		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5862	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5327	5863	// PROBLEM with CROWD!!
5328		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5864	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5329	5865	}
5330	5866
5331	5867	static boolean DEBUG_SELECTION = false;
	5868	+
	5869	+ boolean IsLive()
	5870	+ {
	5871	+ if (live)
	5872	+ return true;
	5873	+
	5874	+ if (parent == null)
	5875	+ return false;
	5876	+
	5877	+ return parent.IsLive();
	5878	+ }
5332	5879
5333	5880	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5334	5881	{
..	..	@@ -5340,7 +5887,7 @@
5340	5887	}
5341	5888
5342	5889	if (display.DrawMode() == iCameraPane.SELECTION &&
5343		- hide)
	5890	+ (hide \|\| dontselect))
5344	5891	return;
5345	5892
5346	5893	if (name != null && name.contains("sclera"))
..	..	@@ -5390,8 +5937,10 @@
5390	5937	if (support != null)
5391	5938	support = support;
5392	5939
5393		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5942	+
	5943	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5395	5944
5396	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5397	5946	{
..	..	@@ -5401,8 +5950,9 @@
5401	5950	// usecalllists &= !(parent instanceof RandomNode);
5402	5951	// usecalllists = false;
5403	5952
5404		- if (GetBRep() != null)
5405		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5406	5956	//System.out.println("draw " + this);
5407	5957	//new Exception().printStackTrace();
5408	5958
..	..	@@ -5411,10 +5961,12 @@
5411	5961	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5412	5962
5413	5963	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5414		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5415	5966	{
5416	5967	Globals.lighttouched = true;
5417	5968	} // all panes...
	5969	+
5418	5970	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5419	5971	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5420	5972	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5974,7 @@
5422	5974	if (!(this instanceof Composite))
5423	5975	touched = false;
5424	5976	//if (displaylist == -1 && usecalllists)
5425		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5426	5978	{
5427	5979	bRep.displaylist = display.GenList();
5428	5980	assert(bRep.displaylist != 0);
..	..	@@ -5433,7 +5985,7 @@
5433	5985
5434	5986	//System.out.println("\tnew list " + list);
5435	5987	//gl.glDrawBuffer(gl.GL_NONE);
5436		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5437	5989	{
5438	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5439	5991	display.NewList(bRep.displaylist);
..	..	@@ -5442,7 +5994,7 @@
5442	5994	CallList(display, root, selected, blocked);
5443	5995
5444	5996	// compiled = true;
5445		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5446	5998	{
5447	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5448	6000	display.EndList();
..	..	@@ -5542,6 +6094,7 @@
5542	6094	if (GetBRep() != null)
5543	6095	{
5544	6096	display.NextIndex();
	6097	+
5545	6098	// vertex color conflict : gl.glCallList(list);
5546	6099	DrawNode(display, root, selected);
5547	6100	if (this instanceof BezierPatch)
..	..	@@ -5582,7 +6135,28 @@
5582	6135	tex = GetTextures();
5583	6136	}
5584	6137
5585		- display.BindTextures(tex, texres);
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
	6140	+
	6141	+ try
	6142	+ {
	6143	+ display.BindPigmentTexture(tex, texres);
	6144	+ }
	6145	+ catch (Exception e)
	6146	+ {
	6147	+ System.err.println("FAILED: " + this);
	6148	+ failedPigment = true;
	6149	+ }
	6150	+
	6151	+ try
	6152	+ {
	6153	+ display.BindBumpTexture(tex, texres);
	6154	+ }
	6155	+ catch (Exception e)
	6156	+ {
	6157	+ //System.err.println("FAILED: " + this);
	6158	+ failedBump = true;
	6159	+ }
5586	6160
5587	6161	if (!compiled)
5588	6162	{
..	..	@@ -5604,7 +6178,11 @@
5604	6178	}
5605	6179	}
5606	6180
5607		- display.ReleaseTextures(tex);
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
5608	6186
5609	6187	display.PopMaterial(this, selected);
5610	6188	}
..	..	@@ -5733,6 +6311,9 @@
5733	6311
5734	6312	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5735	6313	{
	6314	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6315	+ return;
	6316	+
5736	6317	if (hide)
5737	6318	return;
5738	6319	// shadow optimisation
..	..	@@ -5858,6 +6439,9 @@
5858	6439	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5859	6440	return; // no shadow for transparent objects
5860	6441
	6442	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6443	+ return;
	6444	+
5861	6445	if (hide)
5862	6446	return;
5863	6447
..	..	@@ -5898,6 +6482,7 @@
5898	6482	return;
5899	6483	}
5900	6484
	6485	+ //bRep.GenUV(1/material.diffuseness);
5901	6486	// bRep.lock = true;
5902	6487
5903	6488	//javax.media.opengl.GL gl = display.GetGL();
..	..	@@ -5970,6 +6555,11 @@
5970	6555	// dec 2012
5971	6556	new Exception().printStackTrace();
5972	6557	return;
	6558	+ }
	6559	+
	6560	+ if (dontselect)
	6561	+ {
	6562	+ //bRep.GenerateNormalsMINE();
5973	6563	}
5974	6564
5975	6565	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6755,20 +7345,23 @@
6755	7345	}
6756	7346	}
6757	7347
6758		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7348	+ static ClickInfo clickInfo = new ClickInfo();
	7349	+
	7350	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7351	+ Point outPt, Rectangle outRec)
6759	7352	{
6760		- int hc = info.bounds.x + info.bounds.width / 2;
6761		- int vc = info.bounds.y + info.bounds.height / 2;
6762		- double[][] toscreen = info.toScreen;
	7353	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7354	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7355	+ double[][] toscreen = clickInfo.toScreen;
6763	7356	if (toscreen == null)
6764	7357	{
6765		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6766	7359	}
6767	7360	cVector vec = in;
6768	7361	LA.xformPos(in, toscreen, in);
6769	7362	//System.out.println("Distance = " + info.camera.Distance());
6770		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6771		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6772	7365	outPt.x = hc + (int) vec.x;
6773	7366	outPt.y = vc - (int) vec.y;
6774	7367	outRec.x = outPt.x - 3;
..	..	@@ -6776,15 +7369,18 @@
6776	7369	outRec.width = outRec.height = 6;
6777	7370	}
6778	7371
6779		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
6780	7374	{
6781	7375	Point pt = new Point(0, 0);
6782	7376	Rectangle rec = new Rectangle();
6783		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
6784	7379	return rec;
6785	7380	}
6786	7381
6787		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
6788	7384	{
6789	7385	if (level == 0)
6790	7386	{
..	..	@@ -6793,16 +7389,19 @@
6793	7389	{
6794	7390	cVector origin = new cVector();
6795	7391	//LA.xformPos(origin, toParent, origin);
6796		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6797	7396	Rectangle boundary = new Rectangle();
6798	7397	boundary.x = spot.x - 30;
6799	7398	boundary.y = spot.y - 30;
6800	7399	boundary.width = spot.width + 60;
6801	7400	boundary.height = spot.height + 60;
6802		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
6803	7402	int spotw = spot.x + spot.width;
6804	7403	int spoth = spot.y + spot.height;
6805		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6806	7405	// if (CameraPane.Xmin > spot.x)
6807	7406	// {
6808	7407	// CameraPane.Xmin = spot.x;
..	..	@@ -6822,8 +7421,8 @@
6822	7421	spot.translate(32, 32);
6823	7422	spotw = spot.x + spot.width;
6824	7423	spoth = spot.y + spot.height;
6825		- info.g.setColor(Color.blue);
6826		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7424	+ clickInfo.g.setColor(Color.cyan);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6827	7426	// if (CameraPane.Xmin > spot.x)
6828	7427	// {
6829	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -6840,11 +7439,12 @@
6840	7439	// {
6841	7440	// CameraPane.Ymax = spoth;
6842	7441	// }
6843		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7442	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7443	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6845	7444	spot.translate(0, -32);
6846		- info.g.setColor(Color.green);
6847		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
6848	7448	// if (CameraPane.Xmin > spot.x)
6849	7449	// {
6850	7450	// CameraPane.Xmin = spot.x;
..	..	@@ -6861,8 +7461,8 @@
6861	7461	// {
6862	7462	// CameraPane.Ymax = spoth;
6863	7463	// }
6864		- info.g.drawArc(boundary.x, boundary.y,
6865		- boundary.width, boundary.height, 0, 360);
	7464	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7465	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6866	7466	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6867	7467	// if (CameraPane.Xmin > boundary.x)
6868	7468	// {
..	..	@@ -6884,7 +7484,8 @@
6884	7484	}
6885	7485	}
6886	7486
6887		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
6888	7489	{
6889	7490	if (level == 0)
6890	7491	{
..	..	@@ -6893,10 +7494,10 @@
6893	7494
6894	7495	boolean retval = false;
6895	7496
6896		- startX = info.x;
6897		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
6898	7499
6899		- hitSomething = 0;
	7500	+ hitSomething = -1;
6900	7501	cVector origin = new cVector();
6901	7502	//LA.xformPos(origin, toParent, origin);
6902	7503	Rectangle spot = new Rectangle();
..	..	@@ -6904,22 +7505,51 @@
6904	7505	{
6905	7506	centerPt = new Point(0, 0);
6906	7507	}
6907		- calcHotSpot(origin, info, centerPt, spot);
6908		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
6909	7511	{
6910	7512	hitSomething = hitCenter;
6911	7513	retval = true;
6912	7514	}
6913	7515	spot.translate(32, 0);
6914		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
6915	7517	{
6916	7518	hitSomething = hitRotate;
6917	7519	retval = true;
6918	7520	}
6919	7521	spot.translate(0, 32);
6920		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
6921	7523	{
6922	7524	hitSomething = hitScale;
	7525	+
	7526	+ double scale = 0.005f * clickInfo.camera.Distance();
	7527	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7528	+ double sign = 1;
	7529	+ if (hScale < 0)
	7530	+ {
	7531	+ sign = -1;
	7532	+ }
	7533	+ hScale = signMath.pow(signhScale, scale * 50);
	7534	+ if (hScale < 0.01)
	7535	+ {
	7536	+ //hScale = 0.01;
	7537	+ }
	7538	+
	7539	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7540	+ sign = 1;
	7541	+ if (vScale < 0)
	7542	+ {
	7543	+ sign = -1;
	7544	+ }
	7545	+ vScale = signMath.pow(signvScale, scale * 50);
	7546	+ if (vScale < 0.01)
	7547	+ {
	7548	+ //vScale = 0.01;
	7549	+ }
	7550	+
	7551	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7552	+
6923	7553	retval = true;
6924	7554	}
6925	7555
..	..	@@ -6929,7 +7559,7 @@
6929	7559	}
6930	7560
6931	7561	//System.out.println("info.modifiers = " + info.modifiers);
6932		- modified = (info.modifiers & CameraPane.META) != 0;
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6933	7563	//System.out.println("modified = " + modified);
6934	7564	//new Exception().printStackTrace();
6935	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6957,7 +7587,8 @@
6957	7587	return true;
6958	7588	}
6959	7589
6960		- void doEditDrag0(ClickInfo info)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
6961	7592	{
6962	7593	if (hitSomething == 0)
6963	7594	{
..	..	@@ -6971,7 +7602,8 @@
6971	7602
6972	7603	//System.out.println("hitSomething = " + hitSomething);
6973	7604
6974		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
	7606	+
6975	7607	cVector xlate = new cVector();
6976	7608	//cVector xlate2 = new cVector();
6977	7609	switch (hitSomething)
..	..	@@ -6984,7 +7616,7 @@
6984	7616
6985	7617	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6986	7618
6987		- if (modified)
	7619	+ if (modified \|\| opposite)
6988	7620	{
6989	7621	//assert(false);
6990	7622	/*
..	..	@@ -7004,8 +7636,8 @@
7004	7636	toParent[3][i] = xlate.get(i);
7005	7637	LA.matInvert(toParent, fromParent);
7006	7638	*/
7007		- cVector delta = LA.newVector(0, 0, startY - info.y);
7008		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7639	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7640	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7009	7641
7010	7642	LA.matCopy(startMat, toParent);
7011	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7014,7 +7646,7 @@
7014	7646	} else
7015	7647	{
7016	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7017		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7018	7650	cVector away = new cVector();
7019	7651	//cVector right2 = new cVector();
7020	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7031,19 +7663,19 @@
7031	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7032	7664	// if (!CameraPane.LOCALTRANSFORM)
7033	7665	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7034		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7035	7667	// if (!CameraPane.LOCALTRANSFORM)
7036	7668	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7037	7669	//LA.vecCross(up, cVector.Z, right2);
7038	7670
7039		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7040	7672
7041	7673	//System.out.println("DELTA0 = " + delta);
7042	7674	//System.out.println("AWAY = " + info.camera.away);
7043	7675	//System.out.println("UP = " + info.camera.up);
7044	7676	if (away.z > 0)
7045	7677	{
7046		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7047	7679	{
7048	7680	delta.x = -delta.x;
7049	7681	} else
..	..	@@ -7058,7 +7690,7 @@
7058	7690	//System.out.println("DELTA1 = " + delta);
7059	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7060	7692	//System.out.println("DELTA2 = " + delta);
7061		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7062	7694	LA.matCopy(startMat, toParent);
7063	7695	//System.out.println("DELTA3 = " + delta);
7064	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7068,8 +7700,8 @@
7068	7700	break;
7069	7701
7070	7702	case hitRotate: // rotate
7071		- int dx = info.x - centerPt.x;
7072		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7073	7705	double angle = (double) Math.atan2(dx, dy);
7074	7706	angle = -(1.570796 - angle);
7075	7707
..	..	@@ -7078,6 +7710,7 @@
7078	7710
7079	7711	if (modified)
7080	7712	{
	7713	+ // Rotate 90 degrees
7081	7714	angle /= (Math.PI / 4);
7082	7715	angle = Math.floor(angle + 0.5);
7083	7716	angle *= (Math.PI / 4);
..	..	@@ -7091,7 +7724,7 @@
7091	7724	}
7092	7725	/**/
7093	7726
7094		- switch (info.pane.RenderCamera().viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7095	7728	{
7096	7729	case 1: // '\001'
7097	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7118,26 +7751,30 @@
7118	7751	break;
7119	7752
7120	7753	case hitScale: // scale
7121		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7755	+ double sign = 1;
	7756	+ if (hScale < 0)
	7757	+ {
	7758	+ sign = -1;
	7759	+ }
	7760	+ hScale = signMath.pow(signhScale, scale * 50);
7122	7761	if (hScale < 0.01)
7123	7762	{
7124		- hScale = 0.01;
	7763	+ //hScale = 0.01;
7125	7764	}
7126		- hScale = Math.pow(hScale, scale * 50);
7127		- if (hScale < 0.01)
	7765	+
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7767	+ sign = 1;
	7768	+ if (vScale < 0)
7128	7769	{
7129		- hScale = 0.01;
	7770	+ sign = -1;
7130	7771	}
7131		- double vScale = (double) (info.y - centerPt.y) / 32;
	7772	+ vScale = signMath.pow(signvScale, scale * 50);
7132	7773	if (vScale < 0.01)
7133	7774	{
7134		- vScale = 0.01;
	7775	+ //vScale = 0.01;
7135	7776	}
7136		- vScale = Math.pow(vScale, scale * 50);
7137		- if (vScale < 0.01)
7138		- {
7139		- vScale = 0.01;
7140		- }
	7777	+
7141	7778	LA.matCopy(startMat, toParent);
7142	7779	/**/
7143	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7147,39 +7784,47 @@
7147	7784	}
7148	7785	/**/
7149	7786
7150		- switch (info.pane.RenderCamera().viewCode)
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7788	+
	7789	+ if (totalScale < 0.01)
	7790	+ {
	7791	+ totalScale = 0.01;
	7792	+ }
	7793	+
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7151	7795	{
7152	7796	case 3: // '\001'
7153		- if (modified)
	7797	+ if (modified \|\| opposite)
7154	7798	{
7155	7799	//LA.matScale(toParent, 1, hScale, vScale);
7156		- LA.matScale(toParent, vScale, 1, 1);
	7800	+ LA.matScale(toParent, totalScale, 1, 1);
7157	7801	} // vScale, 1);
7158	7802	else
7159	7803	{
7160		- LA.matScale(toParent, vScale, vScale, vScale);
	7804	+ // EXCEPTION!
	7805	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7161	7806	} // vScale, 1);
7162	7807	break;
7163	7808
7164	7809	case 2: // '\002'
7165		- if (modified)
	7810	+ if (modified \|\| opposite)
7166	7811	{
7167	7812	//LA.matScale(toParent, hScale, 1, vScale);
7168		- LA.matScale(toParent, 1, vScale, 1);
	7813	+ LA.matScale(toParent, 1, totalScale, 1);
7169	7814	} else
7170	7815	{
7171		- LA.matScale(toParent, vScale, 1, vScale);
	7816	+ LA.matScale(toParent, totalScale, 1, totalScale);
7172	7817	}
7173	7818	break;
7174	7819
7175	7820	case 1: // '\003'
7176		- if (modified)
	7821	+ if (modified \|\| opposite)
7177	7822	{
7178	7823	//LA.matScale(toParent, hScale, vScale, 1);
7179		- LA.matScale(toParent, 1, 1, vScale);
	7824	+ LA.matScale(toParent, 1, 1, totalScale);
7180	7825	} else
7181	7826	{
7182		- LA.matScale(toParent, vScale, vScale, 1);
	7827	+ LA.matScale(toParent, totalScale, totalScale, 1);
7183	7828	}
7184	7829	break;
7185	7830	}
..	..	@@ -7213,7 +7858,7 @@
7213	7858	} // NEW ...
7214	7859
7215	7860
7216		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7217	7862	}
7218	7863
7219	7864	boolean overflow = false;
..	..	@@ -7312,14 +7957,22 @@
7312	7957	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7313	7958	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7314	7959	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7960	+
	7961	+ String objname;
	7962	+
7315	7963	if (false) //parent != null)
7316	7964	{
7317		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7965	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7318	7966	} else
7319	7967	{
7320		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7968	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7321	7969	} // + super.toString();
7322	7970	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7971	+
	7972	+ if (!Globals.ADVANCED)
	7973	+ return objname;
	7974	+
	7975	+ return objname + " " + System.identityHashCode(this);
7323	7976	}
7324	7977
7325	7978	public int hashCode()
..	..	@@ -7375,6 +8028,7 @@
7375	8028	objectUI.closeUI();
7376	8029	if (editWindow != null)
7377	8030	{
	8031	+ editWindow.ctrlPanel.FlushUI();
7378	8032	editWindow.refreshContents();
7379	8033	} // ? new
7380	8034	objectUI = null;
..	..	@@ -7383,6 +8037,10 @@
7383	8037	{
7384	8038	editWindow = null;
7385	8039	} // ?
	8040	+ }
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
7386	8044	}
7387	8045	}
7388	8046
..	..	@@ -7395,7 +8053,7 @@
7395	8053	/transient/ cVector2[] projectedVertices = new cVector2[0];
7396	8054
7397	8055	Object3D /Composite/ parent;
7398		- Object3D /Composite/ fileparent;
	8056	+ Object3D /Composite/ fileparent; // In the case of FileObject
7399	8057
7400	8058	double[][] toParent; // dynamic matrix
7401	8059	double[][] fromParent;
..	..	@@ -7510,7 +8168,7 @@
7510	8168	{
7511	8169	assert(bRep != null);
7512	8170	if (!(support instanceof GenericJoint)) // support.bRep != null)
7513		- GrafreeD.Assert(support.bRep == bRep.support);
	8171	+ Grafreed.Assert(support.bRep == bRep.support);
7514	8172	}
7515	8173	else
7516	8174	{
..	..	@@ -7541,6 +8199,10 @@
7541	8199	}
7542	8200
7543	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
7544	8206	transient ObjectUI objectUI;
7545	8207	public static int povDepth = 0;
7546	8208	private static cVector tbMin = new cVector();
..	..	@@ -7559,9 +8221,9 @@
7559	8221	private static cVector edge2 = new cVector();
7560	8222	//private static cVector norm = new cVector();
7561	8223	/transient private/ int hitSomething;
7562		- private static final int hitCenter = 1;
7563		- private static final int hitScale = 2;
7564		- private static final int hitRotate = 3;
	8224	+ static final int hitCenter = 1;
	8225	+ static final int hitScale = 2;
	8226	+ static final int hitRotate = 3;
7565	8227	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7566	8228	/transient/ private Point centerPt;
7567	8229	/transient/ private int startX;