~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,11 @@
2384	2465	}
2385	2466	*/
2386	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2387	2473	}
2388	2474
2389	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2425,6 +2511,14 @@
2425	2511	{
2426	2512	editWindow.refreshContents();
2427	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2428	2522	//if (parent != null)
2429	2523	//parent.refreshEditWindow();
2430	2524	}
..	..	@@ -2504,7 +2598,8 @@
2504	2598	private static final int editSelf = 1;
2505	2599	private static final int editChild = 2;
2506	2600
2507		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2508	2603	{
2509	2604	if (level == 0)
2510	2605	{
..	..	@@ -2512,7 +2607,8 @@
2512	2607	return;
2513	2608
2514	2609	Object3D selectee;
2515		- 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))
2516	2612	{
2517	2613	selectee = (Object3D) e.nextElement();
2518	2614	}
..	..	@@ -2520,19 +2616,22 @@
2520	2616	} else
2521	2617	{
2522	2618	//super.
2523		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2524	2621	}
2525	2622	}
2526	2623
2527		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2528	2626	{
2529	2627	doSomething = 0;
2530	2628	if (level == 0)
2531	2629	{
2532		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2533	2631	}
2534	2632	if (//super.
2535		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2536	2635	{
2537	2636	doSomething = 1;
2538	2637	return true;
..	..	@@ -2542,7 +2641,7 @@
2542	2641	}
2543	2642	}
2544	2643
2545		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2546	2645	{
2547	2646	if (selection == null)
2548	2647	{
..	..	@@ -2555,7 +2654,8 @@
2555	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2556	2655	{
2557	2656	Object3D selectee = (Object3D) e.nextElement();
2558		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2559	2659	{
2560	2660	childToDrag = selectee;
2561	2661	doSomething = 2;
..	..	@@ -2567,13 +2667,15 @@
2567	2667	return retval;
2568	2668	}
2569	2669
2570		- void doEditDrag(ClickInfo info, boolean opposite)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2571	2672	{
2572	2673	switch (doSomething)
2573	2674	{
2574	2675	case 1: // '\001'
2575	2676	//super.
2576		- doEditDrag0(info, opposite);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2577	2679	break;
2578	2680
2579	2681	case 2: // '\002'
..	..	@@ -2586,11 +2688,13 @@
2586	2688	{
2587	2689	//sel.hitSomething = childToDrag.hitSomething;
2588	2690	//childToDrag.doEditDrag(info);
2589		- sel.doEditDrag(info, opposite);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2590	2693	} else
2591	2694	{
2592	2695	//super.
2593		- doEditDrag0(info, opposite);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2594	2698	}
2595	2699	}
2596	2700	break;
..	..	@@ -2608,6 +2712,9 @@
2608	2712	{
2609	2713	deselectAll();
2610	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2611	2718	ClickInfo newInfo = new ClickInfo();
2612	2719	newInfo.flags = info.flags;
2613	2720	newInfo.bounds = info.bounds;
..	..	@@ -3055,7 +3162,7 @@
3055	3162	{
3056	3163	if (bRep != null)
3057	3164	{
3058		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3059	3166	Touch();
3060	3167	}
3061	3168	}
..	..	@@ -3501,7 +3608,8 @@
3501	3608	if (blockloop)
3502	3609	return;
3503	3610
3504		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3505	3613	live = h;
3506	3614
3507	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3522,7 +3630,8 @@
3522	3630	return;
3523	3631
3524	3632	//if (bRep != null)
3525		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3526	3635	link2master = h;
3527	3636
3528	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3542,7 +3651,8 @@
3542	3651	if (blockloop)
3543	3652	return;
3544	3653
3545		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3546	3656	hide = h;
3547	3657
3548	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3562,7 +3672,7 @@
3562	3672	if (blockloop)
3563	3673	return;
3564	3674
3565		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3566	3676	marked = h;
3567	3677
3568	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3572,6 +3682,46 @@
3572	3682	continue;
3573	3683	blockloop = true;
3574	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);
3575	3725	blockloop = false;
3576	3726	// release(i);
3577	3727	}
..	..	@@ -4349,6 +4499,55 @@
4349	4499	}
4350	4500	}
4351	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	+
4352	4551	void RepairTexture()
4353	4552	{
4354	4553	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4863,6 +5062,14 @@
4863	5062	}
4864	5063	}
4865	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4866	5073	cTreePath Select(int indexcount, boolean deselect)
4867	5074	{
4868	5075	if (hide \|\| dontselect)
..	..	@@ -4899,10 +5106,11 @@
4899	5106	if (leaf != null)
4900	5107	{
4901	5108	cTreePath tp = new cTreePath(this, leaf);
4902		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4903	5111	{
4904	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4905		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4906	5114	}
4907	5115
4908	5116	return tp;
..	..	@@ -4919,6 +5127,7 @@
4919	5127
4920	5128	if (child == null)
4921	5129	continue;
	5130	+
4922	5131	if (child.HasTransparency() && child.size() != 0)
4923	5132	{
4924	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4928,9 +5137,10 @@
4928	5137	if (leaf != null)
4929	5138	{
4930	5139	cTreePath tp = new cTreePath(this, leaf);
4931		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4932	5142	{
4933		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4934	5144	}
4935	5145
4936	5146	return tp;
..	..	@@ -5255,6 +5465,51 @@
5255	5465	blockloop = false;
5256	5466	}
5257	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	+
5258	5513	boolean IsSelected()
5259	5514	{
5260	5515	if (parent == null)
..	..	@@ -5564,6 +5819,38 @@
5564	5819	}
5565	5820	}
5566	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	+
5567	5854	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5568	5855	{
5569	5856	Draw(display, root, selected, blocked);
..	..	@@ -5572,12 +5859,23 @@
5572	5859	boolean NeedSupport()
5573	5860	{
5574	5861	return
5575		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5862	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5576	5863	// PROBLEM with CROWD!!
5577	5864	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5578	5865	}
5579	5866
5580	5867	static boolean DEBUG_SELECTION = false;
	5868	+
	5869	+ boolean IsLive()
	5870	+ {
	5871	+ if (live)
	5872	+ return true;
	5873	+
	5874	+ if (parent == null)
	5875	+ return false;
	5876	+
	5877	+ return parent.IsLive();
	5878	+ }
5581	5879
5582	5880	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5583	5881	{
..	..	@@ -5639,8 +5937,10 @@
5639	5937	if (support != null)
5640	5938	support = support;
5641	5939
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);
	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.
5644	5944
5645	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646	5946	{
..	..	@@ -5650,8 +5950,9 @@
5650	5950	// usecalllists &= !(parent instanceof RandomNode);
5651	5951	// usecalllists = false;
5652	5952
5653		- if (GetBRep() != null)
5654		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5655	5956	//System.out.println("draw " + this);
5656	5957	//new Exception().printStackTrace();
5657	5958
..	..	@@ -5660,10 +5961,12 @@
5660	5961	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5661	5962
5662	5963	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5664	5966	{
5665	5967	Globals.lighttouched = true;
5666	5968	} // all panes...
	5969	+
5667	5970	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5668	5971	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5669	5972	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5671,7 +5974,7 @@
5671	5974	if (!(this instanceof Composite))
5672	5975	touched = false;
5673	5976	//if (displaylist == -1 && usecalllists)
5674		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5675	5978	{
5676	5979	bRep.displaylist = display.GenList();
5677	5980	assert(bRep.displaylist != 0);
..	..	@@ -5682,7 +5985,7 @@
5682	5985
5683	5986	//System.out.println("\tnew list " + list);
5684	5987	//gl.glDrawBuffer(gl.GL_NONE);
5685		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5686	5989	{
5687	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5688	5991	display.NewList(bRep.displaylist);
..	..	@@ -5691,7 +5994,7 @@
5691	5994	CallList(display, root, selected, blocked);
5692	5995
5693	5996	// compiled = true;
5694		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5695	5998	{
5696	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5697	6000	display.EndList();
..	..	@@ -5791,6 +6094,7 @@
5791	6094	if (GetBRep() != null)
5792	6095	{
5793	6096	display.NextIndex();
	6097	+
5794	6098	// vertex color conflict : gl.glCallList(list);
5795	6099	DrawNode(display, root, selected);
5796	6100	if (this instanceof BezierPatch)
..	..	@@ -5831,16 +6135,27 @@
5831	6135	tex = GetTextures();
5832	6136	}
5833	6137
5834		- boolean failed = false;
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
5835	6140
5836	6141	try
5837	6142	{
5838		- display.BindTextures(tex, texres);
	6143	+ display.BindPigmentTexture(tex, texres);
5839	6144	}
5840	6145	catch (Exception e)
5841	6146	{
5842	6147	System.err.println("FAILED: " + this);
5843		- 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;
5844	6159	}
5845	6160
5846	6161	if (!compiled)
..	..	@@ -5863,8 +6178,11 @@
5863	6178	}
5864	6179	}
5865	6180
5866		- if (!failed)
5867		- display.ReleaseTextures(tex);
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
5868	6186
5869	6187	display.PopMaterial(this, selected);
5870	6188	}
..	..	@@ -6237,6 +6555,11 @@
6237	6555	// dec 2012
6238	6556	new Exception().printStackTrace();
6239	6557	return;
	6558	+ }
	6559	+
	6560	+ if (dontselect)
	6561	+ {
	6562	+ //bRep.GenerateNormalsMINE();
6240	6563	}
6241	6564
6242	6565	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7022,20 +7345,23 @@
7022	7345	}
7023	7346	}
7024	7347
7025		- 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)
7026	7352	{
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;
	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;
7030	7356	if (toscreen == null)
7031	7357	{
7032		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7033	7359	}
7034	7360	cVector vec = in;
7035	7361	LA.xformPos(in, toscreen, in);
7036	7362	//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();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7039	7365	outPt.x = hc + (int) vec.x;
7040	7366	outPt.y = vc - (int) vec.y;
7041	7367	outRec.x = outPt.x - 3;
..	..	@@ -7043,15 +7369,18 @@
7043	7369	outRec.width = outRec.height = 6;
7044	7370	}
7045	7371
7046		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
7047	7374	{
7048	7375	Point pt = new Point(0, 0);
7049	7376	Rectangle rec = new Rectangle();
7050		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
7051	7379	return rec;
7052	7380	}
7053	7381
7054		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
7055	7384	{
7056	7385	if (level == 0)
7057	7386	{
..	..	@@ -7060,16 +7389,19 @@
7060	7389	{
7061	7390	cVector origin = new cVector();
7062	7391	//LA.xformPos(origin, toParent, origin);
7063		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7064	7396	Rectangle boundary = new Rectangle();
7065	7397	boundary.x = spot.x - 30;
7066	7398	boundary.y = spot.y - 30;
7067	7399	boundary.width = spot.width + 60;
7068	7400	boundary.height = spot.height + 60;
7069		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
7070	7402	int spotw = spot.x + spot.width;
7071	7403	int spoth = spot.y + spot.height;
7072		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7073	7405	// if (CameraPane.Xmin > spot.x)
7074	7406	// {
7075	7407	// CameraPane.Xmin = spot.x;
..	..	@@ -7089,8 +7421,8 @@
7089	7421	spot.translate(32, 32);
7090	7422	spotw = spot.x + spot.width;
7091	7423	spoth = spot.y + spot.height;
7092		- info.g.setColor(Color.blue);
7093		- 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);
7094	7426	// if (CameraPane.Xmin > spot.x)
7095	7427	// {
7096	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7107,11 +7439,12 @@
7107	7439	// {
7108	7440	// CameraPane.Ymax = spoth;
7109	7441	// }
7110		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7442	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7443	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7112	7444	spot.translate(0, -32);
7113		- info.g.setColor(Color.green);
7114		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
7115	7448	// if (CameraPane.Xmin > spot.x)
7116	7449	// {
7117	7450	// CameraPane.Xmin = spot.x;
..	..	@@ -7128,8 +7461,8 @@
7128	7461	// {
7129	7462	// CameraPane.Ymax = spoth;
7130	7463	// }
7131		- info.g.drawArc(boundary.x, boundary.y,
7132		- 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);
7133	7466	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7134	7467	// if (CameraPane.Xmin > boundary.x)
7135	7468	// {
..	..	@@ -7151,7 +7484,8 @@
7151	7484	}
7152	7485	}
7153	7486
7154		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
7155	7489	{
7156	7490	if (level == 0)
7157	7491	{
..	..	@@ -7160,8 +7494,8 @@
7160	7494
7161	7495	boolean retval = false;
7162	7496
7163		- startX = info.x;
7164		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
7165	7499
7166	7500	hitSomething = -1;
7167	7501	cVector origin = new cVector();
..	..	@@ -7171,22 +7505,51 @@
7171	7505	{
7172	7506	centerPt = new Point(0, 0);
7173	7507	}
7174		- calcHotSpot(origin, info, centerPt, spot);
7175		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
7176	7511	{
7177	7512	hitSomething = hitCenter;
7178	7513	retval = true;
7179	7514	}
7180	7515	spot.translate(32, 0);
7181		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
7182	7517	{
7183	7518	hitSomething = hitRotate;
7184	7519	retval = true;
7185	7520	}
7186	7521	spot.translate(0, 32);
7187		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
7188	7523	{
7189	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	+
7190	7553	retval = true;
7191	7554	}
7192	7555
..	..	@@ -7196,7 +7559,7 @@
7196	7559	}
7197	7560
7198	7561	//System.out.println("info.modifiers = " + info.modifiers);
7199		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7200	7563	//System.out.println("modified = " + modified);
7201	7564	//new Exception().printStackTrace();
7202	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7224,7 +7587,8 @@
7224	7587	return true;
7225	7588	}
7226	7589
7227		- void doEditDrag0(ClickInfo info, boolean opposite)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
7228	7592	{
7229	7593	if (hitSomething == 0)
7230	7594	{
..	..	@@ -7238,7 +7602,7 @@
7238	7602
7239	7603	//System.out.println("hitSomething = " + hitSomething);
7240	7604
7241		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
7242	7606
7243	7607	cVector xlate = new cVector();
7244	7608	//cVector xlate2 = new cVector();
..	..	@@ -7272,8 +7636,8 @@
7272	7636	toParent[3][i] = xlate.get(i);
7273	7637	LA.matInvert(toParent, fromParent);
7274	7638	*/
7275		- cVector delta = LA.newVector(0, 0, startY - info.y);
7276		- 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);
7277	7641
7278	7642	LA.matCopy(startMat, toParent);
7279	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7282,7 +7646,7 @@
7282	7646	} else
7283	7647	{
7284	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7285		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7286	7650	cVector away = new cVector();
7287	7651	//cVector right2 = new cVector();
7288	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7299,19 +7663,19 @@
7299	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7300	7664	// if (!CameraPane.LOCALTRANSFORM)
7301	7665	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7302		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7303	7667	// if (!CameraPane.LOCALTRANSFORM)
7304	7668	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7305	7669	//LA.vecCross(up, cVector.Z, right2);
7306	7670
7307		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7308	7672
7309	7673	//System.out.println("DELTA0 = " + delta);
7310	7674	//System.out.println("AWAY = " + info.camera.away);
7311	7675	//System.out.println("UP = " + info.camera.up);
7312	7676	if (away.z > 0)
7313	7677	{
7314		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7315	7679	{
7316	7680	delta.x = -delta.x;
7317	7681	} else
..	..	@@ -7326,7 +7690,7 @@
7326	7690	//System.out.println("DELTA1 = " + delta);
7327	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7328	7692	//System.out.println("DELTA2 = " + delta);
7329		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7330	7694	LA.matCopy(startMat, toParent);
7331	7695	//System.out.println("DELTA3 = " + delta);
7332	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7336,8 +7700,8 @@
7336	7700	break;
7337	7701
7338	7702	case hitRotate: // rotate
7339		- int dx = info.x - centerPt.x;
7340		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7341	7705	double angle = (double) Math.atan2(dx, dy);
7342	7706	angle = -(1.570796 - angle);
7343	7707
..	..	@@ -7360,7 +7724,7 @@
7360	7724	}
7361	7725	/**/
7362	7726
7363		- switch (info.pane.RenderCamera().viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7364	7728	{
7365	7729	case 1: // '\001'
7366	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7387,7 +7751,7 @@
7387	7751	break;
7388	7752
7389	7753	case hitScale: // scale
7390		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7391	7755	double sign = 1;
7392	7756	if (hScale < 0)
7393	7757	{
..	..	@@ -7399,7 +7763,7 @@
7399	7763	//hScale = 0.01;
7400	7764	}
7401	7765
7402		- double vScale = (double) (info.y - centerPt.y) / 32;
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7403	7767	sign = 1;
7404	7768	if (vScale < 0)
7405	7769	{
..	..	@@ -7410,6 +7774,7 @@
7410	7774	{
7411	7775	//vScale = 0.01;
7412	7776	}
	7777	+
7413	7778	LA.matCopy(startMat, toParent);
7414	7779	/**/
7415	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7419,29 +7784,30 @@
7419	7784	}
7420	7785	/**/
7421	7786
7422		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7423	7788
7424	7789	if (totalScale < 0.01)
7425	7790	{
7426	7791	totalScale = 0.01;
7427	7792	}
7428	7793
7429		- switch (info.pane.RenderCamera().viewCode)
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7430	7795	{
7431	7796	case 3: // '\001'
7432		- if (modified)
	7797	+ if (modified \|\| opposite)
7433	7798	{
7434	7799	//LA.matScale(toParent, 1, hScale, vScale);
7435	7800	LA.matScale(toParent, totalScale, 1, 1);
7436	7801	} // vScale, 1);
7437	7802	else
7438	7803	{
	7804	+ // EXCEPTION!
7439	7805	LA.matScale(toParent, totalScale, totalScale, totalScale);
7440	7806	} // vScale, 1);
7441	7807	break;
7442	7808
7443	7809	case 2: // '\002'
7444		- if (modified)
	7810	+ if (modified \|\| opposite)
7445	7811	{
7446	7812	//LA.matScale(toParent, hScale, 1, vScale);
7447	7813	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7452,7 +7818,7 @@
7452	7818	break;
7453	7819
7454	7820	case 1: // '\003'
7455		- if (modified)
	7821	+ if (modified \|\| opposite)
7456	7822	{
7457	7823	//LA.matScale(toParent, hScale, vScale, 1);
7458	7824	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7492,7 +7858,7 @@
7492	7858	} // NEW ...
7493	7859
7494	7860
7495		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7496	7862	}
7497	7863
7498	7864	boolean overflow = false;
..	..	@@ -7672,6 +8038,10 @@
7672	8038	editWindow = null;
7673	8039	} // ?
7674	8040	}
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
	8044	+ }
7675	8045	}
7676	8046
7677	8047	boolean root; // patch for edit windows
..	..	@@ -7829,6 +8199,10 @@
7829	8199	}
7830	8200
7831	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
7832	8206	transient ObjectUI objectUI;
7833	8207	public static int povDepth = 0;
7834	8208	private static cVector tbMin = new cVector();