~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,11 +30,29 @@
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
	43	+ int VersionCount()
	44	+ {
	45	+ int count = 0;
	46	+
	47	+ for (int i = versionlist.length; --i >= 0;)
	48	+ {
	49	+ if (versionlist[i] != null)
	50	+ count++;
	51	+ }
	52	+
	53	+ return count;
	54	+ }
	55	+
37	56	void InitOthers()
38	57	{
39	58	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -219,7 +238,7 @@
219	238	// o.bRep.support = null;
220	239	// }
221	240	o.selection = this.selection;
222		- o.versions = this.versions;
	241	+ o.versionlist = this.versionlist;
223	242	o.versionindex = this.versionindex;
224	243
225	244	if (this.support != null)
..	..	@@ -241,6 +260,73 @@
241	260	// this.bRep.support = null;
242	261	// this.support = null;
243	262	// this.fileparent = null;
	263	+ }
	264	+
	265	+// Object3D GetObject(java.util.UUID uuid)
	266	+// {
	267	+// if (this.uuid.equals(uuid))
	268	+// return this;
	269	+//
	270	+// if (blockloop)
	271	+// return null;
	272	+//
	273	+// blockloop = true;
	274	+//
	275	+// for (int i=0; i<Size(); i++)
	276	+// {
	277	+// Object3D o = get(i).GetObject(uuid);
	278	+//
	279	+// if (o != null)
	280	+// return o;
	281	+// }
	282	+//
	283	+// blockloop = false;
	284	+//
	285	+// return null;
	286	+// }
	287	+
	288	+ transient boolean tag;
	289	+
	290	+ void TagObjects(Object3D o, boolean tag)
	291	+ {
	292	+ if (blockloop)
	293	+ return;
	294	+
	295	+ o.tag = tag;
	296	+
	297	+ if (o == this)
	298	+ return;
	299	+
	300	+ blockloop = true;
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
	307	+ blockloop = false;
	308	+ }
	309	+
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
	314	+
	315	+ blockloop = true;
	316	+
	317	+ boolean hasTags = false;
	318	+
	319	+ for (int i=0; i<Size(); i++)
	320	+ {
	321	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	322	+
	323	+ if (hasTags)
	324	+ break;
	325	+ }
	326	+
	327	+ blockloop = false;
	328	+
	329	+ return hasTags;
244	330	}
245	331
246	332	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
..	..	@@ -277,7 +363,7 @@
277	363
278	364	this.selection = o.selection;
279	365
280		- this.versions = o.versions;
	366	+ this.versionlist = o.versionlist;
