~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,12 +22,21 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
30	31	//
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
31	40
32	41	ScriptNode scriptnode;
33	42
..	..	@@ -170,24 +179,35 @@
170	179
171	180	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	181	{
	182	+ Object3D o;
	183	+
173	184	if (hashtable.containsKey(GetUUID()))
174	185	{
175		- Object3D o = hashtable.get(GetUUID());
	186	+ o = hashtable.get(GetUUID());
176	187
177	188	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
180	197
181		- return;
	198	+ hashtable.put(GetUUID(), o);
182	199	}
183	200
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	201	+ if (!blockloop)
189	202	{
190		- get(i).ExtractBigData(hashtable);
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
191	211	}
192	212
193	213	ExtractBigData(o);
..	..	@@ -195,11 +215,26 @@
195	215
196	216	void ExtractBigData(Object3D o)
197	217	{
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
198	221	o.bRep = this.bRep;
199		- if (this.bRep != null)
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
200	232	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
203	238	}
204	239
205	240	// o.support = this.support;
..	..	@@ -214,6 +249,73 @@
214	249	// this.fileparent = null;
215	250	}
216	251
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
	294	+ blockloop = false;
	295	+ }
	296	+
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
	301	+
	302	+ blockloop = true;
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
217	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	320	{
219	321	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +325,35 @@
223	325
224	326	RestoreBigData(o);
225	327
226		- hashtable.remove(GetUUID());
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
227	334
228	335	for (int i=0; i<Size(); i++)
229	336	{
230	337	get(i).RestoreBigData(hashtable);
231	338	}
	339	+
	340	+ blockloop = false;
232	341	}
233	342
234	343	void RestoreBigData(Object3D o)
235	344	{
236	345	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
239	357	// this.support = o.support;
240	358	// this.fileparent = o.fileparent;
241	359	}
..	..	@@ -381,6 +499,7 @@
381	499	}
382	500
383	501	boolean live = false;
	502	+ transient boolean keepdontselect;
384	503	boolean dontselect = false;
385	504	boolean hide = false;
386	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +1000,7 @@
881	1000
882	1001	if (marked && Globals.isLIVE() && live &&
883	1002	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	1004	currentframe != Globals.framecount)
886	1005	{
887	1006	currentframe = Globals.framecount;
..	..	@@ -893,7 +1012,8 @@
893	1012
894	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
895	1014
896		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
897	1017	{
898	1018	countdown = 1;
899	1019	delay = speedup?8:1;
..	..	@@ -965,6 +1085,10 @@
965	1085	if (material == null \|\| material.multiply)
966	1086	return true;
967	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
968	1092	return material.opacity > 0.99;
969	1093	}
970	1094
..	..	@@ -1365,6 +1489,7 @@
1365	1489	toParent = LA.newMatrix();
1366	1490	fromParent = LA.newMatrix();
1367	1491	}
	1492	+
