~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
..	..	@@ -568,7 +687,7 @@
568	687	{
569	688	if (maxcount != 1)
570	689	{
571		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
572	691	}
573	692
574	693	toParentMarked = LA.newMatrix();
..	..	@@ -965,6 +1084,9 @@
965	1084
966	1085	if (material == null \|\| material.multiply)
967	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
968	1090
969	1091	// Transparent objects are dynamic because we have to sort the triangles.
970	1092	return material.opacity > 0.99;
..	..	@@ -1367,6 +1489,7 @@
1367	1489	toParent = LA.newMatrix();
1368	1490	fromParent = LA.newMatrix();
1369	1491	}
	1492	+
1370	1493	LA.matCopy(other.toParent, toParent);
1371	1494	LA.matCopy(other.fromParent, fromParent);
1372	1495
..	..	@@ -2246,11 +2369,6 @@
2246	2369
2247	2370	InitOthers();
2248	2371
2249		- if (this instanceof Camera)
2250		- {
2251		- material.shift = 90;
2252		- }
2253		-
2254	2372	material.multiply = multiply;
2255	2373
2256	2374	if (multiply)
..	..	@@ -2391,6 +2509,11 @@
2391	2509	else
2392	2510	{
2393	2511	//((ObjEditor)editWindow).SetupUI2(null);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
2394	2517	}
2395	2518	}
2396	2519
..	..	@@ -2433,6 +2556,14 @@
2433	2556	{
2434	2557	editWindow.refreshContents();
2435	2558	}
	2559	+ else
	2560	+ {
	2561	+ if (manipWindow != null)
	2562	+ {
	2563	+ manipWindow.refreshContents();
	2564	+ }
	2565	+ }
	2566	+
