~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,12 +22,21 @@
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	//
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
31	40
32	41	ScriptNode scriptnode;
33	42
..	..	@@ -170,24 +179,35 @@
170	179
171	180	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	181	{
	182	+ Object3D o;
	183	+
173	184	if (hashtable.containsKey(GetUUID()))
174	185	{
175		- Object3D o = hashtable.get(GetUUID());
	186	+ o = hashtable.get(GetUUID());
176	187
177	188	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
180	197
181		- return;
	198	+ hashtable.put(GetUUID(), o);
182	199	}
183	200
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	201	+ if (!blockloop)
189	202	{
190		- get(i).ExtractBigData(hashtable);
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
191	211	}
192	212
193	213	ExtractBigData(o);
..	..	@@ -195,11 +215,26 @@
195	215
196	216	void ExtractBigData(Object3D o)
197	217	{
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
198	221	o.bRep = this.bRep;
199		- if (this.bRep != null)
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
200	232	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
203	238	}
204	239
205	240	// o.support = this.support;
..	..	@@ -214,6 +249,73 @@
214	249	// this.fileparent = null;
215	250	}
216	251
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
	294	+ blockloop = false;
	295	+ }
	296	+
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
	301	+
	302	+ blockloop = true;
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
217	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	320	{
219	321	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +325,35 @@
223	325
224	326	RestoreBigData(o);
225	327
226		- hashtable.remove(GetUUID());
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
227	334
228	335	for (int i=0; i<Size(); i++)
229	336	{
230	337	get(i).RestoreBigData(hashtable);
231	338	}
	339	+
	340	+ blockloop = false;
232	341	}
233	342
234	343	void RestoreBigData(Object3D o)
235	344	{
236	345	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
239	357	// this.support = o.support;
240	358	// this.fileparent = o.fileparent;
241	359	}
..	..	@@ -381,6 +499,7 @@
381	499	}
382	500
383	501	boolean live = false;
	502	+ transient boolean keepdontselect;
384	503	boolean dontselect = false;
385	504	boolean hide = false;
386	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +1000,7 @@
881	1000
882	1001	if (marked && Globals.isLIVE() && live &&
883	1002	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	1004	currentframe != Globals.framecount)
886	1005	{
887	1006	currentframe = Globals.framecount;
..	..	@@ -966,6 +1085,10 @@
966	1085	if (material == null \|\| material.multiply)
967	1086	return true;
968	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1092	return material.opacity > 0.99;
970	1093	}
971	1094
..	..	@@ -1366,6 +1489,7 @@
1366	1489	toParent = LA.newMatrix();
1367	1490	fromParent = LA.newMatrix();
1368	1491	}
	1492	+
