~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,245 @@
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	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
134	287	blockloop = true;
135		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
136	294	blockloop = false;
137	295	}
138		-}
139	296
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
144	301
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
151		- {
152		- bRep.RestoreSupports();
153		- }
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160	302	blockloop = true;
161		- child.RestoreSupports();
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
162	340	blockloop = false;
163	341	}
164		-}
	342	+
	343	+ void RestoreBigData(Object3D o)
	344	+ {
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
	359	+ }
165	360
166	361	// MOCAP SUPPORT
167	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -304,6 +499,7 @@
304	499	}
305	500
306	501	boolean live = false;
	502	+ transient boolean keepdontselect;
307	503	boolean dontselect = false;
308	504	boolean hide = false;
309	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -486,12 +682,14 @@
486	682	toParent = LA.newMatrix();
487	683	fromParent = LA.newMatrix();
488	684	}
	685	+
489	686	if (toParentMarked == null)
490	687	{
491	688	if (maxcount != 1)
492	689	{
493	690	new Exception().printStackTrace();
494	691	}
	692	+
495	693	toParentMarked = LA.newMatrix();
496	694	fromParentMarked = LA.newMatrix();
497	695	}
..	..	@@ -802,7 +1000,7 @@
802	1000
803	1001	if (marked && Globals.isLIVE() && live &&
804	1002	//TEMP21aug2018
805		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
806	1004	currentframe != Globals.framecount)
807	1005	{
808	1006	currentframe = Globals.framecount;
..	..	@@ -814,7 +1012,8 @@
814	1012
815	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
816	1014
817		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
818	1017	{
819	1018	countdown = 1;
820	1019	delay = speedup?8:1;
..	..	@@ -886,6 +1085,10 @@
886	1085	if (material == null \|\| material.multiply)
887	1086	return true;
888	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
889	1092	return material.opacity > 0.99;
890	1093	}
891	1094
..	..	@@ -1286,6 +1489,7 @@
1286	1489	toParent = LA.newMatrix();
1287	1490	fromParent = LA.newMatrix();
1288	1491	}
	1492	+
