~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[] = new byte[100][];
	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,8 @@
285	425	return parent.GetName() + "#";
286	426	}
287	427
288		- boolean timeline = false;
289	428	boolean live = false;
	429	+ boolean dontselect = false;
290	430	boolean hide = false;
291	431	boolean link2master = false; // performs reset support/master at each frame
292	432	boolean marked = false; // animation node
..	..	@@ -296,6 +436,8 @@
296	436	boolean random = false;
297	437	boolean speedup = false;
298	438	boolean rewind = false;
	439	+
	440	+ float NORMALPUSH = 0;
299	441
300	442	Object3D support;
301	443
..	..	@@ -416,16 +558,16 @@
416	558	{
417	559	Object3D copy = this;
418	560
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	561	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	562
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	563	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	564	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	565	+ parentcam = Globals.theRenderer.Cameras()[1];
424	566	}
425	567
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	568	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	569	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	570	+ parentcam = Globals.theRenderer.Cameras()[0];
429	571	}
430	572
431	573	if (this == parentcam)
..	..	@@ -433,7 +575,7 @@
433	575	//assert(this instanceof Camera);
434	576
435	577	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	578	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	579	}
438	580
439	581	copy.marked ^= true;
..	..	@@ -453,7 +595,7 @@
453	595	//assert(this instanceof Camera);
454	596
455	597	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	598	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	599	}
458	600
459	601	copy.Touch(); // display list issue
..	..	@@ -466,12 +608,14 @@
466	608	toParent = LA.newMatrix();
467	609	fromParent = LA.newMatrix();
468	610	}
	611	+
469	612	if (toParentMarked == null)
470	613	{
471	614	if (maxcount != 1)
472	615	{
473	616	new Exception().printStackTrace();
474	617	}
	618	+
475	619	toParentMarked = LA.newMatrix();
476	620	fromParentMarked = LA.newMatrix();
477	621	}
..	..	@@ -588,7 +732,7 @@
588	732	return;
589	733	}
590	734
591		- if (CameraPane.fromscript)
	735	+ if (Globals.fromscript)
