~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	28	// TEMPORARY for mocap undo. No need to be transient.
28	29	mocap.reader.BVHReader.BVHResult savebvh;
29	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
..	..	@@ -215,6 +224,9 @@
215	224	// o.transientrep = this.bRep.support;
216	225	// o.bRep.support = null;
217	226	// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
218	230
219	231	if (this.support != null)
220	232	{
..	..	@@ -235,6 +247,73 @@
235	247	// this.bRep.support = null;
236	248	// this.support = null;
237	249	// this.fileparent = null;
	250	+ }
	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	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
	294	+ blockloop = false;
	295	+ }
	296	+
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
	301	+
	302	+ blockloop = true;
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
238	317	}
239	318
240	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
..	..	@@ -268,6 +347,11 @@
268	347	{
269	348	this.support.bRep = o.transientrep;
270	349	}
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
271	355	// July 2019 if (this.bRep != null)
272	356	// this.bRep.support = o.transientrep;
273	357	// this.support = o.support;
..	..	@@ -415,6 +499,7 @@
415	499	}
416	500
417	501	boolean live = false;
	502	+ transient boolean keepdontselect;
418	503	boolean dontselect = false;
419	504	boolean hide = false;
420	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -602,7 +687,7 @@
602	687	{
603	688	if (maxcount != 1)
604	689	{
605		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
606	691	}
607	692
608	693	toParentMarked = LA.newMatrix();
..	..	@@ -999,6 +1084,9 @@
999	1084
1000	1085	if (material == null \|\| material.multiply)
1001	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
1002	1090
1003	1091	// Transparent objects are dynamic because we have to sort the triangles.
1004	1092	return material.opacity > 0.99;
..	..	@@ -2281,11 +2369,6 @@
2281	2369
2282	2370	InitOthers();
2283	2371
2284		- if (this instanceof Camera)
2285		- {
2286		- material.shift = 90;
2287		- }
2288		-
2289	2372	material.multiply = multiply;
2290	2373
2291	2374	if (multiply)
..	..	@@ -2426,6 +2509,11 @@
2426	2509	else
2427	2510	{
2428	2511	//((ObjEditor)editWindow).SetupUI2(null);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
2429	2517	}
2430	2518	}
2431	2519
..	..	@@ -2555,7 +2643,8 @@
2555	2643	private static final int editSelf = 1;
2556	2644	private static final int editChild = 2;
2557	2645
2558		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2559	2648	{
2560	2649	if (level == 0)
2561	2650	{
..	..	@@ -2563,7 +2652,8 @@
2563	2652	return;
2564	2653
2565	2654	Object3D selectee;
2566		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2655	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2656	+ level + 1))
2567	2657	{
2568	2658	selectee = (Object3D) e.nextElement();
2569	2659	}
..	..	@@ -2571,19 +2661,22 @@
2571	2661	} else
2572	2662	{
2573	2663	//super.
2574		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2575	2666	}
2576	2667	}
2577	2668
2578		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2579	2671	{
2580	2672	doSomething = 0;
2581	2673	if (level == 0)
2582	2674	{
2583		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2584	2676	}
2585	2677	if (//super.
2586		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2587	2680	{
2588	2681	doSomething = 1;
2589	2682	return true;
..	..	@@ -2593,7 +2686,7 @@
2593	2686	}
2594	2687	}
2595	2688
2596		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2597	2690	{
2598	2691	if (selection == null)
2599	2692	{
..	..	@@ -2606,7 +2699,8 @@
2606	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2607	2700	{
2608	2701	Object3D selectee = (Object3D) e.nextElement();
2609		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2610	2704	{
2611	2705	childToDrag = selectee;
2612	2706	doSomething = 2;
..	..	@@ -2618,13 +2712,15 @@
2618	2712	return retval;
2619	2713	}
2620	2714
2621		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2622	2717	{
2623	2718	switch (doSomething)
2624	2719	{
2625	2720	case 1: // '\001'
2626	2721	//super.
2627		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2628	2724	break;
2629	2725
2630	2726	case 2: // '\002'
..	..	@@ -2637,11 +2733,13 @@
2637	2733	{
2638	2734	//sel.hitSomething = childToDrag.hitSomething;
2639	2735	//childToDrag.doEditDrag(info);
2640		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2641	2738	} else
2642	2739	{
2643	2740	//super.
2644		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2645	2743	}
2646	2744	}
2647	2745	break;
..	..	@@ -2659,6 +2757,9 @@
2659	2757	{
2660	2758	deselectAll();
2661	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2662	2763	ClickInfo newInfo = new ClickInfo();
2663	2764	newInfo.flags = info.flags;
2664	2765	newInfo.bounds = info.bounds;
..	..	@@ -3106,7 +3207,7 @@
3106	3207	{
3107	3208	if (bRep != null)
3108	3209	{
3109		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3110	3211	Touch();
3111	3212	}
3112	3213	}
..	..	@@ -3516,15 +3617,47 @@
3516	3617
3517	3618	void ClearMaterials()
3518	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3519	3625	ClearMaterial();
3520		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3521	3627	{
3522		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3523	3629	if (child == null)
3524	3630	continue;
3525	3631	child.ClearMaterials();
3526		- release(i);
3527	3632	}
	3633	+
	3634	+ blockloop = false;
	3635	+ }
	3636	+
	3637	+ void ClearVersionList()
	3638	+ {
	3639	+ this.versionlist = null;
	3640	+ this.versionindex = -1;
	3641	+ this.versiontable = null;
	3642	+ }
	3643	+
	3644	+ void ClearVersions()
	3645	+ {
	3646	+ if (blockloop)
	3647	+ return;
	3648	+
	3649	+ blockloop = true;
	3650	+
	3651	+ ClearVersionList();
	3652	+ for (int i = 0; i < Size(); i++)
	3653	+ {
	3654	+ Object3D child = (Object3D) get(i);
	3655	+ if (child == null)
	3656	+ continue;
	3657	+ child.ClearVersions();
	3658	+ }
	3659	+
	3660	+ blockloop = false;
3528	3661	}
3529	3662
3530	3663	void FlipV(boolean flip)
..	..	@@ -5409,6 +5542,51 @@
5409	5542	blockloop = false;
5410	5543	}
5411	5544
	5545	+ void ResetSelectable()
	5546	+ {
	5547	+ if (blockloop)
	5548	+ return;
	5549	+
	5550	+ blockloop = true;
	5551	+
	5552	+ keepdontselect = dontselect;
	5553	+ dontselect = true;
	5554	+
	5555	+ Object3D child;
	5556	+ int nb = Size();
	5557	+ for (int i = 0; i < nb; i++)
	5558	+ {
	5559	+ child = (Object3D) get(i);
	5560	+ if (child == null)
	5561	+ continue;
	5562	+ child.ResetSelectable();
	5563	+ }
	5564	+
	5565	+ blockloop = false;
	5566	+ }
	5567	+
	5568	+ void RestoreSelectable()
	5569	+ {
	5570	+ if (blockloop)
	5571	+ return;
	5572	+
	5573	+ blockloop = true;
	5574	+
	5575	+ dontselect = keepdontselect;
	5576	+
	5577	+ Object3D child;
	5578	+ int nb = Size();
	5579	+ for (int i = 0; i < nb; i++)
	5580	+ {
	5581	+ child = (Object3D) get(i);
	5582	+ if (child == null)
	5583	+ continue;
	5584	+ child.RestoreSelectable();
	5585	+ }
	5586	+
	5587	+ blockloop = false;
	5588	+ }
	5589	+
5412	5590	boolean IsSelected()
5413	5591	{
5414	5592	if (parent == null)
..	..	@@ -5469,6 +5647,11 @@
5469	5647	if (fullname == null)
5470	5648	return "";
5471	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5472	5655	// System.out.println("Fullname = " + fullname);
5473	5656
5474	5657	// Does not work on Windows due to C:
..	..	@@ -5481,7 +5664,7 @@
5481	5664
5482	5665	if (split.length == 0)
5483	5666	{
5484		- return "";
	5667	+ return fullname.pigment = "";
5485	5668	}
5486	5669
5487	5670	if (split.length <= 2)
..	..	@@ -5489,22 +5672,27 @@
5489	5672	if (fullname.name.endsWith(":"))
5490	5673	{
5491	5674	// Windows
5492		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5493	5676	}
5494	5677
5495		- return split[0];
	5678	+ return fullname.pigment = split[0];
5496	5679	}
5497	5680
5498	5681	// Windows
5499	5682	assert(split.length == 4);
5500	5683
5501		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5502	5685	}
5503	5686
5504	5687	static String GetBump(cTexture fullname)
5505	5688	{
5506	5689	if (fullname == null)
5507	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5508	5696
5509	5697	// System.out.println("Fullname = " + fullname);
5510	5698	// Does not work on Windows due to C:
..	..	@@ -5516,12 +5704,12 @@
5516	5704
5517	5705	if (split.length == 0)
5518	5706	{
5519		- return "";
	5707	+ return fullname.bump = "";
5520	5708	}
5521	5709
5522	5710	if (split.length == 1)
5523	5711	{
5524		- return "";
	5712	+ return fullname.bump = "";
5525	5713	}
5526	5714
5527	5715	if (split.length == 2)
..	..	@@ -5529,16 +5717,16 @@
5529	5717	if (fullname.name.endsWith(":"))
5530	5718	{
5531	5719	// Windows
5532		- return "";
	5720	+ return fullname.bump = "";
5533	5721	}
5534	5722
5535		- return split[1];
	5723	+ return fullname.bump = split[1];
5536	5724	}
5537	5725
5538	5726	// Windows
5539	5727	assert(split.length == 4);
5540	5728
5541		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5542	5730	}
5543	5731
5544	5732	String GetPigmentTexture()
..	..	@@ -5621,6 +5809,9 @@
5621	5809	texname = "";
5622	5810
5623	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5624	5815	Touch();
5625	5816	}
5626	5817
..	..	@@ -5694,6 +5885,8 @@
5694	5885
5695	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5696	5887
	5888	+ GetTextures().bump = null;
	5889	+
5697	5890	Touch();
5698	5891	}
5699	5892
..	..	@@ -5714,6 +5907,38 @@
5714	5907
5715	5908	blockloop = true;
5716	5909	child.ResetBumpTexture();
	5910	+ blockloop = false;
	5911	+ }
	5912	+ }
	5913	+
	5914	+ void EmbedTextures(boolean embed)
	5915	+ {
	5916	+ if (blockloop)
	5917	+ return;
	5918	+
	5919	+ //if (GetTextures() != null)
	5920	+ if (embed)
	5921	+ CameraPane.EmbedTextures(GetTextures());
	5922	+ else
	5923	+ {
	5924	+ GetTextures().pigmentdata = null;
	5925	+ GetTextures().bumpdata = null;
	5926	+ GetTextures().pw = 0;
	5927	+ GetTextures().ph = 0;
	5928	+ GetTextures().bw = 0;
	5929	+ GetTextures().bh = 0;
	5930	+ }
	5931	+
	5932	+ int nb = Size();
	5933	+ for (int i = 0; i < nb; i++)
	5934	+ {
	5935	+ Object3D child = (Object3D) get(i);
	5936	+
	5937	+ if (child == null)
	5938	+ continue;
	5939	+
	5940	+ blockloop = true;
	5941	+ child.EmbedTextures(embed);
5717	5942	blockloop = false;
5718	5943	}
5719	5944	}
..	..	@@ -5804,8 +6029,10 @@
5804	6029	if (support != null)
5805	6030	support = support;
5806	6031
5807		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5808		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6032	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6033	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6034	+
	6035	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5809	6036
