~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,7 +22,21 @@
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
..	..	@@ -104,117 +118,245 @@
104	118
105	119	// transient boolean reduced; // for morph reduction
106	120
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	123
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
112	126
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)
	127	+ void SaveSupports()
125	128	{
126		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
127	152	}
128		-
129		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
130	155	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
134	287	blockloop = true;
135		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
136	294	blockloop = false;
137	295	}
138		-}
139	296
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
144	301
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	302	blockloop = true;
161		- child.RestoreSupports();
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
162	340	blockloop = false;
163	341	}
164		-}
165	342
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
169		- return;
170		-
171		- Object3D o = new Object3D();
172		- o.bRep = this.bRep;
173		- if (this.bRep != null)
	343	+ void RestoreBigData(Object3D o)
174	344	{
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
177	359	}
178		-
179		-// o.support = this.support;
180		-// o.fileparent = this.fileparent;
181		-// if (this.bRep != null)
182		-// o.bRep = this.bRep.support;
183		-
184		- hashtable.put(GetUUID(), o);
185		-
186		- this.bRep = null;
187		-// if (this.bRep != null)
188		-// this.bRep.support = null;
189		-// this.support = null;
190		-// this.fileparent = null;
191		-
192		- for (int i=0; i<Size(); i++)
193		- {
194		- get(i).ExtractBigData(hashtable);
195		- }
196		-}
197		-
198		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199		-{
200		- if (!hashtable.containsKey(GetUUID()))
201		- return;
202		-
203		- Object3D o = hashtable.get(GetUUID());
204		-
205		- this.bRep = o.bRep;
206		- if (this.bRep != null)
207		- this.bRep.support = o.transientrep;
208		-// this.support = o.support;
209		-// this.fileparent = o.fileparent;
210		-
211		- hashtable.remove(GetUUID());
212		-
213		- for (int i=0; i<Size(); i++)
214		- {
215		- get(i).RestoreBigData(hashtable);
216		- }
217		-}
218	360
219	361	// MOCAP SUPPORT
220	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,6 +499,7 @@
357	499	}
358	500
359	501	boolean live = false;
	502	+ transient boolean keepdontselect;
360	503	boolean dontselect = false;
361	504	boolean hide = false;
362	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -539,12 +682,14 @@
539	682	toParent = LA.newMatrix();
540	683	fromParent = LA.newMatrix();
541	684	}
	685	+
542	686	if (toParentMarked == null)
543	687	{
544	688	if (maxcount != 1)
545	689	{
546		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
547	691	}
	692	+
548	693	toParentMarked = LA.newMatrix();
549	694	fromParentMarked = LA.newMatrix();
550	695	}
..	..	@@ -855,7 +1000,7 @@
855	1000
856	1001	if (marked && Globals.isLIVE() && live &&
857	1002	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	1004	currentframe != Globals.framecount)
860	1005	{
861	1006	currentframe = Globals.framecount;
..	..	@@ -867,7 +1012,8 @@
867	1012
868	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	1014
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
871	1017	{
872	1018	countdown = 1;
873	1019	delay = speedup?8:1;
..	..	@@ -939,6 +1085,10 @@
939	1085	if (material == null \|\| material.multiply)
940	1086	return true;
941	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1092	return material.opacity > 0.99;
943	1093	}
944	1094
..	..	@@ -1339,6 +1489,7 @@
1339	1489	toParent = LA.newMatrix();
1340	1490	fromParent = LA.newMatrix();
1341	1491	}
	1492	+
1342	1493	LA.matCopy(other.toParent, toParent);
1343	1494	LA.matCopy(other.fromParent, fromParent);
1344	1495
..	..	@@ -2218,11 +2369,6 @@
2218	2369
2219	2370	InitOthers();
2220	2371
2221		- if (this instanceof Camera)
2222		- {
2223		- material.shift = 90;
2224		- }
2225		-
2226	2372	material.multiply = multiply;
2227	2373
2228	2374	if (multiply)
..	..	@@ -2360,6 +2506,15 @@
2360	2506	}
2361	2507	*/
2362	2508	}
	2509	+ else
	2510	+ {
	2511	+ //((ObjEditor)editWindow).SetupUI2(null);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
	2517	+ }
2363	2518	}
2364	2519
2365	2520	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2556,14 @@
2401	2556	{
2402	2557	editWindow.refreshContents();
2403	2558	}
	2559	+ else
	2560	+ {
	2561	+ if (manipWindow != null)
	2562	+ {
	2563	+ manipWindow.refreshContents();
	2564	+ }
	2565	+ }
	2566	+