592	736	{
593	737	transformcount = 0;
594	738	return;
..	..	@@ -746,7 +890,7 @@
746	890
747	891	int GetTransformCount()
748	892	{
749		- // marde pour serialization de Texture
	893	+ // patch pour serialization de Texture
750	894	resetmaxcount();
751	895	resettransformcount();
752	896	resetstep();
..	..	@@ -759,7 +903,7 @@
759	903	if (step == 0)
760	904	step = 1;
761	905	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	906	+ maxcount = 128; // 2048; // 4;
763	907	// if (acceleration == 0)
764	908	// acceleration = 10;
765	909	if (delay == 0) // serial
..	..	@@ -780,9 +924,12 @@
780	924	// factor = CameraPane.STEP;
781	925	// }
782	926
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	927	+ if (marked && Globals.isLIVE() && live &&
	928	+ //TEMP21aug2018
	929	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	930	+ currentframe != Globals.framecount)
784	931	{
785		- currentframe = CameraPane.framecount;
	932	+ currentframe = Globals.framecount;
786	933
787	934	// System.err.println("transformcount = " + transformcount);
788	935	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +938,8 @@
791	938
792	939	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	940
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	941	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	942	+ (step == 1 && changedir))
795	943	{
796	944	countdown = 1;
797	945	delay = speedup?8:1;
..	..	@@ -863,6 +1011,7 @@
863	1011	if (material == null \|\| material.multiply)
864	1012	return true;
865	1013
	1014	+ // Transparent objects are dynamic because we have to sort the triangles.
866	1015	return material.opacity > 0.99;
867	1016	}
868	1017
..	..	@@ -894,6 +1043,11 @@
894	1043	fromParent = null; // LA.newMatrix();
895	1044	bRep = null; // new BoundaryRep();
896	1045
	1046	+ if (oname != null && oname.equals("LeftHand"))
	1047	+ {
	1048	+ name = oname;
	1049	+ }
	1050	+
897	1051	/*
898	1052	float hue = (float)Math.random();
899	1053	Color col;
..	..	@@ -936,7 +1090,7 @@
936	1090
937	1091	public Object clone()
938	1092	{
939		- return GrafreeD.clone(this);
	1093	+ return Grafreed.clone(this);
940	1094	}
941	1095
942	1096	Object3D copyExpand()
..	..	@@ -1258,6 +1412,7 @@
1258	1412	toParent = LA.newMatrix();
1259	1413	fromParent = LA.newMatrix();
1260	1414	}
	1415	+
1261	1416	LA.matCopy(other.toParent, toParent);
1262	1417	LA.matCopy(other.fromParent, fromParent);
1263	1418
..	..	@@ -1452,7 +1607,7 @@
1452	1607	BoundaryRep.SEUIL = other.material.cameralight;
1453	1608
1454	1609	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1610	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1611	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1612	}
1458	1613
..	..	@@ -1711,7 +1866,7 @@
1711	1866	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1867	o.bRep = transientrep;
1713	1868	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1869	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1870	o.CreateMaterial();
1716	1871	o.SetAttributes(this, -1);
1717	1872	//parent
..	..	@@ -1724,7 +1879,7 @@
1724	1879	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1880	o.bRep = bRep;
1726	1881	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1882	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1883	o.CreateMaterial();
1729	1884	//o.overwriteThis(this, -1);
1730	1885	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1966,15 @@
1811	1966	if (obj.name == null)
1812	1967	continue; // can't be a null one
1813	1968
	1969	+ // Try perfect match first.
1814	1970	if (n.equals(obj.name))
1815	1971	{
1816	1972	theobj = obj;
1817	1973	count++;
1818	1974	}
1819	1975	}
	1976	+
	1977	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	1978
1821	1979	if (count != 1)
1822	1980	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2289,8 @@
2131	2289	if (/parent != null &&/ material == null)
2132	2290	{
2133	2291	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
	2292	+
	2293	+ InitOthers();
2143	2294
2144	2295	if (this instanceof Camera)
2145	2296	{
..	..	@@ -2283,12 +2434,17 @@
2283	2434	}
2284	2435	*/
2285	2436	}
	2437	+ else
	2438	+ {
	2439	+ //((ObjEditor)editWindow).SetupUI2(null);
	2440	+ }
2286	2441	}
2287	2442
2288	2443	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2444	{
2290	2445	if (newWindow)
2291	2446	{
	2447	+ new Exception().printStackTrace();
2292	2448	System.exit(0);
2293	2449	if (parent != null)
2294	2450	{
..	..	@@ -2323,6 +2479,14 @@
2323	2479	{
2324	2480	editWindow.refreshContents();
2325	2481	}
	2482	+ else
	2483	+ {
	2484	+ if (manipWindow != null)
	2485	+ {
	2486	+ manipWindow.refreshContents();
	2487	+ }
	2488	+ }
	2489	+
2326	2490	//if (parent != null)
2327	2491	//parent.refreshEditWindow();
2328	2492	}
..	..	@@ -2465,13 +2629,13 @@
2465	2629	return retval;
2466	2630	}
2467	2631
2468		- void doEditDrag(ClickInfo info)
	2632	+ void doEditDrag(ClickInfo info, boolean opposite)
2469	2633	{
2470	2634	switch (doSomething)
2471	2635	{
2472	2636	case 1: // '\001'
2473	2637	//super.
2474		- doEditDrag0(info);
	2638	+ doEditDrag0(info, opposite);
2475	2639	break;
2476	2640
2477	2641	case 2: // '\002'
..	..	@@ -2484,11 +2648,11 @@
2484	2648	{
2485	2649	//sel.hitSomething = childToDrag.hitSomething;
2486	2650	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2651	+ sel.doEditDrag(info, opposite);
2488	2652	} else
2489	2653	{
2490	2654	//super.
2491		- doEditDrag0(info);
	2655	+ doEditDrag0(info, opposite);
2492	2656	}
2493	2657	}
2494	2658	break;
..	..	@@ -2598,6 +2762,18 @@
2598	2762	void GenNormalsS(boolean crease)
2599	2763	{
2600	2764	selection.GenNormals(crease);
	2765	+// for (int i=0; i<selection.size(); i++)
	2766	+// {
	2767	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2768	+// selectee.GenNormals(crease);
	2769	+// }
	2770	+
	2771	+ //Touch();
	2772	+ }
	2773	+
	2774	+ void GenNormalsMeshS()
	2775	+ {
	2776	+ selection.GenNormalsMesh();
2601	2777	// for (int i=0; i<selection.size(); i++)
2602	2778	// {
2603	2779	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2914,24 @@
2738	2914	if (child == null)
2739	2915	continue;
2740	2916	child.GenNormals(crease);
	2917	+// Children().release(i);
	2918	+ }
	2919	+ blockloop = false;
	2920	+ }
	2921	+
	2922	+ void GenNormalsMesh()
	2923	+ {
	2924	+ if (blockloop)
	2925	+ return;
	2926	+
	2927	+ blockloop = true;
	2928	+ GenNormalsMesh0();
	2929	+ for (int i = 0; i < Children().Size(); i++)
	2930	+ {
	2931	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2932	+ if (child == null)
	2933	+ continue;
	2934	+ child.GenNormalsMesh();
2741	2935	// Children().release(i);
2742	2936	}
2743	2937	blockloop = false;
..	..	@@ -2895,7 +3089,8 @@
2895	3089	{
2896	3090	if (bRep != null)
2897	3091	{
2898		- bRep.GenUV();
	3092	+ bRep.GenUV(); //1);
	3093	+ //bRep.UnfoldUV();
2899	3094	Touch();
2900	3095	}
2901	3096	}
..	..	@@ -2905,6 +3100,15 @@
2905	3100	if (bRep != null)
2906	3101	{
2907	3102	bRep.GenerateNormals(crease);
	3103	+ Touch();
	3104	+ }
	3105	+ }
	3106	+
	3107	+ void GenNormalsMesh0()
	3108	+ {
	3109	+ if (bRep != null)
	3110	+ {
	3111	+ bRep.GenerateNormalsMesh();
2908	3112	Touch();
2909	3113	}
2910	3114	}
..	..	@@ -2970,6 +3174,33 @@
2970	3174	blockloop = false;
2971	3175	}
2972	3176
	3177	+ void TransformChildren()
	3178	+ {
	3179	+ if (toParent != null)
	3180	+ {
	3181	+ for (int i=Size(); --i>=0;)
	3182	+ {
	3183	+ Object3D v = get(i);
	3184	+
	3185	+ if (v.toParent == null)
	3186	+ {
	3187	+ v.toParent = LA.newMatrix();
	3188	+ v.fromParent = LA.newMatrix();
	3189	+ }
	3190	+
	3191	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3192	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3193	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3194	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3195	+ }
	3196	+
	3197	+ toParent = null; // LA.matIdentity(toParent);
	3198	+ fromParent = null; // LA.matIdentity(fromParent);
	3199	+
	3200	+ Touch();
	3201	+ }
	3202	+ }
	3203	+
