~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,14 +14,45 @@
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	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
23	41	ScriptNode scriptnode;
24	42
	43	+ int VersionCount()
	44	+ {
	45	+ int count = 0;
	46	+
	47	+ for (int i = versionlist.length; --i >= 0;)
	48	+ {
	49	+ if (versionlist[i] != null)
	50	+ count++;
	51	+ }
	52	+
	53	+ return count;
	54	+ }
	55	+
25	56	void InitOthers()
26	57	{
27	58	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -100,64 +131,245 @@
100	131
101	132	// transient boolean reduced; // for morph reduction
102	133
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	134	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	135	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	136
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	137	+ transient Object3D transientsupport; // for cloning
	138	+ transient boolean transientlink2master;
108	139
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)
	140	+ void SaveSupports()
121	141	{
122		- bRep.SaveSupports();
	142	+ if (blockloop)
	143	+ return;
	144	+
	145	+ transientsupport = support;
	146	+ transientlink2master = link2master;
	147	+
	148	+ support = null;
	149	+ link2master = false;
	150	+
	151	+ if (bRep != null)
	152	+ {
	153	+ bRep.SaveSupports();
	154	+ }
	155	+
	156	+ for (int i = 0; i < Size(); i++)
	157	+ {
	158	+ Object3D child = (Object3D) get(i);
	159	+ if (child == null)
	160	+ continue;
	161	+ blockloop = true;
	162	+ child.SaveSupports();
	163	+ blockloop = false;
	164	+ }
123	165	}
124		-
125		- for (int i = 0; i < Size(); i++)
	166	+
	167	+ void RestoreSupports()
126	168	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	169	+ if (blockloop)
	170	+ return;
	171	+
	172	+ support = transientsupport;
	173	+ link2master = transientlink2master;
	174	+ transientsupport = null;
	175	+ transientlink2master = false;
	176	+
	177	+ if (bRep != null)
	178	+ {
	179	+ bRep.RestoreSupports();
	180	+ }
	181	+
	182	+ for (int i = 0; i < Size(); i++)
	183	+ {
	184	+ Object3D child = (Object3D) get(i);
	185	+ if (child == null)
	186	+ continue;
	187	+ blockloop = true;
	188	+ child.RestoreSupports();
	189	+ blockloop = false;
	190	+ }
	191	+ }
	192	+
	193	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	194	+ {
	195	+ Object3D o;
	196	+
	197	+ if (hashtable.containsKey(GetUUID()))
	198	+ {
	199	+ o = hashtable.get(GetUUID());
	200	+
	201	+ Grafreed.Assert(this.bRep == o.bRep);
	202	+ //if (this.bRep != null)
	203	+ // assert(this.bRep.support == o.transientrep);
	204	+ if (this.support != null)
	205	+ assert(this.support.bRep == o.transientrep);
	206	+ }
	207	+ else
	208	+ {
	209	+ o = new Object3D("copy of " + this.name);
	210	+
	211	+ hashtable.put(GetUUID(), o);
	212	+ }
	213	+
	214	+ if (!blockloop)
	215	+ {
	216	+ blockloop = true;
	217	+
	218	+ for (int i=0; i<Size(); i++)
	219	+ {
	220	+ get(i).ExtractBigData(hashtable);
	221	+ }
	222	+
	223	+ blockloop = false;
	224	+ }
	225	+
	226	+ ExtractBigData(o);
	227	+ }
	228	+
	229	+ void ExtractBigData(Object3D o)
	230	+ {
	231	+ if (o.bRep != null)
	232	+ Grafreed.Assert(o.bRep == this.bRep);
	233	+
	234	+ o.bRep = this.bRep;
	235	+// July 2019 if (this.bRep != null)
	236	+// {
	237	+// o.transientrep = this.bRep.support;
	238	+// o.bRep.support = null;
	239	+// }
	240	+ o.selection = this.selection;
	241	+ o.versionlist = this.versionlist;
	242	+ o.versionindex = this.versionindex;
	243	+
	244	+ if (this.support != null)
	245	+ {
	246	+ if (o.transientrep != null)
	247	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	248	+
	249	+ o.transientrep = this.support.bRep;
	250	+ this.support.bRep = null;
	251	+ }
	252	+
	253	+ // o.support = this.support;
	254	+ // o.fileparent = this.fileparent;
	255	+ // if (this.bRep != null)
	256	+ // o.bRep = this.bRep.support;
	257	+
	258	+ this.bRep = null;
	259	+ // if (this.bRep != null)
	260	+ // this.bRep.support = null;
	261	+ // this.support = null;
	262	+ // this.fileparent = null;
	263	+ }
	264	+
	265	+// Object3D GetObject(java.util.UUID uuid)
	266	+// {
	267	+// if (this.uuid.equals(uuid))
	268	+// return this;
	269	+//
	270	+// if (blockloop)
	271	+// return null;
	272	+//
	273	+// blockloop = true;
	274	+//
	275	+// for (int i=0; i<Size(); i++)
	276	+// {
	277	+// Object3D o = get(i).GetObject(uuid);
	278	+//
	279	+// if (o != null)
	280	+// return o;
	281	+// }
	282	+//
	283	+// blockloop = false;
	284	+//
	285	+// return null;
	286	+// }
	287	+
	288	+ transient boolean tag;
	289	+
	290	+ void TagObjects(Object3D o, boolean tag)
	291	+ {
	292	+ if (blockloop)
	293	+ return;
	294	+
	295	+ o.tag = tag;
	296	+
	297	+ if (o == this)
	298	+ return;
	299	+
130	300	blockloop = true;
131		- child.SaveSupports();
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
132	307	blockloop = false;
133	308	}
134		-}
135	309
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
140	314
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	315	blockloop = true;
157		- child.RestoreSupports();
	316	+
	317	+ boolean hasTags = false;
	318	+
	319	+ for (int i=0; i<Size(); i++)
	320	+ {
	321	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	322	+
	323	+ if (hasTags)
	324	+ break;
	325	+ }
	326	+
	327	+ blockloop = false;
	328	+
	329	+ return hasTags;
	330	+ }
	331	+
	332	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	333	+ {
	334	+ if (!hashtable.containsKey(GetUUID()))
	335	+ return;
	336	+
	337	+ Object3D o = hashtable.get(GetUUID());
	338	+
	339	+ RestoreBigData(o);
	340	+
	341	+ if (blockloop)
	342	+ return;
	343	+
	344	+ blockloop = true;
	345	+
	346	+ //hashtable.remove(GetUUID());
	347	+
	348	+ for (int i=0; i<Size(); i++)
	349	+ {
	350	+ get(i).RestoreBigData(hashtable);
	351	+ }
	352	+
158	353	blockloop = false;
159	354	}
160		-}
	355	+
	356	+ void RestoreBigData(Object3D o)
	357	+ {
	358	+ this.bRep = o.bRep;
	359	+ if (this.support != null && o.transientrep != null)
	360	+ {
	361	+ this.support.bRep = o.transientrep;
	362	+ }
	363	+
	364	+ this.selection = o.selection;
	365	+
	366	+ this.versionlist = o.versionlist;
	367	+ this.versionindex = o.versionindex;
	368	+// July 2019 if (this.bRep != null)
	369	+// this.bRep.support = o.transientrep;
	370	+ // this.support = o.support;
	371	+ // this.fileparent = o.fileparent;
	372	+ }
