~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,35 @@
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
	28	+ mocap.reader.BVHReader.BVHResult bvh;
	29	+ Object3D skeleton;
	30	+ //
	31	+
22	32	ScriptNode scriptnode;
	33	+
	34	+ void InitOthers()
	35	+ {
	36	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	37	+ {
	38	+ projectedVertices = new Object3D.cVector2[3];
	39	+ }
	40	+ for (int i = 0; i < 3; i++)
	41	+ {
	42	+ projectedVertices[i] = new cVector2(); // Others
	43	+ }
	44	+ projectedVertices[0].x = 100; // bump
	45	+ }
23	46
24	47	void MinMax(cVector minima, cVector maxima)
25	48	{
..	..	@@ -86,64 +109,143 @@
86	109
87	110	// transient boolean reduced; // for morph reduction
88	111
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	112	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	113	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	114
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	115	+ transient Object3D transientsupport; // for cloning
	116	+ transient boolean transientlink2master;
94	117
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)
	118	+ void SaveSupports()
107	119	{
108		- bRep.SaveSupports();
	120	+ if (blockloop)
	121	+ return;
	122	+
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
	125	+
	126	+ support = null;
	127	+ link2master = false;
	128	+
	129	+ if (bRep != null)
	130	+ {
	131	+ bRep.SaveSupports();
	132	+ }
	133	+
	134	+ for (int i = 0; i < Size(); i++)
	135	+ {
	136	+ Object3D child = (Object3D) get(i);
	137	+ if (child == null)
	138	+ continue;
	139	+ blockloop = true;
	140	+ child.SaveSupports();
	141	+ blockloop = false;
	142	+ }
109	143	}
110		-
111		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
112	146	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	147	+ if (blockloop)
	148	+ return;
	149	+
	150	+ support = transientsupport;
	151	+ link2master = transientlink2master;
	152	+ transientsupport = null;
	153	+ transientlink2master = false;
	154	+
	155	+ if (bRep != null)
	156	+ {
	157	+ bRep.RestoreSupports();
	158	+ }
	159	+
	160	+ for (int i = 0; i < Size(); i++)
	161	+ {
	162	+ Object3D child = (Object3D) get(i);
	163	+ if (child == null)
	164	+ continue;
	165	+ blockloop = true;
	166	+ child.RestoreSupports();
	167	+ blockloop = false;
	168	+ }
	169	+ }
	170	+
	171	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	172	+ {
	173	+ if (hashtable.containsKey(GetUUID()))
	174	+ {
	175	+ Object3D o = hashtable.get(GetUUID());
	176	+
	177	+ Grafreed.Assert(this.bRep == o.bRep);
	178	+ if (this.bRep != null)
	179	+ assert(this.bRep.support == o.transientrep);
	180	+
	181	+ return;
	182	+ }
	183	+
	184	+ Object3D o = new Object3D("copy of " + this.name);
	185	+
	186	+ hashtable.put(GetUUID(), o);
	187	+
	188	+ for (int i=0; i<Size(); i++)
	189	+ {
	190	+ get(i).ExtractBigData(hashtable);
	191	+ }
	192	+
	193	+ ExtractBigData(o);
	194	+ }
	195	+
	196	+ void ExtractBigData(Object3D o)
	197	+ {
	198	+ o.bRep = this.bRep;
	199	+ if (this.bRep != null)
	200	+ {
	201	+ o.transientrep = this.bRep.support;
	202	+ o.bRep.support = null;
	203	+ }
	204	+
	205	+ // o.support = this.support;
	206	+ // o.fileparent = this.fileparent;
	207	+ // if (this.bRep != null)
	208	+ // o.bRep = this.bRep.support;
	209	+
	210	+ this.bRep = null;
	211	+ // if (this.bRep != null)
	212	+ // this.bRep.support = null;
	213	+ // this.support = null;
	214	+ // this.fileparent = null;
	215	+ }
	216	+
	217	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	218	+ {
	219	+ if (!hashtable.containsKey(GetUUID()))
	220	+ return;
	221	+
	222	+ if (blockloop)
	223	+ return;
	224	+
116	225	blockloop = true;
117		- child.SaveSupports();
	226	+
	227	+ Object3D o = hashtable.get(GetUUID());
	228	+
	229	+ RestoreBigData(o);
	230	+
	231	+ //hashtable.remove(GetUUID());
	232	+
	233	+ for (int i=0; i<Size(); i++)
	234	+ {
	235	+ get(i).RestoreBigData(hashtable);
	236	+ }
	237	+
118	238	blockloop = false;
119	239	}
120		-}
121	240
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)
	241	+ void RestoreBigData(Object3D o)
133	242	{
134		- bRep.RestoreSupports();
	243	+ this.bRep = o.bRep;
	244	+ if (this.bRep != null)
	245	+ this.bRep.support = o.transientrep;
	246	+ // this.support = o.support;
	247	+ // this.fileparent = o.fileparent;
135	248	}
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	249
148	250	// MOCAP SUPPORT
149	251	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +388,7 @@
286	388	}
287	389
288	390	boolean live = false;
	391	+ boolean dontselect = false;
289	392	boolean hide = false;
290	393	boolean link2master = false; // performs reset support/master at each frame
291	394	boolean marked = false; // animation node
..	..	@@ -295,6 +398,8 @@
295	398	boolean random = false;
296	399	boolean speedup = false;
297	400	boolean rewind = false;
	401	+
	402	+ float NORMALPUSH = 0;
298	403
299	404	Object3D support;
300	405
..	..	@@ -355,7 +460,7 @@
355	460
356	461	int MemorySize()
357	462	{
358		- if (memorysize == 0)
	463	+ if (true) // memorysize == 0)
359	464	{
360	465	try
361	466	{
..	..	@@ -415,16 +520,16 @@
415	520	{
416	521	Object3D copy = this;
417	522
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	523	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	524
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	525	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	526	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	527	+ parentcam = Globals.theRenderer.Cameras()[1];
423	528	}
424	529
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	530	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	531	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	532	+ parentcam = Globals.theRenderer.Cameras()[0];
428	533	}
429	534
430	535	if (this == parentcam)
..	..	@@ -432,7 +537,7 @@
432	537	//assert(this instanceof Camera);
433	538
434	539	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	540	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	541	}
437	542
438	543	copy.marked ^= true;
..	..	@@ -452,7 +557,7 @@
452	557	//assert(this instanceof Camera);
453	558
454	559	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	560	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	561	}
457	562
458	563	copy.Touch(); // display list issue
..	..	@@ -465,12 +570,14 @@
465	570	toParent = LA.newMatrix();
466	571	fromParent = LA.newMatrix();
467	572	}
	573	+
468	574	if (toParentMarked == null)
469	575	{
470	576	if (maxcount != 1)
471	577	{
472	578	new Exception().printStackTrace();
473	579	}
	580	+
474	581	toParentMarked = LA.newMatrix();
475	582	fromParentMarked = LA.newMatrix();
476	583	}
..	..	@@ -587,7 +694,7 @@
587	694	return;
588	695	}
589	696
590		- if (CameraPane.fromscript)
	697	+ if (Globals.fromscript)
