~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,12 +22,21 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
30	31	//
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
31	40
32	41	ScriptNode scriptnode;
33	42
..	..	@@ -170,24 +179,35 @@
170	179
171	180	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	181	{
	182	+ Object3D o;
	183	+
173	184	if (hashtable.containsKey(GetUUID()))
174	185	{
175		- Object3D o = hashtable.get(GetUUID());
	186	+ o = hashtable.get(GetUUID());
176	187
177	188	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
180	197
181		- return;
	198	+ hashtable.put(GetUUID(), o);
182	199	}
183	200
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	201	+ if (!blockloop)
189	202	{
190		- get(i).ExtractBigData(hashtable);
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
191	211	}
192	212
193	213	ExtractBigData(o);
..	..	@@ -195,11 +215,26 @@
195	215
196	216	void ExtractBigData(Object3D o)
197	217	{
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
198	221	o.bRep = this.bRep;
199		- if (this.bRep != null)
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
200	232	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
203	238	}
204	239
205	240	// o.support = this.support;
..	..	@@ -214,6 +249,73 @@
214	249	// this.fileparent = null;
215	250	}
216	251
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
	294	+ blockloop = false;
	295	+ }
	296	+
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
	301	+
	302	+ blockloop = true;
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
217	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	320	{
219	321	if (!hashtable.containsKey(GetUUID()))
..	..	@@ -223,19 +325,35 @@
223	325
224	326	RestoreBigData(o);
225	327
226		- hashtable.remove(GetUUID());
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
227	334
228	335	for (int i=0; i<Size(); i++)
229	336	{
230	337	get(i).RestoreBigData(hashtable);
231	338	}
	339	+
	340	+ blockloop = false;
232	341	}
233	342
234	343	void RestoreBigData(Object3D o)
235	344	{
236	345	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
239	357	// this.support = o.support;
240	358	// this.fileparent = o.fileparent;
241	359	}
..	..	@@ -381,6 +499,7 @@
381	499	}
382	500
383	501	boolean live = false;
	502	+ transient boolean keepdontselect;
384	503	boolean dontselect = false;
385	504	boolean hide = false;
386	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -568,7 +687,7 @@
568	687	{
569	688	if (maxcount != 1)
570	689	{
571		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
572	691	}
573	692
574	693	toParentMarked = LA.newMatrix();
..	..	@@ -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
..	..	@@ -2244,11 +2369,6 @@
2244	2369
2245	2370	InitOthers();
2246	2371
2247		- if (this instanceof Camera)
2248		- {
2249		- material.shift = 90;
2250		- }
2251		-
2252	2372	material.multiply = multiply;
2253	2373
2254	2374	if (multiply)
..	..	@@ -2386,6 +2506,15 @@
2386	2506	}
2387	2507	*/
2388	2508	}
	2509	+ else
	2510	+ {
	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");
	2517	+ }
2389	2518	}
2390	2519
2391	2520	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2427,6 +2556,14 @@
2427	2556	{
2428	2557	editWindow.refreshContents();
2429	2558	}
	2559	+ else
	2560	+ {
	2561	+ if (manipWindow != null)
	2562	+ {
	2563	+ manipWindow.refreshContents();
	2564	+ }
	2565	+ }
	2566	+
