~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,28 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
22	24
	25	+ // Use GetUUID for backward compatibility with null.
	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	+
23	39	ScriptNode scriptnode;
24	40
25	41	void InitOthers()
..	..	@@ -100,64 +116,201 @@
100	116
101	117	// transient boolean reduced; // for morph reduction
102	118
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-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
105	121
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
108	124
109		-void SaveSupports()
110		-{
111		- if (blockloop)
112		- return;
113		-
114		- transientsupport = support;
115		- transientlink2master = link2master;
116		-
117		- support = null;
118		- link2master = false;
119		-
120		- if (bRep != null)
	125	+ void SaveSupports()
121	126	{
122		- 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	+ }
123	150	}
124		-
125		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
126	153	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- 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	+
130	285	blockloop = true;
131		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
132	294	blockloop = false;
133	295	}
134		-}
135	296
136		-void RestoreSupports()
137		-{
138		- if (blockloop)
139		- return;
140		-
141		- support = transientsupport;
142		- link2master = transientlink2master;
143		- transientsupport = null;
144		- transientlink2master = false;
145		-
146		- if (bRep != null)
	297	+ void RestoreBigData(Object3D o)
147	298	{
148		- 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;
149	313	}
150		-
151		- for (int i = 0; i < Size(); i++)
152		- {
153		- Object3D child = (Object3D) get(i);
154		- if (child == null)
155		- continue;
156		- blockloop = true;
157		- child.RestoreSupports();
158		- blockloop = false;
159		- }
160		-}
161	314
162	315	// MOCAP SUPPORT
163	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +453,7 @@
300	453	}
301	454
302	455	boolean live = false;
	456	+ transient boolean keepdontselect;
303	457	boolean dontselect = false;
304	458	boolean hide = false;
305	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -482,12 +636,14 @@
482	636	toParent = LA.newMatrix();
483	637	fromParent = LA.newMatrix();
484	638	}
	639	+
485	640	if (toParentMarked == null)
486	641	{
487	642	if (maxcount != 1)
488	643	{
489	644	new Exception().printStackTrace();
490	645	}
	646	+
491	647	toParentMarked = LA.newMatrix();
492	648	fromParentMarked = LA.newMatrix();
493	649	}
..	..	@@ -775,7 +931,7 @@
775	931	if (step == 0)
776	932	step = 1;
777	933	if (maxcount == 0)
778		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
779	935	// if (acceleration == 0)
780	936	// acceleration = 10;
781	937	if (delay == 0) // serial
..	..	@@ -798,7 +954,7 @@
798	954
799	955	if (marked && Globals.isLIVE() && live &&
800	956	//TEMP21aug2018
801		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
802	958	currentframe != Globals.framecount)
803	959	{
804	960	currentframe = Globals.framecount;
..	..	@@ -810,7 +966,8 @@
810	966
811	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
812	968
813		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
814	971	{
815	972	countdown = 1;
816	973	delay = speedup?8:1;
..	..	@@ -882,6 +1039,10 @@
882	1039	if (material == null \|\| material.multiply)
883	1040	return true;
884	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.
885	1046	return material.opacity > 0.99;
886	1047	}
887	1048
..	..	@@ -1282,6 +1443,7 @@
1282	1443	toParent = LA.newMatrix();
1283	1444	fromParent = LA.newMatrix();
1284	1445	}
	1446	+
