~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,12 +22,21 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27	28	// TEMPORARY for mocap undo. No need to be transient.
28	29	mocap.reader.BVHReader.BVHResult savebvh;
29	30	Object3D saveskeleton;
30	31	//
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
31	40
32	41	ScriptNode scriptnode;
33	42
..	..	@@ -215,6 +224,9 @@
215	224	// o.transientrep = this.bRep.support;
216	225	// o.bRep.support = null;
217	226	// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
218	230
219	231	if (this.support != null)
220	232	{
..	..	@@ -236,6 +248,29 @@
236	248	// this.support = null;
237	249	// this.fileparent = null;
238	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	+// }
239	274
240	275	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
241	276	{
..	..	@@ -268,6 +303,11 @@
268	303	{
269	304	this.support.bRep = o.transientrep;
270	305	}
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
271	311	// July 2019 if (this.bRep != null)
272	312	// this.bRep.support = o.transientrep;
273	313	// this.support = o.support;
..	..	@@ -415,6 +455,7 @@
415	455	}
416	456
417	457	boolean live = false;
	458	+ transient boolean keepdontselect;
418	459	boolean dontselect = false;
419	460	boolean hide = false;
420	461	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -999,6 +1040,9 @@
999	1040
1000	1041	if (material == null \|\| material.multiply)
1001	1042	return true;
	1043	+
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
1002	1046
1003	1047	// Transparent objects are dynamic because we have to sort the triangles.
1004	1048	return material.opacity > 0.99;
..	..	@@ -2426,6 +2470,11 @@
2426	2470	else
2427	2471	{
2428	2472	//((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
2429	2478	}
2430	2479	}
2431	2480
..	..	@@ -2555,7 +2604,8 @@
2555	2604	private static final int editSelf = 1;
2556	2605	private static final int editChild = 2;
2557	2606
2558		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2559	2609	{
2560	2610	if (level == 0)
2561	2611	{
..	..	@@ -2563,7 +2613,8 @@
2563	2613	return;
2564	2614
2565	2615	Object3D selectee;
2566		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2567	2618	{
2568	2619	selectee = (Object3D) e.nextElement();
2569	2620	}
..	..	@@ -2571,19 +2622,22 @@
2571	2622	} else
2572	2623	{
2573	2624	//super.
2574		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2575	2627	}
2576	2628	}
2577	2629
2578		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2579	2632	{
2580	2633	doSomething = 0;
2581	2634	if (level == 0)
2582	2635	{
2583		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2584	2637	}
2585	2638	if (//super.
2586		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2587	2641	{
2588	2642	doSomething = 1;
2589	2643	return true;
..	..	@@ -2593,7 +2647,7 @@
2593	2647	}
2594	2648	}
2595	2649
2596		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2597	2651	{
2598	2652	if (selection == null)
2599	2653	{
..	..	@@ -2606,7 +2660,8 @@
2606	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2607	2661	{
2608	2662	Object3D selectee = (Object3D) e.nextElement();
2609		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2610	2665	{
2611	2666	childToDrag = selectee;
2612	2667	doSomething = 2;
..	..	@@ -2618,13 +2673,15 @@
2618	2673	return retval;
2619	2674	}
2620	2675
2621		- void doEditDrag(ClickInfo info, boolean opposite)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2622	2678	{
2623	2679	switch (doSomething)
2624	2680	{
2625	2681	case 1: // '\001'
2626	2682	//super.
2627		- doEditDrag0(info, opposite);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2628	2685	break;
2629	2686
2630	2687	case 2: // '\002'
..	..	@@ -2637,11 +2694,13 @@
2637	2694	{
2638	2695	//sel.hitSomething = childToDrag.hitSomething;
2639	2696	//childToDrag.doEditDrag(info);
2640		- sel.doEditDrag(info, opposite);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2641	2699	} else
2642	2700	{
2643	2701	//super.
2644		- doEditDrag0(info, opposite);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2645	2704	}
2646	2705	}
2647	2706	break;
..	..	@@ -2659,6 +2718,9 @@
2659	2718	{
2660	2719	deselectAll();
2661	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2662	2724	ClickInfo newInfo = new ClickInfo();
2663	2725	newInfo.flags = info.flags;
2664	2726	newInfo.bounds = info.bounds;
..	..	@@ -3106,7 +3168,7 @@
3106	3168	{
3107	3169	if (bRep != null)
3108	3170	{
3109		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3110	3172	Touch();
3111	3173	}
3112	3174	}
..	..	@@ -5409,6 +5471,51 @@
5409	5471	blockloop = false;
5410	5472	}
5411	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5412	5519	boolean IsSelected()
5413	5520	{
5414	5521	if (parent == null)
..	..	@@ -5469,6 +5576,11 @@
5469	5576	if (fullname == null)
5470	5577	return "";
5471	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5472	5584	// System.out.println("Fullname = " + fullname);
5473	5585
5474	5586	// Does not work on Windows due to C:
..	..	@@ -5481,7 +5593,7 @@
5481	5593
5482	5594	if (split.length == 0)
5483	5595	{
5484		- return "";
	5596	+ return fullname.pigment = "";
5485	5597	}
5486	5598
5487	5599	if (split.length <= 2)
..	..	@@ -5489,22 +5601,27 @@
5489	5601	if (fullname.name.endsWith(":"))
5490	5602	{
5491	5603	// Windows
5492		- return fullname.name.substring(0, fullname.name.length()-1);
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5493	5605	}
5494	5606
5495		- return split[0];
	5607	+ return fullname.pigment = split[0];
5496	5608	}
5497	5609
5498	5610	// Windows
5499	5611	assert(split.length == 4);
5500	5612
5501		- return split[0] + ":" + split[1];
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5502	5614	}
5503	5615
5504	5616	static String GetBump(cTexture fullname)
5505	5617	{
5506	5618	if (fullname == null)
5507	5619	return "";
	5620	+
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
5508	5625
5509	5626	// System.out.println("Fullname = " + fullname);
5510	5627	// Does not work on Windows due to C:
..	..	@@ -5516,12 +5633,12 @@
5516	5633
5517	5634	if (split.length == 0)
5518	5635	{
5519		- return "";
	5636	+ return fullname.bump = "";
5520	5637	}
5521	5638
5522	5639	if (split.length == 1)
5523	5640	{
5524		- return "";
	5641	+ return fullname.bump = "";
5525	5642	}
5526	5643
5527	5644	if (split.length == 2)
..	..	@@ -5529,16 +5646,16 @@
5529	5646	if (fullname.name.endsWith(":"))
5530	5647	{
5531	5648	// Windows
5532		- return "";
	5649	+ return fullname.bump = "";
5533	5650	}
5534	5651
5535		- return split[1];
	5652	+ return fullname.bump = split[1];
5536	5653	}
5537	5654
5538	5655	// Windows
5539	5656	assert(split.length == 4);
5540	5657
5541		- return split[2] + ":" + split[3];
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5542	5659	}
5543	5660
5544	5661	String GetPigmentTexture()
..	..	@@ -5621,6 +5738,9 @@
5621	5738	texname = "";
5622	5739
5623	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5624	5744	Touch();
5625	5745	}
5626	5746
..	..	@@ -5694,6 +5814,8 @@
5694	5814
5695	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5696	5816
	5817	+ GetTextures().bump = null;
	5818	+
5697	5819	Touch();
5698	5820	}
5699	5821
..	..	@@ -5714,6 +5836,38 @@
5714	5836
5715	5837	blockloop = true;
5716	5838	child.ResetBumpTexture();
	5839	+ blockloop = false;
	5840	+ }
	5841	+ }
	5842	+
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
5717	5871	blockloop = false;
5718	5872	}
5719	5873	}
..	..	@@ -5804,8 +5958,10 @@
5804	5958	if (support != null)
5805	5959	support = support;
5806	5960
5807		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5808		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5809	5965
5810	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5811	5967	{
..	..	@@ -5815,8 +5971,9 @@
5815	5971	// usecalllists &= !(parent instanceof RandomNode);
5816	5972	// usecalllists = false;
5817	5973
5818		- if (GetBRep() != null)
5819		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5820	5977	//System.out.println("draw " + this);
5821	5978	//new Exception().printStackTrace();
5822	5979
..	..	@@ -5838,7 +5995,7 @@
5838	5995	if (!(this instanceof Composite))
5839	5996	touched = false;
5840	5997	//if (displaylist == -1 && usecalllists)
5841		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5842	5999	{
5843	6000	bRep.displaylist = display.GenList();
5844	6001	assert(bRep.displaylist != 0);
..	..	@@ -5849,7 +6006,7 @@
5849	6006
5850	6007	//System.out.println("\tnew list " + list);
5851	6008	//gl.glDrawBuffer(gl.GL_NONE);
5852		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5853	6010	{
5854	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5855	6012	display.NewList(bRep.displaylist);
..	..	@@ -5858,7 +6015,7 @@
5858	6015	CallList(display, root, selected, blocked);
5859	6016
5860	6017	// compiled = true;
5861		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5862	6019	{
5863	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5864	6021	display.EndList();
..	..	@@ -7209,20 +7366,23 @@
7209	7366	}
7210	7367	}
7211	7368
7212		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
7213	7373	{
7214		- int hc = info.bounds.x + info.bounds.width / 2;
7215		- int vc = info.bounds.y + info.bounds.height / 2;
7216		- double[][] toscreen = info.toScreen;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
7217	7377	if (toscreen == null)
7218	7378	{
7219		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7220	7380	}
7221	7381	cVector vec = in;
7222	7382	LA.xformPos(in, toscreen, in);
7223	7383	//System.out.println("Distance = " + info.camera.Distance());
7224		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7225		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7226	7386	outPt.x = hc + (int) vec.x;
7227	7387	outPt.y = vc - (int) vec.y;
7228	7388	outRec.x = outPt.x - 3;
..	..	@@ -7230,15 +7390,18 @@
7230	7390	outRec.width = outRec.height = 6;
7231	7391	}
7232	7392
7233		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
7234	7395	{
7235	7396	Point pt = new Point(0, 0);
7236	7397	Rectangle rec = new Rectangle();
7237		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
7238	7400	return rec;
7239	7401	}
7240	7402
7241		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
7242	7405	{
7243	7406	if (level == 0)
7244	7407	{
..	..	@@ -7247,16 +7410,19 @@
7247	7410	{
7248	7411	cVector origin = new cVector();
7249	7412	//LA.xformPos(origin, toParent, origin);
7250		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7251	7417	Rectangle boundary = new Rectangle();
7252	7418	boundary.x = spot.x - 30;
7253	7419	boundary.y = spot.y - 30;
7254	7420	boundary.width = spot.width + 60;
7255	7421	boundary.height = spot.height + 60;
7256		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7257	7423	int spotw = spot.x + spot.width;
7258	7424	int spoth = spot.y + spot.height;
7259		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7260	7426	// if (CameraPane.Xmin > spot.x)
7261	7427	// {
7262	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7273,11 +7439,6 @@
7273	7439	// {
7274	7440	// CameraPane.Ymax = spoth;
7275	7441	// }
7276		- spot.translate(32, 32);
7277		- spotw = spot.x + spot.width;
7278		- spoth = spot.y + spot.height;
7279		- info.g.setColor(Color.cyan);
7280		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7281	7442	// if (CameraPane.Xmin > spot.x)
7282	7443	// {
7283	7444	// CameraPane.Xmin = spot.x;
..	..	@@ -7296,10 +7457,15 @@
7296	7457	// }
7297	7458	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7298	7459	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7299		- spot.translate(0, -32);
7300		- info.g.setColor(Color.yellow);
7301		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7302		- info.g.setColor(Color.green);
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
	7465	+ spotw = spot.x + spot.width;
	7466	+ spoth = spot.y + spot.height;
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7303	7469	// if (CameraPane.Xmin > spot.x)
7304	7470	// {
7305	7471	// CameraPane.Xmin = spot.x;
..	..	@@ -7316,8 +7482,9 @@
7316	7482	// {
7317	7483	// CameraPane.Ymax = spoth;
7318	7484	// }
7319		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7320		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7321	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7322	7489	// if (CameraPane.Xmin > boundary.x)
7323	7490	// {
..	..	@@ -7339,7 +7506,8 @@
7339	7506	}
7340	7507	}
7341	7508
7342		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7343	7511	{
7344	7512	if (level == 0)
7345	7513	{
..	..	@@ -7348,8 +7516,8 @@
7348	7516
7349	7517	boolean retval = false;
7350	7518
7351		- startX = info.x;
7352		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7353	7521
7354	7522	hitSomething = -1;
7355	7523	cVector origin = new cVector();
..	..	@@ -7359,22 +7527,53 @@
7359	7527	{
7360	7528	centerPt = new Point(0, 0);
7361	7529	}
7362		- calcHotSpot(origin, info, centerPt, spot);
7363		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7364	7533	{
7365	7534	hitSomething = hitCenter;
7366	7535	retval = true;
7367	7536	}
7368	7537	spot.translate(32, 0);
7369		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7539	{
7371	7540	hitSomething = hitRotate;
7372	7541	retval = true;
7373	7542	}
7374	7543	spot.translate(0, 32);
7375		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7547	{
7377	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7378	7577	retval = true;
7379	7578	}
7380	7579
..	..	@@ -7384,7 +7583,7 @@
7384	7583	}
7385	7584
7386	7585	//System.out.println("info.modifiers = " + info.modifiers);
7387		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7388	7587	//System.out.println("modified = " + modified);
7389	7588	//new Exception().printStackTrace();
7390	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7412,7 +7611,8 @@
7412	7611	return true;
7413	7612	}
7414	7613
7415		- void doEditDrag0(ClickInfo info, boolean opposite)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7416	7616	{
7417	7617	if (hitSomething == 0)
7418	7618	{
..	..	@@ -7426,7 +7626,7 @@
7426	7626
7427	7627	//System.out.println("hitSomething = " + hitSomething);
7428	7628
7429		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
7430	7630
7431	7631	cVector xlate = new cVector();
7432	7632	//cVector xlate2 = new cVector();
..	..	@@ -7460,8 +7660,8 @@
7460	7660	toParent[3][i] = xlate.get(i);
7461	7661	LA.matInvert(toParent, fromParent);
7462	7662	*/
7463		- cVector delta = LA.newVector(0, 0, startY - info.y);
7464		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7465	7665
7466	7666	LA.matCopy(startMat, toParent);
7467	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7470,7 +7670,7 @@
7470	7670	} else
7471	7671	{
7472	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7473		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7474	7674	cVector away = new cVector();
7475	7675	//cVector right2 = new cVector();
7476	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7487,19 +7687,19 @@
7487	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7488	7688	// if (!CameraPane.LOCALTRANSFORM)
7489	7689	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7490		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7491	7691	// if (!CameraPane.LOCALTRANSFORM)
7492	7692	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7493	7693	//LA.vecCross(up, cVector.Z, right2);
7494	7694
7495		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7496	7696
7497	7697	//System.out.println("DELTA0 = " + delta);
7498	7698	//System.out.println("AWAY = " + info.camera.away);
7499	7699	//System.out.println("UP = " + info.camera.up);
7500	7700	if (away.z > 0)
7501	7701	{
7502		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7503	7703	{
7504	7704	delta.x = -delta.x;
7505	7705	} else
..	..	@@ -7514,7 +7714,7 @@
7514	7714	//System.out.println("DELTA1 = " + delta);
7515	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7516	7716	//System.out.println("DELTA2 = " + delta);
7517		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7518	7718	LA.matCopy(startMat, toParent);
7519	7719	//System.out.println("DELTA3 = " + delta);
7520	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7524,8 +7724,8 @@
7524	7724	break;
7525	7725
7526	7726	case hitRotate: // rotate
7527		- int dx = info.x - centerPt.x;
7528		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7529	7729	double angle = (double) Math.atan2(dx, dy);
7530	7730	angle = -(1.570796 - angle);
7531	7731
..	..	@@ -7548,7 +7748,7 @@
7548	7748	}
7549	7749	/**/
7550	7750
7551		- switch (info.pane.RenderCamera().viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7552	7752	{
7553	7753	case 1: // '\001'
7554	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7575,7 +7775,7 @@
7575	7775	break;
7576	7776
7577	7777	case hitScale: // scale
7578		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7579	7779	double sign = 1;
7580	7780	if (hScale < 0)
7581	7781	{
..	..	@@ -7587,7 +7787,7 @@
7587	7787	//hScale = 0.01;
7588	7788	}
7589	7789
7590		- double vScale = (double) (info.y - centerPt.y) / 32;
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7591	7791	sign = 1;
7592	7792	if (vScale < 0)
7593	7793	{
..	..	@@ -7598,6 +7798,7 @@
7598	7798	{
7599	7799	//vScale = 0.01;
7600	7800	}
	7801	+
7601	7802	LA.matCopy(startMat, toParent);
7602	7803	/**/
7603	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7607,33 +7808,39 @@
7607	7808	}
7608	7809	/**/
7609	7810
7610		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7611	7812
7612	7813	if (totalScale < 0.01)
7613	7814	{
7614	7815	totalScale = 0.01;
7615	7816	}
7616	7817
7617		- switch (info.pane.RenderCamera().viewCode)
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7618	7819	{
7619	7820	case 3: // '\001'
7620	7821	if (modified \|\| opposite)
7621	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7622	7826	//LA.matScale(toParent, 1, hScale, vScale);
7623		- LA.matScale(toParent, totalScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7624	7828	} // vScale, 1);
7625	7829	else
7626	7830	{
7627	7831	// EXCEPTION!
7628		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7629	7833	} // vScale, 1);
7630	7834	break;
7631	7835
7632	7836	case 2: // '\002'
7633	7837	if (modified \|\| opposite)
7634	7838	{
7635		- //LA.matScale(toParent, hScale, 1, vScale);
7636		- LA.matScale(toParent, 1, totalScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7637	7844	} else
7638	7845	{
7639	7846	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7643,8 +7850,11 @@
7643	7850	case 1: // '\003'
7644	7851	if (modified \|\| opposite)
7645	7852	{
7646		- //LA.matScale(toParent, hScale, vScale, 1);
7647		- LA.matScale(toParent, 1, 1, totalScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7648	7858	} else
7649	7859	{
7650	7860	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7681,7 +7891,7 @@
7681	7891	} // NEW ...
7682	7892
7683	7893
7684		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7685	7895	}
7686	7896
7687	7897	boolean overflow = false;