~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,13 +14,38 @@
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;
	36	+
	37	+ void InitOthers()
	38	+ {
	39	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	40	+ {
	41	+ projectedVertices = new Object3D.cVector2[3];
	42	+ }
	43	+ for (int i = 0; i < 3; i++)
	44	+ {
	45	+ projectedVertices[i] = new cVector2(); // Others
	46	+ }
	47	+ projectedVertices[0].x = 100; // bump
	48	+ }
23	49
24	50	void MinMax(cVector minima, cVector maxima)
25	51	{
..	..	@@ -86,64 +112,178 @@
86	112
87	113	// transient boolean reduced; // for morph reduction
88	114
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-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
91	117
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
94	120
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	121	+ void SaveSupports()
107	122	{
108		- 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	+ }
109	146	}
110		-
111		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
112	149	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- 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	+
116	258	blockloop = true;
117		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
118	267	blockloop = false;
119	268	}
120		-}
121	269
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
126		-
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
	270	+ void RestoreBigData(Object3D o)
133	271	{
134		- 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;
135	286	}
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.RestoreSupports();
144		- blockloop = false;
145		- }
146		-}
147	287
148	288	// MOCAP SUPPORT
149	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -285,8 +425,9 @@
285	425	return parent.GetName() + "#";
286	426	}
287	427
288		- boolean timeline = false;
289	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
290	431	boolean hide = false;
291	432	boolean link2master = false; // performs reset support/master at each frame
292	433	boolean marked = false; // animation node
..	..	@@ -296,6 +437,8 @@
296	437	boolean random = false;
297	438	boolean speedup = false;
298	439	boolean rewind = false;
	440	+
	441	+ float NORMALPUSH = 0;
299	442
300	443	Object3D support;
301	444
..	..	@@ -416,16 +559,16 @@
416	559	{
417	560	Object3D copy = this;
418	561
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	562	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	563
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	564	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	565	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	566	+ parentcam = Globals.theRenderer.Cameras()[1];
424	567	}
425	568
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	569	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	570	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	571	+ parentcam = Globals.theRenderer.Cameras()[0];
429	572	}
430	573
431	574	if (this == parentcam)
..	..	@@ -433,7 +576,7 @@
433	576	//assert(this instanceof Camera);
434	577
435	578	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	579	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	580	}
438	581
439	582	copy.marked ^= true;
..	..	@@ -453,7 +596,7 @@
453	596	//assert(this instanceof Camera);
454	597
455	598	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	599	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	600	}
458	601
459	602	copy.Touch(); // display list issue
..	..	@@ -466,12 +609,14 @@
466	609	toParent = LA.newMatrix();
467	610	fromParent = LA.newMatrix();
468	611	}
	612	+
469	613	if (toParentMarked == null)
470	614	{
471	615	if (maxcount != 1)
472	616	{
473	617	new Exception().printStackTrace();
474	618	}
	619	+
475	620	toParentMarked = LA.newMatrix();
476	621	fromParentMarked = LA.newMatrix();
477	622	}
..	..	@@ -588,7 +733,7 @@
588	733	return;
589	734	}
590	735
591		- if (CameraPane.fromscript)
	736	+ if (Globals.fromscript)
