~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("copy of " + this.name);
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,19 +249,86 @@
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()))
220	322	return;
221	323
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
222	328	if (blockloop)
223	329	return;
224	330
225	331	blockloop = true;
226		-
227		- Object3D o = hashtable.get(GetUUID());
228		-
229		- RestoreBigData(o);
230	332
231	333	//hashtable.remove(GetUUID());
232	334
..	..	@@ -241,8 +343,17 @@
241	343	void RestoreBigData(Object3D o)
242	344	{
243	345	this.bRep = o.bRep;
244		- if (this.bRep != null)
245		- 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;
246	357	// this.support = o.support;
247	358	// this.fileparent = o.fileparent;
248	359	}
..	..	@@ -388,6 +499,7 @@
388	499	}
389	500
390	501	boolean live = false;
	502	+ transient boolean keepdontselect;
391	503	boolean dontselect = false;
392	504	boolean hide = false;
393	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -575,7 +687,7 @@
575	687	{
576	688	if (maxcount != 1)
577	689	{
578		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
579	691	}
580	692
581	693	toParentMarked = LA.newMatrix();
..	..	@@ -972,6 +1084,9 @@
972	1084
973	1085	if (material == null \|\| material.multiply)
974	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
975	1090
976	1091	// Transparent objects are dynamic because we have to sort the triangles.
977	1092	return material.opacity > 0.99;
..	..	@@ -1374,6 +1489,7 @@
1374	1489	toParent = LA.newMatrix();
1375	1490	fromParent = LA.newMatrix();
1376	1491	}
	1492	+
