~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,12 +22,21 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
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	//
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
31	40
32	41	ScriptNode scriptnode;
33	42
..	..	@@ -170,24 +179,35 @@
170	179
171	180	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	181	{
	182	+ Object3D o;
	183	+
173	184	if (hashtable.containsKey(GetUUID()))
174	185	{
175		- Object3D o = hashtable.get(GetUUID());
	186	+ o = hashtable.get(GetUUID());
176	187
177	188	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
180	197
181		- return;
	198	+ hashtable.put(GetUUID(), o);
182	199	}
183	200
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	201	+ if (!blockloop)
189	202	{
190		- get(i).ExtractBigData(hashtable);
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
191	211	}
192	212
193	213	ExtractBigData(o);
..	..	@@ -195,11 +215,26 @@
195	215
196	216	void ExtractBigData(Object3D o)
197	217	{
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
198	221	o.bRep = this.bRep;
199		- if (this.bRep != null)
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
200	232	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
203	238	}
204	239
205	240	// o.support = this.support;
..	..	@@ -214,6 +249,29 @@
214	249	// this.fileparent = null;
215	250	}
216	251
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
217	275	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	276	{
219	277	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +281,35 @@
223	281
224	282	RestoreBigData(o);
225	283
226		- hashtable.remove(GetUUID());
	284	+ if (blockloop)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ //hashtable.remove(GetUUID());
227	290
228	291	for (int i=0; i<Size(); i++)
229	292	{
230	293	get(i).RestoreBigData(hashtable);
231	294	}
	295	+
	296	+ blockloop = false;
232	297	}
233	298
234	299	void RestoreBigData(Object3D o)
235	300	{
236	301	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
239	313	// this.support = o.support;
240	314	// this.fileparent = o.fileparent;
241	315	}
..	..	@@ -381,6 +455,7 @@
381	455	}
382	456
383	457	boolean live = false;
	458	+ transient boolean keepdontselect;
384	459	boolean dontselect = false;
385	460	boolean hide = false;
386	461	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -966,6 +1041,9 @@
966	1041	if (material == null \|\| material.multiply)
967	1042	return true;
968	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
969	1047	// Transparent objects are dynamic because we have to sort the triangles.
970	1048	return material.opacity > 0.99;
971	1049	}
..	..	@@ -1367,6 +1445,7 @@
1367	1445	toParent = LA.newMatrix();
1368	1446	fromParent = LA.newMatrix();
1369	1447	}
	1448	+
