~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,10 +22,37 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	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>();
26	40
27	41	ScriptNode scriptnode;
28	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	+
29	56	void InitOthers()
30	57	{
31	58	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -104,125 +131,245 @@
104	131
105	132	// transient boolean reduced; // for morph reduction
106	133
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-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
109	136
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	137	+ transient Object3D transientsupport; // for cloning
	138	+ transient boolean transientlink2master;
112	139
113		-void SaveSupports()
114		-{
115		- if (blockloop)
116		- return;
117		-
118		- transientsupport = support;
119		- transientlink2master = link2master;
120		-
121		- support = null;
122		- link2master = false;
123		-
124		- if (bRep != null)
	140	+ void SaveSupports()
125	141	{
126		- 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	+ }
127	165	}
128		-
129		- for (int i = 0; i < Size(); i++)
	166	+
	167	+ void RestoreSupports()
130	168	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- 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	+
134	300	blockloop = true;
135		- child.SaveSupports();
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
136	307	blockloop = false;
137	308	}
138		-}
139	309
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
144	314
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
151		- {
152		- bRep.RestoreSupports();
153		- }
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160	315	blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165	316
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
	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)
169	333	{
	334	+ if (!hashtable.containsKey(GetUUID()))
	335	+ return;
	336	+
170	337	Object3D o = hashtable.get(GetUUID());
171	338
172		- assert(this.bRep == o.bRep);
173		- if (this.bRep != null)
174		- assert(this.bRep.support == o.transientrep);
175		-
176		- return;
177		- }
178		-
179		- Object3D o = new Object3D();
180		- o.bRep = this.bRep;
181		- if (this.bRep != null)
182		- {
183		- o.transientrep = this.bRep.support;
184		- o.bRep.support = null;
185		- }
186		-
187		-// o.support = this.support;
188		-// o.fileparent = this.fileparent;
189		-// if (this.bRep != null)
190		-// o.bRep = this.bRep.support;
191		-
192		- hashtable.put(GetUUID(), o);
193		-
194		- this.bRep = null;
195		-// if (this.bRep != null)
196		-// this.bRep.support = null;
197		-// this.support = null;
198		-// this.fileparent = null;
199		-
200		- for (int i=0; i<Size(); i++)
201		- {
202		- get(i).ExtractBigData(hashtable);
203		- }
204		-}
	339	+ RestoreBigData(o);
205	340
206		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
207		-{
208		- if (!hashtable.containsKey(GetUUID()))
209		- return;
210		-
211		- Object3D o = hashtable.get(GetUUID());
212		-
213		- this.bRep = o.bRep;
214		- if (this.bRep != null)
215		- this.bRep.support = o.transientrep;
216		-// this.support = o.support;
217		-// this.fileparent = o.fileparent;
218		-
219		- hashtable.remove(GetUUID());
220		-
221		- for (int i=0; i<Size(); i++)
222		- {
223		- get(i).RestoreBigData(hashtable);
	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	+
	353	+ blockloop = false;
224	354	}
225		-}
	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	+ }
226	373
227	374	// MOCAP SUPPORT
228	375	double tx,ty,tz,rx,ry,rz;
..	..	@@ -365,6 +512,7 @@
365	512	}
366	513
367	514	boolean live = false;
	515	+ transient boolean keepdontselect;
