~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,17 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
30	30	//
31	31
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ Object3D versions[];
	36	+ int versionindex = -1;
	37	+
32	38	ScriptNode scriptnode;
33	39
34	40	void InitOthers()
..	..	@@ -170,24 +176,35 @@
170	176
171	177	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	178	{
	179	+ Object3D o;
	180	+
173	181	if (hashtable.containsKey(GetUUID()))
174	182	{
175		- Object3D o = hashtable.get(GetUUID());
	183	+ o = hashtable.get(GetUUID());
176	184
177	185	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
180	194
181		- return;
	195	+ hashtable.put(GetUUID(), o);
182	196	}
183	197
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	198	+ if (!blockloop)
189	199	{
190		- get(i).ExtractBigData(hashtable);
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
191	208	}
192	209
193	210	ExtractBigData(o);
..	..	@@ -195,11 +212,26 @@
195	212
196	213	void ExtractBigData(Object3D o)
197	214	{
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
198	218	o.bRep = this.bRep;
199		- if (this.bRep != null)
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
200	229	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
203	235	}
204	236
205	237	// o.support = this.support;
..	..	@@ -223,19 +255,35 @@
223	255
224	256	RestoreBigData(o);
225	257
226		- hashtable.remove(GetUUID());
	258	+ if (blockloop)
	259	+ return;
	260	+
	261	+ blockloop = true;
	262	+
	263	+ //hashtable.remove(GetUUID());
227	264
228	265	for (int i=0; i<Size(); i++)
229	266	{
230	267	get(i).RestoreBigData(hashtable);
231	268	}
	269	+
	270	+ blockloop = false;
232	271	}
233	272
234	273	void RestoreBigData(Object3D o)
235	274	{
236	275	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
239	287	// this.support = o.support;
240	288	// this.fileparent = o.fileparent;
241	289	}
..	..	@@ -381,6 +429,7 @@
381	429	}
382	430
383	431	boolean live = false;
	432	+ transient boolean keepdontselect;
384	433	boolean dontselect = false;
385	434	boolean hide = false;
386	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +930,7 @@
881	930
882	931	if (marked && Globals.isLIVE() && live &&
883	932	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	934	currentframe != Globals.framecount)
886	935	{
887	936	currentframe = Globals.framecount;
..	..	@@ -966,6 +1015,10 @@
966	1015	if (material == null \|\| material.multiply)
967	1016	return true;
968	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1022	return material.opacity > 0.99;
970	1023	}
971	1024
..	..	@@ -1366,6 +1419,7 @@
1366	1419	toParent = LA.newMatrix();
1367	1420	fromParent = LA.newMatrix();
1368	1421	}
	1422	+
