~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;
..	..	@@ -614,7 +687,7 @@
614	687	{
615	688	if (maxcount != 1)
616	689	{
617		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
618	691	}
619	692
620	693	toParentMarked = LA.newMatrix();
..	..	@@ -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;
..	..	@@ -2293,11 +2369,6 @@
2293	2369
2294	2370	InitOthers();
2295	2371
2296		- if (this instanceof Camera)
2297		- {
2298		- material.shift = 90;
2299		- }
2300		-
2301	2372	material.multiply = multiply;
2302	2373
2303	2374	if (multiply)
..	..	@@ -2438,6 +2509,11 @@
2438	2509	else
2439	2510	{
2440	2511	//((ObjEditor)editWindow).SetupUI2(null);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
2441	2517	}
2442	2518	}
2443	2519
..	..	@@ -2567,7 +2643,8 @@
2567	2643	private static final int editSelf = 1;
2568	2644	private static final int editChild = 2;
2569	2645
2570		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2571	2648	{
2572	2649	if (level == 0)
2573	2650	{
..	..	@@ -2575,7 +2652,8 @@
2575	2652	return;
2576	2653
2577	2654	Object3D selectee;
2578		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2655	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2656	+ level + 1))
2579	2657	{
2580	2658	selectee = (Object3D) e.nextElement();
2581	2659	}
..	..	@@ -2583,19 +2661,22 @@
2583	2661	} else
2584	2662	{
2585	2663	//super.
2586		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2587	2666	}
2588	2667	}
2589	2668
2590		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2591	2671	{
2592	2672	doSomething = 0;
2593	2673	if (level == 0)
2594	2674	{
2595		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2596	2676	}
2597	2677	if (//super.
2598		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2599	2680	{
2600	2681	doSomething = 1;
2601	2682	return true;
..	..	@@ -2605,7 +2686,7 @@
2605	2686	}
2606	2687	}
2607	2688
2608		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2609	2690	{
2610	2691	if (selection == null)
2611	2692	{
..	..	@@ -2618,7 +2699,8 @@
2618	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2619	2700	{
2620	2701	Object3D selectee = (Object3D) e.nextElement();
2621		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2622	2704	{
2623	2705	childToDrag = selectee;
2624	2706	doSomething = 2;
..	..	@@ -2630,13 +2712,15 @@
2630	2712	return retval;
2631	2713	}
2632	2714
2633		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2634	2717	{
2635	2718	switch (doSomething)
2636	2719	{
2637	2720	case 1: // '\001'
2638	2721	//super.
2639		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2640	2724	break;
2641	2725
2642	2726	case 2: // '\002'
..	..	@@ -2649,11 +2733,13 @@
2649	2733	{
2650	2734	//sel.hitSomething = childToDrag.hitSomething;
2651	2735	//childToDrag.doEditDrag(info);
2652		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2653	2738	} else
2654	2739	{
2655	2740	//super.
2656		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2657	2743	}
2658	2744	}
2659	2745	break;
..	..	@@ -2671,6 +2757,9 @@
2671	2757	{
2672	2758	deselectAll();
2673	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2674	2763	ClickInfo newInfo = new ClickInfo();
2675	2764	newInfo.flags = info.flags;
2676	2765	newInfo.bounds = info.bounds;
..	..	@@ -3528,15 +3617,47 @@
3528	3617
3529	3618	void ClearMaterials()
3530	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3531	3625	ClearMaterial();
3532		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3533	3627	{
3534		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3535	3629	if (child == null)
3536	3630	continue;
3537	3631	child.ClearMaterials();
3538		- release(i);
3539	3632	}
	3633	+
	3634	+ blockloop = false;
	3635	+ }
	3636	+
	3637	+ void ClearVersionList()
	3638	+ {
	3639	+ this.versionlist = null;
	3640	+ this.versionindex = -1;
	3641	+ this.versiontable = null;
	3642	+ }
	3643	+
	3644	+ void ClearVersions()
	3645	+ {
	3646	+ if (blockloop)
	3647	+ return;
	3648	+
	3649	+ blockloop = true;
	3650	+
	3651	+ ClearVersionList();
	3652	+ for (int i = 0; i < Size(); i++)
	3653	+ {
	3654	+ Object3D child = (Object3D) get(i);
	3655	+ if (child == null)
	3656	+ continue;
	3657	+ child.ClearVersions();
	3658	+ }
	3659	+
	3660	+ blockloop = false;
3540	3661	}
3541	3662
3542	3663	void FlipV(boolean flip)
..	..	@@ -5526,6 +5647,11 @@
5526	5647	if (fullname == null)
5527	5648	return "";
5528	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5529	5655	// System.out.println("Fullname = " + fullname);
5530	5656
5531	5657	// Does not work on Windows due to C:
..	..	@@ -5538,7 +5664,7 @@
5538	5664
5539	5665	if (split.length == 0)
5540	5666	{
5541		- return "";
	5667	+ return fullname.pigment = "";
5542	5668	}
5543	5669
5544	5670	if (split.length <= 2)
..	..	@@ -5546,22 +5672,27 @@
5546	5672	if (fullname.name.endsWith(":"))
5547	5673	{
5548	5674	// Windows
5549		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5550	5676	}
5551	5677
5552		- return split[0];
	5678	+ return fullname.pigment = split[0];
5553	5679	}
5554	5680
5555	5681	// Windows
5556	5682	assert(split.length == 4);
5557	5683
5558		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5559	5685	}
5560	5686
5561	5687	static String GetBump(cTexture fullname)
5562	5688	{
5563	5689	if (fullname == null)
5564	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5565	5696
5566	5697	// System.out.println("Fullname = " + fullname);
5567	5698	// Does not work on Windows due to C:
..	..	@@ -5573,12 +5704,12 @@
5573	5704
5574	5705	if (split.length == 0)
5575	5706	{
5576		- return "";
	5707	+ return fullname.bump = "";
5577	5708	}
5578	5709
5579	5710	if (split.length == 1)
5580	5711	{
5581		- return "";
	5712	+ return fullname.bump = "";
5582	5713	}
5583	5714
5584	5715	if (split.length == 2)
..	..	@@ -5586,16 +5717,16 @@
5586	5717	if (fullname.name.endsWith(":"))
5587	5718	{
5588	5719	// Windows
5589		- return "";
	5720	+ return fullname.bump = "";
5590	5721	}
5591	5722
5592		- return split[1];
	5723	+ return fullname.bump = split[1];
5593	5724	}
5594	5725
5595	5726	// Windows
5596	5727	assert(split.length == 4);
5597	5728
5598		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5599	5730	}
5600	5731
5601	5732	String GetPigmentTexture()
..	..	@@ -5678,6 +5809,9 @@
5678	5809	texname = "";
5679	5810
5680	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5681	5815	Touch();
5682	5816	}
5683	5817
..	..	@@ -5751,6 +5885,8 @@
5751	5885
5752	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5753	5887
	5888	+ GetTextures().bump = null;
	5889	+
5754	5890	Touch();
5755	5891	}
5756	5892
..	..	@@ -5775,12 +5911,23 @@
5775	5911	}
5776	5912	}
5777	5913
5778		- void EmbedTextures()
	5914	+ void EmbedTextures(boolean embed)
