~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,14 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
30	30	//
31	31
	32	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
32	35	ScriptNode scriptnode;
33	36
34	37	void InitOthers()
..	..	@@ -170,24 +173,35 @@
170	173
171	174	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	175	{
	176	+ Object3D o;
	177	+
173	178	if (hashtable.containsKey(GetUUID()))
174	179	{
175		- Object3D o = hashtable.get(GetUUID());
	180	+ o = hashtable.get(GetUUID());
176	181
177		- assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
180	191
181		- return;
	192	+ hashtable.put(GetUUID(), o);
182	193	}
183	194
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	195	+ if (!blockloop)
189	196	{
190		- get(i).ExtractBigData(hashtable);
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
191	205	}
192	206
193	207	ExtractBigData(o);
..	..	@@ -195,11 +209,26 @@
195	209
196	210	void ExtractBigData(Object3D o)
197	211	{
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
198	215	o.bRep = this.bRep;
199		- if (this.bRep != null)
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
200	226	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
203	232	}
204	233
205	234	// o.support = this.support;
..	..	@@ -223,19 +252,35 @@
223	252
224	253	RestoreBigData(o);
225	254
226		- hashtable.remove(GetUUID());
	255	+ if (blockloop)
	256	+ return;
	257	+
	258	+ blockloop = true;
	259	+
	260	+ //hashtable.remove(GetUUID());
227	261
228	262	for (int i=0; i<Size(); i++)
229	263	{
230	264	get(i).RestoreBigData(hashtable);
231	265	}
	266	+
	267	+ blockloop = false;
232	268	}
233	269
234	270	void RestoreBigData(Object3D o)
235	271	{
236	272	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
239	284	// this.support = o.support;
240	285	// this.fileparent = o.fileparent;
241	286	}
..	..	@@ -381,6 +426,7 @@
381	426	}
382	427
383	428	boolean live = false;
	429	+ transient boolean keepdontselect;
384	430	boolean dontselect = false;
385	431	boolean hide = false;
386	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -563,12 +609,14 @@
563	609	toParent = LA.newMatrix();
564	610	fromParent = LA.newMatrix();
565	611	}
	612	+
566	613	if (toParentMarked == null)
567	614	{
568	615	if (maxcount != 1)
569	616	{
570	617	new Exception().printStackTrace();
571	618	}
	619	+
572	620	toParentMarked = LA.newMatrix();
573	621	fromParentMarked = LA.newMatrix();
574	622	}
..	..	@@ -879,7 +927,7 @@
879	927
880	928	if (marked && Globals.isLIVE() && live &&
881	929	//TEMP21aug2018
882		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
883	931	currentframe != Globals.framecount)
884	932	{
885	933	currentframe = Globals.framecount;
..	..	@@ -891,7 +939,8 @@
891	939
892	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
893	941
894		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
895	944	{
896	945	countdown = 1;
897	946	delay = speedup?8:1;
..	..	@@ -963,6 +1012,7 @@
963	1012	if (material == null \|\| material.multiply)
964	1013	return true;
965	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
966	1016	return material.opacity > 0.99;
967	1017	}
968	1018
..	..	@@ -1363,6 +1413,7 @@
1363	1413	toParent = LA.newMatrix();
1364	1414	fromParent = LA.newMatrix();
1365	1415	}
	1416	+
