~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,173 @@
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	+
	223	+ if (this.support != null)
	224	+ {
	225	+ if (o.transientrep != null)
	226	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	227	+
	228	+ o.transientrep = this.support.bRep;
	229	+ this.support.bRep = null;
	230	+ }
	231	+
	232	+ // o.support = this.support;
	233	+ // o.fileparent = this.fileparent;
	234	+ // if (this.bRep != null)
	235	+ // o.bRep = this.bRep.support;
	236	+
	237	+ this.bRep = null;
	238	+ // if (this.bRep != null)
	239	+ // this.bRep.support = null;
	240	+ // this.support = null;
	241	+ // this.fileparent = null;
	242	+ }
	243	+
	244	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	245	+ {
	246	+ if (!hashtable.containsKey(GetUUID()))
	247	+ return;
	248	+
	249	+ Object3D o = hashtable.get(GetUUID());
	250	+
	251	+ RestoreBigData(o);
	252	+
	253	+ if (blockloop)
	254	+ return;
	255	+
116	256	blockloop = true;
117		- child.SaveSupports();
	257	+
	258	+ //hashtable.remove(GetUUID());
	259	+
	260	+ for (int i=0; i<Size(); i++)
	261	+ {
	262	+ get(i).RestoreBigData(hashtable);
	263	+ }
	264	+
118	265	blockloop = false;
119	266	}
120		-}
121	267
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)
	268	+ void RestoreBigData(Object3D o)
133	269	{
134		- bRep.RestoreSupports();
	270	+ this.bRep = o.bRep;
	271	+ if (this.support != null && o.transientrep != null)
	272	+ {
	273	+ this.support.bRep = o.transientrep;
	274	+ }
	275	+
	276	+ this.selection = o.selection;
	277	+// July 2019 if (this.bRep != null)
	278	+// this.bRep.support = o.transientrep;
	279	+ // this.support = o.support;
	280	+ // this.fileparent = o.fileparent;
135	281	}
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	282
148	283	// MOCAP SUPPORT
149	284	double tx,ty,tz,rx,ry,rz;
..	..	@@ -285,8 +420,8 @@
285	420	return parent.GetName() + "#";
286	421	}
287	422
288		- boolean timeline = false;
289	423	boolean live = false;
	424	+ boolean dontselect = false;
290	425	boolean hide = false;
291	426	boolean link2master = false; // performs reset support/master at each frame
292	427	boolean marked = false; // animation node
..	..	@@ -296,6 +431,8 @@
296	431	boolean random = false;
297	432	boolean speedup = false;
298	433	boolean rewind = false;
	434	+
	435	+ float NORMALPUSH = 0;
299	436
300	437	Object3D support;
301	438
..	..	@@ -416,16 +553,16 @@
416	553	{
417	554	Object3D copy = this;
418	555
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	556	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	557
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	558	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	559	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	560	+ parentcam = Globals.theRenderer.Cameras()[1];
424	561	}
425	562
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	563	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	564	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	565	+ parentcam = Globals.theRenderer.Cameras()[0];
429	566	}
430	567
431	568	if (this == parentcam)
..	..	@@ -433,7 +570,7 @@
433	570	//assert(this instanceof Camera);
434	571
435	572	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	573	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	574	}
438	575
439	576	copy.marked ^= true;
..	..	@@ -453,7 +590,7 @@
453	590	//assert(this instanceof Camera);
454	591
455	592	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	593	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	594	}
458	595
459	596	copy.Touch(); // display list issue
..	..	@@ -466,12 +603,14 @@
466	603	toParent = LA.newMatrix();
467	604	fromParent = LA.newMatrix();
468	605	}
	606	+
469	607	if (toParentMarked == null)
470	608	{
471	609	if (maxcount != 1)
472	610	{
473	611	new Exception().printStackTrace();
474	612	}
	613	+
475	614	toParentMarked = LA.newMatrix();
476	615	fromParentMarked = LA.newMatrix();
477	616	}
..	..	@@ -588,7 +727,7 @@
588	727	return;
589	728	}
590	729
591		- if (CameraPane.fromscript)
	730	+ if (Globals.fromscript)
