~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	}
..	..	@@ -3503,7 +3658,8 @@
3503	3658	if (blockloop)
3504	3659	return;
3505	3660
3506		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3661	+ if (//marked \|\| // does not make sense
	3662	+ (bRep != null \|\| material != null)) // borderline...
3507	3663	live = h;
3508	3664
3509	3665	for (int i = 0; i < Size(); i++)
..	..	@@ -3524,7 +3680,8 @@
3524	3680	return;
3525	3681
3526	3682	//if (bRep != null)
3527		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3683	+ if (//marked \|\| // does not make sense
	3684	+ (bRep != null \|\| material != null)) // borderline...
3528	3685	link2master = h;
3529	3686
3530	3687	for (int i = 0; i < Size(); i++)
..	..	@@ -3544,7 +3701,8 @@
3544	3701	if (blockloop)
3545	3702	return;
3546	3703
3547		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3704	+ if (//marked \|\| // does not make sense
	3705	+ (bRep != null \|\| material != null)) // borderline...
3548	3706	hide = h;
3549	3707
3550	3708	for (int i = 0; i < Size(); i++)
..	..	@@ -3564,7 +3722,7 @@
3564	3722	if (blockloop)
3565	3723	return;
3566	3724
3567		- if (bRep != null && material != null) // borderline...
	3725	+ if (bRep != null \|\| material != null) // borderline...
3568	3726	marked = h;
3569	3727
3570	3728	for (int i = 0; i < Size(); i++)
..	..	@@ -3574,6 +3732,46 @@
3574	3732	continue;
3575	3733	blockloop = true;
3576	3734	child.MarkLeaves(h);
	3735	+ blockloop = false;
	3736	+ // release(i);
	3737	+ }
	3738	+ }
	3739	+
	3740	+ void RewindLeaves(boolean h)
	3741	+ {
	3742	+ if (blockloop)
	3743	+ return;
	3744	+
	3745	+ if (bRep != null \|\| material != null) // borderline...
	3746	+ rewind = h;
	3747	+
	3748	+ for (int i = 0; i < Size(); i++)
	3749	+ {
	3750	+ Object3D child = (Object3D) get(i); // reserve(i);
	3751	+ if (child == null)
	3752	+ continue;
	3753	+ blockloop = true;
	3754	+ child.RewindLeaves(h);
	3755	+ blockloop = false;
	3756	+ // release(i);
	3757	+ }
	3758	+ }
	3759	+
	3760	+ void RandomLeaves(boolean h)
	3761	+ {
	3762	+ if (blockloop)
	3763	+ return;
	3764	+
	3765	+ if (bRep != null \|\| material != null) // borderline...
	3766	+ random = h;
	3767	+
	3768	+ for (int i = 0; i < Size(); i++)
	3769	+ {
	3770	+ Object3D child = (Object3D) get(i); // reserve(i);
	3771	+ if (child == null)
	3772	+ continue;
	3773	+ blockloop = true;
	3774	+ child.RandomLeaves(h);
3577	3775	blockloop = false;
3578	3776	// release(i);
3579	3777	}
..	..	@@ -4351,6 +4549,55 @@
4351	4549	}
4352	4550	}
4353	4551
	4552	+ void RepairSOV()
	4553	+ {
	4554	+ if (blockloop)
	4555	+ return;
	4556	+
	4557	+ String texname = this.GetPigmentTexture();
	4558	+
	4559	+ if (texname.startsWith("sov"))
	4560	+ {
	4561	+ String[] s = texname.split("/");
	4562	+
	4563	+ String[] sname = s[1].split("Color.pn");
	4564	+
	4565	+ texname = sname[0];
	4566	+
	4567	+ if (sname.length > 1)
	4568	+ {
	4569	+ texname += "Color.jpg";
	4570	+ }
	4571	+
	4572	+ this.SetPigmentTexture("sov/" + texname);
	4573	+ }
	4574	+
	4575	+ texname = this.GetBumpTexture();
	4576	+
	4577	+ if (texname.startsWith("sov"))
	4578	+ {
	4579	+ String[] s = texname.split("/");
	4580	+
	4581	+ String[] sname = s[1].split("Bump.pn");
	4582	+
	4583	+ texname = sname[0];
	4584	+
	4585	+ if (sname.length > 1)
	4586	+ {
	4587	+ texname += "Bump.jpg";
	4588	+ }
	4589	+
	4590	+ this.SetBumpTexture("sov/" + texname);
	4591	+ }
	4592	+
	4593	+ for (int i=0; i<Size(); i++)
	4594	+ {
	4595	+ blockloop = true;
	4596	+ get(i).RepairSOV();
	4597	+ blockloop = false;
	4598	+ }
	4599	+ }
	4600	+
