~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,11 +14,29 @@
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;
	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	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
22	40
23	41	ScriptNode scriptnode;
24	42
..	..	@@ -100,64 +118,245 @@
100	118
101	119	// transient boolean reduced; // for morph reduction
102	120
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	123
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
108	126
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)
	127	+ void SaveSupports()
121	128	{
122		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
123	152	}
124		-
125		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
126	155	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
130	287	blockloop = true;
131		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
132	294	blockloop = false;
133	295	}
134		-}
135	296
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
140	301
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
147		- {
148		- bRep.RestoreSupports();
149		- }
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156	302	blockloop = true;
157		- child.RestoreSupports();
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
158	340	blockloop = false;
159	341	}
160		-}
	342	+
	343	+ void RestoreBigData(Object3D o)
	344	+ {
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
	359	+ }
161	360
162	361	// MOCAP SUPPORT
163	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +499,8 @@
300	499	}
301	500
302	501	boolean live = false;
	502	+ transient boolean keepdontselect;
	503	+ boolean dontselect = false;
303	504	boolean hide = false;
304	505	boolean link2master = false; // performs reset support/master at each frame
305	506	boolean marked = false; // animation node
..	..	@@ -481,12 +682,14 @@
481	682	toParent = LA.newMatrix();
482	683	fromParent = LA.newMatrix();
483	684	}
	685	+