592	731	{
593	732	transformcount = 0;
594	733	return;
..	..	@@ -746,7 +885,7 @@
746	885
747	886	int GetTransformCount()
748	887	{
749		- // marde pour serialization de Texture
	888	+ // patch pour serialization de Texture
750	889	resetmaxcount();
751	890	resettransformcount();
752	891	resetstep();
..	..	@@ -759,7 +898,7 @@
759	898	if (step == 0)
760	899	step = 1;
761	900	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	901	+ maxcount = 128; // 2048; // 4;
763	902	// if (acceleration == 0)
764	903	// acceleration = 10;
765	904	if (delay == 0) // serial
..	..	@@ -780,9 +919,12 @@
780	919	// factor = CameraPane.STEP;
781	920	// }
782	921
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	922	+ if (marked && Globals.isLIVE() && live &&
	923	+ //TEMP21aug2018
	924	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	925	+ currentframe != Globals.framecount)
784	926	{
785		- currentframe = CameraPane.framecount;
	927	+ currentframe = Globals.framecount;
786	928
787	929	// System.err.println("transformcount = " + transformcount);
788	930	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +933,8 @@
791	933
792	934	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	935
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	936	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	937	+ (step == 1 && changedir))
795	938	{
796	939	countdown = 1;
797	940	delay = speedup?8:1;
..	..	@@ -863,6 +1006,7 @@
863	1006	if (material == null \|\| material.multiply)
864	1007	return true;
865	1008
	1009	+ // Transparent objects are dynamic because we have to sort the triangles.
866	1010	return material.opacity > 0.99;
867	1011	}
868	1012
..	..	@@ -894,6 +1038,11 @@
894	1038	fromParent = null; // LA.newMatrix();
895	1039	bRep = null; // new BoundaryRep();
896	1040
	1041	+ if (oname != null && oname.equals("LeftHand"))
	1042	+ {
	1043	+ name = oname;
	1044	+ }
	1045	+
897	1046	/*
898	1047	float hue = (float)Math.random();
899	1048	Color col;
..	..	@@ -936,7 +1085,7 @@
936	1085
937	1086	public Object clone()
938	1087	{
939		- return GrafreeD.clone(this);
	1088	+ return Grafreed.clone(this);
940	1089	}
941	1090
942	1091	Object3D copyExpand()
..	..	@@ -1258,6 +1407,7 @@
1258	1407	toParent = LA.newMatrix();
1259	1408	fromParent = LA.newMatrix();
1260	1409	}
	1410	+
1261	1411	LA.matCopy(other.toParent, toParent);
1262	1412	LA.matCopy(other.fromParent, fromParent);
1263	1413
..	..	@@ -1452,7 +1602,7 @@
1452	1602	BoundaryRep.SEUIL = other.material.cameralight;
1453	1603
1454	1604	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1605	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1606	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1607	}
1458	1608
..	..	@@ -1711,7 +1861,7 @@
1711	1861	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1862	o.bRep = transientrep;
1713	1863	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1864	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1865	o.CreateMaterial();
1716	1866	o.SetAttributes(this, -1);
1717	1867	//parent
..	..	@@ -1724,7 +1874,7 @@
1724	1874	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1875	o.bRep = bRep;
1726	1876	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1877	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1878	o.CreateMaterial();
1729	1879	//o.overwriteThis(this, -1);
1730	1880	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1961,15 @@
1811	1961	if (obj.name == null)
1812	1962	continue; // can't be a null one
1813	1963
	1964	+ // Try perfect match first.
1814	1965	if (n.equals(obj.name))
1815	1966	{
1816	1967	theobj = obj;
1817	1968	count++;
1818	1969	}
1819	1970	}
	1971	+
	1972	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	1973
1821	1974	if (count != 1)
1822	1975	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2284,8 @@
2131	2284	if (/parent != null &&/ material == null)
2132	2285	{
2133	2286	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
	2287	+
	2288	+ InitOthers();
2143	2289
2144	2290	if (this instanceof Camera)
2145	2291	{
..	..	@@ -2283,12 +2429,17 @@
2283	2429	}
2284	2430	*/
2285	2431	}
	2432	+ else
	2433	+ {
	2434	+ //((ObjEditor)editWindow).SetupUI2(null);
	2435	+ }
2286	2436	}
2287	2437
2288	2438	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2439	{
2290	2440	if (newWindow)
2291	2441	{
	2442	+ new Exception().printStackTrace();
2292	2443	System.exit(0);
2293	2444	if (parent != null)
2294	2445	{
..	..	@@ -2323,6 +2474,14 @@
2323	2474	{
2324	2475	editWindow.refreshContents();
2325	2476	}
	2477	+ else
	2478	+ {
	2479	+ if (manipWindow != null)
	2480	+ {
	2481	+ manipWindow.refreshContents();
	2482	+ }
	2483	+ }
	2484	+
2326	2485	//if (parent != null)
2327	2486	//parent.refreshEditWindow();
2328	2487	}
..	..	@@ -2465,13 +2624,13 @@
2465	2624	return retval;
2466	2625	}
2467	2626
2468		- void doEditDrag(ClickInfo info)
	2627	+ void doEditDrag(ClickInfo info, boolean opposite)
2469	2628	{
2470	2629	switch (doSomething)
2471	2630	{
2472	2631	case 1: // '\001'
2473	2632	//super.
2474		- doEditDrag0(info);
	2633	+ doEditDrag0(info, opposite);
2475	2634	break;
2476	2635
2477	2636	case 2: // '\002'
..	..	@@ -2484,11 +2643,11 @@
2484	2643	{
2485	2644	//sel.hitSomething = childToDrag.hitSomething;
2486	2645	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2646	+ sel.doEditDrag(info, opposite);
2488	2647	} else
2489	2648	{
2490	2649	//super.
2491		- doEditDrag0(info);
	2650	+ doEditDrag0(info, opposite);
2492	2651	}
2493	2652	}
2494	2653	break;
..	..	@@ -2598,6 +2757,18 @@
2598	2757	void GenNormalsS(boolean crease)
2599	2758	{
2600	2759	selection.GenNormals(crease);
	2760	+// for (int i=0; i<selection.size(); i++)
	2761	+// {
	2762	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2763	+// selectee.GenNormals(crease);
	2764	+// }
	2765	+
	2766	+ //Touch();
	2767	+ }
	2768	+
	2769	+ void GenNormalsMeshS()
	2770	+ {
	2771	+ selection.GenNormalsMesh();
2601	2772	// for (int i=0; i<selection.size(); i++)
2602	2773	// {
2603	2774	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2909,24 @@
2738	2909	if (child == null)
2739	2910	continue;
2740	2911	child.GenNormals(crease);
	2912	+// Children().release(i);
	2913	+ }
	2914	+ blockloop = false;
	2915	+ }
	2916	+
	2917	+ void GenNormalsMesh()
	2918	+ {
	2919	+ if (blockloop)
	2920	+ return;
	2921	+
	2922	+ blockloop = true;
	2923	+ GenNormalsMesh0();
	2924	+ for (int i = 0; i < Children().Size(); i++)
	2925	+ {
	2926	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2927	+ if (child == null)
	2928	+ continue;
	2929	+ child.GenNormalsMesh();
2741	2930	// Children().release(i);
2742	2931	}
2743	2932	blockloop = false;
..	..	@@ -2895,7 +3084,8 @@
2895	3084	{
2896	3085	if (bRep != null)
2897	3086	{
2898		- bRep.GenUV();
	3087	+ bRep.GenUV(); //1);
	3088	+ //bRep.UnfoldUV();
2899	3089	Touch();
2900	3090	}
2901	3091	}
..	..	@@ -2905,6 +3095,15 @@
2905	3095	if (bRep != null)
2906	3096	{
2907	3097	bRep.GenerateNormals(crease);
	3098	+ Touch();
	3099	+ }
	3100	+ }
	3101	+
	3102	+ void GenNormalsMesh0()
	3103	+ {
	3104	+ if (bRep != null)
	3105	+ {
	3106	+ bRep.GenerateNormalsMesh();
2908	3107	Touch();
2909	3108	}
2910	3109	}
..	..	@@ -2970,6 +3169,33 @@
2970	3169	blockloop = false;
2971	3170	}
2972	3171
	3172	+ void TransformChildren()
	3173	+ {
	3174	+ if (toParent != null)
	3175	+ {
	3176	+ for (int i=Size(); --i>=0;)
	3177	+ {
	3178	+ Object3D v = get(i);
	3179	+
	3180	+ if (v.toParent == null)
	3181	+ {
	3182	+ v.toParent = LA.newMatrix();
	3183	+ v.fromParent = LA.newMatrix();
	3184	+ }
	3185	+
	3186	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3187	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3188	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3189	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3190	+ }
	3191	+
	3192	+ toParent = null; // LA.matIdentity(toParent);
	3193	+ fromParent = null; // LA.matIdentity(fromParent);
	3194	+
	3195	+ Touch();
	3196	+ }
	3197	+ }
	3198	+
