~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();
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,6 +249,73 @@
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()))
..	..	@@ -223,19 +325,35 @@
223	325
224	326	RestoreBigData(o);
225	327
226		- hashtable.remove(GetUUID());
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
227	334
228	335	for (int i=0; i<Size(); i++)
229	336	{
230	337	get(i).RestoreBigData(hashtable);
231	338	}
	339	+
	340	+ blockloop = false;
232	341	}
233	342
234	343	void RestoreBigData(Object3D o)
235	344	{
236	345	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- 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;
239	357	// this.support = o.support;
240	358	// this.fileparent = o.fileparent;
241	359	}
..	..	@@ -381,6 +499,7 @@
381	499	}
382	500
383	501	boolean live = false;
	502	+ transient boolean keepdontselect;
384	503	boolean dontselect = false;
385	504	boolean hide = false;
386	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -966,6 +1085,9 @@
966	1085	if (material == null \|\| material.multiply)
967	1086	return true;
968	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
969	1091	// Transparent objects are dynamic because we have to sort the triangles.
970	1092	return material.opacity > 0.99;
971	1093	}
..	..	@@ -1367,6 +1489,7 @@
1367	1489	toParent = LA.newMatrix();
1368	1490	fromParent = LA.newMatrix();
1369	1491	}
	1492	+
