~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,8 +22,20 @@
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
	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	+
27	39	ScriptNode scriptnode;
28	40
29	41	void InitOthers()
..	..	@@ -104,64 +116,201 @@
104	116
105	117	// transient boolean reduced; // for morph reduction
106	118
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	121
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
112	124
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)
	125	+ void SaveSupports()
125	126	{
126		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
127	150	}
128		-
129		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
130	153	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	154	+ if (blockloop)
	155	+ return;
	156	+
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
	161	+
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	179	+ {
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
	282	+ if (blockloop)
	283	+ return;
	284	+
134	285	blockloop = true;
135		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
136	294	blockloop = false;
137	295	}
138		-}
139	296
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)
	297	+ void RestoreBigData(Object3D o)
151	298	{
152		- bRep.RestoreSupports();
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
153	313	}
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	314
166	315	// MOCAP SUPPORT
167	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -304,6 +453,7 @@
304	453	}
305	454
306	455	boolean live = false;
	456	+ transient boolean keepdontselect;
307	457	boolean dontselect = false;
308	458	boolean hide = false;
309	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -486,12 +636,14 @@
486	636	toParent = LA.newMatrix();
487	637	fromParent = LA.newMatrix();
488	638	}
	639	+
489	640	if (toParentMarked == null)
490	641	{
491	642	if (maxcount != 1)
492	643	{
493	644	new Exception().printStackTrace();
494	645	}
	646	+
495	647	toParentMarked = LA.newMatrix();
496	648	fromParentMarked = LA.newMatrix();
497	649	}
..	..	@@ -802,7 +954,7 @@
802	954
803	955	if (marked && Globals.isLIVE() && live &&
804	956	//TEMP21aug2018
805		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
806	958	currentframe != Globals.framecount)
807	959	{
808	960	currentframe = Globals.framecount;
..	..	@@ -814,7 +966,8 @@
814	966
815	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
816	968
817		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
818	971	{
819	972	countdown = 1;
820	973	delay = speedup?8:1;
..	..	@@ -886,6 +1039,10 @@
886	1039	if (material == null \|\| material.multiply)
887	1040	return true;
888	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
889	1046	return material.opacity > 0.99;
890	1047	}
891	1048
..	..	@@ -1286,6 +1443,7 @@
1286	1443	toParent = LA.newMatrix();
1287	1444	fromParent = LA.newMatrix();
1288	1445	}
	1446	+
1289	1447	LA.matCopy(other.toParent, toParent);
1290	1448	LA.matCopy(other.fromParent, fromParent);
1291	1449
..	..	@@ -2307,6 +2465,10 @@
2307	2465	}
2308	2466	*/
2309	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ }
2310	2472	}
2311	2473
2312	2474	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2348,6 +2510,14 @@
2348	2510	{
2349	2511	editWindow.refreshContents();
2350	2512	}
	2513	+ else
	2514	+ {
	2515	+ if (manipWindow != null)
	2516	+ {
	2517	+ manipWindow.refreshContents();
	2518	+ }
	2519	+ }
	2520	+
2351	2521	//if (parent != null)
2352	2522	//parent.refreshEditWindow();
2353	2523	}
..	..	@@ -2427,7 +2597,8 @@
2427	2597	private static final int editSelf = 1;
2428	2598	private static final int editChild = 2;
2429	2599
2430		- void drawEditHandles(ClickInfo info, int level)
	2600	+ void drawEditHandles(//ClickInfo info,
	2601	+ int level)
2431	2602	{
2432	2603	if (level == 0)
2433	2604	{
..	..	@@ -2435,7 +2606,8 @@
2435	2606	return;
2436	2607
2437	2608	Object3D selectee;
2438		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2609	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2610	+ level + 1))
2439	2611	{
2440	2612	selectee = (Object3D) e.nextElement();
2441	2613	}
..	..	@@ -2443,19 +2615,22 @@
2443	2615	} else
2444	2616	{
2445	2617	//super.
2446		- drawEditHandles0(info, level + 1);
	2618	+ drawEditHandles0(//info,
	2619	+ level + 1);
2447	2620	}
2448	2621	}
2449	2622
2450		- boolean doEditClick(ClickInfo info, int level)
	2623	+ boolean doEditClick(//ClickInfo info,
	2624	+ int level)
2451	2625	{
2452	2626	doSomething = 0;
2453	2627	if (level == 0)
2454	2628	{
2455		- return doParentClick(info);
	2629	+ return doParentClick(); //info);
2456	2630	}
2457	2631	if (//super.
2458		- doEditClick0(info, level))
	2632	+ doEditClick0(//info,
	2633	+ level))