2973	3199	void TransformGeometry()
2974	3200	{
2975	3201	Object3D obj = this;
..	..	@@ -3191,9 +3417,11 @@
3191	3417
3192	3418	BoundaryRep sup = bRep.support;
3193	3419	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3420	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3421	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3422	+
	3423	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3424	+
3197	3425	bRep = temprep;
3198	3426	bRep.support = sup;
3199	3427	Touch();
..	..	@@ -3330,7 +3558,8 @@
3330	3558	if (blockloop)
3331	3559	return;
3332	3560
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3561	+ if (//marked \|\| // does not make sense
	3562	+ (bRep != null \|\| material != null)) // borderline...
3334	3563	live = h;
3335	3564
3336	3565	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3580,8 @@
3351	3580	return;
3352	3581
3353	3582	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3355	3585	link2master = h;
3356	3586
3357	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3601,8 @@
3371	3601	if (blockloop)
3372	3602	return;
3373	3603
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3604	+ if (//marked \|\| // does not make sense
	3605	+ (bRep != null \|\| material != null)) // borderline...
3375	3606	hide = h;
3376	3607
3377	3608	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3622,7 @@
3391	3622	if (blockloop)
3392	3623	return;
3393	3624
3394		- if (bRep != null && material != null) // borderline...
	3625	+ if (bRep != null \|\| material != null) // borderline...
3395	3626	marked = h;
3396	3627
3397	3628	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3632,46 @@
3401	3632	continue;
3402	3633	blockloop = true;
3403	3634	child.MarkLeaves(h);
	3635	+ blockloop = false;
	3636	+ // release(i);
	3637	+ }
	3638	+ }
	3639	+
	3640	+ void RewindLeaves(boolean h)
	3641	+ {
	3642	+ if (blockloop)
	3643	+ return;
	3644	+
	3645	+ if (bRep != null \|\| material != null) // borderline...
	3646	+ rewind = h;
	3647	+
	3648	+ for (int i = 0; i < Size(); i++)
	3649	+ {
	3650	+ Object3D child = (Object3D) get(i); // reserve(i);
	3651	+ if (child == null)
	3652	+ continue;
	3653	+ blockloop = true;
	3654	+ child.RewindLeaves(h);
	3655	+ blockloop = false;
	3656	+ // release(i);
	3657	+ }
	3658	+ }
	3659	+
	3660	+ void RandomLeaves(boolean h)
	3661	+ {
	3662	+ if (blockloop)
	3663	+ return;
	3664	+
	3665	+ if (bRep != null \|\| material != null) // borderline...
	3666	+ random = h;
	3667	+
	3668	+ for (int i = 0; i < Size(); i++)
	3669	+ {
	3670	+ Object3D child = (Object3D) get(i); // reserve(i);
	3671	+ if (child == null)
	3672	+ continue;
	3673	+ blockloop = true;
	3674	+ child.RandomLeaves(h);
3404	3675	blockloop = false;
3405	3676	// release(i);
3406	3677	}
..	..	@@ -3715,7 +3986,7 @@
3715	3986	if (child == null)
3716	3987	continue;
3717	3988
3718		- if (GrafreeD.RENDERME > 0)
	3989	+ if (Grafreed.RENDERME > 0)
3719	3990	{
3720	3991	if (child instanceof Merge)
3721	3992	((Merge)child).renderme();
..	..	@@ -3866,7 +4137,7 @@
3866	4137	if (child == null)
3867	4138	continue;
3868	4139
3869		- if (GrafreeD.RENDERME > 0)
	4140	+ if (Grafreed.RENDERME > 0)
3870	4141	{
3871	4142	if (child instanceof Merge)
3872	4143	((Merge)child).renderme();
..	..	@@ -4061,7 +4332,7 @@
4061	4332	if (child == null)
4062	4333	continue;
4063	4334
4064		- if (GrafreeD.RENDERME > 0)
	4335	+ if (Grafreed.RENDERME > 0)
4065	4336	{
4066	4337	if (child instanceof Merge)
4067	4338	((Merge)child).renderme();
..	..	@@ -4158,6 +4429,71 @@
4158	4429	}
4159	4430	blockloop = true;
4160	4431	get(i).RepairParent();
	4432	+ blockloop = false;
	4433	+ }
	4434	+ }
	4435	+
	4436	+ void RepairShadow()
	4437	+ {
	4438	+ if (blockloop)
	4439	+ return;
	4440	+
	4441	+ if (this.material != null)
	4442	+ this.InitOthers();
	4443	+
	4444	+ for (int i=0; i<Size(); i++)
	4445	+ {
	4446	+ blockloop = true;
	4447	+ get(i).RepairShadow();
	4448	+ blockloop = false;
	4449	+ }
	4450	+ }
	4451	+
	4452	+ void RepairSOV()
	4453	+ {
	4454	+ if (blockloop)
	4455	+ return;
	4456	+
	4457	+ String texname = this.GetPigmentTexture();
	4458	+
	4459	+ if (texname.startsWith("sov"))
	4460	+ {
	4461	+ String[] s = texname.split("/");
	4462	+
	4463	+ String[] sname = s[1].split("Color.pn");
	4464	+
	4465	+ texname = sname[0];
	4466	+
	4467	+ if (sname.length > 1)
	4468	+ {
	4469	+ texname += "Color.jpg";
	4470	+ }
	4471	+
	4472	+ this.SetPigmentTexture("sov/" + texname);
	4473	+ }
	4474	+
	4475	+ texname = this.GetBumpTexture();
	4476	+
	4477	+ if (texname.startsWith("sov"))
	4478	+ {
	4479	+ String[] s = texname.split("/");
	4480	+
	4481	+ String[] sname = s[1].split("Bump.pn");
	4482	+
	4483	+ texname = sname[0];
	4484	+
	4485	+ if (sname.length > 1)
	4486	+ {
	4487	+ texname += "Bump.jpg";
	4488	+ }
	4489	+
	4490	+ this.SetBumpTexture("sov/" + texname);
	4491	+ }
	4492	+
	4493	+ for (int i=0; i<Size(); i++)
	4494	+ {
	4495	+ blockloop = true;
	4496	+ get(i).RepairSOV();
4161	4497	blockloop = false;
4162	4498	}
4163	4499	}
..	..	@@ -4652,7 +4988,7 @@
4652	4988
4653	4989	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	4990	{
4655		- if (hide)
	4991	+ if (hide \|\| dontselect)
4656	4992	return null;
4657	4993
4658	4994	if (count <= 0)
..	..	@@ -4676,9 +5012,17 @@
4676	5012	}
4677	5013	}
4678	5014
	5015	+ ObjEditor GetWindow()
	5016	+ {
	5017	+ if (editWindow != null)
	5018	+ return editWindow;
	5019	+
	5020	+ return manipWindow;
	5021	+ }
	5022	+
