~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[];
	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;
..	..	@@ -1011,6 +1084,9 @@
1011	1084
1012	1085	if (material == null \|\| material.multiply)
1013	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
1014	1090
1015	1091	// Transparent objects are dynamic because we have to sort the triangles.
1016	1092	return material.opacity > 0.99;
..	..	@@ -2438,6 +2514,11 @@
2438	2514	else
2439	2515	{
2440	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");
2441	2522	}
2442	2523	}
2443	2524
..	..	@@ -2567,7 +2648,8 @@
2567	2648	private static final int editSelf = 1;
2568	2649	private static final int editChild = 2;
2569	2650
2570		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2571	2653	{
2572	2654	if (level == 0)
2573	2655	{
..	..	@@ -2575,7 +2657,8 @@
2575	2657	return;
2576	2658
2577	2659	Object3D selectee;
2578		- 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))
2579	2662	{
2580	2663	selectee = (Object3D) e.nextElement();
2581	2664	}
..	..	@@ -2583,19 +2666,22 @@
2583	2666	} else
2584	2667	{
2585	2668	//super.
2586		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2587	2671	}
2588	2672	}
2589	2673
2590		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2591	2676	{
2592	2677	doSomething = 0;
2593	2678	if (level == 0)
2594	2679	{
2595		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2596	2681	}
2597	2682	if (//super.
2598		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2599	2685	{
2600	2686	doSomething = 1;
2601	2687	return true;
..	..	@@ -2605,7 +2691,7 @@
2605	2691	}
2606	2692	}
2607	2693
2608		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2609	2695	{
2610	2696	if (selection == null)
2611	2697	{
..	..	@@ -2618,7 +2704,8 @@
2618	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2619	2705	{
2620	2706	Object3D selectee = (Object3D) e.nextElement();
2621		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2622	2709	{
2623	2710	childToDrag = selectee;
2624	2711	doSomething = 2;
..	..	@@ -2630,13 +2717,15 @@
2630	2717	return retval;
2631	2718	}
2632	2719
2633		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2634	2722	{
2635	2723	switch (doSomething)
2636	2724	{
2637	2725	case 1: // '\001'
2638	2726	//super.
2639		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2640	2729	break;
2641	2730
2642	2731	case 2: // '\002'
..	..	@@ -2649,11 +2738,13 @@
2649	2738	{
2650	2739	//sel.hitSomething = childToDrag.hitSomething;
2651	2740	//childToDrag.doEditDrag(info);
2652		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2653	2743	} else
2654	2744	{
2655	2745	//super.
2656		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2657	2748	}
2658	2749	}
2659	2750	break;
..	..	@@ -2671,6 +2762,9 @@
2671	2762	{
2672	2763	deselectAll();
2673	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2674	2768	ClickInfo newInfo = new ClickInfo();
2675	2769	newInfo.flags = info.flags;
2676	2770	newInfo.bounds = info.bounds;
..	..	@@ -5526,6 +5620,11 @@
5526	5620	if (fullname == null)
5527	5621	return "";
5528	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5529	5628	// System.out.println("Fullname = " + fullname);
5530	5629
5531	5630	// Does not work on Windows due to C:
..	..	@@ -5538,7 +5637,7 @@
5538	5637
5539	5638	if (split.length == 0)
5540	5639	{
5541		- return "";
	5640	+ return fullname.pigment = "";
5542	5641	}
5543	5642
5544	5643	if (split.length <= 2)
..	..	@@ -5546,22 +5645,27 @@
5546	5645	if (fullname.name.endsWith(":"))
5547	5646	{
5548	5647	// Windows
5549		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5550	5649	}
5551	5650
5552		- return split[0];
	5651	+ return fullname.pigment = split[0];
5553	5652	}
5554	5653
5555	5654	// Windows
5556	5655	assert(split.length == 4);
5557	5656
5558		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5559	5658	}
5560	5659
5561	5660	static String GetBump(cTexture fullname)
5562	5661	{
5563	5662	if (fullname == null)
5564	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5565	5669
5566	5670	// System.out.println("Fullname = " + fullname);
5567	5671	// Does not work on Windows due to C:
..	..	@@ -5573,12 +5677,12 @@
5573	5677
5574	5678	if (split.length == 0)
5575	5679	{
5576		- return "";
	5680	+ return fullname.bump = "";
5577	5681	}
5578	5682
5579	5683	if (split.length == 1)
5580	5684	{
5581		- return "";
	5685	+ return fullname.bump = "";
5582	5686	}
5583	5687
5584	5688	if (split.length == 2)
..	..	@@ -5586,16 +5690,16 @@
5586	5690	if (fullname.name.endsWith(":"))
5587	5691	{
5588	5692	// Windows
5589		- return "";
	5693	+ return fullname.bump = "";
5590	5694	}
5591	5695
5592		- return split[1];
	5696	+ return fullname.bump = split[1];
5593	5697	}
5594	5698
5595	5699	// Windows
5596	5700	assert(split.length == 4);
5597	5701
5598		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5599	5703	}
5600	5704
5601	5705	String GetPigmentTexture()
..	..	@@ -5678,6 +5782,9 @@
5678	5782	texname = "";
5679	5783
5680	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5681	5788	Touch();
5682	5789	}
5683	5790
..	..	@@ -5751,6 +5858,8 @@
5751	5858
5752	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5753	5860
	5861	+ GetTextures().bump = null;
	5862	+
5754	5863	Touch();
5755	5864	}
5756	5865
..	..	@@ -5775,12 +5884,23 @@
5775	5884	}
5776	5885	}
5777	5886
5778		- void EmbedTextures()
	5887	+ void EmbedTextures(boolean embed)
