~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,8 +22,20 @@
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();
26	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	+
27	39	ScriptNode scriptnode;
28	40
29	41	void InitOthers()
..	..	@@ -104,125 +116,201 @@
104	116
105	117	// transient boolean reduced; // for morph reduction
106	118
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	121
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
112	124
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)
	125	+ void SaveSupports()
125	126	{
126		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
127	150	}
128		-
129		- for (int i = 0; i < Size(); i++)
130		- {
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
134		- blockloop = true;
135		- child.SaveSupports();
136		- blockloop = false;
137		- }
138		-}
139	151
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	152	+ void RestoreSupports()
	153	+ {
	154	+ if (blockloop)
	155	+ return;
144	156
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		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
165	161
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
169	179	{
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
170	278	Object3D o = hashtable.get(GetUUID());
171	279
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		-}
	280	+ RestoreBigData(o);
205	281
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);
	282	+ if (blockloop)
	283	+ return;
	284	+
	285	+ blockloop = true;
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
	294	+ blockloop = false;
224	295	}
225		-}
	296	+
	297	+ void RestoreBigData(Object3D o)
	298	+ {
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
	313	+ }
226	314
227	315	// MOCAP SUPPORT
228	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -365,6 +453,7 @@
365	453	}
366	454
367	455	boolean live = false;
	456	+ transient boolean keepdontselect;
368	457	boolean dontselect = false;
369	458	boolean hide = false;
370	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -547,12 +636,14 @@
547	636	toParent = LA.newMatrix();
548	637	fromParent = LA.newMatrix();
549	638	}
	639	+
550	640	if (toParentMarked == null)
551	641	{
552	642	if (maxcount != 1)
553	643	{
554	644	new Exception().printStackTrace();
555	645	}
	646	+
556	647	toParentMarked = LA.newMatrix();
557	648	fromParentMarked = LA.newMatrix();
558	649	}
..	..	@@ -863,7 +954,7 @@
863	954
864	955	if (marked && Globals.isLIVE() && live &&
865	956	//TEMP21aug2018
866		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
867	958	currentframe != Globals.framecount)
868	959	{
869	960	currentframe = Globals.framecount;
..	..	@@ -875,7 +966,8 @@
875	966
876	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
877	968
878		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
879	971	{
880	972	countdown = 1;
881	973	delay = speedup?8:1;
..	..	@@ -947,6 +1039,10 @@
947	1039	if (material == null \|\| material.multiply)
948	1040	return true;
949	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
950	1046	return material.opacity > 0.99;
951	1047	}
952	1048
..	..	@@ -1347,6 +1443,7 @@
1347	1443	toParent = LA.newMatrix();
1348	1444	fromParent = LA.newMatrix();
1349	1445	}
	1446	+