1289	1493	LA.matCopy(other.toParent, toParent);
1290	1494	LA.matCopy(other.fromParent, fromParent);
1291	1495
..	..	@@ -2307,6 +2511,15 @@
2307	2511	}
2308	2512	*/
2309	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2310	2523	}
2311	2524
2312	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2348,6 +2561,14 @@
2348	2561	{
2349	2562	editWindow.refreshContents();
2350	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2351	2572	//if (parent != null)
2352	2573	//parent.refreshEditWindow();
2353	2574	}
..	..	@@ -2427,7 +2648,8 @@
2427	2648	private static final int editSelf = 1;
2428	2649	private static final int editChild = 2;
2429	2650
2430		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2431	2653	{
2432	2654	if (level == 0)
2433	2655	{
..	..	@@ -2435,7 +2657,8 @@
2435	2657	return;
2436	2658
2437	2659	Object3D selectee;
2438		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2439	2662	{
2440	2663	selectee = (Object3D) e.nextElement();
2441	2664	}
..	..	@@ -2443,19 +2666,22 @@
2443	2666	} else
2444	2667	{
2445	2668	//super.
2446		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2447	2671	}
2448	2672	}
2449	2673
2450		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2451	2676	{
2452	2677	doSomething = 0;
2453	2678	if (level == 0)
2454	2679	{
2455		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2456	2681	}
2457	2682	if (//super.
2458		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2459	2685	{
2460	2686	doSomething = 1;
2461	2687	return true;
..	..	@@ -2465,7 +2691,7 @@
2465	2691	}
2466	2692	}
2467	2693
2468		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2469	2695	{
2470	2696	if (selection == null)
2471	2697	{
..	..	@@ -2478,7 +2704,8 @@
2478	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2479	2705	{
2480	2706	Object3D selectee = (Object3D) e.nextElement();
2481		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2482	2709	{
2483	2710	childToDrag = selectee;
2484	2711	doSomething = 2;
..	..	@@ -2490,13 +2717,15 @@
2490	2717	return retval;
2491	2718	}
2492	2719
2493		- void doEditDrag(ClickInfo info, boolean opposite)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2494	2722	{
2495	2723	switch (doSomething)
2496	2724	{
2497	2725	case 1: // '\001'
2498	2726	//super.
2499		- doEditDrag0(info, opposite);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2500	2729	break;
2501	2730
2502	2731	case 2: // '\002'
..	..	@@ -2509,11 +2738,13 @@
2509	2738	{
2510	2739	//sel.hitSomething = childToDrag.hitSomething;
2511	2740	//childToDrag.doEditDrag(info);
2512		- sel.doEditDrag(info, opposite);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2513	2743	} else
2514	2744	{
2515	2745	//super.
2516		- doEditDrag0(info, opposite);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2517	2748	}
2518	2749	}
2519	2750	break;
..	..	@@ -2531,6 +2762,9 @@
2531	2762	{
2532	2763	deselectAll();
2533	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2534	2768	ClickInfo newInfo = new ClickInfo();
2535	2769	newInfo.flags = info.flags;
2536	2770	newInfo.bounds = info.bounds;
..	..	@@ -2623,6 +2857,18 @@
2623	2857	void GenNormalsS(boolean crease)
2624	2858	{
2625	2859	selection.GenNormals(crease);
	2860	+// for (int i=0; i<selection.size(); i++)
	2861	+// {
	2862	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2863	+// selectee.GenNormals(crease);
	2864	+// }
	2865	+
	2866	+ //Touch();
	2867	+ }
	2868	+
	2869	+ void GenNormalsMeshS()
	2870	+ {
	2871	+ selection.GenNormalsMesh();
2626	2872	// for (int i=0; i<selection.size(); i++)
2627	2873	// {
2628	2874	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2763,6 +3009,24 @@
2763	3009	if (child == null)
2764	3010	continue;
2765	3011	child.GenNormals(crease);
	3012	+// Children().release(i);
	3013	+ }
	3014	+ blockloop = false;
	3015	+ }
	3016	+
	3017	+ void GenNormalsMesh()
	3018	+ {
	3019	+ if (blockloop)
	3020	+ return;
	3021	+
	3022	+ blockloop = true;
	3023	+ GenNormalsMesh0();
	3024	+ for (int i = 0; i < Children().Size(); i++)
	3025	+ {
	3026	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3027	+ if (child == null)
	3028	+ continue;
	3029	+ child.GenNormalsMesh();
2766	3030	// Children().release(i);
2767	3031	}
2768	3032	blockloop = false;
..	..	@@ -2935,11 +3199,20 @@
2935	3199	}
2936	3200	}
2937	3201
	3202	+ void GenNormalsMesh0()
	3203	+ {
	3204	+ if (bRep != null)
	3205	+ {
	3206	+ bRep.GenerateNormalsMesh();
	3207	+ Touch();
	3208	+ }
	3209	+ }
	3210	+
2938	3211	void GenNormalsMINE0()
2939	3212	{
2940	3213	if (bRep != null)
2941	3214	{
2942		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2943	3216	Touch();
2944	3217	}
2945	3218	}
..	..	@@ -3385,7 +3658,8 @@
3385	3658	if (blockloop)
3386	3659	return;
3387	3660
3388		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3661	+ if (//marked \|\| // does not make sense
	3662	+ (bRep != null \|\| material != null)) // borderline...
3389	3663	live = h;
3390	3664
3391	3665	for (int i = 0; i < Size(); i++)
..	..	@@ -3406,7 +3680,8 @@
3406	3680	return;
3407	3681
3408	3682	//if (bRep != null)
3409		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3683	+ if (//marked \|\| // does not make sense
	3684	+ (bRep != null \|\| material != null)) // borderline...
3410	3685	link2master = h;
3411	3686
3412	3687	for (int i = 0; i < Size(); i++)
..	..	@@ -3426,7 +3701,8 @@
3426	3701	if (blockloop)
3427	3702	return;
3428	3703
3429		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3704	+ if (//marked \|\| // does not make sense
	3705	+ (bRep != null \|\| material != null)) // borderline...
3430	3706	hide = h;
3431	3707
3432	3708	for (int i = 0; i < Size(); i++)
..	..	@@ -3446,7 +3722,7 @@
3446	3722	if (blockloop)
3447	3723	return;
3448	3724
3449		- if (bRep != null && material != null) // borderline...
	3725	+ if (bRep != null \|\| material != null) // borderline...
3450	3726	marked = h;
3451	3727
3452	3728	for (int i = 0; i < Size(); i++)
..	..	@@ -3456,6 +3732,46 @@
3456	3732	continue;
3457	3733	blockloop = true;
3458	3734	child.MarkLeaves(h);
	3735	+ blockloop = false;
	3736	+ // release(i);
	3737	+ }
	3738	+ }
	3739	+
	3740	+ void RewindLeaves(boolean h)
	3741	+ {
	3742	+ if (blockloop)
	3743	+ return;
	3744	+
	3745	+ if (bRep != null \|\| material != null) // borderline...
	3746	+ rewind = h;
	3747	+
	3748	+ for (int i = 0; i < Size(); i++)
	3749	+ {
	3750	+ Object3D child = (Object3D) get(i); // reserve(i);
	3751	+ if (child == null)
	3752	+ continue;
	3753	+ blockloop = true;
	3754	+ child.RewindLeaves(h);
	3755	+ blockloop = false;
	3756	+ // release(i);
	3757	+ }
	3758	+ }
	3759	+
	3760	+ void RandomLeaves(boolean h)
	3761	+ {
	3762	+ if (blockloop)
	3763	+ return;
	3764	+
	3765	+ if (bRep != null \|\| material != null) // borderline...
	3766	+ random = h;
	3767	+
	3768	+ for (int i = 0; i < Size(); i++)
	3769	+ {
	3770	+ Object3D child = (Object3D) get(i); // reserve(i);
	3771	+ if (child == null)
	3772	+ continue;
	3773	+ blockloop = true;
	3774	+ child.RandomLeaves(h);
3459	3775	blockloop = false;
3460	3776	// release(i);
3461	3777	}
..	..	@@ -4233,6 +4549,55 @@
4233	4549	}
4234	4550	}
4235	4551
	4552	+ void RepairSOV()
	4553	+ {
	4554	+ if (blockloop)
	4555	+ return;
	4556	+
	4557	+ String texname = this.GetPigmentTexture();
	4558	+
	4559	+ if (texname.startsWith("sov"))
	4560	+ {
	4561	+ String[] s = texname.split("/");
	4562	+
	4563	+ String[] sname = s[1].split("Color.pn");
	4564	+
	4565	+ texname = sname[0];
	4566	+
	4567	+ if (sname.length > 1)
	4568	+ {
	4569	+ texname += "Color.jpg";
	4570	+ }
	4571	+
	4572	+ this.SetPigmentTexture("sov/" + texname);
	4573	+ }
	4574	+
	4575	+ texname = this.GetBumpTexture();
	4576	+
	4577	+ if (texname.startsWith("sov"))
	4578	+ {
	4579	+ String[] s = texname.split("/");
	4580	+
	4581	+ String[] sname = s[1].split("Bump.pn");
	4582	+
	4583	+ texname = sname[0];
	4584	+
	4585	+ if (sname.length > 1)
	4586	+ {
	4587	+ texname += "Bump.jpg";
	4588	+ }
	4589	+
	4590	+ this.SetBumpTexture("sov/" + texname);
	4591	+ }
	4592	+
	4593	+ for (int i=0; i<Size(); i++)
	4594	+ {
	4595	+ blockloop = true;
	4596	+ get(i).RepairSOV();
	4597	+ blockloop = false;
	4598	+ }
	4599	+ }
	4600	+
4236	4601	void RepairTexture()
4237	4602	{
4238	4603	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4747,6 +5112,14 @@
4747	5112	}
4748	5113	}
4749	5114
	5115	+ ObjEditor GetWindow()
	5116	+ {
	5117	+ if (editWindow != null)
	5118	+ return editWindow;
	5119	+
	5120	+ return manipWindow;
	5121	+ }
	5122	+