2973	3204	void TransformGeometry()
2974	3205	{
2975	3206	Object3D obj = this;
..	..	@@ -3191,9 +3422,11 @@
3191	3422
3192	3423	BoundaryRep sup = bRep.support;
3193	3424	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3425	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3426	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3427	+
	3428	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3429	+
3197	3430	bRep = temprep;
3198	3431	bRep.support = sup;
3199	3432	Touch();
..	..	@@ -3330,7 +3563,8 @@
3330	3563	if (blockloop)
3331	3564	return;
3332	3565
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3566	+ if (//marked \|\| // does not make sense
	3567	+ (bRep != null \|\| material != null)) // borderline...
3334	3568	live = h;
3335	3569
3336	3570	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3585,8 @@
3351	3585	return;
3352	3586
3353	3587	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3588	+ if (//marked \|\| // does not make sense
	3589	+ (bRep != null \|\| material != null)) // borderline...
3355	3590	link2master = h;
3356	3591
3357	3592	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3606,8 @@
3371	3606	if (blockloop)
3372	3607	return;
3373	3608
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3609	+ if (//marked \|\| // does not make sense
	3610	+ (bRep != null \|\| material != null)) // borderline...
3375	3611	hide = h;
3376	3612
3377	3613	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3627,7 @@
3391	3627	if (blockloop)
3392	3628	return;
3393	3629
3394		- if (bRep != null && material != null) // borderline...
	3630	+ if (bRep != null \|\| material != null) // borderline...
3395	3631	marked = h;
3396	3632
3397	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3637,46 @@
3401	3637	continue;
3402	3638	blockloop = true;
3403	3639	child.MarkLeaves(h);
	3640	+ blockloop = false;
	3641	+ // release(i);
	3642	+ }
	3643	+ }
	3644	+
	3645	+ void RewindLeaves(boolean h)
	3646	+ {
	3647	+ if (blockloop)
	3648	+ return;
	3649	+
	3650	+ if (bRep != null \|\| material != null) // borderline...
	3651	+ rewind = h;
	3652	+
	3653	+ for (int i = 0; i < Size(); i++)
	3654	+ {
	3655	+ Object3D child = (Object3D) get(i); // reserve(i);
	3656	+ if (child == null)
	3657	+ continue;
	3658	+ blockloop = true;
	3659	+ child.RewindLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RandomLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ random = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RandomLeaves(h);
3404	3680	blockloop = false;
3405	3681	// release(i);
3406	3682	}
..	..	@@ -3715,7 +3991,7 @@
3715	3991	if (child == null)
3716	3992	continue;
3717	3993
3718		- if (GrafreeD.RENDERME > 0)
	3994	+ if (Grafreed.RENDERME > 0)
3719	3995	{
3720	3996	if (child instanceof Merge)
3721	3997	((Merge)child).renderme();
..	..	@@ -3866,7 +4142,7 @@
3866	4142	if (child == null)
3867	4143	continue;
3868	4144
3869		- if (GrafreeD.RENDERME > 0)
	4145	+ if (Grafreed.RENDERME > 0)
3870	4146	{
3871	4147	if (child instanceof Merge)
3872	4148	((Merge)child).renderme();
..	..	@@ -4061,7 +4337,7 @@
4061	4337	if (child == null)
4062	4338	continue;
4063	4339
4064		- if (GrafreeD.RENDERME > 0)
	4340	+ if (Grafreed.RENDERME > 0)
4065	4341	{
4066	4342	if (child instanceof Merge)
4067	4343	((Merge)child).renderme();
..	..	@@ -4158,6 +4434,71 @@
4158	4434	}
4159	4435	blockloop = true;
4160	4436	get(i).RepairParent();
	4437	+ blockloop = false;
	4438	+ }
	4439	+ }
	4440	+
	4441	+ void RepairShadow()
	4442	+ {
	4443	+ if (blockloop)
	4444	+ return;
	4445	+
	4446	+ if (this.material != null)
	4447	+ this.InitOthers();
	4448	+
	4449	+ for (int i=0; i<Size(); i++)
	4450	+ {
	4451	+ blockloop = true;
	4452	+ get(i).RepairShadow();
	4453	+ blockloop = false;
	4454	+ }
	4455	+ }
	4456	+
	4457	+ void RepairSOV()
	4458	+ {
	4459	+ if (blockloop)
	4460	+ return;
	4461	+
	4462	+ String texname = this.GetPigmentTexture();
	4463	+
	4464	+ if (texname.startsWith("sov"))
	4465	+ {
	4466	+ String[] s = texname.split("/");
	4467	+
	4468	+ String[] sname = s[1].split("Color.pn");
	4469	+
	4470	+ texname = sname[0];
	4471	+
	4472	+ if (sname.length > 1)
	4473	+ {
	4474	+ texname += "Color.jpg";
	4475	+ }
	4476	+
	4477	+ this.SetPigmentTexture("sov/" + texname);
	4478	+ }
	4479	+
	4480	+ texname = this.GetBumpTexture();
	4481	+
	4482	+ if (texname.startsWith("sov"))
	4483	+ {
	4484	+ String[] s = texname.split("/");
	4485	+
	4486	+ String[] sname = s[1].split("Bump.pn");
	4487	+
	4488	+ texname = sname[0];
	4489	+
	4490	+ if (sname.length > 1)
	4491	+ {
	4492	+ texname += "Bump.jpg";
	4493	+ }
	4494	+
	4495	+ this.SetBumpTexture("sov/" + texname);
	4496	+ }
	4497	+
	4498	+ for (int i=0; i<Size(); i++)
	4499	+ {
	4500	+ blockloop = true;
	4501	+ get(i).RepairSOV();
4161	4502	blockloop = false;
4162	4503	}
4163	4504	}
..	..	@@ -4652,7 +4993,7 @@
4652	4993
4653	4994	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	4995	{
4655		- if (hide)
	4996	+ if (hide \|\| dontselect)
4656	4997	return null;
4657	4998
4658	4999	if (count <= 0)
..	..	@@ -4676,9 +5017,17 @@
4676	5017	}
4677	5018	}
4678	5019
	5020	+ ObjEditor GetWindow()
	5021	+ {
	5022	+ if (editWindow != null)
	5023	+ return editWindow;
	5024	+
	5025	+ return manipWindow;
	5026	+ }
	5027	+
