~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		- assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	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
..	..	@@ -563,12 +636,14 @@
563	636	toParent = LA.newMatrix();
564	637	fromParent = LA.newMatrix();
565	638	}
	639	+
566	640	if (toParentMarked == null)
567	641	{
568	642	if (maxcount != 1)
569	643	{
570	644	new Exception().printStackTrace();
571	645	}
	646	+
572	647	toParentMarked = LA.newMatrix();
573	648	fromParentMarked = LA.newMatrix();
574	649	}
..	..	@@ -879,7 +954,7 @@
879	954
880	955	if (marked && Globals.isLIVE() && live &&
881	956	//TEMP21aug2018
882		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
883	958	currentframe != Globals.framecount)
884	959	{
885	960	currentframe = Globals.framecount;
..	..	@@ -891,7 +966,8 @@
891	966
892	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
893	968
894		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
895	971	{
896	972	countdown = 1;
897	973	delay = speedup?8:1;
..	..	@@ -963,6 +1039,10 @@
963	1039	if (material == null \|\| material.multiply)
964	1040	return true;
965	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.
966	1046	return material.opacity > 0.99;
967	1047	}
968	1048
..	..	@@ -1363,6 +1443,7 @@
1363	1443	toParent = LA.newMatrix();
1364	1444	fromParent = LA.newMatrix();
1365	1445	}
	1446	+
1366	1447	LA.matCopy(other.toParent, toParent);
1367	1448	LA.matCopy(other.fromParent, fromParent);
1368	1449
..	..	@@ -2384,6 +2465,10 @@
2384	2465	}
2385	2466	*/
2386	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ }
2387	2472	}
2388	2473
2389	2474	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2425,6 +2510,14 @@
2425	2510	{
2426	2511	editWindow.refreshContents();
2427	2512	}
	2513	+ else
	2514	+ {
	2515	+ if (manipWindow != null)
	2516	+ {
	2517	+ manipWindow.refreshContents();
	2518	+ }
	2519	+ }
	2520	+
2428	2521	//if (parent != null)
2429	2522	//parent.refreshEditWindow();
2430	2523	}
..	..	@@ -2504,7 +2597,8 @@
2504	2597	private static final int editSelf = 1;
2505	2598	private static final int editChild = 2;
2506	2599
2507		- void drawEditHandles(ClickInfo info, int level)
	2600	+ void drawEditHandles(//ClickInfo info,
	2601	+ int level)
2508	2602	{
2509	2603	if (level == 0)
2510	2604	{
..	..	@@ -2512,7 +2606,8 @@
2512	2606	return;
2513	2607
2514	2608	Object3D selectee;
2515		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2609	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2610	+ level + 1))
2516	2611	{
2517	2612	selectee = (Object3D) e.nextElement();
2518	2613	}
..	..	@@ -2520,19 +2615,22 @@
2520	2615	} else
2521	2616	{
2522	2617	//super.
2523		- drawEditHandles0(info, level + 1);
	2618	+ drawEditHandles0(//info,
	2619	+ level + 1);
2524	2620	}
2525	2621	}
2526	2622
2527		- boolean doEditClick(ClickInfo info, int level)
	2623	+ boolean doEditClick(//ClickInfo info,
	2624	+ int level)
2528	2625	{
2529	2626	doSomething = 0;
2530	2627	if (level == 0)
2531	2628	{
2532		- return doParentClick(info);
	2629	+ return doParentClick(); //info);
2533	2630	}
2534	2631	if (//super.
2535		- doEditClick0(info, level))
	2632	+ doEditClick0(//info,
	2633	+ level))
2536	2634	{
2537	2635	doSomething = 1;
2538	2636	return true;
..	..	@@ -2542,7 +2640,7 @@
2542	2640	}
2543	2641	}
2544	2642
2545		- boolean doParentClick(ClickInfo info)
	2643	+ boolean doParentClick() //ClickInfo info)
