~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,201 @@
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	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	276	+ {
	277	+ if (!hashtable.containsKey(GetUUID()))
	278	+ return;
	279	+
	280	+ Object3D o = hashtable.get(GetUUID());
	281	+
	282	+ RestoreBigData(o);
	283	+
	284	+ if (blockloop)
	285	+ return;
	286	+
134	287	blockloop = true;
135		- child.SaveSupports();
	288	+
	289	+ //hashtable.remove(GetUUID());
	290	+
	291	+ for (int i=0; i<Size(); i++)
	292	+ {
	293	+ get(i).RestoreBigData(hashtable);
	294	+ }
	295	+
136	296	blockloop = false;
137	297	}
138		-}
139	298
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
144		-
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
	299	+ void RestoreBigData(Object3D o)
151	300	{
152		- bRep.RestoreSupports();
	301	+ this.bRep = o.bRep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
	313	+ // this.support = o.support;
	314	+ // this.fileparent = o.fileparent;
153	315	}
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		-}
165		-
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)
174		- {
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
177		- }
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	316
219	317	// MOCAP SUPPORT
220	318	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,6 +455,7 @@
357	455	}
358	456
359	457	boolean live = false;
	458	+ transient boolean keepdontselect;
360	459	boolean dontselect = false;
361	460	boolean hide = false;
362	461	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -539,12 +638,14 @@
539	638	toParent = LA.newMatrix();
540	639	fromParent = LA.newMatrix();
541	640	}
	641	+
542	642	if (toParentMarked == null)
543	643	{
544	644	if (maxcount != 1)
545	645	{
546	646	new Exception().printStackTrace();
547	647	}
	648	+
548	649	toParentMarked = LA.newMatrix();
549	650	fromParentMarked = LA.newMatrix();
550	651	}
..	..	@@ -855,7 +956,7 @@
855	956
856	957	if (marked && Globals.isLIVE() && live &&
857	958	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	959	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	960	currentframe != Globals.framecount)
860	961	{
861	962	currentframe = Globals.framecount;
..	..	@@ -867,7 +968,8 @@
867	968
868	969	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	970
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	971	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	972	+ (step == 1 && changedir))
871	973	{
872	974	countdown = 1;
873	975	delay = speedup?8:1;
..	..	@@ -939,6 +1041,10 @@
939	1041	if (material == null \|\| material.multiply)
940	1042	return true;
941	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
	1047	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1048	return material.opacity > 0.99;
943	1049	}
944	1050
..	..	@@ -1339,6 +1445,7 @@
1339	1445	toParent = LA.newMatrix();
1340	1446	fromParent = LA.newMatrix();
1341	1447	}
	1448	+
1342	1449	LA.matCopy(other.toParent, toParent);
1343	1450	LA.matCopy(other.fromParent, fromParent);
1344	1451
..	..	@@ -2360,6 +2467,15 @@
2360	2467	}
2361	2468	*/
2362	2469	}
	2470	+ else
	2471	+ {
	2472	+ //((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
	2478	+ }
