~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		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	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
..	..	@@ -170,24 +179,35 @@
170	179
171	180	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	181	{
	182	+ Object3D o;
	183	+
173	184	if (hashtable.containsKey(GetUUID()))
174	185	{
175		- Object3D o = hashtable.get(GetUUID());
	186	+ o = hashtable.get(GetUUID());
176	187
177	188	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
180	197
181		- return;
	198	+ hashtable.put(GetUUID(), o);
182	199	}
183	200
184		- Object3D o = new Object3D("copy of " + this.name);
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	201	+ if (!blockloop)
189	202	{
190		- get(i).ExtractBigData(hashtable);
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
191	211	}
192	212
193	213	ExtractBigData(o);
..	..	@@ -195,11 +215,26 @@
195	215
196	216	void ExtractBigData(Object3D o)
197	217	{
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
198	221	o.bRep = this.bRep;
199		- if (this.bRep != null)
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
200	232	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
203	238	}
204	239
205	240	// o.support = this.support;
..	..	@@ -214,19 +249,86 @@
214	249	// this.fileparent = null;
215	250	}
216	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;
	317	+ }
	318	+
217	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	320	{
219	321	if (!hashtable.containsKey(GetUUID()))
220	322	return;
221	323
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
222	328	if (blockloop)
223	329	return;
224	330
225	331	blockloop = true;
226		-
227		- Object3D o = hashtable.get(GetUUID());
228		-
229		- RestoreBigData(o);
230	332
231	333	//hashtable.remove(GetUUID());
232	334
..	..	@@ -241,8 +343,17 @@
241	343	void RestoreBigData(Object3D o)
242	344	{
243	345	this.bRep = o.bRep;
244		- if (this.bRep != null)
245		- this.bRep.support = o.transientrep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
246	357	// this.support = o.support;
247	358	// this.fileparent = o.fileparent;
248	359	}
..	..	@@ -388,6 +499,7 @@
388	499	}
389	500
390	501	boolean live = false;
	502	+ transient boolean keepdontselect;
391	503	boolean dontselect = false;
392	504	boolean hide = false;
393	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -973,6 +1085,9 @@
973	1085	if (material == null \|\| material.multiply)
974	1086	return true;
975	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
976	1091	// Transparent objects are dynamic because we have to sort the triangles.
977	1092	return material.opacity > 0.99;
978	1093	}
..	..	@@ -1374,6 +1489,7 @@
1374	1489	toParent = LA.newMatrix();
1375	1490	fromParent = LA.newMatrix();
1376	1491	}
	1492	+
