~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;
..	..	@@ -760,7 +891,7 @@
760	891
761	892	int GetTransformCount()
762	893	{
763		- // marde pour serialization de Texture
	894	+ // patch pour serialization de Texture
764	895	resetmaxcount();
765	896	resettransformcount();
766	897	resetstep();
..	..	@@ -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
..	..	@@ -794,12 +925,12 @@
794	925	// factor = CameraPane.STEP;
795	926	// }
796	927
797		- if (marked && CameraPane.isLIVE() && live &&
	928	+ if (marked && Globals.isLIVE() && live &&
798	929	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	931	+ currentframe != Globals.framecount)
801	932	{
802		- currentframe = CameraPane.framecount;
	933	+ currentframe = Globals.framecount;
803	934
804	935	// System.err.println("transformcount = " + transformcount);
805	936	// System.err.println("factor = " + factor);
..	..	@@ -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)
..	..	@@ -5001,7 +5328,8 @@
5001	5328	} else //
5002	5329	if (editWindow != null)
5003	5330	{
5004		- editWindow.cameraView.lighttouched = true;
	5331	+ //editWindow.cameraView.lighttouched = true;
	5332	+ Globals.lighttouched = true;
5005	5333	}
5006	5334	}
5007	5335
..	..	@@ -5093,6 +5421,51 @@
5093	5421	blockloop = false;
5094	5422	}
5095	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	+
5096	5469	boolean IsSelected()
5097	5470	{
5098	5471	if (parent == null)
..	..	@@ -5155,10 +5528,34 @@
5155	5528
5156	5529	// System.out.println("Fullname = " + fullname);
5157	5530
5158		- if (fullname.name.indexOf(":") == -1)
5159		- 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(":"));
5160	5536
5161		- 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];
5162	5559	}
5163	5560
5164	5561	static String GetBump(cTexture fullname)
..	..	@@ -5167,10 +5564,38 @@
5167	5564	return "";
5168	5565
5169	5566	// System.out.println("Fullname = " + fullname);
5170		- if (fullname.name.indexOf(":") == -1)
5171		- return "";
5172		-
5173		- 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];
5174	5599	}
5175	5600
5176	5601	String GetPigmentTexture()
..	..	@@ -5244,7 +5669,7 @@
5244	5669	System.out.print("; textures = " + textures);
5245	5670	System.out.println("; usedtextures = " + usedtextures);
5246	5671
5247		- if (GetTextures() == null)
	5672	+ if (GetTextures() == null) // What is that??
5248	5673	GetTextures().name = ":";
5249	5674
5250	5675	String texname = tex;
..	..	@@ -5275,6 +5700,43 @@
5275	5700	child.ResetPigmentTexture();
5276	5701	blockloop = false;
5277	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;
5278	5740	}
5279	5741
5280	5742	void SetBumpTexture(String tex)
..	..	@@ -5313,25 +5775,33 @@
5313	5775	}
5314	5776	}
5315	5777
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5778	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5779	{
5318	5780	Draw(display, root, selected, blocked);
5319	5781	}
5320	5782
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5783	boolean NeedSupport()
5326	5784	{
5327	5785	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5786	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5329	5787	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5788	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5789	}
5332	5790
	5791	+ static boolean DEBUG_SELECTION = false;
5333	5792
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5793	+ boolean IsLive()
	5794	+ {
	5795	+ if (live)
	5796	+ return true;
	5797	+
	5798	+ if (parent == null)
	5799	+ return false;
	5800	+
	5801	+ return parent.IsLive();
	5802	+ }
	5803	+
	5804	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5805	{
5336	5806	Invariants(); // june 2013
5337	5807
..	..	@@ -5340,8 +5810,8 @@
5340	5810	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5811	}
5342	5812
5343		- if (display.drawMode == CameraPane.SELECTION &&
5344		- hide)
	5813	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5814	+ (hide \|\| dontselect))
5345	5815	return;
5346	5816
5347	5817	if (name != null && name.contains("sclera"))
..	..	@@ -5359,7 +5829,7 @@
5359	5829	if (this instanceof Checker)
5360	5830	return;
5361	5831
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5832	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5833	return;
5364	5834
5365	5835	if (count <= 0)
..	..	@@ -5367,13 +5837,13 @@
5367	5837	return;
5368	5838	}
5369	5839
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5840	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5841	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5842	{
5373	5843	return;
5374	5844	}
5375	5845
5376		- javax.media.opengl.GL gl = display.GetGL();
	5846	+ //javax.media.opengl.GL gl = display.GetGL();