161	373
162	374	// MOCAP SUPPORT
163	375	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +512,7 @@
300	512	}
301	513
302	514	boolean live = false;
	515	+ transient boolean keepdontselect;
303	516	boolean dontselect = false;
304	517	boolean hide = false;
305	518	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -368,11 +581,11 @@
368	581	}
369	582	}
370	583
371		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
372	585
373	586	int MemorySize()
374	587	{
375		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
376	589	{
377	590	try
378	591	{
..	..	@@ -482,12 +695,14 @@
482	695	toParent = LA.newMatrix();
483	696	fromParent = LA.newMatrix();
484	697	}
	698	+
485	699	if (toParentMarked == null)
486	700	{
487	701	if (maxcount != 1)
488	702	{
489		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
490	704	}
	705	+
491	706	toParentMarked = LA.newMatrix();
492	707	fromParentMarked = LA.newMatrix();
493	708	}
..	..	@@ -798,7 +1013,7 @@
798	1013
799	1014	if (marked && Globals.isLIVE() && live &&
800	1015	//TEMP21aug2018
801		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1016	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
802	1017	currentframe != Globals.framecount)
803	1018	{
804	1019	currentframe = Globals.framecount;
..	..	@@ -810,7 +1025,8 @@
810	1025
811	1026	boolean changedir = random && Math.random() < 0.01; // && !link2master;
812	1027
813		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1028	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1029	+ (step == 1 && changedir))
814	1030	{
815	1031	countdown = 1;
816	1032	delay = speedup?8:1;
..	..	@@ -882,6 +1098,10 @@
882	1098	if (material == null \|\| material.multiply)
883	1099	return true;
884	1100
	1101	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1102	+ return false;
	1103	+
	1104	+ // Transparent objects are dynamic because we have to sort the triangles.
885	1105	return material.opacity > 0.99;
886	1106	}
887	1107
..	..	@@ -1282,6 +1502,7 @@
1282	1502	toParent = LA.newMatrix();
1283	1503	fromParent = LA.newMatrix();
1284	1504	}
	1505	+
1285	1506	LA.matCopy(other.toParent, toParent);
1286	1507	LA.matCopy(other.fromParent, fromParent);
1287	1508
..	..	@@ -2161,11 +2382,6 @@
2161	2382
2162	2383	InitOthers();
2163	2384
2164		- if (this instanceof Camera)
2165		- {
2166		- material.shift = 90;
2167		- }
2168		-
2169	2385	material.multiply = multiply;
2170	2386
2171	2387	if (multiply)
..	..	@@ -2303,6 +2519,15 @@
2303	2519	}
2304	2520	*/
2305	2521	}
	2522	+ else
	2523	+ {
	2524	+ //((ObjEditor)editWindow).SetupUI2(null);
	2525	+ if (objectUI != null)
	2526	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2527	+ else
	2528	+ //new Exception().printStackTrace();
	2529	+ System.err.println("objectUI is null");
	2530	+ }
2306	2531	}
2307	2532
2308	2533	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2344,6 +2569,14 @@
2344	2569	{
2345	2570	editWindow.refreshContents();
2346	2571	}
	2572	+ else
	2573	+ {
	2574	+ if (manipWindow != null)
	2575	+ {
	2576	+ manipWindow.refreshContents();
	2577	+ }
	2578	+ }
	2579	+