4679	5023	cTreePath Select(int indexcount, boolean deselect)
4680	5024	{
4681		- if (hide)
	5025	+ if (hide \|\| dontselect)
4682	5026	return null;
4683	5027
4684	5028	if (count <= 0)
..	..	@@ -4712,10 +5056,11 @@
4712	5056	if (leaf != null)
4713	5057	{
4714	5058	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5059	+ ObjEditor window = GetWindow();
	5060	+ if (window != null)
4716	5061	{
4717	5062	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5063	+ window.Select(tp, deselect, true);
4719	5064	}
4720	5065
4721	5066	return tp;
..	..	@@ -4732,6 +5077,7 @@
4732	5077
4733	5078	if (child == null)
4734	5079	continue;
	5080	+
4735	5081	if (child.HasTransparency() && child.size() != 0)
4736	5082	{
4737	5083	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5087,10 @@
4741	5087	if (leaf != null)
4742	5088	{
4743	5089	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5090	+ ObjEditor window = GetWindow();
	5091	+ if (window != null)
4745	5092	{
4746		- editWindow.Select(tp, deselect, true);
	5093	+ window.Select(tp, deselect, true);
4747	5094	}
4748	5095
4749	5096	return tp;
..	..	@@ -4828,7 +5175,7 @@
4828	5175	return globalTransform;
4829	5176	}
4830	5177
4831		- void PreprocessOcclusion(CameraPane cp)
	5178	+ void PreprocessOcclusion(iCameraPane cp)
4832	5179	{
4833	5180	/*
4834	5181	if (AOdone)
..	..	@@ -4975,7 +5322,8 @@
4975	5322	} else //
4976	5323	if (editWindow != null)
4977	5324	{
4978		- editWindow.cameraView.lighttouched = true;
	5325	+ //editWindow.cameraView.lighttouched = true;
	5326	+ Globals.lighttouched = true;
4979	5327	}
4980	5328	}
4981	5329
..	..	@@ -5129,10 +5477,34 @@
5129	5477
5130	5478	// System.out.println("Fullname = " + fullname);
5131	5479
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5480	+ // Does not work on Windows due to C:
	5481	+// if (fullname.name.indexOf(":") == -1)
	5482	+// return fullname.name;
	5483	+//
	5484	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5485
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5486	+ String[] split = fullname.name.split(":");
	5487	+
	5488	+ if (split.length == 0)
	5489	+ {
	5490	+ return "";
	5491	+ }
	5492	+
	5493	+ if (split.length <= 2)
	5494	+ {
	5495	+ if (fullname.name.endsWith(":"))
	5496	+ {
	5497	+ // Windows
	5498	+ return fullname.name.substring(0, fullname.name.length()-1);
	5499	+ }
	5500	+
	5501	+ return split[0];
	5502	+ }
	5503	+
	5504	+ // Windows
	5505	+ assert(split.length == 4);
	5506	+
	5507	+ return split[0] + ":" + split[1];
5136	5508	}
5137	5509
5138	5510	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5513,38 @@
5141	5513	return "";
5142	5514
5143	5515	// 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());
	5516	+ // Does not work on Windows due to C:
	5517	+// if (fullname.name.indexOf(":") == -1)
	5518	+// return "";
	5519	+//
	5520	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5521	+ String[] split = fullname.name.split(":");
	5522	+
	5523	+ if (split.length == 0)
	5524	+ {
	5525	+ return "";
	5526	+ }
	5527	+
	5528	+ if (split.length == 1)
	5529	+ {
	5530	+ return "";
	5531	+ }
	5532	+
	5533	+ if (split.length == 2)
	5534	+ {
	5535	+ if (fullname.name.endsWith(":"))
	5536	+ {
	5537	+ // Windows
	5538	+ return "";
	5539	+ }
	5540	+
	5541	+ return split[1];
	5542	+ }
	5543	+
	5544	+ // Windows
	5545	+ assert(split.length == 4);
	5546	+
	5547	+ return split[2] + ":" + split[3];
5148	5548	}
5149	5549
5150	5550	String GetPigmentTexture()
..	..	@@ -5218,7 +5618,7 @@
5218	5618	System.out.print("; textures = " + textures);
5219	5619	System.out.println("; usedtextures = " + usedtextures);
5220	5620
5221		- if (GetTextures() == null)
	5621	+ if (GetTextures() == null) // What is that??
5222	5622	GetTextures().name = ":";
5223	5623
5224	5624	String texname = tex;
..	..	@@ -5249,6 +5649,43 @@
5249	5649	child.ResetPigmentTexture();
5250	5650	blockloop = false;
5251	5651	}
	5652	+ }
	5653	+
	5654	+ UUID GetUUID()
	5655	+ {
	5656	+ if (uuid == null)
	5657	+ {
	5658	+ // Serial
	5659	+ uuid = UUID.randomUUID();
	5660	+ }
	5661	+
	5662	+ return uuid;
	5663	+ }
	5664	+
	5665	+ Object3D GetObject(UUID uid)
	5666	+ {
	5667	+ if (blockloop)
	5668	+ return null;
	5669	+
	5670	+ if (GetUUID().equals(uid))
	5671	+ return this;
	5672	+
	5673	+ int nb = Size();
	5674	+ for (int i = 0; i < nb; i++)
	5675	+ {
	5676	+ Object3D child = (Object3D) get(i);
	5677	+
	5678	+ if (child == null)
	5679	+ continue;
	5680	+
	5681	+ blockloop = true;
	5682	+ Object3D obj = child.GetObject(uid);
	5683	+ blockloop = false;
	5684	+ if (obj != null)
	5685	+ return obj;
	5686	+ }
	5687	+
	5688	+ return null;
5252	5689	}
5253	5690
5254	5691	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5724,33 @@
5287	5724	}
5288	5725	}
5289	5726
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5727	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5728	{
5292	5729	Draw(display, root, selected, blocked);
5293	5730	}
5294	5731
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5732	boolean NeedSupport()
5300	5733	{
5301	5734	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5735	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5736	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5737	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5738	}
5306	5739
	5740	+ static boolean DEBUG_SELECTION = false;
5307	5741
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5742	+ boolean IsLive()
	5743	+ {
	5744	+ if (live)
	5745	+ return true;
	5746	+
	5747	+ if (parent == null)
	5748	+ return false;
	5749	+
	5750	+ return parent.IsLive();
	5751	+ }
	5752	+
	5753	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5754	{
5310	5755	Invariants(); // june 2013
5311	5756
..	..	@@ -5314,8 +5759,8 @@
5314	5759	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5760	}
5316	5761
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5762	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5763	+ (hide \|\| dontselect))
5319	5764	return;
5320	5765
5321	5766	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5778,7 @@
5333	5778	if (this instanceof Checker)
5334	5779	return;
5335	5780
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5781	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5782	return;
5338	5783
5339	5784	if (count <= 0)
..	..	@@ -5341,13 +5786,13 @@
5341	5786	return;
5342	5787	}
5343	5788
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5789	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5790	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5791	{
5347	5792	return;
5348	5793	}
5349	5794
5350		- javax.media.opengl.GL gl = display.GetGL();
	5795	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5796
5352	5797	/*
5353	5798	if (touched)
..	..	@@ -5366,7 +5811,7 @@
5366	5811	support = support;
5367	5812
5368	5813	//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);
	5814	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5370	5815
5371	5816	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5817	{
..	..	@@ -5383,15 +5828,17 @@
5383	5828
5384	5829	boolean compiled = false;
5385	5830
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5831	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5832
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5833	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5834	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5835	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5836	{
5391		- display.lighttouched = true;
	5837	+ Globals.lighttouched = true;
5392	5838	} // 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 &&
	5839	+
	5840	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5841	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5842	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5843	{
5397	5844	if (!(this instanceof Composite))
..	..	@@ -5399,7 +5846,7 @@
5399	5846	//if (displaylist == -1 && usecalllists)
5400	5847	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5401	5848	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5849	+ bRep.displaylist = display.GenList();
5403	5850	assert(bRep.displaylist != 0);
5404	5851	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5852	//System.out.println("\tgen list " + list);
..	..	@@ -5411,18 +5858,20 @@
5411	5858	if (usecalllists)
5412	5859	{
5413	5860	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5861	+ display.NewList(bRep.displaylist);
5415	5862	}
	5863	+
5416	5864	CallList(display, root, selected, blocked);
	5865	+
5417	5866	// compiled = true;
5418	5867	if (usecalllists)
5419	5868	{
5420	5869	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5870	+ display.EndList();
5422	5871	}
5423	5872	//gl.glDrawBuffer(gl.GL_BACK);
5424	5873	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	5874	+ Globals.lighttouched = true; // all panes...
5426	5875	}
5427	5876
5428	5877	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +5910,12 @@
5461	5910
5462	5911	// frustum culling
5463	5912	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	5913	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	5914	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	5915	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	5916	{
5468	5917	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5918	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	5919	{
5471	5920	//System.out.print("CULLED");
5472	5921	culled = true;
..	..	@@ -5474,7 +5923,7 @@
5474	5923	}
5475	5924	else
5476	5925	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5926	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	5927	culled = true;
5479	5928
5480	5929	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +5959,12 @@
5510	5959
5511	5960
5512	5961	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5962	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	5963	{
5515	5964	if (GetBRep() != null)
5516	5965	{
5517		- CameraPane.NextIndex(this, gl);
	5966	+ display.NextIndex();
	5967	+
5518	5968	// vertex color conflict : gl.glCallList(list);
5519	5969	DrawNode(display, root, selected);
5520	5970	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +5986,7 @@
5536	5986	color[2] /= 2;
5537	5987	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	5988	*/
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		- }
	5989	+ display.PushMaterial(this, selected);
5588	5990
5589	5991	//System.out.println("call list " + list);
5590	5992	//System.out.println();
..	..	@@ -5603,7 +6005,28 @@
5603	6005	tex = GetTextures();
5604	6006	}
5605	6007
5606		- display.BindTextures(tex, texres);
	6008	+ boolean failedPigment = false;
	6009	+ boolean failedBump = false;
	6010	+
	6011	+ try
	6012	+ {
	6013	+ display.BindPigmentTexture(tex, texres);
	6014	+ }
	6015	+ catch (Exception e)
	6016	+ {
	6017	+ System.err.println("FAILED: " + this);
	6018	+ failedPigment = true;
	6019	+ }
	6020	+
	6021	+ try
	6022	+ {
	6023	+ display.BindBumpTexture(tex, texres);
	6024	+ }
	6025	+ catch (Exception e)
	6026	+ {
	6027	+ //System.err.println("FAILED: " + this);
	6028	+ failedBump = true;
	6029	+ }
5607	6030
5608	6031	if (!compiled)
5609	6032	{
..	..	@@ -5619,30 +6042,19 @@
5619	6042
5620	6043	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6044	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6045	+ display.CallList(bRep.displaylist);
5623	6046	// june 2013 drawSelf(display, root, selected);
5624	6047	}
5625	6048	}
5626	6049	}
5627	6050
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		- }
	6051	+ if (!failedBump)
	6052	+ display.ReleaseBumpTexture(tex);
	6053	+
	6054	+ if (!failedPigment)
	6055	+ display.ReleasePigmentTexture(tex);
	6056	+
	6057	+ display.PopMaterial(this, selected);