1285	1447	LA.matCopy(other.toParent, toParent);
1286	1448	LA.matCopy(other.fromParent, fromParent);
1287	1449
..	..	@@ -2303,6 +2465,15 @@
2303	2465	}
2304	2466	*/
2305	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2306	2477	}
2307	2478
2308	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2344,6 +2515,14 @@
2344	2515	{
2345	2516	editWindow.refreshContents();
2346	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2347	2526	//if (parent != null)
2348	2527	//parent.refreshEditWindow();
2349	2528	}
..	..	@@ -2423,7 +2602,8 @@
2423	2602	private static final int editSelf = 1;
2424	2603	private static final int editChild = 2;
2425	2604
2426		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2427	2607	{
2428	2608	if (level == 0)
2429	2609	{
..	..	@@ -2431,7 +2611,8 @@
2431	2611	return;
2432	2612
2433	2613	Object3D selectee;
2434		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2435	2616	{
2436	2617	selectee = (Object3D) e.nextElement();
2437	2618	}
..	..	@@ -2439,19 +2620,22 @@
2439	2620	} else
2440	2621	{
2441	2622	//super.
2442		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2443	2625	}
2444	2626	}
2445	2627
2446		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2447	2630	{
2448	2631	doSomething = 0;
2449	2632	if (level == 0)
2450	2633	{
2451		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2452	2635	}
2453	2636	if (//super.
2454		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2455	2639	{
2456	2640	doSomething = 1;
2457	2641	return true;
..	..	@@ -2461,7 +2645,7 @@
2461	2645	}
2462	2646	}
2463	2647
2464		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2465	2649	{
2466	2650	if (selection == null)
2467	2651	{
..	..	@@ -2474,7 +2658,8 @@
2474	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2475	2659	{
2476	2660	Object3D selectee = (Object3D) e.nextElement();
2477		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2478	2663	{
2479	2664	childToDrag = selectee;
2480	2665	doSomething = 2;
..	..	@@ -2486,13 +2671,15 @@
2486	2671	return retval;
2487	2672	}
2488	2673
2489		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2490	2676	{
2491	2677	switch (doSomething)
2492	2678	{
2493	2679	case 1: // '\001'
2494	2680	//super.
2495		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2496	2683	break;
2497	2684
2498	2685	case 2: // '\002'
..	..	@@ -2505,11 +2692,13 @@
2505	2692	{
2506	2693	//sel.hitSomething = childToDrag.hitSomething;
2507	2694	//childToDrag.doEditDrag(info);
2508		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2509	2697	} else
2510	2698	{
2511	2699	//super.
2512		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2513	2702	}
2514	2703	}
2515	2704	break;
..	..	@@ -2527,6 +2716,9 @@
2527	2716	{
2528	2717	deselectAll();
2529	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2530	2722	ClickInfo newInfo = new ClickInfo();
2531	2723	newInfo.flags = info.flags;
2532	2724	newInfo.bounds = info.bounds;
..	..	@@ -2619,6 +2811,18 @@
2619	2811	void GenNormalsS(boolean crease)
2620	2812	{
2621	2813	selection.GenNormals(crease);
	2814	+// for (int i=0; i<selection.size(); i++)
	2815	+// {
	2816	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2817	+// selectee.GenNormals(crease);
	2818	+// }
	2819	+
	2820	+ //Touch();
	2821	+ }
	2822	+
	2823	+ void GenNormalsMeshS()
	2824	+ {
	2825	+ selection.GenNormalsMesh();
2622	2826	// for (int i=0; i<selection.size(); i++)
2623	2827	// {
2624	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2759,6 +2963,24 @@
2759	2963	if (child == null)
2760	2964	continue;
2761	2965	child.GenNormals(crease);
	2966	+// Children().release(i);
	2967	+ }
	2968	+ blockloop = false;
	2969	+ }
	2970	+
	2971	+ void GenNormalsMesh()
	2972	+ {
	2973	+ if (blockloop)
	2974	+ return;
	2975	+
	2976	+ blockloop = true;
	2977	+ GenNormalsMesh0();
	2978	+ for (int i = 0; i < Children().Size(); i++)
	2979	+ {
	2980	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2981	+ if (child == null)
	2982	+ continue;
	2983	+ child.GenNormalsMesh();
2762	2984	// Children().release(i);
2763	2985	}
2764	2986	blockloop = false;
..	..	@@ -2931,11 +3153,20 @@
2931	3153	}
2932	3154	}
2933	3155
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2934	3165	void GenNormalsMINE0()
2935	3166	{
2936	3167	if (bRep != null)
2937	3168	{
2938		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2939	3170	Touch();
2940	3171	}
2941	3172	}
..	..	@@ -3381,7 +3612,8 @@
3381	3612	if (blockloop)
3382	3613	return;
3383	3614
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3385	3617	live = h;
3386	3618
3387	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3634,8 @@
3402	3634	return;
3403	3635
3404	3636	//if (bRep != null)
3405		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3406	3639	link2master = h;
3407	3640
3408	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3422,7 +3655,8 @@
3422	3655	if (blockloop)
3423	3656	return;
3424	3657
3425		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3426	3660	hide = h;
3427	3661
3428	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3442,7 +3676,7 @@
3442	3676	if (blockloop)
3443	3677	return;
3444	3678
3445		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3446	3680	marked = h;
3447	3681
3448	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3452,6 +3686,46 @@
3452	3686	continue;
3453	3687	blockloop = true;
3454	3688	child.MarkLeaves(h);
	3689	+ blockloop = false;
	3690	+ // release(i);
	3691	+ }
	3692	+ }
	3693	+
	3694	+ void RewindLeaves(boolean h)
	3695	+ {
	3696	+ if (blockloop)
	3697	+ return;
	3698	+
	3699	+ if (bRep != null \|\| material != null) // borderline...
	3700	+ rewind = h;
	3701	+
	3702	+ for (int i = 0; i < Size(); i++)
	3703	+ {
	3704	+ Object3D child = (Object3D) get(i); // reserve(i);
	3705	+ if (child == null)
	3706	+ continue;
	3707	+ blockloop = true;
	3708	+ child.RewindLeaves(h);
	3709	+ blockloop = false;
	3710	+ // release(i);
	3711	+ }
	3712	+ }
	3713	+
	3714	+ void RandomLeaves(boolean h)
	3715	+ {
	3716	+ if (blockloop)
	3717	+ return;
	3718	+
	3719	+ if (bRep != null \|\| material != null) // borderline...
	3720	+ random = h;
	3721	+
	3722	+ for (int i = 0; i < Size(); i++)
	3723	+ {
	3724	+ Object3D child = (Object3D) get(i); // reserve(i);
	3725	+ if (child == null)
	3726	+ continue;
	3727	+ blockloop = true;
	3728	+ child.RandomLeaves(h);
3455	3729	blockloop = false;
3456	3730	// release(i);
3457	3731	}
..	..	@@ -4229,6 +4503,55 @@
4229	4503	}
4230	4504	}
4231	4505
	4506	+ void RepairSOV()
	4507	+ {
	4508	+ if (blockloop)
	4509	+ return;
	4510	+
	4511	+ String texname = this.GetPigmentTexture();
	4512	+
	4513	+ if (texname.startsWith("sov"))
	4514	+ {
	4515	+ String[] s = texname.split("/");
	4516	+
	4517	+ String[] sname = s[1].split("Color.pn");
	4518	+
	4519	+ texname = sname[0];
	4520	+
	4521	+ if (sname.length > 1)
	4522	+ {
	4523	+ texname += "Color.jpg";
	4524	+ }
	4525	+
	4526	+ this.SetPigmentTexture("sov/" + texname);
	4527	+ }
	4528	+
	4529	+ texname = this.GetBumpTexture();
	4530	+
	4531	+ if (texname.startsWith("sov"))
	4532	+ {
	4533	+ String[] s = texname.split("/");
	4534	+
	4535	+ String[] sname = s[1].split("Bump.pn");
	4536	+
	4537	+ texname = sname[0];
	4538	+
	4539	+ if (sname.length > 1)
	4540	+ {
	4541	+ texname += "Bump.jpg";
	4542	+ }
	4543	+
	4544	+ this.SetBumpTexture("sov/" + texname);
	4545	+ }
	4546	+
	4547	+ for (int i=0; i<Size(); i++)
	4548	+ {
	4549	+ blockloop = true;
	4550	+ get(i).RepairSOV();
	4551	+ blockloop = false;
	4552	+ }
	4553	+ }
	4554	+
4232	4555	void RepairTexture()
4233	4556	{
4234	4557	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4743,6 +5066,14 @@
4743	5066	}
4744	5067	}
4745	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4746	5077	cTreePath Select(int indexcount, boolean deselect)
4747	5078	{
4748	5079	if (hide \|\| dontselect)
..	..	@@ -4779,10 +5110,11 @@
4779	5110	if (leaf != null)
4780	5111	{
4781	5112	cTreePath tp = new cTreePath(this, leaf);
4782		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4783	5115	{
4784	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4785		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4786	5118	}
4787	5119
4788	5120	return tp;
..	..	@@ -4799,6 +5131,7 @@
4799	5131
4800	5132	if (child == null)
4801	5133	continue;
	5134	+
4802	5135	if (child.HasTransparency() && child.size() != 0)
4803	5136	{
4804	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4808,9 +5141,10 @@
4808	5141	if (leaf != null)
4809	5142	{
4810	5143	cTreePath tp = new cTreePath(this, leaf);
4811		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4812	5146	{
4813		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4814	5148	}
4815	5149
4816	5150	return tp;
..	..	@@ -5135,6 +5469,51 @@
5135	5469	blockloop = false;
5136	5470	}
5137	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5138	5517	boolean IsSelected()
5139	5518	{
5140	5519	if (parent == null)
..	..	@@ -5195,6 +5574,11 @@
5195	5574	if (fullname == null)
5196	5575	return "";
5197	5576
	5577	+ if (fullname.pigment != null)
	5578	+ {
	5579	+ return fullname.pigment;
	5580	+ }
	5581	+
5198	5582	// System.out.println("Fullname = " + fullname);
5199	5583
5200	5584	// Does not work on Windows due to C:
..	..	@@ -5207,7 +5591,7 @@
5207	5591
5208	5592	if (split.length == 0)
5209	5593	{
5210		- return "";
	5594	+ return fullname.pigment = "";
5211	5595	}
5212	5596
5213	5597	if (split.length <= 2)
..	..	@@ -5215,22 +5599,27 @@
5215	5599	if (fullname.name.endsWith(":"))
5216	5600	{
5217	5601	// Windows
5218		- return fullname.name.substring(0, fullname.name.length()-1);
	5602	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5219	5603	}
5220	5604
5221		- return split[0];
	5605	+ return fullname.pigment = split[0];
5222	5606	}
5223	5607
5224	5608	// Windows
5225	5609	assert(split.length == 4);
5226	5610
5227		- return split[0] + ":" + split[1];
	5611	+ return fullname.pigment = split[0] + ":" + split[1];
5228	5612	}
5229	5613
5230	5614	static String GetBump(cTexture fullname)
5231	5615	{
5232	5616	if (fullname == null)
5233	5617	return "";
	5618	+
	5619	+ if (fullname.bump != null)
	5620	+ {
	5621	+ return fullname.bump;
	5622	+ }
5234	5623
5235	5624	// System.out.println("Fullname = " + fullname);
5236	5625	// Does not work on Windows due to C:
..	..	@@ -5242,12 +5631,12 @@
5242	5631
5243	5632	if (split.length == 0)
5244	5633	{
5245		- return "";
	5634	+ return fullname.bump = "";
5246	5635	}
5247	5636
5248	5637	if (split.length == 1)
5249	5638	{
5250		- return "";
	5639	+ return fullname.bump = "";
5251	5640	}
5252	5641
5253	5642	if (split.length == 2)
..	..	@@ -5255,16 +5644,16 @@
5255	5644	if (fullname.name.endsWith(":"))
5256	5645	{
5257	5646	// Windows
5258		- return "";
	5647	+ return fullname.bump = "";
5259	5648	}
5260	5649
5261		- return split[1];
	5650	+ return fullname.bump = split[1];
5262	5651	}
5263	5652
5264	5653	// Windows
5265	5654	assert(split.length == 4);
5266	5655
5267		- return split[2] + ":" + split[3];
	5656	+ return fullname.bump = split[2] + ":" + split[3];
5268	5657	}
5269	5658
5270	5659	String GetPigmentTexture()
..	..	@@ -5347,6 +5736,9 @@
5347	5736	texname = "";
5348	5737
5349	5738	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5739	+
	5740	+ GetTextures().pigment = null;
	5741	+
5350	5742	Touch();
5351	5743	}
5352	5744
..	..	@@ -5371,6 +5763,43 @@
5371	5763	}
5372	5764	}
5373	5765
	5766	+ UUID GetUUID()
	5767	+ {
	5768	+ if (uuid == null)
	5769	+ {
	5770	+ // Serial
	5771	+ uuid = UUID.randomUUID();
	5772	+ }
	5773	+
	5774	+ return uuid;
	5775	+ }
	5776	+
	5777	+ Object3D GetObject(UUID uid)
	5778	+ {
	5779	+ if (blockloop)
	5780	+ return null;
	5781	+
	5782	+ if (GetUUID().equals(uid))
	5783	+ return this;
	5784	+
	5785	+ int nb = Size();
	5786	+ for (int i = 0; i < nb; i++)
	5787	+ {
	5788	+ Object3D child = (Object3D) get(i);
	5789	+
	5790	+ if (child == null)
	5791	+ continue;
	5792	+
	5793	+ blockloop = true;
	5794	+ Object3D obj = child.GetObject(uid);
	5795	+ blockloop = false;
	5796	+ if (obj != null)
	5797	+ return obj;
	5798	+ }
	5799	+
	5800	+ return null;
	5801	+ }
	5802	+