1350	1447	LA.matCopy(other.toParent, toParent);
1351	1448	LA.matCopy(other.fromParent, fromParent);
1352	1449
..	..	@@ -2368,6 +2465,15 @@
2368	2465	}
2369	2466	*/
2370	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2371	2477	}
2372	2478
2373	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2515,14 @@
2409	2515	{
2410	2516	editWindow.refreshContents();
2411	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2412	2526	//if (parent != null)
2413	2527	//parent.refreshEditWindow();
2414	2528	}
..	..	@@ -2488,7 +2602,8 @@
2488	2602	private static final int editSelf = 1;
2489	2603	private static final int editChild = 2;
2490	2604
2491		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2492	2607	{
2493	2608	if (level == 0)
2494	2609	{
..	..	@@ -2496,7 +2611,8 @@
2496	2611	return;
2497	2612
2498	2613	Object3D selectee;
2499		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2500	2616	{
2501	2617	selectee = (Object3D) e.nextElement();
2502	2618	}
..	..	@@ -2504,19 +2620,22 @@
2504	2620	} else
2505	2621	{
2506	2622	//super.
2507		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2508	2625	}
2509	2626	}
2510	2627
2511		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2512	2630	{
2513	2631	doSomething = 0;
2514	2632	if (level == 0)
2515	2633	{
2516		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2517	2635	}
2518	2636	if (//super.
2519		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2520	2639	{
2521	2640	doSomething = 1;
2522	2641	return true;
..	..	@@ -2526,7 +2645,7 @@
2526	2645	}
2527	2646	}
2528	2647
2529		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2530	2649	{
2531	2650	if (selection == null)
2532	2651	{
..	..	@@ -2539,7 +2658,8 @@
2539	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2659	{
2541	2660	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2543	2663	{
2544	2664	childToDrag = selectee;
2545	2665	doSomething = 2;
..	..	@@ -2551,13 +2671,15 @@
2551	2671	return retval;
2552	2672	}
2553	2673
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2555	2676	{
2556	2677	switch (doSomething)
2557	2678	{
2558	2679	case 1: // '\001'
2559	2680	//super.
2560		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2561	2683	break;
2562	2684
2563	2685	case 2: // '\002'
..	..	@@ -2570,11 +2692,13 @@
2570	2692	{
2571	2693	//sel.hitSomething = childToDrag.hitSomething;
2572	2694	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2574	2697	} else
2575	2698	{
2576	2699	//super.
2577		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2578	2702	}
2579	2703	}
2580	2704	break;
..	..	@@ -2592,6 +2716,9 @@
2592	2716	{
2593	2717	deselectAll();
2594	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2595	2722	ClickInfo newInfo = new ClickInfo();
2596	2723	newInfo.flags = info.flags;
2597	2724	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2811,18 @@
2684	2811	void GenNormalsS(boolean crease)
2685	2812	{
2686	2813	selection.GenNormals(crease);
	2814	+// for (int i=0; i<selection.size(); i++)
	2815	+// {
	2816	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2817	+// selectee.GenNormals(crease);
	2818	+// }
	2819	+
	2820	+ //Touch();
	2821	+ }
	2822	+
	2823	+ void GenNormalsMeshS()
	2824	+ {
	2825	+ selection.GenNormalsMesh();
2687	2826	// for (int i=0; i<selection.size(); i++)
2688	2827	// {
2689	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +2963,24 @@
2824	2963	if (child == null)
2825	2964	continue;
2826	2965	child.GenNormals(crease);
	2966	+// Children().release(i);
	2967	+ }
	2968	+ blockloop = false;
	2969	+ }
	2970	+
	2971	+ void GenNormalsMesh()
	2972	+ {
	2973	+ if (blockloop)
	2974	+ return;
	2975	+
	2976	+ blockloop = true;
	2977	+ GenNormalsMesh0();
	2978	+ for (int i = 0; i < Children().Size(); i++)
	2979	+ {
	2980	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2981	+ if (child == null)
	2982	+ continue;
	2983	+ child.GenNormalsMesh();
2827	2984	// Children().release(i);
2828	2985	}
2829	2986	blockloop = false;
..	..	@@ -2996,11 +3153,20 @@
2996	3153	}
2997	3154	}
2998	3155
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2999	3165	void GenNormalsMINE0()
3000	3166	{
3001	3167	if (bRep != null)
3002	3168	{
3003		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3170	Touch();
3005	3171	}
3006	3172	}
..	..	@@ -3446,7 +3612,8 @@
3446	3612	if (blockloop)
3447	3613	return;
3448	3614
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3450	3617	live = h;
3451	3618
3452	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3634,8 @@
3467	3634	return;
3468	3635
3469	3636	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3471	3639	link2master = h;
3472	3640
3473	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3655,8 @@
3487	3655	if (blockloop)
3488	3656	return;
3489	3657
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3491	3660	hide = h;
3492	3661
3493	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3676,7 @@
3507	3676	if (blockloop)
3508	3677	return;
3509	3678
3510		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3511	3680	marked = h;
3512	3681
3513	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3686,46 @@
3517	3686	continue;
3518	3687	blockloop = true;
3519	3688	child.MarkLeaves(h);
	3689	+ blockloop = false;
	3690	+ // release(i);
	3691	+ }
	3692	+ }
	3693	+
	3694	+ void RewindLeaves(boolean h)
	3695	+ {
	3696	+ if (blockloop)
	3697	+ return;
	3698	+
	3699	+ if (bRep != null \|\| material != null) // borderline...
	3700	+ rewind = h;
	3701	+
	3702	+ for (int i = 0; i < Size(); i++)
	3703	+ {
	3704	+ Object3D child = (Object3D) get(i); // reserve(i);
	3705	+ if (child == null)
	3706	+ continue;
	3707	+ blockloop = true;
	3708	+ child.RewindLeaves(h);
	3709	+ blockloop = false;
	3710	+ // release(i);
	3711	+ }
	3712	+ }
	3713	+
	3714	+ void RandomLeaves(boolean h)
	3715	+ {
	3716	+ if (blockloop)
	3717	+ return;
	3718	+
	3719	+ if (bRep != null \|\| material != null) // borderline...
	3720	+ random = h;
	3721	+
	3722	+ for (int i = 0; i < Size(); i++)
	3723	+ {
	3724	+ Object3D child = (Object3D) get(i); // reserve(i);
	3725	+ if (child == null)
	3726	+ continue;
	3727	+ blockloop = true;
	3728	+ child.RandomLeaves(h);
3520	3729	blockloop = false;
3521	3730	// release(i);
3522	3731	}
..	..	@@ -4294,6 +4503,55 @@
4294	4503	}
4295	4504	}
4296	4505
	4506	+ void RepairSOV()
	4507	+ {
	4508	+ if (blockloop)
	4509	+ return;
	4510	+
	4511	+ String texname = this.GetPigmentTexture();
	4512	+
	4513	+ if (texname.startsWith("sov"))
	4514	+ {
	4515	+ String[] s = texname.split("/");
	4516	+
	4517	+ String[] sname = s[1].split("Color.pn");
	4518	+
	4519	+ texname = sname[0];
	4520	+
	4521	+ if (sname.length > 1)
	4522	+ {
	4523	+ texname += "Color.jpg";
	4524	+ }
	4525	+
	4526	+ this.SetPigmentTexture("sov/" + texname);
	4527	+ }
	4528	+
	4529	+ texname = this.GetBumpTexture();
	4530	+
	4531	+ if (texname.startsWith("sov"))
	4532	+ {
	4533	+ String[] s = texname.split("/");
	4534	+
	4535	+ String[] sname = s[1].split("Bump.pn");
	4536	+
	4537	+ texname = sname[0];
	4538	+
	4539	+ if (sname.length > 1)
	4540	+ {
	4541	+ texname += "Bump.jpg";
	4542	+ }
	4543	+
	4544	+ this.SetBumpTexture("sov/" + texname);
	4545	+ }
	4546	+
	4547	+ for (int i=0; i<Size(); i++)
	4548	+ {
	4549	+ blockloop = true;
	4550	+ get(i).RepairSOV();
	4551	+ blockloop = false;
	4552	+ }
	4553	+ }
	4554	+
4297	4555	void RepairTexture()
4298	4556	{
4299	4557	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5066,14 @@
4808	5066	}
4809	5067	}
4810	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4811	5077	cTreePath Select(int indexcount, boolean deselect)
4812	5078	{
4813	5079	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5110,11 @@
4844	5110	if (leaf != null)
4845	5111	{
4846	5112	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4848	5115	{
4849	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4851	5118	}
4852	5119
4853	5120	return tp;
..	..	@@ -4864,6 +5131,7 @@
4864	5131
4865	5132	if (child == null)
4866	5133	continue;
	5134	+
4867	5135	if (child.HasTransparency() && child.size() != 0)
4868	5136	{
4869	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5141,10 @@
4873	5141	if (leaf != null)
4874	5142	{
4875	5143	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4877	5146	{
4878		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4879	5148	}
4880	5149
4881	5150	return tp;
..	..	@@ -5200,6 +5469,51 @@
5200	5469	blockloop = false;
5201	5470	}
5202	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5203	5517	boolean IsSelected()
5204	5518	{
5205	5519	if (parent == null)
..	..	@@ -5260,6 +5574,11 @@
5260	5574	if (fullname == null)
5261	5575	return "";
5262	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5263	5582	// System.out.println("Fullname = " + fullname);
5264	5583
5265	5584	// Does not work on Windows due to C:
..	..	@@ -5272,7 +5591,7 @@
5272	5591
5273	5592	if (split.length == 0)
5274	5593	{
5275		- return "";
	5594	+ return fullname.pigment = "";
5276	5595	}
5277	5596
5278	5597	if (split.length <= 2)
..	..	@@ -5280,22 +5599,27 @@
5280	5599	if (fullname.name.endsWith(":"))
5281	5600	{
5282	5601	// Windows
5283		- return fullname.name.substring(0, fullname.name.length()-1);
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5284	5603	}
5285	5604
5286		- return split[0];
	5605	+ return fullname.pigment = split[0];
5287	5606	}
5288	5607
5289	5608	// Windows
5290	5609	assert(split.length == 4);
5291	5610
5292		- return split[0] + ":" + split[1];
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5293	5612	}
5294	5613
5295	5614	static String GetBump(cTexture fullname)
5296	5615	{
5297	5616	if (fullname == null)
5298	5617	return "";
	5618	+
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
5299	5623
5300	5624	// System.out.println("Fullname = " + fullname);
5301	5625	// Does not work on Windows due to C:
..	..	@@ -5307,12 +5631,12 @@
5307	5631
5308	5632	if (split.length == 0)
5309	5633	{
5310		- return "";
	5634	+ return fullname.bump = "";
5311	5635	}
5312	5636
5313	5637	if (split.length == 1)
5314	5638	{
5315		- return "";
	5639	+ return fullname.bump = "";
5316	5640	}
5317	5641
5318	5642	if (split.length == 2)
..	..	@@ -5320,16 +5644,16 @@
5320	5644	if (fullname.name.endsWith(":"))
5321	5645	{
5322	5646	// Windows
5323		- return "";
	5647	+ return fullname.bump = "";
5324	5648	}
5325	5649
5326		- return split[1];
	5650	+ return fullname.bump = split[1];
5327	5651	}
5328	5652
5329	5653	// Windows
5330	5654	assert(split.length == 4);
5331	5655
5332		- return split[2] + ":" + split[3];
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5333	5657	}
5334	5658
5335	5659	String GetPigmentTexture()
..	..	@@ -5412,6 +5736,9 @@
5412	5736	texname = "";
5413	5737
5414	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5415	5742	Touch();
5416	5743	}
5417	5744
..	..	@@ -5485,6 +5812,8 @@
5485	5812
5486	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5487	5814
	5815	+ GetTextures().bump = null;
	5816	+