5377	5847
5378	5848	/*
5379	5849	if (touched)
..	..	@@ -5392,7 +5862,7 @@
5392	5862	support = support;
5393	5863
5394	5864	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5865	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396	5866
5397	5867	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	5868	{
..	..	@@ -5409,15 +5879,17 @@
5409	5879
5410	5880	boolean compiled = false;
5411	5881
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5882	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5883
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
5415		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5884	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5885	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5886	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5887	{
5417		- display.lighttouched = true;
	5888	+ Globals.lighttouched = true;
5418	5889	} // all panes...
5419		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5420		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5890	+
	5891	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5892	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5893	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5894	{
5423	5895	if (!(this instanceof Composite))
..	..	@@ -5425,7 +5897,7 @@
5425	5897	//if (displaylist == -1 && usecalllists)
5426	5898	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5427	5899	{
5428		- bRep.displaylist = gl.glGenLists(1);
	5900	+ bRep.displaylist = display.GenList();
5429	5901	assert(bRep.displaylist != 0);
5430	5902	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	5903	//System.out.println("\tgen list " + list);
..	..	@@ -5437,18 +5909,20 @@
5437	5909	if (usecalllists)
5438	5910	{
5439	5911	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5912	+ display.NewList(bRep.displaylist);
5441	5913	}
	5914	+
5442	5915	CallList(display, root, selected, blocked);
	5916	+
5443	5917	// compiled = true;
5444	5918	if (usecalllists)
5445	5919	{
5446	5920	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	5921	+ display.EndList();
5448	5922	}
5449	5923	//gl.glDrawBuffer(gl.GL_BACK);
5450	5924	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5925	+ Globals.lighttouched = true; // all panes...
5452	5926	}
5453	5927
5454	5928	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5961,12 @@
5487	5961
5488	5962	// frustum culling
5489	5963	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5964	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5965	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5966	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5967	{
5494	5968	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5969	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	5970	{
5497	5971	//System.out.print("CULLED");
5498	5972	culled = true;
..	..	@@ -5500,7 +5974,7 @@
5500	5974	}
5501	5975	else
5502	5976	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5977	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	5978	culled = true;
5505	5979
5506	5980	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +6010,12 @@
5536	6010
5537	6011
5538	6012	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6013	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	6014	{
5541	6015	if (GetBRep() != null)
5542	6016	{
5543		- CameraPane.NextIndex(this, gl);
	6017	+ display.NextIndex();
	6018	+
5544	6019	// vertex color conflict : gl.glCallList(list);
5545	6020	DrawNode(display, root, selected);
5546	6021	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +6037,7 @@
5562	6037	color[2] /= 2;
5563	6038	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	6039	*/
5565		- if (material != null)
5566		- {
5567		- materialstack[materialdepth] = material;
5568		- selectedstack[materialdepth] = selected;
5569		- cStatic.objectstack[materialdepth++] = this;
5570		- //System.out.println("material " + material);
5571		- //Applet3D.tracein(this, selected);
5572		- display.vector2buffer = projectedVertices;
5573		- if (this instanceof Camera)
5574		- {
5575		- display.options1[0] = material.shift;
5576		- //System.out.println("shift " + material.shift);
5577		- display.options1[1] = material.lightarea;
5578		- display.options1[2] = material.shadowbias;
5579		- display.options1[3] = material.aniso;
5580		- display.options1[4] = material.anisoV;
5581		- display.options2[0] = material.opacity;
5582		- display.options2[1] = material.diffuse;
5583		- display.options2[2] = material.factor;
5584		-
5585		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5586		- display.options4[0] = material.cameralight/0.2f;
5587		- display.options4[1] = material.subsurface;
5588		- display.options4[2] = material.sheen;
5589		-
5590		- // if (display.CURRENTANTIALIAS > 0)
5591		- // display.options3[3] /= 4;
5592		-
5593		- /*
5594		- System.out.println("Focus = " + display.options1[0]);
5595		- System.out.println("Aperture = " + display.options1[1]);
5596		- System.out.println("ShadowBlur = " + display.options1[2]);
5597		- System.out.println("Antialiasing = " + display.options1[3]);
5598		- System.out.println("Fog = " + display.options2[0]);
5599		- System.out.println("Intensity = " + display.options2[1]);
5600		- System.out.println("Elevation = " + display.options2[2]);
5601		- /**/
5602		- } else
5603		- {
5604		- material.Draw(display, selected);
5605		- }
5606		- } else
5607		- {
5608		- if (selected && CameraPane.flash)
5609		- {
5610		- display.modelParams4[1] = 100;
5611		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5612		- }
5613		- }
	6040	+ display.PushMaterial(this, selected);
5614	6041
5615	6042	//System.out.println("call list " + list);
5616	6043	//System.out.println();
..	..	@@ -5629,7 +6056,28 @@
5629	6056	tex = GetTextures();
5630	6057	}
5631	6058
5632		- display.BindTextures(tex, texres);
	6059	+ boolean failedPigment = false;
	6060	+ boolean failedBump = false;
	6061	+
	6062	+ try
	6063	+ {
	6064	+ display.BindPigmentTexture(tex, texres);
	6065	+ }
	6066	+ catch (Exception e)
	6067	+ {
	6068	+ System.err.println("FAILED: " + this);
	6069	+ failedPigment = true;
	6070	+ }
	6071	+
	6072	+ try
	6073	+ {
	6074	+ display.BindBumpTexture(tex, texres);
	6075	+ }
	6076	+ catch (Exception e)
	6077	+ {
	6078	+ //System.err.println("FAILED: " + this);
	6079	+ failedBump = true;
	6080	+ }