368	516	boolean dontselect = false;
369	517	boolean hide = false;
370	518	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -433,11 +581,11 @@
433	581	}
434	582	}
435	583
436		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
437	585
438	586	int MemorySize()
439	587	{
440		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
441	589	{
442	590	try
443	591	{
..	..	@@ -547,12 +695,14 @@
547	695	toParent = LA.newMatrix();
548	696	fromParent = LA.newMatrix();
549	697	}
	698	+
550	699	if (toParentMarked == null)
551	700	{
552	701	if (maxcount != 1)
553	702	{
554		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
555	704	}
	705	+
556	706	toParentMarked = LA.newMatrix();
557	707	fromParentMarked = LA.newMatrix();
558	708	}
..	..	@@ -863,7 +1013,7 @@
863	1013
864	1014	if (marked && Globals.isLIVE() && live &&
865	1015	//TEMP21aug2018
866		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1016	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
867	1017	currentframe != Globals.framecount)
868	1018	{
869	1019	currentframe = Globals.framecount;
..	..	@@ -875,7 +1025,8 @@
875	1025
876	1026	boolean changedir = random && Math.random() < 0.01; // && !link2master;
877	1027
878		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1028	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1029	+ (step == 1 && changedir))
879	1030	{
880	1031	countdown = 1;
881	1032	delay = speedup?8:1;
..	..	@@ -947,6 +1098,10 @@
947	1098	if (material == null \|\| material.multiply)
948	1099	return true;
949	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.
950	1105	return material.opacity > 0.99;
951	1106	}
952	1107
..	..	@@ -1347,6 +1502,7 @@
1347	1502	toParent = LA.newMatrix();
1348	1503	fromParent = LA.newMatrix();
1349	1504	}
	1505	+
1350	1506	LA.matCopy(other.toParent, toParent);
1351	1507	LA.matCopy(other.fromParent, fromParent);
1352	1508
..	..	@@ -2226,11 +2382,6 @@
2226	2382
2227	2383	InitOthers();
2228	2384
2229		- if (this instanceof Camera)
2230		- {
2231		- material.shift = 90;
2232		- }
2233		-
2234	2385	material.multiply = multiply;
2235	2386
2236	2387	if (multiply)
..	..	@@ -2368,6 +2519,15 @@
2368	2519	}
2369	2520	*/
2370	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	+ }
2371	2531	}
2372	2532
2373	2533	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2569,14 @@
2409	2569	{
2410	2570	editWindow.refreshContents();
2411	2571	}
	2572	+ else
	2573	+ {
	2574	+ if (manipWindow != null)
	2575	+ {
	2576	+ manipWindow.refreshContents();
	2577	+ }
	2578	+ }
	2579	+