5374	5803	void SetBumpTexture(String tex)
5375	5804	{
5376	5805	if (GetTextures() == null)
..	..	@@ -5382,6 +5811,8 @@
5382	5811	texname = "";
5383	5812
5384	5813	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5814	+
	5815	+ GetTextures().bump = null;
5385	5816
5386	5817	Touch();
5387	5818	}
..	..	@@ -5407,6 +5838,38 @@
5407	5838	}
5408	5839	}
5409	5840
	5841	+ void EmbedTextures(boolean embed)
	5842	+ {
	5843	+ if (blockloop)
	5844	+ return;
	5845	+
	5846	+ //if (GetTextures() != null)
	5847	+ if (embed)
	5848	+ CameraPane.EmbedTextures(GetTextures());
	5849	+ else
	5850	+ {
	5851	+ GetTextures().pigmentdata = null;
	5852	+ GetTextures().bumpdata = null;
	5853	+ GetTextures().pw = 0;
	5854	+ GetTextures().ph = 0;
	5855	+ GetTextures().bw = 0;
	5856	+ GetTextures().bh = 0;
	5857	+ }
	5858	+
	5859	+ int nb = Size();
	5860	+ for (int i = 0; i < nb; i++)
	5861	+ {
	5862	+ Object3D child = (Object3D) get(i);
	5863	+
	5864	+ if (child == null)
	5865	+ continue;
	5866	+
	5867	+ blockloop = true;
	5868	+ child.EmbedTextures(embed);
	5869	+ blockloop = false;
	5870	+ }
	5871	+ }
	5872	+