484	686	if (toParentMarked == null)
485	687	{
486	688	if (maxcount != 1)
487	689	{
488	690	new Exception().printStackTrace();
489	691	}
	692	+
490	693	toParentMarked = LA.newMatrix();
491	694	fromParentMarked = LA.newMatrix();
492	695	}
..	..	@@ -774,7 +977,7 @@
774	977	if (step == 0)
775	978	step = 1;
776	979	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	980	+ maxcount = 128; // 2048; // 4;
778	981	// if (acceleration == 0)
779	982	// acceleration = 10;
780	983	if (delay == 0) // serial
..	..	@@ -797,7 +1000,7 @@
797	1000
798	1001	if (marked && Globals.isLIVE() && live &&
799	1002	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
801	1004	currentframe != Globals.framecount)
802	1005	{
803	1006	currentframe = Globals.framecount;
..	..	@@ -809,7 +1012,8 @@
809	1012
810	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
811	1014
812		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
813	1017	{
814	1018	countdown = 1;
815	1019	delay = speedup?8:1;
..	..	@@ -881,6 +1085,10 @@
881	1085	if (material == null \|\| material.multiply)
882	1086	return true;
883	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
884	1092	return material.opacity > 0.99;
885	1093	}
886	1094
..	..	@@ -912,6 +1120,11 @@
912	1120	fromParent = null; // LA.newMatrix();
913	1121	bRep = null; // new BoundaryRep();
914	1122
	1123	+ if (oname != null && oname.equals("LeftHand"))
	1124	+ {
	1125	+ name = oname;
	1126	+ }
	1127	+
915	1128	/*
916	1129	float hue = (float)Math.random();
917	1130	Color col;
..	..	@@ -1276,6 +1489,7 @@
1276	1489	toParent = LA.newMatrix();
1277	1490	fromParent = LA.newMatrix();
1278	1491	}
	1492	+
1279	1493	LA.matCopy(other.toParent, toParent);
1280	1494	LA.matCopy(other.fromParent, fromParent);
1281	1495
..	..	@@ -1470,7 +1684,7 @@
1470	1684	BoundaryRep.SEUIL = other.material.cameralight;
1471	1685
1472	1686	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1687	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1688	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1689	}
1476	1690
..	..	@@ -1829,12 +2043,15 @@
1829	2043	if (obj.name == null)
1830	2044	continue; // can't be a null one
1831	2045
	2046	+ // Try perfect match first.
1832	2047	if (n.equals(obj.name))
1833	2048	{
1834	2049	theobj = obj;
1835	2050	count++;
1836	2051	}
1837	2052	}
	2053	+
	2054	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	2055
1839	2056	if (count != 1)
1840	2057	for (int i=Size(); --i>=0;)
..	..	@@ -2294,6 +2511,15 @@
2294	2511	}
2295	2512	*/
2296	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2297	2523	}
2298	2524
2299	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2335,6 +2561,14 @@
2335	2561	{
2336	2562	editWindow.refreshContents();
2337	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2338	2572	//if (parent != null)
2339	2573	//parent.refreshEditWindow();
2340	2574	}
..	..	@@ -2414,7 +2648,8 @@
2414	2648	private static final int editSelf = 1;
2415	2649	private static final int editChild = 2;
2416	2650
2417		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2418	2653	{
2419	2654	if (level == 0)
2420	2655	{
..	..	@@ -2422,7 +2657,8 @@
2422	2657	return;
2423	2658
2424	2659	Object3D selectee;
2425		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2426	2662	{
2427	2663	selectee = (Object3D) e.nextElement();
2428	2664	}
..	..	@@ -2430,19 +2666,22 @@
2430	2666	} else
2431	2667	{
2432	2668	//super.
2433		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2434	2671	}
2435	2672	}
2436	2673
2437		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2438	2676	{
2439	2677	doSomething = 0;
2440	2678	if (level == 0)
2441	2679	{
2442		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2443	2681	}
2444	2682	if (//super.
2445		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2446	2685	{
2447	2686	doSomething = 1;
2448	2687	return true;
..	..	@@ -2452,7 +2691,7 @@
2452	2691	}
2453	2692	}
2454	2693
2455		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2456	2695	{
2457	2696	if (selection == null)
2458	2697	{
..	..	@@ -2465,7 +2704,8 @@
2465	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2466	2705	{
2467	2706	Object3D selectee = (Object3D) e.nextElement();
2468		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2469	2709	{
2470	2710	childToDrag = selectee;
2471	2711	doSomething = 2;
..	..	@@ -2477,13 +2717,15 @@
2477	2717	return retval;
2478	2718	}
2479	2719
2480		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2481	2722	{
2482	2723	switch (doSomething)
2483	2724	{
2484	2725	case 1: // '\001'
2485	2726	//super.
2486		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2487	2729	break;
2488	2730
2489	2731	case 2: // '\002'
..	..	@@ -2496,11 +2738,13 @@
2496	2738	{
2497	2739	//sel.hitSomething = childToDrag.hitSomething;
2498	2740	//childToDrag.doEditDrag(info);
2499		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2500	2743	} else
2501	2744	{
2502	2745	//super.
2503		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2504	2748	}
2505	2749	}
2506	2750	break;
..	..	@@ -2518,6 +2762,9 @@
2518	2762	{
2519	2763	deselectAll();
2520	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2521	2768	ClickInfo newInfo = new ClickInfo();
2522	2769	newInfo.flags = info.flags;
2523	2770	newInfo.bounds = info.bounds;
..	..	@@ -2610,6 +2857,18 @@
2610	2857	void GenNormalsS(boolean crease)
2611	2858	{
2612	2859	selection.GenNormals(crease);
	2860	+// for (int i=0; i<selection.size(); i++)
	2861	+// {
	2862	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2863	+// selectee.GenNormals(crease);
	2864	+// }
	2865	+
	2866	+ //Touch();
	2867	+ }
	2868	+
	2869	+ void GenNormalsMeshS()
	2870	+ {
	2871	+ selection.GenNormalsMesh();
2613	2872	// for (int i=0; i<selection.size(); i++)
2614	2873	// {
2615	2874	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2750,6 +3009,24 @@
2750	3009	if (child == null)
2751	3010	continue;
2752	3011	child.GenNormals(crease);
	3012	+// Children().release(i);
	3013	+ }
	3014	+ blockloop = false;
	3015	+ }
	3016	+
	3017	+ void GenNormalsMesh()
	3018	+ {
	3019	+ if (blockloop)
	3020	+ return;
	3021	+
	3022	+ blockloop = true;
	3023	+ GenNormalsMesh0();
	3024	+ for (int i = 0; i < Children().Size(); i++)
	3025	+ {
	3026	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3027	+ if (child == null)
	3028	+ continue;
	3029	+ child.GenNormalsMesh();
2753	3030	// Children().release(i);
2754	3031	}
2755	3032	blockloop = false;
..	..	@@ -2922,11 +3199,20 @@
2922	3199	}
2923	3200	}
2924	3201
	3202	+ void GenNormalsMesh0()
	3203	+ {
	3204	+ if (bRep != null)
	3205	+ {
	3206	+ bRep.GenerateNormalsMesh();
	3207	+ Touch();
	3208	+ }
	3209	+ }
	3210	+
2925	3211	void GenNormalsMINE0()
2926	3212	{
2927	3213	if (bRep != null)
2928	3214	{
2929		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2930	3216	Touch();
2931	3217	}
2932	3218	}
..	..	@@ -2983,6 +3269,33 @@
2983	3269	blockloop = false;
2984	3270	}
2985	3271
	3272	+ void TransformChildren()
	3273	+ {
	3274	+ if (toParent != null)
	3275	+ {
	3276	+ for (int i=Size(); --i>=0;)
	3277	+ {
	3278	+ Object3D v = get(i);
	3279	+
	3280	+ if (v.toParent == null)
	3281	+ {
	3282	+ v.toParent = LA.newMatrix();
	3283	+ v.fromParent = LA.newMatrix();
	3284	+ }
	3285	+
	3286	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3287	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3288	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3289	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3290	+ }
	3291	+
	3292	+ toParent = null; // LA.matIdentity(toParent);
	3293	+ fromParent = null; // LA.matIdentity(fromParent);
	3294	+
	3295	+ Touch();
	3296	+ }
	3297	+ }
	3298	+
2986	3299	void TransformGeometry()
2987	3300	{
2988	3301	Object3D obj = this;
..	..	@@ -3206,7 +3519,9 @@
3206	3519	bRep.support = null;
3207	3520	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3521	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3522	+
	3523	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3524	+
3210	3525	bRep = temprep;
3211	3526	bRep.support = sup;
3212	3527	Touch();
..	..	@@ -3343,7 +3658,8 @@
3343	3658	if (blockloop)
3344	3659	return;
3345	3660
3346		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3661	+ if (//marked \|\| // does not make sense
	3662	+ (bRep != null \|\| material != null)) // borderline...
3347	3663	live = h;
3348	3664
3349	3665	for (int i = 0; i < Size(); i++)
..	..	@@ -3364,7 +3680,8 @@
3364	3680	return;
3365	3681
3366	3682	//if (bRep != null)
3367		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3683	+ if (//marked \|\| // does not make sense
	3684	+ (bRep != null \|\| material != null)) // borderline...
3368	3685	link2master = h;
3369	3686
3370	3687	for (int i = 0; i < Size(); i++)
..	..	@@ -3384,7 +3701,8 @@
3384	3701	if (blockloop)
3385	3702	return;
3386	3703
3387		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3704	+ if (//marked \|\| // does not make sense
	3705	+ (bRep != null \|\| material != null)) // borderline...
3388	3706	hide = h;
3389	3707
3390	3708	for (int i = 0; i < Size(); i++)
..	..	@@ -3404,7 +3722,7 @@
3404	3722	if (blockloop)
3405	3723	return;
3406	3724
3407		- if (bRep != null && material != null) // borderline...
	3725	+ if (bRep != null \|\| material != null) // borderline...
3408	3726	marked = h;
3409	3727
3410	3728	for (int i = 0; i < Size(); i++)
..	..	@@ -3414,6 +3732,46 @@
3414	3732	continue;
3415	3733	blockloop = true;
3416	3734	child.MarkLeaves(h);
	3735	+ blockloop = false;
	3736	+ // release(i);
	3737	+ }
	3738	+ }
	3739	+
	3740	+ void RewindLeaves(boolean h)
	3741	+ {
	3742	+ if (blockloop)
	3743	+ return;
	3744	+
	3745	+ if (bRep != null \|\| material != null) // borderline...
	3746	+ rewind = h;
	3747	+
	3748	+ for (int i = 0; i < Size(); i++)
	3749	+ {
	3750	+ Object3D child = (Object3D) get(i); // reserve(i);
	3751	+ if (child == null)
	3752	+ continue;
	3753	+ blockloop = true;
	3754	+ child.RewindLeaves(h);
	3755	+ blockloop = false;
	3756	+ // release(i);
	3757	+ }
	3758	+ }
	3759	+
	3760	+ void RandomLeaves(boolean h)
	3761	+ {
	3762	+ if (blockloop)
	3763	+ return;
	3764	+
	3765	+ if (bRep != null \|\| material != null) // borderline...
	3766	+ random = h;
	3767	+
	3768	+ for (int i = 0; i < Size(); i++)
	3769	+ {
	3770	+ Object3D child = (Object3D) get(i); // reserve(i);
	3771	+ if (child == null)
	3772	+ continue;
	3773	+ blockloop = true;
	3774	+ child.RandomLeaves(h);
3417	3775	blockloop = false;
3418	3776	// release(i);
3419	3777	}
..	..	@@ -4191,6 +4549,55 @@
4191	4549	}
4192	4550	}
4193	4551
	4552	+ void RepairSOV()
	4553	+ {
	4554	+ if (blockloop)
	4555	+ return;
	4556	+
	4557	+ String texname = this.GetPigmentTexture();
	4558	+
	4559	+ if (texname.startsWith("sov"))
	4560	+ {
	4561	+ String[] s = texname.split("/");
	4562	+
	4563	+ String[] sname = s[1].split("Color.pn");
	4564	+
	4565	+ texname = sname[0];
	4566	+
	4567	+ if (sname.length > 1)
	4568	+ {
	4569	+ texname += "Color.jpg";
	4570	+ }
	4571	+
	4572	+ this.SetPigmentTexture("sov/" + texname);
	4573	+ }
	4574	+
	4575	+ texname = this.GetBumpTexture();
	4576	+
	4577	+ if (texname.startsWith("sov"))
	4578	+ {
	4579	+ String[] s = texname.split("/");
	4580	+
	4581	+ String[] sname = s[1].split("Bump.pn");
	4582	+
	4583	+ texname = sname[0];
	4584	+
	4585	+ if (sname.length > 1)
	4586	+ {
	4587	+ texname += "Bump.jpg";
	4588	+ }
	4589	+
	4590	+ this.SetBumpTexture("sov/" + texname);
	4591	+ }
	4592	+
	4593	+ for (int i=0; i<Size(); i++)
	4594	+ {
	4595	+ blockloop = true;
	4596	+ get(i).RepairSOV();
	4597	+ blockloop = false;
	4598	+ }
	4599	+ }
	4600	+
4194	4601	void RepairTexture()
4195	4602	{
4196	4603	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4681,7 +5088,7 @@
4681	5088
4682	5089	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	5090	{
4684		- if (hide)
	5091	+ if (hide \|\| dontselect)
4685	5092	return null;
4686	5093
4687	5094	if (count <= 0)
..	..	@@ -4705,9 +5112,17 @@
4705	5112	}
4706	5113	}
4707	5114
	5115	+ ObjEditor GetWindow()
	5116	+ {
	5117	+ if (editWindow != null)
	5118	+ return editWindow;
	5119	+
	5120	+ return manipWindow;
	5121	+ }
	5122	+
4708	5123	cTreePath Select(int indexcount, boolean deselect)
4709	5124	{
4710		- if (hide)
	5125	+ if (hide \|\| dontselect)
4711	5126	return null;
4712	5127
4713	5128	if (count <= 0)
..	..	@@ -4741,10 +5156,11 @@
4741	5156	if (leaf != null)
4742	5157	{
4743	5158	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5159	+ ObjEditor window = GetWindow();
	5160	+ if (window != null)
4745	5161	{
4746	5162	//System.out.println("editWindow = " + editWindow + " vs " + this);
4747		- editWindow.Select(tp, deselect, true);
	5163	+ window.Select(tp, deselect, true);
4748	5164	}
4749	5165
4750	5166	return tp;
..	..	@@ -4761,6 +5177,7 @@
4761	5177
4762	5178	if (child == null)
4763	5179	continue;
	5180	+
4764	5181	if (child.HasTransparency() && child.size() != 0)
4765	5182	{
4766	5183	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4770,9 +5187,10 @@
4770	5187	if (leaf != null)
4771	5188	{
4772	5189	cTreePath tp = new cTreePath(this, leaf);
4773		- if (editWindow != null)
	5190	+ ObjEditor window = GetWindow();
	5191	+ if (window != null)
4774	5192	{
4775		- editWindow.Select(tp, deselect, true);
	5193	+ window.Select(tp, deselect, true);
4776	5194	}
4777	5195
4778	5196	return tp;
..	..	@@ -5097,6 +5515,51 @@
5097	5515	blockloop = false;
5098	5516	}
5099	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5100	5563	boolean IsSelected()
5101	5564	{
5102	5565	if (parent == null)
..	..	@@ -5157,6 +5620,11 @@
5157	5620	if (fullname == null)
5158	5621	return "";
5159	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5160	5628	// System.out.println("Fullname = " + fullname);
5161	5629
5162	5630	// Does not work on Windows due to C:
..	..	@@ -5169,7 +5637,7 @@
5169	5637
5170	5638	if (split.length == 0)
5171	5639	{
5172		- return "";
	5640	+ return fullname.pigment = "";
5173	5641	}
5174	5642
5175	5643	if (split.length <= 2)
..	..	@@ -5177,22 +5645,27 @@
5177	5645	if (fullname.name.endsWith(":"))
5178	5646	{
5179	5647	// Windows
5180		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5181	5649	}
5182	5650
5183		- return split[0];
	5651	+ return fullname.pigment = split[0];
5184	5652	}
5185	5653
5186	5654	// Windows
5187	5655	assert(split.length == 4);
5188	5656
5189		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5190	5658	}
5191	5659
5192	5660	static String GetBump(cTexture fullname)
5193	5661	{
5194	5662	if (fullname == null)
5195	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5196	5669
5197	5670	// System.out.println("Fullname = " + fullname);
5198	5671	// Does not work on Windows due to C:
..	..	@@ -5204,12 +5677,12 @@
5204	5677
5205	5678	if (split.length == 0)
5206	5679	{
5207		- return "";
	5680	+ return fullname.bump = "";
5208	5681	}
5209	5682
5210	5683	if (split.length == 1)
5211	5684	{
5212		- return "";
	5685	+ return fullname.bump = "";
5213	5686	}
5214	5687
5215	5688	if (split.length == 2)
..	..	@@ -5217,16 +5690,16 @@
5217	5690	if (fullname.name.endsWith(":"))
5218	5691	{
5219	5692	// Windows
5220		- return "";
	5693	+ return fullname.bump = "";
5221	5694	}
5222	5695
5223		- return split[1];
	5696	+ return fullname.bump = split[1];
5224	5697	}
5225	5698
5226	5699	// Windows
5227	5700	assert(split.length == 4);
5228	5701
5229		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5230	5703	}
5231	5704
5232	5705	String GetPigmentTexture()
..	..	@@ -5309,6 +5782,9 @@
5309	5782	texname = "";
5310	5783
5311	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5312	5788	Touch();
5313	5789	}
5314	5790
..	..	@@ -5333,6 +5809,43 @@
5333	5809	}
5334	5810	}
5335	5811
	5812	+ UUID GetUUID()
	5813	+ {
	5814	+ if (uuid == null)
	5815	+ {
	5816	+ // Serial
	5817	+ uuid = UUID.randomUUID();
	5818	+ }
	5819	+
	5820	+ return uuid;
	5821	+ }
	5822	+
	5823	+ Object3D GetObject(UUID uid)
	5824	+ {
	5825	+ if (blockloop)
	5826	+ return null;
	5827	+
	5828	+ if (GetUUID().equals(uid))
	5829	+ return this;
	5830	+
	5831	+ int nb = Size();
	5832	+ for (int i = 0; i < nb; i++)
	5833	+ {
	5834	+ Object3D child = (Object3D) get(i);
	5835	+
	5836	+ if (child == null)
	5837	+ continue;
	5838	+
	5839	+ blockloop = true;
	5840	+ Object3D obj = child.GetObject(uid);
	5841	+ blockloop = false;
	5842	+ if (obj != null)
	5843	+ return obj;
	5844	+ }
	5845	+
	5846	+ return null;
	5847	+ }
	5848	+