5633	6081
5634	6082	if (!compiled)
5635	6083	{
..	..	@@ -5645,30 +6093,19 @@
5645	6093
5646	6094	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	6095	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	6096	+ display.CallList(bRep.displaylist);
5649	6097	// june 2013 drawSelf(display, root, selected);
5650	6098	}
5651	6099	}
5652	6100	}
5653	6101
5654		- display.ReleaseTextures(tex);
5655		-
5656		- //if (parent != null && parent.GetMaterial() != null)
5657		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5658		- if (material != null)
5659		- {
5660		- materialdepth -= 1;
5661		- if (materialdepth > 0)
5662		- {
5663		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5664		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5665		- }
5666		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5667		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5668		- {
5669		- display.modelParams4[1] = GetMaterial().cameralight;
5670		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5671		- }
	6102	+ if (!failedBump)
	6103	+ display.ReleaseBumpTexture(tex);
	6104	+
	6105	+ if (!failedPigment)
	6106	+ display.ReleasePigmentTexture(tex);
	6107	+
	6108	+ display.PopMaterial(this, selected);
5672	6109	}
5673	6110
5674	6111	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +6147,7 @@
5710	6147	// resetMasterNode();
5711	6148	}
5712	6149
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6150	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	6151	{
5715	6152	if (GetBRep() == null)
5716	6153	{
..	..	@@ -5793,8 +6230,11 @@
5793	6230	boolean flipV = false; // true;
5794	6231	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	6232
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6233	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	6234	{
	6235	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6236	+ return;
	6237	+
5798	6238	if (hide)
5799	6239	return;
5800	6240	// shadow optimisation
..	..	@@ -5852,16 +6292,7 @@
5852	6292	// // ??????????????????????????? Touch();
5853	6293	// }
5854	6294
5855		- if (material != null)
5856		- {
5857		- materialstack[materialdepth] = material;
5858		- selectedstack[materialdepth] = selected;
5859		- cStatic.objectstack[materialdepth++] = this;
5860		- //System.out.println("material " + material);
5861		- //Applet3D.tracein("selected ", selected);
5862		- display.vector2buffer = projectedVertices;
5863		- material.Draw(display, selected);
5864		- }
	6295	+display.PushMaterial2(this, selected);
5865	6296
5866	6297	Object3D child;
5867	6298	boolean sel;
..	..	@@ -5913,19 +6344,7 @@
5913	6344	*/
5914	6345	//depth += 1;
5915	6346
5916		- if (material != null)
5917		- {
5918		- materialdepth -= 1;
5919		- if (materialdepth > 0)
5920		- {
5921		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5922		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5923		- }
5924		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5925		- //else
5926		- //material.Draw(display, false);
5927		- }
5928		-
	6347	+display.PopMaterial2(this);
5929	6348	/*
5930	6349	display.ReleaseTextures(tex);
5931	6350	*/
..	..	@@ -5936,10 +6355,13 @@
5936	6355
5937	6356	//static cVector min,max;
5938	6357
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6358	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	6359	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6360	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	6361	return; // no shadow for transparent objects
	6362	+
	6363	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6364	+ return;
5943	6365
5944	6366	if (hide)
5945	6367	return;
..	..	@@ -5981,9 +6403,10 @@
5981	6403	return;
5982	6404	}
5983	6405
	6406	+ //bRep.GenUV(1/material.diffuseness);
5984	6407	// bRep.lock = true;
5985	6408
5986		- javax.media.opengl.GL gl = display.GetGL();
	6409	+ //javax.media.opengl.GL gl = display.GetGL();
5987	6410
5988	6411	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	6412	{
..	..	@@ -6000,23 +6423,7 @@
6000	6423
6001	6424	bRep.getMinMax(min, max, 100);
6002	6425
6003		- gl.glBegin(gl.GL_LINES);
6004		-
6005		- gl.glVertex3d(min.x, min.y, min.z);
6006		- gl.glVertex3d(min.x, min.y, max.z);
6007		- gl.glVertex3d(min.x, min.y, min.z);
6008		- gl.glVertex3d(min.x, max.y, min.z);
6009		- gl.glVertex3d(min.x, min.y, min.z);
6010		- gl.glVertex3d(max.x, min.y, min.z);
6011		-
6012		- gl.glVertex3d(max.x, max.y, max.z);
6013		- gl.glVertex3d(min.x, max.y, max.z);
6014		- gl.glVertex3d(max.x, max.y, max.z);
6015		- gl.glVertex3d(max.x, min.y, max.z);
6016		- gl.glVertex3d(max.x, max.y, max.z);
6017		- gl.glVertex3d(max.x, max.y, min.z);
6018		-
6019		- gl.glEnd();
	6426	+ display.DrawBox(min, max);
6020	6427
6021	6428	return;
6022	6429	}
..	..	@@ -6060,7 +6467,7 @@
6060	6467	{
6061	6468	//throw new Error();
6062	6469
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6470	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	6471
6065	6472	int[] strips = bRep.getRawIndices();
6066	6473
..	..	@@ -6070,178 +6477,19 @@
6070	6477	new Exception().printStackTrace();
6071	6478	return;
6072	6479	}
6073		-
6074		- // TRIANGLE STRIP ARRAY
6075		- if (bRep.trimmed)
	6480	+
	6481	+ if (dontselect)
6076	6482	{
6077		- float[] v = bRep.getRawVertices();
6078		- float[] n = bRep.getRawNormals();
6079		- float[] c = bRep.getRawColors();
6080		- float[] uv = bRep.getRawUVMap();
6081		-
6082		- int count2 = 0;
6083		- int count3 = 0;
6084		-
6085		- if (n.length > 0)
6086		- {
6087		- for (int i = 0; i < strips.length; i++)
6088		- {
6089		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6090		-
6091		- /*
6092		- boolean locked = false;
6093		- float eps = 0.1f;
6094		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6095		-
6096		- int dot = 0;
6097		-
6098		- if ((dot&1) == 0)
6099		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6100		-
6101		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6102		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6103		- else
6104		- {
6105		- locked = true;
6106		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6107		- }
6108		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6109		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6110		- if (hasnorm)
6111		- {
6112		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6113		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6114		- }
6115		-
6116		- if ((dot&4) == 0)
6117		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6118		-
6119		- if (wrap \|\| !locked && (dot&8) != 0)
6120		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6121		- else
6122		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6123		-
6124		- f.dot = dot;
6125		- */
6126		-
6127		- if (!selectmode)
6128		- {
6129		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6130		- {
6131		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6132		- } else
6133		- {
6134		- gl.glNormal3f(0, 0, 1);
6135		- }
6136		-
6137		- if (c != null)
6138		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6139		- {
6140		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6141		- }
6142		- }
6143		- if (flipV)
6144		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6145		- else
6146		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6147		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6148		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6149		-
6150		- count2 += 2;
6151		- count3 += 3;
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		-
6173		- count2 += 2;
6174		- count3 += 3;
6175		- for (int j = 0; j < strips[i] - 2; j++)
6176		- {
6177		- //gl.glTexCoord2d(...);
6178		- if (!selectmode)
6179		- {
6180		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6181		- {
6182		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6183		- } else
6184		- {
6185		- gl.glNormal3f(0, 0, 1);
6186		- }
6187		- if (c != null)
6188		- {
6189		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6190		- }
6191		- }
6192		-
6193		- if (flipV)
6194		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6195		- else
6196		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6197		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6198		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6199		- count2 += 2;
6200		- count3 += 3;
6201		- }
6202		-
6203		- gl.glEnd();
6204		- }
6205		- }
6206		-
6207		- assert count3 == v.length;
	6483	+ //bRep.GenerateNormalsMINE();
6208	6484	}
6209		- else // !trimmed
6210		- {
6211		- int count = 0;
6212		- for (int i = 0; i < strips.length; i++)
6213		- {
6214		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6215		-
6216		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6217		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6218		-
6219		- drawVertex(gl, p, selectmode);
6220		- drawVertex(gl, q, selectmode);
6221		-
6222		- for (int j = 0; j < strips[i] - 2; j++)
6223		- {
6224		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6225		-
6226		-// if (j%2 == 0)
6227		-// drawFace(p, q, r, display, null);
6228		-// else
6229		-// drawFace(p, r, q, display, null);
6230		-
6231		-// p = q;
6232		-// q = r;
6233		- drawVertex(gl, r, selectmode);
6234		- }
6235		-
6236		- gl.glEnd();
6237		- }
6238		- }
	6485	+
	6486	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	6487	} else // catch (Error e)
6240	6488	{
6241	6489	// TRIANGLE ARRAY
6242	6490	if (IsOpaque()) // Static())
6243	6491	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	6492	+ display.StartTriangles();
6245	6493	int facecount = bRep.FaceCount();
6246	6494	for (int i = 0; i < facecount; i++)
6247	6495	{
..	..	@@ -6304,9 +6552,9 @@
6304	6552	// // r.norm.dot(v3) > -0.5)
6305	6553	// // continue;
6306	6554
6307		- drawFace(p, q, r, display, face);
	6555	+ display.DrawFace(this, p, q, r, face);
6308	6556	}
6309		- gl.glEnd();
	6557	+ display.EndTriangles();
6310	6558	}
6311	6559	else
6312	6560	{
..	..	@@ -6335,8 +6583,8 @@
6335	6583	//System.out.println("SORT");
6336	6584
6337	6585	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6586	+
	6587	+ display.StartTriangles();
6340	6588	for (int i = 0; i < facecount; i++)
6341	6589	{
6342	6590	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6596,14 @@
6348	6596	Vertex q = bRep.GetVertex(face.q);
6349	6597	Vertex r = bRep.GetVertex(face.r);
6350	6598
6351		- drawFace(p, q, r, display, face);
	6599	+ display.DrawFace(this, p, q, r, face);
6352	6600	}
6353		- gl.glEnd();
	6601	+ display.EndTriangles();
6354	6602	}
6355	6603
6356	6604	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6605	{
	6606	+ /*
6358	6607	gl.glDisable(gl.GL_LIGHTING);
6359	6608	float[] colorV = new float[3];
6360	6609
..	..	@@ -6433,6 +6682,7 @@
6433	6682	// gl.glEnd();
6434	6683	}
6435	6684	}
	6685	+ */
6436	6686	}
6437	6687	}
6438	6688
..	..	@@ -6477,7 +6727,7 @@
6477	6727	center.add(r);
6478	6728	center.mul(1.0/3);
6479	6729
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6730	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6731
6482	6732	distance = center.dot(center);
6483	6733	}
..	..	@@ -6488,390 +6738,11 @@
6488	6738
6489	6739	transient FaceCompare[] facescompare = null;
6490	6740
6491		- void SetColor(CameraPane display, Vertex p0)
6492		- {
6493		- if (display.RENDERPROGRAM == 0)
6494		- {
6495		- float r = 0;
6496		- if (bRep != null)
6497		- {
6498		- if (bRep.stripified)
6499		- {
6500		- r = 1;
6501		- }
6502		- }
6503		- float g = 0;
6504		- if (bRep != null)
6505		- {
6506		- if (bRep.trimmed)
6507		- {
6508		- g = 1;
6509		- }
6510		- }
6511		- float b = 0;
6512		- if (support != null && link2master)
6513		- {
6514		- b = 1;
6515		- }
6516		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6517		- return;
6518		- }
6519		-
6520		- if (display.drawMode != CameraPane.SHADOW)
6521		- return;
6522		-
6523		- javax.media.opengl.GL gl = display.GetGL();
6524		-// if (true) return;
6525		-// float ao = p.AO;
6526		-//
6527		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6528		-// // ao = 1;
6529		-//
6530		-// gl.glColor4f(ao, ao, ao, 1);
6531		-
6532		-// CameraPane.selectedpoint.
6533		-// getAverage(cStatic.point1, true);
6534		- if (CameraPane.pointflow == null) // !random) // live)
6535		- {
6536		- return;
6537		- }
6538		-
6539		- cStatic.point1.set(0,0,0);
6540		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6541		-
6542		- cStatic.point1.sub(p0);
6543		-
6544		-
6545		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6546		-// {
6547		-// return;
6548		-// }
6549		-
6550		- //if (true)
6551		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6552		- {
6553		- return;
6554		- }
6555		-
6556		- float[] colorV = new float[3];
6557		-
6558		- if (false) // marked)
6559		- {
6560		- // debug rigging weights
6561		- for (int object = 0; object < p0.vertexlinks.length; object++)
6562		- {
6563		- float weight = p0.weights[object] / p0.totalweight;
6564		-
6565		- // if (weight < 0.1)
6566		- // {
6567		- // assert(weight == 0);
6568		- // continue;
6569		- // }
6570		-
6571		- if (p0.vertexlinks[object] == -1)
6572		- continue;
6573		-
6574		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6575		-
6576		- int color = //1 << object; //
6577		- //p.vertexlinks.length;
6578		- support.bRep.supports[p0.closestsupport].links[object];
6579		- colorV[2] += (color & 1) * weight;
6580		- colorV[1] += ((color & 2) >> 1) * weight;
6581		- colorV[0] += ((color & 4) >> 2) * weight;
6582		- }
6583		- }
6584		- else
6585		- {
6586		- if (drawingstarted)
6587		- {
6588		- // find next point
6589		- if (bRep.GetVertex(0).faceindices == null)
6590		- {
6591		- bRep.InitFaceIndices();
6592		- }
6593		-
6594		- double ymin = p0.y;
6595		-
6596		- Vertex newp = p0;
6597		-
6598		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6599		- {
6600		- int fi = p0.faceindices[fii];
6601		-
6602		- if (fi == -1)
6603		- break;
6604		-
6605		- Face f = bRep.GetFace(fi);
6606		-
6607		- Vertex p = bRep.GetVertex(f.p);
6608		- Vertex q = bRep.GetVertex(f.q);
6609		- Vertex r = bRep.GetVertex(f.r);
6610		-
6611		- int swap = (int)(Math.random()*3);
6612		-
6613		-// for (int s=swap; --s>=0;)
6614		-// {
6615		-// Vertex t = p;
6616		-// p = q;
6617		-// q = r;
6618		-// r = t;
6619		-// }
6620		- if (ymin > p.y)
6621		- {
6622		- ymin = p.y;
6623		- newp = p;
6624		-// break;
6625		- }
6626		- if (ymin > q.y)
6627		- {
6628		- ymin = q.y;
6629		- newp = q;
6630		-// break;
6631		- }
6632		- if (ymin > r.y)
6633		- {
6634		- ymin = r.y;
6635		- newp = r;
6636		-// break;
6637		- }
6638		- }
6639		-
6640		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6641		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6642		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6643		-
6644		- drawingstarted = false;
6645		-
6646		- // return;
6647		- }
6648		-
6649		- if (false) // CameraPane.DRAW
6650		- {
6651		- p0.AO = colorV[0] = 2;
6652		- colorV[1] = 2;
6653		- colorV[2] = 2;
6654		- }
6655		-
6656		- CameraPane.pointflow.add(p0);
6657		- CameraPane.pointflow.Touch();
6658		- }
6659		-
6660		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6661		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6662		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6663		- }
6664		-
6665	6741	void Print(Vertex v)
6666	6742	{
6667	6743	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6744	}
6669	6745
6670		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6671		- {
6672		- if (!selectmode)
6673		- {
6674		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6675		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6676		-
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- }
6682		-
6683		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6684		- }
6685		-
6686		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6687		- CameraPane display, Face face)
6688		- {
6689		- if (pv.y == -10000 \|\|
6690		- qv.y == -10000 \|\|
6691		- rv.y == -10000)
6692		- return;
6693		-
6694		-// float b = f.nbiterations & 1;
6695		-// float g = (f.nbiterations>>1) & 1;
6696		-// float r = (f.nbiterations>>2) & 1;
6697		-//
6698		-// //if (f.weight == 10000)
6699		-// //{
6700		-// // r = 1; g = b = 0;
6701		-// //}
6702		-// //else
6703		-// //{
6704		-// // assert(f.weight < 10000);
6705		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6706		-// if (r<0)
6707		-// assert(r>=0);
6708		-// //}
6709		-
6710		- javax.media.opengl.GL gl = display.GetGL();
6711		-
6712		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6713		-
6714		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6715		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6716		- {
6717		- //gl.glBegin(gl.GL_TRIANGLES);
6718		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6719		- if (!hasnorm)
6720		- {
6721		- // System.out.println("FUCK!!");
6722		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6723		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6724		- LA.vecCross(v0, v1, v2);
6725		- LA.vecNormalize(v2);
6726		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6727		- }
6728		-
6729		- // P
6730		- float x = (float)pv.x;
6731		- float y = (float)pv.y;
6732		- float z = (float)pv.z;
6733		-
6734		- if (hasnorm)
6735		- {
6736		-// if (!pv.norm.normalized())
6737		-// assert(pv.norm.normalized());
6738		-
6739		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6740		- float nx = (float)pv.norm.x;
6741		- float ny = (float)pv.norm.y;
6742		- float nz = (float)pv.norm.z;
6743		-
6744		- x += nx * NORMALPUSH;
6745		- y += ny * NORMALPUSH;
6746		- z += nz * NORMALPUSH;
6747		-
6748		- gl.glNormal3f(nx, ny, nz);
6749		- }
6750		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6751		- SetColor(display, pv);
6752		- //gl.glColor4f(r, g, b, 1);
6753		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6754		- if (flipV)
6755		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6756		- else
6757		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6758		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6759		-
6760		- gl.glVertex3f(x, y, z);
6761		-
6762		- // Q
6763		- x = (float)qv.x;
6764		- y = (float)qv.y;
6765		- z = (float)qv.z;
6766		-
6767		-// Print(pv);
6768		- if (hasnorm)
6769		- {
6770		-// assert(qv.norm.normalized());
6771		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6772		- float nx = (float)qv.norm.x;
6773		- float ny = (float)qv.norm.y;
6774		- float nz = (float)qv.norm.z;
6775		-
6776		- x += nx * NORMALPUSH;
6777		- y += ny * NORMALPUSH;
6778		- z += nz * NORMALPUSH;
6779		-
6780		- gl.glNormal3f(nx, ny, nz);
6781		- }
6782		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6783		- // boolean locked = false;
6784		- // float eps = 0.1f;
6785		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6786		-
6787		- // int dot = 0; //*/ (int)f.dot;
6788		-
6789		- // if ((dot&1) == 0)
6790		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6791		-
6792		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6793		- if (flipV)
6794		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6795		- else
6796		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6797		- // else
6798		- // {
6799		- // locked = true;
6800		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6801		- // }
6802		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6803		- SetColor(display, qv);
6804		-
6805		- gl.glVertex3f(x, y, z);
6806		- //gl.glColor4f(r, g, b, 1);
6807		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6808		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6809		-// Print(qv);
6810		-
6811		- // R
6812		- x = (float)rv.x;
6813		- y = (float)rv.y;
6814		- z = (float)rv.z;
6815		-
6816		- if (hasnorm)
6817		- {
6818		-// assert(rv.norm.normalized());
6819		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6820		- float nx = (float)rv.norm.x;
6821		- float ny = (float)rv.norm.y;
6822		- float nz = (float)rv.norm.z;
6823		-
6824		- x += nx * NORMALPUSH;
6825		- y += ny * NORMALPUSH;
6826		- z += nz * NORMALPUSH;
6827		-
6828		- gl.glNormal3f(nx, ny, nz);
6829		- }
6830		-
6831		- // if ((dot&4) == 0)
6832		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6833		-
6834		- // if (wrap \|\| !locked && (dot&8) != 0)
6835		- if (flipV)
6836		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6837		- else
6838		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6839		- // else
6840		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6841		-
6842		- // f.dot = dot;
6843		-
6844		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6845		- SetColor(display, rv);
6846		- //gl.glColor4f(r, g, b, 1);
6847		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6848		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6849		- gl.glVertex3f(x, y, z);
6850		-// Print(rv);
6851		- //gl.glEnd();
6852		- }
6853		- else
6854		- {
6855		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6856		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6857		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6858		-
6859		- }
6860		-
6861		- if (false) // (attributes & WIREFRAME) != 0)
6862		- {
6863		- gl.glDisable(gl.GL_LIGHTING);
6864		-
6865		- gl.glBegin(gl.GL_LINE_LOOP);
6866		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6867		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6868		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6869		- gl.glEnd();
6870		-
6871		- gl.glEnable(gl.GL_LIGHTING);
6872		- }
6873		- }
6874		-
6875	6746	void drawSelf(ClickInfo info, int level, boolean select)
6876	6747	{
6877	6748	if (bRep == null)
..	..	@@ -7443,83 +7314,84 @@
7443	7314	int spotw = spot.x + spot.width;
7444	7315	int spoth = spot.y + spot.height;
7445	7316	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7446		- if (CameraPane.Xmin > spot.x)
7447		- {
7448		- CameraPane.Xmin = spot.x;
7449		- }
7450		- if (CameraPane.Xmax < spotw)
7451		- {
7452		- CameraPane.Xmax = spotw;
7453		- }
7454		- if (CameraPane.Ymin > spot.y)
7455		- {
7456		- CameraPane.Ymin = spot.y;
7457		- }
7458		- if (CameraPane.Ymax < spoth)
7459		- {
7460		- CameraPane.Ymax = spoth;
7461		- }
	7317	+// if (CameraPane.Xmin > spot.x)
	7318	+// {
	7319	+// CameraPane.Xmin = spot.x;
	7320	+// }
	7321	+// if (CameraPane.Xmax < spotw)
	7322	+// {
	7323	+// CameraPane.Xmax = spotw;
	7324	+// }
	7325	+// if (CameraPane.Ymin > spot.y)
	7326	+// {
	7327	+// CameraPane.Ymin = spot.y;
	7328	+// }
	7329	+// if (CameraPane.Ymax < spoth)
	7330	+// {
	7331	+// CameraPane.Ymax = spoth;
	7332	+// }
7462	7333	spot.translate(32, 32);
7463	7334	spotw = spot.x + spot.width;
7464	7335	spoth = spot.y + spot.height;
7465		- info.g.setColor(Color.blue);
	7336	+ info.g.setColor(Color.cyan);
7466	7337	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7467		- if (CameraPane.Xmin > spot.x)
7468		- {
7469		- CameraPane.Xmin = spot.x;
7470		- }
7471		- if (CameraPane.Xmax < spotw)
7472		- {
7473		- CameraPane.Xmax = spotw;
7474		- }
7475		- if (CameraPane.Ymin > spot.y)
7476		- {
7477		- CameraPane.Ymin = spot.y;
7478		- }
7479		- if (CameraPane.Ymax < spoth)
7480		- {
7481		- CameraPane.Ymax = spoth;
7482		- }
7483		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7484		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7338	+// if (CameraPane.Xmin > spot.x)
	7339	+// {
	7340	+// CameraPane.Xmin = spot.x;
	7341	+// }
	7342	+// if (CameraPane.Xmax < spotw)
	7343	+// {
	7344	+// CameraPane.Xmax = spotw;
	7345	+// }
	7346	+// if (CameraPane.Ymin > spot.y)
	7347	+// {
	7348	+// CameraPane.Ymin = spot.y;
	7349	+// }
	7350	+// if (CameraPane.Ymax < spoth)
	7351	+// {
	7352	+// CameraPane.Ymax = spoth;
	7353	+// }
	7354	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7355	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7485	7356	spot.translate(0, -32);
7486		- info.g.setColor(Color.green);
	7357	+ info.g.setColor(Color.yellow);
7487	7358	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7488		- if (CameraPane.Xmin > spot.x)
7489		- {
7490		- CameraPane.Xmin = spot.x;
7491		- }
7492		- if (CameraPane.Xmax < spotw)
7493		- {
7494		- CameraPane.Xmax = spotw;
7495		- }
7496		- if (CameraPane.Ymin > spot.y)
7497		- {
7498		- CameraPane.Ymin = spot.y;
7499		- }
7500		- if (CameraPane.Ymax < spoth)
7501		- {
7502		- CameraPane.Ymax = spoth;
7503		- }
7504		- info.g.drawArc(boundary.x, boundary.y,
7505		- boundary.width, boundary.height, 0, 360);
	7359	+ info.g.setColor(Color.green);
	7360	+// if (CameraPane.Xmin > spot.x)
	7361	+// {
	7362	+// CameraPane.Xmin = spot.x;
	7363	+// }
	7364	+// if (CameraPane.Xmax < spotw)
	7365	+// {
	7366	+// CameraPane.Xmax = spotw;
	7367	+// }
	7368	+// if (CameraPane.Ymin > spot.y)
	7369	+// {
	7370	+// CameraPane.Ymin = spot.y;
	7371	+// }
	7372	+// if (CameraPane.Ymax < spoth)
	7373	+// {
	7374	+// CameraPane.Ymax = spoth;
	7375	+// }
	7376	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7377	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7506	7378	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7507		- if (CameraPane.Xmin > boundary.x)
7508		- {
7509		- CameraPane.Xmin = boundary.x;
7510		- }
7511		- if (CameraPane.Xmax < boundary.x + boundary.width)
7512		- {
7513		- CameraPane.Xmax = boundary.x + boundary.width;
7514		- }
7515		- if (CameraPane.Ymin > boundary.y)
7516		- {
7517		- CameraPane.Ymin = boundary.y;
7518		- }
7519		- if (CameraPane.Ymax < boundary.y + boundary.height)
7520		- {
7521		- CameraPane.Ymax = boundary.y + boundary.height;
7522		- }
	7379	+// if (CameraPane.Xmin > boundary.x)
	7380	+// {
	7381	+// CameraPane.Xmin = boundary.x;
	7382	+// }
	7383	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7384	+// {
	7385	+// CameraPane.Xmax = boundary.x + boundary.width;
	7386	+// }
	7387	+// if (CameraPane.Ymin > boundary.y)
	7388	+// {
	7389	+// CameraPane.Ymin = boundary.y;
	7390	+// }
	7391	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7392	+// {
	7393	+// CameraPane.Ymax = boundary.y + boundary.height;
	7394	+// }
7523	7395	return;
7524	7396	}
7525	7397	}
..	..	@@ -7536,7 +7408,7 @@
7536	7408	startX = info.x;
7537	7409	startY = info.y;
7538	7410
7539		- hitSomething = 0;
	7411	+ hitSomething = -1;
