~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,12 +14,24 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	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	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
22	35	ScriptNode scriptnode;
23	36
24	37	void InitOthers()
..	..	@@ -99,64 +112,178 @@
99	112
100	113	// transient boolean reduced; // for morph reduction
101	114
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	117
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
107	120
108		-void SaveSupports()
109		-{
110		- if (blockloop)
111		- return;
112		-
113		- transientsupport = support;
114		- transientlink2master = link2master;
115		-
116		- support = null;
117		- link2master = false;
118		-
119		- if (bRep != null)
	121	+ void SaveSupports()
120	122	{
121		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
122	146	}
123		-
124		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
125	149	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
129	258	blockloop = true;
130		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
131	267	blockloop = false;
132	268	}
133		-}
134	269
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
139		-
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
	270	+ void RestoreBigData(Object3D o)
146	271	{
147		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
148	286	}
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155		- blockloop = true;
156		- child.RestoreSupports();
157		- blockloop = false;
158		- }
159		-}
160	287
161	288	// MOCAP SUPPORT
162	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +426,8 @@
299	426	}
300	427
301	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
302	431	boolean hide = false;
303	432	boolean link2master = false; // performs reset support/master at each frame
304	433	boolean marked = false; // animation node
..	..	@@ -430,16 +559,16 @@
430	559	{
431	560	Object3D copy = this;
432	561
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	562	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	563
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	564	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	565	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	566	+ parentcam = Globals.theRenderer.Cameras()[1];
438	567	}
439	568
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	569	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	570	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	571	+ parentcam = Globals.theRenderer.Cameras()[0];
443	572	}
444	573
445	574	if (this == parentcam)
..	..	@@ -447,7 +576,7 @@
447	576	//assert(this instanceof Camera);
448	577
449	578	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	579	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	580	}
452	581
453	582	copy.marked ^= true;
..	..	@@ -467,7 +596,7 @@
467	596	//assert(this instanceof Camera);
468	597
469	598	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	599	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	600	}
472	601
473	602	copy.Touch(); // display list issue
..	..	@@ -480,12 +609,14 @@
480	609	toParent = LA.newMatrix();
481	610	fromParent = LA.newMatrix();
482	611	}
	612	+
483	613	if (toParentMarked == null)
484	614	{
485	615	if (maxcount != 1)
486	616	{
487	617	new Exception().printStackTrace();
488	618	}
	619	+
489	620	toParentMarked = LA.newMatrix();
490	621	fromParentMarked = LA.newMatrix();
491	622	}
..	..	@@ -602,7 +733,7 @@
602	733	return;
603	734	}
604	735
605		- if (CameraPane.fromscript)
	736	+ if (Globals.fromscript)