2459	2634	{
2460	2635	doSomething = 1;
2461	2636	return true;
..	..	@@ -2465,7 +2640,7 @@
2465	2640	}
2466	2641	}
2467	2642
2468		- boolean doParentClick(ClickInfo info)
	2643	+ boolean doParentClick() //ClickInfo info)
2469	2644	{
2470	2645	if (selection == null)
2471	2646	{
..	..	@@ -2478,7 +2653,8 @@
2478	2653	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2479	2654	{
2480	2655	Object3D selectee = (Object3D) e.nextElement();
2481		- if (selectee.doEditClick(info, 1))
	2656	+ if (selectee.doEditClick(//info,
	2657	+ 1))
2482	2658	{
2483	2659	childToDrag = selectee;
2484	2660	doSomething = 2;
..	..	@@ -2490,13 +2666,15 @@
2490	2666	return retval;
2491	2667	}
2492	2668
2493		- void doEditDrag(ClickInfo info, boolean opposite)
	2669	+ void doEditDrag(//ClickInfo clickInfo,
	2670	+ boolean opposite)
2494	2671	{
2495	2672	switch (doSomething)
2496	2673	{
2497	2674	case 1: // '\001'
2498	2675	//super.
2499		- doEditDrag0(info, opposite);
	2676	+ doEditDrag0(//clickInfo,
	2677	+ opposite);
2500	2678	break;
2501	2679
2502	2680	case 2: // '\002'
..	..	@@ -2509,11 +2687,13 @@
2509	2687	{
2510	2688	//sel.hitSomething = childToDrag.hitSomething;
2511	2689	//childToDrag.doEditDrag(info);
2512		- sel.doEditDrag(info, opposite);
	2690	+ sel.doEditDrag(//clickInfo,
	2691	+ opposite);
2513	2692	} else
2514	2693	{
2515	2694	//super.
2516		- doEditDrag0(info, opposite);
	2695	+ doEditDrag0(//clickInfo,
	2696	+ opposite);
2517	2697	}
2518	2698	}
2519	2699	break;
..	..	@@ -2531,6 +2711,9 @@
2531	2711	{
2532	2712	deselectAll();
2533	2713	}
	2714	+
	2715	+ new Exception().printStackTrace();
	2716	+
2534	2717	ClickInfo newInfo = new ClickInfo();
2535	2718	newInfo.flags = info.flags;
2536	2719	newInfo.bounds = info.bounds;
..	..	@@ -2623,6 +2806,18 @@
2623	2806	void GenNormalsS(boolean crease)
2624	2807	{
2625	2808	selection.GenNormals(crease);
	2809	+// for (int i=0; i<selection.size(); i++)
	2810	+// {
	2811	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2812	+// selectee.GenNormals(crease);
	2813	+// }
	2814	+
	2815	+ //Touch();
	2816	+ }
	2817	+
	2818	+ void GenNormalsMeshS()
	2819	+ {
	2820	+ selection.GenNormalsMesh();
2626	2821	// for (int i=0; i<selection.size(); i++)
2627	2822	// {
2628	2823	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2763,6 +2958,24 @@
2763	2958	if (child == null)
2764	2959	continue;
2765	2960	child.GenNormals(crease);
	2961	+// Children().release(i);
	2962	+ }
	2963	+ blockloop = false;
	2964	+ }
	2965	+
	2966	+ void GenNormalsMesh()
	2967	+ {
	2968	+ if (blockloop)
	2969	+ return;
	2970	+
	2971	+ blockloop = true;
	2972	+ GenNormalsMesh0();
	2973	+ for (int i = 0; i < Children().Size(); i++)
	2974	+ {
	2975	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2976	+ if (child == null)
	2977	+ continue;
	2978	+ child.GenNormalsMesh();
2766	2979	// Children().release(i);
2767	2980	}
2768	2981	blockloop = false;
..	..	@@ -2935,11 +3148,20 @@
2935	3148	}
2936	3149	}
2937	3150
	3151	+ void GenNormalsMesh0()
	3152	+ {
	3153	+ if (bRep != null)
	3154	+ {
	3155	+ bRep.GenerateNormalsMesh();
	3156	+ Touch();
	3157	+ }
	3158	+ }
	3159	+
2938	3160	void GenNormalsMINE0()
2939	3161	{
2940	3162	if (bRep != null)
2941	3163	{
2942		- bRep.GenerateNormalsMINE();
	3164	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2943	3165	Touch();
2944	3166	}
2945	3167	}
..	..	@@ -3385,7 +3607,8 @@
3385	3607	if (blockloop)
3386	3608	return;
3387	3609
3388		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3389	3612	live = h;
3390	3613
3391	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3406,7 +3629,8 @@
3406	3629	return;
3407	3630
3408	3631	//if (bRep != null)
3409		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3632	+ if (//marked \|\| // does not make sense
	3633	+ (bRep != null \|\| material != null)) // borderline...
3410	3634	link2master = h;
3411	3635
3412	3636	for (int i = 0; i < Size(); i++)
..	..	@@ -3426,7 +3650,8 @@
3426	3650	if (blockloop)
3427	3651	return;
3428	3652
3429		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3653	+ if (//marked \|\| // does not make sense
	3654	+ (bRep != null \|\| material != null)) // borderline...
3430	3655	hide = h;
3431	3656
3432	3657	for (int i = 0; i < Size(); i++)
..	..	@@ -3446,7 +3671,7 @@
3446	3671	if (blockloop)
3447	3672	return;
3448	3673
3449		- if (bRep != null && material != null) // borderline...
	3674	+ if (bRep != null \|\| material != null) // borderline...
3450	3675	marked = h;
3451	3676
3452	3677	for (int i = 0; i < Size(); i++)
..	..	@@ -3456,6 +3681,46 @@
3456	3681	continue;
3457	3682	blockloop = true;
3458	3683	child.MarkLeaves(h);
	3684	+ blockloop = false;
	3685	+ // release(i);
	3686	+ }
	3687	+ }
	3688	+
	3689	+ void RewindLeaves(boolean h)
	3690	+ {
	3691	+ if (blockloop)
	3692	+ return;
	3693	+
	3694	+ if (bRep != null \|\| material != null) // borderline...
	3695	+ rewind = h;
	3696	+
	3697	+ for (int i = 0; i < Size(); i++)
	3698	+ {
	3699	+ Object3D child = (Object3D) get(i); // reserve(i);
	3700	+ if (child == null)
	3701	+ continue;
	3702	+ blockloop = true;
	3703	+ child.RewindLeaves(h);
	3704	+ blockloop = false;
	3705	+ // release(i);
	3706	+ }
	3707	+ }
	3708	+
	3709	+ void RandomLeaves(boolean h)
	3710	+ {
	3711	+ if (blockloop)
	3712	+ return;
	3713	+
	3714	+ if (bRep != null \|\| material != null) // borderline...
	3715	+ random = h;
	3716	+
	3717	+ for (int i = 0; i < Size(); i++)
	3718	+ {
	3719	+ Object3D child = (Object3D) get(i); // reserve(i);
	3720	+ if (child == null)
	3721	+ continue;
	3722	+ blockloop = true;
	3723	+ child.RandomLeaves(h);
3459	3724	blockloop = false;
3460	3725	// release(i);
3461	3726	}
..	..	@@ -4233,6 +4498,55 @@
4233	4498	}
4234	4499	}
4235	4500
	4501	+ void RepairSOV()
	4502	+ {
	4503	+ if (blockloop)
	4504	+ return;
	4505	+
	4506	+ String texname = this.GetPigmentTexture();
	4507	+
	4508	+ if (texname.startsWith("sov"))
	4509	+ {
	4510	+ String[] s = texname.split("/");
	4511	+
	4512	+ String[] sname = s[1].split("Color.pn");
	4513	+
	4514	+ texname = sname[0];
	4515	+
	4516	+ if (sname.length > 1)
	4517	+ {
	4518	+ texname += "Color.jpg";
	4519	+ }
	4520	+
	4521	+ this.SetPigmentTexture("sov/" + texname);
	4522	+ }
	4523	+
	4524	+ texname = this.GetBumpTexture();
	4525	+
	4526	+ if (texname.startsWith("sov"))
	4527	+ {
	4528	+ String[] s = texname.split("/");
	4529	+
	4530	+ String[] sname = s[1].split("Bump.pn");
	4531	+
	4532	+ texname = sname[0];
	4533	+
	4534	+ if (sname.length > 1)
	4535	+ {
	4536	+ texname += "Bump.jpg";
	4537	+ }
	4538	+
	4539	+ this.SetBumpTexture("sov/" + texname);
	4540	+ }
	4541	+
	4542	+ for (int i=0; i<Size(); i++)
	4543	+ {
	4544	+ blockloop = true;
	4545	+ get(i).RepairSOV();
	4546	+ blockloop = false;
	4547	+ }
	4548	+ }
	4549	+
