~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,13 +22,20 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
30	31	//
31	32
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
32	39	ScriptNode scriptnode;
33	40
34	41	void InitOthers()
..	..	@@ -170,24 +177,35 @@
170	177
171	178	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	179	{
	180	+ Object3D o;
	181	+
173	182	if (hashtable.containsKey(GetUUID()))
174	183	{
175		- Object3D o = hashtable.get(GetUUID());
	184	+ o = hashtable.get(GetUUID());
176	185
177	186	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
180	195
181		- return;
	196	+ hashtable.put(GetUUID(), o);
182	197	}
183	198
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	199	+ if (!blockloop)
189	200	{
190		- get(i).ExtractBigData(hashtable);
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
191	209	}
192	210
193	211	ExtractBigData(o);
..	..	@@ -195,11 +213,26 @@
195	213
196	214	void ExtractBigData(Object3D o)
197	215	{
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
198	219	o.bRep = this.bRep;
199		- if (this.bRep != null)
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
200	230	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
203	236	}
204	237
205	238	// o.support = this.support;
..	..	@@ -214,6 +247,29 @@
214	247	// this.fileparent = null;
215	248	}
216	249
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
217	273	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	274	{
219	275	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +279,35 @@
223	279
224	280	RestoreBigData(o);
225	281
226		- hashtable.remove(GetUUID());
	282	+ if (blockloop)
	283	+ return;
	284	+
	285	+ blockloop = true;
	286	+
	287	+ //hashtable.remove(GetUUID());
227	288
228	289	for (int i=0; i<Size(); i++)
229	290	{
230	291	get(i).RestoreBigData(hashtable);
231	292	}
	293	+
	294	+ blockloop = false;
232	295	}
233	296
234	297	void RestoreBigData(Object3D o)
235	298	{
236	299	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
239	311	// this.support = o.support;
240	312	// this.fileparent = o.fileparent;
241	313	}
..	..	@@ -381,6 +453,7 @@
381	453	}
382	454
383	455	boolean live = false;
	456	+ transient boolean keepdontselect;
384	457	boolean dontselect = false;
385	458	boolean hide = false;
386	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +954,7 @@
881	954
882	955	if (marked && Globals.isLIVE() && live &&
883	956	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	958	currentframe != Globals.framecount)
886	959	{
887	960	currentframe = Globals.framecount;
..	..	@@ -893,7 +966,8 @@
893	966
894	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
895	968
896		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
897	971	{
898	972	countdown = 1;
899	973	delay = speedup?8:1;
..	..	@@ -965,6 +1039,10 @@
965	1039	if (material == null \|\| material.multiply)
966	1040	return true;
967	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
968	1046	return material.opacity > 0.99;
969	1047	}
970	1048
..	..	@@ -1365,6 +1443,7 @@
1365	1443	toParent = LA.newMatrix();
1366	1444	fromParent = LA.newMatrix();
1367	1445	}
	1446	+