1377	1493	LA.matCopy(other.toParent, toParent);
1378	1494	LA.matCopy(other.fromParent, fromParent);
1379	1495
..	..	@@ -2398,6 +2514,11 @@
2398	2514	else
2399	2515	{
2400	2516	//((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
2401	2522	}
2402	2523	}
2403	2524
..	..	@@ -2527,7 +2648,8 @@
2527	2648	private static final int editSelf = 1;
2528	2649	private static final int editChild = 2;
2529	2650
2530		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2531	2653	{
2532	2654	if (level == 0)
2533	2655	{
..	..	@@ -2535,7 +2657,8 @@
2535	2657	return;
2536	2658
2537	2659	Object3D selectee;
2538		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2539	2662	{
2540	2663	selectee = (Object3D) e.nextElement();
2541	2664	}
..	..	@@ -2543,19 +2666,22 @@
2543	2666	} else
2544	2667	{
2545	2668	//super.
2546		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2547	2671	}
2548	2672	}
2549	2673
2550		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2551	2676	{
2552	2677	doSomething = 0;
2553	2678	if (level == 0)
2554	2679	{
2555		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2556	2681	}
2557	2682	if (//super.
2558		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2559	2685	{
2560	2686	doSomething = 1;
2561	2687	return true;
..	..	@@ -2565,7 +2691,7 @@
2565	2691	}
2566	2692	}
2567	2693
2568		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2569	2695	{
2570	2696	if (selection == null)
2571	2697	{
..	..	@@ -2578,7 +2704,8 @@
2578	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2579	2705	{
2580	2706	Object3D selectee = (Object3D) e.nextElement();
2581		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2582	2709	{
2583	2710	childToDrag = selectee;
2584	2711	doSomething = 2;
..	..	@@ -2590,13 +2717,15 @@
2590	2717	return retval;
2591	2718	}
2592	2719
2593		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2594	2722	{
2595	2723	switch (doSomething)
2596	2724	{
2597	2725	case 1: // '\001'
2598	2726	//super.
2599		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2600	2729	break;
2601	2730
2602	2731	case 2: // '\002'
..	..	@@ -2609,11 +2738,13 @@
2609	2738	{
2610	2739	//sel.hitSomething = childToDrag.hitSomething;
2611	2740	//childToDrag.doEditDrag(info);
2612		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2613	2743	} else
2614	2744	{
2615	2745	//super.
2616		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2617	2748	}
2618	2749	}
2619	2750	break;
..	..	@@ -2631,6 +2762,9 @@
2631	2762	{
2632	2763	deselectAll();
2633	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2634	2768	ClickInfo newInfo = new ClickInfo();
2635	2769	newInfo.flags = info.flags;
2636	2770	newInfo.bounds = info.bounds;
..	..	@@ -3078,7 +3212,7 @@
3078	3212	{
3079	3213	if (bRep != null)
3080	3214	{
3081		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3082	3216	Touch();
3083	3217	}
3084	3218	}
..	..	@@ -3488,15 +3622,47 @@
3488	3622
3489	3623	void ClearMaterials()
3490	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3491	3630	ClearMaterial();
3492		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3493	3632	{
3494		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3495	3634	if (child == null)
3496	3635	continue;
3497	3636	child.ClearMaterials();
3498		- release(i);
3499	3637	}
	3638	+
	3639	+ blockloop = false;
	3640	+ }
	3641	+
	3642	+ void ClearVersionList()
	3643	+ {
	3644	+ this.versionlist = null;
	3645	+ this.versionindex = -1;
	3646	+ this.versiontable = null;
	3647	+ }
	3648	+
	3649	+ void ClearVersions()
	3650	+ {
	3651	+ if (blockloop)
	3652	+ return;
	3653	+
	3654	+ blockloop = true;
	3655	+
	3656	+ ClearVersionList();
	3657	+ for (int i = 0; i < Size(); i++)
	3658	+ {
	3659	+ Object3D child = (Object3D) get(i);
	3660	+ if (child == null)
	3661	+ continue;
	3662	+ child.ClearVersions();
	3663	+ }
	3664	+
	3665	+ blockloop = false;
3500	3666	}
3501	3667
3502	3668	void FlipV(boolean flip)
..	..	@@ -5381,6 +5547,51 @@
5381	5547	blockloop = false;
5382	5548	}
5383	5549
	5550	+ void ResetSelectable()
	5551	+ {
	5552	+ if (blockloop)
	5553	+ return;
	5554	+
	5555	+ blockloop = true;
	5556	+
	5557	+ keepdontselect = dontselect;
	5558	+ dontselect = true;
	5559	+
	5560	+ Object3D child;
	5561	+ int nb = Size();
	5562	+ for (int i = 0; i < nb; i++)
	5563	+ {
	5564	+ child = (Object3D) get(i);
	5565	+ if (child == null)
	5566	+ continue;
	5567	+ child.ResetSelectable();
	5568	+ }
	5569	+
	5570	+ blockloop = false;
	5571	+ }
	5572	+
	5573	+ void RestoreSelectable()
	5574	+ {
	5575	+ if (blockloop)
	5576	+ return;
	5577	+
	5578	+ blockloop = true;
	5579	+
	5580	+ dontselect = keepdontselect;
	5581	+
	5582	+ Object3D child;
	5583	+ int nb = Size();
	5584	+ for (int i = 0; i < nb; i++)
	5585	+ {
	5586	+ child = (Object3D) get(i);
	5587	+ if (child == null)
	5588	+ continue;
	5589	+ child.RestoreSelectable();
	5590	+ }
	5591	+
	5592	+ blockloop = false;
	5593	+ }
	5594	+
5384	5595	boolean IsSelected()
5385	5596	{
5386	5597	if (parent == null)
..	..	@@ -5441,6 +5652,11 @@
5441	5652	if (fullname == null)
5442	5653	return "";
5443	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5444	5660	// System.out.println("Fullname = " + fullname);
5445	5661
5446	5662	// Does not work on Windows due to C:
..	..	@@ -5453,7 +5669,7 @@
5453	5669
5454	5670	if (split.length == 0)
5455	5671	{
5456		- return "";
	5672	+ return fullname.pigment = "";
5457	5673	}
5458	5674
5459	5675	if (split.length <= 2)
..	..	@@ -5461,22 +5677,27 @@
5461	5677	if (fullname.name.endsWith(":"))
5462	5678	{
5463	5679	// Windows
5464		- return fullname.name.substring(0, fullname.name.length()-1);
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5465	5681	}
5466	5682
5467		- return split[0];
	5683	+ return fullname.pigment = split[0];
5468	5684	}
5469	5685
5470	5686	// Windows
5471	5687	assert(split.length == 4);
5472	5688
5473		- return split[0] + ":" + split[1];
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5474	5690	}
5475	5691
5476	5692	static String GetBump(cTexture fullname)
5477	5693	{
5478	5694	if (fullname == null)
5479	5695	return "";
	5696	+
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
5480	5701
5481	5702	// System.out.println("Fullname = " + fullname);
5482	5703	// Does not work on Windows due to C:
..	..	@@ -5488,12 +5709,12 @@
5488	5709
5489	5710	if (split.length == 0)
5490	5711	{
5491		- return "";
	5712	+ return fullname.bump = "";
5492	5713	}
5493	5714
5494	5715	if (split.length == 1)
5495	5716	{
5496		- return "";
	5717	+ return fullname.bump = "";
5497	5718	}
5498	5719
5499	5720	if (split.length == 2)
..	..	@@ -5501,16 +5722,16 @@
5501	5722	if (fullname.name.endsWith(":"))
5502	5723	{
5503	5724	// Windows
5504		- return "";
	5725	+ return fullname.bump = "";
5505	5726	}
5506	5727
5507		- return split[1];
	5728	+ return fullname.bump = split[1];
5508	5729	}
5509	5730
5510	5731	// Windows
5511	5732	assert(split.length == 4);
5512	5733
5513		- return split[2] + ":" + split[3];
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5514	5735	}
5515	5736
5516	5737	String GetPigmentTexture()
..	..	@@ -5593,6 +5814,9 @@
5593	5814	texname = "";
5594	5815
5595	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5596	5820	Touch();
5597	5821	}
5598	5822
..	..	@@ -5666,6 +5890,8 @@
5666	5890
5667	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5668	5892
	5893	+ GetTextures().bump = null;
	5894	+
5669	5895	Touch();
5670	5896	}
5671	5897
..	..	@@ -5686,6 +5912,38 @@
5686	5912
5687	5913	blockloop = true;
5688	5914	child.ResetBumpTexture();
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
	5919	+ void EmbedTextures(boolean embed)
	5920	+ {
	5921	+ if (blockloop)
	5922	+ return;
	5923	+
	5924	+ //if (GetTextures() != null)
	5925	+ if (embed)
	5926	+ CameraPane.EmbedTextures(GetTextures());
	5927	+ else
	5928	+ {
	5929	+ GetTextures().pigmentdata = null;
	5930	+ GetTextures().bumpdata = null;
	5931	+ GetTextures().pw = 0;
	5932	+ GetTextures().ph = 0;
	5933	+ GetTextures().bw = 0;
	5934	+ GetTextures().bh = 0;
	5935	+ }
	5936	+
	5937	+ int nb = Size();
	5938	+ for (int i = 0; i < nb; i++)
	5939	+ {
	5940	+ Object3D child = (Object3D) get(i);
	5941	+
	5942	+ if (child == null)
	5943	+ continue;
	5944	+
	5945	+ blockloop = true;
	5946	+ child.EmbedTextures(embed);
5689	5947	blockloop = false;
5690	5948	}
5691	5949	}
..	..	@@ -5776,8 +6034,10 @@
5776	6034	if (support != null)
5777	6035	support = support;
5778	6036
5779		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6037	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6038	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6039	+
	6040	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5781	6041
