~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,11 @@
2307	2465	}
2308	2466	*/
2309	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2310	2473	}
2311	2474
2312	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2348,6 +2511,14 @@
2348	2511	{
2349	2512	editWindow.refreshContents();
2350	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2351	2522	//if (parent != null)
2352	2523	//parent.refreshEditWindow();
2353	2524	}
..	..	@@ -2427,7 +2598,8 @@
2427	2598	private static final int editSelf = 1;
2428	2599	private static final int editChild = 2;
2429	2600
2430		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2431	2603	{
2432	2604	if (level == 0)
2433	2605	{
..	..	@@ -2435,7 +2607,8 @@
2435	2607	return;
2436	2608
2437	2609	Object3D selectee;
2438		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2610	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2611	+ level + 1))
2439	2612	{
2440	2613	selectee = (Object3D) e.nextElement();
2441	2614	}
..	..	@@ -2443,19 +2616,22 @@
2443	2616	} else
2444	2617	{
2445	2618	//super.
2446		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2447	2621	}
2448	2622	}
2449	2623
2450		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2451	2626	{
2452	2627	doSomething = 0;
2453	2628	if (level == 0)
2454	2629	{
2455		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2456	2631	}
2457	2632	if (//super.
2458		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2459	2635	{
2460	2636	doSomething = 1;
2461	2637	return true;
..	..	@@ -2465,7 +2641,7 @@
2465	2641	}
2466	2642	}
2467	2643
2468		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2469	2645	{
2470	2646	if (selection == null)
2471	2647	{
..	..	@@ -2478,7 +2654,8 @@
2478	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2479	2655	{
2480	2656	Object3D selectee = (Object3D) e.nextElement();
2481		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2482	2659	{
2483	2660	childToDrag = selectee;
2484	2661	doSomething = 2;
..	..	@@ -2490,13 +2667,15 @@
2490	2667	return retval;
2491	2668	}
2492	2669
2493		- void doEditDrag(ClickInfo info, boolean opposite)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2494	2672	{
2495	2673	switch (doSomething)
2496	2674	{
2497	2675	case 1: // '\001'
2498	2676	//super.
2499		- doEditDrag0(info, opposite);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2500	2679	break;
2501	2680
2502	2681	case 2: // '\002'
..	..	@@ -2509,11 +2688,13 @@
2509	2688	{
2510	2689	//sel.hitSomething = childToDrag.hitSomething;
2511	2690	//childToDrag.doEditDrag(info);
2512		- sel.doEditDrag(info, opposite);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2513	2693	} else
2514	2694	{
2515	2695	//super.
2516		- doEditDrag0(info, opposite);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2517	2698	}
2518	2699	}
2519	2700	break;
..	..	@@ -2531,6 +2712,9 @@
2531	2712	{
2532	2713	deselectAll();
2533	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2534	2718	ClickInfo newInfo = new ClickInfo();
2535	2719	newInfo.flags = info.flags;
2536	2720	newInfo.bounds = info.bounds;
..	..	@@ -2623,6 +2807,18 @@
2623	2807	void GenNormalsS(boolean crease)
2624	2808	{
2625	2809	selection.GenNormals(crease);
	2810	+// for (int i=0; i<selection.size(); i++)
	2811	+// {
	2812	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2813	+// selectee.GenNormals(crease);
	2814	+// }
	2815	+
	2816	+ //Touch();
	2817	+ }
	2818	+
	2819	+ void GenNormalsMeshS()
	2820	+ {
	2821	+ selection.GenNormalsMesh();
2626	2822	// for (int i=0; i<selection.size(); i++)
2627	2823	// {
2628	2824	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2763,6 +2959,24 @@
2763	2959	if (child == null)
2764	2960	continue;
2765	2961	child.GenNormals(crease);
	2962	+// Children().release(i);
	2963	+ }
	2964	+ blockloop = false;
	2965	+ }
	2966	+
	2967	+ void GenNormalsMesh()
	2968	+ {
	2969	+ if (blockloop)
	2970	+ return;
	2971	+
	2972	+ blockloop = true;
	2973	+ GenNormalsMesh0();
	2974	+ for (int i = 0; i < Children().Size(); i++)
	2975	+ {
	2976	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2977	+ if (child == null)
	2978	+ continue;
	2979	+ child.GenNormalsMesh();
2766	2980	// Children().release(i);
2767	2981	}
2768	2982	blockloop = false;
..	..	@@ -2935,11 +3149,20 @@
2935	3149	}
2936	3150	}
2937	3151
	3152	+ void GenNormalsMesh0()
	3153	+ {
	3154	+ if (bRep != null)
	3155	+ {
	3156	+ bRep.GenerateNormalsMesh();
	3157	+ Touch();
	3158	+ }
	3159	+ }
	3160	+
2938	3161	void GenNormalsMINE0()
2939	3162	{
2940	3163	if (bRep != null)
2941	3164	{
2942		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2943	3166	Touch();
2944	3167	}
2945	3168	}
..	..	@@ -3385,7 +3608,8 @@
3385	3608	if (blockloop)
3386	3609	return;
3387	3610
3388		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3389	3613	live = h;
3390	3614
3391	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3406,7 +3630,8 @@
3406	3630	return;
3407	3631
3408	3632	//if (bRep != null)
3409		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3410	3635	link2master = h;
3411	3636
3412	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3426,7 +3651,8 @@
3426	3651	if (blockloop)
3427	3652	return;
3428	3653
3429		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3430	3656	hide = h;
3431	3657
3432	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3446,7 +3672,7 @@
3446	3672	if (blockloop)
3447	3673	return;
3448	3674
3449		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3450	3676	marked = h;
3451	3677
3452	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3456,6 +3682,46 @@
3456	3682	continue;
3457	3683	blockloop = true;
3458	3684	child.MarkLeaves(h);
	3685	+ blockloop = false;
	3686	+ // release(i);
	3687	+ }
	3688	+ }
	3689	+
	3690	+ void RewindLeaves(boolean h)
	3691	+ {
	3692	+ if (blockloop)
	3693	+ return;
	3694	+
	3695	+ if (bRep != null \|\| material != null) // borderline...
	3696	+ rewind = h;
	3697	+
	3698	+ for (int i = 0; i < Size(); i++)
	3699	+ {
	3700	+ Object3D child = (Object3D) get(i); // reserve(i);
	3701	+ if (child == null)
	3702	+ continue;
	3703	+ blockloop = true;
	3704	+ child.RewindLeaves(h);
	3705	+ blockloop = false;
	3706	+ // release(i);
	3707	+ }
	3708	+ }
	3709	+
	3710	+ void RandomLeaves(boolean h)
	3711	+ {
	3712	+ if (blockloop)
	3713	+ return;
	3714	+
	3715	+ if (bRep != null \|\| material != null) // borderline...
	3716	+ random = h;
	3717	+
	3718	+ for (int i = 0; i < Size(); i++)
	3719	+ {
	3720	+ Object3D child = (Object3D) get(i); // reserve(i);
	3721	+ if (child == null)
	3722	+ continue;
	3723	+ blockloop = true;
	3724	+ child.RandomLeaves(h);
3459	3725	blockloop = false;
3460	3726	// release(i);
3461	3727	}
..	..	@@ -4233,6 +4499,55 @@
4233	4499	}
4234	4500	}
4235	4501
	4502	+ void RepairSOV()
	4503	+ {
	4504	+ if (blockloop)
	4505	+ return;
	4506	+
	4507	+ String texname = this.GetPigmentTexture();
	4508	+
	4509	+ if (texname.startsWith("sov"))
	4510	+ {
	4511	+ String[] s = texname.split("/");
	4512	+
	4513	+ String[] sname = s[1].split("Color.pn");
	4514	+
	4515	+ texname = sname[0];
	4516	+
	4517	+ if (sname.length > 1)
	4518	+ {
	4519	+ texname += "Color.jpg";
	4520	+ }
	4521	+
	4522	+ this.SetPigmentTexture("sov/" + texname);
	4523	+ }
	4524	+
	4525	+ texname = this.GetBumpTexture();
	4526	+
	4527	+ if (texname.startsWith("sov"))
	4528	+ {
	4529	+ String[] s = texname.split("/");
	4530	+
	4531	+ String[] sname = s[1].split("Bump.pn");
	4532	+
	4533	+ texname = sname[0];
	4534	+
	4535	+ if (sname.length > 1)
	4536	+ {
	4537	+ texname += "Bump.jpg";
	4538	+ }
	4539	+
	4540	+ this.SetBumpTexture("sov/" + texname);
	4541	+ }
	4542	+
	4543	+ for (int i=0; i<Size(); i++)
	4544	+ {
	4545	+ blockloop = true;
	4546	+ get(i).RepairSOV();
	4547	+ blockloop = false;
	4548	+ }
	4549	+ }
	4550	+
4236	4551	void RepairTexture()
4237	4552	{
4238	4553	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4747,6 +5062,14 @@
4747	5062	}
4748	5063	}
4749	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4750	5073	cTreePath Select(int indexcount, boolean deselect)
4751	5074	{
4752	5075	if (hide \|\| dontselect)
..	..	@@ -4783,10 +5106,11 @@
4783	5106	if (leaf != null)
4784	5107	{
4785	5108	cTreePath tp = new cTreePath(this, leaf);
4786		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4787	5111	{
4788	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4789		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4790	5114	}
4791	5115
4792	5116	return tp;
..	..	@@ -4803,6 +5127,7 @@
4803	5127
4804	5128	if (child == null)
4805	5129	continue;
	5130	+
4806	5131	if (child.HasTransparency() && child.size() != 0)
4807	5132	{
4808	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4812,9 +5137,10 @@
4812	5137	if (leaf != null)
4813	5138	{
4814	5139	cTreePath tp = new cTreePath(this, leaf);
4815		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4816	5142	{
4817		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4818	5144	}
4819	5145
4820	5146	return tp;
..	..	@@ -5139,6 +5465,51 @@
5139	5465	blockloop = false;
5140	5466	}
5141	5467
	5468	+ void ResetSelectable()
	5469	+ {
	5470	+ if (blockloop)
	5471	+ return;
	5472	+
	5473	+ blockloop = true;
	5474	+
	5475	+ keepdontselect = dontselect;
	5476	+ dontselect = true;
	5477	+
	5478	+ Object3D child;
	5479	+ int nb = Size();
	5480	+ for (int i = 0; i < nb; i++)
	5481	+ {
	5482	+ child = (Object3D) get(i);
	5483	+ if (child == null)
	5484	+ continue;
	5485	+ child.ResetSelectable();
	5486	+ }
	5487	+
	5488	+ blockloop = false;
	5489	+ }
	5490	+
	5491	+ void RestoreSelectable()
	5492	+ {
	5493	+ if (blockloop)
	5494	+ return;
	5495	+
	5496	+ blockloop = true;
	5497	+
	5498	+ dontselect = keepdontselect;
	5499	+
	5500	+ Object3D child;
	5501	+ int nb = Size();
	5502	+ for (int i = 0; i < nb; i++)
	5503	+ {
	5504	+ child = (Object3D) get(i);
	5505	+ if (child == null)
	5506	+ continue;
	5507	+ child.RestoreSelectable();
	5508	+ }
	5509	+
	5510	+ blockloop = false;
	5511	+ }
	5512	+
5142	5513	boolean IsSelected()
5143	5514	{
5144	5515	if (parent == null)
..	..	@@ -5448,6 +5819,38 @@
5448	5819	}
5449	5820	}
5450	5821
	5822	+ void EmbedTextures(boolean embed)
	5823	+ {
	5824	+ if (blockloop)
	5825	+ return;
	5826	+
	5827	+ //if (GetTextures() != null)
	5828	+ if (embed)
	5829	+ CameraPane.EmbedTextures(GetTextures());
	5830	+ else
	5831	+ {
	5832	+ GetTextures().pigmentdata = null;
	5833	+ GetTextures().bumpdata = null;
	5834	+ GetTextures().pw = 0;
	5835	+ GetTextures().ph = 0;
	5836	+ GetTextures().bw = 0;
	5837	+ GetTextures().bh = 0;
	5838	+ }
	5839	+
	5840	+ int nb = Size();
	5841	+ for (int i = 0; i < nb; i++)
	5842	+ {
	5843	+ Object3D child = (Object3D) get(i);
	5844	+
	5845	+ if (child == null)
	5846	+ continue;
	5847	+
	5848	+ blockloop = true;
	5849	+ child.EmbedTextures(embed);
	5850	+ blockloop = false;
	5851	+ }
	5852	+ }
	5853	+
5451	5854	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5452	5855	{
5453	5856	Draw(display, root, selected, blocked);
..	..	@@ -5456,12 +5859,23 @@
5456	5859	boolean NeedSupport()
5457	5860	{
5458	5861	return
5459		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5862	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5460	5863	// PROBLEM with CROWD!!
5461	5864	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5462	5865	}
5463	5866
5464	5867	static boolean DEBUG_SELECTION = false;
	5868	+
	5869	+ boolean IsLive()
	5870	+ {
	5871	+ if (live)
	5872	+ return true;
	5873	+
	5874	+ if (parent == null)
	5875	+ return false;
	5876	+
	5877	+ return parent.IsLive();
	5878	+ }
5465	5879
5466	5880	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5467	5881	{
..	..	@@ -5523,8 +5937,10 @@
5523	5937	if (support != null)
5524	5938	support = support;
5525	5939
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);
	5940	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5942	+
	5943	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5528	5944
5529	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5530	5946	{
..	..	@@ -5534,8 +5950,9 @@
5534	5950	// usecalllists &= !(parent instanceof RandomNode);
5535	5951	// usecalllists = false;
5536	5952
5537		- if (GetBRep() != null)
5538		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5539	5956	//System.out.println("draw " + this);
5540	5957	//new Exception().printStackTrace();
5541	5958
..	..	@@ -5544,10 +5961,12 @@
5544	5961	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5545	5962
5546	5963	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5547		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5548	5966	{
5549	5967	Globals.lighttouched = true;
5550	5968	} // all panes...
	5969	+
5551	5970	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5552	5971	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5553	5972	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5555,7 +5974,7 @@
5555	5974	if (!(this instanceof Composite))
5556	5975	touched = false;
5557	5976	//if (displaylist == -1 && usecalllists)
5558		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5559	5978	{
5560	5979	bRep.displaylist = display.GenList();
5561	5980	assert(bRep.displaylist != 0);
..	..	@@ -5566,7 +5985,7 @@
5566	5985
5567	5986	//System.out.println("\tnew list " + list);
5568	5987	//gl.glDrawBuffer(gl.GL_NONE);
5569		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5570	5989	{
5571	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5572	5991	display.NewList(bRep.displaylist);
..	..	@@ -5575,7 +5994,7 @@
5575	5994	CallList(display, root, selected, blocked);
5576	5995
5577	5996	// compiled = true;
5578		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5579	5998	{
5580	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5581	6000	display.EndList();
..	..	@@ -5675,6 +6094,7 @@
5675	6094	if (GetBRep() != null)
5676	6095	{
5677	6096	display.NextIndex();
	6097	+
5678	6098	// vertex color conflict : gl.glCallList(list);
5679	6099	DrawNode(display, root, selected);
5680	6100	if (this instanceof BezierPatch)
..	..	@@ -5715,16 +6135,27 @@
5715	6135	tex = GetTextures();
5716	6136	}
5717	6137
5718		- boolean failed = false;
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
5719	6140
5720	6141	try
5721	6142	{
5722		- display.BindTextures(tex, texres);
	6143	+ display.BindPigmentTexture(tex, texres);
5723	6144	}
5724	6145	catch (Exception e)
5725	6146	{
5726	6147	System.err.println("FAILED: " + this);
5727		- failed = true;
	6148	+ failedPigment = true;
	6149	+ }
	6150	+
	6151	+ try
	6152	+ {
	6153	+ display.BindBumpTexture(tex, texres);
	6154	+ }
	6155	+ catch (Exception e)
	6156	+ {
	6157	+ //System.err.println("FAILED: " + this);
	6158	+ failedBump = true;
5728	6159	}
5729	6160
5730	6161	if (!compiled)
..	..	@@ -5747,8 +6178,11 @@
5747	6178	}
5748	6179	}
5749	6180
5750		- if (!failed)
5751		- display.ReleaseTextures(tex);
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
5752	6186
5753	6187	display.PopMaterial(this, selected);
5754	6188	}
..	..	@@ -6121,6 +6555,11 @@
6121	6555	// dec 2012
6122	6556	new Exception().printStackTrace();
6123	6557	return;
	6558	+ }
	6559	+
	6560	+ if (dontselect)
	6561	+ {
	6562	+ //bRep.GenerateNormalsMINE();
6124	6563	}
6125	6564
6126	6565	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6906,20 +7345,23 @@
6906	7345	}
6907	7346	}
6908	7347
6909		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7348	+ static ClickInfo clickInfo = new ClickInfo();
	7349	+
	7350	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7351	+ Point outPt, Rectangle outRec)
