~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("copy of " + this.name);
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,19 +247,42 @@
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()))
220	276	return;
221	277
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
222	282	if (blockloop)
223	283	return;
224	284
225	285	blockloop = true;
226		-
227		- Object3D o = hashtable.get(GetUUID());
228		-
229		- RestoreBigData(o);
230	286
231	287	//hashtable.remove(GetUUID());
232	288
..	..	@@ -241,8 +297,17 @@
241	297	void RestoreBigData(Object3D o)
242	298	{
243	299	this.bRep = o.bRep;
244		- if (this.bRep != null)
245		- 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;
246	311	// this.support = o.support;
247	312	// this.fileparent = o.fileparent;
248	313	}
..	..	@@ -388,6 +453,7 @@
388	453	}
389	454
390	455	boolean live = false;
	456	+ transient boolean keepdontselect;
391	457	boolean dontselect = false;
392	458	boolean hide = false;
393	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -973,6 +1039,9 @@
973	1039	if (material == null \|\| material.multiply)
974	1040	return true;
975	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
976	1045	// Transparent objects are dynamic because we have to sort the triangles.
977	1046	return material.opacity > 0.99;
978	1047	}
..	..	@@ -1374,6 +1443,7 @@
1374	1443	toParent = LA.newMatrix();
1375	1444	fromParent = LA.newMatrix();
1376	1445	}
	1446	+