2412	2580	//if (parent != null)
2413	2581	//parent.refreshEditWindow();
2414	2582	}
..	..	@@ -2488,7 +2656,8 @@
2488	2656	private static final int editSelf = 1;
2489	2657	private static final int editChild = 2;
2490	2658
2491		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2492	2661	{
2493	2662	if (level == 0)
2494	2663	{
..	..	@@ -2496,7 +2665,8 @@
2496	2665	return;
2497	2666
2498	2667	Object3D selectee;
2499		- 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))
2500	2670	{
2501	2671	selectee = (Object3D) e.nextElement();
2502	2672	}
..	..	@@ -2504,19 +2674,22 @@
2504	2674	} else
2505	2675	{
2506	2676	//super.
2507		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2508	2679	}
2509	2680	}
2510	2681
2511		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2512	2684	{
2513	2685	doSomething = 0;
2514	2686	if (level == 0)
2515	2687	{
2516		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2517	2689	}
2518	2690	if (//super.
2519		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2520	2693	{
2521	2694	doSomething = 1;
2522	2695	return true;
..	..	@@ -2526,7 +2699,7 @@
2526	2699	}
2527	2700	}
2528	2701
2529		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2530	2703	{
2531	2704	if (selection == null)
2532	2705	{
..	..	@@ -2539,7 +2712,8 @@
2539	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2713	{
2541	2714	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2543	2717	{
2544	2718	childToDrag = selectee;
2545	2719	doSomething = 2;
..	..	@@ -2551,13 +2725,15 @@
2551	2725	return retval;
2552	2726	}
2553	2727
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2555	2730	{
2556	2731	switch (doSomething)
2557	2732	{
2558	2733	case 1: // '\001'
2559	2734	//super.
2560		- doEditDrag0(info, opposite);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2561	2737	break;
2562	2738
2563	2739	case 2: // '\002'
..	..	@@ -2570,11 +2746,13 @@
2570	2746	{
2571	2747	//sel.hitSomething = childToDrag.hitSomething;
2572	2748	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2574	2751	} else
2575	2752	{
2576	2753	//super.
2577		- doEditDrag0(info, opposite);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2578	2756	}
2579	2757	}
2580	2758	break;
..	..	@@ -2592,6 +2770,9 @@
2592	2770	{
2593	2771	deselectAll();
2594	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2595	2776	ClickInfo newInfo = new ClickInfo();
2596	2777	newInfo.flags = info.flags;
2597	2778	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2865,18 @@
2684	2865	void GenNormalsS(boolean crease)
2685	2866	{
2686	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();
2687	2880	// for (int i=0; i<selection.size(); i++)
2688	2881	// {
2689	2882	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +3017,24 @@
2824	3017	if (child == null)
2825	3018	continue;
2826	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();
2827	3038	// Children().release(i);
2828	3039	}
2829	3040	blockloop = false;
..	..	@@ -2996,11 +3207,20 @@
2996	3207	}
2997	3208	}
2998	3209
	3210	+ void GenNormalsMesh0()
	3211	+ {
	3212	+ if (bRep != null)
	3213	+ {
	3214	+ bRep.GenerateNormalsMesh();
	3215	+ Touch();
	3216	+ }
	3217	+ }
	3218	+
2999	3219	void GenNormalsMINE0()
3000	3220	{
3001	3221	if (bRep != null)
3002	3222	{
3003		- bRep.GenerateNormalsMINE();
	3223	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3224	Touch();
3005	3225	}
3006	3226	}
..	..	@@ -3057,6 +3277,93 @@
3057	3277	blockloop = false;
3058	3278	}
3059	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	+
3060	3367	void TransformChildren()
3061	3368	{
3062	3369	if (toParent != null)
..	..	@@ -3410,15 +3717,47 @@
3410	3717
3411	3718	void ClearMaterials()
3412	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3413	3725	ClearMaterial();
3414		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3415	3727	{
3416		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3417	3729	if (child == null)
3418	3730	continue;
3419	3731	child.ClearMaterials();
3420		- release(i);
3421	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;
3422	3761	}
3423	3762
3424	3763	void FlipV(boolean flip)
..	..	@@ -3446,7 +3785,8 @@
3446	3785	if (blockloop)
3447	3786	return;
3448	3787
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3788	+ if (//marked \|\| // does not make sense
	3789	+ (bRep != null \|\| material != null)) // borderline...
3450	3790	live = h;
3451	3791
3452	3792	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3807,8 @@
3467	3807	return;
3468	3808
3469	3809	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3810	+ if (//marked \|\| // does not make sense
	3811	+ (bRep != null \|\| material != null)) // borderline...
3471	3812	link2master = h;
3472	3813
3473	3814	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3828,8 @@
3487	3828	if (blockloop)
3488	3829	return;
3489	3830
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3831	+ if (//marked \|\| // does not make sense
	3832	+ (bRep != null \|\| material != null)) // borderline...
3491	3833	hide = h;
3492	3834
3493	3835	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3849,7 @@
3507	3849	if (blockloop)
3508	3850	return;
3509	3851
3510		- if (bRep != null && material != null) // borderline...
	3852	+ if (bRep != null \|\| material != null) // borderline...
3511	3853	marked = h;
3512	3854
3513	3855	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3859,46 @@
3517	3859	continue;
3518	3860	blockloop = true;
3519	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);
3520	3902	blockloop = false;
3521	3903	// release(i);
3522	3904	}
..	..	@@ -4294,6 +4676,55 @@
4294	4676	}
4295	4677	}
4296	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	+
4297	4728	void RepairTexture()
4298	4729	{
4299	4730	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5239,14 @@
4808	5239	}
4809	5240	}
4810	5241
	5242	+ ObjEditor GetWindow()
	5243	+ {
	5244	+ if (editWindow != null)
	5245	+ return editWindow;
	5246	+
	5247	+ return manipWindow;
	5248	+ }
	5249	+