2436	2567	//if (parent != null)
2437	2568	//parent.refreshEditWindow();
2438	2569	}
..	..	@@ -2512,7 +2643,8 @@
2512	2643	private static final int editSelf = 1;
2513	2644	private static final int editChild = 2;
2514	2645
2515		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2516	2648	{
2517	2649	if (level == 0)
2518	2650	{
..	..	@@ -2520,7 +2652,8 @@
2520	2652	return;
2521	2653
2522	2654	Object3D selectee;
2523		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2655	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2656	+ level + 1))
2524	2657	{
2525	2658	selectee = (Object3D) e.nextElement();
2526	2659	}
..	..	@@ -2528,19 +2661,22 @@
2528	2661	} else
2529	2662	{
2530	2663	//super.
2531		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2532	2666	}
2533	2667	}
2534	2668
2535		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2536	2671	{
2537	2672	doSomething = 0;
2538	2673	if (level == 0)
2539	2674	{
2540		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2541	2676	}
2542	2677	if (//super.
2543		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2544	2680	{
2545	2681	doSomething = 1;
2546	2682	return true;
..	..	@@ -2550,7 +2686,7 @@
2550	2686	}
2551	2687	}
2552	2688
2553		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2554	2690	{
2555	2691	if (selection == null)
2556	2692	{
..	..	@@ -2563,7 +2699,8 @@
2563	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2564	2700	{
2565	2701	Object3D selectee = (Object3D) e.nextElement();
2566		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2567	2704	{
2568	2705	childToDrag = selectee;
2569	2706	doSomething = 2;
..	..	@@ -2575,13 +2712,15 @@
2575	2712	return retval;
2576	2713	}
2577	2714
2578		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2579	2717	{
2580	2718	switch (doSomething)
2581	2719	{
2582	2720	case 1: // '\001'
2583	2721	//super.
2584		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2585	2724	break;
2586	2725
2587	2726	case 2: // '\002'
..	..	@@ -2594,11 +2733,13 @@
2594	2733	{
2595	2734	//sel.hitSomething = childToDrag.hitSomething;
2596	2735	//childToDrag.doEditDrag(info);
2597		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2598	2738	} else
2599	2739	{
2600	2740	//super.
2601		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2602	2743	}
2603	2744	}
2604	2745	break;
..	..	@@ -2616,6 +2757,9 @@
2616	2757	{
2617	2758	deselectAll();
2618	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2619	2763	ClickInfo newInfo = new ClickInfo();
2620	2764	newInfo.flags = info.flags;
2621	2765	newInfo.bounds = info.bounds;
..	..	@@ -3063,7 +3207,7 @@
3063	3207	{
3064	3208	if (bRep != null)
3065	3209	{
3066		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3067	3211	Touch();
3068	3212	}
3069	3213	}
..	..	@@ -3473,15 +3617,47 @@
3473	3617
3474	3618	void ClearMaterials()
3475	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3476	3625	ClearMaterial();
3477		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3478	3627	{
3479		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3480	3629	if (child == null)
3481	3630	continue;
3482	3631	child.ClearMaterials();
3483		- release(i);
3484	3632	}
	3633	+
	3634	+ blockloop = false;
	3635	+ }
	3636	+
	3637	+ void ClearVersionList()
	3638	+ {
	3639	+ this.versionlist = null;
	3640	+ this.versionindex = -1;
	3641	+ this.versiontable = null;
	3642	+ }
	3643	+
	3644	+ void ClearVersions()
	3645	+ {
	3646	+ if (blockloop)
	3647	+ return;
	3648	+
	3649	+ blockloop = true;
	3650	+
	3651	+ ClearVersionList();
	3652	+ for (int i = 0; i < Size(); i++)
	3653	+ {
	3654	+ Object3D child = (Object3D) get(i);
	3655	+ if (child == null)
	3656	+ continue;
	3657	+ child.ClearVersions();
	3658	+ }
	3659	+
	3660	+ blockloop = false;
3485	3661	}
3486	3662
3487	3663	void FlipV(boolean flip)
..	..	@@ -4963,6 +5139,14 @@
4963	5139	}
4964	5140	}
4965	5141
	5142	+ ObjEditor GetWindow()
	5143	+ {
	5144	+ if (editWindow != null)
	5145	+ return editWindow;
	5146	+
	5147	+ return manipWindow;
	5148	+ }
	5149	+
4966	5150	cTreePath Select(int indexcount, boolean deselect)
4967	5151	{
4968	5152	if (hide \|\| dontselect)
..	..	@@ -4999,10 +5183,11 @@
4999	5183	if (leaf != null)
5000	5184	{
5001	5185	cTreePath tp = new cTreePath(this, leaf);
5002		- if (editWindow != null)
	5186	+ ObjEditor window = GetWindow();
	5187	+ if (window != null)
5003	5188	{
5004	5189	//System.out.println("editWindow = " + editWindow + " vs " + this);
5005		- editWindow.Select(tp, deselect, true);
	5190	+ window.Select(tp, deselect, true);
5006	5191	}
5007	5192
5008	5193	return tp;
..	..	@@ -5019,6 +5204,7 @@
5019	5204
5020	5205	if (child == null)
5021	5206	continue;
	5207	+
5022	5208	if (child.HasTransparency() && child.size() != 0)
5023	5209	{
5024	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5028,9 +5214,10 @@
5028	5214	if (leaf != null)
5029	5215	{
5030	5216	cTreePath tp = new cTreePath(this, leaf);
5031		- if (editWindow != null)
	5217	+ ObjEditor window = GetWindow();
	5218	+ if (window != null)
5032	5219	{
5033		- editWindow.Select(tp, deselect, true);
	5220	+ window.Select(tp, deselect, true);
5034	5221	}
5035	5222
5036	5223	return tp;
..	..	@@ -5355,6 +5542,51 @@
5355	5542	blockloop = false;
5356	5543	}
5357	5544
	5545	+ void ResetSelectable()
	5546	+ {
	5547	+ if (blockloop)
	5548	+ return;
	5549	+
	5550	+ blockloop = true;
	5551	+
	5552	+ keepdontselect = dontselect;
	5553	+ dontselect = true;
	5554	+
	5555	+ Object3D child;
	5556	+ int nb = Size();
	5557	+ for (int i = 0; i < nb; i++)
	5558	+ {
	5559	+ child = (Object3D) get(i);
	5560	+ if (child == null)
	5561	+ continue;
	5562	+ child.ResetSelectable();
	5563	+ }
	5564	+
	5565	+ blockloop = false;
	5566	+ }
	5567	+
	5568	+ void RestoreSelectable()
	5569	+ {
	5570	+ if (blockloop)
	5571	+ return;
	5572	+
	5573	+ blockloop = true;
	5574	+
	5575	+ dontselect = keepdontselect;
	5576	+
	5577	+ Object3D child;
	5578	+ int nb = Size();
	5579	+ for (int i = 0; i < nb; i++)
	5580	+ {
	5581	+ child = (Object3D) get(i);
	5582	+ if (child == null)
	5583	+ continue;
	5584	+ child.RestoreSelectable();
	5585	+ }
	5586	+
	5587	+ blockloop = false;
	5588	+ }
	5589	+
5358	5590	boolean IsSelected()
5359	5591	{
5360	5592	if (parent == null)
..	..	@@ -5415,6 +5647,11 @@
5415	5647	if (fullname == null)
5416	5648	return "";
5417	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5418	5655	// System.out.println("Fullname = " + fullname);
5419	5656
5420	5657	// Does not work on Windows due to C:
..	..	@@ -5427,7 +5664,7 @@
5427	5664
5428	5665	if (split.length == 0)
5429	5666	{
5430		- return "";
	5667	+ return fullname.pigment = "";
5431	5668	}
5432	5669
5433	5670	if (split.length <= 2)
..	..	@@ -5435,22 +5672,27 @@
5435	5672	if (fullname.name.endsWith(":"))
5436	5673	{
5437	5674	// Windows
5438		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5439	5676	}
5440	5677
5441		- return split[0];
	5678	+ return fullname.pigment = split[0];
5442	5679	}
5443	5680
5444	5681	// Windows
5445	5682	assert(split.length == 4);
5446	5683
5447		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5448	5685	}
5449	5686
5450	5687	static String GetBump(cTexture fullname)
5451	5688	{
5452	5689	if (fullname == null)
5453	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5454	5696
5455	5697	// System.out.println("Fullname = " + fullname);
5456	5698	// Does not work on Windows due to C:
..	..	@@ -5462,12 +5704,12 @@
5462	5704
5463	5705	if (split.length == 0)
5464	5706	{
5465		- return "";
	5707	+ return fullname.bump = "";
5466	5708	}
5467	5709
5468	5710	if (split.length == 1)
5469	5711	{
5470		- return "";
	5712	+ return fullname.bump = "";
5471	5713	}
5472	5714
5473	5715	if (split.length == 2)
..	..	@@ -5475,16 +5717,16 @@
5475	5717	if (fullname.name.endsWith(":"))
5476	5718	{
5477	5719	// Windows
5478		- return "";
	5720	+ return fullname.bump = "";
5479	5721	}
5480	5722
5481		- return split[1];
	5723	+ return fullname.bump = split[1];
5482	5724	}
5483	5725
5484	5726	// Windows
5485	5727	assert(split.length == 4);
5486	5728
5487		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5488	5730	}
5489	5731
5490	5732	String GetPigmentTexture()
..	..	@@ -5567,6 +5809,9 @@
5567	5809	texname = "";
5568	5810
5569	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5570	5815	Touch();
5571	5816	}
5572	5817
..	..	@@ -5640,6 +5885,8 @@
5640	5885
5641	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5642	5887
	5888	+ GetTextures().bump = null;
	5889	+
5643	5890	Touch();
5644	5891	}
5645	5892
..	..	@@ -5660,6 +5907,38 @@
5660	5907
5661	5908	blockloop = true;
5662	5909	child.ResetBumpTexture();
	5910	+ blockloop = false;
	5911	+ }
	5912	+ }
	5913	+
	5914	+ void EmbedTextures(boolean embed)
	5915	+ {
	5916	+ if (blockloop)
	5917	+ return;
	5918	+
	5919	+ //if (GetTextures() != null)
	5920	+ if (embed)
	5921	+ CameraPane.EmbedTextures(GetTextures());
	5922	+ else
	5923	+ {
	5924	+ GetTextures().pigmentdata = null;
	5925	+ GetTextures().bumpdata = null;
	5926	+ GetTextures().pw = 0;
	5927	+ GetTextures().ph = 0;
	5928	+ GetTextures().bw = 0;
	5929	+ GetTextures().bh = 0;
	5930	+ }
	5931	+
	5932	+ int nb = Size();
	5933	+ for (int i = 0; i < nb; i++)
	5934	+ {
	5935	+ Object3D child = (Object3D) get(i);
	5936	+
	5937	+ if (child == null)
	5938	+ continue;
	5939	+
	5940	+ blockloop = true;
	5941	+ child.EmbedTextures(embed);
5663	5942	blockloop = false;
5664	5943	}
5665	5944	}
..	..	@@ -5750,8 +6029,10 @@
5750	6029	if (support != null)
5751	6030	support = support;
5752	6031
5753		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6032	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6033	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6034	+
	6035	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5755	6036
