~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[] = 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
	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;
..	..	@@ -426,6 +512,7 @@
426	512	}
427	513
428	514	boolean live = false;
	515	+ transient boolean keepdontselect;
429	516	boolean dontselect = false;
430	517	boolean hide = false;
431	518	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -494,11 +581,11 @@
494	581	}
495	582	}
496	583
497		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
498	585
499	586	int MemorySize()
500	587	{
501		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
502	589	{
503	590	try
504	591	{
..	..	@@ -613,7 +700,7 @@
613	700	{
614	701	if (maxcount != 1)
615	702	{
616		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
617	704	}
618	705
619	706	toParentMarked = LA.newMatrix();
..	..	@@ -1010,6 +1097,9 @@
1010	1097
1011	1098	if (material == null \|\| material.multiply)
1012	1099	return true;
	1100	+
	1101	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1102	+ return false;
1013	1103
1014	1104	// Transparent objects are dynamic because we have to sort the triangles.
1015	1105	return material.opacity > 0.99;
..	..	@@ -2292,11 +2382,6 @@
2292	2382
2293	2383	InitOthers();
2294	2384
2295		- if (this instanceof Camera)
2296		- {
2297		- material.shift = 90;
2298		- }
2299		-
2300	2385	material.multiply = multiply;
2301	2386
2302	2387	if (multiply)
..	..	@@ -2437,6 +2522,11 @@
2437	2522	else
2438	2523	{
2439	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");
2440	2530	}
2441	2531	}
2442	2532
..	..	@@ -2566,7 +2656,8 @@
2566	2656	private static final int editSelf = 1;
2567	2657	private static final int editChild = 2;
2568	2658
2569		- void drawEditHandles(ClickInfo info, int level)
	2659	+ void drawEditHandles(//ClickInfo info,
	2660	+ int level)
2570	2661	{
2571	2662	if (level == 0)
2572	2663	{
..	..	@@ -2574,7 +2665,8 @@
2574	2665	return;
2575	2666
2576	2667	Object3D selectee;
2577		- 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))
2578	2670	{
2579	2671	selectee = (Object3D) e.nextElement();
2580	2672	}
..	..	@@ -2582,19 +2674,22 @@
2582	2674	} else
2583	2675	{
2584	2676	//super.
2585		- drawEditHandles0(info, level + 1);
	2677	+ drawEditHandles0(//info,
	2678	+ level + 1);
2586	2679	}
2587	2680	}
2588	2681
2589		- boolean doEditClick(ClickInfo info, int level)
	2682	+ boolean doEditClick(//ClickInfo info,
	2683	+ int level)
2590	2684	{
2591	2685	doSomething = 0;
2592	2686	if (level == 0)
2593	2687	{
2594		- return doParentClick(info);
	2688	+ return doParentClick(); //info);
2595	2689	}
2596	2690	if (//super.
2597		- doEditClick0(info, level))
	2691	+ doEditClick0(//info,
	2692	+ level))
2598	2693	{
2599	2694	doSomething = 1;
2600	2695	return true;
..	..	@@ -2604,7 +2699,7 @@
2604	2699	}
2605	2700	}
2606	2701
2607		- boolean doParentClick(ClickInfo info)
	2702	+ boolean doParentClick() //ClickInfo info)