2347	2580	//if (parent != null)
2348	2581	//parent.refreshEditWindow();
2349	2582	}
..	..	@@ -2423,7 +2656,8 @@
2423	2656	private static final int editSelf = 1;
2424	2657	private static final int editChild = 2;
2425	2658
2426		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2427	2661	{
2428	2662	if (level == 0)
2429	2663	{
..	..	@@ -2431,7 +2665,8 @@
2431	2665	return;
2432	2666
2433	2667	Object3D selectee;
2434		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2668	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2669	+ level + 1))
2435	2670	{
2436	2671	selectee = (Object3D) e.nextElement();
2437	2672	}
..	..	@@ -2439,19 +2674,22 @@
2439	2674	} else
2440	2675	{
2441	2676	//super.
2442		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2443	2679	}
2444	2680	}
2445	2681
2446		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2447	2684	{
2448	2685	doSomething = 0;
2449	2686	if (level == 0)
2450	2687	{
2451		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2452	2689	}
2453	2690	if (//super.
2454		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2455	2693	{
2456	2694	doSomething = 1;
2457	2695	return true;
..	..	@@ -2461,7 +2699,7 @@
2461	2699	}
2462	2700	}
2463	2701
2464		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2465	2703	{
2466	2704	if (selection == null)
2467	2705	{
..	..	@@ -2474,7 +2712,8 @@
2474	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2475	2713	{
2476	2714	Object3D selectee = (Object3D) e.nextElement();
2477		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2478	2717	{
2479	2718	childToDrag = selectee;
2480	2719	doSomething = 2;
..	..	@@ -2486,13 +2725,15 @@
2486	2725	return retval;
2487	2726	}
2488	2727
2489		- void doEditDrag(ClickInfo info, boolean opposite)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2490	2730	{
2491	2731	switch (doSomething)
2492	2732	{
2493	2733	case 1: // '\001'
2494	2734	//super.
2495		- doEditDrag0(info, opposite);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2496	2737	break;
2497	2738
2498	2739	case 2: // '\002'
..	..	@@ -2505,11 +2746,13 @@
2505	2746	{
2506	2747	//sel.hitSomething = childToDrag.hitSomething;
2507	2748	//childToDrag.doEditDrag(info);
2508		- sel.doEditDrag(info, opposite);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2509	2751	} else
2510	2752	{
2511	2753	//super.
2512		- doEditDrag0(info, opposite);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2513	2756	}
2514	2757	}
2515	2758	break;
..	..	@@ -2527,6 +2770,9 @@
2527	2770	{
2528	2771	deselectAll();
2529	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2530	2776	ClickInfo newInfo = new ClickInfo();
2531	2777	newInfo.flags = info.flags;
2532	2778	newInfo.bounds = info.bounds;
..	..	@@ -2619,6 +2865,18 @@
2619	2865	void GenNormalsS(boolean crease)
2620	2866	{
2621	2867	selection.GenNormals(crease);
	2868	+// for (int i=0; i<selection.size(); i++)
	2869	+// {
	2870	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2871	+// selectee.GenNormals(crease);
	2872	+// }
	2873	+
	2874	+ //Touch();
	2875	+ }
	2876	+
	2877	+ void GenNormalsMeshS()
	2878	+ {
	2879	+ selection.GenNormalsMesh();
2622	2880	// for (int i=0; i<selection.size(); i++)
2623	2881	// {
2624	2882	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2759,6 +3017,24 @@
2759	3017	if (child == null)
2760	3018	continue;
2761	3019	child.GenNormals(crease);
	3020	+// Children().release(i);
	3021	+ }
	3022	+ blockloop = false;
	3023	+ }
	3024	+
	3025	+ void GenNormalsMesh()
	3026	+ {
	3027	+ if (blockloop)
	3028	+ return;
	3029	+
	3030	+ blockloop = true;
	3031	+ GenNormalsMesh0();
	3032	+ for (int i = 0; i < Children().Size(); i++)
	3033	+ {
	3034	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3035	+ if (child == null)
	3036	+ continue;
	3037	+ child.GenNormalsMesh();
2762	3038	// Children().release(i);
2763	3039	}
2764	3040	blockloop = false;
..	..	@@ -2931,11 +3207,20 @@
2931	3207	}
2932	3208	}
2933	3209
	3210	+ void GenNormalsMesh0()
	3211	+ {
	3212	+ if (bRep != null)
	3213	+ {
	3214	+ bRep.GenerateNormalsMesh();
	3215	+ Touch();
	3216	+ }
	3217	+ }
	3218	+
2934	3219	void GenNormalsMINE0()
2935	3220	{
2936	3221	if (bRep != null)
2937	3222	{
2938		- bRep.GenerateNormalsMINE();
	3223	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2939	3224	Touch();
2940	3225	}
2941	3226	}
..	..	@@ -2992,6 +3277,93 @@
2992	3277	blockloop = false;
2993	3278	}
2994	3279
	3280	+ public void ResetTransform(int mask)
	3281	+ {
	3282	+ Object3D obj = this;
	3283	+
	3284	+ if (mask == -1)
	3285	+ {
	3286	+ if (obj instanceof Camera) // jan 2014
	3287	+ {
	3288	+ LA.matIdentity(obj.toParent);
	3289	+ LA.matIdentity(obj.fromParent);
	3290	+ }
	3291	+ else
	3292	+ {
	3293	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3294	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3295	+ }
	3296	+ return;
	3297	+ }
	3298	+
	3299	+ if ((mask&2) != 0) // Scale/rotation
	3300	+ {
	3301	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3302	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3303	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3304	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3305	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3306	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3307	+ }
	3308	+ if ((mask&1) != 0) // Translation
	3309	+ {
	3310	+ if (obj.toParent != null)
	3311	+ {
	3312	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3313	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3314	+ }
	3315	+ }
	3316	+ }
	3317	+
	3318	+ public void TextureRatioTransform(int axis)
	3319	+ {
	3320	+ cTexture tex = GetTextures();
	3321	+
	3322	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3323	+
	3324	+ try
	3325	+ {
	3326	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3327	+ }
	3328	+ catch (Exception e)
	3329	+ {
	3330	+ System.err.println("FAIL TextureRatio: " + this);
	3331	+ }
	3332	+
	3333	+ LA.matIdentity(Object3D.mat);
	3334	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3335	+
	3336	+ if (toParent == null)
	3337	+ {
	3338	+ toParent = LA.newMatrix();
	3339	+ fromParent = LA.newMatrix();
	3340	+ }
	3341	+
	3342	+ ResetTransform(2);
	3343	+
	3344	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3345	+ LA.matInvert(fromParent, toParent);
	3346	+ }
	3347	+
	3348	+ void TextureRatio(int axis)
	3349	+ {
	3350	+ if (blockloop)
	3351	+ return;
	3352	+
	3353	+ blockloop = true;
	3354	+
	3355	+ TextureRatioTransform(axis);
	3356	+
	3357	+ for (int i=Size(); --i>=0;)
	3358	+ {
	3359	+ Object3D v = get(i);
	3360	+
	3361	+ v.TextureRatio(axis);
	3362	+ }
	3363	+
	3364	+ blockloop = false;
	3365	+ }
	3366	+
2995	3367	void TransformChildren()
2996	3368	{
2997	3369	if (toParent != null)
..	..	@@ -3345,15 +3717,47 @@
3345	3717
3346	3718	void ClearMaterials()
3347	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3348	3725	ClearMaterial();
3349		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3350	3727	{
3351		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3352	3729	if (child == null)
3353	3730	continue;
3354	3731	child.ClearMaterials();
3355		- release(i);
3356	3732	}
	3733	+
	3734	+ blockloop = false;
	3735	+ }
	3736	+
	3737	+ void ClearVersionList()
	3738	+ {
	3739	+ this.versionlist = null;
	3740	+ this.versionindex = -1;
	3741	+ this.versiontable = null;
	3742	+ }
	3743	+
	3744	+ void ClearVersions()
	3745	+ {
	3746	+ if (blockloop)
	3747	+ return;
	3748	+
	3749	+ blockloop = true;
	3750	+
	3751	+ ClearVersionList();
	3752	+ for (int i = 0; i < Size(); i++)
	3753	+ {
	3754	+ Object3D child = (Object3D) get(i);
	3755	+ if (child == null)
	3756	+ continue;
	3757	+ child.ClearVersions();
	3758	+ }
	3759	+
	3760	+ blockloop = false;
3357	3761	}
3358	3762
3359	3763	void FlipV(boolean flip)
..	..	@@ -3381,7 +3785,8 @@
3381	3785	if (blockloop)
3382	3786	return;
3383	3787
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3788	+ if (//marked \|\| // does not make sense
	3789	+ (bRep != null \|\| material != null)) // borderline...
3385	3790	live = h;
3386	3791
3387	3792	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3807,8 @@
3402	3807	return;
3403	3808
3404	3809	//if (bRep != null)
3405		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3810	+ if (//marked \|\| // does not make sense
	3811	+ (bRep != null \|\| material != null)) // borderline...
3406	3812	link2master = h;
3407	3813
3408	3814	for (int i = 0; i < Size(); i++)
..	..	@@ -3422,7 +3828,8 @@
3422	3828	if (blockloop)
3423	3829	return;
3424	3830
3425		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3831	+ if (//marked \|\| // does not make sense
	3832	+ (bRep != null \|\| material != null)) // borderline...
3426	3833	hide = h;
3427	3834
3428	3835	for (int i = 0; i < Size(); i++)
..	..	@@ -3442,7 +3849,7 @@
3442	3849	if (blockloop)
3443	3850	return;
3444	3851
3445		- if (bRep != null && material != null) // borderline...
	3852	+ if (bRep != null \|\| material != null) // borderline...
3446	3853	marked = h;
3447	3854
3448	3855	for (int i = 0; i < Size(); i++)
..	..	@@ -3452,6 +3859,46 @@
3452	3859	continue;
3453	3860	blockloop = true;
3454	3861	child.MarkLeaves(h);
	3862	+ blockloop = false;
	3863	+ // release(i);
	3864	+ }
	3865	+ }
	3866	+
	3867	+ void RewindLeaves(boolean h)
	3868	+ {
	3869	+ if (blockloop)
	3870	+ return;
	3871	+
	3872	+ if (bRep != null \|\| material != null) // borderline...
	3873	+ rewind = h;
	3874	+
	3875	+ for (int i = 0; i < Size(); i++)
	3876	+ {
	3877	+ Object3D child = (Object3D) get(i); // reserve(i);
	3878	+ if (child == null)
	3879	+ continue;
	3880	+ blockloop = true;
	3881	+ child.RewindLeaves(h);
	3882	+ blockloop = false;
	3883	+ // release(i);
	3884	+ }
	3885	+ }
	3886	+
	3887	+ void RandomLeaves(boolean h)
	3888	+ {
	3889	+ if (blockloop)
	3890	+ return;
	3891	+
	3892	+ if (bRep != null \|\| material != null) // borderline...
	3893	+ random = h;
	3894	+
	3895	+ for (int i = 0; i < Size(); i++)
	3896	+ {
	3897	+ Object3D child = (Object3D) get(i); // reserve(i);
	3898	+ if (child == null)
	3899	+ continue;
	3900	+ blockloop = true;
	3901	+ child.RandomLeaves(h);
3455	3902	blockloop = false;
3456	3903	// release(i);
3457	3904	}
..	..	@@ -4229,6 +4676,55 @@
4229	4676	}
4230	4677	}
4231	4678
	4679	+ void RepairSOV()
	4680	+ {
	4681	+ if (blockloop)
	4682	+ return;
	4683	+
	4684	+ String texname = this.GetPigmentTexture();
	4685	+
	4686	+ if (texname.startsWith("sov"))
	4687	+ {
	4688	+ String[] s = texname.split("/");
	4689	+
	4690	+ String[] sname = s[1].split("Color.pn");
	4691	+
	4692	+ texname = sname[0];
	4693	+
	4694	+ if (sname.length > 1)
	4695	+ {
	4696	+ texname += "Color.jpg";
	4697	+ }
	4698	+
	4699	+ this.SetPigmentTexture("sov/" + texname);
	4700	+ }
	4701	+
	4702	+ texname = this.GetBumpTexture();
	4703	+
	4704	+ if (texname.startsWith("sov"))
	4705	+ {
	4706	+ String[] s = texname.split("/");
	4707	+
	4708	+ String[] sname = s[1].split("Bump.pn");
	4709	+
	4710	+ texname = sname[0];
	4711	+
	4712	+ if (sname.length > 1)
	4713	+ {
	4714	+ texname += "Bump.jpg";
	4715	+ }
	4716	+
	4717	+ this.SetBumpTexture("sov/" + texname);
	4718	+ }
	4719	+
	4720	+ for (int i=0; i<Size(); i++)
	4721	+ {
	4722	+ blockloop = true;
	4723	+ get(i).RepairSOV();
	4724	+ blockloop = false;
	4725	+ }
	4726	+ }
	4727	+