1377	1447	LA.matCopy(other.toParent, toParent);
1378	1448	LA.matCopy(other.fromParent, fromParent);
1379	1449
..	..	@@ -2398,6 +2468,11 @@
2398	2468	else
2399	2469	{
2400	2470	//((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
2401	2476	}
2402	2477	}
2403	2478
..	..	@@ -2527,7 +2602,8 @@
2527	2602	private static final int editSelf = 1;
2528	2603	private static final int editChild = 2;
2529	2604
2530		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2531	2607	{
2532	2608	if (level == 0)
2533	2609	{
..	..	@@ -2535,7 +2611,8 @@
2535	2611	return;
2536	2612
2537	2613	Object3D selectee;
2538		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2539	2616	{
2540	2617	selectee = (Object3D) e.nextElement();
2541	2618	}
..	..	@@ -2543,19 +2620,22 @@
2543	2620	} else
2544	2621	{
2545	2622	//super.
2546		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2547	2625	}
2548	2626	}
2549	2627
2550		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2551	2630	{
2552	2631	doSomething = 0;
2553	2632	if (level == 0)
2554	2633	{
2555		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2556	2635	}
2557	2636	if (//super.
2558		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2559	2639	{
2560	2640	doSomething = 1;
2561	2641	return true;
..	..	@@ -2565,7 +2645,7 @@
2565	2645	}
2566	2646	}
2567	2647
2568		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2569	2649	{
2570	2650	if (selection == null)
2571	2651	{
..	..	@@ -2578,7 +2658,8 @@
2578	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2579	2659	{
2580	2660	Object3D selectee = (Object3D) e.nextElement();
2581		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2582	2663	{
2583	2664	childToDrag = selectee;
2584	2665	doSomething = 2;
..	..	@@ -2590,13 +2671,15 @@
2590	2671	return retval;
2591	2672	}
2592	2673
2593		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2594	2676	{
2595	2677	switch (doSomething)
2596	2678	{
2597	2679	case 1: // '\001'
2598	2680	//super.
2599		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2600	2683	break;
2601	2684
2602	2685	case 2: // '\002'
..	..	@@ -2609,11 +2692,13 @@
2609	2692	{
2610	2693	//sel.hitSomething = childToDrag.hitSomething;
2611	2694	//childToDrag.doEditDrag(info);
2612		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2613	2697	} else
2614	2698	{
2615	2699	//super.
2616		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2617	2702	}
2618	2703	}
2619	2704	break;
..	..	@@ -2631,6 +2716,9 @@
2631	2716	{
2632	2717	deselectAll();
2633	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2634	2722	ClickInfo newInfo = new ClickInfo();
2635	2723	newInfo.flags = info.flags;
2636	2724	newInfo.bounds = info.bounds;
..	..	@@ -3078,7 +3166,7 @@
3078	3166	{
3079	3167	if (bRep != null)
3080	3168	{
3081		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3082	3170	Touch();
3083	3171	}
3084	3172	}
..	..	@@ -5043,6 +5131,7 @@
5043	5131
5044	5132	if (child == null)
5045	5133	continue;
	5134	+
5046	5135	if (child.HasTransparency() && child.size() != 0)
5047	5136	{
5048	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5380,6 +5469,51 @@
5380	5469	blockloop = false;
5381	5470	}
5382	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5383	5517	boolean IsSelected()
5384	5518	{
5385	5519	if (parent == null)
..	..	@@ -5440,6 +5574,11 @@
5440	5574	if (fullname == null)
5441	5575	return "";
5442	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5443	5582	// System.out.println("Fullname = " + fullname);
5444	5583
5445	5584	// Does not work on Windows due to C:
..	..	@@ -5452,7 +5591,7 @@
5452	5591
5453	5592	if (split.length == 0)
5454	5593	{
5455		- return "";
	5594	+ return fullname.pigment = "";
5456	5595	}
5457	5596
5458	5597	if (split.length <= 2)
..	..	@@ -5460,22 +5599,27 @@
5460	5599	if (fullname.name.endsWith(":"))
5461	5600	{
5462	5601	// Windows
5463		- return fullname.name.substring(0, fullname.name.length()-1);
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5464	5603	}
5465	5604
5466		- return split[0];
	5605	+ return fullname.pigment = split[0];
5467	5606	}
5468	5607
5469	5608	// Windows
5470	5609	assert(split.length == 4);
5471	5610
5472		- return split[0] + ":" + split[1];
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5473	5612	}
5474	5613
5475	5614	static String GetBump(cTexture fullname)
5476	5615	{
5477	5616	if (fullname == null)
5478	5617	return "";
	5618	+
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
5479	5623
5480	5624	// System.out.println("Fullname = " + fullname);
5481	5625	// Does not work on Windows due to C:
..	..	@@ -5487,12 +5631,12 @@
5487	5631
5488	5632	if (split.length == 0)
5489	5633	{
5490		- return "";
	5634	+ return fullname.bump = "";
5491	5635	}
5492	5636
5493	5637	if (split.length == 1)
5494	5638	{
5495		- return "";
	5639	+ return fullname.bump = "";
5496	5640	}
5497	5641
5498	5642	if (split.length == 2)
..	..	@@ -5500,16 +5644,16 @@
5500	5644	if (fullname.name.endsWith(":"))
5501	5645	{
5502	5646	// Windows
5503		- return "";
	5647	+ return fullname.bump = "";
5504	5648	}
5505	5649
5506		- return split[1];
	5650	+ return fullname.bump = split[1];
5507	5651	}
5508	5652
5509	5653	// Windows
5510	5654	assert(split.length == 4);
5511	5655
5512		- return split[2] + ":" + split[3];
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5513	5657	}
5514	5658
5515	5659	String GetPigmentTexture()
..	..	@@ -5592,6 +5736,9 @@
5592	5736	texname = "";
5593	5737
5594	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5595	5742	Touch();
5596	5743	}
5597	5744
..	..	@@ -5665,6 +5812,8 @@
5665	5812
5666	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5667	5814
	5815	+ GetTextures().bump = null;
	5816	+
5668	5817	Touch();
5669	5818	}
5670	5819
..	..	@@ -5685,6 +5834,38 @@
5685	5834
5686	5835	blockloop = true;
5687	5836	child.ResetBumpTexture();
	5837	+ blockloop = false;
	5838	+ }
	5839	+ }
	5840	+
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
5688	5869	blockloop = false;
5689	5870	}
5690	5871	}
..	..	@@ -5775,8 +5956,10 @@
5775	5956	if (support != null)
5776	5957	support = support;
5777	5958
5778		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5779		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5780	5963
5781	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5782	5965	{
..	..	@@ -5786,8 +5969,9 @@
5786	5969	// usecalllists &= !(parent instanceof RandomNode);
5787	5970	// usecalllists = false;
5788	5971
5789		- if (GetBRep() != null)
5790		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5791	5975	//System.out.println("draw " + this);
5792	5976	//new Exception().printStackTrace();
5793	5977
..	..	@@ -5797,7 +5981,7 @@
5797	5981
5798	5982	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5799	5983	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5800		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5984	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5801	5985	{
5802	5986	Globals.lighttouched = true;
5803	5987	} // all panes...
..	..	@@ -5809,7 +5993,7 @@
5809	5993	if (!(this instanceof Composite))
5810	5994	touched = false;
5811	5995	//if (displaylist == -1 && usecalllists)
5812		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5813	5997	{
5814	5998	bRep.displaylist = display.GenList();
5815	5999	assert(bRep.displaylist != 0);
..	..	@@ -5820,7 +6004,7 @@
5820	6004
5821	6005	//System.out.println("\tnew list " + list);
5822	6006	//gl.glDrawBuffer(gl.GL_NONE);
5823		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5824	6008	{
5825	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5826	6010	display.NewList(bRep.displaylist);
..	..	@@ -5829,7 +6013,7 @@
5829	6013	CallList(display, root, selected, blocked);
5830	6014
5831	6015	// compiled = true;
5832		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5833	6017	{
5834	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5835	6019	display.EndList();
..	..	@@ -5929,6 +6113,7 @@
5929	6113	if (GetBRep() != null)
5930	6114	{
5931	6115	display.NextIndex();
	6116	+
5932	6117	// vertex color conflict : gl.glCallList(list);
5933	6118	DrawNode(display, root, selected);
5934	6119	if (this instanceof BezierPatch)
..	..	@@ -7179,20 +7364,23 @@
7179	7364	}
7180	7365	}
7181	7366
7182		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
7183	7371	{
7184		- int hc = info.bounds.x + info.bounds.width / 2;
7185		- int vc = info.bounds.y + info.bounds.height / 2;
7186		- double[][] toscreen = info.toScreen;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
7187	7375	if (toscreen == null)
7188	7376	{
7189		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7190	7378	}
7191	7379	cVector vec = in;
7192	7380	LA.xformPos(in, toscreen, in);
7193	7381	//System.out.println("Distance = " + info.camera.Distance());
7194		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7195		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7196	7384	outPt.x = hc + (int) vec.x;
7197	7385	outPt.y = vc - (int) vec.y;
7198	7386	outRec.x = outPt.x - 3;
..	..	@@ -7200,15 +7388,18 @@
7200	7388	outRec.width = outRec.height = 6;
7201	7389	}
7202	7390
7203		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
7204	7393	{
7205	7394	Point pt = new Point(0, 0);
7206	7395	Rectangle rec = new Rectangle();
7207		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
7208	7398	return rec;
7209	7399	}
7210	7400
7211		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
7212	7403	{
7213	7404	if (level == 0)
7214	7405	{
..	..	@@ -7217,16 +7408,19 @@
7217	7408	{
7218	7409	cVector origin = new cVector();
7219	7410	//LA.xformPos(origin, toParent, origin);
7220		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7221	7415	Rectangle boundary = new Rectangle();
7222	7416	boundary.x = spot.x - 30;
7223	7417	boundary.y = spot.y - 30;
7224	7418	boundary.width = spot.width + 60;
7225	7419	boundary.height = spot.height + 60;
7226		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.red);
7227	7421	int spotw = spot.x + spot.width;
7228	7422	int spoth = spot.y + spot.height;
7229		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7230	7424	// if (CameraPane.Xmin > spot.x)
7231	7425	// {
7232	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -7243,11 +7437,6 @@
7243	7437	// {
7244	7438	// CameraPane.Ymax = spoth;
7245	7439	// }
7246		- spot.translate(32, 32);
7247		- spotw = spot.x + spot.width;
7248		- spoth = spot.y + spot.height;
7249		- info.g.setColor(Color.cyan);
7250		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7251	7440	// if (CameraPane.Xmin > spot.x)
7252	7441	// {
7253	7442	// CameraPane.Xmin = spot.x;
..	..	@@ -7266,10 +7455,15 @@
7266	7455	// }
7267	7456	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7268	7457	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7269		- spot.translate(0, -32);
7270		- info.g.setColor(Color.yellow);
7271		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7272		- info.g.setColor(Color.green);
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
	7463	+ spotw = spot.x + spot.width;
	7464	+ spoth = spot.y + spot.height;
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7273	7467	// if (CameraPane.Xmin > spot.x)
7274	7468	// {
7275	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -7286,8 +7480,9 @@
7286	7480	// {
7287	7481	// CameraPane.Ymax = spoth;
7288	7482	// }
7289		- info.g.drawArc(boundary.x, boundary.y,
7290		- boundary.width, boundary.height, 0, 360);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7291	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7292	7487	// if (CameraPane.Xmin > boundary.x)
7293	7488	// {
..	..	@@ -7309,7 +7504,8 @@
7309	7504	}
7310	7505	}
7311	7506
7312		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
7313	7509	{
7314	7510	if (level == 0)
7315	7511	{
..	..	@@ -7318,8 +7514,8 @@
7318	7514
7319	7515	boolean retval = false;
7320	7516
7321		- startX = info.x;
7322		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
7323	7519
7324	7520	hitSomething = -1;
7325	7521	cVector origin = new cVector();
..	..	@@ -7329,22 +7525,53 @@
7329	7525	{
7330	7526	centerPt = new Point(0, 0);
7331	7527	}
7332		- calcHotSpot(origin, info, centerPt, spot);
7333		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
7334	7531	{
7335	7532	hitSomething = hitCenter;
7336	7533	retval = true;
7337	7534	}
7338	7535	spot.translate(32, 0);
7339		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
7340	7537	{
7341	7538	hitSomething = hitRotate;
7342	7539	retval = true;
7343	7540	}
7344	7541	spot.translate(0, 32);
7345		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
7346	7545	{
7347	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
7348	7575	retval = true;
7349	7576	}
7350	7577
..	..	@@ -7354,7 +7581,7 @@
7354	7581	}
7355	7582
7356	7583	//System.out.println("info.modifiers = " + info.modifiers);
7357		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7358	7585	//System.out.println("modified = " + modified);
7359	7586	//new Exception().printStackTrace();
7360	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7382,7 +7609,8 @@
7382	7609	return true;
7383	7610	}
7384	7611
7385		- void doEditDrag0(ClickInfo info, boolean opposite)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
7386	7614	{
7387	7615	if (hitSomething == 0)
7388	7616	{
..	..	@@ -7396,7 +7624,7 @@
7396	7624
7397	7625	//System.out.println("hitSomething = " + hitSomething);
7398	7626
7399		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
7400	7628
7401	7629	cVector xlate = new cVector();
7402	7630	//cVector xlate2 = new cVector();
..	..	@@ -7430,8 +7658,8 @@
7430	7658	toParent[3][i] = xlate.get(i);
7431	7659	LA.matInvert(toParent, fromParent);
7432	7660	*/
7433		- cVector delta = LA.newVector(0, 0, startY - info.y);
7434		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7435	7663
7436	7664	LA.matCopy(startMat, toParent);
7437	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7440,7 +7668,7 @@
7440	7668	} else
7441	7669	{
7442	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7443		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7444	7672	cVector away = new cVector();
7445	7673	//cVector right2 = new cVector();
7446	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7457,19 +7685,19 @@
7457	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7458	7686	// if (!CameraPane.LOCALTRANSFORM)
7459	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7460		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7461	7689	// if (!CameraPane.LOCALTRANSFORM)
7462	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7463	7691	//LA.vecCross(up, cVector.Z, right2);
7464	7692
7465		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7466	7694
7467	7695	//System.out.println("DELTA0 = " + delta);
7468	7696	//System.out.println("AWAY = " + info.camera.away);
7469	7697	//System.out.println("UP = " + info.camera.up);
7470	7698	if (away.z > 0)
7471	7699	{
7472		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7473	7701	{
7474	7702	delta.x = -delta.x;
7475	7703	} else
..	..	@@ -7484,7 +7712,7 @@
7484	7712	//System.out.println("DELTA1 = " + delta);
7485	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7486	7714	//System.out.println("DELTA2 = " + delta);
7487		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7488	7716	LA.matCopy(startMat, toParent);
7489	7717	//System.out.println("DELTA3 = " + delta);
7490	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7494,8 +7722,8 @@
7494	7722	break;
7495	7723
7496	7724	case hitRotate: // rotate
7497		- int dx = info.x - centerPt.x;
7498		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7499	7727	double angle = (double) Math.atan2(dx, dy);
7500	7728	angle = -(1.570796 - angle);
7501	7729
..	..	@@ -7518,7 +7746,7 @@
7518	7746	}
7519	7747	/**/
7520	7748
7521		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7522	7750	{
7523	7751	case 1: // '\001'
7524	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7545,7 +7773,7 @@
7545	7773	break;
7546	7774
7547	7775	case hitScale: // scale
7548		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7549	7777	double sign = 1;
7550	7778	if (hScale < 0)
7551	7779	{
..	..	@@ -7557,7 +7785,7 @@
7557	7785	//hScale = 0.01;
7558	7786	}
7559	7787
7560		- double vScale = (double) (info.y - centerPt.y) / 32;
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7561	7789	sign = 1;
7562	7790	if (vScale < 0)
7563	7791	{
..	..	@@ -7568,6 +7796,7 @@
7568	7796	{
7569	7797	//vScale = 0.01;
7570	7798	}
	7799	+
7571	7800	LA.matCopy(startMat, toParent);
7572	7801	/**/
7573	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7577,14 +7806,14 @@
7577	7806	}
7578	7807	/**/
7579	7808
7580		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7581	7810
7582	7811	if (totalScale < 0.01)
7583	7812	{
7584	7813	totalScale = 0.01;
7585	7814	}
7586	7815
7587		- switch (info.pane.RenderCamera().viewCode)
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7588	7817	{
7589	7818	case 3: // '\001'
7590	7819	if (modified \|\| opposite)
..	..	@@ -7651,7 +7880,7 @@
7651	7880	} // NEW ...
7652	7881
7653	7882
7654		- info.pane.repaint();
	7883	+ clickInfo.pane.repaint();
7655	7884	}
7656	7885
7657	7886	boolean overflow = false;
..	..	@@ -7994,6 +8223,8 @@
7994	8223	transient ObjEditor editWindow;
7995	8224	transient ObjEditor manipWindow;
7996	8225
	8226	+ transient boolean pinned;
	8227	+
7997	8228	transient ObjectUI objectUI;
7998	8229	public static int povDepth = 0;
7999	8230	private static cVector tbMin = new cVector();