4811	5250	cTreePath Select(int indexcount, boolean deselect)
4812	5251	{
4813	5252	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5283,11 @@
4844	5283	if (leaf != null)
4845	5284	{
4846	5285	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5286	+ ObjEditor window = GetWindow();
	5287	+ if (window != null)
4848	5288	{
4849	5289	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5290	+ window.Select(tp, deselect, true);
4851	5291	}
4852	5292
4853	5293	return tp;
..	..	@@ -4864,6 +5304,7 @@
4864	5304
4865	5305	if (child == null)
4866	5306	continue;
	5307	+
4867	5308	if (child.HasTransparency() && child.size() != 0)
4868	5309	{
4869	5310	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5314,10 @@
4873	5314	if (leaf != null)
4874	5315	{
4875	5316	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5317	+ ObjEditor window = GetWindow();
	5318	+ if (window != null)
4877	5319	{
4878		- editWindow.Select(tp, deselect, true);
	5320	+ window.Select(tp, deselect, true);
4879	5321	}
4880	5322
4881	5323	return tp;
..	..	@@ -5200,6 +5642,51 @@
5200	5642	blockloop = false;
5201	5643	}
5202	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	+
5203	5690	boolean IsSelected()
5204	5691	{
5205	5692	if (parent == null)
..	..	@@ -5260,6 +5747,11 @@
5260	5747	if (fullname == null)
5261	5748	return "";
5262	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5263	5755	// System.out.println("Fullname = " + fullname);
5264	5756
5265	5757	// Does not work on Windows due to C:
..	..	@@ -5272,7 +5764,7 @@
5272	5764
5273	5765	if (split.length == 0)
5274	5766	{
5275		- return "";
	5767	+ return fullname.pigment = "";
5276	5768	}
5277	5769
5278	5770	if (split.length <= 2)
..	..	@@ -5280,22 +5772,27 @@
5280	5772	if (fullname.name.endsWith(":"))
5281	5773	{
5282	5774	// Windows
5283		- return fullname.name.substring(0, fullname.name.length()-1);
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5284	5776	}
5285	5777
5286		- return split[0];
	5778	+ return fullname.pigment = split[0];
5287	5779	}
5288	5780
5289	5781	// Windows
5290	5782	assert(split.length == 4);
5291	5783
5292		- return split[0] + ":" + split[1];
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5293	5785	}
5294	5786
5295	5787	static String GetBump(cTexture fullname)
5296	5788	{
5297	5789	if (fullname == null)
5298	5790	return "";
	5791	+
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
5299	5796
5300	5797	// System.out.println("Fullname = " + fullname);
5301	5798	// Does not work on Windows due to C:
..	..	@@ -5307,12 +5804,12 @@
5307	5804
5308	5805	if (split.length == 0)
5309	5806	{
5310		- return "";
	5807	+ return fullname.bump = "";
5311	5808	}
5312	5809
5313	5810	if (split.length == 1)
5314	5811	{
5315		- return "";
	5812	+ return fullname.bump = "";
5316	5813	}
5317	5814
5318	5815	if (split.length == 2)
..	..	@@ -5320,16 +5817,16 @@
5320	5817	if (fullname.name.endsWith(":"))
5321	5818	{
5322	5819	// Windows
5323		- return "";
	5820	+ return fullname.bump = "";
5324	5821	}
5325	5822
5326		- return split[1];
	5823	+ return fullname.bump = split[1];
5327	5824	}
5328	5825
5329	5826	// Windows
5330	5827	assert(split.length == 4);
5331	5828
5332		- return split[2] + ":" + split[3];
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5333	5830	}
5334	5831
5335	5832	String GetPigmentTexture()
..	..	@@ -5412,6 +5909,9 @@
5412	5909	texname = "";
5413	5910
5414	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5415	5915	Touch();
5416	5916	}
5417	5917
..	..	@@ -5485,6 +5985,8 @@
5485	5985
5486	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5487	5987
	5988	+ GetTextures().bump = null;
	5989	+
5488	5990	Touch();
5489	5991	}
5490	5992
..	..	@@ -5509,6 +6011,38 @@
5509	6011	}
5510	6012	}
5511	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	+
5512	6046	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	6047	{
5514	6048	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +6051,28 @@
5517	6051	boolean NeedSupport()
5518	6052	{
5519	6053	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	6054	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	6055	// PROBLEM with CROWD!!
5522	6056	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	6057	}
5524	6058
5525	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	+ }
5526	6076
5527	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	6078	{
..	..	@@ -5584,8 +6134,11 @@
5584	6134	if (support != null)
5585	6135	support = support;
5586	6136
5587		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5588		- 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.
5589	6142
5590	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	6144	{
..	..	@@ -5595,8 +6148,9 @@
5595	6148	// usecalllists &= !(parent instanceof RandomNode);
5596	6149	// usecalllists = false;
5597	6150
5598		- if (GetBRep() != null)
5599		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5600	6154	//System.out.println("draw " + this);
5601	6155	//new Exception().printStackTrace();
5602	6156
..	..	@@ -5605,10 +6159,12 @@
5605	6159	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	6160
5607	6161	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (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)))
5609	6164	{
5610	6165	Globals.lighttouched = true;
5611	6166	} // all panes...
	6167	+
