~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;
..	..	@@ -3528,15 +3622,47 @@
3528	3622
3529	3623	void ClearMaterials()
3530	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3531	3630	ClearMaterial();
3532		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3533	3632	{
3534		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3535	3634	if (child == null)
3536	3635	continue;
3537	3636	child.ClearMaterials();
3538		- release(i);
3539	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;
3540	3666	}
3541	3667
3542	3668	void FlipV(boolean flip)
..	..	@@ -5526,6 +5652,11 @@
5526	5652	if (fullname == null)
5527	5653	return "";
5528	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5529	5660	// System.out.println("Fullname = " + fullname);
5530	5661
5531	5662	// Does not work on Windows due to C:
..	..	@@ -5538,7 +5669,7 @@
5538	5669
5539	5670	if (split.length == 0)
5540	5671	{
5541		- return "";
	5672	+ return fullname.pigment = "";
5542	5673	}
5543	5674
5544	5675	if (split.length <= 2)
..	..	@@ -5546,22 +5677,27 @@
5546	5677	if (fullname.name.endsWith(":"))
5547	5678	{
5548	5679	// Windows
5549		- return fullname.name.substring(0, fullname.name.length()-1);
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5550	5681	}
5551	5682
5552		- return split[0];
	5683	+ return fullname.pigment = split[0];
5553	5684	}
5554	5685
5555	5686	// Windows
5556	5687	assert(split.length == 4);
5557	5688
5558		- return split[0] + ":" + split[1];
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5559	5690	}
5560	5691
5561	5692	static String GetBump(cTexture fullname)
5562	5693	{
5563	5694	if (fullname == null)
5564	5695	return "";
	5696	+
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
5565	5701
5566	5702	// System.out.println("Fullname = " + fullname);
5567	5703	// Does not work on Windows due to C:
..	..	@@ -5573,12 +5709,12 @@
5573	5709
5574	5710	if (split.length == 0)
5575	5711	{
5576		- return "";
	5712	+ return fullname.bump = "";
5577	5713	}
5578	5714
5579	5715	if (split.length == 1)
5580	5716	{
5581		- return "";
	5717	+ return fullname.bump = "";
5582	5718	}
5583	5719
5584	5720	if (split.length == 2)
..	..	@@ -5586,16 +5722,16 @@
5586	5722	if (fullname.name.endsWith(":"))
5587	5723	{
5588	5724	// Windows
5589		- return "";
	5725	+ return fullname.bump = "";
5590	5726	}
5591	5727
5592		- return split[1];
	5728	+ return fullname.bump = split[1];
5593	5729	}
5594	5730
5595	5731	// Windows
5596	5732	assert(split.length == 4);
5597	5733
5598		- return split[2] + ":" + split[3];
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5599	5735	}
5600	5736
5601	5737	String GetPigmentTexture()
..	..	@@ -5678,6 +5814,9 @@
5678	5814	texname = "";
5679	5815
5680	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5681	5820	Touch();
5682	5821	}
5683	5822
..	..	@@ -5750,6 +5889,8 @@
5750	5889	texname = "";
5751	5890
5752	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5892	+
	5893	+ GetTextures().bump = null;