5810	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5811	6038	{
..	..	@@ -5815,8 +6042,9 @@
5815	6042	// usecalllists &= !(parent instanceof RandomNode);
5816	6043	// usecalllists = false;
5817	6044
5818		- if (GetBRep() != null)
5819		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5820	6048	//System.out.println("draw " + this);
5821	6049	//new Exception().printStackTrace();
5822	6050
..	..	@@ -5838,7 +6066,7 @@
5838	6066	if (!(this instanceof Composite))
5839	6067	touched = false;
5840	6068	//if (displaylist == -1 && usecalllists)
5841		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5842	6070	{
5843	6071	bRep.displaylist = display.GenList();
5844	6072	assert(bRep.displaylist != 0);
..	..	@@ -5849,7 +6077,7 @@
5849	6077
5850	6078	//System.out.println("\tnew list " + list);
5851	6079	//gl.glDrawBuffer(gl.GL_NONE);
5852		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5853	6081	{
5854	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5855	6083	display.NewList(bRep.displaylist);
..	..	@@ -5858,7 +6086,7 @@
5858	6086	CallList(display, root, selected, blocked);
5859	6087
5860	6088	// compiled = true;
5861		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5862	6090	{
5863	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5864	6092	display.EndList();
..	..	@@ -7209,20 +7437,23 @@
7209	7437	}
7210	7438	}
7211	7439
7212		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7440	+ static ClickInfo clickInfo = new ClickInfo();
	7441	+
	7442	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7443	+ Point outPt, Rectangle outRec)
7213	7444	{
7214		- int hc = info.bounds.x + info.bounds.width / 2;
7215		- int vc = info.bounds.y + info.bounds.height / 2;
7216		- double[][] toscreen = info.toScreen;
	7445	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7446	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7447	+ double[][] toscreen = clickInfo.toScreen;
7217	7448	if (toscreen == null)
7218	7449	{
7219		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7220	7451	}
7221	7452	cVector vec = in;
7222	7453	LA.xformPos(in, toscreen, in);
7223	7454	//System.out.println("Distance = " + info.camera.Distance());
7224		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7225		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7226	7457	outPt.x = hc + (int) vec.x;
7227	7458	outPt.y = vc - (int) vec.y;
7228	7459	outRec.x = outPt.x - 3;
..	..	@@ -7230,15 +7461,18 @@
7230	7461	outRec.width = outRec.height = 6;
7231	7462	}
7232	7463
7233		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7234	7466	{
7235	7467	Point pt = new Point(0, 0);
7236	7468	Rectangle rec = new Rectangle();
7237		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7238	7471	return rec;
7239	7472	}
7240	7473
7241		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7242	7476	{
7243	7477	if (level == 0)
7244	7478	{
..	..	@@ -7247,16 +7481,19 @@
7247	7481	{
7248	7482	cVector origin = new cVector();
7249	7483	//LA.xformPos(origin, toParent, origin);
7250		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7251	7488	Rectangle boundary = new Rectangle();
7252	7489	boundary.x = spot.x - 30;
7253	7490	boundary.y = spot.y - 30;
7254	7491	boundary.width = spot.width + 60;
7255	7492	boundary.height = spot.height + 60;
7256		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7257	7494	int spotw = spot.x + spot.width;
7258	7495	int spoth = spot.y + spot.height;
7259		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7260	7497	// if (CameraPane.Xmin > spot.x)
7261	7498	// {
7262	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7273,11 +7510,6 @@
7273	7510	// {
7274	7511	// CameraPane.Ymax = spoth;
7275	7512	// }
7276		- spot.translate(32, 32);
7277		- spotw = spot.x + spot.width;
7278		- spoth = spot.y + spot.height;
7279		- info.g.setColor(Color.cyan);
7280		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7281	7513	// if (CameraPane.Xmin > spot.x)
7282	7514	// {
7283	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7296,10 +7528,15 @@
7296	7528	// }
7297	7529	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7298	7530	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7299		- spot.translate(0, -32);
7300		- info.g.setColor(Color.yellow);
7301		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7302		- info.g.setColor(Color.green);
	7531	+ spot.translate(32, 0);
	7532	+ clickInfo.g.setColor(Color.yellow);
	7533	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7534	+
	7535	+ spot.translate(32, 64);
	7536	+ spotw = spot.x + spot.width;
	7537	+ spoth = spot.y + spot.height;
	7538	+ clickInfo.g.setColor(Color.cyan);
	7539	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7303	7540	// if (CameraPane.Xmin > spot.x)
7304	7541	// {
7305	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7316,8 +7553,9 @@
7316	7553	// {
7317	7554	// CameraPane.Ymax = spoth;
7318	7555	// }
7319		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7320		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7556	+ clickInfo.g.setColor(Color.green);
	7557	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7558	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7321	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7322	7560	// if (CameraPane.Xmin > boundary.x)
7323	7561	// {
..	..	@@ -7339,7 +7577,8 @@
7339	7577	}
7340	7578	}
7341	7579
7342		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7343	7582	{
7344	7583	if (level == 0)
7345	7584	{
..	..	@@ -7348,8 +7587,8 @@
7348	7587
7349	7588	boolean retval = false;
7350	7589
7351		- startX = info.x;
7352		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7353	7592
7354	7593	hitSomething = -1;
7355	7594	cVector origin = new cVector();
..	..	@@ -7359,22 +7598,53 @@
7359	7598	{
7360	7599	centerPt = new Point(0, 0);
7361	7600	}
7362		- calcHotSpot(origin, info, centerPt, spot);
7363		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7364	7604	{
7365	7605	hitSomething = hitCenter;
7366	7606	retval = true;
7367	7607	}
7368	7608	spot.translate(32, 0);
7369		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7610	{
7371	7611	hitSomething = hitRotate;
7372	7612	retval = true;
7373	7613	}
7374	7614	spot.translate(0, 32);
7375		- if (spot.contains(info.x, info.y))
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
	7617	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7618	{
7377	7619	hitSomething = hitScale;
	7620	+
	7621	+ double scale = 0.005f * clickInfo.camera.Distance();
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7623	+ double sign = 1;
	7624	+ if (hScale < 0)
	7625	+ {
	7626	+ sign = -1;
	7627	+ }
	7628	+ hScale = signMath.pow(signhScale, scale * 50);
	7629	+ if (hScale < 0.01)
	7630	+ {
	7631	+ //hScale = 0.01;
	7632	+ }
	7633	+
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7635	+ sign = 1;
	7636	+ if (vScale < 0)
	7637	+ {
	7638	+ sign = -1;
	7639	+ }
	7640	+ vScale = signMath.pow(signvScale, scale * 50);
	7641	+ if (vScale < 0.01)
	7642	+ {
	7643	+ //vScale = 0.01;
	7644	+ }
	7645	+
	7646	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7647	+
7378	7648	retval = true;
7379	7649	}
7380	7650
..	..	@@ -7384,7 +7654,7 @@
7384	7654	}
7385	7655
7386	7656	//System.out.println("info.modifiers = " + info.modifiers);
7387		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7388	7658	//System.out.println("modified = " + modified);
7389	7659	//new Exception().printStackTrace();
7390	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7412,7 +7682,8 @@
7412	7682	return true;
7413	7683	}
7414	7684
7415		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7416	7687	{
7417	7688	if (hitSomething == 0)
7418	7689	{
..	..	@@ -7426,7 +7697,7 @@
7426	7697
7427	7698	//System.out.println("hitSomething = " + hitSomething);
7428	7699
7429		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7430	7701
7431	7702	cVector xlate = new cVector();
7432	7703	//cVector xlate2 = new cVector();
..	..	@@ -7440,7 +7711,9 @@
7440	7711
7441	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7442	7713
7443		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7444	7717	{
7445	7718	//assert(false);
7446	7719	/*
..	..	@@ -7460,8 +7733,8 @@
7460	7733	toParent[3][i] = xlate.get(i);
7461	7734	LA.matInvert(toParent, fromParent);
7462	7735	*/
7463		- cVector delta = LA.newVector(0, 0, startY - info.y);
7464		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7736	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7737	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7465	7738
7466	7739	LA.matCopy(startMat, toParent);
7467	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7470,7 +7743,7 @@
7470	7743	} else
7471	7744	{
7472	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7473		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7474	7747	cVector away = new cVector();
7475	7748	//cVector right2 = new cVector();
7476	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7487,19 +7760,19 @@
7487	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7488	7761	// if (!CameraPane.LOCALTRANSFORM)
7489	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7490		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7491	7764	// if (!CameraPane.LOCALTRANSFORM)
7492	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7493	7766	//LA.vecCross(up, cVector.Z, right2);
7494	7767
7495		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7496	7769
7497	7770	//System.out.println("DELTA0 = " + delta);
7498	7771	//System.out.println("AWAY = " + info.camera.away);
7499	7772	//System.out.println("UP = " + info.camera.up);
7500	7773	if (away.z > 0)
7501	7774	{
7502		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7503	7776	{
7504	7777	delta.x = -delta.x;
7505	7778	} else
..	..	@@ -7514,7 +7787,7 @@
7514	7787	//System.out.println("DELTA1 = " + delta);
7515	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7516	7789	//System.out.println("DELTA2 = " + delta);
7517		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7518	7791	LA.matCopy(startMat, toParent);
7519	7792	//System.out.println("DELTA3 = " + delta);
7520	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7524,8 +7797,8 @@
7524	7797	break;
7525	7798
7526	7799	case hitRotate: // rotate
7527		- int dx = info.x - centerPt.x;
7528		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7529	7802	double angle = (double) Math.atan2(dx, dy);
7530	7803	angle = -(1.570796 - angle);
7531	7804
..	..	@@ -7534,7 +7807,7 @@
7534	7807
7535	7808	if (modified)
7536	7809	{
7537		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7538	7811	angle /= (Math.PI / 4);
7539	7812	angle = Math.floor(angle + 0.5);
7540	7813	angle *= (Math.PI / 4);
..	..	@@ -7548,7 +7821,7 @@
7548	7821	}
7549	7822	/**/
7550	7823
7551		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7552	7825	{
7553	7826	case 1: // '\001'
7554	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7575,7 +7848,7 @@
7575	7848	break;
7576	7849
7577	7850	case hitScale: // scale
7578		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7579	7852	double sign = 1;
7580	7853	if (hScale < 0)
7581	7854	{
..	..	@@ -7587,7 +7860,7 @@
7587	7860	//hScale = 0.01;
7588	7861	}
7589	7862
7590		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7591	7864	sign = 1;
7592	7865	if (vScale < 0)
7593	7866	{
..	..	@@ -7598,6 +7871,7 @@
7598	7871	{
7599	7872	//vScale = 0.01;
7600	7873	}
	7874	+
7601	7875	LA.matCopy(startMat, toParent);
7602	7876	/**/
7603	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7607,33 +7881,39 @@
7607	7881	}
7608	7882	/**/
7609	7883
7610		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7611	7885
7612	7886	if (totalScale < 0.01)
7613	7887	{
7614	7888	totalScale = 0.01;
7615	7889	}
7616	7890
7617		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7618	7892	{
7619	7893	case 3: // '\001'
7620	7894	if (modified \|\| opposite)
7621	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7622	7899	//LA.matScale(toParent, 1, hScale, vScale);
7623		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7624	7901	} // vScale, 1);
7625	7902	else
7626	7903	{
7627	7904	// EXCEPTION!
7628		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7629	7906	} // vScale, 1);
7630	7907	break;
7631	7908
7632	7909	case 2: // '\002'
7633	7910	if (modified \|\| opposite)
7634	7911	{
7635		- //LA.matScale(toParent, hScale, 1, vScale);
7636		- LA.matScale(toParent, 1, totalScale, 1);
	7912	+ if (modified) // && opposite)
	7913	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7914	+ else
	7915	+ //LA.matScale(toParent, hScale, 1, vScale);
	7916	+ LA.matScale(toParent, 1, totalScale, 1);
7637	7917	} else
7638	7918	{
7639	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7643,8 +7923,11 @@
7643	7923	case 1: // '\003'
7644	7924	if (modified \|\| opposite)
7645	7925	{
7646		- //LA.matScale(toParent, hScale, vScale, 1);
7647		- LA.matScale(toParent, 1, 1, totalScale);
	7926	+ if (modified) // && opposite)
	7927	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7928	+ else
	7929	+ //LA.matScale(toParent, hScale, vScale, 1);
	7930	+ LA.matScale(toParent, 1, 1, totalScale);
7648	7931	} else
7649	7932	{
7650	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7681,7 +7964,7 @@
7681	7964	} // NEW ...
7682	7965
7683	7966
7684		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7685	7968	}
7686	7969
7687	7970	boolean overflow = false;