592	737	{
593	738	transformcount = 0;
594	739	return;
..	..	@@ -746,7 +891,7 @@
746	891
747	892	int GetTransformCount()
748	893	{
749		- // marde pour serialization de Texture
	894	+ // patch pour serialization de Texture
750	895	resetmaxcount();
751	896	resettransformcount();
752	897	resetstep();
..	..	@@ -759,7 +904,7 @@
759	904	if (step == 0)
760	905	step = 1;
761	906	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
763	908	// if (acceleration == 0)
764	909	// acceleration = 10;
765	910	if (delay == 0) // serial
..	..	@@ -780,9 +925,12 @@
780	925	// factor = CameraPane.STEP;
781	926	// }
782	927
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	928	+ if (marked && Globals.isLIVE() && live &&
	929	+ //TEMP21aug2018
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	931	+ currentframe != Globals.framecount)
784	932	{
785		- currentframe = CameraPane.framecount;
	933	+ currentframe = Globals.framecount;
786	934
787	935	// System.err.println("transformcount = " + transformcount);
788	936	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +939,8 @@
791	939
792	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	941
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
795	944	{
796	945	countdown = 1;
797	946	delay = speedup?8:1;
..	..	@@ -863,6 +1012,7 @@
863	1012	if (material == null \|\| material.multiply)
864	1013	return true;
865	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
866	1016	return material.opacity > 0.99;
867	1017	}
868	1018
..	..	@@ -894,6 +1044,11 @@
894	1044	fromParent = null; // LA.newMatrix();
895	1045	bRep = null; // new BoundaryRep();
896	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
897	1052	/*
898	1053	float hue = (float)Math.random();
899	1054	Color col;
..	..	@@ -936,7 +1091,7 @@
936	1091
937	1092	public Object clone()
938	1093	{
939		- return GrafreeD.clone(this);
	1094	+ return Grafreed.clone(this);
940	1095	}
941	1096
942	1097	Object3D copyExpand()
..	..	@@ -1258,6 +1413,7 @@
1258	1413	toParent = LA.newMatrix();
1259	1414	fromParent = LA.newMatrix();
1260	1415	}
	1416	+
1261	1417	LA.matCopy(other.toParent, toParent);
1262	1418	LA.matCopy(other.fromParent, fromParent);
1263	1419
..	..	@@ -1452,7 +1608,7 @@
1452	1608	BoundaryRep.SEUIL = other.material.cameralight;
1453	1609
1454	1610	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1612	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1613	}
1458	1614
..	..	@@ -1711,7 +1867,7 @@
1711	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1868	o.bRep = transientrep;
1713	1869	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1871	o.CreateMaterial();
1716	1872	o.SetAttributes(this, -1);
1717	1873	//parent
..	..	@@ -1724,7 +1880,7 @@
1724	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1881	o.bRep = bRep;
1726	1882	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1884	o.CreateMaterial();
1729	1885	//o.overwriteThis(this, -1);
1730	1886	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1967,15 @@
1811	1967	if (obj.name == null)
1812	1968	continue; // can't be a null one
1813	1969
	1970	+ // Try perfect match first.
1814	1971	if (n.equals(obj.name))
1815	1972	{
1816	1973	theobj = obj;
1817	1974	count++;
1818	1975	}
1819	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	1979
1821	1980	if (count != 1)
1822	1981	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2290,8 @@
2131	2290	if (/parent != null &&/ material == null)
2132	2291	{
2133	2292	material = new cMaterial(GetMaterial());
2134		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2135		- {
2136		- projectedVertices = new Object3D.cVector2[3];
2137		- }
2138		- for (int i = 0; i < 3; i++)
2139		- {
2140		- projectedVertices[i] = new cVector2(); // Others
2141		- }
2142		- projectedVertices[0].x = 100; // bump
	2293	+
	2294	+ InitOthers();
2143	2295
2144	2296	if (this instanceof Camera)
2145	2297	{
..	..	@@ -2283,12 +2435,17 @@
2283	2435	}
2284	2436	*/
2285	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2286	2442	}
2287	2443
2288	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2445	{
2290	2446	if (newWindow)
2291	2447	{
	2448	+ new Exception().printStackTrace();
2292	2449	System.exit(0);
2293	2450	if (parent != null)
2294	2451	{
..	..	@@ -2323,6 +2480,14 @@
2323	2480	{
2324	2481	editWindow.refreshContents();
2325	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2326	2491	//if (parent != null)
2327	2492	//parent.refreshEditWindow();
2328	2493	}
..	..	@@ -2465,13 +2630,13 @@
2465	2630	return retval;
2466	2631	}
2467	2632
2468		- void doEditDrag(ClickInfo info)
	2633	+ void doEditDrag(ClickInfo info, boolean opposite)
2469	2634	{
2470	2635	switch (doSomething)
2471	2636	{
2472	2637	case 1: // '\001'
2473	2638	//super.
2474		- doEditDrag0(info);
	2639	+ doEditDrag0(info, opposite);
2475	2640	break;
2476	2641
2477	2642	case 2: // '\002'
..	..	@@ -2484,11 +2649,11 @@
2484	2649	{
2485	2650	//sel.hitSomething = childToDrag.hitSomething;
2486	2651	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2652	+ sel.doEditDrag(info, opposite);
2488	2653	} else
2489	2654	{
2490	2655	//super.
2491		- doEditDrag0(info);
	2656	+ doEditDrag0(info, opposite);
2492	2657	}
2493	2658	}
2494	2659	break;
..	..	@@ -2598,6 +2763,18 @@
2598	2763	void GenNormalsS(boolean crease)
2599	2764	{
2600	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();
2601	2778	// for (int i=0; i<selection.size(); i++)
2602	2779	// {
2603	2780	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2915,24 @@
2738	2915	if (child == null)
2739	2916	continue;
2740	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();
2741	2936	// Children().release(i);
2742	2937	}
2743	2938	blockloop = false;
..	..	@@ -2895,7 +3090,8 @@
2895	3090	{
2896	3091	if (bRep != null)
2897	3092	{
2898		- bRep.GenUV();
	3093	+ bRep.GenUV(); //1);
	3094	+ //bRep.UnfoldUV();
2899	3095	Touch();
2900	3096	}
2901	3097	}
..	..	@@ -2909,11 +3105,20 @@
2909	3105	}
2910	3106	}
2911	3107
	3108	+ void GenNormalsMesh0()
	3109	+ {
	3110	+ if (bRep != null)
	3111	+ {
	3112	+ bRep.GenerateNormalsMesh();
	3113	+ Touch();
	3114	+ }
	3115	+ }
	3116	+
2912	3117	void GenNormalsMINE0()
2913	3118	{
2914	3119	if (bRep != null)
2915	3120	{
2916		- bRep.GenerateNormalsMINE();
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2917	3122	Touch();
2918	3123	}
2919	3124	}
..	..	@@ -2970,6 +3175,33 @@
2970	3175	blockloop = false;
2971	3176	}
2972	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	+
2973	3205	void TransformGeometry()
2974	3206	{
2975	3207	Object3D obj = this;
..	..	@@ -3191,9 +3423,11 @@
3191	3423
3192	3424	BoundaryRep sup = bRep.support;
3193	3425	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3426	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3427	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3428	+
	3429	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3430	+
3197	3431	bRep = temprep;
3198	3432	bRep.support = sup;
3199	3433	Touch();
..	..	@@ -3330,7 +3564,8 @@
3330	3564	if (blockloop)
3331	3565	return;
3332	3566
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3334	3569	live = h;
3335	3570
3336	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3586,8 @@
3351	3586	return;
3352	3587
3353	3588	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3355	3591	link2master = h;
3356	3592
3357	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3607,8 @@
3371	3607	if (blockloop)
3372	3608	return;
3373	3609
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3375	3612	hide = h;
3376	3613
3377	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3628,7 @@
3391	3628	if (blockloop)
3392	3629	return;
3393	3630
3394		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3395	3632	marked = h;
3396	3633
3397	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3638,46 @@
3401	3638	continue;
3402	3639	blockloop = true;
3403	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);
3404	3681	blockloop = false;
3405	3682	// release(i);
3406	3683	}
..	..	@@ -3715,7 +3992,7 @@
3715	3992	if (child == null)
3716	3993	continue;
3717	3994
3718		- if (GrafreeD.RENDERME > 0)
	3995	+ if (Grafreed.RENDERME > 0)
3719	3996	{
3720	3997	if (child instanceof Merge)
3721	3998	((Merge)child).renderme();
..	..	@@ -3866,7 +4143,7 @@
3866	4143	if (child == null)
3867	4144	continue;
3868	4145
3869		- if (GrafreeD.RENDERME > 0)
	4146	+ if (Grafreed.RENDERME > 0)
3870	4147	{
3871	4148	if (child instanceof Merge)
3872	4149	((Merge)child).renderme();
..	..	@@ -4061,7 +4338,7 @@
4061	4338	if (child == null)
4062	4339	continue;
4063	4340
4064		- if (GrafreeD.RENDERME > 0)
	4341	+ if (Grafreed.RENDERME > 0)
4065	4342	{
4066	4343	if (child instanceof Merge)
4067	4344	((Merge)child).renderme();
..	..	@@ -4158,6 +4435,71 @@
4158	4435	}
4159	4436	blockloop = true;
4160	4437	get(i).RepairParent();
	4438	+ blockloop = false;
	4439	+ }
	4440	+ }
	4441	+
	4442	+ void RepairShadow()
	4443	+ {
	4444	+ if (blockloop)
	4445	+ return;
	4446	+
	4447	+ if (this.material != null)
	4448	+ this.InitOthers();
	4449	+
	4450	+ for (int i=0; i<Size(); i++)
	4451	+ {
	4452	+ blockloop = true;
	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();
4161	4503	blockloop = false;
4162	4504	}
4163	4505	}
..	..	@@ -4652,7 +4994,7 @@
4652	4994
4653	4995	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	4996	{
4655		- if (hide)
	4997	+ if (hide \|\| dontselect)
4656	4998	return null;
4657	4999
4658	5000	if (count <= 0)
..	..	@@ -4676,9 +5018,17 @@
4676	5018	}
4677	5019	}
4678	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4679	5029	cTreePath Select(int indexcount, boolean deselect)
4680	5030	{
4681		- if (hide)
	5031	+ if (hide \|\| dontselect)
4682	5032	return null;
4683	5033
4684	5034	if (count <= 0)
..	..	@@ -4712,10 +5062,11 @@
4712	5062	if (leaf != null)
4713	5063	{
4714	5064	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4716	5067	{
4717	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4719	5070	}
4720	5071
4721	5072	return tp;
..	..	@@ -4732,6 +5083,7 @@
4732	5083
4733	5084	if (child == null)
4734	5085	continue;
	5086	+
4735	5087	if (child.HasTransparency() && child.size() != 0)
4736	5088	{
4737	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5093,10 @@
4741	5093	if (leaf != null)
4742	5094	{
4743	5095	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4745	5098	{
4746		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4747	5100	}
4748	5101
4749	5102	return tp;
..	..	@@ -4828,7 +5181,7 @@
4828	5181	return globalTransform;
4829	5182	}
4830	5183
4831		- void PreprocessOcclusion(CameraPane cp)
	5184	+ void PreprocessOcclusion(iCameraPane cp)
4832	5185	{
4833	5186	/*
4834	5187	if (AOdone)
..	..	@@ -4975,7 +5328,8 @@
4975	5328	} else //
4976	5329	if (editWindow != null)
4977	5330	{
4978		- editWindow.cameraView.lighttouched = true;
	5331	+ //editWindow.cameraView.lighttouched = true;
	5332	+ Globals.lighttouched = true;
4979	5333	}
4980	5334	}
4981	5335
..	..	@@ -5067,6 +5421,51 @@
5067	5421	blockloop = false;
5068	5422	}
5069	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	+
5070	5469	boolean IsSelected()
5071	5470	{
5072	5471	if (parent == null)
..	..	@@ -5129,10 +5528,34 @@
5129	5528
5130	5529	// System.out.println("Fullname = " + fullname);
5131	5530
5132		- if (fullname.name.indexOf(":") == -1)
5133		- 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(":"));
5134	5536
5135		- 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];
5136	5559	}
5137	5560
5138	5561	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5564,38 @@
5141	5564	return "";
5142	5565
5143	5566	// System.out.println("Fullname = " + fullname);
5144		- if (fullname.name.indexOf(":") == -1)
5145		- return "";
5146		-
5147		- 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];
5148	5599	}
5149	5600
5150	5601	String GetPigmentTexture()
..	..	@@ -5218,7 +5669,7 @@
5218	5669	System.out.print("; textures = " + textures);
5219	5670	System.out.println("; usedtextures = " + usedtextures);
5220	5671
5221		- if (GetTextures() == null)
	5672	+ if (GetTextures() == null) // What is that??
5222	5673	GetTextures().name = ":";
5223	5674
5224	5675	String texname = tex;
..	..	@@ -5249,6 +5700,43 @@
5249	5700	child.ResetPigmentTexture();
5250	5701	blockloop = false;
5251	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;
5252	5740	}
5253	5741
5254	5742	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5775,54 @@
5287	5775	}
5288	5776	}
5289	5777
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5778	+ void EmbedTextures()
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ CameraPane.EmbedTextures(texture);
	5784	+
	5785	+ int nb = Size();
	5786	+ for (int i = 0; i < nb; i++)
	5787	+ {
	5788	+ Object3D child = (Object3D) get(i);
	5789	+
	5790	+ if (child == null)
	5791	+ continue;
	5792	+
	5793	+ blockloop = true;
	5794	+ child.EmbedTextures();
	5795	+ blockloop = false;
	5796	+ }
	5797	+ }
	5798	+
	5799	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5800	{
5292	5801	Draw(display, root, selected, blocked);
5293	5802	}
5294	5803
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5804	boolean NeedSupport()
5300	5805	{
5301	5806	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5807	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5808	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5809	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5810	}
5306	5811
	5812	+ static boolean DEBUG_SELECTION = false;
5307	5813
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5814	+ boolean IsLive()
	5815	+ {
	5816	+ if (live)
	5817	+ return true;
	5818	+
	5819	+ if (parent == null)
	5820	+ return false;
	5821	+
	5822	+ return parent.IsLive();
	5823	+ }
	5824	+
	5825	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5826	{
5310	5827	Invariants(); // june 2013
5311	5828
..	..	@@ -5314,8 +5831,8 @@
5314	5831	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5832	}
5316	5833
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5834	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5835	+ (hide \|\| dontselect))
5319	5836	return;
5320	5837
5321	5838	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5850,7 @@
5333	5850	if (this instanceof Checker)
5334	5851	return;
5335	5852
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5853	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5854	return;
5338	5855
5339	5856	if (count <= 0)
..	..	@@ -5341,13 +5858,13 @@
5341	5858	return;
5342	5859	}
5343	5860
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5861	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5862	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5863	{
5347	5864	return;
5348	5865	}
5349	5866
5350		- javax.media.opengl.GL gl = display.GetGL();
	5867	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5868
5352	5869	/*
5353	5870	if (touched)
..	..	@@ -5366,7 +5883,7 @@
5366	5883	support = support;
5367	5884
5368	5885	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5369		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5886	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5370	5887
5371	5888	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5889	{
..	..	@@ -5383,15 +5900,17 @@
5383	5900
5384	5901	boolean compiled = false;
5385	5902
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5903	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5904
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5905	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5906	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5907	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5908	{
5391		- display.lighttouched = true;
	5909	+ Globals.lighttouched = true;
5392	5910	} // all panes...
5393		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5394		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5911	+
	5912	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5913	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5914	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5915	{
5397	5916	if (!(this instanceof Composite))
..	..	@@ -5399,7 +5918,7 @@
5399	5918	//if (displaylist == -1 && usecalllists)
5400	5919	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5401	5920	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5921	+ bRep.displaylist = display.GenList();
5403	5922	assert(bRep.displaylist != 0);
5404	5923	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5924	//System.out.println("\tgen list " + list);
..	..	@@ -5411,18 +5930,20 @@
5411	5930	if (usecalllists)
5412	5931	{
5413	5932	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5933	+ display.NewList(bRep.displaylist);
5415	5934	}
	5935	+
5416	5936	CallList(display, root, selected, blocked);
	5937	+
5417	5938	// compiled = true;
5418	5939	if (usecalllists)
5419	5940	{
5420	5941	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5942	+ display.EndList();
5422	5943	}
5423	5944	//gl.glDrawBuffer(gl.GL_BACK);
5424	5945	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	5946	+ Globals.lighttouched = true; // all panes...
5426	5947	}
5427	5948
5428	5949	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +5982,12 @@
5461	5982
5462	5983	// frustum culling
5463	5984	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	5985	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	5986	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	5987	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	5988	{
5468	5989	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5990	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	5991	{
5471	5992	//System.out.print("CULLED");
5472	5993	culled = true;
..	..	@@ -5474,7 +5995,7 @@
5474	5995	}
5475	5996	else
5476	5997	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5998	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	5999	culled = true;
5479	6000
5480	6001	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +6031,12 @@
5510	6031
5511	6032
5512	6033	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6034	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	6035	{
5515	6036	if (GetBRep() != null)
5516	6037	{
5517		- CameraPane.NextIndex(this, gl);
	6038	+ display.NextIndex();
	6039	+
5518	6040	// vertex color conflict : gl.glCallList(list);
5519	6041	DrawNode(display, root, selected);
5520	6042	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +6058,7 @@
5536	6058	color[2] /= 2;
5537	6059	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	6060	*/
5539		- if (material != null)
5540		- {
5541		- materialstack[materialdepth] = material;
5542		- selectedstack[materialdepth] = selected;
5543		- cStatic.objectstack[materialdepth++] = this;
5544		- //System.out.println("material " + material);
5545		- //Applet3D.tracein(this, selected);
5546		- display.vector2buffer = projectedVertices;
5547		- if (this instanceof Camera)
5548		- {
5549		- display.options1[0] = material.shift;
5550		- //System.out.println("shift " + material.shift);
5551		- display.options1[1] = material.lightarea;
5552		- display.options1[2] = material.shadowbias;
5553		- display.options1[3] = material.aniso;
5554		- display.options1[4] = material.anisoV;
5555		- display.options2[0] = material.opacity;
5556		- display.options2[1] = material.diffuse;
5557		- display.options2[2] = material.factor;
5558		-
5559		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5560		- display.options4[0] = material.cameralight/0.2f;
5561		- display.options4[1] = material.subsurface;
5562		- display.options4[2] = material.sheen;
5563		-
5564		- // if (display.CURRENTANTIALIAS > 0)
5565		- // display.options3[3] /= 4;
5566		-
5567		- /*
5568		- System.out.println("Focus = " + display.options1[0]);
5569		- System.out.println("Aperture = " + display.options1[1]);
5570		- System.out.println("ShadowBlur = " + display.options1[2]);
5571		- System.out.println("Antialiasing = " + display.options1[3]);
5572		- System.out.println("Fog = " + display.options2[0]);
5573		- System.out.println("Intensity = " + display.options2[1]);
5574		- System.out.println("Elevation = " + display.options2[2]);
5575		- /**/
5576		- } else
5577		- {
5578		- material.Draw(display, selected);
5579		- }
5580		- } else
5581		- {
5582		- if (selected && CameraPane.flash)
5583		- {
5584		- display.modelParams4[1] = 100;
5585		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5586		- }
5587		- }
	6061	+ display.PushMaterial(this, selected);
5588	6062
5589	6063	//System.out.println("call list " + list);
5590	6064	//System.out.println();
..	..	@@ -5603,7 +6077,28 @@
5603	6077	tex = GetTextures();
5604	6078	}
5605	6079
5606		- display.BindTextures(tex, texres);
	6080	+ boolean failedPigment = false;
	6081	+ boolean failedBump = false;
	6082	+
	6083	+ try
	6084	+ {
	6085	+ display.BindPigmentTexture(tex, texres);
	6086	+ }
	6087	+ catch (Exception e)
	6088	+ {
	6089	+ System.err.println("FAILED: " + this);
	6090	+ failedPigment = true;
	6091	+ }
	6092	+
	6093	+ try
	6094	+ {
	6095	+ display.BindBumpTexture(tex, texres);
	6096	+ }
	6097	+ catch (Exception e)
	6098	+ {
	6099	+ //System.err.println("FAILED: " + this);
	6100	+ failedBump = true;
	6101	+ }
5607	6102
5608	6103	if (!compiled)
5609	6104	{
..	..	@@ -5619,30 +6114,19 @@
5619	6114
5620	6115	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6116	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6117	+ display.CallList(bRep.displaylist);
5623	6118	// june 2013 drawSelf(display, root, selected);
5624	6119	}
5625	6120	}
5626	6121	}
5627	6122
5628		- display.ReleaseTextures(tex);
5629		-
5630		- //if (parent != null && parent.GetMaterial() != null)
5631		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5632		- if (material != null)
5633		- {
5634		- materialdepth -= 1;
5635		- if (materialdepth > 0)
5636		- {
5637		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5638		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5639		- }
5640		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5641		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5642		- {
5643		- display.modelParams4[1] = GetMaterial().cameralight;
5644		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5645		- }
	6123	+ if (!failedBump)
	6124	+ display.ReleaseBumpTexture(tex);
	6125	+
	6126	+ if (!failedPigment)
	6127	+ display.ReleasePigmentTexture(tex);
	6128	+
	6129	+ display.PopMaterial(this, selected);
5646	6130	}
5647	6131
5648	6132	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6168,7 @@
5684	6168	// resetMasterNode();
5685	6169	}
5686	6170
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6171	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6172	{
5689	6173	if (GetBRep() == null)
5690	6174	{
..	..	@@ -5767,8 +6251,11 @@
5767	6251	boolean flipV = false; // true;
5768	6252	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6253
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6254	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6255	{
	6256	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6257	+ return;
	6258	+
5772	6259	if (hide)
5773	6260	return;
5774	6261	// shadow optimisation
..	..	@@ -5826,16 +6313,7 @@
5826	6313	// // ??????????????????????????? Touch();
5827	6314	// }
5828	6315
5829		- if (material != null)
5830		- {
5831		- materialstack[materialdepth] = material;
5832		- selectedstack[materialdepth] = selected;
5833		- cStatic.objectstack[materialdepth++] = this;
5834		- //System.out.println("material " + material);
5835		- //Applet3D.tracein("selected ", selected);
5836		- display.vector2buffer = projectedVertices;
5837		- material.Draw(display, selected);
5838		- }
	6316	+display.PushMaterial2(this, selected);
5839	6317
5840	6318	Object3D child;
5841	6319	boolean sel;
..	..	@@ -5887,19 +6365,7 @@
5887	6365	*/
5888	6366	//depth += 1;
5889	6367
5890		- if (material != null)
5891		- {
5892		- materialdepth -= 1;
5893		- if (materialdepth > 0)
5894		- {
5895		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5896		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5897		- }
5898		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5899		- //else
5900		- //material.Draw(display, false);
5901		- }
5902		-
	6368	+display.PopMaterial2(this);
5903	6369	/*
5904	6370	display.ReleaseTextures(tex);
5905	6371	*/
..	..	@@ -5910,10 +6376,13 @@
5910	6376
5911	6377	//static cVector min,max;
5912	6378
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6379	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6380	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6381	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6382	return; // no shadow for transparent objects
	6383	+
	6384	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6385	+ return;
5917	6386
5918	6387	if (hide)
5919	6388	return;
..	..	@@ -5955,11 +6424,12 @@
5955	6424	return;
5956	6425	}
5957	6426
	6427	+ //bRep.GenUV(1/material.diffuseness);
5958	6428	// bRep.lock = true;
5959	6429
5960		- javax.media.opengl.GL gl = display.GetGL();
	6430	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6431
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6432	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6433	{
5964	6434	int fc = bRep.FaceCount();
5965	6435	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6444,7 @@
5974	6444
5975	6445	bRep.getMinMax(min, max, 100);
5976	6446
5977		- gl.glBegin(gl.GL_LINES);
5978		-
5979		- gl.glVertex3d(min.x, min.y, min.z);
5980		- gl.glVertex3d(min.x, min.y, max.z);
5981		- gl.glVertex3d(min.x, min.y, min.z);
5982		- gl.glVertex3d(min.x, max.y, min.z);
5983		- gl.glVertex3d(min.x, min.y, min.z);
5984		- gl.glVertex3d(max.x, min.y, min.z);
5985		-
5986		- gl.glVertex3d(max.x, max.y, max.z);
5987		- gl.glVertex3d(min.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, max.y, max.z);
5989		- gl.glVertex3d(max.x, min.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, max.z);
5991		- gl.glVertex3d(max.x, max.y, min.z);
5992		-
5993		- gl.glEnd();
	6447	+ display.DrawBox(min, max);
5994	6448
5995	6449	return;
5996	6450	}
..	..	@@ -6034,7 +6488,7 @@
6034	6488	{
6035	6489	//throw new Error();
6036	6490
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6491	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6492
6039	6493	int[] strips = bRep.getRawIndices();
6040	6494
..	..	@@ -6044,178 +6498,19 @@
6044	6498	new Exception().printStackTrace();
6045	6499	return;
6046	6500	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6501	+
	6502	+ if (dontselect)
6050	6503	{
6051		- float[] v = bRep.getRawVertices();
6052		- float[] n = bRep.getRawNormals();
6053		- float[] c = bRep.getRawColors();
6054		- float[] uv = bRep.getRawUVMap();
6055		-
6056		- int count2 = 0;
6057		- int count3 = 0;
6058		-
6059		- if (n.length > 0)
6060		- {
6061		- for (int i = 0; i < strips.length; i++)
6062		- {
6063		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6064		-
6065		- /*
6066		- boolean locked = false;
6067		- float eps = 0.1f;
6068		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6069		-
6070		- int dot = 0;
6071		-
6072		- if ((dot&1) == 0)
6073		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6074		-
6075		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6076		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6077		- else
6078		- {
6079		- locked = true;
6080		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6081		- }
6082		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6083		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6084		- if (hasnorm)
6085		- {
6086		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6087		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6088		- }
6089		-
6090		- if ((dot&4) == 0)
6091		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6092		-
6093		- if (wrap \|\| !locked && (dot&8) != 0)
6094		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6095		- else
6096		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6097		-
6098		- f.dot = dot;
6099		- */
6100		-
6101		- if (!selectmode)
6102		- {
6103		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6104		- {
6105		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6106		- } else
6107		- {
6108		- gl.glNormal3f(0, 0, 1);
6109		- }
6110		-
6111		- if (c != null)
6112		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6113		- {
6114		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6115		- }
6116		- }
6117		- if (flipV)
6118		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6119		- else
6120		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6121		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6122		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6123		-
6124		- count2 += 2;
6125		- count3 += 3;
6126		- if (!selectmode)
6127		- {
6128		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6129		- {
6130		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6131		- } else
6132		- {
6133		- gl.glNormal3f(0, 0, 1);
6134		- }
6135		- if (c != null)
6136		- {
6137		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6138		- }
6139		- }
6140		- if (flipV)
6141		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6142		- else
6143		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6144		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6145		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6146		-
6147		- count2 += 2;
6148		- count3 += 3;
6149		- for (int j = 0; j < strips[i] - 2; j++)
6150		- {
6151		- //gl.glTexCoord2d(...);
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		-
6167		- if (flipV)
6168		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6169		- else
6170		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6171		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6172		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6173		- count2 += 2;
6174		- count3 += 3;
6175		- }
6176		-
6177		- gl.glEnd();
6178		- }
6179		- }
6180		-
6181		- assert count3 == v.length;
	6504	+ //bRep.GenerateNormalsMINE();
6182	6505	}
6183		- else // !trimmed
6184		- {
6185		- int count = 0;
6186		- for (int i = 0; i < strips.length; i++)
6187		- {
6188		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6189		-
6190		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6191		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6192		-
6193		- drawVertex(gl, p, selectmode);
6194		- drawVertex(gl, q, selectmode);
6195		-
6196		- for (int j = 0; j < strips[i] - 2; j++)
6197		- {
6198		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6199		-
6200		-// if (j%2 == 0)
6201		-// drawFace(p, q, r, display, null);
6202		-// else
6203		-// drawFace(p, r, q, display, null);
6204		-
6205		-// p = q;
6206		-// q = r;
6207		- drawVertex(gl, r, selectmode);
6208		- }
6209		-
6210		- gl.glEnd();
6211		- }
6212		- }
	6506	+
	6507	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6508	} else // catch (Error e)
6214	6509	{
6215	6510	// TRIANGLE ARRAY
6216	6511	if (IsOpaque()) // Static())
6217	6512	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6513	+ display.StartTriangles();
6219	6514	int facecount = bRep.FaceCount();
6220	6515	for (int i = 0; i < facecount; i++)
6221	6516	{
..	..	@@ -6278,9 +6573,9 @@
6278	6573	// // r.norm.dot(v3) > -0.5)
6279	6574	// // continue;
6280	6575
6281		- drawFace(p, q, r, display, face);
	6576	+ display.DrawFace(this, p, q, r, face);
6282	6577	}
6283		- gl.glEnd();
	6578	+ display.EndTriangles();
6284	6579	}
6285	6580	else
6286	6581	{
..	..	@@ -6309,8 +6604,8 @@
6309	6604	//System.out.println("SORT");
6310	6605
6311	6606	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6607	+
	6608	+ display.StartTriangles();
6314	6609	for (int i = 0; i < facecount; i++)
6315	6610	{
6316	6611	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6617,14 @@
6322	6617	Vertex q = bRep.GetVertex(face.q);
6323	6618	Vertex r = bRep.GetVertex(face.r);
6324	6619
6325		- drawFace(p, q, r, display, face);
	6620	+ display.DrawFace(this, p, q, r, face);
6326	6621	}
6327		- gl.glEnd();
	6622	+ display.EndTriangles();
6328	6623	}
6329	6624
6330	6625	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6626	{
	6627	+ /*
6332	6628	gl.glDisable(gl.GL_LIGHTING);
6333	6629	float[] colorV = new float[3];
6334	6630
..	..	@@ -6407,6 +6703,7 @@
6407	6703	// gl.glEnd();
6408	6704	}
6409	6705	}
	6706	+ */
6410	6707	}
6411	6708	}
6412	6709
..	..	@@ -6451,7 +6748,7 @@
6451	6748	center.add(r);
6452	6749	center.mul(1.0/3);
6453	6750
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6751	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6752
6456	6753	distance = center.dot(center);
6457	6754	}
..	..	@@ -6462,347 +6759,11 @@
6462	6759
6463	6760	transient FaceCompare[] facescompare = null;
6464	6761
6465		- void SetColor(CameraPane display, Vertex p0)
6466		- {
6467		- if (display.RENDERPROGRAM == 0)
6468		- {
6469		- float r = 0;
6470		- if (bRep != null)
6471		- {
6472		- if (bRep.stripified)
6473		- {
6474		- r = 1;
6475		- }
6476		- }
6477		- float g = 0;
6478		- if (bRep != null)
6479		- {
6480		- if (bRep.trimmed)
6481		- {
6482		- g = 1;
6483		- }
6484		- }
6485		- float b = 0;
6486		- if (support != null && link2master)
6487		- {
6488		- b = 1;
6489		- }
6490		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6491		- return;
6492		- }
6493		-
6494		- if (display.drawMode != CameraPane.SHADOW)
6495		- return;
6496		-
6497		- javax.media.opengl.GL gl = display.GetGL();
6498		-// if (true) return;
6499		-// float ao = p.AO;
6500		-//
6501		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6502		-// // ao = 1;
6503		-//
6504		-// gl.glColor4f(ao, ao, ao, 1);
6505		-
6506		-// CameraPane.selectedpoint.
6507		-// getAverage(cStatic.point1, true);
6508		- if (CameraPane.pointflow == null) // !random) // live)
6509		- {
6510		- return;
6511		- }
6512		-
6513		- cStatic.point1.set(0,0,0);
6514		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6515		-
6516		- cStatic.point1.sub(p0);
6517		-
6518		-
6519		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6520		-// {
6521		-// return;
6522		-// }
6523		-
6524		- //if (true)
6525		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6526		- {
6527		- return;
6528		- }
6529		-
6530		- float[] colorV = new float[3];
6531		-
6532		- if (false) // marked)
6533		- {
6534		- // debug rigging weights
6535		- for (int object = 0; object < p0.vertexlinks.length; object++)
6536		- {
6537		- float weight = p0.weights[object] / p0.totalweight;
6538		-
6539		- // if (weight < 0.1)
6540		- // {
6541		- // assert(weight == 0);
6542		- // continue;
6543		- // }
6544		-
6545		- if (p0.vertexlinks[object] == -1)
6546		- continue;
6547		-
6548		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6549		-
6550		- int color = //1 << object; //
6551		- //p.vertexlinks.length;
6552		- support.bRep.supports[p0.closestsupport].links[object];
6553		- colorV[2] += (color & 1) * weight;
6554		- colorV[1] += ((color & 2) >> 1) * weight;
6555		- colorV[0] += ((color & 4) >> 2) * weight;
6556		- }
6557		- }
6558		- else
6559		- {
6560		- if (drawingstarted)
6561		- {
6562		- // find next point
6563		- if (bRep.GetVertex(0).faceindices == null)
6564		- {
6565		- bRep.InitFaceIndices();
6566		- }
6567		-
6568		- double ymin = p0.y;
6569		-
6570		- Vertex newp = p0;
6571		-
6572		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6573		- {
6574		- int fi = p0.faceindices[fii];
6575		-
6576		- if (fi == -1)
6577		- break;
6578		-
6579		- Face f = bRep.GetFace(fi);
6580		-
6581		- Vertex p = bRep.GetVertex(f.p);
6582		- Vertex q = bRep.GetVertex(f.q);
6583		- Vertex r = bRep.GetVertex(f.r);
6584		-
6585		- int swap = (int)(Math.random()*3);
6586		-
6587		-// for (int s=swap; --s>=0;)
6588		-// {
6589		-// Vertex t = p;
6590		-// p = q;
6591		-// q = r;
6592		-// r = t;
6593		-// }
6594		- if (ymin > p.y)
6595		- {
6596		- ymin = p.y;
6597		- newp = p;
6598		-// break;
6599		- }
6600		- if (ymin > q.y)
6601		- {
6602		- ymin = q.y;
6603		- newp = q;
6604		-// break;
6605		- }
6606		- if (ymin > r.y)
6607		- {
6608		- ymin = r.y;
6609		- newp = r;
6610		-// break;
6611		- }
6612		- }
6613		-
6614		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6615		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6616		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6617		-
6618		- drawingstarted = false;
6619		-
6620		- // return;
6621		- }
6622		-
6623		- if (false) // CameraPane.DRAW
6624		- {
6625		- p0.AO = colorV[0] = 2;
6626		- colorV[1] = 2;
6627		- colorV[2] = 2;
6628		- }
6629		-
6630		- CameraPane.pointflow.add(p0);
6631		- CameraPane.pointflow.Touch();
6632		- }
6633		-
6634		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6635		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6636		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6637		- }
6638		-
6639	6762	void Print(Vertex v)
6640	6763	{
6641	6764	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6765	}
6643	6766
6644		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6645		- {
6646		- if (!selectmode)
6647		- {
6648		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6649		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6650		-
6651		- if (flipV)
6652		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6653		- else
6654		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6655		- }
6656		-
6657		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6658		- }
6659		-
6660		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6661		- CameraPane display, Face face)
6662		- {
6663		- if (pv.y == -10000 \|\|
6664		- qv.y == -10000 \|\|
6665		- rv.y == -10000)
6666		- return;
6667		-
6668		-// float b = f.nbiterations & 1;
6669		-// float g = (f.nbiterations>>1) & 1;
6670		-// float r = (f.nbiterations>>2) & 1;
6671		-//
6672		-// //if (f.weight == 10000)
6673		-// //{
6674		-// // r = 1; g = b = 0;
6675		-// //}
6676		-// //else
6677		-// //{
6678		-// // assert(f.weight < 10000);
6679		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6680		-// if (r<0)
6681		-// assert(r>=0);
6682		-// //}
6683		-
6684		- javax.media.opengl.GL gl = display.GetGL();
6685		-
6686		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6687		-
6688		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6689		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6690		- {
6691		- //gl.glBegin(gl.GL_TRIANGLES);
6692		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6693		- if (!hasnorm)
6694		- {
6695		- // System.out.println("FUCK!!");
6696		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6697		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6698		- LA.vecCross(v0, v1, v2);
6699		- LA.vecNormalize(v2);
6700		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6701		- }
6702		-
6703		- if (hasnorm)
6704		- {
6705		-// if (!pv.norm.normalized())
6706		-// assert(pv.norm.normalized());
6707		-
6708		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6709		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6710		- }
6711		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6712		- SetColor(display, pv);
6713		- //gl.glColor4f(r, g, b, 1);
6714		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6715		- if (flipV)
6716		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6717		- else
6718		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6719		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6720		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6721		-// Print(pv);
6722		- if (hasnorm)
6723		- {
6724		-// assert(qv.norm.normalized());
6725		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6726		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6727		- }
6728		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6729		- // boolean locked = false;
6730		- // float eps = 0.1f;
6731		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6732		-
6733		- // int dot = 0; //*/ (int)f.dot;
6734		-
6735		- // if ((dot&1) == 0)
6736		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6737		-
6738		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6739		- if (flipV)
6740		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6741		- else
6742		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6743		- // else
6744		- // {
6745		- // locked = true;
6746		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6747		- // }
6748		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6749		- SetColor(display, qv);
6750		- //gl.glColor4f(r, g, b, 1);
6751		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6752		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6753		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6754		-// Print(qv);
6755		- if (hasnorm)
6756		- {
6757		-// assert(rv.norm.normalized());
6758		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6759		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6760		- }
6761		-
6762		- // if ((dot&4) == 0)
6763		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6764		-
6765		- // if (wrap \|\| !locked && (dot&8) != 0)
6766		- if (flipV)
6767		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6768		- else
6769		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6770		- // else
6771		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6772		-
6773		- // f.dot = dot;
6774		-
6775		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6776		- SetColor(display, rv);
6777		- //gl.glColor4f(r, g, b, 1);
6778		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6779		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6780		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6781		-// Print(rv);
6782		- //gl.glEnd();
6783		- }
6784		- else
6785		- {
6786		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6787		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6788		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6789		-
6790		- }
6791		-
6792		- if (false) // (attributes & WIREFRAME) != 0)
6793		- {
6794		- gl.glDisable(gl.GL_LIGHTING);
6795		-
6796		- gl.glBegin(gl.GL_LINE_LOOP);
6797		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6798		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6799		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6800		- gl.glEnd();
6801		-
6802		- gl.glEnable(gl.GL_LIGHTING);
6803		- }
6804		- }
6805		-
6806	6767	void drawSelf(ClickInfo info, int level, boolean select)
6807	6768	{
6808	6769	if (bRep == null)
..	..	@@ -7374,83 +7335,84 @@
7374	7335	int spotw = spot.x + spot.width;
7375	7336	int spoth = spot.y + spot.height;
7376	7337	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7377		- if (CameraPane.Xmin > spot.x)
7378		- {
7379		- CameraPane.Xmin = spot.x;
7380		- }
7381		- if (CameraPane.Xmax < spotw)
7382		- {
7383		- CameraPane.Xmax = spotw;
7384		- }
7385		- if (CameraPane.Ymin > spot.y)
7386		- {
7387		- CameraPane.Ymin = spot.y;
7388		- }
7389		- if (CameraPane.Ymax < spoth)
7390		- {
7391		- CameraPane.Ymax = spoth;
7392		- }
	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	+// }
7393	7354	spot.translate(32, 32);
7394	7355	spotw = spot.x + spot.width;
7395	7356	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
	7357	+ info.g.setColor(Color.cyan);
7397	7358	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7398		- if (CameraPane.Xmin > spot.x)
7399		- {
7400		- CameraPane.Xmin = spot.x;
7401		- }
7402		- if (CameraPane.Xmax < spotw)
7403		- {
7404		- CameraPane.Xmax = spotw;
7405		- }
7406		- if (CameraPane.Ymin > spot.y)
7407		- {
7408		- CameraPane.Ymin = spot.y;
7409		- }
7410		- if (CameraPane.Ymax < spoth)
7411		- {
7412		- CameraPane.Ymax = spoth;
7413		- }
7414		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7415		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7359	+// if (CameraPane.Xmin > spot.x)
	7360	+// {
	7361	+// CameraPane.Xmin = spot.x;
	7362	+// }
	7363	+// if (CameraPane.Xmax < spotw)
	7364	+// {
	7365	+// CameraPane.Xmax = spotw;
	7366	+// }
	7367	+// if (CameraPane.Ymin > spot.y)
	7368	+// {
	7369	+// CameraPane.Ymin = spot.y;
	7370	+// }
	7371	+// if (CameraPane.Ymax < spoth)
	7372	+// {
	7373	+// CameraPane.Ymax = spoth;
	7374	+// }
	7375	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7376	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7416	7377	spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
	7378	+ info.g.setColor(Color.yellow);
7418	7379	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7419		- if (CameraPane.Xmin > spot.x)
7420		- {
7421		- CameraPane.Xmin = spot.x;
7422		- }
7423		- if (CameraPane.Xmax < spotw)
7424		- {
7425		- CameraPane.Xmax = spotw;
7426		- }
7427		- if (CameraPane.Ymin > spot.y)
7428		- {
7429		- CameraPane.Ymin = spot.y;
7430		- }
7431		- if (CameraPane.Ymax < spoth)
7432		- {
7433		- CameraPane.Ymax = spoth;
7434		- }
7435		- info.g.drawArc(boundary.x, boundary.y,
7436		- boundary.width, boundary.height, 0, 360);
	7380	+ info.g.setColor(Color.green);
	7381	+// if (CameraPane.Xmin > spot.x)
	7382	+// {
	7383	+// CameraPane.Xmin = spot.x;
	7384	+// }
	7385	+// if (CameraPane.Xmax < spotw)
	7386	+// {
	7387	+// CameraPane.Xmax = spotw;
	7388	+// }
	7389	+// if (CameraPane.Ymin > spot.y)
	7390	+// {
	7391	+// CameraPane.Ymin = spot.y;
	7392	+// }
	7393	+// if (CameraPane.Ymax < spoth)
	7394	+// {
	7395	+// CameraPane.Ymax = spoth;
	7396	+// }
	7397	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7398	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7437	7399	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7438		- if (CameraPane.Xmin > boundary.x)
7439		- {
7440		- CameraPane.Xmin = boundary.x;
7441		- }
7442		- if (CameraPane.Xmax < boundary.x + boundary.width)
7443		- {
7444		- CameraPane.Xmax = boundary.x + boundary.width;
7445		- }
7446		- if (CameraPane.Ymin > boundary.y)
7447		- {
7448		- CameraPane.Ymin = boundary.y;
7449		- }
7450		- if (CameraPane.Ymax < boundary.y + boundary.height)
7451		- {
7452		- CameraPane.Ymax = boundary.y + boundary.height;
7453		- }
	7400	+// if (CameraPane.Xmin > boundary.x)
	7401	+// {
	7402	+// CameraPane.Xmin = boundary.x;
	7403	+// }
	7404	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7405	+// {
	7406	+// CameraPane.Xmax = boundary.x + boundary.width;
	7407	+// }
	7408	+// if (CameraPane.Ymin > boundary.y)
	7409	+// {
	7410	+// CameraPane.Ymin = boundary.y;
	7411	+// }
	7412	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7413	+// {
	7414	+// CameraPane.Ymax = boundary.y + boundary.height;
	7415	+// }
7454	7416	return;
7455	7417	}
7456	7418	}
..	..	@@ -7467,7 +7429,7 @@
7467	7429	startX = info.x;
7468	7430	startY = info.y;
7469	7431
7470		- hitSomething = 0;
	7432	+ hitSomething = -1;
