~nbriere/GrafreeD.git - Noware Git Repository

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