~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,7 +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();
	27	+
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	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>();
26	40
27	41	ScriptNode scriptnode;
28	42
..	..	@@ -104,64 +118,201 @@
104	118
105	119	// transient boolean reduced; // for morph reduction
106	120
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	123
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
112	126
113		-void SaveSupports()
114		-{
115		- if (blockloop)
116		- return;
117		-
118		- transientsupport = support;
119		- transientlink2master = link2master;
120		-
121		- support = null;
122		- link2master = false;
123		-
124		- if (bRep != null)
	127	+ void SaveSupports()
125	128	{
126		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
127	152	}
128		-
129		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
130	155	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	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);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	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)
	232	+ {
	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;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	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	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	276	+ {
	277	+ if (!hashtable.containsKey(GetUUID()))
	278	+ return;
	279	+
	280	+ Object3D o = hashtable.get(GetUUID());
	281	+
	282	+ RestoreBigData(o);
	283	+
	284	+ if (blockloop)
	285	+ return;
	286	+
134	287	blockloop = true;
135		- child.SaveSupports();
	288	+
	289	+ //hashtable.remove(GetUUID());
	290	+
	291	+ for (int i=0; i<Size(); i++)
	292	+ {
	293	+ get(i).RestoreBigData(hashtable);
	294	+ }
	295	+
136	296	blockloop = false;
137	297	}
138		-}
139	298
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
144		-
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
	299	+ void RestoreBigData(Object3D o)
151	300	{
152		- bRep.RestoreSupports();
	301	+ this.bRep = o.bRep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
	313	+ // this.support = o.support;
	314	+ // this.fileparent = o.fileparent;
153	315	}
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165	316
166	317	// MOCAP SUPPORT
167	318	double tx,ty,tz,rx,ry,rz;
..	..	@@ -304,6 +455,7 @@
304	455	}
305	456
306	457	boolean live = false;
	458	+ transient boolean keepdontselect;
307	459	boolean dontselect = false;
308	460	boolean hide = false;
309	461	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -486,12 +638,14 @@
486	638	toParent = LA.newMatrix();
487	639	fromParent = LA.newMatrix();
488	640	}
	641	+
489	642	if (toParentMarked == null)
490	643	{
491	644	if (maxcount != 1)
492	645	{
493	646	new Exception().printStackTrace();
494	647	}
	648	+
495	649	toParentMarked = LA.newMatrix();
496	650	fromParentMarked = LA.newMatrix();
497	651	}
..	..	@@ -802,7 +956,7 @@
802	956
803	957	if (marked && Globals.isLIVE() && live &&
804	958	//TEMP21aug2018
805		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	959	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
806	960	currentframe != Globals.framecount)
807	961	{
808	962	currentframe = Globals.framecount;
..	..	@@ -814,7 +968,8 @@
814	968
815	969	boolean changedir = random && Math.random() < 0.01; // && !link2master;
816	970
817		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	971	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	972	+ (step == 1 && changedir))
818	973	{
819	974	countdown = 1;
820	975	delay = speedup?8:1;
..	..	@@ -886,6 +1041,10 @@
886	1041	if (material == null \|\| material.multiply)
887	1042	return true;
888	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
	1047	+ // Transparent objects are dynamic because we have to sort the triangles.
889	1048	return material.opacity > 0.99;
890	1049	}
891	1050
..	..	@@ -1286,6 +1445,7 @@
1286	1445	toParent = LA.newMatrix();
1287	1446	fromParent = LA.newMatrix();
1288	1447	}
	1448	+
1289	1449	LA.matCopy(other.toParent, toParent);
1290	1450	LA.matCopy(other.fromParent, fromParent);
1291	1451
..	..	@@ -2307,6 +2467,15 @@
2307	2467	}
2308	2468	*/
2309	2469	}
	2470	+ else
	2471	+ {
	2472	+ //((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
	2478	+ }