1366	1417	LA.matCopy(other.toParent, toParent);
1367	1418	LA.matCopy(other.fromParent, fromParent);
1368	1419
..	..	@@ -2384,6 +2435,10 @@
2384	2435	}
2385	2436	*/
2386	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2387	2442	}
2388	2443
2389	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2425,6 +2480,14 @@
2425	2480	{
2426	2481	editWindow.refreshContents();
2427	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2428	2491	//if (parent != null)
2429	2492	//parent.refreshEditWindow();
2430	2493	}
..	..	@@ -2504,7 +2567,8 @@
2504	2567	private static final int editSelf = 1;
2505	2568	private static final int editChild = 2;
2506	2569
2507		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2508	2572	{
2509	2573	if (level == 0)
2510	2574	{
..	..	@@ -2512,7 +2576,8 @@
2512	2576	return;
2513	2577
2514	2578	Object3D selectee;
2515		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2579	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2580	+ level + 1))
2516	2581	{
2517	2582	selectee = (Object3D) e.nextElement();
2518	2583	}
..	..	@@ -2520,19 +2585,22 @@
2520	2585	} else
2521	2586	{
2522	2587	//super.
2523		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2524	2590	}
2525	2591	}
2526	2592
2527		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2528	2595	{
2529	2596	doSomething = 0;
2530	2597	if (level == 0)
2531	2598	{
2532		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2533	2600	}
2534	2601	if (//super.
2535		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2536	2604	{
2537	2605	doSomething = 1;
2538	2606	return true;
..	..	@@ -2542,7 +2610,7 @@
2542	2610	}
2543	2611	}
2544	2612
2545		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2546	2614	{
2547	2615	if (selection == null)
2548	2616	{
..	..	@@ -2555,7 +2623,8 @@
2555	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2556	2624	{
2557	2625	Object3D selectee = (Object3D) e.nextElement();
2558		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2559	2628	{
2560	2629	childToDrag = selectee;
2561	2630	doSomething = 2;
..	..	@@ -2567,13 +2636,15 @@
2567	2636	return retval;
2568	2637	}
2569	2638
2570		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2571	2641	{
2572	2642	switch (doSomething)
2573	2643	{
2574	2644	case 1: // '\001'
2575	2645	//super.
2576		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2577	2648	break;
2578	2649
2579	2650	case 2: // '\002'
..	..	@@ -2586,11 +2657,13 @@
2586	2657	{
2587	2658	//sel.hitSomething = childToDrag.hitSomething;
2588	2659	//childToDrag.doEditDrag(info);
2589		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2590	2662	} else
2591	2663	{
2592	2664	//super.
2593		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2594	2667	}
2595	2668	}
2596	2669	break;
..	..	@@ -2608,6 +2681,9 @@
2608	2681	{
2609	2682	deselectAll();
2610	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2611	2687	ClickInfo newInfo = new ClickInfo();
2612	2688	newInfo.flags = info.flags;
2613	2689	newInfo.bounds = info.bounds;
..	..	@@ -3055,7 +3131,7 @@
3055	3131	{
3056	3132	if (bRep != null)
3057	3133	{
3058		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3059	3135	Touch();
3060	3136	}
3061	3137	}
..	..	@@ -3501,7 +3577,8 @@
3501	3577	if (blockloop)
3502	3578	return;
3503	3579
3504		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3580	+ if (//marked \|\| // does not make sense
	3581	+ (bRep != null \|\| material != null)) // borderline...
3505	3582	live = h;
3506	3583
3507	3584	for (int i = 0; i < Size(); i++)
..	..	@@ -3522,7 +3599,8 @@
3522	3599	return;
3523	3600
3524	3601	//if (bRep != null)
3525		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3602	+ if (//marked \|\| // does not make sense
	3603	+ (bRep != null \|\| material != null)) // borderline...
3526	3604	link2master = h;
3527	3605
3528	3606	for (int i = 0; i < Size(); i++)
..	..	@@ -3542,7 +3620,8 @@
3542	3620	if (blockloop)
3543	3621	return;
3544	3622
3545		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3623	+ if (//marked \|\| // does not make sense
	3624	+ (bRep != null \|\| material != null)) // borderline...
3546	3625	hide = h;
3547	3626
3548	3627	for (int i = 0; i < Size(); i++)
..	..	@@ -3562,7 +3641,7 @@
3562	3641	if (blockloop)
3563	3642	return;
3564	3643
3565		- if (bRep != null && material != null) // borderline...
	3644	+ if (bRep != null \|\| material != null) // borderline...
3566	3645	marked = h;
3567	3646
3568	3647	for (int i = 0; i < Size(); i++)
..	..	@@ -3572,6 +3651,46 @@
3572	3651	continue;
3573	3652	blockloop = true;
3574	3653	child.MarkLeaves(h);
	3654	+ blockloop = false;
	3655	+ // release(i);
	3656	+ }
	3657	+ }
	3658	+
	3659	+ void RewindLeaves(boolean h)
	3660	+ {
	3661	+ if (blockloop)
	3662	+ return;
	3663	+
	3664	+ if (bRep != null \|\| material != null) // borderline...
	3665	+ rewind = h;
	3666	+
	3667	+ for (int i = 0; i < Size(); i++)
	3668	+ {
	3669	+ Object3D child = (Object3D) get(i); // reserve(i);
	3670	+ if (child == null)
	3671	+ continue;
	3672	+ blockloop = true;
	3673	+ child.RewindLeaves(h);
	3674	+ blockloop = false;
	3675	+ // release(i);
	3676	+ }
	3677	+ }
	3678	+
	3679	+ void RandomLeaves(boolean h)
	3680	+ {
	3681	+ if (blockloop)
	3682	+ return;
	3683	+
	3684	+ if (bRep != null \|\| material != null) // borderline...
	3685	+ random = h;
	3686	+
	3687	+ for (int i = 0; i < Size(); i++)
	3688	+ {
	3689	+ Object3D child = (Object3D) get(i); // reserve(i);
	3690	+ if (child == null)
	3691	+ continue;
	3692	+ blockloop = true;
	3693	+ child.RandomLeaves(h);
3575	3694	blockloop = false;
3576	3695	// release(i);
3577	3696	}
..	..	@@ -4349,6 +4468,55 @@
4349	4468	}
4350	4469	}
4351	4470
	4471	+ void RepairSOV()
	4472	+ {
	4473	+ if (blockloop)
	4474	+ return;
	4475	+
	4476	+ String texname = this.GetPigmentTexture();
	4477	+
	4478	+ if (texname.startsWith("sov"))
	4479	+ {
	4480	+ String[] s = texname.split("/");
	4481	+
	4482	+ String[] sname = s[1].split("Color.pn");
	4483	+
	4484	+ texname = sname[0];
	4485	+
	4486	+ if (sname.length > 1)
	4487	+ {
	4488	+ texname += "Color.jpg";
	4489	+ }
	4490	+
	4491	+ this.SetPigmentTexture("sov/" + texname);
	4492	+ }
	4493	+
	4494	+ texname = this.GetBumpTexture();
	4495	+
	4496	+ if (texname.startsWith("sov"))
	4497	+ {
	4498	+ String[] s = texname.split("/");
	4499	+
	4500	+ String[] sname = s[1].split("Bump.pn");
	4501	+
	4502	+ texname = sname[0];
	4503	+
	4504	+ if (sname.length > 1)
	4505	+ {
	4506	+ texname += "Bump.jpg";
	4507	+ }
	4508	+
	4509	+ this.SetBumpTexture("sov/" + texname);
	4510	+ }
	4511	+
	4512	+ for (int i=0; i<Size(); i++)
	4513	+ {
	4514	+ blockloop = true;
	4515	+ get(i).RepairSOV();
	4516	+ blockloop = false;
	4517	+ }
	4518	+ }
	4519	+
4352	4520	void RepairTexture()
4353	4521	{
4354	4522	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4863,6 +5031,14 @@
4863	5031	}
4864	5032	}
4865	5033
	5034	+ ObjEditor GetWindow()
	5035	+ {
	5036	+ if (editWindow != null)
	5037	+ return editWindow;
	5038	+
	5039	+ return manipWindow;
	5040	+ }
	5041	+
4866	5042	cTreePath Select(int indexcount, boolean deselect)
4867	5043	{
4868	5044	if (hide \|\| dontselect)
..	..	@@ -4899,10 +5075,11 @@
4899	5075	if (leaf != null)
4900	5076	{
4901	5077	cTreePath tp = new cTreePath(this, leaf);
4902		- if (editWindow != null)
	5078	+ ObjEditor window = GetWindow();
	5079	+ if (window != null)
4903	5080	{
4904	5081	//System.out.println("editWindow = " + editWindow + " vs " + this);
4905		- editWindow.Select(tp, deselect, true);
	5082	+ window.Select(tp, deselect, true);
4906	5083	}
4907	5084
4908	5085	return tp;
..	..	@@ -4919,6 +5096,7 @@
4919	5096
4920	5097	if (child == null)
4921	5098	continue;
	5099	+
4922	5100	if (child.HasTransparency() && child.size() != 0)
4923	5101	{
4924	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4928,9 +5106,10 @@
4928	5106	if (leaf != null)
4929	5107	{
4930	5108	cTreePath tp = new cTreePath(this, leaf);
4931		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4932	5111	{
4933		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4934	5113	}
4935	5114
4936	5115	return tp;
..	..	@@ -5255,6 +5434,51 @@
5255	5434	blockloop = false;
5256	5435	}
5257	5436
	5437	+ void ResetSelectable()
	5438	+ {
	5439	+ if (blockloop)
	5440	+ return;
	5441	+
	5442	+ blockloop = true;
	5443	+
	5444	+ keepdontselect = dontselect;
	5445	+ dontselect = true;
	5446	+
	5447	+ Object3D child;
	5448	+ int nb = Size();
	5449	+ for (int i = 0; i < nb; i++)
	5450	+ {
	5451	+ child = (Object3D) get(i);
	5452	+ if (child == null)
	5453	+ continue;
	5454	+ child.ResetSelectable();
	5455	+ }
	5456	+
	5457	+ blockloop = false;
	5458	+ }
	5459	+
	5460	+ void RestoreSelectable()
	5461	+ {
	5462	+ if (blockloop)
	5463	+ return;
	5464	+
	5465	+ blockloop = true;
	5466	+
	5467	+ dontselect = keepdontselect;
	5468	+
	5469	+ Object3D child;
	5470	+ int nb = Size();
	5471	+ for (int i = 0; i < nb; i++)
	5472	+ {
	5473	+ child = (Object3D) get(i);
	5474	+ if (child == null)
	5475	+ continue;
	5476	+ child.RestoreSelectable();
	5477	+ }
	5478	+
	5479	+ blockloop = false;
	5480	+ }
	5481	+
5258	5482	boolean IsSelected()
5259	5483	{
5260	5484	if (parent == null)
..	..	@@ -5564,6 +5788,38 @@
5564	5788	}
5565	5789	}
5566	5790
	5791	+ void EmbedTextures(boolean embed)
	5792	+ {
	5793	+ if (blockloop)
	5794	+ return;
	5795	+
	5796	+ //if (GetTextures() != null)
	5797	+ if (embed)
	5798	+ CameraPane.EmbedTextures(GetTextures());
	5799	+ else
	5800	+ {
	5801	+ GetTextures().pigmentdata = null;
	5802	+ GetTextures().bumpdata = null;
	5803	+ GetTextures().pw = 0;
	5804	+ GetTextures().ph = 0;
	5805	+ GetTextures().bw = 0;
	5806	+ GetTextures().bh = 0;
	5807	+ }
	5808	+
	5809	+ int nb = Size();
	5810	+ for (int i = 0; i < nb; i++)
	5811	+ {
	5812	+ Object3D child = (Object3D) get(i);
	5813	+
	5814	+ if (child == null)
	5815	+ continue;
	5816	+
	5817	+ blockloop = true;
	5818	+ child.EmbedTextures(embed);
	5819	+ blockloop = false;
	5820	+ }
	5821	+ }
	5822	+
5567	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5568	5824	{
5569	5825	Draw(display, root, selected, blocked);
..	..	@@ -5572,12 +5828,23 @@
5572	5828	boolean NeedSupport()
5573	5829	{
5574	5830	return
5575		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5831	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5576	5832	// PROBLEM with CROWD!!
5577	5833	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5578	5834	}
5579	5835
5580	5836	static boolean DEBUG_SELECTION = false;
	5837	+
	5838	+ boolean IsLive()
	5839	+ {
	5840	+ if (live)
	5841	+ return true;
	5842	+
	5843	+ if (parent == null)
	5844	+ return false;
	5845	+
	5846	+ return parent.IsLive();
	5847	+ }
5581	5848
5582	5849	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5583	5850	{
..	..	@@ -5640,7 +5907,7 @@
5640	5907	support = support;
5641	5908
5642	5909	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5644	5911
5645	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646	5913	{
..	..	@@ -5660,10 +5927,12 @@
5660	5927	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5661	5928
5662	5929	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5930	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5664	5932	{
5665	5933	Globals.lighttouched = true;
5666	5934	} // all panes...
	5935	+
5667	5936	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5668	5937	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5669	5938	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5791,6 +6060,7 @@
5791	6060	if (GetBRep() != null)
5792	6061	{
5793	6062	display.NextIndex();
	6063	+
5794	6064	// vertex color conflict : gl.glCallList(list);
5795	6065	DrawNode(display, root, selected);
5796	6066	if (this instanceof BezierPatch)
..	..	@@ -5831,16 +6101,27 @@
5831	6101	tex = GetTextures();
5832	6102	}
5833	6103
5834		- boolean failed = false;
	6104	+ boolean failedPigment = false;
	6105	+ boolean failedBump = false;
5835	6106
5836	6107	try
5837	6108	{
5838		- display.BindTextures(tex, texres);
	6109	+ display.BindPigmentTexture(tex, texres);
5839	6110	}
5840	6111	catch (Exception e)
5841	6112	{
5842	6113	System.err.println("FAILED: " + this);
5843		- failed = true;
	6114	+ failedPigment = true;
	6115	+ }
	6116	+
	6117	+ try
	6118	+ {
	6119	+ display.BindBumpTexture(tex, texres);
	6120	+ }
	6121	+ catch (Exception e)
	6122	+ {
	6123	+ //System.err.println("FAILED: " + this);
	6124	+ failedBump = true;
5844	6125	}
5845	6126
5846	6127	if (!compiled)
..	..	@@ -5863,8 +6144,11 @@
5863	6144	}
5864	6145	}
5865	6146
5866		- if (!failed)
5867		- display.ReleaseTextures(tex);
	6147	+ if (!failedBump)
	6148	+ display.ReleaseBumpTexture(tex);
	6149	+
	6150	+ if (!failedPigment)
	6151	+ display.ReleasePigmentTexture(tex);
5868	6152
5869	6153	display.PopMaterial(this, selected);
5870	6154	}
..	..	@@ -6237,6 +6521,11 @@
6237	6521	// dec 2012
6238	6522	new Exception().printStackTrace();
6239	6523	return;
	6524	+ }
	6525	+
	6526	+ if (dontselect)
	6527	+ {
	6528	+ //bRep.GenerateNormalsMINE();
6240	6529	}
6241	6530
6242	6531	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7022,20 +7311,23 @@
7022	7311	}
7023	7312	}
7024	7313
7025		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7314	+ static ClickInfo clickInfo = new ClickInfo();
	7315	+
	7316	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7317	+ Point outPt, Rectangle outRec)