5410	5873	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5411	5874	{
5412	5875	Draw(display, root, selected, blocked);
..	..	@@ -5415,12 +5878,23 @@
5415	5878	boolean NeedSupport()
5416	5879	{
5417	5880	return
5418		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5881	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5419	5882	// PROBLEM with CROWD!!
5420	5883	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5421	5884	}
5422	5885
5423	5886	static boolean DEBUG_SELECTION = false;
	5887	+
	5888	+ boolean IsLive()
	5889	+ {
	5890	+ if (live)
	5891	+ return true;
	5892	+
	5893	+ if (parent == null)
	5894	+ return false;
	5895	+
	5896	+ return parent.IsLive();
	5897	+ }
5424	5898
5425	5899	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5426	5900	{
..	..	@@ -5482,8 +5956,10 @@
5482	5956	if (support != null)
5483	5957	support = support;
5484	5958
5485		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5486		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5959	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5960	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+
	5962	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5487	5963
5488	5964	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5489	5965	{
..	..	@@ -5493,8 +5969,9 @@
5493	5969	// usecalllists &= !(parent instanceof RandomNode);
5494	5970	// usecalllists = false;
5495	5971
5496		- if (GetBRep() != null)
5497		- usecalllists = usecalllists;
	5972	+ if (display.DrawMode() == display.SHADOW)
	5973	+ //GetBRep() != null)
	5974	+ usecalllists = !!usecalllists;
5498	5975	//System.out.println("draw " + this);
5499	5976	//new Exception().printStackTrace();
5500	5977
..	..	@@ -5503,10 +5980,12 @@
5503	5980	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5504	5981
5505	5982	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5506		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5983	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5984	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5507	5985	{
5508	5986	Globals.lighttouched = true;
5509	5987	} // all panes...
	5988	+
5510	5989	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5511	5990	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5512	5991	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5514,7 +5993,7 @@
5514	5993	if (!(this instanceof Composite))
5515	5994	touched = false;
5516	5995	//if (displaylist == -1 && usecalllists)
5517		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5996	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5518	5997	{
5519	5998	bRep.displaylist = display.GenList();
5520	5999	assert(bRep.displaylist != 0);
..	..	@@ -5525,7 +6004,7 @@
5525	6004
5526	6005	//System.out.println("\tnew list " + list);
5527	6006	//gl.glDrawBuffer(gl.GL_NONE);
5528		- if (usecalllists)
	6007	+ if (usecalllists && bRep.displaylist > 0)
5529	6008	{
5530	6009	// System.err.println("new list " + bRep.displaylist + " for " + this);
5531	6010	display.NewList(bRep.displaylist);
..	..	@@ -5534,7 +6013,7 @@
5534	6013	CallList(display, root, selected, blocked);
5535	6014
5536	6015	// compiled = true;
5537		- if (usecalllists)
	6016	+ if (usecalllists && bRep.displaylist > 0)
5538	6017	{
5539	6018	// System.err.println("end list " + bRep.displaylist + " for " + this);
5540	6019	display.EndList();
..	..	@@ -5634,6 +6113,7 @@
5634	6113	if (GetBRep() != null)
5635	6114	{
5636	6115	display.NextIndex();
	6116	+
5637	6117	// vertex color conflict : gl.glCallList(list);
5638	6118	DrawNode(display, root, selected);
5639	6119	if (this instanceof BezierPatch)
..	..	@@ -5674,16 +6154,27 @@
5674	6154	tex = GetTextures();
5675	6155	}
5676	6156
5677		- boolean failed = false;
	6157	+ boolean failedPigment = false;
	6158	+ boolean failedBump = false;
5678	6159
5679	6160	try
5680	6161	{
5681		- display.BindTextures(tex, texres);
	6162	+ display.BindPigmentTexture(tex, texres);
5682	6163	}
5683	6164	catch (Exception e)
5684	6165	{
5685	6166	System.err.println("FAILED: " + this);
5686		- failed = true;
	6167	+ failedPigment = true;
	6168	+ }
	6169	+
	6170	+ try
	6171	+ {
	6172	+ display.BindBumpTexture(tex, texres);
	6173	+ }
	6174	+ catch (Exception e)
	6175	+ {
	6176	+ //System.err.println("FAILED: " + this);
	6177	+ failedBump = true;
5687	6178	}
5688	6179
5689	6180	if (!compiled)
..	..	@@ -5706,8 +6197,11 @@
5706	6197	}
5707	6198	}
5708	6199
5709		- if (!failed)
5710		- display.ReleaseTextures(tex);
	6200	+ if (!failedBump)
	6201	+ display.ReleaseBumpTexture(tex);
	6202	+
	6203	+ if (!failedPigment)
	6204	+ display.ReleasePigmentTexture(tex);
5711	6205
5712	6206	display.PopMaterial(this, selected);
5713	6207	}
..	..	@@ -6080,6 +6574,11 @@
6080	6574	// dec 2012
6081	6575	new Exception().printStackTrace();
6082	6576	return;
	6577	+ }
	6578	+
	6579	+ if (dontselect)
	6580	+ {
	6581	+ //bRep.GenerateNormalsMINE();
6083	6582	}
6084	6583
6085	6584	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6865,20 +7364,23 @@
6865	7364	}
6866	7365	}
6867	7366
6868		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7367	+ static ClickInfo clickInfo = new ClickInfo();
	7368	+
	7369	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7370	+ Point outPt, Rectangle outRec)