2546	2644	{
2547	2645	if (selection == null)
2548	2646	{
..	..	@@ -2555,7 +2653,8 @@
2555	2653	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2556	2654	{
2557	2655	Object3D selectee = (Object3D) e.nextElement();
2558		- if (selectee.doEditClick(info, 1))
	2656	+ if (selectee.doEditClick(//info,
	2657	+ 1))
2559	2658	{
2560	2659	childToDrag = selectee;
2561	2660	doSomething = 2;
..	..	@@ -2567,13 +2666,15 @@
2567	2666	return retval;
2568	2667	}
2569	2668
2570		- void doEditDrag(ClickInfo info, boolean opposite)
	2669	+ void doEditDrag(//ClickInfo clickInfo,
	2670	+ boolean opposite)
2571	2671	{
2572	2672	switch (doSomething)
2573	2673	{
2574	2674	case 1: // '\001'
2575	2675	//super.
2576		- doEditDrag0(info, opposite);
	2676	+ doEditDrag0(//clickInfo,
	2677	+ opposite);
2577	2678	break;
2578	2679
2579	2680	case 2: // '\002'
..	..	@@ -2586,11 +2687,13 @@
2586	2687	{
2587	2688	//sel.hitSomething = childToDrag.hitSomething;
2588	2689	//childToDrag.doEditDrag(info);
2589		- sel.doEditDrag(info, opposite);
	2690	+ sel.doEditDrag(//clickInfo,
	2691	+ opposite);
2590	2692	} else
2591	2693	{
2592	2694	//super.
2593		- doEditDrag0(info, opposite);
	2695	+ doEditDrag0(//clickInfo,
	2696	+ opposite);
2594	2697	}
2595	2698	}
2596	2699	break;
..	..	@@ -2608,6 +2711,9 @@
2608	2711	{
2609	2712	deselectAll();
2610	2713	}
	2714	+
	2715	+ new Exception().printStackTrace();
	2716	+
2611	2717	ClickInfo newInfo = new ClickInfo();
2612	2718	newInfo.flags = info.flags;
2613	2719	newInfo.bounds = info.bounds;
..	..	@@ -3055,7 +3161,7 @@
3055	3161	{
3056	3162	if (bRep != null)
3057	3163	{
3058		- bRep.GenerateNormalsMINE();
	3164	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3059	3165	Touch();
3060	3166	}
3061	3167	}
..	..	@@ -3501,7 +3607,8 @@
3501	3607	if (blockloop)
3502	3608	return;
3503	3609
3504		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3505	3612	live = h;
3506	3613
3507	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3522,7 +3629,8 @@
3522	3629	return;
3523	3630
3524	3631	//if (bRep != null)
3525		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3632	+ if (//marked \|\| // does not make sense
	3633	+ (bRep != null \|\| material != null)) // borderline...
3526	3634	link2master = h;
3527	3635
3528	3636	for (int i = 0; i < Size(); i++)
..	..	@@ -3542,7 +3650,8 @@
3542	3650	if (blockloop)
3543	3651	return;
3544	3652
3545		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3653	+ if (//marked \|\| // does not make sense
	3654	+ (bRep != null \|\| material != null)) // borderline...
3546	3655	hide = h;
3547	3656
3548	3657	for (int i = 0; i < Size(); i++)
..	..	@@ -3562,7 +3671,7 @@
3562	3671	if (blockloop)
3563	3672	return;
3564	3673
3565		- if (bRep != null && material != null) // borderline...
	3674	+ if (bRep != null \|\| material != null) // borderline...
3566	3675	marked = h;
3567	3676
3568	3677	for (int i = 0; i < Size(); i++)
..	..	@@ -3572,6 +3681,46 @@
3572	3681	continue;
3573	3682	blockloop = true;
3574	3683	child.MarkLeaves(h);
	3684	+ blockloop = false;
	3685	+ // release(i);
	3686	+ }
	3687	+ }
	3688	+
	3689	+ void RewindLeaves(boolean h)
	3690	+ {
	3691	+ if (blockloop)
	3692	+ return;
	3693	+
	3694	+ if (bRep != null \|\| material != null) // borderline...
	3695	+ rewind = h;
	3696	+
	3697	+ for (int i = 0; i < Size(); i++)
	3698	+ {
	3699	+ Object3D child = (Object3D) get(i); // reserve(i);
	3700	+ if (child == null)
	3701	+ continue;
	3702	+ blockloop = true;
	3703	+ child.RewindLeaves(h);
	3704	+ blockloop = false;
	3705	+ // release(i);
	3706	+ }
	3707	+ }
	3708	+
	3709	+ void RandomLeaves(boolean h)
	3710	+ {
	3711	+ if (blockloop)
	3712	+ return;
	3713	+
	3714	+ if (bRep != null \|\| material != null) // borderline...
	3715	+ random = h;
	3716	+
	3717	+ for (int i = 0; i < Size(); i++)
	3718	+ {
	3719	+ Object3D child = (Object3D) get(i); // reserve(i);
	3720	+ if (child == null)
	3721	+ continue;
	3722	+ blockloop = true;
	3723	+ child.RandomLeaves(h);
3575	3724	blockloop = false;
3576	3725	// release(i);
3577	3726	}
..	..	@@ -4349,6 +4498,55 @@
4349	4498	}
4350	4499	}
4351	4500
	4501	+ void RepairSOV()
	4502	+ {
	4503	+ if (blockloop)
	4504	+ return;
	4505	+
	4506	+ String texname = this.GetPigmentTexture();
	4507	+
	4508	+ if (texname.startsWith("sov"))
	4509	+ {
	4510	+ String[] s = texname.split("/");
	4511	+
	4512	+ String[] sname = s[1].split("Color.pn");
	4513	+
	4514	+ texname = sname[0];
	4515	+
	4516	+ if (sname.length > 1)
	4517	+ {
	4518	+ texname += "Color.jpg";
	4519	+ }
	4520	+
	4521	+ this.SetPigmentTexture("sov/" + texname);
	4522	+ }
	4523	+
	4524	+ texname = this.GetBumpTexture();
	4525	+
	4526	+ if (texname.startsWith("sov"))
	4527	+ {
	4528	+ String[] s = texname.split("/");
	4529	+
	4530	+ String[] sname = s[1].split("Bump.pn");
	4531	+
	4532	+ texname = sname[0];
	4533	+
	4534	+ if (sname.length > 1)
	4535	+ {
	4536	+ texname += "Bump.jpg";
	4537	+ }
	4538	+
	4539	+ this.SetBumpTexture("sov/" + texname);
	4540	+ }
	4541	+
	4542	+ for (int i=0; i<Size(); i++)
	4543	+ {
	4544	+ blockloop = true;
	4545	+ get(i).RepairSOV();
	4546	+ blockloop = false;
	4547	+ }
	4548	+ }
	4549	+
4352	4550	void RepairTexture()
4353	4551	{
4354	4552	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4863,6 +5061,14 @@
4863	5061	}
4864	5062	}
4865	5063
	5064	+ ObjEditor GetWindow()
	5065	+ {
	5066	+ if (editWindow != null)
	5067	+ return editWindow;
	5068	+
	5069	+ return manipWindow;
	5070	+ }
	5071	+