5646	6058	}
5647	6059
5648	6060	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6096,7 @@
5684	6096	// resetMasterNode();
5685	6097	}
5686	6098
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6099	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6100	{
5689	6101	if (GetBRep() == null)
5690	6102	{
..	..	@@ -5767,8 +6179,11 @@
5767	6179	boolean flipV = false; // true;
5768	6180	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6181
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6182	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6183	{
	6184	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6185	+ return;
	6186	+
5772	6187	if (hide)
5773	6188	return;
5774	6189	// shadow optimisation
..	..	@@ -5826,16 +6241,7 @@
5826	6241	// // ??????????????????????????? Touch();
5827	6242	// }
5828	6243
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		- }
	6244	+display.PushMaterial2(this, selected);
5839	6245
5840	6246	Object3D child;
5841	6247	boolean sel;
..	..	@@ -5887,19 +6293,7 @@
5887	6293	*/
5888	6294	//depth += 1;
5889	6295
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		-
	6296	+display.PopMaterial2(this);
5903	6297	/*
5904	6298	display.ReleaseTextures(tex);
5905	6299	*/
..	..	@@ -5910,10 +6304,13 @@
5910	6304
5911	6305	//static cVector min,max;
5912	6306
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6307	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6308	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6309	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6310	return; // no shadow for transparent objects
	6311	+
	6312	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6313	+ return;
5917	6314
5918	6315	if (hide)
5919	6316	return;
..	..	@@ -5955,11 +6352,12 @@
5955	6352	return;
5956	6353	}
5957	6354
	6355	+ //bRep.GenUV(1/material.diffuseness);
5958	6356	// bRep.lock = true;
5959	6357
5960		- javax.media.opengl.GL gl = display.GetGL();
	6358	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6359
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6360	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6361	{
5964	6362	int fc = bRep.FaceCount();
5965	6363	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6372,7 @@
5974	6372
5975	6373	bRep.getMinMax(min, max, 100);
5976	6374
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();
	6375	+ display.DrawBox(min, max);
5994	6376
5995	6377	return;
5996	6378	}
..	..	@@ -6034,7 +6416,7 @@
6034	6416	{
6035	6417	//throw new Error();
6036	6418
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6419	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6420
6039	6421	int[] strips = bRep.getRawIndices();
6040	6422
..	..	@@ -6044,178 +6426,19 @@
6044	6426	new Exception().printStackTrace();
6045	6427	return;
6046	6428	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6429	+
	6430	+ if (dontselect)
6050	6431	{
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;
	6432	+ //bRep.GenerateNormalsMINE();
6182	6433	}
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		- }
	6434	+
	6435	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6436	} else // catch (Error e)