4679	5028	cTreePath Select(int indexcount, boolean deselect)
4680	5029	{
4681		- if (hide)
	5030	+ if (hide \|\| dontselect)
4682	5031	return null;
4683	5032
4684	5033	if (count <= 0)
..	..	@@ -4712,10 +5061,11 @@
4712	5061	if (leaf != null)
4713	5062	{
4714	5063	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5064	+ ObjEditor window = GetWindow();
	5065	+ if (window != null)
4716	5066	{
4717	5067	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5068	+ window.Select(tp, deselect, true);
4719	5069	}
4720	5070
4721	5071	return tp;
..	..	@@ -4732,6 +5082,7 @@
4732	5082
4733	5083	if (child == null)
4734	5084	continue;
	5085	+
4735	5086	if (child.HasTransparency() && child.size() != 0)
4736	5087	{
4737	5088	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5092,10 @@
4741	5092	if (leaf != null)
4742	5093	{
4743	5094	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5095	+ ObjEditor window = GetWindow();
	5096	+ if (window != null)
4745	5097	{
4746		- editWindow.Select(tp, deselect, true);
	5098	+ window.Select(tp, deselect, true);
4747	5099	}
4748	5100
4749	5101	return tp;
..	..	@@ -4828,7 +5180,7 @@
4828	5180	return globalTransform;
4829	5181	}
4830	5182
4831		- void PreprocessOcclusion(CameraPane cp)
	5183	+ void PreprocessOcclusion(iCameraPane cp)
4832	5184	{
4833	5185	/*
4834	5186	if (AOdone)
..	..	@@ -4975,7 +5327,8 @@
4975	5327	} else //
4976	5328	if (editWindow != null)
4977	5329	{
4978		- editWindow.cameraView.lighttouched = true;
	5330	+ //editWindow.cameraView.lighttouched = true;
	5331	+ Globals.lighttouched = true;
4979	5332	}
4980	5333	}
4981	5334
..	..	@@ -5129,10 +5482,34 @@
5129	5482
5130	5483	// System.out.println("Fullname = " + fullname);
5131	5484
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5485	+ // Does not work on Windows due to C:
	5486	+// if (fullname.name.indexOf(":") == -1)
	5487	+// return fullname.name;
	5488	+//
	5489	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5490
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5491	+ String[] split = fullname.name.split(":");
	5492	+
	5493	+ if (split.length == 0)
	5494	+ {
	5495	+ return "";
	5496	+ }
	5497	+
	5498	+ if (split.length <= 2)
	5499	+ {
	5500	+ if (fullname.name.endsWith(":"))
	5501	+ {
	5502	+ // Windows
	5503	+ return fullname.name.substring(0, fullname.name.length()-1);
	5504	+ }
	5505	+
	5506	+ return split[0];
	5507	+ }
	5508	+
	5509	+ // Windows
	5510	+ assert(split.length == 4);
	5511	+
	5512	+ return split[0] + ":" + split[1];
5136	5513	}
5137	5514
5138	5515	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5518,38 @@
5141	5518	return "";
5142	5519
5143	5520	// 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());
	5521	+ // Does not work on Windows due to C:
	5522	+// if (fullname.name.indexOf(":") == -1)
	5523	+// return "";
	5524	+//
	5525	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5526	+ String[] split = fullname.name.split(":");
	5527	+
	5528	+ if (split.length == 0)
	5529	+ {
	5530	+ return "";
	5531	+ }
	5532	+
	5533	+ if (split.length == 1)
	5534	+ {
	5535	+ return "";
	5536	+ }
	5537	+
	5538	+ if (split.length == 2)
	5539	+ {
	5540	+ if (fullname.name.endsWith(":"))
	5541	+ {
	5542	+ // Windows
	5543	+ return "";
	5544	+ }
	5545	+
	5546	+ return split[1];
	5547	+ }
	5548	+
	5549	+ // Windows
	5550	+ assert(split.length == 4);
	5551	+
	5552	+ return split[2] + ":" + split[3];
5148	5553	}
5149	5554
5150	5555	String GetPigmentTexture()
..	..	@@ -5218,7 +5623,7 @@
5218	5623	System.out.print("; textures = " + textures);
5219	5624	System.out.println("; usedtextures = " + usedtextures);
5220	5625
5221		- if (GetTextures() == null)
	5626	+ if (GetTextures() == null) // What is that??
5222	5627	GetTextures().name = ":";
5223	5628
5224	5629	String texname = tex;
..	..	@@ -5249,6 +5654,43 @@
5249	5654	child.ResetPigmentTexture();
5250	5655	blockloop = false;
5251	5656	}
	5657	+ }
	5658	+
	5659	+ UUID GetUUID()
	5660	+ {
	5661	+ if (uuid == null)
	5662	+ {
	5663	+ // Serial
	5664	+ uuid = UUID.randomUUID();
	5665	+ }
	5666	+
	5667	+ return uuid;
	5668	+ }
	5669	+
	5670	+ Object3D GetObject(UUID uid)
	5671	+ {
	5672	+ if (blockloop)
	5673	+ return null;
	5674	+
	5675	+ if (GetUUID().equals(uid))
	5676	+ return this;
	5677	+
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ Object3D child = (Object3D) get(i);
	5682	+
	5683	+ if (child == null)
	5684	+ continue;
	5685	+
	5686	+ blockloop = true;
	5687	+ Object3D obj = child.GetObject(uid);
	5688	+ blockloop = false;
	5689	+ if (obj != null)
	5690	+ return obj;
	5691	+ }
	5692	+
	5693	+ return null;
5252	5694	}
5253	5695
5254	5696	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5729,33 @@
5287	5729	}
5288	5730	}
5289	5731
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5732	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5733	{
5292	5734	Draw(display, root, selected, blocked);
5293	5735	}
5294	5736
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5737	boolean NeedSupport()
5300	5738	{
5301	5739	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5740	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5741	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5742	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5743	}
5306	5744
	5745	+ static boolean DEBUG_SELECTION = false;
5307	5746
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5747	+ boolean IsLive()
	5748	+ {
	5749	+ if (live)
	5750	+ return true;
	5751	+
	5752	+ if (parent == null)
	5753	+ return false;
	5754	+
	5755	+ return parent.IsLive();
	5756	+ }
	5757	+
	5758	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5759	{
5310	5760	Invariants(); // june 2013
5311	5761
..	..	@@ -5314,8 +5764,8 @@
5314	5764	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5765	}
5316	5766
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5767	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5768	+ (hide \|\| dontselect))
5319	5769	return;
5320	5770
5321	5771	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5783,7 @@
5333	5783	if (this instanceof Checker)
5334	5784	return;
5335	5785
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5786	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5787	return;
5338	5788
5339	5789	if (count <= 0)
..	..	@@ -5341,13 +5791,13 @@
5341	5791	return;
5342	5792	}
5343	5793
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5794	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5795	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5796	{
5347	5797	return;
5348	5798	}
5349	5799
5350		- javax.media.opengl.GL gl = display.GetGL();
	5800	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5801
5352	5802	/*
5353	5803	if (touched)
..	..	@@ -5366,7 +5816,7 @@
5366	5816	support = support;
5367	5817
5368	5818	//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);
	5819	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5370	5820
5371	5821	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5822	{
..	..	@@ -5383,15 +5833,17 @@
5383	5833
5384	5834	boolean compiled = false;
5385	5835
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5836	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5837
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5838	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5839	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5840	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5841	{
5391		- display.lighttouched = true;
	5842	+ Globals.lighttouched = true;
5392	5843	} // 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 &&
	5844	+
	5845	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5846	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5847	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5848	{
5397	5849	if (!(this instanceof Composite))
..	..	@@ -5399,7 +5851,7 @@
5399	5851	//if (displaylist == -1 && usecalllists)
5400	5852	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5401	5853	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5854	+ bRep.displaylist = display.GenList();
5403	5855	assert(bRep.displaylist != 0);
5404	5856	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5857	//System.out.println("\tgen list " + list);
..	..	@@ -5411,18 +5863,20 @@
5411	5863	if (usecalllists)
5412	5864	{
5413	5865	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5866	+ display.NewList(bRep.displaylist);
5415	5867	}
	5868	+
5416	5869	CallList(display, root, selected, blocked);
	5870	+
5417	5871	// compiled = true;
5418	5872	if (usecalllists)
5419	5873	{
5420	5874	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5875	+ display.EndList();
5422	5876	}
5423	5877	//gl.glDrawBuffer(gl.GL_BACK);
5424	5878	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	5879	+ Globals.lighttouched = true; // all panes...
5426	5880	}
5427	5881
5428	5882	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +5915,12 @@
5461	5915
5462	5916	// frustum culling
5463	5917	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	5918	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	5919	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	5920	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	5921	{
5468	5922	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5923	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	5924	{
5471	5925	//System.out.print("CULLED");
5472	5926	culled = true;
..	..	@@ -5474,7 +5928,7 @@
5474	5928	}
5475	5929	else
5476	5930	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5931	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	5932	culled = true;
5479	5933
5480	5934	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +5964,12 @@
5510	5964
5511	5965
5512	5966	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5967	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	5968	{
5515	5969	if (GetBRep() != null)
5516	5970	{
5517		- CameraPane.NextIndex(this, gl);
	5971	+ display.NextIndex();
	5972	+
5518	5973	// vertex color conflict : gl.glCallList(list);
5519	5974	DrawNode(display, root, selected);
5520	5975	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +5991,7 @@
5536	5991	color[2] /= 2;
5537	5992	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	5993	*/
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		- }
	5994	+ display.PushMaterial(this, selected);
5588	5995
5589	5996	//System.out.println("call list " + list);
5590	5997	//System.out.println();
..	..	@@ -5603,7 +6010,28 @@
5603	6010	tex = GetTextures();
5604	6011	}
5605	6012
5606		- display.BindTextures(tex, texres);
	6013	+ boolean failedPigment = false;
	6014	+ boolean failedBump = false;
	6015	+
	6016	+ try
	6017	+ {
	6018	+ display.BindPigmentTexture(tex, texres);
	6019	+ }
	6020	+ catch (Exception e)
	6021	+ {
	6022	+ System.err.println("FAILED: " + this);
	6023	+ failedPigment = true;
	6024	+ }
	6025	+
	6026	+ try
	6027	+ {
	6028	+ display.BindBumpTexture(tex, texres);
	6029	+ }
	6030	+ catch (Exception e)
	6031	+ {
	6032	+ //System.err.println("FAILED: " + this);
	6033	+ failedBump = true;
	6034	+ }
5607	6035
5608	6036	if (!compiled)
5609	6037	{
..	..	@@ -5619,30 +6047,19 @@
5619	6047
5620	6048	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6049	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6050	+ display.CallList(bRep.displaylist);
5623	6051	// june 2013 drawSelf(display, root, selected);
5624	6052	}
5625	6053	}
5626	6054	}
5627	6055
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		- }
	6056	+ if (!failedBump)
	6057	+ display.ReleaseBumpTexture(tex);
	6058	+
	6059	+ if (!failedPigment)
	6060	+ display.ReleasePigmentTexture(tex);
	6061	+
	6062	+ display.PopMaterial(this, selected);