2363	2479	}
2364	2480
2365	2481	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2517,14 @@
2401	2517	{
2402	2518	editWindow.refreshContents();
2403	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2404	2528	//if (parent != null)
2405	2529	//parent.refreshEditWindow();
2406	2530	}
..	..	@@ -2480,7 +2604,8 @@
2480	2604	private static final int editSelf = 1;
2481	2605	private static final int editChild = 2;
2482	2606
2483		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2484	2609	{
2485	2610	if (level == 0)
2486	2611	{
..	..	@@ -2488,7 +2613,8 @@
2488	2613	return;
2489	2614
2490	2615	Object3D selectee;
2491		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2492	2618	{
2493	2619	selectee = (Object3D) e.nextElement();
2494	2620	}
..	..	@@ -2496,19 +2622,22 @@
2496	2622	} else
2497	2623	{
2498	2624	//super.
2499		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2500	2627	}
2501	2628	}
2502	2629
2503		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2504	2632	{
2505	2633	doSomething = 0;
2506	2634	if (level == 0)
2507	2635	{
2508		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2509	2637	}
2510	2638	if (//super.
2511		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2512	2641	{
2513	2642	doSomething = 1;
2514	2643	return true;
..	..	@@ -2518,7 +2647,7 @@
2518	2647	}
2519	2648	}
2520	2649
2521		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2522	2651	{
2523	2652	if (selection == null)
2524	2653	{
..	..	@@ -2531,7 +2660,8 @@
2531	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2532	2661	{
2533	2662	Object3D selectee = (Object3D) e.nextElement();
2534		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2535	2665	{
2536	2666	childToDrag = selectee;
2537	2667	doSomething = 2;
..	..	@@ -2543,13 +2673,15 @@
2543	2673	return retval;
2544	2674	}
2545	2675
2546		- void doEditDrag(ClickInfo info, boolean opposite)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2547	2678	{
2548	2679	switch (doSomething)
2549	2680	{
2550	2681	case 1: // '\001'
2551	2682	//super.
2552		- doEditDrag0(info, opposite);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2553	2685	break;
2554	2686
2555	2687	case 2: // '\002'
..	..	@@ -2562,11 +2694,13 @@
2562	2694	{
2563	2695	//sel.hitSomething = childToDrag.hitSomething;
2564	2696	//childToDrag.doEditDrag(info);
2565		- sel.doEditDrag(info, opposite);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2566	2699	} else
2567	2700	{
2568	2701	//super.
2569		- doEditDrag0(info, opposite);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2570	2704	}
2571	2705	}
2572	2706	break;
..	..	@@ -2584,6 +2718,9 @@
2584	2718	{
2585	2719	deselectAll();
2586	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2587	2724	ClickInfo newInfo = new ClickInfo();
2588	2725	newInfo.flags = info.flags;
2589	2726	newInfo.bounds = info.bounds;
..	..	@@ -2676,6 +2813,18 @@
2676	2813	void GenNormalsS(boolean crease)
2677	2814	{
2678	2815	selection.GenNormals(crease);
	2816	+// for (int i=0; i<selection.size(); i++)
	2817	+// {
	2818	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2819	+// selectee.GenNormals(crease);
	2820	+// }
	2821	+
	2822	+ //Touch();
	2823	+ }
	2824	+
	2825	+ void GenNormalsMeshS()
	2826	+ {
	2827	+ selection.GenNormalsMesh();
2679	2828	// for (int i=0; i<selection.size(); i++)
2680	2829	// {
2681	2830	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2816,6 +2965,24 @@
2816	2965	if (child == null)
2817	2966	continue;
2818	2967	child.GenNormals(crease);
	2968	+// Children().release(i);
	2969	+ }
	2970	+ blockloop = false;
	2971	+ }
	2972	+
	2973	+ void GenNormalsMesh()
	2974	+ {
	2975	+ if (blockloop)
	2976	+ return;
	2977	+
	2978	+ blockloop = true;
	2979	+ GenNormalsMesh0();
	2980	+ for (int i = 0; i < Children().Size(); i++)
	2981	+ {
	2982	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2983	+ if (child == null)
	2984	+ continue;
	2985	+ child.GenNormalsMesh();
2819	2986	// Children().release(i);
2820	2987	}
2821	2988	blockloop = false;
..	..	@@ -2988,11 +3155,20 @@
2988	3155	}
2989	3156	}
2990	3157
	3158	+ void GenNormalsMesh0()
	3159	+ {
	3160	+ if (bRep != null)
	3161	+ {
	3162	+ bRep.GenerateNormalsMesh();
	3163	+ Touch();
	3164	+ }
	3165	+ }
	3166	+
2991	3167	void GenNormalsMINE0()
2992	3168	{
2993	3169	if (bRep != null)
2994	3170	{
2995		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3172	Touch();
2997	3173	}
2998	3174	}
..	..	@@ -3438,7 +3614,8 @@
3438	3614	if (blockloop)
3439	3615	return;
3440	3616
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3617	+ if (//marked \|\| // does not make sense
	3618	+ (bRep != null \|\| material != null)) // borderline...
3442	3619	live = h;
3443	3620
3444	3621	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3636,8 @@
3459	3636	return;
3460	3637
3461	3638	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3639	+ if (//marked \|\| // does not make sense
	3640	+ (bRep != null \|\| material != null)) // borderline...
3463	3641	link2master = h;
3464	3642
3465	3643	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3657,8 @@
3479	3657	if (blockloop)
3480	3658	return;
3481	3659
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3660	+ if (//marked \|\| // does not make sense
	3661	+ (bRep != null \|\| material != null)) // borderline...
3483	3662	hide = h;
3484	3663
3485	3664	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3678,7 @@
3499	3678	if (blockloop)
3500	3679	return;
3501	3680
3502		- if (bRep != null && material != null) // borderline...
	3681	+ if (bRep != null \|\| material != null) // borderline...
3503	3682	marked = h;
3504	3683
3505	3684	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3688,46 @@
3509	3688	continue;
3510	3689	blockloop = true;
3511	3690	child.MarkLeaves(h);
	3691	+ blockloop = false;
	3692	+ // release(i);
	3693	+ }
	3694	+ }
	3695	+
	3696	+ void RewindLeaves(boolean h)
	3697	+ {
	3698	+ if (blockloop)
	3699	+ return;
	3700	+
	3701	+ if (bRep != null \|\| material != null) // borderline...
	3702	+ rewind = h;
	3703	+
	3704	+ for (int i = 0; i < Size(); i++)
	3705	+ {
	3706	+ Object3D child = (Object3D) get(i); // reserve(i);
	3707	+ if (child == null)
	3708	+ continue;
	3709	+ blockloop = true;
	3710	+ child.RewindLeaves(h);
	3711	+ blockloop = false;
	3712	+ // release(i);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void RandomLeaves(boolean h)
	3717	+ {
	3718	+ if (blockloop)
	3719	+ return;
	3720	+
	3721	+ if (bRep != null \|\| material != null) // borderline...
	3722	+ random = h;
	3723	+
	3724	+ for (int i = 0; i < Size(); i++)
	3725	+ {
	3726	+ Object3D child = (Object3D) get(i); // reserve(i);
	3727	+ if (child == null)
	3728	+ continue;
	3729	+ blockloop = true;
	3730	+ child.RandomLeaves(h);
3512	3731	blockloop = false;
3513	3732	// release(i);
3514	3733	}
..	..	@@ -4286,6 +4505,55 @@
4286	4505	}
4287	4506	}
4288	4507
	4508	+ void RepairSOV()
	4509	+ {
	4510	+ if (blockloop)
	4511	+ return;
	4512	+
	4513	+ String texname = this.GetPigmentTexture();
	4514	+
	4515	+ if (texname.startsWith("sov"))
	4516	+ {
	4517	+ String[] s = texname.split("/");
	4518	+
	4519	+ String[] sname = s[1].split("Color.pn");
	4520	+
	4521	+ texname = sname[0];
	4522	+
	4523	+ if (sname.length > 1)
	4524	+ {
	4525	+ texname += "Color.jpg";
	4526	+ }
	4527	+
	4528	+ this.SetPigmentTexture("sov/" + texname);
	4529	+ }
	4530	+
	4531	+ texname = this.GetBumpTexture();
	4532	+
	4533	+ if (texname.startsWith("sov"))
	4534	+ {
	4535	+ String[] s = texname.split("/");
	4536	+
	4537	+ String[] sname = s[1].split("Bump.pn");
	4538	+
	4539	+ texname = sname[0];
	4540	+
	4541	+ if (sname.length > 1)
	4542	+ {
	4543	+ texname += "Bump.jpg";
	4544	+ }
	4545	+
	4546	+ this.SetBumpTexture("sov/" + texname);
	4547	+ }
	4548	+
	4549	+ for (int i=0; i<Size(); i++)
	4550	+ {
	4551	+ blockloop = true;
	4552	+ get(i).RepairSOV();
	4553	+ blockloop = false;
	4554	+ }
	4555	+ }
	4556	+
4289	4557	void RepairTexture()
4290	4558	{
4291	4559	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5068,14 @@
4800	5068	}
4801	5069	}
4802	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4803	5079	cTreePath Select(int indexcount, boolean deselect)
4804	5080	{
4805	5081	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5112,11 @@
4836	5112	if (leaf != null)
4837	5113	{
4838	5114	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4840	5117	{
4841	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
4843	5120	}
4844	5121
4845	5122	return tp;
..	..	@@ -4856,6 +5133,7 @@
4856	5133
4857	5134	if (child == null)
4858	5135	continue;
	5136	+
4859	5137	if (child.HasTransparency() && child.size() != 0)
4860	5138	{
4861	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5143,10 @@
4865	5143	if (leaf != null)
4866	5144	{
4867	5145	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
4869	5148	{
4870		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
4871	5150	}
4872	5151
4873	5152	return tp;
..	..	@@ -5192,6 +5471,51 @@
5192	5471	blockloop = false;
5193	5472	}
5194	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5195	5519	boolean IsSelected()
5196	5520	{
5197	5521	if (parent == null)
..	..	@@ -5252,6 +5576,11 @@
5252	5576	if (fullname == null)
5253	5577	return "";
5254	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5255	5584	// System.out.println("Fullname = " + fullname);
5256	5585
5257	5586	// Does not work on Windows due to C:
..	..	@@ -5264,7 +5593,7 @@
5264	5593
5265	5594	if (split.length == 0)
5266	5595	{
5267		- return "";
	5596	+ return fullname.pigment = "";
5268	5597	}
5269	5598
5270	5599	if (split.length <= 2)
..	..	@@ -5272,22 +5601,27 @@
5272	5601	if (fullname.name.endsWith(":"))
5273	5602	{
5274	5603	// Windows
5275		- return fullname.name.substring(0, fullname.name.length()-1);
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5276	5605	}
5277	5606
5278		- return split[0];
	5607	+ return fullname.pigment = split[0];
5279	5608	}
5280	5609
5281	5610	// Windows
5282	5611	assert(split.length == 4);
5283	5612
5284		- return split[0] + ":" + split[1];
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5285	5614	}
5286	5615
5287	5616	static String GetBump(cTexture fullname)
5288	5617	{
5289	5618	if (fullname == null)
5290	5619	return "";
	5620	+
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
5291	5625
5292	5626	// System.out.println("Fullname = " + fullname);
5293	5627	// Does not work on Windows due to C:
..	..	@@ -5299,12 +5633,12 @@
5299	5633
5300	5634	if (split.length == 0)
5301	5635	{
5302		- return "";
	5636	+ return fullname.bump = "";
5303	5637	}
5304	5638
5305	5639	if (split.length == 1)
5306	5640	{
5307		- return "";
	5641	+ return fullname.bump = "";
5308	5642	}
5309	5643
5310	5644	if (split.length == 2)
..	..	@@ -5312,16 +5646,16 @@
5312	5646	if (fullname.name.endsWith(":"))
5313	5647	{
5314	5648	// Windows
5315		- return "";
	5649	+ return fullname.bump = "";
5316	5650	}
5317	5651
5318		- return split[1];
	5652	+ return fullname.bump = split[1];
5319	5653	}
5320	5654
5321	5655	// Windows
5322	5656	assert(split.length == 4);
5323	5657
5324		- return split[2] + ":" + split[3];
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5325	5659	}
5326	5660
5327	5661	String GetPigmentTexture()
..	..	@@ -5404,6 +5738,9 @@
5404	5738	texname = "";
5405	5739
5406	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5407	5744	Touch();
5408	5745	}
5409	5746
..	..	@@ -5477,6 +5814,8 @@
5477	5814
5478	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5479	5816
	5817	+ GetTextures().bump = null;
	5818	+
5480	5819	Touch();
5481	5820	}
5482	5821
..	..	@@ -5501,6 +5840,38 @@
5501	5840	}
5502	5841	}
5503	5842
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
	5871	+ blockloop = false;
	5872	+ }
	5873	+ }
	5874	+
