~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,7 +225,7 @@
219	225	// o.bRep.support = null;
220	226	// }
221	227	o.selection = this.selection;
222		- o.versions = this.versions;
	228	+ o.versionlist = this.versionlist;
223	229	o.versionindex = this.versionindex;
224	230
225	231	if (this.support != null)
..	..	@@ -241,6 +247,73 @@
241	247	// this.bRep.support = null;
242	248	// this.support = null;
243	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;
244	317	}
245	318
246	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
..	..	@@ -277,7 +350,7 @@
277	350
278	351	this.selection = o.selection;
279	352
280		- this.versions = o.versions;
	353	+ this.versionlist = o.versionlist;
281	354	this.versionindex = o.versionindex;
282	355	// July 2019 if (this.bRep != null)
283	356	// this.bRep.support = o.transientrep;
..	..	@@ -426,6 +499,7 @@
426	499	}
427	500
428	501	boolean live = false;
	502	+ transient boolean keepdontselect;
429	503	boolean dontselect = false;
430	504	boolean hide = false;
431	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -1010,6 +1084,9 @@
1010	1084
1011	1085	if (material == null \|\| material.multiply)
1012	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
1013	1090
1014	1091	// Transparent objects are dynamic because we have to sort the triangles.
1015	1092	return material.opacity > 0.99;
..	..	@@ -2437,6 +2514,11 @@
2437	2514	else
2438	2515	{
2439	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");
2440	2522	}
2441	2523	}
2442	2524
..	..	@@ -2566,7 +2648,8 @@
2566	2648	private static final int editSelf = 1;
2567	2649	private static final int editChild = 2;
2568	2650
2569		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2570	2653	{
2571	2654	if (level == 0)
2572	2655	{
..	..	@@ -2574,7 +2657,8 @@
2574	2657	return;
2575	2658
2576	2659	Object3D selectee;
2577		- 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))
2578	2662	{
2579	2663	selectee = (Object3D) e.nextElement();
2580	2664	}
..	..	@@ -2582,19 +2666,22 @@
2582	2666	} else
2583	2667	{
2584	2668	//super.
2585		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2586	2671	}
2587	2672	}
2588	2673
2589		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2590	2676	{
2591	2677	doSomething = 0;
2592	2678	if (level == 0)
2593	2679	{
2594		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2595	2681	}
2596	2682	if (//super.
2597		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2598	2685	{
2599	2686	doSomething = 1;
2600	2687	return true;
..	..	@@ -2604,7 +2691,7 @@
2604	2691	}
2605	2692	}
2606	2693
2607		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2608	2695	{
2609	2696	if (selection == null)
2610	2697	{
..	..	@@ -2617,7 +2704,8 @@
2617	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2618	2705	{
2619	2706	Object3D selectee = (Object3D) e.nextElement();
2620		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2621	2709	{
2622	2710	childToDrag = selectee;
2623	2711	doSomething = 2;
..	..	@@ -2629,13 +2717,15 @@
2629	2717	return retval;
2630	2718	}
2631	2719
2632		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2633	2722	{
2634	2723	switch (doSomething)
2635	2724	{
2636	2725	case 1: // '\001'
2637	2726	//super.
2638		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2639	2729	break;
2640	2730
2641	2731	case 2: // '\002'
..	..	@@ -2648,11 +2738,13 @@
2648	2738	{
2649	2739	//sel.hitSomething = childToDrag.hitSomething;
2650	2740	//childToDrag.doEditDrag(info);
2651		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2652	2743	} else
2653	2744	{
2654	2745	//super.
2655		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2656	2748	}
2657	2749	}
2658	2750	break;
..	..	@@ -2670,6 +2762,9 @@
2670	2762	{
2671	2763	deselectAll();
2672	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2673	2768	ClickInfo newInfo = new ClickInfo();
2674	2769	newInfo.flags = info.flags;
2675	2770	newInfo.bounds = info.bounds;
..	..	@@ -5420,6 +5515,51 @@
5420	5515	blockloop = false;
5421	5516	}
5422	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	+
5423	5563	boolean IsSelected()
5424	5564	{
5425	5565	if (parent == null)
..	..	@@ -5480,6 +5620,11 @@
5480	5620	if (fullname == null)
5481	5621	return "";
5482	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5483	5628	// System.out.println("Fullname = " + fullname);
5484	5629
5485	5630	// Does not work on Windows due to C:
..	..	@@ -5492,7 +5637,7 @@
5492	5637
5493	5638	if (split.length == 0)
5494	5639	{
5495		- return "";
	5640	+ return fullname.pigment = "";
5496	5641	}
5497	5642
5498	5643	if (split.length <= 2)
..	..	@@ -5500,22 +5645,27 @@
5500	5645	if (fullname.name.endsWith(":"))
5501	5646	{
5502	5647	// Windows
5503		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5504	5649	}
5505	5650
5506		- return split[0];
	5651	+ return fullname.pigment = split[0];
5507	5652	}
5508	5653
5509	5654	// Windows
5510	5655	assert(split.length == 4);
5511	5656
5512		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5513	5658	}
5514	5659
5515	5660	static String GetBump(cTexture fullname)
5516	5661	{
5517	5662	if (fullname == null)
5518	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5519	5669
5520	5670	// System.out.println("Fullname = " + fullname);
5521	5671	// Does not work on Windows due to C:
..	..	@@ -5527,12 +5677,12 @@
5527	5677
5528	5678	if (split.length == 0)
5529	5679	{
5530		- return "";
	5680	+ return fullname.bump = "";
5531	5681	}
5532	5682
5533	5683	if (split.length == 1)
5534	5684	{
5535		- return "";
	5685	+ return fullname.bump = "";
5536	5686	}
5537	5687
5538	5688	if (split.length == 2)
..	..	@@ -5540,16 +5690,16 @@
5540	5690	if (fullname.name.endsWith(":"))
5541	5691	{
5542	5692	// Windows
5543		- return "";
	5693	+ return fullname.bump = "";
5544	5694	}
5545	5695
5546		- return split[1];
	5696	+ return fullname.bump = split[1];
5547	5697	}
5548	5698
5549	5699	// Windows
5550	5700	assert(split.length == 4);
5551	5701
5552		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5553	5703	}
5554	5704
5555	5705	String GetPigmentTexture()
..	..	@@ -5632,6 +5782,9 @@
5632	5782	texname = "";
5633	5783
5634	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5635	5788	Touch();
5636	5789	}
5637	5790
..	..	@@ -5705,6 +5858,8 @@
5705	5858
5706	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5707	5860
	5861	+ GetTextures().bump = null;
	5862	+
5708	5863	Touch();
5709	5864	}
5710	5865
..	..	@@ -5725,6 +5880,38 @@
5725	5880
5726	5881	blockloop = true;
5727	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);
5728	5915	blockloop = false;
5729	5916	}
5730	5917	}
..	..	@@ -5815,8 +6002,10 @@
5815	6002	if (support != null)
5816	6003	support = support;
5817	6004
5818		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5819		- 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.
5820	6009
5821	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5822	6011	{
..	..	@@ -5826,8 +6015,9 @@
5826	6015	// usecalllists &= !(parent instanceof RandomNode);
5827	6016	// usecalllists = false;
5828	6017
5829		- if (GetBRep() != null)
5830		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5831	6021	//System.out.println("draw " + this);
5832	6022	//new Exception().printStackTrace();
5833	6023
..	..	@@ -5849,7 +6039,7 @@
5849	6039	if (!(this instanceof Composite))
5850	6040	touched = false;
5851	6041	//if (displaylist == -1 && usecalllists)
5852		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5853	6043	{
5854	6044	bRep.displaylist = display.GenList();
5855	6045	assert(bRep.displaylist != 0);
..	..	@@ -5860,7 +6050,7 @@
5860	6050
5861	6051	//System.out.println("\tnew list " + list);
5862	6052	//gl.glDrawBuffer(gl.GL_NONE);
5863		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5864	6054	{
5865	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5866	6056	display.NewList(bRep.displaylist);
..	..	@@ -5869,7 +6059,7 @@
5869	6059	CallList(display, root, selected, blocked);
5870	6060
5871	6061	// compiled = true;
5872		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5873	6063	{
5874	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5875	6065	display.EndList();
..	..	@@ -7220,20 +7410,23 @@
7220	7410	}
7221	7411	}
7222	7412
7223		- 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)
7224	7417	{
7225		- int hc = info.bounds.x + info.bounds.width / 2;
7226		- int vc = info.bounds.y + info.bounds.height / 2;
7227		- 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;
7228	7421	if (toscreen == null)
7229	7422	{
7230		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7231	7424	}
7232	7425	cVector vec = in;
7233	7426	LA.xformPos(in, toscreen, in);
7234	7427	//System.out.println("Distance = " + info.camera.Distance());
7235		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7236		- 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();
7237	7430	outPt.x = hc + (int) vec.x;
7238	7431	outPt.y = vc - (int) vec.y;
7239	7432	outRec.x = outPt.x - 3;
..	..	@@ -7241,15 +7434,18 @@
7241	7434	outRec.width = outRec.height = 6;
7242	7435	}
7243	7436
7244		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
7245	7439	{
7246	7440	Point pt = new Point(0, 0);
7247	7441	Rectangle rec = new Rectangle();
7248		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
7249	7444	return rec;
7250	7445	}
7251	7446
7252		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
7253	7449	{
7254	7450	if (level == 0)
7255	7451	{
..	..	@@ -7258,16 +7454,19 @@
7258	7454	{
7259	7455	cVector origin = new cVector();
7260	7456	//LA.xformPos(origin, toParent, origin);
7261		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7262	7461	Rectangle boundary = new Rectangle();
7263	7462	boundary.x = spot.x - 30;
7264	7463	boundary.y = spot.y - 30;
7265	7464	boundary.width = spot.width + 60;
7266	7465	boundary.height = spot.height + 60;
7267		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7268	7467	int spotw = spot.x + spot.width;
7269	7468	int spoth = spot.y + spot.height;
7270		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7271	7470	// if (CameraPane.Xmin > spot.x)
7272	7471	// {
7273	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -7284,11 +7483,6 @@
7284	7483	// {
7285	7484	// CameraPane.Ymax = spoth;
7286	7485	// }
7287		- spot.translate(32, 32);
7288		- spotw = spot.x + spot.width;
7289		- spoth = spot.y + spot.height;
7290		- info.g.setColor(Color.cyan);
7291		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7292	7486	// if (CameraPane.Xmin > spot.x)
7293	7487	// {
7294	7488	// CameraPane.Xmin = spot.x;
..	..	@@ -7307,10 +7501,15 @@
7307	7501	// }
7308	7502	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7309	7503	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7310		- spot.translate(0, -32);
7311		- info.g.setColor(Color.yellow);
7312		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7313		- 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);
7314	7513	// if (CameraPane.Xmin > spot.x)
7315	7514	// {
7316	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7327,8 +7526,9 @@
7327	7526	// {
7328	7527	// CameraPane.Ymax = spoth;
7329	7528	// }
7330		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7331		- (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);
7332	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7333	7533	// if (CameraPane.Xmin > boundary.x)
7334	7534	// {
..	..	@@ -7350,7 +7550,8 @@
7350	7550	}
7351	7551	}
7352	7552
7353		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7354	7555	{
7355	7556	if (level == 0)
7356	7557	{
..	..	@@ -7359,8 +7560,8 @@
7359	7560
7360	7561	boolean retval = false;
7361	7562
7362		- startX = info.x;
7363		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7364	7565
7365	7566	hitSomething = -1;
7366	7567	cVector origin = new cVector();
..	..	@@ -7370,22 +7571,53 @@
7370	7571	{
7371	7572	centerPt = new Point(0, 0);
7372	7573	}
7373		- calcHotSpot(origin, info, centerPt, spot);
7374		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7375	7577	{
7376	7578	hitSomething = hitCenter;
7377	7579	retval = true;
7378	7580	}
7379	7581	spot.translate(32, 0);
7380		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7381	7583	{
7382	7584	hitSomething = hitRotate;
7383	7585	retval = true;
7384	7586	}
7385	7587	spot.translate(0, 32);
7386		- 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))
7387	7591	{
7388	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	+
7389	7621	retval = true;
7390	7622	}
7391	7623
..	..	@@ -7395,7 +7627,7 @@
7395	7627	}
7396	7628
7397	7629	//System.out.println("info.modifiers = " + info.modifiers);
7398		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7399	7631	//System.out.println("modified = " + modified);
7400	7632	//new Exception().printStackTrace();
7401	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7423,7 +7655,8 @@
7423	7655	return true;
7424	7656	}
7425	7657
7426		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7427	7660	{
7428	7661	if (hitSomething == 0)
7429	7662	{
..	..	@@ -7437,7 +7670,7 @@
7437	7670
7438	7671	//System.out.println("hitSomething = " + hitSomething);
7439	7672
7440		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
7441	7674
7442	7675	cVector xlate = new cVector();
7443	7676	//cVector xlate2 = new cVector();
..	..	@@ -7471,8 +7704,8 @@
7471	7704	toParent[3][i] = xlate.get(i);
7472	7705	LA.matInvert(toParent, fromParent);
7473	7706	*/
7474		- cVector delta = LA.newVector(0, 0, startY - info.y);
7475		- 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);
7476	7709
7477	7710	LA.matCopy(startMat, toParent);
7478	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7481,7 +7714,7 @@
7481	7714	} else
7482	7715	{
7483	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7484		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7485	7718	cVector away = new cVector();
7486	7719	//cVector right2 = new cVector();
7487	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7498,19 +7731,19 @@
7498	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7499	7732	// if (!CameraPane.LOCALTRANSFORM)
7500	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7501		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7502	7735	// if (!CameraPane.LOCALTRANSFORM)
7503	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7504	7737	//LA.vecCross(up, cVector.Z, right2);
7505	7738
7506		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7507	7740
7508	7741	//System.out.println("DELTA0 = " + delta);
7509	7742	//System.out.println("AWAY = " + info.camera.away);
7510	7743	//System.out.println("UP = " + info.camera.up);
7511	7744	if (away.z > 0)
7512	7745	{
7513		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7514	7747	{
7515	7748	delta.x = -delta.x;
7516	7749	} else
..	..	@@ -7525,7 +7758,7 @@
7525	7758	//System.out.println("DELTA1 = " + delta);
7526	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7527	7760	//System.out.println("DELTA2 = " + delta);
7528		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7529	7762	LA.matCopy(startMat, toParent);
7530	7763	//System.out.println("DELTA3 = " + delta);
7531	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7535,8 +7768,8 @@
7535	7768	break;
7536	7769
7537	7770	case hitRotate: // rotate
7538		- int dx = info.x - centerPt.x;
7539		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7540	7773	double angle = (double) Math.atan2(dx, dy);
7541	7774	angle = -(1.570796 - angle);
7542	7775
..	..	@@ -7559,7 +7792,7 @@
7559	7792	}
7560	7793	/**/
7561	7794
7562		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7796	{
7564	7797	case 1: // '\001'
7565	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7586,7 +7819,7 @@
7586	7819	break;
7587	7820
7588	7821	case hitScale: // scale
7589		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7590	7823	double sign = 1;
7591	7824	if (hScale < 0)
7592	7825	{
..	..	@@ -7598,7 +7831,7 @@
7598	7831	//hScale = 0.01;
7599	7832	}
7600	7833
7601		- double vScale = (double) (info.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7602	7835	sign = 1;
7603	7836	if (vScale < 0)
7604	7837	{
..	..	@@ -7609,6 +7842,7 @@
7609	7842	{
7610	7843	//vScale = 0.01;
7611	7844	}
	7845	+
7612	7846	LA.matCopy(startMat, toParent);
7613	7847	/**/
7614	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7618,33 +7852,39 @@
7618	7852	}
7619	7853	/**/
7620	7854
7621		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7622	7856
7623	7857	if (totalScale < 0.01)
7624	7858	{
7625	7859	totalScale = 0.01;
7626	7860	}
7627	7861
7628		- switch (info.pane.RenderCamera().viewCode)
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7629	7863	{
7630	7864	case 3: // '\001'
7631	7865	if (modified \|\| opposite)
7632	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7633	7870	//LA.matScale(toParent, 1, hScale, vScale);
7634		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7635	7872	} // vScale, 1);
7636	7873	else
7637	7874	{
7638	7875	// EXCEPTION!
7639		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7640	7877	} // vScale, 1);
7641	7878	break;
7642	7879
7643	7880	case 2: // '\002'
7644	7881	if (modified \|\| opposite)
7645	7882	{
7646		- //LA.matScale(toParent, hScale, 1, vScale);
7647		- 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);
7648	7888	} else
7649	7889	{
7650	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7654,8 +7894,11 @@
7654	7894	case 1: // '\003'
7655	7895	if (modified \|\| opposite)
7656	7896	{
7657		- //LA.matScale(toParent, hScale, vScale, 1);
7658		- 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);
7659	7902	} else
7660	7903	{
7661	7904	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7692,7 +7935,7 @@
7692	7935	} // NEW ...
7693	7936
7694	7937
7695		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7696	7939	}
7697	7940
7698	7941	boolean overflow = false;