7540	7412	cVector origin = new cVector();
7541	7413	//LA.xformPos(origin, toParent, origin);
7542	7414	Rectangle spot = new Rectangle();
..	..	@@ -7569,7 +7441,7 @@
7569	7441	}
7570	7442
7571	7443	//System.out.println("info.modifiers = " + info.modifiers);
7572		- modified = (info.modifiers & CameraPane.META) != 0;
	7444	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7573	7445	//System.out.println("modified = " + modified);
7574	7446	//new Exception().printStackTrace();
7575	7447	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7597,7 +7469,7 @@
7597	7469	return true;
7598	7470	}
7599	7471
7600		- void doEditDrag0(ClickInfo info)
	7472	+ void doEditDrag0(ClickInfo info, boolean opposite)
7601	7473	{
7602	7474	if (hitSomething == 0)
7603	7475	{
..	..	@@ -7612,6 +7484,7 @@
7612	7484	//System.out.println("hitSomething = " + hitSomething);
7613	7485
7614	7486	double scale = 0.005f * info.camera.Distance();
	7487	+
7615	7488	cVector xlate = new cVector();
7616	7489	//cVector xlate2 = new cVector();
7617	7490	switch (hitSomething)
..	..	@@ -7622,9 +7495,9 @@
7622	7495
7623	7496	case hitCenter: // Translate
7624	7497
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7498	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	7499
7627		- if (modified)
	7500	+ if (modified \|\| opposite)
7628	7501	{
7629	7502	//assert(false);
7630	7503	/*
..	..	@@ -7670,10 +7543,10 @@
7670	7543	}
7671	7544	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7545	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7546	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7674	7547	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7675	7548	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7549	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7550	//LA.vecCross(up, cVector.Z, right2);
7678	7551
7679	7552	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7718,6 +7591,7 @@
7718	7591
7719	7592	if (modified)
7720	7593	{
	7594	+ // Rotate 90 degrees
7721	7595	angle /= (Math.PI / 4);
7722	7596	angle = Math.floor(angle + 0.5);
7723	7597	angle *= (Math.PI / 4);
..	..	@@ -7731,7 +7605,7 @@
7731	7605	}
7732	7606	/**/
7733	7607
7734		- switch (info.pane.renderCamera.viewCode)
	7608	+ switch (info.pane.RenderCamera().viewCode)
7735	7609	{
7736	7610	case 1: // '\001'
7737	7611	LA.matZRotate(toParent, angle);
..	..	@@ -7759,24 +7633,27 @@
7759	7633
7760	7634	case hitScale: // scale
7761	7635	double hScale = (double) (info.x - centerPt.x) / 32;
	7636	+ double sign = 1;
	7637	+ if (hScale < 0)
	7638	+ {
	7639	+ sign = -1;
	7640	+ }
	7641	+ hScale = signMath.pow(signhScale, scale * 50);
7762	7642	if (hScale < 0.01)
7763	7643	{
7764		- hScale = 0.01;
	7644	+ //hScale = 0.01;
7765	7645	}
7766		- hScale = Math.pow(hScale, scale * 50);
7767		- if (hScale < 0.01)
7768		- {
7769		- hScale = 0.01;
7770		- }
	7646	+
7771	7647	double vScale = (double) (info.y - centerPt.y) / 32;
7772		- if (vScale < 0.01)
	7648	+ sign = 1;
	7649	+ if (vScale < 0)
7773	7650	{
7774		- vScale = 0.01;
	7651	+ sign = -1;
7775	7652	}
7776		- vScale = Math.pow(vScale, scale * 50);
	7653	+ vScale = signMath.pow(signvScale, scale * 50);
7777	7654	if (vScale < 0.01)
7778	7655	{
7779		- vScale = 0.01;
	7656	+ //vScale = 0.01;
7780	7657	}
7781	7658	LA.matCopy(startMat, toParent);
7782	7659	/**/
..	..	@@ -7787,39 +7664,47 @@
7787	7664	}
7788	7665	/**/
7789	7666
7790		- switch (info.pane.renderCamera.viewCode)
	7667	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7668	+
	7669	+ if (totalScale < 0.01)
	7670	+ {
	7671	+ totalScale = 0.01;
	7672	+ }
	7673	+
	7674	+ switch (info.pane.RenderCamera().viewCode)
7791	7675	{
7792	7676	case 3: // '\001'
7793		- if (modified)
	7677	+ if (modified \|\| opposite)
7794	7678	{
7795	7679	//LA.matScale(toParent, 1, hScale, vScale);
7796		- LA.matScale(toParent, vScale, 1, 1);
	7680	+ LA.matScale(toParent, totalScale, 1, 1);
7797	7681	} // vScale, 1);
7798	7682	else
7799	7683	{
7800		- LA.matScale(toParent, vScale, vScale, vScale);
	7684	+ // EXCEPTION!
	7685	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7801	7686	} // vScale, 1);
7802	7687	break;
7803	7688
7804	7689	case 2: // '\002'
7805		- if (modified)
	7690	+ if (modified \|\| opposite)
7806	7691	{
7807	7692	//LA.matScale(toParent, hScale, 1, vScale);
7808		- LA.matScale(toParent, 1, vScale, 1);
	7693	+ LA.matScale(toParent, 1, totalScale, 1);
7809	7694	} else
7810	7695	{
7811		- LA.matScale(toParent, vScale, 1, vScale);
	7696	+ LA.matScale(toParent, totalScale, 1, totalScale);
7812	7697	}
7813	7698	break;
7814	7699
7815	7700	case 1: // '\003'
7816		- if (modified)
	7701	+ if (modified \|\| opposite)
7817	7702	{
7818	7703	//LA.matScale(toParent, hScale, vScale, 1);
7819		- LA.matScale(toParent, 1, 1, vScale);
	7704	+ LA.matScale(toParent, 1, 1, totalScale);
7820	7705	} else
7821	7706	{
7822		- LA.matScale(toParent, vScale, vScale, 1);
	7707	+ LA.matScale(toParent, totalScale, totalScale, 1);
7823	7708	}
7824	7709	break;
7825	7710	}
..	..	@@ -7952,14 +7837,22 @@
7952	7837	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7953	7838	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7954	7839	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7840	+
	7841	+ String objname;
	7842	+
7955	7843	if (false) //parent != null)
7956	7844	{
7957		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7845	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7958	7846	} else
7959	7847	{
7960		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7848	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7961	7849	} // + super.toString();
7962	7850	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7851	+
	7852	+ if (!Globals.ADVANCED)
	7853	+ return objname;
	7854	+
	7855	+ return objname + " " + System.identityHashCode(this);
7963	7856	}
7964	7857
7965	7858	public int hashCode()
..	..	@@ -8015,6 +7908,7 @@
8015	7908	objectUI.closeUI();
8016	7909	if (editWindow != null)
8017	7910	{
	7911	+ editWindow.ctrlPanel.FlushUI();
8018	7912	editWindow.refreshContents();
8019	7913	} // ? new
8020	7914	objectUI = null;
..	..	@@ -8023,6 +7917,10 @@
8023	7917	{
8024	7918	editWindow = null;
8025	7919	} // ?
	7920	+ }
	7921	+ else
	7922	+ {
	7923	+ //editWindow.closeUI();
8026	7924	}
8027	7925	}
8028	7926
..	..	@@ -8035,7 +7933,7 @@
8035	7933	/transient/ cVector2[] projectedVertices = new cVector2[0];
8036	7934
8037	7935	Object3D /Composite/ parent;
8038		- Object3D /Composite/ fileparent;
	7936	+ Object3D /Composite/ fileparent; // In the case of FileObject
