~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,17 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
30	30	//
31	31
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
32	38	ScriptNode scriptnode;
33	39
34	40	void InitOthers()
..	..	@@ -170,24 +176,35 @@
170	176
171	177	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	178	{
	179	+ Object3D o;
	180	+
173	181	if (hashtable.containsKey(GetUUID()))
174	182	{
175		- Object3D o = hashtable.get(GetUUID());
	183	+ o = hashtable.get(GetUUID());
176	184
177	185	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
180	194
181		- return;
	195	+ hashtable.put(GetUUID(), o);
182	196	}
183	197
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	198	+ if (!blockloop)
189	199	{
190		- get(i).ExtractBigData(hashtable);
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
191	208	}
192	209
193	210	ExtractBigData(o);
..	..	@@ -195,11 +212,26 @@
195	212
196	213	void ExtractBigData(Object3D o)
197	214	{
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
198	218	o.bRep = this.bRep;
199		- if (this.bRep != null)
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
200	229	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
203	235	}
204	236
205	237	// o.support = this.support;
..	..	@@ -223,19 +255,35 @@
223	255
224	256	RestoreBigData(o);
225	257
226		- hashtable.remove(GetUUID());
	258	+ if (blockloop)
	259	+ return;
	260	+
	261	+ blockloop = true;
	262	+
	263	+ //hashtable.remove(GetUUID());
227	264
228	265	for (int i=0; i<Size(); i++)
229	266	{
230	267	get(i).RestoreBigData(hashtable);
231	268	}
	269	+
	270	+ blockloop = false;
232	271	}
233	272
234	273	void RestoreBigData(Object3D o)
235	274	{
236	275	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
239	287	// this.support = o.support;
240	288	// this.fileparent = o.fileparent;
241	289	}
..	..	@@ -381,6 +429,7 @@
381	429	}
382	430
383	431	boolean live = false;
	432	+ transient boolean keepdontselect;
384	433	boolean dontselect = false;
385	434	boolean hide = false;
386	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +930,7 @@
881	930
882	931	if (marked && Globals.isLIVE() && live &&
883	932	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	934	currentframe != Globals.framecount)
886	935	{
887	936	currentframe = Globals.framecount;
..	..	@@ -893,7 +942,8 @@
893	942
894	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
895	944
896		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
897	947	{
898	948	countdown = 1;
899	949	delay = speedup?8:1;
..	..	@@ -965,6 +1015,7 @@
965	1015	if (material == null \|\| material.multiply)
966	1016	return true;
967	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
968	1019	return material.opacity > 0.99;
969	1020	}
970	1021
..	..	@@ -1365,6 +1416,7 @@
1365	1416	toParent = LA.newMatrix();
1366	1417	fromParent = LA.newMatrix();
1367	1418	}
	1419	+
