~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[] = new byte[100][];
	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,6 +225,8 @@
219	225	// o.bRep.support = null;
220	226	// }
221	227	o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
222	230
223	231	if (this.support != null)
224	232	{
..	..	@@ -239,6 +247,73 @@
239	247	// this.bRep.support = null;
240	248	// this.support = null;
241	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;
242	317	}
243	318
244	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
..	..	@@ -274,6 +349,9 @@
274	349	}
275	350
276	351	this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
277	355	// July 2019 if (this.bRep != null)
278	356	// this.bRep.support = o.transientrep;
279	357	// this.support = o.support;
..	..	@@ -421,6 +499,7 @@
421	499	}
422	500
423	501	boolean live = false;
	502	+ transient boolean keepdontselect;
424	503	boolean dontselect = false;
425	504	boolean hide = false;
426	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -608,7 +687,7 @@
608	687	{
609	688	if (maxcount != 1)
610	689	{
611		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
612	691	}
613	692
614	693	toParentMarked = LA.newMatrix();
..	..	@@ -1005,6 +1084,9 @@
1005	1084
1006	1085	if (material == null \|\| material.multiply)
1007	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
1008	1090
1009	1091	// Transparent objects are dynamic because we have to sort the triangles.
1010	1092	return material.opacity > 0.99;
..	..	@@ -2287,11 +2369,6 @@
2287	2369
2288	2370	InitOthers();
2289	2371
2290		- if (this instanceof Camera)
2291		- {
2292		- material.shift = 90;
2293		- }
2294		-
2295	2372	material.multiply = multiply;
2296	2373
2297	2374	if (multiply)
..	..	@@ -2432,6 +2509,11 @@
2432	2509	else
2433	2510	{
2434	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");
2435	2517	}
2436	2518	}
2437	2519
..	..	@@ -2561,7 +2643,8 @@
2561	2643	private static final int editSelf = 1;
2562	2644	private static final int editChild = 2;
2563	2645
2564		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2565	2648	{
2566	2649	if (level == 0)
2567	2650	{
..	..	@@ -2569,7 +2652,8 @@
2569	2652	return;
2570	2653
2571	2654	Object3D selectee;
2572		- 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))
2573	2657	{
2574	2658	selectee = (Object3D) e.nextElement();
2575	2659	}
..	..	@@ -2577,19 +2661,22 @@
2577	2661	} else
2578	2662	{
2579	2663	//super.
2580		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2581	2666	}
2582	2667	}
2583	2668
2584		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2585	2671	{
2586	2672	doSomething = 0;
2587	2673	if (level == 0)
2588	2674	{
2589		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2590	2676	}
2591	2677	if (//super.
2592		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2593	2680	{
2594	2681	doSomething = 1;
2595	2682	return true;
..	..	@@ -2599,7 +2686,7 @@
2599	2686	}
2600	2687	}
2601	2688
2602		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2603	2690	{
2604	2691	if (selection == null)
2605	2692	{
..	..	@@ -2612,7 +2699,8 @@
2612	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2613	2700	{
2614	2701	Object3D selectee = (Object3D) e.nextElement();
2615		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2616	2704	{
2617	2705	childToDrag = selectee;
2618	2706	doSomething = 2;
..	..	@@ -2624,13 +2712,15 @@
2624	2712	return retval;
2625	2713	}
2626	2714
2627		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2628	2717	{
2629	2718	switch (doSomething)
2630	2719	{
2631	2720	case 1: // '\001'
2632	2721	//super.
2633		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2634	2724	break;
2635	2725
2636	2726	case 2: // '\002'
..	..	@@ -2643,11 +2733,13 @@
2643	2733	{
2644	2734	//sel.hitSomething = childToDrag.hitSomething;
2645	2735	//childToDrag.doEditDrag(info);
2646		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2647	2738	} else
2648	2739	{
2649	2740	//super.
2650		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2651	2743	}
2652	2744	}
2653	2745	break;
..	..	@@ -2665,6 +2757,9 @@
2665	2757	{
2666	2758	deselectAll();
2667	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2668	2763	ClickInfo newInfo = new ClickInfo();
2669	2764	newInfo.flags = info.flags;
2670	2765	newInfo.bounds = info.bounds;
..	..	@@ -3112,7 +3207,7 @@
3112	3207	{
3113	3208	if (bRep != null)
3114	3209	{
3115		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3116	3211	Touch();
3117	3212	}
3118	3213	}
..	..	@@ -3522,15 +3617,47 @@
3522	3617
3523	3618	void ClearMaterials()
3524	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3525	3625	ClearMaterial();
3526		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3527	3627	{
3528		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3529	3629	if (child == null)
3530	3630	continue;
3531	3631	child.ClearMaterials();
3532		- release(i);
3533	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;
3534	3661	}
3535	3662
3536	3663	void FlipV(boolean flip)
..	..	@@ -5415,6 +5542,51 @@
5415	5542	blockloop = false;
5416	5543	}
5417	5544
	5545	+ void ResetSelectable()
	5546	+ {
	5547	+ if (blockloop)
	5548	+ return;
	5549	+
	5550	+ blockloop = true;
	5551	+
	5552	+ keepdontselect = dontselect;
	5553	+ dontselect = true;
	5554	+
	5555	+ Object3D child;
	5556	+ int nb = Size();
	5557	+ for (int i = 0; i < nb; i++)
	5558	+ {
	5559	+ child = (Object3D) get(i);
	5560	+ if (child == null)
	5561	+ continue;
	5562	+ child.ResetSelectable();
	5563	+ }
	5564	+
	5565	+ blockloop = false;
	5566	+ }
	5567	+
	5568	+ void RestoreSelectable()
	5569	+ {
	5570	+ if (blockloop)
	5571	+ return;
	5572	+
	5573	+ blockloop = true;
	5574	+
	5575	+ dontselect = keepdontselect;
	5576	+
	5577	+ Object3D child;
	5578	+ int nb = Size();
	5579	+ for (int i = 0; i < nb; i++)
	5580	+ {
	5581	+ child = (Object3D) get(i);
	5582	+ if (child == null)
	5583	+ continue;
	5584	+ child.RestoreSelectable();
	5585	+ }
	5586	+
	5587	+ blockloop = false;
	5588	+ }
	5589	+
5418	5590	boolean IsSelected()
5419	5591	{
5420	5592	if (parent == null)
..	..	@@ -5475,6 +5647,11 @@
5475	5647	if (fullname == null)
5476	5648	return "";
5477	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5478	5655	// System.out.println("Fullname = " + fullname);
5479	5656
5480	5657	// Does not work on Windows due to C:
..	..	@@ -5487,7 +5664,7 @@
5487	5664
5488	5665	if (split.length == 0)
5489	5666	{
5490		- return "";
	5667	+ return fullname.pigment = "";
5491	5668	}
5492	5669
5493	5670	if (split.length <= 2)
..	..	@@ -5495,22 +5672,27 @@
5495	5672	if (fullname.name.endsWith(":"))
5496	5673	{
5497	5674	// Windows
5498		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5499	5676	}
5500	5677
5501		- return split[0];
	5678	+ return fullname.pigment = split[0];
5502	5679	}
5503	5680
5504	5681	// Windows
5505	5682	assert(split.length == 4);
5506	5683
5507		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5508	5685	}
5509	5686
5510	5687	static String GetBump(cTexture fullname)
5511	5688	{
5512	5689	if (fullname == null)
5513	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5514	5696
5515	5697	// System.out.println("Fullname = " + fullname);
5516	5698	// Does not work on Windows due to C:
..	..	@@ -5522,12 +5704,12 @@
5522	5704
5523	5705	if (split.length == 0)
5524	5706	{
5525		- return "";
	5707	+ return fullname.bump = "";
5526	5708	}
5527	5709
5528	5710	if (split.length == 1)
5529	5711	{
5530		- return "";
	5712	+ return fullname.bump = "";
5531	5713	}
5532	5714
5533	5715	if (split.length == 2)
..	..	@@ -5535,16 +5717,16 @@
5535	5717	if (fullname.name.endsWith(":"))
5536	5718	{
5537	5719	// Windows
5538		- return "";
	5720	+ return fullname.bump = "";
5539	5721	}
5540	5722
5541		- return split[1];
	5723	+ return fullname.bump = split[1];
5542	5724	}
5543	5725
5544	5726	// Windows
5545	5727	assert(split.length == 4);
5546	5728
5547		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5548	5730	}
5549	5731
5550	5732	String GetPigmentTexture()
..	..	@@ -5627,6 +5809,9 @@
5627	5809	texname = "";
5628	5810
5629	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5630	5815	Touch();
5631	5816	}
5632	5817
..	..	@@ -5700,6 +5885,8 @@
5700	5885
5701	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5702	5887
	5888	+ GetTextures().bump = null;
	5889	+
5703	5890	Touch();
5704	5891	}
5705	5892
..	..	@@ -5720,6 +5907,38 @@
5720	5907
5721	5908	blockloop = true;
5722	5909	child.ResetBumpTexture();
	5910	+ blockloop = false;
	5911	+ }
	5912	+ }
	5913	+
	5914	+ void EmbedTextures(boolean embed)
	5915	+ {
	5916	+ if (blockloop)
	5917	+ return;
	5918	+
	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	+ }
	5931	+
	5932	+ int nb = Size();
	5933	+ for (int i = 0; i < nb; i++)
	5934	+ {
	5935	+ Object3D child = (Object3D) get(i);
	5936	+
	5937	+ if (child == null)
	5938	+ continue;
	5939	+
	5940	+ blockloop = true;
	5941	+ child.EmbedTextures(embed);
5723	5942	blockloop = false;
5724	5943	}
5725	5944	}
..	..	@@ -5810,8 +6029,10 @@
5810	6029	if (support != null)
5811	6030	support = support;
5812	6031
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);
	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.