2404	2567	//if (parent != null)
2405	2568	//parent.refreshEditWindow();
2406	2569	}
..	..	@@ -2480,7 +2643,8 @@
2480	2643	private static final int editSelf = 1;
2481	2644	private static final int editChild = 2;
2482	2645
2483		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2484	2648	{
2485	2649	if (level == 0)
2486	2650	{
..	..	@@ -2488,7 +2652,8 @@
2488	2652	return;
2489	2653
2490	2654	Object3D selectee;
2491		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2655	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2656	+ level + 1))
2492	2657	{
2493	2658	selectee = (Object3D) e.nextElement();
2494	2659	}
..	..	@@ -2496,19 +2661,22 @@
2496	2661	} else
2497	2662	{
2498	2663	//super.
2499		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2500	2666	}
2501	2667	}
2502	2668
2503		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2504	2671	{
2505	2672	doSomething = 0;
2506	2673	if (level == 0)
2507	2674	{
2508		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2509	2676	}
2510	2677	if (//super.
2511		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2512	2680	{
2513	2681	doSomething = 1;
2514	2682	return true;
..	..	@@ -2518,7 +2686,7 @@
2518	2686	}
2519	2687	}
2520	2688
2521		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2522	2690	{
2523	2691	if (selection == null)
2524	2692	{
..	..	@@ -2531,7 +2699,8 @@
2531	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2532	2700	{
2533	2701	Object3D selectee = (Object3D) e.nextElement();
2534		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2535	2704	{
2536	2705	childToDrag = selectee;
2537	2706	doSomething = 2;
..	..	@@ -2543,13 +2712,15 @@
2543	2712	return retval;
2544	2713	}
2545	2714
2546		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2547	2717	{
2548	2718	switch (doSomething)
2549	2719	{
2550	2720	case 1: // '\001'
2551	2721	//super.
2552		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2553	2724	break;
2554	2725
2555	2726	case 2: // '\002'
..	..	@@ -2562,11 +2733,13 @@
2562	2733	{
2563	2734	//sel.hitSomething = childToDrag.hitSomething;
2564	2735	//childToDrag.doEditDrag(info);
2565		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2566	2738	} else
2567	2739	{
2568	2740	//super.
2569		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2570	2743	}
2571	2744	}
2572	2745	break;
..	..	@@ -2584,6 +2757,9 @@
2584	2757	{
2585	2758	deselectAll();
2586	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2587	2763	ClickInfo newInfo = new ClickInfo();
2588	2764	newInfo.flags = info.flags;
2589	2765	newInfo.bounds = info.bounds;
..	..	@@ -2676,6 +2852,18 @@
2676	2852	void GenNormalsS(boolean crease)
2677	2853	{
2678	2854	selection.GenNormals(crease);
	2855	+// for (int i=0; i<selection.size(); i++)
	2856	+// {
	2857	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2858	+// selectee.GenNormals(crease);
	2859	+// }
	2860	+
	2861	+ //Touch();
	2862	+ }
	2863	+
	2864	+ void GenNormalsMeshS()
	2865	+ {
	2866	+ selection.GenNormalsMesh();
2679	2867	// for (int i=0; i<selection.size(); i++)
2680	2868	// {
2681	2869	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2816,6 +3004,24 @@
2816	3004	if (child == null)
2817	3005	continue;
2818	3006	child.GenNormals(crease);
	3007	+// Children().release(i);
	3008	+ }
	3009	+ blockloop = false;
	3010	+ }
	3011	+
	3012	+ void GenNormalsMesh()
	3013	+ {
	3014	+ if (blockloop)
	3015	+ return;
	3016	+
	3017	+ blockloop = true;
	3018	+ GenNormalsMesh0();
	3019	+ for (int i = 0; i < Children().Size(); i++)
	3020	+ {
	3021	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3022	+ if (child == null)
	3023	+ continue;
	3024	+ child.GenNormalsMesh();
2819	3025	// Children().release(i);
2820	3026	}
2821	3027	blockloop = false;
..	..	@@ -2988,11 +3194,20 @@
2988	3194	}
2989	3195	}
2990	3196
	3197	+ void GenNormalsMesh0()
	3198	+ {
	3199	+ if (bRep != null)
	3200	+ {
	3201	+ bRep.GenerateNormalsMesh();
	3202	+ Touch();
	3203	+ }
	3204	+ }
	3205	+
2991	3206	void GenNormalsMINE0()
2992	3207	{
2993	3208	if (bRep != null)
2994	3209	{
2995		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3211	Touch();
2997	3212	}
2998	3213	}
..	..	@@ -3402,15 +3617,47 @@
3402	3617
3403	3618	void ClearMaterials()
3404	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3405	3625	ClearMaterial();
3406		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3407	3627	{
3408		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3409	3629	if (child == null)
3410	3630	continue;
3411	3631	child.ClearMaterials();
3412		- release(i);
3413	3632	}
	3633	+
	3634	+ blockloop = false;
	3635	+ }
	3636	+
	3637	+ void ClearVersionList()
	3638	+ {
	3639	+ this.versionlist = null;
	3640	+ this.versionindex = -1;
	3641	+ this.versiontable = null;
	3642	+ }
	3643	+
	3644	+ void ClearVersions()
	3645	+ {
	3646	+ if (blockloop)
	3647	+ return;
	3648	+
	3649	+ blockloop = true;
	3650	+
	3651	+ ClearVersionList();
	3652	+ for (int i = 0; i < Size(); i++)
	3653	+ {
	3654	+ Object3D child = (Object3D) get(i);
	3655	+ if (child == null)
	3656	+ continue;
	3657	+ child.ClearVersions();
	3658	+ }
	3659	+
	3660	+ blockloop = false;
3414	3661	}
3415	3662
3416	3663	void FlipV(boolean flip)
..	..	@@ -3438,7 +3685,8 @@
3438	3685	if (blockloop)
3439	3686	return;
3440	3687
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3688	+ if (//marked \|\| // does not make sense
	3689	+ (bRep != null \|\| material != null)) // borderline...
3442	3690	live = h;
3443	3691
3444	3692	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3707,8 @@
3459	3707	return;
3460	3708
3461	3709	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3710	+ if (//marked \|\| // does not make sense
	3711	+ (bRep != null \|\| material != null)) // borderline...
3463	3712	link2master = h;
3464	3713
3465	3714	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3728,8 @@
3479	3728	if (blockloop)
3480	3729	return;
3481	3730
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3731	+ if (//marked \|\| // does not make sense
	3732	+ (bRep != null \|\| material != null)) // borderline...
3483	3733	hide = h;
3484	3734
3485	3735	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3749,7 @@
3499	3749	if (blockloop)
3500	3750	return;
3501	3751
3502		- if (bRep != null && material != null) // borderline...
	3752	+ if (bRep != null \|\| material != null) // borderline...
3503	3753	marked = h;
3504	3754
3505	3755	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3759,46 @@
3509	3759	continue;
3510	3760	blockloop = true;
3511	3761	child.MarkLeaves(h);
	3762	+ blockloop = false;
	3763	+ // release(i);
	3764	+ }
	3765	+ }
	3766	+
	3767	+ void RewindLeaves(boolean h)
	3768	+ {
	3769	+ if (blockloop)
	3770	+ return;
	3771	+
	3772	+ if (bRep != null \|\| material != null) // borderline...
	3773	+ rewind = h;
	3774	+
	3775	+ for (int i = 0; i < Size(); i++)
	3776	+ {
	3777	+ Object3D child = (Object3D) get(i); // reserve(i);
	3778	+ if (child == null)
	3779	+ continue;
	3780	+ blockloop = true;
	3781	+ child.RewindLeaves(h);
	3782	+ blockloop = false;
	3783	+ // release(i);
	3784	+ }
	3785	+ }
	3786	+
	3787	+ void RandomLeaves(boolean h)
	3788	+ {
	3789	+ if (blockloop)
	3790	+ return;
	3791	+
	3792	+ if (bRep != null \|\| material != null) // borderline...
	3793	+ random = h;
	3794	+
	3795	+ for (int i = 0; i < Size(); i++)
	3796	+ {
	3797	+ Object3D child = (Object3D) get(i); // reserve(i);
	3798	+ if (child == null)
	3799	+ continue;
	3800	+ blockloop = true;
	3801	+ child.RandomLeaves(h);
3512	3802	blockloop = false;
3513	3803	// release(i);
3514	3804	}
..	..	@@ -4286,6 +4576,55 @@
4286	4576	}
4287	4577	}
4288	4578
	4579	+ void RepairSOV()
	4580	+ {
	4581	+ if (blockloop)
	4582	+ return;
	4583	+
	4584	+ String texname = this.GetPigmentTexture();
	4585	+
	4586	+ if (texname.startsWith("sov"))
	4587	+ {
	4588	+ String[] s = texname.split("/");
	4589	+
	4590	+ String[] sname = s[1].split("Color.pn");
	4591	+
	4592	+ texname = sname[0];
	4593	+
	4594	+ if (sname.length > 1)
	4595	+ {
	4596	+ texname += "Color.jpg";
	4597	+ }
	4598	+
	4599	+ this.SetPigmentTexture("sov/" + texname);
	4600	+ }
	4601	+
	4602	+ texname = this.GetBumpTexture();
	4603	+
	4604	+ if (texname.startsWith("sov"))
	4605	+ {
	4606	+ String[] s = texname.split("/");
	4607	+
	4608	+ String[] sname = s[1].split("Bump.pn");
	4609	+
	4610	+ texname = sname[0];
	4611	+
	4612	+ if (sname.length > 1)
	4613	+ {
	4614	+ texname += "Bump.jpg";
	4615	+ }
	4616	+
	4617	+ this.SetBumpTexture("sov/" + texname);
	4618	+ }
	4619	+
	4620	+ for (int i=0; i<Size(); i++)
	4621	+ {
	4622	+ blockloop = true;
	4623	+ get(i).RepairSOV();
	4624	+ blockloop = false;
	4625	+ }
	4626	+ }
	4627	+