6214	6437	{
6215	6438	// TRIANGLE ARRAY
6216	6439	if (IsOpaque()) // Static())
6217	6440	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6441	+ display.StartTriangles();
6219	6442	int facecount = bRep.FaceCount();
6220	6443	for (int i = 0; i < facecount; i++)
6221	6444	{
..	..	@@ -6278,9 +6501,9 @@
6278	6501	// // r.norm.dot(v3) > -0.5)
6279	6502	// // continue;
6280	6503
6281		- drawFace(p, q, r, display, face);
	6504	+ display.DrawFace(this, p, q, r, face);
6282	6505	}
6283		- gl.glEnd();
	6506	+ display.EndTriangles();
6284	6507	}
6285	6508	else
6286	6509	{
..	..	@@ -6309,8 +6532,8 @@
6309	6532	//System.out.println("SORT");
6310	6533
6311	6534	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6535	+
	6536	+ display.StartTriangles();
6314	6537	for (int i = 0; i < facecount; i++)
6315	6538	{
6316	6539	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6545,14 @@
6322	6545	Vertex q = bRep.GetVertex(face.q);
6323	6546	Vertex r = bRep.GetVertex(face.r);
6324	6547
6325		- drawFace(p, q, r, display, face);
	6548	+ display.DrawFace(this, p, q, r, face);
6326	6549	}
6327		- gl.glEnd();
	6550	+ display.EndTriangles();
6328	6551	}
6329	6552
6330	6553	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6554	{
	6555	+ /*
6332	6556	gl.glDisable(gl.GL_LIGHTING);
6333	6557	float[] colorV = new float[3];
6334	6558
..	..	@@ -6407,6 +6631,7 @@
6407	6631	// gl.glEnd();
6408	6632	}
6409	6633	}
	6634	+ */
6410	6635	}
6411	6636	}
6412	6637
..	..	@@ -6451,7 +6676,7 @@
6451	6676	center.add(r);
6452	6677	center.mul(1.0/3);
6453	6678
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6679	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6680
6456	6681	distance = center.dot(center);
6457	6682	}
..	..	@@ -6462,347 +6687,11 @@
6462	6687
6463	6688	transient FaceCompare[] facescompare = null;
6464	6689
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	6690	void Print(Vertex v)
6640	6691	{
6641	6692	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6693	}
6643	6694
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	6695	void drawSelf(ClickInfo info, int level, boolean select)
6807	6696	{
6808	6697	if (bRep == null)
..	..	@@ -7374,83 +7263,84 @@
7374	7263	int spotw = spot.x + spot.width;
7375	7264	int spoth = spot.y + spot.height;
7376	7265	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		- }
	7266	+// if (CameraPane.Xmin > spot.x)
	7267	+// {
	7268	+// CameraPane.Xmin = spot.x;
	7269	+// }
	7270	+// if (CameraPane.Xmax < spotw)
	7271	+// {
	7272	+// CameraPane.Xmax = spotw;
	7273	+// }
	7274	+// if (CameraPane.Ymin > spot.y)
	7275	+// {
	7276	+// CameraPane.Ymin = spot.y;
	7277	+// }
	7278	+// if (CameraPane.Ymax < spoth)
	7279	+// {
	7280	+// CameraPane.Ymax = spoth;
	7281	+// }