5646	6063	}
5647	6064
5648	6065	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6101,7 @@
5684	6101	// resetMasterNode();
5685	6102	}
5686	6103
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6104	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6105	{
5689	6106	if (GetBRep() == null)
5690	6107	{
..	..	@@ -5767,8 +6184,11 @@
5767	6184	boolean flipV = false; // true;
5768	6185	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6186
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6187	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6188	{
	6189	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6190	+ return;
	6191	+
5772	6192	if (hide)
5773	6193	return;
5774	6194	// shadow optimisation
..	..	@@ -5826,16 +6246,7 @@
5826	6246	// // ??????????????????????????? Touch();
5827	6247	// }
5828	6248
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		- }
	6249	+display.PushMaterial2(this, selected);
5839	6250
5840	6251	Object3D child;
5841	6252	boolean sel;
..	..	@@ -5887,19 +6298,7 @@
5887	6298	*/
5888	6299	//depth += 1;
5889	6300
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		-
	6301	+display.PopMaterial2(this);
5903	6302	/*
5904	6303	display.ReleaseTextures(tex);
5905	6304	*/
..	..	@@ -5910,10 +6309,13 @@
5910	6309
5911	6310	//static cVector min,max;
5912	6311
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6312	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6313	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6314	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6315	return; // no shadow for transparent objects
	6316	+
	6317	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6318	+ return;
5917	6319
5918	6320	if (hide)
5919	6321	return;
..	..	@@ -5955,11 +6357,12 @@
5955	6357	return;
5956	6358	}
5957	6359
	6360	+ //bRep.GenUV(1/material.diffuseness);
5958	6361	// bRep.lock = true;
5959	6362
5960		- javax.media.opengl.GL gl = display.GetGL();
	6363	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6364
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6365	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6366	{
5964	6367	int fc = bRep.FaceCount();
5965	6368	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6377,7 @@
5974	6377
5975	6378	bRep.getMinMax(min, max, 100);
5976	6379
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();
	6380	+ display.DrawBox(min, max);
5994	6381
5995	6382	return;
5996	6383	}
..	..	@@ -6034,7 +6421,7 @@
6034	6421	{
6035	6422	//throw new Error();
6036	6423
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6424	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6425
6039	6426	int[] strips = bRep.getRawIndices();
6040	6427
..	..	@@ -6044,178 +6431,19 @@
6044	6431	new Exception().printStackTrace();
6045	6432	return;
6046	6433	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6434	+
	6435	+ if (dontselect)
6050	6436	{
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;
	6437	+ //bRep.GenerateNormalsMINE();
6182	6438	}
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		- }
	6439	+
	6440	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6441	} else // catch (Error e)