4289	4628	void RepairTexture()
4290	4629	{
4291	4630	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5139,14 @@
4800	5139	}
4801	5140	}
4802	5141
	5142	+ ObjEditor GetWindow()
	5143	+ {
	5144	+ if (editWindow != null)
	5145	+ return editWindow;
	5146	+
	5147	+ return manipWindow;
	5148	+ }
	5149	+
4803	5150	cTreePath Select(int indexcount, boolean deselect)
4804	5151	{
4805	5152	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5183,11 @@
4836	5183	if (leaf != null)
4837	5184	{
4838	5185	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5186	+ ObjEditor window = GetWindow();
	5187	+ if (window != null)
4840	5188	{
4841	5189	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5190	+ window.Select(tp, deselect, true);
4843	5191	}
4844	5192
4845	5193	return tp;
..	..	@@ -4856,6 +5204,7 @@
4856	5204
4857	5205	if (child == null)
4858	5206	continue;
	5207	+
4859	5208	if (child.HasTransparency() && child.size() != 0)
4860	5209	{
4861	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5214,10 @@
4865	5214	if (leaf != null)
4866	5215	{
4867	5216	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5217	+ ObjEditor window = GetWindow();
	5218	+ if (window != null)
4869	5219	{
4870		- editWindow.Select(tp, deselect, true);
	5220	+ window.Select(tp, deselect, true);
4871	5221	}
4872	5222
4873	5223	return tp;
..	..	@@ -5192,6 +5542,51 @@
5192	5542	blockloop = false;
5193	5543	}
5194	5544
	5545	+ void ResetSelectable()
	5546	+ {
	5547	+ if (blockloop)
	5548	+ return;
	5549	+
	5550	+ blockloop = true;
	5551	+
	5552	+ keepdontselect = dontselect;
	5553	+ dontselect = true;
	5554	+
	5555	+ Object3D child;
	5556	+ int nb = Size();
	5557	+ for (int i = 0; i < nb; i++)
	5558	+ {
	5559	+ child = (Object3D) get(i);
	5560	+ if (child == null)
	5561	+ continue;
	5562	+ child.ResetSelectable();
	5563	+ }
	5564	+
	5565	+ blockloop = false;
	5566	+ }
	5567	+
	5568	+ void RestoreSelectable()
	5569	+ {
	5570	+ if (blockloop)
	5571	+ return;
	5572	+
	5573	+ blockloop = true;
	5574	+
	5575	+ dontselect = keepdontselect;
	5576	+
	5577	+ Object3D child;
	5578	+ int nb = Size();
	5579	+ for (int i = 0; i < nb; i++)
	5580	+ {
	5581	+ child = (Object3D) get(i);
	5582	+ if (child == null)
	5583	+ continue;
	5584	+ child.RestoreSelectable();
	5585	+ }
	5586	+
	5587	+ blockloop = false;
	5588	+ }
	5589	+
5195	5590	boolean IsSelected()
5196	5591	{
5197	5592	if (parent == null)
..	..	@@ -5252,6 +5647,11 @@
5252	5647	if (fullname == null)
5253	5648	return "";
5254	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5255	5655	// System.out.println("Fullname = " + fullname);
5256	5656
5257	5657	// Does not work on Windows due to C:
..	..	@@ -5264,7 +5664,7 @@
5264	5664
5265	5665	if (split.length == 0)
5266	5666	{
5267		- return "";
	5667	+ return fullname.pigment = "";
5268	5668	}
5269	5669
5270	5670	if (split.length <= 2)
..	..	@@ -5272,22 +5672,27 @@
5272	5672	if (fullname.name.endsWith(":"))
5273	5673	{
5274	5674	// Windows
5275		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5276	5676	}
5277	5677
5278		- return split[0];
	5678	+ return fullname.pigment = split[0];
5279	5679	}
5280	5680
5281	5681	// Windows
5282	5682	assert(split.length == 4);
5283	5683
5284		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5285	5685	}
5286	5686
5287	5687	static String GetBump(cTexture fullname)
5288	5688	{
5289	5689	if (fullname == null)
5290	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5291	5696
5292	5697	// System.out.println("Fullname = " + fullname);
5293	5698	// Does not work on Windows due to C:
..	..	@@ -5299,12 +5704,12 @@
5299	5704
5300	5705	if (split.length == 0)
5301	5706	{
5302		- return "";
	5707	+ return fullname.bump = "";
5303	5708	}
5304	5709
5305	5710	if (split.length == 1)
5306	5711	{
5307		- return "";
	5712	+ return fullname.bump = "";
5308	5713	}
5309	5714
5310	5715	if (split.length == 2)
..	..	@@ -5312,16 +5717,16 @@
5312	5717	if (fullname.name.endsWith(":"))
5313	5718	{
5314	5719	// Windows
5315		- return "";
	5720	+ return fullname.bump = "";
5316	5721	}
5317	5722
5318		- return split[1];
	5723	+ return fullname.bump = split[1];
5319	5724	}
5320	5725
5321	5726	// Windows
5322	5727	assert(split.length == 4);
5323	5728
5324		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5325	5730	}
5326	5731
5327	5732	String GetPigmentTexture()
..	..	@@ -5404,6 +5809,9 @@
5404	5809	texname = "";
5405	5810
5406	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5407	5815	Touch();
5408	5816	}
5409	5817
..	..	@@ -5477,6 +5885,8 @@
5477	5885
5478	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5479	5887
	5888	+ GetTextures().bump = null;
	5889	+