7393	7282	spot.translate(32, 32);
7394	7283	spotw = spot.x + spot.width;
7395	7284	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
	7285	+ info.g.setColor(Color.cyan);
7397	7286	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);
	7287	+// if (CameraPane.Xmin > spot.x)
	7288	+// {
	7289	+// CameraPane.Xmin = spot.x;
	7290	+// }
	7291	+// if (CameraPane.Xmax < spotw)
	7292	+// {
	7293	+// CameraPane.Xmax = spotw;
	7294	+// }
	7295	+// if (CameraPane.Ymin > spot.y)
	7296	+// {
	7297	+// CameraPane.Ymin = spot.y;
	7298	+// }
	7299	+// if (CameraPane.Ymax < spoth)
	7300	+// {
	7301	+// CameraPane.Ymax = spoth;
	7302	+// }
	7303	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7304	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7416	7305	spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
	7306	+ info.g.setColor(Color.yellow);
7418	7307	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);
	7308	+ info.g.setColor(Color.green);
	7309	+// if (CameraPane.Xmin > spot.x)
	7310	+// {
	7311	+// CameraPane.Xmin = spot.x;
	7312	+// }
	7313	+// if (CameraPane.Xmax < spotw)
	7314	+// {
	7315	+// CameraPane.Xmax = spotw;
	7316	+// }
	7317	+// if (CameraPane.Ymin > spot.y)
	7318	+// {
	7319	+// CameraPane.Ymin = spot.y;
	7320	+// }
	7321	+// if (CameraPane.Ymax < spoth)
	7322	+// {
	7323	+// CameraPane.Ymax = spoth;
	7324	+// }
	7325	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7326	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7437	7327	//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		- }
	7328	+// if (CameraPane.Xmin > boundary.x)
	7329	+// {
	7330	+// CameraPane.Xmin = boundary.x;
	7331	+// }
	7332	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7333	+// {
	7334	+// CameraPane.Xmax = boundary.x + boundary.width;
	7335	+// }
	7336	+// if (CameraPane.Ymin > boundary.y)
	7337	+// {
	7338	+// CameraPane.Ymin = boundary.y;
	7339	+// }
	7340	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7341	+// {
	7342	+// CameraPane.Ymax = boundary.y + boundary.height;
	7343	+// }
7454	7344	return;
7455	7345	}
7456	7346	}
..	..	@@ -7467,7 +7357,7 @@
7467	7357	startX = info.x;
7468	7358	startY = info.y;
7469	7359
7470		- hitSomething = 0;
	7360	+ hitSomething = -1;
7471	7361	cVector origin = new cVector();
7472	7362	//LA.xformPos(origin, toParent, origin);
7473	7363	Rectangle spot = new Rectangle();
..	..	@@ -7500,7 +7390,7 @@
7500	7390	}
7501	7391
7502	7392	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7393	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7394	//System.out.println("modified = " + modified);
7505	7395	//new Exception().printStackTrace();
7506	7396	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7418,7 @@
7528	7418	return true;
7529	7419	}
7530	7420
7531		- void doEditDrag0(ClickInfo info)
	7421	+ void doEditDrag0(ClickInfo info, boolean opposite)