5756	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5757	6038	{
..	..	@@ -5761,8 +6042,9 @@
5761	6042	// usecalllists &= !(parent instanceof RandomNode);
5762	6043	// usecalllists = false;
5763	6044
5764		- if (GetBRep() != null)
5765		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5766	6048	//System.out.println("draw " + this);
5767	6049	//new Exception().printStackTrace();
5768	6050
..	..	@@ -5772,7 +6054,7 @@
5772	6054
5773	6055	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5774	6056	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5775		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6057	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5776	6058	{
5777	6059	Globals.lighttouched = true;
5778	6060	} // all panes...
..	..	@@ -5784,7 +6066,7 @@
5784	6066	if (!(this instanceof Composite))
5785	6067	touched = false;
5786	6068	//if (displaylist == -1 && usecalllists)
5787		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5788	6070	{
5789	6071	bRep.displaylist = display.GenList();
5790	6072	assert(bRep.displaylist != 0);
..	..	@@ -5795,7 +6077,7 @@
5795	6077
5796	6078	//System.out.println("\tnew list " + list);
5797	6079	//gl.glDrawBuffer(gl.GL_NONE);
5798		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5799	6081	{
5800	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5801	6083	display.NewList(bRep.displaylist);
..	..	@@ -5804,7 +6086,7 @@
5804	6086	CallList(display, root, selected, blocked);
5805	6087
5806	6088	// compiled = true;
5807		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5808	6090	{
5809	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5810	6092	display.EndList();
..	..	@@ -5904,6 +6186,7 @@
5904	6186	if (GetBRep() != null)
5905	6187	{
5906	6188	display.NextIndex();
	6189	+
5907	6190	// vertex color conflict : gl.glCallList(list);
5908	6191	DrawNode(display, root, selected);
5909	6192	if (this instanceof BezierPatch)
..	..	@@ -7154,20 +7437,23 @@
7154	7437	}
7155	7438	}
7156	7439
7157		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7440	+ static ClickInfo clickInfo = new ClickInfo();
	7441	+
	7442	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7443	+ Point outPt, Rectangle outRec)
7158	7444	{
7159		- int hc = info.bounds.x + info.bounds.width / 2;
7160		- int vc = info.bounds.y + info.bounds.height / 2;
7161		- double[][] toscreen = info.toScreen;
	7445	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7446	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7447	+ double[][] toscreen = clickInfo.toScreen;
7162	7448	if (toscreen == null)
7163	7449	{
7164		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7165	7451	}
7166	7452	cVector vec = in;
7167	7453	LA.xformPos(in, toscreen, in);
7168	7454	//System.out.println("Distance = " + info.camera.Distance());
7169		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7170		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7171	7457	outPt.x = hc + (int) vec.x;
7172	7458	outPt.y = vc - (int) vec.y;
7173	7459	outRec.x = outPt.x - 3;
..	..	@@ -7175,15 +7461,18 @@
7175	7461	outRec.width = outRec.height = 6;
7176	7462	}
7177	7463
7178		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7179	7466	{
7180	7467	Point pt = new Point(0, 0);
7181	7468	Rectangle rec = new Rectangle();
7182		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7183	7471	return rec;
7184	7472	}
7185	7473
7186		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7187	7476	{
7188	7477	if (level == 0)
7189	7478	{
..	..	@@ -7192,16 +7481,19 @@
7192	7481	{
7193	7482	cVector origin = new cVector();
7194	7483	//LA.xformPos(origin, toParent, origin);
7195		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7196	7488	Rectangle boundary = new Rectangle();
7197	7489	boundary.x = spot.x - 30;
7198	7490	boundary.y = spot.y - 30;
7199	7491	boundary.width = spot.width + 60;
7200	7492	boundary.height = spot.height + 60;
7201		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7202	7494	int spotw = spot.x + spot.width;
7203	7495	int spoth = spot.y + spot.height;
7204		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7205	7497	// if (CameraPane.Xmin > spot.x)
7206	7498	// {
7207	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7218,11 +7510,6 @@
7218	7510	// {
7219	7511	// CameraPane.Ymax = spoth;
7220	7512	// }
7221		- spot.translate(32, 32);
7222		- spotw = spot.x + spot.width;
7223		- spoth = spot.y + spot.height;
7224		- info.g.setColor(Color.cyan);
7225		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7226	7513	// if (CameraPane.Xmin > spot.x)
7227	7514	// {
7228	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7241,10 +7528,15 @@
7241	7528	// }
7242	7529	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243	7530	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7244		- spot.translate(0, -32);
7245		- info.g.setColor(Color.yellow);
7246		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7247		- info.g.setColor(Color.green);
	7531	+ spot.translate(32, 0);
	7532	+ clickInfo.g.setColor(Color.yellow);
	7533	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7534	+
	7535	+ spot.translate(32, 64);
	7536	+ spotw = spot.x + spot.width;
	7537	+ spoth = spot.y + spot.height;
	7538	+ clickInfo.g.setColor(Color.cyan);
	7539	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7248	7540	// if (CameraPane.Xmin > spot.x)
7249	7541	// {
7250	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7261,8 +7553,9 @@
7261	7553	// {
7262	7554	// CameraPane.Ymax = spoth;
7263	7555	// }
7264		- info.g.drawArc(boundary.x, boundary.y,
7265		- boundary.width, boundary.height, 0, 360);
	7556	+ clickInfo.g.setColor(Color.green);
	7557	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7558	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7266	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7267	7560	// if (CameraPane.Xmin > boundary.x)
7268	7561	// {
..	..	@@ -7284,7 +7577,8 @@
7284	7577	}
7285	7578	}
7286	7579
7287		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7288	7582	{
7289	7583	if (level == 0)
7290	7584	{
..	..	@@ -7293,8 +7587,8 @@
7293	7587
7294	7588	boolean retval = false;
7295	7589
7296		- startX = info.x;
7297		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7298	7592
7299	7593	hitSomething = -1;
7300	7594	cVector origin = new cVector();
..	..	@@ -7304,22 +7598,53 @@
7304	7598	{
7305	7599	centerPt = new Point(0, 0);
7306	7600	}
7307		- calcHotSpot(origin, info, centerPt, spot);
7308		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7309	7604	{
7310	7605	hitSomething = hitCenter;
7311	7606	retval = true;
7312	7607	}
7313	7608	spot.translate(32, 0);
7314		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7315	7610	{
7316	7611	hitSomething = hitRotate;
7317	7612	retval = true;
7318	7613	}
7319	7614	spot.translate(0, 32);
7320		- if (spot.contains(info.x, info.y))
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
	7617	+ if (spot.contains(clickInfo.x, clickInfo.y))
7321	7618	{
7322	7619	hitSomething = hitScale;
	7620	+
	7621	+ double scale = 0.005f * clickInfo.camera.Distance();
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7623	+ double sign = 1;
	7624	+ if (hScale < 0)
	7625	+ {
	7626	+ sign = -1;
	7627	+ }
	7628	+ hScale = signMath.pow(signhScale, scale * 50);
	7629	+ if (hScale < 0.01)
	7630	+ {
	7631	+ //hScale = 0.01;
	7632	+ }
	7633	+
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7635	+ sign = 1;
	7636	+ if (vScale < 0)
	7637	+ {
	7638	+ sign = -1;
	7639	+ }
	7640	+ vScale = signMath.pow(signvScale, scale * 50);
	7641	+ if (vScale < 0.01)
	7642	+ {
	7643	+ //vScale = 0.01;
	7644	+ }
	7645	+
	7646	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7647	+
7323	7648	retval = true;
7324	7649	}
7325	7650
..	..	@@ -7329,7 +7654,7 @@
7329	7654	}
7330	7655
7331	7656	//System.out.println("info.modifiers = " + info.modifiers);
7332		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7333	7658	//System.out.println("modified = " + modified);
7334	7659	//new Exception().printStackTrace();
7335	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7357,7 +7682,8 @@
7357	7682	return true;
7358	7683	}
7359	7684
7360		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7361	7687	{
7362	7688	if (hitSomething == 0)
7363	7689	{
..	..	@@ -7371,7 +7697,7 @@
7371	7697
7372	7698	//System.out.println("hitSomething = " + hitSomething);
7373	7699
7374		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7375	7701
7376	7702	cVector xlate = new cVector();
7377	7703	//cVector xlate2 = new cVector();
..	..	@@ -7385,7 +7711,9 @@
7385	7711
7386	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7387	7713
7388		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7389	7717	{
7390	7718	//assert(false);
7391	7719	/*
..	..	@@ -7405,8 +7733,8 @@
7405	7733	toParent[3][i] = xlate.get(i);
7406	7734	LA.matInvert(toParent, fromParent);
7407	7735	*/
7408		- cVector delta = LA.newVector(0, 0, startY - info.y);
7409		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7736	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7737	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7410	7738
7411	7739	LA.matCopy(startMat, toParent);
7412	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7415,7 +7743,7 @@
7415	7743	} else
7416	7744	{
7417	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7418		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7419	7747	cVector away = new cVector();
7420	7748	//cVector right2 = new cVector();
7421	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7432,19 +7760,19 @@
7432	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7433	7761	// if (!CameraPane.LOCALTRANSFORM)
7434	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7435		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7436	7764	// if (!CameraPane.LOCALTRANSFORM)
7437	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7438	7766	//LA.vecCross(up, cVector.Z, right2);
7439	7767
7440		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7441	7769
7442	7770	//System.out.println("DELTA0 = " + delta);
7443	7771	//System.out.println("AWAY = " + info.camera.away);
7444	7772	//System.out.println("UP = " + info.camera.up);
7445	7773	if (away.z > 0)
7446	7774	{
7447		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7448	7776	{
7449	7777	delta.x = -delta.x;
7450	7778	} else
..	..	@@ -7459,7 +7787,7 @@
7459	7787	//System.out.println("DELTA1 = " + delta);
7460	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7461	7789	//System.out.println("DELTA2 = " + delta);
7462		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7463	7791	LA.matCopy(startMat, toParent);
7464	7792	//System.out.println("DELTA3 = " + delta);
7465	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7469,8 +7797,8 @@
7469	7797	break;
7470	7798
7471	7799	case hitRotate: // rotate
7472		- int dx = info.x - centerPt.x;
7473		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7474	7802	double angle = (double) Math.atan2(dx, dy);
7475	7803	angle = -(1.570796 - angle);
7476	7804
..	..	@@ -7479,7 +7807,7 @@
7479	7807
7480	7808	if (modified)
7481	7809	{
7482		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7483	7811	angle /= (Math.PI / 4);
7484	7812	angle = Math.floor(angle + 0.5);
7485	7813	angle *= (Math.PI / 4);
..	..	@@ -7493,7 +7821,7 @@
7493	7821	}
7494	7822	/**/
7495	7823
7496		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7497	7825	{
7498	7826	case 1: // '\001'
7499	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7520,7 +7848,7 @@
7520	7848	break;
7521	7849
7522	7850	case hitScale: // scale
7523		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7524	7852	double sign = 1;
7525	7853	if (hScale < 0)
7526	7854	{
..	..	@@ -7532,7 +7860,7 @@
7532	7860	//hScale = 0.01;
7533	7861	}
7534	7862
7535		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7536	7864	sign = 1;
7537	7865	if (vScale < 0)
7538	7866	{
..	..	@@ -7543,6 +7871,7 @@
7543	7871	{
7544	7872	//vScale = 0.01;
7545	7873	}
	7874	+
7546	7875	LA.matCopy(startMat, toParent);
7547	7876	/**/
7548	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7552,33 +7881,39 @@
7552	7881	}
7553	7882	/**/
7554	7883
7555		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7556	7885
7557	7886	if (totalScale < 0.01)
7558	7887	{
7559	7888	totalScale = 0.01;
7560	7889	}
7561	7890
7562		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7892	{
7564	7893	case 3: // '\001'
7565	7894	if (modified \|\| opposite)
7566	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7567	7899	//LA.matScale(toParent, 1, hScale, vScale);
7568		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7569	7901	} // vScale, 1);
7570	7902	else
7571	7903	{
7572	7904	// EXCEPTION!
7573		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7574	7906	} // vScale, 1);
7575	7907	break;
7576	7908
7577	7909	case 2: // '\002'
7578	7910	if (modified \|\| opposite)
7579	7911	{
7580		- //LA.matScale(toParent, hScale, 1, vScale);
7581		- LA.matScale(toParent, 1, totalScale, 1);
	7912	+ if (modified) // && opposite)
	7913	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7914	+ else
	7915	+ //LA.matScale(toParent, hScale, 1, vScale);
	7916	+ LA.matScale(toParent, 1, totalScale, 1);
7582	7917	} else
7583	7918	{
7584	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7588,8 +7923,11 @@
7588	7923	case 1: // '\003'
7589	7924	if (modified \|\| opposite)
7590	7925	{
7591		- //LA.matScale(toParent, hScale, vScale, 1);
7592		- LA.matScale(toParent, 1, 1, totalScale);
	7926	+ if (modified) // && opposite)
	7927	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7928	+ else
	7929	+ //LA.matScale(toParent, hScale, vScale, 1);
	7930	+ LA.matScale(toParent, 1, 1, totalScale);
7593	7931	} else
7594	7932	{
7595	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7626,7 +7964,7 @@
7626	7964	} // NEW ...
7627	7965
7628	7966
7629		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7630	7968	}
7631	7969
7632	7970	boolean overflow = false;
..	..	@@ -7967,6 +8305,10 @@
7967	8305	}
7968	8306
7969	8307	transient ObjEditor editWindow;
	8308	+ transient ObjEditor manipWindow;
	8309	+
	8310	+ transient boolean pinned;
	8311	+
7970	8312	transient ObjectUI objectUI;
7971	8313	public static int povDepth = 0;
7972	8314	private static cVector tbMin = new cVector();