2608	2703	{
2609	2704	if (selection == null)
2610	2705	{
..	..	@@ -2617,7 +2712,8 @@
2617	2712	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2618	2713	{
2619	2714	Object3D selectee = (Object3D) e.nextElement();
2620		- if (selectee.doEditClick(info, 1))
	2715	+ if (selectee.doEditClick(//info,
	2716	+ 1))
2621	2717	{
2622	2718	childToDrag = selectee;
2623	2719	doSomething = 2;
..	..	@@ -2629,13 +2725,15 @@
2629	2725	return retval;
2630	2726	}
2631	2727
2632		- void doEditDrag(ClickInfo info, boolean opposite)
	2728	+ void doEditDrag(//ClickInfo clickInfo,
	2729	+ boolean opposite)
2633	2730	{
2634	2731	switch (doSomething)
2635	2732	{
2636	2733	case 1: // '\001'
2637	2734	//super.
2638		- doEditDrag0(info, opposite);
	2735	+ doEditDrag0(//clickInfo,
	2736	+ opposite);
2639	2737	break;
2640	2738
2641	2739	case 2: // '\002'
..	..	@@ -2648,11 +2746,13 @@
2648	2746	{
2649	2747	//sel.hitSomething = childToDrag.hitSomething;
2650	2748	//childToDrag.doEditDrag(info);
2651		- sel.doEditDrag(info, opposite);
	2749	+ sel.doEditDrag(//clickInfo,
	2750	+ opposite);
2652	2751	} else
2653	2752	{
2654	2753	//super.
2655		- doEditDrag0(info, opposite);
	2754	+ doEditDrag0(//clickInfo,
	2755	+ opposite);
2656	2756	}
2657	2757	}
2658	2758	break;
..	..	@@ -2670,6 +2770,9 @@
2670	2770	{
2671	2771	deselectAll();
2672	2772	}
	2773	+
	2774	+ new Exception().printStackTrace();
	2775	+
2673	2776	ClickInfo newInfo = new ClickInfo();
2674	2777	newInfo.flags = info.flags;
2675	2778	newInfo.bounds = info.bounds;
..	..	@@ -3117,7 +3220,7 @@
3117	3220	{
3118	3221	if (bRep != null)
3119	3222	{
3120		- bRep.GenerateNormalsMINE();
	3223	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3121	3224	Touch();
3122	3225	}
3123	3226	}
..	..	@@ -3174,6 +3277,93 @@
3174	3277	blockloop = false;
3175	3278	}
3176	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	+
3177	3367	void TransformChildren()
3178	3368	{
3179	3369	if (toParent != null)
..	..	@@ -3527,15 +3717,47 @@
3527	3717
3528	3718	void ClearMaterials()
3529	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3530	3725	ClearMaterial();
3531		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3532	3727	{
3533		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3534	3729	if (child == null)
3535	3730	continue;
3536	3731	child.ClearMaterials();
3537		- release(i);
3538	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;
3539	3761	}
3540	3762
3541	3763	void FlipV(boolean flip)
..	..	@@ -5420,6 +5642,51 @@
5420	5642	blockloop = false;
5421	5643	}
5422	5644
	5645	+ void ResetSelectable()
	5646	+ {
	5647	+ if (blockloop)
	5648	+ return;
	5649	+
	5650	+ blockloop = true;
	5651	+
	5652	+ keepdontselect = dontselect;
	5653	+ dontselect = true;
	5654	+
	5655	+ Object3D child;
	5656	+ int nb = Size();
	5657	+ for (int i = 0; i < nb; i++)
	5658	+ {
	5659	+ child = (Object3D) get(i);
	5660	+ if (child == null)
	5661	+ continue;
	5662	+ child.ResetSelectable();
	5663	+ }
	5664	+
	5665	+ blockloop = false;
	5666	+ }
	5667	+
	5668	+ void RestoreSelectable()
	5669	+ {
	5670	+ if (blockloop)
	5671	+ return;
	5672	+
	5673	+ blockloop = true;
	5674	+
	5675	+ dontselect = keepdontselect;
	5676	+
	5677	+ Object3D child;
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ child = (Object3D) get(i);
	5682	+ if (child == null)
	5683	+ continue;
	5684	+ child.RestoreSelectable();
	5685	+ }
	5686	+
	5687	+ blockloop = false;
	5688	+ }
	5689	+
5423	5690	boolean IsSelected()
5424	5691	{
5425	5692	if (parent == null)
..	..	@@ -5480,6 +5747,11 @@
5480	5747	if (fullname == null)
5481	5748	return "";
5482	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5483	5755	// System.out.println("Fullname = " + fullname);
5484	5756
5485	5757	// Does not work on Windows due to C:
..	..	@@ -5492,7 +5764,7 @@
5492	5764
5493	5765	if (split.length == 0)
5494	5766	{
5495		- return "";
	5767	+ return fullname.pigment = "";
5496	5768	}
5497	5769
5498	5770	if (split.length <= 2)
..	..	@@ -5500,22 +5772,27 @@
5500	5772	if (fullname.name.endsWith(":"))
5501	5773	{
5502	5774	// Windows
5503		- return fullname.name.substring(0, fullname.name.length()-1);
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5504	5776	}
5505	5777
5506		- return split[0];
	5778	+ return fullname.pigment = split[0];
5507	5779	}
5508	5780
5509	5781	// Windows
5510	5782	assert(split.length == 4);
5511	5783
5512		- return split[0] + ":" + split[1];
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5513	5785	}
5514	5786
5515	5787	static String GetBump(cTexture fullname)
5516	5788	{
5517	5789	if (fullname == null)
5518	5790	return "";
	5791	+
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
5519	5796
5520	5797	// System.out.println("Fullname = " + fullname);
5521	5798	// Does not work on Windows due to C:
..	..	@@ -5527,12 +5804,12 @@
5527	5804
5528	5805	if (split.length == 0)
5529	5806	{
5530		- return "";
	5807	+ return fullname.bump = "";
5531	5808	}
5532	5809
5533	5810	if (split.length == 1)
5534	5811	{
5535		- return "";
	5812	+ return fullname.bump = "";
5536	5813	}
5537	5814
5538	5815	if (split.length == 2)
..	..	@@ -5540,16 +5817,16 @@
5540	5817	if (fullname.name.endsWith(":"))
5541	5818	{
5542	5819	// Windows
5543		- return "";
	5820	+ return fullname.bump = "";
5544	5821	}
5545	5822
5546		- return split[1];
	5823	+ return fullname.bump = split[1];
5547	5824	}
5548	5825
5549	5826	// Windows
5550	5827	assert(split.length == 4);
5551	5828
5552		- return split[2] + ":" + split[3];
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5553	5830	}
5554	5831
5555	5832	String GetPigmentTexture()
..	..	@@ -5632,6 +5909,9 @@
5632	5909	texname = "";
5633	5910
5634	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5635	5915	Touch();
5636	5916	}
5637	5917
..	..	@@ -5705,6 +5985,8 @@
5705	5985
5706	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5707	5987
	5988	+ GetTextures().bump = null;
	5989	+