606	737	{
607	738	transformcount = 0;
608	739	return;
..	..	@@ -773,7 +904,7 @@
773	904	if (step == 0)
774	905	step = 1;
775	906	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
777	908	// if (acceleration == 0)
778	909	// acceleration = 10;
779	910	if (delay == 0) // serial
..	..	@@ -796,7 +927,7 @@
796	927
797	928	if (marked && Globals.isLIVE() && live &&
798	929	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	931	currentframe != Globals.framecount)
801	932	{
802	933	currentframe = Globals.framecount;
..	..	@@ -808,7 +939,8 @@
808	939
809	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	941
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
812	944	{
813	945	countdown = 1;
814	946	delay = speedup?8:1;
..	..	@@ -880,6 +1012,7 @@
880	1012	if (material == null \|\| material.multiply)
881	1013	return true;
882	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1016	return material.opacity > 0.99;
884	1017	}
885	1018
..	..	@@ -911,6 +1044,11 @@
911	1044	fromParent = null; // LA.newMatrix();
912	1045	bRep = null; // new BoundaryRep();
913	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
914	1052	/*
915	1053	float hue = (float)Math.random();
916	1054	Color col;
..	..	@@ -953,7 +1091,7 @@
953	1091
954	1092	public Object clone()
955	1093	{
956		- return GrafreeD.clone(this);
	1094	+ return Grafreed.clone(this);
957	1095	}
958	1096
959	1097	Object3D copyExpand()
..	..	@@ -1275,6 +1413,7 @@
1275	1413	toParent = LA.newMatrix();
1276	1414	fromParent = LA.newMatrix();
1277	1415	}
	1416	+
1278	1417	LA.matCopy(other.toParent, toParent);
1279	1418	LA.matCopy(other.fromParent, fromParent);
1280	1419
..	..	@@ -1469,7 +1608,7 @@
1469	1608	BoundaryRep.SEUIL = other.material.cameralight;
1470	1609
1471	1610	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1612	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1613	}
1475	1614
..	..	@@ -1728,7 +1867,7 @@
1728	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1868	o.bRep = transientrep;
1730	1869	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1871	o.CreateMaterial();
1733	1872	o.SetAttributes(this, -1);
1734	1873	//parent
..	..	@@ -1741,7 +1880,7 @@
1741	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1881	o.bRep = bRep;
1743	1882	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1884	o.CreateMaterial();
1746	1885	//o.overwriteThis(this, -1);
1747	1886	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1967,15 @@
1828	1967	if (obj.name == null)
1829	1968	continue; // can't be a null one
1830	1969
	1970	+ // Try perfect match first.
1831	1971	if (n.equals(obj.name))
1832	1972	{
1833	1973	theobj = obj;
1834	1974	count++;
1835	1975	}
1836	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1979
1838	1980	if (count != 1)
1839	1981	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2435,17 @@
2293	2435	}
2294	2436	*/
2295	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2296	2442	}
2297	2443
2298	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2445	{
2300	2446	if (newWindow)
2301	2447	{
	2448	+ new Exception().printStackTrace();
2302	2449	System.exit(0);
2303	2450	if (parent != null)
2304	2451	{
..	..	@@ -2333,6 +2480,14 @@
2333	2480	{
2334	2481	editWindow.refreshContents();
2335	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2336	2491	//if (parent != null)
2337	2492	//parent.refreshEditWindow();
2338	2493	}
..	..	@@ -2475,13 +2630,13 @@
2475	2630	return retval;
2476	2631	}
2477	2632
2478		- void doEditDrag(ClickInfo info)
	2633	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2634	{
2480	2635	switch (doSomething)
2481	2636	{
2482	2637	case 1: // '\001'
2483	2638	//super.
2484		- doEditDrag0(info);
	2639	+ doEditDrag0(info, opposite);
2485	2640	break;
2486	2641
2487	2642	case 2: // '\002'
..	..	@@ -2494,11 +2649,11 @@
2494	2649	{
2495	2650	//sel.hitSomething = childToDrag.hitSomething;
2496	2651	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2652	+ sel.doEditDrag(info, opposite);
2498	2653	} else
2499	2654	{
2500	2655	//super.
2501		- doEditDrag0(info);
	2656	+ doEditDrag0(info, opposite);
2502	2657	}
2503	2658	}
2504	2659	break;
..	..	@@ -2608,6 +2763,18 @@
2608	2763	void GenNormalsS(boolean crease)
2609	2764	{
2610	2765	selection.GenNormals(crease);
	2766	+// for (int i=0; i<selection.size(); i++)
	2767	+// {
	2768	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2769	+// selectee.GenNormals(crease);
	2770	+// }
	2771	+
	2772	+ //Touch();
	2773	+ }
	2774	+
	2775	+ void GenNormalsMeshS()
	2776	+ {
	2777	+ selection.GenNormalsMesh();
2611	2778	// for (int i=0; i<selection.size(); i++)
2612	2779	// {
2613	2780	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2915,24 @@
2748	2915	if (child == null)
2749	2916	continue;
2750	2917	child.GenNormals(crease);
	2918	+// Children().release(i);
	2919	+ }
	2920	+ blockloop = false;
	2921	+ }
	2922	+
	2923	+ void GenNormalsMesh()
	2924	+ {
	2925	+ if (blockloop)
	2926	+ return;
	2927	+
	2928	+ blockloop = true;
	2929	+ GenNormalsMesh0();
	2930	+ for (int i = 0; i < Children().Size(); i++)
	2931	+ {
	2932	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2933	+ if (child == null)
	2934	+ continue;
	2935	+ child.GenNormalsMesh();
2751	2936	// Children().release(i);
2752	2937	}
2753	2938	blockloop = false;
..	..	@@ -2905,7 +3090,8 @@
2905	3090	{
2906	3091	if (bRep != null)
2907	3092	{
2908		- bRep.GenUV();
	3093	+ bRep.GenUV(); //1);
	3094	+ //bRep.UnfoldUV();
2909	3095	Touch();
2910	3096	}
2911	3097	}
..	..	@@ -2919,11 +3105,20 @@
2919	3105	}
2920	3106	}
2921	3107
	3108	+ void GenNormalsMesh0()
	3109	+ {
	3110	+ if (bRep != null)
	3111	+ {
	3112	+ bRep.GenerateNormalsMesh();
	3113	+ Touch();
	3114	+ }
	3115	+ }
	3116	+
2922	3117	void GenNormalsMINE0()
2923	3118	{
2924	3119	if (bRep != null)
2925	3120	{
2926		- bRep.GenerateNormalsMINE();
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3122	Touch();
2928	3123	}
2929	3124	}
..	..	@@ -2980,6 +3175,33 @@
2980	3175	blockloop = false;
2981	3176	}
2982	3177
	3178	+ void TransformChildren()
	3179	+ {
	3180	+ if (toParent != null)
	3181	+ {
	3182	+ for (int i=Size(); --i>=0;)
	3183	+ {
	3184	+ Object3D v = get(i);
	3185	+
	3186	+ if (v.toParent == null)
	3187	+ {
	3188	+ v.toParent = LA.newMatrix();
	3189	+ v.fromParent = LA.newMatrix();
	3190	+ }
	3191	+
	3192	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3193	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3194	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3195	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3196	+ }
	3197	+
	3198	+ toParent = null; // LA.matIdentity(toParent);
	3199	+ fromParent = null; // LA.matIdentity(fromParent);
	3200	+
	3201	+ Touch();
	3202	+ }
	3203	+ }
	3204	+
2983	3205	void TransformGeometry()
2984	3206	{
2985	3207	Object3D obj = this;
..	..	@@ -3201,9 +3423,11 @@
3201	3423
3202	3424	BoundaryRep sup = bRep.support;
3203	3425	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3426	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3427	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3428	+
	3429	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3430	+
3207	3431	bRep = temprep;
3208	3432	bRep.support = sup;
3209	3433	Touch();
..	..	@@ -3340,7 +3564,8 @@
3340	3564	if (blockloop)
3341	3565	return;
3342	3566
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3344	3569	live = h;
3345	3570
3346	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3586,8 @@
3361	3586	return;
3362	3587
3363	3588	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3365	3591	link2master = h;
3366	3592
3367	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3607,8 @@
3381	3607	if (blockloop)
3382	3608	return;
3383	3609
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3385	3612	hide = h;
3386	3613
3387	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3628,7 @@
3401	3628	if (blockloop)
3402	3629	return;
3403	3630
3404		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3405	3632	marked = h;
3406	3633
3407	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3638,46 @@
3411	3638	continue;
3412	3639	blockloop = true;
3413	3640	child.MarkLeaves(h);
	3641	+ blockloop = false;
	3642	+ // release(i);
	3643	+ }
	3644	+ }
	3645	+
	3646	+ void RewindLeaves(boolean h)
	3647	+ {
	3648	+ if (blockloop)
	3649	+ return;
	3650	+
	3651	+ if (bRep != null \|\| material != null) // borderline...
	3652	+ rewind = h;
	3653	+
	3654	+ for (int i = 0; i < Size(); i++)
	3655	+ {
	3656	+ Object3D child = (Object3D) get(i); // reserve(i);
	3657	+ if (child == null)
	3658	+ continue;
	3659	+ blockloop = true;
	3660	+ child.RewindLeaves(h);
	3661	+ blockloop = false;
	3662	+ // release(i);
	3663	+ }
	3664	+ }
	3665	+
	3666	+ void RandomLeaves(boolean h)
	3667	+ {
	3668	+ if (blockloop)
	3669	+ return;
	3670	+
	3671	+ if (bRep != null \|\| material != null) // borderline...
	3672	+ random = h;
	3673	+
	3674	+ for (int i = 0; i < Size(); i++)
	3675	+ {
	3676	+ Object3D child = (Object3D) get(i); // reserve(i);
	3677	+ if (child == null)
	3678	+ continue;
	3679	+ blockloop = true;
	3680	+ child.RandomLeaves(h);
3414	3681	blockloop = false;
3415	3682	// release(i);
3416	3683	}
..	..	@@ -3725,7 +3992,7 @@
3725	3992	if (child == null)
3726	3993	continue;
3727	3994
3728		- if (GrafreeD.RENDERME > 0)
	3995	+ if (Grafreed.RENDERME > 0)
3729	3996	{
3730	3997	if (child instanceof Merge)
3731	3998	((Merge)child).renderme();
..	..	@@ -3876,7 +4143,7 @@
3876	4143	if (child == null)
3877	4144	continue;
3878	4145
3879		- if (GrafreeD.RENDERME > 0)
	4146	+ if (Grafreed.RENDERME > 0)
3880	4147	{
3881	4148	if (child instanceof Merge)
3882	4149	((Merge)child).renderme();
..	..	@@ -4071,7 +4338,7 @@
4071	4338	if (child == null)
4072	4339	continue;
4073	4340
4074		- if (GrafreeD.RENDERME > 0)
	4341	+ if (Grafreed.RENDERME > 0)
4075	4342	{
4076	4343	if (child instanceof Merge)
4077	4344	((Merge)child).renderme();
..	..	@@ -4184,6 +4451,55 @@
4184	4451	{
4185	4452	blockloop = true;
4186	4453	get(i).RepairShadow();
	4454	+ blockloop = false;
	4455	+ }
	4456	+ }
	4457	+
	4458	+ void RepairSOV()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ String texname = this.GetPigmentTexture();
	4464	+
	4465	+ if (texname.startsWith("sov"))
	4466	+ {
	4467	+ String[] s = texname.split("/");
	4468	+
	4469	+ String[] sname = s[1].split("Color.pn");
	4470	+
	4471	+ texname = sname[0];
	4472	+
	4473	+ if (sname.length > 1)
	4474	+ {
	4475	+ texname += "Color.jpg";
	4476	+ }
	4477	+
	4478	+ this.SetPigmentTexture("sov/" + texname);
	4479	+ }
	4480	+
	4481	+ texname = this.GetBumpTexture();
	4482	+
	4483	+ if (texname.startsWith("sov"))
	4484	+ {
	4485	+ String[] s = texname.split("/");
	4486	+
	4487	+ String[] sname = s[1].split("Bump.pn");
	4488	+
	4489	+ texname = sname[0];
	4490	+
	4491	+ if (sname.length > 1)
	4492	+ {
	4493	+ texname += "Bump.jpg";
	4494	+ }
	4495	+
	4496	+ this.SetBumpTexture("sov/" + texname);
	4497	+ }
	4498	+
	4499	+ for (int i=0; i<Size(); i++)
	4500	+ {
	4501	+ blockloop = true;
	4502	+ get(i).RepairSOV();
4187	4503	blockloop = false;
4188	4504	}
4189	4505	}
..	..	@@ -4678,7 +4994,7 @@
4678	4994
4679	4995	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4996	{
4681		- if (hide)
	4997	+ if (hide \|\| dontselect)
4682	4998	return null;
4683	4999
4684	5000	if (count <= 0)
..	..	@@ -4702,9 +5018,17 @@
4702	5018	}
4703	5019	}
4704	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4705	5029	cTreePath Select(int indexcount, boolean deselect)
4706	5030	{
4707		- if (hide)
	5031	+ if (hide \|\| dontselect)
4708	5032	return null;
4709	5033
4710	5034	if (count <= 0)
..	..	@@ -4738,10 +5062,11 @@
4738	5062	if (leaf != null)
4739	5063	{
4740	5064	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4742	5067	{
4743	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4745	5070	}
4746	5071
4747	5072	return tp;
..	..	@@ -4758,6 +5083,7 @@
4758	5083
4759	5084	if (child == null)
4760	5085	continue;
	5086	+
4761	5087	if (child.HasTransparency() && child.size() != 0)
4762	5088	{
4763	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5093,10 @@
4767	5093	if (leaf != null)
4768	5094	{
4769	5095	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4771	5098	{
4772		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4773	5100	}
4774	5101
4775	5102	return tp;
..	..	@@ -4854,7 +5181,7 @@
4854	5181	return globalTransform;
4855	5182	}
4856	5183
4857		- void PreprocessOcclusion(CameraPane cp)
	5184	+ void PreprocessOcclusion(iCameraPane cp)
4858	5185	{
4859	5186	/*
4860	5187	if (AOdone)
..	..	@@ -5094,6 +5421,51 @@
5094	5421	blockloop = false;
5095	5422	}
5096	5423
	5424	+ void ResetSelectable()
	5425	+ {
	5426	+ if (blockloop)
	5427	+ return;
	5428	+
	5429	+ blockloop = true;
	5430	+
	5431	+ keepdontselect = dontselect;
	5432	+ dontselect = true;
	5433	+
	5434	+ Object3D child;
	5435	+ int nb = Size();
	5436	+ for (int i = 0; i < nb; i++)
	5437	+ {
	5438	+ child = (Object3D) get(i);
	5439	+ if (child == null)
	5440	+ continue;
	5441	+ child.ResetSelectable();
	5442	+ }
	5443	+
	5444	+ blockloop = false;
	5445	+ }
	5446	+
	5447	+ void RestoreSelectable()
	5448	+ {
	5449	+ if (blockloop)
	5450	+ return;
	5451	+
	5452	+ blockloop = true;
	5453	+
	5454	+ dontselect = keepdontselect;
	5455	+
	5456	+ Object3D child;
	5457	+ int nb = Size();
	5458	+ for (int i = 0; i < nb; i++)
	5459	+ {
	5460	+ child = (Object3D) get(i);
	5461	+ if (child == null)
	5462	+ continue;
	5463	+ child.RestoreSelectable();
	5464	+ }
	5465	+
	5466	+ blockloop = false;
	5467	+ }
	5468	+
5097	5469	boolean IsSelected()
5098	5470	{
5099	5471	if (parent == null)
..	..	@@ -5156,10 +5528,34 @@
5156	5528
5157	5529	// System.out.println("Fullname = " + fullname);
5158	5530
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5531	+ // Does not work on Windows due to C:
	5532	+// if (fullname.name.indexOf(":") == -1)
	5533	+// return fullname.name;
	5534	+//
	5535	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5536
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5537	+ String[] split = fullname.name.split(":");
	5538	+
	5539	+ if (split.length == 0)
	5540	+ {
	5541	+ return "";
	5542	+ }
	5543	+
	5544	+ if (split.length <= 2)
	5545	+ {
	5546	+ if (fullname.name.endsWith(":"))
	5547	+ {
	5548	+ // Windows
	5549	+ return fullname.name.substring(0, fullname.name.length()-1);
	5550	+ }
	5551	+
	5552	+ return split[0];
	5553	+ }
	5554	+
	5555	+ // Windows
	5556	+ assert(split.length == 4);
	5557	+
	5558	+ return split[0] + ":" + split[1];
5163	5559	}
5164	5560
5165	5561	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5564,38 @@
5168	5564	return "";
5169	5565
5170	5566	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5567	+ // Does not work on Windows due to C:
	5568	+// if (fullname.name.indexOf(":") == -1)
	5569	+// return "";
	5570	+//
	5571	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5572	+ String[] split = fullname.name.split(":");
	5573	+
	5574	+ if (split.length == 0)
	5575	+ {
	5576	+ return "";
	5577	+ }
	5578	+
	5579	+ if (split.length == 1)
	5580	+ {
	5581	+ return "";
	5582	+ }
	5583	+
	5584	+ if (split.length == 2)
	5585	+ {
	5586	+ if (fullname.name.endsWith(":"))
	5587	+ {
	5588	+ // Windows
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ return split[1];
	5593	+ }
	5594	+
	5595	+ // Windows
	5596	+ assert(split.length == 4);
	5597	+
	5598	+ return split[2] + ":" + split[3];
5175	5599	}
5176	5600
5177	5601	String GetPigmentTexture()
..	..	@@ -5245,7 +5669,7 @@
5245	5669	System.out.print("; textures = " + textures);
5246	5670	System.out.println("; usedtextures = " + usedtextures);
5247	5671
5248		- if (GetTextures() == null)
	5672	+ if (GetTextures() == null) // What is that??
5249	5673	GetTextures().name = ":";
5250	5674
5251	5675	String texname = tex;
..	..	@@ -5276,6 +5700,43 @@
5276	5700	child.ResetPigmentTexture();
5277	5701	blockloop = false;
5278	5702	}
	5703	+ }
	5704	+
	5705	+ UUID GetUUID()
	5706	+ {
	5707	+ if (uuid == null)
	5708	+ {
	5709	+ // Serial
	5710	+ uuid = UUID.randomUUID();
	5711	+ }
	5712	+
	5713	+ return uuid;
	5714	+ }
	5715	+
	5716	+ Object3D GetObject(UUID uid)
	5717	+ {
	5718	+ if (blockloop)
	5719	+ return null;
	5720	+
	5721	+ if (GetUUID().equals(uid))
	5722	+ return this;
	5723	+
	5724	+ int nb = Size();
	5725	+ for (int i = 0; i < nb; i++)
	5726	+ {
	5727	+ Object3D child = (Object3D) get(i);
	5728	+
	5729	+ if (child == null)
	5730	+ continue;
	5731	+
	5732	+ blockloop = true;
	5733	+ Object3D obj = child.GetObject(uid);
	5734	+ blockloop = false;
	5735	+ if (obj != null)
	5736	+ return obj;
	5737	+ }
	5738	+
	5739	+ return null;
5279	5740	}
5280	5741
5281	5742	void SetBumpTexture(String tex)
..	..	@@ -5314,6 +5775,38 @@
5314	5775	}
5315	5776	}
5316	5777
	5778	+ void EmbedTextures(boolean embed)
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ //if (GetTextures() != null)
	5784	+ if (embed)
	5785	+ CameraPane.EmbedTextures(GetTextures());
	5786	+ else
	5787	+ {
	5788	+ GetTextures().pigmentdata = null;
	5789	+ GetTextures().bumpdata = null;
	5790	+ GetTextures().pw = 0;
	5791	+ GetTextures().ph = 0;
	5792	+ GetTextures().bw = 0;
	5793	+ GetTextures().bh = 0;
	5794	+ }
	5795	+
	5796	+ int nb = Size();
	5797	+ for (int i = 0; i < nb; i++)
	5798	+ {
	5799	+ Object3D child = (Object3D) get(i);
	5800	+
	5801	+ if (child == null)
	5802	+ continue;
	5803	+
	5804	+ blockloop = true;
	5805	+ child.EmbedTextures(embed);
	5806	+ blockloop = false;
	5807	+ }
	5808	+ }
	5809	+
5317	5810	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5811	{
5319	5812	Draw(display, root, selected, blocked);
..	..	@@ -5322,11 +5815,23 @@
5322	5815	boolean NeedSupport()
5323	5816	{
5324	5817	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5818	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5819	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5820	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5821	}
5329	5822
	5823	+ static boolean DEBUG_SELECTION = false;
	5824	+
	5825	+ boolean IsLive()
	5826	+ {
	5827	+ if (live)
	5828	+ return true;
	5829	+
	5830	+ if (parent == null)
	5831	+ return false;
	5832	+
	5833	+ return parent.IsLive();
	5834	+ }
5330	5835
5331	5836	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5837	{
..	..	@@ -5338,7 +5843,7 @@
5338	5843	}
5339	5844
5340	5845	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5846	+ (hide \|\| dontselect))
5342	5847	return;
5343	5848
5344	5849	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5870,12 @@
5365	5870	}
5366	5871
5367	5872	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5873	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5874	{
5370	5875	return;
5371	5876	}
5372	5877
5373		- javax.media.opengl.GL gl = display.GetGL();
	5878	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5879
5375	5880	/*
5376	5881	if (touched)
..	..	@@ -5389,7 +5894,7 @@
5389	5894	support = support;
5390	5895
5391	5896	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5392		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5897	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5393	5898
5394	5899	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5395	5900	{
..	..	@@ -5406,13 +5911,15 @@
5406	5911
5407	5912	boolean compiled = false;
5408	5913
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5914	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5915
5411	5916	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5917	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5918	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5413	5919	{
5414	5920	Globals.lighttouched = true;
5415	5921	} // all panes...
	5922	+
5416	5923	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5417	5924	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5418	5925	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5929,7 @@
5422	5929	//if (displaylist == -1 && usecalllists)
5423	5930	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5931	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5932	+ bRep.displaylist = display.GenList();
5426	5933	assert(bRep.displaylist != 0);
5427	5934	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5935	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5941,16 @@
5434	5941	if (usecalllists)
5435	5942	{
5436	5943	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5944	+ display.NewList(bRep.displaylist);
5438	5945	}
	5946	+
5439	5947	CallList(display, root, selected, blocked);
	5948	+
5440	5949	// compiled = true;
5441	5950	if (usecalllists)
5442	5951	{
5443	5952	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5953	+ display.EndList();
5445	5954	}
5446	5955	//gl.glDrawBuffer(gl.GL_BACK);
5447	5956	// XXX touched = false;
..	..	@@ -5484,12 +5993,12 @@
5484	5993
5485	5994	// frustum culling
5486	5995	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	5996	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	5997	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	5998	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	5999	{
5491	6000	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6001	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	6002	{
5494	6003	//System.out.print("CULLED");
5495	6004	culled = true;
..	..	@@ -5497,7 +6006,7 @@
5497	6006	}
5498	6007	else
5499	6008	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6009	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	6010	culled = true;
5502	6011
5503	6012	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +6042,12 @@
5533	6042
5534	6043
5535	6044	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6045	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	6046	{
5538	6047	if (GetBRep() != null)
5539	6048	{
5540		- CameraPane.NextIndex(this, gl);
	6049	+ display.NextIndex();
	6050	+
5541	6051	// vertex color conflict : gl.glCallList(list);
5542	6052	DrawNode(display, root, selected);
5543	6053	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +6088,28 @@
5578	6088	tex = GetTextures();
5579	6089	}
5580	6090
5581		- display.BindTextures(tex, texres);
	6091	+ boolean failedPigment = false;
	6092	+ boolean failedBump = false;
	6093	+
	6094	+ try
	6095	+ {
	6096	+ display.BindPigmentTexture(tex, texres);
	6097	+ }
	6098	+ catch (Exception e)
	6099	+ {
	6100	+ System.err.println("FAILED: " + this);
	6101	+ failedPigment = true;
	6102	+ }
	6103	+
	6104	+ try
	6105	+ {
	6106	+ display.BindBumpTexture(tex, texres);
	6107	+ }
	6108	+ catch (Exception e)
	6109	+ {
	6110	+ //System.err.println("FAILED: " + this);
	6111	+ failedBump = true;
	6112	+ }
5582	6113
5583	6114	if (!compiled)
5584	6115	{
..	..	@@ -5594,13 +6125,17 @@
5594	6125
5595	6126	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	6127	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	6128	+ display.CallList(bRep.displaylist);
5598	6129	// june 2013 drawSelf(display, root, selected);
5599	6130	}
5600	6131	}
5601	6132	}
5602	6133
5603		- display.ReleaseTextures(tex);
	6134	+ if (!failedBump)
	6135	+ display.ReleaseBumpTexture(tex);
	6136	+
	6137	+ if (!failedPigment)
	6138	+ display.ReleasePigmentTexture(tex);
5604	6139
5605	6140	display.PopMaterial(this, selected);
5606	6141	}
..	..	@@ -5729,6 +6264,9 @@
5729	6264
5730	6265	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6266	{
	6267	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6268	+ return;
	6269	+
5732	6270	if (hide)
5733	6271	return;
5734	6272	// shadow optimisation
..	..	@@ -5854,6 +6392,9 @@
5854	6392	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	6393	return; // no shadow for transparent objects
5856	6394
	6395	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6396	+ return;
	6397	+
5857	6398	if (hide)
5858	6399	return;
5859	6400
..	..	@@ -5894,9 +6435,10 @@
5894	6435	return;
5895	6436	}
5896	6437
	6438	+ //bRep.GenUV(1/material.diffuseness);
5897	6439	// bRep.lock = true;
5898	6440
5899		- javax.media.opengl.GL gl = display.GetGL();
	6441	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6442
5901	6443	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6444	{
..	..	@@ -5913,23 +6455,7 @@
5913	6455
5914	6456	bRep.getMinMax(min, max, 100);
5915	6457
5916		- gl.glBegin(gl.GL_LINES);
5917		-
5918		- gl.glVertex3d(min.x, min.y, min.z);
5919		- gl.glVertex3d(min.x, min.y, max.z);
5920		- gl.glVertex3d(min.x, min.y, min.z);
5921		- gl.glVertex3d(min.x, max.y, min.z);
5922		- gl.glVertex3d(min.x, min.y, min.z);
5923		- gl.glVertex3d(max.x, min.y, min.z);
5924		-
5925		- gl.glVertex3d(max.x, max.y, max.z);
5926		- gl.glVertex3d(min.x, max.y, max.z);
5927		- gl.glVertex3d(max.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, min.y, max.z);
5929		- gl.glVertex3d(max.x, max.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, min.z);
5931		-
5932		- gl.glEnd();
	6458	+ display.DrawBox(min, max);
5933	6459
5934	6460	return;
5935	6461	}
..	..	@@ -5973,7 +6499,7 @@
5973	6499	{
5974	6500	//throw new Error();
5975	6501
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6502	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6503
5978	6504	int[] strips = bRep.getRawIndices();
5979	6505
..	..	@@ -5983,178 +6509,19 @@
5983	6509	new Exception().printStackTrace();
5984	6510	return;
5985	6511	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
	6512	+
	6513	+ if (dontselect)
5989	6514	{
5990		- float[] v = bRep.getRawVertices();
5991		- float[] n = bRep.getRawNormals();
5992		- float[] c = bRep.getRawColors();
5993		- float[] uv = bRep.getRawUVMap();
5994		-
5995		- int count2 = 0;
5996		- int count3 = 0;
5997		-
5998		- if (n.length > 0)
5999		- {
6000		- for (int i = 0; i < strips.length; i++)
6001		- {
6002		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6003		-
6004		- /*
6005		- boolean locked = false;
6006		- float eps = 0.1f;
6007		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6008		-
6009		- int dot = 0;
6010		-
6011		- if ((dot&1) == 0)
6012		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6013		-
6014		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6015		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6016		- else
6017		- {
6018		- locked = true;
6019		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6020		- }
6021		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6022		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6023		- if (hasnorm)
6024		- {
6025		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6026		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6027		- }
6028		-
6029		- if ((dot&4) == 0)
6030		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6031		-
6032		- if (wrap \|\| !locked && (dot&8) != 0)
6033		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6034		- else
6035		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6036		-
6037		- f.dot = dot;
6038		- */
6039		-
6040		- if (!selectmode)
6041		- {
6042		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6043		- {
6044		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6045		- } else
6046		- {
6047		- gl.glNormal3f(0, 0, 1);
6048		- }
6049		-
6050		- if (c != null)
6051		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6052		- {
6053		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6054		- }
6055		- }
6056		- if (flipV)
6057		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6058		- else
6059		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6060		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6061		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6062		-
6063		- count2 += 2;
6064		- count3 += 3;
6065		- if (!selectmode)
6066		- {
6067		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6068		- {
6069		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6070		- } else
6071		- {
6072		- gl.glNormal3f(0, 0, 1);
6073		- }
6074		- if (c != null)
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- for (int j = 0; j < strips[i] - 2; j++)
6089		- {
6090		- //gl.glTexCoord2d(...);
6091		- if (!selectmode)
6092		- {
6093		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6094		- {
6095		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6096		- } else
6097		- {
6098		- gl.glNormal3f(0, 0, 1);
6099		- }
6100		- if (c != null)
6101		- {
6102		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6103		- }
6104		- }
6105		-
6106		- if (flipV)
6107		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6108		- else
6109		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6110		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6111		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6112		- count2 += 2;
6113		- count3 += 3;
6114		- }
6115		-
6116		- gl.glEnd();
6117		- }
6118		- }
6119		-
6120		- assert count3 == v.length;
	6515	+ //bRep.GenerateNormalsMINE();
6121	6516	}
6122		- else // !trimmed
6123		- {
6124		- int count = 0;
6125		- for (int i = 0; i < strips.length; i++)
6126		- {
6127		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6128		-
6129		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6130		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6131		-
6132		- drawVertex(gl, p, selectmode);
6133		- drawVertex(gl, q, selectmode);
6134		-
6135		- for (int j = 0; j < strips[i] - 2; j++)
6136		- {
6137		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6138		-
6139		-// if (j%2 == 0)
6140		-// drawFace(p, q, r, display, null);
6141		-// else
6142		-// drawFace(p, r, q, display, null);
6143		-
6144		-// p = q;
6145		-// q = r;
6146		- drawVertex(gl, r, selectmode);
6147		- }
6148		-
6149		- gl.glEnd();
6150		- }
6151		- }
	6517	+
	6518	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6519	} else // catch (Error e)
6153	6520	{
6154	6521	// TRIANGLE ARRAY
6155	6522	if (IsOpaque()) // Static())
6156	6523	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6524	+ display.StartTriangles();
6158	6525	int facecount = bRep.FaceCount();
6159	6526	for (int i = 0; i < facecount; i++)
6160	6527	{
..	..	@@ -6219,7 +6586,7 @@
6219	6586
6220	6587	display.DrawFace(this, p, q, r, face);
6221	6588	}
6222		- gl.glEnd();
	6589	+ display.EndTriangles();
6223	6590	}
6224	6591	else
6225	6592	{
..	..	@@ -6248,8 +6615,8 @@
6248	6615	//System.out.println("SORT");
6249	6616
6250	6617	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6618	+
	6619	+ display.StartTriangles();
6253	6620	for (int i = 0; i < facecount; i++)
6254	6621	{
6255	6622	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6630,12 @@
6263	6630
6264	6631	display.DrawFace(this, p, q, r, face);
6265	6632	}
6266		- gl.glEnd();
	6633	+ display.EndTriangles();
6267	6634	}
6268	6635
6269	6636	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6637	{
	6638	+ /*
6271	6639	gl.glDisable(gl.GL_LIGHTING);
6272	6640	float[] colorV = new float[3];
6273	6641
..	..	@@ -6346,6 +6714,7 @@
6346	6714	// gl.glEnd();
6347	6715	}
6348	6716	}
	6717	+ */
6349	6718	}
6350	6719	}
6351	6720
..	..	@@ -6390,7 +6759,7 @@
6390	6759	center.add(r);
6391	6760	center.mul(1.0/3);
6392	6761
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6762	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6763
6395	6764	distance = center.dot(center);
6396	6765	}
..	..	@@ -6404,22 +6773,6 @@
6404	6773	void Print(Vertex v)
6405	6774	{
6406	6775	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6407		- }
6408		-
6409		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6410		- {
6411		- if (!selectmode)
6412		- {
6413		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6414		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6415		-
6416		- if (flipV)
6417		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6418		- else
6419		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6420		- }
6421		-
6422		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6423	6776	}
6424	6777
6425	6778	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6993,83 +7346,84 @@
6993	7346	int spotw = spot.x + spot.width;
6994	7347	int spoth = spot.y + spot.height;
6995	7348	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996		- if (CameraPane.Xmin > spot.x)
6997		- {
6998		- CameraPane.Xmin = spot.x;
6999		- }
7000		- if (CameraPane.Xmax < spotw)
7001		- {
7002		- CameraPane.Xmax = spotw;
7003		- }
7004		- if (CameraPane.Ymin > spot.y)
7005		- {
7006		- CameraPane.Ymin = spot.y;
7007		- }
7008		- if (CameraPane.Ymax < spoth)
7009		- {
7010		- CameraPane.Ymax = spoth;
7011		- }
	7349	+// if (CameraPane.Xmin > spot.x)
	7350	+// {
	7351	+// CameraPane.Xmin = spot.x;
	7352	+// }
	7353	+// if (CameraPane.Xmax < spotw)
	7354	+// {
	7355	+// CameraPane.Xmax = spotw;
	7356	+// }
	7357	+// if (CameraPane.Ymin > spot.y)
	7358	+// {
	7359	+// CameraPane.Ymin = spot.y;
	7360	+// }
	7361	+// if (CameraPane.Ymax < spoth)
	7362	+// {
	7363	+// CameraPane.Ymax = spoth;
	7364	+// }