1369	1423	LA.matCopy(other.toParent, toParent);
1370	1424	LA.matCopy(other.fromParent, fromParent);
1371	1425
..	..	@@ -2387,6 +2441,10 @@
2387	2441	}
2388	2442	*/
2389	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2390	2448	}
2391	2449
2392	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2486,14 @@
2428	2486	{
2429	2487	editWindow.refreshContents();
2430	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2431	2497	//if (parent != null)
2432	2498	//parent.refreshEditWindow();
2433	2499	}
..	..	@@ -2507,7 +2573,8 @@
2507	2573	private static final int editSelf = 1;
2508	2574	private static final int editChild = 2;
2509	2575
2510		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2511	2578	{
2512	2579	if (level == 0)
2513	2580	{
..	..	@@ -2515,7 +2582,8 @@
2515	2582	return;
2516	2583
2517	2584	Object3D selectee;
2518		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2519	2587	{
2520	2588	selectee = (Object3D) e.nextElement();
2521	2589	}
..	..	@@ -2523,19 +2591,22 @@
2523	2591	} else
2524	2592	{
2525	2593	//super.
2526		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2527	2596	}
2528	2597	}
2529	2598
2530		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2531	2601	{
2532	2602	doSomething = 0;
2533	2603	if (level == 0)
2534	2604	{
2535		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2536	2606	}
2537	2607	if (//super.
2538		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2539	2610	{
2540	2611	doSomething = 1;
2541	2612	return true;
..	..	@@ -2545,7 +2616,7 @@
2545	2616	}
2546	2617	}
2547	2618
2548		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2549	2620	{
2550	2621	if (selection == null)
2551	2622	{
..	..	@@ -2558,7 +2629,8 @@
2558	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2630	{
2560	2631	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2562	2634	{
2563	2635	childToDrag = selectee;
2564	2636	doSomething = 2;
..	..	@@ -2570,13 +2642,15 @@
2570	2642	return retval;
2571	2643	}
2572	2644
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2574	2647	{
2575	2648	switch (doSomething)
2576	2649	{
2577	2650	case 1: // '\001'
2578	2651	//super.
2579		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2580	2654	break;
2581	2655
2582	2656	case 2: // '\002'
..	..	@@ -2589,11 +2663,13 @@
2589	2663	{
2590	2664	//sel.hitSomething = childToDrag.hitSomething;
2591	2665	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2593	2668	} else
2594	2669	{
2595	2670	//super.
2596		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2597	2673	}
2598	2674	}
2599	2675	break;
..	..	@@ -2611,6 +2687,9 @@
2611	2687	{
2612	2688	deselectAll();
2613	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2614	2693	ClickInfo newInfo = new ClickInfo();
2615	2694	newInfo.flags = info.flags;
2616	2695	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3137,7 @@
3058	3137	{
3059	3138	if (bRep != null)
3060	3139	{
3061		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3141	Touch();
3063	3142	}
3064	3143	}
..	..	@@ -4958,6 +5037,14 @@
4958	5037	}
4959	5038	}
4960	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4961	5048	cTreePath Select(int indexcount, boolean deselect)
4962	5049	{
4963	5050	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5081,11 @@
4994	5081	if (leaf != null)
4995	5082	{
4996	5083	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4998	5086	{
4999	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
5001	5089	}
5002	5090
5003	5091	return tp;
..	..	@@ -5014,6 +5102,7 @@
5014	5102
5015	5103	if (child == null)
5016	5104	continue;
	5105	+
5017	5106	if (child.HasTransparency() && child.size() != 0)
5018	5107	{
5019	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5112,10 @@
5023	5112	if (leaf != null)
5024	5113	{
5025	5114	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
5027	5117	{
5028		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
5029	5119	}
5030	5120
5031	5121	return tp;
..	..	@@ -5350,6 +5440,51 @@
5350	5440	blockloop = false;
5351	5441	}
5352	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5353	5488	boolean IsSelected()
5354	5489	{
5355	5490	if (parent == null)
..	..	@@ -5659,6 +5794,38 @@
5659	5794	}
5660	5795	}
5661	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5662	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5663	5830	{
5664	5831	Draw(display, root, selected, blocked);
..	..	@@ -5745,8 +5912,10 @@
5745	5912	if (support != null)
5746	5913	support = support;
5747	5914
5748		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5750	5919
5751	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	5921	{
..	..	@@ -5756,8 +5925,9 @@
5756	5925	// usecalllists &= !(parent instanceof RandomNode);
5757	5926	// usecalllists = false;
5758	5927
5759		- if (GetBRep() != null)
5760		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5761	5931	//System.out.println("draw " + this);
5762	5932	//new Exception().printStackTrace();
5763	5933
..	..	@@ -5767,7 +5937,7 @@
5767	5937
5768	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	5939	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	5941	{
5772	5942	Globals.lighttouched = true;
5773	5943	} // all panes...
..	..	@@ -5779,7 +5949,7 @@
5779	5949	if (!(this instanceof Composite))
5780	5950	touched = false;
5781	5951	//if (displaylist == -1 && usecalllists)
5782		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5783	5953	{
5784	5954	bRep.displaylist = display.GenList();
5785	5955	assert(bRep.displaylist != 0);
..	..	@@ -5790,7 +5960,7 @@
5790	5960
5791	5961	//System.out.println("\tnew list " + list);
5792	5962	//gl.glDrawBuffer(gl.GL_NONE);
5793		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5794	5964	{
5795	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5796	5966	display.NewList(bRep.displaylist);
..	..	@@ -5799,7 +5969,7 @@
5799	5969	CallList(display, root, selected, blocked);
5800	5970
5801	5971	// compiled = true;
5802		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5803	5973	{
5804	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5805	5975	display.EndList();
..	..	@@ -5899,6 +6069,7 @@
5899	6069	if (GetBRep() != null)
5900	6070	{
5901	6071	display.NextIndex();
	6072	+
5902	6073	// vertex color conflict : gl.glCallList(list);
5903	6074	DrawNode(display, root, selected);
5904	6075	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6530,11 @@
6359	6530	// dec 2012
6360	6531	new Exception().printStackTrace();
6361	6532	return;
	6533	+ }
	6534	+
	6535	+ if (dontselect)
	6536	+ {
	6537	+ //bRep.GenerateNormalsMINE();
6362	6538	}
6363	6539
6364	6540	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7320,23 @@
7144	7320	}
7145	7321	}
7146	7322
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
7148	7327	{
7149		- int hc = info.bounds.x + info.bounds.width / 2;
7150		- int vc = info.bounds.y + info.bounds.height / 2;
7151		- double[][] toscreen = info.toScreen;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
7152	7331	if (toscreen == null)
7153	7332	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7334	}
7156	7335	cVector vec = in;
7157	7336	LA.xformPos(in, toscreen, in);
7158	7337	//System.out.println("Distance = " + info.camera.Distance());
7159		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7160		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7340	outPt.x = hc + (int) vec.x;
7162	7341	outPt.y = vc - (int) vec.y;
7163	7342	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7344,18 @@
7165	7344	outRec.width = outRec.height = 6;
7166	7345	}
7167	7346
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
7169	7349	{
7170	7350	Point pt = new Point(0, 0);
7171	7351	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
7173	7354	return rec;
7174	7355	}
7175	7356
7176		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
7177	7359	{
7178	7360	if (level == 0)
7179	7361	{
..	..	@@ -7182,16 +7364,19 @@
7182	7364	{
7183	7365	cVector origin = new cVector();
7184	7366	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7371	Rectangle boundary = new Rectangle();
7187	7372	boundary.x = spot.x - 30;
7188	7373	boundary.y = spot.y - 30;
7189	7374	boundary.width = spot.width + 60;
7190	7375	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
7192	7377	int spotw = spot.x + spot.width;
7193	7378	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7380	// if (CameraPane.Xmin > spot.x)
7196	7381	// {
7197	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -7211,8 +7396,8 @@
7211	7396	spot.translate(32, 32);
7212	7397	spotw = spot.x + spot.width;
7213	7398	spoth = spot.y + spot.height;
7214		- info.g.setColor(Color.cyan);
7215		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7216	7401	// if (CameraPane.Xmin > spot.x)
7217	7402	// {
7218	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -7232,9 +7417,9 @@
7232	7417	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7418	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7234	7419	spot.translate(0, -32);
7235		- info.g.setColor(Color.yellow);
7236		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237		- info.g.setColor(Color.green);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
7238	7423	// if (CameraPane.Xmin > spot.x)
7239	7424	// {
7240	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7436,8 @@
7251	7436	// {
7252	7437	// CameraPane.Ymax = spoth;
7253	7438	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7442	// if (CameraPane.Xmin > boundary.x)
7258	7443	// {
..	..	@@ -7274,7 +7459,8 @@
7274	7459	}
7275	7460	}
7276	7461
7277		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7278	7464	{
7279	7465	if (level == 0)
7280	7466	{
..	..	@@ -7283,8 +7469,8 @@
7283	7469
7284	7470	boolean retval = false;
7285	7471
7286		- startX = info.x;
7287		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7288	7474
7289	7475	hitSomething = -1;
7290	7476	cVector origin = new cVector();
..	..	@@ -7294,22 +7480,51 @@
7294	7480	{
7295	7481	centerPt = new Point(0, 0);
7296	7482	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7486	{
7300	7487	hitSomething = hitCenter;
7301	7488	retval = true;
7302	7489	}
7303	7490	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7492	{
7306	7493	hitSomething = hitRotate;
7307	7494	retval = true;
7308	7495	}
7309	7496	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7498	{
7312	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7313	7528	retval = true;
7314	7529	}
7315	7530
..	..	@@ -7319,7 +7534,7 @@
7319	7534	}
7320	7535
7321	7536	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7538	//System.out.println("modified = " + modified);
7324	7539	//new Exception().printStackTrace();
7325	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7562,8 @@
7347	7562	return true;
7348	7563	}
7349	7564
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7351	7567	{
7352	7568	if (hitSomething == 0)
7353	7569	{
..	..	@@ -7361,7 +7577,7 @@
7361	7577
7362	7578	//System.out.println("hitSomething = " + hitSomething);
7363	7579
7364		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7581
7366	7582	cVector xlate = new cVector();
7367	7583	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7611,8 @@
7395	7611	toParent[3][i] = xlate.get(i);
7396	7612	LA.matInvert(toParent, fromParent);
7397	7613	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7616
7401	7617	LA.matCopy(startMat, toParent);
7402	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7621,7 @@
7405	7621	} else
7406	7622	{
7407	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7409	7625	cVector away = new cVector();
7410	7626	//cVector right2 = new cVector();
7411	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7638,19 @@
7422	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7639	// if (!CameraPane.LOCALTRANSFORM)
7424	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7642	// if (!CameraPane.LOCALTRANSFORM)
7427	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7644	//LA.vecCross(up, cVector.Z, right2);
7429	7645
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7647
7432	7648	//System.out.println("DELTA0 = " + delta);
7433	7649	//System.out.println("AWAY = " + info.camera.away);
7434	7650	//System.out.println("UP = " + info.camera.up);
7435	7651	if (away.z > 0)
7436	7652	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7654	{
7439	7655	delta.x = -delta.x;
7440	7656	} else
..	..	@@ -7449,7 +7665,7 @@
7449	7665	//System.out.println("DELTA1 = " + delta);
7450	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7667	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7669	LA.matCopy(startMat, toParent);
7454	7670	//System.out.println("DELTA3 = " + delta);
7455	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7675,8 @@
7459	7675	break;
7460	7676
7461	7677	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7464	7680	double angle = (double) Math.atan2(dx, dy);
7465	7681	angle = -(1.570796 - angle);
7466	7682
..	..	@@ -7483,7 +7699,7 @@
7483	7699	}
7484	7700	/**/
7485	7701
7486		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7703	{
7488	7704	case 1: // '\001'
7489	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7726,7 @@
7510	7726	break;
7511	7727
7512	7728	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7514	7730	double sign = 1;
7515	7731	if (hScale < 0)
7516	7732	{
..	..	@@ -7522,7 +7738,7 @@
7522	7738	//hScale = 0.01;
7523	7739	}
7524	7740
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7526	7742	sign = 1;
7527	7743	if (vScale < 0)
7528	7744	{
..	..	@@ -7533,6 +7749,7 @@
7533	7749	{
7534	7750	//vScale = 0.01;
7535	7751	}
	7752	+
7536	7753	LA.matCopy(startMat, toParent);
7537	7754	/**/
7538	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7542,14 +7759,14 @@
7542	7759	}
7543	7760	/**/
7544	7761
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7763
7547	7764	if (totalScale < 0.01)
7548	7765	{
7549	7766	totalScale = 0.01;
7550	7767	}
7551	7768
7552		- switch (info.pane.RenderCamera().viewCode)
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7770	{
7554	7771	case 3: // '\001'
7555	7772	if (modified \|\| opposite)
..	..	@@ -7616,7 +7833,7 @@
7616	7833	} // NEW ...
7617	7834
7618	7835
7619		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7620	7837	}
7621	7838
7622	7839	boolean overflow = false;
..	..	@@ -7796,6 +8013,10 @@
7796	8013	editWindow = null;
7797	8014	} // ?
7798	8015	}
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
	8019	+ }
7799	8020	}
7800	8021
7801	8022	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8174,10 @@
7953	8174	}
7954	8175
7955	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7956	8181	transient ObjectUI objectUI;
7957	8182	public static int povDepth = 0;
7958	8183	private static cVector tbMin = new cVector();