4354	4601	void RepairTexture()
4355	4602	{
4356	4603	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4865,6 +5112,14 @@
4865	5112	}
4866	5113	}
4867	5114
	5115	+ ObjEditor GetWindow()
	5116	+ {
	5117	+ if (editWindow != null)
	5118	+ return editWindow;
	5119	+
	5120	+ return manipWindow;
	5121	+ }
	5122	+
4868	5123	cTreePath Select(int indexcount, boolean deselect)
4869	5124	{
4870	5125	if (hide \|\| dontselect)
..	..	@@ -4901,10 +5156,11 @@
4901	5156	if (leaf != null)
4902	5157	{
4903	5158	cTreePath tp = new cTreePath(this, leaf);
4904		- if (editWindow != null)
	5159	+ ObjEditor window = GetWindow();
	5160	+ if (window != null)
4905	5161	{
4906	5162	//System.out.println("editWindow = " + editWindow + " vs " + this);
4907		- editWindow.Select(tp, deselect, true);
	5163	+ window.Select(tp, deselect, true);
4908	5164	}
4909	5165
4910	5166	return tp;
..	..	@@ -4921,6 +5177,7 @@
4921	5177
4922	5178	if (child == null)
4923	5179	continue;
	5180	+
4924	5181	if (child.HasTransparency() && child.size() != 0)
4925	5182	{
4926	5183	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4930,9 +5187,10 @@
4930	5187	if (leaf != null)
4931	5188	{
4932	5189	cTreePath tp = new cTreePath(this, leaf);
4933		- if (editWindow != null)
	5190	+ ObjEditor window = GetWindow();
	5191	+ if (window != null)
4934	5192	{
4935		- editWindow.Select(tp, deselect, true);
	5193	+ window.Select(tp, deselect, true);
4936	5194	}
4937	5195
4938	5196	return tp;
..	..	@@ -5257,6 +5515,51 @@
5257	5515	blockloop = false;
5258	5516	}
5259	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5260	5563	boolean IsSelected()
5261	5564	{
5262	5565	if (parent == null)
..	..	@@ -5317,6 +5620,11 @@
5317	5620	if (fullname == null)
5318	5621	return "";
5319	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5320	5628	// System.out.println("Fullname = " + fullname);
5321	5629
5322	5630	// Does not work on Windows due to C:
..	..	@@ -5329,7 +5637,7 @@
5329	5637
5330	5638	if (split.length == 0)
5331	5639	{
5332		- return "";
	5640	+ return fullname.pigment = "";
5333	5641	}
5334	5642
5335	5643	if (split.length <= 2)
..	..	@@ -5337,22 +5645,27 @@
5337	5645	if (fullname.name.endsWith(":"))
5338	5646	{
5339	5647	// Windows
5340		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5341	5649	}
5342	5650
5343		- return split[0];
	5651	+ return fullname.pigment = split[0];
5344	5652	}
5345	5653
5346	5654	// Windows
5347	5655	assert(split.length == 4);
5348	5656
5349		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5350	5658	}
5351	5659
5352	5660	static String GetBump(cTexture fullname)
5353	5661	{
5354	5662	if (fullname == null)
5355	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5356	5669
5357	5670	// System.out.println("Fullname = " + fullname);
5358	5671	// Does not work on Windows due to C:
..	..	@@ -5364,12 +5677,12 @@
5364	5677
5365	5678	if (split.length == 0)
5366	5679	{
5367		- return "";
	5680	+ return fullname.bump = "";
5368	5681	}
5369	5682
5370	5683	if (split.length == 1)
5371	5684	{
5372		- return "";
	5685	+ return fullname.bump = "";
5373	5686	}
5374	5687
5375	5688	if (split.length == 2)
..	..	@@ -5377,16 +5690,16 @@
5377	5690	if (fullname.name.endsWith(":"))
5378	5691	{
5379	5692	// Windows
5380		- return "";
	5693	+ return fullname.bump = "";
5381	5694	}
5382	5695
5383		- return split[1];
	5696	+ return fullname.bump = split[1];
5384	5697	}
5385	5698
5386	5699	// Windows
5387	5700	assert(split.length == 4);
5388	5701
5389		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5390	5703	}
5391	5704
5392	5705	String GetPigmentTexture()
..	..	@@ -5469,6 +5782,9 @@
5469	5782	texname = "";
5470	5783
5471	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5472	5788	Touch();
5473	5789	}
5474	5790
..	..	@@ -5542,6 +5858,8 @@
5542	5858
5543	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5544	5860
	5861	+ GetTextures().bump = null;
	5862	+