4866	5072	cTreePath Select(int indexcount, boolean deselect)
4867	5073	{
4868	5074	if (hide \|\| dontselect)
..	..	@@ -4899,10 +5105,11 @@
4899	5105	if (leaf != null)
4900	5106	{
4901	5107	cTreePath tp = new cTreePath(this, leaf);
4902		- if (editWindow != null)
	5108	+ ObjEditor window = GetWindow();
	5109	+ if (window != null)
4903	5110	{
4904	5111	//System.out.println("editWindow = " + editWindow + " vs " + this);
4905		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4906	5113	}
4907	5114
4908	5115	return tp;
..	..	@@ -4919,6 +5126,7 @@
4919	5126
4920	5127	if (child == null)
4921	5128	continue;
	5129	+
4922	5130	if (child.HasTransparency() && child.size() != 0)
4923	5131	{
4924	5132	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4928,9 +5136,10 @@
4928	5136	if (leaf != null)
4929	5137	{
4930	5138	cTreePath tp = new cTreePath(this, leaf);
4931		- if (editWindow != null)
	5139	+ ObjEditor window = GetWindow();
	5140	+ if (window != null)
4932	5141	{
4933		- editWindow.Select(tp, deselect, true);
	5142	+ window.Select(tp, deselect, true);
4934	5143	}
4935	5144
4936	5145	return tp;
..	..	@@ -5255,6 +5464,51 @@
5255	5464	blockloop = false;
5256	5465	}
5257	5466
	5467	+ void ResetSelectable()
	5468	+ {
	5469	+ if (blockloop)
	5470	+ return;
	5471	+
	5472	+ blockloop = true;
	5473	+
	5474	+ keepdontselect = dontselect;
	5475	+ dontselect = true;
	5476	+
	5477	+ Object3D child;
	5478	+ int nb = Size();
	5479	+ for (int i = 0; i < nb; i++)
	5480	+ {
	5481	+ child = (Object3D) get(i);
	5482	+ if (child == null)
	5483	+ continue;
	5484	+ child.ResetSelectable();
	5485	+ }
	5486	+
	5487	+ blockloop = false;
	5488	+ }
	5489	+
	5490	+ void RestoreSelectable()
	5491	+ {
	5492	+ if (blockloop)
	5493	+ return;
	5494	+
	5495	+ blockloop = true;
	5496	+
	5497	+ dontselect = keepdontselect;
	5498	+
	5499	+ Object3D child;
	5500	+ int nb = Size();
	5501	+ for (int i = 0; i < nb; i++)
	5502	+ {
	5503	+ child = (Object3D) get(i);
	5504	+ if (child == null)
	5505	+ continue;
	5506	+ child.RestoreSelectable();
	5507	+ }
	5508	+
	5509	+ blockloop = false;
	5510	+ }
	5511	+
5258	5512	boolean IsSelected()
5259	5513	{
5260	5514	if (parent == null)
..	..	@@ -5564,6 +5818,38 @@
5564	5818	}
5565	5819	}
5566	5820
	5821	+ void EmbedTextures(boolean embed)
	5822	+ {
	5823	+ if (blockloop)
	5824	+ return;
	5825	+
	5826	+ //if (GetTextures() != null)
	5827	+ if (embed)
	5828	+ CameraPane.EmbedTextures(GetTextures());
	5829	+ else
	5830	+ {
	5831	+ GetTextures().pigmentdata = null;
	5832	+ GetTextures().bumpdata = null;
	5833	+ GetTextures().pw = 0;
	5834	+ GetTextures().ph = 0;
	5835	+ GetTextures().bw = 0;
	5836	+ GetTextures().bh = 0;
	5837	+ }
	5838	+
	5839	+ int nb = Size();
	5840	+ for (int i = 0; i < nb; i++)
	5841	+ {
	5842	+ Object3D child = (Object3D) get(i);
	5843	+
	5844	+ if (child == null)
	5845	+ continue;
	5846	+
	5847	+ blockloop = true;
	5848	+ child.EmbedTextures(embed);
	5849	+ blockloop = false;
	5850	+ }
	5851	+ }
	5852	+
5567	5853	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5568	5854	{
5569	5855	Draw(display, root, selected, blocked);
..	..	@@ -5572,12 +5858,23 @@
5572	5858	boolean NeedSupport()
5573	5859	{
5574	5860	return
5575		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5861	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5576	5862	// PROBLEM with CROWD!!
5577	5863	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5578	5864	}
5579	5865
5580	5866	static boolean DEBUG_SELECTION = false;
	5867	+
	5868	+ boolean IsLive()
	5869	+ {
	5870	+ if (live)
	5871	+ return true;
	5872	+
	5873	+ if (parent == null)
	5874	+ return false;
	5875	+
	5876	+ return parent.IsLive();
	5877	+ }
5581	5878
5582	5879	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5583	5880	{
..	..	@@ -5639,8 +5936,10 @@
5639	5936	if (support != null)
5640	5937	support = support;
5641	5938
5642		- //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);
	5939	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+
	5942	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5644	5943
5645	5944	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646	5945	{
..	..	@@ -5650,8 +5949,9 @@
5650	5949	// usecalllists &= !(parent instanceof RandomNode);
5651	5950	// usecalllists = false;
5652	5951
5653		- if (GetBRep() != null)
5654		- usecalllists = usecalllists;
	5952	+ if (display.DrawMode() == display.SHADOW)
	5953	+ //GetBRep() != null)
	5954	+ usecalllists = !!usecalllists;
5655	5955	//System.out.println("draw " + this);
5656	5956	//new Exception().printStackTrace();
5657	5957
..	..	@@ -5660,10 +5960,12 @@
5660	5960	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5661	5961
5662	5962	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5963	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5664	5965	{
5665	5966	Globals.lighttouched = true;
5666	5967	} // all panes...
	5968	+
5667	5969	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5668	5970	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5669	5971	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5671,7 +5973,7 @@
5671	5973	if (!(this instanceof Composite))
5672	5974	touched = false;
5673	5975	//if (displaylist == -1 && usecalllists)
5674		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5976	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5675	5977	{
5676	5978	bRep.displaylist = display.GenList();
5677	5979	assert(bRep.displaylist != 0);
..	..	@@ -5682,7 +5984,7 @@
5682	5984
5683	5985	//System.out.println("\tnew list " + list);
5684	5986	//gl.glDrawBuffer(gl.GL_NONE);
5685		- if (usecalllists)
	5987	+ if (usecalllists && bRep.displaylist > 0)
5686	5988	{
5687	5989	// System.err.println("new list " + bRep.displaylist + " for " + this);
5688	5990	display.NewList(bRep.displaylist);
..	..	@@ -5691,7 +5993,7 @@
5691	5993	CallList(display, root, selected, blocked);
5692	5994
5693	5995	// compiled = true;
5694		- if (usecalllists)
	5996	+ if (usecalllists && bRep.displaylist > 0)
5695	5997	{
5696	5998	// System.err.println("end list " + bRep.displaylist + " for " + this);
5697	5999	display.EndList();
..	..	@@ -5791,6 +6093,7 @@
5791	6093	if (GetBRep() != null)
5792	6094	{
5793	6095	display.NextIndex();
	6096	+
5794	6097	// vertex color conflict : gl.glCallList(list);
5795	6098	DrawNode(display, root, selected);
5796	6099	if (this instanceof BezierPatch)
..	..	@@ -5831,16 +6134,27 @@
5831	6134	tex = GetTextures();
5832	6135	}
5833	6136
5834		- boolean failed = false;
	6137	+ boolean failedPigment = false;
	6138	+ boolean failedBump = false;
5835	6139
5836	6140	try
5837	6141	{
5838		- display.BindTextures(tex, texres);
	6142	+ display.BindPigmentTexture(tex, texres);
5839	6143	}
5840	6144	catch (Exception e)
5841	6145	{
5842	6146	System.err.println("FAILED: " + this);
5843		- failed = true;
	6147	+ failedPigment = true;
	6148	+ }
	6149	+
	6150	+ try
	6151	+ {
	6152	+ display.BindBumpTexture(tex, texres);
	6153	+ }
	6154	+ catch (Exception e)
	6155	+ {
	6156	+ //System.err.println("FAILED: " + this);
	6157	+ failedBump = true;
5844	6158	}
5845	6159
5846	6160	if (!compiled)
..	..	@@ -5863,8 +6177,11 @@
5863	6177	}
5864	6178	}
5865	6179
5866		- if (!failed)
5867		- display.ReleaseTextures(tex);
	6180	+ if (!failedBump)
	6181	+ display.ReleaseBumpTexture(tex);
	6182	+
	6183	+ if (!failedPigment)
	6184	+ display.ReleasePigmentTexture(tex);
5868	6185
5869	6186	display.PopMaterial(this, selected);
5870	6187	}
..	..	@@ -6237,6 +6554,11 @@
6237	6554	// dec 2012
6238	6555	new Exception().printStackTrace();
6239	6556	return;
	6557	+ }
	6558	+
	6559	+ if (dontselect)
	6560	+ {
	6561	+ //bRep.GenerateNormalsMINE();
6240	6562	}
6241	6563
6242	6564	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7022,20 +7344,23 @@
7022	7344	}
7023	7345	}
7024	7346
7025		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7347	+ static ClickInfo clickInfo = new ClickInfo();
	7348	+
	7349	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7350	+ Point outPt, Rectangle outRec)
7026	7351	{
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;
	7352	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7353	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7354	+ double[][] toscreen = clickInfo.toScreen;
7030	7355	if (toscreen == null)
7031	7356	{
7032		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7357	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7033	7358	}
7034	7359	cVector vec = in;
7035	7360	LA.xformPos(in, toscreen, in);
7036	7361	//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();
	7362	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7363	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7039	7364	outPt.x = hc + (int) vec.x;
7040	7365	outPt.y = vc - (int) vec.y;
7041	7366	outRec.x = outPt.x - 3;
..	..	@@ -7043,15 +7368,18 @@
7043	7368	outRec.width = outRec.height = 6;
7044	7369	}
7045	7370
7046		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7371	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7372	+ )
7047	7373	{
7048	7374	Point pt = new Point(0, 0);
7049	7375	Rectangle rec = new Rectangle();
7050		- calcHotSpot(in, info, pt, rec);
	7376	+ calcHotSpot(in, //clickInfo,
	7377	+ pt, rec);
7051	7378	return rec;
7052	7379	}
7053	7380
7054		- void drawEditHandles0(ClickInfo info, int level)
	7381	+ void drawEditHandles0(//ClickInfo clickInfo,
	7382	+ int level)