4236	4550	void RepairTexture()
4237	4551	{
4238	4552	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4747,6 +5061,14 @@
4747	5061	}
4748	5062	}
4749	5063
	5064	+ ObjEditor GetWindow()
	5065	+ {
	5066	+ if (editWindow != null)
	5067	+ return editWindow;
	5068	+
	5069	+ return manipWindow;
	5070	+ }
	5071	+
4750	5072	cTreePath Select(int indexcount, boolean deselect)
4751	5073	{
4752	5074	if (hide \|\| dontselect)
..	..	@@ -4783,10 +5105,11 @@
4783	5105	if (leaf != null)
4784	5106	{
4785	5107	cTreePath tp = new cTreePath(this, leaf);
4786		- if (editWindow != null)
	5108	+ ObjEditor window = GetWindow();
	5109	+ if (window != null)
4787	5110	{
4788	5111	//System.out.println("editWindow = " + editWindow + " vs " + this);
4789		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4790	5113	}
4791	5114
4792	5115	return tp;
..	..	@@ -4803,6 +5126,7 @@
4803	5126
4804	5127	if (child == null)
4805	5128	continue;
	5129	+
4806	5130	if (child.HasTransparency() && child.size() != 0)
4807	5131	{
4808	5132	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4812,9 +5136,10 @@
4812	5136	if (leaf != null)
4813	5137	{
4814	5138	cTreePath tp = new cTreePath(this, leaf);
4815		- if (editWindow != null)
	5139	+ ObjEditor window = GetWindow();
	5140	+ if (window != null)
4816	5141	{
4817		- editWindow.Select(tp, deselect, true);
	5142	+ window.Select(tp, deselect, true);
4818	5143	}
4819	5144
4820	5145	return tp;
..	..	@@ -5139,6 +5464,51 @@
5139	5464	blockloop = false;
5140	5465	}
5141	5466
	5467	+ void ResetSelectable()
	5468	+ {
	5469	+ if (blockloop)
	5470	+ return;
	5471	+
	5472	+ blockloop = true;
	5473	+
	5474	+ keepdontselect = dontselect;
	5475	+ dontselect = true;
	5476	+
	5477	+ Object3D child;
	5478	+ int nb = Size();
	5479	+ for (int i = 0; i < nb; i++)
	5480	+ {
	5481	+ child = (Object3D) get(i);
	5482	+ if (child == null)
	5483	+ continue;
	5484	+ child.ResetSelectable();
	5485	+ }
	5486	+
	5487	+ blockloop = false;
	5488	+ }
	5489	+
	5490	+ void RestoreSelectable()
	5491	+ {
	5492	+ if (blockloop)
	5493	+ return;
	5494	+
	5495	+ blockloop = true;
	5496	+
	5497	+ dontselect = keepdontselect;
	5498	+
	5499	+ Object3D child;
	5500	+ int nb = Size();
	5501	+ for (int i = 0; i < nb; i++)
	5502	+ {
	5503	+ child = (Object3D) get(i);
	5504	+ if (child == null)
	5505	+ continue;
	5506	+ child.RestoreSelectable();
	5507	+ }
	5508	+
	5509	+ blockloop = false;
	5510	+ }
	5511	+
5142	5512	boolean IsSelected()
5143	5513	{
5144	5514	if (parent == null)
..	..	@@ -5448,6 +5818,38 @@
5448	5818	}
5449	5819	}
5450	5820
	5821	+ void EmbedTextures(boolean embed)
	5822	+ {
	5823	+ if (blockloop)
	5824	+ return;
	5825	+
	5826	+ //if (GetTextures() != null)
	5827	+ if (embed)
	5828	+ CameraPane.EmbedTextures(GetTextures());
	5829	+ else
	5830	+ {
	5831	+ GetTextures().pigmentdata = null;
	5832	+ GetTextures().bumpdata = null;
	5833	+ GetTextures().pw = 0;
	5834	+ GetTextures().ph = 0;
	5835	+ GetTextures().bw = 0;
	5836	+ GetTextures().bh = 0;
	5837	+ }
	5838	+
	5839	+ int nb = Size();
	5840	+ for (int i = 0; i < nb; i++)
	5841	+ {
	5842	+ Object3D child = (Object3D) get(i);
	5843	+
	5844	+ if (child == null)
	5845	+ continue;
	5846	+
	5847	+ blockloop = true;
	5848	+ child.EmbedTextures(embed);
	5849	+ blockloop = false;
	5850	+ }
	5851	+ }
	5852	+
5451	5853	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5452	5854	{
5453	5855	Draw(display, root, selected, blocked);
..	..	@@ -5456,12 +5858,23 @@
5456	5858	boolean NeedSupport()
5457	5859	{
5458	5860	return
5459		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5861	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5460	5862	// PROBLEM with CROWD!!
5461	5863	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5462	5864	}
5463	5865
5464	5866	static boolean DEBUG_SELECTION = false;
	5867	+
	5868	+ boolean IsLive()
	5869	+ {
	5870	+ if (live)
	5871	+ return true;
	5872	+
	5873	+ if (parent == null)
	5874	+ return false;
	5875	+
	5876	+ return parent.IsLive();
	5877	+ }
5465	5878
5466	5879	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5467	5880	{
..	..	@@ -5523,8 +5936,10 @@
5523	5936	if (support != null)
5524	5937	support = support;
5525	5938
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);
	5939	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+
	5942	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5528	5943
5529	5944	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5530	5945	{
..	..	@@ -5534,8 +5949,9 @@
5534	5949	// usecalllists &= !(parent instanceof RandomNode);
5535	5950	// usecalllists = false;
5536	5951
5537		- if (GetBRep() != null)
5538		- usecalllists = usecalllists;
	5952	+ if (display.DrawMode() == display.SHADOW)
	5953	+ //GetBRep() != null)
	5954	+ usecalllists = !!usecalllists;
5539	5955	//System.out.println("draw " + this);
5540	5956	//new Exception().printStackTrace();
5541	5957
..	..	@@ -5544,10 +5960,12 @@
5544	5960	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5545	5961
5546	5962	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5547		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5963	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5548	5965	{
5549	5966	Globals.lighttouched = true;
5550	5967	} // all panes...
	5968	+
5551	5969	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5552	5970	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5553	5971	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5555,7 +5973,7 @@
5555	5973	if (!(this instanceof Composite))
5556	5974	touched = false;
5557	5975	//if (displaylist == -1 && usecalllists)
5558		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5976	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5559	5977	{
5560	5978	bRep.displaylist = display.GenList();
5561	5979	assert(bRep.displaylist != 0);
..	..	@@ -5566,7 +5984,7 @@
5566	5984
5567	5985	//System.out.println("\tnew list " + list);
5568	5986	//gl.glDrawBuffer(gl.GL_NONE);
5569		- if (usecalllists)
	5987	+ if (usecalllists && bRep.displaylist > 0)
5570	5988	{
5571	5989	// System.err.println("new list " + bRep.displaylist + " for " + this);
5572	5990	display.NewList(bRep.displaylist);
..	..	@@ -5575,7 +5993,7 @@
5575	5993	CallList(display, root, selected, blocked);
5576	5994
5577	5995	// compiled = true;
5578		- if (usecalllists)
	5996	+ if (usecalllists && bRep.displaylist > 0)
5579	5997	{
5580	5998	// System.err.println("end list " + bRep.displaylist + " for " + this);
5581	5999	display.EndList();
..	..	@@ -5675,6 +6093,7 @@
5675	6093	if (GetBRep() != null)
5676	6094	{
5677	6095	display.NextIndex();
	6096	+
5678	6097	// vertex color conflict : gl.glCallList(list);
5679	6098	DrawNode(display, root, selected);
5680	6099	if (this instanceof BezierPatch)
..	..	@@ -5715,16 +6134,27 @@
5715	6134	tex = GetTextures();
5716	6135	}
5717	6136
5718		- boolean failed = false;
	6137	+ boolean failedPigment = false;
	6138	+ boolean failedBump = false;
5719	6139
5720	6140	try
5721	6141	{
5722		- display.BindTextures(tex, texres);
	6142	+ display.BindPigmentTexture(tex, texres);
5723	6143	}
5724	6144	catch (Exception e)
5725	6145	{
5726	6146	System.err.println("FAILED: " + this);
5727		- failed = true;
	6147	+ failedPigment = true;
	6148	+ }
	6149	+
	6150	+ try
	6151	+ {
	6152	+ display.BindBumpTexture(tex, texres);
	6153	+ }
	6154	+ catch (Exception e)
	6155	+ {
	6156	+ //System.err.println("FAILED: " + this);
	6157	+ failedBump = true;
5728	6158	}
5729	6159
5730	6160	if (!compiled)
..	..	@@ -5747,8 +6177,11 @@
5747	6177	}
5748	6178	}
5749	6179
5750		- if (!failed)
5751		- display.ReleaseTextures(tex);
	6180	+ if (!failedBump)
	6181	+ display.ReleaseBumpTexture(tex);
	6182	+
	6183	+ if (!failedPigment)
	6184	+ display.ReleasePigmentTexture(tex);
5752	6185
5753	6186	display.PopMaterial(this, selected);
5754	6187	}
..	..	@@ -6121,6 +6554,11 @@
6121	6554	// dec 2012
6122	6555	new Exception().printStackTrace();
6123	6556	return;
	6557	+ }
	6558	+
	6559	+ if (dontselect)
	6560	+ {
	6561	+ //bRep.GenerateNormalsMINE();
6124	6562	}
6125	6563
6126	6564	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6906,20 +7344,23 @@
6906	7344	}
6907	7345	}
6908	7346
6909		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7347	+ static ClickInfo clickInfo = new ClickInfo();
	7348	+
	7349	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7350	+ Point outPt, Rectangle outRec)