4750	5123	cTreePath Select(int indexcount, boolean deselect)
4751	5124	{
4752	5125	if (hide \|\| dontselect)
..	..	@@ -4783,10 +5156,11 @@
4783	5156	if (leaf != null)
4784	5157	{
4785	5158	cTreePath tp = new cTreePath(this, leaf);
4786		- if (editWindow != null)
	5159	+ ObjEditor window = GetWindow();
	5160	+ if (window != null)
4787	5161	{
4788	5162	//System.out.println("editWindow = " + editWindow + " vs " + this);
4789		- editWindow.Select(tp, deselect, true);
	5163	+ window.Select(tp, deselect, true);
4790	5164	}
4791	5165
4792	5166	return tp;
..	..	@@ -4803,6 +5177,7 @@
4803	5177
4804	5178	if (child == null)
4805	5179	continue;
	5180	+
4806	5181	if (child.HasTransparency() && child.size() != 0)
4807	5182	{
4808	5183	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4812,9 +5187,10 @@
4812	5187	if (leaf != null)
4813	5188	{
4814	5189	cTreePath tp = new cTreePath(this, leaf);
4815		- if (editWindow != null)
	5190	+ ObjEditor window = GetWindow();
	5191	+ if (window != null)
4816	5192	{
4817		- editWindow.Select(tp, deselect, true);
	5193	+ window.Select(tp, deselect, true);
4818	5194	}
4819	5195
4820	5196	return tp;
..	..	@@ -5139,6 +5515,51 @@
5139	5515	blockloop = false;
5140	5516	}
5141	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5142	5563	boolean IsSelected()
5143	5564	{
5144	5565	if (parent == null)
..	..	@@ -5199,6 +5620,11 @@
5199	5620	if (fullname == null)
5200	5621	return "";
5201	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5202	5628	// System.out.println("Fullname = " + fullname);
5203	5629
5204	5630	// Does not work on Windows due to C:
..	..	@@ -5211,7 +5637,7 @@
5211	5637
5212	5638	if (split.length == 0)
5213	5639	{
5214		- return "";
	5640	+ return fullname.pigment = "";
5215	5641	}
5216	5642
5217	5643	if (split.length <= 2)
..	..	@@ -5219,22 +5645,27 @@
5219	5645	if (fullname.name.endsWith(":"))
5220	5646	{
5221	5647	// Windows
5222		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5223	5649	}
5224	5650
5225		- return split[0];
	5651	+ return fullname.pigment = split[0];
5226	5652	}
5227	5653
5228	5654	// Windows
5229	5655	assert(split.length == 4);
5230	5656
5231		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5232	5658	}
5233	5659
5234	5660	static String GetBump(cTexture fullname)
5235	5661	{
5236	5662	if (fullname == null)
5237	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5238	5669
5239	5670	// System.out.println("Fullname = " + fullname);
5240	5671	// Does not work on Windows due to C:
..	..	@@ -5246,12 +5677,12 @@
5246	5677
5247	5678	if (split.length == 0)
5248	5679	{
5249		- return "";
	5680	+ return fullname.bump = "";
5250	5681	}
5251	5682
5252	5683	if (split.length == 1)
5253	5684	{
5254		- return "";
	5685	+ return fullname.bump = "";
5255	5686	}
5256	5687
5257	5688	if (split.length == 2)
..	..	@@ -5259,16 +5690,16 @@
5259	5690	if (fullname.name.endsWith(":"))
5260	5691	{
5261	5692	// Windows
5262		- return "";
	5693	+ return fullname.bump = "";
5263	5694	}
5264	5695
5265		- return split[1];
	5696	+ return fullname.bump = split[1];
5266	5697	}
5267	5698
5268	5699	// Windows
5269	5700	assert(split.length == 4);
5270	5701
5271		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5272	5703	}
5273	5704
5274	5705	String GetPigmentTexture()
..	..	@@ -5351,6 +5782,9 @@
5351	5782	texname = "";
5352	5783
5353	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5354	5788	Touch();
5355	5789	}
5356	5790
..	..	@@ -5424,6 +5858,8 @@
5424	5858
5425	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5426	5860
	5861	+ GetTextures().bump = null;
	5862	+