5779	5915	{
5780	5916	if (blockloop)
5781	5917	return;
5782	5918
5783		- CameraPane.EmbedTextures(texture);
	5919	+ //if (GetTextures() != null)
	5920	+ if (embed)
	5921	+ CameraPane.EmbedTextures(GetTextures());
	5922	+ else
	5923	+ {
	5924	+ GetTextures().pigmentdata = null;
	5925	+ GetTextures().bumpdata = null;
	5926	+ GetTextures().pw = 0;
	5927	+ GetTextures().ph = 0;
	5928	+ GetTextures().bw = 0;
	5929	+ GetTextures().bh = 0;
	5930	+ }
5784	5931
5785	5932	int nb = Size();
5786	5933	for (int i = 0; i < nb; i++)
..	..	@@ -5791,7 +5938,7 @@
5791	5938	continue;
5792	5939
5793	5940	blockloop = true;
5794		- child.EmbedTextures();
	5941	+ child.EmbedTextures(embed);
5795	5942	blockloop = false;
5796	5943	}
5797	5944	}
..	..	@@ -5882,8 +6029,10 @@
5882	6029	if (support != null)
5883	6030	support = support;
5884	6031
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);
	6032	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6033	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6034	+
	6035	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5887	6036
5888	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5889	6038	{
..	..	@@ -5893,8 +6042,9 @@
5893	6042	// usecalllists &= !(parent instanceof RandomNode);
5894	6043	// usecalllists = false;
5895	6044
5896		- if (GetBRep() != null)
5897		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5898	6048	//System.out.println("draw " + this);
5899	6049	//new Exception().printStackTrace();
5900	6050
..	..	@@ -5916,7 +6066,7 @@
5916	6066	if (!(this instanceof Composite))
5917	6067	touched = false;
5918	6068	//if (displaylist == -1 && usecalllists)
5919		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5920	6070	{
5921	6071	bRep.displaylist = display.GenList();
5922	6072	assert(bRep.displaylist != 0);
..	..	@@ -5927,7 +6077,7 @@
5927	6077
5928	6078	//System.out.println("\tnew list " + list);
5929	6079	//gl.glDrawBuffer(gl.GL_NONE);
5930		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5931	6081	{
5932	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5933	6083	display.NewList(bRep.displaylist);
..	..	@@ -5936,7 +6086,7 @@
5936	6086	CallList(display, root, selected, blocked);
5937	6087
5938	6088	// compiled = true;
5939		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5940	6090	{
5941	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5942	6092	display.EndList();
..	..	@@ -7287,20 +7437,23 @@
7287	7437	}
7288	7438	}
7289	7439
7290		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7440	+ static ClickInfo clickInfo = new ClickInfo();
	7441	+
	7442	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7443	+ Point outPt, Rectangle outRec)
7291	7444	{
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;
	7445	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7446	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7447	+ double[][] toscreen = clickInfo.toScreen;
7295	7448	if (toscreen == null)
7296	7449	{
7297		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7298	7451	}
7299	7452	cVector vec = in;
7300	7453	LA.xformPos(in, toscreen, in);
7301	7454	//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();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7304	7457	outPt.x = hc + (int) vec.x;
7305	7458	outPt.y = vc - (int) vec.y;
7306	7459	outRec.x = outPt.x - 3;
..	..	@@ -7308,15 +7461,18 @@
7308	7461	outRec.width = outRec.height = 6;
7309	7462	}
7310	7463
7311		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7312	7466	{
7313	7467	Point pt = new Point(0, 0);
7314	7468	Rectangle rec = new Rectangle();
7315		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7316	7471	return rec;
7317	7472	}
7318	7473
7319		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7320	7476	{
7321	7477	if (level == 0)
7322	7478	{
..	..	@@ -7325,16 +7481,19 @@
7325	7481	{
7326	7482	cVector origin = new cVector();
7327	7483	//LA.xformPos(origin, toParent, origin);
7328		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7329	7488	Rectangle boundary = new Rectangle();
7330	7489	boundary.x = spot.x - 30;
7331	7490	boundary.y = spot.y - 30;
7332	7491	boundary.width = spot.width + 60;
7333	7492	boundary.height = spot.height + 60;
7334		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7335	7494	int spotw = spot.x + spot.width;
7336	7495	int spoth = spot.y + spot.height;
7337		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7338	7497	// if (CameraPane.Xmin > spot.x)
7339	7498	// {
7340	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7351,11 +7510,6 @@
7351	7510	// {
7352	7511	// CameraPane.Ymax = spoth;
7353	7512	// }
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	7513	// if (CameraPane.Xmin > spot.x)
7360	7514	// {
7361	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7374,10 +7528,15 @@
7374	7528	// }
7375	7529	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7376	7530	//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);
	7531	+ spot.translate(32, 0);
	7532	+ clickInfo.g.setColor(Color.yellow);
	7533	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7534	+
	7535	+ spot.translate(32, 64);
	7536	+ spotw = spot.x + spot.width;
	7537	+ spoth = spot.y + spot.height;
	7538	+ clickInfo.g.setColor(Color.cyan);
	7539	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7381	7540	// if (CameraPane.Xmin > spot.x)
7382	7541	// {
7383	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7394,8 +7553,9 @@
7394	7553	// {
7395	7554	// CameraPane.Ymax = spoth;
7396	7555	// }
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);
	7556	+ clickInfo.g.setColor(Color.green);
	7557	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7558	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7399	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7400	7560	// if (CameraPane.Xmin > boundary.x)
7401	7561	// {
..	..	@@ -7417,7 +7577,8 @@
7417	7577	}
7418	7578	}
7419	7579
7420		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7421	7582	{
7422	7583	if (level == 0)
7423	7584	{
..	..	@@ -7426,8 +7587,8 @@
7426	7587
7427	7588	boolean retval = false;
7428	7589
7429		- startX = info.x;
7430		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7431	7592
7432	7593	hitSomething = -1;
7433	7594	cVector origin = new cVector();
..	..	@@ -7437,22 +7598,53 @@
7437	7598	{
7438	7599	centerPt = new Point(0, 0);
7439	7600	}
7440		- calcHotSpot(origin, info, centerPt, spot);
7441		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7442	7604	{
7443	7605	hitSomething = hitCenter;
7444	7606	retval = true;
7445	7607	}
7446	7608	spot.translate(32, 0);
7447		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7448	7610	{
7449	7611	hitSomething = hitRotate;
7450	7612	retval = true;
7451	7613	}
7452	7614	spot.translate(0, 32);
7453		- if (spot.contains(info.x, info.y))
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
	7617	+ if (spot.contains(clickInfo.x, clickInfo.y))
7454	7618	{
7455	7619	hitSomething = hitScale;
	7620	+
	7621	+ double scale = 0.005f * clickInfo.camera.Distance();
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7623	+ double sign = 1;
	7624	+ if (hScale < 0)
	7625	+ {
	7626	+ sign = -1;
	7627	+ }
	7628	+ hScale = signMath.pow(signhScale, scale * 50);
	7629	+ if (hScale < 0.01)
	7630	+ {
	7631	+ //hScale = 0.01;
	7632	+ }
	7633	+
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7635	+ sign = 1;
	7636	+ if (vScale < 0)
	7637	+ {
	7638	+ sign = -1;
	7639	+ }
	7640	+ vScale = signMath.pow(signvScale, scale * 50);
	7641	+ if (vScale < 0.01)
	7642	+ {
	7643	+ //vScale = 0.01;
	7644	+ }
	7645	+
	7646	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7647	+
7456	7648	retval = true;
7457	7649	}
7458	7650
..	..	@@ -7462,7 +7654,7 @@
7462	7654	}
7463	7655
7464	7656	//System.out.println("info.modifiers = " + info.modifiers);
7465		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7466	7658	//System.out.println("modified = " + modified);
7467	7659	//new Exception().printStackTrace();
7468	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7490,7 +7682,8 @@
7490	7682	return true;
7491	7683	}
7492	7684
7493		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7494	7687	{
7495	7688	if (hitSomething == 0)
7496	7689	{
..	..	@@ -7504,7 +7697,7 @@
7504	7697
7505	7698	//System.out.println("hitSomething = " + hitSomething);
7506	7699
7507		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7508	7701
7509	7702	cVector xlate = new cVector();
7510	7703	//cVector xlate2 = new cVector();
..	..	@@ -7518,7 +7711,9 @@
7518	7711
7519	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7520	7713
7521		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7522	7717	{
7523	7718	//assert(false);
7524	7719	/*
..	..	@@ -7538,8 +7733,8 @@
7538	7733	toParent[3][i] = xlate.get(i);
7539	7734	LA.matInvert(toParent, fromParent);
7540	7735	*/
7541		- cVector delta = LA.newVector(0, 0, startY - info.y);
7542		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7736	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7737	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7543	7738
7544	7739	LA.matCopy(startMat, toParent);
7545	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7548,7 +7743,7 @@
7548	7743	} else
7549	7744	{
7550	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7551		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7552	7747	cVector away = new cVector();
7553	7748	//cVector right2 = new cVector();
7554	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7565,19 +7760,19 @@
7565	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7566	7761	// if (!CameraPane.LOCALTRANSFORM)
7567	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7568		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7569	7764	// if (!CameraPane.LOCALTRANSFORM)
7570	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7571	7766	//LA.vecCross(up, cVector.Z, right2);
7572	7767
7573		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7574	7769
7575	7770	//System.out.println("DELTA0 = " + delta);
7576	7771	//System.out.println("AWAY = " + info.camera.away);
7577	7772	//System.out.println("UP = " + info.camera.up);
7578	7773	if (away.z > 0)
7579	7774	{
7580		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7581	7776	{
7582	7777	delta.x = -delta.x;
7583	7778	} else
..	..	@@ -7592,7 +7787,7 @@
7592	7787	//System.out.println("DELTA1 = " + delta);
7593	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7594	7789	//System.out.println("DELTA2 = " + delta);
7595		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7596	7791	LA.matCopy(startMat, toParent);
7597	7792	//System.out.println("DELTA3 = " + delta);
7598	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7602,8 +7797,8 @@
7602	7797	break;
7603	7798
7604	7799	case hitRotate: // rotate
7605		- int dx = info.x - centerPt.x;
7606		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7607	7802	double angle = (double) Math.atan2(dx, dy);
7608	7803	angle = -(1.570796 - angle);
7609	7804
..	..	@@ -7612,7 +7807,7 @@
7612	7807
7613	7808	if (modified)
7614	7809	{
7615		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7616	7811	angle /= (Math.PI / 4);
7617	7812	angle = Math.floor(angle + 0.5);
7618	7813	angle *= (Math.PI / 4);
..	..	@@ -7626,7 +7821,7 @@
7626	7821	}
7627	7822	/**/
7628	7823
7629		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7630	7825	{
7631	7826	case 1: // '\001'
7632	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7653,7 +7848,7 @@
7653	7848	break;
7654	7849
7655	7850	case hitScale: // scale
7656		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7657	7852	double sign = 1;
7658	7853	if (hScale < 0)
7659	7854	{
..	..	@@ -7665,7 +7860,7 @@
7665	7860	//hScale = 0.01;
7666	7861	}
7667	7862
7668		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7669	7864	sign = 1;
7670	7865	if (vScale < 0)
7671	7866	{
..	..	@@ -7676,6 +7871,7 @@
7676	7871	{
7677	7872	//vScale = 0.01;
7678	7873	}
	7874	+
7679	7875	LA.matCopy(startMat, toParent);
7680	7876	/**/
7681	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7685,33 +7881,39 @@
7685	7881	}
7686	7882	/**/
7687	7883
7688		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7689	7885
7690	7886	if (totalScale < 0.01)
7691	7887	{
7692	7888	totalScale = 0.01;
7693	7889	}
7694	7890
7695		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7696	7892	{
7697	7893	case 3: // '\001'
7698	7894	if (modified \|\| opposite)
7699	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7700	7899	//LA.matScale(toParent, 1, hScale, vScale);
7701		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7702	7901	} // vScale, 1);
7703	7902	else
7704	7903	{
7705	7904	// EXCEPTION!
7706		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7707	7906	} // vScale, 1);
7708	7907	break;
7709	7908
7710	7909	case 2: // '\002'
7711	7910	if (modified \|\| opposite)
7712	7911	{
7713		- //LA.matScale(toParent, hScale, 1, vScale);
7714		- LA.matScale(toParent, 1, totalScale, 1);
	7912	+ if (modified) // && opposite)
	7913	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7914	+ else
	7915	+ //LA.matScale(toParent, hScale, 1, vScale);
	7916	+ LA.matScale(toParent, 1, totalScale, 1);
7715	7917	} else
7716	7918	{
7717	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7721,8 +7923,11 @@
7721	7923	case 1: // '\003'
7722	7924	if (modified \|\| opposite)
7723	7925	{
7724		- //LA.matScale(toParent, hScale, vScale, 1);
7725		- LA.matScale(toParent, 1, 1, totalScale);
	7926	+ if (modified) // && opposite)
	7927	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7928	+ else
	7929	+ //LA.matScale(toParent, hScale, vScale, 1);
	7930	+ LA.matScale(toParent, 1, 1, totalScale);
7726	7931	} else
7727	7932	{
7728	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7759,7 +7964,7 @@
7759	7964	} // NEW ...
7760	7965
7761	7966
7762		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7763	7968	}
7764	7969
7765	7970	boolean overflow = false;