6910	7351	{
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;
	7352	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7353	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7354	+ double[][] toscreen = clickInfo.toScreen;
6914	7355	if (toscreen == null)
6915	7356	{
6916		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7357	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6917	7358	}
6918	7359	cVector vec = in;
6919	7360	LA.xformPos(in, toscreen, in);
6920	7361	//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();
	7362	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7363	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6923	7364	outPt.x = hc + (int) vec.x;
6924	7365	outPt.y = vc - (int) vec.y;
6925	7366	outRec.x = outPt.x - 3;
..	..	@@ -6927,15 +7368,18 @@
6927	7368	outRec.width = outRec.height = 6;
6928	7369	}
6929	7370
6930		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7371	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7372	+ )
6931	7373	{
6932	7374	Point pt = new Point(0, 0);
6933	7375	Rectangle rec = new Rectangle();
6934		- calcHotSpot(in, info, pt, rec);
	7376	+ calcHotSpot(in, //clickInfo,
	7377	+ pt, rec);
6935	7378	return rec;
6936	7379	}
6937	7380
6938		- void drawEditHandles0(ClickInfo info, int level)
	7381	+ void drawEditHandles0(//ClickInfo clickInfo,
	7382	+ int level)
6939	7383	{
6940	7384	if (level == 0)
6941	7385	{
..	..	@@ -6944,16 +7388,19 @@
6944	7388	{
6945	7389	cVector origin = new cVector();
6946	7390	//LA.xformPos(origin, toParent, origin);
6947		- Rectangle spot = calcHotSpot(origin, info);
	7391	+ if (this.clickInfo == null)
	7392	+ this.clickInfo = new ClickInfo();
	7393	+
	7394	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6948	7395	Rectangle boundary = new Rectangle();
6949	7396	boundary.x = spot.x - 30;
6950	7397	boundary.y = spot.y - 30;
6951	7398	boundary.width = spot.width + 60;
6952	7399	boundary.height = spot.height + 60;
6953		- info.g.setColor(Color.red);
	7400	+ clickInfo.g.setColor(Color.red);
6954	7401	int spotw = spot.x + spot.width;
6955	7402	int spoth = spot.y + spot.height;
6956		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7403	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6957	7404	// if (CameraPane.Xmin > spot.x)
6958	7405	// {
6959	7406	// CameraPane.Xmin = spot.x;
..	..	@@ -6973,8 +7420,8 @@
6973	7420	spot.translate(32, 32);
6974	7421	spotw = spot.x + spot.width;
6975	7422	spoth = spot.y + spot.height;
6976		- info.g.setColor(Color.blue);
6977		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.setColor(Color.cyan);
	7424	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6978	7425	// if (CameraPane.Xmin > spot.x)
6979	7426	// {
6980	7427	// CameraPane.Xmin = spot.x;
..	..	@@ -6991,11 +7438,12 @@
6991	7438	// {
6992	7439	// CameraPane.Ymax = spoth;
6993	7440	// }
6994		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6995		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7441	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7442	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6996	7443	spot.translate(0, -32);
6997		- info.g.setColor(Color.green);
6998		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7444	+ clickInfo.g.setColor(Color.yellow);
	7445	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7446	+ clickInfo.g.setColor(Color.green);
6999	7447	// if (CameraPane.Xmin > spot.x)
7000	7448	// {
7001	7449	// CameraPane.Xmin = spot.x;
..	..	@@ -7012,8 +7460,8 @@
7012	7460	// {
7013	7461	// CameraPane.Ymax = spoth;
7014	7462	// }
7015		- info.g.drawArc(boundary.x, boundary.y,
7016		- boundary.width, boundary.height, 0, 360);
	7463	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7464	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7017	7465	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7018	7466	// if (CameraPane.Xmin > boundary.x)
7019	7467	// {
..	..	@@ -7035,7 +7483,8 @@
7035	7483	}
7036	7484	}
7037	7485
7038		- boolean doEditClick0(ClickInfo info, int level)
	7486	+ boolean doEditClick0(//ClickInfo clickInfo,
	7487	+ int level)
7039	7488	{
7040	7489	if (level == 0)
7041	7490	{
..	..	@@ -7044,8 +7493,8 @@
7044	7493
7045	7494	boolean retval = false;
7046	7495
7047		- startX = info.x;
7048		- startY = info.y;
	7496	+ startX = clickInfo.x;
	7497	+ startY = clickInfo.y;
7049	7498
7050	7499	hitSomething = -1;
7051	7500	cVector origin = new cVector();
..	..	@@ -7055,22 +7504,51 @@
7055	7504	{
7056	7505	centerPt = new Point(0, 0);
7057	7506	}
7058		- calcHotSpot(origin, info, centerPt, spot);
7059		- if (spot.contains(info.x, info.y))
	7507	+ calcHotSpot(origin, //info,
	7508	+ centerPt, spot);
	7509	+ if (spot.contains(clickInfo.x, clickInfo.y))
7060	7510	{
7061	7511	hitSomething = hitCenter;
7062	7512	retval = true;
7063	7513	}
7064	7514	spot.translate(32, 0);
7065		- if (spot.contains(info.x, info.y))
	7515	+ if (spot.contains(clickInfo.x, clickInfo.y))
7066	7516	{
7067	7517	hitSomething = hitRotate;
7068	7518	retval = true;
7069	7519	}
7070	7520	spot.translate(0, 32);
7071		- if (spot.contains(info.x, info.y))
	7521	+ if (spot.contains(clickInfo.x, clickInfo.y))
7072	7522	{
7073	7523	hitSomething = hitScale;
	7524	+
	7525	+ double scale = 0.005f * clickInfo.camera.Distance();
	7526	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7527	+ double sign = 1;
	7528	+ if (hScale < 0)
	7529	+ {
	7530	+ sign = -1;
	7531	+ }
	7532	+ hScale = signMath.pow(signhScale, scale * 50);
	7533	+ if (hScale < 0.01)
	7534	+ {
	7535	+ //hScale = 0.01;
	7536	+ }
	7537	+
	7538	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7539	+ sign = 1;
	7540	+ if (vScale < 0)
	7541	+ {
	7542	+ sign = -1;
	7543	+ }
	7544	+ vScale = signMath.pow(signvScale, scale * 50);
	7545	+ if (vScale < 0.01)
	7546	+ {
	7547	+ //vScale = 0.01;
	7548	+ }
	7549	+
	7550	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7551	+
7074	7552	retval = true;
7075	7553	}
7076	7554
..	..	@@ -7080,7 +7558,7 @@
7080	7558	}
7081	7559
7082	7560	//System.out.println("info.modifiers = " + info.modifiers);
7083		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7561	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7084	7562	//System.out.println("modified = " + modified);
7085	7563	//new Exception().printStackTrace();
7086	7564	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7108,7 +7586,8 @@
7108	7586	return true;
7109	7587	}
7110	7588
7111		- void doEditDrag0(ClickInfo info, boolean opposite)
	7589	+ void doEditDrag0(//ClickInfo info,
	7590	+ boolean opposite)
7112	7591	{
7113	7592	if (hitSomething == 0)
7114	7593	{
..	..	@@ -7122,7 +7601,7 @@
7122	7601
7123	7602	//System.out.println("hitSomething = " + hitSomething);
7124	7603
7125		- double scale = 0.005f * info.camera.Distance();
	7604	+ double scale = 0.005f * clickInfo.camera.Distance();
7126	7605
7127	7606	cVector xlate = new cVector();
7128	7607	//cVector xlate2 = new cVector();
..	..	@@ -7156,8 +7635,8 @@
7156	7635	toParent[3][i] = xlate.get(i);
7157	7636	LA.matInvert(toParent, fromParent);
7158	7637	*/
7159		- cVector delta = LA.newVector(0, 0, startY - info.y);
7160		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7638	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7639	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7161	7640
7162	7641	LA.matCopy(startMat, toParent);
7163	7642	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7166,7 +7645,7 @@
7166	7645	} else
7167	7646	{
7168	7647	//LA.xformDir(delta, info.camera.fromScreen, delta);
7169		- cVector up = new cVector(info.camera.up);
	7648	+ cVector up = new cVector(clickInfo.camera.up);
7170	7649	cVector away = new cVector();
7171	7650	//cVector right2 = new cVector();
7172	7651	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7183,19 +7662,19 @@
7183	7662	LA.xformDir(up, ClickInfo.matbuffer, up);
7184	7663	// if (!CameraPane.LOCALTRANSFORM)
7185	7664	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7186		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7665	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7187	7666	// if (!CameraPane.LOCALTRANSFORM)
7188	7667	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7189	7668	//LA.vecCross(up, cVector.Z, right2);
7190	7669
7191		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7670	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7192	7671
7193	7672	//System.out.println("DELTA0 = " + delta);
7194	7673	//System.out.println("AWAY = " + info.camera.away);
7195	7674	//System.out.println("UP = " + info.camera.up);
7196	7675	if (away.z > 0)
7197	7676	{
7198		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7677	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7199	7678	{
7200	7679	delta.x = -delta.x;
7201	7680	} else
..	..	@@ -7210,7 +7689,7 @@
7210	7689	//System.out.println("DELTA1 = " + delta);
7211	7690	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7212	7691	//System.out.println("DELTA2 = " + delta);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7692	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7693	LA.matCopy(startMat, toParent);
7215	7694	//System.out.println("DELTA3 = " + delta);
7216	7695	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7220,8 +7699,8 @@
7220	7699	break;
7221	7700
7222	7701	case hitRotate: // rotate
7223		- int dx = info.x - centerPt.x;
7224		- int dy = -(info.y - centerPt.y);
	7702	+ int dx = clickInfo.x - centerPt.x;
	7703	+ int dy = -(clickInfo.y - centerPt.y);
7225	7704	double angle = (double) Math.atan2(dx, dy);
7226	7705	angle = -(1.570796 - angle);
7227	7706
..	..	@@ -7244,7 +7723,7 @@
7244	7723	}
7245	7724	/**/
7246	7725
7247		- switch (info.pane.RenderCamera().viewCode)
	7726	+ switch (clickInfo.pane.RenderCamera().viewCode)
7248	7727	{
7249	7728	case 1: // '\001'
7250	7729	LA.matZRotate(toParent, angle);
..	..	@@ -7271,7 +7750,7 @@
7271	7750	break;
7272	7751
7273	7752	case hitScale: // scale
7274		- double hScale = (double) (info.x - centerPt.x) / 32;
	7753	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7275	7754	double sign = 1;
7276	7755	if (hScale < 0)
7277	7756	{
..	..	@@ -7283,7 +7762,7 @@
7283	7762	//hScale = 0.01;
7284	7763	}
7285	7764
7286		- double vScale = (double) (info.y - centerPt.y) / 32;
	7765	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7287	7766	sign = 1;
7288	7767	if (vScale < 0)
7289	7768	{
..	..	@@ -7294,6 +7773,7 @@
7294	7773	{
7295	7774	//vScale = 0.01;
7296	7775	}
	7776	+
7297	7777	LA.matCopy(startMat, toParent);
7298	7778	/**/
7299	7779	for (int i = 0; i < 3; i++)
..	..	@@ -7303,29 +7783,30 @@
7303	7783	}
7304	7784	/**/
7305	7785
7306		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7786	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7307	7787
7308	7788	if (totalScale < 0.01)
7309	7789	{
7310	7790	totalScale = 0.01;
7311	7791	}
7312	7792
7313		- switch (info.pane.RenderCamera().viewCode)
	7793	+ switch (clickInfo.pane.RenderCamera().viewCode)
7314	7794	{
7315	7795	case 3: // '\001'
7316		- if (modified)
	7796	+ if (modified \|\| opposite)
7317	7797	{
7318	7798	//LA.matScale(toParent, 1, hScale, vScale);
7319	7799	LA.matScale(toParent, totalScale, 1, 1);
7320	7800	} // vScale, 1);
7321	7801	else
7322	7802	{
	7803	+ // EXCEPTION!
7323	7804	LA.matScale(toParent, totalScale, totalScale, totalScale);
7324	7805	} // vScale, 1);
7325	7806	break;
7326	7807
7327	7808	case 2: // '\002'
7328		- if (modified)
	7809	+ if (modified \|\| opposite)
7329	7810	{
7330	7811	//LA.matScale(toParent, hScale, 1, vScale);
7331	7812	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7336,7 +7817,7 @@
7336	7817	break;
7337	7818
7338	7819	case 1: // '\003'
7339		- if (modified)
	7820	+ if (modified \|\| opposite)
7340	7821	{
7341	7822	//LA.matScale(toParent, hScale, vScale, 1);
7342	7823	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7376,7 +7857,7 @@
7376	7857	} // NEW ...
7377	7858
7378	7859
7379		- info.pane.repaint();
	7860	+ clickInfo.pane.repaint();
7380	7861	}
7381	7862
7382	7863	boolean overflow = false;
..	..	@@ -7556,6 +8037,10 @@
7556	8037	editWindow = null;
7557	8038	} // ?
7558	8039	}
	8040	+ else
	8041	+ {
	8042	+ //editWindow.closeUI();
	8043	+ }
7559	8044	}
7560	8045
7561	8046	boolean root; // patch for edit windows
..	..	@@ -7567,7 +8052,7 @@
7567	8052	/transient/ cVector2[] projectedVertices = new cVector2[0];
7568	8053
7569	8054	Object3D /Composite/ parent;
7570		- Object3D /Composite/ fileparent;
	8055	+ Object3D /Composite/ fileparent; // In the case of FileObject
7571	8056
7572	8057	double[][] toParent; // dynamic matrix
7573	8058	double[][] fromParent;
..	..	@@ -7713,6 +8198,10 @@
7713	8198	}
7714	8199
7715	8200	transient ObjEditor editWindow;
	8201	+ transient ObjEditor manipWindow;
	8202	+
	8203	+ transient boolean pinned;
	8204	+
7716	8205	transient ObjectUI objectUI;
7717	8206	public static int povDepth = 0;
7718	8207	private static cVector tbMin = new cVector();