6214	6442	{
6215	6443	// TRIANGLE ARRAY
6216	6444	if (IsOpaque()) // Static())
6217	6445	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6446	+ display.StartTriangles();
6219	6447	int facecount = bRep.FaceCount();
6220	6448	for (int i = 0; i < facecount; i++)
6221	6449	{
..	..	@@ -6278,9 +6506,9 @@
6278	6506	// // r.norm.dot(v3) > -0.5)
6279	6507	// // continue;
6280	6508
6281		- drawFace(p, q, r, display, face);
	6509	+ display.DrawFace(this, p, q, r, face);
6282	6510	}
6283		- gl.glEnd();
	6511	+ display.EndTriangles();
6284	6512	}
6285	6513	else
6286	6514	{
..	..	@@ -6309,8 +6537,8 @@
6309	6537	//System.out.println("SORT");
6310	6538
6311	6539	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6540	+
	6541	+ display.StartTriangles();
6314	6542	for (int i = 0; i < facecount; i++)
6315	6543	{
6316	6544	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6550,14 @@
6322	6550	Vertex q = bRep.GetVertex(face.q);
6323	6551	Vertex r = bRep.GetVertex(face.r);
6324	6552
6325		- drawFace(p, q, r, display, face);
	6553	+ display.DrawFace(this, p, q, r, face);
6326	6554	}
6327		- gl.glEnd();
	6555	+ display.EndTriangles();
6328	6556	}
6329	6557
6330	6558	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6559	{
	6560	+ /*
6332	6561	gl.glDisable(gl.GL_LIGHTING);
6333	6562	float[] colorV = new float[3];
6334	6563
..	..	@@ -6407,6 +6636,7 @@
6407	6636	// gl.glEnd();
6408	6637	}
6409	6638	}
	6639	+ */
6410	6640	}
6411	6641	}
6412	6642
..	..	@@ -6451,7 +6681,7 @@
6451	6681	center.add(r);
6452	6682	center.mul(1.0/3);
6453	6683
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6684	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6685
6456	6686	distance = center.dot(center);
6457	6687	}
..	..	@@ -6462,347 +6692,11 @@
6462	6692
6463	6693	transient FaceCompare[] facescompare = null;
6464	6694
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	6695	void Print(Vertex v)
6640	6696	{
6641	6697	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6698	}
6643	6699
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	6700	void drawSelf(ClickInfo info, int level, boolean select)
6807	6701	{
6808	6702	if (bRep == null)
..	..	@@ -7374,83 +7268,84 @@
7374	7268	int spotw = spot.x + spot.width;
7375	7269	int spoth = spot.y + spot.height;
7376	7270	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		- }
	7271	+// if (CameraPane.Xmin > spot.x)
	7272	+// {
	7273	+// CameraPane.Xmin = spot.x;
	7274	+// }
	7275	+// if (CameraPane.Xmax < spotw)
	7276	+// {
	7277	+// CameraPane.Xmax = spotw;
	7278	+// }
	7279	+// if (CameraPane.Ymin > spot.y)
	7280	+// {
	7281	+// CameraPane.Ymin = spot.y;
	7282	+// }
	7283	+// if (CameraPane.Ymax < spoth)
	7284	+// {
	7285	+// CameraPane.Ymax = spoth;
	7286	+// }