8039	7937
8040	7938	double[][] toParent; // dynamic matrix
8041	7939	double[][] fromParent;
..	..	@@ -8150,7 +8048,7 @@
8150	8048	{
8151	8049	assert(bRep != null);
8152	8050	if (!(support instanceof GenericJoint)) // support.bRep != null)
8153		- GrafreeD.Assert(support.bRep == bRep.support);
	8051	+ Grafreed.Assert(support.bRep == bRep.support);
8154	8052	}
8155	8053	else
8156	8054	{
..	..	@@ -8181,6 +8079,10 @@
8181	8079	}
8182	8080
8183	8081	transient ObjEditor editWindow;
	8082	+ transient ObjEditor manipWindow;
	8083	+
	8084	+ transient boolean pinned;
	8085	+
8184	8086	transient ObjectUI objectUI;
8185	8087	public static int povDepth = 0;
8186	8088	private static cVector tbMin = new cVector();
..	..	@@ -8199,9 +8101,9 @@
8199	8101	private static cVector edge2 = new cVector();
8200	8102	//private static cVector norm = new cVector();
8201	8103	/transient private/ int hitSomething;
8202		- private static final int hitCenter = 1;
8203		- private static final int hitScale = 2;
8204		- private static final int hitRotate = 3;
	8104	+ static final int hitCenter = 1;
	8105	+ static final int hitScale = 2;
	8106	+ static final int hitRotate = 3;
8205	8107	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8206	8108	/transient/ private Point centerPt;
8207	8109	/transient/ private int startX;