~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,12 +14,27 @@
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	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ Object3D versions[];
	36	+ int versionindex = -1;
	37	+
23	38	ScriptNode scriptnode;
24	39
25	40	void InitOthers()
..	..	@@ -100,64 +115,178 @@
100	115
101	116	// transient boolean reduced; // for morph reduction
102	117
103		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105	120
106		-transient Object3D transientsupport; // for cloning
107		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
108	123
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)
	124	+ void SaveSupports()
121	125	{
122		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
123	149	}
124		-
125		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
126	152	{
127		- Object3D child = (Object3D) get(i);
128		- if (child == null)
129		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
130	261	blockloop = true;
131		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
132	270	blockloop = false;
133	271	}
134		-}
135	272
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)
	273	+ void RestoreBigData(Object3D o)
147	274	{
148		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
149	289	}
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	290
162	291	// MOCAP SUPPORT
163	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -300,6 +429,7 @@
300	429	}
301	430
302	431	boolean live = false;
	432	+ transient boolean keepdontselect;
303	433	boolean dontselect = false;
304	434	boolean hide = false;
305	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -482,12 +612,14 @@
482	612	toParent = LA.newMatrix();
483	613	fromParent = LA.newMatrix();
484	614	}
	615	+
485	616	if (toParentMarked == null)
486	617	{
487	618	if (maxcount != 1)
488	619	{
489	620	new Exception().printStackTrace();
490	621	}
	622	+
491	623	toParentMarked = LA.newMatrix();
492	624	fromParentMarked = LA.newMatrix();
493	625	}
..	..	@@ -775,7 +907,7 @@
775	907	if (step == 0)
776	908	step = 1;
777	909	if (maxcount == 0)
778		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
779	911	// if (acceleration == 0)
780	912	// acceleration = 10;
781	913	if (delay == 0) // serial
..	..	@@ -798,7 +930,7 @@
798	930
799	931	if (marked && Globals.isLIVE() && live &&
800	932	//TEMP21aug2018
801		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
802	934	currentframe != Globals.framecount)
803	935	{
804	936	currentframe = Globals.framecount;
..	..	@@ -810,7 +942,8 @@
810	942
811	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
812	944
813		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
814	947	{
815	948	countdown = 1;
816	949	delay = speedup?8:1;
..	..	@@ -882,6 +1015,10 @@
882	1015	if (material == null \|\| material.multiply)
883	1016	return true;
884	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
885	1022	return material.opacity > 0.99;
886	1023	}
887	1024
..	..	@@ -1282,6 +1419,7 @@
1282	1419	toParent = LA.newMatrix();
1283	1420	fromParent = LA.newMatrix();
1284	1421	}
	1422	+
