~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	+ Object3D 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	185	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	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
..	..	@@ -881,7 +930,7 @@
881	930
882	931	if (marked && Globals.isLIVE() && live &&
883	932	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	934	currentframe != Globals.framecount)
886	935	{
887	936	currentframe = Globals.framecount;
..	..	@@ -893,7 +942,8 @@
893	942
894	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
895	944
896		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
897	947	{
898	948	countdown = 1;
899	949	delay = speedup?8:1;
..	..	@@ -965,6 +1015,10 @@
965	1015	if (material == null \|\| material.multiply)
966	1016	return true;
967	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
968	1022	return material.opacity > 0.99;
969	1023	}
970	1024
..	..	@@ -1365,6 +1419,7 @@
1365	1419	toParent = LA.newMatrix();
1366	1420	fromParent = LA.newMatrix();
1367	1421	}
	1422	+
1368	1423	LA.matCopy(other.toParent, toParent);
1369	1424	LA.matCopy(other.fromParent, fromParent);
1370	1425
..	..	@@ -2386,6 +2441,10 @@
2386	2441	}
2387	2442	*/
2388	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2389	2448	}
2390	2449
2391	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2427,6 +2486,14 @@
2427	2486	{
2428	2487	editWindow.refreshContents();
2429	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2430	2497	//if (parent != null)
2431	2498	//parent.refreshEditWindow();
2432	2499	}
..	..	@@ -2506,7 +2573,8 @@
2506	2573	private static final int editSelf = 1;
2507	2574	private static final int editChild = 2;
2508	2575
2509		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2510	2578	{
2511	2579	if (level == 0)
2512	2580	{
..	..	@@ -2514,7 +2582,8 @@
2514	2582	return;
2515	2583
2516	2584	Object3D selectee;
2517		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2518	2587	{
2519	2588	selectee = (Object3D) e.nextElement();
2520	2589	}
..	..	@@ -2522,19 +2591,22 @@
2522	2591	} else
2523	2592	{
2524	2593	//super.
2525		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2526	2596	}
2527	2597	}
2528	2598
2529		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2530	2601	{
2531	2602	doSomething = 0;
2532	2603	if (level == 0)
2533	2604	{
2534		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2535	2606	}
2536	2607	if (//super.
2537		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2538	2610	{
2539	2611	doSomething = 1;
2540	2612	return true;
..	..	@@ -2544,7 +2616,7 @@
2544	2616	}
2545	2617	}
2546	2618
2547		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2548	2620	{
2549	2621	if (selection == null)
2550	2622	{
..	..	@@ -2557,7 +2629,8 @@
2557	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2558	2630	{
2559	2631	Object3D selectee = (Object3D) e.nextElement();
2560		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2561	2634	{
2562	2635	childToDrag = selectee;
2563	2636	doSomething = 2;
..	..	@@ -2569,13 +2642,15 @@
2569	2642	return retval;
2570	2643	}
2571	2644
2572		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2573	2647	{
2574	2648	switch (doSomething)
2575	2649	{
2576	2650	case 1: // '\001'
2577	2651	//super.
2578		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2579	2654	break;
2580	2655
2581	2656	case 2: // '\002'
..	..	@@ -2588,11 +2663,13 @@
2588	2663	{
2589	2664	//sel.hitSomething = childToDrag.hitSomething;
2590	2665	//childToDrag.doEditDrag(info);
2591		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2592	2668	} else
2593	2669	{
2594	2670	//super.
2595		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2596	2673	}
2597	2674	}
2598	2675	break;
..	..	@@ -2610,6 +2687,9 @@
2610	2687	{
2611	2688	deselectAll();
2612	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2613	2693	ClickInfo newInfo = new ClickInfo();
2614	2694	newInfo.flags = info.flags;
2615	2695	newInfo.bounds = info.bounds;
..	..	@@ -3057,7 +3137,7 @@
3057	3137	{
3058	3138	if (bRep != null)
3059	3139	{
3060		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3061	3141	Touch();
3062	3142	}
3063	3143	}
..	..	@@ -3503,7 +3583,8 @@
3503	3583	if (blockloop)
3504	3584	return;
3505	3585
3506		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3507	3588	live = h;
3508	3589
3509	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3524,7 +3605,8 @@
3524	3605	return;
3525	3606
3526	3607	//if (bRep != null)
3527		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3528	3610	link2master = h;
3529	3611
3530	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3544,7 +3626,8 @@
3544	3626	if (blockloop)
3545	3627	return;
3546	3628
3547		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3548	3631	hide = h;
3549	3632
3550	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3564,7 +3647,7 @@
3564	3647	if (blockloop)
3565	3648	return;
3566	3649
3567		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3568	3651	marked = h;
3569	3652
3570	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3574,6 +3657,46 @@
3574	3657	continue;
3575	3658	blockloop = true;
3576	3659	child.MarkLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RewindLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ rewind = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RewindLeaves(h);
	3680	+ blockloop = false;
	3681	+ // release(i);
	3682	+ }
	3683	+ }
	3684	+
	3685	+ void RandomLeaves(boolean h)
	3686	+ {
	3687	+ if (blockloop)
	3688	+ return;
	3689	+
	3690	+ if (bRep != null \|\| material != null) // borderline...
	3691	+ random = h;
	3692	+
	3693	+ for (int i = 0; i < Size(); i++)
	3694	+ {
	3695	+ Object3D child = (Object3D) get(i); // reserve(i);
	3696	+ if (child == null)
	3697	+ continue;
	3698	+ blockloop = true;
	3699	+ child.RandomLeaves(h);
3577	3700	blockloop = false;
3578	3701	// release(i);
3579	3702	}
..	..	@@ -4351,6 +4474,55 @@
4351	4474	}
4352	4475	}
4353	4476
	4477	+ void RepairSOV()
	4478	+ {
	4479	+ if (blockloop)
	4480	+ return;
	4481	+
	4482	+ String texname = this.GetPigmentTexture();
	4483	+
	4484	+ if (texname.startsWith("sov"))
	4485	+ {
	4486	+ String[] s = texname.split("/");
	4487	+
	4488	+ String[] sname = s[1].split("Color.pn");
	4489	+
	4490	+ texname = sname[0];
	4491	+
	4492	+ if (sname.length > 1)
	4493	+ {
	4494	+ texname += "Color.jpg";
	4495	+ }
	4496	+
	4497	+ this.SetPigmentTexture("sov/" + texname);
	4498	+ }
	4499	+
	4500	+ texname = this.GetBumpTexture();
	4501	+
	4502	+ if (texname.startsWith("sov"))
	4503	+ {
	4504	+ String[] s = texname.split("/");
	4505	+
	4506	+ String[] sname = s[1].split("Bump.pn");
	4507	+
	4508	+ texname = sname[0];
	4509	+
	4510	+ if (sname.length > 1)
	4511	+ {
	4512	+ texname += "Bump.jpg";
	4513	+ }
	4514	+
	4515	+ this.SetBumpTexture("sov/" + texname);
	4516	+ }
	4517	+
	4518	+ for (int i=0; i<Size(); i++)
	4519	+ {
	4520	+ blockloop = true;
	4521	+ get(i).RepairSOV();
	4522	+ blockloop = false;
	4523	+ }
	4524	+ }
	4525	+
4354	4526	void RepairTexture()
4355	4527	{
4356	4528	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4865,6 +5037,14 @@
4865	5037	}
4866	5038	}
4867	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4868	5048	cTreePath Select(int indexcount, boolean deselect)
4869	5049	{
4870	5050	if (hide \|\| dontselect)
..	..	@@ -4901,10 +5081,11 @@
4901	5081	if (leaf != null)
4902	5082	{
4903	5083	cTreePath tp = new cTreePath(this, leaf);
4904		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4905	5086	{
4906	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4907		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4908	5089	}
4909	5090
4910	5091	return tp;
..	..	@@ -4921,6 +5102,7 @@
4921	5102
4922	5103	if (child == null)
4923	5104	continue;
	5105	+
4924	5106	if (child.HasTransparency() && child.size() != 0)
4925	5107	{
4926	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4930,9 +5112,10 @@
4930	5112	if (leaf != null)
4931	5113	{
4932	5114	cTreePath tp = new cTreePath(this, leaf);
4933		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4934	5117	{
4935		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4936	5119	}
4937	5120
4938	5121	return tp;
..	..	@@ -5257,6 +5440,51 @@
5257	5440	blockloop = false;
5258	5441	}
5259	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5260	5488	boolean IsSelected()
5261	5489	{
5262	5490	if (parent == null)
..	..	@@ -5566,6 +5794,38 @@
5566	5794	}
5567	5795	}
5568	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5569	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5570	5830	{
5571	5831	Draw(display, root, selected, blocked);
..	..	@@ -5652,8 +5912,10 @@
5652	5912	if (support != null)
5653	5913	support = support;
5654	5914
5655		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5656		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5657	5919
5658	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659	5921	{
..	..	@@ -5663,8 +5925,9 @@
5663	5925	// usecalllists &= !(parent instanceof RandomNode);
5664	5926	// usecalllists = false;
5665	5927
5666		- if (GetBRep() != null)
5667		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5668	5931	//System.out.println("draw " + this);
5669	5932	//new Exception().printStackTrace();
5670	5933
..	..	@@ -5674,7 +5937,7 @@
5674	5937
5675	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676	5939	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5677		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5678	5941	{
5679	5942	Globals.lighttouched = true;
5680	5943	} // all panes...
..	..	@@ -5686,7 +5949,7 @@
5686	5949	if (!(this instanceof Composite))
5687	5950	touched = false;
5688	5951	//if (displaylist == -1 && usecalllists)
5689		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5690	5953	{
5691	5954	bRep.displaylist = display.GenList();
5692	5955	assert(bRep.displaylist != 0);
..	..	@@ -5697,7 +5960,7 @@
5697	5960
5698	5961	//System.out.println("\tnew list " + list);
5699	5962	//gl.glDrawBuffer(gl.GL_NONE);
5700		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5701	5964	{
5702	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5703	5966	display.NewList(bRep.displaylist);
..	..	@@ -5706,7 +5969,7 @@
5706	5969	CallList(display, root, selected, blocked);
5707	5970
5708	5971	// compiled = true;
5709		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5710	5973	{
5711	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5712	5975	display.EndList();
..	..	@@ -5806,6 +6069,7 @@
5806	6069	if (GetBRep() != null)
5807	6070	{
5808	6071	display.NextIndex();
	6072	+
5809	6073	// vertex color conflict : gl.glCallList(list);
5810	6074	DrawNode(display, root, selected);
5811	6075	if (this instanceof BezierPatch)
..	..	@@ -5846,16 +6110,27 @@
5846	6110	tex = GetTextures();
5847	6111	}
5848	6112
5849		- boolean failed = false;
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
5850	6115
5851	6116	try
5852	6117	{
5853		- display.BindTextures(tex, texres);
	6118	+ display.BindPigmentTexture(tex, texres);
5854	6119	}
5855	6120	catch (Exception e)
5856	6121	{
5857	6122	System.err.println("FAILED: " + this);
5858		- failed = true;
	6123	+ failedPigment = true;
	6124	+ }
	6125	+
	6126	+ try
	6127	+ {
	6128	+ display.BindBumpTexture(tex, texres);
	6129	+ }
	6130	+ catch (Exception e)
	6131	+ {
	6132	+ //System.err.println("FAILED: " + this);
	6133	+ failedBump = true;
5859	6134	}
5860	6135
5861	6136	if (!compiled)
..	..	@@ -5878,8 +6153,11 @@
5878	6153	}
5879	6154	}
5880	6155
5881		- if (!failed)
5882		- display.ReleaseTextures(tex);
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
5883	6161
5884	6162	display.PopMaterial(this, selected);
5885	6163	}
..	..	@@ -6252,6 +6530,11 @@
6252	6530	// dec 2012
6253	6531	new Exception().printStackTrace();
6254	6532	return;
	6533	+ }
	6534	+
	6535	+ if (dontselect)
	6536	+ {
	6537	+ //bRep.GenerateNormalsMINE();
6255	6538	}
6256	6539
6257	6540	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7037,20 +7320,23 @@
7037	7320	}
7038	7321	}
7039	7322
7040		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
7041	7327	{
7042		- int hc = info.bounds.x + info.bounds.width / 2;
7043		- int vc = info.bounds.y + info.bounds.height / 2;
7044		- double[][] toscreen = info.toScreen;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
7045	7331	if (toscreen == null)
7046	7332	{
7047		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7048	7334	}
7049	7335	cVector vec = in;
7050	7336	LA.xformPos(in, toscreen, in);
7051	7337	//System.out.println("Distance = " + info.camera.Distance());
7052		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7053		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7054	7340	outPt.x = hc + (int) vec.x;
7055	7341	outPt.y = vc - (int) vec.y;
7056	7342	outRec.x = outPt.x - 3;
..	..	@@ -7058,15 +7344,18 @@
7058	7344	outRec.width = outRec.height = 6;
7059	7345	}
7060	7346
7061		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
7062	7349	{
7063	7350	Point pt = new Point(0, 0);
7064	7351	Rectangle rec = new Rectangle();
7065		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
7066	7354	return rec;
7067	7355	}
7068	7356
7069		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
7070	7359	{
7071	7360	if (level == 0)
7072	7361	{
..	..	@@ -7075,16 +7364,19 @@
7075	7364	{
7076	7365	cVector origin = new cVector();
7077	7366	//LA.xformPos(origin, toParent, origin);
7078		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7079	7371	Rectangle boundary = new Rectangle();
7080	7372	boundary.x = spot.x - 30;
7081	7373	boundary.y = spot.y - 30;
7082	7374	boundary.width = spot.width + 60;
7083	7375	boundary.height = spot.height + 60;
7084		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
7085	7377	int spotw = spot.x + spot.width;
7086	7378	int spoth = spot.y + spot.height;
7087		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7088	7380	// if (CameraPane.Xmin > spot.x)
7089	7381	// {
7090	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -7104,8 +7396,8 @@
7104	7396	spot.translate(32, 32);
7105	7397	spotw = spot.x + spot.width;
7106	7398	spoth = spot.y + spot.height;
7107		- info.g.setColor(Color.cyan);
7108		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7109	7401	// if (CameraPane.Xmin > spot.x)
7110	7402	// {
7111	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -7125,9 +7417,9 @@
7125	7417	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7126	7418	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7127	7419	spot.translate(0, -32);
7128		- info.g.setColor(Color.yellow);
7129		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7130		- info.g.setColor(Color.green);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
7131	7423	// if (CameraPane.Xmin > spot.x)
7132	7424	// {
7133	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -7144,8 +7436,8 @@
7144	7436	// {
7145	7437	// CameraPane.Ymax = spoth;
7146	7438	// }
7147		- info.g.drawArc(boundary.x, boundary.y,
7148		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7149	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150	7442	// if (CameraPane.Xmin > boundary.x)
7151	7443	// {
..	..	@@ -7167,7 +7459,8 @@
7167	7459	}
7168	7460	}
7169	7461
7170		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7171	7464	{
7172	7465	if (level == 0)
7173	7466	{
..	..	@@ -7176,8 +7469,8 @@
7176	7469
7177	7470	boolean retval = false;
7178	7471
7179		- startX = info.x;
7180		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7181	7474
7182	7475	hitSomething = -1;
7183	7476	cVector origin = new cVector();
..	..	@@ -7187,22 +7480,51 @@
7187	7480	{
7188	7481	centerPt = new Point(0, 0);
7189	7482	}
7190		- calcHotSpot(origin, info, centerPt, spot);
7191		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7192	7486	{
7193	7487	hitSomething = hitCenter;
7194	7488	retval = true;
7195	7489	}
7196	7490	spot.translate(32, 0);
7197		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7198	7492	{
7199	7493	hitSomething = hitRotate;
7200	7494	retval = true;
7201	7495	}
7202	7496	spot.translate(0, 32);
7203		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7204	7498	{
7205	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7206	7528	retval = true;
7207	7529	}
7208	7530
..	..	@@ -7212,7 +7534,7 @@
7212	7534	}
7213	7535
7214	7536	//System.out.println("info.modifiers = " + info.modifiers);
7215		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7216	7538	//System.out.println("modified = " + modified);
7217	7539	//new Exception().printStackTrace();
7218	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7240,7 +7562,8 @@
7240	7562	return true;
7241	7563	}
7242	7564
7243		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7244	7567	{
7245	7568	if (hitSomething == 0)
7246	7569	{
..	..	@@ -7254,7 +7577,7 @@
7254	7577
7255	7578	//System.out.println("hitSomething = " + hitSomething);
7256	7579
7257		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
7258	7581
7259	7582	cVector xlate = new cVector();
7260	7583	//cVector xlate2 = new cVector();
..	..	@@ -7288,8 +7611,8 @@
7288	7611	toParent[3][i] = xlate.get(i);
7289	7612	LA.matInvert(toParent, fromParent);
7290	7613	*/
7291		- cVector delta = LA.newVector(0, 0, startY - info.y);
7292		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7293	7616
7294	7617	LA.matCopy(startMat, toParent);
7295	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7298,7 +7621,7 @@
7298	7621	} else
7299	7622	{
7300	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7301		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7302	7625	cVector away = new cVector();
7303	7626	//cVector right2 = new cVector();
7304	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7315,19 +7638,19 @@
7315	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7316	7639	// if (!CameraPane.LOCALTRANSFORM)
7317	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7318		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7319	7642	// if (!CameraPane.LOCALTRANSFORM)
7320	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7321	7644	//LA.vecCross(up, cVector.Z, right2);
7322	7645
7323		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7324	7647
7325	7648	//System.out.println("DELTA0 = " + delta);
7326	7649	//System.out.println("AWAY = " + info.camera.away);
7327	7650	//System.out.println("UP = " + info.camera.up);
7328	7651	if (away.z > 0)
7329	7652	{
7330		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7331	7654	{
7332	7655	delta.x = -delta.x;
7333	7656	} else
..	..	@@ -7342,7 +7665,7 @@
7342	7665	//System.out.println("DELTA1 = " + delta);
7343	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7344	7667	//System.out.println("DELTA2 = " + delta);
7345		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7346	7669	LA.matCopy(startMat, toParent);
7347	7670	//System.out.println("DELTA3 = " + delta);
7348	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7352,8 +7675,8 @@
7352	7675	break;
7353	7676
7354	7677	case hitRotate: // rotate
7355		- int dx = info.x - centerPt.x;
7356		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7357	7680	double angle = (double) Math.atan2(dx, dy);
7358	7681	angle = -(1.570796 - angle);
7359	7682
..	..	@@ -7376,7 +7699,7 @@
7376	7699	}
7377	7700	/**/
7378	7701
7379		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7380	7703	{
7381	7704	case 1: // '\001'
7382	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7403,7 +7726,7 @@
7403	7726	break;
7404	7727
7405	7728	case hitScale: // scale
7406		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7407	7730	double sign = 1;
7408	7731	if (hScale < 0)
7409	7732	{
..	..	@@ -7415,7 +7738,7 @@
7415	7738	//hScale = 0.01;
7416	7739	}
7417	7740
7418		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7419	7742	sign = 1;
7420	7743	if (vScale < 0)
7421	7744	{
..	..	@@ -7426,6 +7749,7 @@
7426	7749	{
7427	7750	//vScale = 0.01;
7428	7751	}
	7752	+
7429	7753	LA.matCopy(startMat, toParent);
7430	7754	/**/
7431	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7435,14 +7759,14 @@
7435	7759	}
7436	7760	/**/
7437	7761
7438		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7439	7763
7440	7764	if (totalScale < 0.01)
7441	7765	{
7442	7766	totalScale = 0.01;
7443	7767	}
7444	7768
7445		- switch (info.pane.RenderCamera().viewCode)
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7446	7770	{
7447	7771	case 3: // '\001'
7448	7772	if (modified \|\| opposite)
..	..	@@ -7452,7 +7776,8 @@
7452	7776	} // vScale, 1);
7453	7777	else
7454	7778	{
7455		- LA.matScale(toParent, 1, totalScale, totalScale);
	7779	+ // EXCEPTION!
	7780	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7456	7781	} // vScale, 1);
7457	7782	break;
7458	7783
..	..	@@ -7508,7 +7833,7 @@
7508	7833	} // NEW ...
7509	7834
7510	7835
7511		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7512	7837	}
7513	7838
7514	7839	boolean overflow = false;
..	..	@@ -7688,6 +8013,10 @@
7688	8013	editWindow = null;
7689	8014	} // ?
7690	8015	}
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
	8019	+ }
7691	8020	}
7692	8021
7693	8022	boolean root; // patch for edit windows
..	..	@@ -7845,6 +8174,10 @@
7845	8174	}
7846	8175
7847	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7848	8181	transient ObjectUI objectUI;
7849	8182	public static int povDepth = 0;
7850	8183	private static cVector tbMin = new cVector();