5488	5817	Touch();
5489	5818	}
5490	5819
..	..	@@ -5509,6 +5838,38 @@
5509	5838	}
5510	5839	}
5511	5840
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
	5869	+ blockloop = false;
	5870	+ }
	5871	+ }
	5872	+
5512	5873	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	5874	{
5514	5875	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +5878,23 @@
5517	5878	boolean NeedSupport()
5518	5879	{
5519	5880	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5881	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	5882	// PROBLEM with CROWD!!
5522	5883	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	5884	}
5524	5885
5525	5886	static boolean DEBUG_SELECTION = false;
	5887	+
	5888	+ boolean IsLive()
	5889	+ {
	5890	+ if (live)
	5891	+ return true;
	5892	+
	5893	+ if (parent == null)
	5894	+ return false;
	5895	+
	5896	+ return parent.IsLive();
	5897	+ }
5526	5898
5527	5899	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	5900	{
..	..	@@ -5584,8 +5956,10 @@
5584	5956	if (support != null)
5585	5957	support = support;
5586	5958
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);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5589	5963
5590	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	5965	{
..	..	@@ -5595,8 +5969,9 @@
5595	5969	// usecalllists &= !(parent instanceof RandomNode);
5596	5970	// usecalllists = false;
5597	5971
5598		- if (GetBRep() != null)
5599		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5600	5975	//System.out.println("draw " + this);
5601	5976	//new Exception().printStackTrace();
5602	5977
..	..	@@ -5605,10 +5980,12 @@
5605	5980	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	5981
5607	5982	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5983	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5984	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5609	5985	{
5610	5986	Globals.lighttouched = true;
5611	5987	} // all panes...
	5988	+
5612	5989	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	5990	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	5991	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5616,7 +5993,7 @@
5616	5993	if (!(this instanceof Composite))
5617	5994	touched = false;
5618	5995	//if (displaylist == -1 && usecalllists)
5619		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5620	5997	{
5621	5998	bRep.displaylist = display.GenList();
5622	5999	assert(bRep.displaylist != 0);
..	..	@@ -5627,7 +6004,7 @@
5627	6004
5628	6005	//System.out.println("\tnew list " + list);
5629	6006	//gl.glDrawBuffer(gl.GL_NONE);
5630		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5631	6008	{
5632	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5633	6010	display.NewList(bRep.displaylist);
..	..	@@ -5636,7 +6013,7 @@
5636	6013	CallList(display, root, selected, blocked);
5637	6014
5638	6015	// compiled = true;
5639		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5640	6017	{
5641	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5642	6019	display.EndList();
..	..	@@ -5736,6 +6113,7 @@
5736	6113	if (GetBRep() != null)
5737	6114	{
5738	6115	display.NextIndex();
	6116	+
5739	6117	// vertex color conflict : gl.glCallList(list);
5740	6118	DrawNode(display, root, selected);
5741	6119	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6154,27 @@
5776	6154	tex = GetTextures();
5777	6155	}
5778	6156
5779		- boolean failed = false;
	6157	+ boolean failedPigment = false;
	6158	+ boolean failedBump = false;
5780	6159
5781	6160	try
5782	6161	{
5783		- display.BindTextures(tex, texres);
	6162	+ display.BindPigmentTexture(tex, texres);
5784	6163	}
5785	6164	catch (Exception e)
5786	6165	{
5787	6166	System.err.println("FAILED: " + this);
5788		- failed = true;
	6167	+ failedPigment = true;
	6168	+ }
	6169	+
	6170	+ try
	6171	+ {
	6172	+ display.BindBumpTexture(tex, texres);
	6173	+ }
	6174	+ catch (Exception e)
	6175	+ {
	6176	+ //System.err.println("FAILED: " + this);
	6177	+ failedBump = true;
5789	6178	}
5790	6179
5791	6180	if (!compiled)
..	..	@@ -5808,8 +6197,11 @@
5808	6197	}
5809	6198	}
5810	6199
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6200	+ if (!failedBump)
	6201	+ display.ReleaseBumpTexture(tex);
	6202	+
	6203	+ if (!failedPigment)
	6204	+ display.ReleasePigmentTexture(tex);
5813	6205
5814	6206	display.PopMaterial(this, selected);
5815	6207	}
..	..	@@ -6182,6 +6574,11 @@
6182	6574	// dec 2012
6183	6575	new Exception().printStackTrace();
6184	6576	return;
	6577	+ }
	6578	+
	6579	+ if (dontselect)
	6580	+ {
	6581	+ //bRep.GenerateNormalsMINE();
6185	6582	}
6186	6583
6187	6584	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7364,23 @@
6967	7364	}
6968	7365	}
6969	7366
6970		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
6971	7371	{
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;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
6975	7375	if (toscreen == null)
6976	7376	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7378	}
6979	7379	cVector vec = in;
6980	7380	LA.xformPos(in, toscreen, in);
6981	7381	//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();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6984	7384	outPt.x = hc + (int) vec.x;
6985	7385	outPt.y = vc - (int) vec.y;
6986	7386	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7388,18 @@
6988	7388	outRec.width = outRec.height = 6;
6989	7389	}
6990	7390
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
6992	7393	{
6993	7394	Point pt = new Point(0, 0);
6994	7395	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
6996	7398	return rec;
6997	7399	}
6998	7400
6999		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
7000	7403	{
7001	7404	if (level == 0)
7002	7405	{
..	..	@@ -7005,16 +7408,19 @@
7005	7408	{
7006	7409	cVector origin = new cVector();
7007	7410	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7415	Rectangle boundary = new Rectangle();
7010	7416	boundary.x = spot.x - 30;
7011	7417	boundary.y = spot.y - 30;
7012	7418	boundary.width = spot.width + 60;
7013	7419	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.red);
7015	7421	int spotw = spot.x + spot.width;
7016	7422	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7424	// if (CameraPane.Xmin > spot.x)
7019	7425	// {
7020	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,11 +7437,33 @@
7031	7437	// {
7032	7438	// CameraPane.Ymax = spoth;
7033	7439	// }
7034		- spot.translate(32, 32);
	7440	+// if (CameraPane.Xmin > spot.x)
	7441	+// {
	7442	+// CameraPane.Xmin = spot.x;
	7443	+// }
	7444	+// if (CameraPane.Xmax < spotw)
	7445	+// {
	7446	+// CameraPane.Xmax = spotw;
	7447	+// }
	7448	+// if (CameraPane.Ymin > spot.y)
	7449	+// {
	7450	+// CameraPane.Ymin = spot.y;
	7451	+// }
	7452	+// if (CameraPane.Ymax < spoth)
	7453	+// {
	7454	+// CameraPane.Ymax = spoth;
	7455	+// }
	7456	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7457	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
7035	7463	spotw = spot.x + spot.width;
7036	7464	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039	7467	// if (CameraPane.Xmin > spot.x)
7040	7468	// {
7041	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,29 +7480,9 @@
7052	7480	// {
7053	7481	// CameraPane.Ymax = spoth;
7054	7482	// }
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);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7078	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7487	// if (CameraPane.Xmin > boundary.x)
7080	7488	// {
..	..	@@ -7096,7 +7504,8 @@
7096	7504	}
7097	7505	}
7098	7506
7099		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
7100	7509	{
7101	7510	if (level == 0)
7102	7511	{
..	..	@@ -7105,8 +7514,8 @@
7105	7514
7106	7515	boolean retval = false;
7107	7516
7108		- startX = info.x;
7109		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
7110	7519
7111	7520	hitSomething = -1;
7112	7521	cVector origin = new cVector();
..	..	@@ -7116,22 +7525,53 @@
7116	7525	{
7117	7526	centerPt = new Point(0, 0);
7118	7527	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7531	{
7122	7532	hitSomething = hitCenter;
7123	7533	retval = true;
7124	7534	}
7125	7535	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7537	{
7128	7538	hitSomething = hitRotate;
7129	7539	retval = true;
7130	7540	}
7131	7541	spot.translate(0, 32);
7132		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
7133	7545	{
7134	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
7135	7575	retval = true;
7136	7576	}
7137	7577
..	..	@@ -7141,7 +7581,7 @@
7141	7581	}
7142	7582
7143	7583	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7585	//System.out.println("modified = " + modified);
7146	7586	//new Exception().printStackTrace();
7147	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7609,8 @@
7169	7609	return true;
7170	7610	}
7171	7611
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
7173	7614	{
7174	7615	if (hitSomething == 0)
7175	7616	{
..	..	@@ -7183,7 +7624,7 @@
7183	7624
7184	7625	//System.out.println("hitSomething = " + hitSomething);
7185	7626
7186		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7628
7188	7629	cVector xlate = new cVector();
7189	7630	//cVector xlate2 = new cVector();
..	..	@@ -7217,8 +7658,8 @@
7217	7658	toParent[3][i] = xlate.get(i);
7218	7659	LA.matInvert(toParent, fromParent);
7219	7660	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7222	7663
7223	7664	LA.matCopy(startMat, toParent);
7224	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7668,7 @@
7227	7668	} else
7228	7669	{
7229	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7231	7672	cVector away = new cVector();
7232	7673	//cVector right2 = new cVector();
7233	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7685,19 @@
7244	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7686	// if (!CameraPane.LOCALTRANSFORM)
7246	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7689	// if (!CameraPane.LOCALTRANSFORM)
7249	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7691	//LA.vecCross(up, cVector.Z, right2);
7251	7692
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7694
7254	7695	//System.out.println("DELTA0 = " + delta);
7255	7696	//System.out.println("AWAY = " + info.camera.away);
7256	7697	//System.out.println("UP = " + info.camera.up);
7257	7698	if (away.z > 0)
7258	7699	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7701	{
7261	7702	delta.x = -delta.x;
7262	7703	} else
..	..	@@ -7271,7 +7712,7 @@
7271	7712	//System.out.println("DELTA1 = " + delta);
7272	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7714	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7716	LA.matCopy(startMat, toParent);
7276	7717	//System.out.println("DELTA3 = " + delta);
7277	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7722,8 @@
7281	7722	break;
7282	7723
7283	7724	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7286	7727	double angle = (double) Math.atan2(dx, dy);
7287	7728	angle = -(1.570796 - angle);
7288	7729
..	..	@@ -7305,7 +7746,7 @@
7305	7746	}
7306	7747	/**/
7307	7748
7308		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7750	{
7310	7751	case 1: // '\001'
7311	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7773,7 @@
7332	7773	break;
7333	7774
7334	7775	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7336	7777	double sign = 1;
7337	7778	if (hScale < 0)
7338	7779	{
..	..	@@ -7344,7 +7785,7 @@
7344	7785	//hScale = 0.01;
7345	7786	}
7346	7787
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7348	7789	sign = 1;
7349	7790	if (vScale < 0)
7350	7791	{
..	..	@@ -7355,6 +7796,7 @@
7355	7796	{
7356	7797	//vScale = 0.01;
7357	7798	}
	7799	+
7358	7800	LA.matCopy(startMat, toParent);
7359	7801	/**/
7360	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7364,29 +7806,30 @@
7364	7806	}
7365	7807	/**/
7366	7808
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7810
7369	7811	if (totalScale < 0.01)
7370	7812	{
7371	7813	totalScale = 0.01;
7372	7814	}
7373	7815
7374		- switch (info.pane.RenderCamera().viewCode)
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7817	{
7376	7818	case 3: // '\001'
7377		- if (modified)
	7819	+ if (modified \|\| opposite)
7378	7820	{
7379	7821	//LA.matScale(toParent, 1, hScale, vScale);
7380	7822	LA.matScale(toParent, totalScale, 1, 1);
7381	7823	} // vScale, 1);
7382	7824	else
7383	7825	{
	7826	+ // EXCEPTION!
7384	7827	LA.matScale(toParent, totalScale, totalScale, totalScale);
7385	7828	} // vScale, 1);
7386	7829	break;
7387	7830
7388	7831	case 2: // '\002'
7389		- if (modified)
	7832	+ if (modified \|\| opposite)
7390	7833	{
7391	7834	//LA.matScale(toParent, hScale, 1, vScale);
7392	7835	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7397,7 +7840,7 @@
7397	7840	break;
7398	7841
7399	7842	case 1: // '\003'
7400		- if (modified)
	7843	+ if (modified \|\| opposite)
7401	7844	{
7402	7845	//LA.matScale(toParent, hScale, vScale, 1);
7403	7846	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7437,7 +7880,7 @@
7437	7880	} // NEW ...
7438	7881
7439	7882
7440		- info.pane.repaint();
	7883	+ clickInfo.pane.repaint();
7441	7884	}
7442	7885
7443	7886	boolean overflow = false;
..	..	@@ -7617,6 +8060,10 @@
7617	8060	editWindow = null;
7618	8061	} // ?
7619	8062	}
	8063	+ else
	8064	+ {
	8065	+ //editWindow.closeUI();
	8066	+ }
7620	8067	}
7621	8068
7622	8069	boolean root; // patch for edit windows
..	..	@@ -7774,6 +8221,10 @@
7774	8221	}
7775	8222
7776	8223	transient ObjEditor editWindow;
	8224	+ transient ObjEditor manipWindow;
	8225	+
	8226	+ transient boolean pinned;
	8227	+
7777	8228	transient ObjectUI objectUI;
7778	8229	public static int povDepth = 0;
7779	8230	private static cVector tbMin = new cVector();