5612	6168	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	6169	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	6170	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5616,7 +6172,7 @@
5616	6172	if (!(this instanceof Composite))
5617	6173	touched = false;
5618	6174	//if (displaylist == -1 && usecalllists)
5619		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5620	6176	{
5621	6177	bRep.displaylist = display.GenList();
5622	6178	assert(bRep.displaylist != 0);
..	..	@@ -5627,7 +6183,7 @@
5627	6183
5628	6184	//System.out.println("\tnew list " + list);
5629	6185	//gl.glDrawBuffer(gl.GL_NONE);
5630		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5631	6187	{
5632	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5633	6189	display.NewList(bRep.displaylist);
..	..	@@ -5636,7 +6192,7 @@
5636	6192	CallList(display, root, selected, blocked);
5637	6193
5638	6194	// compiled = true;
5639		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5640	6196	{
5641	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5642	6198	display.EndList();
..	..	@@ -5736,6 +6292,7 @@
5736	6292	if (GetBRep() != null)
5737	6293	{
5738	6294	display.NextIndex();
	6295	+
5739	6296	// vertex color conflict : gl.glCallList(list);
5740	6297	DrawNode(display, root, selected);
5741	6298	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6333,27 @@
5776	6333	tex = GetTextures();
5777	6334	}
5778	6335
5779		- boolean failed = false;
	6336	+ boolean failedPigment = false;
	6337	+ boolean failedBump = false;
5780	6338
5781	6339	try
5782	6340	{
5783		- display.BindTextures(tex, texres);
	6341	+ display.BindPigmentTexture(tex, texres);
5784	6342	}
5785	6343	catch (Exception e)
5786	6344	{
5787	6345	System.err.println("FAILED: " + this);
5788		- 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;
5789	6357	}
5790	6358
5791	6359	if (!compiled)
..	..	@@ -5808,8 +6376,11 @@
5808	6376	}
5809	6377	}
5810	6378
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6379	+ if (!failedBump)
	6380	+ display.ReleaseBumpTexture(tex);
	6381	+
	6382	+ if (!failedPigment)
	6383	+ display.ReleasePigmentTexture(tex);
5813	6384
5814	6385	display.PopMaterial(this, selected);
5815	6386	}
..	..	@@ -6182,6 +6753,11 @@
6182	6753	// dec 2012
6183	6754	new Exception().printStackTrace();
6184	6755	return;
	6756	+ }
	6757	+
	6758	+ if (dontselect)
	6759	+ {
	6760	+ //bRep.GenerateNormalsMINE();
6185	6761	}
6186	6762
6187	6763	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7543,23 @@
6967	7543	}
6968	7544	}
6969	7545
6970		- 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)
6971	7550	{
6972		- int hc = info.bounds.x + info.bounds.width / 2;
6973		- int vc = info.bounds.y + info.bounds.height / 2;
6974		- 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;
6975	7554	if (toscreen == null)
6976	7555	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7557	}
6979	7558	cVector vec = in;
6980	7559	LA.xformPos(in, toscreen, in);
6981	7560	//System.out.println("Distance = " + info.camera.Distance());
6982		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6983		- 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();
6984	7563	outPt.x = hc + (int) vec.x;
6985	7564	outPt.y = vc - (int) vec.y;
6986	7565	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7567,18 @@
6988	7567	outRec.width = outRec.height = 6;
6989	7568	}
6990	7569
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
6992	7572	{
6993	7573	Point pt = new Point(0, 0);
6994	7574	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
6996	7577	return rec;
6997	7578	}
6998	7579
6999		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
7000	7582	{
7001	7583	if (level == 0)
7002	7584	{
..	..	@@ -7005,16 +7587,19 @@
7005	7587	{
7006	7588	cVector origin = new cVector();
7007	7589	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7594	Rectangle boundary = new Rectangle();
7010	7595	boundary.x = spot.x - 30;
7011	7596	boundary.y = spot.y - 30;
7012	7597	boundary.width = spot.width + 60;
7013	7598	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
7015	7600	int spotw = spot.x + spot.width;
7016	7601	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7603	// if (CameraPane.Xmin > spot.x)
7019	7604	// {
7020	7605	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,11 +7616,33 @@
7031	7616	// {
7032	7617	// CameraPane.Ymax = spoth;
7033	7618	// }
7034		- 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);
7035	7642	spotw = spot.x + spot.width;
7036	7643	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- 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);
7039	7646	// if (CameraPane.Xmin > spot.x)
7040	7647	// {
7041	7648	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,29 +7659,9 @@
7052	7659	// {
7053	7660	// CameraPane.Ymax = spoth;
7054	7661	// }
7055		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7057		- spot.translate(0, -32);
7058		- info.g.setColor(Color.green);
7059		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7060		-// if (CameraPane.Xmin > spot.x)
7061		-// {
7062		-// CameraPane.Xmin = spot.x;
7063		-// }
7064		-// if (CameraPane.Xmax < spotw)
7065		-// {
7066		-// CameraPane.Xmax = spotw;
7067		-// }
7068		-// if (CameraPane.Ymin > spot.y)
7069		-// {
7070		-// CameraPane.Ymin = spot.y;
7071		-// }
7072		-// if (CameraPane.Ymax < spoth)
7073		-// {
7074		-// CameraPane.Ymax = spoth;
7075		-// }
7076		- info.g.drawArc(boundary.x, boundary.y,
7077		- 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);
7078	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7666	// if (CameraPane.Xmin > boundary.x)
7080	7667	// {
..	..	@@ -7096,7 +7683,8 @@
7096	7683	}
7097	7684	}
7098	7685
7099		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
7100	7688	{
7101	7689	if (level == 0)
7102	7690	{
..	..	@@ -7105,8 +7693,8 @@
7105	7693
7106	7694	boolean retval = false;
7107	7695
7108		- startX = info.x;
7109		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7110	7698
7111	7699	hitSomething = -1;
7112	7700	cVector origin = new cVector();
..	..	@@ -7116,22 +7704,53 @@
7116	7704	{
7117	7705	centerPt = new Point(0, 0);
7118	7706	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7710	{
7122	7711	hitSomething = hitCenter;
7123	7712	retval = true;
7124	7713	}
7125	7714	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7716	{
7128	7717	hitSomething = hitRotate;
7129	7718	retval = true;
7130	7719	}
7131	7720	spot.translate(0, 32);
7132		- 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))
7133	7724	{
7134	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	+
7135	7754	retval = true;
7136	7755	}
7137	7756
..	..	@@ -7141,7 +7760,7 @@
7141	7760	}
7142	7761
7143	7762	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7764	//System.out.println("modified = " + modified);
7146	7765	//new Exception().printStackTrace();
7147	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7788,8 @@
7169	7788	return true;
7170	7789	}
7171	7790
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7173	7793	{
7174	7794	if (hitSomething == 0)
7175	7795	{
..	..	@@ -7183,7 +7803,7 @@
7183	7803
7184	7804	//System.out.println("hitSomething = " + hitSomething);
7185	7805
7186		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7807
7188	7808	cVector xlate = new cVector();
7189	7809	//cVector xlate2 = new cVector();
..	..	@@ -7197,7 +7817,9 @@
7197	7817
7198	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7199	7819
7200		- if (modified \|\| opposite)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7201	7823	{
7202	7824	//assert(false);
7203	7825	/*
..	..	@@ -7217,8 +7839,8 @@
7217	7839	toParent[3][i] = xlate.get(i);
7218	7840	LA.matInvert(toParent, fromParent);
7219	7841	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- 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);
7222	7844
7223	7845	LA.matCopy(startMat, toParent);
7224	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7849,7 @@
7227	7849	} else
7228	7850	{
7229	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7231	7853	cVector away = new cVector();
7232	7854	//cVector right2 = new cVector();
7233	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7866,19 @@
7244	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7867	// if (!CameraPane.LOCALTRANSFORM)
7246	7868	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7870	// if (!CameraPane.LOCALTRANSFORM)
7249	7871	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7872	//LA.vecCross(up, cVector.Z, right2);
7251	7873
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7875
7254	7876	//System.out.println("DELTA0 = " + delta);
7255	7877	//System.out.println("AWAY = " + info.camera.away);
7256	7878	//System.out.println("UP = " + info.camera.up);
7257	7879	if (away.z > 0)
7258	7880	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7882	{
7261	7883	delta.x = -delta.x;
7262	7884	} else
..	..	@@ -7271,7 +7893,7 @@
7271	7893	//System.out.println("DELTA1 = " + delta);
7272	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7895	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7897	LA.matCopy(startMat, toParent);
7276	7898	//System.out.println("DELTA3 = " + delta);
7277	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7903,8 @@
7281	7903	break;
7282	7904
7283	7905	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7286	7908	double angle = (double) Math.atan2(dx, dy);
7287	7909	angle = -(1.570796 - angle);
7288	7910
..	..	@@ -7291,7 +7913,7 @@
7291	7913
7292	7914	if (modified)
7293	7915	{
7294		- // Rotate 90 degrees
	7916	+ // Rotate 45 degrees
7295	7917	angle /= (Math.PI / 4);
7296	7918	angle = Math.floor(angle + 0.5);
7297	7919	angle *= (Math.PI / 4);
..	..	@@ -7305,7 +7927,7 @@
7305	7927	}
7306	7928	/**/
7307	7929
7308		- switch (info.pane.RenderCamera().viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7931	{
7310	7932	case 1: // '\001'
7311	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7954,7 @@
7332	7954	break;
7333	7955
7334	7956	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7336	7958	double sign = 1;
7337	7959	if (hScale < 0)
7338	7960	{
..	..	@@ -7344,7 +7966,7 @@
7344	7966	//hScale = 0.01;
7345	7967	}
7346	7968
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7348	7970	sign = 1;
7349	7971	if (vScale < 0)
7350	7972	{
..	..	@@ -7355,6 +7977,7 @@
7355	7977	{
7356	7978	//vScale = 0.01;
7357	7979	}
	7980	+
7358	7981	LA.matCopy(startMat, toParent);
7359	7982	/**/
7360	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7364,32 +7987,39 @@
7364	7987	}
7365	7988	/**/
7366	7989
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7990	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7991
7369	7992	if (totalScale < 0.01)
7370	7993	{
7371	7994	totalScale = 0.01;
7372	7995	}
7373	7996
7374		- switch (info.pane.RenderCamera().viewCode)
	7997	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7998	{
7376	7999	case 3: // '\001'
7377		- if (modified)
	8000	+ if (modified \|\| opposite)
7378	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7379	8005	//LA.matScale(toParent, 1, hScale, vScale);
7380		- LA.matScale(toParent, totalScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7381	8007	} // vScale, 1);
7382	8008	else
7383	8009	{
7384		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8010	+ // EXCEPTION!
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7385	8012	} // vScale, 1);
7386	8013	break;
7387	8014
7388	8015	case 2: // '\002'
7389		- if (modified)
	8016	+ if (modified \|\| opposite)
7390	8017	{
7391		- //LA.matScale(toParent, hScale, 1, vScale);
7392		- 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);
7393	8023	} else
7394	8024	{
7395	8025	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7397,10 +8027,13 @@
7397	8027	break;
7398	8028
7399	8029	case 1: // '\003'
7400		- if (modified)
	8030	+ if (modified \|\| opposite)
7401	8031	{
7402		- //LA.matScale(toParent, hScale, vScale, 1);
7403		- 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);
7404	8037	} else
7405	8038	{
7406	8039	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7437,7 +8070,7 @@
7437	8070	} // NEW ...
7438	8071
7439	8072
7440		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7441	8074	}
7442	8075
7443	8076	boolean overflow = false;
..	..	@@ -7548,10 +8181,10 @@
7548	8181	} // + super.toString();
7549	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7550	8183
7551		- if (!Globals.ADVANCED)
7552		- return objname;
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
7553	8186
7554		- return objname + " " + System.identityHashCode(this);
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7555	8188	}
7556	8189
7557	8190	public int hashCode()
..	..	@@ -7616,6 +8249,10 @@
7616	8249	{
7617	8250	editWindow = null;
7618	8251	} // ?
	8252	+ }
	8253	+ else
	8254	+ {
	8255	+ //editWindow.closeUI();
7619	8256	}
7620	8257	}
7621	8258
..	..	@@ -7774,6 +8411,10 @@
7774	8411	}
7775	8412
7776	8413	transient ObjEditor editWindow;
	8414	+ transient ObjEditor manipWindow;
	8415	+
	8416	+ transient boolean pinned;
	8417	+
7777	8418	transient ObjectUI objectUI;
7778	8419	public static int povDepth = 0;
7779	8420	private static cVector tbMin = new cVector();