1368	1420	LA.matCopy(other.toParent, toParent);
1369	1421	LA.matCopy(other.fromParent, fromParent);
1370	1422
..	..	@@ -2386,6 +2438,10 @@
2386	2438	}
2387	2439	*/
2388	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2389	2445	}
2390	2446
2391	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2427,6 +2483,14 @@
2427	2483	{
2428	2484	editWindow.refreshContents();
2429	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2430	2494	//if (parent != null)
2431	2495	//parent.refreshEditWindow();
2432	2496	}
..	..	@@ -2506,7 +2570,8 @@
2506	2570	private static final int editSelf = 1;
2507	2571	private static final int editChild = 2;
2508	2572
2509		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2510	2575	{
2511	2576	if (level == 0)
2512	2577	{
..	..	@@ -2514,7 +2579,8 @@
2514	2579	return;
2515	2580
2516	2581	Object3D selectee;
2517		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2518	2584	{
2519	2585	selectee = (Object3D) e.nextElement();
2520	2586	}
..	..	@@ -2522,19 +2588,22 @@
2522	2588	} else
2523	2589	{
2524	2590	//super.
2525		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2526	2593	}
2527	2594	}
2528	2595
2529		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2530	2598	{
2531	2599	doSomething = 0;
2532	2600	if (level == 0)
2533	2601	{
2534		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2535	2603	}
2536	2604	if (//super.
2537		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2538	2607	{
2539	2608	doSomething = 1;
2540	2609	return true;
..	..	@@ -2544,7 +2613,7 @@
2544	2613	}
2545	2614	}
2546	2615
2547		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2548	2617	{
2549	2618	if (selection == null)
2550	2619	{
..	..	@@ -2557,7 +2626,8 @@
2557	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2558	2627	{
2559	2628	Object3D selectee = (Object3D) e.nextElement();
2560		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2561	2631	{
2562	2632	childToDrag = selectee;
2563	2633	doSomething = 2;
..	..	@@ -2569,13 +2639,15 @@
2569	2639	return retval;
2570	2640	}
2571	2641
2572		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2573	2644	{
2574	2645	switch (doSomething)
2575	2646	{
2576	2647	case 1: // '\001'
2577	2648	//super.
2578		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2579	2651	break;
2580	2652
2581	2653	case 2: // '\002'
..	..	@@ -2588,11 +2660,13 @@
2588	2660	{
2589	2661	//sel.hitSomething = childToDrag.hitSomething;
2590	2662	//childToDrag.doEditDrag(info);
2591		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2592	2665	} else
2593	2666	{
2594	2667	//super.
2595		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2596	2670	}
2597	2671	}
2598	2672	break;
..	..	@@ -2610,6 +2684,9 @@
2610	2684	{
2611	2685	deselectAll();
2612	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2613	2690	ClickInfo newInfo = new ClickInfo();
2614	2691	newInfo.flags = info.flags;
2615	2692	newInfo.bounds = info.bounds;
..	..	@@ -3057,7 +3134,7 @@
3057	3134	{
3058	3135	if (bRep != null)
3059	3136	{
3060		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3061	3138	Touch();
3062	3139	}
3063	3140	}
..	..	@@ -3503,7 +3580,8 @@
3503	3580	if (blockloop)
3504	3581	return;
3505	3582
3506		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3507	3585	live = h;
3508	3586
3509	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3524,7 +3602,8 @@
3524	3602	return;
3525	3603
3526	3604	//if (bRep != null)
3527		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3528	3607	link2master = h;
3529	3608
3530	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3544,7 +3623,8 @@
3544	3623	if (blockloop)
3545	3624	return;
3546	3625
3547		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3548	3628	hide = h;
3549	3629
3550	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3564,7 +3644,7 @@
3564	3644	if (blockloop)
3565	3645	return;
3566	3646
3567		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3568	3648	marked = h;
3569	3649
3570	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3574,6 +3654,46 @@
3574	3654	continue;
3575	3655	blockloop = true;
3576	3656	child.MarkLeaves(h);
	3657	+ blockloop = false;
	3658	+ // release(i);
	3659	+ }
	3660	+ }
	3661	+
	3662	+ void RewindLeaves(boolean h)
	3663	+ {
	3664	+ if (blockloop)
	3665	+ return;
	3666	+
	3667	+ if (bRep != null \|\| material != null) // borderline...
	3668	+ rewind = h;
	3669	+
	3670	+ for (int i = 0; i < Size(); i++)
	3671	+ {
	3672	+ Object3D child = (Object3D) get(i); // reserve(i);
	3673	+ if (child == null)
	3674	+ continue;
	3675	+ blockloop = true;
	3676	+ child.RewindLeaves(h);
	3677	+ blockloop = false;
	3678	+ // release(i);
	3679	+ }
	3680	+ }
	3681	+
	3682	+ void RandomLeaves(boolean h)
	3683	+ {
	3684	+ if (blockloop)
	3685	+ return;
	3686	+
	3687	+ if (bRep != null \|\| material != null) // borderline...
	3688	+ random = h;
	3689	+
	3690	+ for (int i = 0; i < Size(); i++)
	3691	+ {
	3692	+ Object3D child = (Object3D) get(i); // reserve(i);
	3693	+ if (child == null)
	3694	+ continue;
	3695	+ blockloop = true;
	3696	+ child.RandomLeaves(h);
3577	3697	blockloop = false;
3578	3698	// release(i);
3579	3699	}
..	..	@@ -4351,6 +4471,55 @@
4351	4471	}
4352	4472	}
4353	4473
	4474	+ void RepairSOV()
	4475	+ {
	4476	+ if (blockloop)
	4477	+ return;
	4478	+
	4479	+ String texname = this.GetPigmentTexture();
	4480	+
	4481	+ if (texname.startsWith("sov"))
	4482	+ {
	4483	+ String[] s = texname.split("/");
	4484	+
	4485	+ String[] sname = s[1].split("Color.pn");
	4486	+
	4487	+ texname = sname[0];
	4488	+
	4489	+ if (sname.length > 1)
	4490	+ {
	4491	+ texname += "Color.jpg";
	4492	+ }
	4493	+
	4494	+ this.SetPigmentTexture("sov/" + texname);
	4495	+ }
	4496	+
	4497	+ texname = this.GetBumpTexture();
	4498	+
	4499	+ if (texname.startsWith("sov"))
	4500	+ {
	4501	+ String[] s = texname.split("/");
	4502	+
	4503	+ String[] sname = s[1].split("Bump.pn");
	4504	+
	4505	+ texname = sname[0];
	4506	+
	4507	+ if (sname.length > 1)
	4508	+ {
	4509	+ texname += "Bump.jpg";
	4510	+ }
	4511	+
	4512	+ this.SetBumpTexture("sov/" + texname);
	4513	+ }
	4514	+
	4515	+ for (int i=0; i<Size(); i++)
	4516	+ {
	4517	+ blockloop = true;
	4518	+ get(i).RepairSOV();
	4519	+ blockloop = false;
	4520	+ }
	4521	+ }
	4522	+
4354	4523	void RepairTexture()
4355	4524	{
4356	4525	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4865,6 +5034,14 @@
4865	5034	}
4866	5035	}
4867	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4868	5045	cTreePath Select(int indexcount, boolean deselect)
4869	5046	{
4870	5047	if (hide \|\| dontselect)
..	..	@@ -4901,10 +5078,11 @@
4901	5078	if (leaf != null)
4902	5079	{
4903	5080	cTreePath tp = new cTreePath(this, leaf);
4904		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4905	5083	{
4906	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4907		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4908	5086	}
4909	5087
4910	5088	return tp;
..	..	@@ -4921,6 +5099,7 @@
4921	5099
4922	5100	if (child == null)
4923	5101	continue;
	5102	+
4924	5103	if (child.HasTransparency() && child.size() != 0)
4925	5104	{
4926	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4930,9 +5109,10 @@
4930	5109	if (leaf != null)
4931	5110	{
4932	5111	cTreePath tp = new cTreePath(this, leaf);
4933		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4934	5114	{
4935		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4936	5116	}
4937	5117
4938	5118	return tp;
..	..	@@ -5257,6 +5437,51 @@
5257	5437	blockloop = false;
5258	5438	}
5259	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5260	5485	boolean IsSelected()
5261	5486	{
5262	5487	if (parent == null)
..	..	@@ -5566,6 +5791,38 @@
5566	5791	}
5567	5792	}
5568	5793
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
5569	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5570	5827	{
5571	5828	Draw(display, root, selected, blocked);
..	..	@@ -5653,7 +5910,7 @@
5653	5910	support = support;
5654	5911
5655	5912	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5656		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5657	5914
5658	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659	5916	{
..	..	@@ -5673,10 +5930,12 @@
5673	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5674	5931
5675	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5933	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5677	5935	{
5678	5936	Globals.lighttouched = true;
5679	5937	} // all panes...
	5938	+
5680	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5681	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5682	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5804,6 +6063,7 @@
5804	6063	if (GetBRep() != null)
5805	6064	{
5806	6065	display.NextIndex();
	6066	+
5807	6067	// vertex color conflict : gl.glCallList(list);
5808	6068	DrawNode(display, root, selected);
5809	6069	if (this instanceof BezierPatch)
..	..	@@ -5844,16 +6104,27 @@
5844	6104	tex = GetTextures();
5845	6105	}
5846	6106
5847		- boolean failed = false;
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
5848	6109
5849	6110	try
5850	6111	{
5851		- display.BindTextures(tex, texres);
	6112	+ display.BindPigmentTexture(tex, texres);
5852	6113	}
5853	6114	catch (Exception e)
5854	6115	{
5855	6116	System.err.println("FAILED: " + this);
5856		- failed = true;
	6117	+ failedPigment = true;
	6118	+ }
	6119	+
	6120	+ try
	6121	+ {
	6122	+ display.BindBumpTexture(tex, texres);
	6123	+ }
	6124	+ catch (Exception e)
	6125	+ {
	6126	+ //System.err.println("FAILED: " + this);
	6127	+ failedBump = true;
5857	6128	}
5858	6129
5859	6130	if (!compiled)
..	..	@@ -5876,8 +6147,11 @@
5876	6147	}
5877	6148	}
5878	6149
5879		- if (!failed)
5880		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5881	6155
5882	6156	display.PopMaterial(this, selected);
5883	6157	}
..	..	@@ -6250,6 +6524,11 @@
6250	6524	// dec 2012
6251	6525	new Exception().printStackTrace();
6252	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6253	6532	}
6254	6533
6255	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7035,20 +7314,23 @@
7035	7314	}
7036	7315	}
7037	7316
7038		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
7039	7321	{
7040		- int hc = info.bounds.x + info.bounds.width / 2;
7041		- int vc = info.bounds.y + info.bounds.height / 2;
7042		- double[][] toscreen = info.toScreen;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
7043	7325	if (toscreen == null)
7044	7326	{
7045		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7046	7328	}
7047	7329	cVector vec = in;
7048	7330	LA.xformPos(in, toscreen, in);
7049	7331	//System.out.println("Distance = " + info.camera.Distance());
7050		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7051		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7052	7334	outPt.x = hc + (int) vec.x;
7053	7335	outPt.y = vc - (int) vec.y;
7054	7336	outRec.x = outPt.x - 3;
..	..	@@ -7056,15 +7338,18 @@
7056	7338	outRec.width = outRec.height = 6;
7057	7339	}
7058	7340
7059		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
7060	7343	{
7061	7344	Point pt = new Point(0, 0);
7062	7345	Rectangle rec = new Rectangle();
7063		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
7064	7348	return rec;
7065	7349	}
7066	7350
7067		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
7068	7353	{
7069	7354	if (level == 0)
7070	7355	{
..	..	@@ -7073,16 +7358,19 @@
7073	7358	{
7074	7359	cVector origin = new cVector();
7075	7360	//LA.xformPos(origin, toParent, origin);
7076		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7077	7365	Rectangle boundary = new Rectangle();
7078	7366	boundary.x = spot.x - 30;
7079	7367	boundary.y = spot.y - 30;
7080	7368	boundary.width = spot.width + 60;
7081	7369	boundary.height = spot.height + 60;
7082		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
7083	7371	int spotw = spot.x + spot.width;
7084	7372	int spoth = spot.y + spot.height;
7085		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7086	7374	// if (CameraPane.Xmin > spot.x)
7087	7375	// {
7088	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -7102,8 +7390,8 @@
7102	7390	spot.translate(32, 32);
7103	7391	spotw = spot.x + spot.width;
7104	7392	spoth = spot.y + spot.height;
7105		- info.g.setColor(Color.blue);
7106		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7107	7395	// if (CameraPane.Xmin > spot.x)
7108	7396	// {
7109	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -7120,11 +7408,12 @@
7120	7408	// {
7121	7409	// CameraPane.Ymax = spoth;
7122	7410	// }
7123		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7124		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7411	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7412	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7125	7413	spot.translate(0, -32);
7126		- info.g.setColor(Color.green);
7127		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
7128	7417	// if (CameraPane.Xmin > spot.x)
7129	7418	// {
7130	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -7141,8 +7430,8 @@
7141	7430	// {
7142	7431	// CameraPane.Ymax = spoth;
7143	7432	// }
7144		- info.g.drawArc(boundary.x, boundary.y,
7145		- boundary.width, boundary.height, 0, 360);
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7146	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7147	7436	// if (CameraPane.Xmin > boundary.x)
7148	7437	// {
..	..	@@ -7164,7 +7453,8 @@
7164	7453	}
7165	7454	}
7166	7455
7167		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7168	7458	{
7169	7459	if (level == 0)
7170	7460	{
..	..	@@ -7173,8 +7463,8 @@
7173	7463
7174	7464	boolean retval = false;
7175	7465
7176		- startX = info.x;
7177		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7178	7468
7179	7469	hitSomething = -1;
7180	7470	cVector origin = new cVector();
..	..	@@ -7184,22 +7474,51 @@
7184	7474	{
7185	7475	centerPt = new Point(0, 0);
7186	7476	}
7187		- calcHotSpot(origin, info, centerPt, spot);
7188		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7189	7480	{
7190	7481	hitSomething = hitCenter;
7191	7482	retval = true;
7192	7483	}
7193	7484	spot.translate(32, 0);
7194		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7195	7486	{
7196	7487	hitSomething = hitRotate;
7197	7488	retval = true;
7198	7489	}
7199	7490	spot.translate(0, 32);
7200		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7201	7492	{
7202	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7203	7522	retval = true;
7204	7523	}
7205	7524
..	..	@@ -7209,7 +7528,7 @@
7209	7528	}
7210	7529
7211	7530	//System.out.println("info.modifiers = " + info.modifiers);
7212		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7213	7532	//System.out.println("modified = " + modified);
7214	7533	//new Exception().printStackTrace();
7215	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7237,7 +7556,8 @@
7237	7556	return true;
7238	7557	}
7239	7558
7240		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7241	7561	{
7242	7562	if (hitSomething == 0)
7243	7563	{
..	..	@@ -7251,7 +7571,7 @@
7251	7571
7252	7572	//System.out.println("hitSomething = " + hitSomething);
7253	7573
7254		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
7255	7575
7256	7576	cVector xlate = new cVector();
7257	7577	//cVector xlate2 = new cVector();
..	..	@@ -7285,8 +7605,8 @@
7285	7605	toParent[3][i] = xlate.get(i);
7286	7606	LA.matInvert(toParent, fromParent);
7287	7607	*/
7288		- cVector delta = LA.newVector(0, 0, startY - info.y);
7289		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7290	7610
7291	7611	LA.matCopy(startMat, toParent);
7292	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7295,7 +7615,7 @@
7295	7615	} else
7296	7616	{
7297	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7298		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7299	7619	cVector away = new cVector();
7300	7620	//cVector right2 = new cVector();
7301	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7312,19 +7632,19 @@
7312	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7313	7633	// if (!CameraPane.LOCALTRANSFORM)
7314	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7315		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7316	7636	// if (!CameraPane.LOCALTRANSFORM)
7317	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7318	7638	//LA.vecCross(up, cVector.Z, right2);
7319	7639
7320		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7321	7641
7322	7642	//System.out.println("DELTA0 = " + delta);
7323	7643	//System.out.println("AWAY = " + info.camera.away);
7324	7644	//System.out.println("UP = " + info.camera.up);
7325	7645	if (away.z > 0)
7326	7646	{
7327		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7328	7648	{
7329	7649	delta.x = -delta.x;
7330	7650	} else
..	..	@@ -7339,7 +7659,7 @@
7339	7659	//System.out.println("DELTA1 = " + delta);
7340	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7341	7661	//System.out.println("DELTA2 = " + delta);
7342		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7343	7663	LA.matCopy(startMat, toParent);
7344	7664	//System.out.println("DELTA3 = " + delta);
7345	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7349,8 +7669,8 @@
7349	7669	break;
7350	7670
7351	7671	case hitRotate: // rotate
7352		- int dx = info.x - centerPt.x;
7353		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7354	7674	double angle = (double) Math.atan2(dx, dy);
7355	7675	angle = -(1.570796 - angle);
7356	7676
..	..	@@ -7373,7 +7693,7 @@
7373	7693	}
7374	7694	/**/
7375	7695
7376		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7377	7697	{
7378	7698	case 1: // '\001'
7379	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7400,7 +7720,7 @@
7400	7720	break;
7401	7721
7402	7722	case hitScale: // scale
7403		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7404	7724	double sign = 1;
7405	7725	if (hScale < 0)
7406	7726	{
..	..	@@ -7412,7 +7732,7 @@
7412	7732	//hScale = 0.01;
7413	7733	}
7414	7734
7415		- double vScale = (double) (info.y - centerPt.y) / 32;
	7735	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7416	7736	sign = 1;
7417	7737	if (vScale < 0)
7418	7738	{
..	..	@@ -7423,6 +7743,7 @@
7423	7743	{
7424	7744	//vScale = 0.01;
7425	7745	}
	7746	+
7426	7747	LA.matCopy(startMat, toParent);
7427	7748	/**/
7428	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7432,29 +7753,30 @@
7432	7753	}
7433	7754	/**/
7434	7755
7435		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7436	7757
7437	7758	if (totalScale < 0.01)
7438	7759	{
7439	7760	totalScale = 0.01;
7440	7761	}
7441	7762
7442		- switch (info.pane.RenderCamera().viewCode)
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7443	7764	{
7444	7765	case 3: // '\001'
7445		- if (modified)
	7766	+ if (modified \|\| opposite)
7446	7767	{
7447	7768	//LA.matScale(toParent, 1, hScale, vScale);
7448	7769	LA.matScale(toParent, totalScale, 1, 1);
7449	7770	} // vScale, 1);
7450	7771	else
7451	7772	{
	7773	+ // EXCEPTION!
7452	7774	LA.matScale(toParent, totalScale, totalScale, totalScale);
7453	7775	} // vScale, 1);
7454	7776	break;
7455	7777
7456	7778	case 2: // '\002'
7457		- if (modified)
	7779	+ if (modified \|\| opposite)
7458	7780	{
7459	7781	//LA.matScale(toParent, hScale, 1, vScale);
7460	7782	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7465,7 +7787,7 @@
7465	7787	break;
7466	7788
7467	7789	case 1: // '\003'
7468		- if (modified)
	7790	+ if (modified \|\| opposite)
7469	7791	{
7470	7792	//LA.matScale(toParent, hScale, vScale, 1);
7471	7793	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7505,7 +7827,7 @@
7505	7827	} // NEW ...
7506	7828
7507	7829
7508		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7509	7831	}
7510	7832
7511	7833	boolean overflow = false;
..	..	@@ -7685,6 +8007,10 @@
7685	8007	editWindow = null;
7686	8008	} // ?
7687	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7688	8014	}
7689	8015
7690	8016	boolean root; // patch for edit windows
..	..	@@ -7842,6 +8168,10 @@
7842	8168	}
7843	8169
7844	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7845	8175	transient ObjectUI objectUI;
7846	8176	public static int povDepth = 0;
7847	8177	private static cVector tbMin = new cVector();