4232	4728	void RepairTexture()
4233	4729	{
4234	4730	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4743,6 +5239,14 @@
4743	5239	}
4744	5240	}
4745	5241
	5242	+ ObjEditor GetWindow()
	5243	+ {
	5244	+ if (editWindow != null)
	5245	+ return editWindow;
	5246	+
	5247	+ return manipWindow;
	5248	+ }
	5249	+
4746	5250	cTreePath Select(int indexcount, boolean deselect)
4747	5251	{
4748	5252	if (hide \|\| dontselect)
..	..	@@ -4779,10 +5283,11 @@
4779	5283	if (leaf != null)
4780	5284	{
4781	5285	cTreePath tp = new cTreePath(this, leaf);
4782		- if (editWindow != null)
	5286	+ ObjEditor window = GetWindow();
	5287	+ if (window != null)
4783	5288	{
4784	5289	//System.out.println("editWindow = " + editWindow + " vs " + this);
4785		- editWindow.Select(tp, deselect, true);
	5290	+ window.Select(tp, deselect, true);
4786	5291	}
4787	5292
4788	5293	return tp;
..	..	@@ -4799,6 +5304,7 @@
4799	5304
4800	5305	if (child == null)
4801	5306	continue;
	5307	+
4802	5308	if (child.HasTransparency() && child.size() != 0)
4803	5309	{
4804	5310	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4808,9 +5314,10 @@
4808	5314	if (leaf != null)
4809	5315	{
4810	5316	cTreePath tp = new cTreePath(this, leaf);
4811		- if (editWindow != null)
	5317	+ ObjEditor window = GetWindow();
	5318	+ if (window != null)
4812	5319	{
4813		- editWindow.Select(tp, deselect, true);
	5320	+ window.Select(tp, deselect, true);
4814	5321	}
4815	5322
4816	5323	return tp;
..	..	@@ -5135,6 +5642,51 @@
5135	5642	blockloop = false;
5136	5643	}
5137	5644
	5645	+ void ResetSelectable()
	5646	+ {
	5647	+ if (blockloop)
	5648	+ return;
	5649	+
	5650	+ blockloop = true;
	5651	+
	5652	+ keepdontselect = dontselect;
	5653	+ dontselect = true;
	5654	+
	5655	+ Object3D child;
	5656	+ int nb = Size();
	5657	+ for (int i = 0; i < nb; i++)
	5658	+ {
	5659	+ child = (Object3D) get(i);
	5660	+ if (child == null)
	5661	+ continue;
	5662	+ child.ResetSelectable();
	5663	+ }
	5664	+
	5665	+ blockloop = false;
	5666	+ }
	5667	+
	5668	+ void RestoreSelectable()
	5669	+ {
	5670	+ if (blockloop)
	5671	+ return;
	5672	+
	5673	+ blockloop = true;
	5674	+
	5675	+ dontselect = keepdontselect;
	5676	+
	5677	+ Object3D child;
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ child = (Object3D) get(i);
	5682	+ if (child == null)
	5683	+ continue;
	5684	+ child.RestoreSelectable();
	5685	+ }
	5686	+
	5687	+ blockloop = false;
	5688	+ }
	5689	+
5138	5690	boolean IsSelected()
5139	5691	{
5140	5692	if (parent == null)
..	..	@@ -5195,6 +5747,11 @@
5195	5747	if (fullname == null)
5196	5748	return "";
5197	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5198	5755	// System.out.println("Fullname = " + fullname);
5199	5756
5200	5757	// Does not work on Windows due to C:
..	..	@@ -5207,7 +5764,7 @@
5207	5764
5208	5765	if (split.length == 0)
5209	5766	{
5210		- return "";
	5767	+ return fullname.pigment = "";
5211	5768	}
5212	5769
5213	5770	if (split.length <= 2)
..	..	@@ -5215,22 +5772,27 @@
5215	5772	if (fullname.name.endsWith(":"))
5216	5773	{
5217	5774	// Windows
5218		- return fullname.name.substring(0, fullname.name.length()-1);
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5219	5776	}
5220	5777
5221		- return split[0];
	5778	+ return fullname.pigment = split[0];
5222	5779	}
5223	5780
5224	5781	// Windows
5225	5782	assert(split.length == 4);
5226	5783
5227		- return split[0] + ":" + split[1];
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5228	5785	}
5229	5786
5230	5787	static String GetBump(cTexture fullname)
5231	5788	{
5232	5789	if (fullname == null)
5233	5790	return "";
	5791	+
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
5234	5796
5235	5797	// System.out.println("Fullname = " + fullname);
5236	5798	// Does not work on Windows due to C:
..	..	@@ -5242,12 +5804,12 @@
5242	5804
5243	5805	if (split.length == 0)
5244	5806	{
5245		- return "";
	5807	+ return fullname.bump = "";
5246	5808	}
5247	5809
5248	5810	if (split.length == 1)
5249	5811	{
5250		- return "";
	5812	+ return fullname.bump = "";
5251	5813	}
5252	5814
5253	5815	if (split.length == 2)
..	..	@@ -5255,16 +5817,16 @@
5255	5817	if (fullname.name.endsWith(":"))
5256	5818	{
5257	5819	// Windows
5258		- return "";
	5820	+ return fullname.bump = "";
5259	5821	}
5260	5822
5261		- return split[1];
	5823	+ return fullname.bump = split[1];
5262	5824	}
5263	5825
5264	5826	// Windows
5265	5827	assert(split.length == 4);
5266	5828
5267		- return split[2] + ":" + split[3];
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5268	5830	}
5269	5831
5270	5832	String GetPigmentTexture()
..	..	@@ -5347,6 +5909,9 @@
5347	5909	texname = "";
5348	5910
5349	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5350	5915	Touch();
5351	5916	}
5352	5917
..	..	@@ -5371,6 +5936,43 @@
5371	5936	}
5372	5937	}
5373	5938
	5939	+ UUID GetUUID()
	5940	+ {
	5941	+ if (uuid == null)
	5942	+ {
	5943	+ // Serial
	5944	+ uuid = UUID.randomUUID();
	5945	+ }
	5946	+
	5947	+ return uuid;
	5948	+ }
	5949	+
	5950	+ Object3D GetObject(UUID uid)
	5951	+ {
	5952	+ if (blockloop)
	5953	+ return null;
	5954	+
	5955	+ if (GetUUID().equals(uid))
	5956	+ return this;
	5957	+
	5958	+ int nb = Size();
	5959	+ for (int i = 0; i < nb; i++)
	5960	+ {
	5961	+ Object3D child = (Object3D) get(i);
	5962	+
	5963	+ if (child == null)
	5964	+ continue;
	5965	+
	5966	+ blockloop = true;
	5967	+ Object3D obj = child.GetObject(uid);
	5968	+ blockloop = false;
	5969	+ if (obj != null)
	5970	+ return obj;
	5971	+ }
	5972	+
	5973	+ return null;
	5974	+ }
	5975	+
