~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,13 +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
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
30	31	//
31	32
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
32	39	ScriptNode scriptnode;
33	40
34	41	void InitOthers()
..	..	@@ -170,24 +177,35 @@
170	177
171	178	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	179	{
	180	+ Object3D o;
	181	+
173	182	if (hashtable.containsKey(GetUUID()))
174	183	{
175		- Object3D o = hashtable.get(GetUUID());
	184	+ o = hashtable.get(GetUUID());
176	185
177	186	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	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);
180	195
181		- return;
	196	+ hashtable.put(GetUUID(), o);
182	197	}
183	198
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	199	+ if (!blockloop)
189	200	{
190		- get(i).ExtractBigData(hashtable);
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
191	209	}
192	210
193	211	ExtractBigData(o);
..	..	@@ -195,11 +213,26 @@
195	213
196	214	void ExtractBigData(Object3D o)
197	215	{
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
198	219	o.bRep = this.bRep;
199		- if (this.bRep != null)
	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)
200	230	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	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;
203	236	}
204	237
205	238	// o.support = this.support;
..	..	@@ -214,6 +247,29 @@
214	247	// this.fileparent = null;
215	248	}
216	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	+
217	273	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	274	{
219	275	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +279,35 @@
223	279
224	280	RestoreBigData(o);
225	281
226		- hashtable.remove(GetUUID());
	282	+ if (blockloop)
	283	+ return;
	284	+
	285	+ blockloop = true;
	286	+
	287	+ //hashtable.remove(GetUUID());
227	288
228	289	for (int i=0; i<Size(); i++)
229	290	{
230	291	get(i).RestoreBigData(hashtable);
231	292	}
	293	+
	294	+ blockloop = false;
232	295	}
233	296
234	297	void RestoreBigData(Object3D o)
235	298	{
236	299	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	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;
239	311	// this.support = o.support;
240	312	// this.fileparent = o.fileparent;
241	313	}
..	..	@@ -381,6 +453,7 @@
381	453	}
382	454
383	455	boolean live = false;
	456	+ transient boolean keepdontselect;
384	457	boolean dontselect = false;
385	458	boolean hide = false;
386	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -966,6 +1039,9 @@
966	1039	if (material == null \|\| material.multiply)
967	1040	return true;
968	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
969	1045	// Transparent objects are dynamic because we have to sort the triangles.
970	1046	return material.opacity > 0.99;
971	1047	}
..	..	@@ -1367,6 +1443,7 @@
1367	1443	toParent = LA.newMatrix();
1368	1444	fromParent = LA.newMatrix();
1369	1445	}
	1446	+