591	698	{
592	699	transformcount = 0;
593	700	return;
..	..	@@ -745,7 +852,7 @@
745	852
746	853	int GetTransformCount()
747	854	{
748		- // marde pour serialization de Texture
	855	+ // patch pour serialization de Texture
749	856	resetmaxcount();
750	857	resettransformcount();
751	858	resetstep();
..	..	@@ -758,7 +865,7 @@
758	865	if (step == 0)
759	866	step = 1;
760	867	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	868	+ maxcount = 128; // 2048; // 4;
762	869	// if (acceleration == 0)
763	870	// acceleration = 10;
764	871	if (delay == 0) // serial
..	..	@@ -779,9 +886,12 @@
779	886	// factor = CameraPane.STEP;
780	887	// }
781	888
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	889	+ if (marked && Globals.isLIVE() && live &&
	890	+ //TEMP21aug2018
	891	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	892	+ currentframe != Globals.framecount)
783	893	{
784		- currentframe = CameraPane.framecount;
	894	+ currentframe = Globals.framecount;
785	895
786	896	// System.err.println("transformcount = " + transformcount);
787	897	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +900,8 @@
790	900
791	901	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	902
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	903	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	904	+ (step == 1 && changedir))
794	905	{
795	906	countdown = 1;
796	907	delay = speedup?8:1;
..	..	@@ -862,6 +973,7 @@
862	973	if (material == null \|\| material.multiply)
863	974	return true;
864	975
	976	+ // Transparent objects are dynamic because we have to sort the triangles.
865	977	return material.opacity > 0.99;
866	978	}
867	979
..	..	@@ -893,6 +1005,11 @@
893	1005	fromParent = null; // LA.newMatrix();
894	1006	bRep = null; // new BoundaryRep();
895	1007
	1008	+ if (oname != null && oname.equals("LeftHand"))
	1009	+ {
	1010	+ name = oname;
	1011	+ }
	1012	+
896	1013	/*
897	1014	float hue = (float)Math.random();
898	1015	Color col;
..	..	@@ -935,7 +1052,7 @@
935	1052
936	1053	public Object clone()
937	1054	{
938		- return GrafreeD.clone(this);
	1055	+ return Grafreed.clone(this);
939	1056	}
940	1057
941	1058	Object3D copyExpand()
..	..	@@ -1446,7 +1563,16 @@
1446	1563	// if (other == null)
1447	1564	// return;
1448	1565
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1566	+ if (other != null)
	1567	+ {
	1568	+ BoundaryRep.SEUIL = other.material.cameralight;
	1569	+
	1570	+ // Set default to 0.1
	1571	+ BoundaryRep.SEUIL /= 4; // 2;
	1572	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1573	+ }
	1574	+
	1575	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1576
1451	1577	//if (bRep != null)
1452	1578	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1827,7 @@
1701	1827	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1828	o.bRep = transientrep;
1703	1829	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1830	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1831	o.CreateMaterial();
1706	1832	o.SetAttributes(this, -1);
1707	1833	//parent
..	..	@@ -1714,7 +1840,7 @@
1714	1840	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1841	o.bRep = bRep;
1716	1842	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1843	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1844	o.CreateMaterial();
1719	1845	//o.overwriteThis(this, -1);
1720	1846	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +1927,15 @@
1801	1927	if (obj.name == null)
1802	1928	continue; // can't be a null one
1803	1929
	1930	+ // Try perfect match first.
1804	1931	if (n.equals(obj.name))
1805	1932	{
1806	1933	theobj = obj;
1807	1934	count++;
1808	1935	}
1809	1936	}
	1937	+
	1938	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1939
1811	1940	if (count != 1)
1812	1941	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1945,9 @@
1816	1945	if (obj.name == null)
1817	1946	continue; // can't be a null one
1818	1947
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1948	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1949	+ //if (n.startsWith(obj.name))
	1950	+ if (n.contains(name))
1821	1951	{
1822	1952	theobj = obj;
1823	1953	count++;
..	..	@@ -2120,15 +2250,8 @@
2120	2250	if (/parent != null &&/ material == null)
2121	2251	{
2122	2252	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2253	+
	2254	+ InitOthers();
2132	2255
2133	2256	if (this instanceof Camera)
2134	2257	{
..	..	@@ -2272,12 +2395,17 @@
2272	2395	}
2273	2396	*/
2274	2397	}
	2398	+ else
	2399	+ {
	2400	+ //((ObjEditor)editWindow).SetupUI2(null);
	2401	+ }
2275	2402	}
2276	2403
2277	2404	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2405	{
2279	2406	if (newWindow)
2280	2407	{
	2408	+ new Exception().printStackTrace();
2281	2409	System.exit(0);
2282	2410	if (parent != null)
2283	2411	{
..	..	@@ -2312,6 +2440,14 @@
2312	2440	{
2313	2441	editWindow.refreshContents();
2314	2442	}
	2443	+ else
	2444	+ {
	2445	+ if (manipWindow != null)
	2446	+ {
	2447	+ manipWindow.refreshContents();
	2448	+ }
	2449	+ }
	2450	+
2315	2451	//if (parent != null)
2316	2452	//parent.refreshEditWindow();
2317	2453	}
..	..	@@ -2454,13 +2590,13 @@
2454	2590	return retval;
2455	2591	}
2456	2592
2457		- void doEditDrag(ClickInfo info)
	2593	+ void doEditDrag(ClickInfo info, boolean opposite)
2458	2594	{
2459	2595	switch (doSomething)
2460	2596	{
2461	2597	case 1: // '\001'
2462	2598	//super.
2463		- doEditDrag0(info);
	2599	+ doEditDrag0(info, opposite);
2464	2600	break;
2465	2601
2466	2602	case 2: // '\002'
..	..	@@ -2473,11 +2609,11 @@
2473	2609	{
2474	2610	//sel.hitSomething = childToDrag.hitSomething;
2475	2611	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2612	+ sel.doEditDrag(info, opposite);
2477	2613	} else
2478	2614	{
2479	2615	//super.
2480		- doEditDrag0(info);
	2616	+ doEditDrag0(info, opposite);
2481	2617	}
2482	2618	}
2483	2619	break;
..	..	@@ -2587,6 +2723,18 @@
2587	2723	void GenNormalsS(boolean crease)
2588	2724	{
2589	2725	selection.GenNormals(crease);
	2726	+// for (int i=0; i<selection.size(); i++)
	2727	+// {
	2728	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2729	+// selectee.GenNormals(crease);
	2730	+// }
	2731	+
	2732	+ //Touch();
	2733	+ }
	2734	+
	2735	+ void GenNormalsMeshS()
	2736	+ {
	2737	+ selection.GenNormalsMesh();
2590	2738	// for (int i=0; i<selection.size(); i++)
2591	2739	// {
2592	2740	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +2880,42 @@
2732	2880	blockloop = false;
2733	2881	}
2734	2882
	2883	+ void GenNormalsMesh()
	2884	+ {
	2885	+ if (blockloop)
	2886	+ return;
	2887	+
	2888	+ blockloop = true;
	2889	+ GenNormalsMesh0();
	2890	+ for (int i = 0; i < Children().Size(); i++)
	2891	+ {
	2892	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2893	+ if (child == null)
	2894	+ continue;
	2895	+ child.GenNormalsMesh();
	2896	+// Children().release(i);
	2897	+ }
	2898	+ blockloop = false;
	2899	+ }
	2900	+
	2901	+ void GenNormalsMINE()
	2902	+ {
	2903	+ if (blockloop)
	2904	+ return;
	2905	+
	2906	+ blockloop = true;
	2907	+ GenNormalsMINE0();
	2908	+ for (int i = 0; i < Children().Size(); i++)
	2909	+ {
	2910	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2911	+ if (child == null)
	2912	+ continue;
	2913	+ child.GenNormalsMINE();
	2914	+// Children().release(i);
	2915	+ }
	2916	+ blockloop = false;
	2917	+ }
	2918	+
2735	2919	void ClearColors()
2736	2920	{
2737	2921	if (blockloop)
..	..	@@ -2866,7 +3050,8 @@
2866	3050	{
2867	3051	if (bRep != null)
2868	3052	{
2869		- bRep.GenUV();
	3053	+ bRep.GenUV(); //1);
	3054	+ //bRep.UnfoldUV();
2870	3055	Touch();
2871	3056	}
2872	3057	}
..	..	@@ -2876,6 +3061,24 @@
2876	3061	if (bRep != null)
2877	3062	{
2878	3063	bRep.GenerateNormals(crease);
	3064	+ Touch();
	3065	+ }
	3066	+ }
	3067	+
	3068	+ void GenNormalsMesh0()
	3069	+ {
	3070	+ if (bRep != null)
	3071	+ {
	3072	+ bRep.GenerateNormalsMesh();
	3073	+ Touch();
	3074	+ }
	3075	+ }
	3076	+
	3077	+ void GenNormalsMINE0()
	3078	+ {
	3079	+ if (bRep != null)
	3080	+ {
	3081	+ bRep.GenerateNormalsMINE();
2879	3082	Touch();
2880	3083	}
2881	3084	}
..	..	@@ -2932,6 +3135,33 @@
2932	3135	blockloop = false;
2933	3136	}
2934	3137
	3138	+ void TransformChildren()
	3139	+ {
	3140	+ if (toParent != null)
	3141	+ {
	3142	+ for (int i=Size(); --i>=0;)
	3143	+ {
	3144	+ Object3D v = get(i);
	3145	+
	3146	+ if (v.toParent == null)
	3147	+ {
	3148	+ v.toParent = LA.newMatrix();
	3149	+ v.fromParent = LA.newMatrix();
	3150	+ }
	3151	+
	3152	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3153	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3154	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3155	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3156	+ }
	3157	+
	3158	+ toParent = null; // LA.matIdentity(toParent);
	3159	+ fromParent = null; // LA.matIdentity(fromParent);
	3160	+
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2935	3165	void TransformGeometry()
2936	3166	{
2937	3167	Object3D obj = this;
..	..	@@ -3153,9 +3383,11 @@
3153	3383
3154	3384	BoundaryRep sup = bRep.support;
3155	3385	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3386	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3387	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3388	+
	3389	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3390	+
3159	3391	bRep = temprep;
3160	3392	bRep.support = sup;
3161	3393	Touch();
..	..	@@ -3292,7 +3524,8 @@
3292	3524	if (blockloop)
3293	3525	return;
3294	3526
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3527	+ if (//marked \|\| // does not make sense
	3528	+ (bRep != null \|\| material != null)) // borderline...
3296	3529	live = h;
3297	3530
3298	3531	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3546,8 @@
3313	3546	return;
3314	3547
3315	3548	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3549	+ if (//marked \|\| // does not make sense
	3550	+ (bRep != null \|\| material != null)) // borderline...
3317	3551	link2master = h;
3318	3552
3319	3553	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3567,8 @@
3333	3567	if (blockloop)
3334	3568	return;
3335	3569
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3570	+ if (//marked \|\| // does not make sense
	3571	+ (bRep != null \|\| material != null)) // borderline...
3337	3572	hide = h;
3338	3573
3339	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3588,7 @@
3353	3588	if (blockloop)
3354	3589	return;
3355	3590
3356		- if (bRep != null && material != null) // borderline...
	3591	+ if (bRep != null \|\| material != null) // borderline...
3357	3592	marked = h;
3358	3593
3359	3594	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3598,46 @@
3363	3598	continue;
3364	3599	blockloop = true;
3365	3600	child.MarkLeaves(h);
	3601	+ blockloop = false;
	3602	+ // release(i);
	3603	+ }
	3604	+ }
	3605	+
	3606	+ void RewindLeaves(boolean h)
	3607	+ {
	3608	+ if (blockloop)
	3609	+ return;
	3610	+
	3611	+ if (bRep != null \|\| material != null) // borderline...
	3612	+ rewind = h;
	3613	+
	3614	+ for (int i = 0; i < Size(); i++)
	3615	+ {
	3616	+ Object3D child = (Object3D) get(i); // reserve(i);
	3617	+ if (child == null)
	3618	+ continue;
	3619	+ blockloop = true;
	3620	+ child.RewindLeaves(h);
	3621	+ blockloop = false;
	3622	+ // release(i);
	3623	+ }
	3624	+ }
	3625	+
	3626	+ void RandomLeaves(boolean h)
	3627	+ {
	3628	+ if (blockloop)
	3629	+ return;
	3630	+
	3631	+ if (bRep != null \|\| material != null) // borderline...
	3632	+ random = h;
	3633	+
	3634	+ for (int i = 0; i < Size(); i++)
	3635	+ {
	3636	+ Object3D child = (Object3D) get(i); // reserve(i);
	3637	+ if (child == null)
	3638	+ continue;
	3639	+ blockloop = true;
	3640	+ child.RandomLeaves(h);
3366	3641	blockloop = false;
3367	3642	// release(i);
3368	3643	}
..	..	@@ -3677,7 +3952,7 @@
3677	3952	if (child == null)
3678	3953	continue;
3679	3954
3680		- if (GrafreeD.RENDERME > 0)
	3955	+ if (Grafreed.RENDERME > 0)
3681	3956	{
3682	3957	if (child instanceof Merge)
3683	3958	((Merge)child).renderme();
..	..	@@ -3828,7 +4103,7 @@
3828	4103	if (child == null)
3829	4104	continue;
3830	4105
3831		- if (GrafreeD.RENDERME > 0)
	4106	+ if (Grafreed.RENDERME > 0)
3832	4107	{
3833	4108	if (child instanceof Merge)
3834	4109	((Merge)child).renderme();
..	..	@@ -4023,7 +4298,7 @@
4023	4298	if (child == null)
4024	4299	continue;
4025	4300
4026		- if (GrafreeD.RENDERME > 0)
	4301	+ if (Grafreed.RENDERME > 0)
4027	4302	{
4028	4303	if (child instanceof Merge)
4029	4304	((Merge)child).renderme();
..	..	@@ -4111,7 +4386,7 @@
4111	4386	if (blockloop)
4112	4387	return;
4113	4388
4114		- for (int i=0; i<size(); i++)
	4389	+ for (int i=0; i<Size(); i++)
4115	4390	{
4116	4391	if (get(i).parent != this)
4117	4392	{
..	..	@@ -4120,6 +4395,71 @@
4120	4395	}
4121	4396	blockloop = true;
4122	4397	get(i).RepairParent();
	4398	+ blockloop = false;
	4399	+ }
	4400	+ }
	4401	+
	4402	+ void RepairShadow()
	4403	+ {
	4404	+ if (blockloop)
	4405	+ return;
	4406	+
	4407	+ if (this.material != null)
	4408	+ this.InitOthers();
	4409	+
	4410	+ for (int i=0; i<Size(); i++)
	4411	+ {
	4412	+ blockloop = true;
	4413	+ get(i).RepairShadow();
	4414	+ blockloop = false;
	4415	+ }
	4416	+ }
	4417	+
	4418	+ void RepairSOV()
	4419	+ {
	4420	+ if (blockloop)
	4421	+ return;
	4422	+
	4423	+ String texname = this.GetPigmentTexture();
	4424	+
	4425	+ if (texname.startsWith("sov"))
	4426	+ {
	4427	+ String[] s = texname.split("/");
	4428	+
	4429	+ String[] sname = s[1].split("Color.pn");
	4430	+
	4431	+ texname = sname[0];
	4432	+
	4433	+ if (sname.length > 1)
	4434	+ {
	4435	+ texname += "Color.jpg";
	4436	+ }
	4437	+
	4438	+ this.SetPigmentTexture("sov/" + texname);
	4439	+ }
	4440	+
	4441	+ texname = this.GetBumpTexture();
	4442	+
	4443	+ if (texname.startsWith("sov"))
	4444	+ {
	4445	+ String[] s = texname.split("/");
	4446	+
	4447	+ String[] sname = s[1].split("Bump.pn");
	4448	+
	4449	+ texname = sname[0];
	4450	+
	4451	+ if (sname.length > 1)
	4452	+ {
	4453	+ texname += "Bump.jpg";
	4454	+ }
	4455	+
	4456	+ this.SetBumpTexture("sov/" + texname);
	4457	+ }
	4458	+
	4459	+ for (int i=0; i<Size(); i++)
	4460	+ {
	4461	+ blockloop = true;
	4462	+ get(i).RepairSOV();
4123	4463	blockloop = false;
4124	4464	}
4125	4465	}
..	..	@@ -4614,7 +4954,7 @@
4614	4954
4615	4955	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	4956	{
4617		- if (hide)
	4957	+ if (hide \|\| dontselect)
4618	4958	return null;
4619	4959
4620	4960	if (count <= 0)
..	..	@@ -4638,9 +4978,17 @@
4638	4978	}
4639	4979	}
4640	4980
	4981	+ ObjEditor GetWindow()
	4982	+ {
	4983	+ if (editWindow != null)
	4984	+ return editWindow;
	4985	+
	4986	+ return manipWindow;
	4987	+ }
	4988	+
4641	4989	cTreePath Select(int indexcount, boolean deselect)
4642	4990	{
4643		- if (hide)
	4991	+ if (hide \|\| dontselect)
4644	4992	return null;
4645	4993
4646	4994	if (count <= 0)
..	..	@@ -4674,10 +5022,11 @@
4674	5022	if (leaf != null)
4675	5023	{
4676	5024	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5025	+ ObjEditor window = GetWindow();
	5026	+ if (window != null)
4678	5027	{
4679	5028	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5029	+ window.Select(tp, deselect, true);
4681	5030	}
4682	5031
4683	5032	return tp;
..	..	@@ -4694,6 +5043,7 @@
4694	5043
4695	5044	if (child == null)
4696	5045	continue;
	5046	+
4697	5047	if (child.HasTransparency() && child.size() != 0)
4698	5048	{
4699	5049	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5053,10 @@
4703	5053	if (leaf != null)
4704	5054	{
4705	5055	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5056	+ ObjEditor window = GetWindow();
	5057	+ if (window != null)
4707	5058	{
4708		- editWindow.Select(tp, deselect, true);
	5059	+ window.Select(tp, deselect, true);
4709	5060	}
4710	5061
4711	5062	return tp;
..	..	@@ -4790,7 +5141,7 @@
4790	5141	return globalTransform;
4791	5142	}
4792	5143
4793		- void PreprocessOcclusion(CameraPane cp)
	5144	+ void PreprocessOcclusion(iCameraPane cp)
4794	5145	{
4795	5146	/*
4796	5147	if (AOdone)
..	..	@@ -4937,7 +5288,8 @@
4937	5288	} else //
4938	5289	if (editWindow != null)
4939	5290	{
4940		- editWindow.cameraView.lighttouched = true;
	5291	+ //editWindow.cameraView.lighttouched = true;
	5292	+ Globals.lighttouched = true;
4941	5293	}
4942	5294	}
4943	5295
..	..	@@ -5091,10 +5443,34 @@
5091	5443
5092	5444	// System.out.println("Fullname = " + fullname);
5093	5445
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5446	+ // Does not work on Windows due to C:
	5447	+// if (fullname.name.indexOf(":") == -1)
	5448	+// return fullname.name;
	5449	+//
	5450	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5451
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5452	+ String[] split = fullname.name.split(":");
	5453	+
	5454	+ if (split.length == 0)
	5455	+ {
	5456	+ return "";
	5457	+ }
	5458	+
	5459	+ if (split.length <= 2)
	5460	+ {
	5461	+ if (fullname.name.endsWith(":"))
	5462	+ {
	5463	+ // Windows
	5464	+ return fullname.name.substring(0, fullname.name.length()-1);
	5465	+ }
	5466	+
	5467	+ return split[0];
	5468	+ }
	5469	+
	5470	+ // Windows
	5471	+ assert(split.length == 4);
	5472	+
	5473	+ return split[0] + ":" + split[1];
5098	5474	}
5099	5475
5100	5476	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5479,38 @@
5103	5479	return "";
5104	5480
5105	5481	// System.out.println("Fullname = " + fullname);
5106		- if (fullname.name.indexOf(":") == -1)
5107		- return "";
5108		-
5109		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5482	+ // Does not work on Windows due to C:
	5483	+// if (fullname.name.indexOf(":") == -1)
	5484	+// return "";
	5485	+//
	5486	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5487	+ String[] split = fullname.name.split(":");
	5488	+
	5489	+ if (split.length == 0)
	5490	+ {
	5491	+ return "";
	5492	+ }
	5493	+
	5494	+ if (split.length == 1)
	5495	+ {
	5496	+ return "";
	5497	+ }
	5498	+
	5499	+ if (split.length == 2)
	5500	+ {
	5501	+ if (fullname.name.endsWith(":"))
	5502	+ {
	5503	+ // Windows
	5504	+ return "";
	5505	+ }
	5506	+
	5507	+ return split[1];
	5508	+ }
	5509	+
	5510	+ // Windows
	5511	+ assert(split.length == 4);
	5512	+
	5513	+ return split[2] + ":" + split[3];
5110	5514	}
5111	5515
5112	5516	String GetPigmentTexture()
..	..	@@ -5180,7 +5584,7 @@
5180	5584	System.out.print("; textures = " + textures);
5181	5585	System.out.println("; usedtextures = " + usedtextures);
5182	5586
5183		- if (GetTextures() == null)
	5587	+ if (GetTextures() == null) // What is that??
5184	5588	GetTextures().name = ":";
5185	5589
5186	5590	String texname = tex;
..	..	@@ -5211,6 +5615,43 @@
5211	5615	child.ResetPigmentTexture();
5212	5616	blockloop = false;
5213	5617	}
	5618	+ }
	5619	+
	5620	+ UUID GetUUID()
	5621	+ {
	5622	+ if (uuid == null)
	5623	+ {
	5624	+ // Serial
	5625	+ uuid = UUID.randomUUID();
	5626	+ }
	5627	+
	5628	+ return uuid;
	5629	+ }
	5630	+
	5631	+ Object3D GetObject(UUID uid)
	5632	+ {
	5633	+ if (blockloop)
	5634	+ return null;
	5635	+
	5636	+ if (GetUUID().equals(uid))
	5637	+ return this;
	5638	+
	5639	+ int nb = Size();
	5640	+ for (int i = 0; i < nb; i++)
	5641	+ {
	5642	+ Object3D child = (Object3D) get(i);
	5643	+
	5644	+ if (child == null)
	5645	+ continue;
	5646	+
	5647	+ blockloop = true;
	5648	+ Object3D obj = child.GetObject(uid);
	5649	+ blockloop = false;
	5650	+ if (obj != null)
	5651	+ return obj;
	5652	+ }
	5653	+
	5654	+ return null;
5214	5655	}
5215	5656
5216	5657	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5690,33 @@
5249	5690	}
5250	5691	}
5251	5692
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5693	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5694	{
5254	5695	Draw(display, root, selected, blocked);
5255	5696	}
5256	5697
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5698	boolean NeedSupport()
5262	5699	{
5263	5700	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5701	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5702	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5703	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5704	}
5268	5705
	5706	+ static boolean DEBUG_SELECTION = false;
5269	5707
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5708	+ boolean IsLive()
	5709	+ {
	5710	+ if (live)
	5711	+ return true;
	5712	+
	5713	+ if (parent == null)
	5714	+ return false;
	5715	+
	5716	+ return parent.IsLive();
	5717	+ }
	5718	+
	5719	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5720	{
5272	5721	Invariants(); // june 2013
5273	5722
..	..	@@ -5276,8 +5725,8 @@
5276	5725	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5726	}
5278	5727
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5728	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5729	+ (hide \|\| dontselect))
5281	5730	return;
5282	5731
5283	5732	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5744,7 @@
5295	5744	if (this instanceof Checker)
5296	5745	return;
5297	5746
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5747	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5748	return;
5300	5749
5301	5750	if (count <= 0)
..	..	@@ -5303,13 +5752,13 @@
5303	5752	return;
5304	5753	}
5305	5754
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5755	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5756	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5757	{
5309	5758	return;
5310	5759	}
5311	5760
5312		- javax.media.opengl.GL gl = display.GetGL();
	5761	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5762
5314	5763	/*
5315	5764	if (touched)
..	..	@@ -5328,7 +5777,7 @@
5328	5777	support = support;
5329	5778
5330	5779	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5331		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5780	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5332	5781
5333	5782	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	5783	{
..	..	@@ -5345,15 +5794,17 @@
5345	5794
5346	5795	boolean compiled = false;
5347	5796
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5797	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5798
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5799	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5800	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5801	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5802	{
5353		- display.lighttouched = true;
	5803	+ Globals.lighttouched = true;
5354	5804	} // all panes...
5355		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5356		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5805	+
	5806	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5807	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5808	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5809	{
5359	5810	if (!(this instanceof Composite))
..	..	@@ -5361,7 +5812,7 @@
5361	5812	//if (displaylist == -1 && usecalllists)
5362	5813	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5363	5814	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5815	+ bRep.displaylist = display.GenList();
5365	5816	assert(bRep.displaylist != 0);
5366	5817	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5818	//System.out.println("\tgen list " + list);
..	..	@@ -5373,18 +5824,20 @@
5373	5824	if (usecalllists)
5374	5825	{
5375	5826	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5827	+ display.NewList(bRep.displaylist);
5377	5828	}
	5829	+
5378	5830	CallList(display, root, selected, blocked);
	5831	+
5379	5832	// compiled = true;
5380	5833	if (usecalllists)
5381	5834	{
5382	5835	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5836	+ display.EndList();
5384	5837	}
5385	5838	//gl.glDrawBuffer(gl.GL_BACK);
5386	5839	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5840	+ Globals.lighttouched = true; // all panes...
5388	5841	}
5389	5842
5390	5843	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +5876,12 @@
5423	5876
5424	5877	// frustum culling
5425	5878	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	5879	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	5880	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	5881	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	5882	{
5430	5883	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5884	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	5885	{
5433	5886	//System.out.print("CULLED");
5434	5887	culled = true;
..	..	@@ -5436,7 +5889,7 @@
5436	5889	}
5437	5890	else
5438	5891	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5892	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	5893	culled = true;
5441	5894
5442	5895	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +5925,12 @@
5472	5925
5473	5926
5474	5927	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5928	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	5929	{
5477	5930	if (GetBRep() != null)
5478	5931	{
5479		- CameraPane.NextIndex(this, gl);
	5932	+ display.NextIndex();
	5933	+
5480	5934	// vertex color conflict : gl.glCallList(list);
5481	5935	DrawNode(display, root, selected);
5482	5936	if (this instanceof BezierPatch)
..	..	@@ -5498,53 +5952,7 @@
5498	5952	color[2] /= 2;
5499	5953	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	5954	*/
5501		- if (material != null)
5502		- {
5503		- materialstack[materialdepth] = material;
5504		- selectedstack[materialdepth] = selected;
5505		- cStatic.objectstack[materialdepth++] = this;
5506		- //System.out.println("material " + material);
5507		- //Applet3D.tracein(this, selected);
5508		- display.vector2buffer = projectedVertices;
5509		- if (this instanceof Camera)
5510		- {
5511		- display.options1[0] = material.shift;
5512		- //System.out.println("shift " + material.shift);
5513		- display.options1[1] = material.lightarea;
5514		- display.options1[2] = material.shadowbias;
5515		- display.options1[3] = material.aniso;
5516		- display.options1[4] = material.anisoV;
5517		- display.options2[0] = material.opacity;
5518		- display.options2[1] = material.diffuse;
5519		- display.options2[2] = material.factor;
5520		-
5521		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options3[3] = material.cameralight/0.2f;
5523		-
5524		- // if (display.CURRENTANTIALIAS > 0)
5525		- // display.options3[3] /= 4;
5526		-
5527		- /*
5528		- System.out.println("Focus = " + display.options1[0]);
5529		- System.out.println("Aperture = " + display.options1[1]);
5530		- System.out.println("ShadowBlur = " + display.options1[2]);
5531		- System.out.println("Antialiasing = " + display.options1[3]);
5532		- System.out.println("Fog = " + display.options2[0]);
5533		- System.out.println("Intensity = " + display.options2[1]);
5534		- System.out.println("Elevation = " + display.options2[2]);
5535		- /**/
5536		- } else
5537		- {
5538		- material.Draw(display, selected);
5539		- }
5540		- } else
5541		- {
5542		- if (selected && CameraPane.flash)
5543		- {
5544		- display.modelParams4[1] = 100;
5545		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5546		- }
5547		- }
	5955	+ display.PushMaterial(this, selected);
5548	5956
5549	5957	//System.out.println("call list " + list);
5550	5958	//System.out.println();
..	..	@@ -5563,7 +5971,28 @@
5563	5971	tex = GetTextures();
5564	5972	}
5565	5973
5566		- display.BindTextures(tex, texres);
	5974	+ boolean failedPigment = false;
	5975	+ boolean failedBump = false;
	5976	+
	5977	+ try
	5978	+ {
	5979	+ display.BindPigmentTexture(tex, texres);
	5980	+ }
	5981	+ catch (Exception e)
	5982	+ {
	5983	+ System.err.println("FAILED: " + this);
	5984	+ failedPigment = true;
	5985	+ }
	5986	+
	5987	+ try
	5988	+ {
	5989	+ display.BindBumpTexture(tex, texres);
	5990	+ }
	5991	+ catch (Exception e)
	5992	+ {
	5993	+ //System.err.println("FAILED: " + this);
	5994	+ failedBump = true;
	5995	+ }
5567	5996
5568	5997	if (!compiled)
5569	5998	{
..	..	@@ -5579,30 +6008,19 @@
5579	6008
5580	6009	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	6010	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	6011	+ display.CallList(bRep.displaylist);
5583	6012	// june 2013 drawSelf(display, root, selected);
5584	6013	}
5585	6014	}
5586	6015	}
5587	6016
5588		- display.ReleaseTextures(tex);
5589		-
5590		- //if (parent != null && parent.GetMaterial() != null)
5591		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5592		- if (material != null)
5593		- {
5594		- materialdepth -= 1;
5595		- if (materialdepth > 0)
5596		- {
5597		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5598		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5599		- }
5600		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5601		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5602		- {
5603		- display.modelParams4[1] = GetMaterial().cameralight;
5604		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5605		- }
	6017	+ if (!failedBump)
	6018	+ display.ReleaseBumpTexture(tex);
	6019	+
	6020	+ if (!failedPigment)
	6021	+ display.ReleasePigmentTexture(tex);
	6022	+
	6023	+ display.PopMaterial(this, selected);
5606	6024	}
5607	6025
5608	6026	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,7 +6062,7 @@
5644	6062	// resetMasterNode();
5645	6063	}
5646	6064
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6065	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	6066	{
5649	6067	if (GetBRep() == null)
5650	6068	{
..	..	@@ -5727,8 +6145,11 @@
5727	6145	boolean flipV = false; // true;
5728	6146	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	6147
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6148	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6149	{
	6150	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6151	+ return;
	6152	+
5732	6153	if (hide)
5733	6154	return;
5734	6155	// shadow optimisation
..	..	@@ -5786,16 +6207,7 @@
5786	6207	// // ??????????????????????????? Touch();
5787	6208	// }
5788	6209
5789		- if (material != null)
5790		- {
5791		- materialstack[materialdepth] = material;
5792		- selectedstack[materialdepth] = selected;
5793		- cStatic.objectstack[materialdepth++] = this;
5794		- //System.out.println("material " + material);
5795		- //Applet3D.tracein("selected ", selected);
5796		- display.vector2buffer = projectedVertices;
5797		- material.Draw(display, selected);
5798		- }
	6210	+display.PushMaterial2(this, selected);
5799	6211
5800	6212	Object3D child;
5801	6213	boolean sel;
..	..	@@ -5847,19 +6259,7 @@
5847	6259	*/
5848	6260	//depth += 1;
5849	6261
5850		- if (material != null)
5851		- {
5852		- materialdepth -= 1;
5853		- if (materialdepth > 0)
5854		- {
5855		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5856		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5857		- }
5858		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5859		- //else
5860		- //material.Draw(display, false);
5861		- }
5862		-
	6262	+display.PopMaterial2(this);
5863	6263	/*
5864	6264	display.ReleaseTextures(tex);
5865	6265	*/
..	..	@@ -5870,10 +6270,13 @@
5870	6270
5871	6271	//static cVector min,max;
5872	6272
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6273	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6274	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6275	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6276	return; // no shadow for transparent objects
	6277	+
	6278	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6279	+ return;
5877	6280
5878	6281	if (hide)
5879	6282	return;
..	..	@@ -5915,11 +6318,12 @@
5915	6318	return;
5916	6319	}
5917	6320
	6321	+ //bRep.GenUV(1/material.diffuseness);
5918	6322	// bRep.lock = true;
5919	6323
5920		- javax.media.opengl.GL gl = display.GetGL();
	6324	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6325
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6326	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5923	6327	{
5924	6328	int fc = bRep.FaceCount();
5925	6329	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6338,7 @@
5934	6338
5935	6339	bRep.getMinMax(min, max, 100);
5936	6340
5937		- gl.glBegin(gl.GL_LINES);
5938		-
5939		- gl.glVertex3d(min.x, min.y, min.z);
5940		- gl.glVertex3d(min.x, min.y, max.z);
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, max.y, min.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(max.x, min.y, min.z);
5945		-
5946		- gl.glVertex3d(max.x, max.y, max.z);
5947		- gl.glVertex3d(min.x, max.y, max.z);
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(max.x, min.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, max.y, min.z);
5952		-
5953		- gl.glEnd();
	6341	+ display.DrawBox(min, max);
5954	6342
5955	6343	return;
5956	6344	}
..	..	@@ -5994,7 +6382,7 @@
5994	6382	{
5995	6383	//throw new Error();
5996	6384
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6385	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6386
5999	6387	int[] strips = bRep.getRawIndices();
6000	6388
..	..	@@ -6004,178 +6392,19 @@
6004	6392	new Exception().printStackTrace();
6005	6393	return;
6006	6394	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
	6395	+
	6396	+ if (dontselect)
6010	6397	{
6011		- float[] v = bRep.getRawVertices();
6012		- float[] n = bRep.getRawNormals();
6013		- float[] c = bRep.getRawColors();
6014		- float[] uv = bRep.getRawUVMap();
6015		-
6016		- int count2 = 0;
6017		- int count3 = 0;
6018		-
6019		- if (n.length > 0)
6020		- {
6021		- for (int i = 0; i < strips.length; i++)
6022		- {
6023		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6024		-
6025		- /*
6026		- boolean locked = false;
6027		- float eps = 0.1f;
6028		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6029		-
6030		- int dot = 0;
6031		-
6032		- if ((dot&1) == 0)
6033		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6034		-
6035		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6036		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6037		- else
6038		- {
6039		- locked = true;
6040		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6041		- }
6042		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6043		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6044		- if (hasnorm)
6045		- {
6046		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6047		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6048		- }
6049		-
6050		- if ((dot&4) == 0)
6051		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6052		-
6053		- if (wrap \|\| !locked && (dot&8) != 0)
6054		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6055		- else
6056		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6057		-
6058		- f.dot = dot;
6059		- */
6060		-
6061		- if (!selectmode)
6062		- {
6063		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6064		- {
6065		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6066		- } else
6067		- {
6068		- gl.glNormal3f(0, 0, 1);
6069		- }
6070		-
6071		- if (c != null)
6072		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6073		- {
6074		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6075		- }
6076		- }
6077		- if (flipV)
6078		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6079		- else
6080		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6081		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6082		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6083		-
6084		- count2 += 2;
6085		- count3 += 3;
6086		- if (!selectmode)
6087		- {
6088		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6089		- {
6090		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6091		- } else
6092		- {
6093		- gl.glNormal3f(0, 0, 1);
6094		- }
6095		- if (c != null)
6096		- {
6097		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6098		- }
6099		- }
6100		- if (flipV)
6101		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6102		- else
6103		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6104		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6105		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6106		-
6107		- count2 += 2;
6108		- count3 += 3;
6109		- for (int j = 0; j < strips[i] - 2; j++)
6110		- {
6111		- //gl.glTexCoord2d(...);
6112		- if (!selectmode)
6113		- {
6114		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6115		- {
6116		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6117		- } else
6118		- {
6119		- gl.glNormal3f(0, 0, 1);
6120		- }
6121		- if (c != null)
6122		- {
6123		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6124		- }
6125		- }
6126		-
6127		- if (flipV)
6128		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6129		- else
6130		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6131		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6132		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6133		- count2 += 2;
6134		- count3 += 3;
6135		- }
6136		-
6137		- gl.glEnd();
6138		- }
6139		- }
6140		-
6141		- assert count3 == v.length;
	6398	+ //bRep.GenerateNormalsMINE();
6142	6399	}
6143		- else // !trimmed
6144		- {
6145		- int count = 0;
6146		- for (int i = 0; i < strips.length; i++)
6147		- {
6148		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6149		-
6150		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6151		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6152		-
6153		- drawVertex(gl, p, selectmode);
6154		- drawVertex(gl, q, selectmode);
6155		-
6156		- for (int j = 0; j < strips[i] - 2; j++)
6157		- {
6158		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6159		-
6160		-// if (j%2 == 0)
6161		-// drawFace(p, q, r, display, null);
6162		-// else
6163		-// drawFace(p, r, q, display, null);
6164		-
6165		-// p = q;
6166		-// q = r;
6167		- drawVertex(gl, r, selectmode);
6168		- }
6169		-
6170		- gl.glEnd();
6171		- }
6172		- }
	6400	+
	6401	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6402	} else // catch (Error e)
6174	6403	{
6175	6404	// TRIANGLE ARRAY
6176	6405	if (IsOpaque()) // Static())
6177	6406	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6407	+ display.StartTriangles();
6179	6408	int facecount = bRep.FaceCount();
6180	6409	for (int i = 0; i < facecount; i++)
6181	6410	{
..	..	@@ -6238,9 +6467,9 @@
6238	6467	// // r.norm.dot(v3) > -0.5)
6239	6468	// // continue;
6240	6469
6241		- drawFace(p, q, r, display, face);
	6470	+ display.DrawFace(this, p, q, r, face);
6242	6471	}
6243		- gl.glEnd();
	6472	+ display.EndTriangles();
6244	6473	}
6245	6474	else
6246	6475	{
..	..	@@ -6269,8 +6498,8 @@
6269	6498	//System.out.println("SORT");
6270	6499
6271	6500	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	6501	+
	6502	+ display.StartTriangles();
6274	6503	for (int i = 0; i < facecount; i++)
6275	6504	{
6276	6505	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +6511,14 @@
6282	6511	Vertex q = bRep.GetVertex(face.q);
6283	6512	Vertex r = bRep.GetVertex(face.r);
6284	6513
6285		- drawFace(p, q, r, display, face);
	6514	+ display.DrawFace(this, p, q, r, face);
6286	6515	}
6287		- gl.glEnd();
	6516	+ display.EndTriangles();
6288	6517	}
6289	6518
6290	6519	if (false) // live && support != null && support.bRep != null) // debug weights
6291	6520	{
	6521	+ /*
6292	6522	gl.glDisable(gl.GL_LIGHTING);
6293	6523	float[] colorV = new float[3];
6294	6524
..	..	@@ -6367,6 +6597,7 @@
6367	6597	// gl.glEnd();
6368	6598	}
6369	6599	}
	6600	+ */
6370	6601	}
6371	6602	}
6372	6603
..	..	@@ -6411,7 +6642,7 @@
6411	6642	center.add(r);
6412	6643	center.mul(1.0/3);
6413	6644
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6645	+ center.sub(Globals.theRenderer.EyeCamera().location);
6415	6646
6416	6647	distance = center.dot(center);
6417	6648	}
..	..	@@ -6422,347 +6653,11 @@
6422	6653
6423	6654	transient FaceCompare[] facescompare = null;
6424	6655
6425		- void SetColor(CameraPane display, Vertex p0)
6426		- {
6427		- if (display.RENDERPROGRAM == 0)
6428		- {
6429		- float r = 0;
6430		- if (bRep != null)
6431		- {
6432		- if (bRep.stripified)
6433		- {
6434		- r = 1;
6435		- }
6436		- }
6437		- float g = 0;
6438		- if (bRep != null)
6439		- {
6440		- if (bRep.trimmed)
6441		- {
6442		- g = 1;
6443		- }
6444		- }
6445		- float b = 0;
6446		- if (support != null && link2master)
6447		- {
6448		- b = 1;
6449		- }
6450		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6451		- return;
6452		- }
6453		-
6454		- if (display.drawMode != CameraPane.SHADOW)
6455		- return;
6456		-
6457		- javax.media.opengl.GL gl = display.GetGL();
6458		-// if (true) return;
6459		-// float ao = p.AO;
6460		-//
6461		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6462		-// // ao = 1;
6463		-//
6464		-// gl.glColor4f(ao, ao, ao, 1);
6465		-
6466		-// CameraPane.selectedpoint.
6467		-// getAverage(cStatic.point1, true);
6468		- if (CameraPane.pointflow == null) // !random) // live)
6469		- {
6470		- return;
6471		- }
6472		-
6473		- cStatic.point1.set(0,0,0);
6474		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6475		-
6476		- cStatic.point1.sub(p0);
6477		-
6478		-
6479		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6480		-// {
6481		-// return;
6482		-// }
6483		-
6484		- //if (true)
6485		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6486		- {
6487		- return;
6488		- }
6489		-
6490		- float[] colorV = new float[3];
6491		-
6492		- if (false) // marked)
6493		- {
6494		- // debug rigging weights
6495		- for (int object = 0; object < p0.vertexlinks.length; object++)
6496		- {
6497		- float weight = p0.weights[object] / p0.totalweight;
6498		-
6499		- // if (weight < 0.1)
6500		- // {
6501		- // assert(weight == 0);
6502		- // continue;
6503		- // }
6504		-
6505		- if (p0.vertexlinks[object] == -1)
6506		- continue;
6507		-
6508		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6509		-
6510		- int color = //1 << object; //
6511		- //p.vertexlinks.length;
6512		- support.bRep.supports[p0.closestsupport].links[object];
6513		- colorV[2] += (color & 1) * weight;
6514		- colorV[1] += ((color & 2) >> 1) * weight;
6515		- colorV[0] += ((color & 4) >> 2) * weight;
6516		- }
6517		- }
6518		- else
6519		- {
6520		- if (drawingstarted)
6521		- {
6522		- // find next point
6523		- if (bRep.GetVertex(0).faceindices == null)
6524		- {
6525		- bRep.InitFaceIndices();
6526		- }
6527		-
6528		- double ymin = p0.y;
6529		-
6530		- Vertex newp = p0;
6531		-
6532		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6533		- {
6534		- int fi = p0.faceindices[fii];
6535		-
6536		- if (fi == -1)
6537		- break;
6538		-
6539		- Face f = bRep.GetFace(fi);
6540		-
6541		- Vertex p = bRep.GetVertex(f.p);
6542		- Vertex q = bRep.GetVertex(f.q);
6543		- Vertex r = bRep.GetVertex(f.r);
6544		-
6545		- int swap = (int)(Math.random()*3);
6546		-
6547		-// for (int s=swap; --s>=0;)
6548		-// {
6549		-// Vertex t = p;
6550		-// p = q;
6551		-// q = r;
6552		-// r = t;
6553		-// }
6554		- if (ymin > p.y)
6555		- {
6556		- ymin = p.y;
6557		- newp = p;
6558		-// break;
6559		- }
6560		- if (ymin > q.y)
6561		- {
6562		- ymin = q.y;
6563		- newp = q;
6564		-// break;
6565		- }
6566		- if (ymin > r.y)
6567		- {
6568		- ymin = r.y;
6569		- newp = r;
6570		-// break;
6571		- }
6572		- }
6573		-
6574		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6575		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6576		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6577		-
6578		- drawingstarted = false;
6579		-
6580		- // return;
6581		- }
6582		-
6583		- if (false) // CameraPane.DRAW
6584		- {
6585		- p0.AO = colorV[0] = 2;
6586		- colorV[1] = 2;
6587		- colorV[2] = 2;
6588		- }
6589		-
6590		- CameraPane.pointflow.add(p0);
6591		- CameraPane.pointflow.Touch();
6592		- }
6593		-
6594		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6595		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6596		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6597		- }
6598		-
6599	6656	void Print(Vertex v)
6600	6657	{
6601	6658	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	6659	}
6603	6660
6604		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6605		- {
6606		- if (!selectmode)
6607		- {
6608		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6609		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6610		-
6611		- if (flipV)
6612		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6613		- else
6614		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6615		- }
6616		-
6617		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6618		- }
6619		-
6620		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6621		- CameraPane display, Face face)
6622		- {
6623		- if (pv.y == -10000 \|\|
6624		- qv.y == -10000 \|\|
6625		- rv.y == -10000)
6626		- return;
6627		-
6628		-// float b = f.nbiterations & 1;
6629		-// float g = (f.nbiterations>>1) & 1;
6630		-// float r = (f.nbiterations>>2) & 1;
6631		-//
6632		-// //if (f.weight == 10000)
6633		-// //{
6634		-// // r = 1; g = b = 0;
6635		-// //}
6636		-// //else
6637		-// //{
6638		-// // assert(f.weight < 10000);
6639		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6640		-// if (r<0)
6641		-// assert(r>=0);
6642		-// //}
6643		-
6644		- javax.media.opengl.GL gl = display.GetGL();
6645		-
6646		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6647		-
6648		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6649		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6650		- {
6651		- //gl.glBegin(gl.GL_TRIANGLES);
6652		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6653		- if (!hasnorm)
6654		- {
6655		- // System.out.println("FUCK!!");
6656		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6657		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6658		- LA.vecCross(v0, v1, v2);
6659		- LA.vecNormalize(v2);
6660		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661		- }
6662		-
6663		- if (hasnorm)
6664		- {
6665		-// if (!pv.norm.normalized())
6666		-// assert(pv.norm.normalized());
6667		-
6668		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6670		- }
6671		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672		- SetColor(display, pv);
6673		- //gl.glColor4f(r, g, b, 1);
6674		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6675		- if (flipV)
6676		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6677		- else
6678		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6681		-// Print(pv);
6682		- if (hasnorm)
6683		- {
6684		-// assert(qv.norm.normalized());
6685		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6687		- }
6688		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689		- // boolean locked = false;
6690		- // float eps = 0.1f;
6691		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6692		-
6693		- // int dot = 0; //*/ (int)f.dot;
6694		-
6695		- // if ((dot&1) == 0)
6696		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6697		-
6698		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6699		- if (flipV)
6700		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6701		- else
6702		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6703		- // else
6704		- // {
6705		- // locked = true;
6706		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6707		- // }
6708		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709		- SetColor(display, qv);
6710		- //gl.glColor4f(r, g, b, 1);
6711		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6714		-// Print(qv);
6715		- if (hasnorm)
6716		- {
6717		-// assert(rv.norm.normalized());
6718		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6720		- }
6721		-
6722		- // if ((dot&4) == 0)
6723		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6724		-
6725		- // if (wrap \|\| !locked && (dot&8) != 0)
6726		- if (flipV)
6727		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6728		- else
6729		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6730		- // else
6731		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6732		-
6733		- // f.dot = dot;
6734		-
6735		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6736		- SetColor(display, rv);
6737		- //gl.glColor4f(r, g, b, 1);
6738		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6741		-// Print(rv);
6742		- //gl.glEnd();
6743		- }
6744		- else
6745		- {
6746		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6747		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6748		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6749		-
6750		- }
6751		-
6752		- if (false) // (attributes & WIREFRAME) != 0)
6753		- {
6754		- gl.glDisable(gl.GL_LIGHTING);
6755		-
6756		- gl.glBegin(gl.GL_LINE_LOOP);
6757		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6758		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6759		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6760		- gl.glEnd();
6761		-
6762		- gl.glEnable(gl.GL_LIGHTING);
6763		- }
6764		- }
6765		-
6766	6661	void drawSelf(ClickInfo info, int level, boolean select)
6767	6662	{
6768	6663	if (bRep == null)
..	..	@@ -7334,83 +7229,84 @@
7334	7229	int spotw = spot.x + spot.width;
7335	7230	int spoth = spot.y + spot.height;
7336	7231	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7337		- if (CameraPane.Xmin > spot.x)
7338		- {
7339		- CameraPane.Xmin = spot.x;
7340		- }
7341		- if (CameraPane.Xmax < spotw)
7342		- {
7343		- CameraPane.Xmax = spotw;
7344		- }
7345		- if (CameraPane.Ymin > spot.y)
7346		- {
7347		- CameraPane.Ymin = spot.y;
7348		- }
7349		- if (CameraPane.Ymax < spoth)
7350		- {
7351		- CameraPane.Ymax = spoth;
7352		- }
	7232	+// if (CameraPane.Xmin > spot.x)
	7233	+// {
	7234	+// CameraPane.Xmin = spot.x;
	7235	+// }
	7236	+// if (CameraPane.Xmax < spotw)
	7237	+// {
	7238	+// CameraPane.Xmax = spotw;
	7239	+// }
	7240	+// if (CameraPane.Ymin > spot.y)
	7241	+// {
	7242	+// CameraPane.Ymin = spot.y;
	7243	+// }
	7244	+// if (CameraPane.Ymax < spoth)
	7245	+// {
	7246	+// CameraPane.Ymax = spoth;
	7247	+// }
7353	7248	spot.translate(32, 32);
7354	7249	spotw = spot.x + spot.width;
7355	7250	spoth = spot.y + spot.height;
7356		- info.g.setColor(Color.blue);
	7251	+ info.g.setColor(Color.cyan);
7357	7252	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7358		- if (CameraPane.Xmin > spot.x)
7359		- {
7360		- CameraPane.Xmin = spot.x;
7361		- }
7362		- if (CameraPane.Xmax < spotw)
7363		- {
7364		- CameraPane.Xmax = spotw;
7365		- }
7366		- if (CameraPane.Ymin > spot.y)
7367		- {
7368		- CameraPane.Ymin = spot.y;
7369		- }
7370		- if (CameraPane.Ymax < spoth)
7371		- {
7372		- CameraPane.Ymax = spoth;
7373		- }
7374		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7375		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7253	+// if (CameraPane.Xmin > spot.x)
	7254	+// {
	7255	+// CameraPane.Xmin = spot.x;
	7256	+// }
	7257	+// if (CameraPane.Xmax < spotw)
	7258	+// {
	7259	+// CameraPane.Xmax = spotw;
	7260	+// }
	7261	+// if (CameraPane.Ymin > spot.y)
	7262	+// {
	7263	+// CameraPane.Ymin = spot.y;
	7264	+// }
	7265	+// if (CameraPane.Ymax < spoth)
	7266	+// {
	7267	+// CameraPane.Ymax = spoth;
	7268	+// }
	7269	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7270	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7376	7271	spot.translate(0, -32);
7377		- info.g.setColor(Color.green);
	7272	+ info.g.setColor(Color.yellow);
7378	7273	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7379		- if (CameraPane.Xmin > spot.x)
7380		- {
7381		- CameraPane.Xmin = spot.x;
7382		- }
7383		- if (CameraPane.Xmax < spotw)
7384		- {
7385		- CameraPane.Xmax = spotw;
7386		- }
7387		- if (CameraPane.Ymin > spot.y)
7388		- {
7389		- CameraPane.Ymin = spot.y;
7390		- }
7391		- if (CameraPane.Ymax < spoth)
7392		- {
7393		- CameraPane.Ymax = spoth;
7394		- }
	7274	+ info.g.setColor(Color.green);
	7275	+// if (CameraPane.Xmin > spot.x)
	7276	+// {
	7277	+// CameraPane.Xmin = spot.x;
	7278	+// }
	7279	+// if (CameraPane.Xmax < spotw)
	7280	+// {
	7281	+// CameraPane.Xmax = spotw;
	7282	+// }
	7283	+// if (CameraPane.Ymin > spot.y)
	7284	+// {
	7285	+// CameraPane.Ymin = spot.y;
	7286	+// }
	7287	+// if (CameraPane.Ymax < spoth)
	7288	+// {
	7289	+// CameraPane.Ymax = spoth;
	7290	+// }
7395	7291	info.g.drawArc(boundary.x, boundary.y,
7396	7292	boundary.width, boundary.height, 0, 360);
7397	7293	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7398		- if (CameraPane.Xmin > boundary.x)
7399		- {
7400		- CameraPane.Xmin = boundary.x;
7401		- }
7402		- if (CameraPane.Xmax < boundary.x + boundary.width)
7403		- {
7404		- CameraPane.Xmax = boundary.x + boundary.width;
7405		- }
7406		- if (CameraPane.Ymin > boundary.y)
7407		- {
7408		- CameraPane.Ymin = boundary.y;
7409		- }
7410		- if (CameraPane.Ymax < boundary.y + boundary.height)
7411		- {
7412		- CameraPane.Ymax = boundary.y + boundary.height;
7413		- }
	7294	+// if (CameraPane.Xmin > boundary.x)
	7295	+// {
	7296	+// CameraPane.Xmin = boundary.x;
	7297	+// }
	7298	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7299	+// {
	7300	+// CameraPane.Xmax = boundary.x + boundary.width;
	7301	+// }
	7302	+// if (CameraPane.Ymin > boundary.y)
	7303	+// {
	7304	+// CameraPane.Ymin = boundary.y;
	7305	+// }
	7306	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7307	+// {
	7308	+// CameraPane.Ymax = boundary.y + boundary.height;
	7309	+// }
7414	7310	return;
7415	7311	}
7416	7312	}
..	..	@@ -7427,7 +7323,7 @@
7427	7323	startX = info.x;
7428	7324	startY = info.y;
7429	7325
7430		- hitSomething = 0;
	7326	+ hitSomething = -1;
7431	7327	cVector origin = new cVector();
7432	7328	//LA.xformPos(origin, toParent, origin);
7433	7329	Rectangle spot = new Rectangle();
..	..	@@ -7460,7 +7356,7 @@
7460	7356	}
7461	7357
7462	7358	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7359	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7360	//System.out.println("modified = " + modified);
7465	7361	//new Exception().printStackTrace();
7466	7362	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7384,7 @@
7488	7384	return true;
7489	7385	}
7490	7386
7491		- void doEditDrag0(ClickInfo info)
	7387	+ void doEditDrag0(ClickInfo info, boolean opposite)