5708	5990	Touch();
5709	5991	}
5710	5992
..	..	@@ -5725,6 +6007,38 @@
5725	6007
5726	6008	blockloop = true;
5727	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);
5728	6042	blockloop = false;
5729	6043	}
5730	6044	}
..	..	@@ -5753,6 +6067,11 @@
5753	6067	return false;
5754	6068
5755	6069	return parent.IsLive();
	6070	+ }
	6071	+
	6072	+ boolean IsDynamic()
	6073	+ {
	6074	+ return live && bRep != null;
5756	6075	}
5757	6076
5758	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
..	..	@@ -5815,8 +6134,11 @@
5815	6134	if (support != null)
5816	6135	support = support;
5817	6136
5818		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5819		- 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.
5820	6142
5821	6143	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5822	6144	{
..	..	@@ -5826,8 +6148,9 @@
5826	6148	// usecalllists &= !(parent instanceof RandomNode);
5827	6149	// usecalllists = false;
5828	6150
5829		- if (GetBRep() != null)
5830		- usecalllists = usecalllists;
	6151	+ if (display.DrawMode() == display.SHADOW)
	6152	+ //GetBRep() != null)
	6153	+ usecalllists = !!usecalllists;
5831	6154	//System.out.println("draw " + this);
5832	6155	//new Exception().printStackTrace();
5833	6156
..	..	@@ -5849,7 +6172,7 @@
5849	6172	if (!(this instanceof Composite))
5850	6173	touched = false;
5851	6174	//if (displaylist == -1 && usecalllists)
5852		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6175	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5853	6176	{
5854	6177	bRep.displaylist = display.GenList();
5855	6178	assert(bRep.displaylist != 0);
..	..	@@ -5860,7 +6183,7 @@
5860	6183
5861	6184	//System.out.println("\tnew list " + list);
5862	6185	//gl.glDrawBuffer(gl.GL_NONE);
5863		- if (usecalllists)
	6186	+ if (usecalllists && bRep.displaylist > 0)
5864	6187	{
5865	6188	// System.err.println("new list " + bRep.displaylist + " for " + this);
5866	6189	display.NewList(bRep.displaylist);
..	..	@@ -5869,7 +6192,7 @@
5869	6192	CallList(display, root, selected, blocked);
5870	6193
5871	6194	// compiled = true;
5872		- if (usecalllists)
	6195	+ if (usecalllists && bRep.displaylist > 0)
5873	6196	{
5874	6197	// System.err.println("end list " + bRep.displaylist + " for " + this);
5875	6198	display.EndList();
..	..	@@ -7220,20 +7543,23 @@
7220	7543	}
7221	7544	}
7222	7545
7223		- 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)
7224	7550	{
7225		- int hc = info.bounds.x + info.bounds.width / 2;
7226		- int vc = info.bounds.y + info.bounds.height / 2;
7227		- 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;
7228	7554	if (toscreen == null)
7229	7555	{
7230		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7556	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7231	7557	}
7232	7558	cVector vec = in;
7233	7559	LA.xformPos(in, toscreen, in);
7234	7560	//System.out.println("Distance = " + info.camera.Distance());
7235		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7236		- 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();
7237	7563	outPt.x = hc + (int) vec.x;
7238	7564	outPt.y = vc - (int) vec.y;
7239	7565	outRec.x = outPt.x - 3;
..	..	@@ -7241,15 +7567,18 @@
7241	7567	outRec.width = outRec.height = 6;
7242	7568	}
7243	7569
7244		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7570	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7571	+ )
7245	7572	{
7246	7573	Point pt = new Point(0, 0);
7247	7574	Rectangle rec = new Rectangle();
7248		- calcHotSpot(in, info, pt, rec);
	7575	+ calcHotSpot(in, //clickInfo,
	7576	+ pt, rec);
7249	7577	return rec;
7250	7578	}
7251	7579
7252		- void drawEditHandles0(ClickInfo info, int level)
	7580	+ void drawEditHandles0(//ClickInfo clickInfo,
	7581	+ int level)