6869	7371	{
6870		- int hc = info.bounds.x + info.bounds.width / 2;
6871		- int vc = info.bounds.y + info.bounds.height / 2;
6872		- double[][] toscreen = info.toScreen;
	7372	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7373	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7374	+ double[][] toscreen = clickInfo.toScreen;
6873	7375	if (toscreen == null)
6874	7376	{
6875		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7377	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6876	7378	}
6877	7379	cVector vec = in;
6878	7380	LA.xformPos(in, toscreen, in);
6879	7381	//System.out.println("Distance = " + info.camera.Distance());
6880		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6881		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7382	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7383	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6882	7384	outPt.x = hc + (int) vec.x;
6883	7385	outPt.y = vc - (int) vec.y;
6884	7386	outRec.x = outPt.x - 3;
..	..	@@ -6886,15 +7388,18 @@
6886	7388	outRec.width = outRec.height = 6;
6887	7389	}
6888	7390
6889		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7391	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7392	+ )
6890	7393	{
6891	7394	Point pt = new Point(0, 0);
6892	7395	Rectangle rec = new Rectangle();
6893		- calcHotSpot(in, info, pt, rec);
	7396	+ calcHotSpot(in, //clickInfo,
	7397	+ pt, rec);
6894	7398	return rec;
6895	7399	}
6896	7400
6897		- void drawEditHandles0(ClickInfo info, int level)
	7401	+ void drawEditHandles0(//ClickInfo clickInfo,
	7402	+ int level)
