~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,6 +22,7 @@
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.
..	..	@@ -29,9 +30,14 @@
29	30	Object3D saveskeleton;
30	31	//
31	32
32		- byte[] versions[] = new byte[100][];
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
33	37	int versionindex = -1;
34	38
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
35	41	ScriptNode scriptnode;
36	42
37	43	void InitOthers()
..	..	@@ -219,6 +225,8 @@
219	225	// o.bRep.support = null;
220	226	// }
221	227	o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
222	230
223	231	if (this.support != null)
224	232	{
..	..	@@ -239,6 +247,73 @@
239	247	// this.bRep.support = null;
240	248	// this.support = null;
241	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;
242	317	}
243	318
244	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
..	..	@@ -274,6 +349,9 @@
274	349	}
275	350
276	351	this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
277	355	// July 2019 if (this.bRep != null)
278	356	// this.bRep.support = o.transientrep;
279	357	// this.support = o.support;
..	..	@@ -421,6 +499,7 @@
421	499	}
422	500
423	501	boolean live = false;
	502	+ transient boolean keepdontselect;
424	503	boolean dontselect = false;
425	504	boolean hide = false;
426	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -1005,6 +1084,9 @@
1005	1084
1006	1085	if (material == null \|\| material.multiply)
1007	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
1008	1090
1009	1091	// Transparent objects are dynamic because we have to sort the triangles.
1010	1092	return material.opacity > 0.99;
..	..	@@ -2432,6 +2514,11 @@
2432	2514	else
2433	2515	{
2434	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");
2435	2522	}
2436	2523	}
2437	2524
..	..	@@ -2561,7 +2648,8 @@
2561	2648	private static final int editSelf = 1;
2562	2649	private static final int editChild = 2;
2563	2650
2564		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2565	2653	{
2566	2654	if (level == 0)
2567	2655	{
..	..	@@ -2569,7 +2657,8 @@
2569	2657	return;
2570	2658
2571	2659	Object3D selectee;
2572		- 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))
2573	2662	{
2574	2663	selectee = (Object3D) e.nextElement();
2575	2664	}
..	..	@@ -2577,19 +2666,22 @@
2577	2666	} else
2578	2667	{
2579	2668	//super.
2580		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2581	2671	}
2582	2672	}
2583	2673
2584		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2585	2676	{
2586	2677	doSomething = 0;
2587	2678	if (level == 0)
2588	2679	{
2589		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2590	2681	}
2591	2682	if (//super.
2592		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2593	2685	{
2594	2686	doSomething = 1;
2595	2687	return true;
..	..	@@ -2599,7 +2691,7 @@
2599	2691	}
2600	2692	}
2601	2693
2602		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2603	2695	{
2604	2696	if (selection == null)
2605	2697	{
..	..	@@ -2612,7 +2704,8 @@
2612	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2613	2705	{
2614	2706	Object3D selectee = (Object3D) e.nextElement();
2615		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2616	2709	{
2617	2710	childToDrag = selectee;
2618	2711	doSomething = 2;
..	..	@@ -2624,13 +2717,15 @@
2624	2717	return retval;
2625	2718	}
2626	2719
2627		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2628	2722	{
2629	2723	switch (doSomething)
2630	2724	{
2631	2725	case 1: // '\001'
2632	2726	//super.
2633		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2634	2729	break;
2635	2730
2636	2731	case 2: // '\002'
..	..	@@ -2643,11 +2738,13 @@
2643	2738	{
2644	2739	//sel.hitSomething = childToDrag.hitSomething;
2645	2740	//childToDrag.doEditDrag(info);
2646		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2647	2743	} else
2648	2744	{
2649	2745	//super.
2650		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2651	2748	}
2652	2749	}
2653	2750	break;
..	..	@@ -2665,6 +2762,9 @@
2665	2762	{
2666	2763	deselectAll();
2667	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2668	2768	ClickInfo newInfo = new ClickInfo();
2669	2769	newInfo.flags = info.flags;
2670	2770	newInfo.bounds = info.bounds;
..	..	@@ -3112,7 +3212,7 @@
3112	3212	{
3113	3213	if (bRep != null)
3114	3214	{
3115		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3116	3216	Touch();
3117	3217	}
3118	3218	}
..	..	@@ -3522,15 +3622,47 @@
3522	3622
3523	3623	void ClearMaterials()
3524	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3525	3630	ClearMaterial();
3526		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3527	3632	{
3528		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3529	3634	if (child == null)
3530	3635	continue;
3531	3636	child.ClearMaterials();
3532		- release(i);
3533	3637	}
	3638	+
	3639	+ blockloop = false;
	3640	+ }
	3641	+
	3642	+ void ClearVersionList()
	3643	+ {
	3644	+ this.versionlist = null;
	3645	+ this.versionindex = -1;
	3646	+ this.versiontable = null;
	3647	+ }
	3648	+
	3649	+ void ClearVersions()
	3650	+ {
	3651	+ if (blockloop)
	3652	+ return;
	3653	+
	3654	+ blockloop = true;
	3655	+
	3656	+ ClearVersionList();
	3657	+ for (int i = 0; i < Size(); i++)
	3658	+ {
	3659	+ Object3D child = (Object3D) get(i);
	3660	+ if (child == null)
	3661	+ continue;
	3662	+ child.ClearVersions();
	3663	+ }
	3664	+
	3665	+ blockloop = false;
3534	3666	}
3535	3667
3536	3668	void FlipV(boolean flip)
..	..	@@ -5415,6 +5547,51 @@
5415	5547	blockloop = false;
5416	5548	}
5417	5549
	5550	+ void ResetSelectable()
	5551	+ {
	5552	+ if (blockloop)
	5553	+ return;
	5554	+
	5555	+ blockloop = true;
	5556	+
	5557	+ keepdontselect = dontselect;
	5558	+ dontselect = true;
	5559	+
	5560	+ Object3D child;
	5561	+ int nb = Size();
	5562	+ for (int i = 0; i < nb; i++)
	5563	+ {
	5564	+ child = (Object3D) get(i);
	5565	+ if (child == null)
	5566	+ continue;
	5567	+ child.ResetSelectable();
	5568	+ }
	5569	+
	5570	+ blockloop = false;
	5571	+ }
	5572	+
	5573	+ void RestoreSelectable()
	5574	+ {
	5575	+ if (blockloop)
	5576	+ return;
	5577	+
	5578	+ blockloop = true;
	5579	+
	5580	+ dontselect = keepdontselect;
	5581	+
	5582	+ Object3D child;
	5583	+ int nb = Size();
	5584	+ for (int i = 0; i < nb; i++)
	5585	+ {
	5586	+ child = (Object3D) get(i);
	5587	+ if (child == null)
	5588	+ continue;
	5589	+ child.RestoreSelectable();
	5590	+ }
	5591	+
	5592	+ blockloop = false;
	5593	+ }
	5594	+
5418	5595	boolean IsSelected()
5419	5596	{
5420	5597	if (parent == null)
..	..	@@ -5475,6 +5652,11 @@
5475	5652	if (fullname == null)
5476	5653	return "";
5477	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5478	5660	// System.out.println("Fullname = " + fullname);
5479	5661
5480	5662	// Does not work on Windows due to C:
..	..	@@ -5487,7 +5669,7 @@
5487	5669
5488	5670	if (split.length == 0)
5489	5671	{
5490		- return "";
	5672	+ return fullname.pigment = "";
5491	5673	}
5492	5674
5493	5675	if (split.length <= 2)
..	..	@@ -5495,22 +5677,27 @@
5495	5677	if (fullname.name.endsWith(":"))
5496	5678	{
5497	5679	// Windows
5498		- return fullname.name.substring(0, fullname.name.length()-1);
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5499	5681	}
5500	5682
5501		- return split[0];
	5683	+ return fullname.pigment = split[0];
5502	5684	}
5503	5685
5504	5686	// Windows
5505	5687	assert(split.length == 4);
5506	5688
5507		- return split[0] + ":" + split[1];
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5508	5690	}
5509	5691
5510	5692	static String GetBump(cTexture fullname)
5511	5693	{
5512	5694	if (fullname == null)
5513	5695	return "";
	5696	+
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
5514	5701
5515	5702	// System.out.println("Fullname = " + fullname);
5516	5703	// Does not work on Windows due to C:
..	..	@@ -5522,12 +5709,12 @@
5522	5709
5523	5710	if (split.length == 0)
5524	5711	{
5525		- return "";
	5712	+ return fullname.bump = "";
5526	5713	}
5527	5714
5528	5715	if (split.length == 1)
5529	5716	{
5530		- return "";
	5717	+ return fullname.bump = "";
5531	5718	}
5532	5719
5533	5720	if (split.length == 2)
..	..	@@ -5535,16 +5722,16 @@
5535	5722	if (fullname.name.endsWith(":"))
5536	5723	{
5537	5724	// Windows
5538		- return "";
	5725	+ return fullname.bump = "";
5539	5726	}
5540	5727
5541		- return split[1];
	5728	+ return fullname.bump = split[1];
5542	5729	}
5543	5730
5544	5731	// Windows
5545	5732	assert(split.length == 4);
5546	5733
5547		- return split[2] + ":" + split[3];
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5548	5735	}
5549	5736
5550	5737	String GetPigmentTexture()
..	..	@@ -5627,6 +5814,9 @@
5627	5814	texname = "";
5628	5815
5629	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5630	5820	Touch();
5631	5821	}
5632	5822
..	..	@@ -5700,6 +5890,8 @@
5700	5890
5701	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5702	5892
	5893	+ GetTextures().bump = null;
	5894	+
5703	5895	Touch();
5704	5896	}
5705	5897
..	..	@@ -5720,6 +5912,38 @@
5720	5912
5721	5913	blockloop = true;
5722	5914	child.ResetBumpTexture();
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
	5919	+ void EmbedTextures(boolean embed)
	5920	+ {
	5921	+ if (blockloop)
	5922	+ return;
	5923	+
	5924	+ //if (GetTextures() != null)
	5925	+ if (embed)
	5926	+ CameraPane.EmbedTextures(GetTextures());
	5927	+ else
	5928	+ {
	5929	+ GetTextures().pigmentdata = null;
	5930	+ GetTextures().bumpdata = null;
	5931	+ GetTextures().pw = 0;
	5932	+ GetTextures().ph = 0;
	5933	+ GetTextures().bw = 0;
	5934	+ GetTextures().bh = 0;
	5935	+ }
	5936	+
	5937	+ int nb = Size();
	5938	+ for (int i = 0; i < nb; i++)
	5939	+ {
	5940	+ Object3D child = (Object3D) get(i);
	5941	+
	5942	+ if (child == null)
	5943	+ continue;
	5944	+
	5945	+ blockloop = true;
	5946	+ child.EmbedTextures(embed);
5723	5947	blockloop = false;
5724	5948	}
5725	5949	}
..	..	@@ -5810,8 +6034,10 @@
5810	6034	if (support != null)
5811	6035	support = support;
5812	6036
5813		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5814		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6037	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6038	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6039	+
	6040	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5815	6041