5374	5976	void SetBumpTexture(String tex)
5375	5977	{
5376	5978	if (GetTextures() == null)
..	..	@@ -5382,6 +5984,8 @@
5382	5984	texname = "";
5383	5985
5384	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5987	+
	5988	+ GetTextures().bump = null;
5385	5989
5386	5990	Touch();
5387	5991	}
..	..	@@ -5407,6 +6011,38 @@
5407	6011	}
5408	6012	}
5409	6013
	6014	+ void EmbedTextures(boolean embed)
	6015	+ {
	6016	+ if (blockloop)
	6017	+ return;
	6018	+
	6019	+ //if (GetTextures() != null)
	6020	+ if (embed)
	6021	+ CameraPane.EmbedTextures(GetTextures());
	6022	+ else
	6023	+ {
	6024	+ GetTextures().pigmentdata = null;
	6025	+ GetTextures().bumpdata = null;
	6026	+ GetTextures().pw = 0;
	6027	+ GetTextures().ph = 0;
	6028	+ GetTextures().bw = 0;
	6029	+ GetTextures().bh = 0;
	6030	+ }
	6031	+
	6032	+ int nb = Size();
	6033	+ for (int i = 0; i < nb; i++)
	6034	+ {
	6035	+ Object3D child = (Object3D) get(i);
	6036	+
	6037	+ if (child == null)
	6038	+ continue;
	6039	+
	6040	+ blockloop = true;
	6041	+ child.EmbedTextures(embed);
	6042	+ blockloop = false;
	6043	+ }
	6044	+ }
	6045	+