6898	7403	{
6899	7404	if (level == 0)
6900	7405	{
..	..	@@ -6903,16 +7408,19 @@
6903	7408	{
6904	7409	cVector origin = new cVector();
6905	7410	//LA.xformPos(origin, toParent, origin);
6906		- Rectangle spot = calcHotSpot(origin, info);
	7411	+ if (this.clickInfo == null)
	7412	+ this.clickInfo = new ClickInfo();
	7413	+
	7414	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6907	7415	Rectangle boundary = new Rectangle();
6908	7416	boundary.x = spot.x - 30;
6909	7417	boundary.y = spot.y - 30;
6910	7418	boundary.width = spot.width + 60;
6911	7419	boundary.height = spot.height + 60;
6912		- info.g.setColor(Color.red);
	7420	+ clickInfo.g.setColor(Color.white);
6913	7421	int spotw = spot.x + spot.width;
6914	7422	int spoth = spot.y + spot.height;
6915		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7423	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6916	7424	// if (CameraPane.Xmin > spot.x)
6917	7425	// {
6918	7426	// CameraPane.Xmin = spot.x;
..	..	@@ -6929,11 +7437,33 @@
6929	7437	// {
6930	7438	// CameraPane.Ymax = spoth;
6931	7439	// }
6932		- spot.translate(32, 32);
	7440	+// if (CameraPane.Xmin > spot.x)
	7441	+// {
	7442	+// CameraPane.Xmin = spot.x;
	7443	+// }
	7444	+// if (CameraPane.Xmax < spotw)
	7445	+// {
	7446	+// CameraPane.Xmax = spotw;
	7447	+// }
	7448	+// if (CameraPane.Ymin > spot.y)
	7449	+// {
	7450	+// CameraPane.Ymin = spot.y;
	7451	+// }
	7452	+// if (CameraPane.Ymax < spoth)
	7453	+// {
	7454	+// CameraPane.Ymax = spoth;
	7455	+// }
	7456	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7457	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7458	+ spot.translate(32, 0);
	7459	+ clickInfo.g.setColor(Color.yellow);
	7460	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7461	+
	7462	+ spot.translate(32, 64);
6933	7463	spotw = spot.x + spot.width;
6934	7464	spoth = spot.y + spot.height;
6935		- info.g.setColor(Color.blue);
6936		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7465	+ clickInfo.g.setColor(Color.cyan);
	7466	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6937	7467	// if (CameraPane.Xmin > spot.x)
6938	7468	// {
6939	7469	// CameraPane.Xmin = spot.x;
..	..	@@ -6950,29 +7480,9 @@
6950	7480	// {
6951	7481	// CameraPane.Ymax = spoth;
6952	7482	// }
6953		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6955		- spot.translate(0, -32);
6956		- info.g.setColor(Color.green);
6957		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6958		-// if (CameraPane.Xmin > spot.x)
6959		-// {
6960		-// CameraPane.Xmin = spot.x;
6961		-// }
6962		-// if (CameraPane.Xmax < spotw)
6963		-// {
6964		-// CameraPane.Xmax = spotw;
6965		-// }
6966		-// if (CameraPane.Ymin > spot.y)
6967		-// {
6968		-// CameraPane.Ymin = spot.y;
6969		-// }
6970		-// if (CameraPane.Ymax < spoth)
6971		-// {
6972		-// CameraPane.Ymax = spoth;
6973		-// }
6974		- info.g.drawArc(boundary.x, boundary.y,
6975		- boundary.width, boundary.height, 0, 360);
	7483	+ clickInfo.g.setColor(Color.green);
	7484	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7485	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6976	7486	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6977	7487	// if (CameraPane.Xmin > boundary.x)
6978	7488	// {
..	..	@@ -6994,7 +7504,8 @@
6994	7504	}
6995	7505	}
6996	7506
6997		- boolean doEditClick0(ClickInfo info, int level)
	7507	+ boolean doEditClick0(//ClickInfo clickInfo,
	7508	+ int level)
6998	7509	{
6999	7510	if (level == 0)
7000	7511	{
..	..	@@ -7003,10 +7514,10 @@
7003	7514
7004	7515	boolean retval = false;
7005	7516
7006		- startX = info.x;
7007		- startY = info.y;
	7517	+ startX = clickInfo.x;
	7518	+ startY = clickInfo.y;
7008	7519
7009		- hitSomething = 0;
	7520	+ hitSomething = -1;
7010	7521	cVector origin = new cVector();
7011	7522	//LA.xformPos(origin, toParent, origin);
7012	7523	Rectangle spot = new Rectangle();
..	..	@@ -7014,22 +7525,53 @@
7014	7525	{
7015	7526	centerPt = new Point(0, 0);
7016	7527	}
7017		- calcHotSpot(origin, info, centerPt, spot);
7018		- if (spot.contains(info.x, info.y))
	7528	+ calcHotSpot(origin, //info,
	7529	+ centerPt, spot);
	7530	+ if (spot.contains(clickInfo.x, clickInfo.y))
7019	7531	{
7020	7532	hitSomething = hitCenter;
7021	7533	retval = true;
7022	7534	}
7023	7535	spot.translate(32, 0);
7024		- if (spot.contains(info.x, info.y))
	7536	+ if (spot.contains(clickInfo.x, clickInfo.y))
7025	7537	{
7026	7538	hitSomething = hitRotate;
7027	7539	retval = true;
7028	7540	}
7029	7541	spot.translate(0, 32);
7030		- if (spot.contains(info.x, info.y))
	7542	+ spot.translate(32, 0);
	7543	+ spot.translate(0, 32);
	7544	+ if (spot.contains(clickInfo.x, clickInfo.y))
7031	7545	{
7032	7546	hitSomething = hitScale;
	7547	+
	7548	+ double scale = 0.005f * clickInfo.camera.Distance();
	7549	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7550	+ double sign = 1;
	7551	+ if (hScale < 0)
	7552	+ {
	7553	+ sign = -1;
	7554	+ }
	7555	+ hScale = signMath.pow(signhScale, scale * 50);
	7556	+ if (hScale < 0.01)
	7557	+ {
	7558	+ //hScale = 0.01;
	7559	+ }
	7560	+
	7561	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7562	+ sign = 1;
	7563	+ if (vScale < 0)
	7564	+ {
	7565	+ sign = -1;
	7566	+ }
	7567	+ vScale = signMath.pow(signvScale, scale * 50);
	7568	+ if (vScale < 0.01)
	7569	+ {
	7570	+ //vScale = 0.01;
	7571	+ }
	7572	+
	7573	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7574	+
7033	7575	retval = true;
7034	7576	}
7035	7577
..	..	@@ -7039,7 +7581,7 @@
7039	7581	}
7040	7582
7041	7583	//System.out.println("info.modifiers = " + info.modifiers);
7042		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7584	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7043	7585	//System.out.println("modified = " + modified);
7044	7586	//new Exception().printStackTrace();
7045	7587	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7067,7 +7609,8 @@
7067	7609	return true;
7068	7610	}
7069	7611
7070		- void doEditDrag0(ClickInfo info, boolean opposite)
	7612	+ void doEditDrag0(//ClickInfo info,
	7613	+ boolean opposite)
7071	7614	{
7072	7615	if (hitSomething == 0)
7073	7616	{
..	..	@@ -7081,7 +7624,8 @@
7081	7624
7082	7625	//System.out.println("hitSomething = " + hitSomething);
7083	7626
7084		- double scale = 0.005f * info.camera.Distance();
	7627	+ double scale = 0.005f * clickInfo.camera.Distance();
	7628	+
7085	7629	cVector xlate = new cVector();
7086	7630	//cVector xlate2 = new cVector();
7087	7631	switch (hitSomething)
..	..	@@ -7114,8 +7658,8 @@
7114	7658	toParent[3][i] = xlate.get(i);
7115	7659	LA.matInvert(toParent, fromParent);
7116	7660	*/
7117		- cVector delta = LA.newVector(0, 0, startY - info.y);
7118		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7661	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7119	7663
7120	7664	LA.matCopy(startMat, toParent);
7121	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7124,7 +7668,7 @@
7124	7668	} else
7125	7669	{
7126	7670	//LA.xformDir(delta, info.camera.fromScreen, delta);
7127		- cVector up = new cVector(info.camera.up);
	7671	+ cVector up = new cVector(clickInfo.camera.up);
7128	7672	cVector away = new cVector();
7129	7673	//cVector right2 = new cVector();
7130	7674	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7141,19 +7685,19 @@
7141	7685	LA.xformDir(up, ClickInfo.matbuffer, up);
7142	7686	// if (!CameraPane.LOCALTRANSFORM)
7143	7687	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7144		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7688	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7145	7689	// if (!CameraPane.LOCALTRANSFORM)
7146	7690	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7147	7691	//LA.vecCross(up, cVector.Z, right2);
7148	7692
7149		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7693	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7150	7694
7151	7695	//System.out.println("DELTA0 = " + delta);
7152	7696	//System.out.println("AWAY = " + info.camera.away);
7153	7697	//System.out.println("UP = " + info.camera.up);
7154	7698	if (away.z > 0)
7155	7699	{
7156		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7700	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7157	7701	{
7158	7702	delta.x = -delta.x;
7159	7703	} else
..	..	@@ -7168,7 +7712,7 @@
7168	7712	//System.out.println("DELTA1 = " + delta);
7169	7713	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7170	7714	//System.out.println("DELTA2 = " + delta);
7171		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7715	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7172	7716	LA.matCopy(startMat, toParent);
7173	7717	//System.out.println("DELTA3 = " + delta);
7174	7718	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7178,8 +7722,8 @@
7178	7722	break;
7179	7723
7180	7724	case hitRotate: // rotate
7181		- int dx = info.x - centerPt.x;
7182		- int dy = -(info.y - centerPt.y);
	7725	+ int dx = clickInfo.x - centerPt.x;
	7726	+ int dy = -(clickInfo.y - centerPt.y);
7183	7727	double angle = (double) Math.atan2(dx, dy);
7184	7728	angle = -(1.570796 - angle);
7185	7729
..	..	@@ -7202,7 +7746,7 @@
7202	7746	}
7203	7747	/**/
7204	7748
7205		- switch (info.pane.RenderCamera().viewCode)
	7749	+ switch (clickInfo.pane.RenderCamera().viewCode)
7206	7750	{
7207	7751	case 1: // '\001'
7208	7752	LA.matZRotate(toParent, angle);
..	..	@@ -7229,26 +7773,30 @@
7229	7773	break;
7230	7774
7231	7775	case hitScale: // scale
7232		- double hScale = (double) (info.x - centerPt.x) / 32;
	7776	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7777	+ double sign = 1;
	7778	+ if (hScale < 0)
	7779	+ {
	7780	+ sign = -1;
	7781	+ }
	7782	+ hScale = signMath.pow(signhScale, scale * 50);
7233	7783	if (hScale < 0.01)
7234	7784	{
7235		- hScale = 0.01;
	7785	+ //hScale = 0.01;
7236	7786	}
7237		- hScale = Math.pow(hScale, scale * 50);
7238		- if (hScale < 0.01)
	7787	+
	7788	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7789	+ sign = 1;
	7790	+ if (vScale < 0)
7239	7791	{
7240		- hScale = 0.01;
	7792	+ sign = -1;
7241	7793	}
7242		- double vScale = (double) (info.y - centerPt.y) / 32;
	7794	+ vScale = signMath.pow(signvScale, scale * 50);
7243	7795	if (vScale < 0.01)
7244	7796	{
7245		- vScale = 0.01;
	7797	+ //vScale = 0.01;
7246	7798	}
7247		- vScale = Math.pow(vScale, scale * 50);
7248		- if (vScale < 0.01)
7249		- {
7250		- vScale = 0.01;
7251		- }
	7799	+
7252	7800	LA.matCopy(startMat, toParent);
7253	7801	/**/
7254	7802	for (int i = 0; i < 3; i++)
..	..	@@ -7258,39 +7806,56 @@
7258	7806	}
7259	7807	/**/
7260	7808
7261		- switch (info.pane.RenderCamera().viewCode)
	7809	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7810	+
	7811	+ if (totalScale < 0.01)
	7812	+ {
	7813	+ totalScale = 0.01;
	7814	+ }
	7815	+
	7816	+ switch (clickInfo.pane.RenderCamera().viewCode)
7262	7817	{
7263	7818	case 3: // '\001'
7264		- if (modified)
	7819	+ if (modified \|\| opposite)
7265	7820	{
	7821	+ if (modified && opposite)
	7822	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7823	+ else
7266	7824	//LA.matScale(toParent, 1, hScale, vScale);
7267		- LA.matScale(toParent, vScale, 1, 1);
	7825	+ LA.matScale(toParent, totalScale, 1, 1);
7268	7826	} // vScale, 1);
7269	7827	else
7270	7828	{
7271		- LA.matScale(toParent, vScale, vScale, vScale);
	7829	+ // EXCEPTION!
	7830	+ LA.matScale(toParent, 1, totalScale, totalScale);
7272	7831	} // vScale, 1);
7273	7832	break;
7274	7833
7275	7834	case 2: // '\002'
7276		- if (modified)
	7835	+ if (modified \|\| opposite)
7277	7836	{
7278		- //LA.matScale(toParent, hScale, 1, vScale);
7279		- LA.matScale(toParent, 1, vScale, 1);
	7837	+ if (modified && opposite)
	7838	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7839	+ else
	7840	+ //LA.matScale(toParent, hScale, 1, vScale);
	7841	+ LA.matScale(toParent, 1, totalScale, 1);
7280	7842	} else
7281	7843	{
7282		- LA.matScale(toParent, vScale, 1, vScale);
	7844	+ LA.matScale(toParent, totalScale, 1, totalScale);
7283	7845	}
7284	7846	break;
7285	7847
7286	7848	case 1: // '\003'
7287		- if (modified)
	7849	+ if (modified \|\| opposite)
7288	7850	{
7289		- //LA.matScale(toParent, hScale, vScale, 1);
7290		- LA.matScale(toParent, 1, 1, vScale);
	7851	+ if (modified && opposite)
	7852	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7853	+ else
	7854	+ //LA.matScale(toParent, hScale, vScale, 1);
	7855	+ LA.matScale(toParent, 1, 1, totalScale);
7291	7856	} else
7292	7857	{
7293		- LA.matScale(toParent, vScale, vScale, 1);
	7858	+ LA.matScale(toParent, totalScale, totalScale, 1);
7294	7859	}
7295	7860	break;
7296	7861	}
..	..	@@ -7324,7 +7889,7 @@
7324	7889	} // NEW ...
7325	7890
7326	7891
7327		- info.pane.repaint();
	7892	+ clickInfo.pane.repaint();
7328	7893	}
7329	7894
7330	7895	boolean overflow = false;
..	..	@@ -7431,7 +7996,7 @@
7431	7996	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7432	7997	} else
7433	7998	{
7434		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7999	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7435	8000	} // + super.toString();
7436	8001	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7437	8002
..	..	@@ -7504,6 +8069,10 @@
7504	8069	editWindow = null;
7505	8070	} // ?
7506	8071	}
	8072	+ else
	8073	+ {
	8074	+ //editWindow.closeUI();
	8075	+ }