5336	5849	void SetBumpTexture(String tex)
5337	5850	{
5338	5851	if (GetTextures() == null)
..	..	@@ -5344,6 +5857,8 @@
5344	5857	texname = "";
5345	5858
5346	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5860	+
	5861	+ GetTextures().bump = null;
5347	5862
5348	5863	Touch();
5349	5864	}
..	..	@@ -5369,6 +5884,38 @@
5369	5884	}
5370	5885	}
5371	5886
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
5372	5919	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5373	5920	{
5374	5921	Draw(display, root, selected, blocked);
..	..	@@ -5377,12 +5924,23 @@
5377	5924	boolean NeedSupport()
5378	5925	{
5379	5926	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5927	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5381	5928	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5929	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5930	}
5384	5931
5385	5932	static boolean DEBUG_SELECTION = false;
	5933	+
	5934	+ boolean IsLive()
	5935	+ {
	5936	+ if (live)
	5937	+ return true;
	5938	+
	5939	+ if (parent == null)
	5940	+ return false;
	5941	+
	5942	+ return parent.IsLive();
	5943	+ }
5386	5944
5387	5945	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5388	5946	{
..	..	@@ -5394,7 +5952,7 @@
5394	5952	}
5395	5953
5396	5954	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5955	+ (hide \|\| dontselect))
5398	5956	return;
5399	5957
5400	5958	if (name != null && name.contains("sclera"))
..	..	@@ -5444,8 +6002,10 @@
5444	6002	if (support != null)
5445	6003	support = support;
5446	6004
5447		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5448		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5449	6009
5450	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5451	6011	{
..	..	@@ -5455,8 +6015,9 @@
5455	6015	// usecalllists &= !(parent instanceof RandomNode);
5456	6016	// usecalllists = false;
5457	6017
5458		- if (GetBRep() != null)
5459		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5460	6021	//System.out.println("draw " + this);
5461	6022	//new Exception().printStackTrace();
5462	6023
..	..	@@ -5465,10 +6026,12 @@
5465	6026	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5466	6027
5467	6028	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5468		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6029	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6030	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5469	6031	{
5470	6032	Globals.lighttouched = true;
5471	6033	} // all panes...
	6034	+
5472	6035	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5473	6036	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5474	6037	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5476,7 +6039,7 @@
5476	6039	if (!(this instanceof Composite))
5477	6040	touched = false;
5478	6041	//if (displaylist == -1 && usecalllists)
5479		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5480	6043	{
5481	6044	bRep.displaylist = display.GenList();
5482	6045	assert(bRep.displaylist != 0);
..	..	@@ -5487,7 +6050,7 @@
5487	6050
5488	6051	//System.out.println("\tnew list " + list);
5489	6052	//gl.glDrawBuffer(gl.GL_NONE);
5490		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5491	6054	{
5492	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5493	6056	display.NewList(bRep.displaylist);
..	..	@@ -5496,7 +6059,7 @@
5496	6059	CallList(display, root, selected, blocked);
5497	6060
5498	6061	// compiled = true;
5499		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5500	6063	{
5501	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5502	6065	display.EndList();
..	..	@@ -5596,6 +6159,7 @@
5596	6159	if (GetBRep() != null)
5597	6160	{
5598	6161	display.NextIndex();
	6162	+
5599	6163	// vertex color conflict : gl.glCallList(list);
5600	6164	DrawNode(display, root, selected);
5601	6165	if (this instanceof BezierPatch)
..	..	@@ -5636,7 +6200,28 @@
5636	6200	tex = GetTextures();
5637	6201	}
5638	6202
5639		- display.BindTextures(tex, texres);
	6203	+ boolean failedPigment = false;
	6204	+ boolean failedBump = false;
	6205	+
	6206	+ try
	6207	+ {
	6208	+ display.BindPigmentTexture(tex, texres);
	6209	+ }
	6210	+ catch (Exception e)
	6211	+ {
	6212	+ System.err.println("FAILED: " + this);
	6213	+ failedPigment = true;
	6214	+ }
	6215	+
	6216	+ try
	6217	+ {
	6218	+ display.BindBumpTexture(tex, texres);
	6219	+ }
	6220	+ catch (Exception e)
	6221	+ {
	6222	+ //System.err.println("FAILED: " + this);
	6223	+ failedBump = true;
	6224	+ }
5640	6225
5641	6226	if (!compiled)
5642	6227	{
..	..	@@ -5658,7 +6243,11 @@
5658	6243	}
5659	6244	}
5660	6245
5661		- display.ReleaseTextures(tex);
	6246	+ if (!failedBump)
	6247	+ display.ReleaseBumpTexture(tex);
	6248	+
	6249	+ if (!failedPigment)
	6250	+ display.ReleasePigmentTexture(tex);
5662	6251
5663	6252	display.PopMaterial(this, selected);
5664	6253	}
..	..	@@ -5787,6 +6376,9 @@
5787	6376
5788	6377	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	6378	{
	6379	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6380	+ return;
	6381	+
5790	6382	if (hide)
5791	6383	return;
5792	6384	// shadow optimisation
..	..	@@ -5912,6 +6504,9 @@
5912	6504	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6505	return; // no shadow for transparent objects
5914	6506
	6507	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6508	+ return;
	6509	+
5915	6510	if (hide)
5916	6511	return;
5917	6512
..	..	@@ -6025,6 +6620,11 @@
6025	6620	// dec 2012
6026	6621	new Exception().printStackTrace();
6027	6622	return;
	6623	+ }
	6624	+
	6625	+ if (dontselect)
	6626	+ {
	6627	+ //bRep.GenerateNormalsMINE();
6028	6628	}
6029	6629
6030	6630	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6810,20 +7410,23 @@
6810	7410	}
6811	7411	}
6812	7412
6813		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
6814	7417	{
6815		- int hc = info.bounds.x + info.bounds.width / 2;
6816		- int vc = info.bounds.y + info.bounds.height / 2;
6817		- double[][] toscreen = info.toScreen;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
6818	7421	if (toscreen == null)
6819	7422	{
6820		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6821	7424	}
6822	7425	cVector vec = in;
6823	7426	LA.xformPos(in, toscreen, in);
6824	7427	//System.out.println("Distance = " + info.camera.Distance());
6825		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6826		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6827	7430	outPt.x = hc + (int) vec.x;
6828	7431	outPt.y = vc - (int) vec.y;
6829	7432	outRec.x = outPt.x - 3;
..	..	@@ -6831,15 +7434,18 @@
6831	7434	outRec.width = outRec.height = 6;
6832	7435	}
6833	7436
6834		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
6835	7439	{
6836	7440	Point pt = new Point(0, 0);
6837	7441	Rectangle rec = new Rectangle();
6838		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
6839	7444	return rec;
6840	7445	}
6841	7446
6842		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
6843	7449	{
6844	7450	if (level == 0)
6845	7451	{
..	..	@@ -6848,16 +7454,19 @@
6848	7454	{
6849	7455	cVector origin = new cVector();
6850	7456	//LA.xformPos(origin, toParent, origin);
6851		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6852	7461	Rectangle boundary = new Rectangle();
6853	7462	boundary.x = spot.x - 30;
6854	7463	boundary.y = spot.y - 30;
6855	7464	boundary.width = spot.width + 60;
6856	7465	boundary.height = spot.height + 60;
6857		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
6858	7467	int spotw = spot.x + spot.width;
6859	7468	int spoth = spot.y + spot.height;
6860		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6861	7470	// if (CameraPane.Xmin > spot.x)
6862	7471	// {
6863	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -6874,11 +7483,33 @@
6874	7483	// {
6875	7484	// CameraPane.Ymax = spoth;
6876	7485	// }
6877		- spot.translate(32, 32);
	7486	+// if (CameraPane.Xmin > spot.x)
	7487	+// {
	7488	+// CameraPane.Xmin = spot.x;
	7489	+// }
	7490	+// if (CameraPane.Xmax < spotw)
	7491	+// {
	7492	+// CameraPane.Xmax = spotw;
	7493	+// }
	7494	+// if (CameraPane.Ymin > spot.y)
	7495	+// {
	7496	+// CameraPane.Ymin = spot.y;
	7497	+// }
	7498	+// if (CameraPane.Ymax < spoth)
	7499	+// {
	7500	+// CameraPane.Ymax = spoth;
	7501	+// }
	7502	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7503	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
6878	7509	spotw = spot.x + spot.width;
6879	7510	spoth = spot.y + spot.height;
6880		- info.g.setColor(Color.blue);
6881		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6882	7513	// if (CameraPane.Xmin > spot.x)
6883	7514	// {
6884	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -6895,29 +7526,9 @@
6895	7526	// {
6896	7527	// CameraPane.Ymax = spoth;
6897	7528	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6900		- spot.translate(0, -32);
6901		- info.g.setColor(Color.green);
6902		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6903		-// if (CameraPane.Xmin > spot.x)
6904		-// {
6905		-// CameraPane.Xmin = spot.x;
6906		-// }
6907		-// if (CameraPane.Xmax < spotw)
6908		-// {
6909		-// CameraPane.Xmax = spotw;
6910		-// }
6911		-// if (CameraPane.Ymin > spot.y)
6912		-// {
6913		-// CameraPane.Ymin = spot.y;
6914		-// }
6915		-// if (CameraPane.Ymax < spoth)
6916		-// {
6917		-// CameraPane.Ymax = spoth;
6918		-// }
6919		- info.g.drawArc(boundary.x, boundary.y,
6920		- boundary.width, boundary.height, 0, 360);
	7529	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6921	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6922	7533	// if (CameraPane.Xmin > boundary.x)
6923	7534	// {
..	..	@@ -6939,7 +7550,8 @@
6939	7550	}
6940	7551	}
6941	7552
6942		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
6943	7555	{
6944	7556	if (level == 0)
6945	7557	{
..	..	@@ -6948,10 +7560,10 @@
6948	7560
6949	7561	boolean retval = false;
6950	7562
6951		- startX = info.x;
6952		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
6953	7565
6954		- hitSomething = 0;
	7566	+ hitSomething = -1;
6955	7567	cVector origin = new cVector();
6956	7568	//LA.xformPos(origin, toParent, origin);
6957	7569	Rectangle spot = new Rectangle();
..	..	@@ -6959,22 +7571,53 @@
6959	7571	{
6960	7572	centerPt = new Point(0, 0);
6961	7573	}
6962		- calcHotSpot(origin, info, centerPt, spot);
6963		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
6964	7577	{
6965	7578	hitSomething = hitCenter;
6966	7579	retval = true;
6967	7580	}
6968	7581	spot.translate(32, 0);
6969		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
6970	7583	{
6971	7584	hitSomething = hitRotate;
6972	7585	retval = true;
6973	7586	}
6974	7587	spot.translate(0, 32);
6975		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
6976	7591	{
6977	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
6978	7621	retval = true;
6979	7622	}
6980	7623
..	..	@@ -6984,7 +7627,7 @@
6984	7627	}
6985	7628
6986	7629	//System.out.println("info.modifiers = " + info.modifiers);
6987		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
6988	7631	//System.out.println("modified = " + modified);
6989	7632	//new Exception().printStackTrace();
6990	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7012,7 +7655,8 @@
7012	7655	return true;
7013	7656	}
7014	7657
7015		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7016	7660	{
7017	7661	if (hitSomething == 0)
7018	7662	{
..	..	@@ -7026,7 +7670,8 @@
7026	7670
7027	7671	//System.out.println("hitSomething = " + hitSomething);
7028	7672
7029		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
	7674	+
7030	7675	cVector xlate = new cVector();
7031	7676	//cVector xlate2 = new cVector();
7032	7677	switch (hitSomething)
..	..	@@ -7059,8 +7704,8 @@
7059	7704	toParent[3][i] = xlate.get(i);
7060	7705	LA.matInvert(toParent, fromParent);
7061	7706	*/
7062		- cVector delta = LA.newVector(0, 0, startY - info.y);
7063		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7064	7709
7065	7710	LA.matCopy(startMat, toParent);
7066	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7069,7 +7714,7 @@
7069	7714	} else
7070	7715	{
7071	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7072		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7073	7718	cVector away = new cVector();
7074	7719	//cVector right2 = new cVector();
7075	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7086,19 +7731,19 @@
7086	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7087	7732	// if (!CameraPane.LOCALTRANSFORM)
7088	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7089		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7090	7735	// if (!CameraPane.LOCALTRANSFORM)
7091	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7092	7737	//LA.vecCross(up, cVector.Z, right2);
7093	7738
7094		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7095	7740
7096	7741	//System.out.println("DELTA0 = " + delta);
7097	7742	//System.out.println("AWAY = " + info.camera.away);
7098	7743	//System.out.println("UP = " + info.camera.up);
7099	7744	if (away.z > 0)
7100	7745	{
7101		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7102	7747	{
7103	7748	delta.x = -delta.x;
7104	7749	} else
..	..	@@ -7113,7 +7758,7 @@
7113	7758	//System.out.println("DELTA1 = " + delta);
7114	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7115	7760	//System.out.println("DELTA2 = " + delta);
7116		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7117	7762	LA.matCopy(startMat, toParent);
7118	7763	//System.out.println("DELTA3 = " + delta);
7119	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7123,8 +7768,8 @@
7123	7768	break;
7124	7769
7125	7770	case hitRotate: // rotate
7126		- int dx = info.x - centerPt.x;
7127		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7128	7773	double angle = (double) Math.atan2(dx, dy);
7129	7774	angle = -(1.570796 - angle);
7130	7775
..	..	@@ -7147,7 +7792,7 @@
7147	7792	}
7148	7793	/**/
7149	7794
7150		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7151	7796	{
7152	7797	case 1: // '\001'
7153	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7174,26 +7819,30 @@
7174	7819	break;
7175	7820
7176	7821	case hitScale: // scale
7177		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7823	+ double sign = 1;
	7824	+ if (hScale < 0)
	7825	+ {
	7826	+ sign = -1;
	7827	+ }
	7828	+ hScale = signMath.pow(signhScale, scale * 50);
7178	7829	if (hScale < 0.01)
7179	7830	{
7180		- hScale = 0.01;
	7831	+ //hScale = 0.01;
7181	7832	}
7182		- hScale = Math.pow(hScale, scale * 50);
7183		- if (hScale < 0.01)
	7833	+
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7835	+ sign = 1;
	7836	+ if (vScale < 0)
7184	7837	{
7185		- hScale = 0.01;
	7838	+ sign = -1;
7186	7839	}
7187		- double vScale = (double) (info.y - centerPt.y) / 32;
	7840	+ vScale = signMath.pow(signvScale, scale * 50);
7188	7841	if (vScale < 0.01)
7189	7842	{
7190		- vScale = 0.01;
	7843	+ //vScale = 0.01;
7191	7844	}
7192		- vScale = Math.pow(vScale, scale * 50);
7193		- if (vScale < 0.01)
7194		- {
7195		- vScale = 0.01;
7196		- }
	7845	+
7197	7846	LA.matCopy(startMat, toParent);
7198	7847	/**/
7199	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7203,39 +7852,56 @@
7203	7852	}
7204	7853	/**/
7205	7854
7206		- switch (info.pane.RenderCamera().viewCode)
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7856	+
	7857	+ if (totalScale < 0.01)
	7858	+ {
	7859	+ totalScale = 0.01;
	7860	+ }
	7861	+
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7207	7863	{
7208	7864	case 3: // '\001'
7209		- if (modified)
	7865	+ if (modified \|\| opposite)
7210	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7211	7870	//LA.matScale(toParent, 1, hScale, vScale);
7212		- LA.matScale(toParent, vScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7213	7872	} // vScale, 1);
7214	7873	else
7215	7874	{
7216		- LA.matScale(toParent, vScale, vScale, vScale);
	7875	+ // EXCEPTION!
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7217	7877	} // vScale, 1);
7218	7878	break;
7219	7879
7220	7880	case 2: // '\002'
7221		- if (modified)
	7881	+ if (modified \|\| opposite)
7222	7882	{
7223		- //LA.matScale(toParent, hScale, 1, vScale);
7224		- LA.matScale(toParent, 1, vScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7225	7888	} else
7226	7889	{
7227		- LA.matScale(toParent, vScale, 1, vScale);
	7890	+ LA.matScale(toParent, totalScale, 1, totalScale);
7228	7891	}
7229	7892	break;
7230	7893
7231	7894	case 1: // '\003'
7232		- if (modified)
	7895	+ if (modified \|\| opposite)
7233	7896	{
7234		- //LA.matScale(toParent, hScale, vScale, 1);
7235		- LA.matScale(toParent, 1, 1, vScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7236	7902	} else
7237	7903	{
7238		- LA.matScale(toParent, vScale, vScale, 1);
	7904	+ LA.matScale(toParent, totalScale, totalScale, 1);
7239	7905	}
7240	7906	break;
7241	7907	}
..	..	@@ -7269,7 +7935,7 @@
7269	7935	} // NEW ...
7270	7936
7271	7937
7272		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7273	7939	}
7274	7940
7275	7941	boolean overflow = false;
..	..	@@ -7368,14 +8034,22 @@
7368	8034	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369	8035	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370	8036	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8037	+
	8038	+ String objname;
	8039	+
7371	8040	if (false) //parent != null)
7372	8041	{
7373		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8042	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374	8043	} else
7375	8044	{
7376		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8045	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7377	8046	} // + super.toString();
7378	8047	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8048	+
	8049	+ if (!Globals.ADVANCED)
	8050	+ return objname;
	8051	+
	8052	+ return objname + " " + System.identityHashCode(this);
7379	8053	}
7380	8054
7381	8055	public int hashCode()
..	..	@@ -7441,6 +8115,10 @@
7441	8115	editWindow = null;
7442	8116	} // ?
7443	8117	}
	8118	+ else
	8119	+ {
	8120	+ //editWindow.closeUI();
	8121	+ }