5427	5863	Touch();
5428	5864	}
5429	5865
..	..	@@ -5448,6 +5884,38 @@
5448	5884	}
5449	5885	}
5450	5886
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
5451	5919	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5452	5920	{
5453	5921	Draw(display, root, selected, blocked);
..	..	@@ -5456,12 +5924,23 @@
5456	5924	boolean NeedSupport()
5457	5925	{
5458	5926	return
5459		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5927	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5460	5928	// PROBLEM with CROWD!!
5461	5929	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5462	5930	}
5463	5931
5464	5932	static boolean DEBUG_SELECTION = false;
	5933	+
	5934	+ boolean IsLive()
	5935	+ {
	5936	+ if (live)
	5937	+ return true;
	5938	+
	5939	+ if (parent == null)
	5940	+ return false;
	5941	+
	5942	+ return parent.IsLive();
	5943	+ }
5465	5944
5466	5945	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5467	5946	{
..	..	@@ -5523,8 +6002,10 @@
5523	6002	if (support != null)
5524	6003	support = support;
5525	6004
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);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5528	6009
5529	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5530	6011	{
..	..	@@ -5534,8 +6015,9 @@
5534	6015	// usecalllists &= !(parent instanceof RandomNode);
5535	6016	// usecalllists = false;
5536	6017
5537		- if (GetBRep() != null)
5538		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5539	6021	//System.out.println("draw " + this);
5540	6022	//new Exception().printStackTrace();
5541	6023
..	..	@@ -5544,10 +6026,12 @@
5544	6026	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5545	6027
5546	6028	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5547		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6029	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6030	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5548	6031	{
5549	6032	Globals.lighttouched = true;
5550	6033	} // all panes...
	6034	+
5551	6035	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5552	6036	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5553	6037	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5555,7 +6039,7 @@
5555	6039	if (!(this instanceof Composite))
5556	6040	touched = false;
5557	6041	//if (displaylist == -1 && usecalllists)
5558		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5559	6043	{
5560	6044	bRep.displaylist = display.GenList();
5561	6045	assert(bRep.displaylist != 0);
..	..	@@ -5566,7 +6050,7 @@
5566	6050
5567	6051	//System.out.println("\tnew list " + list);
5568	6052	//gl.glDrawBuffer(gl.GL_NONE);
5569		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5570	6054	{
5571	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5572	6056	display.NewList(bRep.displaylist);
..	..	@@ -5575,7 +6059,7 @@
5575	6059	CallList(display, root, selected, blocked);
5576	6060
5577	6061	// compiled = true;
5578		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5579	6063	{
5580	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5581	6065	display.EndList();
..	..	@@ -5675,6 +6159,7 @@
5675	6159	if (GetBRep() != null)
5676	6160	{
5677	6161	display.NextIndex();
	6162	+
5678	6163	// vertex color conflict : gl.glCallList(list);
5679	6164	DrawNode(display, root, selected);
5680	6165	if (this instanceof BezierPatch)
..	..	@@ -5715,16 +6200,27 @@
5715	6200	tex = GetTextures();
5716	6201	}
5717	6202
5718		- boolean failed = false;
	6203	+ boolean failedPigment = false;
	6204	+ boolean failedBump = false;
5719	6205
5720	6206	try
5721	6207	{
5722		- display.BindTextures(tex, texres);
	6208	+ display.BindPigmentTexture(tex, texres);
5723	6209	}
5724	6210	catch (Exception e)
5725	6211	{
5726	6212	System.err.println("FAILED: " + this);
5727		- failed = true;
	6213	+ failedPigment = true;
	6214	+ }
	6215	+
	6216	+ try
	6217	+ {
	6218	+ display.BindBumpTexture(tex, texres);
	6219	+ }
	6220	+ catch (Exception e)
	6221	+ {
	6222	+ //System.err.println("FAILED: " + this);
	6223	+ failedBump = true;
5728	6224	}
5729	6225
5730	6226	if (!compiled)
..	..	@@ -5747,8 +6243,11 @@
5747	6243	}
5748	6244	}
5749	6245
5750		- if (!failed)
5751		- display.ReleaseTextures(tex);
	6246	+ if (!failedBump)
	6247	+ display.ReleaseBumpTexture(tex);
	6248	+
	6249	+ if (!failedPigment)
	6250	+ display.ReleasePigmentTexture(tex);
5752	6251
5753	6252	display.PopMaterial(this, selected);
5754	6253	}
..	..	@@ -6121,6 +6620,11 @@
6121	6620	// dec 2012
6122	6621	new Exception().printStackTrace();
6123	6622	return;
	6623	+ }
	6624	+
	6625	+ if (dontselect)
	6626	+ {
	6627	+ //bRep.GenerateNormalsMINE();
6124	6628	}
6125	6629
6126	6630	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6906,20 +7410,23 @@
6906	7410	}
6907	7411	}
6908	7412
6909		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
6910	7417	{
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;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
6914	7421	if (toscreen == null)
6915	7422	{
6916		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6917	7424	}
6918	7425	cVector vec = in;
6919	7426	LA.xformPos(in, toscreen, in);
6920	7427	//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();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6923	7430	outPt.x = hc + (int) vec.x;
6924	7431	outPt.y = vc - (int) vec.y;
6925	7432	outRec.x = outPt.x - 3;
..	..	@@ -6927,15 +7434,18 @@
6927	7434	outRec.width = outRec.height = 6;
6928	7435	}
6929	7436
6930		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
6931	7439	{
6932	7440	Point pt = new Point(0, 0);
6933	7441	Rectangle rec = new Rectangle();
6934		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
6935	7444	return rec;
6936	7445	}
6937	7446
6938		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
6939	7449	{
6940	7450	if (level == 0)
6941	7451	{
..	..	@@ -6944,16 +7454,19 @@
6944	7454	{
6945	7455	cVector origin = new cVector();
6946	7456	//LA.xformPos(origin, toParent, origin);
6947		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6948	7461	Rectangle boundary = new Rectangle();
6949	7462	boundary.x = spot.x - 30;
6950	7463	boundary.y = spot.y - 30;
6951	7464	boundary.width = spot.width + 60;
6952	7465	boundary.height = spot.height + 60;
6953		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
6954	7467	int spotw = spot.x + spot.width;
6955	7468	int spoth = spot.y + spot.height;
6956		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6957	7470	// if (CameraPane.Xmin > spot.x)
6958	7471	// {
6959	7472	// CameraPane.Xmin = spot.x;
..	..	@@ -6970,11 +7483,33 @@
6970	7483	// {
6971	7484	// CameraPane.Ymax = spoth;
6972	7485	// }
6973		- spot.translate(32, 32);
	7486	+// if (CameraPane.Xmin > spot.x)
	7487	+// {
	7488	+// CameraPane.Xmin = spot.x;
	7489	+// }
	7490	+// if (CameraPane.Xmax < spotw)
	7491	+// {
	7492	+// CameraPane.Xmax = spotw;
	7493	+// }
	7494	+// if (CameraPane.Ymin > spot.y)
	7495	+// {
	7496	+// CameraPane.Ymin = spot.y;
	7497	+// }
	7498	+// if (CameraPane.Ymax < spoth)
	7499	+// {
	7500	+// CameraPane.Ymax = spoth;
	7501	+// }
	7502	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7503	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
6974	7509	spotw = spot.x + spot.width;
6975	7510	spoth = spot.y + spot.height;
6976		- info.g.setColor(Color.blue);
6977		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6978	7513	// if (CameraPane.Xmin > spot.x)
6979	7514	// {
6980	7515	// CameraPane.Xmin = spot.x;
..	..	@@ -6991,29 +7526,9 @@
6991	7526	// {
6992	7527	// CameraPane.Ymax = spoth;
6993	7528	// }
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);
	7529	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7017	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7018	7533	// if (CameraPane.Xmin > boundary.x)
7019	7534	// {
..	..	@@ -7035,7 +7550,8 @@
7035	7550	}
7036	7551	}
7037	7552
7038		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7039	7555	{
7040	7556	if (level == 0)
7041	7557	{
..	..	@@ -7044,8 +7560,8 @@
7044	7560
7045	7561	boolean retval = false;
7046	7562
7047		- startX = info.x;
7048		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7049	7565
7050	7566	hitSomething = -1;
7051	7567	cVector origin = new cVector();
..	..	@@ -7055,22 +7571,53 @@
7055	7571	{
7056	7572	centerPt = new Point(0, 0);
7057	7573	}
7058		- calcHotSpot(origin, info, centerPt, spot);
7059		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7060	7577	{
7061	7578	hitSomething = hitCenter;
7062	7579	retval = true;
7063	7580	}
7064	7581	spot.translate(32, 0);
7065		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7066	7583	{
7067	7584	hitSomething = hitRotate;
7068	7585	retval = true;
7069	7586	}
7070	7587	spot.translate(0, 32);
7071		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
7072	7591	{
7073	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
7074	7621	retval = true;
7075	7622	}
7076	7623
..	..	@@ -7080,7 +7627,7 @@
7080	7627	}
7081	7628
7082	7629	//System.out.println("info.modifiers = " + info.modifiers);
7083		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7084	7631	//System.out.println("modified = " + modified);
7085	7632	//new Exception().printStackTrace();
7086	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7108,7 +7655,8 @@
7108	7655	return true;
7109	7656	}
7110	7657
7111		- void doEditDrag0(ClickInfo info, boolean opposite)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7112	7660	{
7113	7661	if (hitSomething == 0)
7114	7662	{
..	..	@@ -7122,7 +7670,7 @@
7122	7670
7123	7671	//System.out.println("hitSomething = " + hitSomething);
7124	7672
7125		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
7126	7674
7127	7675	cVector xlate = new cVector();
7128	7676	//cVector xlate2 = new cVector();
..	..	@@ -7156,8 +7704,8 @@
7156	7704	toParent[3][i] = xlate.get(i);
7157	7705	LA.matInvert(toParent, fromParent);
7158	7706	*/
7159		- cVector delta = LA.newVector(0, 0, startY - info.y);
7160		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7161	7709
7162	7710	LA.matCopy(startMat, toParent);
7163	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7166,7 +7714,7 @@
7166	7714	} else
7167	7715	{
7168	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7169		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7170	7718	cVector away = new cVector();
7171	7719	//cVector right2 = new cVector();
7172	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7183,19 +7731,19 @@
7183	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7184	7732	// if (!CameraPane.LOCALTRANSFORM)
7185	7733	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7186		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7187	7735	// if (!CameraPane.LOCALTRANSFORM)
7188	7736	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7189	7737	//LA.vecCross(up, cVector.Z, right2);
7190	7738
7191		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7192	7740
7193	7741	//System.out.println("DELTA0 = " + delta);
7194	7742	//System.out.println("AWAY = " + info.camera.away);
7195	7743	//System.out.println("UP = " + info.camera.up);
7196	7744	if (away.z > 0)
7197	7745	{
7198		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7199	7747	{
7200	7748	delta.x = -delta.x;
7201	7749	} else
..	..	@@ -7210,7 +7758,7 @@
7210	7758	//System.out.println("DELTA1 = " + delta);
7211	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7212	7760	//System.out.println("DELTA2 = " + delta);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7762	LA.matCopy(startMat, toParent);
7215	7763	//System.out.println("DELTA3 = " + delta);
7216	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7220,8 +7768,8 @@
7220	7768	break;
7221	7769
7222	7770	case hitRotate: // rotate
7223		- int dx = info.x - centerPt.x;
7224		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7225	7773	double angle = (double) Math.atan2(dx, dy);
7226	7774	angle = -(1.570796 - angle);
7227	7775
..	..	@@ -7244,7 +7792,7 @@
7244	7792	}
7245	7793	/**/
7246	7794
7247		- switch (info.pane.RenderCamera().viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7248	7796	{
7249	7797	case 1: // '\001'
7250	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7271,7 +7819,7 @@
7271	7819	break;
7272	7820
7273	7821	case hitScale: // scale
7274		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7275	7823	double sign = 1;
7276	7824	if (hScale < 0)
7277	7825	{
..	..	@@ -7283,7 +7831,7 @@
7283	7831	//hScale = 0.01;
7284	7832	}
7285	7833
7286		- double vScale = (double) (info.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7287	7835	sign = 1;
7288	7836	if (vScale < 0)
7289	7837	{
..	..	@@ -7294,6 +7842,7 @@
7294	7842	{
7295	7843	//vScale = 0.01;
7296	7844	}
	7845	+
7297	7846	LA.matCopy(startMat, toParent);
7298	7847	/**/
7299	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7303,32 +7852,39 @@
7303	7852	}
7304	7853	/**/
7305	7854
7306		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7307	7856
7308	7857	if (totalScale < 0.01)
7309	7858	{
7310	7859	totalScale = 0.01;
7311	7860	}
7312	7861
7313		- switch (info.pane.RenderCamera().viewCode)
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7314	7863	{
7315	7864	case 3: // '\001'
7316		- if (modified)
	7865	+ if (modified \|\| opposite)
7317	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7318	7870	//LA.matScale(toParent, 1, hScale, vScale);
7319		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7320	7872	} // vScale, 1);
7321	7873	else
7322	7874	{
7323		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7875	+ // EXCEPTION!
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7324	7877	} // vScale, 1);
7325	7878	break;
7326	7879
7327	7880	case 2: // '\002'
7328		- if (modified)
	7881	+ if (modified \|\| opposite)
7329	7882	{
7330		- //LA.matScale(toParent, hScale, 1, vScale);
7331		- LA.matScale(toParent, 1, totalScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7332	7888	} else
7333	7889	{
7334	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7336,10 +7892,13 @@
7336	7892	break;
7337	7893
7338	7894	case 1: // '\003'
7339		- if (modified)
	7895	+ if (modified \|\| opposite)
7340	7896	{
7341		- //LA.matScale(toParent, hScale, vScale, 1);
7342		- LA.matScale(toParent, 1, 1, totalScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7343	7902	} else
7344	7903	{
7345	7904	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7376,7 +7935,7 @@
7376	7935	} // NEW ...
7377	7936
7378	7937
7379		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7380	7939	}
7381	7940
7382	7941	boolean overflow = false;
..	..	@@ -7556,6 +8115,10 @@
7556	8115	editWindow = null;
7557	8116	} // ?
7558	8117	}
	8118	+ else
	8119	+ {
	8120	+ //editWindow.closeUI();
	8121	+ }
7559	8122	}
7560	8123
7561	8124	boolean root; // patch for edit windows
..	..	@@ -7567,7 +8130,7 @@
7567	8130	/transient/ cVector2[] projectedVertices = new cVector2[0];
7568	8131
7569	8132	Object3D /Composite/ parent;
7570		- Object3D /Composite/ fileparent;
	8133	+ Object3D /Composite/ fileparent; // In the case of FileObject
7571	8134
7572	8135	double[][] toParent; // dynamic matrix
7573	8136	double[][] fromParent;
..	..	@@ -7713,6 +8276,10 @@
7713	8276	}
7714	8277
7715	8278	transient ObjEditor editWindow;
	8279	+ transient ObjEditor manipWindow;
	8280	+
	8281	+ transient boolean pinned;
	8282	+
7716	8283	transient ObjectUI objectUI;
7717	8284	public static int povDepth = 0;
7718	8285	private static cVector tbMin = new cVector();