~nbriere/GrafreeD.git - Noware Git Repository

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