1285	1423	LA.matCopy(other.toParent, toParent);
1286	1424	LA.matCopy(other.fromParent, fromParent);
1287	1425
..	..	@@ -2303,6 +2441,10 @@
2303	2441	}
2304	2442	*/
2305	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2306	2448	}
2307	2449
2308	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2344,6 +2486,14 @@
2344	2486	{
2345	2487	editWindow.refreshContents();
2346	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2347	2497	//if (parent != null)
2348	2498	//parent.refreshEditWindow();
2349	2499	}
..	..	@@ -2423,7 +2573,8 @@
2423	2573	private static final int editSelf = 1;
2424	2574	private static final int editChild = 2;
2425	2575
2426		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2427	2578	{
2428	2579	if (level == 0)
2429	2580	{
..	..	@@ -2431,7 +2582,8 @@
2431	2582	return;
2432	2583
2433	2584	Object3D selectee;
2434		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2435	2587	{
2436	2588	selectee = (Object3D) e.nextElement();
2437	2589	}
..	..	@@ -2439,19 +2591,22 @@
2439	2591	} else
2440	2592	{
2441	2593	//super.
2442		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2443	2596	}
2444	2597	}
2445	2598
2446		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2447	2601	{
2448	2602	doSomething = 0;
2449	2603	if (level == 0)
2450	2604	{
2451		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2452	2606	}
2453	2607	if (//super.
2454		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2455	2610	{
2456	2611	doSomething = 1;
2457	2612	return true;
..	..	@@ -2461,7 +2616,7 @@
2461	2616	}
2462	2617	}
2463	2618
2464		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2465	2620	{
2466	2621	if (selection == null)
2467	2622	{
..	..	@@ -2474,7 +2629,8 @@
2474	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2475	2630	{
2476	2631	Object3D selectee = (Object3D) e.nextElement();
2477		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2478	2634	{
2479	2635	childToDrag = selectee;
2480	2636	doSomething = 2;
..	..	@@ -2486,13 +2642,15 @@
2486	2642	return retval;
2487	2643	}
2488	2644
2489		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2490	2647	{
2491	2648	switch (doSomething)
2492	2649	{
2493	2650	case 1: // '\001'
2494	2651	//super.
2495		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2496	2654	break;
2497	2655
2498	2656	case 2: // '\002'
..	..	@@ -2505,11 +2663,13 @@
2505	2663	{
2506	2664	//sel.hitSomething = childToDrag.hitSomething;
2507	2665	//childToDrag.doEditDrag(info);
2508		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2509	2668	} else
2510	2669	{
2511	2670	//super.
2512		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2513	2673	}
2514	2674	}
2515	2675	break;
..	..	@@ -2527,6 +2687,9 @@
2527	2687	{
2528	2688	deselectAll();
2529	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2530	2693	ClickInfo newInfo = new ClickInfo();
2531	2694	newInfo.flags = info.flags;
2532	2695	newInfo.bounds = info.bounds;
..	..	@@ -2619,6 +2782,18 @@
2619	2782	void GenNormalsS(boolean crease)
2620	2783	{
2621	2784	selection.GenNormals(crease);
	2785	+// for (int i=0; i<selection.size(); i++)
	2786	+// {
	2787	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2788	+// selectee.GenNormals(crease);
	2789	+// }
	2790	+
	2791	+ //Touch();
	2792	+ }
	2793	+
	2794	+ void GenNormalsMeshS()
	2795	+ {
	2796	+ selection.GenNormalsMesh();
2622	2797	// for (int i=0; i<selection.size(); i++)
2623	2798	// {
2624	2799	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2759,6 +2934,24 @@
2759	2934	if (child == null)
2760	2935	continue;
2761	2936	child.GenNormals(crease);
	2937	+// Children().release(i);
	2938	+ }
	2939	+ blockloop = false;
	2940	+ }
	2941	+
	2942	+ void GenNormalsMesh()
	2943	+ {
	2944	+ if (blockloop)
	2945	+ return;
	2946	+
	2947	+ blockloop = true;
	2948	+ GenNormalsMesh0();
	2949	+ for (int i = 0; i < Children().Size(); i++)
	2950	+ {
	2951	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2952	+ if (child == null)
	2953	+ continue;
	2954	+ child.GenNormalsMesh();
2762	2955	// Children().release(i);
2763	2956	}
2764	2957	blockloop = false;
..	..	@@ -2931,11 +3124,20 @@
2931	3124	}
2932	3125	}
2933	3126
	3127	+ void GenNormalsMesh0()
	3128	+ {
	3129	+ if (bRep != null)
	3130	+ {
	3131	+ bRep.GenerateNormalsMesh();
	3132	+ Touch();
	3133	+ }
	3134	+ }
	3135	+
2934	3136	void GenNormalsMINE0()
2935	3137	{
2936	3138	if (bRep != null)
2937	3139	{
2938		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2939	3141	Touch();
2940	3142	}
2941	3143	}
..	..	@@ -3381,7 +3583,8 @@
3381	3583	if (blockloop)
3382	3584	return;
3383	3585
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3385	3588	live = h;
3386	3589
3387	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3402,7 +3605,8 @@
3402	3605	return;
3403	3606
3404	3607	//if (bRep != null)
3405		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3406	3610	link2master = h;
3407	3611
3408	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3422,7 +3626,8 @@
3422	3626	if (blockloop)
3423	3627	return;
3424	3628
3425		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3426	3631	hide = h;
3427	3632
3428	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3442,7 +3647,7 @@
3442	3647	if (blockloop)
3443	3648	return;
3444	3649
3445		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3446	3651	marked = h;
3447	3652
3448	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3452,6 +3657,46 @@
3452	3657	continue;
3453	3658	blockloop = true;
3454	3659	child.MarkLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RewindLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ rewind = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RewindLeaves(h);
	3680	+ blockloop = false;
	3681	+ // release(i);
	3682	+ }
	3683	+ }
	3684	+
	3685	+ void RandomLeaves(boolean h)
	3686	+ {
	3687	+ if (blockloop)
	3688	+ return;
	3689	+
	3690	+ if (bRep != null \|\| material != null) // borderline...
	3691	+ random = h;
	3692	+
	3693	+ for (int i = 0; i < Size(); i++)
	3694	+ {
	3695	+ Object3D child = (Object3D) get(i); // reserve(i);
	3696	+ if (child == null)
	3697	+ continue;
	3698	+ blockloop = true;
	3699	+ child.RandomLeaves(h);
3455	3700	blockloop = false;
3456	3701	// release(i);
3457	3702	}
..	..	@@ -4229,6 +4474,55 @@
4229	4474	}
4230	4475	}
4231	4476
	4477	+ void RepairSOV()
	4478	+ {
	4479	+ if (blockloop)
	4480	+ return;
	4481	+
	4482	+ String texname = this.GetPigmentTexture();
	4483	+
	4484	+ if (texname.startsWith("sov"))
	4485	+ {
	4486	+ String[] s = texname.split("/");
	4487	+
	4488	+ String[] sname = s[1].split("Color.pn");
	4489	+
	4490	+ texname = sname[0];
	4491	+
	4492	+ if (sname.length > 1)
	4493	+ {
	4494	+ texname += "Color.jpg";
	4495	+ }
	4496	+
	4497	+ this.SetPigmentTexture("sov/" + texname);
	4498	+ }
	4499	+
	4500	+ texname = this.GetBumpTexture();
	4501	+
	4502	+ if (texname.startsWith("sov"))
	4503	+ {
	4504	+ String[] s = texname.split("/");
	4505	+
	4506	+ String[] sname = s[1].split("Bump.pn");
	4507	+
	4508	+ texname = sname[0];
	4509	+
	4510	+ if (sname.length > 1)
	4511	+ {
	4512	+ texname += "Bump.jpg";
	4513	+ }
	4514	+
	4515	+ this.SetBumpTexture("sov/" + texname);
	4516	+ }
	4517	+
	4518	+ for (int i=0; i<Size(); i++)
	4519	+ {
	4520	+ blockloop = true;
	4521	+ get(i).RepairSOV();
	4522	+ blockloop = false;
	4523	+ }
	4524	+ }
	4525	+
4232	4526	void RepairTexture()
4233	4527	{
4234	4528	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4743,6 +5037,14 @@
4743	5037	}
4744	5038	}
4745	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4746	5048	cTreePath Select(int indexcount, boolean deselect)
4747	5049	{
4748	5050	if (hide \|\| dontselect)
..	..	@@ -4779,10 +5081,11 @@
4779	5081	if (leaf != null)
4780	5082	{
4781	5083	cTreePath tp = new cTreePath(this, leaf);
4782		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4783	5086	{
4784	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4785		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4786	5089	}
4787	5090
4788	5091	return tp;
..	..	@@ -4799,6 +5102,7 @@
4799	5102
4800	5103	if (child == null)
4801	5104	continue;
	5105	+
4802	5106	if (child.HasTransparency() && child.size() != 0)
4803	5107	{
4804	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4808,9 +5112,10 @@
4808	5112	if (leaf != null)
4809	5113	{
4810	5114	cTreePath tp = new cTreePath(this, leaf);
4811		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4812	5117	{
4813		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4814	5119	}
4815	5120
4816	5121	return tp;
..	..	@@ -5135,6 +5440,51 @@
5135	5440	blockloop = false;
5136	5441	}
5137	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5138	5488	boolean IsSelected()
5139	5489	{
5140	5490	if (parent == null)
..	..	@@ -5371,6 +5721,43 @@
5371	5721	}
5372	5722	}
5373	5723
	5724	+ UUID GetUUID()
	5725	+ {
	5726	+ if (uuid == null)
	5727	+ {
	5728	+ // Serial
	5729	+ uuid = UUID.randomUUID();
	5730	+ }
	5731	+
	5732	+ return uuid;
	5733	+ }
	5734	+
	5735	+ Object3D GetObject(UUID uid)
	5736	+ {
	5737	+ if (blockloop)
	5738	+ return null;
	5739	+
	5740	+ if (GetUUID().equals(uid))
	5741	+ return this;
	5742	+
	5743	+ int nb = Size();
	5744	+ for (int i = 0; i < nb; i++)
	5745	+ {
	5746	+ Object3D child = (Object3D) get(i);
	5747	+
	5748	+ if (child == null)
	5749	+ continue;
	5750	+
	5751	+ blockloop = true;
	5752	+ Object3D obj = child.GetObject(uid);
	5753	+ blockloop = false;
	5754	+ if (obj != null)
	5755	+ return obj;
	5756	+ }
	5757	+
	5758	+ return null;
	5759	+ }
	5760	+
5374	5761	void SetBumpTexture(String tex)
5375	5762	{
5376	5763	if (GetTextures() == null)
..	..	@@ -5407,6 +5794,38 @@
5407	5794	}
5408	5795	}
5409	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5410	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5411	5830	{
5412	5831	Draw(display, root, selected, blocked);
..	..	@@ -5415,12 +5834,23 @@
5415	5834	boolean NeedSupport()
5416	5835	{
5417	5836	return
5418		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5837	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5419	5838	// PROBLEM with CROWD!!
5420	5839	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5421	5840	}
5422	5841
5423	5842	static boolean DEBUG_SELECTION = false;
	5843	+
	5844	+ boolean IsLive()
	5845	+ {
	5846	+ if (live)
	5847	+ return true;
	5848	+
	5849	+ if (parent == null)
	5850	+ return false;
	5851	+
	5852	+ return parent.IsLive();
	5853	+ }
5424	5854
5425	5855	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5426	5856	{
..	..	@@ -5482,8 +5912,10 @@
5482	5912	if (support != null)
5483	5913	support = support;
5484	5914
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);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5487	5919
5488	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5489	5921	{
..	..	@@ -5493,8 +5925,9 @@
5493	5925	// usecalllists &= !(parent instanceof RandomNode);
5494	5926	// usecalllists = false;
5495	5927
5496		- if (GetBRep() != null)
5497		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5498	5931	//System.out.println("draw " + this);
5499	5932	//new Exception().printStackTrace();
5500	5933
..	..	@@ -5503,10 +5936,12 @@
5503	5936	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5504	5937
5505	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5506		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5939	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5507	5941	{
5508	5942	Globals.lighttouched = true;
5509	5943	} // all panes...
	5944	+
5510	5945	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5511	5946	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5512	5947	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5514,7 +5949,7 @@
5514	5949	if (!(this instanceof Composite))
5515	5950	touched = false;
5516	5951	//if (displaylist == -1 && usecalllists)
5517		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5518	5953	{
5519	5954	bRep.displaylist = display.GenList();
5520	5955	assert(bRep.displaylist != 0);
..	..	@@ -5525,7 +5960,7 @@
5525	5960
5526	5961	//System.out.println("\tnew list " + list);
5527	5962	//gl.glDrawBuffer(gl.GL_NONE);
5528		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5529	5964	{
5530	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5531	5966	display.NewList(bRep.displaylist);
..	..	@@ -5534,7 +5969,7 @@
5534	5969	CallList(display, root, selected, blocked);
5535	5970
5536	5971	// compiled = true;
5537		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5538	5973	{
5539	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5540	5975	display.EndList();
..	..	@@ -5634,6 +6069,7 @@
5634	6069	if (GetBRep() != null)
5635	6070	{
5636	6071	display.NextIndex();
	6072	+
5637	6073	// vertex color conflict : gl.glCallList(list);
5638	6074	DrawNode(display, root, selected);
5639	6075	if (this instanceof BezierPatch)
..	..	@@ -5674,16 +6110,27 @@
5674	6110	tex = GetTextures();
5675	6111	}
5676	6112
5677		- boolean failed = false;
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
5678	6115
5679	6116	try
5680	6117	{
5681		- display.BindTextures(tex, texres);
	6118	+ display.BindPigmentTexture(tex, texres);
5682	6119	}
5683	6120	catch (Exception e)
5684	6121	{
5685	6122	System.err.println("FAILED: " + this);
5686		- failed = true;
	6123	+ failedPigment = true;
	6124	+ }
	6125	+
	6126	+ try
	6127	+ {
	6128	+ display.BindBumpTexture(tex, texres);
	6129	+ }
	6130	+ catch (Exception e)
	6131	+ {
	6132	+ //System.err.println("FAILED: " + this);
	6133	+ failedBump = true;
5687	6134	}
5688	6135
5689	6136	if (!compiled)
..	..	@@ -5706,8 +6153,11 @@
5706	6153	}
5707	6154	}
5708	6155
5709		- if (!failed)
5710		- display.ReleaseTextures(tex);
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
5711	6161
5712	6162	display.PopMaterial(this, selected);
5713	6163	}
..	..	@@ -6080,6 +6530,11 @@
6080	6530	// dec 2012
6081	6531	new Exception().printStackTrace();
6082	6532	return;
	6533	+ }
	6534	+
	6535	+ if (dontselect)
	6536	+ {
	6537	+ //bRep.GenerateNormalsMINE();
6083	6538	}
6084	6539
6085	6540	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6865,20 +7320,23 @@
6865	7320	}
6866	7321	}
6867	7322
6868		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
6869	7327	{
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;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
6873	7331	if (toscreen == null)
6874	7332	{
6875		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6876	7334	}
6877	7335	cVector vec = in;
6878	7336	LA.xformPos(in, toscreen, in);
6879	7337	//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();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6882	7340	outPt.x = hc + (int) vec.x;
6883	7341	outPt.y = vc - (int) vec.y;
6884	7342	outRec.x = outPt.x - 3;
..	..	@@ -6886,15 +7344,18 @@
6886	7344	outRec.width = outRec.height = 6;
6887	7345	}
6888	7346
6889		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
6890	7349	{
6891	7350	Point pt = new Point(0, 0);
6892	7351	Rectangle rec = new Rectangle();
6893		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
6894	7354	return rec;
6895	7355	}
6896	7356
6897		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
6898	7359	{
6899	7360	if (level == 0)
6900	7361	{
..	..	@@ -6903,16 +7364,19 @@
6903	7364	{
6904	7365	cVector origin = new cVector();
6905	7366	//LA.xformPos(origin, toParent, origin);
6906		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6907	7371	Rectangle boundary = new Rectangle();
6908	7372	boundary.x = spot.x - 30;
6909	7373	boundary.y = spot.y - 30;
6910	7374	boundary.width = spot.width + 60;
6911	7375	boundary.height = spot.height + 60;
6912		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
6913	7377	int spotw = spot.x + spot.width;
6914	7378	int spoth = spot.y + spot.height;
6915		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6916	7380	// if (CameraPane.Xmin > spot.x)
6917	7381	// {
6918	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -6932,8 +7396,8 @@
6932	7396	spot.translate(32, 32);
6933	7397	spotw = spot.x + spot.width;
6934	7398	spoth = spot.y + spot.height;
6935		- info.g.setColor(Color.blue);
6936		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6937	7401	// if (CameraPane.Xmin > spot.x)
6938	7402	// {
6939	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -6950,11 +7414,12 @@
6950	7414	// {
6951	7415	// CameraPane.Ymax = spoth;
6952	7416	// }
6953		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7417	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7418	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6955	7419	spot.translate(0, -32);
6956		- info.g.setColor(Color.green);
6957		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
6958	7423	// if (CameraPane.Xmin > spot.x)
6959	7424	// {
6960	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -6971,8 +7436,8 @@
6971	7436	// {
6972	7437	// CameraPane.Ymax = spoth;
6973	7438	// }
6974		- info.g.drawArc(boundary.x, boundary.y,
6975		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
6976	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
6977	7442	// if (CameraPane.Xmin > boundary.x)
6978	7443	// {
..	..	@@ -6994,7 +7459,8 @@
6994	7459	}
6995	7460	}
6996	7461
6997		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
6998	7464	{
6999	7465	if (level == 0)
7000	7466	{
..	..	@@ -7003,10 +7469,10 @@
7003	7469
7004	7470	boolean retval = false;
7005	7471
7006		- startX = info.x;
7007		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7008	7474
7009		- hitSomething = 0;
	7475	+ hitSomething = -1;
7010	7476	cVector origin = new cVector();
7011	7477	//LA.xformPos(origin, toParent, origin);
7012	7478	Rectangle spot = new Rectangle();
..	..	@@ -7014,22 +7480,51 @@
7014	7480	{
7015	7481	centerPt = new Point(0, 0);
7016	7482	}
7017		- calcHotSpot(origin, info, centerPt, spot);
7018		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7019	7486	{
7020	7487	hitSomething = hitCenter;
7021	7488	retval = true;
7022	7489	}
7023	7490	spot.translate(32, 0);
7024		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7025	7492	{
7026	7493	hitSomething = hitRotate;
7027	7494	retval = true;
7028	7495	}
7029	7496	spot.translate(0, 32);
7030		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7031	7498	{
7032	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7033	7528	retval = true;
7034	7529	}
7035	7530
..	..	@@ -7039,7 +7534,7 @@
7039	7534	}
7040	7535
7041	7536	//System.out.println("info.modifiers = " + info.modifiers);
7042		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7043	7538	//System.out.println("modified = " + modified);
7044	7539	//new Exception().printStackTrace();
7045	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7067,7 +7562,8 @@
7067	7562	return true;
7068	7563	}
7069	7564
7070		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7071	7567	{
7072	7568	if (hitSomething == 0)
7073	7569	{
..	..	@@ -7081,7 +7577,8 @@
7081	7577
7082	7578	//System.out.println("hitSomething = " + hitSomething);
7083	7579
7084		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
	7581	+
7085	7582	cVector xlate = new cVector();
7086	7583	//cVector xlate2 = new cVector();
7087	7584	switch (hitSomething)
..	..	@@ -7114,8 +7611,8 @@
7114	7611	toParent[3][i] = xlate.get(i);
7115	7612	LA.matInvert(toParent, fromParent);
7116	7613	*/
7117		- cVector delta = LA.newVector(0, 0, startY - info.y);
7118		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7119	7616
7120	7617	LA.matCopy(startMat, toParent);
7121	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7124,7 +7621,7 @@
7124	7621	} else
7125	7622	{
7126	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7127		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7128	7625	cVector away = new cVector();
7129	7626	//cVector right2 = new cVector();
7130	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7141,19 +7638,19 @@
7141	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7142	7639	// if (!CameraPane.LOCALTRANSFORM)
7143	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7144		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7145	7642	// if (!CameraPane.LOCALTRANSFORM)
7146	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7147	7644	//LA.vecCross(up, cVector.Z, right2);
7148	7645
7149		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7150	7647
7151	7648	//System.out.println("DELTA0 = " + delta);
7152	7649	//System.out.println("AWAY = " + info.camera.away);
7153	7650	//System.out.println("UP = " + info.camera.up);
7154	7651	if (away.z > 0)
7155	7652	{
7156		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7157	7654	{
7158	7655	delta.x = -delta.x;
7159	7656	} else
..	..	@@ -7168,7 +7665,7 @@
7168	7665	//System.out.println("DELTA1 = " + delta);
7169	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7170	7667	//System.out.println("DELTA2 = " + delta);
7171		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7172	7669	LA.matCopy(startMat, toParent);
7173	7670	//System.out.println("DELTA3 = " + delta);
7174	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7178,8 +7675,8 @@
7178	7675	break;
7179	7676
7180	7677	case hitRotate: // rotate
7181		- int dx = info.x - centerPt.x;
7182		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7183	7680	double angle = (double) Math.atan2(dx, dy);
7184	7681	angle = -(1.570796 - angle);
7185	7682
..	..	@@ -7202,7 +7699,7 @@
7202	7699	}
7203	7700	/**/
7204	7701
7205		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7206	7703	{
7207	7704	case 1: // '\001'
7208	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7229,26 +7726,30 @@
7229	7726	break;
7230	7727
7231	7728	case hitScale: // scale
7232		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7730	+ double sign = 1;
	7731	+ if (hScale < 0)
	7732	+ {
	7733	+ sign = -1;
	7734	+ }
	7735	+ hScale = signMath.pow(signhScale, scale * 50);
7233	7736	if (hScale < 0.01)
7234	7737	{
7235		- hScale = 0.01;
	7738	+ //hScale = 0.01;
7236	7739	}
7237		- hScale = Math.pow(hScale, scale * 50);
7238		- if (hScale < 0.01)
	7740	+
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7742	+ sign = 1;
	7743	+ if (vScale < 0)
7239	7744	{
7240		- hScale = 0.01;
	7745	+ sign = -1;
7241	7746	}
7242		- double vScale = (double) (info.y - centerPt.y) / 32;
	7747	+ vScale = signMath.pow(signvScale, scale * 50);
7243	7748	if (vScale < 0.01)
7244	7749	{
7245		- vScale = 0.01;
	7750	+ //vScale = 0.01;
7246	7751	}
7247		- vScale = Math.pow(vScale, scale * 50);
7248		- if (vScale < 0.01)
7249		- {
7250		- vScale = 0.01;
7251		- }
	7752	+
7252	7753	LA.matCopy(startMat, toParent);
7253	7754	/**/
7254	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7258,39 +7759,47 @@
7258	7759	}
7259	7760	/**/
7260	7761
7261		- switch (info.pane.RenderCamera().viewCode)
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7763	+
	7764	+ if (totalScale < 0.01)
	7765	+ {
	7766	+ totalScale = 0.01;
	7767	+ }
	7768	+
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7262	7770	{
7263	7771	case 3: // '\001'
7264		- if (modified)
	7772	+ if (modified \|\| opposite)
7265	7773	{
7266	7774	//LA.matScale(toParent, 1, hScale, vScale);
7267		- LA.matScale(toParent, vScale, 1, 1);
	7775	+ LA.matScale(toParent, totalScale, 1, 1);
7268	7776	} // vScale, 1);
7269	7777	else
7270	7778	{
7271		- LA.matScale(toParent, vScale, vScale, vScale);
	7779	+ // EXCEPTION!
	7780	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7272	7781	} // vScale, 1);
7273	7782	break;
7274	7783
7275	7784	case 2: // '\002'
7276		- if (modified)
	7785	+ if (modified \|\| opposite)
7277	7786	{
7278	7787	//LA.matScale(toParent, hScale, 1, vScale);
7279		- LA.matScale(toParent, 1, vScale, 1);
	7788	+ LA.matScale(toParent, 1, totalScale, 1);
7280	7789	} else
7281	7790	{
7282		- LA.matScale(toParent, vScale, 1, vScale);
	7791	+ LA.matScale(toParent, totalScale, 1, totalScale);
7283	7792	}
7284	7793	break;
7285	7794
7286	7795	case 1: // '\003'
7287		- if (modified)
	7796	+ if (modified \|\| opposite)
7288	7797	{
7289	7798	//LA.matScale(toParent, hScale, vScale, 1);
7290		- LA.matScale(toParent, 1, 1, vScale);
	7799	+ LA.matScale(toParent, 1, 1, totalScale);
7291	7800	} else
7292	7801	{
7293		- LA.matScale(toParent, vScale, vScale, 1);
	7802	+ LA.matScale(toParent, totalScale, totalScale, 1);
7294	7803	}
7295	7804	break;
7296	7805	}
..	..	@@ -7324,7 +7833,7 @@
7324	7833	} // NEW ...
7325	7834
7326	7835
7327		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7328	7837	}
7329	7838
7330	7839	boolean overflow = false;
..	..	@@ -7431,7 +7940,7 @@
7431	7940	objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7432	7941	} else
7433	7942	{
7434		- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
	7943	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7435	7944	} // + super.toString();
7436	7945	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7437	7946
..	..	@@ -7504,6 +8013,10 @@
7504	8013	editWindow = null;
7505	8014	} // ?
7506	8015	}
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
	8019	+ }
7507	8020	}
7508	8021
7509	8022	boolean root; // patch for edit windows
..	..	@@ -7515,7 +8028,7 @@
7515	8028	/transient/ cVector2[] projectedVertices = new cVector2[0];
7516	8029
7517	8030	Object3D /Composite/ parent;
7518		- Object3D /Composite/ fileparent;
	8031	+ Object3D /Composite/ fileparent; // In the case of FileObject
7519	8032
7520	8033	double[][] toParent; // dynamic matrix
7521	8034	double[][] fromParent;
..	..	@@ -7661,6 +8174,10 @@
7661	8174	}
7662	8175
7663	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
7664	8181	transient ObjectUI objectUI;
7665	8182	public static int povDepth = 0;
7666	8183	private static cVector tbMin = new cVector();
..	..	@@ -7679,9 +8196,9 @@
7679	8196	private static cVector edge2 = new cVector();
7680	8197	//private static cVector norm = new cVector();
7681	8198	/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;
	8199	+ static final int hitCenter = 1;
	8200	+ static final int hitScale = 2;
	8201	+ static final int hitRotate = 3;
7685	8202	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7686	8203	/transient/ private Point centerPt;
7687	8204	/transient/ private int startX;