7012	7365	spot.translate(32, 32);
7013	7366	spotw = spot.x + spot.width;
7014	7367	spoth = spot.y + spot.height;
7015		- info.g.setColor(Color.blue);
	7368	+ info.g.setColor(Color.cyan);
7016	7369	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017		- if (CameraPane.Xmin > spot.x)
7018		- {
7019		- CameraPane.Xmin = spot.x;
7020		- }
7021		- if (CameraPane.Xmax < spotw)
7022		- {
7023		- CameraPane.Xmax = spotw;
7024		- }
7025		- if (CameraPane.Ymin > spot.y)
7026		- {
7027		- CameraPane.Ymin = spot.y;
7028		- }
7029		- if (CameraPane.Ymax < spoth)
7030		- {
7031		- CameraPane.Ymax = spoth;
7032		- }
7033		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7370	+// if (CameraPane.Xmin > spot.x)
	7371	+// {
	7372	+// CameraPane.Xmin = spot.x;
	7373	+// }
	7374	+// if (CameraPane.Xmax < spotw)
	7375	+// {
	7376	+// CameraPane.Xmax = spotw;
	7377	+// }
	7378	+// if (CameraPane.Ymin > spot.y)
	7379	+// {
	7380	+// CameraPane.Ymin = spot.y;
	7381	+// }
	7382	+// if (CameraPane.Ymax < spoth)
	7383	+// {
	7384	+// CameraPane.Ymax = spoth;
	7385	+// }
	7386	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7387	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7035	7388	spot.translate(0, -32);