7492	7388	{
7493	7389	if (hitSomething == 0)
7494	7390	{
..	..	@@ -7503,6 +7399,7 @@
7503	7399	//System.out.println("hitSomething = " + hitSomething);
7504	7400
7505	7401	double scale = 0.005f * info.camera.Distance();
	7402	+
7506	7403	cVector xlate = new cVector();
7507	7404	//cVector xlate2 = new cVector();
7508	7405	switch (hitSomething)
..	..	@@ -7513,9 +7410,9 @@
7513	7410
7514	7411	case hitCenter: // Translate
7515	7412
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7413	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7414
7518		- if (modified)
	7415	+ if (modified \|\| opposite)
7519	7416	{
7520	7417	//assert(false);
7521	7418	/*
..	..	@@ -7561,10 +7458,10 @@
7561	7458	}
7562	7459	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	7460	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7461	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7565	7462	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7566	7463	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7464	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	7465	//LA.vecCross(up, cVector.Z, right2);
7569	7466
7570	7467	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7609,6 +7506,7 @@
7609	7506
7610	7507	if (modified)
7611	7508	{
	7509	+ // Rotate 90 degrees
7612	7510	angle /= (Math.PI / 4);
7613	7511	angle = Math.floor(angle + 0.5);
7614	7512	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +7520,7 @@
7622	7520	}
7623	7521	/**/
7624	7522
7625		- switch (info.pane.renderCamera.viewCode)
	7523	+ switch (info.pane.RenderCamera().viewCode)
7626	7524	{
7627	7525	case 1: // '\001'
7628	7526	LA.matZRotate(toParent, angle);
..	..	@@ -7650,24 +7548,27 @@
7650	7548
7651	7549	case hitScale: // scale
7652	7550	double hScale = (double) (info.x - centerPt.x) / 32;
	7551	+ double sign = 1;
	7552	+ if (hScale < 0)
	7553	+ {
	7554	+ sign = -1;
	7555	+ }
	7556	+ hScale = signMath.pow(signhScale, scale * 50);
7653	7557	if (hScale < 0.01)
7654	7558	{
7655		- hScale = 0.01;
	7559	+ //hScale = 0.01;
7656	7560	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
7659		- {
7660		- hScale = 0.01;
7661		- }
	7561	+
7662	7562	double vScale = (double) (info.y - centerPt.y) / 32;
7663		- if (vScale < 0.01)
	7563	+ sign = 1;
	7564	+ if (vScale < 0)
7664	7565	{
7665		- vScale = 0.01;
	7566	+ sign = -1;
7666	7567	}
7667		- vScale = Math.pow(vScale, scale * 50);
	7568	+ vScale = signMath.pow(signvScale, scale * 50);
7668	7569	if (vScale < 0.01)
7669	7570	{
7670		- vScale = 0.01;
	7571	+ //vScale = 0.01;
7671	7572	}
7672	7573	LA.matCopy(startMat, toParent);
7673	7574	/**/
..	..	@@ -7678,39 +7579,47 @@
7678	7579	}
7679	7580	/**/
7680	7581
7681		- switch (info.pane.renderCamera.viewCode)
	7582	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7583	+
	7584	+ if (totalScale < 0.01)
	7585	+ {
	7586	+ totalScale = 0.01;
	7587	+ }
	7588	+
	7589	+ switch (info.pane.RenderCamera().viewCode)
7682	7590	{
7683	7591	case 3: // '\001'
7684		- if (modified)
	7592	+ if (modified \|\| opposite)
7685	7593	{
7686	7594	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	7595	+ LA.matScale(toParent, totalScale, 1, 1);
7688	7596	} // vScale, 1);
7689	7597	else
7690	7598	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	7599	+ // EXCEPTION!
	7600	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7692	7601	} // vScale, 1);
7693	7602	break;
7694	7603
7695	7604	case 2: // '\002'
7696		- if (modified)
	7605	+ if (modified \|\| opposite)
7697	7606	{
7698	7607	//LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 1);
	7608	+ LA.matScale(toParent, 1, totalScale, 1);
7700	7609	} else
7701	7610	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	7611	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	7612	}
7704	7613	break;
7705	7614
7706	7615	case 1: // '\003'
7707		- if (modified)
	7616	+ if (modified \|\| opposite)
7708	7617	{
7709	7618	//LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	7619	+ LA.matScale(toParent, 1, 1, totalScale);
7711	7620	} else
7712	7621	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	7622	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	7623	}
7715	7624	break;
7716	7625	}
..	..	@@ -7731,7 +7640,7 @@
7731	7640	if (parent == null)
7732	7641	{
7733	7642	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	7643	+ //new Exception().printStackTrace();
7735	7644	} else
7736	7645	{
7737	7646	if (parent instanceof BezierPatch)
..	..	@@ -7843,14 +7752,22 @@
7843	7752	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	7753	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	7754	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7755	+
	7756	+ String objname;
	7757	+
7846	7758	if (false) //parent != null)
7847	7759	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7760	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	7761	} else
7850	7762	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7763	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	7764	} // + super.toString();
7853	7765	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7766	+
	7767	+ if (!Globals.ADVANCED)
	7768	+ return objname;
	7769	+
	7770	+ return objname + " " + System.identityHashCode(this);