7532	7422	{
7533	7423	if (hitSomething == 0)
7534	7424	{
..	..	@@ -7543,6 +7433,7 @@
7543	7433	//System.out.println("hitSomething = " + hitSomething);
7544	7434
7545	7435	double scale = 0.005f * info.camera.Distance();
	7436	+
7546	7437	cVector xlate = new cVector();
7547	7438	//cVector xlate2 = new cVector();
7548	7439	switch (hitSomething)
..	..	@@ -7553,9 +7444,9 @@
7553	7444
7554	7445	case hitCenter: // Translate
7555	7446
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7447	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7448
7558		- if (modified)
	7449	+ if (modified \|\| opposite)
7559	7450	{
7560	7451	//assert(false);
7561	7452	/*
..	..	@@ -7601,10 +7492,10 @@
7601	7492	}
7602	7493	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7494	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7495	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7605	7496	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7606	7497	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7498	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7499	//LA.vecCross(up, cVector.Z, right2);
7609	7500
7610	7501	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7649,6 +7540,7 @@
7649	7540
7650	7541	if (modified)
7651	7542	{
	7543	+ // Rotate 90 degrees
7652	7544	angle /= (Math.PI / 4);
7653	7545	angle = Math.floor(angle + 0.5);
7654	7546	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7554,7 @@
7662	7554	}
7663	7555	/**/
7664	7556
7665		- switch (info.pane.renderCamera.viewCode)
	7557	+ switch (info.pane.RenderCamera().viewCode)
7666	7558	{
7667	7559	case 1: // '\001'
7668	7560	LA.matZRotate(toParent, angle);
..	..	@@ -7690,24 +7582,27 @@
7690	7582
7691	7583	case hitScale: // scale
7692	7584	double hScale = (double) (info.x - centerPt.x) / 32;
	7585	+ double sign = 1;
	7586	+ if (hScale < 0)
	7587	+ {
	7588	+ sign = -1;
	7589	+ }
	7590	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7591	if (hScale < 0.01)
7694	7592	{
7695		- hScale = 0.01;
	7593	+ //hScale = 0.01;
7696	7594	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
7699		- {
7700		- hScale = 0.01;
7701		- }
	7595	+
7702	7596	double vScale = (double) (info.y - centerPt.y) / 32;
7703		- if (vScale < 0.01)
	7597	+ sign = 1;
	7598	+ if (vScale < 0)
7704	7599	{
7705		- vScale = 0.01;
	7600	+ sign = -1;
7706	7601	}
7707		- vScale = Math.pow(vScale, scale * 50);
	7602	+ vScale = signMath.pow(signvScale, scale * 50);
7708	7603	if (vScale < 0.01)
7709	7604	{
7710		- vScale = 0.01;
	7605	+ //vScale = 0.01;
7711	7606	}
7712	7607	LA.matCopy(startMat, toParent);
7713	7608	/**/
..	..	@@ -7718,39 +7613,47 @@
7718	7613	}
7719	7614	/**/
7720	7615
7721		- switch (info.pane.renderCamera.viewCode)
	7616	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7617	+
	7618	+ if (totalScale < 0.01)
	7619	+ {
	7620	+ totalScale = 0.01;
	7621	+ }
	7622	+
	7623	+ switch (info.pane.RenderCamera().viewCode)
7722	7624	{
7723	7625	case 3: // '\001'
7724		- if (modified)
	7626	+ if (modified \|\| opposite)
7725	7627	{
7726	7628	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7629	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7630	} // vScale, 1);
7729	7631	else
7730	7632	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7633	+ // EXCEPTION!
	7634	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7635	} // vScale, 1);
7733	7636	break;
7734	7637
7735	7638	case 2: // '\002'
7736		- if (modified)
	7639	+ if (modified \|\| opposite)
7737	7640	{
7738	7641	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7642	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7643	} else
7741	7644	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7645	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7646	}
7744	7647	break;
7745	7648
7746	7649	case 1: // '\003'
7747		- if (modified)
	7650	+ if (modified \|\| opposite)
7748	7651	{
7749	7652	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7653	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7654	} else
7752	7655	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7656	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7657	}
7755	7658	break;
7756	7659	}
..	..	@@ -7883,14 +7786,22 @@
7883	7786	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7787	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7788	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7789	+
	7790	+ String objname;
	7791	+
7886	7792	if (false) //parent != null)
7887	7793	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7794	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7795	} else
7890	7796	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7797	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7798	} // + super.toString();
7893	7799	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7800	+
	7801	+ if (!Globals.ADVANCED)
	7802	+ return objname;
	7803	+
	7804	+ return objname + " " + System.identityHashCode(this);
7894	7805	}
7895	7806
7896	7807	public int hashCode()
..	..	@@ -7946,6 +7857,7 @@
7946	7857	objectUI.closeUI();
7947	7858	if (editWindow != null)
7948	7859	{
	7860	+ editWindow.ctrlPanel.FlushUI();
7949	7861	editWindow.refreshContents();
7950	7862	} // ? new
7951	7863	objectUI = null;
..	..	@@ -7954,6 +7866,10 @@
7954	7866	{
7955	7867	editWindow = null;
7956	7868	} // ?
	7869	+ }
	7870	+ else
	7871	+ {
	7872	+ //editWindow.closeUI();
7957	7873	}
7958	7874	}
7959	7875
..	..	@@ -7966,7 +7882,7 @@
7966	7882	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	7883
7968	7884	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	7885	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	7886
7971	7887	double[][] toParent; // dynamic matrix
7972	7888	double[][] fromParent;
..	..	@@ -8081,7 +7997,7 @@
8081	7997	{
8082	7998	assert(bRep != null);
8083	7999	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8000	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8001	}
8086	8002	else
8087	8003	{
..	..	@@ -8112,6 +8028,10 @@
8112	8028	}
8113	8029
8114	8030	transient ObjEditor editWindow;
	8031	+ transient ObjEditor manipWindow;
	8032	+
	8033	+ transient boolean pinned;
	8034	+
8115	8035	transient ObjectUI objectUI;
8116	8036	public static int povDepth = 0;
8117	8037	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8050,9 @@
8130	8050	private static cVector edge2 = new cVector();
8131	8051	//private static cVector norm = new cVector();
8132	8052	/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;
	8053	+ static final int hitCenter = 1;
	8054	+ static final int hitScale = 2;
	8055	+ static final int hitRotate = 3;
8136	8056	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8057	/transient/ private Point centerPt;
8138	8058	/transient/ private int startX;
..	..	@@ -8164,6 +8084,8 @@
8164	8084	{
8165	8085	Object3D targ = this;
8166	8086
	8087	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8088	+
8167	8089	if (obj.material != null)
8168	8090	{
8169	8091	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))