5779	5888	{
5780	5889	if (blockloop)
5781	5890	return;
5782	5891
5783		- CameraPane.EmbedTextures(texture);
	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	+ }
5784	5904
5785	5905	int nb = Size();
5786	5906	for (int i = 0; i < nb; i++)
..	..	@@ -5791,7 +5911,7 @@
5791	5911	continue;
5792	5912
5793	5913	blockloop = true;
5794		- child.EmbedTextures();
	5914	+ child.EmbedTextures(embed);
5795	5915	blockloop = false;
5796	5916	}
5797	5917	}
..	..	@@ -5882,8 +6002,10 @@
5882	6002	if (support != null)
5883	6003	support = support;
5884	6004
5885		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5886		- 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.
5887	6009
5888	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5889	6011	{
..	..	@@ -5893,8 +6015,9 @@
5893	6015	// usecalllists &= !(parent instanceof RandomNode);
5894	6016	// usecalllists = false;
5895	6017
5896		- if (GetBRep() != null)
5897		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5898	6021	//System.out.println("draw " + this);
5899	6022	//new Exception().printStackTrace();
5900	6023
..	..	@@ -5916,7 +6039,7 @@
5916	6039	if (!(this instanceof Composite))
5917	6040	touched = false;
5918	6041	//if (displaylist == -1 && usecalllists)
5919		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5920	6043	{
5921	6044	bRep.displaylist = display.GenList();
5922	6045	assert(bRep.displaylist != 0);
..	..	@@ -5927,7 +6050,7 @@
5927	6050
5928	6051	//System.out.println("\tnew list " + list);
5929	6052	//gl.glDrawBuffer(gl.GL_NONE);
5930		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5931	6054	{
5932	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5933	6056	display.NewList(bRep.displaylist);
..	..	@@ -5936,7 +6059,7 @@
5936	6059	CallList(display, root, selected, blocked);
5937	6060
5938	6061	// compiled = true;
5939		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5940	6063	{
5941	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5942	6065	display.EndList();
..	..	@@ -7287,20 +7410,23 @@
7287	7410	}
7288	7411	}
7289	7412
7290		- 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)
7291	7417	{
7292		- int hc = info.bounds.x + info.bounds.width / 2;
7293		- int vc = info.bounds.y + info.bounds.height / 2;
7294		- 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;
7295	7421	if (toscreen == null)
7296	7422	{
7297		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7298	7424	}
7299	7425	cVector vec = in;
7300	7426	LA.xformPos(in, toscreen, in);
7301	7427	//System.out.println("Distance = " + info.camera.Distance());
7302		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7303		- 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();
7304	7430	outPt.x = hc + (int) vec.x;
7305	7431	outPt.y = vc - (int) vec.y;
7306	7432	outRec.x = outPt.x - 3;
..	..	@@ -7308,15 +7434,18 @@
7308	7434	outRec.width = outRec.height = 6;
7309	7435	}
7310	7436
7311		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
7312	7439	{
7313	7440	Point pt = new Point(0, 0);
7314	7441	Rectangle rec = new Rectangle();
7315		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
7316	7444	return rec;
7317	7445	}
7318	7446
7319		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
7320	7449	{
7321	7450	if (level == 0)
7322	7451	{
..	..	@@ -7325,16 +7454,19 @@
7325	7454	{
7326	7455	cVector origin = new cVector();
7327	7456	//LA.xformPos(origin, toParent, origin);
7328		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7329	7461	Rectangle boundary = new Rectangle();
7330	7462	boundary.x = spot.x - 30;
7331	7463	boundary.y = spot.y - 30;
7332	7464	boundary.width = spot.width + 60;
7333	7465	boundary.height = spot.height + 60;
7334		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7335	7467	int spotw = spot.x + spot.width;
7336	7468	int spoth = spot.y + spot.height;
7337		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7338	7470	// if (CameraPane.Xmin > spot.x)
7339	7471	// {
7340	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -7351,11 +7483,6 @@
7351	7483	// {
7352	7484	// CameraPane.Ymax = spoth;
7353	7485	// }
7354		- spot.translate(32, 32);
7355		- spotw = spot.x + spot.width;
7356		- spoth = spot.y + spot.height;
7357		- info.g.setColor(Color.cyan);
7358		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7359	7486	// if (CameraPane.Xmin > spot.x)
7360	7487	// {
7361	7488	// CameraPane.Xmin = spot.x;
..	..	@@ -7374,10 +7501,15 @@
7374	7501	// }
7375	7502	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7376	7503	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7377		- spot.translate(0, -32);
7378		- info.g.setColor(Color.yellow);
7379		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7380		- 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);
7381	7513	// if (CameraPane.Xmin > spot.x)
7382	7514	// {
7383	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7394,8 +7526,9 @@
7394	7526	// {
7395	7527	// CameraPane.Ymax = spoth;
7396	7528	// }
7397		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7398		- (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);
7399	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7400	7533	// if (CameraPane.Xmin > boundary.x)
7401	7534	// {
..	..	@@ -7417,7 +7550,8 @@
7417	7550	}
7418	7551	}
7419	7552
7420		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7421	7555	{
7422	7556	if (level == 0)
7423	7557	{
..	..	@@ -7426,8 +7560,8 @@
7426	7560
7427	7561	boolean retval = false;
7428	7562
7429		- startX = info.x;
7430		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7431	7565
7432	7566	hitSomething = -1;
7433	7567	cVector origin = new cVector();
..	..	@@ -7437,22 +7571,53 @@
7437	7571	{
7438	7572	centerPt = new Point(0, 0);
7439	7573	}
7440		- calcHotSpot(origin, info, centerPt, spot);
7441		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7442	7577	{
7443	7578	hitSomething = hitCenter;
7444	7579	retval = true;
7445	7580	}
7446	7581	spot.translate(32, 0);
7447		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7448	7583	{
7449	7584	hitSomething = hitRotate;
7450	7585	retval = true;
7451	7586	}
7452	7587	spot.translate(0, 32);
7453		- 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))
7454	7591	{
7455	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	+
7456	7621	retval = true;
7457	7622	}
7458	7623
..	..	@@ -7462,7 +7627,7 @@
7462	7627	}
7463	7628
7464	7629	//System.out.println("info.modifiers = " + info.modifiers);
7465		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7466	7631	//System.out.println("modified = " + modified);
7467	7632	//new Exception().printStackTrace();
7468	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7490,7 +7655,8 @@
7490	7655	return true;
7491	7656	}
7492	7657
7493		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7494	7660	{
7495	7661	if (hitSomething == 0)
7496	7662	{
..	..	@@ -7504,7 +7670,7 @@
7504	7670
7505	7671	//System.out.println("hitSomething = " + hitSomething);
7506	7672
7507		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
7508	7674
7509	7675	cVector xlate = new cVector();
7510	7676	//cVector xlate2 = new cVector();
..	..	@@ -7538,8 +7704,8 @@
7538	7704	toParent[3][i] = xlate.get(i);
7539	7705	LA.matInvert(toParent, fromParent);
7540	7706	*/
7541		- cVector delta = LA.newVector(0, 0, startY - info.y);
7542		- 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);
7543	7709
7544	7710	LA.matCopy(startMat, toParent);
7545	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7548,7 +7714,7 @@
7548	7714	} else
7549	7715	{
7550	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7551		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7552	7718	cVector away = new cVector();
7553	7719	//cVector right2 = new cVector();
7554	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7565,19 +7731,19 @@
7565	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7566	7732	// if (!CameraPane.LOCALTRANSFORM)
7567	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7568		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7569	7735	// if (!CameraPane.LOCALTRANSFORM)
7570	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7571	7737	//LA.vecCross(up, cVector.Z, right2);
7572	7738
7573		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7574	7740
7575	7741	//System.out.println("DELTA0 = " + delta);
7576	7742	//System.out.println("AWAY = " + info.camera.away);
7577	7743	//System.out.println("UP = " + info.camera.up);
7578	7744	if (away.z > 0)
7579	7745	{
7580		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7581	7747	{
7582	7748	delta.x = -delta.x;
7583	7749	} else
..	..	@@ -7592,7 +7758,7 @@
7592	7758	//System.out.println("DELTA1 = " + delta);
7593	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7594	7760	//System.out.println("DELTA2 = " + delta);
7595		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7596	7762	LA.matCopy(startMat, toParent);
7597	7763	//System.out.println("DELTA3 = " + delta);
7598	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7602,8 +7768,8 @@
7602	7768	break;
7603	7769
7604	7770	case hitRotate: // rotate
7605		- int dx = info.x - centerPt.x;
7606		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7607	7773	double angle = (double) Math.atan2(dx, dy);
7608	7774	angle = -(1.570796 - angle);
7609	7775
..	..	@@ -7626,7 +7792,7 @@
7626	7792	}
7627	7793	/**/
7628	7794
7629		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7630	7796	{
7631	7797	case 1: // '\001'
7632	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7653,7 +7819,7 @@
7653	7819	break;
7654	7820
7655	7821	case hitScale: // scale
7656		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7657	7823	double sign = 1;
7658	7824	if (hScale < 0)
7659	7825	{
..	..	@@ -7665,7 +7831,7 @@
7665	7831	//hScale = 0.01;
7666	7832	}
7667	7833
7668		- double vScale = (double) (info.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7669	7835	sign = 1;
7670	7836	if (vScale < 0)
7671	7837	{
..	..	@@ -7676,6 +7842,7 @@
7676	7842	{
7677	7843	//vScale = 0.01;
7678	7844	}
	7845	+
7679	7846	LA.matCopy(startMat, toParent);
7680	7847	/**/
7681	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7685,33 +7852,39 @@
7685	7852	}
7686	7853	/**/
7687	7854
7688		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7689	7856
7690	7857	if (totalScale < 0.01)
7691	7858	{
7692	7859	totalScale = 0.01;
7693	7860	}
7694	7861
7695		- switch (info.pane.RenderCamera().viewCode)
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7696	7863	{
7697	7864	case 3: // '\001'
7698	7865	if (modified \|\| opposite)
7699	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7700	7870	//LA.matScale(toParent, 1, hScale, vScale);
7701		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7702	7872	} // vScale, 1);
7703	7873	else
7704	7874	{
7705	7875	// EXCEPTION!
7706		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7707	7877	} // vScale, 1);
7708	7878	break;
7709	7879
7710	7880	case 2: // '\002'
7711	7881	if (modified \|\| opposite)
7712	7882	{
7713		- //LA.matScale(toParent, hScale, 1, vScale);
7714		- 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);
7715	7888	} else
7716	7889	{
7717	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7721,8 +7894,11 @@
7721	7894	case 1: // '\003'
7722	7895	if (modified \|\| opposite)
7723	7896	{
7724		- //LA.matScale(toParent, hScale, vScale, 1);
7725		- 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);
7726	7902	} else
7727	7903	{
7728	7904	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7759,7 +7935,7 @@
7759	7935	} // NEW ...
7760	7936
7761	7937
7762		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7763	7939	}
7764	7940
7765	7941	boolean overflow = false;