1368	1447	LA.matCopy(other.toParent, toParent);
1369	1448	LA.matCopy(other.fromParent, fromParent);
1370	1449
..	..	@@ -2386,6 +2465,11 @@
2386	2465	}
2387	2466	*/
2388	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2389	2473	}
2390	2474
2391	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2427,6 +2511,14 @@
2427	2511	{
2428	2512	editWindow.refreshContents();
2429	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2430	2522	//if (parent != null)
2431	2523	//parent.refreshEditWindow();
2432	2524	}
..	..	@@ -2506,7 +2598,8 @@
2506	2598	private static final int editSelf = 1;
2507	2599	private static final int editChild = 2;
2508	2600
2509		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2510	2603	{
2511	2604	if (level == 0)
2512	2605	{
..	..	@@ -2514,7 +2607,8 @@
2514	2607	return;
2515	2608
2516	2609	Object3D selectee;
2517		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2610	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2611	+ level + 1))
2518	2612	{
2519	2613	selectee = (Object3D) e.nextElement();
2520	2614	}
..	..	@@ -2522,19 +2616,22 @@
2522	2616	} else
2523	2617	{
2524	2618	//super.
2525		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2526	2621	}
2527	2622	}
2528	2623
2529		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2530	2626	{
2531	2627	doSomething = 0;
2532	2628	if (level == 0)
2533	2629	{
2534		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2535	2631	}
2536	2632	if (//super.
2537		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2538	2635	{
2539	2636	doSomething = 1;
2540	2637	return true;
..	..	@@ -2544,7 +2641,7 @@
2544	2641	}
2545	2642	}
2546	2643
2547		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2548	2645	{
2549	2646	if (selection == null)
2550	2647	{
..	..	@@ -2557,7 +2654,8 @@
2557	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2558	2655	{
2559	2656	Object3D selectee = (Object3D) e.nextElement();
2560		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2561	2659	{
2562	2660	childToDrag = selectee;
2563	2661	doSomething = 2;
..	..	@@ -2569,13 +2667,15 @@
2569	2667	return retval;
2570	2668	}
2571	2669
2572		- void doEditDrag(ClickInfo info, boolean opposite)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2573	2672	{
2574	2673	switch (doSomething)
2575	2674	{
2576	2675	case 1: // '\001'
2577	2676	//super.
2578		- doEditDrag0(info, opposite);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2579	2679	break;
2580	2680
2581	2681	case 2: // '\002'
..	..	@@ -2588,11 +2688,13 @@
2588	2688	{
2589	2689	//sel.hitSomething = childToDrag.hitSomething;
2590	2690	//childToDrag.doEditDrag(info);
2591		- sel.doEditDrag(info, opposite);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2592	2693	} else
2593	2694	{
2594	2695	//super.
2595		- doEditDrag0(info, opposite);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2596	2698	}
2597	2699	}
2598	2700	break;
..	..	@@ -2610,6 +2712,9 @@
2610	2712	{
2611	2713	deselectAll();
2612	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2613	2718	ClickInfo newInfo = new ClickInfo();
2614	2719	newInfo.flags = info.flags;
2615	2720	newInfo.bounds = info.bounds;
..	..	@@ -3057,7 +3162,7 @@
3057	3162	{
3058	3163	if (bRep != null)
3059	3164	{
3060		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3061	3166	Touch();
3062	3167	}
3063	3168	}
..	..	@@ -3503,7 +3608,8 @@
3503	3608	if (blockloop)
3504	3609	return;
3505	3610
3506		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3507	3613	live = h;
3508	3614
3509	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3524,7 +3630,8 @@
3524	3630	return;
3525	3631
3526	3632	//if (bRep != null)
3527		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3528	3635	link2master = h;
3529	3636
3530	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3544,7 +3651,8 @@
3544	3651	if (blockloop)
3545	3652	return;
3546	3653
3547		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3548	3656	hide = h;
3549	3657
3550	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3564,7 +3672,7 @@
3564	3672	if (blockloop)
3565	3673	return;
3566	3674
3567		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3568	3676	marked = h;
3569	3677
3570	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3574,6 +3682,46 @@
3574	3682	continue;
3575	3683	blockloop = true;
3576	3684	child.MarkLeaves(h);
	3685	+ blockloop = false;
	3686	+ // release(i);
	3687	+ }
	3688	+ }
	3689	+
	3690	+ void RewindLeaves(boolean h)
	3691	+ {
	3692	+ if (blockloop)
	3693	+ return;
	3694	+
	3695	+ if (bRep != null \|\| material != null) // borderline...
	3696	+ rewind = h;
	3697	+
	3698	+ for (int i = 0; i < Size(); i++)
	3699	+ {
	3700	+ Object3D child = (Object3D) get(i); // reserve(i);
	3701	+ if (child == null)
	3702	+ continue;
	3703	+ blockloop = true;
	3704	+ child.RewindLeaves(h);
	3705	+ blockloop = false;
	3706	+ // release(i);
	3707	+ }
	3708	+ }
	3709	+
	3710	+ void RandomLeaves(boolean h)
	3711	+ {
	3712	+ if (blockloop)
	3713	+ return;
	3714	+
	3715	+ if (bRep != null \|\| material != null) // borderline...
	3716	+ random = h;
	3717	+
	3718	+ for (int i = 0; i < Size(); i++)
	3719	+ {
	3720	+ Object3D child = (Object3D) get(i); // reserve(i);
	3721	+ if (child == null)
	3722	+ continue;
	3723	+ blockloop = true;
	3724	+ child.RandomLeaves(h);
3577	3725	blockloop = false;
3578	3726	// release(i);
3579	3727	}
..	..	@@ -4351,6 +4499,55 @@
4351	4499	}
4352	4500	}
4353	4501
	4502	+ void RepairSOV()
	4503	+ {
	4504	+ if (blockloop)
	4505	+ return;
	4506	+
	4507	+ String texname = this.GetPigmentTexture();
	4508	+
	4509	+ if (texname.startsWith("sov"))
	4510	+ {
	4511	+ String[] s = texname.split("/");
	4512	+
	4513	+ String[] sname = s[1].split("Color.pn");
	4514	+
	4515	+ texname = sname[0];
	4516	+
	4517	+ if (sname.length > 1)
	4518	+ {
	4519	+ texname += "Color.jpg";
	4520	+ }
	4521	+
	4522	+ this.SetPigmentTexture("sov/" + texname);
	4523	+ }
	4524	+
	4525	+ texname = this.GetBumpTexture();
	4526	+
	4527	+ if (texname.startsWith("sov"))
	4528	+ {
	4529	+ String[] s = texname.split("/");
	4530	+
	4531	+ String[] sname = s[1].split("Bump.pn");
	4532	+
	4533	+ texname = sname[0];
	4534	+
	4535	+ if (sname.length > 1)
	4536	+ {
	4537	+ texname += "Bump.jpg";
	4538	+ }
	4539	+
	4540	+ this.SetBumpTexture("sov/" + texname);
	4541	+ }
	4542	+
	4543	+ for (int i=0; i<Size(); i++)
	4544	+ {
	4545	+ blockloop = true;
	4546	+ get(i).RepairSOV();
	4547	+ blockloop = false;
	4548	+ }
	4549	+ }
	4550	+
4354	4551	void RepairTexture()
4355	4552	{
4356	4553	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4865,6 +5062,14 @@
4865	5062	}
4866	5063	}
4867	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4868	5073	cTreePath Select(int indexcount, boolean deselect)
4869	5074	{
4870	5075	if (hide \|\| dontselect)
..	..	@@ -4901,10 +5106,11 @@
4901	5106	if (leaf != null)
4902	5107	{
4903	5108	cTreePath tp = new cTreePath(this, leaf);
4904		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4905	5111	{
4906	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4907		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4908	5114	}
4909	5115
4910	5116	return tp;
..	..	@@ -4921,6 +5127,7 @@
4921	5127
4922	5128	if (child == null)
4923	5129	continue;
	5130	+
4924	5131	if (child.HasTransparency() && child.size() != 0)
4925	5132	{
4926	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4930,9 +5137,10 @@
4930	5137	if (leaf != null)
4931	5138	{
4932	5139	cTreePath tp = new cTreePath(this, leaf);
4933		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4934	5142	{
4935		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4936	5144	}
4937	5145
4938	5146	return tp;
..	..	@@ -5257,6 +5465,51 @@
5257	5465	blockloop = false;
5258	5466	}
5259	5467
	5468	+ void ResetSelectable()
	5469	+ {
	5470	+ if (blockloop)
	5471	+ return;
	5472	+
	5473	+ blockloop = true;
	5474	+
	5475	+ keepdontselect = dontselect;
	5476	+ dontselect = true;
	5477	+
	5478	+ Object3D child;
	5479	+ int nb = Size();
	5480	+ for (int i = 0; i < nb; i++)
	5481	+ {
	5482	+ child = (Object3D) get(i);
	5483	+ if (child == null)
	5484	+ continue;
	5485	+ child.ResetSelectable();
	5486	+ }
	5487	+
	5488	+ blockloop = false;
	5489	+ }
	5490	+
	5491	+ void RestoreSelectable()
	5492	+ {
	5493	+ if (blockloop)
	5494	+ return;
	5495	+
	5496	+ blockloop = true;
	5497	+
	5498	+ dontselect = keepdontselect;
	5499	+
	5500	+ Object3D child;
	5501	+ int nb = Size();
	5502	+ for (int i = 0; i < nb; i++)
	5503	+ {
	5504	+ child = (Object3D) get(i);
	5505	+ if (child == null)
	5506	+ continue;
	5507	+ child.RestoreSelectable();
	5508	+ }
	5509	+
	5510	+ blockloop = false;
	5511	+ }
	5512	+
5260	5513	boolean IsSelected()
5261	5514	{
5262	5515	if (parent == null)
..	..	@@ -5566,6 +5819,38 @@
5566	5819	}
5567	5820	}
5568	5821
	5822	+ void EmbedTextures(boolean embed)
	5823	+ {
	5824	+ if (blockloop)
	5825	+ return;
	5826	+
	5827	+ //if (GetTextures() != null)
	5828	+ if (embed)
	5829	+ CameraPane.EmbedTextures(GetTextures());
	5830	+ else
	5831	+ {
	5832	+ GetTextures().pigmentdata = null;
	5833	+ GetTextures().bumpdata = null;
	5834	+ GetTextures().pw = 0;
	5835	+ GetTextures().ph = 0;
	5836	+ GetTextures().bw = 0;
	5837	+ GetTextures().bh = 0;
	5838	+ }
	5839	+
	5840	+ int nb = Size();
	5841	+ for (int i = 0; i < nb; i++)
	5842	+ {
	5843	+ Object3D child = (Object3D) get(i);
	5844	+
	5845	+ if (child == null)
	5846	+ continue;
	5847	+
	5848	+ blockloop = true;
	5849	+ child.EmbedTextures(embed);
	5850	+ blockloop = false;
	5851	+ }
	5852	+ }
	5853	+
5569	5854	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5570	5855	{
5571	5856	Draw(display, root, selected, blocked);
..	..	@@ -5652,8 +5937,10 @@
5652	5937	if (support != null)
5653	5938	support = support;
5654	5939
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);
	5940	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5942	+
	5943	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5657	5944
5658	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659	5946	{
..	..	@@ -5663,8 +5950,9 @@
5663	5950	// usecalllists &= !(parent instanceof RandomNode);
5664	5951	// usecalllists = false;
5665	5952
5666		- if (GetBRep() != null)
5667		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5668	5956	//System.out.println("draw " + this);
5669	5957	//new Exception().printStackTrace();
5670	5958
..	..	@@ -5674,7 +5962,7 @@
5674	5962
5675	5963	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676	5964	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5677		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5678	5966	{
5679	5967	Globals.lighttouched = true;
5680	5968	} // all panes...
..	..	@@ -5686,7 +5974,7 @@
5686	5974	if (!(this instanceof Composite))
5687	5975	touched = false;
5688	5976	//if (displaylist == -1 && usecalllists)
5689		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5690	5978	{
5691	5979	bRep.displaylist = display.GenList();
5692	5980	assert(bRep.displaylist != 0);
..	..	@@ -5697,7 +5985,7 @@
5697	5985
5698	5986	//System.out.println("\tnew list " + list);
5699	5987	//gl.glDrawBuffer(gl.GL_NONE);
5700		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5701	5989	{
5702	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5703	5991	display.NewList(bRep.displaylist);
..	..	@@ -5706,7 +5994,7 @@
5706	5994	CallList(display, root, selected, blocked);
5707	5995
5708	5996	// compiled = true;
5709		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5710	5998	{
5711	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5712	6000	display.EndList();
..	..	@@ -5806,6 +6094,7 @@
5806	6094	if (GetBRep() != null)
5807	6095	{
5808	6096	display.NextIndex();
	6097	+
5809	6098	// vertex color conflict : gl.glCallList(list);
5810	6099	DrawNode(display, root, selected);
5811	6100	if (this instanceof BezierPatch)
..	..	@@ -5846,16 +6135,27 @@
5846	6135	tex = GetTextures();
5847	6136	}
5848	6137
5849		- boolean failed = false;
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
5850	6140
5851	6141	try
5852	6142	{
5853		- display.BindTextures(tex, texres);
	6143	+ display.BindPigmentTexture(tex, texres);
5854	6144	}
5855	6145	catch (Exception e)
5856	6146	{
5857	6147	System.err.println("FAILED: " + this);
5858		- failed = true;
	6148	+ failedPigment = true;
	6149	+ }
	6150	+
	6151	+ try
	6152	+ {
	6153	+ display.BindBumpTexture(tex, texres);
	6154	+ }
	6155	+ catch (Exception e)
	6156	+ {
	6157	+ //System.err.println("FAILED: " + this);
	6158	+ failedBump = true;
5859	6159	}
5860	6160
5861	6161	if (!compiled)
..	..	@@ -5878,8 +6178,11 @@
5878	6178	}
5879	6179	}
5880	6180
5881		- if (!failed)
5882		- display.ReleaseTextures(tex);
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
5883	6186
5884	6187	display.PopMaterial(this, selected);
5885	6188	}
..	..	@@ -6252,6 +6555,11 @@
6252	6555	// dec 2012
6253	6556	new Exception().printStackTrace();
6254	6557	return;
	6558	+ }
	6559	+
	6560	+ if (dontselect)
	6561	+ {
	6562	+ //bRep.GenerateNormalsMINE();
6255	6563	}
6256	6564
6257	6565	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7037,20 +7345,23 @@
7037	7345	}
7038	7346	}
7039	7347
7040		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7348	+ static ClickInfo clickInfo = new ClickInfo();
	7349	+
	7350	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7351	+ Point outPt, Rectangle outRec)
7041	7352	{
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;
	7353	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7354	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7355	+ double[][] toscreen = clickInfo.toScreen;
7045	7356	if (toscreen == null)
7046	7357	{
7047		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7048	7359	}
7049	7360	cVector vec = in;
7050	7361	LA.xformPos(in, toscreen, in);
7051	7362	//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();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7054	7365	outPt.x = hc + (int) vec.x;
7055	7366	outPt.y = vc - (int) vec.y;
7056	7367	outRec.x = outPt.x - 3;
..	..	@@ -7058,15 +7369,18 @@
7058	7369	outRec.width = outRec.height = 6;
7059	7370	}
7060	7371
7061		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
7062	7374	{
7063	7375	Point pt = new Point(0, 0);
7064	7376	Rectangle rec = new Rectangle();
7065		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
7066	7379	return rec;
7067	7380	}
7068	7381
7069		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
7070	7384	{
7071	7385	if (level == 0)
7072	7386	{
..	..	@@ -7075,16 +7389,19 @@
7075	7389	{
7076	7390	cVector origin = new cVector();
7077	7391	//LA.xformPos(origin, toParent, origin);
7078		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7079	7396	Rectangle boundary = new Rectangle();
7080	7397	boundary.x = spot.x - 30;
7081	7398	boundary.y = spot.y - 30;
7082	7399	boundary.width = spot.width + 60;
7083	7400	boundary.height = spot.height + 60;
7084		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
7085	7402	int spotw = spot.x + spot.width;
7086	7403	int spoth = spot.y + spot.height;
7087		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7088	7405	// if (CameraPane.Xmin > spot.x)
7089	7406	// {
7090	7407	// CameraPane.Xmin = spot.x;
..	..	@@ -7104,8 +7421,8 @@
7104	7421	spot.translate(32, 32);
7105	7422	spotw = spot.x + spot.width;
7106	7423	spoth = spot.y + spot.height;
7107		- info.g.setColor(Color.cyan);
7108		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7424	+ clickInfo.g.setColor(Color.cyan);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7109	7426	// if (CameraPane.Xmin > spot.x)
7110	7427	// {
7111	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7125,9 +7442,9 @@
7125	7442	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7126	7443	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7127	7444	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);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
7131	7448	// if (CameraPane.Xmin > spot.x)
7132	7449	// {
7133	7450	// CameraPane.Xmin = spot.x;
..	..	@@ -7144,8 +7461,8 @@
7144	7461	// {
7145	7462	// CameraPane.Ymax = spoth;
7146	7463	// }
7147		- info.g.drawArc(boundary.x, boundary.y,
7148		- boundary.width, boundary.height, 0, 360);
	7464	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7465	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7149	7466	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150	7467	// if (CameraPane.Xmin > boundary.x)
7151	7468	// {
..	..	@@ -7167,7 +7484,8 @@
7167	7484	}
7168	7485	}
7169	7486
7170		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
7171	7489	{
7172	7490	if (level == 0)
7173	7491	{
..	..	@@ -7176,8 +7494,8 @@
7176	7494
7177	7495	boolean retval = false;
7178	7496
7179		- startX = info.x;
7180		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
7181	7499
7182	7500	hitSomething = -1;
7183	7501	cVector origin = new cVector();
..	..	@@ -7187,22 +7505,51 @@
7187	7505	{
7188	7506	centerPt = new Point(0, 0);
7189	7507	}
7190		- calcHotSpot(origin, info, centerPt, spot);
7191		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
7192	7511	{
7193	7512	hitSomething = hitCenter;
7194	7513	retval = true;
7195	7514	}
7196	7515	spot.translate(32, 0);
7197		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
7198	7517	{
7199	7518	hitSomething = hitRotate;
7200	7519	retval = true;
7201	7520	}
7202	7521	spot.translate(0, 32);
7203		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
7204	7523	{
7205	7524	hitSomething = hitScale;
	7525	+
	7526	+ double scale = 0.005f * clickInfo.camera.Distance();
	7527	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7528	+ double sign = 1;
	7529	+ if (hScale < 0)
	7530	+ {
	7531	+ sign = -1;
	7532	+ }
	7533	+ hScale = signMath.pow(signhScale, scale * 50);
	7534	+ if (hScale < 0.01)
	7535	+ {
	7536	+ //hScale = 0.01;
	7537	+ }
	7538	+
	7539	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7540	+ sign = 1;
	7541	+ if (vScale < 0)
	7542	+ {
	7543	+ sign = -1;
	7544	+ }
	7545	+ vScale = signMath.pow(signvScale, scale * 50);
	7546	+ if (vScale < 0.01)
	7547	+ {
	7548	+ //vScale = 0.01;
	7549	+ }
	7550	+
	7551	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7552	+
7206	7553	retval = true;
7207	7554	}
7208	7555
..	..	@@ -7212,7 +7559,7 @@
7212	7559	}
7213	7560
7214	7561	//System.out.println("info.modifiers = " + info.modifiers);
7215		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7216	7563	//System.out.println("modified = " + modified);
7217	7564	//new Exception().printStackTrace();
7218	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7240,7 +7587,8 @@
7240	7587	return true;
7241	7588	}
7242	7589
7243		- void doEditDrag0(ClickInfo info, boolean opposite)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
7244	7592	{
7245	7593	if (hitSomething == 0)
7246	7594	{
..	..	@@ -7254,7 +7602,7 @@
7254	7602
7255	7603	//System.out.println("hitSomething = " + hitSomething);
7256	7604
7257		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
7258	7606
7259	7607	cVector xlate = new cVector();
7260	7608	//cVector xlate2 = new cVector();
..	..	@@ -7288,8 +7636,8 @@
7288	7636	toParent[3][i] = xlate.get(i);
7289	7637	LA.matInvert(toParent, fromParent);
7290	7638	*/
7291		- cVector delta = LA.newVector(0, 0, startY - info.y);
7292		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7639	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7640	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7293	7641
7294	7642	LA.matCopy(startMat, toParent);
7295	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7298,7 +7646,7 @@
7298	7646	} else
7299	7647	{
7300	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7301		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7302	7650	cVector away = new cVector();
7303	7651	//cVector right2 = new cVector();
7304	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7315,19 +7663,19 @@
7315	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7316	7664	// if (!CameraPane.LOCALTRANSFORM)
7317	7665	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7318		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7319	7667	// if (!CameraPane.LOCALTRANSFORM)
7320	7668	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7321	7669	//LA.vecCross(up, cVector.Z, right2);
7322	7670
7323		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7324	7672
7325	7673	//System.out.println("DELTA0 = " + delta);
7326	7674	//System.out.println("AWAY = " + info.camera.away);
7327	7675	//System.out.println("UP = " + info.camera.up);
7328	7676	if (away.z > 0)
7329	7677	{
7330		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7331	7679	{
7332	7680	delta.x = -delta.x;
7333	7681	} else
..	..	@@ -7342,7 +7690,7 @@
7342	7690	//System.out.println("DELTA1 = " + delta);
7343	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7344	7692	//System.out.println("DELTA2 = " + delta);
7345		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7346	7694	LA.matCopy(startMat, toParent);
7347	7695	//System.out.println("DELTA3 = " + delta);
7348	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7352,8 +7700,8 @@
7352	7700	break;
7353	7701
7354	7702	case hitRotate: // rotate
7355		- int dx = info.x - centerPt.x;
7356		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7357	7705	double angle = (double) Math.atan2(dx, dy);
7358	7706	angle = -(1.570796 - angle);
7359	7707
..	..	@@ -7376,7 +7724,7 @@
7376	7724	}
7377	7725	/**/
7378	7726
7379		- switch (info.pane.RenderCamera().viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7380	7728	{
7381	7729	case 1: // '\001'
7382	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7403,7 +7751,7 @@
7403	7751	break;
7404	7752
7405	7753	case hitScale: // scale
7406		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7407	7755	double sign = 1;
7408	7756	if (hScale < 0)
7409	7757	{
..	..	@@ -7415,7 +7763,7 @@
7415	7763	//hScale = 0.01;
7416	7764	}
7417	7765
7418		- double vScale = (double) (info.y - centerPt.y) / 32;
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7419	7767	sign = 1;
7420	7768	if (vScale < 0)
7421	7769	{
..	..	@@ -7426,6 +7774,7 @@
7426	7774	{
7427	7775	//vScale = 0.01;
7428	7776	}
	7777	+
7429	7778	LA.matCopy(startMat, toParent);
7430	7779	/**/
7431	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7435,14 +7784,14 @@
7435	7784	}
7436	7785	/**/
7437	7786
7438		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7439	7788
7440	7789	if (totalScale < 0.01)
7441	7790	{
7442	7791	totalScale = 0.01;
7443	7792	}
7444	7793
7445		- switch (info.pane.RenderCamera().viewCode)
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7446	7795	{
7447	7796	case 3: // '\001'
7448	7797	if (modified \|\| opposite)
..	..	@@ -7509,7 +7858,7 @@
7509	7858	} // NEW ...
7510	7859
7511	7860
7512		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7513	7862	}
7514	7863
7515	7864	boolean overflow = false;
..	..	@@ -7689,6 +8038,10 @@
7689	8038	editWindow = null;
7690	8039	} // ?
7691	8040	}
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
	8044	+ }
7692	8045	}
7693	8046
7694	8047	boolean root; // patch for edit windows
..	..	@@ -7846,6 +8199,10 @@
7846	8199	}
7847	8200
7848	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
7849	8206	transient ObjectUI objectUI;
7850	8207	public static int povDepth = 0;
7851	8208	private static cVector tbMin = new cVector();