7036		- info.g.setColor(Color.green);
	7389	+ info.g.setColor(Color.yellow);
7037	7390	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038		- if (CameraPane.Xmin > spot.x)
7039		- {
7040		- CameraPane.Xmin = spot.x;
7041		- }
7042		- if (CameraPane.Xmax < spotw)
7043		- {
7044		- CameraPane.Xmax = spotw;
7045		- }
7046		- if (CameraPane.Ymin > spot.y)
7047		- {
7048		- CameraPane.Ymin = spot.y;
7049		- }
7050		- if (CameraPane.Ymax < spoth)
7051		- {
7052		- CameraPane.Ymax = spoth;
7053		- }
7054		- info.g.drawArc(boundary.x, boundary.y,
7055		- boundary.width, boundary.height, 0, 360);
	7391	+ info.g.setColor(Color.green);
	7392	+// if (CameraPane.Xmin > spot.x)
	7393	+// {
	7394	+// CameraPane.Xmin = spot.x;
	7395	+// }
	7396	+// if (CameraPane.Xmax < spotw)
	7397	+// {
	7398	+// CameraPane.Xmax = spotw;
	7399	+// }
	7400	+// if (CameraPane.Ymin > spot.y)
	7401	+// {
	7402	+// CameraPane.Ymin = spot.y;
	7403	+// }
	7404	+// if (CameraPane.Ymax < spoth)
	7405	+// {
	7406	+// CameraPane.Ymax = spoth;
	7407	+// }
	7408	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7409	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7056	7410	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057		- if (CameraPane.Xmin > boundary.x)
