~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,7 +30,10 @@
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
35	39	ScriptNode scriptnode;
..	..	@@ -219,6 +223,8 @@
219	223	// o.bRep.support = null;
220	224	// }
221	225	o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
222	228
223	229	if (this.support != null)
224	230	{
..	..	@@ -240,6 +246,29 @@
240	246	// this.support = null;
241	247	// this.fileparent = null;
242	248	}
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
243	272
244	273	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
245	274	{
..	..	@@ -274,6 +303,9 @@
274	303	}
275	304
276	305	this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
277	309	// July 2019 if (this.bRep != null)
278	310	// this.bRep.support = o.transientrep;
279	311	// this.support = o.support;
..	..	@@ -421,6 +453,7 @@
421	453	}
422	454
423	455	boolean live = false;
	456	+ transient boolean keepdontselect;
424	457	boolean dontselect = false;
425	458	boolean hide = false;
426	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -1005,6 +1038,9 @@
1005	1038
1006	1039	if (material == null \|\| material.multiply)
1007	1040	return true;
	1041	+
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
1008	1044
1009	1045	// Transparent objects are dynamic because we have to sort the triangles.
1010	1046	return material.opacity > 0.99;
..	..	@@ -2432,6 +2468,11 @@
2432	2468	else
2433	2469	{
2434	2470	//((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
2435	2476	}
2436	2477	}
2437	2478
..	..	@@ -2561,7 +2602,8 @@
2561	2602	private static final int editSelf = 1;
2562	2603	private static final int editChild = 2;
2563	2604
2564		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2565	2607	{
2566	2608	if (level == 0)
2567	2609	{
..	..	@@ -2569,7 +2611,8 @@
2569	2611	return;
2570	2612
2571	2613	Object3D selectee;
2572		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2573	2616	{
2574	2617	selectee = (Object3D) e.nextElement();
2575	2618	}
..	..	@@ -2577,19 +2620,22 @@
2577	2620	} else
2578	2621	{
2579	2622	//super.
2580		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2581	2625	}
2582	2626	}
2583	2627
2584		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2585	2630	{
2586	2631	doSomething = 0;
2587	2632	if (level == 0)
2588	2633	{
2589		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2590	2635	}
2591	2636	if (//super.
2592		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2593	2639	{
2594	2640	doSomething = 1;
2595	2641	return true;
..	..	@@ -2599,7 +2645,7 @@
2599	2645	}
2600	2646	}
2601	2647
2602		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2603	2649	{
2604	2650	if (selection == null)
2605	2651	{
..	..	@@ -2612,7 +2658,8 @@
2612	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2613	2659	{
2614	2660	Object3D selectee = (Object3D) e.nextElement();
2615		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2616	2663	{
2617	2664	childToDrag = selectee;
2618	2665	doSomething = 2;
..	..	@@ -2624,13 +2671,15 @@
2624	2671	return retval;
2625	2672	}
2626	2673
2627		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2628	2676	{
2629	2677	switch (doSomething)
2630	2678	{
2631	2679	case 1: // '\001'
2632	2680	//super.
2633		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2634	2683	break;
2635	2684
2636	2685	case 2: // '\002'
..	..	@@ -2643,11 +2692,13 @@
2643	2692	{
2644	2693	//sel.hitSomething = childToDrag.hitSomething;
2645	2694	//childToDrag.doEditDrag(info);
2646		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2647	2697	} else
2648	2698	{
2649	2699	//super.
2650		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2651	2702	}
2652	2703	}
2653	2704	break;
..	..	@@ -2665,6 +2716,9 @@
2665	2716	{
2666	2717	deselectAll();
2667	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2668	2722	ClickInfo newInfo = new ClickInfo();
2669	2723	newInfo.flags = info.flags;
2670	2724	newInfo.bounds = info.bounds;
..	..	@@ -3112,7 +3166,7 @@
3112	3166	{
3113	3167	if (bRep != null)
3114	3168	{
3115		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3116	3170	Touch();
3117	3171	}
3118	3172	}
..	..	@@ -5415,6 +5469,51 @@
5415	5469	blockloop = false;
5416	5470	}
5417	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5418	5517	boolean IsSelected()
5419	5518	{
5420	5519	if (parent == null)
..	..	@@ -5475,6 +5574,11 @@
5475	5574	if (fullname == null)
5476	5575	return "";
5477	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5478	5582	// System.out.println("Fullname = " + fullname);
5479	5583
5480	5584	// Does not work on Windows due to C:
..	..	@@ -5487,7 +5591,7 @@
5487	5591
5488	5592	if (split.length == 0)
5489	5593	{
5490		- return "";
	5594	+ return fullname.pigment = "";
5491	5595	}
5492	5596
5493	5597	if (split.length <= 2)
..	..	@@ -5495,22 +5599,27 @@
5495	5599	if (fullname.name.endsWith(":"))
5496	5600	{
5497	5601	// Windows
5498		- return fullname.name.substring(0, fullname.name.length()-1);
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5499	5603	}
5500	5604
5501		- return split[0];
	5605	+ return fullname.pigment = split[0];
5502	5606	}
5503	5607
5504	5608	// Windows
5505	5609	assert(split.length == 4);
5506	5610
5507		- return split[0] + ":" + split[1];
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5508	5612	}
5509	5613
5510	5614	static String GetBump(cTexture fullname)
5511	5615	{
5512	5616	if (fullname == null)
5513	5617	return "";
	5618	+
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
5514	5623
5515	5624	// System.out.println("Fullname = " + fullname);
5516	5625	// Does not work on Windows due to C:
..	..	@@ -5522,12 +5631,12 @@
5522	5631
5523	5632	if (split.length == 0)
5524	5633	{
5525		- return "";
	5634	+ return fullname.bump = "";
5526	5635	}
5527	5636
5528	5637	if (split.length == 1)
5529	5638	{
5530		- return "";
	5639	+ return fullname.bump = "";
5531	5640	}
5532	5641
5533	5642	if (split.length == 2)
..	..	@@ -5535,16 +5644,16 @@
5535	5644	if (fullname.name.endsWith(":"))
5536	5645	{
5537	5646	// Windows
5538		- return "";
	5647	+ return fullname.bump = "";
5539	5648	}
5540	5649
5541		- return split[1];
	5650	+ return fullname.bump = split[1];
5542	5651	}
5543	5652
5544	5653	// Windows
5545	5654	assert(split.length == 4);
5546	5655
5547		- return split[2] + ":" + split[3];
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5548	5657	}
5549	5658
5550	5659	String GetPigmentTexture()
..	..	@@ -5627,6 +5736,9 @@
5627	5736	texname = "";
5628	5737
5629	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5630	5742	Touch();
5631	5743	}
5632	5744
..	..	@@ -5700,6 +5812,8 @@
5700	5812
5701	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5702	5814
	5815	+ GetTextures().bump = null;
	5816	+
5703	5817	Touch();
5704	5818	}
5705	5819
..	..	@@ -5720,6 +5834,38 @@
5720	5834
5721	5835	blockloop = true;
5722	5836	child.ResetBumpTexture();
	5837	+ blockloop = false;
	5838	+ }
	5839	+ }
	5840	+
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
5723	5869	blockloop = false;
5724	5870	}
5725	5871	}
..	..	@@ -5810,8 +5956,10 @@
5810	5956	if (support != null)
5811	5957	support = support;
5812	5958
5813		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5814		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5815	5963
5816	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5817	5965	{
..	..	@@ -5821,8 +5969,9 @@
5821	5969	// usecalllists &= !(parent instanceof RandomNode);
5822	5970	// usecalllists = false;
5823	5971
5824		- if (GetBRep() != null)
5825		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5826	5975	//System.out.println("draw " + this);
5827	5976	//new Exception().printStackTrace();
5828	5977
..	..	@@ -5844,7 +5993,7 @@
5844	5993	if (!(this instanceof Composite))
5845	5994	touched = false;
5846	5995	//if (displaylist == -1 && usecalllists)
5847		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5848	5997	{
5849	5998	bRep.displaylist = display.GenList();
5850	5999	assert(bRep.displaylist != 0);
..	..	@@ -5855,7 +6004,7 @@
5855	6004
5856	6005	//System.out.println("\tnew list " + list);
5857	6006	//gl.glDrawBuffer(gl.GL_NONE);
5858		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5859	6008	{
5860	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5861	6010	display.NewList(bRep.displaylist);
..	..	@@ -5864,7 +6013,7 @@
5864	6013	CallList(display, root, selected, blocked);
5865	6014
5866	6015	// compiled = true;
5867		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5868	6017	{
5869	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5870	6019	display.EndList();
..	..	@@ -7215,20 +7364,23 @@
7215	7364	}
7216	7365	}
7217	7366
7218		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
7219	7371	{
7220		- int hc = info.bounds.x + info.bounds.width / 2;
7221		- int vc = info.bounds.y + info.bounds.height / 2;
7222		- double[][] toscreen = info.toScreen;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
7223	7375	if (toscreen == null)
7224	7376	{
7225		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7226	7378	}
7227	7379	cVector vec = in;
7228	7380	LA.xformPos(in, toscreen, in);
7229	7381	//System.out.println("Distance = " + info.camera.Distance());
7230		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7231		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7232	7384	outPt.x = hc + (int) vec.x;
7233	7385	outPt.y = vc - (int) vec.y;
7234	7386	outRec.x = outPt.x - 3;
..	..	@@ -7236,15 +7388,18 @@
7236	7388	outRec.width = outRec.height = 6;
7237	7389	}
7238	7390
7239		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
7240	7393	{
7241	7394	Point pt = new Point(0, 0);
7242	7395	Rectangle rec = new Rectangle();
7243		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
7244	7398	return rec;
7245	7399	}
7246	7400
7247		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
7248	7403	{
7249	7404	if (level == 0)
7250	7405	{
..	..	@@ -7253,16 +7408,19 @@
7253	7408	{
7254	7409	cVector origin = new cVector();
7255	7410	//LA.xformPos(origin, toParent, origin);
7256		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7257	7415	Rectangle boundary = new Rectangle();
7258	7416	boundary.x = spot.x - 30;
7259	7417	boundary.y = spot.y - 30;
7260	7418	boundary.width = spot.width + 60;
7261	7419	boundary.height = spot.height + 60;
7262		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.white);
7263	7421	int spotw = spot.x + spot.width;
7264	7422	int spoth = spot.y + spot.height;
7265		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7266	7424	// if (CameraPane.Xmin > spot.x)
7267	7425	// {
7268	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -7279,11 +7437,6 @@
7279	7437	// {
7280	7438	// CameraPane.Ymax = spoth;
7281	7439	// }
7282		- spot.translate(32, 32);
7283		- spotw = spot.x + spot.width;
7284		- spoth = spot.y + spot.height;
7285		- info.g.setColor(Color.cyan);
7286		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7287	7440	// if (CameraPane.Xmin > spot.x)
7288	7441	// {
7289	7442	// CameraPane.Xmin = spot.x;
..	..	@@ -7302,10 +7455,15 @@
7302	7455	// }
7303	7456	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7304	7457	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7305		- spot.translate(0, -32);
7306		- info.g.setColor(Color.yellow);
7307		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7308		- info.g.setColor(Color.green);
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
	7463	+ spotw = spot.x + spot.width;
	7464	+ spoth = spot.y + spot.height;
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7309	7467	// if (CameraPane.Xmin > spot.x)
7310	7468	// {
7311	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -7322,8 +7480,9 @@
7322	7480	// {
7323	7481	// CameraPane.Ymax = spoth;
7324	7482	// }
7325		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7326		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7327	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7328	7487	// if (CameraPane.Xmin > boundary.x)
7329	7488	// {
..	..	@@ -7345,7 +7504,8 @@
7345	7504	}
7346	7505	}
7347	7506
7348		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
7349	7509	{
7350	7510	if (level == 0)
7351	7511	{
..	..	@@ -7354,8 +7514,8 @@
7354	7514
7355	7515	boolean retval = false;
7356	7516
7357		- startX = info.x;
7358		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
7359	7519
7360	7520	hitSomething = -1;
7361	7521	cVector origin = new cVector();
..	..	@@ -7365,22 +7525,53 @@
7365	7525	{
7366	7526	centerPt = new Point(0, 0);
7367	7527	}
7368		- calcHotSpot(origin, info, centerPt, spot);
7369		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7531	{
7371	7532	hitSomething = hitCenter;
7372	7533	retval = true;
7373	7534	}
7374	7535	spot.translate(32, 0);
7375		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7537	{
7377	7538	hitSomething = hitRotate;
7378	7539	retval = true;
7379	7540	}
7380	7541	spot.translate(0, 32);
7381		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
7382	7545	{
7383	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
7384	7575	retval = true;
7385	7576	}
7386	7577
..	..	@@ -7390,7 +7581,7 @@
7390	7581	}
7391	7582
7392	7583	//System.out.println("info.modifiers = " + info.modifiers);
7393		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7394	7585	//System.out.println("modified = " + modified);
7395	7586	//new Exception().printStackTrace();
7396	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7418,7 +7609,8 @@
7418	7609	return true;
7419	7610	}
7420	7611
7421		- void doEditDrag0(ClickInfo info, boolean opposite)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
7422	7614	{
7423	7615	if (hitSomething == 0)
7424	7616	{
..	..	@@ -7432,7 +7624,7 @@
7432	7624
7433	7625	//System.out.println("hitSomething = " + hitSomething);
7434	7626
7435		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
7436	7628
7437	7629	cVector xlate = new cVector();
7438	7630	//cVector xlate2 = new cVector();
..	..	@@ -7466,8 +7658,8 @@
7466	7658	toParent[3][i] = xlate.get(i);
7467	7659	LA.matInvert(toParent, fromParent);
7468	7660	*/
7469		- cVector delta = LA.newVector(0, 0, startY - info.y);
7470		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7471	7663
7472	7664	LA.matCopy(startMat, toParent);
7473	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7476,7 +7668,7 @@
7476	7668	} else
7477	7669	{
7478	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7479		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7480	7672	cVector away = new cVector();
7481	7673	//cVector right2 = new cVector();
7482	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7493,19 +7685,19 @@
7493	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7494	7686	// if (!CameraPane.LOCALTRANSFORM)
7495	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7496		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7497	7689	// if (!CameraPane.LOCALTRANSFORM)
7498	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7499	7691	//LA.vecCross(up, cVector.Z, right2);
7500	7692
7501		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7502	7694
7503	7695	//System.out.println("DELTA0 = " + delta);
7504	7696	//System.out.println("AWAY = " + info.camera.away);
7505	7697	//System.out.println("UP = " + info.camera.up);
7506	7698	if (away.z > 0)
7507	7699	{
7508		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7509	7701	{
7510	7702	delta.x = -delta.x;
7511	7703	} else
..	..	@@ -7520,7 +7712,7 @@
7520	7712	//System.out.println("DELTA1 = " + delta);
7521	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7522	7714	//System.out.println("DELTA2 = " + delta);
7523		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7524	7716	LA.matCopy(startMat, toParent);
7525	7717	//System.out.println("DELTA3 = " + delta);
7526	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7530,8 +7722,8 @@
7530	7722	break;
7531	7723
7532	7724	case hitRotate: // rotate
7533		- int dx = info.x - centerPt.x;
7534		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7535	7727	double angle = (double) Math.atan2(dx, dy);
7536	7728	angle = -(1.570796 - angle);
7537	7729
..	..	@@ -7554,7 +7746,7 @@
7554	7746	}
7555	7747	/**/
7556	7748
7557		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7558	7750	{
7559	7751	case 1: // '\001'
7560	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7581,7 +7773,7 @@
7581	7773	break;
7582	7774
7583	7775	case hitScale: // scale
7584		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7585	7777	double sign = 1;
7586	7778	if (hScale < 0)
7587	7779	{
..	..	@@ -7593,7 +7785,7 @@
7593	7785	//hScale = 0.01;
7594	7786	}
7595	7787
7596		- double vScale = (double) (info.y - centerPt.y) / 32;
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7597	7789	sign = 1;
7598	7790	if (vScale < 0)
7599	7791	{
..	..	@@ -7604,6 +7796,7 @@
7604	7796	{
7605	7797	//vScale = 0.01;
7606	7798	}
	7799	+
7607	7800	LA.matCopy(startMat, toParent);
7608	7801	/**/
7609	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7613,33 +7806,39 @@
7613	7806	}
7614	7807	/**/
7615	7808
7616		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7617	7810
7618	7811	if (totalScale < 0.01)
7619	7812	{
7620	7813	totalScale = 0.01;
7621	7814	}
7622	7815
7623		- switch (info.pane.RenderCamera().viewCode)
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7624	7817	{
7625	7818	case 3: // '\001'
7626	7819	if (modified \|\| opposite)
7627	7820	{
	7821	+ if (modified && opposite)
	7822	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7823	+ else
7628	7824	//LA.matScale(toParent, 1, hScale, vScale);
7629		- LA.matScale(toParent, totalScale, 1, 1);
	7825	+ LA.matScale(toParent, totalScale, 1, 1);
7630	7826	} // vScale, 1);
7631	7827	else
7632	7828	{
7633	7829	// EXCEPTION!
7634		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7830	+ LA.matScale(toParent, 1, totalScale, totalScale);
7635	7831	} // vScale, 1);
7636	7832	break;
7637	7833
7638	7834	case 2: // '\002'
7639	7835	if (modified \|\| opposite)
7640	7836	{
7641		- //LA.matScale(toParent, hScale, 1, vScale);
7642		- LA.matScale(toParent, 1, totalScale, 1);
	7837	+ if (modified && opposite)
	7838	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7839	+ else
	7840	+ //LA.matScale(toParent, hScale, 1, vScale);
	7841	+ LA.matScale(toParent, 1, totalScale, 1);
7643	7842	} else
7644	7843	{
7645	7844	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7649,8 +7848,11 @@
7649	7848	case 1: // '\003'
7650	7849	if (modified \|\| opposite)
7651	7850	{
7652		- //LA.matScale(toParent, hScale, vScale, 1);
7653		- LA.matScale(toParent, 1, 1, totalScale);
	7851	+ if (modified && opposite)
	7852	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7853	+ else
	7854	+ //LA.matScale(toParent, hScale, vScale, 1);
	7855	+ LA.matScale(toParent, 1, 1, totalScale);
7654	7856	} else
7655	7857	{
7656	7858	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7687,7 +7889,7 @@
7687	7889	} // NEW ...
7688	7890
7689	7891
7690		- info.pane.repaint();
	7892	+ clickInfo.pane.repaint();
7691	7893	}
7692	7894
7693	7895	boolean overflow = false;