7507	8076	}
7508	8077
7509	8078	boolean root; // patch for edit windows
..	..	@@ -7515,7 +8084,7 @@
7515	8084	/transient/ cVector2[] projectedVertices = new cVector2[0];
7516	8085
7517	8086	Object3D /Composite/ parent;
7518		- Object3D /Composite/ fileparent;
	8087	+ Object3D /Composite/ fileparent; // In the case of FileObject
7519	8088
7520	8089	double[][] toParent; // dynamic matrix
7521	8090	double[][] fromParent;
..	..	@@ -7661,6 +8230,10 @@
7661	8230	}
7662	8231
7663	8232	transient ObjEditor editWindow;
	8233	+ transient ObjEditor manipWindow;
	8234	+
	8235	+ transient boolean pinned;
	8236	+
7664	8237	transient ObjectUI objectUI;
7665	8238	public static int povDepth = 0;
7666	8239	private static cVector tbMin = new cVector();
..	..	@@ -7679,9 +8252,9 @@
7679	8252	private static cVector edge2 = new cVector();
7680	8253	//private static cVector norm = new cVector();
7681	8254	/transient private/ int hitSomething;
7682		- private static final int hitCenter = 1;
7683		- private static final int hitScale = 2;
7684		- private static final int hitRotate = 3;
	8255	+ static final int hitCenter = 1;
	8256	+ static final int hitScale = 2;
	8257	+ static final int hitRotate = 3;
7685	8258	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7686	8259	/transient/ private Point centerPt;
7687	8260	/transient/ private int startX;