1370	1449	LA.matCopy(other.toParent, toParent);
1371	1450	LA.matCopy(other.fromParent, fromParent);
1372	1451
..	..	@@ -2391,6 +2470,11 @@
2391	2470	else
2392	2471	{
2393	2472	//((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
2394	2478	}
2395	2479	}
2396	2480
..	..	@@ -2433,6 +2517,14 @@
2433	2517	{
2434	2518	editWindow.refreshContents();
2435	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2436	2528	//if (parent != null)
2437	2529	//parent.refreshEditWindow();
2438	2530	}
..	..	@@ -2512,7 +2604,8 @@
2512	2604	private static final int editSelf = 1;
2513	2605	private static final int editChild = 2;
2514	2606
2515		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2516	2609	{
2517	2610	if (level == 0)
2518	2611	{
..	..	@@ -2520,7 +2613,8 @@
2520	2613	return;
2521	2614
2522	2615	Object3D selectee;
2523		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2524	2618	{
2525	2619	selectee = (Object3D) e.nextElement();
2526	2620	}
..	..	@@ -2528,19 +2622,22 @@
2528	2622	} else
2529	2623	{
2530	2624	//super.
2531		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2532	2627	}
2533	2628	}
2534	2629
2535		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2536	2632	{
2537	2633	doSomething = 0;
2538	2634	if (level == 0)
2539	2635	{
2540		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2541	2637	}
2542	2638	if (//super.
2543		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2544	2641	{
2545	2642	doSomething = 1;
2546	2643	return true;
..	..	@@ -2550,7 +2647,7 @@
2550	2647	}
2551	2648	}
2552	2649
2553		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2554	2651	{
2555	2652	if (selection == null)
2556	2653	{
..	..	@@ -2563,7 +2660,8 @@
2563	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2564	2661	{
2565	2662	Object3D selectee = (Object3D) e.nextElement();
2566		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2567	2665	{
2568	2666	childToDrag = selectee;
2569	2667	doSomething = 2;
..	..	@@ -2575,13 +2673,15 @@
2575	2673	return retval;
2576	2674	}
2577	2675
2578		- void doEditDrag(ClickInfo info, boolean opposite)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2579	2678	{
2580	2679	switch (doSomething)
2581	2680	{
2582	2681	case 1: // '\001'
2583	2682	//super.
2584		- doEditDrag0(info, opposite);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2585	2685	break;
2586	2686
2587	2687	case 2: // '\002'
..	..	@@ -2594,11 +2694,13 @@
2594	2694	{
2595	2695	//sel.hitSomething = childToDrag.hitSomething;
2596	2696	//childToDrag.doEditDrag(info);
2597		- sel.doEditDrag(info, opposite);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2598	2699	} else
2599	2700	{
2600	2701	//super.
2601		- doEditDrag0(info, opposite);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2602	2704	}
2603	2705	}
2604	2706	break;
..	..	@@ -2616,6 +2718,9 @@
2616	2718	{
2617	2719	deselectAll();
2618	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2619	2724	ClickInfo newInfo = new ClickInfo();
2620	2725	newInfo.flags = info.flags;
2621	2726	newInfo.bounds = info.bounds;
..	..	@@ -3063,7 +3168,7 @@
3063	3168	{
3064	3169	if (bRep != null)
3065	3170	{
3066		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3067	3172	Touch();
3068	3173	}
3069	3174	}
..	..	@@ -4963,6 +5068,14 @@
4963	5068	}
4964	5069	}
4965	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4966	5079	cTreePath Select(int indexcount, boolean deselect)
4967	5080	{
4968	5081	if (hide \|\| dontselect)
..	..	@@ -4999,10 +5112,11 @@
4999	5112	if (leaf != null)
5000	5113	{
5001	5114	cTreePath tp = new cTreePath(this, leaf);
5002		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
5003	5117	{
5004	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
5005		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
5006	5120	}
5007	5121
5008	5122	return tp;
..	..	@@ -5019,6 +5133,7 @@
5019	5133
5020	5134	if (child == null)
5021	5135	continue;
	5136	+
5022	5137	if (child.HasTransparency() && child.size() != 0)
5023	5138	{
5024	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5028,9 +5143,10 @@
5028	5143	if (leaf != null)
5029	5144	{
5030	5145	cTreePath tp = new cTreePath(this, leaf);
5031		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
5032	5148	{
5033		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
5034	5150	}
5035	5151
5036	5152	return tp;
..	..	@@ -5355,6 +5471,51 @@
5355	5471	blockloop = false;
5356	5472	}
5357	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5358	5519	boolean IsSelected()
5359	5520	{
5360	5521	if (parent == null)
..	..	@@ -5415,6 +5576,11 @@
5415	5576	if (fullname == null)
5416	5577	return "";
5417	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5418	5584	// System.out.println("Fullname = " + fullname);
5419	5585
5420	5586	// Does not work on Windows due to C:
..	..	@@ -5427,7 +5593,7 @@
5427	5593
5428	5594	if (split.length == 0)
5429	5595	{
5430		- return "";
	5596	+ return fullname.pigment = "";
5431	5597	}
5432	5598
5433	5599	if (split.length <= 2)
..	..	@@ -5435,22 +5601,27 @@
5435	5601	if (fullname.name.endsWith(":"))
5436	5602	{
5437	5603	// Windows
5438		- return fullname.name.substring(0, fullname.name.length()-1);
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5439	5605	}
5440	5606
5441		- return split[0];
	5607	+ return fullname.pigment = split[0];
5442	5608	}
5443	5609
5444	5610	// Windows
5445	5611	assert(split.length == 4);
5446	5612
5447		- return split[0] + ":" + split[1];
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5448	5614	}
5449	5615
5450	5616	static String GetBump(cTexture fullname)
5451	5617	{
5452	5618	if (fullname == null)
5453	5619	return "";
	5620	+
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
5454	5625
5455	5626	// System.out.println("Fullname = " + fullname);
5456	5627	// Does not work on Windows due to C:
..	..	@@ -5462,12 +5633,12 @@
5462	5633
5463	5634	if (split.length == 0)
5464	5635	{
5465		- return "";
	5636	+ return fullname.bump = "";
5466	5637	}
5467	5638
5468	5639	if (split.length == 1)
5469	5640	{
5470		- return "";
	5641	+ return fullname.bump = "";
5471	5642	}
5472	5643
5473	5644	if (split.length == 2)
..	..	@@ -5475,16 +5646,16 @@
5475	5646	if (fullname.name.endsWith(":"))
5476	5647	{
5477	5648	// Windows
5478		- return "";
	5649	+ return fullname.bump = "";
5479	5650	}
5480	5651
5481		- return split[1];
	5652	+ return fullname.bump = split[1];
5482	5653	}
5483	5654
5484	5655	// Windows
5485	5656	assert(split.length == 4);
5486	5657
5487		- return split[2] + ":" + split[3];
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5488	5659	}
5489	5660
5490	5661	String GetPigmentTexture()
..	..	@@ -5567,6 +5738,9 @@
5567	5738	texname = "";
5568	5739
5569	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5570	5744	Touch();
5571	5745	}
5572	5746
..	..	@@ -5640,6 +5814,8 @@
5640	5814
5641	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5642	5816
	5817	+ GetTextures().bump = null;
	5818	+
5643	5819	Touch();
5644	5820	}
5645	5821
..	..	@@ -5660,6 +5836,38 @@
5660	5836
5661	5837	blockloop = true;
5662	5838	child.ResetBumpTexture();
	5839	+ blockloop = false;
	5840	+ }
	5841	+ }
	5842	+
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
5663	5871	blockloop = false;
5664	5872	}
5665	5873	}
..	..	@@ -5750,8 +5958,10 @@
5750	5958	if (support != null)
5751	5959	support = support;
5752	5960
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);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5755	5965
5756	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5757	5967	{
..	..	@@ -5761,8 +5971,9 @@
5761	5971	// usecalllists &= !(parent instanceof RandomNode);
5762	5972	// usecalllists = false;
5763	5973
5764		- if (GetBRep() != null)
5765		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5766	5977	//System.out.println("draw " + this);
5767	5978	//new Exception().printStackTrace();
5768	5979
..	..	@@ -5772,7 +5983,7 @@
5772	5983
5773	5984	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774	5985	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5775		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5776	5987	{
5777	5988	Globals.lighttouched = true;
5778	5989	} // all panes...
..	..	@@ -5784,7 +5995,7 @@
5784	5995	if (!(this instanceof Composite))
5785	5996	touched = false;
5786	5997	//if (displaylist == -1 && usecalllists)
5787		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5788	5999	{
5789	6000	bRep.displaylist = display.GenList();
5790	6001	assert(bRep.displaylist != 0);
..	..	@@ -5795,7 +6006,7 @@
5795	6006
5796	6007	//System.out.println("\tnew list " + list);
5797	6008	//gl.glDrawBuffer(gl.GL_NONE);
5798		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5799	6010	{
5800	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5801	6012	display.NewList(bRep.displaylist);
..	..	@@ -5804,7 +6015,7 @@
5804	6015	CallList(display, root, selected, blocked);
5805	6016
5806	6017	// compiled = true;
5807		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5808	6019	{
5809	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5810	6021	display.EndList();
..	..	@@ -5904,6 +6115,7 @@
5904	6115	if (GetBRep() != null)
5905	6116	{
5906	6117	display.NextIndex();
	6118	+
5907	6119	// vertex color conflict : gl.glCallList(list);
5908	6120	DrawNode(display, root, selected);
5909	6121	if (this instanceof BezierPatch)
..	..	@@ -7154,20 +7366,23 @@
7154	7366	}
7155	7367	}
7156	7368
7157		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
7158	7373	{
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;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
7162	7377	if (toscreen == null)
7163	7378	{
7164		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7165	7380	}
7166	7381	cVector vec = in;
7167	7382	LA.xformPos(in, toscreen, in);
7168	7383	//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();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7171	7386	outPt.x = hc + (int) vec.x;
7172	7387	outPt.y = vc - (int) vec.y;
7173	7388	outRec.x = outPt.x - 3;
..	..	@@ -7175,15 +7390,18 @@
7175	7390	outRec.width = outRec.height = 6;
7176	7391	}
7177	7392
7178		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
7179	7395	{
7180	7396	Point pt = new Point(0, 0);
7181	7397	Rectangle rec = new Rectangle();
7182		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
7183	7400	return rec;
7184	7401	}
7185	7402
7186		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
7187	7405	{
7188	7406	if (level == 0)
7189	7407	{
..	..	@@ -7192,16 +7410,19 @@
7192	7410	{
7193	7411	cVector origin = new cVector();
7194	7412	//LA.xformPos(origin, toParent, origin);
7195		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7196	7417	Rectangle boundary = new Rectangle();
7197	7418	boundary.x = spot.x - 30;
7198	7419	boundary.y = spot.y - 30;
7199	7420	boundary.width = spot.width + 60;
7200	7421	boundary.height = spot.height + 60;
7201		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7202	7423	int spotw = spot.x + spot.width;
7203	7424	int spoth = spot.y + spot.height;
7204		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7205	7426	// if (CameraPane.Xmin > spot.x)
7206	7427	// {
7207	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7218,11 +7439,6 @@
7218	7439	// {
7219	7440	// CameraPane.Ymax = spoth;
7220	7441	// }
7221		- spot.translate(32, 32);
7222		- spotw = spot.x + spot.width;
7223		- spoth = spot.y + spot.height;
7224		- info.g.setColor(Color.cyan);
7225		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7226	7442	// if (CameraPane.Xmin > spot.x)
7227	7443	// {
7228	7444	// CameraPane.Xmin = spot.x;
..	..	@@ -7241,10 +7457,15 @@
7241	7457	// }
7242	7458	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243	7459	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7244		- 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);
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
	7465	+ spotw = spot.x + spot.width;
	7466	+ spoth = spot.y + spot.height;
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7248	7469	// if (CameraPane.Xmin > spot.x)
7249	7470	// {
7250	7471	// CameraPane.Xmin = spot.x;
..	..	@@ -7261,8 +7482,9 @@
7261	7482	// {
7262	7483	// CameraPane.Ymax = spoth;
7263	7484	// }
7264		- info.g.drawArc(boundary.x, boundary.y,
7265		- boundary.width, boundary.height, 0, 360);
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7266	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267	7489	// if (CameraPane.Xmin > boundary.x)
7268	7490	// {
..	..	@@ -7284,7 +7506,8 @@
7284	7506	}
7285	7507	}
7286	7508
7287		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7288	7511	{
7289	7512	if (level == 0)
7290	7513	{
..	..	@@ -7293,8 +7516,8 @@
7293	7516
7294	7517	boolean retval = false;
7295	7518
7296		- startX = info.x;
7297		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7298	7521
7299	7522	hitSomething = -1;
7300	7523	cVector origin = new cVector();
..	..	@@ -7304,22 +7527,53 @@
7304	7527	{
7305	7528	centerPt = new Point(0, 0);
7306	7529	}
7307		- calcHotSpot(origin, info, centerPt, spot);
7308		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7309	7533	{
7310	7534	hitSomething = hitCenter;
7311	7535	retval = true;
7312	7536	}
7313	7537	spot.translate(32, 0);
7314		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7315	7539	{
7316	7540	hitSomething = hitRotate;
7317	7541	retval = true;
7318	7542	}
7319	7543	spot.translate(0, 32);
7320		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7321	7547	{
7322	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7323	7577	retval = true;
7324	7578	}
7325	7579
..	..	@@ -7329,7 +7583,7 @@
7329	7583	}
7330	7584
7331	7585	//System.out.println("info.modifiers = " + info.modifiers);
7332		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7333	7587	//System.out.println("modified = " + modified);
7334	7588	//new Exception().printStackTrace();
7335	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7357,7 +7611,8 @@
7357	7611	return true;
7358	7612	}
7359	7613
7360		- void doEditDrag0(ClickInfo info, boolean opposite)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7361	7616	{
7362	7617	if (hitSomething == 0)
7363	7618	{
..	..	@@ -7371,7 +7626,7 @@
7371	7626
7372	7627	//System.out.println("hitSomething = " + hitSomething);
7373	7628
7374		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
7375	7630
7376	7631	cVector xlate = new cVector();
7377	7632	//cVector xlate2 = new cVector();
..	..	@@ -7405,8 +7660,8 @@
7405	7660	toParent[3][i] = xlate.get(i);
7406	7661	LA.matInvert(toParent, fromParent);
7407	7662	*/
7408		- cVector delta = LA.newVector(0, 0, startY - info.y);
7409		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7410	7665
7411	7666	LA.matCopy(startMat, toParent);
7412	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7415,7 +7670,7 @@
7415	7670	} else
7416	7671	{
7417	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7418		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7419	7674	cVector away = new cVector();
7420	7675	//cVector right2 = new cVector();
7421	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7432,19 +7687,19 @@
7432	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7433	7688	// if (!CameraPane.LOCALTRANSFORM)
7434	7689	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7435		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7436	7691	// if (!CameraPane.LOCALTRANSFORM)
7437	7692	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7438	7693	//LA.vecCross(up, cVector.Z, right2);
7439	7694
7440		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7441	7696
7442	7697	//System.out.println("DELTA0 = " + delta);
7443	7698	//System.out.println("AWAY = " + info.camera.away);
7444	7699	//System.out.println("UP = " + info.camera.up);
7445	7700	if (away.z > 0)
7446	7701	{
7447		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7448	7703	{
7449	7704	delta.x = -delta.x;
7450	7705	} else
..	..	@@ -7459,7 +7714,7 @@
7459	7714	//System.out.println("DELTA1 = " + delta);
7460	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7461	7716	//System.out.println("DELTA2 = " + delta);
7462		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7463	7718	LA.matCopy(startMat, toParent);
7464	7719	//System.out.println("DELTA3 = " + delta);
7465	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7469,8 +7724,8 @@
7469	7724	break;
7470	7725
7471	7726	case hitRotate: // rotate
7472		- int dx = info.x - centerPt.x;
7473		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7474	7729	double angle = (double) Math.atan2(dx, dy);
7475	7730	angle = -(1.570796 - angle);
7476	7731
..	..	@@ -7493,7 +7748,7 @@
7493	7748	}
7494	7749	/**/
7495	7750
7496		- switch (info.pane.RenderCamera().viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7497	7752	{
7498	7753	case 1: // '\001'
7499	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7520,7 +7775,7 @@
7520	7775	break;
7521	7776
7522	7777	case hitScale: // scale
7523		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7524	7779	double sign = 1;
7525	7780	if (hScale < 0)
7526	7781	{
..	..	@@ -7532,7 +7787,7 @@
7532	7787	//hScale = 0.01;
7533	7788	}
7534	7789
7535		- double vScale = (double) (info.y - centerPt.y) / 32;
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7536	7791	sign = 1;
7537	7792	if (vScale < 0)
7538	7793	{
..	..	@@ -7543,6 +7798,7 @@
7543	7798	{
7544	7799	//vScale = 0.01;
7545	7800	}
	7801	+
7546	7802	LA.matCopy(startMat, toParent);
7547	7803	/**/
7548	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7552,33 +7808,39 @@
7552	7808	}
7553	7809	/**/
7554	7810
7555		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7556	7812
7557	7813	if (totalScale < 0.01)
7558	7814	{
7559	7815	totalScale = 0.01;
7560	7816	}
7561	7817
7562		- switch (info.pane.RenderCamera().viewCode)
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7819	{
7564	7820	case 3: // '\001'
7565	7821	if (modified \|\| opposite)
7566	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7567	7826	//LA.matScale(toParent, 1, hScale, vScale);
7568		- LA.matScale(toParent, totalScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7569	7828	} // vScale, 1);
7570	7829	else
7571	7830	{
7572	7831	// EXCEPTION!
7573		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7574	7833	} // vScale, 1);
7575	7834	break;
7576	7835
7577	7836	case 2: // '\002'
7578	7837	if (modified \|\| opposite)
7579	7838	{
7580		- //LA.matScale(toParent, hScale, 1, vScale);
7581		- LA.matScale(toParent, 1, totalScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7582	7844	} else
7583	7845	{
7584	7846	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7588,8 +7850,11 @@
7588	7850	case 1: // '\003'
7589	7851	if (modified \|\| opposite)
7590	7852	{
7591		- //LA.matScale(toParent, hScale, vScale, 1);
7592		- LA.matScale(toParent, 1, 1, totalScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7593	7858	} else
7594	7859	{
7595	7860	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7626,7 +7891,7 @@
7626	7891	} // NEW ...
7627	7892
7628	7893
7629		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7630	7895	}
7631	7896
7632	7897	boolean overflow = false;
..	..	@@ -7967,6 +8232,10 @@
7967	8232	}
7968	8233
7969	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
7970	8239	transient ObjectUI objectUI;
7971	8240	public static int povDepth = 0;
7972	8241	private static cVector tbMin = new cVector();