1369	1493	LA.matCopy(other.toParent, toParent);
1370	1494	LA.matCopy(other.fromParent, fromParent);
1371	1495
..	..	@@ -2387,6 +2511,15 @@
2387	2511	}
2388	2512	*/
2389	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2390	2523	}
2391	2524
2392	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2561,14 @@
2428	2561	{
2429	2562	editWindow.refreshContents();
2430	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2431	2572	//if (parent != null)
2432	2573	//parent.refreshEditWindow();
2433	2574	}
..	..	@@ -2507,7 +2648,8 @@
2507	2648	private static final int editSelf = 1;
2508	2649	private static final int editChild = 2;
2509	2650
2510		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2511	2653	{
2512	2654	if (level == 0)
2513	2655	{
..	..	@@ -2515,7 +2657,8 @@
2515	2657	return;
2516	2658
2517	2659	Object3D selectee;
2518		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2519	2662	{
2520	2663	selectee = (Object3D) e.nextElement();
2521	2664	}
..	..	@@ -2523,19 +2666,22 @@
2523	2666	} else
2524	2667	{
2525	2668	//super.
2526		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2527	2671	}
2528	2672	}
2529	2673
2530		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2531	2676	{
2532	2677	doSomething = 0;
2533	2678	if (level == 0)
2534	2679	{
2535		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2536	2681	}
2537	2682	if (//super.
2538		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2539	2685	{
2540	2686	doSomething = 1;
2541	2687	return true;
..	..	@@ -2545,7 +2691,7 @@
2545	2691	}
2546	2692	}
2547	2693
2548		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2549	2695	{
2550	2696	if (selection == null)
2551	2697	{
..	..	@@ -2558,7 +2704,8 @@
2558	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2705	{
2560	2706	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2562	2709	{
2563	2710	childToDrag = selectee;
2564	2711	doSomething = 2;
..	..	@@ -2570,13 +2717,15 @@
2570	2717	return retval;
2571	2718	}
2572	2719
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2574	2722	{
2575	2723	switch (doSomething)
2576	2724	{
2577	2725	case 1: // '\001'
2578	2726	//super.
2579		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2580	2729	break;
2581	2730
2582	2731	case 2: // '\002'
..	..	@@ -2589,11 +2738,13 @@
2589	2738	{
2590	2739	//sel.hitSomething = childToDrag.hitSomething;
2591	2740	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2593	2743	} else
2594	2744	{
2595	2745	//super.
2596		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2597	2748	}
2598	2749	}
2599	2750	break;
..	..	@@ -2611,6 +2762,9 @@
2611	2762	{
2612	2763	deselectAll();
2613	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2614	2768	ClickInfo newInfo = new ClickInfo();
2615	2769	newInfo.flags = info.flags;
2616	2770	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3212,7 @@
3058	3212	{
3059	3213	if (bRep != null)
3060	3214	{
3061		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3216	Touch();
3063	3217	}
3064	3218	}
..	..	@@ -3468,15 +3622,47 @@
3468	3622
3469	3623	void ClearMaterials()
3470	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3471	3630	ClearMaterial();
3472		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3473	3632	{
3474		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3475	3634	if (child == null)
3476	3635	continue;
3477	3636	child.ClearMaterials();
3478		- release(i);
3479	3637	}
	3638	+
	3639	+ blockloop = false;
	3640	+ }
	3641	+
	3642	+ void ClearVersionList()
	3643	+ {
	3644	+ this.versionlist = null;
	3645	+ this.versionindex = -1;
	3646	+ this.versiontable = null;
	3647	+ }
	3648	+
	3649	+ void ClearVersions()
	3650	+ {
	3651	+ if (blockloop)
	3652	+ return;
	3653	+
	3654	+ blockloop = true;
	3655	+
	3656	+ ClearVersionList();
	3657	+ for (int i = 0; i < Size(); i++)
	3658	+ {
	3659	+ Object3D child = (Object3D) get(i);
	3660	+ if (child == null)
	3661	+ continue;
	3662	+ child.ClearVersions();
	3663	+ }
	3664	+
	3665	+ blockloop = false;
3480	3666	}
3481	3667
3482	3668	void FlipV(boolean flip)
..	..	@@ -4958,6 +5144,14 @@
4958	5144	}
4959	5145	}
4960	5146
	5147	+ ObjEditor GetWindow()
	5148	+ {
	5149	+ if (editWindow != null)
	5150	+ return editWindow;
	5151	+
	5152	+ return manipWindow;
	5153	+ }
	5154	+
4961	5155	cTreePath Select(int indexcount, boolean deselect)
4962	5156	{
4963	5157	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5188,11 @@
4994	5188	if (leaf != null)
4995	5189	{
4996	5190	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5191	+ ObjEditor window = GetWindow();
	5192	+ if (window != null)
4998	5193	{
4999	5194	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5195	+ window.Select(tp, deselect, true);
5001	5196	}
5002	5197
5003	5198	return tp;
..	..	@@ -5014,6 +5209,7 @@
5014	5209
5015	5210	if (child == null)
5016	5211	continue;
	5212	+
5017	5213	if (child.HasTransparency() && child.size() != 0)
5018	5214	{
5019	5215	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5219,10 @@
5023	5219	if (leaf != null)
5024	5220	{
5025	5221	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5222	+ ObjEditor window = GetWindow();
	5223	+ if (window != null)
5027	5224	{
5028		- editWindow.Select(tp, deselect, true);
	5225	+ window.Select(tp, deselect, true);
5029	5226	}
5030	5227
5031	5228	return tp;
..	..	@@ -5350,6 +5547,51 @@
5350	5547	blockloop = false;
5351	5548	}
5352	5549
	5550	+ void ResetSelectable()
	5551	+ {
	5552	+ if (blockloop)
	5553	+ return;
	5554	+
	5555	+ blockloop = true;
	5556	+
	5557	+ keepdontselect = dontselect;
	5558	+ dontselect = true;
	5559	+
	5560	+ Object3D child;
	5561	+ int nb = Size();
	5562	+ for (int i = 0; i < nb; i++)
	5563	+ {
	5564	+ child = (Object3D) get(i);
	5565	+ if (child == null)
	5566	+ continue;
	5567	+ child.ResetSelectable();
	5568	+ }
	5569	+
	5570	+ blockloop = false;
	5571	+ }
	5572	+
	5573	+ void RestoreSelectable()
	5574	+ {
	5575	+ if (blockloop)
	5576	+ return;
	5577	+
	5578	+ blockloop = true;
	5579	+
	5580	+ dontselect = keepdontselect;
	5581	+
	5582	+ Object3D child;
	5583	+ int nb = Size();
	5584	+ for (int i = 0; i < nb; i++)
	5585	+ {
	5586	+ child = (Object3D) get(i);
	5587	+ if (child == null)
	5588	+ continue;
	5589	+ child.RestoreSelectable();
	5590	+ }
	5591	+
	5592	+ blockloop = false;
	5593	+ }
	5594	+
5353	5595	boolean IsSelected()
5354	5596	{
5355	5597	if (parent == null)
..	..	@@ -5410,6 +5652,11 @@
5410	5652	if (fullname == null)
5411	5653	return "";
5412	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5413	5660	// System.out.println("Fullname = " + fullname);
5414	5661
5415	5662	// Does not work on Windows due to C:
..	..	@@ -5422,7 +5669,7 @@
5422	5669
5423	5670	if (split.length == 0)
5424	5671	{
5425		- return "";
	5672	+ return fullname.pigment = "";
5426	5673	}
5427	5674
5428	5675	if (split.length <= 2)
..	..	@@ -5430,22 +5677,27 @@
5430	5677	if (fullname.name.endsWith(":"))
5431	5678	{
5432	5679	// Windows
5433		- return fullname.name.substring(0, fullname.name.length()-1);
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5434	5681	}
5435	5682
5436		- return split[0];
	5683	+ return fullname.pigment = split[0];
5437	5684	}
5438	5685
5439	5686	// Windows
5440	5687	assert(split.length == 4);
5441	5688
5442		- return split[0] + ":" + split[1];
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5443	5690	}
5444	5691
5445	5692	static String GetBump(cTexture fullname)
5446	5693	{
5447	5694	if (fullname == null)
5448	5695	return "";
	5696	+
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
5449	5701
5450	5702	// System.out.println("Fullname = " + fullname);
5451	5703	// Does not work on Windows due to C:
..	..	@@ -5457,12 +5709,12 @@
5457	5709
5458	5710	if (split.length == 0)
5459	5711	{
5460		- return "";
	5712	+ return fullname.bump = "";
5461	5713	}
5462	5714
5463	5715	if (split.length == 1)
5464	5716	{
5465		- return "";
	5717	+ return fullname.bump = "";
5466	5718	}
5467	5719
5468	5720	if (split.length == 2)
..	..	@@ -5470,16 +5722,16 @@
5470	5722	if (fullname.name.endsWith(":"))
5471	5723	{
5472	5724	// Windows
5473		- return "";
	5725	+ return fullname.bump = "";
5474	5726	}
5475	5727
5476		- return split[1];
	5728	+ return fullname.bump = split[1];
5477	5729	}
5478	5730
5479	5731	// Windows
5480	5732	assert(split.length == 4);
5481	5733
5482		- return split[2] + ":" + split[3];
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5483	5735	}
5484	5736
5485	5737	String GetPigmentTexture()
..	..	@@ -5562,6 +5814,9 @@
5562	5814	texname = "";
5563	5815
5564	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5565	5820	Touch();
5566	5821	}
5567	5822
..	..	@@ -5635,6 +5890,8 @@
5635	5890
5636	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5637	5892
	5893	+ GetTextures().bump = null;
	5894	+
5638	5895	Touch();
5639	5896	}
5640	5897
..	..	@@ -5655,6 +5912,38 @@
5655	5912
5656	5913	blockloop = true;
5657	5914	child.ResetBumpTexture();
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
	5919	+ void EmbedTextures(boolean embed)
	5920	+ {
	5921	+ if (blockloop)
	5922	+ return;
	5923	+
	5924	+ //if (GetTextures() != null)
	5925	+ if (embed)
	5926	+ CameraPane.EmbedTextures(GetTextures());
	5927	+ else
	5928	+ {
	5929	+ GetTextures().pigmentdata = null;
	5930	+ GetTextures().bumpdata = null;
	5931	+ GetTextures().pw = 0;
	5932	+ GetTextures().ph = 0;
	5933	+ GetTextures().bw = 0;
	5934	+ GetTextures().bh = 0;
	5935	+ }
	5936	+
	5937	+ int nb = Size();
	5938	+ for (int i = 0; i < nb; i++)
	5939	+ {
	5940	+ Object3D child = (Object3D) get(i);
	5941	+
	5942	+ if (child == null)
	5943	+ continue;
	5944	+
	5945	+ blockloop = true;
	5946	+ child.EmbedTextures(embed);
5658	5947	blockloop = false;
5659	5948	}
5660	5949	}
..	..	@@ -5745,8 +6034,10 @@
5745	6034	if (support != null)
5746	6035	support = support;
5747	6036
5748		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6037	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6038	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6039	+
	6040	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5750	6041
5751	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	6043	{
..	..	@@ -5756,8 +6047,9 @@
5756	6047	// usecalllists &= !(parent instanceof RandomNode);
5757	6048	// usecalllists = false;
5758	6049
5759		- if (GetBRep() != null)
5760		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5761	6053	//System.out.println("draw " + this);
5762	6054	//new Exception().printStackTrace();
5763	6055
..	..	@@ -5767,7 +6059,7 @@
5767	6059
5768	6060	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	6061	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6062	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	6063	{
5772	6064	Globals.lighttouched = true;
5773	6065	} // all panes...
..	..	@@ -5779,7 +6071,7 @@
5779	6071	if (!(this instanceof Composite))
5780	6072	touched = false;
5781	6073	//if (displaylist == -1 && usecalllists)
5782		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5783	6075	{
5784	6076	bRep.displaylist = display.GenList();
5785	6077	assert(bRep.displaylist != 0);
..	..	@@ -5790,7 +6082,7 @@
5790	6082
5791	6083	//System.out.println("\tnew list " + list);
5792	6084	//gl.glDrawBuffer(gl.GL_NONE);
5793		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5794	6086	{
5795	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5796	6088	display.NewList(bRep.displaylist);
..	..	@@ -5799,7 +6091,7 @@
5799	6091	CallList(display, root, selected, blocked);
5800	6092
5801	6093	// compiled = true;
5802		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5803	6095	{
5804	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5805	6097	display.EndList();
..	..	@@ -5899,6 +6191,7 @@
5899	6191	if (GetBRep() != null)
5900	6192	{
5901	6193	display.NextIndex();
	6194	+
5902	6195	// vertex color conflict : gl.glCallList(list);
5903	6196	DrawNode(display, root, selected);
5904	6197	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6652,11 @@
6359	6652	// dec 2012
6360	6653	new Exception().printStackTrace();
6361	6654	return;
	6655	+ }
	6656	+
	6657	+ if (dontselect)
	6658	+ {
	6659	+ //bRep.GenerateNormalsMINE();
6362	6660	}
6363	6661
6364	6662	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7442,23 @@
7144	7442	}
7145	7443	}
7146	7444
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7445	+ static ClickInfo clickInfo = new ClickInfo();
	7446	+
	7447	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7448	+ Point outPt, Rectangle outRec)
7148	7449	{
7149		- int hc = info.bounds.x + info.bounds.width / 2;
7150		- int vc = info.bounds.y + info.bounds.height / 2;
7151		- double[][] toscreen = info.toScreen;
	7450	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7451	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7452	+ double[][] toscreen = clickInfo.toScreen;
7152	7453	if (toscreen == null)
7153	7454	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7456	}
7156	7457	cVector vec = in;
7157	7458	LA.xformPos(in, toscreen, in);
7158	7459	//System.out.println("Distance = " + info.camera.Distance());
7159		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7160		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7460	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7461	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7462	outPt.x = hc + (int) vec.x;
7162	7463	outPt.y = vc - (int) vec.y;
7163	7464	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7466,18 @@
7165	7466	outRec.width = outRec.height = 6;
7166	7467	}
7167	7468
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7169	7471	{
7170	7472	Point pt = new Point(0, 0);
7171	7473	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7173	7476	return rec;
7174	7477	}
7175	7478
7176		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7177	7481	{
7178	7482	if (level == 0)
7179	7483	{
..	..	@@ -7182,16 +7486,19 @@
7182	7486	{
7183	7487	cVector origin = new cVector();
7184	7488	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7493	Rectangle boundary = new Rectangle();
7187	7494	boundary.x = spot.x - 30;
7188	7495	boundary.y = spot.y - 30;
7189	7496	boundary.width = spot.width + 60;
7190	7497	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7192	7499	int spotw = spot.x + spot.width;
7193	7500	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7502	// if (CameraPane.Xmin > spot.x)
7196	7503	// {
7197	7504	// CameraPane.Xmin = spot.x;
..	..	@@ -7208,11 +7515,6 @@
7208	7515	// {
7209	7516	// CameraPane.Ymax = spoth;
7210	7517	// }
7211		- spot.translate(32, 32);
7212		- spotw = spot.x + spot.width;
7213		- spoth = spot.y + spot.height;
7214		- info.g.setColor(Color.cyan);
7215		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7216	7518	// if (CameraPane.Xmin > spot.x)
7217	7519	// {
7218	7520	// CameraPane.Xmin = spot.x;
..	..	@@ -7231,10 +7533,15 @@
7231	7533	// }
7232	7534	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7535	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7234		- spot.translate(0, -32);
7235		- info.g.setColor(Color.yellow);
7236		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237		- info.g.setColor(Color.green);
	7536	+ spot.translate(32, 0);
	7537	+ clickInfo.g.setColor(Color.yellow);
	7538	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7539	+
	7540	+ spot.translate(32, 64);
	7541	+ spotw = spot.x + spot.width;
	7542	+ spoth = spot.y + spot.height;
	7543	+ clickInfo.g.setColor(Color.cyan);
	7544	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7238	7545	// if (CameraPane.Xmin > spot.x)
7239	7546	// {
7240	7547	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7558,9 @@
7251	7558	// {
7252	7559	// CameraPane.Ymax = spoth;
7253	7560	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7561	+ clickInfo.g.setColor(Color.green);
	7562	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7563	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7565	// if (CameraPane.Xmin > boundary.x)
7258	7566	// {
..	..	@@ -7274,7 +7582,8 @@
7274	7582	}
7275	7583	}
7276	7584
7277		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7278	7587	{
7279	7588	if (level == 0)
7280	7589	{
..	..	@@ -7283,8 +7592,8 @@
7283	7592
7284	7593	boolean retval = false;
7285	7594
7286		- startX = info.x;
7287		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7288	7597
7289	7598	hitSomething = -1;
7290	7599	cVector origin = new cVector();
..	..	@@ -7294,22 +7603,53 @@
7294	7603	{
7295	7604	centerPt = new Point(0, 0);
7296	7605	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7609	{
7300	7610	hitSomething = hitCenter;
7301	7611	retval = true;
7302	7612	}
7303	7613	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7615	{
7306	7616	hitSomething = hitRotate;
7307	7617	retval = true;
7308	7618	}
7309	7619	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7620	+ spot.translate(32, 0);
	7621	+ spot.translate(0, 32);
	7622	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7623	{
7312	7624	hitSomething = hitScale;
	7625	+
	7626	+ double scale = 0.005f * clickInfo.camera.Distance();
	7627	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7628	+ double sign = 1;
	7629	+ if (hScale < 0)
	7630	+ {
	7631	+ sign = -1;
	7632	+ }
	7633	+ hScale = signMath.pow(signhScale, scale * 50);
	7634	+ if (hScale < 0.01)
	7635	+ {
	7636	+ //hScale = 0.01;
	7637	+ }
	7638	+
	7639	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7640	+ sign = 1;
	7641	+ if (vScale < 0)
	7642	+ {
	7643	+ sign = -1;
	7644	+ }
	7645	+ vScale = signMath.pow(signvScale, scale * 50);
	7646	+ if (vScale < 0.01)
	7647	+ {
	7648	+ //vScale = 0.01;
	7649	+ }
	7650	+
	7651	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7652	+
7313	7653	retval = true;
7314	7654	}
7315	7655
..	..	@@ -7319,7 +7659,7 @@
7319	7659	}
7320	7660
7321	7661	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7663	//System.out.println("modified = " + modified);
7324	7664	//new Exception().printStackTrace();
7325	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7687,8 @@
7347	7687	return true;
7348	7688	}
7349	7689
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7351	7692	{
7352	7693	if (hitSomething == 0)
7353	7694	{
..	..	@@ -7361,7 +7702,7 @@
7361	7702
7362	7703	//System.out.println("hitSomething = " + hitSomething);
7363	7704
7364		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7706
7366	7707	cVector xlate = new cVector();
7367	7708	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7736,8 @@
7395	7736	toParent[3][i] = xlate.get(i);
7396	7737	LA.matInvert(toParent, fromParent);
7397	7738	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7739	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7740	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7741
7401	7742	LA.matCopy(startMat, toParent);
7402	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7746,7 @@
7405	7746	} else
7406	7747	{
7407	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7409	7750	cVector away = new cVector();
7410	7751	//cVector right2 = new cVector();
7411	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7763,19 @@
7422	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7764	// if (!CameraPane.LOCALTRANSFORM)
7424	7765	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7767	// if (!CameraPane.LOCALTRANSFORM)
7427	7768	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7769	//LA.vecCross(up, cVector.Z, right2);
7429	7770
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7772
7432	7773	//System.out.println("DELTA0 = " + delta);
7433	7774	//System.out.println("AWAY = " + info.camera.away);
7434	7775	//System.out.println("UP = " + info.camera.up);
7435	7776	if (away.z > 0)
7436	7777	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7779	{
7439	7780	delta.x = -delta.x;
7440	7781	} else
..	..	@@ -7449,7 +7790,7 @@
7449	7790	//System.out.println("DELTA1 = " + delta);
7450	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7792	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7794	LA.matCopy(startMat, toParent);
7454	7795	//System.out.println("DELTA3 = " + delta);
7455	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7800,8 @@
7459	7800	break;
7460	7801
7461	7802	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7464	7805	double angle = (double) Math.atan2(dx, dy);
7465	7806	angle = -(1.570796 - angle);
7466	7807
..	..	@@ -7483,7 +7824,7 @@
7483	7824	}
7484	7825	/**/
7485	7826
7486		- switch (info.pane.RenderCamera().viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7828	{
7488	7829	case 1: // '\001'
7489	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7851,7 @@
7510	7851	break;
7511	7852
7512	7853	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7514	7855	double sign = 1;
7515	7856	if (hScale < 0)
7516	7857	{
..	..	@@ -7522,7 +7863,7 @@
7522	7863	//hScale = 0.01;
7523	7864	}
7524	7865
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7526	7867	sign = 1;
7527	7868	if (vScale < 0)
7528	7869	{
..	..	@@ -7533,6 +7874,7 @@
7533	7874	{
7534	7875	//vScale = 0.01;
7535	7876	}
	7877	+
7536	7878	LA.matCopy(startMat, toParent);
7537	7879	/**/
7538	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7542,33 +7884,39 @@
7542	7884	}
7543	7885	/**/
7544	7886
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7888
7547	7889	if (totalScale < 0.01)
7548	7890	{
7549	7891	totalScale = 0.01;
7550	7892	}
7551	7893
7552		- switch (info.pane.RenderCamera().viewCode)
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7895	{
7554	7896	case 3: // '\001'
7555	7897	if (modified \|\| opposite)
7556	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7557	7902	//LA.matScale(toParent, 1, hScale, vScale);
7558		- LA.matScale(toParent, totalScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7559	7904	} // vScale, 1);
7560	7905	else
7561	7906	{
7562	7907	// EXCEPTION!
7563		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7564	7909	} // vScale, 1);
7565	7910	break;
7566	7911
7567	7912	case 2: // '\002'
7568	7913	if (modified \|\| opposite)
7569	7914	{
7570		- //LA.matScale(toParent, hScale, 1, vScale);
7571		- LA.matScale(toParent, 1, totalScale, 1);
	7915	+ if (modified && opposite)
	7916	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7917	+ else
	7918	+ //LA.matScale(toParent, hScale, 1, vScale);
	7919	+ LA.matScale(toParent, 1, totalScale, 1);
7572	7920	} else
7573	7921	{
7574	7922	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7578,8 +7926,11 @@
7578	7926	case 1: // '\003'
7579	7927	if (modified \|\| opposite)
7580	7928	{
7581		- //LA.matScale(toParent, hScale, vScale, 1);
7582		- LA.matScale(toParent, 1, 1, totalScale);
	7929	+ if (modified && opposite)
	7930	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7931	+ else
	7932	+ //LA.matScale(toParent, hScale, vScale, 1);
	7933	+ LA.matScale(toParent, 1, 1, totalScale);
7583	7934	} else
7584	7935	{
7585	7936	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7616,7 +7967,7 @@
7616	7967	} // NEW ...
7617	7968
7618	7969
7619		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7620	7971	}
7621	7972
7622	7973	boolean overflow = false;
..	..	@@ -7796,6 +8147,10 @@
7796	8147	editWindow = null;
7797	8148	} // ?
7798	8149	}
	8150	+ else
	8151	+ {
	8152	+ //editWindow.closeUI();
	8153	+ }
7799	8154	}
7800	8155
7801	8156	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8308,10 @@
7953	8308	}
7954	8309
7955	8310	transient ObjEditor editWindow;
	8311	+ transient ObjEditor manipWindow;
	8312	+
	8313	+ transient boolean pinned;
	8314	+
7956	8315	transient ObjectUI objectUI;
7957	8316	public static int povDepth = 0;
7958	8317	private static cVector tbMin = new cVector();