1368	1493	LA.matCopy(other.toParent, toParent);
1369	1494	LA.matCopy(other.fromParent, fromParent);
1370	1495
..	..	@@ -2386,6 +2511,15 @@
2386	2511	}
2387	2512	*/
2388	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2389	2523	}
2390	2524
2391	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2427,6 +2561,14 @@
2427	2561	{
2428	2562	editWindow.refreshContents();
2429	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2430	2572	//if (parent != null)
2431	2573	//parent.refreshEditWindow();
2432	2574	}
..	..	@@ -2506,7 +2648,8 @@
2506	2648	private static final int editSelf = 1;
2507	2649	private static final int editChild = 2;
2508	2650
2509		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2510	2653	{
2511	2654	if (level == 0)
2512	2655	{
..	..	@@ -2514,7 +2657,8 @@
2514	2657	return;
2515	2658
2516	2659	Object3D selectee;
2517		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2518	2662	{
2519	2663	selectee = (Object3D) e.nextElement();
2520	2664	}
..	..	@@ -2522,19 +2666,22 @@
2522	2666	} else
2523	2667	{
2524	2668	//super.
2525		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2526	2671	}
2527	2672	}
2528	2673
2529		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2530	2676	{
2531	2677	doSomething = 0;
2532	2678	if (level == 0)
2533	2679	{
2534		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2535	2681	}
2536	2682	if (//super.
2537		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2538	2685	{
2539	2686	doSomething = 1;
2540	2687	return true;
..	..	@@ -2544,7 +2691,7 @@
2544	2691	}
2545	2692	}
2546	2693
2547		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2548	2695	{
2549	2696	if (selection == null)
2550	2697	{
..	..	@@ -2557,7 +2704,8 @@
2557	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2558	2705	{
2559	2706	Object3D selectee = (Object3D) e.nextElement();
2560		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2561	2709	{
2562	2710	childToDrag = selectee;
2563	2711	doSomething = 2;
..	..	@@ -2569,13 +2717,15 @@
2569	2717	return retval;
2570	2718	}
2571	2719
2572		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2573	2722	{
2574	2723	switch (doSomething)
2575	2724	{
2576	2725	case 1: // '\001'
2577	2726	//super.
2578		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2579	2729	break;
2580	2730
2581	2731	case 2: // '\002'
..	..	@@ -2588,11 +2738,13 @@
2588	2738	{
2589	2739	//sel.hitSomething = childToDrag.hitSomething;
2590	2740	//childToDrag.doEditDrag(info);
2591		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2592	2743	} else
2593	2744	{
2594	2745	//super.
2595		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2596	2748	}
2597	2749	}
2598	2750	break;
..	..	@@ -2610,6 +2762,9 @@
2610	2762	{
2611	2763	deselectAll();
2612	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2613	2768	ClickInfo newInfo = new ClickInfo();
2614	2769	newInfo.flags = info.flags;
2615	2770	newInfo.bounds = info.bounds;
..	..	@@ -3057,7 +3212,7 @@
3057	3212	{
3058	3213	if (bRep != null)
3059	3214	{
3060		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3061	3216	Touch();
3062	3217	}
3063	3218	}
..	..	@@ -3467,15 +3622,47 @@
3467	3622
3468	3623	void ClearMaterials()
3469	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3470	3630	ClearMaterial();
3471		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3472	3632	{
3473		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3474	3634	if (child == null)
3475	3635	continue;
3476	3636	child.ClearMaterials();
3477		- release(i);
3478	3637	}
	3638	+
	3639	+ blockloop = false;
	3640	+ }
	3641	+
	3642	+ void ClearVersionList()
	3643	+ {
	3644	+ this.versionlist = null;
	3645	+ this.versionindex = -1;
	3646	+ this.versiontable = null;
	3647	+ }
	3648	+
	3649	+ void ClearVersions()
	3650	+ {
	3651	+ if (blockloop)
	3652	+ return;
	3653	+
	3654	+ blockloop = true;
	3655	+
	3656	+ ClearVersionList();
	3657	+ for (int i = 0; i < Size(); i++)
	3658	+ {
	3659	+ Object3D child = (Object3D) get(i);
	3660	+ if (child == null)
	3661	+ continue;
	3662	+ child.ClearVersions();
	3663	+ }
	3664	+
	3665	+ blockloop = false;
3479	3666	}
3480	3667
3481	3668	void FlipV(boolean flip)
..	..	@@ -3503,7 +3690,8 @@
3503	3690	if (blockloop)
3504	3691	return;
3505	3692
3506		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3693	+ if (//marked \|\| // does not make sense
	3694	+ (bRep != null \|\| material != null)) // borderline...
3507	3695	live = h;
3508	3696
3509	3697	for (int i = 0; i < Size(); i++)
..	..	@@ -3524,7 +3712,8 @@
3524	3712	return;
3525	3713
3526	3714	//if (bRep != null)
3527		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3715	+ if (//marked \|\| // does not make sense
	3716	+ (bRep != null \|\| material != null)) // borderline...
3528	3717	link2master = h;
3529	3718
3530	3719	for (int i = 0; i < Size(); i++)
..	..	@@ -3544,7 +3733,8 @@
3544	3733	if (blockloop)
3545	3734	return;
3546	3735
3547		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3736	+ if (//marked \|\| // does not make sense
	3737	+ (bRep != null \|\| material != null)) // borderline...
3548	3738	hide = h;
3549	3739
3550	3740	for (int i = 0; i < Size(); i++)
..	..	@@ -3564,7 +3754,7 @@
3564	3754	if (blockloop)
3565	3755	return;
3566	3756
3567		- if (bRep != null && material != null) // borderline...
	3757	+ if (bRep != null \|\| material != null) // borderline...
3568	3758	marked = h;
3569	3759
3570	3760	for (int i = 0; i < Size(); i++)
..	..	@@ -3574,6 +3764,46 @@
3574	3764	continue;
3575	3765	blockloop = true;
3576	3766	child.MarkLeaves(h);
	3767	+ blockloop = false;
	3768	+ // release(i);
	3769	+ }
	3770	+ }
	3771	+
	3772	+ void RewindLeaves(boolean h)
	3773	+ {
	3774	+ if (blockloop)
	3775	+ return;
	3776	+
	3777	+ if (bRep != null \|\| material != null) // borderline...
	3778	+ rewind = h;
	3779	+
	3780	+ for (int i = 0; i < Size(); i++)
	3781	+ {
	3782	+ Object3D child = (Object3D) get(i); // reserve(i);
	3783	+ if (child == null)
	3784	+ continue;
	3785	+ blockloop = true;
	3786	+ child.RewindLeaves(h);
	3787	+ blockloop = false;
	3788	+ // release(i);
	3789	+ }
	3790	+ }
	3791	+
	3792	+ void RandomLeaves(boolean h)
	3793	+ {
	3794	+ if (blockloop)
	3795	+ return;
	3796	+
	3797	+ if (bRep != null \|\| material != null) // borderline...
	3798	+ random = h;
	3799	+
	3800	+ for (int i = 0; i < Size(); i++)
	3801	+ {
	3802	+ Object3D child = (Object3D) get(i); // reserve(i);
	3803	+ if (child == null)
	3804	+ continue;
	3805	+ blockloop = true;
	3806	+ child.RandomLeaves(h);
3577	3807	blockloop = false;
3578	3808	// release(i);
3579	3809	}
..	..	@@ -4351,6 +4581,55 @@
4351	4581	}
4352	4582	}
4353	4583
	4584	+ void RepairSOV()
	4585	+ {
	4586	+ if (blockloop)
	4587	+ return;
	4588	+
	4589	+ String texname = this.GetPigmentTexture();
	4590	+
	4591	+ if (texname.startsWith("sov"))
	4592	+ {
	4593	+ String[] s = texname.split("/");
	4594	+
	4595	+ String[] sname = s[1].split("Color.pn");
	4596	+
	4597	+ texname = sname[0];
	4598	+
	4599	+ if (sname.length > 1)
	4600	+ {
	4601	+ texname += "Color.jpg";
	4602	+ }
	4603	+
	4604	+ this.SetPigmentTexture("sov/" + texname);
	4605	+ }
	4606	+
	4607	+ texname = this.GetBumpTexture();
	4608	+
	4609	+ if (texname.startsWith("sov"))
	4610	+ {
	4611	+ String[] s = texname.split("/");
	4612	+
	4613	+ String[] sname = s[1].split("Bump.pn");
	4614	+
	4615	+ texname = sname[0];
	4616	+
	4617	+ if (sname.length > 1)
	4618	+ {
	4619	+ texname += "Bump.jpg";
	4620	+ }
	4621	+
	4622	+ this.SetBumpTexture("sov/" + texname);
	4623	+ }
	4624	+
	4625	+ for (int i=0; i<Size(); i++)
	4626	+ {
	4627	+ blockloop = true;
	4628	+ get(i).RepairSOV();
	4629	+ blockloop = false;
	4630	+ }
	4631	+ }
	4632	+
4354	4633	void RepairTexture()
4355	4634	{
4356	4635	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4865,6 +5144,14 @@
4865	5144	}
4866	5145	}
4867	5146
	5147	+ ObjEditor GetWindow()
	5148	+ {
	5149	+ if (editWindow != null)
	5150	+ return editWindow;
	5151	+
	5152	+ return manipWindow;
	5153	+ }
	5154	+
4868	5155	cTreePath Select(int indexcount, boolean deselect)
4869	5156	{
4870	5157	if (hide \|\| dontselect)
..	..	@@ -4901,10 +5188,11 @@
4901	5188	if (leaf != null)
4902	5189	{
4903	5190	cTreePath tp = new cTreePath(this, leaf);
4904		- if (editWindow != null)
	5191	+ ObjEditor window = GetWindow();
	5192	+ if (window != null)
4905	5193	{
4906	5194	//System.out.println("editWindow = " + editWindow + " vs " + this);
4907		- editWindow.Select(tp, deselect, true);
	5195	+ window.Select(tp, deselect, true);
4908	5196	}
4909	5197
4910	5198	return tp;
..	..	@@ -4921,6 +5209,7 @@
4921	5209
4922	5210	if (child == null)
4923	5211	continue;
	5212	+
4924	5213	if (child.HasTransparency() && child.size() != 0)
4925	5214	{
4926	5215	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4930,9 +5219,10 @@
4930	5219	if (leaf != null)
4931	5220	{
4932	5221	cTreePath tp = new cTreePath(this, leaf);
4933		- if (editWindow != null)
	5222	+ ObjEditor window = GetWindow();
	5223	+ if (window != null)
4934	5224	{
4935		- editWindow.Select(tp, deselect, true);
	5225	+ window.Select(tp, deselect, true);
4936	5226	}
4937	5227
4938	5228	return tp;
..	..	@@ -5257,6 +5547,51 @@
5257	5547	blockloop = false;
5258	5548	}
5259	5549
	5550	+ void ResetSelectable()
	5551	+ {
	5552	+ if (blockloop)
	5553	+ return;
	5554	+
	5555	+ blockloop = true;
	5556	+
	5557	+ keepdontselect = dontselect;
	5558	+ dontselect = true;
	5559	+
	5560	+ Object3D child;
	5561	+ int nb = Size();
	5562	+ for (int i = 0; i < nb; i++)
	5563	+ {
	5564	+ child = (Object3D) get(i);
	5565	+ if (child == null)
	5566	+ continue;
	5567	+ child.ResetSelectable();
	5568	+ }
	5569	+
	5570	+ blockloop = false;
	5571	+ }
	5572	+
	5573	+ void RestoreSelectable()
	5574	+ {
	5575	+ if (blockloop)
	5576	+ return;
	5577	+
	5578	+ blockloop = true;
	5579	+
	5580	+ dontselect = keepdontselect;
	5581	+
	5582	+ Object3D child;
	5583	+ int nb = Size();
	5584	+ for (int i = 0; i < nb; i++)
	5585	+ {
	5586	+ child = (Object3D) get(i);
	5587	+ if (child == null)
	5588	+ continue;
	5589	+ child.RestoreSelectable();
	5590	+ }
	5591	+
	5592	+ blockloop = false;
	5593	+ }
	5594	+
5260	5595	boolean IsSelected()
5261	5596	{
5262	5597	if (parent == null)
..	..	@@ -5317,6 +5652,11 @@
5317	5652	if (fullname == null)
5318	5653	return "";
5319	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5320	5660	// System.out.println("Fullname = " + fullname);
5321	5661
5322	5662	// Does not work on Windows due to C:
..	..	@@ -5329,7 +5669,7 @@
5329	5669
5330	5670	if (split.length == 0)
5331	5671	{
5332		- return "";
	5672	+ return fullname.pigment = "";
5333	5673	}
5334	5674
5335	5675	if (split.length <= 2)
..	..	@@ -5337,22 +5677,27 @@
5337	5677	if (fullname.name.endsWith(":"))
5338	5678	{
5339	5679	// Windows
5340		- return fullname.name.substring(0, fullname.name.length()-1);
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5341	5681	}
5342	5682
5343		- return split[0];
	5683	+ return fullname.pigment = split[0];
5344	5684	}
5345	5685
5346	5686	// Windows
5347	5687	assert(split.length == 4);
5348	5688
5349		- return split[0] + ":" + split[1];
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5350	5690	}
5351	5691
5352	5692	static String GetBump(cTexture fullname)
5353	5693	{
5354	5694	if (fullname == null)
5355	5695	return "";
	5696	+
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
5356	5701
5357	5702	// System.out.println("Fullname = " + fullname);
5358	5703	// Does not work on Windows due to C:
..	..	@@ -5364,12 +5709,12 @@
5364	5709
5365	5710	if (split.length == 0)
5366	5711	{
5367		- return "";
	5712	+ return fullname.bump = "";
5368	5713	}
5369	5714
5370	5715	if (split.length == 1)
5371	5716	{
5372		- return "";
	5717	+ return fullname.bump = "";
5373	5718	}
5374	5719
5375	5720	if (split.length == 2)
..	..	@@ -5377,16 +5722,16 @@
5377	5722	if (fullname.name.endsWith(":"))
5378	5723	{
5379	5724	// Windows
5380		- return "";
	5725	+ return fullname.bump = "";
5381	5726	}
5382	5727
5383		- return split[1];
	5728	+ return fullname.bump = split[1];
5384	5729	}
5385	5730
5386	5731	// Windows
5387	5732	assert(split.length == 4);
5388	5733
5389		- return split[2] + ":" + split[3];
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5390	5735	}
5391	5736
5392	5737	String GetPigmentTexture()
..	..	@@ -5469,6 +5814,9 @@
5469	5814	texname = "";
5470	5815
5471	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5472	5820	Touch();
5473	5821	}
5474	5822
..	..	@@ -5542,6 +5890,8 @@
5542	5890
5543	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5544	5892
	5893	+ GetTextures().bump = null;
	5894	+
5545	5895	Touch();
5546	5896	}
5547	5897
..	..	@@ -5562,6 +5912,38 @@
5562	5912
5563	5913	blockloop = true;
5564	5914	child.ResetBumpTexture();
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
	5919	+ void EmbedTextures(boolean embed)
	5920	+ {
	5921	+ if (blockloop)
	5922	+ return;
	5923	+
	5924	+ //if (GetTextures() != null)
	5925	+ if (embed)
	5926	+ CameraPane.EmbedTextures(GetTextures());
	5927	+ else
	5928	+ {
	5929	+ GetTextures().pigmentdata = null;
	5930	+ GetTextures().bumpdata = null;
	5931	+ GetTextures().pw = 0;
	5932	+ GetTextures().ph = 0;
	5933	+ GetTextures().bw = 0;
	5934	+ GetTextures().bh = 0;
	5935	+ }
	5936	+
	5937	+ int nb = Size();
	5938	+ for (int i = 0; i < nb; i++)
	5939	+ {
	5940	+ Object3D child = (Object3D) get(i);
	5941	+
	5942	+ if (child == null)
	5943	+ continue;
	5944	+
	5945	+ blockloop = true;
	5946	+ child.EmbedTextures(embed);
5565	5947	blockloop = false;
5566	5948	}
5567	5949	}
..	..	@@ -5652,8 +6034,10 @@
5652	6034	if (support != null)
5653	6035	support = support;
5654	6036
5655		- //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);
	6037	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6038	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6039	+
	6040	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5657	6041
