~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
..	..	@@ -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;
..	..	@@ -2426,6 +2514,11 @@
2426	2514	else
2427	2515	{
2428	2516	//((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
2429	2522	}
2430	2523	}
2431	2524
..	..	@@ -2555,7 +2648,8 @@
2555	2648	private static final int editSelf = 1;
2556	2649	private static final int editChild = 2;
2557	2650
2558		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2559	2653	{
2560	2654	if (level == 0)
2561	2655	{
..	..	@@ -2563,7 +2657,8 @@
2563	2657	return;
2564	2658
2565	2659	Object3D selectee;
2566		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2567	2662	{
2568	2663	selectee = (Object3D) e.nextElement();
2569	2664	}
..	..	@@ -2571,19 +2666,22 @@
2571	2666	} else
2572	2667	{
2573	2668	//super.
2574		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2575	2671	}
2576	2672	}
2577	2673
2578		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2579	2676	{
2580	2677	doSomething = 0;
2581	2678	if (level == 0)
2582	2679	{
2583		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2584	2681	}
2585	2682	if (//super.
2586		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2587	2685	{
2588	2686	doSomething = 1;
2589	2687	return true;
..	..	@@ -2593,7 +2691,7 @@
2593	2691	}
2594	2692	}
2595	2693
2596		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2597	2695	{
2598	2696	if (selection == null)
2599	2697	{
..	..	@@ -2606,7 +2704,8 @@
2606	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2607	2705	{
2608	2706	Object3D selectee = (Object3D) e.nextElement();
2609		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2610	2709	{
2611	2710	childToDrag = selectee;
2612	2711	doSomething = 2;
..	..	@@ -2618,13 +2717,15 @@
2618	2717	return retval;
2619	2718	}
2620	2719
2621		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2622	2722	{
2623	2723	switch (doSomething)
2624	2724	{
2625	2725	case 1: // '\001'
2626	2726	//super.
2627		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2628	2729	break;
2629	2730
2630	2731	case 2: // '\002'
..	..	@@ -2637,11 +2738,13 @@
2637	2738	{
2638	2739	//sel.hitSomething = childToDrag.hitSomething;
2639	2740	//childToDrag.doEditDrag(info);
2640		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2641	2743	} else
2642	2744	{
2643	2745	//super.
2644		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2645	2748	}
2646	2749	}
2647	2750	break;
..	..	@@ -2659,6 +2762,9 @@
2659	2762	{
2660	2763	deselectAll();
2661	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2662	2768	ClickInfo newInfo = new ClickInfo();
2663	2769	newInfo.flags = info.flags;
2664	2770	newInfo.bounds = info.bounds;
..	..	@@ -3106,7 +3212,7 @@
3106	3212	{
3107	3213	if (bRep != null)
3108	3214	{
3109		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3110	3216	Touch();
3111	3217	}
3112	3218	}
..	..	@@ -5409,6 +5515,51 @@
5409	5515	blockloop = false;
5410	5516	}
5411	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5412	5563	boolean IsSelected()
5413	5564	{
5414	5565	if (parent == null)
..	..	@@ -5469,6 +5620,11 @@
5469	5620	if (fullname == null)
5470	5621	return "";
5471	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5472	5628	// System.out.println("Fullname = " + fullname);
5473	5629
5474	5630	// Does not work on Windows due to C:
..	..	@@ -5481,7 +5637,7 @@
5481	5637
5482	5638	if (split.length == 0)
5483	5639	{
5484		- return "";
	5640	+ return fullname.pigment = "";
5485	5641	}
5486	5642
5487	5643	if (split.length <= 2)
..	..	@@ -5489,22 +5645,27 @@
5489	5645	if (fullname.name.endsWith(":"))
5490	5646	{
5491	5647	// Windows
5492		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5493	5649	}
5494	5650
5495		- return split[0];
	5651	+ return fullname.pigment = split[0];
5496	5652	}
5497	5653
5498	5654	// Windows
5499	5655	assert(split.length == 4);
5500	5656
5501		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5502	5658	}
5503	5659
5504	5660	static String GetBump(cTexture fullname)
5505	5661	{
5506	5662	if (fullname == null)
5507	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5508	5669
5509	5670	// System.out.println("Fullname = " + fullname);
5510	5671	// Does not work on Windows due to C:
..	..	@@ -5516,12 +5677,12 @@
5516	5677
5517	5678	if (split.length == 0)
5518	5679	{
5519		- return "";
	5680	+ return fullname.bump = "";
5520	5681	}
5521	5682
5522	5683	if (split.length == 1)
5523	5684	{
5524		- return "";
	5685	+ return fullname.bump = "";
5525	5686	}
5526	5687
5527	5688	if (split.length == 2)
..	..	@@ -5529,16 +5690,16 @@
5529	5690	if (fullname.name.endsWith(":"))
5530	5691	{
5531	5692	// Windows
5532		- return "";
	5693	+ return fullname.bump = "";
5533	5694	}
5534	5695
5535		- return split[1];
	5696	+ return fullname.bump = split[1];
5536	5697	}
5537	5698
5538	5699	// Windows
5539	5700	assert(split.length == 4);
5540	5701
5541		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5542	5703	}
5543	5704
5544	5705	String GetPigmentTexture()
..	..	@@ -5621,6 +5782,9 @@
5621	5782	texname = "";
5622	5783
5623	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5624	5788	Touch();
5625	5789	}
5626	5790
..	..	@@ -5694,6 +5858,8 @@
5694	5858
5695	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5696	5860
	5861	+ GetTextures().bump = null;
	5862	+
5697	5863	Touch();
5698	5864	}
5699	5865
..	..	@@ -5714,6 +5880,38 @@
5714	5880
5715	5881	blockloop = true;
5716	5882	child.ResetBumpTexture();
	5883	+ blockloop = false;
	5884	+ }
	5885	+ }
	5886	+
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
5717	5915	blockloop = false;
5718	5916	}
5719	5917	}
..	..	@@ -5804,8 +6002,10 @@
5804	6002	if (support != null)
5805	6003	support = support;
5806	6004
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);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5809	6009
5810	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5811	6011	{
..	..	@@ -5815,8 +6015,9 @@
5815	6015	// usecalllists &= !(parent instanceof RandomNode);
5816	6016	// usecalllists = false;
5817	6017
5818		- if (GetBRep() != null)
5819		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5820	6021	//System.out.println("draw " + this);
5821	6022	//new Exception().printStackTrace();
5822	6023
..	..	@@ -5838,7 +6039,7 @@
5838	6039	if (!(this instanceof Composite))
5839	6040	touched = false;
5840	6041	//if (displaylist == -1 && usecalllists)
5841		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5842	6043	{
5843	6044	bRep.displaylist = display.GenList();
5844	6045	assert(bRep.displaylist != 0);
..	..	@@ -5849,7 +6050,7 @@
5849	6050
5850	6051	//System.out.println("\tnew list " + list);
5851	6052	//gl.glDrawBuffer(gl.GL_NONE);
5852		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5853	6054	{
5854	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5855	6056	display.NewList(bRep.displaylist);
..	..	@@ -5858,7 +6059,7 @@
5858	6059	CallList(display, root, selected, blocked);
5859	6060
5860	6061	// compiled = true;
5861		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5862	6063	{
5863	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5864	6065	display.EndList();
..	..	@@ -7209,20 +7410,23 @@
7209	7410	}
7210	7411	}
7211	7412
7212		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
7213	7417	{
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;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
7217	7421	if (toscreen == null)
7218	7422	{
7219		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7220	7424	}
7221	7425	cVector vec = in;
7222	7426	LA.xformPos(in, toscreen, in);
7223	7427	//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();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7226	7430	outPt.x = hc + (int) vec.x;
7227	7431	outPt.y = vc - (int) vec.y;
7228	7432	outRec.x = outPt.x - 3;
..	..	@@ -7230,15 +7434,18 @@
7230	7434	outRec.width = outRec.height = 6;
7231	7435	}
7232	7436
7233		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
7234	7439	{
7235	7440	Point pt = new Point(0, 0);
7236	7441	Rectangle rec = new Rectangle();
7237		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
7238	7444	return rec;
7239	7445	}
7240	7446
7241		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
7242	7449	{
7243	7450	if (level == 0)
7244	7451	{
..	..	@@ -7247,16 +7454,19 @@
7247	7454	{
7248	7455	cVector origin = new cVector();
7249	7456	//LA.xformPos(origin, toParent, origin);
7250		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7251	7461	Rectangle boundary = new Rectangle();
7252	7462	boundary.x = spot.x - 30;
7253	7463	boundary.y = spot.y - 30;
7254	7464	boundary.width = spot.width + 60;
7255	7465	boundary.height = spot.height + 60;
7256		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7257	7467	int spotw = spot.x + spot.width;
7258	7468	int spoth = spot.y + spot.height;
7259		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7260	7470	// if (CameraPane.Xmin > spot.x)
7261	7471	// {
7262	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -7273,11 +7483,6 @@
7273	7483	// {
7274	7484	// CameraPane.Ymax = spoth;
7275	7485	// }
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	7486	// if (CameraPane.Xmin > spot.x)
7282	7487	// {
7283	7488	// CameraPane.Xmin = spot.x;
..	..	@@ -7296,10 +7501,15 @@
7296	7501	// }
7297	7502	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7298	7503	//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);
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
	7509	+ spotw = spot.x + spot.width;
	7510	+ spoth = spot.y + spot.height;
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7303	7513	// if (CameraPane.Xmin > spot.x)
7304	7514	// {
7305	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7316,8 +7526,9 @@
7316	7526	// {
7317	7527	// CameraPane.Ymax = spoth;
7318	7528	// }
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);
	7529	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7321	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7322	7533	// if (CameraPane.Xmin > boundary.x)
7323	7534	// {
..	..	@@ -7339,7 +7550,8 @@
7339	7550	}
7340	7551	}
7341	7552
7342		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7343	7555	{
7344	7556	if (level == 0)
7345	7557	{
..	..	@@ -7348,8 +7560,8 @@
7348	7560
7349	7561	boolean retval = false;
7350	7562
7351		- startX = info.x;
7352		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7353	7565
7354	7566	hitSomething = -1;
7355	7567	cVector origin = new cVector();
..	..	@@ -7359,22 +7571,53 @@
7359	7571	{
7360	7572	centerPt = new Point(0, 0);
7361	7573	}
7362		- calcHotSpot(origin, info, centerPt, spot);
7363		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7364	7577	{
7365	7578	hitSomething = hitCenter;
7366	7579	retval = true;
7367	7580	}
7368	7581	spot.translate(32, 0);
7369		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7583	{
7371	7584	hitSomething = hitRotate;
7372	7585	retval = true;
7373	7586	}
7374	7587	spot.translate(0, 32);
7375		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7591	{
7377	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
7378	7621	retval = true;
7379	7622	}
7380	7623
..	..	@@ -7384,7 +7627,7 @@
7384	7627	}
7385	7628
7386	7629	//System.out.println("info.modifiers = " + info.modifiers);
7387		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7388	7631	//System.out.println("modified = " + modified);
7389	7632	//new Exception().printStackTrace();
7390	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7412,7 +7655,8 @@
7412	7655	return true;
7413	7656	}
7414	7657
7415		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7416	7660	{
7417	7661	if (hitSomething == 0)
7418	7662	{
..	..	@@ -7426,7 +7670,7 @@
7426	7670
7427	7671	//System.out.println("hitSomething = " + hitSomething);
7428	7672
7429		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
7430	7674
7431	7675	cVector xlate = new cVector();
7432	7676	//cVector xlate2 = new cVector();
..	..	@@ -7460,8 +7704,8 @@
7460	7704	toParent[3][i] = xlate.get(i);
7461	7705	LA.matInvert(toParent, fromParent);
7462	7706	*/
7463		- cVector delta = LA.newVector(0, 0, startY - info.y);
7464		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7465	7709
7466	7710	LA.matCopy(startMat, toParent);
7467	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7470,7 +7714,7 @@
7470	7714	} else
7471	7715	{
7472	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7473		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7474	7718	cVector away = new cVector();
7475	7719	//cVector right2 = new cVector();
7476	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7487,19 +7731,19 @@
7487	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7488	7732	// if (!CameraPane.LOCALTRANSFORM)
7489	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7490		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7491	7735	// if (!CameraPane.LOCALTRANSFORM)
7492	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7493	7737	//LA.vecCross(up, cVector.Z, right2);
7494	7738
7495		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7496	7740
7497	7741	//System.out.println("DELTA0 = " + delta);
7498	7742	//System.out.println("AWAY = " + info.camera.away);
7499	7743	//System.out.println("UP = " + info.camera.up);
7500	7744	if (away.z > 0)
7501	7745	{
7502		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7503	7747	{
7504	7748	delta.x = -delta.x;
7505	7749	} else
..	..	@@ -7514,7 +7758,7 @@
7514	7758	//System.out.println("DELTA1 = " + delta);
7515	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7516	7760	//System.out.println("DELTA2 = " + delta);
7517		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7518	7762	LA.matCopy(startMat, toParent);
7519	7763	//System.out.println("DELTA3 = " + delta);
7520	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7524,8 +7768,8 @@
7524	7768	break;
7525	7769
7526	7770	case hitRotate: // rotate
7527		- int dx = info.x - centerPt.x;
7528		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7529	7773	double angle = (double) Math.atan2(dx, dy);
7530	7774	angle = -(1.570796 - angle);
7531	7775
..	..	@@ -7548,7 +7792,7 @@
7548	7792	}
7549	7793	/**/
7550	7794
7551		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7552	7796	{
7553	7797	case 1: // '\001'
7554	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7575,7 +7819,7 @@
7575	7819	break;
7576	7820
7577	7821	case hitScale: // scale
7578		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7579	7823	double sign = 1;
7580	7824	if (hScale < 0)
7581	7825	{
..	..	@@ -7587,7 +7831,7 @@
7587	7831	//hScale = 0.01;
7588	7832	}
7589	7833
7590		- double vScale = (double) (info.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7591	7835	sign = 1;
7592	7836	if (vScale < 0)
7593	7837	{
..	..	@@ -7598,6 +7842,7 @@
7598	7842	{
7599	7843	//vScale = 0.01;
7600	7844	}
	7845	+
7601	7846	LA.matCopy(startMat, toParent);
7602	7847	/**/
7603	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7607,33 +7852,39 @@
7607	7852	}
7608	7853	/**/
7609	7854
7610		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7611	7856
7612	7857	if (totalScale < 0.01)
7613	7858	{
7614	7859	totalScale = 0.01;
7615	7860	}
7616	7861
7617		- switch (info.pane.RenderCamera().viewCode)
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7618	7863	{
7619	7864	case 3: // '\001'
7620	7865	if (modified \|\| opposite)
7621	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7622	7870	//LA.matScale(toParent, 1, hScale, vScale);
7623		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7624	7872	} // vScale, 1);
7625	7873	else
7626	7874	{
7627	7875	// EXCEPTION!
7628		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7629	7877	} // vScale, 1);
7630	7878	break;
7631	7879
7632	7880	case 2: // '\002'
7633	7881	if (modified \|\| opposite)
7634	7882	{
7635		- //LA.matScale(toParent, hScale, 1, vScale);
7636		- LA.matScale(toParent, 1, totalScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7637	7888	} else
7638	7889	{
7639	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7643,8 +7894,11 @@
7643	7894	case 1: // '\003'
7644	7895	if (modified \|\| opposite)
7645	7896	{
7646		- //LA.matScale(toParent, hScale, vScale, 1);
7647		- LA.matScale(toParent, 1, 1, totalScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7648	7902	} else
7649	7903	{
7650	7904	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7681,7 +7935,7 @@
7681	7935	} // NEW ...
7682	7936
7683	7937
7684		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7685	7939	}
7686	7940
7687	7941	boolean overflow = false;