1370	1493	LA.matCopy(other.toParent, toParent);
1371	1494	LA.matCopy(other.fromParent, fromParent);
1372	1495
..	..	@@ -2391,6 +2514,11 @@
2391	2514	else
2392	2515	{
2393	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");
2394	2522	}
2395	2523	}
2396	2524
..	..	@@ -2433,6 +2561,14 @@
2433	2561	{
2434	2562	editWindow.refreshContents();
2435	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2436	2572	//if (parent != null)
2437	2573	//parent.refreshEditWindow();
2438	2574	}
..	..	@@ -2512,7 +2648,8 @@
2512	2648	private static final int editSelf = 1;
2513	2649	private static final int editChild = 2;
2514	2650
2515		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2516	2653	{
2517	2654	if (level == 0)
2518	2655	{
..	..	@@ -2520,7 +2657,8 @@
2520	2657	return;
2521	2658
2522	2659	Object3D selectee;
2523		- 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))
2524	2662	{
2525	2663	selectee = (Object3D) e.nextElement();
2526	2664	}
..	..	@@ -2528,19 +2666,22 @@
2528	2666	} else
2529	2667	{
2530	2668	//super.
2531		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2532	2671	}
2533	2672	}
2534	2673
2535		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2536	2676	{
2537	2677	doSomething = 0;
2538	2678	if (level == 0)
2539	2679	{
2540		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2541	2681	}
2542	2682	if (//super.
2543		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2544	2685	{
2545	2686	doSomething = 1;
2546	2687	return true;
..	..	@@ -2550,7 +2691,7 @@
2550	2691	}
2551	2692	}
2552	2693
2553		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2554	2695	{
2555	2696	if (selection == null)
2556	2697	{
..	..	@@ -2563,7 +2704,8 @@
2563	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2564	2705	{
2565	2706	Object3D selectee = (Object3D) e.nextElement();
2566		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2567	2709	{
2568	2710	childToDrag = selectee;
2569	2711	doSomething = 2;
..	..	@@ -2575,13 +2717,15 @@
2575	2717	return retval;
2576	2718	}
2577	2719
2578		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2579	2722	{
2580	2723	switch (doSomething)
2581	2724	{
2582	2725	case 1: // '\001'
2583	2726	//super.
2584		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2585	2729	break;
2586	2730
2587	2731	case 2: // '\002'
..	..	@@ -2594,11 +2738,13 @@
2594	2738	{
2595	2739	//sel.hitSomething = childToDrag.hitSomething;
2596	2740	//childToDrag.doEditDrag(info);
2597		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2598	2743	} else
2599	2744	{
2600	2745	//super.
2601		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2602	2748	}
2603	2749	}
2604	2750	break;
..	..	@@ -2616,6 +2762,9 @@
2616	2762	{
2617	2763	deselectAll();
2618	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2619	2768	ClickInfo newInfo = new ClickInfo();
2620	2769	newInfo.flags = info.flags;
2621	2770	newInfo.bounds = info.bounds;
..	..	@@ -3063,7 +3212,7 @@
3063	3212	{
3064	3213	if (bRep != null)
3065	3214	{
3066		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3067	3216	Touch();
3068	3217	}
3069	3218	}
..	..	@@ -3473,15 +3622,47 @@
3473	3622
3474	3623	void ClearMaterials()
3475	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3476	3630	ClearMaterial();
3477		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3478	3632	{
3479		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3480	3634	if (child == null)
3481	3635	continue;
3482	3636	child.ClearMaterials();
3483		- release(i);
3484	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;
3485	3666	}
3486	3667
3487	3668	void FlipV(boolean flip)
..	..	@@ -4963,6 +5144,14 @@
4963	5144	}
4964	5145	}
4965	5146
	5147	+ ObjEditor GetWindow()
	5148	+ {
	5149	+ if (editWindow != null)
	5150	+ return editWindow;
	5151	+
	5152	+ return manipWindow;
	5153	+ }
	5154	+
4966	5155	cTreePath Select(int indexcount, boolean deselect)
4967	5156	{
4968	5157	if (hide \|\| dontselect)
..	..	@@ -4999,10 +5188,11 @@
4999	5188	if (leaf != null)
5000	5189	{
5001	5190	cTreePath tp = new cTreePath(this, leaf);
5002		- if (editWindow != null)
	5191	+ ObjEditor window = GetWindow();
	5192	+ if (window != null)
5003	5193	{
5004	5194	//System.out.println("editWindow = " + editWindow + " vs " + this);
5005		- editWindow.Select(tp, deselect, true);
	5195	+ window.Select(tp, deselect, true);
5006	5196	}
5007	5197
5008	5198	return tp;
..	..	@@ -5019,6 +5209,7 @@
5019	5209
5020	5210	if (child == null)
5021	5211	continue;
	5212	+
5022	5213	if (child.HasTransparency() && child.size() != 0)
5023	5214	{
5024	5215	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5028,9 +5219,10 @@
5028	5219	if (leaf != null)
5029	5220	{
5030	5221	cTreePath tp = new cTreePath(this, leaf);
5031		- if (editWindow != null)
	5222	+ ObjEditor window = GetWindow();
	5223	+ if (window != null)
5032	5224	{
5033		- editWindow.Select(tp, deselect, true);
	5225	+ window.Select(tp, deselect, true);
5034	5226	}
5035	5227
5036	5228	return tp;
..	..	@@ -5355,6 +5547,51 @@
5355	5547	blockloop = false;
5356	5548	}
5357	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	+
5358	5595	boolean IsSelected()
5359	5596	{
5360	5597	if (parent == null)
..	..	@@ -5415,6 +5652,11 @@
5415	5652	if (fullname == null)
5416	5653	return "";
5417	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5418	5660	// System.out.println("Fullname = " + fullname);
5419	5661
5420	5662	// Does not work on Windows due to C:
..	..	@@ -5427,7 +5669,7 @@
5427	5669
5428	5670	if (split.length == 0)
5429	5671	{
5430		- return "";
	5672	+ return fullname.pigment = "";
5431	5673	}
5432	5674
5433	5675	if (split.length <= 2)
..	..	@@ -5435,22 +5677,27 @@
5435	5677	if (fullname.name.endsWith(":"))
5436	5678	{
5437	5679	// Windows
5438		- return fullname.name.substring(0, fullname.name.length()-1);
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5439	5681	}
5440	5682
5441		- return split[0];
	5683	+ return fullname.pigment = split[0];
5442	5684	}
5443	5685
5444	5686	// Windows
5445	5687	assert(split.length == 4);
5446	5688
5447		- return split[0] + ":" + split[1];
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5448	5690	}
5449	5691
5450	5692	static String GetBump(cTexture fullname)
5451	5693	{
5452	5694	if (fullname == null)
5453	5695	return "";
	5696	+
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
5454	5701
5455	5702	// System.out.println("Fullname = " + fullname);
5456	5703	// Does not work on Windows due to C:
..	..	@@ -5462,12 +5709,12 @@
5462	5709
5463	5710	if (split.length == 0)
5464	5711	{
5465		- return "";
	5712	+ return fullname.bump = "";
5466	5713	}
5467	5714
5468	5715	if (split.length == 1)
5469	5716	{
5470		- return "";
	5717	+ return fullname.bump = "";
5471	5718	}
5472	5719
5473	5720	if (split.length == 2)
..	..	@@ -5475,16 +5722,16 @@
5475	5722	if (fullname.name.endsWith(":"))
5476	5723	{
5477	5724	// Windows
5478		- return "";
	5725	+ return fullname.bump = "";
5479	5726	}
5480	5727
5481		- return split[1];
	5728	+ return fullname.bump = split[1];
5482	5729	}
5483	5730
5484	5731	// Windows
5485	5732	assert(split.length == 4);
5486	5733
5487		- return split[2] + ":" + split[3];
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5488	5735	}
5489	5736
5490	5737	String GetPigmentTexture()
..	..	@@ -5567,6 +5814,9 @@
5567	5814	texname = "";
5568	5815
5569	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5570	5820	Touch();
5571	5821	}
5572	5822
..	..	@@ -5640,6 +5890,8 @@
5640	5890
5641	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5642	5892
	5893	+ GetTextures().bump = null;
	5894	+
5643	5895	Touch();
5644	5896	}
5645	5897
..	..	@@ -5660,6 +5912,38 @@
5660	5912
5661	5913	blockloop = true;
5662	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);
5663	5947	blockloop = false;
5664	5948	}
5665	5949	}
..	..	@@ -5750,8 +6034,10 @@
5750	6034	if (support != null)
5751	6035	support = support;
5752	6036
5753		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754		- 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.
5755	6041
5756	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5757	6043	{
..	..	@@ -5761,8 +6047,9 @@
5761	6047	// usecalllists &= !(parent instanceof RandomNode);
5762	6048	// usecalllists = false;
5763	6049
5764		- if (GetBRep() != null)
5765		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5766	6053	//System.out.println("draw " + this);
5767	6054	//new Exception().printStackTrace();
5768	6055
..	..	@@ -5772,7 +6059,7 @@
5772	6059
5773	6060	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774	6061	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5775		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6062	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5776	6063	{
5777	6064	Globals.lighttouched = true;
5778	6065	} // all panes...
..	..	@@ -5784,7 +6071,7 @@
5784	6071	if (!(this instanceof Composite))
5785	6072	touched = false;
5786	6073	//if (displaylist == -1 && usecalllists)
5787		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5788	6075	{
5789	6076	bRep.displaylist = display.GenList();
5790	6077	assert(bRep.displaylist != 0);
..	..	@@ -5795,7 +6082,7 @@
5795	6082
5796	6083	//System.out.println("\tnew list " + list);
5797	6084	//gl.glDrawBuffer(gl.GL_NONE);
5798		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5799	6086	{
5800	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5801	6088	display.NewList(bRep.displaylist);
..	..	@@ -5804,7 +6091,7 @@
5804	6091	CallList(display, root, selected, blocked);
5805	6092
5806	6093	// compiled = true;
5807		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5808	6095	{
5809	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5810	6097	display.EndList();
..	..	@@ -5904,6 +6191,7 @@
5904	6191	if (GetBRep() != null)
5905	6192	{
5906	6193	display.NextIndex();
	6194	+
5907	6195	// vertex color conflict : gl.glCallList(list);
5908	6196	DrawNode(display, root, selected);
5909	6197	if (this instanceof BezierPatch)
..	..	@@ -7154,20 +7442,23 @@
7154	7442	}
7155	7443	}
7156	7444
7157		- 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)
7158	7449	{
7159		- int hc = info.bounds.x + info.bounds.width / 2;
7160		- int vc = info.bounds.y + info.bounds.height / 2;
7161		- 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;
7162	7453	if (toscreen == null)
7163	7454	{
7164		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7165	7456	}
7166	7457	cVector vec = in;
7167	7458	LA.xformPos(in, toscreen, in);
7168	7459	//System.out.println("Distance = " + info.camera.Distance());
7169		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7170		- 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();
7171	7462	outPt.x = hc + (int) vec.x;
7172	7463	outPt.y = vc - (int) vec.y;
7173	7464	outRec.x = outPt.x - 3;
..	..	@@ -7175,15 +7466,18 @@
7175	7466	outRec.width = outRec.height = 6;
7176	7467	}
7177	7468
7178		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7179	7471	{
7180	7472	Point pt = new Point(0, 0);
7181	7473	Rectangle rec = new Rectangle();
7182		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7183	7476	return rec;
7184	7477	}
7185	7478
7186		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7187	7481	{
7188	7482	if (level == 0)
7189	7483	{
..	..	@@ -7192,16 +7486,19 @@
7192	7486	{
7193	7487	cVector origin = new cVector();
7194	7488	//LA.xformPos(origin, toParent, origin);
7195		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7196	7493	Rectangle boundary = new Rectangle();
7197	7494	boundary.x = spot.x - 30;
7198	7495	boundary.y = spot.y - 30;
7199	7496	boundary.width = spot.width + 60;
7200	7497	boundary.height = spot.height + 60;
7201		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7202	7499	int spotw = spot.x + spot.width;
7203	7500	int spoth = spot.y + spot.height;
7204		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7205	7502	// if (CameraPane.Xmin > spot.x)
7206	7503	// {
7207	7504	// CameraPane.Xmin = spot.x;
..	..	@@ -7218,11 +7515,6 @@
7218	7515	// {
7219	7516	// CameraPane.Ymax = spoth;
7220	7517	// }
7221		- spot.translate(32, 32);
7222		- spotw = spot.x + spot.width;
7223		- spoth = spot.y + spot.height;
7224		- info.g.setColor(Color.cyan);
7225		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7226	7518	// if (CameraPane.Xmin > spot.x)
7227	7519	// {
7228	7520	// CameraPane.Xmin = spot.x;
..	..	@@ -7241,10 +7533,15 @@
7241	7533	// }
7242	7534	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243	7535	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7244		- spot.translate(0, -32);
7245		- info.g.setColor(Color.yellow);
7246		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7247		- 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);
7248	7545	// if (CameraPane.Xmin > spot.x)
7249	7546	// {
7250	7547	// CameraPane.Xmin = spot.x;
..	..	@@ -7261,8 +7558,9 @@
7261	7558	// {
7262	7559	// CameraPane.Ymax = spoth;
7263	7560	// }
7264		- info.g.drawArc(boundary.x, boundary.y,
7265		- boundary.width, boundary.height, 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);
7266	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267	7565	// if (CameraPane.Xmin > boundary.x)
7268	7566	// {
..	..	@@ -7284,7 +7582,8 @@
7284	7582	}
7285	7583	}
7286	7584
7287		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7288	7587	{
7289	7588	if (level == 0)
7290	7589	{
..	..	@@ -7293,8 +7592,8 @@
7293	7592
7294	7593	boolean retval = false;
7295	7594
7296		- startX = info.x;
7297		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7298	7597
7299	7598	hitSomething = -1;
7300	7599	cVector origin = new cVector();
..	..	@@ -7304,22 +7603,53 @@
7304	7603	{
7305	7604	centerPt = new Point(0, 0);
7306	7605	}
7307		- calcHotSpot(origin, info, centerPt, spot);
7308		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7309	7609	{
7310	7610	hitSomething = hitCenter;
7311	7611	retval = true;
7312	7612	}
7313	7613	spot.translate(32, 0);
7314		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7315	7615	{
7316	7616	hitSomething = hitRotate;
7317	7617	retval = true;
7318	7618	}
7319	7619	spot.translate(0, 32);
7320		- 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))
7321	7623	{
7322	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	+
7323	7653	retval = true;
7324	7654	}
7325	7655
..	..	@@ -7329,7 +7659,7 @@
7329	7659	}
7330	7660
7331	7661	//System.out.println("info.modifiers = " + info.modifiers);
7332		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7333	7663	//System.out.println("modified = " + modified);
7334	7664	//new Exception().printStackTrace();
7335	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7357,7 +7687,8 @@
7357	7687	return true;
7358	7688	}
7359	7689
7360		- void doEditDrag0(ClickInfo info, boolean opposite)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7361	7692	{
7362	7693	if (hitSomething == 0)
7363	7694	{
..	..	@@ -7371,7 +7702,7 @@
7371	7702
7372	7703	//System.out.println("hitSomething = " + hitSomething);
7373	7704
7374		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
7375	7706
7376	7707	cVector xlate = new cVector();
7377	7708	//cVector xlate2 = new cVector();
..	..	@@ -7405,8 +7736,8 @@
7405	7736	toParent[3][i] = xlate.get(i);
7406	7737	LA.matInvert(toParent, fromParent);
7407	7738	*/
7408		- cVector delta = LA.newVector(0, 0, startY - info.y);
7409		- 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);
7410	7741
7411	7742	LA.matCopy(startMat, toParent);
7412	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7415,7 +7746,7 @@
7415	7746	} else
7416	7747	{
7417	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7418		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7419	7750	cVector away = new cVector();
7420	7751	//cVector right2 = new cVector();
7421	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7432,19 +7763,19 @@
7432	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7433	7764	// if (!CameraPane.LOCALTRANSFORM)
7434	7765	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7435		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7436	7767	// if (!CameraPane.LOCALTRANSFORM)
7437	7768	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7438	7769	//LA.vecCross(up, cVector.Z, right2);
7439	7770
7440		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7441	7772
7442	7773	//System.out.println("DELTA0 = " + delta);
7443	7774	//System.out.println("AWAY = " + info.camera.away);
7444	7775	//System.out.println("UP = " + info.camera.up);
7445	7776	if (away.z > 0)
7446	7777	{
7447		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7448	7779	{
7449	7780	delta.x = -delta.x;
7450	7781	} else
..	..	@@ -7459,7 +7790,7 @@
7459	7790	//System.out.println("DELTA1 = " + delta);
7460	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7461	7792	//System.out.println("DELTA2 = " + delta);
7462		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7463	7794	LA.matCopy(startMat, toParent);
7464	7795	//System.out.println("DELTA3 = " + delta);
7465	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7469,8 +7800,8 @@
7469	7800	break;
7470	7801
7471	7802	case hitRotate: // rotate
7472		- int dx = info.x - centerPt.x;
7473		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7474	7805	double angle = (double) Math.atan2(dx, dy);
7475	7806	angle = -(1.570796 - angle);
7476	7807
..	..	@@ -7493,7 +7824,7 @@
7493	7824	}
7494	7825	/**/
7495	7826
7496		- switch (info.pane.RenderCamera().viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7497	7828	{
7498	7829	case 1: // '\001'
7499	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7520,7 +7851,7 @@
7520	7851	break;
7521	7852
7522	7853	case hitScale: // scale
7523		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7524	7855	double sign = 1;
7525	7856	if (hScale < 0)
7526	7857	{
..	..	@@ -7532,7 +7863,7 @@
7532	7863	//hScale = 0.01;
7533	7864	}
7534	7865
7535		- double vScale = (double) (info.y - centerPt.y) / 32;
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7536	7867	sign = 1;
7537	7868	if (vScale < 0)
7538	7869	{
..	..	@@ -7543,6 +7874,7 @@
7543	7874	{
7544	7875	//vScale = 0.01;
7545	7876	}
	7877	+
7546	7878	LA.matCopy(startMat, toParent);
7547	7879	/**/
7548	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7552,33 +7884,39 @@
7552	7884	}
7553	7885	/**/
7554	7886
7555		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7556	7888
7557	7889	if (totalScale < 0.01)
7558	7890	{
7559	7891	totalScale = 0.01;
7560	7892	}
7561	7893
7562		- switch (info.pane.RenderCamera().viewCode)
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7895	{
7564	7896	case 3: // '\001'
7565	7897	if (modified \|\| opposite)
7566	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7567	7902	//LA.matScale(toParent, 1, hScale, vScale);
7568		- LA.matScale(toParent, totalScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7569	7904	} // vScale, 1);
7570	7905	else
7571	7906	{
7572	7907	// EXCEPTION!
7573		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7574	7909	} // vScale, 1);
7575	7910	break;
7576	7911
7577	7912	case 2: // '\002'
7578	7913	if (modified \|\| opposite)
7579	7914	{
7580		- //LA.matScale(toParent, hScale, 1, vScale);
7581		- 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);
7582	7920	} else
7583	7921	{
7584	7922	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7588,8 +7926,11 @@
7588	7926	case 1: // '\003'
7589	7927	if (modified \|\| opposite)
7590	7928	{
7591		- //LA.matScale(toParent, hScale, vScale, 1);
7592		- 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);
7593	7934	} else
7594	7935	{
7595	7936	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7626,7 +7967,7 @@
7626	7967	} // NEW ...
7627	7968
7628	7969
7629		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7630	7971	}
7631	7972
7632	7973	boolean overflow = false;
..	..	@@ -7967,6 +8308,10 @@
7967	8308	}
7968	8309
7969	8310	transient ObjEditor editWindow;
	8311	+ transient ObjEditor manipWindow;
	8312	+
	8313	+ transient boolean pinned;
	8314	+
7970	8315	transient ObjectUI objectUI;
7971	8316	public static int povDepth = 0;
7972	8317	private static cVector tbMin = new cVector();