~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
..	..	@@ -881,7 +1000,7 @@
881	1000
882	1001	if (marked && Globals.isLIVE() && live &&
883	1002	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	1004	currentframe != Globals.framecount)
886	1005	{
887	1006	currentframe = Globals.framecount;
..	..	@@ -966,6 +1085,10 @@
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	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1092	return material.opacity > 0.99;
970	1093	}
971	1094
..	..	@@ -1366,6 +1489,7 @@
1366	1489	toParent = LA.newMatrix();
1367	1490	fromParent = LA.newMatrix();
1368	1491	}
	1492	+
1369	1493	LA.matCopy(other.toParent, toParent);
1370	1494	LA.matCopy(other.fromParent, fromParent);
1371	1495
..	..	@@ -2387,6 +2511,15 @@
2387	2511	}
2388	2512	*/
2389	2513	}
	2514	+ else
	2515	+ {
	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");
	2522	+ }
2390	2523	}
2391	2524
2392	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2561,14 @@
2428	2561	{
2429	2562	editWindow.refreshContents();
2430	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2431	2572	//if (parent != null)
2432	2573	//parent.refreshEditWindow();
2433	2574	}
..	..	@@ -2507,7 +2648,8 @@
2507	2648	private static final int editSelf = 1;
2508	2649	private static final int editChild = 2;
2509	2650
2510		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2511	2653	{
2512	2654	if (level == 0)
2513	2655	{
..	..	@@ -2515,7 +2657,8 @@
2515	2657	return;
2516	2658
2517	2659	Object3D selectee;
2518		- 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))
2519	2662	{
2520	2663	selectee = (Object3D) e.nextElement();
2521	2664	}
..	..	@@ -2523,19 +2666,22 @@
2523	2666	} else
2524	2667	{
2525	2668	//super.
2526		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2527	2671	}
2528	2672	}
2529	2673
2530		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2531	2676	{
2532	2677	doSomething = 0;
2533	2678	if (level == 0)
2534	2679	{
2535		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2536	2681	}
2537	2682	if (//super.
2538		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2539	2685	{
2540	2686	doSomething = 1;
2541	2687	return true;
..	..	@@ -2545,7 +2691,7 @@
2545	2691	}
2546	2692	}
2547	2693
2548		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2549	2695	{
2550	2696	if (selection == null)
2551	2697	{
..	..	@@ -2558,7 +2704,8 @@
2558	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2705	{
2560	2706	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2562	2709	{
2563	2710	childToDrag = selectee;
2564	2711	doSomething = 2;
..	..	@@ -2570,13 +2717,15 @@
2570	2717	return retval;
2571	2718	}
2572	2719
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2574	2722	{
2575	2723	switch (doSomething)
2576	2724	{
2577	2725	case 1: // '\001'
2578	2726	//super.
2579		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2580	2729	break;
2581	2730
2582	2731	case 2: // '\002'
..	..	@@ -2589,11 +2738,13 @@
2589	2738	{
2590	2739	//sel.hitSomething = childToDrag.hitSomething;
2591	2740	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2593	2743	} else
2594	2744	{
2595	2745	//super.
2596		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2597	2748	}
2598	2749	}
2599	2750	break;
..	..	@@ -2611,6 +2762,9 @@
2611	2762	{
2612	2763	deselectAll();
2613	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2614	2768	ClickInfo newInfo = new ClickInfo();
2615	2769	newInfo.flags = info.flags;
2616	2770	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3212,7 @@
3058	3212	{
3059	3213	if (bRep != null)
3060	3214	{
3061		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3216	Touch();
3063	3217	}
3064	3218	}
..	..	@@ -4958,6 +5112,14 @@
4958	5112	}
4959	5113	}
4960	5114
	5115	+ ObjEditor GetWindow()
	5116	+ {
	5117	+ if (editWindow != null)
	5118	+ return editWindow;
	5119	+
	5120	+ return manipWindow;
	5121	+ }
	5122	+
4961	5123	cTreePath Select(int indexcount, boolean deselect)
4962	5124	{
4963	5125	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5156,11 @@
4994	5156	if (leaf != null)
4995	5157	{
4996	5158	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5159	+ ObjEditor window = GetWindow();
	5160	+ if (window != null)
4998	5161	{
4999	5162	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5163	+ window.Select(tp, deselect, true);
5001	5164	}
5002	5165
5003	5166	return tp;
..	..	@@ -5014,6 +5177,7 @@
5014	5177
5015	5178	if (child == null)
5016	5179	continue;
	5180	+
5017	5181	if (child.HasTransparency() && child.size() != 0)
5018	5182	{
5019	5183	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5187,10 @@
5023	5187	if (leaf != null)
5024	5188	{
5025	5189	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5190	+ ObjEditor window = GetWindow();
	5191	+ if (window != null)
5027	5192	{
5028		- editWindow.Select(tp, deselect, true);
	5193	+ window.Select(tp, deselect, true);
5029	5194	}
5030	5195
5031	5196	return tp;
..	..	@@ -5350,6 +5515,51 @@
5350	5515	blockloop = false;
5351	5516	}
5352	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5353	5563	boolean IsSelected()
5354	5564	{
5355	5565	if (parent == null)
..	..	@@ -5410,6 +5620,11 @@
5410	5620	if (fullname == null)
5411	5621	return "";
5412	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5413	5628	// System.out.println("Fullname = " + fullname);
5414	5629
5415	5630	// Does not work on Windows due to C:
..	..	@@ -5422,7 +5637,7 @@
5422	5637
5423	5638	if (split.length == 0)
5424	5639	{
5425		- return "";
	5640	+ return fullname.pigment = "";
5426	5641	}
5427	5642
5428	5643	if (split.length <= 2)
..	..	@@ -5430,22 +5645,27 @@
5430	5645	if (fullname.name.endsWith(":"))
5431	5646	{
5432	5647	// Windows
5433		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5434	5649	}
5435	5650
5436		- return split[0];
	5651	+ return fullname.pigment = split[0];
5437	5652	}
5438	5653
5439	5654	// Windows
5440	5655	assert(split.length == 4);
5441	5656
5442		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5443	5658	}
5444	5659
5445	5660	static String GetBump(cTexture fullname)
5446	5661	{
5447	5662	if (fullname == null)
5448	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5449	5669
5450	5670	// System.out.println("Fullname = " + fullname);
5451	5671	// Does not work on Windows due to C:
..	..	@@ -5457,12 +5677,12 @@
5457	5677
5458	5678	if (split.length == 0)
5459	5679	{
5460		- return "";
	5680	+ return fullname.bump = "";
5461	5681	}
5462	5682
5463	5683	if (split.length == 1)
5464	5684	{
5465		- return "";
	5685	+ return fullname.bump = "";
5466	5686	}
5467	5687
5468	5688	if (split.length == 2)
..	..	@@ -5470,16 +5690,16 @@
5470	5690	if (fullname.name.endsWith(":"))
5471	5691	{
5472	5692	// Windows
5473		- return "";
	5693	+ return fullname.bump = "";
5474	5694	}
5475	5695
5476		- return split[1];
	5696	+ return fullname.bump = split[1];
5477	5697	}
5478	5698
5479	5699	// Windows
5480	5700	assert(split.length == 4);
5481	5701
5482		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5483	5703	}
5484	5704
5485	5705	String GetPigmentTexture()
..	..	@@ -5562,6 +5782,9 @@
5562	5782	texname = "";
5563	5783
5564	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5565	5788	Touch();
5566	5789	}
5567	5790
..	..	@@ -5635,6 +5858,8 @@
5635	5858
5636	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5637	5860
	5861	+ GetTextures().bump = null;
	5862	+
5638	5863	Touch();
5639	5864	}
5640	5865
..	..	@@ -5655,6 +5880,38 @@
5655	5880
5656	5881	blockloop = true;
5657	5882	child.ResetBumpTexture();
	5883	+ blockloop = false;
	5884	+ }
	5885	+ }
	5886	+
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
5658	5915	blockloop = false;
5659	5916	}
5660	5917	}
..	..	@@ -5745,8 +6002,10 @@
5745	6002	if (support != null)
5746	6003	support = support;
5747	6004
5748		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5750	6009
5751	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	6011	{
..	..	@@ -5756,8 +6015,9 @@
5756	6015	// usecalllists &= !(parent instanceof RandomNode);
5757	6016	// usecalllists = false;
5758	6017
5759		- if (GetBRep() != null)
5760		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5761	6021	//System.out.println("draw " + this);
5762	6022	//new Exception().printStackTrace();
5763	6023
..	..	@@ -5767,7 +6027,7 @@
5767	6027
5768	6028	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	6029	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6030	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	6031	{
5772	6032	Globals.lighttouched = true;
5773	6033	} // all panes...
..	..	@@ -5779,7 +6039,7 @@
5779	6039	if (!(this instanceof Composite))
5780	6040	touched = false;
5781	6041	//if (displaylist == -1 && usecalllists)
5782		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5783	6043	{
5784	6044	bRep.displaylist = display.GenList();
5785	6045	assert(bRep.displaylist != 0);
..	..	@@ -5790,7 +6050,7 @@
5790	6050
5791	6051	//System.out.println("\tnew list " + list);
5792	6052	//gl.glDrawBuffer(gl.GL_NONE);
5793		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5794	6054	{
5795	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5796	6056	display.NewList(bRep.displaylist);
..	..	@@ -5799,7 +6059,7 @@
5799	6059	CallList(display, root, selected, blocked);
5800	6060
5801	6061	// compiled = true;
5802		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5803	6063	{
5804	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5805	6065	display.EndList();
..	..	@@ -5899,6 +6159,7 @@
5899	6159	if (GetBRep() != null)
5900	6160	{
5901	6161	display.NextIndex();
	6162	+
5902	6163	// vertex color conflict : gl.glCallList(list);
5903	6164	DrawNode(display, root, selected);
5904	6165	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6620,11 @@
6359	6620	// dec 2012
6360	6621	new Exception().printStackTrace();
6361	6622	return;
	6623	+ }
	6624	+
	6625	+ if (dontselect)
	6626	+ {
	6627	+ //bRep.GenerateNormalsMINE();
6362	6628	}
6363	6629
6364	6630	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7410,23 @@
7144	7410	}
7145	7411	}
7146	7412
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
7148	7417	{
7149		- int hc = info.bounds.x + info.bounds.width / 2;
7150		- int vc = info.bounds.y + info.bounds.height / 2;
7151		- double[][] toscreen = info.toScreen;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
7152	7421	if (toscreen == null)
7153	7422	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7424	}
7156	7425	cVector vec = in;
7157	7426	LA.xformPos(in, toscreen, in);
7158	7427	//System.out.println("Distance = " + info.camera.Distance());
7159		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7160		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7430	outPt.x = hc + (int) vec.x;
7162	7431	outPt.y = vc - (int) vec.y;
7163	7432	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7434,18 @@
7165	7434	outRec.width = outRec.height = 6;
7166	7435	}
7167	7436
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
7169	7439	{
7170	7440	Point pt = new Point(0, 0);
7171	7441	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
7173	7444	return rec;
7174	7445	}
7175	7446
7176		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
7177	7449	{
7178	7450	if (level == 0)
7179	7451	{
..	..	@@ -7182,16 +7454,19 @@
7182	7454	{
7183	7455	cVector origin = new cVector();
7184	7456	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7461	Rectangle boundary = new Rectangle();
7187	7462	boundary.x = spot.x - 30;
7188	7463	boundary.y = spot.y - 30;
7189	7464	boundary.width = spot.width + 60;
7190	7465	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7192	7467	int spotw = spot.x + spot.width;
7193	7468	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7470	// if (CameraPane.Xmin > spot.x)
7196	7471	// {
7197	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -7208,11 +7483,6 @@
7208	7483	// {
7209	7484	// CameraPane.Ymax = spoth;
7210	7485	// }
7211		- spot.translate(32, 32);
7212		- spotw = spot.x + spot.width;
7213		- spoth = spot.y + spot.height;
7214		- info.g.setColor(Color.cyan);
7215		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7216	7486	// if (CameraPane.Xmin > spot.x)
7217	7487	// {
7218	7488	// CameraPane.Xmin = spot.x;
..	..	@@ -7231,10 +7501,15 @@
7231	7501	// }
7232	7502	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7503	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7234		- spot.translate(0, -32);
7235		- info.g.setColor(Color.yellow);
7236		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237		- info.g.setColor(Color.green);
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
	7509	+ spotw = spot.x + spot.width;
	7510	+ spoth = spot.y + spot.height;
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7238	7513	// if (CameraPane.Xmin > spot.x)
7239	7514	// {
7240	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7526,9 @@
7251	7526	// {
7252	7527	// CameraPane.Ymax = spoth;
7253	7528	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7529	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7533	// if (CameraPane.Xmin > boundary.x)
7258	7534	// {
..	..	@@ -7274,7 +7550,8 @@
7274	7550	}
7275	7551	}
7276	7552
7277		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7278	7555	{
7279	7556	if (level == 0)
7280	7557	{
..	..	@@ -7283,8 +7560,8 @@
7283	7560
7284	7561	boolean retval = false;
7285	7562
7286		- startX = info.x;
7287		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7288	7565
7289	7566	hitSomething = -1;
7290	7567	cVector origin = new cVector();
..	..	@@ -7294,22 +7571,53 @@
7294	7571	{
7295	7572	centerPt = new Point(0, 0);
7296	7573	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7577	{
7300	7578	hitSomething = hitCenter;
7301	7579	retval = true;
7302	7580	}
7303	7581	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7583	{
7306	7584	hitSomething = hitRotate;
7307	7585	retval = true;
7308	7586	}
7309	7587	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7591	{
7312	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
7313	7621	retval = true;
7314	7622	}
7315	7623
..	..	@@ -7319,7 +7627,7 @@
7319	7627	}
7320	7628
7321	7629	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7631	//System.out.println("modified = " + modified);
7324	7632	//new Exception().printStackTrace();
7325	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7655,8 @@
7347	7655	return true;
7348	7656	}
7349	7657
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7351	7660	{
7352	7661	if (hitSomething == 0)
7353	7662	{
..	..	@@ -7361,7 +7670,7 @@
7361	7670
7362	7671	//System.out.println("hitSomething = " + hitSomething);
7363	7672
7364		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7674
7366	7675	cVector xlate = new cVector();
7367	7676	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7704,8 @@
7395	7704	toParent[3][i] = xlate.get(i);
7396	7705	LA.matInvert(toParent, fromParent);
7397	7706	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7709
7401	7710	LA.matCopy(startMat, toParent);
7402	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7714,7 @@
7405	7714	} else
7406	7715	{
7407	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7409	7718	cVector away = new cVector();
7410	7719	//cVector right2 = new cVector();
7411	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7731,19 @@
7422	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7732	// if (!CameraPane.LOCALTRANSFORM)
7424	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7735	// if (!CameraPane.LOCALTRANSFORM)
7427	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7737	//LA.vecCross(up, cVector.Z, right2);
7429	7738
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7740
7432	7741	//System.out.println("DELTA0 = " + delta);
7433	7742	//System.out.println("AWAY = " + info.camera.away);
7434	7743	//System.out.println("UP = " + info.camera.up);
7435	7744	if (away.z > 0)
7436	7745	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7747	{
7439	7748	delta.x = -delta.x;
7440	7749	} else
..	..	@@ -7449,7 +7758,7 @@
7449	7758	//System.out.println("DELTA1 = " + delta);
7450	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7760	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7762	LA.matCopy(startMat, toParent);
7454	7763	//System.out.println("DELTA3 = " + delta);
7455	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7768,8 @@
7459	7768	break;
7460	7769
7461	7770	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7464	7773	double angle = (double) Math.atan2(dx, dy);
7465	7774	angle = -(1.570796 - angle);
7466	7775
..	..	@@ -7483,7 +7792,7 @@
7483	7792	}
7484	7793	/**/
7485	7794
7486		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7796	{
7488	7797	case 1: // '\001'
7489	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7819,7 @@
7510	7819	break;
7511	7820
7512	7821	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7514	7823	double sign = 1;
7515	7824	if (hScale < 0)
7516	7825	{
..	..	@@ -7522,7 +7831,7 @@
7522	7831	//hScale = 0.01;
7523	7832	}
7524	7833
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7526	7835	sign = 1;
7527	7836	if (vScale < 0)
7528	7837	{
..	..	@@ -7533,6 +7842,7 @@
7533	7842	{
7534	7843	//vScale = 0.01;
7535	7844	}
	7845	+
7536	7846	LA.matCopy(startMat, toParent);
7537	7847	/**/
7538	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7542,33 +7852,39 @@
7542	7852	}
7543	7853	/**/
7544	7854
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7856
7547	7857	if (totalScale < 0.01)
7548	7858	{
7549	7859	totalScale = 0.01;
7550	7860	}
7551	7861
7552		- switch (info.pane.RenderCamera().viewCode)
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7863	{
7554	7864	case 3: // '\001'
7555	7865	if (modified \|\| opposite)
7556	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7557	7870	//LA.matScale(toParent, 1, hScale, vScale);
7558		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7559	7872	} // vScale, 1);
7560	7873	else
7561	7874	{
7562	7875	// EXCEPTION!
7563		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7564	7877	} // vScale, 1);
7565	7878	break;
7566	7879
7567	7880	case 2: // '\002'
7568	7881	if (modified \|\| opposite)
7569	7882	{
7570		- //LA.matScale(toParent, hScale, 1, vScale);
7571		- LA.matScale(toParent, 1, totalScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7572	7888	} else
7573	7889	{
7574	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7578,8 +7894,11 @@
7578	7894	case 1: // '\003'
7579	7895	if (modified \|\| opposite)
7580	7896	{
7581		- //LA.matScale(toParent, hScale, vScale, 1);
7582		- LA.matScale(toParent, 1, 1, totalScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7583	7902	} else
7584	7903	{
7585	7904	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7616,7 +7935,7 @@
7616	7935	} // NEW ...
7617	7936
7618	7937
7619		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7620	7939	}
7621	7940
7622	7941	boolean overflow = false;
..	..	@@ -7796,6 +8115,10 @@
7796	8115	editWindow = null;
7797	8116	} // ?
7798	8117	}
	8118	+ else
	8119	+ {
	8120	+ //editWindow.closeUI();
	8121	+ }
7799	8122	}
7800	8123
7801	8124	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8276,10 @@
7953	8276	}
7954	8277
7955	8278	transient ObjEditor editWindow;
	8279	+ transient ObjEditor manipWindow;
	8280	+
	8281	+ transient boolean pinned;
	8282	+
7956	8283	transient ObjectUI objectUI;
7957	8284	public static int povDepth = 0;
7958	8285	private static cVector tbMin = new cVector();