7058		- {
7059		- CameraPane.Xmin = boundary.x;
7060		- }
7061		- if (CameraPane.Xmax < boundary.x + boundary.width)
7062		- {
7063		- CameraPane.Xmax = boundary.x + boundary.width;
7064		- }
7065		- if (CameraPane.Ymin > boundary.y)
7066		- {
7067		- CameraPane.Ymin = boundary.y;
7068		- }
7069		- if (CameraPane.Ymax < boundary.y + boundary.height)
7070		- {
7071		- CameraPane.Ymax = boundary.y + boundary.height;
7072		- }
	7411	+// if (CameraPane.Xmin > boundary.x)
	7412	+// {
	7413	+// CameraPane.Xmin = boundary.x;
	7414	+// }
	7415	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7416	+// {
	7417	+// CameraPane.Xmax = boundary.x + boundary.width;
	7418	+// }
	7419	+// if (CameraPane.Ymin > boundary.y)
	7420	+// {
	7421	+// CameraPane.Ymin = boundary.y;
	7422	+// }
	7423	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7424	+// {
	7425	+// CameraPane.Ymax = boundary.y + boundary.height;
	7426	+// }
7073	7427	return;
7074	7428	}
7075	7429	}
..	..	@@ -7086,7 +7440,7 @@
7086	7440	startX = info.x;
7087	7441	startY = info.y;
7088	7442
7089		- hitSomething = 0;
	7443	+ hitSomething = -1;