2310	2479	}
2311	2480
2312	2481	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2348,6 +2517,14 @@
2348	2517	{
2349	2518	editWindow.refreshContents();
2350	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2351	2528	//if (parent != null)
2352	2529	//parent.refreshEditWindow();
2353	2530	}
..	..	@@ -2427,7 +2604,8 @@
2427	2604	private static final int editSelf = 1;
2428	2605	private static final int editChild = 2;
2429	2606
2430		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2431	2609	{
2432	2610	if (level == 0)
2433	2611	{
..	..	@@ -2435,7 +2613,8 @@
2435	2613	return;
2436	2614
2437	2615	Object3D selectee;
2438		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2439	2618	{
2440	2619	selectee = (Object3D) e.nextElement();
2441	2620	}
..	..	@@ -2443,19 +2622,22 @@
2443	2622	} else
2444	2623	{
2445	2624	//super.
2446		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2447	2627	}
2448	2628	}
2449	2629
2450		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2451	2632	{
2452	2633	doSomething = 0;
2453	2634	if (level == 0)
2454	2635	{
2455		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2456	2637	}
2457	2638	if (//super.
2458		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2459	2641	{
2460	2642	doSomething = 1;
2461	2643	return true;
..	..	@@ -2465,7 +2647,7 @@
2465	2647	}
2466	2648	}
2467	2649
2468		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2469	2651	{
2470	2652	if (selection == null)
2471	2653	{
..	..	@@ -2478,7 +2660,8 @@
2478	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2479	2661	{
2480	2662	Object3D selectee = (Object3D) e.nextElement();
2481		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2482	2665	{
2483	2666	childToDrag = selectee;
2484	2667	doSomething = 2;
..	..	@@ -2490,13 +2673,15 @@
2490	2673	return retval;
2491	2674	}
2492	2675
2493		- void doEditDrag(ClickInfo info, boolean opposite)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2494	2678	{
2495	2679	switch (doSomething)
2496	2680	{
2497	2681	case 1: // '\001'
2498	2682	//super.
2499		- doEditDrag0(info, opposite);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2500	2685	break;
2501	2686
2502	2687	case 2: // '\002'
..	..	@@ -2509,11 +2694,13 @@
2509	2694	{
2510	2695	//sel.hitSomething = childToDrag.hitSomething;
2511	2696	//childToDrag.doEditDrag(info);
2512		- sel.doEditDrag(info, opposite);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2513	2699	} else
2514	2700	{
2515	2701	//super.
2516		- doEditDrag0(info, opposite);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2517	2704	}
2518	2705	}
2519	2706	break;
..	..	@@ -2531,6 +2718,9 @@
2531	2718	{
2532	2719	deselectAll();
2533	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2534	2724	ClickInfo newInfo = new ClickInfo();
2535	2725	newInfo.flags = info.flags;
2536	2726	newInfo.bounds = info.bounds;
..	..	@@ -2623,6 +2813,18 @@
2623	2813	void GenNormalsS(boolean crease)
2624	2814	{
2625	2815	selection.GenNormals(crease);
	2816	+// for (int i=0; i<selection.size(); i++)
	2817	+// {
	2818	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2819	+// selectee.GenNormals(crease);
	2820	+// }
	2821	+
	2822	+ //Touch();
	2823	+ }
	2824	+
	2825	+ void GenNormalsMeshS()
	2826	+ {
	2827	+ selection.GenNormalsMesh();
2626	2828	// for (int i=0; i<selection.size(); i++)
2627	2829	// {
2628	2830	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2763,6 +2965,24 @@
2763	2965	if (child == null)
2764	2966	continue;
2765	2967	child.GenNormals(crease);
	2968	+// Children().release(i);
	2969	+ }
	2970	+ blockloop = false;
	2971	+ }
	2972	+
	2973	+ void GenNormalsMesh()
	2974	+ {
	2975	+ if (blockloop)
	2976	+ return;
	2977	+
	2978	+ blockloop = true;
	2979	+ GenNormalsMesh0();
	2980	+ for (int i = 0; i < Children().Size(); i++)
	2981	+ {
	2982	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2983	+ if (child == null)
	2984	+ continue;
	2985	+ child.GenNormalsMesh();
2766	2986	// Children().release(i);
2767	2987	}
2768	2988	blockloop = false;
..	..	@@ -2935,11 +3155,20 @@
2935	3155	}
2936	3156	}
2937	3157
	3158	+ void GenNormalsMesh0()
	3159	+ {
	3160	+ if (bRep != null)
	3161	+ {
	3162	+ bRep.GenerateNormalsMesh();
	3163	+ Touch();
	3164	+ }
	3165	+ }
	3166	+
2938	3167	void GenNormalsMINE0()
2939	3168	{
2940	3169	if (bRep != null)
2941	3170	{
2942		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2943	3172	Touch();
2944	3173	}
2945	3174	}
..	..	@@ -3385,7 +3614,8 @@
3385	3614	if (blockloop)
3386	3615	return;
3387	3616
3388		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3617	+ if (//marked \|\| // does not make sense
	3618	+ (bRep != null \|\| material != null)) // borderline...
3389	3619	live = h;
3390	3620
3391	3621	for (int i = 0; i < Size(); i++)
..	..	@@ -3406,7 +3636,8 @@
3406	3636	return;
3407	3637
3408	3638	//if (bRep != null)
3409		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3639	+ if (//marked \|\| // does not make sense
	3640	+ (bRep != null \|\| material != null)) // borderline...
3410	3641	link2master = h;
3411	3642
3412	3643	for (int i = 0; i < Size(); i++)
..	..	@@ -3426,7 +3657,8 @@
3426	3657	if (blockloop)
3427	3658	return;
3428	3659
3429		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3660	+ if (//marked \|\| // does not make sense
	3661	+ (bRep != null \|\| material != null)) // borderline...
3430	3662	hide = h;
3431	3663
3432	3664	for (int i = 0; i < Size(); i++)
..	..	@@ -3446,7 +3678,7 @@
3446	3678	if (blockloop)
3447	3679	return;
3448	3680
3449		- if (bRep != null && material != null) // borderline...
	3681	+ if (bRep != null \|\| material != null) // borderline...
3450	3682	marked = h;
3451	3683
3452	3684	for (int i = 0; i < Size(); i++)
..	..	@@ -3456,6 +3688,46 @@
3456	3688	continue;
3457	3689	blockloop = true;
3458	3690	child.MarkLeaves(h);
	3691	+ blockloop = false;
	3692	+ // release(i);
	3693	+ }
	3694	+ }
	3695	+
	3696	+ void RewindLeaves(boolean h)
	3697	+ {
	3698	+ if (blockloop)
	3699	+ return;
	3700	+
	3701	+ if (bRep != null \|\| material != null) // borderline...
	3702	+ rewind = h;
	3703	+
	3704	+ for (int i = 0; i < Size(); i++)
	3705	+ {
	3706	+ Object3D child = (Object3D) get(i); // reserve(i);
	3707	+ if (child == null)
	3708	+ continue;
	3709	+ blockloop = true;
	3710	+ child.RewindLeaves(h);
	3711	+ blockloop = false;
	3712	+ // release(i);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void RandomLeaves(boolean h)
	3717	+ {
	3718	+ if (blockloop)
	3719	+ return;
	3720	+
	3721	+ if (bRep != null \|\| material != null) // borderline...
	3722	+ random = h;
	3723	+
	3724	+ for (int i = 0; i < Size(); i++)
	3725	+ {
	3726	+ Object3D child = (Object3D) get(i); // reserve(i);
	3727	+ if (child == null)
	3728	+ continue;
	3729	+ blockloop = true;
	3730	+ child.RandomLeaves(h);
3459	3731	blockloop = false;
3460	3732	// release(i);
3461	3733	}
..	..	@@ -4233,6 +4505,55 @@
4233	4505	}
4234	4506	}
4235	4507
	4508	+ void RepairSOV()
	4509	+ {
	4510	+ if (blockloop)
	4511	+ return;
	4512	+
	4513	+ String texname = this.GetPigmentTexture();
	4514	+
	4515	+ if (texname.startsWith("sov"))
	4516	+ {
	4517	+ String[] s = texname.split("/");
	4518	+
	4519	+ String[] sname = s[1].split("Color.pn");
	4520	+
	4521	+ texname = sname[0];
	4522	+
	4523	+ if (sname.length > 1)
	4524	+ {
	4525	+ texname += "Color.jpg";
	4526	+ }
	4527	+
	4528	+ this.SetPigmentTexture("sov/" + texname);
	4529	+ }
	4530	+
	4531	+ texname = this.GetBumpTexture();
	4532	+
	4533	+ if (texname.startsWith("sov"))
	4534	+ {
	4535	+ String[] s = texname.split("/");
	4536	+
	4537	+ String[] sname = s[1].split("Bump.pn");
	4538	+
	4539	+ texname = sname[0];
	4540	+
	4541	+ if (sname.length > 1)
	4542	+ {
	4543	+ texname += "Bump.jpg";
	4544	+ }
	4545	+
	4546	+ this.SetBumpTexture("sov/" + texname);
	4547	+ }
	4548	+
	4549	+ for (int i=0; i<Size(); i++)
	4550	+ {
	4551	+ blockloop = true;
	4552	+ get(i).RepairSOV();
	4553	+ blockloop = false;
	4554	+ }
	4555	+ }
	4556	+
4236	4557	void RepairTexture()
4237	4558	{
4238	4559	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4747,6 +5068,14 @@
4747	5068	}
4748	5069	}
4749	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4750	5079	cTreePath Select(int indexcount, boolean deselect)
4751	5080	{
4752	5081	if (hide \|\| dontselect)
..	..	@@ -4783,10 +5112,11 @@
4783	5112	if (leaf != null)
4784	5113	{
4785	5114	cTreePath tp = new cTreePath(this, leaf);
4786		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4787	5117	{
4788	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
4789		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
4790	5120	}
4791	5121
4792	5122	return tp;
..	..	@@ -4803,6 +5133,7 @@
4803	5133
4804	5134	if (child == null)
4805	5135	continue;
	5136	+
4806	5137	if (child.HasTransparency() && child.size() != 0)
4807	5138	{
4808	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4812,9 +5143,10 @@
4812	5143	if (leaf != null)
4813	5144	{
4814	5145	cTreePath tp = new cTreePath(this, leaf);
4815		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
4816	5148	{
4817		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
4818	5150	}
4819	5151
4820	5152	return tp;
..	..	@@ -5139,6 +5471,51 @@
5139	5471	blockloop = false;
5140	5472	}
5141	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5142	5519	boolean IsSelected()
5143	5520	{
5144	5521	if (parent == null)
..	..	@@ -5199,6 +5576,11 @@
5199	5576	if (fullname == null)
5200	5577	return "";
5201	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5202	5584	// System.out.println("Fullname = " + fullname);
5203	5585
5204	5586	// Does not work on Windows due to C:
..	..	@@ -5211,7 +5593,7 @@
5211	5593
5212	5594	if (split.length == 0)
5213	5595	{
5214		- return "";
	5596	+ return fullname.pigment = "";
5215	5597	}
5216	5598
5217	5599	if (split.length <= 2)
..	..	@@ -5219,22 +5601,27 @@
5219	5601	if (fullname.name.endsWith(":"))
5220	5602	{
5221	5603	// Windows
5222		- return fullname.name.substring(0, fullname.name.length()-1);
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5223	5605	}
5224	5606
5225		- return split[0];
	5607	+ return fullname.pigment = split[0];
5226	5608	}
5227	5609
5228	5610	// Windows
5229	5611	assert(split.length == 4);
5230	5612
5231		- return split[0] + ":" + split[1];
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5232	5614	}
5233	5615
5234	5616	static String GetBump(cTexture fullname)
5235	5617	{
5236	5618	if (fullname == null)
5237	5619	return "";
	5620	+
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
5238	5625
5239	5626	// System.out.println("Fullname = " + fullname);
5240	5627	// Does not work on Windows due to C:
..	..	@@ -5246,12 +5633,12 @@
5246	5633
5247	5634	if (split.length == 0)
5248	5635	{
5249		- return "";
	5636	+ return fullname.bump = "";
5250	5637	}
5251	5638
5252	5639	if (split.length == 1)
5253	5640	{
5254		- return "";
	5641	+ return fullname.bump = "";
5255	5642	}
5256	5643
5257	5644	if (split.length == 2)
..	..	@@ -5259,16 +5646,16 @@
5259	5646	if (fullname.name.endsWith(":"))
5260	5647	{
5261	5648	// Windows
5262		- return "";
	5649	+ return fullname.bump = "";
5263	5650	}
5264	5651
5265		- return split[1];
	5652	+ return fullname.bump = split[1];
5266	5653	}
5267	5654
5268	5655	// Windows
5269	5656	assert(split.length == 4);
5270	5657
5271		- return split[2] + ":" + split[3];
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5272	5659	}
5273	5660
5274	5661	String GetPigmentTexture()
..	..	@@ -5351,6 +5738,9 @@
5351	5738	texname = "";
5352	5739
5353	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5354	5744	Touch();
5355	5745	}
5356	5746
..	..	@@ -5424,6 +5814,8 @@
5424	5814
5425	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5426	5816
	5817	+ GetTextures().bump = null;
	5818	+
5427	5819	Touch();
5428	5820	}
5429	5821
..	..	@@ -5448,6 +5840,38 @@
5448	5840	}
5449	5841	}
5450	5842
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
	5871	+ blockloop = false;
	5872	+ }
	5873	+ }
	5874	+