5782	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5783	6043	{
..	..	@@ -5787,8 +6047,9 @@
5787	6047	// usecalllists &= !(parent instanceof RandomNode);
5788	6048	// usecalllists = false;
5789	6049
5790		- if (GetBRep() != null)
5791		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5792	6053	//System.out.println("draw " + this);
5793	6054	//new Exception().printStackTrace();
5794	6055
..	..	@@ -5810,7 +6071,7 @@
5810	6071	if (!(this instanceof Composite))
5811	6072	touched = false;
5812	6073	//if (displaylist == -1 && usecalllists)
5813		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5814	6075	{
5815	6076	bRep.displaylist = display.GenList();
5816	6077	assert(bRep.displaylist != 0);
..	..	@@ -5821,7 +6082,7 @@
5821	6082
5822	6083	//System.out.println("\tnew list " + list);
5823	6084	//gl.glDrawBuffer(gl.GL_NONE);
5824		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5825	6086	{
5826	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5827	6088	display.NewList(bRep.displaylist);
..	..	@@ -5830,7 +6091,7 @@
5830	6091	CallList(display, root, selected, blocked);
5831	6092
5832	6093	// compiled = true;
5833		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5834	6095	{
5835	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5836	6097	display.EndList();
..	..	@@ -7181,20 +7442,23 @@
7181	7442	}
7182	7443	}
7183	7444
7184		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7445	+ static ClickInfo clickInfo = new ClickInfo();
	7446	+
	7447	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7448	+ Point outPt, Rectangle outRec)
7185	7449	{
7186		- int hc = info.bounds.x + info.bounds.width / 2;
7187		- int vc = info.bounds.y + info.bounds.height / 2;
7188		- double[][] toscreen = info.toScreen;
	7450	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7451	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7452	+ double[][] toscreen = clickInfo.toScreen;
7189	7453	if (toscreen == null)
7190	7454	{
7191		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7192	7456	}
7193	7457	cVector vec = in;
7194	7458	LA.xformPos(in, toscreen, in);
7195	7459	//System.out.println("Distance = " + info.camera.Distance());
7196		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7197		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7460	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7461	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7198	7462	outPt.x = hc + (int) vec.x;
7199	7463	outPt.y = vc - (int) vec.y;
7200	7464	outRec.x = outPt.x - 3;
..	..	@@ -7202,15 +7466,18 @@
7202	7466	outRec.width = outRec.height = 6;
7203	7467	}
7204	7468
7205		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7206	7471	{
7207	7472	Point pt = new Point(0, 0);
7208	7473	Rectangle rec = new Rectangle();
7209		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7210	7476	return rec;
7211	7477	}
7212	7478
7213		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7214	7481	{
7215	7482	if (level == 0)
7216	7483	{
..	..	@@ -7219,16 +7486,19 @@
7219	7486	{
7220	7487	cVector origin = new cVector();
7221	7488	//LA.xformPos(origin, toParent, origin);
7222		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7223	7493	Rectangle boundary = new Rectangle();
7224	7494	boundary.x = spot.x - 30;
7225	7495	boundary.y = spot.y - 30;
7226	7496	boundary.width = spot.width + 60;
7227	7497	boundary.height = spot.height + 60;
7228		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7229	7499	int spotw = spot.x + spot.width;
7230	7500	int spoth = spot.y + spot.height;
7231		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7232	7502	// if (CameraPane.Xmin > spot.x)
7233	7503	// {
7234	7504	// CameraPane.Xmin = spot.x;
..	..	@@ -7245,11 +7515,6 @@
7245	7515	// {
7246	7516	// CameraPane.Ymax = spoth;
7247	7517	// }
7248		- spot.translate(32, 32);
7249		- spotw = spot.x + spot.width;
7250		- spoth = spot.y + spot.height;
7251		- info.g.setColor(Color.cyan);
7252		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7253	7518	// if (CameraPane.Xmin > spot.x)
7254	7519	// {
7255	7520	// CameraPane.Xmin = spot.x;
..	..	@@ -7268,10 +7533,15 @@
7268	7533	// }
7269	7534	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7270	7535	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7271		- spot.translate(0, -32);
7272		- info.g.setColor(Color.yellow);
7273		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7274		- info.g.setColor(Color.green);
	7536	+ spot.translate(32, 0);
	7537	+ clickInfo.g.setColor(Color.yellow);
	7538	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7539	+
	7540	+ spot.translate(32, 64);
	7541	+ spotw = spot.x + spot.width;
	7542	+ spoth = spot.y + spot.height;
	7543	+ clickInfo.g.setColor(Color.cyan);
	7544	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7275	7545	// if (CameraPane.Xmin > spot.x)
7276	7546	// {
7277	7547	// CameraPane.Xmin = spot.x;
..	..	@@ -7288,8 +7558,9 @@
7288	7558	// {
7289	7559	// CameraPane.Ymax = spoth;
7290	7560	// }
7291		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7292		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7561	+ clickInfo.g.setColor(Color.green);
	7562	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7563	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7293	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7294	7565	// if (CameraPane.Xmin > boundary.x)
7295	7566	// {
..	..	@@ -7311,7 +7582,8 @@
7311	7582	}
7312	7583	}
7313	7584
7314		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7315	7587	{
7316	7588	if (level == 0)
7317	7589	{
..	..	@@ -7320,8 +7592,8 @@
7320	7592
7321	7593	boolean retval = false;
7322	7594
7323		- startX = info.x;
7324		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7325	7597
7326	7598	hitSomething = -1;
7327	7599	cVector origin = new cVector();
..	..	@@ -7331,22 +7603,53 @@
7331	7603	{
7332	7604	centerPt = new Point(0, 0);
7333	7605	}
7334		- calcHotSpot(origin, info, centerPt, spot);
7335		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7336	7609	{
7337	7610	hitSomething = hitCenter;
7338	7611	retval = true;
7339	7612	}
7340	7613	spot.translate(32, 0);
7341		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7342	7615	{
7343	7616	hitSomething = hitRotate;
7344	7617	retval = true;
7345	7618	}
7346	7619	spot.translate(0, 32);
7347		- if (spot.contains(info.x, info.y))
	7620	+ spot.translate(32, 0);
	7621	+ spot.translate(0, 32);
	7622	+ if (spot.contains(clickInfo.x, clickInfo.y))
7348	7623	{
7349	7624	hitSomething = hitScale;
	7625	+
	7626	+ double scale = 0.005f * clickInfo.camera.Distance();
	7627	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7628	+ double sign = 1;
	7629	+ if (hScale < 0)
	7630	+ {
	7631	+ sign = -1;
	7632	+ }
	7633	+ hScale = signMath.pow(signhScale, scale * 50);
	7634	+ if (hScale < 0.01)
	7635	+ {
	7636	+ //hScale = 0.01;
	7637	+ }
	7638	+
	7639	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7640	+ sign = 1;
	7641	+ if (vScale < 0)
	7642	+ {
	7643	+ sign = -1;
	7644	+ }
	7645	+ vScale = signMath.pow(signvScale, scale * 50);
	7646	+ if (vScale < 0.01)
	7647	+ {
	7648	+ //vScale = 0.01;
	7649	+ }
	7650	+
	7651	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7652	+
7350	7653	retval = true;
7351	7654	}
7352	7655
..	..	@@ -7356,7 +7659,7 @@
7356	7659	}
7357	7660
7358	7661	//System.out.println("info.modifiers = " + info.modifiers);
7359		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7360	7663	//System.out.println("modified = " + modified);
7361	7664	//new Exception().printStackTrace();
7362	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7384,7 +7687,8 @@
7384	7687	return true;
7385	7688	}
7386	7689
7387		- void doEditDrag0(ClickInfo info, boolean opposite)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7388	7692	{
7389	7693	if (hitSomething == 0)
7390	7694	{
..	..	@@ -7398,7 +7702,7 @@
7398	7702
7399	7703	//System.out.println("hitSomething = " + hitSomething);
7400	7704
7401		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
7402	7706
7403	7707	cVector xlate = new cVector();
7404	7708	//cVector xlate2 = new cVector();
..	..	@@ -7432,8 +7736,8 @@
7432	7736	toParent[3][i] = xlate.get(i);
7433	7737	LA.matInvert(toParent, fromParent);
7434	7738	*/
7435		- cVector delta = LA.newVector(0, 0, startY - info.y);
7436		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7739	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7740	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7437	7741
7438	7742	LA.matCopy(startMat, toParent);
7439	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7442,7 +7746,7 @@
7442	7746	} else
7443	7747	{
7444	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7445		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7446	7750	cVector away = new cVector();
7447	7751	//cVector right2 = new cVector();
7448	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7459,19 +7763,19 @@
7459	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7460	7764	// if (!CameraPane.LOCALTRANSFORM)
7461	7765	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7462		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7463	7767	// if (!CameraPane.LOCALTRANSFORM)
7464	7768	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7465	7769	//LA.vecCross(up, cVector.Z, right2);
7466	7770
7467		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7468	7772
7469	7773	//System.out.println("DELTA0 = " + delta);
7470	7774	//System.out.println("AWAY = " + info.camera.away);
7471	7775	//System.out.println("UP = " + info.camera.up);
7472	7776	if (away.z > 0)
7473	7777	{
7474		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7475	7779	{
7476	7780	delta.x = -delta.x;
7477	7781	} else
..	..	@@ -7486,7 +7790,7 @@
7486	7790	//System.out.println("DELTA1 = " + delta);
7487	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7488	7792	//System.out.println("DELTA2 = " + delta);
7489		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7490	7794	LA.matCopy(startMat, toParent);
7491	7795	//System.out.println("DELTA3 = " + delta);
7492	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7496,8 +7800,8 @@
7496	7800	break;
7497	7801
7498	7802	case hitRotate: // rotate
7499		- int dx = info.x - centerPt.x;
7500		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7501	7805	double angle = (double) Math.atan2(dx, dy);
7502	7806	angle = -(1.570796 - angle);
7503	7807
..	..	@@ -7520,7 +7824,7 @@
7520	7824	}
7521	7825	/**/
7522	7826
7523		- switch (info.pane.RenderCamera().viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7524	7828	{
7525	7829	case 1: // '\001'
7526	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7547,7 +7851,7 @@
7547	7851	break;
7548	7852
7549	7853	case hitScale: // scale
7550		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7551	7855	double sign = 1;
7552	7856	if (hScale < 0)
7553	7857	{
..	..	@@ -7559,7 +7863,7 @@
7559	7863	//hScale = 0.01;
7560	7864	}
7561	7865
7562		- double vScale = (double) (info.y - centerPt.y) / 32;
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7563	7867	sign = 1;
7564	7868	if (vScale < 0)
7565	7869	{
..	..	@@ -7570,6 +7874,7 @@
7570	7874	{
7571	7875	//vScale = 0.01;
7572	7876	}
	7877	+
7573	7878	LA.matCopy(startMat, toParent);
7574	7879	/**/
7575	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7579,33 +7884,39 @@
7579	7884	}
7580	7885	/**/
7581	7886
7582		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7583	7888
7584	7889	if (totalScale < 0.01)
7585	7890	{
7586	7891	totalScale = 0.01;
7587	7892	}
7588	7893
7589		- switch (info.pane.RenderCamera().viewCode)
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7590	7895	{
7591	7896	case 3: // '\001'
7592	7897	if (modified \|\| opposite)
7593	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7594	7902	//LA.matScale(toParent, 1, hScale, vScale);
7595		- LA.matScale(toParent, totalScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7596	7904	} // vScale, 1);
7597	7905	else
7598	7906	{
7599	7907	// EXCEPTION!
7600		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7601	7909	} // vScale, 1);
7602	7910	break;
7603	7911
7604	7912	case 2: // '\002'
7605	7913	if (modified \|\| opposite)
7606	7914	{
7607		- //LA.matScale(toParent, hScale, 1, vScale);
7608		- LA.matScale(toParent, 1, totalScale, 1);
	7915	+ if (modified && opposite)
	7916	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7917	+ else
	7918	+ //LA.matScale(toParent, hScale, 1, vScale);
	7919	+ LA.matScale(toParent, 1, totalScale, 1);
7609	7920	} else
7610	7921	{
7611	7922	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7615,8 +7926,11 @@
7615	7926	case 1: // '\003'
7616	7927	if (modified \|\| opposite)
7617	7928	{
7618		- //LA.matScale(toParent, hScale, vScale, 1);
7619		- LA.matScale(toParent, 1, 1, totalScale);
	7929	+ if (modified && opposite)
	7930	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7931	+ else
	7932	+ //LA.matScale(toParent, hScale, vScale, 1);
	7933	+ LA.matScale(toParent, 1, 1, totalScale);
7620	7934	} else
7621	7935	{
7622	7936	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7653,7 +7967,7 @@
7653	7967	} // NEW ...
7654	7968
7655	7969
7656		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7657	7971	}
7658	7972
7659	7973	boolean overflow = false;