5545	5863	Touch();
5546	5864	}
5547	5865
..	..	@@ -5562,6 +5880,38 @@
5562	5880
5563	5881	blockloop = true;
5564	5882	child.ResetBumpTexture();
	5883	+ blockloop = false;
	5884	+ }
	5885	+ }
	5886	+
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
5565	5915	blockloop = false;
5566	5916	}
5567	5917	}
..	..	@@ -5652,8 +6002,10 @@
5652	6002	if (support != null)
5653	6003	support = support;
5654	6004
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);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5657	6009
5658	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659	6011	{
..	..	@@ -5663,8 +6015,9 @@
5663	6015	// usecalllists &= !(parent instanceof RandomNode);
5664	6016	// usecalllists = false;
5665	6017
5666		- if (GetBRep() != null)
5667		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5668	6021	//System.out.println("draw " + this);
5669	6022	//new Exception().printStackTrace();
5670	6023
..	..	@@ -5673,10 +6026,12 @@
5673	6026	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5674	6027
5675	6028	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6029	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6030	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5677	6031	{
5678	6032	Globals.lighttouched = true;
5679	6033	} // all panes...
	6034	+
5680	6035	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5681	6036	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5682	6037	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5684,7 +6039,7 @@
5684	6039	if (!(this instanceof Composite))
5685	6040	touched = false;
5686	6041	//if (displaylist == -1 && usecalllists)
5687		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5688	6043	{
5689	6044	bRep.displaylist = display.GenList();
5690	6045	assert(bRep.displaylist != 0);
..	..	@@ -5695,7 +6050,7 @@
5695	6050
5696	6051	//System.out.println("\tnew list " + list);
5697	6052	//gl.glDrawBuffer(gl.GL_NONE);
5698		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5699	6054	{
5700	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5701	6056	display.NewList(bRep.displaylist);
..	..	@@ -5704,7 +6059,7 @@
5704	6059	CallList(display, root, selected, blocked);
5705	6060
5706	6061	// compiled = true;
5707		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5708	6063	{
5709	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5710	6065	display.EndList();
..	..	@@ -5804,6 +6159,7 @@
5804	6159	if (GetBRep() != null)
5805	6160	{
5806	6161	display.NextIndex();
	6162	+
5807	6163	// vertex color conflict : gl.glCallList(list);
5808	6164	DrawNode(display, root, selected);
5809	6165	if (this instanceof BezierPatch)
..	..	@@ -5844,16 +6200,27 @@
5844	6200	tex = GetTextures();
5845	6201	}
5846	6202
5847		- boolean failed = false;
	6203	+ boolean failedPigment = false;
	6204	+ boolean failedBump = false;
5848	6205
5849	6206	try
5850	6207	{
5851		- display.BindTextures(tex, texres);
	6208	+ display.BindPigmentTexture(tex, texres);
5852	6209	}
5853	6210	catch (Exception e)
5854	6211	{
5855	6212	System.err.println("FAILED: " + this);
5856		- failed = true;
	6213	+ failedPigment = true;
	6214	+ }
	6215	+
	6216	+ try
	6217	+ {
	6218	+ display.BindBumpTexture(tex, texres);
	6219	+ }
	6220	+ catch (Exception e)
	6221	+ {
	6222	+ //System.err.println("FAILED: " + this);
	6223	+ failedBump = true;
5857	6224	}
5858	6225
5859	6226	if (!compiled)
..	..	@@ -5876,8 +6243,11 @@
5876	6243	}
5877	6244	}
5878	6245
5879		- if (!failed)
5880		- display.ReleaseTextures(tex);
	6246	+ if (!failedBump)
	6247	+ display.ReleaseBumpTexture(tex);
	6248	+
	6249	+ if (!failedPigment)
	6250	+ display.ReleasePigmentTexture(tex);
5881	6251
5882	6252	display.PopMaterial(this, selected);
5883	6253	}
..	..	@@ -6250,6 +6620,11 @@
6250	6620	// dec 2012
6251	6621	new Exception().printStackTrace();
6252	6622	return;
	6623	+ }
	6624	+
	6625	+ if (dontselect)
	6626	+ {
	6627	+ //bRep.GenerateNormalsMINE();
6253	6628	}
6254	6629
6255	6630	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7035,20 +7410,23 @@
7035	7410	}
7036	7411	}
7037	7412
7038		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
7039	7417	{
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;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
7043	7421	if (toscreen == null)
7044	7422	{
7045		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7046	7424	}
7047	7425	cVector vec = in;
7048	7426	LA.xformPos(in, toscreen, in);
7049	7427	//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();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7052	7430	outPt.x = hc + (int) vec.x;
7053	7431	outPt.y = vc - (int) vec.y;
7054	7432	outRec.x = outPt.x - 3;
..	..	@@ -7056,15 +7434,18 @@
7056	7434	outRec.width = outRec.height = 6;
7057	7435	}
7058	7436
7059		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
7060	7439	{
7061	7440	Point pt = new Point(0, 0);
7062	7441	Rectangle rec = new Rectangle();
7063		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
7064	7444	return rec;
7065	7445	}
7066	7446
7067		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
7068	7449	{
7069	7450	if (level == 0)
7070	7451	{
..	..	@@ -7073,16 +7454,19 @@
7073	7454	{
7074	7455	cVector origin = new cVector();
7075	7456	//LA.xformPos(origin, toParent, origin);
7076		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7077	7461	Rectangle boundary = new Rectangle();
7078	7462	boundary.x = spot.x - 30;
7079	7463	boundary.y = spot.y - 30;
7080	7464	boundary.width = spot.width + 60;
7081	7465	boundary.height = spot.height + 60;
7082		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7083	7467	int spotw = spot.x + spot.width;
7084	7468	int spoth = spot.y + spot.height;
7085		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7086	7470	// if (CameraPane.Xmin > spot.x)
7087	7471	// {
7088	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -7099,11 +7483,33 @@
7099	7483	// {
7100	7484	// CameraPane.Ymax = spoth;
7101	7485	// }
7102		- spot.translate(32, 32);
	7486	+// if (CameraPane.Xmin > spot.x)
	7487	+// {
	7488	+// CameraPane.Xmin = spot.x;
	7489	+// }
	7490	+// if (CameraPane.Xmax < spotw)
	7491	+// {
	7492	+// CameraPane.Xmax = spotw;
	7493	+// }
	7494	+// if (CameraPane.Ymin > spot.y)
	7495	+// {
	7496	+// CameraPane.Ymin = spot.y;
	7497	+// }
	7498	+// if (CameraPane.Ymax < spoth)
	7499	+// {
	7500	+// CameraPane.Ymax = spoth;
	7501	+// }
	7502	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7503	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
7103	7509	spotw = spot.x + spot.width;
7104	7510	spoth = spot.y + spot.height;
7105		- info.g.setColor(Color.blue);
7106		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7107	7513	// if (CameraPane.Xmin > spot.x)
7108	7514	// {
7109	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -7120,29 +7526,9 @@
7120	7526	// {
7121	7527	// CameraPane.Ymax = spoth;
7122	7528	// }
7123		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7124		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7125		- spot.translate(0, -32);
7126		- info.g.setColor(Color.green);
7127		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7128		-// if (CameraPane.Xmin > spot.x)
7129		-// {
7130		-// CameraPane.Xmin = spot.x;
7131		-// }
7132		-// if (CameraPane.Xmax < spotw)
7133		-// {
7134		-// CameraPane.Xmax = spotw;
7135		-// }
7136		-// if (CameraPane.Ymin > spot.y)
7137		-// {
7138		-// CameraPane.Ymin = spot.y;
7139		-// }
7140		-// if (CameraPane.Ymax < spoth)
7141		-// {
7142		-// CameraPane.Ymax = spoth;
7143		-// }
7144		- info.g.drawArc(boundary.x, boundary.y,
7145		- boundary.width, boundary.height, 0, 360);
	7529	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7146	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7147	7533	// if (CameraPane.Xmin > boundary.x)
7148	7534	// {
..	..	@@ -7164,7 +7550,8 @@
7164	7550	}
7165	7551	}
7166	7552
7167		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7168	7555	{
7169	7556	if (level == 0)
7170	7557	{
..	..	@@ -7173,8 +7560,8 @@
7173	7560
7174	7561	boolean retval = false;
7175	7562
7176		- startX = info.x;
7177		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7178	7565
7179	7566	hitSomething = -1;
7180	7567	cVector origin = new cVector();
..	..	@@ -7184,22 +7571,53 @@
7184	7571	{
7185	7572	centerPt = new Point(0, 0);
7186	7573	}
7187		- calcHotSpot(origin, info, centerPt, spot);
7188		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7189	7577	{
7190	7578	hitSomething = hitCenter;
7191	7579	retval = true;
7192	7580	}
7193	7581	spot.translate(32, 0);
7194		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7195	7583	{
7196	7584	hitSomething = hitRotate;
7197	7585	retval = true;
7198	7586	}
7199	7587	spot.translate(0, 32);
7200		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
7201	7591	{
7202	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
7203	7621	retval = true;
7204	7622	}
7205	7623
..	..	@@ -7209,7 +7627,7 @@
7209	7627	}
7210	7628
7211	7629	//System.out.println("info.modifiers = " + info.modifiers);
7212		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7213	7631	//System.out.println("modified = " + modified);
7214	7632	//new Exception().printStackTrace();
7215	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7237,7 +7655,8 @@
7237	7655	return true;
7238	7656	}
7239	7657
7240		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7241	7660	{
7242	7661	if (hitSomething == 0)
7243	7662	{
..	..	@@ -7251,7 +7670,7 @@
7251	7670
7252	7671	//System.out.println("hitSomething = " + hitSomething);
7253	7672
7254		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
7255	7674
7256	7675	cVector xlate = new cVector();
7257	7676	//cVector xlate2 = new cVector();
..	..	@@ -7285,8 +7704,8 @@
7285	7704	toParent[3][i] = xlate.get(i);
7286	7705	LA.matInvert(toParent, fromParent);
7287	7706	*/
7288		- cVector delta = LA.newVector(0, 0, startY - info.y);
7289		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7290	7709
7291	7710	LA.matCopy(startMat, toParent);
7292	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7295,7 +7714,7 @@
7295	7714	} else
7296	7715	{
7297	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7298		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7299	7718	cVector away = new cVector();
7300	7719	//cVector right2 = new cVector();
7301	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7312,19 +7731,19 @@
7312	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7313	7732	// if (!CameraPane.LOCALTRANSFORM)
7314	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7315		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7316	7735	// if (!CameraPane.LOCALTRANSFORM)
7317	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7318	7737	//LA.vecCross(up, cVector.Z, right2);
7319	7738
7320		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7321	7740
7322	7741	//System.out.println("DELTA0 = " + delta);
7323	7742	//System.out.println("AWAY = " + info.camera.away);
7324	7743	//System.out.println("UP = " + info.camera.up);
7325	7744	if (away.z > 0)
7326	7745	{
7327		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7328	7747	{
7329	7748	delta.x = -delta.x;
7330	7749	} else
..	..	@@ -7339,7 +7758,7 @@
7339	7758	//System.out.println("DELTA1 = " + delta);
7340	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7341	7760	//System.out.println("DELTA2 = " + delta);
7342		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7343	7762	LA.matCopy(startMat, toParent);
7344	7763	//System.out.println("DELTA3 = " + delta);
7345	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7349,8 +7768,8 @@
7349	7768	break;
7350	7769
7351	7770	case hitRotate: // rotate
7352		- int dx = info.x - centerPt.x;
7353		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7354	7773	double angle = (double) Math.atan2(dx, dy);
7355	7774	angle = -(1.570796 - angle);
7356	7775
..	..	@@ -7373,7 +7792,7 @@
7373	7792	}
7374	7793	/**/
7375	7794
7376		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7377	7796	{
7378	7797	case 1: // '\001'
7379	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7400,7 +7819,7 @@
7400	7819	break;
7401	7820
7402	7821	case hitScale: // scale
7403		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7404	7823	double sign = 1;
7405	7824	if (hScale < 0)
7406	7825	{
..	..	@@ -7412,7 +7831,7 @@
7412	7831	//hScale = 0.01;
7413	7832	}
7414	7833
7415		- double vScale = (double) (info.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7416	7835	sign = 1;
7417	7836	if (vScale < 0)
7418	7837	{
..	..	@@ -7423,6 +7842,7 @@
7423	7842	{
7424	7843	//vScale = 0.01;
7425	7844	}
	7845	+
7426	7846	LA.matCopy(startMat, toParent);
7427	7847	/**/
7428	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7432,32 +7852,39 @@
7432	7852	}
7433	7853	/**/
7434	7854
7435		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7436	7856
7437	7857	if (totalScale < 0.01)
7438	7858	{
7439	7859	totalScale = 0.01;
7440	7860	}
7441	7861
7442		- switch (info.pane.RenderCamera().viewCode)
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7443	7863	{
7444	7864	case 3: // '\001'
7445		- if (modified)
	7865	+ if (modified \|\| opposite)
7446	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7447	7870	//LA.matScale(toParent, 1, hScale, vScale);
7448		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7449	7872	} // vScale, 1);
7450	7873	else
7451	7874	{
7452		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7875	+ // EXCEPTION!
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7453	7877	} // vScale, 1);
7454	7878	break;
7455	7879
7456	7880	case 2: // '\002'
7457		- if (modified)
	7881	+ if (modified \|\| opposite)
7458	7882	{
7459		- //LA.matScale(toParent, hScale, 1, vScale);
7460		- LA.matScale(toParent, 1, totalScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7461	7888	} else
7462	7889	{
7463	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7465,10 +7892,13 @@
7465	7892	break;
7466	7893
7467	7894	case 1: // '\003'
7468		- if (modified)
	7895	+ if (modified \|\| opposite)
7469	7896	{
7470		- //LA.matScale(toParent, hScale, vScale, 1);
7471		- LA.matScale(toParent, 1, 1, totalScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7472	7902	} else
7473	7903	{
7474	7904	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7505,7 +7935,7 @@
7505	7935	} // NEW ...
7506	7936
7507	7937
7508		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7509	7939	}
7510	7940
7511	7941	boolean overflow = false;
..	..	@@ -7685,6 +8115,10 @@
7685	8115	editWindow = null;
7686	8116	} // ?
7687	8117	}
	8118	+ else
	8119	+ {
	8120	+ //editWindow.closeUI();
	8121	+ }
7688	8122	}
7689	8123
7690	8124	boolean root; // patch for edit windows
..	..	@@ -7842,6 +8276,10 @@
7842	8276	}
7843	8277
7844	8278	transient ObjEditor editWindow;
	8279	+ transient ObjEditor manipWindow;
	8280	+
	8281	+ transient boolean pinned;
	8282	+
7845	8283	transient ObjectUI objectUI;
7846	8284	public static int povDepth = 0;
7847	8285	private static cVector tbMin = new cVector();