7393	7287	spot.translate(32, 32);
7394	7288	spotw = spot.x + spot.width;
7395	7289	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
	7290	+ info.g.setColor(Color.cyan);
7397	7291	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);
	7292	+// if (CameraPane.Xmin > spot.x)
	7293	+// {
	7294	+// CameraPane.Xmin = spot.x;
	7295	+// }
	7296	+// if (CameraPane.Xmax < spotw)
	7297	+// {
	7298	+// CameraPane.Xmax = spotw;
	7299	+// }
	7300	+// if (CameraPane.Ymin > spot.y)
	7301	+// {
	7302	+// CameraPane.Ymin = spot.y;
	7303	+// }
	7304	+// if (CameraPane.Ymax < spoth)
	7305	+// {
	7306	+// CameraPane.Ymax = spoth;
	7307	+// }
	7308	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7309	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7416	7310	spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
	7311	+ info.g.setColor(Color.yellow);
7418	7312	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);
	7313	+ info.g.setColor(Color.green);
	7314	+// if (CameraPane.Xmin > spot.x)
	7315	+// {
	7316	+// CameraPane.Xmin = spot.x;
	7317	+// }
	7318	+// if (CameraPane.Xmax < spotw)
	7319	+// {
	7320	+// CameraPane.Xmax = spotw;
	7321	+// }
	7322	+// if (CameraPane.Ymin > spot.y)
	7323	+// {
	7324	+// CameraPane.Ymin = spot.y;
	7325	+// }
	7326	+// if (CameraPane.Ymax < spoth)
	7327	+// {
	7328	+// CameraPane.Ymax = spoth;
	7329	+// }
	7330	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7331	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7437	7332	//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		- }
	7333	+// if (CameraPane.Xmin > boundary.x)
	7334	+// {
	7335	+// CameraPane.Xmin = boundary.x;
	7336	+// }
	7337	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7338	+// {
	7339	+// CameraPane.Xmax = boundary.x + boundary.width;
	7340	+// }
	7341	+// if (CameraPane.Ymin > boundary.y)
	7342	+// {
	7343	+// CameraPane.Ymin = boundary.y;
	7344	+// }
	7345	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7346	+// {
	7347	+// CameraPane.Ymax = boundary.y + boundary.height;
	7348	+// }
7454	7349	return;
7455	7350	}
7456	7351	}
..	..	@@ -7467,7 +7362,7 @@
7467	7362	startX = info.x;
7468	7363	startY = info.y;
7469	7364
7470		- hitSomething = 0;
	7365	+ hitSomething = -1;
7471	7366	cVector origin = new cVector();
7472	7367	//LA.xformPos(origin, toParent, origin);
7473	7368	Rectangle spot = new Rectangle();
..	..	@@ -7500,7 +7395,7 @@
7500	7395	}
7501	7396
7502	7397	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7398	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7399	//System.out.println("modified = " + modified);
7505	7400	//new Exception().printStackTrace();
7506	7401	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7423,7 @@
7528	7423	return true;
7529	7424	}
7530	7425
7531		- void doEditDrag0(ClickInfo info)
	7426	+ void doEditDrag0(ClickInfo info, boolean opposite)