5753	5894
5754	5895	Touch();
5755	5896	}
..	..	@@ -5893,8 +6034,10 @@
5893	6034	if (support != null)
5894	6035	support = support;
5895	6036
5896		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5897		- 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.
5898	6041
5899	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5900	6043	{
..	..	@@ -5904,8 +6047,9 @@
5904	6047	// usecalllists &= !(parent instanceof RandomNode);
5905	6048	// usecalllists = false;
5906	6049
5907		- if (GetBRep() != null)
5908		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5909	6053	//System.out.println("draw " + this);
5910	6054	//new Exception().printStackTrace();
5911	6055
..	..	@@ -5927,7 +6071,7 @@
5927	6071	if (!(this instanceof Composite))
5928	6072	touched = false;
5929	6073	//if (displaylist == -1 && usecalllists)
5930		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5931	6075	{
5932	6076	bRep.displaylist = display.GenList();
5933	6077	assert(bRep.displaylist != 0);
..	..	@@ -5938,7 +6082,7 @@
5938	6082
5939	6083	//System.out.println("\tnew list " + list);
5940	6084	//gl.glDrawBuffer(gl.GL_NONE);
5941		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5942	6086	{
5943	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5944	6088	display.NewList(bRep.displaylist);
..	..	@@ -5947,7 +6091,7 @@
5947	6091	CallList(display, root, selected, blocked);
5948	6092
5949	6093	// compiled = true;
5950		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5951	6095	{
5952	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5953	6097	display.EndList();
..	..	@@ -7298,20 +7442,23 @@
7298	7442	}
7299	7443	}
7300	7444
7301		- 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)
7302	7449	{
7303		- int hc = info.bounds.x + info.bounds.width / 2;
7304		- int vc = info.bounds.y + info.bounds.height / 2;
7305		- 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;
7306	7453	if (toscreen == null)
7307	7454	{
7308		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7309	7456	}
7310	7457	cVector vec = in;
7311	7458	LA.xformPos(in, toscreen, in);
7312	7459	//System.out.println("Distance = " + info.camera.Distance());
7313		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7314		- 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();
7315	7462	outPt.x = hc + (int) vec.x;
7316	7463	outPt.y = vc - (int) vec.y;
7317	7464	outRec.x = outPt.x - 3;
..	..	@@ -7319,15 +7466,18 @@
7319	7466	outRec.width = outRec.height = 6;
7320	7467	}
7321	7468
7322		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7323	7471	{
7324	7472	Point pt = new Point(0, 0);
7325	7473	Rectangle rec = new Rectangle();
7326		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7327	7476	return rec;
7328	7477	}
7329	7478
7330		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7331	7481	{
7332	7482	if (level == 0)
7333	7483	{
..	..	@@ -7336,16 +7486,19 @@
7336	7486	{
7337	7487	cVector origin = new cVector();
7338	7488	//LA.xformPos(origin, toParent, origin);
7339		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7340	7493	Rectangle boundary = new Rectangle();
7341	7494	boundary.x = spot.x - 30;
7342	7495	boundary.y = spot.y - 30;
7343	7496	boundary.width = spot.width + 60;
7344	7497	boundary.height = spot.height + 60;
7345		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7346	7499	int spotw = spot.x + spot.width;
7347	7500	int spoth = spot.y + spot.height;
7348		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7349	7502	// if (CameraPane.Xmin > spot.x)
7350	7503	// {
7351	7504	// CameraPane.Xmin = spot.x;
..	..	@@ -7362,11 +7515,6 @@
7362	7515	// {
7363	7516	// CameraPane.Ymax = spoth;
7364	7517	// }
7365		- spot.translate(32, 32);
7366		- spotw = spot.x + spot.width;
7367		- spoth = spot.y + spot.height;
7368		- info.g.setColor(Color.cyan);
7369		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7370	7518	// if (CameraPane.Xmin > spot.x)
7371	7519	// {
7372	7520	// CameraPane.Xmin = spot.x;
..	..	@@ -7385,10 +7533,15 @@
7385	7533	// }
7386	7534	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7387	7535	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7388		- spot.translate(0, -32);
7389		- info.g.setColor(Color.yellow);
7390		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7391		- 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);
7392	7545	// if (CameraPane.Xmin > spot.x)
7393	7546	// {
7394	7547	// CameraPane.Xmin = spot.x;
..	..	@@ -7405,8 +7558,9 @@
7405	7558	// {
7406	7559	// CameraPane.Ymax = spoth;
7407	7560	// }
7408		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7409		- (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);
7410	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7411	7565	// if (CameraPane.Xmin > boundary.x)
7412	7566	// {
..	..	@@ -7428,7 +7582,8 @@
7428	7582	}
7429	7583	}
7430	7584
7431		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7432	7587	{
7433	7588	if (level == 0)
7434	7589	{
..	..	@@ -7437,8 +7592,8 @@
7437	7592
7438	7593	boolean retval = false;
7439	7594
7440		- startX = info.x;
7441		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7442	7597
7443	7598	hitSomething = -1;
7444	7599	cVector origin = new cVector();
..	..	@@ -7448,22 +7603,53 @@
7448	7603	{
7449	7604	centerPt = new Point(0, 0);
7450	7605	}
7451		- calcHotSpot(origin, info, centerPt, spot);
7452		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7453	7609	{
7454	7610	hitSomething = hitCenter;
7455	7611	retval = true;
7456	7612	}
7457	7613	spot.translate(32, 0);
7458		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7459	7615	{
7460	7616	hitSomething = hitRotate;
7461	7617	retval = true;
7462	7618	}
7463	7619	spot.translate(0, 32);
7464		- 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))
7465	7623	{
7466	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	+
7467	7653	retval = true;
7468	7654	}
7469	7655
..	..	@@ -7473,7 +7659,7 @@
7473	7659	}
7474	7660
7475	7661	//System.out.println("info.modifiers = " + info.modifiers);
7476		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7477	7663	//System.out.println("modified = " + modified);
7478	7664	//new Exception().printStackTrace();
7479	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7501,7 +7687,8 @@
7501	7687	return true;
7502	7688	}
7503	7689
7504		- void doEditDrag0(ClickInfo info, boolean opposite)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7505	7692	{
7506	7693	if (hitSomething == 0)
7507	7694	{
..	..	@@ -7515,7 +7702,7 @@
7515	7702
7516	7703	//System.out.println("hitSomething = " + hitSomething);
7517	7704
7518		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
7519	7706
7520	7707	cVector xlate = new cVector();
7521	7708	//cVector xlate2 = new cVector();
..	..	@@ -7549,8 +7736,8 @@
7549	7736	toParent[3][i] = xlate.get(i);
7550	7737	LA.matInvert(toParent, fromParent);
7551	7738	*/
7552		- cVector delta = LA.newVector(0, 0, startY - info.y);
7553		- 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);
7554	7741
7555	7742	LA.matCopy(startMat, toParent);
7556	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7559,7 +7746,7 @@
7559	7746	} else
7560	7747	{
7561	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7562		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7563	7750	cVector away = new cVector();
7564	7751	//cVector right2 = new cVector();
7565	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7576,19 +7763,19 @@
7576	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7577	7764	// if (!CameraPane.LOCALTRANSFORM)
7578	7765	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7579		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7580	7767	// if (!CameraPane.LOCALTRANSFORM)
7581	7768	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7582	7769	//LA.vecCross(up, cVector.Z, right2);
7583	7770
7584		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7585	7772
7586	7773	//System.out.println("DELTA0 = " + delta);
7587	7774	//System.out.println("AWAY = " + info.camera.away);
7588	7775	//System.out.println("UP = " + info.camera.up);
7589	7776	if (away.z > 0)
7590	7777	{
7591		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7592	7779	{
7593	7780	delta.x = -delta.x;
7594	7781	} else
..	..	@@ -7603,7 +7790,7 @@
7603	7790	//System.out.println("DELTA1 = " + delta);
7604	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7605	7792	//System.out.println("DELTA2 = " + delta);
7606		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7607	7794	LA.matCopy(startMat, toParent);
7608	7795	//System.out.println("DELTA3 = " + delta);
7609	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7613,8 +7800,8 @@
7613	7800	break;
7614	7801
7615	7802	case hitRotate: // rotate
7616		- int dx = info.x - centerPt.x;
7617		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7618	7805	double angle = (double) Math.atan2(dx, dy);
7619	7806	angle = -(1.570796 - angle);
7620	7807
..	..	@@ -7637,7 +7824,7 @@
7637	7824	}
7638	7825	/**/
7639	7826
7640		- switch (info.pane.RenderCamera().viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7641	7828	{
7642	7829	case 1: // '\001'
7643	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7664,7 +7851,7 @@
7664	7851	break;
7665	7852
7666	7853	case hitScale: // scale
7667		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7668	7855	double sign = 1;
7669	7856	if (hScale < 0)
7670	7857	{
..	..	@@ -7676,7 +7863,7 @@
7676	7863	//hScale = 0.01;
7677	7864	}
7678	7865
7679		- double vScale = (double) (info.y - centerPt.y) / 32;
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7680	7867	sign = 1;
7681	7868	if (vScale < 0)
7682	7869	{
..	..	@@ -7687,6 +7874,7 @@
7687	7874	{
7688	7875	//vScale = 0.01;
7689	7876	}
	7877	+
7690	7878	LA.matCopy(startMat, toParent);
7691	7879	/**/
7692	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7696,33 +7884,39 @@
7696	7884	}
7697	7885	/**/
7698	7886
7699		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7700	7888
7701	7889	if (totalScale < 0.01)
7702	7890	{
7703	7891	totalScale = 0.01;
7704	7892	}
7705	7893
7706		- switch (info.pane.RenderCamera().viewCode)
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7707	7895	{
7708	7896	case 3: // '\001'
7709	7897	if (modified \|\| opposite)
7710	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7711	7902	//LA.matScale(toParent, 1, hScale, vScale);
7712		- LA.matScale(toParent, totalScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7713	7904	} // vScale, 1);
7714	7905	else
7715	7906	{
7716	7907	// EXCEPTION!
7717		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7718	7909	} // vScale, 1);
7719	7910	break;
7720	7911
7721	7912	case 2: // '\002'
7722	7913	if (modified \|\| opposite)
7723	7914	{
7724		- //LA.matScale(toParent, hScale, 1, vScale);
7725		- 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);
7726	7920	} else
7727	7921	{
7728	7922	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7732,8 +7926,11 @@
7732	7926	case 1: // '\003'
7733	7927	if (modified \|\| opposite)
7734	7928	{
7735		- //LA.matScale(toParent, hScale, vScale, 1);
7736		- 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);
7737	7934	} else
7738	7935	{
7739	7936	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7770,7 +7967,7 @@
7770	7967	} // NEW ...
7771	7968
7772	7969
7773		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7774	7971	}
7775	7972
7776	7973	boolean overflow = false;