5504	5875	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	5876	{
5506	5877	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +5880,23 @@
5509	5880	boolean NeedSupport()
5510	5881	{
5511	5882	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5883	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5884	// PROBLEM with CROWD!!
5514	5885	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5886	}
5516	5887
5517	5888	static boolean DEBUG_SELECTION = false;
	5889	+
	5890	+ boolean IsLive()
	5891	+ {
	5892	+ if (live)
	5893	+ return true;
	5894	+
	5895	+ if (parent == null)
	5896	+ return false;
	5897	+
	5898	+ return parent.IsLive();
	5899	+ }
5518	5900
5519	5901	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5902	{
..	..	@@ -5576,8 +5958,10 @@
5576	5958	if (support != null)
5577	5959	support = support;
5578	5960
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);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5581	5965
5582	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	5967	{
..	..	@@ -5587,8 +5971,9 @@
5587	5971	// usecalllists &= !(parent instanceof RandomNode);
5588	5972	// usecalllists = false;
5589	5973
5590		- if (GetBRep() != null)
5591		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5592	5977	//System.out.println("draw " + this);
5593	5978	//new Exception().printStackTrace();
5594	5979
..	..	@@ -5597,10 +5982,12 @@
5597	5982	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	5983
5599	5984	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5985	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	5987	{
5602	5988	Globals.lighttouched = true;
5603	5989	} // all panes...
	5990	+
5604	5991	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	5992	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	5993	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5608,7 +5995,7 @@
5608	5995	if (!(this instanceof Composite))
5609	5996	touched = false;
5610	5997	//if (displaylist == -1 && usecalllists)
5611		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5612	5999	{
5613	6000	bRep.displaylist = display.GenList();
5614	6001	assert(bRep.displaylist != 0);
..	..	@@ -5619,7 +6006,7 @@
5619	6006
5620	6007	//System.out.println("\tnew list " + list);
5621	6008	//gl.glDrawBuffer(gl.GL_NONE);
5622		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5623	6010	{
5624	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5625	6012	display.NewList(bRep.displaylist);
..	..	@@ -5628,7 +6015,7 @@
5628	6015	CallList(display, root, selected, blocked);
5629	6016
5630	6017	// compiled = true;
5631		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5632	6019	{
5633	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5634	6021	display.EndList();
..	..	@@ -5728,6 +6115,7 @@
5728	6115	if (GetBRep() != null)
5729	6116	{
5730	6117	display.NextIndex();
	6118	+
5731	6119	// vertex color conflict : gl.glCallList(list);
5732	6120	DrawNode(display, root, selected);
5733	6121	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6156,27 @@
5768	6156	tex = GetTextures();
5769	6157	}
5770	6158
5771		- boolean failed = false;
	6159	+ boolean failedPigment = false;
	6160	+ boolean failedBump = false;
5772	6161
5773	6162	try
5774	6163	{
5775		- display.BindTextures(tex, texres);
	6164	+ display.BindPigmentTexture(tex, texres);
5776	6165	}
5777	6166	catch (Exception e)
5778	6167	{
5779	6168	System.err.println("FAILED: " + this);
5780		- failed = true;
	6169	+ failedPigment = true;
	6170	+ }
	6171	+
	6172	+ try
	6173	+ {
	6174	+ display.BindBumpTexture(tex, texres);
	6175	+ }
	6176	+ catch (Exception e)
	6177	+ {
	6178	+ //System.err.println("FAILED: " + this);
	6179	+ failedBump = true;
5781	6180	}
5782	6181
5783	6182	if (!compiled)
..	..	@@ -5800,8 +6199,11 @@
5800	6199	}
5801	6200	}
5802	6201
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6202	+ if (!failedBump)
	6203	+ display.ReleaseBumpTexture(tex);
	6204	+
	6205	+ if (!failedPigment)
	6206	+ display.ReleasePigmentTexture(tex);
5805	6207
5806	6208	display.PopMaterial(this, selected);
5807	6209	}
..	..	@@ -6174,6 +6576,11 @@
6174	6576	// dec 2012
6175	6577	new Exception().printStackTrace();
6176	6578	return;
	6579	+ }
	6580	+
	6581	+ if (dontselect)
	6582	+ {
	6583	+ //bRep.GenerateNormalsMINE();
6177	6584	}
6178	6585
6179	6586	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6959,20 +7366,23 @@
6959	7366	}
6960	7367	}
6961	7368
6962		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
6963	7373	{
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;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
6967	7377	if (toscreen == null)
6968	7378	{
6969		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6970	7380	}
6971	7381	cVector vec = in;
6972	7382	LA.xformPos(in, toscreen, in);
6973	7383	//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();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6976	7386	outPt.x = hc + (int) vec.x;
6977	7387	outPt.y = vc - (int) vec.y;
6978	7388	outRec.x = outPt.x - 3;
..	..	@@ -6980,15 +7390,18 @@
6980	7390	outRec.width = outRec.height = 6;
6981	7391	}
6982	7392
6983		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
6984	7395	{
6985	7396	Point pt = new Point(0, 0);
6986	7397	Rectangle rec = new Rectangle();
6987		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
6988	7400	return rec;
6989	7401	}
6990	7402
6991		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
6992	7405	{
6993	7406	if (level == 0)
6994	7407	{
..	..	@@ -6997,16 +7410,19 @@
6997	7410	{
6998	7411	cVector origin = new cVector();
6999	7412	//LA.xformPos(origin, toParent, origin);
7000		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7001	7417	Rectangle boundary = new Rectangle();
7002	7418	boundary.x = spot.x - 30;
7003	7419	boundary.y = spot.y - 30;
7004	7420	boundary.width = spot.width + 60;
7005	7421	boundary.height = spot.height + 60;
7006		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7007	7423	int spotw = spot.x + spot.width;
7008	7424	int spoth = spot.y + spot.height;
7009		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7010	7426	// if (CameraPane.Xmin > spot.x)
7011	7427	// {
7012	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7023,11 +7439,33 @@
7023	7439	// {
7024	7440	// CameraPane.Ymax = spoth;
7025	7441	// }
7026		- spot.translate(32, 32);
	7442	+// if (CameraPane.Xmin > spot.x)
	7443	+// {
	7444	+// CameraPane.Xmin = spot.x;
	7445	+// }
	7446	+// if (CameraPane.Xmax < spotw)
	7447	+// {
	7448	+// CameraPane.Xmax = spotw;
	7449	+// }
	7450	+// if (CameraPane.Ymin > spot.y)
	7451	+// {
	7452	+// CameraPane.Ymin = spot.y;
	7453	+// }
	7454	+// if (CameraPane.Ymax < spoth)
	7455	+// {
	7456	+// CameraPane.Ymax = spoth;
	7457	+// }
	7458	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7459	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
7027	7465	spotw = spot.x + spot.width;
7028	7466	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
7030		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7469	// if (CameraPane.Xmin > spot.x)
7032	7470	// {
7033	7471	// CameraPane.Xmin = spot.x;
..	..	@@ -7044,29 +7482,9 @@
7044	7482	// {
7045	7483	// CameraPane.Ymax = spoth;
7046	7484	// }
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);
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7070	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7489	// if (CameraPane.Xmin > boundary.x)
7072	7490	// {
..	..	@@ -7088,7 +7506,8 @@
7088	7506	}
7089	7507	}
7090	7508
7091		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7092	7511	{
7093	7512	if (level == 0)
7094	7513	{
..	..	@@ -7097,8 +7516,8 @@
7097	7516
7098	7517	boolean retval = false;
7099	7518
7100		- startX = info.x;
7101		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7102	7521
7103	7522	hitSomething = -1;
7104	7523	cVector origin = new cVector();
..	..	@@ -7108,22 +7527,53 @@
7108	7527	{
7109	7528	centerPt = new Point(0, 0);
7110	7529	}
7111		- calcHotSpot(origin, info, centerPt, spot);
7112		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7113	7533	{
7114	7534	hitSomething = hitCenter;
7115	7535	retval = true;
7116	7536	}
7117	7537	spot.translate(32, 0);
7118		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7119	7539	{
7120	7540	hitSomething = hitRotate;
7121	7541	retval = true;
7122	7542	}
7123	7543	spot.translate(0, 32);
7124		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7125	7547	{
7126	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7127	7577	retval = true;
7128	7578	}
7129	7579
..	..	@@ -7133,7 +7583,7 @@
7133	7583	}
7134	7584
7135	7585	//System.out.println("info.modifiers = " + info.modifiers);
7136		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7137	7587	//System.out.println("modified = " + modified);
7138	7588	//new Exception().printStackTrace();
7139	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7161,7 +7611,8 @@
7161	7611	return true;
7162	7612	}
7163	7613
7164		- void doEditDrag0(ClickInfo info, boolean opposite)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7165	7616	{
7166	7617	if (hitSomething == 0)
7167	7618	{
..	..	@@ -7175,7 +7626,7 @@
7175	7626
7176	7627	//System.out.println("hitSomething = " + hitSomething);
7177	7628
7178		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
7179	7630
7180	7631	cVector xlate = new cVector();
7181	7632	//cVector xlate2 = new cVector();
..	..	@@ -7209,8 +7660,8 @@
7209	7660	toParent[3][i] = xlate.get(i);
7210	7661	LA.matInvert(toParent, fromParent);
7211	7662	*/
7212		- cVector delta = LA.newVector(0, 0, startY - info.y);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7665
7215	7666	LA.matCopy(startMat, toParent);
7216	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7219,7 +7670,7 @@
7219	7670	} else
7220	7671	{
7221	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7222		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7223	7674	cVector away = new cVector();
7224	7675	//cVector right2 = new cVector();
7225	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7236,19 +7687,19 @@
7236	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7237	7688	// if (!CameraPane.LOCALTRANSFORM)
7238	7689	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7239		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7240	7691	// if (!CameraPane.LOCALTRANSFORM)
7241	7692	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7242	7693	//LA.vecCross(up, cVector.Z, right2);
7243	7694
7244		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7245	7696
7246	7697	//System.out.println("DELTA0 = " + delta);
7247	7698	//System.out.println("AWAY = " + info.camera.away);
7248	7699	//System.out.println("UP = " + info.camera.up);
7249	7700	if (away.z > 0)
7250	7701	{
7251		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7252	7703	{
7253	7704	delta.x = -delta.x;
7254	7705	} else
..	..	@@ -7263,7 +7714,7 @@
7263	7714	//System.out.println("DELTA1 = " + delta);
7264	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7265	7716	//System.out.println("DELTA2 = " + delta);
7266		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7267	7718	LA.matCopy(startMat, toParent);
7268	7719	//System.out.println("DELTA3 = " + delta);
7269	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7273,8 +7724,8 @@
7273	7724	break;
7274	7725
7275	7726	case hitRotate: // rotate
7276		- int dx = info.x - centerPt.x;
7277		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7278	7729	double angle = (double) Math.atan2(dx, dy);
7279	7730	angle = -(1.570796 - angle);
7280	7731
..	..	@@ -7297,7 +7748,7 @@
7297	7748	}
7298	7749	/**/
7299	7750
7300		- switch (info.pane.RenderCamera().viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7301	7752	{
7302	7753	case 1: // '\001'
7303	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7324,7 +7775,7 @@
7324	7775	break;
7325	7776
7326	7777	case hitScale: // scale
7327		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7328	7779	double sign = 1;
7329	7780	if (hScale < 0)
7330	7781	{
..	..	@@ -7336,7 +7787,7 @@
7336	7787	//hScale = 0.01;
7337	7788	}
7338	7789
7339		- double vScale = (double) (info.y - centerPt.y) / 32;
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7340	7791	sign = 1;
7341	7792	if (vScale < 0)
7342	7793	{
..	..	@@ -7347,6 +7798,7 @@
7347	7798	{
7348	7799	//vScale = 0.01;
7349	7800	}
	7801	+
7350	7802	LA.matCopy(startMat, toParent);
7351	7803	/**/
7352	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7356,32 +7808,39 @@
7356	7808	}
7357	7809	/**/
7358	7810
7359		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7360	7812
7361	7813	if (totalScale < 0.01)
7362	7814	{
7363	7815	totalScale = 0.01;
7364	7816	}
7365	7817
7366		- switch (info.pane.RenderCamera().viewCode)
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7367	7819	{
7368	7820	case 3: // '\001'
7369		- if (modified)
	7821	+ if (modified \|\| opposite)
7370	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7371	7826	//LA.matScale(toParent, 1, hScale, vScale);
7372		- LA.matScale(toParent, totalScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7373	7828	} // vScale, 1);
7374	7829	else
7375	7830	{
7376		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7831	+ // EXCEPTION!
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7377	7833	} // vScale, 1);
7378	7834	break;
7379	7835
7380	7836	case 2: // '\002'
7381		- if (modified)
	7837	+ if (modified \|\| opposite)
7382	7838	{
7383		- //LA.matScale(toParent, hScale, 1, vScale);
7384		- LA.matScale(toParent, 1, totalScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7385	7844	} else
7386	7845	{
7387	7846	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7389,10 +7848,13 @@
7389	7848	break;
7390	7849
7391	7850	case 1: // '\003'
7392		- if (modified)
	7851	+ if (modified \|\| opposite)
7393	7852	{
7394		- //LA.matScale(toParent, hScale, vScale, 1);
7395		- LA.matScale(toParent, 1, 1, totalScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7396	7858	} else
7397	7859	{
7398	7860	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7429,7 +7891,7 @@
7429	7891	} // NEW ...
7430	7892
7431	7893
7432		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7433	7895	}
7434	7896
7435	7897	boolean overflow = false;
..	..	@@ -7609,6 +8071,10 @@
7609	8071	editWindow = null;
7610	8072	} // ?
7611	8073	}
	8074	+ else
	8075	+ {
	8076	+ //editWindow.closeUI();
	8077	+ }
7612	8078	}
7613	8079
7614	8080	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8232,10 @@
7766	8232	}
7767	8233
7768	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
7769	8239	transient ObjectUI objectUI;
7770	8240	public static int povDepth = 0;
7771	8241	private static cVector tbMin = new cVector();