7253	7582	{
7254	7583	if (level == 0)
7255	7584	{
..	..	@@ -7258,16 +7587,19 @@
7258	7587	{
7259	7588	cVector origin = new cVector();
7260	7589	//LA.xformPos(origin, toParent, origin);
7261		- Rectangle spot = calcHotSpot(origin, info);
	7590	+ if (this.clickInfo == null)
	7591	+ this.clickInfo = new ClickInfo();
	7592	+
	7593	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7262	7594	Rectangle boundary = new Rectangle();
7263	7595	boundary.x = spot.x - 30;
7264	7596	boundary.y = spot.y - 30;
7265	7597	boundary.width = spot.width + 60;
7266	7598	boundary.height = spot.height + 60;
7267		- info.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
7268	7600	int spotw = spot.x + spot.width;
7269	7601	int spoth = spot.y + spot.height;
7270		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7602	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7271	7603	// if (CameraPane.Xmin > spot.x)
7272	7604	// {
7273	7605	// CameraPane.Xmin = spot.x;
..	..	@@ -7284,11 +7616,6 @@
7284	7616	// {
7285	7617	// CameraPane.Ymax = spoth;
7286	7618	// }
7287		- spot.translate(32, 32);
7288		- spotw = spot.x + spot.width;
7289		- spoth = spot.y + spot.height;
7290		- info.g.setColor(Color.cyan);
7291		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7292	7619	// if (CameraPane.Xmin > spot.x)
7293	7620	// {
7294	7621	// CameraPane.Xmin = spot.x;
..	..	@@ -7307,10 +7634,15 @@
7307	7634	// }
7308	7635	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7309	7636	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7310		- spot.translate(0, -32);
7311		- info.g.setColor(Color.yellow);
7312		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7313		- 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);
7314	7646	// if (CameraPane.Xmin > spot.x)
7315	7647	// {
7316	7648	// CameraPane.Xmin = spot.x;
..	..	@@ -7327,8 +7659,9 @@
7327	7659	// {
7328	7660	// CameraPane.Ymax = spoth;
7329	7661	// }
7330		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7331		- (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);
7332	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7333	7666	// if (CameraPane.Xmin > boundary.x)
7334	7667	// {
..	..	@@ -7350,7 +7683,8 @@
7350	7683	}
7351	7684	}
7352	7685
7353		- boolean doEditClick0(ClickInfo info, int level)
	7686	+ boolean doEditClick0(//ClickInfo clickInfo,
	7687	+ int level)
