~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
..	..	@@ -881,7 +954,7 @@
881	954
882	955	if (marked && Globals.isLIVE() && live &&
883	956	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	958	currentframe != Globals.framecount)
886	959	{
887	960	currentframe = Globals.framecount;
..	..	@@ -966,6 +1039,10 @@
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	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1046	return material.opacity > 0.99;
970	1047	}
971	1048
..	..	@@ -1366,6 +1443,7 @@
1366	1443	toParent = LA.newMatrix();
1367	1444	fromParent = LA.newMatrix();
1368	1445	}
	1446	+
1369	1447	LA.matCopy(other.toParent, toParent);
1370	1448	LA.matCopy(other.fromParent, fromParent);
1371	1449
..	..	@@ -2432,6 +2510,14 @@
2432	2510	{
2433	2511	editWindow.refreshContents();
2434	2512	}
	2513	+ else
	2514	+ {
	2515	+ if (manipWindow != null)
	2516	+ {
	2517	+ manipWindow.refreshContents();
	2518	+ }
	2519	+ }
	2520	+
2435	2521	//if (parent != null)
2436	2522	//parent.refreshEditWindow();
2437	2523	}
..	..	@@ -2511,7 +2597,8 @@
2511	2597	private static final int editSelf = 1;
2512	2598	private static final int editChild = 2;
2513	2599
2514		- void drawEditHandles(ClickInfo info, int level)
	2600	+ void drawEditHandles(//ClickInfo info,
	2601	+ int level)
2515	2602	{
2516	2603	if (level == 0)
2517	2604	{
..	..	@@ -2519,7 +2606,8 @@
2519	2606	return;
2520	2607
2521	2608	Object3D selectee;
2522		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2609	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2610	+ level + 1))
2523	2611	{
2524	2612	selectee = (Object3D) e.nextElement();
2525	2613	}
..	..	@@ -2527,19 +2615,22 @@
2527	2615	} else
2528	2616	{
2529	2617	//super.
2530		- drawEditHandles0(info, level + 1);
	2618	+ drawEditHandles0(//info,
	2619	+ level + 1);
2531	2620	}
2532	2621	}
2533	2622
2534		- boolean doEditClick(ClickInfo info, int level)
	2623	+ boolean doEditClick(//ClickInfo info,
	2624	+ int level)
2535	2625	{
2536	2626	doSomething = 0;
2537	2627	if (level == 0)
2538	2628	{
2539		- return doParentClick(info);
	2629	+ return doParentClick(); //info);
2540	2630	}
2541	2631	if (//super.
2542		- doEditClick0(info, level))
	2632	+ doEditClick0(//info,
	2633	+ level))
2543	2634	{
2544	2635	doSomething = 1;
2545	2636	return true;
..	..	@@ -2549,7 +2640,7 @@
2549	2640	}
2550	2641	}
2551	2642
2552		- boolean doParentClick(ClickInfo info)
	2643	+ boolean doParentClick() //ClickInfo info)