7055	7383	{
7056	7384	if (level == 0)
7057	7385	{
..	..	@@ -7060,16 +7388,19 @@
7060	7388	{
7061	7389	cVector origin = new cVector();
7062	7390	//LA.xformPos(origin, toParent, origin);
7063		- Rectangle spot = calcHotSpot(origin, info);
	7391	+ if (this.clickInfo == null)
	7392	+ this.clickInfo = new ClickInfo();
	7393	+
	7394	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7064	7395	Rectangle boundary = new Rectangle();
7065	7396	boundary.x = spot.x - 30;
7066	7397	boundary.y = spot.y - 30;
7067	7398	boundary.width = spot.width + 60;
7068	7399	boundary.height = spot.height + 60;
7069		- info.g.setColor(Color.red);
	7400	+ clickInfo.g.setColor(Color.red);
7070	7401	int spotw = spot.x + spot.width;
7071	7402	int spoth = spot.y + spot.height;
7072		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7403	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7073	7404	// if (CameraPane.Xmin > spot.x)
7074	7405	// {
7075	7406	// CameraPane.Xmin = spot.x;
..	..	@@ -7089,8 +7420,8 @@
7089	7420	spot.translate(32, 32);
7090	7421	spotw = spot.x + spot.width;
7091	7422	spoth = spot.y + spot.height;
7092		- info.g.setColor(Color.blue);
7093		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.setColor(Color.cyan);
	7424	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7094	7425	// if (CameraPane.Xmin > spot.x)
7095	7426	// {
7096	7427	// CameraPane.Xmin = spot.x;
..	..	@@ -7107,11 +7438,12 @@
7107	7438	// {
7108	7439	// CameraPane.Ymax = spoth;
7109	7440	// }
7110		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7441	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7442	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7112	7443	spot.translate(0, -32);
7113		- info.g.setColor(Color.green);
7114		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7444	+ clickInfo.g.setColor(Color.yellow);
	7445	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7446	+ clickInfo.g.setColor(Color.green);
7115	7447	// if (CameraPane.Xmin > spot.x)
7116	7448	// {
7117	7449	// CameraPane.Xmin = spot.x;
..	..	@@ -7128,8 +7460,8 @@
7128	7460	// {
7129	7461	// CameraPane.Ymax = spoth;
7130	7462	// }
7131		- info.g.drawArc(boundary.x, boundary.y,
7132		- boundary.width, boundary.height, 0, 360);
	7463	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7464	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7133	7465	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7134	7466	// if (CameraPane.Xmin > boundary.x)
7135	7467	// {
..	..	@@ -7151,7 +7483,8 @@
7151	7483	}
7152	7484	}
7153	7485
7154		- boolean doEditClick0(ClickInfo info, int level)
	7486	+ boolean doEditClick0(//ClickInfo clickInfo,
	7487	+ int level)
7155	7488	{
7156	7489	if (level == 0)
7157	7490	{
..	..	@@ -7160,8 +7493,8 @@
7160	7493
7161	7494	boolean retval = false;
7162	7495
7163		- startX = info.x;
7164		- startY = info.y;
	7496	+ startX = clickInfo.x;
	7497	+ startY = clickInfo.y;
7165	7498
7166	7499	hitSomething = -1;
7167	7500	cVector origin = new cVector();
..	..	@@ -7171,22 +7504,51 @@
7171	7504	{
7172	7505	centerPt = new Point(0, 0);
7173	7506	}
7174		- calcHotSpot(origin, info, centerPt, spot);
7175		- if (spot.contains(info.x, info.y))
	7507	+ calcHotSpot(origin, //info,
	7508	+ centerPt, spot);
	7509	+ if (spot.contains(clickInfo.x, clickInfo.y))
7176	7510	{
7177	7511	hitSomething = hitCenter;
7178	7512	retval = true;
7179	7513	}
7180	7514	spot.translate(32, 0);
7181		- if (spot.contains(info.x, info.y))
	7515	+ if (spot.contains(clickInfo.x, clickInfo.y))
7182	7516	{
7183	7517	hitSomething = hitRotate;
7184	7518	retval = true;
7185	7519	}
7186	7520	spot.translate(0, 32);
7187		- if (spot.contains(info.x, info.y))
	7521	+ if (spot.contains(clickInfo.x, clickInfo.y))
7188	7522	{
7189	7523	hitSomething = hitScale;
	7524	+
	7525	+ double scale = 0.005f * clickInfo.camera.Distance();
	7526	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7527	+ double sign = 1;
	7528	+ if (hScale < 0)
	7529	+ {
	7530	+ sign = -1;
	7531	+ }
	7532	+ hScale = signMath.pow(signhScale, scale * 50);
	7533	+ if (hScale < 0.01)
	7534	+ {
	7535	+ //hScale = 0.01;
	7536	+ }
	7537	+
	7538	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7539	+ sign = 1;
	7540	+ if (vScale < 0)
	7541	+ {
	7542	+ sign = -1;
	7543	+ }
	7544	+ vScale = signMath.pow(signvScale, scale * 50);
	7545	+ if (vScale < 0.01)
	7546	+ {
	7547	+ //vScale = 0.01;
	7548	+ }
	7549	+
	7550	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7551	+
7190	7552	retval = true;
7191	7553	}
7192	7554
..	..	@@ -7196,7 +7558,7 @@
7196	7558	}
7197	7559
7198	7560	//System.out.println("info.modifiers = " + info.modifiers);
7199		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7561	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7200	7562	//System.out.println("modified = " + modified);
7201	7563	//new Exception().printStackTrace();
7202	7564	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7224,7 +7586,8 @@
7224	7586	return true;
7225	7587	}
7226	7588
7227		- void doEditDrag0(ClickInfo info, boolean opposite)
	7589	+ void doEditDrag0(//ClickInfo info,
	7590	+ boolean opposite)
7228	7591	{
7229	7592	if (hitSomething == 0)
7230	7593	{
..	..	@@ -7238,7 +7601,7 @@
7238	7601
7239	7602	//System.out.println("hitSomething = " + hitSomething);
7240	7603
7241		- double scale = 0.005f * info.camera.Distance();
	7604	+ double scale = 0.005f * clickInfo.camera.Distance();
7242	7605
7243	7606	cVector xlate = new cVector();
7244	7607	//cVector xlate2 = new cVector();
..	..	@@ -7272,8 +7635,8 @@
7272	7635	toParent[3][i] = xlate.get(i);
7273	7636	LA.matInvert(toParent, fromParent);
7274	7637	*/
7275		- cVector delta = LA.newVector(0, 0, startY - info.y);
7276		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7638	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7639	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7277	7640
7278	7641	LA.matCopy(startMat, toParent);
7279	7642	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7282,7 +7645,7 @@
7282	7645	} else
7283	7646	{
7284	7647	//LA.xformDir(delta, info.camera.fromScreen, delta);
7285		- cVector up = new cVector(info.camera.up);
	7648	+ cVector up = new cVector(clickInfo.camera.up);
7286	7649	cVector away = new cVector();
7287	7650	//cVector right2 = new cVector();
7288	7651	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7299,19 +7662,19 @@
7299	7662	LA.xformDir(up, ClickInfo.matbuffer, up);
7300	7663	// if (!CameraPane.LOCALTRANSFORM)
7301	7664	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7302		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7665	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7303	7666	// if (!CameraPane.LOCALTRANSFORM)
7304	7667	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7305	7668	//LA.vecCross(up, cVector.Z, right2);
7306	7669
7307		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7670	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7308	7671
7309	7672	//System.out.println("DELTA0 = " + delta);
7310	7673	//System.out.println("AWAY = " + info.camera.away);
7311	7674	//System.out.println("UP = " + info.camera.up);
7312	7675	if (away.z > 0)
7313	7676	{
7314		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7677	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7315	7678	{
7316	7679	delta.x = -delta.x;
7317	7680	} else
..	..	@@ -7326,7 +7689,7 @@
7326	7689	//System.out.println("DELTA1 = " + delta);
7327	7690	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7328	7691	//System.out.println("DELTA2 = " + delta);
7329		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7692	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7330	7693	LA.matCopy(startMat, toParent);
7331	7694	//System.out.println("DELTA3 = " + delta);
7332	7695	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7336,8 +7699,8 @@
7336	7699	break;
7337	7700
7338	7701	case hitRotate: // rotate
7339		- int dx = info.x - centerPt.x;
7340		- int dy = -(info.y - centerPt.y);
	7702	+ int dx = clickInfo.x - centerPt.x;
	7703	+ int dy = -(clickInfo.y - centerPt.y);
7341	7704	double angle = (double) Math.atan2(dx, dy);
7342	7705	angle = -(1.570796 - angle);
7343	7706
..	..	@@ -7360,7 +7723,7 @@
7360	7723	}
7361	7724	/**/
7362	7725
7363		- switch (info.pane.RenderCamera().viewCode)
	7726	+ switch (clickInfo.pane.RenderCamera().viewCode)
7364	7727	{
7365	7728	case 1: // '\001'
7366	7729	LA.matZRotate(toParent, angle);
..	..	@@ -7387,7 +7750,7 @@
7387	7750	break;
7388	7751
7389	7752	case hitScale: // scale
7390		- double hScale = (double) (info.x - centerPt.x) / 32;
	7753	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7391	7754	double sign = 1;
7392	7755	if (hScale < 0)
7393	7756	{
..	..	@@ -7399,7 +7762,7 @@
7399	7762	//hScale = 0.01;
7400	7763	}
7401	7764
7402		- double vScale = (double) (info.y - centerPt.y) / 32;
	7765	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7403	7766	sign = 1;
7404	7767	if (vScale < 0)
7405	7768	{
..	..	@@ -7410,6 +7773,7 @@
7410	7773	{
7411	7774	//vScale = 0.01;
7412	7775	}
	7776	+
7413	7777	LA.matCopy(startMat, toParent);
7414	7778	/**/
7415	7779	for (int i = 0; i < 3; i++)
..	..	@@ -7419,29 +7783,30 @@
7419	7783	}
7420	7784	/**/
7421	7785
7422		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7786	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7423	7787
7424	7788	if (totalScale < 0.01)
7425	7789	{
7426	7790	totalScale = 0.01;
7427	7791	}
7428	7792
7429		- switch (info.pane.RenderCamera().viewCode)
	7793	+ switch (clickInfo.pane.RenderCamera().viewCode)
7430	7794	{
7431	7795	case 3: // '\001'
7432		- if (modified)
	7796	+ if (modified \|\| opposite)
7433	7797	{
7434	7798	//LA.matScale(toParent, 1, hScale, vScale);
7435	7799	LA.matScale(toParent, totalScale, 1, 1);
7436	7800	} // vScale, 1);
7437	7801	else
7438	7802	{
	7803	+ // EXCEPTION!
7439	7804	LA.matScale(toParent, totalScale, totalScale, totalScale);
7440	7805	} // vScale, 1);
7441	7806	break;
7442	7807
7443	7808	case 2: // '\002'
7444		- if (modified)
	7809	+ if (modified \|\| opposite)
7445	7810	{
7446	7811	//LA.matScale(toParent, hScale, 1, vScale);
7447	7812	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7452,7 +7817,7 @@
7452	7817	break;
7453	7818
7454	7819	case 1: // '\003'
7455		- if (modified)
	7820	+ if (modified \|\| opposite)
7456	7821	{
7457	7822	//LA.matScale(toParent, hScale, vScale, 1);
7458	7823	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7492,7 +7857,7 @@
7492	7857	} // NEW ...
7493	7858
7494	7859
7495		- info.pane.repaint();
	7860	+ clickInfo.pane.repaint();
7496	7861	}
7497	7862
7498	7863	boolean overflow = false;
..	..	@@ -7672,6 +8037,10 @@
7672	8037	editWindow = null;
7673	8038	} // ?
7674	8039	}
	8040	+ else
	8041	+ {
	8042	+ //editWindow.closeUI();
	8043	+ }
7675	8044	}
7676	8045
7677	8046	boolean root; // patch for edit windows
..	..	@@ -7829,6 +8198,10 @@
7829	8198	}
7830	8199
7831	8200	transient ObjEditor editWindow;
	8201	+ transient ObjEditor manipWindow;
	8202	+
	8203	+ transient boolean pinned;
	8204	+
7832	8205	transient ObjectUI objectUI;
7833	8206	public static int povDepth = 0;
7834	8207	private static cVector tbMin = new cVector();