6910	7352	{
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;
	7353	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7354	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7355	+ double[][] toscreen = clickInfo.toScreen;
6914	7356	if (toscreen == null)
6915	7357	{
6916		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6917	7359	}
6918	7360	cVector vec = in;
6919	7361	LA.xformPos(in, toscreen, in);
6920	7362	//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();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6923	7365	outPt.x = hc + (int) vec.x;
6924	7366	outPt.y = vc - (int) vec.y;
6925	7367	outRec.x = outPt.x - 3;
..	..	@@ -6927,15 +7369,18 @@
6927	7369	outRec.width = outRec.height = 6;
6928	7370	}
6929	7371
6930		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
6931	7374	{
6932	7375	Point pt = new Point(0, 0);
6933	7376	Rectangle rec = new Rectangle();
6934		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
6935	7379	return rec;
6936	7380	}
6937	7381
6938		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
6939	7384	{
6940	7385	if (level == 0)
6941	7386	{
..	..	@@ -6944,16 +7389,19 @@
6944	7389	{
6945	7390	cVector origin = new cVector();
6946	7391	//LA.xformPos(origin, toParent, origin);
6947		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6948	7396	Rectangle boundary = new Rectangle();
6949	7397	boundary.x = spot.x - 30;
6950	7398	boundary.y = spot.y - 30;
6951	7399	boundary.width = spot.width + 60;
6952	7400	boundary.height = spot.height + 60;
6953		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
6954	7402	int spotw = spot.x + spot.width;
6955	7403	int spoth = spot.y + spot.height;
6956		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6957	7405	// if (CameraPane.Xmin > spot.x)
6958	7406	// {
6959	7407	// CameraPane.Xmin = spot.x;
..	..	@@ -6973,8 +7421,8 @@
6973	7421	spot.translate(32, 32);
6974	7422	spotw = spot.x + spot.width;
6975	7423	spoth = spot.y + spot.height;
6976		- info.g.setColor(Color.blue);
6977		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7424	+ clickInfo.g.setColor(Color.cyan);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6978	7426	// if (CameraPane.Xmin > spot.x)
6979	7427	// {
6980	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -6991,11 +7439,12 @@
6991	7439	// {
6992	7440	// CameraPane.Ymax = spoth;
6993	7441	// }
6994		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6995		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7442	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7443	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6996	7444	spot.translate(0, -32);
6997		- info.g.setColor(Color.green);
6998		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
6999	7448	// if (CameraPane.Xmin > spot.x)
7000	7449	// {
7001	7450	// CameraPane.Xmin = spot.x;
..	..	@@ -7012,8 +7461,8 @@
7012	7461	// {
7013	7462	// CameraPane.Ymax = spoth;
7014	7463	// }
7015		- info.g.drawArc(boundary.x, boundary.y,
7016		- boundary.width, boundary.height, 0, 360);
	7464	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7465	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7017	7466	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7018	7467	// if (CameraPane.Xmin > boundary.x)
7019	7468	// {
..	..	@@ -7035,7 +7484,8 @@
7035	7484	}
7036	7485	}
7037	7486
7038		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
7039	7489	{
7040	7490	if (level == 0)
7041	7491	{
..	..	@@ -7044,8 +7494,8 @@
7044	7494
7045	7495	boolean retval = false;
7046	7496
7047		- startX = info.x;
7048		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
7049	7499
7050	7500	hitSomething = -1;
7051	7501	cVector origin = new cVector();
..	..	@@ -7055,22 +7505,51 @@
7055	7505	{
7056	7506	centerPt = new Point(0, 0);
7057	7507	}
7058		- calcHotSpot(origin, info, centerPt, spot);
7059		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
7060	7511	{
7061	7512	hitSomething = hitCenter;
7062	7513	retval = true;
7063	7514	}
7064	7515	spot.translate(32, 0);
7065		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
7066	7517	{
7067	7518	hitSomething = hitRotate;
7068	7519	retval = true;
7069	7520	}
7070	7521	spot.translate(0, 32);
7071		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
7072	7523	{
7073	7524	hitSomething = hitScale;
	7525	+
	7526	+ double scale = 0.005f * clickInfo.camera.Distance();
	7527	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7528	+ double sign = 1;
	7529	+ if (hScale < 0)
	7530	+ {
	7531	+ sign = -1;
	7532	+ }
	7533	+ hScale = signMath.pow(signhScale, scale * 50);
	7534	+ if (hScale < 0.01)
	7535	+ {
	7536	+ //hScale = 0.01;
	7537	+ }
	7538	+
	7539	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7540	+ sign = 1;
	7541	+ if (vScale < 0)
	7542	+ {
	7543	+ sign = -1;
	7544	+ }
	7545	+ vScale = signMath.pow(signvScale, scale * 50);
	7546	+ if (vScale < 0.01)
	7547	+ {
	7548	+ //vScale = 0.01;
	7549	+ }
	7550	+
	7551	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7552	+
7074	7553	retval = true;
7075	7554	}
7076	7555
..	..	@@ -7080,7 +7559,7 @@
7080	7559	}
7081	7560
7082	7561	//System.out.println("info.modifiers = " + info.modifiers);
7083		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7084	7563	//System.out.println("modified = " + modified);
7085	7564	//new Exception().printStackTrace();
7086	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7108,7 +7587,8 @@
7108	7587	return true;
7109	7588	}
7110	7589
7111		- void doEditDrag0(ClickInfo info, boolean opposite)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
7112	7592	{
7113	7593	if (hitSomething == 0)
7114	7594	{
..	..	@@ -7122,7 +7602,7 @@
7122	7602
7123	7603	//System.out.println("hitSomething = " + hitSomething);
7124	7604
7125		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
7126	7606
7127	7607	cVector xlate = new cVector();
7128	7608	//cVector xlate2 = new cVector();
..	..	@@ -7156,8 +7636,8 @@
7156	7636	toParent[3][i] = xlate.get(i);
7157	7637	LA.matInvert(toParent, fromParent);
7158	7638	*/
7159		- cVector delta = LA.newVector(0, 0, startY - info.y);
7160		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7639	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7640	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7161	7641
7162	7642	LA.matCopy(startMat, toParent);
7163	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7166,7 +7646,7 @@
7166	7646	} else
7167	7647	{
7168	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7169		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7170	7650	cVector away = new cVector();
7171	7651	//cVector right2 = new cVector();
7172	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7183,19 +7663,19 @@
7183	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7184	7664	// if (!CameraPane.LOCALTRANSFORM)
7185	7665	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7186		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7187	7667	// if (!CameraPane.LOCALTRANSFORM)
7188	7668	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7189	7669	//LA.vecCross(up, cVector.Z, right2);
7190	7670
7191		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7192	7672
7193	7673	//System.out.println("DELTA0 = " + delta);
7194	7674	//System.out.println("AWAY = " + info.camera.away);
7195	7675	//System.out.println("UP = " + info.camera.up);
7196	7676	if (away.z > 0)
7197	7677	{
7198		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7199	7679	{
7200	7680	delta.x = -delta.x;
7201	7681	} else
..	..	@@ -7210,7 +7690,7 @@
7210	7690	//System.out.println("DELTA1 = " + delta);
7211	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7212	7692	//System.out.println("DELTA2 = " + delta);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7694	LA.matCopy(startMat, toParent);
7215	7695	//System.out.println("DELTA3 = " + delta);
7216	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7220,8 +7700,8 @@
7220	7700	break;
7221	7701
7222	7702	case hitRotate: // rotate
7223		- int dx = info.x - centerPt.x;
7224		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7225	7705	double angle = (double) Math.atan2(dx, dy);
7226	7706	angle = -(1.570796 - angle);
7227	7707
..	..	@@ -7244,7 +7724,7 @@
7244	7724	}
7245	7725	/**/
7246	7726
7247		- switch (info.pane.RenderCamera().viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7248	7728	{
7249	7729	case 1: // '\001'
7250	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7271,7 +7751,7 @@
7271	7751	break;
7272	7752
7273	7753	case hitScale: // scale
7274		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7275	7755	double sign = 1;
7276	7756	if (hScale < 0)
7277	7757	{
..	..	@@ -7283,7 +7763,7 @@
7283	7763	//hScale = 0.01;
7284	7764	}
7285	7765
7286		- double vScale = (double) (info.y - centerPt.y) / 32;
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7287	7767	sign = 1;
7288	7768	if (vScale < 0)
7289	7769	{
..	..	@@ -7294,6 +7774,7 @@
7294	7774	{
7295	7775	//vScale = 0.01;
7296	7776	}
	7777	+
7297	7778	LA.matCopy(startMat, toParent);
7298	7779	/**/
7299	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7303,29 +7784,30 @@
7303	7784	}
7304	7785	/**/
7305	7786
7306		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7307	7788
7308	7789	if (totalScale < 0.01)
7309	7790	{
7310	7791	totalScale = 0.01;
7311	7792	}
7312	7793
7313		- switch (info.pane.RenderCamera().viewCode)
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7314	7795	{
7315	7796	case 3: // '\001'
7316		- if (modified)
	7797	+ if (modified \|\| opposite)
7317	7798	{
7318	7799	//LA.matScale(toParent, 1, hScale, vScale);
7319	7800	LA.matScale(toParent, totalScale, 1, 1);
7320	7801	} // vScale, 1);
7321	7802	else
7322	7803	{
	7804	+ // EXCEPTION!
7323	7805	LA.matScale(toParent, totalScale, totalScale, totalScale);
7324	7806	} // vScale, 1);
7325	7807	break;
7326	7808
7327	7809	case 2: // '\002'
7328		- if (modified)
	7810	+ if (modified \|\| opposite)
7329	7811	{
7330	7812	//LA.matScale(toParent, hScale, 1, vScale);
7331	7813	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7336,7 +7818,7 @@
7336	7818	break;
7337	7819
7338	7820	case 1: // '\003'
7339		- if (modified)
	7821	+ if (modified \|\| opposite)
7340	7822	{
7341	7823	//LA.matScale(toParent, hScale, vScale, 1);
7342	7824	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7376,7 +7858,7 @@
7376	7858	} // NEW ...
7377	7859
7378	7860
7379		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7380	7862	}
7381	7863
7382	7864	boolean overflow = false;
..	..	@@ -7556,6 +8038,10 @@
7556	8038	editWindow = null;
7557	8039	} // ?
7558	8040	}
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
	8044	+ }
7559	8045	}
7560	8046
7561	8047	boolean root; // patch for edit windows
..	..	@@ -7567,7 +8053,7 @@
7567	8053	/transient/ cVector2[] projectedVertices = new cVector2[0];
7568	8054
7569	8055	Object3D /Composite/ parent;
7570		- Object3D /Composite/ fileparent;
	8056	+ Object3D /Composite/ fileparent; // In the case of FileObject
7571	8057
7572	8058	double[][] toParent; // dynamic matrix
7573	8059	double[][] fromParent;
..	..	@@ -7713,6 +8199,10 @@
7713	8199	}
7714	8200
7715	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
7716	8206	transient ObjectUI objectUI;
7717	8207	public static int povDepth = 0;
7718	8208	private static cVector tbMin = new cVector();