7354	7688	{
7355	7689	if (level == 0)
7356	7690	{
..	..	@@ -7359,8 +7693,8 @@
7359	7693
7360	7694	boolean retval = false;
7361	7695
7362		- startX = info.x;
7363		- startY = info.y;
	7696	+ startX = clickInfo.x;
	7697	+ startY = clickInfo.y;
7364	7698
7365	7699	hitSomething = -1;
7366	7700	cVector origin = new cVector();
..	..	@@ -7370,22 +7704,53 @@
7370	7704	{
7371	7705	centerPt = new Point(0, 0);
7372	7706	}
7373		- calcHotSpot(origin, info, centerPt, spot);
7374		- if (spot.contains(info.x, info.y))
	7707	+ calcHotSpot(origin, //info,
	7708	+ centerPt, spot);
	7709	+ if (spot.contains(clickInfo.x, clickInfo.y))
7375	7710	{
7376	7711	hitSomething = hitCenter;
7377	7712	retval = true;
7378	7713	}
7379	7714	spot.translate(32, 0);
7380		- if (spot.contains(info.x, info.y))
	7715	+ if (spot.contains(clickInfo.x, clickInfo.y))
7381	7716	{
7382	7717	hitSomething = hitRotate;
7383	7718	retval = true;
7384	7719	}
7385	7720	spot.translate(0, 32);
7386		- 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))
7387	7724	{
7388	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	+
7389	7754	retval = true;
7390	7755	}
7391	7756
..	..	@@ -7395,7 +7760,7 @@
7395	7760	}
7396	7761
7397	7762	//System.out.println("info.modifiers = " + info.modifiers);
7398		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7763	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7399	7764	//System.out.println("modified = " + modified);
7400	7765	//new Exception().printStackTrace();
7401	7766	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7423,7 +7788,8 @@
7423	7788	return true;
7424	7789	}
7425	7790
7426		- void doEditDrag0(ClickInfo info, boolean opposite)
	7791	+ void doEditDrag0(//ClickInfo info,
	7792	+ boolean opposite)