5815	6036
5816	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5817	6038	{
..	..	@@ -5821,8 +6042,9 @@
5821	6042	// usecalllists &= !(parent instanceof RandomNode);
5822	6043	// usecalllists = false;
5823	6044
5824		- if (GetBRep() != null)
5825		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5826	6048	//System.out.println("draw " + this);
5827	6049	//new Exception().printStackTrace();
5828	6050
..	..	@@ -5844,7 +6066,7 @@
5844	6066	if (!(this instanceof Composite))
5845	6067	touched = false;
5846	6068	//if (displaylist == -1 && usecalllists)
5847		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5848	6070	{
5849	6071	bRep.displaylist = display.GenList();
5850	6072	assert(bRep.displaylist != 0);
..	..	@@ -5855,7 +6077,7 @@
5855	6077
5856	6078	//System.out.println("\tnew list " + list);
5857	6079	//gl.glDrawBuffer(gl.GL_NONE);
5858		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5859	6081	{
5860	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5861	6083	display.NewList(bRep.displaylist);
..	..	@@ -5864,7 +6086,7 @@
5864	6086	CallList(display, root, selected, blocked);
5865	6087
5866	6088	// compiled = true;
5867		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5868	6090	{
5869	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5870	6092	display.EndList();
..	..	@@ -7215,20 +7437,23 @@
7215	7437	}
7216	7438	}
7217	7439
7218		- 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)
7219	7444	{
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;
	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;
7223	7448	if (toscreen == null)
7224	7449	{
7225		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7226	7451	}
7227	7452	cVector vec = in;
7228	7453	LA.xformPos(in, toscreen, in);
7229	7454	//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();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7232	7457	outPt.x = hc + (int) vec.x;
7233	7458	outPt.y = vc - (int) vec.y;
7234	7459	outRec.x = outPt.x - 3;
..	..	@@ -7236,15 +7461,18 @@
7236	7461	outRec.width = outRec.height = 6;
7237	7462	}
7238	7463
7239		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7240	7466	{
7241	7467	Point pt = new Point(0, 0);
7242	7468	Rectangle rec = new Rectangle();
7243		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7244	7471	return rec;
7245	7472	}
7246	7473
7247		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7248	7476	{
7249	7477	if (level == 0)
7250	7478	{
..	..	@@ -7253,16 +7481,19 @@
7253	7481	{
7254	7482	cVector origin = new cVector();
7255	7483	//LA.xformPos(origin, toParent, origin);
7256		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7257	7488	Rectangle boundary = new Rectangle();
7258	7489	boundary.x = spot.x - 30;
7259	7490	boundary.y = spot.y - 30;
7260	7491	boundary.width = spot.width + 60;
7261	7492	boundary.height = spot.height + 60;
7262		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7263	7494	int spotw = spot.x + spot.width;
7264	7495	int spoth = spot.y + spot.height;
7265		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7266	7497	// if (CameraPane.Xmin > spot.x)
7267	7498	// {
7268	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7279,11 +7510,6 @@
7279	7510	// {
7280	7511	// CameraPane.Ymax = spoth;
7281	7512	// }
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	7513	// if (CameraPane.Xmin > spot.x)
7288	7514	// {
7289	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7302,10 +7528,15 @@
7302	7528	// }
7303	7529	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7304	7530	//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);
	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);
7309	7540	// if (CameraPane.Xmin > spot.x)
7310	7541	// {
7311	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7322,8 +7553,9 @@
7322	7553	// {
7323	7554	// CameraPane.Ymax = spoth;
7324	7555	// }
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);
	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);
7327	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7328	7560	// if (CameraPane.Xmin > boundary.x)
7329	7561	// {
..	..	@@ -7345,7 +7577,8 @@
7345	7577	}
7346	7578	}
7347	7579
7348		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7349	7582	{
7350	7583	if (level == 0)
7351	7584	{
..	..	@@ -7354,8 +7587,8 @@
7354	7587
7355	7588	boolean retval = false;
7356	7589
7357		- startX = info.x;
7358		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7359	7592
7360	7593	hitSomething = -1;
7361	7594	cVector origin = new cVector();
..	..	@@ -7365,22 +7598,53 @@
7365	7598	{
7366	7599	centerPt = new Point(0, 0);
7367	7600	}
7368		- calcHotSpot(origin, info, centerPt, spot);
7369		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7370	7604	{
7371	7605	hitSomething = hitCenter;
7372	7606	retval = true;
7373	7607	}
7374	7608	spot.translate(32, 0);
7375		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7376	7610	{
7377	7611	hitSomething = hitRotate;
7378	7612	retval = true;
7379	7613	}
7380	7614	spot.translate(0, 32);
7381		- 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))
7382	7618	{
7383	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	+
7384	7648	retval = true;
7385	7649	}
7386	7650
..	..	@@ -7390,7 +7654,7 @@
7390	7654	}
7391	7655
7392	7656	//System.out.println("info.modifiers = " + info.modifiers);
7393		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7394	7658	//System.out.println("modified = " + modified);
7395	7659	//new Exception().printStackTrace();
7396	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7418,7 +7682,8 @@
7418	7682	return true;
7419	7683	}
7420	7684
7421		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7422	7687	{
7423	7688	if (hitSomething == 0)
7424	7689	{
..	..	@@ -7432,7 +7697,7 @@
7432	7697
7433	7698	//System.out.println("hitSomething = " + hitSomething);
7434	7699
7435		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7436	7701
7437	7702	cVector xlate = new cVector();
7438	7703	//cVector xlate2 = new cVector();
..	..	@@ -7446,7 +7711,9 @@
7446	7711
7447	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7448	7713
7449		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7450	7717	{
7451	7718	//assert(false);
7452	7719	/*
..	..	@@ -7466,8 +7733,8 @@
7466	7733	toParent[3][i] = xlate.get(i);
7467	7734	LA.matInvert(toParent, fromParent);
7468	7735	*/
7469		- cVector delta = LA.newVector(0, 0, startY - info.y);
7470		- 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);
7471	7738
7472	7739	LA.matCopy(startMat, toParent);
7473	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7476,7 +7743,7 @@
7476	7743	} else
7477	7744	{
7478	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7479		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7480	7747	cVector away = new cVector();
7481	7748	//cVector right2 = new cVector();
7482	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7493,19 +7760,19 @@
7493	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7494	7761	// if (!CameraPane.LOCALTRANSFORM)
7495	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7496		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7497	7764	// if (!CameraPane.LOCALTRANSFORM)
7498	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7499	7766	//LA.vecCross(up, cVector.Z, right2);
7500	7767
7501		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7502	7769
7503	7770	//System.out.println("DELTA0 = " + delta);
7504	7771	//System.out.println("AWAY = " + info.camera.away);
7505	7772	//System.out.println("UP = " + info.camera.up);
7506	7773	if (away.z > 0)
7507	7774	{
7508		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7509	7776	{
7510	7777	delta.x = -delta.x;
7511	7778	} else
..	..	@@ -7520,7 +7787,7 @@
7520	7787	//System.out.println("DELTA1 = " + delta);
7521	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7522	7789	//System.out.println("DELTA2 = " + delta);
7523		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7524	7791	LA.matCopy(startMat, toParent);
7525	7792	//System.out.println("DELTA3 = " + delta);
7526	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7530,8 +7797,8 @@
7530	7797	break;
7531	7798
7532	7799	case hitRotate: // rotate
7533		- int dx = info.x - centerPt.x;
7534		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7535	7802	double angle = (double) Math.atan2(dx, dy);
7536	7803	angle = -(1.570796 - angle);
7537	7804
..	..	@@ -7540,7 +7807,7 @@
7540	7807
7541	7808	if (modified)
7542	7809	{
7543		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7544	7811	angle /= (Math.PI / 4);
7545	7812	angle = Math.floor(angle + 0.5);
7546	7813	angle *= (Math.PI / 4);
..	..	@@ -7554,7 +7821,7 @@
7554	7821	}
7555	7822	/**/
7556	7823
7557		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7558	7825	{
7559	7826	case 1: // '\001'
7560	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7581,7 +7848,7 @@
7581	7848	break;
7582	7849
7583	7850	case hitScale: // scale
7584		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7585	7852	double sign = 1;
7586	7853	if (hScale < 0)
7587	7854	{
..	..	@@ -7593,7 +7860,7 @@
7593	7860	//hScale = 0.01;
7594	7861	}
7595	7862
7596		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7597	7864	sign = 1;
7598	7865	if (vScale < 0)
7599	7866	{
..	..	@@ -7604,6 +7871,7 @@
7604	7871	{
7605	7872	//vScale = 0.01;
7606	7873	}
	7874	+
7607	7875	LA.matCopy(startMat, toParent);
7608	7876	/**/
7609	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7613,33 +7881,39 @@
7613	7881	}
7614	7882	/**/
7615	7883
7616		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7617	7885
7618	7886	if (totalScale < 0.01)
7619	7887	{
7620	7888	totalScale = 0.01;
7621	7889	}
7622	7890
7623		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7624	7892	{
7625	7893	case 3: // '\001'
7626	7894	if (modified \|\| opposite)
7627	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7628	7899	//LA.matScale(toParent, 1, hScale, vScale);
7629		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7630	7901	} // vScale, 1);
7631	7902	else
7632	7903	{
7633	7904	// EXCEPTION!
7634		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7635	7906	} // vScale, 1);
7636	7907	break;
7637	7908
7638	7909	case 2: // '\002'
7639	7910	if (modified \|\| opposite)
7640	7911	{
7641		- //LA.matScale(toParent, hScale, 1, vScale);
7642		- 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);
7643	7917	} else
7644	7918	{
7645	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7649,8 +7923,11 @@
7649	7923	case 1: // '\003'
7650	7924	if (modified \|\| opposite)
7651	7925	{
7652		- //LA.matScale(toParent, hScale, vScale, 1);
7653		- 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);
7654	7931	} else
7655	7932	{
7656	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7687,7 +7964,7 @@
7687	7964	} // NEW ...
7688	7965
7689	7966
7690		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7691	7968	}
7692	7969
7693	7970	boolean overflow = false;