7090	7444	cVector origin = new cVector();
7091	7445	//LA.xformPos(origin, toParent, origin);
7092	7446	Rectangle spot = new Rectangle();
..	..	@@ -7119,7 +7473,7 @@
7119	7473	}
7120	7474
7121	7475	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7476	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7477	//System.out.println("modified = " + modified);
7124	7478	//new Exception().printStackTrace();
7125	7479	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7501,7 @@
7147	7501	return true;
7148	7502	}
7149	7503
7150		- void doEditDrag0(ClickInfo info)
	7504	+ void doEditDrag0(ClickInfo info, boolean opposite)
7151	7505	{
7152	7506	if (hitSomething == 0)
7153	7507	{
..	..	@@ -7162,6 +7516,7 @@
7162	7516	//System.out.println("hitSomething = " + hitSomething);
7163	7517
7164	7518	double scale = 0.005f * info.camera.Distance();
	7519	+
7165	7520	cVector xlate = new cVector();
7166	7521	//cVector xlate2 = new cVector();
7167	7522	switch (hitSomething)
..	..	@@ -7172,9 +7527,9 @@
7172	7527
7173	7528	case hitCenter: // Translate
7174	7529
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7530	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7531
7177		- if (modified)
	7532	+ if (modified \|\| opposite)
7178	7533	{
7179	7534	//assert(false);
7180	7535	/*
..	..	@@ -7220,10 +7575,10 @@
7220	7575	}
7221	7576	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7577	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7578	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7224	7579	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7225	7580	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7581	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7582	//LA.vecCross(up, cVector.Z, right2);
7228	7583
7229	7584	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7268,6 +7623,7 @@
7268	7623
7269	7624	if (modified)
7270	7625	{
	7626	+ // Rotate 90 degrees
7271	7627	angle /= (Math.PI / 4);
7272	7628	angle = Math.floor(angle + 0.5);
7273	7629	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7637,7 @@
7281	7637	}
7282	7638	/**/
7283	7639
7284		- switch (info.pane.renderCamera.viewCode)
	7640	+ switch (info.pane.RenderCamera().viewCode)
7285	7641	{
7286	7642	case 1: // '\001'
7287	7643	LA.matZRotate(toParent, angle);
..	..	@@ -7309,24 +7665,27 @@
7309	7665
7310	7666	case hitScale: // scale
7311	7667	double hScale = (double) (info.x - centerPt.x) / 32;
	7668	+ double sign = 1;
	7669	+ if (hScale < 0)
	7670	+ {
	7671	+ sign = -1;
	7672	+ }
	7673	+ hScale = signMath.pow(signhScale, scale * 50);
7312	7674	if (hScale < 0.01)
7313	7675	{
7314		- hScale = 0.01;
	7676	+ //hScale = 0.01;
7315	7677	}
7316		- hScale = Math.pow(hScale, scale * 50);
7317		- if (hScale < 0.01)
7318		- {
7319		- hScale = 0.01;
7320		- }
	7678	+
7321	7679	double vScale = (double) (info.y - centerPt.y) / 32;
7322		- if (vScale < 0.01)
	7680	+ sign = 1;
	7681	+ if (vScale < 0)
7323	7682	{
7324		- vScale = 0.01;
	7683	+ sign = -1;
7325	7684	}
7326		- vScale = Math.pow(vScale, scale * 50);
	7685	+ vScale = signMath.pow(signvScale, scale * 50);
7327	7686	if (vScale < 0.01)
7328	7687	{
7329		- vScale = 0.01;
	7688	+ //vScale = 0.01;
7330	7689	}
7331	7690	LA.matCopy(startMat, toParent);
7332	7691	/**/
..	..	@@ -7337,39 +7696,47 @@
7337	7696	}
7338	7697	/**/
7339	7698
7340		- switch (info.pane.renderCamera.viewCode)
	7699	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7700	+
	7701	+ if (totalScale < 0.01)
	7702	+ {
	7703	+ totalScale = 0.01;
	7704	+ }
	7705	+
	7706	+ switch (info.pane.RenderCamera().viewCode)
7341	7707	{
7342	7708	case 3: // '\001'
7343		- if (modified)
	7709	+ if (modified \|\| opposite)
7344	7710	{
7345	7711	//LA.matScale(toParent, 1, hScale, vScale);
7346		- LA.matScale(toParent, vScale, 1, 1);
	7712	+ LA.matScale(toParent, totalScale, 1, 1);
7347	7713	} // vScale, 1);
7348	7714	else
7349	7715	{
7350		- LA.matScale(toParent, vScale, vScale, vScale);
	7716	+ // EXCEPTION!
	7717	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7351	7718	} // vScale, 1);
7352	7719	break;
7353	7720
7354	7721	case 2: // '\002'
7355		- if (modified)
	7722	+ if (modified \|\| opposite)
7356	7723	{
7357	7724	//LA.matScale(toParent, hScale, 1, vScale);
7358		- LA.matScale(toParent, 1, vScale, 1);
	7725	+ LA.matScale(toParent, 1, totalScale, 1);
7359	7726	} else
7360	7727	{
7361		- LA.matScale(toParent, vScale, 1, vScale);
	7728	+ LA.matScale(toParent, totalScale, 1, totalScale);
7362	7729	}
7363	7730	break;
7364	7731
7365	7732	case 1: // '\003'
7366		- if (modified)
	7733	+ if (modified \|\| opposite)
7367	7734	{
7368	7735	//LA.matScale(toParent, hScale, vScale, 1);
7369		- LA.matScale(toParent, 1, 1, vScale);
	7736	+ LA.matScale(toParent, 1, 1, totalScale);
7370	7737	} else
7371	7738	{
7372		- LA.matScale(toParent, vScale, vScale, 1);
	7739	+ LA.matScale(toParent, totalScale, totalScale, 1);
7373	7740	}
7374	7741	break;
7375	7742	}
..	..	@@ -7502,14 +7869,22 @@
7502	7869	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7870	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7871	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7872	+
	7873	+ String objname;
	7874	+
7505	7875	if (false) //parent != null)
7506	7876	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7877	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7878	} else
7509	7879	{
7510		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7880	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7511	7881	} // + super.toString();
7512	7882	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7883	+
	7884	+ if (!Globals.ADVANCED)
	7885	+ return objname;
	7886	+
	7887	+ return objname + " " + System.identityHashCode(this);
7513	7888	}
7514	7889
7515	7890	public int hashCode()
..	..	@@ -7565,6 +7940,7 @@
7565	7940	objectUI.closeUI();
7566	7941	if (editWindow != null)
7567	7942	{
	7943	+ editWindow.ctrlPanel.FlushUI();
7568	7944	editWindow.refreshContents();
7569	7945	} // ? new
7570	7946	objectUI = null;
..	..	@@ -7573,6 +7949,10 @@
7573	7949	{
7574	7950	editWindow = null;
7575	7951	} // ?
	7952	+ }
	7953	+ else
	7954	+ {
	7955	+ //editWindow.closeUI();
7576	7956	}
7577	7957	}
7578	7958
..	..	@@ -7585,7 +7965,7 @@
7585	7965	/transient/ cVector2[] projectedVertices = new cVector2[0];
7586	7966
7587	7967	Object3D /Composite/ parent;
7588		- Object3D /Composite/ fileparent;
	7968	+ Object3D /Composite/ fileparent; // In the case of FileObject