7471	7433	cVector origin = new cVector();
7472	7434	//LA.xformPos(origin, toParent, origin);
7473	7435	Rectangle spot = new Rectangle();
..	..	@@ -7500,7 +7462,7 @@
7500	7462	}
7501	7463
7502	7464	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7465	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7466	//System.out.println("modified = " + modified);
7505	7467	//new Exception().printStackTrace();
7506	7468	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7490,7 @@
7528	7490	return true;
7529	7491	}
7530	7492
7531		- void doEditDrag0(ClickInfo info)
	7493	+ void doEditDrag0(ClickInfo info, boolean opposite)
7532	7494	{
7533	7495	if (hitSomething == 0)
7534	7496	{
..	..	@@ -7543,6 +7505,7 @@
7543	7505	//System.out.println("hitSomething = " + hitSomething);
7544	7506
7545	7507	double scale = 0.005f * info.camera.Distance();
	7508	+
7546	7509	cVector xlate = new cVector();
7547	7510	//cVector xlate2 = new cVector();
7548	7511	switch (hitSomething)
..	..	@@ -7553,9 +7516,9 @@
7553	7516
7554	7517	case hitCenter: // Translate
7555	7518
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7519	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7520
7558		- if (modified)
	7521	+ if (modified \|\| opposite)
7559	7522	{
7560	7523	//assert(false);
7561	7524	/*
..	..	@@ -7601,10 +7564,10 @@
7601	7564	}
7602	7565	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7566	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7567	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7605	7568	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7606	7569	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7570	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7571	//LA.vecCross(up, cVector.Z, right2);
7609	7572
7610	7573	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7649,6 +7612,7 @@
7649	7612
7650	7613	if (modified)
7651	7614	{
	7615	+ // Rotate 90 degrees
7652	7616	angle /= (Math.PI / 4);
7653	7617	angle = Math.floor(angle + 0.5);
7654	7618	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7626,7 @@
7662	7626	}
7663	7627	/**/
7664	7628
7665		- switch (info.pane.renderCamera.viewCode)
	7629	+ switch (info.pane.RenderCamera().viewCode)
7666	7630	{
7667	7631	case 1: // '\001'
7668	7632	LA.matZRotate(toParent, angle);
..	..	@@ -7690,24 +7654,27 @@
7690	7654
7691	7655	case hitScale: // scale
7692	7656	double hScale = (double) (info.x - centerPt.x) / 32;
	7657	+ double sign = 1;
	7658	+ if (hScale < 0)
	7659	+ {
	7660	+ sign = -1;
	7661	+ }
	7662	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7663	if (hScale < 0.01)
7694	7664	{
7695		- hScale = 0.01;
	7665	+ //hScale = 0.01;
7696	7666	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
7699		- {
7700		- hScale = 0.01;
7701		- }
	7667	+
7702	7668	double vScale = (double) (info.y - centerPt.y) / 32;
7703		- if (vScale < 0.01)
	7669	+ sign = 1;
	7670	+ if (vScale < 0)
7704	7671	{
7705		- vScale = 0.01;
	7672	+ sign = -1;
7706	7673	}
7707		- vScale = Math.pow(vScale, scale * 50);
	7674	+ vScale = signMath.pow(signvScale, scale * 50);
7708	7675	if (vScale < 0.01)
7709	7676	{
7710		- vScale = 0.01;
	7677	+ //vScale = 0.01;
7711	7678	}
7712	7679	LA.matCopy(startMat, toParent);
7713	7680	/**/
..	..	@@ -7718,39 +7685,47 @@
7718	7685	}
7719	7686	/**/
7720	7687
7721		- switch (info.pane.renderCamera.viewCode)
	7688	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7689	+
	7690	+ if (totalScale < 0.01)
	7691	+ {
	7692	+ totalScale = 0.01;
	7693	+ }
	7694	+
	7695	+ switch (info.pane.RenderCamera().viewCode)
7722	7696	{
7723	7697	case 3: // '\001'
7724		- if (modified)
	7698	+ if (modified \|\| opposite)
7725	7699	{
7726	7700	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7701	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7702	} // vScale, 1);
7729	7703	else
7730	7704	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7705	+ // EXCEPTION!
	7706	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7707	} // vScale, 1);
7733	7708	break;
7734	7709
7735	7710	case 2: // '\002'
7736		- if (modified)
	7711	+ if (modified \|\| opposite)
7737	7712	{
7738	7713	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7714	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7715	} else
7741	7716	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7717	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7718	}
7744	7719	break;
7745	7720
7746	7721	case 1: // '\003'
7747		- if (modified)
	7722	+ if (modified \|\| opposite)
7748	7723	{
7749	7724	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7725	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7726	} else
7752	7727	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7728	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7729	}
7755	7730	break;
7756	7731	}
..	..	@@ -7883,14 +7858,22 @@
7883	7858	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7859	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7860	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7861	+
	7862	+ String objname;
	7863	+
7886	7864	if (false) //parent != null)
7887	7865	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7866	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7867	} else
7890	7868	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7869	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7870	} // + super.toString();
7893	7871	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7872	+
	7873	+ if (!Globals.ADVANCED)
	7874	+ return objname;
	7875	+
	7876	+ return objname + " " + System.identityHashCode(this);