7026	7318	{
7027		- int hc = info.bounds.x + info.bounds.width / 2;
7028		- int vc = info.bounds.y + info.bounds.height / 2;
7029		- double[][] toscreen = info.toScreen;
	7319	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7320	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7321	+ double[][] toscreen = clickInfo.toScreen;
7030	7322	if (toscreen == null)
7031	7323	{
7032		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7033	7325	}
7034	7326	cVector vec = in;
7035	7327	LA.xformPos(in, toscreen, in);
7036	7328	//System.out.println("Distance = " + info.camera.Distance());
7037		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7038		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7039	7331	outPt.x = hc + (int) vec.x;
7040	7332	outPt.y = vc - (int) vec.y;
7041	7333	outRec.x = outPt.x - 3;
..	..	@@ -7043,15 +7335,18 @@
7043	7335	outRec.width = outRec.height = 6;
7044	7336	}
7045	7337
7046		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
7047	7340	{
7048	7341	Point pt = new Point(0, 0);
7049	7342	Rectangle rec = new Rectangle();
7050		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
7051	7345	return rec;
7052	7346	}
7053	7347
7054		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7055	7350	{
7056	7351	if (level == 0)
7057	7352	{
..	..	@@ -7060,16 +7355,19 @@
7060	7355	{
7061	7356	cVector origin = new cVector();
7062	7357	//LA.xformPos(origin, toParent, origin);
7063		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7064	7362	Rectangle boundary = new Rectangle();
7065	7363	boundary.x = spot.x - 30;
7066	7364	boundary.y = spot.y - 30;
7067	7365	boundary.width = spot.width + 60;
7068	7366	boundary.height = spot.height + 60;
7069		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7070	7368	int spotw = spot.x + spot.width;
7071	7369	int spoth = spot.y + spot.height;
7072		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7073	7371	// if (CameraPane.Xmin > spot.x)
7074	7372	// {
7075	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7089,8 +7387,8 @@
7089	7387	spot.translate(32, 32);
7090	7388	spotw = spot.x + spot.width;
7091	7389	spoth = spot.y + spot.height;
7092		- info.g.setColor(Color.blue);
7093		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7390	+ clickInfo.g.setColor(Color.cyan);
	7391	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7094	7392	// if (CameraPane.Xmin > spot.x)
7095	7393	// {
7096	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7107,11 +7405,12 @@
7107	7405	// {
7108	7406	// CameraPane.Ymax = spoth;
7109	7407	// }
7110		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7408	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7409	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7112	7410	spot.translate(0, -32);
7113		- info.g.setColor(Color.green);
7114		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
7115	7414	// if (CameraPane.Xmin > spot.x)
7116	7415	// {
7117	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7128,8 +7427,8 @@
7128	7427	// {
7129	7428	// CameraPane.Ymax = spoth;
7130	7429	// }
7131		- info.g.drawArc(boundary.x, boundary.y,
7132		- boundary.width, boundary.height, 0, 360);
	7430	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7431	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7133	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7134	7433	// if (CameraPane.Xmin > boundary.x)
7135	7434	// {
..	..	@@ -7151,7 +7450,8 @@
7151	7450	}
7152	7451	}
7153	7452
7154		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7155	7455	{
7156	7456	if (level == 0)
7157	7457	{
..	..	@@ -7160,8 +7460,8 @@
7160	7460
7161	7461	boolean retval = false;
7162	7462
7163		- startX = info.x;
7164		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7165	7465
7166	7466	hitSomething = -1;
7167	7467	cVector origin = new cVector();
..	..	@@ -7171,22 +7471,51 @@
7171	7471	{
7172	7472	centerPt = new Point(0, 0);
7173	7473	}
7174		- calcHotSpot(origin, info, centerPt, spot);
7175		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7176	7477	{
7177	7478	hitSomething = hitCenter;
7178	7479	retval = true;
7179	7480	}
7180	7481	spot.translate(32, 0);
7181		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7182	7483	{
7183	7484	hitSomething = hitRotate;
7184	7485	retval = true;
7185	7486	}
7186	7487	spot.translate(0, 32);
7187		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7188	7489	{
7189	7490	hitSomething = hitScale;
	7491	+
	7492	+ double scale = 0.005f * clickInfo.camera.Distance();
	7493	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7494	+ double sign = 1;
	7495	+ if (hScale < 0)
	7496	+ {
	7497	+ sign = -1;
	7498	+ }
	7499	+ hScale = signMath.pow(signhScale, scale * 50);
	7500	+ if (hScale < 0.01)
	7501	+ {
	7502	+ //hScale = 0.01;
	7503	+ }
	7504	+
	7505	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7506	+ sign = 1;
	7507	+ if (vScale < 0)
	7508	+ {
	7509	+ sign = -1;
	7510	+ }
	7511	+ vScale = signMath.pow(signvScale, scale * 50);
	7512	+ if (vScale < 0.01)
	7513	+ {
	7514	+ //vScale = 0.01;
	7515	+ }
	7516	+
	7517	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7518	+
7190	7519	retval = true;
7191	7520	}
7192	7521
..	..	@@ -7196,7 +7525,7 @@
7196	7525	}
7197	7526
7198	7527	//System.out.println("info.modifiers = " + info.modifiers);
7199		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7200	7529	//System.out.println("modified = " + modified);
7201	7530	//new Exception().printStackTrace();
7202	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7224,7 +7553,8 @@
7224	7553	return true;
7225	7554	}
7226	7555
7227		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7228	7558	{
7229	7559	if (hitSomething == 0)
7230	7560	{
..	..	@@ -7238,7 +7568,7 @@
7238	7568
7239	7569	//System.out.println("hitSomething = " + hitSomething);
7240	7570
7241		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7242	7572
7243	7573	cVector xlate = new cVector();
7244	7574	//cVector xlate2 = new cVector();
..	..	@@ -7272,8 +7602,8 @@
7272	7602	toParent[3][i] = xlate.get(i);
7273	7603	LA.matInvert(toParent, fromParent);
7274	7604	*/
7275		- cVector delta = LA.newVector(0, 0, startY - info.y);
7276		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7605	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7606	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7277	7607
7278	7608	LA.matCopy(startMat, toParent);
7279	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7282,7 +7612,7 @@
7282	7612	} else
7283	7613	{
7284	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7285		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7286	7616	cVector away = new cVector();
7287	7617	//cVector right2 = new cVector();
7288	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7299,19 +7629,19 @@
7299	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7300	7630	// if (!CameraPane.LOCALTRANSFORM)
7301	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7302		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7303	7633	// if (!CameraPane.LOCALTRANSFORM)
7304	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7305	7635	//LA.vecCross(up, cVector.Z, right2);
7306	7636
7307		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7308	7638
7309	7639	//System.out.println("DELTA0 = " + delta);
7310	7640	//System.out.println("AWAY = " + info.camera.away);
7311	7641	//System.out.println("UP = " + info.camera.up);
7312	7642	if (away.z > 0)
7313	7643	{
7314		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7315	7645	{
7316	7646	delta.x = -delta.x;
7317	7647	} else
..	..	@@ -7326,7 +7656,7 @@
7326	7656	//System.out.println("DELTA1 = " + delta);
7327	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7328	7658	//System.out.println("DELTA2 = " + delta);
7329		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7330	7660	LA.matCopy(startMat, toParent);
7331	7661	//System.out.println("DELTA3 = " + delta);
7332	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7336,8 +7666,8 @@
7336	7666	break;
7337	7667
7338	7668	case hitRotate: // rotate
7339		- int dx = info.x - centerPt.x;
7340		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7341	7671	double angle = (double) Math.atan2(dx, dy);
7342	7672	angle = -(1.570796 - angle);
7343	7673
..	..	@@ -7360,7 +7690,7 @@
7360	7690	}
7361	7691	/**/
7362	7692
7363		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7364	7694	{
7365	7695	case 1: // '\001'
7366	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7387,7 +7717,7 @@
7387	7717	break;
7388	7718
7389	7719	case hitScale: // scale
7390		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7391	7721	double sign = 1;
7392	7722	if (hScale < 0)
7393	7723	{
..	..	@@ -7399,7 +7729,7 @@
7399	7729	//hScale = 0.01;
7400	7730	}
7401	7731
7402		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7403	7733	sign = 1;
7404	7734	if (vScale < 0)
7405	7735	{
..	..	@@ -7410,6 +7740,7 @@
7410	7740	{
7411	7741	//vScale = 0.01;
7412	7742	}
	7743	+
7413	7744	LA.matCopy(startMat, toParent);
7414	7745	/**/
7415	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7419,29 +7750,30 @@
7419	7750	}
7420	7751	/**/
7421	7752
7422		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7423	7754
7424	7755	if (totalScale < 0.01)
7425	7756	{
7426	7757	totalScale = 0.01;
7427	7758	}
7428	7759
7429		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7430	7761	{
7431	7762	case 3: // '\001'
7432		- if (modified)
	7763	+ if (modified \|\| opposite)
7433	7764	{
7434	7765	//LA.matScale(toParent, 1, hScale, vScale);
7435	7766	LA.matScale(toParent, totalScale, 1, 1);
7436	7767	} // vScale, 1);
7437	7768	else
7438	7769	{
	7770	+ // EXCEPTION!
7439	7771	LA.matScale(toParent, totalScale, totalScale, totalScale);
7440	7772	} // vScale, 1);
7441	7773	break;
7442	7774
7443	7775	case 2: // '\002'
7444		- if (modified)
	7776	+ if (modified \|\| opposite)
7445	7777	{
7446	7778	//LA.matScale(toParent, hScale, 1, vScale);
7447	7779	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7452,7 +7784,7 @@
7452	7784	break;
7453	7785
7454	7786	case 1: // '\003'
7455		- if (modified)
	7787	+ if (modified \|\| opposite)
7456	7788	{
7457	7789	//LA.matScale(toParent, hScale, vScale, 1);
7458	7790	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7492,7 +7824,7 @@
7492	7824	} // NEW ...
7493	7825
7494	7826
7495		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7496	7828	}
7497	7829
7498	7830	boolean overflow = false;
..	..	@@ -7672,6 +8004,10 @@
7672	8004	editWindow = null;
7673	8005	} // ?
7674	8006	}
	8007	+ else
	8008	+ {
	8009	+ //editWindow.closeUI();
	8010	+ }
7675	8011	}
7676	8012
7677	8013	boolean root; // patch for edit windows
..	..	@@ -7829,6 +8165,10 @@
7829	8165	}
7830	8166
7831	8167	transient ObjEditor editWindow;
	8168	+ transient ObjEditor manipWindow;
	8169	+
	8170	+ transient boolean pinned;
	8171	+
7832	8172	transient ObjectUI objectUI;
7833	8173	public static int povDepth = 0;
7834	8174	private static cVector tbMin = new cVector();