7589	7969
7590	7970	double[][] toParent; // dynamic matrix
7591	7971	double[][] fromParent;
..	..	@@ -7700,7 +8080,7 @@
7700	8080	{
7701	8081	assert(bRep != null);
7702	8082	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	8083	+ Grafreed.Assert(support.bRep == bRep.support);
7704	8084	}
7705	8085	else
7706	8086	{
..	..	@@ -7731,6 +8111,10 @@
7731	8111	}
7732	8112
7733	8113	transient ObjEditor editWindow;
	8114	+ transient ObjEditor manipWindow;
	8115	+
	8116	+ transient boolean pinned;
	8117	+
7734	8118	transient ObjectUI objectUI;
7735	8119	public static int povDepth = 0;
7736	8120	private static cVector tbMin = new cVector();
..	..	@@ -7749,9 +8133,9 @@
7749	8133	private static cVector edge2 = new cVector();
7750	8134	//private static cVector norm = new cVector();
7751	8135	/transient private/ int hitSomething;
7752		- private static final int hitCenter = 1;
7753		- private static final int hitScale = 2;
7754		- private static final int hitRotate = 3;
	8136	+ static final int hitCenter = 1;
	8137	+ static final int hitScale = 2;
	8138	+ static final int hitRotate = 3;
7755	8139	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7756	8140	/transient/ private Point centerPt;
7757	8141	/transient/ private int startX;