5658	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659	6043	{
..	..	@@ -5663,8 +6047,9 @@
5663	6047	// usecalllists &= !(parent instanceof RandomNode);
5664	6048	// usecalllists = false;
5665	6049
5666		- if (GetBRep() != null)
5667		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5668	6053	//System.out.println("draw " + this);
5669	6054	//new Exception().printStackTrace();
5670	6055
..	..	@@ -5674,7 +6059,7 @@
5674	6059
5675	6060	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676	6061	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5677		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6062	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5678	6063	{
5679	6064	Globals.lighttouched = true;
5680	6065	} // all panes...
..	..	@@ -5686,7 +6071,7 @@
5686	6071	if (!(this instanceof Composite))
5687	6072	touched = false;
5688	6073	//if (displaylist == -1 && usecalllists)
5689		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5690	6075	{
5691	6076	bRep.displaylist = display.GenList();
5692	6077	assert(bRep.displaylist != 0);
..	..	@@ -5697,7 +6082,7 @@
5697	6082
5698	6083	//System.out.println("\tnew list " + list);
5699	6084	//gl.glDrawBuffer(gl.GL_NONE);
5700		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5701	6086	{
5702	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5703	6088	display.NewList(bRep.displaylist);
..	..	@@ -5706,7 +6091,7 @@
5706	6091	CallList(display, root, selected, blocked);
5707	6092
5708	6093	// compiled = true;
5709		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5710	6095	{
5711	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5712	6097	display.EndList();
..	..	@@ -5806,6 +6191,7 @@
5806	6191	if (GetBRep() != null)
5807	6192	{
5808	6193	display.NextIndex();
	6194	+
5809	6195	// vertex color conflict : gl.glCallList(list);
5810	6196	DrawNode(display, root, selected);
5811	6197	if (this instanceof BezierPatch)
..	..	@@ -5846,16 +6232,27 @@
5846	6232	tex = GetTextures();
5847	6233	}
5848	6234
5849		- boolean failed = false;
	6235	+ boolean failedPigment = false;
	6236	+ boolean failedBump = false;
5850	6237
5851	6238	try
5852	6239	{
5853		- display.BindTextures(tex, texres);
	6240	+ display.BindPigmentTexture(tex, texres);
5854	6241	}
5855	6242	catch (Exception e)
5856	6243	{
5857	6244	System.err.println("FAILED: " + this);
5858		- failed = true;
	6245	+ failedPigment = true;
	6246	+ }
	6247	+
	6248	+ try
	6249	+ {
	6250	+ display.BindBumpTexture(tex, texres);
	6251	+ }
	6252	+ catch (Exception e)
	6253	+ {
	6254	+ //System.err.println("FAILED: " + this);
	6255	+ failedBump = true;
5859	6256	}
5860	6257
5861	6258	if (!compiled)
..	..	@@ -5878,8 +6275,11 @@
5878	6275	}
5879	6276	}
5880	6277
5881		- if (!failed)
5882		- display.ReleaseTextures(tex);
	6278	+ if (!failedBump)
	6279	+ display.ReleaseBumpTexture(tex);
	6280	+
	6281	+ if (!failedPigment)
	6282	+ display.ReleasePigmentTexture(tex);
5883	6283
5884	6284	display.PopMaterial(this, selected);
5885	6285	}
..	..	@@ -6252,6 +6652,11 @@
6252	6652	// dec 2012
6253	6653	new Exception().printStackTrace();
6254	6654	return;
	6655	+ }
	6656	+
	6657	+ if (dontselect)
	6658	+ {
	6659	+ //bRep.GenerateNormalsMINE();
6255	6660	}
6256	6661
6257	6662	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7037,20 +7442,23 @@
7037	7442	}
7038	7443	}
7039	7444
7040		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7445	+ static ClickInfo clickInfo = new ClickInfo();
	7446	+
	7447	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7448	+ Point outPt, Rectangle outRec)