7427	7793	{
7428	7794	if (hitSomething == 0)
7429	7795	{
..	..	@@ -7437,7 +7803,7 @@
7437	7803
7438	7804	//System.out.println("hitSomething = " + hitSomething);
7439	7805
7440		- double scale = 0.005f * info.camera.Distance();
	7806	+ double scale = 0.005f * clickInfo.camera.Distance();
7441	7807
7442	7808	cVector xlate = new cVector();
7443	7809	//cVector xlate2 = new cVector();
..	..	@@ -7451,7 +7817,9 @@
7451	7817
7452	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7453	7819
7454		- if (modified \|\| opposite)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7455	7823	{
7456	7824	//assert(false);
7457	7825	/*
..	..	@@ -7471,8 +7839,8 @@
7471	7839	toParent[3][i] = xlate.get(i);
7472	7840	LA.matInvert(toParent, fromParent);
7473	7841	*/
7474		- cVector delta = LA.newVector(0, 0, startY - info.y);
7475		- 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);
7476	7844
7477	7845	LA.matCopy(startMat, toParent);
7478	7846	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7481,7 +7849,7 @@
7481	7849	} else
7482	7850	{
7483	7851	//LA.xformDir(delta, info.camera.fromScreen, delta);
7484		- cVector up = new cVector(info.camera.up);
	7852	+ cVector up = new cVector(clickInfo.camera.up);
7485	7853	cVector away = new cVector();
7486	7854	//cVector right2 = new cVector();
7487	7855	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7498,19 +7866,19 @@
7498	7866	LA.xformDir(up, ClickInfo.matbuffer, up);
7499	7867	// if (!CameraPane.LOCALTRANSFORM)
7500	7868	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7501		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7869	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7502	7870	// if (!CameraPane.LOCALTRANSFORM)
7503	7871	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7504	7872	//LA.vecCross(up, cVector.Z, right2);
7505	7873
7506		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7874	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7507	7875
7508	7876	//System.out.println("DELTA0 = " + delta);
7509	7877	//System.out.println("AWAY = " + info.camera.away);
7510	7878	//System.out.println("UP = " + info.camera.up);
7511	7879	if (away.z > 0)
7512	7880	{
7513		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7881	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7514	7882	{
7515	7883	delta.x = -delta.x;
7516	7884	} else
..	..	@@ -7525,7 +7893,7 @@
7525	7893	//System.out.println("DELTA1 = " + delta);
7526	7894	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7527	7895	//System.out.println("DELTA2 = " + delta);
7528		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7896	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7529	7897	LA.matCopy(startMat, toParent);
7530	7898	//System.out.println("DELTA3 = " + delta);
7531	7899	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7535,8 +7903,8 @@
7535	7903	break;
7536	7904
7537	7905	case hitRotate: // rotate
7538		- int dx = info.x - centerPt.x;
7539		- int dy = -(info.y - centerPt.y);
	7906	+ int dx = clickInfo.x - centerPt.x;
	7907	+ int dy = -(clickInfo.y - centerPt.y);
7540	7908	double angle = (double) Math.atan2(dx, dy);
7541	7909	angle = -(1.570796 - angle);
7542	7910
..	..	@@ -7545,7 +7913,7 @@
7545	7913
7546	7914	if (modified)
7547	7915	{
7548		- // Rotate 90 degrees
	7916	+ // Rotate 45 degrees
7549	7917	angle /= (Math.PI / 4);
7550	7918	angle = Math.floor(angle + 0.5);
7551	7919	angle *= (Math.PI / 4);
..	..	@@ -7559,7 +7927,7 @@
7559	7927	}
7560	7928	/**/
7561	7929
7562		- switch (info.pane.RenderCamera().viewCode)
	7930	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7931	{
7564	7932	case 1: // '\001'
7565	7933	LA.matZRotate(toParent, angle);
..	..	@@ -7586,7 +7954,7 @@
7586	7954	break;
7587	7955
7588	7956	case hitScale: // scale
7589		- double hScale = (double) (info.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7590	7958	double sign = 1;
7591	7959	if (hScale < 0)
7592	7960	{
..	..	@@ -7598,7 +7966,7 @@
7598	7966	//hScale = 0.01;
7599	7967	}
7600	7968
7601		- double vScale = (double) (info.y - centerPt.y) / 32;
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7602	7970	sign = 1;
7603	7971	if (vScale < 0)
7604	7972	{
..	..	@@ -7609,6 +7977,7 @@
7609	7977	{
7610	7978	//vScale = 0.01;
7611	7979	}
	7980	+
7612	7981	LA.matCopy(startMat, toParent);
7613	7982	/**/
7614	7983	for (int i = 0; i < 3; i++)
..	..	@@ -7618,33 +7987,39 @@
7618	7987	}
7619	7988	/**/
7620	7989
7621		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7990	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7622	7991
7623	7992	if (totalScale < 0.01)
7624	7993	{
7625	7994	totalScale = 0.01;
7626	7995	}
7627	7996
7628		- switch (info.pane.RenderCamera().viewCode)
	7997	+ switch (clickInfo.pane.RenderCamera().viewCode)
7629	7998	{
7630	7999	case 3: // '\001'
7631	8000	if (modified \|\| opposite)
7632	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7633	8005	//LA.matScale(toParent, 1, hScale, vScale);
7634		- LA.matScale(toParent, totalScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7635	8007	} // vScale, 1);
7636	8008	else
7637	8009	{
7638	8010	// EXCEPTION!
7639		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7640	8012	} // vScale, 1);
7641	8013	break;
7642	8014
7643	8015	case 2: // '\002'
7644	8016	if (modified \|\| opposite)
7645	8017	{
7646		- //LA.matScale(toParent, hScale, 1, vScale);
7647		- 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);
7648	8023	} else
7649	8024	{
7650	8025	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7654,8 +8029,11 @@
7654	8029	case 1: // '\003'
7655	8030	if (modified \|\| opposite)
7656	8031	{
7657		- //LA.matScale(toParent, hScale, vScale, 1);
7658		- 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);
7659	8037	} else
7660	8038	{
7661	8039	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7692,7 +8070,7 @@
7692	8070	} // NEW ...
7693	8071
7694	8072
7695		- info.pane.repaint();
	8073	+ clickInfo.pane.repaint();
7696	8074	}
7697	8075
7698	8076	boolean overflow = false;
..	..	@@ -7803,10 +8181,10 @@
7803	8181	} // + super.toString();
7804	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7805	8183
7806		- if (!Globals.ADVANCED)
7807		- return objname;
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
7808	8186
7809		- return objname + " " + System.identityHashCode(this);
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7810	8188	}
7811	8189
7812	8190	public int hashCode()