281	367	this.versionindex = o.versionindex;
282	368	// July 2019 if (this.bRep != null)
283	369	// this.bRep.support = o.transientrep;
..	..	@@ -495,11 +581,11 @@
495	581	}
496	582	}
497	583
498		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
499	585
500	586	int MemorySize()
501	587	{
502		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
503	589	{
504	590	try
505	591	{
..	..	@@ -614,7 +700,7 @@
614	700	{
615	701	if (maxcount != 1)
616	702	{
617		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
618	704	}
619	705
620	706	toParentMarked = LA.newMatrix();
..	..	@@ -1011,6 +1097,9 @@
1011	1097
1012	1098	if (material == null \|\| material.multiply)
1013	1099	return true;
	1100	+
	1101	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1102	+ return false;
1014	1103
1015	1104	// Transparent objects are dynamic because we have to sort the triangles.
1016	1105	return material.opacity > 0.99;
..	..	@@ -2293,11 +2382,6 @@
2293	2382
2294	2383	InitOthers();
2295	2384
2296		- if (this instanceof Camera)
2297		- {
2298		- material.shift = 90;
2299		- }
2300		-
2301	2385	material.multiply = multiply;
2302	2386
2303	2387	if (multiply)
..	..	@@ -2438,6 +2522,11 @@
2438	2522	else
2439	2523	{
2440	2524	//((ObjEditor)editWindow).SetupUI2(null);
	2525	+ if (objectUI != null)
	2526	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2527	+ else
	2528	+ //new Exception().printStackTrace();
	2529	+ System.err.println("objectUI is null");
2441	2530	}
2442	2531	}
2443	2532
..	..	@@ -2567,7 +2656,8 @@
2567	2656	private static final int editSelf = 1;
2568	2657	private static final int editChild = 2;
2569	2658
2570		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2571	2661	{
2572	2662	if (level == 0)
2573	2663	{
..	..	@@ -2575,7 +2665,8 @@
2575	2665	return;
2576	2666
2577	2667	Object3D selectee;
2578		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2668	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2669	+ level + 1))
2579	2670	{
2580	2671	selectee = (Object3D) e.nextElement();
2581	2672	}
..	..	@@ -2583,19 +2674,22 @@
2583	2674	} else
2584	2675	{
2585	2676	//super.
2586		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2587	2679	}
2588	2680	}
2589	2681
2590		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2591	2684	{
2592	2685	doSomething = 0;
2593	2686	if (level == 0)
2594	2687	{
2595		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2596	2689	}
2597	2690	if (//super.
2598		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2599	2693	{
2600	2694	doSomething = 1;
2601	2695	return true;
..	..	@@ -2605,7 +2699,7 @@
2605	2699	}
2606	2700	}
2607	2701
2608		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2609	2703	{
2610	2704	if (selection == null)
2611	2705	{
..	..	@@ -2618,7 +2712,8 @@
2618	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2619	2713	{
2620	2714	Object3D selectee = (Object3D) e.nextElement();
2621		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2622	2717	{
2623	2718	childToDrag = selectee;
2624	2719	doSomething = 2;
..	..	@@ -2630,13 +2725,15 @@
2630	2725	return retval;
2631	2726	}
2632	2727
2633		- void doEditDrag(ClickInfo info, boolean opposite)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2634	2730	{
2635	2731	switch (doSomething)
2636	2732	{
2637	2733	case 1: // '\001'
2638	2734	//super.
2639		- doEditDrag0(info, opposite);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2640	2737	break;
2641	2738
2642	2739	case 2: // '\002'
..	..	@@ -2649,11 +2746,13 @@
2649	2746	{
2650	2747	//sel.hitSomething = childToDrag.hitSomething;
2651	2748	//childToDrag.doEditDrag(info);
2652		- sel.doEditDrag(info, opposite);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2653	2751	} else
2654	2752	{
2655	2753	//super.
2656		- doEditDrag0(info, opposite);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2657	2756	}
2658	2757	}
2659	2758	break;
..	..	@@ -2671,6 +2770,9 @@
2671	2770	{
2672	2771	deselectAll();
2673	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2674	2776	ClickInfo newInfo = new ClickInfo();
2675	2777	newInfo.flags = info.flags;
2676	2778	newInfo.bounds = info.bounds;
..	..	@@ -3175,6 +3277,93 @@
3175	3277	blockloop = false;
3176	3278	}
3177	3279
	3280	+ public void ResetTransform(int mask)
	3281	+ {
	3282	+ Object3D obj = this;
	3283	+
	3284	+ if (mask == -1)
	3285	+ {
	3286	+ if (obj instanceof Camera) // jan 2014
	3287	+ {
	3288	+ LA.matIdentity(obj.toParent);
	3289	+ LA.matIdentity(obj.fromParent);
	3290	+ }
	3291	+ else
	3292	+ {
	3293	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3294	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3295	+ }
	3296	+ return;
	3297	+ }
	3298	+
	3299	+ if ((mask&2) != 0) // Scale/rotation
	3300	+ {
	3301	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3302	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3303	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3304	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3305	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3306	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3307	+ }
	3308	+ if ((mask&1) != 0) // Translation
	3309	+ {
	3310	+ if (obj.toParent != null)
	3311	+ {
	3312	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3313	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3314	+ }
	3315	+ }
	3316	+ }
	3317	+
	3318	+ public void TextureRatioTransform(int axis)
	3319	+ {
	3320	+ cTexture tex = GetTextures();
	3321	+
	3322	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3323	+
	3324	+ try
	3325	+ {
	3326	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3327	+ }
	3328	+ catch (Exception e)
	3329	+ {
	3330	+ System.err.println("FAIL TextureRatio: " + this);
	3331	+ }
	3332	+
	3333	+ LA.matIdentity(Object3D.mat);
	3334	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3335	+
	3336	+ if (toParent == null)
	3337	+ {
	3338	+ toParent = LA.newMatrix();
	3339	+ fromParent = LA.newMatrix();
	3340	+ }
	3341	+
	3342	+ ResetTransform(2);
	3343	+
	3344	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3345	+ LA.matInvert(fromParent, toParent);
	3346	+ }
	3347	+
	3348	+ void TextureRatio(int axis)
	3349	+ {
	3350	+ if (blockloop)
	3351	+ return;
	3352	+
	3353	+ blockloop = true;
	3354	+
	3355	+ TextureRatioTransform(axis);
	3356	+
	3357	+ for (int i=Size(); --i>=0;)
	3358	+ {
	3359	+ Object3D v = get(i);
	3360	+
	3361	+ v.TextureRatio(axis);
	3362	+ }
	3363	+
	3364	+ blockloop = false;
	3365	+ }
	3366	+
3178	3367	void TransformChildren()
3179	3368	{
3180	3369	if (toParent != null)
..	..	@@ -3528,15 +3717,47 @@
3528	3717
3529	3718	void ClearMaterials()
3530	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3531	3725	ClearMaterial();
3532		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3533	3727	{
3534		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3535	3729	if (child == null)
3536	3730	continue;
3537	3731	child.ClearMaterials();
3538		- release(i);
3539	3732	}
	3733	+
	3734	+ blockloop = false;
	3735	+ }
	3736	+
	3737	+ void ClearVersionList()
	3738	+ {
	3739	+ this.versionlist = null;
	3740	+ this.versionindex = -1;
	3741	+ this.versiontable = null;
	3742	+ }
	3743	+
	3744	+ void ClearVersions()
	3745	+ {
	3746	+ if (blockloop)
	3747	+ return;
	3748	+
	3749	+ blockloop = true;
	3750	+
	3751	+ ClearVersionList();
	3752	+ for (int i = 0; i < Size(); i++)
	3753	+ {
	3754	+ Object3D child = (Object3D) get(i);
	3755	+ if (child == null)
	3756	+ continue;
	3757	+ child.ClearVersions();
	3758	+ }
	3759	+
	3760	+ blockloop = false;
3540	3761	}
3541	3762
3542	3763	void FlipV(boolean flip)
..	..	@@ -5526,6 +5747,11 @@
5526	5747	if (fullname == null)
5527	5748	return "";
5528	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5529	5755	// System.out.println("Fullname = " + fullname);
5530	5756
5531	5757	// Does not work on Windows due to C:
..	..	@@ -5538,7 +5764,7 @@
5538	5764
5539	5765	if (split.length == 0)
5540	5766	{
5541		- return "";
	5767	+ return fullname.pigment = "";
5542	5768	}
5543	5769
5544	5770	if (split.length <= 2)
..	..	@@ -5546,22 +5772,27 @@
5546	5772	if (fullname.name.endsWith(":"))
5547	5773	{
5548	5774	// Windows
5549		- return fullname.name.substring(0, fullname.name.length()-1);
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5550	5776	}
5551	5777
5552		- return split[0];
	5778	+ return fullname.pigment = split[0];
5553	5779	}
5554	5780
5555	5781	// Windows
5556	5782	assert(split.length == 4);
5557	5783
5558		- return split[0] + ":" + split[1];
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5559	5785	}
5560	5786
5561	5787	static String GetBump(cTexture fullname)
5562	5788	{
5563	5789	if (fullname == null)
5564	5790	return "";
	5791	+
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
5565	5796
5566	5797	// System.out.println("Fullname = " + fullname);
5567	5798	// Does not work on Windows due to C:
..	..	@@ -5573,12 +5804,12 @@
5573	5804
5574	5805	if (split.length == 0)
5575	5806	{
5576		- return "";
	5807	+ return fullname.bump = "";
5577	5808	}
5578	5809
5579	5810	if (split.length == 1)
5580	5811	{
5581		- return "";
	5812	+ return fullname.bump = "";
5582	5813	}
5583	5814
5584	5815	if (split.length == 2)
..	..	@@ -5586,16 +5817,16 @@
5586	5817	if (fullname.name.endsWith(":"))
5587	5818	{
5588	5819	// Windows
5589		- return "";
	5820	+ return fullname.bump = "";
5590	5821	}
5591	5822
5592		- return split[1];
	5823	+ return fullname.bump = split[1];
5593	5824	}
5594	5825
5595	5826	// Windows
5596	5827	assert(split.length == 4);
5597	5828
5598		- return split[2] + ":" + split[3];
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5599	5830	}
5600	5831
5601	5832	String GetPigmentTexture()
..	..	@@ -5678,6 +5909,9 @@
5678	5909	texname = "";
5679	5910
5680	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5681	5915	Touch();
5682	5916	}
5683	5917
..	..	@@ -5751,6 +5985,8 @@
5751	5985
5752	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5753	5987
	5988	+ GetTextures().bump = null;
	5989	+
5754	5990	Touch();
5755	5991	}
5756	5992
..	..	@@ -5771,6 +6007,38 @@
5771	6007
5772	6008	blockloop = true;
5773	6009	child.ResetBumpTexture();
	6010	+ blockloop = false;
	6011	+ }
	6012	+ }
	6013	+
	6014	+ void EmbedTextures(boolean embed)
	6015	+ {
	6016	+ if (blockloop)
	6017	+ return;
	6018	+
	6019	+ //if (GetTextures() != null)
	6020	+ if (embed)
	6021	+ CameraPane.EmbedTextures(GetTextures());
	6022	+ else
	6023	+ {
	6024	+ GetTextures().pigmentdata = null;
	6025	+ GetTextures().bumpdata = null;
	6026	+ GetTextures().pw = 0;
	6027	+ GetTextures().ph = 0;
	6028	+ GetTextures().bw = 0;
	6029	+ GetTextures().bh = 0;
	6030	+ }
	6031	+
	6032	+ int nb = Size();
	6033	+ for (int i = 0; i < nb; i++)
	6034	+ {
	6035	+ Object3D child = (Object3D) get(i);
	6036	+
	6037	+ if (child == null)
	6038	+ continue;
	6039	+
	6040	+ blockloop = true;
	6041	+ child.EmbedTextures(embed);
5774	6042	blockloop = false;
5775	6043	}
5776	6044	}
..	..	@@ -5799,6 +6067,11 @@
5799	6067	return false;
5800	6068
5801	6069	return parent.IsLive();
	6070	+ }
	6071	+
	6072	+ boolean IsDynamic()
	6073	+ {
	6074	+ return live && bRep != null;
5802	6075	}
5803	6076
5804	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
..	..	@@ -5861,8 +6134,11 @@
5861	6134	if (support != null)
5862	6135	support = support;
5863	6136
5864		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5865		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6137	+ boolean usecalllists = !IsDynamic() &&
	6138	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6139	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6140	+
	6141	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5866	6142