7532	7427	{
7533	7428	if (hitSomething == 0)
7534	7429	{
..	..	@@ -7543,6 +7438,7 @@
7543	7438	//System.out.println("hitSomething = " + hitSomething);
7544	7439
7545	7440	double scale = 0.005f * info.camera.Distance();
	7441	+
7546	7442	cVector xlate = new cVector();
7547	7443	//cVector xlate2 = new cVector();
7548	7444	switch (hitSomething)
..	..	@@ -7553,9 +7449,9 @@
7553	7449
7554	7450	case hitCenter: // Translate
7555	7451
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7452	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7453
7558		- if (modified)
	7454	+ if (modified \|\| opposite)
7559	7455	{
7560	7456	//assert(false);
7561	7457	/*
..	..	@@ -7601,10 +7497,10 @@
7601	7497	}
7602	7498	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7499	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7500	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7605	7501	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7606	7502	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7503	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7504	//LA.vecCross(up, cVector.Z, right2);
7609	7505
7610	7506	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7649,6 +7545,7 @@
7649	7545
7650	7546	if (modified)
7651	7547	{
	7548	+ // Rotate 90 degrees
7652	7549	angle /= (Math.PI / 4);
7653	7550	angle = Math.floor(angle + 0.5);
7654	7551	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7559,7 @@
7662	7559	}
7663	7560	/**/
7664	7561
7665		- switch (info.pane.renderCamera.viewCode)
	7562	+ switch (info.pane.RenderCamera().viewCode)
7666	7563	{
7667	7564	case 1: // '\001'
7668	7565	LA.matZRotate(toParent, angle);
..	..	@@ -7690,24 +7587,27 @@
7690	7587
7691	7588	case hitScale: // scale
7692	7589	double hScale = (double) (info.x - centerPt.x) / 32;
	7590	+ double sign = 1;
	7591	+ if (hScale < 0)
	7592	+ {
	7593	+ sign = -1;
	7594	+ }
	7595	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7596	if (hScale < 0.01)
7694	7597	{
7695		- hScale = 0.01;
	7598	+ //hScale = 0.01;
7696	7599	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
7699		- {
7700		- hScale = 0.01;
7701		- }
	7600	+
7702	7601	double vScale = (double) (info.y - centerPt.y) / 32;
7703		- if (vScale < 0.01)
	7602	+ sign = 1;
	7603	+ if (vScale < 0)
7704	7604	{
7705		- vScale = 0.01;
	7605	+ sign = -1;
7706	7606	}
7707		- vScale = Math.pow(vScale, scale * 50);
	7607	+ vScale = signMath.pow(signvScale, scale * 50);
7708	7608	if (vScale < 0.01)
7709	7609	{
7710		- vScale = 0.01;
	7610	+ //vScale = 0.01;
7711	7611	}
7712	7612	LA.matCopy(startMat, toParent);
7713	7613	/**/
..	..	@@ -7718,39 +7618,47 @@
7718	7618	}
7719	7619	/**/
7720	7620
7721		- switch (info.pane.renderCamera.viewCode)
	7621	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7622	+
	7623	+ if (totalScale < 0.01)
	7624	+ {
	7625	+ totalScale = 0.01;
	7626	+ }
	7627	+
	7628	+ switch (info.pane.RenderCamera().viewCode)
7722	7629	{
7723	7630	case 3: // '\001'
7724		- if (modified)
	7631	+ if (modified \|\| opposite)
7725	7632	{
7726	7633	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7634	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7635	} // vScale, 1);
7729	7636	else
7730	7637	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7638	+ // EXCEPTION!
	7639	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7640	} // vScale, 1);
7733	7641	break;
7734	7642
7735	7643	case 2: // '\002'
7736		- if (modified)
	7644	+ if (modified \|\| opposite)
7737	7645	{
7738	7646	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7647	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7648	} else
7741	7649	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7650	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7651	}
7744	7652	break;
7745	7653
7746	7654	case 1: // '\003'
7747		- if (modified)
	7655	+ if (modified \|\| opposite)
7748	7656	{
7749	7657	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7658	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7659	} else
7752	7660	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7661	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7662	}
7755	7663	break;
7756	7664	}
..	..	@@ -7883,14 +7791,22 @@
7883	7791	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7792	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7793	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7794	+
	7795	+ String objname;
	7796	+
7886	7797	if (false) //parent != null)
7887	7798	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7799	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7800	} else
7890	7801	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7802	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7803	} // + super.toString();
7893	7804	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7805	+
	7806	+ if (!Globals.ADVANCED)
	7807	+ return objname;
	7808	+
	7809	+ return objname + " " + System.identityHashCode(this);
7894	7810	}
7895	7811
7896	7812	public int hashCode()
..	..	@@ -7946,6 +7862,7 @@
7946	7862	objectUI.closeUI();
7947	7863	if (editWindow != null)
7948	7864	{
	7865	+ editWindow.ctrlPanel.FlushUI();
7949	7866	editWindow.refreshContents();
7950	7867	} // ? new
7951	7868	objectUI = null;
..	..	@@ -7954,6 +7871,10 @@
7954	7871	{
7955	7872	editWindow = null;
7956	7873	} // ?
	7874	+ }
	7875	+ else
	7876	+ {
	7877	+ //editWindow.closeUI();
7957	7878	}
7958	7879	}
7959	7880
..	..	@@ -7966,7 +7887,7 @@
7966	7887	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	7888
7968	7889	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	7890	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	7891
7971	7892	double[][] toParent; // dynamic matrix
7972	7893	double[][] fromParent;
..	..	@@ -8081,7 +8002,7 @@
8081	8002	{
8082	8003	assert(bRep != null);
8083	8004	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8005	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8006	}
8086	8007	else
8087	8008	{
..	..	@@ -8112,6 +8033,10 @@
8112	8033	}
8113	8034
8114	8035	transient ObjEditor editWindow;
	8036	+ transient ObjEditor manipWindow;
	8037	+
	8038	+ transient boolean pinned;
	8039	+
8115	8040	transient ObjectUI objectUI;
8116	8041	public static int povDepth = 0;
8117	8042	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8055,9 @@
8130	8055	private static cVector edge2 = new cVector();
8131	8056	//private static cVector norm = new cVector();
8132	8057	/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;
	8058	+ static final int hitCenter = 1;
	8059	+ static final int hitScale = 2;
	8060	+ static final int hitRotate = 3;
8136	8061	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8062	/transient/ private Point centerPt;
8138	8063	/transient/ private int startX;
..	..	@@ -8164,6 +8089,8 @@
8164	8089	{
8165	8090	Object3D targ = this;
8166	8091
	8092	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8093	+
8167	8094	if (obj.material != null)
8168	8095	{
8169	8096	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))