2430	2567	//if (parent != null)
2431	2568	//parent.refreshEditWindow();
2432	2569	}
..	..	@@ -2506,7 +2643,8 @@
2506	2643	private static final int editSelf = 1;
2507	2644	private static final int editChild = 2;
2508	2645
2509		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2510	2648	{
2511	2649	if (level == 0)
2512	2650	{
..	..	@@ -2514,7 +2652,8 @@
2514	2652	return;
2515	2653
2516	2654	Object3D selectee;
2517		- 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))
2518	2657	{
2519	2658	selectee = (Object3D) e.nextElement();
2520	2659	}
..	..	@@ -2522,19 +2661,22 @@
2522	2661	} else
2523	2662	{
2524	2663	//super.
2525		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2526	2666	}
2527	2667	}
2528	2668
2529		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2530	2671	{
2531	2672	doSomething = 0;
2532	2673	if (level == 0)
2533	2674	{
2534		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2535	2676	}
2536	2677	if (//super.
2537		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2538	2680	{
2539	2681	doSomething = 1;
2540	2682	return true;
..	..	@@ -2544,7 +2686,7 @@
2544	2686	}
2545	2687	}
2546	2688
2547		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2548	2690	{
2549	2691	if (selection == null)
2550	2692	{
..	..	@@ -2557,7 +2699,8 @@
2557	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2558	2700	{
2559	2701	Object3D selectee = (Object3D) e.nextElement();
2560		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2561	2704	{
2562	2705	childToDrag = selectee;
2563	2706	doSomething = 2;
..	..	@@ -2569,13 +2712,15 @@
2569	2712	return retval;
2570	2713	}
2571	2714
2572		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2573	2717	{
2574	2718	switch (doSomething)
2575	2719	{
2576	2720	case 1: // '\001'
2577	2721	//super.
2578		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2579	2724	break;
2580	2725
2581	2726	case 2: // '\002'
..	..	@@ -2588,11 +2733,13 @@
2588	2733	{
2589	2734	//sel.hitSomething = childToDrag.hitSomething;
2590	2735	//childToDrag.doEditDrag(info);
2591		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2592	2738	} else
2593	2739	{
2594	2740	//super.
2595		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2596	2743	}
2597	2744	}
2598	2745	break;
..	..	@@ -2610,6 +2757,9 @@
2610	2757	{
2611	2758	deselectAll();
2612	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2613	2763	ClickInfo newInfo = new ClickInfo();
2614	2764	newInfo.flags = info.flags;
2615	2765	newInfo.bounds = info.bounds;
..	..	@@ -3057,7 +3207,7 @@
3057	3207	{
3058	3208	if (bRep != null)
3059	3209	{
3060		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3061	3211	Touch();
3062	3212	}
3063	3213	}
..	..	@@ -3467,15 +3617,47 @@
3467	3617
3468	3618	void ClearMaterials()
3469	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3470	3625	ClearMaterial();
3471		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3472	3627	{
3473		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3474	3629	if (child == null)
3475	3630	continue;
3476	3631	child.ClearMaterials();
3477		- release(i);
3478	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;
3479	3661	}
3480	3662
3481	3663	void FlipV(boolean flip)
..	..	@@ -3503,7 +3685,8 @@
3503	3685	if (blockloop)
3504	3686	return;
3505	3687
3506		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3688	+ if (//marked \|\| // does not make sense
	3689	+ (bRep != null \|\| material != null)) // borderline...
3507	3690	live = h;
3508	3691
3509	3692	for (int i = 0; i < Size(); i++)
..	..	@@ -3524,7 +3707,8 @@
3524	3707	return;
3525	3708
3526	3709	//if (bRep != null)
3527		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3710	+ if (//marked \|\| // does not make sense
	3711	+ (bRep != null \|\| material != null)) // borderline...
3528	3712	link2master = h;
3529	3713
3530	3714	for (int i = 0; i < Size(); i++)
..	..	@@ -3544,7 +3728,8 @@
3544	3728	if (blockloop)
3545	3729	return;
3546	3730
3547		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3731	+ if (//marked \|\| // does not make sense
	3732	+ (bRep != null \|\| material != null)) // borderline...
3548	3733	hide = h;
3549	3734
3550	3735	for (int i = 0; i < Size(); i++)
..	..	@@ -3564,7 +3749,7 @@
3564	3749	if (blockloop)
3565	3750	return;
3566	3751
3567		- if (bRep != null && material != null) // borderline...
	3752	+ if (bRep != null \|\| material != null) // borderline...
3568	3753	marked = h;
3569	3754
3570	3755	for (int i = 0; i < Size(); i++)
..	..	@@ -3574,6 +3759,46 @@
3574	3759	continue;
3575	3760	blockloop = true;
3576	3761	child.MarkLeaves(h);
	3762	+ blockloop = false;
	3763	+ // release(i);
	3764	+ }
	3765	+ }
	3766	+
	3767	+ void RewindLeaves(boolean h)
	3768	+ {
	3769	+ if (blockloop)
	3770	+ return;
	3771	+
	3772	+ if (bRep != null \|\| material != null) // borderline...
	3773	+ rewind = h;
	3774	+
	3775	+ for (int i = 0; i < Size(); i++)
	3776	+ {
	3777	+ Object3D child = (Object3D) get(i); // reserve(i);
	3778	+ if (child == null)
	3779	+ continue;
	3780	+ blockloop = true;
	3781	+ child.RewindLeaves(h);
	3782	+ blockloop = false;
	3783	+ // release(i);
	3784	+ }
	3785	+ }
	3786	+
	3787	+ void RandomLeaves(boolean h)
	3788	+ {
	3789	+ if (blockloop)
	3790	+ return;
	3791	+
	3792	+ if (bRep != null \|\| material != null) // borderline...
	3793	+ random = h;
	3794	+
	3795	+ for (int i = 0; i < Size(); i++)
	3796	+ {
	3797	+ Object3D child = (Object3D) get(i); // reserve(i);
	3798	+ if (child == null)
	3799	+ continue;
	3800	+ blockloop = true;
	3801	+ child.RandomLeaves(h);
3577	3802	blockloop = false;
3578	3803	// release(i);
3579	3804	}
..	..	@@ -4351,6 +4576,55 @@
4351	4576	}
4352	4577	}
4353	4578
	4579	+ void RepairSOV()
	4580	+ {
	4581	+ if (blockloop)
	4582	+ return;
	4583	+
	4584	+ String texname = this.GetPigmentTexture();
	4585	+
	4586	+ if (texname.startsWith("sov"))
	4587	+ {
	4588	+ String[] s = texname.split("/");
	4589	+
	4590	+ String[] sname = s[1].split("Color.pn");
	4591	+
	4592	+ texname = sname[0];
	4593	+
	4594	+ if (sname.length > 1)
	4595	+ {
	4596	+ texname += "Color.jpg";
	4597	+ }
	4598	+
	4599	+ this.SetPigmentTexture("sov/" + texname);
	4600	+ }
	4601	+
	4602	+ texname = this.GetBumpTexture();
	4603	+
	4604	+ if (texname.startsWith("sov"))
	4605	+ {
	4606	+ String[] s = texname.split("/");
	4607	+
	4608	+ String[] sname = s[1].split("Bump.pn");
	4609	+
	4610	+ texname = sname[0];
	4611	+
	4612	+ if (sname.length > 1)
	4613	+ {
	4614	+ texname += "Bump.jpg";
	4615	+ }
	4616	+
	4617	+ this.SetBumpTexture("sov/" + texname);
	4618	+ }
	4619	+
	4620	+ for (int i=0; i<Size(); i++)
	4621	+ {
	4622	+ blockloop = true;
	4623	+ get(i).RepairSOV();
	4624	+ blockloop = false;
	4625	+ }
	4626	+ }
	4627	+
4354	4628	void RepairTexture()
4355	4629	{
4356	4630	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4865,6 +5139,14 @@
4865	5139	}
4866	5140	}
4867	5141
	5142	+ ObjEditor GetWindow()
	5143	+ {
	5144	+ if (editWindow != null)
	5145	+ return editWindow;
	5146	+
	5147	+ return manipWindow;
	5148	+ }
	5149	+
4868	5150	cTreePath Select(int indexcount, boolean deselect)
4869	5151	{
4870	5152	if (hide \|\| dontselect)
..	..	@@ -4901,10 +5183,11 @@
4901	5183	if (leaf != null)
4902	5184	{
4903	5185	cTreePath tp = new cTreePath(this, leaf);
4904		- if (editWindow != null)
	5186	+ ObjEditor window = GetWindow();
	5187	+ if (window != null)
4905	5188	{
4906	5189	//System.out.println("editWindow = " + editWindow + " vs " + this);
4907		- editWindow.Select(tp, deselect, true);
	5190	+ window.Select(tp, deselect, true);
4908	5191	}
4909	5192
4910	5193	return tp;
..	..	@@ -4921,6 +5204,7 @@
4921	5204
4922	5205	if (child == null)
4923	5206	continue;
	5207	+
4924	5208	if (child.HasTransparency() && child.size() != 0)
4925	5209	{
4926	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4930,9 +5214,10 @@
4930	5214	if (leaf != null)
4931	5215	{
4932	5216	cTreePath tp = new cTreePath(this, leaf);
4933		- if (editWindow != null)
	5217	+ ObjEditor window = GetWindow();
	5218	+ if (window != null)
4934	5219	{
4935		- editWindow.Select(tp, deselect, true);
	5220	+ window.Select(tp, deselect, true);
4936	5221	}
4937	5222
4938	5223	return tp;
..	..	@@ -5257,6 +5542,51 @@
5257	5542	blockloop = false;
5258	5543	}
5259	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	+
5260	5590	boolean IsSelected()
5261	5591	{
5262	5592	if (parent == null)
..	..	@@ -5317,6 +5647,11 @@
5317	5647	if (fullname == null)
5318	5648	return "";
5319	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5320	5655	// System.out.println("Fullname = " + fullname);
5321	5656
5322	5657	// Does not work on Windows due to C:
..	..	@@ -5329,7 +5664,7 @@
5329	5664
5330	5665	if (split.length == 0)
5331	5666	{
5332		- return "";
	5667	+ return fullname.pigment = "";
5333	5668	}
5334	5669
5335	5670	if (split.length <= 2)
..	..	@@ -5337,22 +5672,27 @@
5337	5672	if (fullname.name.endsWith(":"))
5338	5673	{
5339	5674	// Windows
5340		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5341	5676	}
5342	5677
5343		- return split[0];
	5678	+ return fullname.pigment = split[0];
5344	5679	}
5345	5680
5346	5681	// Windows
5347	5682	assert(split.length == 4);
5348	5683
5349		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5350	5685	}
5351	5686
5352	5687	static String GetBump(cTexture fullname)
5353	5688	{
5354	5689	if (fullname == null)
5355	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5356	5696
5357	5697	// System.out.println("Fullname = " + fullname);
5358	5698	// Does not work on Windows due to C:
..	..	@@ -5364,12 +5704,12 @@
5364	5704
5365	5705	if (split.length == 0)
5366	5706	{
5367		- return "";
	5707	+ return fullname.bump = "";
5368	5708	}
5369	5709
5370	5710	if (split.length == 1)
5371	5711	{
5372		- return "";
	5712	+ return fullname.bump = "";
5373	5713	}
5374	5714
5375	5715	if (split.length == 2)
..	..	@@ -5377,16 +5717,16 @@
5377	5717	if (fullname.name.endsWith(":"))
5378	5718	{
5379	5719	// Windows
5380		- return "";
	5720	+ return fullname.bump = "";
5381	5721	}
5382	5722
5383		- return split[1];
	5723	+ return fullname.bump = split[1];
5384	5724	}
5385	5725
5386	5726	// Windows
5387	5727	assert(split.length == 4);
5388	5728
5389		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5390	5730	}
5391	5731
5392	5732	String GetPigmentTexture()
..	..	@@ -5469,6 +5809,9 @@
5469	5809	texname = "";
5470	5810
5471	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5472	5815	Touch();
5473	5816	}
5474	5817
..	..	@@ -5542,6 +5885,8 @@
5542	5885
5543	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5544	5887
	5888	+ GetTextures().bump = null;
	5889	+
5545	5890	Touch();
5546	5891	}
5547	5892
..	..	@@ -5562,6 +5907,38 @@
5562	5907
5563	5908	blockloop = true;
5564	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);
5565	5942	blockloop = false;
5566	5943	}
5567	5944	}
..	..	@@ -5652,8 +6029,10 @@
5652	6029	if (support != null)
5653	6030	support = support;
5654	6031
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);
	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.
