~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,29 @@
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	+
217	275	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	276	{
219	277	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +281,35 @@
223	281
224	282	RestoreBigData(o);
225	283
226		- hashtable.remove(GetUUID());
	284	+ if (blockloop)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ //hashtable.remove(GetUUID());
227	290
228	291	for (int i=0; i<Size(); i++)
229	292	{
230	293	get(i).RestoreBigData(hashtable);
231	294	}
	295	+
	296	+ blockloop = false;
232	297	}
233	298
234	299	void RestoreBigData(Object3D o)
235	300	{
236	301	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
239	313	// this.support = o.support;
240	314	// this.fileparent = o.fileparent;
241	315	}
..	..	@@ -381,6 +455,7 @@
381	455	}
382	456
383	457	boolean live = false;
	458	+ transient boolean keepdontselect;
384	459	boolean dontselect = false;
385	460	boolean hide = false;
386	461	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +956,7 @@
881	956
882	957	if (marked && Globals.isLIVE() && live &&
883	958	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	959	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	960	currentframe != Globals.framecount)
886	961	{
887	962	currentframe = Globals.framecount;
..	..	@@ -966,6 +1041,10 @@
966	1041	if (material == null \|\| material.multiply)
967	1042	return true;
968	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
	1047	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1048	return material.opacity > 0.99;
970	1049	}
971	1050
..	..	@@ -1366,6 +1445,7 @@
1366	1445	toParent = LA.newMatrix();
1367	1446	fromParent = LA.newMatrix();
1368	1447	}
	1448	+
1369	1449	LA.matCopy(other.toParent, toParent);
1370	1450	LA.matCopy(other.fromParent, fromParent);
1371	1451
..	..	@@ -2387,6 +2467,15 @@
2387	2467	}
2388	2468	*/
2389	2469	}
	2470	+ else
	2471	+ {
	2472	+ //((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
	2478	+ }