5410	6046	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5411	6047	{
5412	6048	Draw(display, root, selected, blocked);
..	..	@@ -5415,12 +6051,28 @@
5415	6051	boolean NeedSupport()
5416	6052	{
5417	6053	return
5418		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	6054	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5419	6055	// PROBLEM with CROWD!!
5420	6056	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5421	6057	}
5422	6058
5423	6059	static boolean DEBUG_SELECTION = false;
	6060	+
	6061	+ boolean IsLive()
	6062	+ {
	6063	+ if (live)
	6064	+ return true;
	6065	+
	6066	+ if (parent == null)
	6067	+ return false;
	6068	+
	6069	+ return parent.IsLive();
	6070	+ }
	6071	+
	6072	+ boolean IsDynamic()
	6073	+ {
	6074	+ return live && bRep != null;
	6075	+ }
5424	6076
5425	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5426	6078	{
..	..	@@ -5482,8 +6134,11 @@
5482	6134	if (support != null)
5483	6135	support = support;
5484	6136
5485		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5486		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6137	+ boolean usecalllists = !IsDynamic() &&
	6138	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6139	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6140	+
	6141	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5487	6142
5488	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5489	6144	{
..	..	@@ -5493,8 +6148,9 @@
5493	6148	// usecalllists &= !(parent instanceof RandomNode);
5494	6149	// usecalllists = false;
5495	6150
5496		- if (GetBRep() != null)
5497		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5498	6154	//System.out.println("draw " + this);
5499	6155	//new Exception().printStackTrace();
5500	6156
..	..	@@ -5503,10 +6159,12 @@
5503	6159	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5504	6160
5505	6161	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5506		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6162	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6163	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5507	6164	{
5508	6165	Globals.lighttouched = true;
5509	6166	} // all panes...
	6167	+
5510	6168	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5511	6169	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5512	6170	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5514,7 +6172,7 @@
5514	6172	if (!(this instanceof Composite))
5515	6173	touched = false;
5516	6174	//if (displaylist == -1 && usecalllists)
5517		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5518	6176	{
5519	6177	bRep.displaylist = display.GenList();
5520	6178	assert(bRep.displaylist != 0);
..	..	@@ -5525,7 +6183,7 @@
5525	6183
5526	6184	//System.out.println("\tnew list " + list);
5527	6185	//gl.glDrawBuffer(gl.GL_NONE);
5528		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5529	6187	{
5530	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5531	6189	display.NewList(bRep.displaylist);
..	..	@@ -5534,7 +6192,7 @@
5534	6192	CallList(display, root, selected, blocked);
5535	6193
5536	6194	// compiled = true;
5537		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5538	6196	{
5539	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5540	6198	display.EndList();
..	..	@@ -5634,6 +6292,7 @@
5634	6292	if (GetBRep() != null)
5635	6293	{
5636	6294	display.NextIndex();
	6295	+
5637	6296	// vertex color conflict : gl.glCallList(list);
5638	6297	DrawNode(display, root, selected);
5639	6298	if (this instanceof BezierPatch)
..	..	@@ -5674,16 +6333,27 @@
5674	6333	tex = GetTextures();
5675	6334	}
5676	6335
5677		- boolean failed = false;
	6336	+ boolean failedPigment = false;
	6337	+ boolean failedBump = false;
5678	6338
5679	6339	try
5680	6340	{
5681		- display.BindTextures(tex, texres);
	6341	+ display.BindPigmentTexture(tex, texres);
5682	6342	}
5683	6343	catch (Exception e)
5684	6344	{
5685	6345	System.err.println("FAILED: " + this);
5686		- failed = true;
	6346	+ failedPigment = true;
	6347	+ }
	6348	+
	6349	+ try
	6350	+ {
	6351	+ display.BindBumpTexture(tex, texres);
	6352	+ }
	6353	+ catch (Exception e)
	6354	+ {
	6355	+ //System.err.println("FAILED: " + this);
	6356	+ failedBump = true;
5687	6357	}
5688	6358
5689	6359	if (!compiled)
..	..	@@ -5706,8 +6376,11 @@
5706	6376	}
5707	6377	}
5708	6378
5709		- if (!failed)
5710		- display.ReleaseTextures(tex);
	6379	+ if (!failedBump)
	6380	+ display.ReleaseBumpTexture(tex);
	6381	+
	6382	+ if (!failedPigment)
	6383	+ display.ReleasePigmentTexture(tex);
5711	6384
5712	6385	display.PopMaterial(this, selected);
5713	6386	}
..	..	@@ -6080,6 +6753,11 @@
6080	6753	// dec 2012
6081	6754	new Exception().printStackTrace();
6082	6755	return;
	6756	+ }
	6757	+
	6758	+ if (dontselect)
	6759	+ {
	6760	+ //bRep.GenerateNormalsMINE();
6083	6761	}
6084	6762
6085	6763	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6865,20 +7543,23 @@
6865	7543	}
6866	7544	}
6867	7545
6868		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7546	+ static ClickInfo clickInfo = new ClickInfo();
	7547	+
	7548	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7549	+ Point outPt, Rectangle outRec)