1377	1493	LA.matCopy(other.toParent, toParent);
1378	1494	LA.matCopy(other.fromParent, fromParent);
1379	1495
..	..	@@ -2253,11 +2369,6 @@
2253	2369
2254	2370	InitOthers();
2255	2371
2256		- if (this instanceof Camera)
2257		- {
2258		- material.shift = 90;
2259		- }
2260		-
2261	2372	material.multiply = multiply;
2262	2373
2263	2374	if (multiply)
..	..	@@ -2398,6 +2509,11 @@
2398	2509	else
2399	2510	{
2400	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");
2401	2517	}
2402	2518	}
2403	2519
..	..	@@ -2527,7 +2643,8 @@
2527	2643	private static final int editSelf = 1;
2528	2644	private static final int editChild = 2;
2529	2645
2530		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2531	2648	{
2532	2649	if (level == 0)
2533	2650	{
..	..	@@ -2535,7 +2652,8 @@
2535	2652	return;
2536	2653
2537	2654	Object3D selectee;
2538		- 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))
2539	2657	{
2540	2658	selectee = (Object3D) e.nextElement();
2541	2659	}
..	..	@@ -2543,19 +2661,22 @@
2543	2661	} else
2544	2662	{
2545	2663	//super.
2546		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2547	2666	}
2548	2667	}
2549	2668
2550		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2551	2671	{
2552	2672	doSomething = 0;
2553	2673	if (level == 0)
2554	2674	{
2555		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2556	2676	}
2557	2677	if (//super.
2558		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2559	2680	{
2560	2681	doSomething = 1;
2561	2682	return true;
..	..	@@ -2565,7 +2686,7 @@
2565	2686	}
2566	2687	}
2567	2688
2568		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2569	2690	{
2570	2691	if (selection == null)
2571	2692	{
..	..	@@ -2578,7 +2699,8 @@
2578	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2579	2700	{
2580	2701	Object3D selectee = (Object3D) e.nextElement();
2581		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2582	2704	{
2583	2705	childToDrag = selectee;
2584	2706	doSomething = 2;
..	..	@@ -2590,13 +2712,15 @@
2590	2712	return retval;
2591	2713	}
2592	2714
2593		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2594	2717	{
2595	2718	switch (doSomething)
2596	2719	{
2597	2720	case 1: // '\001'
2598	2721	//super.
2599		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2600	2724	break;
2601	2725
2602	2726	case 2: // '\002'
..	..	@@ -2609,11 +2733,13 @@
2609	2733	{
2610	2734	//sel.hitSomething = childToDrag.hitSomething;
2611	2735	//childToDrag.doEditDrag(info);
2612		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2613	2738	} else
2614	2739	{
2615	2740	//super.
2616		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2617	2743	}
2618	2744	}
2619	2745	break;
..	..	@@ -2631,6 +2757,9 @@
2631	2757	{
2632	2758	deselectAll();
2633	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2634	2763	ClickInfo newInfo = new ClickInfo();
2635	2764	newInfo.flags = info.flags;
2636	2765	newInfo.bounds = info.bounds;
..	..	@@ -3078,7 +3207,7 @@
3078	3207	{
3079	3208	if (bRep != null)
3080	3209	{
3081		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3082	3211	Touch();
3083	3212	}
3084	3213	}
..	..	@@ -3488,15 +3617,47 @@
3488	3617
3489	3618	void ClearMaterials()
3490	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3491	3625	ClearMaterial();
3492		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3493	3627	{
3494		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3495	3629	if (child == null)
3496	3630	continue;
3497	3631	child.ClearMaterials();
3498		- release(i);
3499	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;
3500	3661	}
3501	3662
3502	3663	void FlipV(boolean flip)
..	..	@@ -5043,6 +5204,7 @@
5043	5204
5044	5205	if (child == null)
5045	5206	continue;
	5207	+
5046	5208	if (child.HasTransparency() && child.size() != 0)
5047	5209	{
5048	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5380,6 +5542,51 @@
5380	5542	blockloop = false;
5381	5543	}
5382	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	+
5383	5590	boolean IsSelected()
5384	5591	{
5385	5592	if (parent == null)
..	..	@@ -5440,6 +5647,11 @@
5440	5647	if (fullname == null)
5441	5648	return "";
5442	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5443	5655	// System.out.println("Fullname = " + fullname);
5444	5656
5445	5657	// Does not work on Windows due to C:
..	..	@@ -5452,7 +5664,7 @@
5452	5664
5453	5665	if (split.length == 0)
5454	5666	{
5455		- return "";
	5667	+ return fullname.pigment = "";
5456	5668	}
5457	5669
5458	5670	if (split.length <= 2)
..	..	@@ -5460,22 +5672,27 @@
5460	5672	if (fullname.name.endsWith(":"))
5461	5673	{
5462	5674	// Windows
5463		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5464	5676	}
5465	5677
5466		- return split[0];
	5678	+ return fullname.pigment = split[0];
5467	5679	}
5468	5680
5469	5681	// Windows
5470	5682	assert(split.length == 4);
5471	5683
5472		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5473	5685	}
5474	5686
5475	5687	static String GetBump(cTexture fullname)
5476	5688	{
5477	5689	if (fullname == null)
5478	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5479	5696
5480	5697	// System.out.println("Fullname = " + fullname);
5481	5698	// Does not work on Windows due to C:
..	..	@@ -5487,12 +5704,12 @@
5487	5704
5488	5705	if (split.length == 0)
5489	5706	{
5490		- return "";
	5707	+ return fullname.bump = "";
5491	5708	}
5492	5709
5493	5710	if (split.length == 1)
5494	5711	{
5495		- return "";
	5712	+ return fullname.bump = "";
5496	5713	}
5497	5714
5498	5715	if (split.length == 2)
..	..	@@ -5500,16 +5717,16 @@
5500	5717	if (fullname.name.endsWith(":"))
5501	5718	{
5502	5719	// Windows
5503		- return "";
	5720	+ return fullname.bump = "";
5504	5721	}
5505	5722
5506		- return split[1];
	5723	+ return fullname.bump = split[1];
5507	5724	}
5508	5725
5509	5726	// Windows
5510	5727	assert(split.length == 4);
5511	5728
5512		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5513	5730	}
5514	5731
5515	5732	String GetPigmentTexture()
..	..	@@ -5592,6 +5809,9 @@
5592	5809	texname = "";
5593	5810
5594	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5595	5815	Touch();
5596	5816	}
5597	5817
..	..	@@ -5665,6 +5885,8 @@
5665	5885
5666	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5667	5887
	5888	+ GetTextures().bump = null;
	5889	+
5668	5890	Touch();
5669	5891	}
5670	5892
..	..	@@ -5685,6 +5907,38 @@
5685	5907
5686	5908	blockloop = true;
5687	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);
5688	5942	blockloop = false;
5689	5943	}
5690	5944	}
..	..	@@ -5775,8 +6029,10 @@
5775	6029	if (support != null)
5776	6030	support = support;
5777	6031
5778		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5779		- 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.
5780	6036
5781	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5782	6038	{
..	..	@@ -5786,8 +6042,9 @@
5786	6042	// usecalllists &= !(parent instanceof RandomNode);
5787	6043	// usecalllists = false;
5788	6044
5789		- if (GetBRep() != null)
5790		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5791	6048	//System.out.println("draw " + this);
5792	6049	//new Exception().printStackTrace();
5793	6050
..	..	@@ -5797,7 +6054,7 @@
5797	6054
5798	6055	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5799	6056	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5800		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6057	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5801	6058	{
5802	6059	Globals.lighttouched = true;
5803	6060	} // all panes...
..	..	@@ -5809,7 +6066,7 @@
5809	6066	if (!(this instanceof Composite))
5810	6067	touched = false;
5811	6068	//if (displaylist == -1 && usecalllists)
5812		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5813	6070	{
5814	6071	bRep.displaylist = display.GenList();
5815	6072	assert(bRep.displaylist != 0);
..	..	@@ -5820,7 +6077,7 @@
5820	6077
5821	6078	//System.out.println("\tnew list " + list);
5822	6079	//gl.glDrawBuffer(gl.GL_NONE);
5823		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5824	6081	{
5825	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5826	6083	display.NewList(bRep.displaylist);
..	..	@@ -5829,7 +6086,7 @@
5829	6086	CallList(display, root, selected, blocked);
5830	6087
5831	6088	// compiled = true;
5832		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5833	6090	{
5834	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5835	6092	display.EndList();
..	..	@@ -5929,6 +6186,7 @@
5929	6186	if (GetBRep() != null)
5930	6187	{
5931	6188	display.NextIndex();
	6189	+
5932	6190	// vertex color conflict : gl.glCallList(list);
5933	6191	DrawNode(display, root, selected);
5934	6192	if (this instanceof BezierPatch)
..	..	@@ -7179,20 +7437,23 @@
7179	7437	}
7180	7438	}
7181	7439
7182		- 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)
7183	7444	{
7184		- int hc = info.bounds.x + info.bounds.width / 2;
7185		- int vc = info.bounds.y + info.bounds.height / 2;
7186		- 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;
7187	7448	if (toscreen == null)
7188	7449	{
7189		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7190	7451	}
7191	7452	cVector vec = in;
7192	7453	LA.xformPos(in, toscreen, in);
7193	7454	//System.out.println("Distance = " + info.camera.Distance());
7194		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7195		- 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();
7196	7457	outPt.x = hc + (int) vec.x;
7197	7458	outPt.y = vc - (int) vec.y;
7198	7459	outRec.x = outPt.x - 3;
..	..	@@ -7200,15 +7461,18 @@
7200	7461	outRec.width = outRec.height = 6;
7201	7462	}
7202	7463
7203		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7204	7466	{
7205	7467	Point pt = new Point(0, 0);
7206	7468	Rectangle rec = new Rectangle();
7207		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7208	7471	return rec;
7209	7472	}
7210	7473
7211		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7212	7476	{
7213	7477	if (level == 0)
7214	7478	{
..	..	@@ -7217,16 +7481,19 @@
7217	7481	{
7218	7482	cVector origin = new cVector();
7219	7483	//LA.xformPos(origin, toParent, origin);
7220		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7221	7488	Rectangle boundary = new Rectangle();
7222	7489	boundary.x = spot.x - 30;
7223	7490	boundary.y = spot.y - 30;
7224	7491	boundary.width = spot.width + 60;
7225	7492	boundary.height = spot.height + 60;
7226		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7227	7494	int spotw = spot.x + spot.width;
7228	7495	int spoth = spot.y + spot.height;
7229		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7230	7497	// if (CameraPane.Xmin > spot.x)
7231	7498	// {
7232	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7243,11 +7510,6 @@
7243	7510	// {
7244	7511	// CameraPane.Ymax = spoth;
7245	7512	// }
7246		- spot.translate(32, 32);
7247		- spotw = spot.x + spot.width;
7248		- spoth = spot.y + spot.height;
7249		- info.g.setColor(Color.cyan);
7250		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7251	7513	// if (CameraPane.Xmin > spot.x)
7252	7514	// {
7253	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7266,10 +7528,15 @@
7266	7528	// }
7267	7529	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7268	7530	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7269		- spot.translate(0, -32);
7270		- info.g.setColor(Color.yellow);
7271		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7272		- 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);
7273	7540	// if (CameraPane.Xmin > spot.x)
7274	7541	// {
7275	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7286,8 +7553,9 @@
7286	7553	// {
7287	7554	// CameraPane.Ymax = spoth;
7288	7555	// }
7289		- info.g.drawArc(boundary.x, boundary.y,
7290		- 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);
7291	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7292	7560	// if (CameraPane.Xmin > boundary.x)
7293	7561	// {
..	..	@@ -7309,7 +7577,8 @@
7309	7577	}
7310	7578	}
7311	7579
7312		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7313	7582	{
7314	7583	if (level == 0)
7315	7584	{
..	..	@@ -7318,8 +7587,8 @@
7318	7587
7319	7588	boolean retval = false;
7320	7589
7321		- startX = info.x;
7322		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7323	7592
7324	7593	hitSomething = -1;
7325	7594	cVector origin = new cVector();
..	..	@@ -7329,22 +7598,53 @@
7329	7598	{
7330	7599	centerPt = new Point(0, 0);
7331	7600	}
7332		- calcHotSpot(origin, info, centerPt, spot);
7333		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7334	7604	{
7335	7605	hitSomething = hitCenter;
7336	7606	retval = true;
7337	7607	}
7338	7608	spot.translate(32, 0);
7339		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7340	7610	{
7341	7611	hitSomething = hitRotate;
7342	7612	retval = true;
7343	7613	}
7344	7614	spot.translate(0, 32);
7345		- 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))
7346	7618	{
7347	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	+
7348	7648	retval = true;
7349	7649	}
7350	7650
..	..	@@ -7354,7 +7654,7 @@
7354	7654	}
7355	7655
7356	7656	//System.out.println("info.modifiers = " + info.modifiers);
7357		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7358	7658	//System.out.println("modified = " + modified);
7359	7659	//new Exception().printStackTrace();
7360	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7382,7 +7682,8 @@
7382	7682	return true;
7383	7683	}
7384	7684
7385		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7386	7687	{
7387	7688	if (hitSomething == 0)
7388	7689	{
..	..	@@ -7396,7 +7697,7 @@
7396	7697
7397	7698	//System.out.println("hitSomething = " + hitSomething);
7398	7699
7399		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7400	7701
7401	7702	cVector xlate = new cVector();
7402	7703	//cVector xlate2 = new cVector();
..	..	@@ -7410,7 +7711,9 @@
7410	7711
7411	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7412	7713
7413		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7414	7717	{
7415	7718	//assert(false);
7416	7719	/*
..	..	@@ -7430,8 +7733,8 @@
7430	7733	toParent[3][i] = xlate.get(i);
7431	7734	LA.matInvert(toParent, fromParent);
7432	7735	*/
7433		- cVector delta = LA.newVector(0, 0, startY - info.y);
7434		- 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);
7435	7738
7436	7739	LA.matCopy(startMat, toParent);
7437	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7440,7 +7743,7 @@
7440	7743	} else
7441	7744	{
7442	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7443		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7444	7747	cVector away = new cVector();
7445	7748	//cVector right2 = new cVector();
7446	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7457,19 +7760,19 @@
7457	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7458	7761	// if (!CameraPane.LOCALTRANSFORM)
7459	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7460		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7461	7764	// if (!CameraPane.LOCALTRANSFORM)
7462	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7463	7766	//LA.vecCross(up, cVector.Z, right2);
7464	7767
7465		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7466	7769
7467	7770	//System.out.println("DELTA0 = " + delta);
7468	7771	//System.out.println("AWAY = " + info.camera.away);
7469	7772	//System.out.println("UP = " + info.camera.up);
7470	7773	if (away.z > 0)
7471	7774	{
7472		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7473	7776	{
7474	7777	delta.x = -delta.x;
7475	7778	} else
..	..	@@ -7484,7 +7787,7 @@
7484	7787	//System.out.println("DELTA1 = " + delta);
7485	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7486	7789	//System.out.println("DELTA2 = " + delta);
7487		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7488	7791	LA.matCopy(startMat, toParent);
7489	7792	//System.out.println("DELTA3 = " + delta);
7490	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7494,8 +7797,8 @@
7494	7797	break;
7495	7798
7496	7799	case hitRotate: // rotate
7497		- int dx = info.x - centerPt.x;
7498		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7499	7802	double angle = (double) Math.atan2(dx, dy);
7500	7803	angle = -(1.570796 - angle);
7501	7804
..	..	@@ -7504,7 +7807,7 @@
7504	7807
7505	7808	if (modified)
7506	7809	{
7507		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7508	7811	angle /= (Math.PI / 4);
7509	7812	angle = Math.floor(angle + 0.5);
7510	7813	angle *= (Math.PI / 4);
..	..	@@ -7518,7 +7821,7 @@
7518	7821	}
7519	7822	/**/
7520	7823
7521		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7522	7825	{
7523	7826	case 1: // '\001'
7524	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7545,7 +7848,7 @@
7545	7848	break;
7546	7849
7547	7850	case hitScale: // scale
7548		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7549	7852	double sign = 1;
7550	7853	if (hScale < 0)
7551	7854	{
..	..	@@ -7557,7 +7860,7 @@
7557	7860	//hScale = 0.01;
7558	7861	}
7559	7862
7560		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7561	7864	sign = 1;
7562	7865	if (vScale < 0)
7563	7866	{
..	..	@@ -7568,6 +7871,7 @@
7568	7871	{
7569	7872	//vScale = 0.01;
7570	7873	}
	7874	+
7571	7875	LA.matCopy(startMat, toParent);
7572	7876	/**/
7573	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7577,33 +7881,39 @@
7577	7881	}
7578	7882	/**/
7579	7883
7580		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7581	7885
7582	7886	if (totalScale < 0.01)
7583	7887	{
7584	7888	totalScale = 0.01;
7585	7889	}
7586	7890
7587		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7588	7892	{
7589	7893	case 3: // '\001'
7590	7894	if (modified \|\| opposite)
7591	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7592	7899	//LA.matScale(toParent, 1, hScale, vScale);
7593		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7594	7901	} // vScale, 1);
7595	7902	else
7596	7903	{
7597	7904	// EXCEPTION!
7598		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7599	7906	} // vScale, 1);
7600	7907	break;
7601	7908
7602	7909	case 2: // '\002'
7603	7910	if (modified \|\| opposite)
7604	7911	{
7605		- //LA.matScale(toParent, hScale, 1, vScale);
7606		- 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);
7607	7917	} else
7608	7918	{
7609	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7613,8 +7923,11 @@
7613	7923	case 1: // '\003'
7614	7924	if (modified \|\| opposite)
7615	7925	{
7616		- //LA.matScale(toParent, hScale, vScale, 1);
7617		- 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);
7618	7931	} else
7619	7932	{
7620	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7651,7 +7964,7 @@
7651	7964	} // NEW ...
7652	7965
7653	7966
7654		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7655	7968	}
7656	7969
7657	7970	boolean overflow = false;