2390	2479	}
2391	2480
2392	2481	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2517,14 @@
2428	2517	{
2429	2518	editWindow.refreshContents();
2430	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2431	2528	//if (parent != null)
2432	2529	//parent.refreshEditWindow();
2433	2530	}
..	..	@@ -2507,7 +2604,8 @@
2507	2604	private static final int editSelf = 1;
2508	2605	private static final int editChild = 2;
2509	2606
2510		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2511	2609	{
2512	2610	if (level == 0)
2513	2611	{
..	..	@@ -2515,7 +2613,8 @@
2515	2613	return;
2516	2614
2517	2615	Object3D selectee;
2518		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2519	2618	{
2520	2619	selectee = (Object3D) e.nextElement();
2521	2620	}
..	..	@@ -2523,19 +2622,22 @@
2523	2622	} else
2524	2623	{
2525	2624	//super.
2526		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2527	2627	}
2528	2628	}
2529	2629
2530		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2531	2632	{
2532	2633	doSomething = 0;
2533	2634	if (level == 0)
2534	2635	{
2535		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2536	2637	}
2537	2638	if (//super.
2538		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2539	2641	{
2540	2642	doSomething = 1;
2541	2643	return true;
..	..	@@ -2545,7 +2647,7 @@
2545	2647	}
2546	2648	}
2547	2649
2548		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2549	2651	{
2550	2652	if (selection == null)
2551	2653	{
..	..	@@ -2558,7 +2660,8 @@
2558	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2661	{
2560	2662	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2562	2665	{
2563	2666	childToDrag = selectee;
2564	2667	doSomething = 2;
..	..	@@ -2570,13 +2673,15 @@
2570	2673	return retval;
2571	2674	}
2572	2675
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2574	2678	{
2575	2679	switch (doSomething)
2576	2680	{
2577	2681	case 1: // '\001'
2578	2682	//super.
2579		- doEditDrag0(info, opposite);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2580	2685	break;
2581	2686
2582	2687	case 2: // '\002'
..	..	@@ -2589,11 +2694,13 @@
2589	2694	{
2590	2695	//sel.hitSomething = childToDrag.hitSomething;
2591	2696	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2593	2699	} else
2594	2700	{
2595	2701	//super.
2596		- doEditDrag0(info, opposite);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2597	2704	}
2598	2705	}
2599	2706	break;
..	..	@@ -2611,6 +2718,9 @@
2611	2718	{
2612	2719	deselectAll();
2613	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2614	2724	ClickInfo newInfo = new ClickInfo();
2615	2725	newInfo.flags = info.flags;
2616	2726	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3168,7 @@
3058	3168	{
3059	3169	if (bRep != null)
3060	3170	{
3061		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3172	Touch();
3063	3173	}
3064	3174	}
..	..	@@ -4958,6 +5068,14 @@
4958	5068	}
4959	5069	}
4960	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4961	5079	cTreePath Select(int indexcount, boolean deselect)
4962	5080	{
4963	5081	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5112,11 @@
4994	5112	if (leaf != null)
4995	5113	{
4996	5114	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4998	5117	{
4999	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
5001	5120	}
5002	5121
5003	5122	return tp;
..	..	@@ -5014,6 +5133,7 @@
5014	5133
5015	5134	if (child == null)
5016	5135	continue;
	5136	+
5017	5137	if (child.HasTransparency() && child.size() != 0)
5018	5138	{
5019	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5143,10 @@
5023	5143	if (leaf != null)
5024	5144	{
5025	5145	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
5027	5148	{
5028		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
5029	5150	}
5030	5151
5031	5152	return tp;
..	..	@@ -5350,6 +5471,51 @@
5350	5471	blockloop = false;
5351	5472	}
5352	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5353	5519	boolean IsSelected()
5354	5520	{
5355	5521	if (parent == null)
..	..	@@ -5410,6 +5576,11 @@
5410	5576	if (fullname == null)
5411	5577	return "";
5412	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5413	5584	// System.out.println("Fullname = " + fullname);
5414	5585
5415	5586	// Does not work on Windows due to C:
..	..	@@ -5422,7 +5593,7 @@
5422	5593
5423	5594	if (split.length == 0)
5424	5595	{
5425		- return "";
	5596	+ return fullname.pigment = "";
5426	5597	}
5427	5598
5428	5599	if (split.length <= 2)
..	..	@@ -5430,22 +5601,27 @@
5430	5601	if (fullname.name.endsWith(":"))
5431	5602	{
5432	5603	// Windows
5433		- return fullname.name.substring(0, fullname.name.length()-1);
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5434	5605	}
5435	5606
5436		- return split[0];
	5607	+ return fullname.pigment = split[0];
5437	5608	}
5438	5609
5439	5610	// Windows
5440	5611	assert(split.length == 4);
5441	5612
5442		- return split[0] + ":" + split[1];
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5443	5614	}
5444	5615
5445	5616	static String GetBump(cTexture fullname)
5446	5617	{
5447	5618	if (fullname == null)
5448	5619	return "";
	5620	+
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
5449	5625
5450	5626	// System.out.println("Fullname = " + fullname);
5451	5627	// Does not work on Windows due to C:
..	..	@@ -5457,12 +5633,12 @@
5457	5633
5458	5634	if (split.length == 0)
5459	5635	{
5460		- return "";
	5636	+ return fullname.bump = "";
5461	5637	}
5462	5638
5463	5639	if (split.length == 1)
5464	5640	{
5465		- return "";
	5641	+ return fullname.bump = "";
5466	5642	}
5467	5643
5468	5644	if (split.length == 2)
..	..	@@ -5470,16 +5646,16 @@
5470	5646	if (fullname.name.endsWith(":"))
5471	5647	{
5472	5648	// Windows
5473		- return "";
	5649	+ return fullname.bump = "";
5474	5650	}
5475	5651
5476		- return split[1];
	5652	+ return fullname.bump = split[1];
5477	5653	}
5478	5654
5479	5655	// Windows
5480	5656	assert(split.length == 4);
5481	5657
5482		- return split[2] + ":" + split[3];
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5483	5659	}
5484	5660
5485	5661	String GetPigmentTexture()
..	..	@@ -5562,6 +5738,9 @@
5562	5738	texname = "";
5563	5739
5564	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5565	5744	Touch();
5566	5745	}
5567	5746
..	..	@@ -5635,6 +5814,8 @@
5635	5814
5636	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5637	5816
	5817	+ GetTextures().bump = null;
	5818	+
5638	5819	Touch();
5639	5820	}
5640	5821
..	..	@@ -5655,6 +5836,38 @@
5655	5836
5656	5837	blockloop = true;
5657	5838	child.ResetBumpTexture();
	5839	+ blockloop = false;
	5840	+ }
	5841	+ }
	5842	+
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
5658	5871	blockloop = false;
5659	5872	}
5660	5873	}
..	..	@@ -5745,8 +5958,10 @@
5745	5958	if (support != null)
5746	5959	support = support;
5747	5960
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);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5750	5965
5751	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	5967	{
..	..	@@ -5756,8 +5971,9 @@
5756	5971	// usecalllists &= !(parent instanceof RandomNode);
5757	5972	// usecalllists = false;
5758	5973
5759		- if (GetBRep() != null)
5760		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5761	5977	//System.out.println("draw " + this);
5762	5978	//new Exception().printStackTrace();
5763	5979
..	..	@@ -5767,7 +5983,7 @@
5767	5983
5768	5984	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	5985	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	5987	{
5772	5988	Globals.lighttouched = true;
5773	5989	} // all panes...
..	..	@@ -5779,7 +5995,7 @@
5779	5995	if (!(this instanceof Composite))
5780	5996	touched = false;
5781	5997	//if (displaylist == -1 && usecalllists)
5782		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5783	5999	{
5784	6000	bRep.displaylist = display.GenList();
5785	6001	assert(bRep.displaylist != 0);
..	..	@@ -5790,7 +6006,7 @@
5790	6006
5791	6007	//System.out.println("\tnew list " + list);
5792	6008	//gl.glDrawBuffer(gl.GL_NONE);
5793		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5794	6010	{
5795	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5796	6012	display.NewList(bRep.displaylist);
..	..	@@ -5799,7 +6015,7 @@
5799	6015	CallList(display, root, selected, blocked);
5800	6016
5801	6017	// compiled = true;
5802		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5803	6019	{
5804	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5805	6021	display.EndList();
..	..	@@ -5899,6 +6115,7 @@
5899	6115	if (GetBRep() != null)
5900	6116	{
5901	6117	display.NextIndex();
	6118	+
5902	6119	// vertex color conflict : gl.glCallList(list);
5903	6120	DrawNode(display, root, selected);
5904	6121	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6576,11 @@
6359	6576	// dec 2012
6360	6577	new Exception().printStackTrace();
6361	6578	return;
	6579	+ }
	6580	+
	6581	+ if (dontselect)
	6582	+ {
	6583	+ //bRep.GenerateNormalsMINE();
6362	6584	}
6363	6585
6364	6586	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7366,23 @@
7144	7366	}
7145	7367	}
7146	7368
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
7148	7373	{
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;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
7152	7377	if (toscreen == null)
7153	7378	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7380	}
7156	7381	cVector vec = in;
7157	7382	LA.xformPos(in, toscreen, in);
7158	7383	//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();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7386	outPt.x = hc + (int) vec.x;
7162	7387	outPt.y = vc - (int) vec.y;
7163	7388	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7390,18 @@
7165	7390	outRec.width = outRec.height = 6;
7166	7391	}
7167	7392
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
7169	7395	{
7170	7396	Point pt = new Point(0, 0);
7171	7397	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
7173	7400	return rec;
7174	7401	}
7175	7402
7176		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
7177	7405	{
7178	7406	if (level == 0)
7179	7407	{
..	..	@@ -7182,16 +7410,19 @@
7182	7410	{
7183	7411	cVector origin = new cVector();
7184	7412	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7417	Rectangle boundary = new Rectangle();
7187	7418	boundary.x = spot.x - 30;
7188	7419	boundary.y = spot.y - 30;
7189	7420	boundary.width = spot.width + 60;
7190	7421	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7192	7423	int spotw = spot.x + spot.width;
7193	7424	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7426	// if (CameraPane.Xmin > spot.x)
7196	7427	// {
7197	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7208,11 +7439,6 @@
7208	7439	// {
7209	7440	// CameraPane.Ymax = spoth;
7210	7441	// }
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	7442	// if (CameraPane.Xmin > spot.x)
7217	7443	// {
7218	7444	// CameraPane.Xmin = spot.x;
..	..	@@ -7231,10 +7457,15 @@
7231	7457	// }
7232	7458	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7459	//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);
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
	7465	+ spotw = spot.x + spot.width;
	7466	+ spoth = spot.y + spot.height;
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7238	7469	// if (CameraPane.Xmin > spot.x)
7239	7470	// {
7240	7471	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7482,9 @@
7251	7482	// {
7252	7483	// CameraPane.Ymax = spoth;
7253	7484	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7489	// if (CameraPane.Xmin > boundary.x)
7258	7490	// {
..	..	@@ -7274,7 +7506,8 @@
7274	7506	}
7275	7507	}
7276	7508
7277		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7278	7511	{
7279	7512	if (level == 0)
7280	7513	{
..	..	@@ -7283,8 +7516,8 @@
7283	7516
7284	7517	boolean retval = false;
7285	7518
7286		- startX = info.x;
7287		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7288	7521
7289	7522	hitSomething = -1;
7290	7523	cVector origin = new cVector();
..	..	@@ -7294,22 +7527,53 @@
7294	7527	{
7295	7528	centerPt = new Point(0, 0);
7296	7529	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7533	{
7300	7534	hitSomething = hitCenter;
7301	7535	retval = true;
7302	7536	}
7303	7537	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7539	{
7306	7540	hitSomething = hitRotate;
7307	7541	retval = true;
7308	7542	}
7309	7543	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7547	{
7312	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7313	7577	retval = true;
7314	7578	}
7315	7579
..	..	@@ -7319,7 +7583,7 @@
7319	7583	}
7320	7584
7321	7585	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7587	//System.out.println("modified = " + modified);
7324	7588	//new Exception().printStackTrace();
7325	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7611,8 @@
7347	7611	return true;
7348	7612	}
7349	7613
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7351	7616	{
7352	7617	if (hitSomething == 0)
7353	7618	{
..	..	@@ -7361,7 +7626,7 @@
7361	7626
7362	7627	//System.out.println("hitSomething = " + hitSomething);
7363	7628
7364		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7630
7366	7631	cVector xlate = new cVector();
7367	7632	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7660,8 @@
7395	7660	toParent[3][i] = xlate.get(i);
7396	7661	LA.matInvert(toParent, fromParent);
7397	7662	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7665
7401	7666	LA.matCopy(startMat, toParent);
7402	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7670,7 @@
7405	7670	} else
7406	7671	{
7407	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7409	7674	cVector away = new cVector();
7410	7675	//cVector right2 = new cVector();
7411	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7687,19 @@
7422	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7688	// if (!CameraPane.LOCALTRANSFORM)
7424	7689	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7691	// if (!CameraPane.LOCALTRANSFORM)
7427	7692	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7693	//LA.vecCross(up, cVector.Z, right2);
7429	7694
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7696
7432	7697	//System.out.println("DELTA0 = " + delta);
7433	7698	//System.out.println("AWAY = " + info.camera.away);
7434	7699	//System.out.println("UP = " + info.camera.up);
7435	7700	if (away.z > 0)
7436	7701	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7703	{
7439	7704	delta.x = -delta.x;
7440	7705	} else
..	..	@@ -7449,7 +7714,7 @@
7449	7714	//System.out.println("DELTA1 = " + delta);
7450	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7716	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7718	LA.matCopy(startMat, toParent);
7454	7719	//System.out.println("DELTA3 = " + delta);
7455	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7724,8 @@
7459	7724	break;
7460	7725
7461	7726	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7464	7729	double angle = (double) Math.atan2(dx, dy);
7465	7730	angle = -(1.570796 - angle);
7466	7731
..	..	@@ -7483,7 +7748,7 @@
7483	7748	}
7484	7749	/**/
7485	7750
7486		- switch (info.pane.RenderCamera().viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7752	{
7488	7753	case 1: // '\001'
7489	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7775,7 @@
7510	7775	break;
7511	7776
7512	7777	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7514	7779	double sign = 1;
7515	7780	if (hScale < 0)
7516	7781	{
..	..	@@ -7522,7 +7787,7 @@
7522	7787	//hScale = 0.01;
7523	7788	}
7524	7789
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7526	7791	sign = 1;
7527	7792	if (vScale < 0)
7528	7793	{
..	..	@@ -7533,6 +7798,7 @@
7533	7798	{
7534	7799	//vScale = 0.01;
7535	7800	}
	7801	+
7536	7802	LA.matCopy(startMat, toParent);
7537	7803	/**/
7538	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7542,33 +7808,39 @@
7542	7808	}
7543	7809	/**/
7544	7810
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7812
7547	7813	if (totalScale < 0.01)
7548	7814	{
7549	7815	totalScale = 0.01;
7550	7816	}
7551	7817
7552		- switch (info.pane.RenderCamera().viewCode)
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7819	{
7554	7820	case 3: // '\001'
7555	7821	if (modified \|\| opposite)
7556	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7557	7826	//LA.matScale(toParent, 1, hScale, vScale);
7558		- LA.matScale(toParent, totalScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7559	7828	} // vScale, 1);
7560	7829	else
7561	7830	{
7562	7831	// EXCEPTION!
7563		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7564	7833	} // vScale, 1);
7565	7834	break;
7566	7835
7567	7836	case 2: // '\002'
7568	7837	if (modified \|\| opposite)
7569	7838	{
7570		- //LA.matScale(toParent, hScale, 1, vScale);
7571		- LA.matScale(toParent, 1, totalScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7572	7844	} else
7573	7845	{
7574	7846	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7578,8 +7850,11 @@
7578	7850	case 1: // '\003'
7579	7851	if (modified \|\| opposite)
7580	7852	{
7581		- //LA.matScale(toParent, hScale, vScale, 1);
7582		- LA.matScale(toParent, 1, 1, totalScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7583	7858	} else
7584	7859	{
7585	7860	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7616,7 +7891,7 @@
7616	7891	} // NEW ...
7617	7892
7618	7893
7619		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7620	7895	}
7621	7896
7622	7897	boolean overflow = false;
..	..	@@ -7796,6 +8071,10 @@
7796	8071	editWindow = null;
7797	8072	} // ?
7798	8073	}
	8074	+ else
	8075	+ {
	8076	+ //editWindow.closeUI();
	8077	+ }
7799	8078	}
7800	8079
7801	8080	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8232,10 @@
7953	8232	}
7954	8233
7955	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
7956	8239	transient ObjectUI objectUI;
7957	8240	public static int povDepth = 0;
7958	8241	private static cVector tbMin = new cVector();