5867	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5868	6144	{
..	..	@@ -5872,8 +6148,9 @@
5872	6148	// usecalllists &= !(parent instanceof RandomNode);
5873	6149	// usecalllists = false;
5874	6150
5875		- if (GetBRep() != null)
5876		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5877	6154	//System.out.println("draw " + this);
5878	6155	//new Exception().printStackTrace();
5879	6156
..	..	@@ -5895,7 +6172,7 @@
5895	6172	if (!(this instanceof Composite))
5896	6173	touched = false;
5897	6174	//if (displaylist == -1 && usecalllists)
5898		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5899	6176	{
5900	6177	bRep.displaylist = display.GenList();
5901	6178	assert(bRep.displaylist != 0);
..	..	@@ -5906,7 +6183,7 @@
5906	6183
5907	6184	//System.out.println("\tnew list " + list);
5908	6185	//gl.glDrawBuffer(gl.GL_NONE);
5909		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5910	6187	{
5911	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5912	6189	display.NewList(bRep.displaylist);
..	..	@@ -5915,7 +6192,7 @@
5915	6192	CallList(display, root, selected, blocked);
5916	6193
5917	6194	// compiled = true;
5918		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5919	6196	{
5920	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5921	6198	display.EndList();
..	..	@@ -7266,20 +7543,23 @@
7266	7543	}
7267	7544	}
7268	7545
7269		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7546	+ static ClickInfo clickInfo = new ClickInfo();
	7547	+
	7548	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7549	+ Point outPt, Rectangle outRec)
7270	7550	{
7271		- int hc = info.bounds.x + info.bounds.width / 2;
7272		- int vc = info.bounds.y + info.bounds.height / 2;
7273		- double[][] toscreen = info.toScreen;
	7551	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7552	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7553	+ double[][] toscreen = clickInfo.toScreen;
7274	7554	if (toscreen == null)
7275	7555	{
7276		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7277	7557	}
7278	7558	cVector vec = in;
7279	7559	LA.xformPos(in, toscreen, in);
7280	7560	//System.out.println("Distance = " + info.camera.Distance());
7281		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7282		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7561	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7562	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7283	7563	outPt.x = hc + (int) vec.x;
7284	7564	outPt.y = vc - (int) vec.y;
7285	7565	outRec.x = outPt.x - 3;
..	..	@@ -7287,15 +7567,18 @@
7287	7567	outRec.width = outRec.height = 6;
7288	7568	}
7289	7569
7290		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
7291	7572	{
7292	7573	Point pt = new Point(0, 0);
7293	7574	Rectangle rec = new Rectangle();
7294		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
7295	7577	return rec;
7296	7578	}
7297	7579
7298		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
7299	7582	{
7300	7583	if (level == 0)
7301	7584	{
..	..	@@ -7304,16 +7587,19 @@
7304	7587	{
7305	7588	cVector origin = new cVector();
7306	7589	//LA.xformPos(origin, toParent, origin);
7307		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7308	7594	Rectangle boundary = new Rectangle();
7309	7595	boundary.x = spot.x - 30;
7310	7596	boundary.y = spot.y - 30;
7311	7597	boundary.width = spot.width + 60;
7312	7598	boundary.height = spot.height + 60;
7313		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
7314	7600	int spotw = spot.x + spot.width;
7315	7601	int spoth = spot.y + spot.height;
7316		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7317	7603	// if (CameraPane.Xmin > spot.x)
7318	7604	// {
7319	7605	// CameraPane.Xmin = spot.x;
..	..	@@ -7330,11 +7616,6 @@
7330	7616	// {
7331	7617	// CameraPane.Ymax = spoth;
7332	7618	// }
7333		- spot.translate(32, 32);
7334		- spotw = spot.x + spot.width;
7335		- spoth = spot.y + spot.height;
7336		- info.g.setColor(Color.cyan);
7337		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7338	7619	// if (CameraPane.Xmin > spot.x)
7339	7620	// {
7340	7621	// CameraPane.Xmin = spot.x;
..	..	@@ -7353,10 +7634,15 @@
7353	7634	// }
7354	7635	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7355	7636	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7356		- spot.translate(0, -32);
7357		- info.g.setColor(Color.yellow);
7358		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7359		- info.g.setColor(Color.green);
	7637	+ spot.translate(32, 0);
	7638	+ clickInfo.g.setColor(Color.yellow);
	7639	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7640	+
	7641	+ spot.translate(32, 64);
	7642	+ spotw = spot.x + spot.width;
	7643	+ spoth = spot.y + spot.height;
	7644	+ clickInfo.g.setColor(Color.cyan);
	7645	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7360	7646	// if (CameraPane.Xmin > spot.x)
7361	7647	// {
7362	7648	// CameraPane.Xmin = spot.x;
..	..	@@ -7373,8 +7659,9 @@
7373	7659	// {
7374	7660	// CameraPane.Ymax = spoth;
7375	7661	// }
7376		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7377		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
	7662	+ clickInfo.g.setColor(Color.green);
	7663	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7664	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7378	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7379	7666	// if (CameraPane.Xmin > boundary.x)
7380	7667	// {
..	..	@@ -7396,7 +7683,8 @@
7396	7683	}
7397	7684	}
7398	7685
7399		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
7400	7688	{
7401	7689	if (level == 0)
7402	7690	{
..	..	@@ -7405,8 +7693,8 @@
7405	7693
7406	7694	boolean retval = false;
7407	7695
7408		- startX = info.x;
7409		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7410	7698
7411	7699	hitSomething = -1;
7412	7700	cVector origin = new cVector();
..	..	@@ -7416,22 +7704,53 @@
7416	7704	{
7417	7705	centerPt = new Point(0, 0);
7418	7706	}
7419		- calcHotSpot(origin, info, centerPt, spot);
7420		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7421	7710	{
7422	7711	hitSomething = hitCenter;
7423	7712	retval = true;
7424	7713	}
7425	7714	spot.translate(32, 0);
7426		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7427	7716	{
7428	7717	hitSomething = hitRotate;
7429	7718	retval = true;
7430	7719	}
7431	7720	spot.translate(0, 32);
7432		- if (spot.contains(info.x, info.y))
	7721	+ spot.translate(32, 0);
	7722	+ spot.translate(0, 32);
	7723	+ if (spot.contains(clickInfo.x, clickInfo.y))
7433	7724	{
7434	7725	hitSomething = hitScale;
	7726	+
	7727	+ double scale = 0.005f * clickInfo.camera.Distance();
	7728	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7729	+ double sign = 1;
	7730	+ if (hScale < 0)
	7731	+ {
	7732	+ sign = -1;
	7733	+ }
	7734	+ hScale = signMath.pow(signhScale, scale * 50);
	7735	+ if (hScale < 0.01)
	7736	+ {
	7737	+ //hScale = 0.01;
	7738	+ }
	7739	+
	7740	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7741	+ sign = 1;
	7742	+ if (vScale < 0)
	7743	+ {
	7744	+ sign = -1;
	7745	+ }
	7746	+ vScale = signMath.pow(signvScale, scale * 50);
	7747	+ if (vScale < 0.01)
	7748	+ {
	7749	+ //vScale = 0.01;
	7750	+ }
	7751	+
	7752	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7753	+
7435	7754	retval = true;
7436	7755	}
7437	7756
..	..	@@ -7441,7 +7760,7 @@
7441	7760	}
7442	7761
7443	7762	//System.out.println("info.modifiers = " + info.modifiers);
7444		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7445	7764	//System.out.println("modified = " + modified);
7446	7765	//new Exception().printStackTrace();
7447	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7469,7 +7788,8 @@
7469	7788	return true;
7470	7789	}
7471	7790
7472		- void doEditDrag0(ClickInfo info, boolean opposite)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7473	7793	{
7474	7794	if (hitSomething == 0)
7475	7795	{
..	..	@@ -7483,7 +7803,7 @@
7483	7803
7484	7804	//System.out.println("hitSomething = " + hitSomething);
7485	7805
7486		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
7487	7807
7488	7808	cVector xlate = new cVector();
7489	7809	//cVector xlate2 = new cVector();
..	..	@@ -7497,7 +7817,9 @@
7497	7817
7498	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7499	7819
7500		- if (modified \|\| opposite)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7501	7823	{
7502	7824	//assert(false);
7503	7825	/*
..	..	@@ -7517,8 +7839,8 @@
7517	7839	toParent[3][i] = xlate.get(i);
7518	7840	LA.matInvert(toParent, fromParent);
7519	7841	*/
7520		- cVector delta = LA.newVector(0, 0, startY - info.y);
7521		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7842	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7843	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7522	7844
7523	7845	LA.matCopy(startMat, toParent);
7524	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7527,7 +7849,7 @@
7527	7849	} else
7528	7850	{
7529	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7530		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7531	7853	cVector away = new cVector();
7532	7854	//cVector right2 = new cVector();
7533	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7544,19 +7866,19 @@
7544	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7545	7867	// if (!CameraPane.LOCALTRANSFORM)
7546	7868	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7547		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7548	7870	// if (!CameraPane.LOCALTRANSFORM)
7549	7871	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7550	7872	//LA.vecCross(up, cVector.Z, right2);
7551	7873
7552		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7553	7875
7554	7876	//System.out.println("DELTA0 = " + delta);
7555	7877	//System.out.println("AWAY = " + info.camera.away);
7556	7878	//System.out.println("UP = " + info.camera.up);
7557	7879	if (away.z > 0)
7558	7880	{
7559		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7560	7882	{
7561	7883	delta.x = -delta.x;
7562	7884	} else
..	..	@@ -7571,7 +7893,7 @@
7571	7893	//System.out.println("DELTA1 = " + delta);
7572	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7573	7895	//System.out.println("DELTA2 = " + delta);
7574		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7575	7897	LA.matCopy(startMat, toParent);
7576	7898	//System.out.println("DELTA3 = " + delta);
7577	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7581,8 +7903,8 @@
7581	7903	break;
7582	7904
7583	7905	case hitRotate: // rotate
7584		- int dx = info.x - centerPt.x;
7585		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7586	7908	double angle = (double) Math.atan2(dx, dy);
7587	7909	angle = -(1.570796 - angle);
7588	7910
..	..	@@ -7591,7 +7913,7 @@
7591	7913
7592	7914	if (modified)
7593	7915	{
7594		- // Rotate 90 degrees
	7916	+ // Rotate 45 degrees
7595	7917	angle /= (Math.PI / 4);
7596	7918	angle = Math.floor(angle + 0.5);
7597	7919	angle *= (Math.PI / 4);
..	..	@@ -7605,7 +7927,7 @@
7605	7927	}
7606	7928	/**/
7607	7929
7608		- switch (info.pane.RenderCamera().viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7609	7931	{
7610	7932	case 1: // '\001'
7611	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7632,7 +7954,7 @@
7632	7954	break;
7633	7955
7634	7956	case hitScale: // scale
7635		- double hScale = (double) (info.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7636	7958	double sign = 1;
7637	7959	if (hScale < 0)
7638	7960	{
..	..	@@ -7644,7 +7966,7 @@
7644	7966	//hScale = 0.01;
7645	7967	}
7646	7968
7647		- double vScale = (double) (info.y - centerPt.y) / 32;
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7648	7970	sign = 1;
7649	7971	if (vScale < 0)
7650	7972	{
..	..	@@ -7655,6 +7977,7 @@
7655	7977	{
7656	7978	//vScale = 0.01;
7657	7979	}
	7980	+
7658	7981	LA.matCopy(startMat, toParent);
7659	7982	/**/
7660	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7664,33 +7987,39 @@
7664	7987	}
7665	7988	/**/
7666	7989
7667		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7990	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7668	7991
7669	7992	if (totalScale < 0.01)
7670	7993	{
7671	7994	totalScale = 0.01;
7672	7995	}
7673	7996
7674		- switch (info.pane.RenderCamera().viewCode)
	7997	+ switch (clickInfo.pane.RenderCamera().viewCode)
7675	7998	{
7676	7999	case 3: // '\001'
7677	8000	if (modified \|\| opposite)
7678	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7679	8005	//LA.matScale(toParent, 1, hScale, vScale);
7680		- LA.matScale(toParent, totalScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7681	8007	} // vScale, 1);
7682	8008	else
7683	8009	{
7684	8010	// EXCEPTION!
7685		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7686	8012	} // vScale, 1);
7687	8013	break;
7688	8014
7689	8015	case 2: // '\002'
7690	8016	if (modified \|\| opposite)
7691	8017	{
7692		- //LA.matScale(toParent, hScale, 1, vScale);
7693		- LA.matScale(toParent, 1, totalScale, 1);
	8018	+ if (modified) // && opposite)
	8019	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8020	+ else
	8021	+ //LA.matScale(toParent, hScale, 1, vScale);
	8022	+ LA.matScale(toParent, 1, totalScale, 1);
7694	8023	} else
7695	8024	{
7696	8025	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7700,8 +8029,11 @@
7700	8029	case 1: // '\003'
7701	8030	if (modified \|\| opposite)
7702	8031	{
7703		- //LA.matScale(toParent, hScale, vScale, 1);
7704		- LA.matScale(toParent, 1, 1, totalScale);
	8032	+ if (modified) // && opposite)
	8033	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8034	+ else
	8035	+ //LA.matScale(toParent, hScale, vScale, 1);
	8036	+ LA.matScale(toParent, 1, 1, totalScale);
7705	8037	} else
7706	8038	{
7707	8039	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7738,7 +8070,7 @@
7738	8070	} // NEW ...
7739	8071
7740	8072
7741		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7742	8074	}
7743	8075
7744	8076	boolean overflow = false;
..	..	@@ -7849,10 +8181,10 @@
7849	8181	} // + super.toString();
7850	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7851	8183
7852		- if (!Globals.ADVANCED)
7853		- return objname;
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
7854	8186
7855		- return objname + " " + System.identityHashCode(this);
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7856	8188	}
7857	8189
7858	8190	public int hashCode()