6869	7550	{
6870		- int hc = info.bounds.x + info.bounds.width / 2;
6871		- int vc = info.bounds.y + info.bounds.height / 2;
6872		- double[][] toscreen = info.toScreen;
	7551	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7552	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7553	+ double[][] toscreen = clickInfo.toScreen;
6873	7554	if (toscreen == null)
6874	7555	{
6875		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6876	7557	}
6877	7558	cVector vec = in;
6878	7559	LA.xformPos(in, toscreen, in);
6879	7560	//System.out.println("Distance = " + info.camera.Distance());
6880		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6881		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7561	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7562	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6882	7563	outPt.x = hc + (int) vec.x;
6883	7564	outPt.y = vc - (int) vec.y;
6884	7565	outRec.x = outPt.x - 3;
..	..	@@ -6886,15 +7567,18 @@
6886	7567	outRec.width = outRec.height = 6;
6887	7568	}
6888	7569
6889		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
6890	7572	{
6891	7573	Point pt = new Point(0, 0);
6892	7574	Rectangle rec = new Rectangle();
6893		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
6894	7577	return rec;
6895	7578	}
6896	7579
6897		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
6898	7582	{
6899	7583	if (level == 0)
6900	7584	{
..	..	@@ -6903,16 +7587,19 @@
6903	7587	{
6904	7588	cVector origin = new cVector();
6905	7589	//LA.xformPos(origin, toParent, origin);
6906		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6907	7594	Rectangle boundary = new Rectangle();
6908	7595	boundary.x = spot.x - 30;
6909	7596	boundary.y = spot.y - 30;
6910	7597	boundary.width = spot.width + 60;
6911	7598	boundary.height = spot.height + 60;
6912		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
6913	7600	int spotw = spot.x + spot.width;
6914	7601	int spoth = spot.y + spot.height;
6915		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6916	7603	// if (CameraPane.Xmin > spot.x)
6917	7604	// {
6918	7605	// CameraPane.Xmin = spot.x;
..	..	@@ -6929,11 +7616,33 @@
6929	7616	// {
6930	7617	// CameraPane.Ymax = spoth;
6931	7618	// }
6932		- spot.translate(32, 32);
	7619	+// if (CameraPane.Xmin > spot.x)
	7620	+// {
	7621	+// CameraPane.Xmin = spot.x;
	7622	+// }
	7623	+// if (CameraPane.Xmax < spotw)
	7624	+// {
	7625	+// CameraPane.Xmax = spotw;
	7626	+// }
	7627	+// if (CameraPane.Ymin > spot.y)
	7628	+// {
	7629	+// CameraPane.Ymin = spot.y;
	7630	+// }
	7631	+// if (CameraPane.Ymax < spoth)
	7632	+// {
	7633	+// CameraPane.Ymax = spoth;
	7634	+// }
	7635	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7636	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7637	+ spot.translate(32, 0);
	7638	+ clickInfo.g.setColor(Color.yellow);
	7639	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7640	+
	7641	+ spot.translate(32, 64);
6933	7642	spotw = spot.x + spot.width;
6934	7643	spoth = spot.y + spot.height;
6935		- info.g.setColor(Color.blue);
6936		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7644	+ clickInfo.g.setColor(Color.cyan);
	7645	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6937	7646	// if (CameraPane.Xmin > spot.x)
6938	7647	// {
6939	7648	// CameraPane.Xmin = spot.x;
..	..	@@ -6950,29 +7659,9 @@
6950	7659	// {
6951	7660	// CameraPane.Ymax = spoth;
6952	7661	// }
6953		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6955		- spot.translate(0, -32);
6956		- info.g.setColor(Color.green);
6957		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6958		-// if (CameraPane.Xmin > spot.x)
6959		-// {
6960		-// CameraPane.Xmin = spot.x;
6961		-// }
6962		-// if (CameraPane.Xmax < spotw)
6963		-// {
6964		-// CameraPane.Xmax = spotw;
6965		-// }
6966		-// if (CameraPane.Ymin > spot.y)
6967		-// {
6968		-// CameraPane.Ymin = spot.y;
6969		-// }
6970		-// if (CameraPane.Ymax < spoth)
6971		-// {
6972		-// CameraPane.Ymax = spoth;
6973		-// }
6974		- info.g.drawArc(boundary.x, boundary.y,
6975		- boundary.width, boundary.height, 0, 360);
	7662	+ clickInfo.g.setColor(Color.green);
	7663	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7664	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6976	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6977	7666	// if (CameraPane.Xmin > boundary.x)
6978	7667	// {
..	..	@@ -6994,7 +7683,8 @@
6994	7683	}
6995	7684	}
6996	7685
6997		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
6998	7688	{
6999	7689	if (level == 0)
7000	7690	{
..	..	@@ -7003,8 +7693,8 @@
7003	7693
7004	7694	boolean retval = false;
7005	7695
7006		- startX = info.x;
7007		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7008	7698
7009	7699	hitSomething = -1;
7010	7700	cVector origin = new cVector();
..	..	@@ -7014,22 +7704,53 @@
7014	7704	{
7015	7705	centerPt = new Point(0, 0);
7016	7706	}
7017		- calcHotSpot(origin, info, centerPt, spot);
7018		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7019	7710	{
7020	7711	hitSomething = hitCenter;
7021	7712	retval = true;
7022	7713	}
7023	7714	spot.translate(32, 0);
7024		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7025	7716	{
7026	7717	hitSomething = hitRotate;
7027	7718	retval = true;
7028	7719	}
7029	7720	spot.translate(0, 32);
7030		- if (spot.contains(info.x, info.y))
	7721	+ spot.translate(32, 0);
	7722	+ spot.translate(0, 32);
	7723	+ if (spot.contains(clickInfo.x, clickInfo.y))
7031	7724	{
7032	7725	hitSomething = hitScale;
	7726	+
	7727	+ double scale = 0.005f * clickInfo.camera.Distance();
	7728	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7729	+ double sign = 1;
	7730	+ if (hScale < 0)
	7731	+ {
	7732	+ sign = -1;
	7733	+ }
	7734	+ hScale = signMath.pow(signhScale, scale * 50);
	7735	+ if (hScale < 0.01)
	7736	+ {
	7737	+ //hScale = 0.01;
	7738	+ }
	7739	+
	7740	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7741	+ sign = 1;
	7742	+ if (vScale < 0)
	7743	+ {
	7744	+ sign = -1;
	7745	+ }
	7746	+ vScale = signMath.pow(signvScale, scale * 50);
	7747	+ if (vScale < 0.01)
	7748	+ {
	7749	+ //vScale = 0.01;
	7750	+ }
	7751	+
	7752	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7753	+
7033	7754	retval = true;
7034	7755	}
7035	7756
..	..	@@ -7039,7 +7760,7 @@
7039	7760	}
7040	7761
7041	7762	//System.out.println("info.modifiers = " + info.modifiers);
7042		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7043	7764	//System.out.println("modified = " + modified);
7044	7765	//new Exception().printStackTrace();
7045	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7067,7 +7788,8 @@
7067	7788	return true;
7068	7789	}
7069	7790
7070		- void doEditDrag0(ClickInfo info, boolean opposite)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7071	7793	{
7072	7794	if (hitSomething == 0)
7073	7795	{
..	..	@@ -7081,7 +7803,7 @@
7081	7803
7082	7804	//System.out.println("hitSomething = " + hitSomething);
7083	7805
7084		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
7085	7807
7086	7808	cVector xlate = new cVector();
7087	7809	//cVector xlate2 = new cVector();
..	..	@@ -7095,7 +7817,9 @@
7095	7817
7096	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7097	7819
7098		- if (modified \|\| opposite)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7099	7823	{
7100	7824	//assert(false);
7101	7825	/*
..	..	@@ -7115,8 +7839,8 @@
7115	7839	toParent[3][i] = xlate.get(i);
7116	7840	LA.matInvert(toParent, fromParent);
7117	7841	*/
7118		- cVector delta = LA.newVector(0, 0, startY - info.y);
7119		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7842	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7843	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7120	7844
7121	7845	LA.matCopy(startMat, toParent);
7122	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7125,7 +7849,7 @@
7125	7849	} else
7126	7850	{
7127	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7128		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7129	7853	cVector away = new cVector();
7130	7854	//cVector right2 = new cVector();
7131	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7142,19 +7866,19 @@
7142	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7143	7867	// if (!CameraPane.LOCALTRANSFORM)
7144	7868	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7145		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7146	7870	// if (!CameraPane.LOCALTRANSFORM)
7147	7871	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7148	7872	//LA.vecCross(up, cVector.Z, right2);
7149	7873
7150		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7151	7875
7152	7876	//System.out.println("DELTA0 = " + delta);
7153	7877	//System.out.println("AWAY = " + info.camera.away);
7154	7878	//System.out.println("UP = " + info.camera.up);
7155	7879	if (away.z > 0)
7156	7880	{
7157		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7158	7882	{
7159	7883	delta.x = -delta.x;
7160	7884	} else
..	..	@@ -7169,7 +7893,7 @@
7169	7893	//System.out.println("DELTA1 = " + delta);
7170	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7171	7895	//System.out.println("DELTA2 = " + delta);
7172		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7173	7897	LA.matCopy(startMat, toParent);
7174	7898	//System.out.println("DELTA3 = " + delta);
7175	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7179,8 +7903,8 @@
7179	7903	break;
7180	7904
7181	7905	case hitRotate: // rotate
7182		- int dx = info.x - centerPt.x;
7183		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7184	7908	double angle = (double) Math.atan2(dx, dy);
7185	7909	angle = -(1.570796 - angle);
7186	7910
..	..	@@ -7189,7 +7913,7 @@
7189	7913
7190	7914	if (modified)
7191	7915	{
7192		- // Rotate 90 degrees
	7916	+ // Rotate 45 degrees
7193	7917	angle /= (Math.PI / 4);
7194	7918	angle = Math.floor(angle + 0.5);
7195	7919	angle *= (Math.PI / 4);
..	..	@@ -7203,7 +7927,7 @@
7203	7927	}
7204	7928	/**/
7205	7929
7206		- switch (info.pane.RenderCamera().viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7207	7931	{
7208	7932	case 1: // '\001'
7209	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7230,7 +7954,7 @@
7230	7954	break;
7231	7955
7232	7956	case hitScale: // scale
7233		- double hScale = (double) (info.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7234	7958	double sign = 1;
7235	7959	if (hScale < 0)
7236	7960	{
..	..	@@ -7242,7 +7966,7 @@
7242	7966	//hScale = 0.01;
7243	7967	}
7244	7968
7245		- double vScale = (double) (info.y - centerPt.y) / 32;
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7246	7970	sign = 1;
7247	7971	if (vScale < 0)
7248	7972	{
..	..	@@ -7253,6 +7977,7 @@
7253	7977	{
7254	7978	//vScale = 0.01;
7255	7979	}
	7980	+
7256	7981	LA.matCopy(startMat, toParent);
7257	7982	/**/
7258	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7262,32 +7987,39 @@
7262	7987	}
7263	7988	/**/
7264	7989
7265		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7990	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7266	7991
7267	7992	if (totalScale < 0.01)
7268	7993	{
7269	7994	totalScale = 0.01;
7270	7995	}
7271	7996
7272		- switch (info.pane.RenderCamera().viewCode)
	7997	+ switch (clickInfo.pane.RenderCamera().viewCode)
7273	7998	{
7274	7999	case 3: // '\001'
7275		- if (modified)
	8000	+ if (modified \|\| opposite)
7276	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7277	8005	//LA.matScale(toParent, 1, hScale, vScale);
7278		- LA.matScale(toParent, totalScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7279	8007	} // vScale, 1);
7280	8008	else
7281	8009	{
7282		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8010	+ // EXCEPTION!
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7283	8012	} // vScale, 1);
7284	8013	break;
7285	8014
7286	8015	case 2: // '\002'
7287		- if (modified)
	8016	+ if (modified \|\| opposite)
7288	8017	{
7289		- //LA.matScale(toParent, hScale, 1, vScale);
7290		- LA.matScale(toParent, 1, totalScale, 1);
	8018	+ if (modified) // && opposite)
	8019	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8020	+ else
	8021	+ //LA.matScale(toParent, hScale, 1, vScale);
	8022	+ LA.matScale(toParent, 1, totalScale, 1);
7291	8023	} else
7292	8024	{
7293	8025	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7295,10 +8027,13 @@
7295	8027	break;
7296	8028
7297	8029	case 1: // '\003'
7298		- if (modified)
	8030	+ if (modified \|\| opposite)
7299	8031	{
7300		- //LA.matScale(toParent, hScale, vScale, 1);
7301		- LA.matScale(toParent, 1, 1, totalScale);
	8032	+ if (modified) // && opposite)
	8033	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8034	+ else
	8035	+ //LA.matScale(toParent, hScale, vScale, 1);
	8036	+ LA.matScale(toParent, 1, 1, totalScale);
7302	8037	} else
7303	8038	{
7304	8039	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7335,7 +8070,7 @@
7335	8070	} // NEW ...
7336	8071
7337	8072
7338		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7339	8074	}
7340	8075
7341	8076	boolean overflow = false;
..	..	@@ -7446,10 +8181,10 @@
7446	8181	} // + super.toString();
7447	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7448	8183
7449		- if (!Globals.ADVANCED)
7450		- return objname;
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
7451	8186
7452		- return objname + " " + System.identityHashCode(this);
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7453	8188	}
7454	8189
7455	8190	public int hashCode()
..	..	@@ -7515,6 +8250,10 @@
7515	8250	editWindow = null;
7516	8251	} // ?
7517	8252	}
	8253	+ else
	8254	+ {
	8255	+ //editWindow.closeUI();
	8256	+ }
7518	8257	}
7519	8258
7520	8259	boolean root; // patch for edit windows
..	..	@@ -7526,7 +8265,7 @@
7526	8265	/transient/ cVector2[] projectedVertices = new cVector2[0];
7527	8266
7528	8267	Object3D /Composite/ parent;
7529		- Object3D /Composite/ fileparent;
	8268	+ Object3D /Composite/ fileparent; // In the case of FileObject
7530	8269
7531	8270	double[][] toParent; // dynamic matrix
7532	8271	double[][] fromParent;
..	..	@@ -7672,6 +8411,10 @@
7672	8411	}
7673	8412
7674	8413	transient ObjEditor editWindow;
	8414	+ transient ObjEditor manipWindow;
	8415	+
	8416	+ transient boolean pinned;
	8417	+
7675	8418	transient ObjectUI objectUI;
7676	8419	public static int povDepth = 0;
7677	8420	private static cVector tbMin = new cVector();