7894	7877	}
7895	7878
7896	7879	public int hashCode()
..	..	@@ -7946,6 +7929,7 @@
7946	7929	objectUI.closeUI();
7947	7930	if (editWindow != null)
7948	7931	{
	7932	+ editWindow.ctrlPanel.FlushUI();
7949	7933	editWindow.refreshContents();
7950	7934	} // ? new
7951	7935	objectUI = null;
..	..	@@ -7954,6 +7938,10 @@
7954	7938	{
7955	7939	editWindow = null;
7956	7940	} // ?
	7941	+ }
	7942	+ else
	7943	+ {
	7944	+ //editWindow.closeUI();
7957	7945	}
7958	7946	}
7959	7947
..	..	@@ -7966,7 +7954,7 @@
7966	7954	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	7955
7968	7956	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	7957	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	7958
7971	7959	double[][] toParent; // dynamic matrix
7972	7960	double[][] fromParent;
..	..	@@ -8081,7 +8069,7 @@
8081	8069	{
8082	8070	assert(bRep != null);
8083	8071	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8072	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8073	}
8086	8074	else
8087	8075	{
..	..	@@ -8112,6 +8100,10 @@
8112	8100	}
8113	8101
8114	8102	transient ObjEditor editWindow;
	8103	+ transient ObjEditor manipWindow;
	8104	+
	8105	+ transient boolean pinned;
	8106	+
8115	8107	transient ObjectUI objectUI;
8116	8108	public static int povDepth = 0;
8117	8109	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8122,9 @@
8130	8122	private static cVector edge2 = new cVector();
8131	8123	//private static cVector norm = new cVector();
8132	8124	/transient private/ int hitSomething;
8133		- private static final int hitCenter = 1;
8134		- private static final int hitScale = 2;
8135		- private static final int hitRotate = 3;
	8125	+ static final int hitCenter = 1;
	8126	+ static final int hitScale = 2;
	8127	+ static final int hitRotate = 3;
8136	8128	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8129	/transient/ private Point centerPt;
8138	8130	/transient/ private int startX;
..	..	@@ -8164,6 +8156,8 @@
8164	8156	{
8165	8157	Object3D targ = this;
8166	8158
	8159	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8160	+
8167	8161	if (obj.material != null)
8168	8162	{
8169	8163	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))