7041	7449	{
7042		- int hc = info.bounds.x + info.bounds.width / 2;
7043		- int vc = info.bounds.y + info.bounds.height / 2;
7044		- double[][] toscreen = info.toScreen;
	7450	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7451	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7452	+ double[][] toscreen = clickInfo.toScreen;
7045	7453	if (toscreen == null)
7046	7454	{
7047		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7048	7456	}
7049	7457	cVector vec = in;
7050	7458	LA.xformPos(in, toscreen, in);
7051	7459	//System.out.println("Distance = " + info.camera.Distance());
7052		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7053		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7460	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7461	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7054	7462	outPt.x = hc + (int) vec.x;
7055	7463	outPt.y = vc - (int) vec.y;
7056	7464	outRec.x = outPt.x - 3;
..	..	@@ -7058,15 +7466,18 @@
7058	7466	outRec.width = outRec.height = 6;
7059	7467	}
7060	7468
7061		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7062	7471	{
7063	7472	Point pt = new Point(0, 0);
7064	7473	Rectangle rec = new Rectangle();
7065		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7066	7476	return rec;
7067	7477	}
7068	7478
7069		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7070	7481	{
7071	7482	if (level == 0)
7072	7483	{
..	..	@@ -7075,16 +7486,19 @@
7075	7486	{
7076	7487	cVector origin = new cVector();
7077	7488	//LA.xformPos(origin, toParent, origin);
7078		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7079	7493	Rectangle boundary = new Rectangle();
7080	7494	boundary.x = spot.x - 30;
7081	7495	boundary.y = spot.y - 30;
7082	7496	boundary.width = spot.width + 60;
7083	7497	boundary.height = spot.height + 60;
7084		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7085	7499	int spotw = spot.x + spot.width;
7086	7500	int spoth = spot.y + spot.height;
7087		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7088	7502	// if (CameraPane.Xmin > spot.x)
7089	7503	// {
7090	7504	// CameraPane.Xmin = spot.x;
..	..	@@ -7101,11 +7515,6 @@
7101	7515	// {
7102	7516	// CameraPane.Ymax = spoth;
7103	7517	// }
7104		- spot.translate(32, 32);
7105		- spotw = spot.x + spot.width;
7106		- spoth = spot.y + spot.height;
7107		- info.g.setColor(Color.cyan);
7108		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7109	7518	// if (CameraPane.Xmin > spot.x)
7110	7519	// {
7111	7520	// CameraPane.Xmin = spot.x;
..	..	@@ -7124,10 +7533,15 @@
7124	7533	// }
7125	7534	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7126	7535	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7127		- spot.translate(0, -32);
7128		- info.g.setColor(Color.yellow);
7129		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7130		- info.g.setColor(Color.green);
	7536	+ spot.translate(32, 0);
	7537	+ clickInfo.g.setColor(Color.yellow);
	7538	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7539	+
	7540	+ spot.translate(32, 64);
	7541	+ spotw = spot.x + spot.width;
	7542	+ spoth = spot.y + spot.height;
	7543	+ clickInfo.g.setColor(Color.cyan);
	7544	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7131	7545	// if (CameraPane.Xmin > spot.x)
7132	7546	// {
7133	7547	// CameraPane.Xmin = spot.x;
..	..	@@ -7144,8 +7558,9 @@
7144	7558	// {
7145	7559	// CameraPane.Ymax = spoth;
7146	7560	// }
7147		- info.g.drawArc(boundary.x, boundary.y,
7148		- boundary.width, boundary.height, 0, 360);
	7561	+ clickInfo.g.setColor(Color.green);
	7562	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7563	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7149	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150	7565	// if (CameraPane.Xmin > boundary.x)
7151	7566	// {
..	..	@@ -7167,7 +7582,8 @@
7167	7582	}
7168	7583	}
7169	7584
7170		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7171	7587	{
7172	7588	if (level == 0)
7173	7589	{
..	..	@@ -7176,8 +7592,8 @@
7176	7592
7177	7593	boolean retval = false;
7178	7594
7179		- startX = info.x;
7180		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7181	7597
7182	7598	hitSomething = -1;
7183	7599	cVector origin = new cVector();
..	..	@@ -7187,22 +7603,53 @@
7187	7603	{
7188	7604	centerPt = new Point(0, 0);
7189	7605	}
7190		- calcHotSpot(origin, info, centerPt, spot);
7191		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7192	7609	{
7193	7610	hitSomething = hitCenter;
7194	7611	retval = true;
7195	7612	}
7196	7613	spot.translate(32, 0);
7197		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7198	7615	{
7199	7616	hitSomething = hitRotate;
7200	7617	retval = true;
7201	7618	}
7202	7619	spot.translate(0, 32);
7203		- if (spot.contains(info.x, info.y))
	7620	+ spot.translate(32, 0);
	7621	+ spot.translate(0, 32);
	7622	+ if (spot.contains(clickInfo.x, clickInfo.y))
7204	7623	{
7205	7624	hitSomething = hitScale;
	7625	+
	7626	+ double scale = 0.005f * clickInfo.camera.Distance();
	7627	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7628	+ double sign = 1;
	7629	+ if (hScale < 0)
	7630	+ {
	7631	+ sign = -1;
	7632	+ }
	7633	+ hScale = signMath.pow(signhScale, scale * 50);
	7634	+ if (hScale < 0.01)
	7635	+ {
	7636	+ //hScale = 0.01;
	7637	+ }
	7638	+
	7639	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7640	+ sign = 1;
	7641	+ if (vScale < 0)
	7642	+ {
	7643	+ sign = -1;
	7644	+ }
	7645	+ vScale = signMath.pow(signvScale, scale * 50);
	7646	+ if (vScale < 0.01)
	7647	+ {
	7648	+ //vScale = 0.01;
	7649	+ }
	7650	+
	7651	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7652	+
7206	7653	retval = true;
7207	7654	}
7208	7655
..	..	@@ -7212,7 +7659,7 @@
7212	7659	}
7213	7660
7214	7661	//System.out.println("info.modifiers = " + info.modifiers);
7215		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7216	7663	//System.out.println("modified = " + modified);
7217	7664	//new Exception().printStackTrace();
7218	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7240,7 +7687,8 @@
7240	7687	return true;
7241	7688	}
7242	7689
7243		- void doEditDrag0(ClickInfo info, boolean opposite)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7244	7692	{
7245	7693	if (hitSomething == 0)
7246	7694	{
..	..	@@ -7254,7 +7702,7 @@
7254	7702
7255	7703	//System.out.println("hitSomething = " + hitSomething);
7256	7704
7257		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
7258	7706
7259	7707	cVector xlate = new cVector();
7260	7708	//cVector xlate2 = new cVector();
..	..	@@ -7288,8 +7736,8 @@
7288	7736	toParent[3][i] = xlate.get(i);
7289	7737	LA.matInvert(toParent, fromParent);
7290	7738	*/
7291		- cVector delta = LA.newVector(0, 0, startY - info.y);
7292		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7739	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7740	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7293	7741
7294	7742	LA.matCopy(startMat, toParent);
7295	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7298,7 +7746,7 @@
7298	7746	} else
7299	7747	{
7300	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7301		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7302	7750	cVector away = new cVector();
7303	7751	//cVector right2 = new cVector();
7304	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7315,19 +7763,19 @@
7315	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7316	7764	// if (!CameraPane.LOCALTRANSFORM)
7317	7765	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7318		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7319	7767	// if (!CameraPane.LOCALTRANSFORM)
7320	7768	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7321	7769	//LA.vecCross(up, cVector.Z, right2);
7322	7770
7323		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7324	7772
7325	7773	//System.out.println("DELTA0 = " + delta);
7326	7774	//System.out.println("AWAY = " + info.camera.away);
7327	7775	//System.out.println("UP = " + info.camera.up);
7328	7776	if (away.z > 0)
7329	7777	{
7330		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7331	7779	{
7332	7780	delta.x = -delta.x;
7333	7781	} else
..	..	@@ -7342,7 +7790,7 @@
7342	7790	//System.out.println("DELTA1 = " + delta);
7343	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7344	7792	//System.out.println("DELTA2 = " + delta);
7345		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7346	7794	LA.matCopy(startMat, toParent);
7347	7795	//System.out.println("DELTA3 = " + delta);
7348	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7352,8 +7800,8 @@
7352	7800	break;
7353	7801
7354	7802	case hitRotate: // rotate
7355		- int dx = info.x - centerPt.x;
7356		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7357	7805	double angle = (double) Math.atan2(dx, dy);
7358	7806	angle = -(1.570796 - angle);
7359	7807
..	..	@@ -7376,7 +7824,7 @@
7376	7824	}
7377	7825	/**/
7378	7826
7379		- switch (info.pane.RenderCamera().viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7380	7828	{
7381	7829	case 1: // '\001'
7382	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7403,7 +7851,7 @@
7403	7851	break;
7404	7852
7405	7853	case hitScale: // scale
7406		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7407	7855	double sign = 1;
7408	7856	if (hScale < 0)
7409	7857	{
..	..	@@ -7415,7 +7863,7 @@
7415	7863	//hScale = 0.01;
7416	7864	}
7417	7865
7418		- double vScale = (double) (info.y - centerPt.y) / 32;
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7419	7867	sign = 1;
7420	7868	if (vScale < 0)
7421	7869	{
..	..	@@ -7426,6 +7874,7 @@
7426	7874	{
7427	7875	//vScale = 0.01;
7428	7876	}
	7877	+
7429	7878	LA.matCopy(startMat, toParent);
7430	7879	/**/
7431	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7435,33 +7884,39 @@
7435	7884	}
7436	7885	/**/
7437	7886
7438		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7439	7888
7440	7889	if (totalScale < 0.01)
7441	7890	{
7442	7891	totalScale = 0.01;
7443	7892	}
7444	7893
7445		- switch (info.pane.RenderCamera().viewCode)
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7446	7895	{
7447	7896	case 3: // '\001'
7448	7897	if (modified \|\| opposite)
7449	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7450	7902	//LA.matScale(toParent, 1, hScale, vScale);
7451		- LA.matScale(toParent, totalScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7452	7904	} // vScale, 1);
7453	7905	else
7454	7906	{
7455	7907	// EXCEPTION!
7456		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7457	7909	} // vScale, 1);
7458	7910	break;
7459	7911
7460	7912	case 2: // '\002'
7461	7913	if (modified \|\| opposite)
7462	7914	{
7463		- //LA.matScale(toParent, hScale, 1, vScale);
7464		- LA.matScale(toParent, 1, totalScale, 1);
	7915	+ if (modified && opposite)
	7916	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7917	+ else
	7918	+ //LA.matScale(toParent, hScale, 1, vScale);
	7919	+ LA.matScale(toParent, 1, totalScale, 1);
7465	7920	} else
7466	7921	{
7467	7922	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7471,8 +7926,11 @@
7471	7926	case 1: // '\003'
7472	7927	if (modified \|\| opposite)
7473	7928	{
7474		- //LA.matScale(toParent, hScale, vScale, 1);
7475		- LA.matScale(toParent, 1, 1, totalScale);
	7929	+ if (modified && opposite)
	7930	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7931	+ else
	7932	+ //LA.matScale(toParent, hScale, vScale, 1);
	7933	+ LA.matScale(toParent, 1, 1, totalScale);
7476	7934	} else
7477	7935	{
7478	7936	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7509,7 +7967,7 @@
7509	7967	} // NEW ...
7510	7968
7511	7969
7512		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7513	7971	}
7514	7972
7515	7973	boolean overflow = false;
..	..	@@ -7689,6 +8147,10 @@
7689	8147	editWindow = null;
7690	8148	} // ?
7691	8149	}
	8150	+ else
	8151	+ {
	8152	+ //editWindow.closeUI();
	8153	+ }
7692	8154	}
7693	8155
7694	8156	boolean root; // patch for edit windows
..	..	@@ -7846,6 +8308,10 @@
7846	8308	}
7847	8309
7848	8310	transient ObjEditor editWindow;
	8311	+ transient ObjEditor manipWindow;
	8312	+
	8313	+ transient boolean pinned;
	8314	+
7849	8315	transient ObjectUI objectUI;
7850	8316	public static int povDepth = 0;
7851	8317	private static cVector tbMin = new cVector();