5451	5875	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5452	5876	{
5453	5877	Draw(display, root, selected, blocked);
..	..	@@ -5456,12 +5880,23 @@
5456	5880	boolean NeedSupport()
5457	5881	{
5458	5882	return
5459		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5883	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5460	5884	// PROBLEM with CROWD!!
5461	5885	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5462	5886	}
5463	5887
5464	5888	static boolean DEBUG_SELECTION = false;
	5889	+
	5890	+ boolean IsLive()
	5891	+ {
	5892	+ if (live)
	5893	+ return true;
	5894	+
	5895	+ if (parent == null)
	5896	+ return false;
	5897	+
	5898	+ return parent.IsLive();
	5899	+ }
5465	5900
5466	5901	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5467	5902	{
..	..	@@ -5523,8 +5958,10 @@
5523	5958	if (support != null)
5524	5959	support = support;
5525	5960
5526		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5527		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5528	5965
5529	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5530	5967	{
..	..	@@ -5534,8 +5971,9 @@
5534	5971	// usecalllists &= !(parent instanceof RandomNode);
5535	5972	// usecalllists = false;
5536	5973
5537		- if (GetBRep() != null)
5538		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5539	5977	//System.out.println("draw " + this);
5540	5978	//new Exception().printStackTrace();
5541	5979
..	..	@@ -5544,10 +5982,12 @@
5544	5982	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5545	5983
5546	5984	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5547		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5985	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5548	5987	{
5549	5988	Globals.lighttouched = true;
5550	5989	} // all panes...
	5990	+
5551	5991	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5552	5992	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5553	5993	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5555,7 +5995,7 @@
5555	5995	if (!(this instanceof Composite))
5556	5996	touched = false;
5557	5997	//if (displaylist == -1 && usecalllists)
5558		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5559	5999	{
5560	6000	bRep.displaylist = display.GenList();
5561	6001	assert(bRep.displaylist != 0);
..	..	@@ -5566,7 +6006,7 @@
5566	6006
5567	6007	//System.out.println("\tnew list " + list);
5568	6008	//gl.glDrawBuffer(gl.GL_NONE);
5569		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5570	6010	{
5571	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5572	6012	display.NewList(bRep.displaylist);
..	..	@@ -5575,7 +6015,7 @@
5575	6015	CallList(display, root, selected, blocked);
5576	6016
5577	6017	// compiled = true;
5578		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5579	6019	{
5580	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5581	6021	display.EndList();
..	..	@@ -5675,6 +6115,7 @@
5675	6115	if (GetBRep() != null)
5676	6116	{
5677	6117	display.NextIndex();
	6118	+
5678	6119	// vertex color conflict : gl.glCallList(list);
5679	6120	DrawNode(display, root, selected);
5680	6121	if (this instanceof BezierPatch)
..	..	@@ -5715,16 +6156,27 @@
5715	6156	tex = GetTextures();
5716	6157	}
5717	6158
5718		- boolean failed = false;
	6159	+ boolean failedPigment = false;
	6160	+ boolean failedBump = false;
5719	6161
5720	6162	try
5721	6163	{
5722		- display.BindTextures(tex, texres);
	6164	+ display.BindPigmentTexture(tex, texres);
5723	6165	}
5724	6166	catch (Exception e)
5725	6167	{
5726	6168	System.err.println("FAILED: " + this);
5727		- failed = true;
	6169	+ failedPigment = true;
	6170	+ }
	6171	+
	6172	+ try
	6173	+ {
	6174	+ display.BindBumpTexture(tex, texres);
	6175	+ }
	6176	+ catch (Exception e)
	6177	+ {
	6178	+ //System.err.println("FAILED: " + this);
	6179	+ failedBump = true;
5728	6180	}
5729	6181
5730	6182	if (!compiled)
..	..	@@ -5747,8 +6199,11 @@
5747	6199	}
5748	6200	}
5749	6201
5750		- if (!failed)
5751		- display.ReleaseTextures(tex);
	6202	+ if (!failedBump)
	6203	+ display.ReleaseBumpTexture(tex);
	6204	+
	6205	+ if (!failedPigment)
	6206	+ display.ReleasePigmentTexture(tex);
5752	6207
5753	6208	display.PopMaterial(this, selected);
5754	6209	}
..	..	@@ -6121,6 +6576,11 @@
6121	6576	// dec 2012
6122	6577	new Exception().printStackTrace();
6123	6578	return;
	6579	+ }
	6580	+
	6581	+ if (dontselect)
	6582	+ {
	6583	+ //bRep.GenerateNormalsMINE();
6124	6584	}
6125	6585
6126	6586	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6906,20 +7366,23 @@
6906	7366	}
6907	7367	}
6908	7368
6909		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
6910	7373	{
6911		- int hc = info.bounds.x + info.bounds.width / 2;
6912		- int vc = info.bounds.y + info.bounds.height / 2;
6913		- double[][] toscreen = info.toScreen;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
6914	7377	if (toscreen == null)
6915	7378	{
6916		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6917	7380	}
6918	7381	cVector vec = in;
6919	7382	LA.xformPos(in, toscreen, in);
6920	7383	//System.out.println("Distance = " + info.camera.Distance());
6921		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6922		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6923	7386	outPt.x = hc + (int) vec.x;
6924	7387	outPt.y = vc - (int) vec.y;
6925	7388	outRec.x = outPt.x - 3;
..	..	@@ -6927,15 +7390,18 @@
6927	7390	outRec.width = outRec.height = 6;
6928	7391	}
6929	7392
6930		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
6931	7395	{
6932	7396	Point pt = new Point(0, 0);
6933	7397	Rectangle rec = new Rectangle();
6934		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
6935	7400	return rec;
6936	7401	}
6937	7402
6938		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
6939	7405	{
6940	7406	if (level == 0)
6941	7407	{
..	..	@@ -6944,16 +7410,19 @@
6944	7410	{
6945	7411	cVector origin = new cVector();
6946	7412	//LA.xformPos(origin, toParent, origin);
6947		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6948	7417	Rectangle boundary = new Rectangle();
6949	7418	boundary.x = spot.x - 30;
6950	7419	boundary.y = spot.y - 30;
6951	7420	boundary.width = spot.width + 60;
6952	7421	boundary.height = spot.height + 60;
6953		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
6954	7423	int spotw = spot.x + spot.width;
6955	7424	int spoth = spot.y + spot.height;
6956		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6957	7426	// if (CameraPane.Xmin > spot.x)
6958	7427	// {
6959	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -6970,11 +7439,33 @@
6970	7439	// {
6971	7440	// CameraPane.Ymax = spoth;
6972	7441	// }
6973		- spot.translate(32, 32);
	7442	+// if (CameraPane.Xmin > spot.x)
	7443	+// {
	7444	+// CameraPane.Xmin = spot.x;
	7445	+// }
	7446	+// if (CameraPane.Xmax < spotw)
	7447	+// {
	7448	+// CameraPane.Xmax = spotw;
	7449	+// }
	7450	+// if (CameraPane.Ymin > spot.y)
	7451	+// {
	7452	+// CameraPane.Ymin = spot.y;
	7453	+// }
	7454	+// if (CameraPane.Ymax < spoth)
	7455	+// {
	7456	+// CameraPane.Ymax = spoth;
	7457	+// }
	7458	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7459	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
6974	7465	spotw = spot.x + spot.width;
6975	7466	spoth = spot.y + spot.height;
6976		- info.g.setColor(Color.blue);
6977		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6978	7469	// if (CameraPane.Xmin > spot.x)
6979	7470	// {
6980	7471	// CameraPane.Xmin = spot.x;
..	..	@@ -6991,29 +7482,9 @@
6991	7482	// {
6992	7483	// CameraPane.Ymax = spoth;
6993	7484	// }
6994		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6995		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6996		- spot.translate(0, -32);
6997		- info.g.setColor(Color.green);
6998		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6999		-// if (CameraPane.Xmin > spot.x)
7000		-// {
7001		-// CameraPane.Xmin = spot.x;
7002		-// }
7003		-// if (CameraPane.Xmax < spotw)
7004		-// {
7005		-// CameraPane.Xmax = spotw;
7006		-// }
7007		-// if (CameraPane.Ymin > spot.y)
7008		-// {
7009		-// CameraPane.Ymin = spot.y;
7010		-// }
7011		-// if (CameraPane.Ymax < spoth)
7012		-// {
7013		-// CameraPane.Ymax = spoth;
7014		-// }
7015		- info.g.drawArc(boundary.x, boundary.y,
7016		- boundary.width, boundary.height, 0, 360);
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7017	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7018	7489	// if (CameraPane.Xmin > boundary.x)
7019	7490	// {
..	..	@@ -7035,7 +7506,8 @@
7035	7506	}
7036	7507	}
7037	7508
7038		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7039	7511	{
7040	7512	if (level == 0)
7041	7513	{
..	..	@@ -7044,8 +7516,8 @@
7044	7516
7045	7517	boolean retval = false;
7046	7518
7047		- startX = info.x;
7048		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7049	7521
7050	7522	hitSomething = -1;
7051	7523	cVector origin = new cVector();
..	..	@@ -7055,22 +7527,53 @@
7055	7527	{
7056	7528	centerPt = new Point(0, 0);
7057	7529	}
7058		- calcHotSpot(origin, info, centerPt, spot);
7059		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7060	7533	{
7061	7534	hitSomething = hitCenter;
7062	7535	retval = true;
7063	7536	}
7064	7537	spot.translate(32, 0);
7065		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7066	7539	{
7067	7540	hitSomething = hitRotate;
7068	7541	retval = true;
7069	7542	}
7070	7543	spot.translate(0, 32);
7071		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7072	7547	{
7073	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7074	7577	retval = true;
7075	7578	}
7076	7579
..	..	@@ -7080,7 +7583,7 @@
7080	7583	}
7081	7584
7082	7585	//System.out.println("info.modifiers = " + info.modifiers);
7083		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7084	7587	//System.out.println("modified = " + modified);
7085	7588	//new Exception().printStackTrace();
7086	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7108,7 +7611,8 @@
7108	7611	return true;
7109	7612	}
7110	7613
7111		- void doEditDrag0(ClickInfo info, boolean opposite)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7112	7616	{
7113	7617	if (hitSomething == 0)
7114	7618	{
..	..	@@ -7122,7 +7626,7 @@
7122	7626
7123	7627	//System.out.println("hitSomething = " + hitSomething);
7124	7628
7125		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
7126	7630
7127	7631	cVector xlate = new cVector();
7128	7632	//cVector xlate2 = new cVector();
..	..	@@ -7156,8 +7660,8 @@
7156	7660	toParent[3][i] = xlate.get(i);
7157	7661	LA.matInvert(toParent, fromParent);
7158	7662	*/
7159		- cVector delta = LA.newVector(0, 0, startY - info.y);
7160		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7161	7665
7162	7666	LA.matCopy(startMat, toParent);
7163	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7166,7 +7670,7 @@
7166	7670	} else
7167	7671	{
7168	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7169		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7170	7674	cVector away = new cVector();
7171	7675	//cVector right2 = new cVector();
7172	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7183,19 +7687,19 @@
7183	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7184	7688	// if (!CameraPane.LOCALTRANSFORM)
7185	7689	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7186		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7187	7691	// if (!CameraPane.LOCALTRANSFORM)
7188	7692	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7189	7693	//LA.vecCross(up, cVector.Z, right2);
7190	7694
7191		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7192	7696
7193	7697	//System.out.println("DELTA0 = " + delta);
7194	7698	//System.out.println("AWAY = " + info.camera.away);
7195	7699	//System.out.println("UP = " + info.camera.up);
7196	7700	if (away.z > 0)
7197	7701	{
7198		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7199	7703	{
7200	7704	delta.x = -delta.x;
7201	7705	} else
..	..	@@ -7210,7 +7714,7 @@
7210	7714	//System.out.println("DELTA1 = " + delta);
7211	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7212	7716	//System.out.println("DELTA2 = " + delta);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7718	LA.matCopy(startMat, toParent);
7215	7719	//System.out.println("DELTA3 = " + delta);
7216	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7220,8 +7724,8 @@
7220	7724	break;
7221	7725
7222	7726	case hitRotate: // rotate
7223		- int dx = info.x - centerPt.x;
7224		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7225	7729	double angle = (double) Math.atan2(dx, dy);
7226	7730	angle = -(1.570796 - angle);
7227	7731
..	..	@@ -7244,7 +7748,7 @@
7244	7748	}
7245	7749	/**/
7246	7750
7247		- switch (info.pane.RenderCamera().viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7248	7752	{
7249	7753	case 1: // '\001'
7250	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7271,7 +7775,7 @@
7271	7775	break;
7272	7776
7273	7777	case hitScale: // scale
7274		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7275	7779	double sign = 1;
7276	7780	if (hScale < 0)
7277	7781	{
..	..	@@ -7283,7 +7787,7 @@
7283	7787	//hScale = 0.01;
7284	7788	}
7285	7789
7286		- double vScale = (double) (info.y - centerPt.y) / 32;
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7287	7791	sign = 1;
7288	7792	if (vScale < 0)
7289	7793	{
..	..	@@ -7294,6 +7798,7 @@
7294	7798	{
7295	7799	//vScale = 0.01;
7296	7800	}
	7801	+
7297	7802	LA.matCopy(startMat, toParent);
7298	7803	/**/
7299	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7303,32 +7808,39 @@
7303	7808	}
7304	7809	/**/
7305	7810
7306		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7307	7812
7308	7813	if (totalScale < 0.01)
7309	7814	{
7310	7815	totalScale = 0.01;
7311	7816	}
7312	7817
7313		- switch (info.pane.RenderCamera().viewCode)
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7314	7819	{
7315	7820	case 3: // '\001'
7316		- if (modified)
	7821	+ if (modified \|\| opposite)
7317	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7318	7826	//LA.matScale(toParent, 1, hScale, vScale);
7319		- LA.matScale(toParent, totalScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7320	7828	} // vScale, 1);
7321	7829	else
7322	7830	{
7323		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7831	+ // EXCEPTION!
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7324	7833	} // vScale, 1);
7325	7834	break;
7326	7835
7327	7836	case 2: // '\002'
7328		- if (modified)
	7837	+ if (modified \|\| opposite)
7329	7838	{
7330		- //LA.matScale(toParent, hScale, 1, vScale);
7331		- LA.matScale(toParent, 1, totalScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7332	7844	} else
7333	7845	{
7334	7846	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7336,10 +7848,13 @@
7336	7848	break;
7337	7849
7338	7850	case 1: // '\003'
7339		- if (modified)
	7851	+ if (modified \|\| opposite)
7340	7852	{
7341		- //LA.matScale(toParent, hScale, vScale, 1);
7342		- LA.matScale(toParent, 1, 1, totalScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7343	7858	} else
7344	7859	{
7345	7860	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7376,7 +7891,7 @@
7376	7891	} // NEW ...
7377	7892
7378	7893
7379		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7380	7895	}
7381	7896
7382	7897	boolean overflow = false;
..	..	@@ -7556,6 +8071,10 @@
7556	8071	editWindow = null;
7557	8072	} // ?
7558	8073	}
	8074	+ else
	8075	+ {
	8076	+ //editWindow.closeUI();
	8077	+ }
7559	8078	}
7560	8079
7561	8080	boolean root; // patch for edit windows
..	..	@@ -7567,7 +8086,7 @@
7567	8086	/transient/ cVector2[] projectedVertices = new cVector2[0];
7568	8087
7569	8088	Object3D /Composite/ parent;
7570		- Object3D /Composite/ fileparent;
	8089	+ Object3D /Composite/ fileparent; // In the case of FileObject
7571	8090
7572	8091	double[][] toParent; // dynamic matrix
7573	8092	double[][] fromParent;
..	..	@@ -7713,6 +8232,10 @@
7713	8232	}
7714	8233
7715	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
7716	8239	transient ObjectUI objectUI;
7717	8240	public static int povDepth = 0;
7718	8241	private static cVector tbMin = new cVector();