7444	8122	}
7445	8123
7446	8124	boolean root; // patch for edit windows
..	..	@@ -7452,7 +8130,7 @@
7452	8130	/transient/ cVector2[] projectedVertices = new cVector2[0];
7453	8131
7454	8132	Object3D /Composite/ parent;
7455		- Object3D /Composite/ fileparent;
	8133	+ Object3D /Composite/ fileparent; // In the case of FileObject
7456	8134
7457	8135	double[][] toParent; // dynamic matrix
7458	8136	double[][] fromParent;
..	..	@@ -7598,6 +8276,10 @@
7598	8276	}
7599	8277
7600	8278	transient ObjEditor editWindow;
	8279	+ transient ObjEditor manipWindow;
	8280	+
	8281	+ transient boolean pinned;
	8282	+
7601	8283	transient ObjectUI objectUI;
7602	8284	public static int povDepth = 0;
7603	8285	private static cVector tbMin = new cVector();
..	..	@@ -7616,9 +8298,9 @@
7616	8298	private static cVector edge2 = new cVector();
7617	8299	//private static cVector norm = new cVector();
7618	8300	/transient private/ int hitSomething;
7619		- private static final int hitCenter = 1;
7620		- private static final int hitScale = 2;
7621		- private static final int hitRotate = 3;
	8301	+ static final int hitCenter = 1;
	8302	+ static final int hitScale = 2;
	8303	+ static final int hitRotate = 3;
7622	8304	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7623	8305	/transient/ private Point centerPt;
7624	8306	/transient/ private int startX;