~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,13 +22,20 @@
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	//
31	32
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
32	39	ScriptNode scriptnode;
33	40
34	41	void InitOthers()
..	..	@@ -170,24 +177,35 @@
170	177
171	178	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	179	{
	180	+ Object3D o;
	181	+
173	182	if (hashtable.containsKey(GetUUID()))
174	183	{
175		- Object3D o = hashtable.get(GetUUID());
	184	+ o = hashtable.get(GetUUID());
176	185
177	186	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
180	195
181		- return;
	196	+ hashtable.put(GetUUID(), o);
182	197	}
183	198
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	199	+ if (!blockloop)
189	200	{
190		- get(i).ExtractBigData(hashtable);
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
191	209	}
192	210
193	211	ExtractBigData(o);
..	..	@@ -195,11 +213,26 @@
195	213
196	214	void ExtractBigData(Object3D o)
197	215	{
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
198	219	o.bRep = this.bRep;
199		- if (this.bRep != null)
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
200	230	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
203	236	}
204	237
205	238	// o.support = this.support;
..	..	@@ -214,6 +247,29 @@
214	247	// this.fileparent = null;
215	248	}
216	249
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
217	273	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	274	{
219	275	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +279,35 @@
223	279
224	280	RestoreBigData(o);
225	281
226		- hashtable.remove(GetUUID());
	282	+ if (blockloop)
	283	+ return;
	284	+
	285	+ blockloop = true;
	286	+
	287	+ //hashtable.remove(GetUUID());
227	288
228	289	for (int i=0; i<Size(); i++)
229	290	{
230	291	get(i).RestoreBigData(hashtable);
231	292	}
	293	+
	294	+ blockloop = false;
232	295	}
233	296
234	297	void RestoreBigData(Object3D o)
235	298	{
236	299	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
239	311	// this.support = o.support;
240	312	// this.fileparent = o.fileparent;
241	313	}
..	..	@@ -381,6 +453,7 @@
381	453	}
382	454
383	455	boolean live = false;
	456	+ transient boolean keepdontselect;
384	457	boolean dontselect = false;
385	458	boolean hide = false;
386	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +954,7 @@
881	954
882	955	if (marked && Globals.isLIVE() && live &&
883	956	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	958	currentframe != Globals.framecount)
886	959	{
887	960	currentframe = Globals.framecount;
..	..	@@ -966,6 +1039,10 @@
966	1039	if (material == null \|\| material.multiply)
967	1040	return true;
968	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1046	return material.opacity > 0.99;
970	1047	}
971	1048
..	..	@@ -1366,6 +1443,7 @@
1366	1443	toParent = LA.newMatrix();
1367	1444	fromParent = LA.newMatrix();
1368	1445	}
	1446	+