2553	2644	{
2554	2645	if (selection == null)
2555	2646	{
..	..	@@ -2562,7 +2653,8 @@
2562	2653	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2563	2654	{
2564	2655	Object3D selectee = (Object3D) e.nextElement();
2565		- if (selectee.doEditClick(info, 1))
	2656	+ if (selectee.doEditClick(//info,
	2657	+ 1))
2566	2658	{
2567	2659	childToDrag = selectee;
2568	2660	doSomething = 2;
..	..	@@ -2574,13 +2666,15 @@
2574	2666	return retval;
2575	2667	}
2576	2668
2577		- void doEditDrag(ClickInfo info, boolean opposite)
	2669	+ void doEditDrag(//ClickInfo clickInfo,
	2670	+ boolean opposite)
2578	2671	{
2579	2672	switch (doSomething)
2580	2673	{
2581	2674	case 1: // '\001'
2582	2675	//super.
2583		- doEditDrag0(info, opposite);
	2676	+ doEditDrag0(//clickInfo,
	2677	+ opposite);
2584	2678	break;
2585	2679
2586	2680	case 2: // '\002'
..	..	@@ -2593,11 +2687,13 @@
2593	2687	{
2594	2688	//sel.hitSomething = childToDrag.hitSomething;
2595	2689	//childToDrag.doEditDrag(info);
2596		- sel.doEditDrag(info, opposite);
	2690	+ sel.doEditDrag(//clickInfo,
	2691	+ opposite);
2597	2692	} else
2598	2693	{
2599	2694	//super.
2600		- doEditDrag0(info, opposite);
	2695	+ doEditDrag0(//clickInfo,
	2696	+ opposite);
2601	2697	}
2602	2698	}
2603	2699	break;
..	..	@@ -2615,6 +2711,9 @@
2615	2711	{
2616	2712	deselectAll();
2617	2713	}
	2714	+
	2715	+ new Exception().printStackTrace();
	2716	+
2618	2717	ClickInfo newInfo = new ClickInfo();
2619	2718	newInfo.flags = info.flags;
2620	2719	newInfo.bounds = info.bounds;
..	..	@@ -3062,7 +3161,7 @@
3062	3161	{
3063	3162	if (bRep != null)
3064	3163	{
3065		- bRep.GenerateNormalsMINE();
	3164	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3066	3165	Touch();
3067	3166	}
3068	3167	}
..	..	@@ -4962,6 +5061,14 @@
4962	5061	}
4963	5062	}
4964	5063
	5064	+ ObjEditor GetWindow()
	5065	+ {
	5066	+ if (editWindow != null)
	5067	+ return editWindow;
	5068	+
	5069	+ return manipWindow;
	5070	+ }
	5071	+
4965	5072	cTreePath Select(int indexcount, boolean deselect)
4966	5073	{
4967	5074	if (hide \|\| dontselect)
..	..	@@ -4998,10 +5105,11 @@
4998	5105	if (leaf != null)
4999	5106	{
5000	5107	cTreePath tp = new cTreePath(this, leaf);
5001		- if (editWindow != null)
	5108	+ ObjEditor window = GetWindow();
	5109	+ if (window != null)
5002	5110	{
5003	5111	//System.out.println("editWindow = " + editWindow + " vs " + this);
5004		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
5005	5113	}
5006	5114
5007	5115	return tp;
..	..	@@ -5018,6 +5126,7 @@
5018	5126
5019	5127	if (child == null)
5020	5128	continue;
	5129	+
5021	5130	if (child.HasTransparency() && child.size() != 0)
5022	5131	{
5023	5132	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5027,9 +5136,10 @@
5027	5136	if (leaf != null)
5028	5137	{
5029	5138	cTreePath tp = new cTreePath(this, leaf);
5030		- if (editWindow != null)
	5139	+ ObjEditor window = GetWindow();
	5140	+ if (window != null)
5031	5141	{
5032		- editWindow.Select(tp, deselect, true);
	5142	+ window.Select(tp, deselect, true);
5033	5143	}
5034	5144
5035	5145	return tp;
..	..	@@ -5354,6 +5464,51 @@
5354	5464	blockloop = false;
5355	5465	}
5356	5466
	5467	+ void ResetSelectable()
	5468	+ {
	5469	+ if (blockloop)
	5470	+ return;
	5471	+
	5472	+ blockloop = true;
	5473	+
	5474	+ keepdontselect = dontselect;
	5475	+ dontselect = true;
	5476	+
	5477	+ Object3D child;
	5478	+ int nb = Size();
	5479	+ for (int i = 0; i < nb; i++)
	5480	+ {
	5481	+ child = (Object3D) get(i);
	5482	+ if (child == null)
	5483	+ continue;
	5484	+ child.ResetSelectable();
	5485	+ }
	5486	+
	5487	+ blockloop = false;
	5488	+ }
	5489	+
	5490	+ void RestoreSelectable()
	5491	+ {
	5492	+ if (blockloop)
	5493	+ return;
	5494	+
	5495	+ blockloop = true;
	5496	+
	5497	+ dontselect = keepdontselect;
	5498	+
	5499	+ Object3D child;
	5500	+ int nb = Size();
	5501	+ for (int i = 0; i < nb; i++)
	5502	+ {
	5503	+ child = (Object3D) get(i);
	5504	+ if (child == null)
	5505	+ continue;
	5506	+ child.RestoreSelectable();
	5507	+ }
	5508	+
	5509	+ blockloop = false;
	5510	+ }
	5511	+
5357	5512	boolean IsSelected()
5358	5513	{
5359	5514	if (parent == null)
..	..	@@ -5663,6 +5818,38 @@
5663	5818	}
5664	5819	}
5665	5820
	5821	+ void EmbedTextures(boolean embed)
	5822	+ {
	5823	+ if (blockloop)
	5824	+ return;
	5825	+
	5826	+ //if (GetTextures() != null)
	5827	+ if (embed)
	5828	+ CameraPane.EmbedTextures(GetTextures());
	5829	+ else
	5830	+ {
	5831	+ GetTextures().pigmentdata = null;
	5832	+ GetTextures().bumpdata = null;
	5833	+ GetTextures().pw = 0;
	5834	+ GetTextures().ph = 0;
	5835	+ GetTextures().bw = 0;
	5836	+ GetTextures().bh = 0;
	5837	+ }
	5838	+
	5839	+ int nb = Size();
	5840	+ for (int i = 0; i < nb; i++)
	5841	+ {
	5842	+ Object3D child = (Object3D) get(i);
	5843	+
	5844	+ if (child == null)
	5845	+ continue;
	5846	+
	5847	+ blockloop = true;
	5848	+ child.EmbedTextures(embed);
	5849	+ blockloop = false;
	5850	+ }
	5851	+ }
	5852	+
5666	5853	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5667	5854	{
5668	5855	Draw(display, root, selected, blocked);
..	..	@@ -5749,8 +5936,10 @@
5749	5936	if (support != null)
5750	5937	support = support;
5751	5938
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);
	5939	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+
	5942	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5754	5943
5755	5944	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5756	5945	{
..	..	@@ -5760,8 +5949,9 @@
5760	5949	// usecalllists &= !(parent instanceof RandomNode);
5761	5950	// usecalllists = false;
5762	5951
5763		- if (GetBRep() != null)
5764		- usecalllists = usecalllists;
	5952	+ if (display.DrawMode() == display.SHADOW)
	5953	+ //GetBRep() != null)
	5954	+ usecalllists = !!usecalllists;
5765	5955	//System.out.println("draw " + this);
5766	5956	//new Exception().printStackTrace();
5767	5957
..	..	@@ -5771,7 +5961,7 @@
5771	5961
5772	5962	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5773	5963	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5774		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5964	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5775	5965	{
5776	5966	Globals.lighttouched = true;
5777	5967	} // all panes...
..	..	@@ -5783,7 +5973,7 @@
5783	5973	if (!(this instanceof Composite))
5784	5974	touched = false;
5785	5975	//if (displaylist == -1 && usecalllists)
5786		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5976	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5787	5977	{
5788	5978	bRep.displaylist = display.GenList();
5789	5979	assert(bRep.displaylist != 0);
..	..	@@ -5794,7 +5984,7 @@
5794	5984
5795	5985	//System.out.println("\tnew list " + list);
5796	5986	//gl.glDrawBuffer(gl.GL_NONE);
5797		- if (usecalllists)
	5987	+ if (usecalllists && bRep.displaylist > 0)
5798	5988	{
5799	5989	// System.err.println("new list " + bRep.displaylist + " for " + this);
5800	5990	display.NewList(bRep.displaylist);
..	..	@@ -5803,7 +5993,7 @@
5803	5993	CallList(display, root, selected, blocked);
5804	5994
5805	5995	// compiled = true;
5806		- if (usecalllists)
	5996	+ if (usecalllists && bRep.displaylist > 0)
5807	5997	{
5808	5998	// System.err.println("end list " + bRep.displaylist + " for " + this);
5809	5999	display.EndList();
..	..	@@ -5903,6 +6093,7 @@
5903	6093	if (GetBRep() != null)
5904	6094	{
5905	6095	display.NextIndex();
	6096	+
5906	6097	// vertex color conflict : gl.glCallList(list);
5907	6098	DrawNode(display, root, selected);
5908	6099	if (this instanceof BezierPatch)
..	..	@@ -7153,20 +7344,23 @@
7153	7344	}
7154	7345	}
7155	7346
7156		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7347	+ static ClickInfo clickInfo = new ClickInfo();
	7348	+
	7349	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7350	+ Point outPt, Rectangle outRec)
7157	7351	{
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;
	7352	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7353	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7354	+ double[][] toscreen = clickInfo.toScreen;
7161	7355	if (toscreen == null)
7162	7356	{
7163		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7357	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7164	7358	}
7165	7359	cVector vec = in;
7166	7360	LA.xformPos(in, toscreen, in);
7167	7361	//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();
	7362	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7363	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7170	7364	outPt.x = hc + (int) vec.x;
7171	7365	outPt.y = vc - (int) vec.y;
7172	7366	outRec.x = outPt.x - 3;
..	..	@@ -7174,15 +7368,18 @@
7174	7368	outRec.width = outRec.height = 6;
7175	7369	}
7176	7370
7177		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7371	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7372	+ )
7178	7373	{
7179	7374	Point pt = new Point(0, 0);
7180	7375	Rectangle rec = new Rectangle();
7181		- calcHotSpot(in, info, pt, rec);
	7376	+ calcHotSpot(in, //clickInfo,
	7377	+ pt, rec);
7182	7378	return rec;
7183	7379	}
7184	7380
7185		- void drawEditHandles0(ClickInfo info, int level)
	7381	+ void drawEditHandles0(//ClickInfo clickInfo,
	7382	+ int level)
7186	7383	{
7187	7384	if (level == 0)
7188	7385	{
..	..	@@ -7191,16 +7388,19 @@
7191	7388	{
7192	7389	cVector origin = new cVector();
7193	7390	//LA.xformPos(origin, toParent, origin);
7194		- Rectangle spot = calcHotSpot(origin, info);
	7391	+ if (this.clickInfo == null)
	7392	+ this.clickInfo = new ClickInfo();
	7393	+
	7394	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7195	7395	Rectangle boundary = new Rectangle();
7196	7396	boundary.x = spot.x - 30;
7197	7397	boundary.y = spot.y - 30;
7198	7398	boundary.width = spot.width + 60;
7199	7399	boundary.height = spot.height + 60;
7200		- info.g.setColor(Color.red);
	7400	+ clickInfo.g.setColor(Color.red);
7201	7401	int spotw = spot.x + spot.width;
7202	7402	int spoth = spot.y + spot.height;
7203		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7403	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7204	7404	// if (CameraPane.Xmin > spot.x)
7205	7405	// {
7206	7406	// CameraPane.Xmin = spot.x;
..	..	@@ -7220,8 +7420,8 @@
7220	7420	spot.translate(32, 32);
7221	7421	spotw = spot.x + spot.width;
7222	7422	spoth = spot.y + spot.height;
7223		- info.g.setColor(Color.cyan);
7224		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.setColor(Color.cyan);
	7424	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7225	7425	// if (CameraPane.Xmin > spot.x)
7226	7426	// {
7227	7427	// CameraPane.Xmin = spot.x;
..	..	@@ -7241,9 +7441,9 @@
7241	7441	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7242	7442	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7243	7443	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);
	7444	+ clickInfo.g.setColor(Color.yellow);
	7445	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7446	+ clickInfo.g.setColor(Color.green);
7247	7447	// if (CameraPane.Xmin > spot.x)
7248	7448	// {
7249	7449	// CameraPane.Xmin = spot.x;
..	..	@@ -7260,8 +7460,8 @@
7260	7460	// {
7261	7461	// CameraPane.Ymax = spoth;
7262	7462	// }
7263		- info.g.drawArc(boundary.x, boundary.y,
7264		- boundary.width, boundary.height, 0, 360);
	7463	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7464	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7265	7465	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7266	7466	// if (CameraPane.Xmin > boundary.x)
7267	7467	// {
..	..	@@ -7283,7 +7483,8 @@
7283	7483	}
7284	7484	}
7285	7485
7286		- boolean doEditClick0(ClickInfo info, int level)
	7486	+ boolean doEditClick0(//ClickInfo clickInfo,
	7487	+ int level)
7287	7488	{
7288	7489	if (level == 0)
7289	7490	{
..	..	@@ -7292,8 +7493,8 @@
7292	7493
7293	7494	boolean retval = false;
7294	7495
7295		- startX = info.x;
7296		- startY = info.y;
	7496	+ startX = clickInfo.x;
	7497	+ startY = clickInfo.y;
7297	7498
7298	7499	hitSomething = -1;
7299	7500	cVector origin = new cVector();
..	..	@@ -7303,22 +7504,51 @@
7303	7504	{
7304	7505	centerPt = new Point(0, 0);
7305	7506	}
7306		- calcHotSpot(origin, info, centerPt, spot);
7307		- if (spot.contains(info.x, info.y))
	7507	+ calcHotSpot(origin, //info,
	7508	+ centerPt, spot);
	7509	+ if (spot.contains(clickInfo.x, clickInfo.y))
7308	7510	{
7309	7511	hitSomething = hitCenter;
7310	7512	retval = true;
7311	7513	}
7312	7514	spot.translate(32, 0);
7313		- if (spot.contains(info.x, info.y))
	7515	+ if (spot.contains(clickInfo.x, clickInfo.y))
7314	7516	{
7315	7517	hitSomething = hitRotate;
7316	7518	retval = true;
7317	7519	}
7318	7520	spot.translate(0, 32);
7319		- if (spot.contains(info.x, info.y))
	7521	+ if (spot.contains(clickInfo.x, clickInfo.y))
7320	7522	{
7321	7523	hitSomething = hitScale;
	7524	+
	7525	+ double scale = 0.005f * clickInfo.camera.Distance();
	7526	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7527	+ double sign = 1;
	7528	+ if (hScale < 0)
	7529	+ {
	7530	+ sign = -1;
	7531	+ }
	7532	+ hScale = signMath.pow(signhScale, scale * 50);
	7533	+ if (hScale < 0.01)
	7534	+ {
	7535	+ //hScale = 0.01;
	7536	+ }
	7537	+
	7538	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7539	+ sign = 1;
	7540	+ if (vScale < 0)
	7541	+ {
	7542	+ sign = -1;
	7543	+ }
	7544	+ vScale = signMath.pow(signvScale, scale * 50);
	7545	+ if (vScale < 0.01)
	7546	+ {
	7547	+ //vScale = 0.01;
	7548	+ }
	7549	+
	7550	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7551	+
7322	7552	retval = true;
7323	7553	}
7324	7554
..	..	@@ -7328,7 +7558,7 @@
7328	7558	}
7329	7559
7330	7560	//System.out.println("info.modifiers = " + info.modifiers);
7331		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7561	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7332	7562	//System.out.println("modified = " + modified);
7333	7563	//new Exception().printStackTrace();
7334	7564	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7356,7 +7586,8 @@
7356	7586	return true;
7357	7587	}
7358	7588
7359		- void doEditDrag0(ClickInfo info, boolean opposite)
	7589	+ void doEditDrag0(//ClickInfo info,
	7590	+ boolean opposite)
7360	7591	{
7361	7592	if (hitSomething == 0)
7362	7593	{
..	..	@@ -7370,7 +7601,7 @@
7370	7601
7371	7602	//System.out.println("hitSomething = " + hitSomething);
7372	7603
7373		- double scale = 0.005f * info.camera.Distance();
	7604	+ double scale = 0.005f * clickInfo.camera.Distance();
7374	7605
7375	7606	cVector xlate = new cVector();
7376	7607	//cVector xlate2 = new cVector();
..	..	@@ -7404,8 +7635,8 @@
7404	7635	toParent[3][i] = xlate.get(i);
7405	7636	LA.matInvert(toParent, fromParent);
7406	7637	*/
7407		- cVector delta = LA.newVector(0, 0, startY - info.y);
7408		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7638	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7639	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7409	7640
7410	7641	LA.matCopy(startMat, toParent);
7411	7642	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7414,7 +7645,7 @@
7414	7645	} else
7415	7646	{
7416	7647	//LA.xformDir(delta, info.camera.fromScreen, delta);
7417		- cVector up = new cVector(info.camera.up);
	7648	+ cVector up = new cVector(clickInfo.camera.up);
7418	7649	cVector away = new cVector();
7419	7650	//cVector right2 = new cVector();
7420	7651	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7431,19 +7662,19 @@
7431	7662	LA.xformDir(up, ClickInfo.matbuffer, up);
7432	7663	// if (!CameraPane.LOCALTRANSFORM)
7433	7664	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7434		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7665	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7435	7666	// if (!CameraPane.LOCALTRANSFORM)
7436	7667	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7437	7668	//LA.vecCross(up, cVector.Z, right2);
7438	7669
7439		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7670	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7440	7671
7441	7672	//System.out.println("DELTA0 = " + delta);
7442	7673	//System.out.println("AWAY = " + info.camera.away);
7443	7674	//System.out.println("UP = " + info.camera.up);
7444	7675	if (away.z > 0)
7445	7676	{
7446		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7677	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7447	7678	{
7448	7679	delta.x = -delta.x;
7449	7680	} else
..	..	@@ -7458,7 +7689,7 @@
7458	7689	//System.out.println("DELTA1 = " + delta);
7459	7690	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7460	7691	//System.out.println("DELTA2 = " + delta);
7461		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7692	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7462	7693	LA.matCopy(startMat, toParent);
7463	7694	//System.out.println("DELTA3 = " + delta);
7464	7695	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7468,8 +7699,8 @@
7468	7699	break;
7469	7700
7470	7701	case hitRotate: // rotate
7471		- int dx = info.x - centerPt.x;
7472		- int dy = -(info.y - centerPt.y);
	7702	+ int dx = clickInfo.x - centerPt.x;
	7703	+ int dy = -(clickInfo.y - centerPt.y);
7473	7704	double angle = (double) Math.atan2(dx, dy);
7474	7705	angle = -(1.570796 - angle);
7475	7706
..	..	@@ -7492,7 +7723,7 @@
7492	7723	}
7493	7724	/**/
7494	7725
7495		- switch (info.pane.RenderCamera().viewCode)
	7726	+ switch (clickInfo.pane.RenderCamera().viewCode)
7496	7727	{
7497	7728	case 1: // '\001'
7498	7729	LA.matZRotate(toParent, angle);
..	..	@@ -7519,7 +7750,7 @@
7519	7750	break;
7520	7751
7521	7752	case hitScale: // scale
7522		- double hScale = (double) (info.x - centerPt.x) / 32;
	7753	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7523	7754	double sign = 1;
7524	7755	if (hScale < 0)
7525	7756	{
..	..	@@ -7531,7 +7762,7 @@
7531	7762	//hScale = 0.01;
7532	7763	}
7533	7764
7534		- double vScale = (double) (info.y - centerPt.y) / 32;
	7765	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7535	7766	sign = 1;
7536	7767	if (vScale < 0)
7537	7768	{
..	..	@@ -7542,6 +7773,7 @@
7542	7773	{
7543	7774	//vScale = 0.01;
7544	7775	}
	7776	+
7545	7777	LA.matCopy(startMat, toParent);
7546	7778	/**/
7547	7779	for (int i = 0; i < 3; i++)
..	..	@@ -7551,14 +7783,14 @@
7551	7783	}
7552	7784	/**/
7553	7785
7554		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7786	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7555	7787
7556	7788	if (totalScale < 0.01)
7557	7789	{
7558	7790	totalScale = 0.01;
7559	7791	}
7560	7792
7561		- switch (info.pane.RenderCamera().viewCode)
	7793	+ switch (clickInfo.pane.RenderCamera().viewCode)
7562	7794	{
7563	7795	case 3: // '\001'
7564	7796	if (modified \|\| opposite)
..	..	@@ -7625,7 +7857,7 @@
7625	7857	} // NEW ...
7626	7858
7627	7859
7628		- info.pane.repaint();
	7860	+ clickInfo.pane.repaint();
7629	7861	}
7630	7862
7631	7863	boolean overflow = false;
..	..	@@ -7966,6 +8198,10 @@
7966	8198	}
7967	8199
7968	8200	transient ObjEditor editWindow;
	8201	+ transient ObjEditor manipWindow;
	8202	+
	8203	+ transient boolean pinned;
	8204	+
7969	8205	transient ObjectUI objectUI;
7970	8206	public static int povDepth = 0;
7971	8207	private static cVector tbMin = new cVector();