5480	5890	Touch();
5481	5891	}
5482	5892
..	..	@@ -5501,6 +5911,38 @@
5501	5911	}
5502	5912	}
5503	5913
	5914	+ void EmbedTextures(boolean embed)
	5915	+ {
	5916	+ if (blockloop)
	5917	+ return;
	5918	+
	5919	+ //if (GetTextures() != null)
	5920	+ if (embed)
	5921	+ CameraPane.EmbedTextures(GetTextures());
	5922	+ else
	5923	+ {
	5924	+ GetTextures().pigmentdata = null;
	5925	+ GetTextures().bumpdata = null;
	5926	+ GetTextures().pw = 0;
	5927	+ GetTextures().ph = 0;
	5928	+ GetTextures().bw = 0;
	5929	+ GetTextures().bh = 0;
	5930	+ }
	5931	+
	5932	+ int nb = Size();
	5933	+ for (int i = 0; i < nb; i++)
	5934	+ {
	5935	+ Object3D child = (Object3D) get(i);
	5936	+
	5937	+ if (child == null)
	5938	+ continue;
	5939	+
	5940	+ blockloop = true;
	5941	+ child.EmbedTextures(embed);
	5942	+ blockloop = false;
	5943	+ }
	5944	+ }
	5945	+
5504	5946	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	5947	{
5506	5948	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +5951,23 @@
5509	5951	boolean NeedSupport()
5510	5952	{
5511	5953	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5954	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5955	// PROBLEM with CROWD!!
5514	5956	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5957	}
5516	5958
5517	5959	static boolean DEBUG_SELECTION = false;
	5960	+
	5961	+ boolean IsLive()
	5962	+ {
	5963	+ if (live)
	5964	+ return true;
	5965	+
	5966	+ if (parent == null)
	5967	+ return false;
	5968	+
	5969	+ return parent.IsLive();
	5970	+ }
5518	5971
5519	5972	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5973	{
..	..	@@ -5576,8 +6029,10 @@
5576	6029	if (support != null)
5577	6030	support = support;
5578	6031
5579		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6032	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6033	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6034	+
	6035	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5581	6036
5582	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	6038	{
..	..	@@ -5587,8 +6042,9 @@
5587	6042	// usecalllists &= !(parent instanceof RandomNode);
5588	6043	// usecalllists = false;
5589	6044
5590		- if (GetBRep() != null)
5591		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5592	6048	//System.out.println("draw " + this);
5593	6049	//new Exception().printStackTrace();
5594	6050
..	..	@@ -5597,10 +6053,12 @@
5597	6053	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	6054
5599	6055	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6056	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6057	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	6058	{
5602	6059	Globals.lighttouched = true;
5603	6060	} // all panes...
	6061	+
5604	6062	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	6063	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	6064	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5608,7 +6066,7 @@
5608	6066	if (!(this instanceof Composite))
5609	6067	touched = false;
5610	6068	//if (displaylist == -1 && usecalllists)
5611		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5612	6070	{
5613	6071	bRep.displaylist = display.GenList();
5614	6072	assert(bRep.displaylist != 0);
..	..	@@ -5619,7 +6077,7 @@
5619	6077
5620	6078	//System.out.println("\tnew list " + list);
5621	6079	//gl.glDrawBuffer(gl.GL_NONE);
5622		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5623	6081	{
5624	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5625	6083	display.NewList(bRep.displaylist);
..	..	@@ -5628,7 +6086,7 @@
5628	6086	CallList(display, root, selected, blocked);
5629	6087
5630	6088	// compiled = true;
5631		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5632	6090	{
5633	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5634	6092	display.EndList();
..	..	@@ -5728,6 +6186,7 @@
5728	6186	if (GetBRep() != null)
5729	6187	{
5730	6188	display.NextIndex();
	6189	+
5731	6190	// vertex color conflict : gl.glCallList(list);
5732	6191	DrawNode(display, root, selected);
5733	6192	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6227,27 @@
5768	6227	tex = GetTextures();
5769	6228	}
5770	6229
5771		- boolean failed = false;
	6230	+ boolean failedPigment = false;
	6231	+ boolean failedBump = false;
5772	6232
5773	6233	try
5774	6234	{
5775		- display.BindTextures(tex, texres);
	6235	+ display.BindPigmentTexture(tex, texres);
5776	6236	}
5777	6237	catch (Exception e)
5778	6238	{
5779	6239	System.err.println("FAILED: " + this);
5780		- failed = true;
	6240	+ failedPigment = true;
	6241	+ }
	6242	+
	6243	+ try
	6244	+ {
	6245	+ display.BindBumpTexture(tex, texres);
	6246	+ }
	6247	+ catch (Exception e)
	6248	+ {
	6249	+ //System.err.println("FAILED: " + this);
	6250	+ failedBump = true;
5781	6251	}
5782	6252
5783	6253	if (!compiled)
..	..	@@ -5800,8 +6270,11 @@
5800	6270	}
5801	6271	}
5802	6272
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6273	+ if (!failedBump)
	6274	+ display.ReleaseBumpTexture(tex);
	6275	+
	6276	+ if (!failedPigment)
	6277	+ display.ReleasePigmentTexture(tex);
5805	6278
5806	6279	display.PopMaterial(this, selected);
5807	6280	}
..	..	@@ -6174,6 +6647,11 @@
6174	6647	// dec 2012
6175	6648	new Exception().printStackTrace();
6176	6649	return;
	6650	+ }
	6651	+
	6652	+ if (dontselect)
	6653	+ {
	6654	+ //bRep.GenerateNormalsMINE();
6177	6655	}
6178	6656
6179	6657	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6959,20 +7437,23 @@
6959	7437	}
6960	7438	}
6961	7439
6962		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7440	+ static ClickInfo clickInfo = new ClickInfo();
	7441	+
	7442	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7443	+ Point outPt, Rectangle outRec)