1370	1447	LA.matCopy(other.toParent, toParent);
1371	1448	LA.matCopy(other.fromParent, fromParent);
1372	1449
..	..	@@ -2391,6 +2468,11 @@
2391	2468	else
2392	2469	{
2393	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");
2394	2476	}
2395	2477	}
2396	2478
..	..	@@ -2433,6 +2515,14 @@
2433	2515	{
2434	2516	editWindow.refreshContents();
2435	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2436	2526	//if (parent != null)
2437	2527	//parent.refreshEditWindow();
2438	2528	}
..	..	@@ -2512,7 +2602,8 @@
2512	2602	private static final int editSelf = 1;
2513	2603	private static final int editChild = 2;
2514	2604
2515		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2516	2607	{
2517	2608	if (level == 0)
2518	2609	{
..	..	@@ -2520,7 +2611,8 @@
2520	2611	return;
2521	2612
2522	2613	Object3D selectee;
2523		- 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))
2524	2616	{
2525	2617	selectee = (Object3D) e.nextElement();
2526	2618	}
..	..	@@ -2528,19 +2620,22 @@
2528	2620	} else
2529	2621	{
2530	2622	//super.
2531		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2532	2625	}
2533	2626	}
2534	2627
2535		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2536	2630	{
2537	2631	doSomething = 0;
2538	2632	if (level == 0)
2539	2633	{
2540		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2541	2635	}
2542	2636	if (//super.
2543		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2544	2639	{
2545	2640	doSomething = 1;
2546	2641	return true;
..	..	@@ -2550,7 +2645,7 @@
2550	2645	}
2551	2646	}
2552	2647
2553		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2554	2649	{
2555	2650	if (selection == null)
2556	2651	{
..	..	@@ -2563,7 +2658,8 @@
2563	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2564	2659	{
2565	2660	Object3D selectee = (Object3D) e.nextElement();
2566		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2567	2663	{
2568	2664	childToDrag = selectee;
2569	2665	doSomething = 2;
..	..	@@ -2575,13 +2671,15 @@
2575	2671	return retval;
2576	2672	}
2577	2673
2578		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2579	2676	{
2580	2677	switch (doSomething)
2581	2678	{
2582	2679	case 1: // '\001'
2583	2680	//super.
2584		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2585	2683	break;
2586	2684
2587	2685	case 2: // '\002'
..	..	@@ -2594,11 +2692,13 @@
2594	2692	{
2595	2693	//sel.hitSomething = childToDrag.hitSomething;
2596	2694	//childToDrag.doEditDrag(info);
2597		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2598	2697	} else
2599	2698	{
2600	2699	//super.
2601		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2602	2702	}
2603	2703	}
2604	2704	break;
..	..	@@ -2616,6 +2716,9 @@
2616	2716	{
2617	2717	deselectAll();
2618	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2619	2722	ClickInfo newInfo = new ClickInfo();
2620	2723	newInfo.flags = info.flags;
2621	2724	newInfo.bounds = info.bounds;
..	..	@@ -3063,7 +3166,7 @@
3063	3166	{
3064	3167	if (bRep != null)
3065	3168	{
3066		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3067	3170	Touch();
3068	3171	}
3069	3172	}
..	..	@@ -4963,6 +5066,14 @@
4963	5066	}
4964	5067	}
4965	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4966	5077	cTreePath Select(int indexcount, boolean deselect)
4967	5078	{
4968	5079	if (hide \|\| dontselect)
..	..	@@ -4999,10 +5110,11 @@
4999	5110	if (leaf != null)
5000	5111	{
5001	5112	cTreePath tp = new cTreePath(this, leaf);
5002		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
5003	5115	{
5004	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
5005		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
5006	5118	}
5007	5119
5008	5120	return tp;
..	..	@@ -5019,6 +5131,7 @@
5019	5131
5020	5132	if (child == null)
5021	5133	continue;
	5134	+
5022	5135	if (child.HasTransparency() && child.size() != 0)
5023	5136	{
5024	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5028,9 +5141,10 @@
5028	5141	if (leaf != null)
5029	5142	{
5030	5143	cTreePath tp = new cTreePath(this, leaf);
5031		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
5032	5146	{
5033		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
5034	5148	}
5035	5149
5036	5150	return tp;
..	..	@@ -5355,6 +5469,51 @@
5355	5469	blockloop = false;
5356	5470	}
5357	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	+
5358	5517	boolean IsSelected()
5359	5518	{
5360	5519	if (parent == null)
..	..	@@ -5664,6 +5823,38 @@
5664	5823	}
5665	5824	}
5666	5825
	5826	+ void EmbedTextures(boolean embed)
	5827	+ {
	5828	+ if (blockloop)
	5829	+ return;
	5830	+
	5831	+ //if (GetTextures() != null)
	5832	+ if (embed)
	5833	+ CameraPane.EmbedTextures(GetTextures());
	5834	+ else
	5835	+ {
	5836	+ GetTextures().pigmentdata = null;
	5837	+ GetTextures().bumpdata = null;
	5838	+ GetTextures().pw = 0;
	5839	+ GetTextures().ph = 0;
	5840	+ GetTextures().bw = 0;
	5841	+ GetTextures().bh = 0;
	5842	+ }
	5843	+
	5844	+ int nb = Size();
	5845	+ for (int i = 0; i < nb; i++)
	5846	+ {
	5847	+ Object3D child = (Object3D) get(i);
	5848	+
	5849	+ if (child == null)
	5850	+ continue;
	5851	+
	5852	+ blockloop = true;
	5853	+ child.EmbedTextures(embed);
	5854	+ blockloop = false;
	5855	+ }
	5856	+ }
	5857	+
5667	5858	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5668	5859	{
5669	5860	Draw(display, root, selected, blocked);
..	..	@@ -5750,8 +5941,10 @@
5750	5941	if (support != null)
5751	5942	support = support;
5752	5943
5753		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5944	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5945	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5946	+
	5947	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5755	5948
5756	5949	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5757	5950	{
..	..	@@ -5761,8 +5954,9 @@
5761	5954	// usecalllists &= !(parent instanceof RandomNode);
5762	5955	// usecalllists = false;
5763	5956
5764		- if (GetBRep() != null)
5765		- usecalllists = usecalllists;
	5957	+ if (display.DrawMode() == display.SHADOW)
	5958	+ //GetBRep() != null)
	5959	+ usecalllists = !!usecalllists;
5766	5960	//System.out.println("draw " + this);
5767	5961	//new Exception().printStackTrace();
5768	5962
..	..	@@ -5772,7 +5966,7 @@
5772	5966
5773	5967	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774	5968	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5775		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5969	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5776	5970	{
5777	5971	Globals.lighttouched = true;
5778	5972	} // all panes...
..	..	@@ -5784,7 +5978,7 @@
5784	5978	if (!(this instanceof Composite))
5785	5979	touched = false;
5786	5980	//if (displaylist == -1 && usecalllists)
5787		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5981	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5788	5982	{
5789	5983	bRep.displaylist = display.GenList();
5790	5984	assert(bRep.displaylist != 0);
..	..	@@ -5795,7 +5989,7 @@
5795	5989
5796	5990	//System.out.println("\tnew list " + list);
5797	5991	//gl.glDrawBuffer(gl.GL_NONE);
5798		- if (usecalllists)
	5992	+ if (usecalllists && bRep.displaylist > 0)
5799	5993	{
5800	5994	// System.err.println("new list " + bRep.displaylist + " for " + this);
5801	5995	display.NewList(bRep.displaylist);
..	..	@@ -5804,7 +5998,7 @@
5804	5998	CallList(display, root, selected, blocked);
5805	5999
5806	6000	// compiled = true;
5807		- if (usecalllists)
	6001	+ if (usecalllists && bRep.displaylist > 0)
5808	6002	{
5809	6003	// System.err.println("end list " + bRep.displaylist + " for " + this);
5810	6004	display.EndList();
..	..	@@ -5904,6 +6098,7 @@
5904	6098	if (GetBRep() != null)
5905	6099	{
5906	6100	display.NextIndex();
	6101	+
5907	6102	// vertex color conflict : gl.glCallList(list);
5908	6103	DrawNode(display, root, selected);
5909	6104	if (this instanceof BezierPatch)
..	..	@@ -7154,20 +7349,23 @@
7154	7349	}
7155	7350	}
7156	7351
7157		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7352	+ static ClickInfo clickInfo = new ClickInfo();
	7353	+
	7354	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7355	+ Point outPt, Rectangle outRec)
7158	7356	{
7159		- int hc = info.bounds.x + info.bounds.width / 2;
7160		- int vc = info.bounds.y + info.bounds.height / 2;
7161		- double[][] toscreen = info.toScreen;
	7357	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7358	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7359	+ double[][] toscreen = clickInfo.toScreen;
7162	7360	if (toscreen == null)
7163	7361	{
7164		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7362	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7165	7363	}
7166	7364	cVector vec = in;
7167	7365	LA.xformPos(in, toscreen, in);
7168	7366	//System.out.println("Distance = " + info.camera.Distance());
7169		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7170		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7367	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7368	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7171	7369	outPt.x = hc + (int) vec.x;
7172	7370	outPt.y = vc - (int) vec.y;
7173	7371	outRec.x = outPt.x - 3;
..	..	@@ -7175,15 +7373,18 @@
7175	7373	outRec.width = outRec.height = 6;
7176	7374	}
7177	7375
7178		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7376	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7377	+ )
7179	7378	{
7180	7379	Point pt = new Point(0, 0);
7181	7380	Rectangle rec = new Rectangle();
7182		- calcHotSpot(in, info, pt, rec);
	7381	+ calcHotSpot(in, //clickInfo,
	7382	+ pt, rec);
7183	7383	return rec;
7184	7384	}
7185	7385
7186		- void drawEditHandles0(ClickInfo info, int level)
	7386	+ void drawEditHandles0(//ClickInfo clickInfo,
	7387	+ int level)
7187	7388	{
7188	7389	if (level == 0)
7189	7390	{
..	..	@@ -7192,16 +7393,19 @@
7192	7393	{
7193	7394	cVector origin = new cVector();
7194	7395	//LA.xformPos(origin, toParent, origin);
7195		- Rectangle spot = calcHotSpot(origin, info);
	7396	+ if (this.clickInfo == null)
	7397	+ this.clickInfo = new ClickInfo();
	7398	+
	7399	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7196	7400	Rectangle boundary = new Rectangle();
7197	7401	boundary.x = spot.x - 30;
7198	7402	boundary.y = spot.y - 30;
7199	7403	boundary.width = spot.width + 60;
7200	7404	boundary.height = spot.height + 60;
7201		- info.g.setColor(Color.red);
	7405	+ clickInfo.g.setColor(Color.red);
7202	7406	int spotw = spot.x + spot.width;
7203	7407	int spoth = spot.y + spot.height;
7204		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7408	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7205	7409	// if (CameraPane.Xmin > spot.x)
7206	7410	// {
7207	7411	// CameraPane.Xmin = spot.x;
..	..	@@ -7221,8 +7425,8 @@
7221	7425	spot.translate(32, 32);
7222	7426	spotw = spot.x + spot.width;
7223	7427	spoth = spot.y + spot.height;
7224		- info.g.setColor(Color.cyan);
7225		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7428	+ clickInfo.g.setColor(Color.cyan);
	7429	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7226	7430	// if (CameraPane.Xmin > spot.x)
7227	7431	// {
7228	7432	// CameraPane.Xmin = spot.x;
..	..	@@ -7242,9 +7446,9 @@
7242	7446	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243	7447	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7244	7448	spot.translate(0, -32);
7245		- info.g.setColor(Color.yellow);
7246		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7247		- info.g.setColor(Color.green);
	7449	+ clickInfo.g.setColor(Color.yellow);
	7450	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7451	+ clickInfo.g.setColor(Color.green);
7248	7452	// if (CameraPane.Xmin > spot.x)
7249	7453	// {
7250	7454	// CameraPane.Xmin = spot.x;
..	..	@@ -7261,8 +7465,8 @@
7261	7465	// {
7262	7466	// CameraPane.Ymax = spoth;
7263	7467	// }
7264		- info.g.drawArc(boundary.x, boundary.y,
7265		- boundary.width, boundary.height, 0, 360);
	7468	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7469	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7266	7470	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267	7471	// if (CameraPane.Xmin > boundary.x)
7268	7472	// {
..	..	@@ -7284,7 +7488,8 @@
7284	7488	}
7285	7489	}
7286	7490
7287		- boolean doEditClick0(ClickInfo info, int level)
	7491	+ boolean doEditClick0(//ClickInfo clickInfo,
	7492	+ int level)
7288	7493	{
7289	7494	if (level == 0)
7290	7495	{
..	..	@@ -7293,8 +7498,8 @@
7293	7498
7294	7499	boolean retval = false;
7295	7500
7296		- startX = info.x;
7297		- startY = info.y;
	7501	+ startX = clickInfo.x;
	7502	+ startY = clickInfo.y;
7298	7503
7299	7504	hitSomething = -1;
7300	7505	cVector origin = new cVector();
..	..	@@ -7304,22 +7509,51 @@
7304	7509	{
7305	7510	centerPt = new Point(0, 0);
7306	7511	}
7307		- calcHotSpot(origin, info, centerPt, spot);
7308		- if (spot.contains(info.x, info.y))
	7512	+ calcHotSpot(origin, //info,
	7513	+ centerPt, spot);
	7514	+ if (spot.contains(clickInfo.x, clickInfo.y))
7309	7515	{
7310	7516	hitSomething = hitCenter;
7311	7517	retval = true;
7312	7518	}
7313	7519	spot.translate(32, 0);
7314		- if (spot.contains(info.x, info.y))
	7520	+ if (spot.contains(clickInfo.x, clickInfo.y))
7315	7521	{
7316	7522	hitSomething = hitRotate;
7317	7523	retval = true;
7318	7524	}
7319	7525	spot.translate(0, 32);
7320		- if (spot.contains(info.x, info.y))
	7526	+ if (spot.contains(clickInfo.x, clickInfo.y))
7321	7527	{
7322	7528	hitSomething = hitScale;
	7529	+
	7530	+ double scale = 0.005f * clickInfo.camera.Distance();
	7531	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7532	+ double sign = 1;
	7533	+ if (hScale < 0)
	7534	+ {
	7535	+ sign = -1;
	7536	+ }
	7537	+ hScale = signMath.pow(signhScale, scale * 50);
	7538	+ if (hScale < 0.01)
	7539	+ {
	7540	+ //hScale = 0.01;
	7541	+ }
	7542	+
	7543	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7544	+ sign = 1;
	7545	+ if (vScale < 0)
	7546	+ {
	7547	+ sign = -1;
	7548	+ }
	7549	+ vScale = signMath.pow(signvScale, scale * 50);
	7550	+ if (vScale < 0.01)
	7551	+ {
	7552	+ //vScale = 0.01;
	7553	+ }
	7554	+
	7555	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7556	+
7323	7557	retval = true;
7324	7558	}
7325	7559
..	..	@@ -7329,7 +7563,7 @@
7329	7563	}
7330	7564
7331	7565	//System.out.println("info.modifiers = " + info.modifiers);
7332		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7566	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7333	7567	//System.out.println("modified = " + modified);
7334	7568	//new Exception().printStackTrace();
7335	7569	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7357,7 +7591,8 @@
7357	7591	return true;
7358	7592	}
7359	7593
7360		- void doEditDrag0(ClickInfo info, boolean opposite)
	7594	+ void doEditDrag0(//ClickInfo info,
	7595	+ boolean opposite)
7361	7596	{
7362	7597	if (hitSomething == 0)
7363	7598	{
..	..	@@ -7371,7 +7606,7 @@
7371	7606
7372	7607	//System.out.println("hitSomething = " + hitSomething);
7373	7608
7374		- double scale = 0.005f * info.camera.Distance();
	7609	+ double scale = 0.005f * clickInfo.camera.Distance();
7375	7610
7376	7611	cVector xlate = new cVector();
7377	7612	//cVector xlate2 = new cVector();
..	..	@@ -7405,8 +7640,8 @@
7405	7640	toParent[3][i] = xlate.get(i);
7406	7641	LA.matInvert(toParent, fromParent);
7407	7642	*/
7408		- cVector delta = LA.newVector(0, 0, startY - info.y);
7409		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7643	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7644	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7410	7645
7411	7646	LA.matCopy(startMat, toParent);
7412	7647	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7415,7 +7650,7 @@
7415	7650	} else
7416	7651	{
7417	7652	//LA.xformDir(delta, info.camera.fromScreen, delta);
7418		- cVector up = new cVector(info.camera.up);
	7653	+ cVector up = new cVector(clickInfo.camera.up);
7419	7654	cVector away = new cVector();
7420	7655	//cVector right2 = new cVector();
7421	7656	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7432,19 +7667,19 @@
7432	7667	LA.xformDir(up, ClickInfo.matbuffer, up);
7433	7668	// if (!CameraPane.LOCALTRANSFORM)
7434	7669	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7435		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7670	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7436	7671	// if (!CameraPane.LOCALTRANSFORM)
7437	7672	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7438	7673	//LA.vecCross(up, cVector.Z, right2);
7439	7674
7440		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7675	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7441	7676
7442	7677	//System.out.println("DELTA0 = " + delta);
7443	7678	//System.out.println("AWAY = " + info.camera.away);
7444	7679	//System.out.println("UP = " + info.camera.up);
7445	7680	if (away.z > 0)
7446	7681	{
7447		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7682	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7448	7683	{
7449	7684	delta.x = -delta.x;
7450	7685	} else
..	..	@@ -7459,7 +7694,7 @@
7459	7694	//System.out.println("DELTA1 = " + delta);
7460	7695	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7461	7696	//System.out.println("DELTA2 = " + delta);
7462		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7697	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7463	7698	LA.matCopy(startMat, toParent);
7464	7699	//System.out.println("DELTA3 = " + delta);
7465	7700	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7469,8 +7704,8 @@
7469	7704	break;
7470	7705
7471	7706	case hitRotate: // rotate
7472		- int dx = info.x - centerPt.x;
7473		- int dy = -(info.y - centerPt.y);
	7707	+ int dx = clickInfo.x - centerPt.x;
	7708	+ int dy = -(clickInfo.y - centerPt.y);
7474	7709	double angle = (double) Math.atan2(dx, dy);
7475	7710	angle = -(1.570796 - angle);
7476	7711
..	..	@@ -7493,7 +7728,7 @@
7493	7728	}
7494	7729	/**/
7495	7730
7496		- switch (info.pane.RenderCamera().viewCode)
	7731	+ switch (clickInfo.pane.RenderCamera().viewCode)
7497	7732	{
7498	7733	case 1: // '\001'
7499	7734	LA.matZRotate(toParent, angle);
..	..	@@ -7520,7 +7755,7 @@
7520	7755	break;
7521	7756
7522	7757	case hitScale: // scale
7523		- double hScale = (double) (info.x - centerPt.x) / 32;
	7758	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7524	7759	double sign = 1;
7525	7760	if (hScale < 0)
7526	7761	{
..	..	@@ -7532,7 +7767,7 @@
7532	7767	//hScale = 0.01;
7533	7768	}
7534	7769
7535		- double vScale = (double) (info.y - centerPt.y) / 32;
	7770	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7536	7771	sign = 1;
7537	7772	if (vScale < 0)
7538	7773	{
..	..	@@ -7543,6 +7778,7 @@
7543	7778	{
7544	7779	//vScale = 0.01;
7545	7780	}
	7781	+
7546	7782	LA.matCopy(startMat, toParent);
7547	7783	/**/
7548	7784	for (int i = 0; i < 3; i++)
..	..	@@ -7552,14 +7788,14 @@
7552	7788	}
7553	7789	/**/
7554	7790
7555		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7791	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7556	7792
7557	7793	if (totalScale < 0.01)
7558	7794	{
7559	7795	totalScale = 0.01;
7560	7796	}
7561	7797
7562		- switch (info.pane.RenderCamera().viewCode)
	7798	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7799	{
7564	7800	case 3: // '\001'
7565	7801	if (modified \|\| opposite)
..	..	@@ -7626,7 +7862,7 @@
7626	7862	} // NEW ...
7627	7863
7628	7864
7629		- info.pane.repaint();
	7865	+ clickInfo.pane.repaint();
7630	7866	}
7631	7867
7632	7868	boolean overflow = false;
..	..	@@ -7967,6 +8203,10 @@
7967	8203	}
7968	8204
7969	8205	transient ObjEditor editWindow;
	8206	+ transient ObjEditor manipWindow;
	8207	+
	8208	+ transient boolean pinned;
	8209	+
7970	8210	transient ObjectUI objectUI;
7971	8211	public static int povDepth = 0;
7972	8212	private static cVector tbMin = new cVector();