5657	6036
5658	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659	6038	{
..	..	@@ -5663,8 +6042,9 @@
5663	6042	// usecalllists &= !(parent instanceof RandomNode);
5664	6043	// usecalllists = false;
5665	6044
5666		- if (GetBRep() != null)
5667		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5668	6048	//System.out.println("draw " + this);
5669	6049	//new Exception().printStackTrace();
5670	6050
..	..	@@ -5674,7 +6054,7 @@
5674	6054
5675	6055	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676	6056	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5677		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	6057	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5678	6058	{
5679	6059	Globals.lighttouched = true;
5680	6060	} // all panes...
..	..	@@ -5686,7 +6066,7 @@
5686	6066	if (!(this instanceof Composite))
5687	6067	touched = false;
5688	6068	//if (displaylist == -1 && usecalllists)
5689		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5690	6070	{
5691	6071	bRep.displaylist = display.GenList();
5692	6072	assert(bRep.displaylist != 0);
..	..	@@ -5697,7 +6077,7 @@
5697	6077
5698	6078	//System.out.println("\tnew list " + list);
5699	6079	//gl.glDrawBuffer(gl.GL_NONE);
5700		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5701	6081	{
5702	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5703	6083	display.NewList(bRep.displaylist);
..	..	@@ -5706,7 +6086,7 @@
5706	6086	CallList(display, root, selected, blocked);
5707	6087
5708	6088	// compiled = true;
5709		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5710	6090	{
5711	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5712	6092	display.EndList();
..	..	@@ -5806,6 +6186,7 @@
5806	6186	if (GetBRep() != null)
5807	6187	{
5808	6188	display.NextIndex();
	6189	+
5809	6190	// vertex color conflict : gl.glCallList(list);
5810	6191	DrawNode(display, root, selected);
5811	6192	if (this instanceof BezierPatch)
..	..	@@ -5846,16 +6227,27 @@
5846	6227	tex = GetTextures();
5847	6228	}
5848	6229
5849		- boolean failed = false;
	6230	+ boolean failedPigment = false;
	6231	+ boolean failedBump = false;
5850	6232
5851	6233	try
5852	6234	{
5853		- display.BindTextures(tex, texres);
	6235	+ display.BindPigmentTexture(tex, texres);
5854	6236	}
5855	6237	catch (Exception e)
5856	6238	{
5857	6239	System.err.println("FAILED: " + this);
5858		- failed = true;
	6240	+ failedPigment = true;
	6241	+ }
	6242	+
	6243	+ try
	6244	+ {
	6245	+ display.BindBumpTexture(tex, texres);
	6246	+ }
	6247	+ catch (Exception e)
	6248	+ {
	6249	+ //System.err.println("FAILED: " + this);
	6250	+ failedBump = true;
5859	6251	}
5860	6252
5861	6253	if (!compiled)
..	..	@@ -5878,8 +6270,11 @@
5878	6270	}
5879	6271	}
5880	6272
5881		- if (!failed)
5882		- display.ReleaseTextures(tex);
	6273	+ if (!failedBump)
	6274	+ display.ReleaseBumpTexture(tex);
	6275	+
	6276	+ if (!failedPigment)
	6277	+ display.ReleasePigmentTexture(tex);
5883	6278
5884	6279	display.PopMaterial(this, selected);
5885	6280	}
..	..	@@ -6252,6 +6647,11 @@
6252	6647	// dec 2012
6253	6648	new Exception().printStackTrace();
6254	6649	return;
	6650	+ }
	6651	+
	6652	+ if (dontselect)
	6653	+ {
	6654	+ //bRep.GenerateNormalsMINE();
6255	6655	}
6256	6656
6257	6657	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7037,20 +7437,23 @@
7037	7437	}
7038	7438	}
7039	7439
7040		- 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)
7041	7444	{
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;
	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;
7045	7448	if (toscreen == null)
7046	7449	{
7047		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7048	7451	}
7049	7452	cVector vec = in;
7050	7453	LA.xformPos(in, toscreen, in);
7051	7454	//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();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7054	7457	outPt.x = hc + (int) vec.x;
7055	7458	outPt.y = vc - (int) vec.y;
7056	7459	outRec.x = outPt.x - 3;
..	..	@@ -7058,15 +7461,18 @@
7058	7461	outRec.width = outRec.height = 6;
7059	7462	}
7060	7463
7061		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7062	7466	{
7063	7467	Point pt = new Point(0, 0);
7064	7468	Rectangle rec = new Rectangle();
7065		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7066	7471	return rec;
7067	7472	}
7068	7473
7069		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7070	7476	{
7071	7477	if (level == 0)
7072	7478	{
..	..	@@ -7075,16 +7481,19 @@
7075	7481	{
7076	7482	cVector origin = new cVector();
7077	7483	//LA.xformPos(origin, toParent, origin);
7078		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7079	7488	Rectangle boundary = new Rectangle();
7080	7489	boundary.x = spot.x - 30;
7081	7490	boundary.y = spot.y - 30;
7082	7491	boundary.width = spot.width + 60;
7083	7492	boundary.height = spot.height + 60;
7084		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7085	7494	int spotw = spot.x + spot.width;
7086	7495	int spoth = spot.y + spot.height;
7087		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7088	7497	// if (CameraPane.Xmin > spot.x)
7089	7498	// {
7090	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7101,11 +7510,6 @@
7101	7510	// {
7102	7511	// CameraPane.Ymax = spoth;
7103	7512	// }
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	7513	// if (CameraPane.Xmin > spot.x)
7110	7514	// {
7111	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7124,10 +7528,15 @@
7124	7528	// }
7125	7529	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7126	7530	//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);
	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);
7131	7540	// if (CameraPane.Xmin > spot.x)
7132	7541	// {
7133	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7144,8 +7553,9 @@
7144	7553	// {
7145	7554	// CameraPane.Ymax = spoth;
7146	7555	// }
7147		- info.g.drawArc(boundary.x, boundary.y,
7148		- 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);
7149	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7150	7560	// if (CameraPane.Xmin > boundary.x)
7151	7561	// {
..	..	@@ -7167,7 +7577,8 @@
7167	7577	}
7168	7578	}
7169	7579
7170		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7171	7582	{
7172	7583	if (level == 0)
7173	7584	{
..	..	@@ -7176,8 +7587,8 @@
7176	7587
7177	7588	boolean retval = false;
7178	7589
7179		- startX = info.x;
7180		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7181	7592
7182	7593	hitSomething = -1;
7183	7594	cVector origin = new cVector();
..	..	@@ -7187,22 +7598,53 @@
7187	7598	{
7188	7599	centerPt = new Point(0, 0);
7189	7600	}
7190		- calcHotSpot(origin, info, centerPt, spot);
7191		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7192	7604	{
7193	7605	hitSomething = hitCenter;
7194	7606	retval = true;
7195	7607	}
7196	7608	spot.translate(32, 0);
7197		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7198	7610	{
7199	7611	hitSomething = hitRotate;
7200	7612	retval = true;
7201	7613	}
7202	7614	spot.translate(0, 32);
7203		- 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))
7204	7618	{
7205	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	+
7206	7648	retval = true;
7207	7649	}
7208	7650
..	..	@@ -7212,7 +7654,7 @@
7212	7654	}
7213	7655
7214	7656	//System.out.println("info.modifiers = " + info.modifiers);
7215		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7216	7658	//System.out.println("modified = " + modified);
7217	7659	//new Exception().printStackTrace();
7218	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7240,7 +7682,8 @@
7240	7682	return true;
7241	7683	}
7242	7684
7243		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7244	7687	{
7245	7688	if (hitSomething == 0)
7246	7689	{
..	..	@@ -7254,7 +7697,7 @@
7254	7697
7255	7698	//System.out.println("hitSomething = " + hitSomething);
7256	7699
7257		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7258	7701
7259	7702	cVector xlate = new cVector();
7260	7703	//cVector xlate2 = new cVector();
..	..	@@ -7268,7 +7711,9 @@
7268	7711
7269	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7270	7713
7271		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7272	7717	{
7273	7718	//assert(false);
7274	7719	/*
..	..	@@ -7288,8 +7733,8 @@
7288	7733	toParent[3][i] = xlate.get(i);
7289	7734	LA.matInvert(toParent, fromParent);
7290	7735	*/
7291		- cVector delta = LA.newVector(0, 0, startY - info.y);
7292		- 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);
7293	7738
7294	7739	LA.matCopy(startMat, toParent);
7295	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7298,7 +7743,7 @@
7298	7743	} else
7299	7744	{
7300	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7301		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7302	7747	cVector away = new cVector();
7303	7748	//cVector right2 = new cVector();
7304	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7315,19 +7760,19 @@
7315	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7316	7761	// if (!CameraPane.LOCALTRANSFORM)
7317	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7318		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7319	7764	// if (!CameraPane.LOCALTRANSFORM)
7320	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7321	7766	//LA.vecCross(up, cVector.Z, right2);
7322	7767
7323		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7324	7769
7325	7770	//System.out.println("DELTA0 = " + delta);
7326	7771	//System.out.println("AWAY = " + info.camera.away);
7327	7772	//System.out.println("UP = " + info.camera.up);
7328	7773	if (away.z > 0)
7329	7774	{
7330		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7331	7776	{
7332	7777	delta.x = -delta.x;
7333	7778	} else
..	..	@@ -7342,7 +7787,7 @@
7342	7787	//System.out.println("DELTA1 = " + delta);
7343	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7344	7789	//System.out.println("DELTA2 = " + delta);
7345		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7346	7791	LA.matCopy(startMat, toParent);
7347	7792	//System.out.println("DELTA3 = " + delta);
7348	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7352,8 +7797,8 @@
7352	7797	break;
7353	7798
7354	7799	case hitRotate: // rotate
7355		- int dx = info.x - centerPt.x;
7356		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7357	7802	double angle = (double) Math.atan2(dx, dy);
7358	7803	angle = -(1.570796 - angle);
7359	7804
..	..	@@ -7362,7 +7807,7 @@
7362	7807
7363	7808	if (modified)
7364	7809	{
7365		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7366	7811	angle /= (Math.PI / 4);
7367	7812	angle = Math.floor(angle + 0.5);
7368	7813	angle *= (Math.PI / 4);
..	..	@@ -7376,7 +7821,7 @@
7376	7821	}
7377	7822	/**/
7378	7823
7379		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7380	7825	{
7381	7826	case 1: // '\001'
7382	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7403,7 +7848,7 @@
7403	7848	break;
7404	7849
7405	7850	case hitScale: // scale
7406		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7407	7852	double sign = 1;
7408	7853	if (hScale < 0)
7409	7854	{
..	..	@@ -7415,7 +7860,7 @@
7415	7860	//hScale = 0.01;
7416	7861	}
7417	7862
7418		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7419	7864	sign = 1;
7420	7865	if (vScale < 0)
7421	7866	{
..	..	@@ -7426,6 +7871,7 @@
7426	7871	{
7427	7872	//vScale = 0.01;
7428	7873	}
	7874	+
7429	7875	LA.matCopy(startMat, toParent);
7430	7876	/**/
7431	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7435,33 +7881,39 @@
7435	7881	}
7436	7882	/**/
7437	7883
7438		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7439	7885
7440	7886	if (totalScale < 0.01)
7441	7887	{
7442	7888	totalScale = 0.01;
7443	7889	}
7444	7890
7445		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7446	7892	{
7447	7893	case 3: // '\001'
7448	7894	if (modified \|\| opposite)
7449	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7450	7899	//LA.matScale(toParent, 1, hScale, vScale);
7451		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7452	7901	} // vScale, 1);
7453	7902	else
7454	7903	{
7455	7904	// EXCEPTION!
7456		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7457	7906	} // vScale, 1);
7458	7907	break;
7459	7908
7460	7909	case 2: // '\002'
7461	7910	if (modified \|\| opposite)
7462	7911	{
7463		- //LA.matScale(toParent, hScale, 1, vScale);
7464		- 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);
7465	7917	} else
7466	7918	{
7467	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7471,8 +7923,11 @@
7471	7923	case 1: // '\003'
7472	7924	if (modified \|\| opposite)
7473	7925	{
7474		- //LA.matScale(toParent, hScale, vScale, 1);
7475		- 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);
7476	7931	} else
7477	7932	{
7478	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7509,7 +7964,7 @@
7509	7964	} // NEW ...
7510	7965
7511	7966
7512		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7513	7968	}
7514	7969
7515	7970	boolean overflow = false;
..	..	@@ -7689,6 +8144,10 @@
7689	8144	editWindow = null;
7690	8145	} // ?
7691	8146	}
	8147	+ else
	8148	+ {
	8149	+ //editWindow.closeUI();
	8150	+ }
7692	8151	}
7693	8152
7694	8153	boolean root; // patch for edit windows
..	..	@@ -7846,6 +8305,10 @@
7846	8305	}
7847	8306
7848	8307	transient ObjEditor editWindow;
	8308	+ transient ObjEditor manipWindow;
	8309	+
	8310	+ transient boolean pinned;
	8311	+
7849	8312	transient ObjectUI objectUI;
7850	8313	public static int povDepth = 0;
7851	8314	private static cVector tbMin = new cVector();