5816	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5817	6043	{
..	..	@@ -5821,8 +6047,9 @@
5821	6047	// usecalllists &= !(parent instanceof RandomNode);
5822	6048	// usecalllists = false;
5823	6049
5824		- if (GetBRep() != null)
5825		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5826	6053	//System.out.println("draw " + this);
5827	6054	//new Exception().printStackTrace();
5828	6055
..	..	@@ -5844,7 +6071,7 @@
5844	6071	if (!(this instanceof Composite))
5845	6072	touched = false;
5846	6073	//if (displaylist == -1 && usecalllists)
5847		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5848	6075	{
5849	6076	bRep.displaylist = display.GenList();
5850	6077	assert(bRep.displaylist != 0);
..	..	@@ -5855,7 +6082,7 @@
5855	6082
5856	6083	//System.out.println("\tnew list " + list);
5857	6084	//gl.glDrawBuffer(gl.GL_NONE);
5858		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5859	6086	{
5860	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5861	6088	display.NewList(bRep.displaylist);
..	..	@@ -5864,7 +6091,7 @@
5864	6091	CallList(display, root, selected, blocked);
5865	6092
5866	6093	// compiled = true;
5867		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5868	6095	{
5869	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5870	6097	display.EndList();
..	..	@@ -7215,20 +7442,23 @@
7215	7442	}
7216	7443	}
7217	7444
7218		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7445	+ static ClickInfo clickInfo = new ClickInfo();
	7446	+
	7447	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7448	+ Point outPt, Rectangle outRec)
7219	7449	{
7220		- int hc = info.bounds.x + info.bounds.width / 2;
7221		- int vc = info.bounds.y + info.bounds.height / 2;
7222		- double[][] toscreen = info.toScreen;
	7450	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7451	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7452	+ double[][] toscreen = clickInfo.toScreen;
7223	7453	if (toscreen == null)
7224	7454	{
7225		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7226	7456	}
7227	7457	cVector vec = in;
7228	7458	LA.xformPos(in, toscreen, in);
7229	7459	//System.out.println("Distance = " + info.camera.Distance());
7230		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7231		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7460	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7461	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7232	7462	outPt.x = hc + (int) vec.x;
7233	7463	outPt.y = vc - (int) vec.y;
7234	7464	outRec.x = outPt.x - 3;
..	..	@@ -7236,15 +7466,18 @@
7236	7466	outRec.width = outRec.height = 6;
7237	7467	}
7238	7468
7239		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7240	7471	{
7241	7472	Point pt = new Point(0, 0);
7242	7473	Rectangle rec = new Rectangle();
7243		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7244	7476	return rec;
7245	7477	}
7246	7478
7247		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7248	7481	{
7249	7482	if (level == 0)
7250	7483	{
..	..	@@ -7253,16 +7486,19 @@
7253	7486	{
7254	7487	cVector origin = new cVector();
7255	7488	//LA.xformPos(origin, toParent, origin);
7256		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7257	7493	Rectangle boundary = new Rectangle();
7258	7494	boundary.x = spot.x - 30;
7259	7495	boundary.y = spot.y - 30;
7260	7496	boundary.width = spot.width + 60;
7261	7497	boundary.height = spot.height + 60;
7262		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7263	7499	int spotw = spot.x + spot.width;
7264	7500	int spoth = spot.y + spot.height;
7265		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7266	7502	// if (CameraPane.Xmin > spot.x)
7267	7503	// {
7268	7504	// CameraPane.Xmin = spot.x;
..	..	@@ -7279,11 +7515,6 @@
7279	7515	// {
7280	7516	// CameraPane.Ymax = spoth;
7281	7517	// }
7282		- spot.translate(32, 32);
7283		- spotw = spot.x + spot.width;
7284		- spoth = spot.y + spot.height;
7285		- info.g.setColor(Color.cyan);
7286		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7287	7518	// if (CameraPane.Xmin > spot.x)
7288	7519	// {
7289	7520	// CameraPane.Xmin = spot.x;
..	..	@@ -7302,10 +7533,15 @@
7302	7533	// }
7303	7534	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7304	7535	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7305		- spot.translate(0, -32);
7306		- info.g.setColor(Color.yellow);
7307		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7308		- info.g.setColor(Color.green);
	7536	+ spot.translate(32, 0);
	7537	+ clickInfo.g.setColor(Color.yellow);
	7538	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7539	+
	7540	+ spot.translate(32, 64);
	7541	+ spotw = spot.x + spot.width;
	7542	+ spoth = spot.y + spot.height;
	7543	+ clickInfo.g.setColor(Color.cyan);
	7544	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7309	7545	// if (CameraPane.Xmin > spot.x)
7310	7546	// {
7311	7547	// CameraPane.Xmin = spot.x;
..	..	@@ -7322,8 +7558,9 @@
7322	7558	// {
7323	7559	// CameraPane.Ymax = spoth;
7324	7560	// }
7325		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7326		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7561	+ clickInfo.g.setColor(Color.green);
	7562	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7563	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7327	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7328	7565	// if (CameraPane.Xmin > boundary.x)
7329	7566	// {
..	..	@@ -7345,7 +7582,8 @@
7345	7582	}
7346	7583	}
7347	7584
7348		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7349	7587	{
7350	7588	if (level == 0)
7351	7589	{
..	..	@@ -7354,8 +7592,8 @@
7354	7592
7355	7593	boolean retval = false;
7356	7594
7357		- startX = info.x;
7358		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7359	7597
7360	7598	hitSomething = -1;
7361	7599	cVector origin = new cVector();
..	..	@@ -7365,22 +7603,53 @@
7365	7603	{
7366	7604	centerPt = new Point(0, 0);
7367	7605	}
7368		- calcHotSpot(origin, info, centerPt, spot);
7369		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7609	{
7371	7610	hitSomething = hitCenter;
7372	7611	retval = true;
7373	7612	}
7374	7613	spot.translate(32, 0);
7375		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7615	{
7377	7616	hitSomething = hitRotate;
7378	7617	retval = true;
7379	7618	}
7380	7619	spot.translate(0, 32);
7381		- if (spot.contains(info.x, info.y))
	7620	+ spot.translate(32, 0);
	7621	+ spot.translate(0, 32);
	7622	+ if (spot.contains(clickInfo.x, clickInfo.y))
7382	7623	{
7383	7624	hitSomething = hitScale;
	7625	+
	7626	+ double scale = 0.005f * clickInfo.camera.Distance();
	7627	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7628	+ double sign = 1;
	7629	+ if (hScale < 0)
	7630	+ {
	7631	+ sign = -1;
	7632	+ }
	7633	+ hScale = signMath.pow(signhScale, scale * 50);
	7634	+ if (hScale < 0.01)
	7635	+ {
	7636	+ //hScale = 0.01;
	7637	+ }
	7638	+
	7639	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7640	+ sign = 1;
	7641	+ if (vScale < 0)
	7642	+ {
	7643	+ sign = -1;
	7644	+ }
	7645	+ vScale = signMath.pow(signvScale, scale * 50);
	7646	+ if (vScale < 0.01)
	7647	+ {
	7648	+ //vScale = 0.01;
	7649	+ }
	7650	+
	7651	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7652	+
7384	7653	retval = true;
7385	7654	}
7386	7655
..	..	@@ -7390,7 +7659,7 @@
7390	7659	}
7391	7660
7392	7661	//System.out.println("info.modifiers = " + info.modifiers);
7393		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7394	7663	//System.out.println("modified = " + modified);
7395	7664	//new Exception().printStackTrace();
7396	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7418,7 +7687,8 @@
7418	7687	return true;
7419	7688	}
7420	7689
7421		- void doEditDrag0(ClickInfo info, boolean opposite)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7422	7692	{
7423	7693	if (hitSomething == 0)
7424	7694	{
..	..	@@ -7432,7 +7702,7 @@
7432	7702
7433	7703	//System.out.println("hitSomething = " + hitSomething);
7434	7704
7435		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
7436	7706
7437	7707	cVector xlate = new cVector();
7438	7708	//cVector xlate2 = new cVector();
..	..	@@ -7466,8 +7736,8 @@
7466	7736	toParent[3][i] = xlate.get(i);
7467	7737	LA.matInvert(toParent, fromParent);
7468	7738	*/
7469		- cVector delta = LA.newVector(0, 0, startY - info.y);
7470		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7739	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7740	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7471	7741
7472	7742	LA.matCopy(startMat, toParent);
7473	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7476,7 +7746,7 @@
7476	7746	} else
7477	7747	{
7478	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7479		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7480	7750	cVector away = new cVector();
7481	7751	//cVector right2 = new cVector();
7482	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7493,19 +7763,19 @@
7493	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7494	7764	// if (!CameraPane.LOCALTRANSFORM)
7495	7765	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7496		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7497	7767	// if (!CameraPane.LOCALTRANSFORM)
7498	7768	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7499	7769	//LA.vecCross(up, cVector.Z, right2);
7500	7770
7501		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7502	7772
7503	7773	//System.out.println("DELTA0 = " + delta);
7504	7774	//System.out.println("AWAY = " + info.camera.away);
7505	7775	//System.out.println("UP = " + info.camera.up);
7506	7776	if (away.z > 0)
7507	7777	{
7508		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7509	7779	{
7510	7780	delta.x = -delta.x;
7511	7781	} else
..	..	@@ -7520,7 +7790,7 @@
7520	7790	//System.out.println("DELTA1 = " + delta);
7521	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7522	7792	//System.out.println("DELTA2 = " + delta);
7523		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7524	7794	LA.matCopy(startMat, toParent);
7525	7795	//System.out.println("DELTA3 = " + delta);
7526	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7530,8 +7800,8 @@
7530	7800	break;
7531	7801
7532	7802	case hitRotate: // rotate
7533		- int dx = info.x - centerPt.x;
7534		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7535	7805	double angle = (double) Math.atan2(dx, dy);
7536	7806	angle = -(1.570796 - angle);
7537	7807
..	..	@@ -7554,7 +7824,7 @@
7554	7824	}
7555	7825	/**/
7556	7826
7557		- switch (info.pane.RenderCamera().viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7558	7828	{
7559	7829	case 1: // '\001'
7560	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7581,7 +7851,7 @@
7581	7851	break;
7582	7852
7583	7853	case hitScale: // scale
7584		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7585	7855	double sign = 1;
7586	7856	if (hScale < 0)
7587	7857	{
..	..	@@ -7593,7 +7863,7 @@
7593	7863	//hScale = 0.01;
7594	7864	}
7595	7865
7596		- double vScale = (double) (info.y - centerPt.y) / 32;
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7597	7867	sign = 1;
7598	7868	if (vScale < 0)
7599	7869	{
..	..	@@ -7604,6 +7874,7 @@
7604	7874	{
7605	7875	//vScale = 0.01;
7606	7876	}
	7877	+
7607	7878	LA.matCopy(startMat, toParent);
7608	7879	/**/
7609	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7613,33 +7884,39 @@
7613	7884	}
7614	7885	/**/
7615	7886
7616		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7617	7888
7618	7889	if (totalScale < 0.01)
7619	7890	{
7620	7891	totalScale = 0.01;
7621	7892	}
7622	7893
7623		- switch (info.pane.RenderCamera().viewCode)
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7624	7895	{
7625	7896	case 3: // '\001'
7626	7897	if (modified \|\| opposite)
7627	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7628	7902	//LA.matScale(toParent, 1, hScale, vScale);
7629		- LA.matScale(toParent, totalScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7630	7904	} // vScale, 1);
7631	7905	else
7632	7906	{
7633	7907	// EXCEPTION!
7634		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7635	7909	} // vScale, 1);
7636	7910	break;
7637	7911
7638	7912	case 2: // '\002'
7639	7913	if (modified \|\| opposite)
7640	7914	{
7641		- //LA.matScale(toParent, hScale, 1, vScale);
7642		- LA.matScale(toParent, 1, totalScale, 1);
	7915	+ if (modified && opposite)
	7916	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7917	+ else
	7918	+ //LA.matScale(toParent, hScale, 1, vScale);
	7919	+ LA.matScale(toParent, 1, totalScale, 1);
7643	7920	} else
7644	7921	{
7645	7922	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7649,8 +7926,11 @@
7649	7926	case 1: // '\003'
7650	7927	if (modified \|\| opposite)
7651	7928	{
7652		- //LA.matScale(toParent, hScale, vScale, 1);
7653		- LA.matScale(toParent, 1, 1, totalScale);
	7929	+ if (modified && opposite)
	7930	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7931	+ else
	7932	+ //LA.matScale(toParent, hScale, vScale, 1);
	7933	+ LA.matScale(toParent, 1, 1, totalScale);
7654	7934	} else
7655	7935	{
7656	7936	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7687,7 +7967,7 @@
7687	7967	} // NEW ...
7688	7968
7689	7969
7690		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7691	7971	}
7692	7972
7693	7973	boolean overflow = false;