1369	1447	LA.matCopy(other.toParent, toParent);
1370	1448	LA.matCopy(other.fromParent, fromParent);
1371	1449
..	..	@@ -2387,6 +2465,15 @@
2387	2465	}
2388	2466	*/
2389	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2390	2477	}
2391	2478
2392	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2515,14 @@
2428	2515	{
2429	2516	editWindow.refreshContents();
2430	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2431	2526	//if (parent != null)
2432	2527	//parent.refreshEditWindow();
2433	2528	}
..	..	@@ -2507,7 +2602,8 @@
2507	2602	private static final int editSelf = 1;
2508	2603	private static final int editChild = 2;
2509	2604
2510		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2511	2607	{
2512	2608	if (level == 0)
2513	2609	{
..	..	@@ -2515,7 +2611,8 @@
2515	2611	return;
2516	2612
2517	2613	Object3D selectee;
2518		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2519	2616	{
2520	2617	selectee = (Object3D) e.nextElement();
2521	2618	}
..	..	@@ -2523,19 +2620,22 @@
2523	2620	} else
2524	2621	{
2525	2622	//super.
2526		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2527	2625	}
2528	2626	}
2529	2627
2530		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2531	2630	{
2532	2631	doSomething = 0;
2533	2632	if (level == 0)
2534	2633	{
2535		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2536	2635	}
2537	2636	if (//super.
2538		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2539	2639	{
2540	2640	doSomething = 1;
2541	2641	return true;
..	..	@@ -2545,7 +2645,7 @@
2545	2645	}
2546	2646	}
2547	2647
2548		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2549	2649	{
2550	2650	if (selection == null)
2551	2651	{
..	..	@@ -2558,7 +2658,8 @@
2558	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2659	{
2560	2660	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2562	2663	{
2563	2664	childToDrag = selectee;
2564	2665	doSomething = 2;
..	..	@@ -2570,13 +2671,15 @@
2570	2671	return retval;
2571	2672	}
2572	2673
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2574	2676	{
2575	2677	switch (doSomething)
2576	2678	{
2577	2679	case 1: // '\001'
2578	2680	//super.
2579		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2580	2683	break;
2581	2684
2582	2685	case 2: // '\002'
..	..	@@ -2589,11 +2692,13 @@
2589	2692	{
2590	2693	//sel.hitSomething = childToDrag.hitSomething;
2591	2694	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2593	2697	} else
2594	2698	{
2595	2699	//super.
2596		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2597	2702	}
2598	2703	}
2599	2704	break;
..	..	@@ -2611,6 +2716,9 @@
2611	2716	{
2612	2717	deselectAll();
2613	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2614	2722	ClickInfo newInfo = new ClickInfo();
2615	2723	newInfo.flags = info.flags;
2616	2724	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3166,7 @@
3058	3166	{
3059	3167	if (bRep != null)
3060	3168	{
3061		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3170	Touch();
3063	3171	}
3064	3172	}
..	..	@@ -4958,6 +5066,14 @@
4958	5066	}
4959	5067	}
4960	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4961	5077	cTreePath Select(int indexcount, boolean deselect)
4962	5078	{
4963	5079	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5110,11 @@
4994	5110	if (leaf != null)
4995	5111	{
4996	5112	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4998	5115	{
4999	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
5001	5118	}
5002	5119
5003	5120	return tp;
..	..	@@ -5014,6 +5131,7 @@
5014	5131
5015	5132	if (child == null)
5016	5133	continue;
	5134	+
5017	5135	if (child.HasTransparency() && child.size() != 0)
5018	5136	{
5019	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5141,10 @@
5023	5141	if (leaf != null)
5024	5142	{
5025	5143	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
5027	5146	{
5028		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
5029	5148	}
5030	5149
5031	5150	return tp;
..	..	@@ -5350,6 +5469,51 @@
5350	5469	blockloop = false;
5351	5470	}
5352	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5353	5517	boolean IsSelected()
5354	5518	{
5355	5519	if (parent == null)
..	..	@@ -5410,6 +5574,11 @@
5410	5574	if (fullname == null)
5411	5575	return "";
5412	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5413	5582	// System.out.println("Fullname = " + fullname);
5414	5583
5415	5584	// Does not work on Windows due to C:
..	..	@@ -5422,7 +5591,7 @@
5422	5591
5423	5592	if (split.length == 0)
5424	5593	{
5425		- return "";
	5594	+ return fullname.pigment = "";
5426	5595	}
5427	5596
5428	5597	if (split.length <= 2)
..	..	@@ -5430,22 +5599,27 @@
5430	5599	if (fullname.name.endsWith(":"))
5431	5600	{
5432	5601	// Windows
5433		- return fullname.name.substring(0, fullname.name.length()-1);
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5434	5603	}
5435	5604
5436		- return split[0];
	5605	+ return fullname.pigment = split[0];
5437	5606	}
5438	5607
5439	5608	// Windows
5440	5609	assert(split.length == 4);
5441	5610
5442		- return split[0] + ":" + split[1];
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5443	5612	}
5444	5613
5445	5614	static String GetBump(cTexture fullname)
5446	5615	{
5447	5616	if (fullname == null)
5448	5617	return "";
	5618	+
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
5449	5623
5450	5624	// System.out.println("Fullname = " + fullname);
5451	5625	// Does not work on Windows due to C:
..	..	@@ -5457,12 +5631,12 @@
5457	5631
5458	5632	if (split.length == 0)
5459	5633	{
5460		- return "";
	5634	+ return fullname.bump = "";
5461	5635	}
5462	5636
5463	5637	if (split.length == 1)
5464	5638	{
5465		- return "";
	5639	+ return fullname.bump = "";
5466	5640	}
5467	5641
5468	5642	if (split.length == 2)
..	..	@@ -5470,16 +5644,16 @@
5470	5644	if (fullname.name.endsWith(":"))
5471	5645	{
5472	5646	// Windows
5473		- return "";
	5647	+ return fullname.bump = "";
5474	5648	}
5475	5649
5476		- return split[1];
	5650	+ return fullname.bump = split[1];
5477	5651	}
5478	5652
5479	5653	// Windows
5480	5654	assert(split.length == 4);
5481	5655
5482		- return split[2] + ":" + split[3];
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5483	5657	}
5484	5658
5485	5659	String GetPigmentTexture()
..	..	@@ -5562,6 +5736,9 @@
5562	5736	texname = "";
5563	5737
5564	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5565	5742	Touch();
5566	5743	}
5567	5744
..	..	@@ -5635,6 +5812,8 @@
5635	5812
5636	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5637	5814
	5815	+ GetTextures().bump = null;
	5816	+
5638	5817	Touch();
5639	5818	}
5640	5819
..	..	@@ -5655,6 +5834,38 @@
5655	5834
5656	5835	blockloop = true;
5657	5836	child.ResetBumpTexture();
	5837	+ blockloop = false;
	5838	+ }
	5839	+ }
	5840	+
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
5658	5869	blockloop = false;
5659	5870	}
5660	5871	}
..	..	@@ -5745,8 +5956,10 @@
5745	5956	if (support != null)
5746	5957	support = support;
5747	5958
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);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5750	5963
5751	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	5965	{
..	..	@@ -5756,8 +5969,9 @@
5756	5969	// usecalllists &= !(parent instanceof RandomNode);
5757	5970	// usecalllists = false;
5758	5971
5759		- if (GetBRep() != null)
5760		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5761	5975	//System.out.println("draw " + this);
5762	5976	//new Exception().printStackTrace();
5763	5977
..	..	@@ -5767,7 +5981,7 @@
5767	5981
5768	5982	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	5983	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5984	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	5985	{
5772	5986	Globals.lighttouched = true;
5773	5987	} // all panes...
..	..	@@ -5779,7 +5993,7 @@
5779	5993	if (!(this instanceof Composite))
5780	5994	touched = false;
5781	5995	//if (displaylist == -1 && usecalllists)
5782		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5783	5997	{
5784	5998	bRep.displaylist = display.GenList();
5785	5999	assert(bRep.displaylist != 0);
..	..	@@ -5790,7 +6004,7 @@
5790	6004
5791	6005	//System.out.println("\tnew list " + list);
5792	6006	//gl.glDrawBuffer(gl.GL_NONE);
5793		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5794	6008	{
5795	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5796	6010	display.NewList(bRep.displaylist);
..	..	@@ -5799,7 +6013,7 @@
5799	6013	CallList(display, root, selected, blocked);
5800	6014
5801	6015	// compiled = true;
5802		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5803	6017	{
5804	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5805	6019	display.EndList();
..	..	@@ -5899,6 +6113,7 @@
5899	6113	if (GetBRep() != null)
5900	6114	{
5901	6115	display.NextIndex();
	6116	+
5902	6117	// vertex color conflict : gl.glCallList(list);
5903	6118	DrawNode(display, root, selected);
5904	6119	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6574,11 @@
6359	6574	// dec 2012
6360	6575	new Exception().printStackTrace();
6361	6576	return;
	6577	+ }
	6578	+
	6579	+ if (dontselect)
	6580	+ {
	6581	+ //bRep.GenerateNormalsMINE();
6362	6582	}
6363	6583
6364	6584	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7364,23 @@
7144	7364	}
7145	7365	}
7146	7366
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
7148	7371	{
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;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
7152	7375	if (toscreen == null)
7153	7376	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7378	}
7156	7379	cVector vec = in;
7157	7380	LA.xformPos(in, toscreen, in);
7158	7381	//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();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7384	outPt.x = hc + (int) vec.x;
7162	7385	outPt.y = vc - (int) vec.y;
7163	7386	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7388,18 @@
7165	7388	outRec.width = outRec.height = 6;
7166	7389	}
7167	7390
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
7169	7393	{
7170	7394	Point pt = new Point(0, 0);
7171	7395	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
7173	7398	return rec;
7174	7399	}
7175	7400
7176		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
7177	7403	{
7178	7404	if (level == 0)
7179	7405	{
..	..	@@ -7182,16 +7408,19 @@
7182	7408	{
7183	7409	cVector origin = new cVector();
7184	7410	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7415	Rectangle boundary = new Rectangle();
7187	7416	boundary.x = spot.x - 30;
7188	7417	boundary.y = spot.y - 30;
7189	7418	boundary.width = spot.width + 60;
7190	7419	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.red);
7192	7421	int spotw = spot.x + spot.width;
7193	7422	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7424	// if (CameraPane.Xmin > spot.x)
7196	7425	// {
7197	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -7208,11 +7437,6 @@
7208	7437	// {
7209	7438	// CameraPane.Ymax = spoth;
7210	7439	// }
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	7440	// if (CameraPane.Xmin > spot.x)
7217	7441	// {
7218	7442	// CameraPane.Xmin = spot.x;
..	..	@@ -7231,10 +7455,15 @@
7231	7455	// }
7232	7456	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7457	//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);
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
	7463	+ spotw = spot.x + spot.width;
	7464	+ spoth = spot.y + spot.height;
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7238	7467	// if (CameraPane.Xmin > spot.x)
7239	7468	// {
7240	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7480,9 @@
7251	7480	// {
7252	7481	// CameraPane.Ymax = spoth;
7253	7482	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7487	// if (CameraPane.Xmin > boundary.x)
7258	7488	// {
..	..	@@ -7274,7 +7504,8 @@
7274	7504	}
7275	7505	}
7276	7506
7277		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
7278	7509	{
7279	7510	if (level == 0)
7280	7511	{
..	..	@@ -7283,8 +7514,8 @@
7283	7514
7284	7515	boolean retval = false;
7285	7516
7286		- startX = info.x;
7287		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
7288	7519
7289	7520	hitSomething = -1;
7290	7521	cVector origin = new cVector();
..	..	@@ -7294,22 +7525,53 @@
7294	7525	{
7295	7526	centerPt = new Point(0, 0);
7296	7527	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7531	{
7300	7532	hitSomething = hitCenter;
7301	7533	retval = true;
7302	7534	}
7303	7535	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7537	{
7306	7538	hitSomething = hitRotate;
7307	7539	retval = true;
7308	7540	}
7309	7541	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7545	{
7312	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
7313	7575	retval = true;
7314	7576	}
7315	7577
..	..	@@ -7319,7 +7581,7 @@
7319	7581	}
7320	7582
7321	7583	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7585	//System.out.println("modified = " + modified);
7324	7586	//new Exception().printStackTrace();
7325	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7609,8 @@
7347	7609	return true;
7348	7610	}
7349	7611
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
7351	7614	{
7352	7615	if (hitSomething == 0)
7353	7616	{
..	..	@@ -7361,7 +7624,7 @@
7361	7624
7362	7625	//System.out.println("hitSomething = " + hitSomething);
7363	7626
7364		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7628
7366	7629	cVector xlate = new cVector();
7367	7630	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7658,8 @@
7395	7658	toParent[3][i] = xlate.get(i);
7396	7659	LA.matInvert(toParent, fromParent);
7397	7660	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7663
7401	7664	LA.matCopy(startMat, toParent);
7402	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7668,7 @@
7405	7668	} else
7406	7669	{
7407	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7409	7672	cVector away = new cVector();
7410	7673	//cVector right2 = new cVector();
7411	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7685,19 @@
7422	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7686	// if (!CameraPane.LOCALTRANSFORM)
7424	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7689	// if (!CameraPane.LOCALTRANSFORM)
7427	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7691	//LA.vecCross(up, cVector.Z, right2);
7429	7692
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7694
7432	7695	//System.out.println("DELTA0 = " + delta);
7433	7696	//System.out.println("AWAY = " + info.camera.away);
7434	7697	//System.out.println("UP = " + info.camera.up);
7435	7698	if (away.z > 0)
7436	7699	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7701	{
7439	7702	delta.x = -delta.x;
7440	7703	} else
..	..	@@ -7449,7 +7712,7 @@
7449	7712	//System.out.println("DELTA1 = " + delta);
7450	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7714	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7716	LA.matCopy(startMat, toParent);
7454	7717	//System.out.println("DELTA3 = " + delta);
7455	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7722,8 @@
7459	7722	break;
7460	7723
7461	7724	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7464	7727	double angle = (double) Math.atan2(dx, dy);
7465	7728	angle = -(1.570796 - angle);
7466	7729
..	..	@@ -7483,7 +7746,7 @@
7483	7746	}
7484	7747	/**/
7485	7748
7486		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7750	{
7488	7751	case 1: // '\001'
7489	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7773,7 @@
7510	7773	break;
7511	7774
7512	7775	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7514	7777	double sign = 1;
7515	7778	if (hScale < 0)
7516	7779	{
..	..	@@ -7522,7 +7785,7 @@
7522	7785	//hScale = 0.01;
7523	7786	}
7524	7787
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7526	7789	sign = 1;
7527	7790	if (vScale < 0)
7528	7791	{
..	..	@@ -7533,6 +7796,7 @@
7533	7796	{
7534	7797	//vScale = 0.01;
7535	7798	}
	7799	+
7536	7800	LA.matCopy(startMat, toParent);
7537	7801	/**/
7538	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7542,14 +7806,14 @@
7542	7806	}
7543	7807	/**/
7544	7808
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7810
7547	7811	if (totalScale < 0.01)
7548	7812	{
7549	7813	totalScale = 0.01;
7550	7814	}
7551	7815
7552		- switch (info.pane.RenderCamera().viewCode)
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7817	{
7554	7818	case 3: // '\001'
7555	7819	if (modified \|\| opposite)
..	..	@@ -7616,7 +7880,7 @@
7616	7880	} // NEW ...
7617	7881
7618	7882
7619		- info.pane.repaint();
	7883	+ clickInfo.pane.repaint();
7620	7884	}
7621	7885
7622	7886	boolean overflow = false;
..	..	@@ -7796,6 +8060,10 @@
7796	8060	editWindow = null;
7797	8061	} // ?
7798	8062	}
	8063	+ else
	8064	+ {
	8065	+ //editWindow.closeUI();
	8066	+ }
7799	8067	}
7800	8068
7801	8069	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8221,10 @@
7953	8221	}
7954	8222
7955	8223	transient ObjEditor editWindow;
	8224	+ transient ObjEditor manipWindow;
	8225	+
	8226	+ transient boolean pinned;
	8227	+
7956	8228	transient ObjectUI objectUI;
7957	8229	public static int povDepth = 0;
7958	8230	private static cVector tbMin = new cVector();