7854	7771	}
7855	7772
7856	7773	public int hashCode()
..	..	@@ -7906,6 +7823,7 @@
7906	7823	objectUI.closeUI();
7907	7824	if (editWindow != null)
7908	7825	{
	7826	+ editWindow.ctrlPanel.FlushUI();
7909	7827	editWindow.refreshContents();
7910	7828	} // ? new
7911	7829	objectUI = null;
..	..	@@ -7914,6 +7832,10 @@
7914	7832	{
7915	7833	editWindow = null;
7916	7834	} // ?
	7835	+ }
	7836	+ else
	7837	+ {
	7838	+ //editWindow.closeUI();
7917	7839	}
7918	7840	}
7919	7841
..	..	@@ -7926,7 +7848,7 @@
7926	7848	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	7849
7928	7850	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	7851	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	7852
7931	7853	double[][] toParent; // dynamic matrix
7932	7854	double[][] fromParent;
..	..	@@ -8041,7 +7963,7 @@
8041	7963	{
8042	7964	assert(bRep != null);
8043	7965	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GrafreeD.Assert(support.bRep == bRep.support);
	7966	+ Grafreed.Assert(support.bRep == bRep.support);
8045	7967	}
8046	7968	else
8047	7969	{
..	..	@@ -8072,6 +7994,10 @@
8072	7994	}
8073	7995
8074	7996	transient ObjEditor editWindow;
	7997	+ transient ObjEditor manipWindow;
	7998	+
	7999	+ transient boolean pinned;
	8000	+
8075	8001	transient ObjectUI objectUI;
8076	8002	public static int povDepth = 0;
8077	8003	private static cVector tbMin = new cVector();
..	..	@@ -8090,9 +8016,9 @@
8090	8016	private static cVector edge2 = new cVector();
8091	8017	//private static cVector norm = new cVector();
8092	8018	/transient private/ int hitSomething;
8093		- private static final int hitCenter = 1;
8094		- private static final int hitScale = 2;
8095		- private static final int hitRotate = 3;
	8019	+ static final int hitCenter = 1;
	8020	+ static final int hitScale = 2;
	8021	+ static final int hitRotate = 3;
8096	8022	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	8023	/transient/ private Point centerPt;
8098	8024	/transient/ private int startX;
..	..	@@ -8124,6 +8050,8 @@
8124	8050	{
8125	8051	Object3D targ = this;
8126	8052
	8053	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8054	+
8127	8055	if (obj.material != null)
8128	8056	{
8129	8057	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))