6963	7444	{
6964		- int hc = info.bounds.x + info.bounds.width / 2;
6965		- int vc = info.bounds.y + info.bounds.height / 2;
6966		- double[][] toscreen = info.toScreen;
	7445	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7446	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7447	+ double[][] toscreen = clickInfo.toScreen;
6967	7448	if (toscreen == null)
6968	7449	{
6969		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6970	7451	}
6971	7452	cVector vec = in;
6972	7453	LA.xformPos(in, toscreen, in);
6973	7454	//System.out.println("Distance = " + info.camera.Distance());
6974		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6975		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6976	7457	outPt.x = hc + (int) vec.x;
6977	7458	outPt.y = vc - (int) vec.y;
6978	7459	outRec.x = outPt.x - 3;
..	..	@@ -6980,15 +7461,18 @@
6980	7461	outRec.width = outRec.height = 6;
6981	7462	}
6982	7463
6983		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
6984	7466	{
6985	7467	Point pt = new Point(0, 0);
6986	7468	Rectangle rec = new Rectangle();
6987		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
6988	7471	return rec;
6989	7472	}
6990	7473
6991		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
6992	7476	{
6993	7477	if (level == 0)
6994	7478	{
..	..	@@ -6997,16 +7481,19 @@
6997	7481	{
6998	7482	cVector origin = new cVector();
6999	7483	//LA.xformPos(origin, toParent, origin);
7000		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7001	7488	Rectangle boundary = new Rectangle();
7002	7489	boundary.x = spot.x - 30;
7003	7490	boundary.y = spot.y - 30;
7004	7491	boundary.width = spot.width + 60;
7005	7492	boundary.height = spot.height + 60;
7006		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7007	7494	int spotw = spot.x + spot.width;
7008	7495	int spoth = spot.y + spot.height;
7009		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7010	7497	// if (CameraPane.Xmin > spot.x)
7011	7498	// {
7012	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7023,11 +7510,33 @@
7023	7510	// {
7024	7511	// CameraPane.Ymax = spoth;
7025	7512	// }
7026		- spot.translate(32, 32);
	7513	+// if (CameraPane.Xmin > spot.x)
	7514	+// {
	7515	+// CameraPane.Xmin = spot.x;
	7516	+// }
	7517	+// if (CameraPane.Xmax < spotw)
	7518	+// {
	7519	+// CameraPane.Xmax = spotw;
	7520	+// }
	7521	+// if (CameraPane.Ymin > spot.y)
	7522	+// {
	7523	+// CameraPane.Ymin = spot.y;
	7524	+// }
	7525	+// if (CameraPane.Ymax < spoth)
	7526	+// {
	7527	+// CameraPane.Ymax = spoth;
	7528	+// }
	7529	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7530	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7531	+ spot.translate(32, 0);
	7532	+ clickInfo.g.setColor(Color.yellow);
	7533	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7534	+
	7535	+ spot.translate(32, 64);
7027	7536	spotw = spot.x + spot.width;
7028	7537	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
7030		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7538	+ clickInfo.g.setColor(Color.cyan);
	7539	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7540	// if (CameraPane.Xmin > spot.x)
7032	7541	// {
7033	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7044,29 +7553,9 @@
7044	7553	// {
7045	7554	// CameraPane.Ymax = spoth;
7046	7555	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7049		- spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
7051		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7052		-// if (CameraPane.Xmin > spot.x)
7053		-// {
7054		-// CameraPane.Xmin = spot.x;
7055		-// }
7056		-// if (CameraPane.Xmax < spotw)
7057		-// {
7058		-// CameraPane.Xmax = spotw;
7059		-// }
7060		-// if (CameraPane.Ymin > spot.y)
7061		-// {
7062		-// CameraPane.Ymin = spot.y;
7063		-// }
7064		-// if (CameraPane.Ymax < spoth)
7065		-// {
7066		-// CameraPane.Ymax = spoth;
7067		-// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- boundary.width, boundary.height, 0, 360);
	7556	+ clickInfo.g.setColor(Color.green);
	7557	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7558	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7070	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7560	// if (CameraPane.Xmin > boundary.x)
7072	7561	// {
..	..	@@ -7088,7 +7577,8 @@
7088	7577	}
7089	7578	}
7090	7579
7091		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7092	7582	{
7093	7583	if (level == 0)
7094	7584	{
..	..	@@ -7097,8 +7587,8 @@
7097	7587
7098	7588	boolean retval = false;
7099	7589
7100		- startX = info.x;
7101		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7102	7592
7103	7593	hitSomething = -1;
7104	7594	cVector origin = new cVector();
..	..	@@ -7108,22 +7598,53 @@
7108	7598	{
7109	7599	centerPt = new Point(0, 0);
7110	7600	}
7111		- calcHotSpot(origin, info, centerPt, spot);
7112		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7113	7604	{
7114	7605	hitSomething = hitCenter;
7115	7606	retval = true;
7116	7607	}
7117	7608	spot.translate(32, 0);
7118		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7119	7610	{
7120	7611	hitSomething = hitRotate;
7121	7612	retval = true;
7122	7613	}
7123	7614	spot.translate(0, 32);
7124		- if (spot.contains(info.x, info.y))
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
	7617	+ if (spot.contains(clickInfo.x, clickInfo.y))
7125	7618	{
7126	7619	hitSomething = hitScale;
	7620	+
	7621	+ double scale = 0.005f * clickInfo.camera.Distance();
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7623	+ double sign = 1;
	7624	+ if (hScale < 0)
	7625	+ {
	7626	+ sign = -1;
	7627	+ }
	7628	+ hScale = signMath.pow(signhScale, scale * 50);
	7629	+ if (hScale < 0.01)
	7630	+ {
	7631	+ //hScale = 0.01;
	7632	+ }
	7633	+
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7635	+ sign = 1;
	7636	+ if (vScale < 0)
	7637	+ {
	7638	+ sign = -1;
	7639	+ }
	7640	+ vScale = signMath.pow(signvScale, scale * 50);
	7641	+ if (vScale < 0.01)
	7642	+ {
	7643	+ //vScale = 0.01;
	7644	+ }
	7645	+
	7646	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7647	+
7127	7648	retval = true;
7128	7649	}
7129	7650
..	..	@@ -7133,7 +7654,7 @@
7133	7654	}
7134	7655
7135	7656	//System.out.println("info.modifiers = " + info.modifiers);
7136		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7137	7658	//System.out.println("modified = " + modified);
7138	7659	//new Exception().printStackTrace();
7139	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7161,7 +7682,8 @@
7161	7682	return true;
7162	7683	}
7163	7684
7164		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7165	7687	{
7166	7688	if (hitSomething == 0)
7167	7689	{
..	..	@@ -7175,7 +7697,7 @@
7175	7697
7176	7698	//System.out.println("hitSomething = " + hitSomething);
7177	7699
7178		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7179	7701
7180	7702	cVector xlate = new cVector();
7181	7703	//cVector xlate2 = new cVector();
..	..	@@ -7189,7 +7711,9 @@
7189	7711
7190	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7191	7713
7192		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7193	7717	{
7194	7718	//assert(false);
7195	7719	/*
..	..	@@ -7209,8 +7733,8 @@
7209	7733	toParent[3][i] = xlate.get(i);
7210	7734	LA.matInvert(toParent, fromParent);
7211	7735	*/
7212		- cVector delta = LA.newVector(0, 0, startY - info.y);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7736	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7737	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7738
7215	7739	LA.matCopy(startMat, toParent);
7216	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7219,7 +7743,7 @@
7219	7743	} else
7220	7744	{
7221	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7222		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7223	7747	cVector away = new cVector();
7224	7748	//cVector right2 = new cVector();
7225	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7236,19 +7760,19 @@
7236	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7237	7761	// if (!CameraPane.LOCALTRANSFORM)
7238	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7239		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7240	7764	// if (!CameraPane.LOCALTRANSFORM)
7241	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7242	7766	//LA.vecCross(up, cVector.Z, right2);
7243	7767
7244		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7245	7769
7246	7770	//System.out.println("DELTA0 = " + delta);
7247	7771	//System.out.println("AWAY = " + info.camera.away);
7248	7772	//System.out.println("UP = " + info.camera.up);
7249	7773	if (away.z > 0)
7250	7774	{
7251		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7252	7776	{
7253	7777	delta.x = -delta.x;
7254	7778	} else
..	..	@@ -7263,7 +7787,7 @@
7263	7787	//System.out.println("DELTA1 = " + delta);
7264	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7265	7789	//System.out.println("DELTA2 = " + delta);
7266		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7267	7791	LA.matCopy(startMat, toParent);
7268	7792	//System.out.println("DELTA3 = " + delta);
7269	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7273,8 +7797,8 @@
7273	7797	break;
7274	7798
7275	7799	case hitRotate: // rotate
7276		- int dx = info.x - centerPt.x;
7277		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7278	7802	double angle = (double) Math.atan2(dx, dy);
7279	7803	angle = -(1.570796 - angle);
7280	7804
..	..	@@ -7283,7 +7807,7 @@
7283	7807
7284	7808	if (modified)
7285	7809	{
7286		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7287	7811	angle /= (Math.PI / 4);
7288	7812	angle = Math.floor(angle + 0.5);
7289	7813	angle *= (Math.PI / 4);
..	..	@@ -7297,7 +7821,7 @@
7297	7821	}
7298	7822	/**/
7299	7823
7300		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7301	7825	{
7302	7826	case 1: // '\001'
7303	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7324,7 +7848,7 @@
7324	7848	break;
7325	7849
7326	7850	case hitScale: // scale
7327		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7328	7852	double sign = 1;
7329	7853	if (hScale < 0)
7330	7854	{
..	..	@@ -7336,7 +7860,7 @@
7336	7860	//hScale = 0.01;
7337	7861	}
7338	7862
7339		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7340	7864	sign = 1;
7341	7865	if (vScale < 0)
7342	7866	{
..	..	@@ -7347,6 +7871,7 @@
7347	7871	{
7348	7872	//vScale = 0.01;
7349	7873	}
	7874	+
7350	7875	LA.matCopy(startMat, toParent);
7351	7876	/**/
7352	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7356,32 +7881,39 @@
7356	7881	}
7357	7882	/**/
7358	7883
7359		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7360	7885
7361	7886	if (totalScale < 0.01)
7362	7887	{
7363	7888	totalScale = 0.01;
7364	7889	}
7365	7890
7366		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7367	7892	{
7368	7893	case 3: // '\001'
7369		- if (modified)
	7894	+ if (modified \|\| opposite)
7370	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7371	7899	//LA.matScale(toParent, 1, hScale, vScale);
7372		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7373	7901	} // vScale, 1);
7374	7902	else
7375	7903	{
7376		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7904	+ // EXCEPTION!
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7377	7906	} // vScale, 1);
7378	7907	break;
7379	7908
7380	7909	case 2: // '\002'
7381		- if (modified)
	7910	+ if (modified \|\| opposite)
7382	7911	{
7383		- //LA.matScale(toParent, hScale, 1, vScale);
7384		- LA.matScale(toParent, 1, totalScale, 1);
	7912	+ if (modified) // && opposite)
	7913	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7914	+ else
	7915	+ //LA.matScale(toParent, hScale, 1, vScale);
	7916	+ LA.matScale(toParent, 1, totalScale, 1);
7385	7917	} else
7386	7918	{
7387	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7389,10 +7921,13 @@
7389	7921	break;
7390	7922
7391	7923	case 1: // '\003'
7392		- if (modified)
	7924	+ if (modified \|\| opposite)
7393	7925	{
7394		- //LA.matScale(toParent, hScale, vScale, 1);
7395		- LA.matScale(toParent, 1, 1, totalScale);
	7926	+ if (modified) // && opposite)
	7927	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7928	+ else
	7929	+ //LA.matScale(toParent, hScale, vScale, 1);
	7930	+ LA.matScale(toParent, 1, 1, totalScale);
7396	7931	} else
7397	7932	{
7398	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7429,7 +7964,7 @@
7429	7964	} // NEW ...
7430	7965
7431	7966
7432		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7433	7968	}
7434	7969
7435	7970	boolean overflow = false;
..	..	@@ -7609,6 +8144,10 @@
7609	8144	editWindow = null;
7610	8145	} // ?
7611	8146	}
	8147	+ else
	8148	+ {
	8149	+ //editWindow.closeUI();
	8150	+ }
7612	8151	}
7613	8152
7614	8153	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8305,10 @@
7766	8305	}
7767	8306
7768	8307	transient ObjEditor editWindow;
	8308	+ transient ObjEditor manipWindow;
	8309	+
	8310	+ transient boolean pinned;
	8311	+
7769	8312	transient ObjectUI objectUI;
7770	8313	public static int povDepth = 0;
7771	8314	private static cVector tbMin = new cVector();