~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
..	..	@@ -2432,6 +2486,14 @@
2432	2486	{
2433	2487	editWindow.refreshContents();
2434	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2435	2497	//if (parent != null)
2436	2498	//parent.refreshEditWindow();
2437	2499	}
..	..	@@ -2511,7 +2573,8 @@
2511	2573	private static final int editSelf = 1;
2512	2574	private static final int editChild = 2;
2513	2575
2514		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2515	2578	{
2516	2579	if (level == 0)
2517	2580	{
..	..	@@ -2519,7 +2582,8 @@
2519	2582	return;
2520	2583
2521	2584	Object3D selectee;
2522		- 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))
2523	2587	{
2524	2588	selectee = (Object3D) e.nextElement();
2525	2589	}
..	..	@@ -2527,19 +2591,22 @@
2527	2591	} else
2528	2592	{
2529	2593	//super.
2530		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2531	2596	}
2532	2597	}
2533	2598
2534		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2535	2601	{
2536	2602	doSomething = 0;
2537	2603	if (level == 0)
2538	2604	{
2539		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2540	2606	}
2541	2607	if (//super.
2542		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2543	2610	{
2544	2611	doSomething = 1;
2545	2612	return true;
..	..	@@ -2549,7 +2616,7 @@
2549	2616	}
2550	2617	}
2551	2618
2552		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2553	2620	{
2554	2621	if (selection == null)
2555	2622	{
..	..	@@ -2562,7 +2629,8 @@
2562	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2563	2630	{
2564	2631	Object3D selectee = (Object3D) e.nextElement();
2565		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2566	2634	{
2567	2635	childToDrag = selectee;
2568	2636	doSomething = 2;
..	..	@@ -2574,13 +2642,15 @@
2574	2642	return retval;
2575	2643	}
2576	2644
2577		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2578	2647	{
2579	2648	switch (doSomething)
2580	2649	{
2581	2650	case 1: // '\001'
2582	2651	//super.
2583		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2584	2654	break;
2585	2655
2586	2656	case 2: // '\002'
..	..	@@ -2593,11 +2663,13 @@
2593	2663	{
2594	2664	//sel.hitSomething = childToDrag.hitSomething;
2595	2665	//childToDrag.doEditDrag(info);
2596		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2597	2668	} else
2598	2669	{
2599	2670	//super.
2600		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2601	2673	}
2602	2674	}
2603	2675	break;
..	..	@@ -2615,6 +2687,9 @@
2615	2687	{
2616	2688	deselectAll();
2617	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2618	2693	ClickInfo newInfo = new ClickInfo();
2619	2694	newInfo.flags = info.flags;
2620	2695	newInfo.bounds = info.bounds;
..	..	@@ -3062,7 +3137,7 @@
3062	3137	{
3063	3138	if (bRep != null)
3064	3139	{
3065		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3066	3141	Touch();
3067	3142	}
3068	3143	}
..	..	@@ -4962,6 +5037,14 @@
4962	5037	}
4963	5038	}
4964	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4965	5048	cTreePath Select(int indexcount, boolean deselect)
4966	5049	{
4967	5050	if (hide \|\| dontselect)
..	..	@@ -4998,10 +5081,11 @@
4998	5081	if (leaf != null)
4999	5082	{
5000	5083	cTreePath tp = new cTreePath(this, leaf);
5001		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
5002	5086	{
5003	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
5004		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
5005	5089	}
5006	5090
5007	5091	return tp;
..	..	@@ -5018,6 +5102,7 @@
5018	5102
5019	5103	if (child == null)
5020	5104	continue;
	5105	+
5021	5106	if (child.HasTransparency() && child.size() != 0)
5022	5107	{
5023	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5027,9 +5112,10 @@
5027	5112	if (leaf != null)
5028	5113	{
5029	5114	cTreePath tp = new cTreePath(this, leaf);
5030		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
5031	5117	{
5032		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
5033	5119	}
5034	5120
5035	5121	return tp;
..	..	@@ -5354,6 +5440,51 @@
5354	5440	blockloop = false;
5355	5441	}
5356	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	+
5357	5488	boolean IsSelected()
5358	5489	{
5359	5490	if (parent == null)
..	..	@@ -5663,6 +5794,38 @@
5663	5794	}
5664	5795	}
5665	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	+
5666	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5667	5830	{
5668	5831	Draw(display, root, selected, blocked);
..	..	@@ -5749,8 +5912,10 @@
5749	5912	if (support != null)
5750	5913	support = support;
5751	5914
5752		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5753		- 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.
5754	5919
5755	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5756	5921	{
..	..	@@ -5760,8 +5925,9 @@
5760	5925	// usecalllists &= !(parent instanceof RandomNode);
5761	5926	// usecalllists = false;
5762	5927
5763		- if (GetBRep() != null)
5764		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5765	5931	//System.out.println("draw " + this);
5766	5932	//new Exception().printStackTrace();
5767	5933
..	..	@@ -5771,7 +5937,7 @@
5771	5937
5772	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5773	5939	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5774		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5775	5941	{
5776	5942	Globals.lighttouched = true;
5777	5943	} // all panes...
..	..	@@ -5783,7 +5949,7 @@
5783	5949	if (!(this instanceof Composite))
5784	5950	touched = false;
5785	5951	//if (displaylist == -1 && usecalllists)
5786		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5787	5953	{
5788	5954	bRep.displaylist = display.GenList();
5789	5955	assert(bRep.displaylist != 0);
..	..	@@ -5794,7 +5960,7 @@
5794	5960
5795	5961	//System.out.println("\tnew list " + list);
5796	5962	//gl.glDrawBuffer(gl.GL_NONE);
5797		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5798	5964	{
5799	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5800	5966	display.NewList(bRep.displaylist);
..	..	@@ -5803,7 +5969,7 @@
5803	5969	CallList(display, root, selected, blocked);
5804	5970
5805	5971	// compiled = true;
5806		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5807	5973	{
5808	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5809	5975	display.EndList();
..	..	@@ -5903,6 +6069,7 @@
5903	6069	if (GetBRep() != null)
5904	6070	{
5905	6071	display.NextIndex();
	6072	+
5906	6073	// vertex color conflict : gl.glCallList(list);
5907	6074	DrawNode(display, root, selected);
5908	6075	if (this instanceof BezierPatch)
..	..	@@ -7153,20 +7320,23 @@
7153	7320	}
7154	7321	}
7155	7322
7156		- 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)
7157	7327	{
7158		- int hc = info.bounds.x + info.bounds.width / 2;
7159		- int vc = info.bounds.y + info.bounds.height / 2;
7160		- 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;
7161	7331	if (toscreen == null)
7162	7332	{
7163		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7164	7334	}
7165	7335	cVector vec = in;
7166	7336	LA.xformPos(in, toscreen, in);
7167	7337	//System.out.println("Distance = " + info.camera.Distance());
7168		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7169		- 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();
7170	7340	outPt.x = hc + (int) vec.x;
7171	7341	outPt.y = vc - (int) vec.y;
7172	7342	outRec.x = outPt.x - 3;
..	..	@@ -7174,15 +7344,18 @@
7174	7344	outRec.width = outRec.height = 6;
7175	7345	}
7176	7346
7177		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
7178	7349	{
7179	7350	Point pt = new Point(0, 0);
7180	7351	Rectangle rec = new Rectangle();
7181		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
7182	7354	return rec;
7183	7355	}
7184	7356
7185		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
7186	7359	{
7187	7360	if (level == 0)
7188	7361	{
..	..	@@ -7191,16 +7364,19 @@
7191	7364	{
7192	7365	cVector origin = new cVector();
7193	7366	//LA.xformPos(origin, toParent, origin);
7194		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7195	7371	Rectangle boundary = new Rectangle();
7196	7372	boundary.x = spot.x - 30;
7197	7373	boundary.y = spot.y - 30;
7198	7374	boundary.width = spot.width + 60;
7199	7375	boundary.height = spot.height + 60;
7200		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
7201	7377	int spotw = spot.x + spot.width;
7202	7378	int spoth = spot.y + spot.height;
7203		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7204	7380	// if (CameraPane.Xmin > spot.x)
7205	7381	// {
7206	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -7220,8 +7396,8 @@
7220	7396	spot.translate(32, 32);
7221	7397	spotw = spot.x + spot.width;
7222	7398	spoth = spot.y + spot.height;
7223		- info.g.setColor(Color.cyan);
7224		- 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);
7225	7401	// if (CameraPane.Xmin > spot.x)
7226	7402	// {
7227	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -7241,9 +7417,9 @@
7241	7417	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7242	7418	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7243	7419	spot.translate(0, -32);
7244		- info.g.setColor(Color.yellow);
7245		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7246		- 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);
7247	7423	// if (CameraPane.Xmin > spot.x)
7248	7424	// {
7249	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -7260,8 +7436,8 @@
7260	7436	// {
7261	7437	// CameraPane.Ymax = spoth;
7262	7438	// }
7263		- info.g.drawArc(boundary.x, boundary.y,
7264		- 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);
7265	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7266	7442	// if (CameraPane.Xmin > boundary.x)
7267	7443	// {
..	..	@@ -7283,7 +7459,8 @@
7283	7459	}
7284	7460	}
7285	7461
7286		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7287	7464	{
7288	7465	if (level == 0)
7289	7466	{
..	..	@@ -7292,8 +7469,8 @@
7292	7469
7293	7470	boolean retval = false;
7294	7471
7295		- startX = info.x;
7296		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7297	7474
7298	7475	hitSomething = -1;
7299	7476	cVector origin = new cVector();
..	..	@@ -7303,22 +7480,51 @@
7303	7480	{
7304	7481	centerPt = new Point(0, 0);
7305	7482	}
7306		- calcHotSpot(origin, info, centerPt, spot);
7307		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7308	7486	{
7309	7487	hitSomething = hitCenter;
7310	7488	retval = true;
7311	7489	}
7312	7490	spot.translate(32, 0);
7313		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7314	7492	{
7315	7493	hitSomething = hitRotate;
7316	7494	retval = true;
7317	7495	}
7318	7496	spot.translate(0, 32);
7319		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7320	7498	{
7321	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	+
7322	7528	retval = true;
7323	7529	}
7324	7530
..	..	@@ -7328,7 +7534,7 @@
7328	7534	}
7329	7535
7330	7536	//System.out.println("info.modifiers = " + info.modifiers);
7331		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7332	7538	//System.out.println("modified = " + modified);
7333	7539	//new Exception().printStackTrace();
7334	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7356,7 +7562,8 @@
7356	7562	return true;
7357	7563	}
7358	7564
7359		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7360	7567	{
7361	7568	if (hitSomething == 0)
7362	7569	{
..	..	@@ -7370,7 +7577,7 @@
7370	7577
7371	7578	//System.out.println("hitSomething = " + hitSomething);
7372	7579
7373		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
7374	7581
7375	7582	cVector xlate = new cVector();
7376	7583	//cVector xlate2 = new cVector();
..	..	@@ -7404,8 +7611,8 @@
7404	7611	toParent[3][i] = xlate.get(i);
7405	7612	LA.matInvert(toParent, fromParent);
7406	7613	*/
7407		- cVector delta = LA.newVector(0, 0, startY - info.y);
7408		- 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);
7409	7616
7410	7617	LA.matCopy(startMat, toParent);
7411	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7414,7 +7621,7 @@
7414	7621	} else
7415	7622	{
7416	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7417		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7418	7625	cVector away = new cVector();
7419	7626	//cVector right2 = new cVector();
7420	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7431,19 +7638,19 @@
7431	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7432	7639	// if (!CameraPane.LOCALTRANSFORM)
7433	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7434		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7435	7642	// if (!CameraPane.LOCALTRANSFORM)
7436	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7437	7644	//LA.vecCross(up, cVector.Z, right2);
7438	7645
7439		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7440	7647
7441	7648	//System.out.println("DELTA0 = " + delta);
7442	7649	//System.out.println("AWAY = " + info.camera.away);
7443	7650	//System.out.println("UP = " + info.camera.up);
7444	7651	if (away.z > 0)
7445	7652	{
7446		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7447	7654	{
7448	7655	delta.x = -delta.x;
7449	7656	} else
..	..	@@ -7458,7 +7665,7 @@
7458	7665	//System.out.println("DELTA1 = " + delta);
7459	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7460	7667	//System.out.println("DELTA2 = " + delta);
7461		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7462	7669	LA.matCopy(startMat, toParent);
7463	7670	//System.out.println("DELTA3 = " + delta);
7464	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7468,8 +7675,8 @@
7468	7675	break;
7469	7676
7470	7677	case hitRotate: // rotate
7471		- int dx = info.x - centerPt.x;
7472		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7473	7680	double angle = (double) Math.atan2(dx, dy);
7474	7681	angle = -(1.570796 - angle);
7475	7682
..	..	@@ -7492,7 +7699,7 @@
7492	7699	}
7493	7700	/**/
7494	7701
7495		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7496	7703	{
7497	7704	case 1: // '\001'
7498	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7519,7 +7726,7 @@
7519	7726	break;
7520	7727
7521	7728	case hitScale: // scale
7522		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7523	7730	double sign = 1;
7524	7731	if (hScale < 0)
7525	7732	{
..	..	@@ -7531,7 +7738,7 @@
7531	7738	//hScale = 0.01;
7532	7739	}
7533	7740
7534		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7535	7742	sign = 1;
7536	7743	if (vScale < 0)
7537	7744	{
..	..	@@ -7542,6 +7749,7 @@
7542	7749	{
7543	7750	//vScale = 0.01;
7544	7751	}
	7752	+
7545	7753	LA.matCopy(startMat, toParent);
7546	7754	/**/
7547	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7551,14 +7759,14 @@
7551	7759	}
7552	7760	/**/
7553	7761
7554		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7555	7763
7556	7764	if (totalScale < 0.01)
7557	7765	{
7558	7766	totalScale = 0.01;
7559	7767	}
7560	7768
7561		- switch (info.pane.RenderCamera().viewCode)
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7562	7770	{
7563	7771	case 3: // '\001'
7564	7772	if (modified \|\| opposite)
..	..	@@ -7625,7 +7833,7 @@
7625	7833	} // NEW ...
7626	7834
7627	7835
7628		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7629	7837	}
7630	7838
7631	7839	boolean overflow = false;
..	..	@@ -7966,6 +8174,10 @@
7966	8174	}
7967	8175
7968	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7969	8181	transient ObjectUI objectUI;
7970	8182	public static int povDepth = 0;
7971	8183	private static cVector tbMin = new cVector();