~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,35 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo
	28	+ mocap.reader.BVHReader.BVHResult bvh;
	29	+ Object3D skeleton;
	30	+ //
	31	+
22	32	ScriptNode scriptnode;
	33	+
	34	+ void InitOthers()
	35	+ {
	36	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	37	+ {
	38	+ projectedVertices = new Object3D.cVector2[3];
	39	+ }
	40	+ for (int i = 0; i < 3; i++)
	41	+ {
	42	+ projectedVertices[i] = new cVector2(); // Others
	43	+ }
	44	+ projectedVertices[0].x = 100; // bump
	45	+ }
23	46
24	47	void MinMax(cVector minima, cVector maxima)
25	48	{
..	..	@@ -86,64 +109,136 @@
86	109
87	110	// transient boolean reduced; // for morph reduction
88	111
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	112	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	113	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	114
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	115	+ transient Object3D transientsupport; // for cloning
	116	+ transient boolean transientlink2master;
94	117
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	118	+ void SaveSupports()
107	119	{
108		- bRep.SaveSupports();
109		- }
110		-
111		- for (int i = 0; i < Size(); i++)
112		- {
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
116		- blockloop = true;
117		- child.SaveSupports();
118		- blockloop = false;
119		- }
120		-}
	120	+ if (blockloop)
	121	+ return;
121	122
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
126	125
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
133		- {
134		- bRep.RestoreSupports();
	126	+ support = null;
	127	+ link2master = false;
	128	+
	129	+ if (bRep != null)
	130	+ {
	131	+ bRep.SaveSupports();
	132	+ }
	133	+
	134	+ for (int i = 0; i < Size(); i++)
	135	+ {
	136	+ Object3D child = (Object3D) get(i);
	137	+ if (child == null)
	138	+ continue;
	139	+ blockloop = true;
	140	+ child.SaveSupports();
	141	+ blockloop = false;
	142	+ }
135	143	}
136		-
137		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
138	146	{
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142		- blockloop = true;
143		- child.RestoreSupports();
144		- blockloop = false;
	147	+ if (blockloop)
	148	+ return;
	149	+
	150	+ support = transientsupport;
	151	+ link2master = transientlink2master;
	152	+ transientsupport = null;
	153	+ transientlink2master = false;
	154	+
	155	+ if (bRep != null)
	156	+ {
	157	+ bRep.RestoreSupports();
	158	+ }
	159	+
	160	+ for (int i = 0; i < Size(); i++)
	161	+ {
	162	+ Object3D child = (Object3D) get(i);
	163	+ if (child == null)
	164	+ continue;
	165	+ blockloop = true;
	166	+ child.RestoreSupports();
	167	+ blockloop = false;
	168	+ }
145	169	}
146		-}
	170	+
	171	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	172	+ {
	173	+ if (hashtable.containsKey(GetUUID()))
	174	+ {
	175	+ Object3D o = hashtable.get(GetUUID());
	176	+
	177	+ assert(this.bRep == o.bRep);
	178	+ if (this.bRep != null)
	179	+ assert(this.bRep.support == o.transientrep);
	180	+
	181	+ return;
	182	+ }
	183	+
	184	+ Object3D o = new Object3D();
	185	+
	186	+ hashtable.put(GetUUID(), o);
	187	+
	188	+ for (int i=0; i<Size(); i++)
	189	+ {
	190	+ get(i).ExtractBigData(hashtable);
	191	+ }
	192	+
	193	+ ExtractBigData(o);
	194	+ }
	195	+
	196	+ void ExtractBigData(Object3D o)
	197	+ {
	198	+ o.bRep = this.bRep;
	199	+ if (this.bRep != null)
	200	+ {
	201	+ o.transientrep = this.bRep.support;
	202	+ o.bRep.support = null;
	203	+ }
	204	+
	205	+ // o.support = this.support;
	206	+ // o.fileparent = this.fileparent;
	207	+ // if (this.bRep != null)
	208	+ // o.bRep = this.bRep.support;
	209	+
	210	+ this.bRep = null;
	211	+ // if (this.bRep != null)
	212	+ // this.bRep.support = null;
	213	+ // this.support = null;
	214	+ // this.fileparent = null;
	215	+ }
	216	+
	217	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	218	+ {
	219	+ if (!hashtable.containsKey(GetUUID()))
	220	+ return;
	221	+
	222	+ Object3D o = hashtable.get(GetUUID());
	223	+
	224	+ RestoreBigData(o);
	225	+
	226	+ hashtable.remove(GetUUID());
	227	+
	228	+ for (int i=0; i<Size(); i++)
	229	+ {
	230	+ get(i).RestoreBigData(hashtable);
	231	+ }
	232	+ }
	233	+
	234	+ void RestoreBigData(Object3D o)
	235	+ {
	236	+ this.bRep = o.bRep;
	237	+ if (this.bRep != null)
	238	+ this.bRep.support = o.transientrep;
	239	+ // this.support = o.support;
	240	+ // this.fileparent = o.fileparent;
	241	+ }
147	242
148	243	// MOCAP SUPPORT
149	244	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +381,7 @@
286	381	}
287	382
288	383	boolean live = false;
	384	+ boolean dontselect = false;
289	385	boolean hide = false;
290	386	boolean link2master = false; // performs reset support/master at each frame
291	387	boolean marked = false; // animation node
..	..	@@ -295,6 +391,8 @@
295	391	boolean random = false;
296	392	boolean speedup = false;
297	393	boolean rewind = false;
	394	+
	395	+ float NORMALPUSH = 0;
298	396
299	397	Object3D support;
300	398
..	..	@@ -355,7 +453,7 @@
355	453
356	454	int MemorySize()
357	455	{
358		- if (memorysize == 0)
	456	+ if (true) // memorysize == 0)
359	457	{
360	458	try
361	459	{
..	..	@@ -415,16 +513,16 @@
415	513	{
416	514	Object3D copy = this;
417	515
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	516	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	517
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	518	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	519	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	520	+ parentcam = Globals.theRenderer.Cameras()[1];
423	521	}
424	522
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	523	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	524	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	525	+ parentcam = Globals.theRenderer.Cameras()[0];
428	526	}
429	527
430	528	if (this == parentcam)
..	..	@@ -432,7 +530,7 @@
432	530	//assert(this instanceof Camera);
433	531
434	532	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	533	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	534	}
437	535
438	536	copy.marked ^= true;
..	..	@@ -452,7 +550,7 @@
452	550	//assert(this instanceof Camera);
453	551
454	552	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	553	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	554	}
457	555
458	556	copy.Touch(); // display list issue
..	..	@@ -587,7 +685,7 @@
587	685	return;
588	686	}
589	687
590		- if (CameraPane.fromscript)
	688	+ if (Globals.fromscript)
591	689	{
592	690	transformcount = 0;
593	691	return;
..	..	@@ -745,7 +843,7 @@
745	843
746	844	int GetTransformCount()
747	845	{
748		- // marde pour serialization de Texture
	846	+ // patch pour serialization de Texture
749	847	resetmaxcount();
750	848	resettransformcount();
751	849	resetstep();
..	..	@@ -758,7 +856,7 @@
758	856	if (step == 0)
759	857	step = 1;
760	858	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	859	+ maxcount = 128; // 2048; // 4;
762	860	// if (acceleration == 0)
763	861	// acceleration = 10;
764	862	if (delay == 0) // serial
..	..	@@ -779,9 +877,12 @@
779	877	// factor = CameraPane.STEP;
780	878	// }
781	879
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	880	+ if (marked && Globals.isLIVE() && live &&
	881	+ //TEMP21aug2018
	882	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	883	+ currentframe != Globals.framecount)
783	884	{
784		- currentframe = CameraPane.framecount;
	885	+ currentframe = Globals.framecount;
785	886
786	887	// System.err.println("transformcount = " + transformcount);
787	888	// System.err.println("factor = " + factor);
..	..	@@ -893,6 +994,11 @@
893	994	fromParent = null; // LA.newMatrix();
894	995	bRep = null; // new BoundaryRep();
895	996
	997	+ if (oname != null && oname.equals("LeftHand"))
	998	+ {
	999	+ name = oname;
	1000	+ }
	1001	+
896	1002	/*
897	1003	float hue = (float)Math.random();
898	1004	Color col;
..	..	@@ -935,7 +1041,7 @@
935	1041
936	1042	public Object clone()
937	1043	{
938		- return GraphreeD.clone(this);
	1044	+ return Grafreed.clone(this);
939	1045	}
940	1046
941	1047	Object3D copyExpand()
..	..	@@ -1446,7 +1552,16 @@
1446	1552	// if (other == null)
1447	1553	// return;
1448	1554
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1555	+ if (other != null)
	1556	+ {
	1557	+ BoundaryRep.SEUIL = other.material.cameralight;
	1558	+
	1559	+ // Set default to 0.1
	1560	+ BoundaryRep.SEUIL /= 4; // 2;
	1561	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1562	+ }
	1563	+
	1564	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1565
1451	1566	//if (bRep != null)
1452	1567	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1816,7 @@
1701	1816	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1817	o.bRep = transientrep;
1703	1818	if (clone)
1704		- o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1819	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1820	o.CreateMaterial();
1706	1821	o.SetAttributes(this, -1);
1707	1822	//parent
..	..	@@ -1714,7 +1829,7 @@
1714	1829	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1830	o.bRep = bRep;
1716	1831	if (clone)
1717		- o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1832	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1833	o.CreateMaterial();
1719	1834	//o.overwriteThis(this, -1);
1720	1835	o.SetAttributes(this, -1);
..	..	@@ -1756,7 +1871,7 @@
1756	1871	// {
1757	1872	// assert(bRep == null);
1758	1873	// Object3D o = new Object3D("Geometry:" + this.name);
1759		-// o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1874	+// o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1760	1875	// o.CreateMaterial();
1761	1876	// parent.addChild(o);
1762	1877	// }
..	..	@@ -1765,7 +1880,7 @@
1765	1880	// {
1766	1881	// assert(transientrep == null);
1767	1882	// Object3D o = new Object3D("Geometry:" + this.name);
1768		-// o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1883	+// o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1769	1884	// o.CreateMaterial();
1770	1885	// parent.addChild(o);
1771	1886	// }
..	..	@@ -1801,12 +1916,15 @@
1801	1916	if (obj.name == null)
1802	1917	continue; // can't be a null one
1803	1918
	1919	+ // Try perfect match first.
1804	1920	if (n.equals(obj.name))
1805	1921	{
1806	1922	theobj = obj;
1807	1923	count++;
1808	1924	}
1809	1925	}
	1926	+
	1927	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1928
1811	1929	if (count != 1)
1812	1930	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1934,9 @@
1816	1934	if (obj.name == null)
1817	1935	continue; // can't be a null one
1818	1936
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1937	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1938	+ //if (n.startsWith(obj.name))
	1939	+ if (n.contains(name))
1821	1940	{
1822	1941	theobj = obj;
1823	1942	count++;
..	..	@@ -2120,15 +2239,8 @@
2120	2239	if (/parent != null &&/ material == null)
2121	2240	{
2122	2241	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2242	+
	2243	+ InitOthers();
2132	2244
2133	2245	if (this instanceof Camera)
2134	2246	{
..	..	@@ -2278,6 +2390,7 @@
2278	2390	{
2279	2391	if (newWindow)
2280	2392	{
	2393	+ new Exception().printStackTrace();
2281	2394	System.exit(0);
2282	2395	if (parent != null)
2283	2396	{
..	..	@@ -2454,13 +2567,13 @@
2454	2567	return retval;
2455	2568	}
2456	2569
2457		- void doEditDrag(ClickInfo info)
	2570	+ void doEditDrag(ClickInfo info, boolean opposite)
2458	2571	{
2459	2572	switch (doSomething)
2460	2573	{
2461	2574	case 1: // '\001'
2462	2575	//super.
2463		- doEditDrag0(info);
	2576	+ doEditDrag0(info, opposite);
2464	2577	break;
2465	2578
2466	2579	case 2: // '\002'
..	..	@@ -2473,11 +2586,11 @@
2473	2586	{
2474	2587	//sel.hitSomething = childToDrag.hitSomething;
2475	2588	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2589	+ sel.doEditDrag(info, opposite);
2477	2590	} else
2478	2591	{
2479	2592	//super.
2480		- doEditDrag0(info);
	2593	+ doEditDrag0(info, opposite);
2481	2594	}
2482	2595	}
2483	2596	break;
..	..	@@ -2587,6 +2700,18 @@
2587	2700	void GenNormalsS(boolean crease)
2588	2701	{
2589	2702	selection.GenNormals(crease);
	2703	+// for (int i=0; i<selection.size(); i++)
	2704	+// {
	2705	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2706	+// selectee.GenNormals(crease);
	2707	+// }
	2708	+
	2709	+ //Touch();
	2710	+ }
	2711	+
	2712	+ void GenNormalsMeshS()
	2713	+ {
	2714	+ selection.GenNormalsMesh();
2590	2715	// for (int i=0; i<selection.size(); i++)
2591	2716	// {
2592	2717	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +2857,42 @@
2732	2857	blockloop = false;
2733	2858	}
2734	2859
	2860	+ void GenNormalsMesh()
	2861	+ {
	2862	+ if (blockloop)
	2863	+ return;
	2864	+
	2865	+ blockloop = true;
	2866	+ GenNormalsMesh0();
	2867	+ for (int i = 0; i < Children().Size(); i++)
	2868	+ {
	2869	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2870	+ if (child == null)
	2871	+ continue;
	2872	+ child.GenNormalsMesh();
	2873	+// Children().release(i);
	2874	+ }
	2875	+ blockloop = false;
	2876	+ }
	2877	+
	2878	+ void GenNormalsMINE()
	2879	+ {
	2880	+ if (blockloop)
	2881	+ return;
	2882	+
	2883	+ blockloop = true;
	2884	+ GenNormalsMINE0();
	2885	+ for (int i = 0; i < Children().Size(); i++)
	2886	+ {
	2887	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2888	+ if (child == null)
	2889	+ continue;
	2890	+ child.GenNormalsMINE();
	2891	+// Children().release(i);
	2892	+ }
	2893	+ blockloop = false;
	2894	+ }
	2895	+
2735	2896	void ClearColors()
2736	2897	{
2737	2898	if (blockloop)
..	..	@@ -2866,7 +3027,8 @@
2866	3027	{
2867	3028	if (bRep != null)
2868	3029	{
2869		- bRep.GenUV();
	3030	+ bRep.GenUV(); //1);
	3031	+ //bRep.UnfoldUV();
2870	3032	Touch();
2871	3033	}
2872	3034	}
..	..	@@ -2876,6 +3038,24 @@
2876	3038	if (bRep != null)
2877	3039	{
2878	3040	bRep.GenerateNormals(crease);
	3041	+ Touch();
	3042	+ }
	3043	+ }
	3044	+
	3045	+ void GenNormalsMesh0()
	3046	+ {
	3047	+ if (bRep != null)
	3048	+ {
	3049	+ bRep.GenerateNormalsMesh();
	3050	+ Touch();
	3051	+ }
	3052	+ }
	3053	+
	3054	+ void GenNormalsMINE0()
	3055	+ {
	3056	+ if (bRep != null)
	3057	+ {
	3058	+ bRep.GenerateNormalsMINE();
2879	3059	Touch();
2880	3060	}
2881	3061	}
..	..	@@ -2932,6 +3112,33 @@
2932	3112	blockloop = false;
2933	3113	}
2934	3114
	3115	+ void TransformChildren()
	3116	+ {
	3117	+ if (toParent != null)
	3118	+ {
	3119	+ for (int i=Size(); --i>=0;)
	3120	+ {
	3121	+ Object3D v = get(i);
	3122	+
	3123	+ if (v.toParent == null)
	3124	+ {
	3125	+ v.toParent = LA.newMatrix();
	3126	+ v.fromParent = LA.newMatrix();
	3127	+ }
	3128	+
	3129	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3130	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3131	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3132	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3133	+ }
	3134	+
	3135	+ toParent = null; // LA.matIdentity(toParent);
	3136	+ fromParent = null; // LA.matIdentity(fromParent);
	3137	+
	3138	+ Touch();
	3139	+ }
	3140	+ }
	3141	+
2935	3142	void TransformGeometry()
2936	3143	{
2937	3144	Object3D obj = this;
..	..	@@ -3153,9 +3360,11 @@
3153	3360
3154	3361	BoundaryRep sup = bRep.support;
3155	3362	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
	3363	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3364	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3365	+
	3366	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3367	+
3159	3368	bRep = temprep;
3160	3369	bRep.support = sup;
3161	3370	Touch();
..	..	@@ -3677,7 +3886,7 @@
3677	3886	if (child == null)
3678	3887	continue;
3679	3888
3680		- if (GraphreeD.RENDERME > 0)
	3889	+ if (Grafreed.RENDERME > 0)
3681	3890	{
3682	3891	if (child instanceof Merge)
3683	3892	((Merge)child).renderme();
..	..	@@ -3717,7 +3926,7 @@
3717	3926
3718	3927	boolean getCentroid(cVector centroid, boolean xform)
3719	3928	{
3720		- assert(false);
	3929	+// for speaker assert(false);
3721	3930	if (blockloop)
3722	3931	return false;
3723	3932
..	..	@@ -3828,7 +4037,7 @@
3828	4037	if (child == null)
3829	4038	continue;
3830	4039
3831		- if (GraphreeD.RENDERME > 0)
	4040	+ if (Grafreed.RENDERME > 0)
3832	4041	{
3833	4042	if (child instanceof Merge)
3834	4043	((Merge)child).renderme();
..	..	@@ -4023,7 +4232,7 @@
4023	4232	if (child == null)
4024	4233	continue;
4025	4234
4026		- if (GraphreeD.RENDERME > 0)
	4235	+ if (Grafreed.RENDERME > 0)
4027	4236	{
4028	4237	if (child instanceof Merge)
4029	4238	((Merge)child).renderme();
..	..	@@ -4111,7 +4320,7 @@
4111	4320	if (blockloop)
4112	4321	return;
4113	4322
4114		- for (int i=0; i<size(); i++)
	4323	+ for (int i=0; i<Size(); i++)
4115	4324	{
4116	4325	if (get(i).parent != this)
4117	4326	{
..	..	@@ -4120,6 +4329,22 @@
4120	4329	}
4121	4330	blockloop = true;
4122	4331	get(i).RepairParent();
	4332	+ blockloop = false;
	4333	+ }
	4334	+ }
	4335	+
	4336	+ void RepairShadow()
	4337	+ {
	4338	+ if (blockloop)
	4339	+ return;
	4340	+
	4341	+ if (this.material != null)
	4342	+ this.InitOthers();
	4343	+
	4344	+ for (int i=0; i<Size(); i++)
	4345	+ {
	4346	+ blockloop = true;
	4347	+ get(i).RepairShadow();
4123	4348	blockloop = false;
4124	4349	}
4125	4350	}
..	..	@@ -4515,16 +4740,28 @@
4515	4740
4516	4741	Object3D GetFileRoot()
4517	4742	{
	4743	+ if (overflow)
	4744	+ return null;
	4745	+
	4746	+ overflow = true;
	4747	+
	4748	+ Object3D pfr = null;
	4749	+
4518	4750	if (parent == null && fileparent == null)
4519		- return this;
	4751	+ pfr = this;
4520	4752
4521	4753	if (parent == null && fileparent != null) // V4.gfd???
4522		- return fileparent;
	4754	+ pfr = fileparent;
4523	4755
4524		- if (parent == null)
4525		- return this;
	4756	+ if (pfr == null && parent == null)
	4757	+ pfr = this;
4526	4758
4527		- return parent.GetFileRoot();
	4759	+ if (pfr == null)
	4760	+ pfr = parent.GetFileRoot();
	4761	+
	4762	+ overflow = false;
	4763	+
	4764	+ return pfr;
4528	4765	}
4529	4766
4530	4767	cTreePath GetPath()
..	..	@@ -4602,7 +4839,7 @@
4602	4839
4603	4840	cTreePath SelectLeaf(int indexcount, boolean deselect)
4604	4841	{
4605		- if (hide)
	4842	+ if (hide \|\| dontselect)
4606	4843	return null;
4607	4844
4608	4845	if (count <= 0)
..	..	@@ -4628,7 +4865,7 @@
4628	4865
4629	4866	cTreePath Select(int indexcount, boolean deselect)
4630	4867	{
4631		- if (hide)
	4868	+ if (hide \|\| dontselect)
4632	4869	return null;
4633	4870
4634	4871	if (count <= 0)
..	..	@@ -4778,7 +5015,7 @@
4778	5015	return globalTransform;
4779	5016	}
4780	5017
4781		- void PreprocessOcclusion(CameraPane cp)
	5018	+ void PreprocessOcclusion(iCameraPane cp)
4782	5019	{
4783	5020	/*
4784	5021	if (AOdone)
..	..	@@ -4925,7 +5162,8 @@
4925	5162	} else //
4926	5163	if (editWindow != null)
4927	5164	{
4928		- editWindow.cameraView.lighttouched = true;
	5165	+ //editWindow.cameraView.lighttouched = true;
	5166	+ Globals.lighttouched = true;
4929	5167	}
4930	5168	}
4931	5169
..	..	@@ -5079,10 +5317,34 @@
5079	5317
5080	5318	// System.out.println("Fullname = " + fullname);
5081	5319
5082		- if (fullname.name.indexOf(":") == -1)
5083		- return fullname.name;
	5320	+ // Does not work on Windows due to C:
	5321	+// if (fullname.name.indexOf(":") == -1)
	5322	+// return fullname.name;
	5323	+//
	5324	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5084	5325
5085		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5326	+ String[] split = fullname.name.split(":");
	5327	+
	5328	+ if (split.length == 0)
	5329	+ {
	5330	+ return "";
	5331	+ }
	5332	+
	5333	+ if (split.length <= 2)
	5334	+ {
	5335	+ if (fullname.name.endsWith(":"))
	5336	+ {
	5337	+ // Windows
	5338	+ return fullname.name.substring(0, fullname.name.length()-1);
	5339	+ }
	5340	+
	5341	+ return split[0];
	5342	+ }
	5343	+
	5344	+ // Windows
	5345	+ assert(split.length == 4);
	5346	+
	5347	+ return split[0] + ":" + split[1];
5086	5348	}
5087	5349
5088	5350	static String GetBump(cTexture fullname)
..	..	@@ -5091,10 +5353,38 @@
5091	5353	return "";
5092	5354
5093	5355	// System.out.println("Fullname = " + fullname);
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return "";
5096		-
5097		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5356	+ // Does not work on Windows due to C:
	5357	+// if (fullname.name.indexOf(":") == -1)
	5358	+// return "";
	5359	+//
	5360	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5361	+ String[] split = fullname.name.split(":");
	5362	+
	5363	+ if (split.length == 0)
	5364	+ {
	5365	+ return "";
	5366	+ }
	5367	+
	5368	+ if (split.length == 1)
	5369	+ {
	5370	+ return "";
	5371	+ }
	5372	+
	5373	+ if (split.length == 2)
	5374	+ {
	5375	+ if (fullname.name.endsWith(":"))
	5376	+ {
	5377	+ // Windows
	5378	+ return "";
	5379	+ }
	5380	+
	5381	+ return split[1];
	5382	+ }
	5383	+
	5384	+ // Windows
	5385	+ assert(split.length == 4);
	5386	+
	5387	+ return split[2] + ":" + split[3];
5098	5388	}
5099	5389
5100	5390	String GetPigmentTexture()
..	..	@@ -5168,7 +5458,7 @@
5168	5458	System.out.print("; textures = " + textures);
5169	5459	System.out.println("; usedtextures = " + usedtextures);
5170	5460
5171		- if (GetTextures() == null)
	5461	+ if (GetTextures() == null) // What is that??
5172	5462	GetTextures().name = ":";
5173	5463
5174	5464	String texname = tex;
..	..	@@ -5199,6 +5489,43 @@
5199	5489	child.ResetPigmentTexture();
5200	5490	blockloop = false;
5201	5491	}
	5492	+ }
	5493	+
	5494	+ UUID GetUUID()
	5495	+ {
	5496	+ if (uuid == null)
	5497	+ {
	5498	+ // Serial
	5499	+ uuid = UUID.randomUUID();
	5500	+ }
	5501	+
	5502	+ return uuid;
	5503	+ }
	5504	+
	5505	+ Object3D GetObject(UUID uid)
	5506	+ {
	5507	+ if (blockloop)
	5508	+ return null;
	5509	+
	5510	+ if (GetUUID().equals(uid))
	5511	+ return this;
	5512	+
	5513	+ int nb = Size();
	5514	+ for (int i = 0; i < nb; i++)
	5515	+ {
	5516	+ Object3D child = (Object3D) get(i);
	5517	+
	5518	+ if (child == null)
	5519	+ continue;
	5520	+
	5521	+ blockloop = true;
	5522	+ Object3D obj = child.GetObject(uid);
	5523	+ blockloop = false;
	5524	+ if (obj != null)
	5525	+ return obj;
	5526	+ }
	5527	+
	5528	+ return null;
5202	5529	}
5203	5530
5204	5531	void SetBumpTexture(String tex)
..	..	@@ -5237,25 +5564,22 @@
5237	5564	}
5238	5565	}
5239	5566
5240		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5567	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5241	5568	{
5242	5569	Draw(display, root, selected, blocked);
5243	5570	}
5244	5571
5245		- static cMaterial[] materialstack = new cMaterial[65536];
5246		- static boolean[] selectedstack = new boolean[65536];
5247		- static int materialdepth = 0;
5248		-
5249	5572	boolean NeedSupport()
5250	5573	{
5251	5574	return
5252		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5575	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5253	5576	// PROBLEM with CROWD!!
5254		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5577	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5255	5578	}
5256	5579
	5580	+ static boolean DEBUG_SELECTION = false;
5257	5581
5258		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5582	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5259	5583	{
5260	5584	Invariants(); // june 2013
5261	5585
..	..	@@ -5264,8 +5588,8 @@
5264	5588	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5265	5589	}
5266	5590
5267		- if (display.drawMode == CameraPane.SELECTION &&
5268		- hide)
	5591	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5592	+ (hide \|\| dontselect))
5269	5593	return;
5270	5594
5271	5595	if (name != null && name.contains("sclera"))
..	..	@@ -5280,10 +5604,10 @@
5280	5604	if (name != null && name.contains("sclera"))
5281	5605	name = name;
5282	5606
5283		- if (this instanceof CheckerIG)
	5607	+ if (this instanceof Checker)
5284	5608	return;
5285	5609
5286		- if (display.drawMode == display.SHADOW && PASSTEST)
	5610	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5287	5611	return;
5288	5612
5289	5613	if (count <= 0)
..	..	@@ -5291,13 +5615,13 @@
5291	5615	return;
5292	5616	}
5293	5617
5294		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5295		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5618	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5619	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5296	5620	{
5297	5621	return;
5298	5622	}
5299	5623
5300		- javax.media.opengl.GL gl = display.GetGL();
	5624	+ //javax.media.opengl.GL gl = display.GetGL();
5301	5625
5302	5626	/*
5303	5627	if (touched)
..	..	@@ -5333,15 +5657,15 @@
5333	5657
5334	5658	boolean compiled = false;
5335	5659
5336		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5660	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5337	5661
5338		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5662	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5339	5663	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5340	5664	{
5341		- display.lighttouched = true;
	5665	+ Globals.lighttouched = true;
5342	5666	} // all panes...
5343		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5344		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5667	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5668	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5345	5669	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5346	5670	{
5347	5671	if (!(this instanceof Composite))
..	..	@@ -5349,7 +5673,7 @@
5349	5673	//if (displaylist == -1 && usecalllists)
5350	5674	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5351	5675	{
5352		- bRep.displaylist = gl.glGenLists(1);
	5676	+ bRep.displaylist = display.GenList();
5353	5677	assert(bRep.displaylist != 0);
5354	5678	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5355	5679	//System.out.println("\tgen list " + list);
..	..	@@ -5361,18 +5685,20 @@
5361	5685	if (usecalllists)
5362	5686	{
5363	5687	// System.err.println("new list " + bRep.displaylist + " for " + this);
5364		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5688	+ display.NewList(bRep.displaylist);
5365	5689	}
	5690	+
5366	5691	CallList(display, root, selected, blocked);
	5692	+
5367	5693	// compiled = true;
5368	5694	if (usecalllists)
5369	5695	{
5370	5696	// System.err.println("end list " + bRep.displaylist + " for " + this);
5371		- gl.glEndList();
	5697	+ display.EndList();
5372	5698	}
5373	5699	//gl.glDrawBuffer(gl.GL_BACK);
5374	5700	// XXX touched = false;
5375		- display.lighttouched = true; // all panes...
	5701	+ Globals.lighttouched = true; // all panes...
5376	5702	}
5377	5703
5378	5704	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5411,12 +5737,12 @@
5411	5737
5412	5738	// frustum culling
5413	5739	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5414		- && display.drawMode != CameraPane.SELECTION)
	5740	+ && display.DrawMode() != iCameraPane.SELECTION)
5415	5741	{
5416		- if (display.drawMode == CameraPane.SHADOW)
	5742	+ if (display.DrawMode() == iCameraPane.SHADOW)
5417	5743	{
5418	5744	if (!link2master // tricky to cull in shadow mode.
5419		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5745	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5420	5746	{
5421	5747	//System.out.print("CULLED");
5422	5748	culled = true;
..	..	@@ -5424,7 +5750,7 @@
5424	5750	}
5425	5751	else
5426	5752	//GetBRep().getBounds(v0, v1, this);
5427		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5753	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5428	5754	culled = true;
5429	5755
5430	5756	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5460,11 +5786,11 @@
5460	5786
5461	5787
5462	5788	if (!culled)
5463		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5789	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5464	5790	{
5465	5791	if (GetBRep() != null)
5466	5792	{
5467		- CameraPane.NextIndex(this, gl);
	5793	+ display.NextIndex();
5468	5794	// vertex color conflict : gl.glCallList(list);
5469	5795	DrawNode(display, root, selected);
5470	5796	if (this instanceof BezierPatch)
..	..	@@ -5486,53 +5812,7 @@
5486	5812	color[2] /= 2;
5487	5813	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5488	5814	*/
5489		- if (material != null)
5490		- {
5491		- materialstack[materialdepth] = material;
5492		- selectedstack[materialdepth] = selected;
5493		- cStatic.objectstack[materialdepth++] = this;
5494		- //System.out.println("material " + material);
5495		- //Applet3D.tracein(this, selected);
5496		- display.vector2buffer = projectedVertices;
5497		- if (this instanceof Camera)
5498		- {
5499		- display.options1[0] = material.shift;
5500		- //System.out.println("shift " + material.shift);
5501		- display.options1[1] = material.lightarea;
5502		- display.options1[2] = material.shadowbias;
5503		- display.options1[3] = material.aniso;
5504		- display.options1[4] = material.anisoV;
5505		- display.options2[0] = material.opacity;
5506		- display.options2[1] = material.diffuse;
5507		- display.options2[2] = material.factor;
5508		-
5509		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5510		- display.options3[3] = material.cameralight/0.2f;
5511		-
5512		- // if (display.CURRENTANTIALIAS > 0)
5513		- // display.options3[3] /= 4;
5514		-
5515		- /*
5516		- System.out.println("Focus = " + display.options1[0]);
5517		- System.out.println("Aperture = " + display.options1[1]);
5518		- System.out.println("ShadowBlur = " + display.options1[2]);
5519		- System.out.println("Antialiasing = " + display.options1[3]);
5520		- System.out.println("Fog = " + display.options2[0]);
5521		- System.out.println("Intensity = " + display.options2[1]);
5522		- System.out.println("Elevation = " + display.options2[2]);
5523		- /**/
5524		- } else
5525		- {
5526		- material.Draw(display, selected);
5527		- }
5528		- } else
5529		- {
5530		- if (selected && CameraPane.flash)
5531		- {
5532		- display.modelParams4[1] = 100;
5533		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5534		- }
5535		- }
	5815	+ display.PushMaterial(this, selected);
5536	5816
5537	5817	//System.out.println("call list " + list);
5538	5818	//System.out.println();
..	..	@@ -5551,7 +5831,17 @@
5551	5831	tex = GetTextures();
5552	5832	}
5553	5833
5554		- display.BindTextures(tex, texres);
	5834	+ boolean failed = false;
	5835	+
	5836	+ try
	5837	+ {
	5838	+ display.BindTextures(tex, texres);
	5839	+ }
	5840	+ catch (Exception e)
	5841	+ {
	5842	+ System.err.println("FAILED: " + this);
	5843	+ failed = true;
	5844	+ }
5555	5845
5556	5846	if (!compiled)
5557	5847	{
..	..	@@ -5567,30 +5857,16 @@
5567	5857
5568	5858	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5569	5859	assert(bRep.displaylist != 0);
5570		- gl.glCallList(bRep.displaylist);
	5860	+ display.CallList(bRep.displaylist);
5571	5861	// june 2013 drawSelf(display, root, selected);
5572	5862	}
5573	5863	}
5574	5864	}
5575	5865
5576		- display.ReleaseTextures(tex);
5577		-
5578		- //if (parent != null && parent.GetMaterial() != null)
5579		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5580		- if (material != null)
5581		- {
5582		- materialdepth -= 1;
5583		- if (materialdepth > 0)
5584		- {
5585		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5586		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5587		- }
5588		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5589		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5590		- {
5591		- display.modelParams4[1] = GetMaterial().cameralight;
5592		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5593		- }
	5866	+ if (!failed)
	5867	+ display.ReleaseTextures(tex);
	5868	+
	5869	+ display.PopMaterial(this, selected);
5594	5870	}
5595	5871
5596	5872	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5632,7 +5908,7 @@
5632	5908	// resetMasterNode();
5633	5909	}
5634	5910
5635		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5911	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5636	5912	{
5637	5913	if (GetBRep() == null)
5638	5914	{
..	..	@@ -5715,8 +5991,11 @@
5715	5991	boolean flipV = false; // true;
5716	5992	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5717	5993
5718		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5994	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5719	5995	{
	5996	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5997	+ return;
	5998	+
5720	5999	if (hide)
5721	6000	return;
5722	6001	// shadow optimisation
..	..	@@ -5774,16 +6053,7 @@
5774	6053	// // ??????????????????????????? Touch();
5775	6054	// }
5776	6055
5777		- if (material != null)
5778		- {
5779		- materialstack[materialdepth] = material;
5780		- selectedstack[materialdepth] = selected;
5781		- cStatic.objectstack[materialdepth++] = this;
5782		- //System.out.println("material " + material);
5783		- //Applet3D.tracein("selected ", selected);
5784		- display.vector2buffer = projectedVertices;
5785		- material.Draw(display, selected);
5786		- }
	6056	+display.PushMaterial2(this, selected);
5787	6057
5788	6058	Object3D child;
5789	6059	boolean sel;
..	..	@@ -5807,12 +6077,12 @@
5807	6077	if (!child.HasTransparency())
5808	6078	{
5809	6079	sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5810		- // GraphreeD.tracein("draw ", child);
	6080	+ // GrafreeD.tracein("draw ", child);
5811	6081	boolean wasblocked = blockdraw;
5812	6082	blockdraw = true;
5813	6083	child.draw(display, root, selected \|\| sel, wasblocked \|\| blocked); // \|\| child.IsSelected());
5814	6084	blockdraw = false;
5815		- // GraphreeD.traceout("draw ", child);
	6085	+ // GrafreeD.traceout("draw ", child);
5816	6086	}
5817	6087
5818	6088	release(i);
..	..	@@ -5835,19 +6105,7 @@
5835	6105	*/
5836	6106	//depth += 1;
5837	6107
5838		- if (material != null)
5839		- {
5840		- materialdepth -= 1;
5841		- if (materialdepth > 0)
5842		- {
5843		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5844		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5845		- }
5846		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5847		- //else
5848		- //material.Draw(display, false);
5849		- }
5850		-
	6108	+display.PopMaterial2(this);
5851	6109	/*
5852	6110	display.ReleaseTextures(tex);
5853	6111	*/
..	..	@@ -5858,10 +6116,13 @@
5858	6116
5859	6117	//static cVector min,max;
5860	6118
5861		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6119	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5862	6120	{
5863		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6121	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5864	6122	return; // no shadow for transparent objects
	6123	+
	6124	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6125	+ return;
5865	6126
5866	6127	if (hide)
5867	6128	return;
..	..	@@ -5903,11 +6164,12 @@
5903	6164	return;
5904	6165	}
5905	6166
	6167	+ //bRep.GenUV(1/material.diffuseness);
5906	6168	// bRep.lock = true;
5907	6169
5908		- javax.media.opengl.GL gl = display.GetGL();
	6170	+ //javax.media.opengl.GL gl = display.GetGL();
5909	6171
5910		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6172	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5911	6173	{
5912	6174	int fc = bRep.FaceCount();
5913	6175	int vc = bRep.VertexCount();
..	..	@@ -5922,23 +6184,7 @@
5922	6184
5923	6185	bRep.getMinMax(min, max, 100);
5924	6186
5925		- gl.glBegin(gl.GL_LINES);
5926		-
5927		- gl.glVertex3d(min.x, min.y, min.z);
5928		- gl.glVertex3d(min.x, min.y, max.z);
5929		- gl.glVertex3d(min.x, min.y, min.z);
5930		- gl.glVertex3d(min.x, max.y, min.z);
5931		- gl.glVertex3d(min.x, min.y, min.z);
5932		- gl.glVertex3d(max.x, min.y, min.z);
5933		-
5934		- gl.glVertex3d(max.x, max.y, max.z);
5935		- gl.glVertex3d(min.x, max.y, max.z);
5936		- gl.glVertex3d(max.x, max.y, max.z);
5937		- gl.glVertex3d(max.x, min.y, max.z);
5938		- gl.glVertex3d(max.x, max.y, max.z);
5939		- gl.glVertex3d(max.x, max.y, min.z);
5940		-
5941		- gl.glEnd();
	6187	+ display.DrawBox(min, max);
5942	6188
5943	6189	return;
5944	6190	}
..	..	@@ -5982,7 +6228,7 @@
5982	6228	{
5983	6229	//throw new Error();
5984	6230
5985		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6231	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5986	6232
5987	6233	int[] strips = bRep.getRawIndices();
5988	6234
..	..	@@ -5992,178 +6238,14 @@
5992	6238	new Exception().printStackTrace();
5993	6239	return;
5994	6240	}
5995		-
5996		- // TRIANGLE STRIP ARRAY
5997		- if (bRep.trimmed)
5998		- {
5999		- float[] v = bRep.getRawVertices();
6000		- float[] n = bRep.getRawNormals();
6001		- float[] c = bRep.getRawColors();
6002		- float[] uv = bRep.getRawUVMap();
6003		-
6004		- int count2 = 0;
6005		- int count3 = 0;
6006		-
6007		- if (n.length > 0)
6008		- {
6009		- for (int i = 0; i < strips.length; i++)
6010		- {
6011		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6012		-
6013		- /*
6014		- boolean locked = false;
6015		- float eps = 0.1f;
6016		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6017		-
6018		- int dot = 0;
6019		-
6020		- if ((dot&1) == 0)
6021		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6022		-
6023		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6024		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6025		- else
6026		- {
6027		- locked = true;
6028		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6029		- }
6030		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6031		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6032		- if (hasnorm)
6033		- {
6034		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6035		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6036		- }
6037		-
6038		- if ((dot&4) == 0)
6039		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6040		-
6041		- if (wrap \|\| !locked && (dot&8) != 0)
6042		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6043		- else
6044		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6045		-
6046		- f.dot = dot;
6047		- */
6048		-
6049		- if (!selectmode)
6050		- {
6051		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6052		- {
6053		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6054		- } else
6055		- {
6056		- gl.glNormal3f(0, 0, 1);
6057		- }
6058		-
6059		- if (c != null)
6060		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6061		- {
6062		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6063		- }
6064		- }
6065		- if (flipV)
6066		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6067		- else
6068		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6069		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6070		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6071		-
6072		- count2 += 2;
6073		- count3 += 3;
6074		- if (!selectmode)
6075		- {
6076		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6077		- {
6078		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6079		- } else
6080		- {
6081		- gl.glNormal3f(0, 0, 1);
6082		- }
6083		- if (c != null)
6084		- {
6085		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6086		- }
6087		- }
6088		- if (flipV)
6089		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6090		- else
6091		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6092		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6093		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6094		-
6095		- count2 += 2;
6096		- count3 += 3;
6097		- for (int j = 0; j < strips[i] - 2; j++)
6098		- {
6099		- //gl.glTexCoord2d(...);
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		- if (c != null)
6110		- {
6111		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6112		- }
6113		- }
6114		-
6115		- if (flipV)
6116		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6117		- else
6118		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6119		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6120		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6121		- count2 += 2;
6122		- count3 += 3;
6123		- }
6124		-
6125		- gl.glEnd();
6126		- }
6127		- }
6128		-
6129		- assert count3 == v.length;
6130		- }
6131		- else // !trimmed
6132		- {
6133		- int count = 0;
6134		- for (int i = 0; i < strips.length; i++)
6135		- {
6136		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6137		-
6138		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6139		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6140		-
6141		- drawVertex(gl, p, selectmode);
6142		- drawVertex(gl, q, selectmode);
6143		-
6144		- for (int j = 0; j < strips[i] - 2; j++)
6145		- {
6146		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6147		-
6148		-// if (j%2 == 0)
6149		-// drawFace(p, q, r, display, null);
6150		-// else
6151		-// drawFace(p, r, q, display, null);
6152		-
6153		-// p = q;
6154		-// q = r;
6155		- drawVertex(gl, r, selectmode);
6156		- }
6157		-
6158		- gl.glEnd();
6159		- }
6160		- }
	6241	+
	6242	+ display.DrawGeometry(bRep, flipV, selectmode);
6161	6243	} else // catch (Error e)
6162	6244	{
6163	6245	// TRIANGLE ARRAY
6164	6246	if (IsOpaque()) // Static())
6165	6247	{
6166		- gl.glBegin(gl.GL_TRIANGLES);
	6248	+ display.StartTriangles();
6167	6249	int facecount = bRep.FaceCount();
6168	6250	for (int i = 0; i < facecount; i++)
6169	6251	{
..	..	@@ -6226,9 +6308,9 @@
6226	6308	// // r.norm.dot(v3) > -0.5)
6227	6309	// // continue;
6228	6310
6229		- drawFace(p, q, r, display, face);
	6311	+ display.DrawFace(this, p, q, r, face);
6230	6312	}
6231		- gl.glEnd();
	6313	+ display.EndTriangles();
6232	6314	}
6233	6315	else
6234	6316	{
..	..	@@ -6257,8 +6339,8 @@
6257	6339	//System.out.println("SORT");
6258	6340
6259	6341	java.util.Arrays.sort(facescompare);
6260		-
6261		- gl.glBegin(gl.GL_TRIANGLES);
	6342	+
	6343	+ display.StartTriangles();
6262	6344	for (int i = 0; i < facecount; i++)
6263	6345	{
6264	6346	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6270,13 +6352,14 @@
6270	6352	Vertex q = bRep.GetVertex(face.q);
6271	6353	Vertex r = bRep.GetVertex(face.r);
6272	6354
6273		- drawFace(p, q, r, display, face);
	6355	+ display.DrawFace(this, p, q, r, face);
6274	6356	}
6275		- gl.glEnd();
	6357	+ display.EndTriangles();
6276	6358	}
6277	6359
6278	6360	if (false) // live && support != null && support.bRep != null) // debug weights
6279	6361	{
	6362	+ /*
6280	6363	gl.glDisable(gl.GL_LIGHTING);
6281	6364	float[] colorV = new float[3];
6282	6365
..	..	@@ -6355,6 +6438,7 @@
6355	6438	// gl.glEnd();
6356	6439	}
6357	6440	}
	6441	+ */
6358	6442	}
6359	6443	}
6360	6444
..	..	@@ -6399,7 +6483,7 @@
6399	6483	center.add(r);
6400	6484	center.mul(1.0/3);
6401	6485
6402		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6486	+ center.sub(Globals.theRenderer.EyeCamera().location);
6403	6487
6404	6488	distance = center.dot(center);
6405	6489	}
..	..	@@ -6410,347 +6494,11 @@
6410	6494
6411	6495	transient FaceCompare[] facescompare = null;
6412	6496
6413		- void SetColor(CameraPane display, Vertex p0)
6414		- {
6415		- if (display.RENDERPROGRAM == 0)
6416		- {
6417		- float r = 0;
6418		- if (bRep != null)
6419		- {
6420		- if (bRep.stripified)
6421		- {
6422		- r = 1;
6423		- }
6424		- }
6425		- float g = 0;
6426		- if (bRep != null)
6427		- {
6428		- if (bRep.trimmed)
6429		- {
6430		- g = 1;
6431		- }
6432		- }
6433		- float b = 0;
6434		- if (support != null && link2master)
6435		- {
6436		- b = 1;
6437		- }
6438		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6439		- return;
6440		- }
6441		-
6442		- if (display.drawMode != CameraPane.SHADOW)
6443		- return;
6444		-
6445		- javax.media.opengl.GL gl = display.GetGL();
6446		-// if (true) return;
6447		-// float ao = p.AO;
6448		-//
6449		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6450		-// // ao = 1;
6451		-//
6452		-// gl.glColor4f(ao, ao, ao, 1);
6453		-
6454		-// CameraPane.selectedpoint.
6455		-// getAverage(cStatic.point1, true);
6456		- if (CameraPane.pointflow == null) // !random) // live)
6457		- {
6458		- return;
6459		- }
6460		-
6461		- cStatic.point1.set(0,0,0);
6462		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6463		-
6464		- cStatic.point1.sub(p0);
6465		-
6466		-
6467		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6468		-// {
6469		-// return;
6470		-// }
6471		-
6472		- //if (true)
6473		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6474		- {
6475		- return;
6476		- }
6477		-
6478		- float[] colorV = new float[3];
6479		-
6480		- if (false) // marked)
6481		- {
6482		- // debug rigging weights
6483		- for (int object = 0; object < p0.vertexlinks.length; object++)
6484		- {
6485		- float weight = p0.weights[object] / p0.totalweight;
6486		-
6487		- // if (weight < 0.1)
6488		- // {
6489		- // assert(weight == 0);
6490		- // continue;
6491		- // }
6492		-
6493		- if (p0.vertexlinks[object] == -1)
6494		- continue;
6495		-
6496		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6497		-
6498		- int color = //1 << object; //
6499		- //p.vertexlinks.length;
6500		- support.bRep.supports[p0.closestsupport].links[object];
6501		- colorV[2] += (color & 1) * weight;
6502		- colorV[1] += ((color & 2) >> 1) * weight;
6503		- colorV[0] += ((color & 4) >> 2) * weight;
6504		- }
6505		- }
6506		- else
6507		- {
6508		- if (drawingstarted)
6509		- {
6510		- // find next point
6511		- if (bRep.GetVertex(0).faceindices == null)
6512		- {
6513		- bRep.InitFaceIndices();
6514		- }
6515		-
6516		- double ymin = p0.y;
6517		-
6518		- Vertex newp = p0;
6519		-
6520		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6521		- {
6522		- int fi = p0.faceindices[fii];
6523		-
6524		- if (fi == -1)
6525		- break;
6526		-
6527		- Face f = bRep.GetFace(fi);
6528		-
6529		- Vertex p = bRep.GetVertex(f.p);
6530		- Vertex q = bRep.GetVertex(f.q);
6531		- Vertex r = bRep.GetVertex(f.r);
6532		-
6533		- int swap = (int)(Math.random()*3);
6534		-
6535		-// for (int s=swap; --s>=0;)
6536		-// {
6537		-// Vertex t = p;
6538		-// p = q;
6539		-// q = r;
6540		-// r = t;
6541		-// }
6542		- if (ymin > p.y)
6543		- {
6544		- ymin = p.y;
6545		- newp = p;
6546		-// break;
6547		- }
6548		- if (ymin > q.y)
6549		- {
6550		- ymin = q.y;
6551		- newp = q;
6552		-// break;
6553		- }
6554		- if (ymin > r.y)
6555		- {
6556		- ymin = r.y;
6557		- newp = r;
6558		-// break;
6559		- }
6560		- }
6561		-
6562		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6563		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6564		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6565		-
6566		- drawingstarted = false;
6567		-
6568		- // return;
6569		- }
6570		-
6571		- if (false) // CameraPane.DRAW
6572		- {
6573		- p0.AO = colorV[0] = 2;
6574		- colorV[1] = 2;
6575		- colorV[2] = 2;
6576		- }
6577		-
6578		- CameraPane.pointflow.add(p0);
6579		- CameraPane.pointflow.Touch();
6580		- }
6581		-
6582		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6583		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6584		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6585		- }
6586		-
6587	6497	void Print(Vertex v)
6588	6498	{
6589	6499	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6590	6500	}
6591	6501
6592		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6593		- {
6594		- if (!selectmode)
6595		- {
6596		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6597		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6598		-
6599		- if (flipV)
6600		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6601		- else
6602		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6603		- }
6604		-
6605		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6606		- }
6607		-
6608		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6609		- CameraPane display, Face face)
6610		- {
6611		- if (pv.y == -10000 \|\|
6612		- qv.y == -10000 \|\|
6613		- rv.y == -10000)
6614		- return;
6615		-
6616		-// float b = f.nbiterations & 1;
6617		-// float g = (f.nbiterations>>1) & 1;
6618		-// float r = (f.nbiterations>>2) & 1;
6619		-//
6620		-// //if (f.weight == 10000)
6621		-// //{
6622		-// // r = 1; g = b = 0;
6623		-// //}
6624		-// //else
6625		-// //{
6626		-// // assert(f.weight < 10000);
6627		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6628		-// if (r<0)
6629		-// assert(r>=0);
6630		-// //}
6631		-
6632		- javax.media.opengl.GL gl = display.GetGL();
6633		-
6634		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6635		-
6636		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6637		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6638		- {
6639		- //gl.glBegin(gl.GL_TRIANGLES);
6640		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6641		- if (!hasnorm)
6642		- {
6643		- // System.out.println("FUCK!!");
6644		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6645		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6646		- LA.vecCross(v0, v1, v2);
6647		- LA.vecNormalize(v2);
6648		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6649		- }
6650		-
6651		- if (hasnorm)
6652		- {
6653		-// if (!pv.norm.normalized())
6654		-// assert(pv.norm.normalized());
6655		-
6656		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6657		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6658		- }
6659		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6660		- SetColor(display, pv);
6661		- //gl.glColor4f(r, g, b, 1);
6662		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6663		- if (flipV)
6664		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6665		- else
6666		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6667		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6668		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6669		-// Print(pv);
6670		- if (hasnorm)
6671		- {
6672		-// assert(qv.norm.normalized());
6673		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6674		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6675		- }
6676		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6677		- // boolean locked = false;
6678		- // float eps = 0.1f;
6679		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6680		-
6681		- // int dot = 0; //*/ (int)f.dot;
6682		-
6683		- // if ((dot&1) == 0)
6684		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6685		-
6686		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6687		- if (flipV)
6688		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6689		- else
6690		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6691		- // else
6692		- // {
6693		- // locked = true;
6694		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6695		- // }
6696		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6697		- SetColor(display, qv);
6698		- //gl.glColor4f(r, g, b, 1);
6699		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6700		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6701		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6702		-// Print(qv);
6703		- if (hasnorm)
6704		- {
6705		-// assert(rv.norm.normalized());
6706		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6707		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6708		- }
6709		-
6710		- // if ((dot&4) == 0)
6711		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6712		-
6713		- // if (wrap \|\| !locked && (dot&8) != 0)
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6716		- else
6717		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6718		- // else
6719		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6720		-
6721		- // f.dot = dot;
6722		-
6723		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6724		- SetColor(display, rv);
6725		- //gl.glColor4f(r, g, b, 1);
6726		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6727		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6728		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6729		-// Print(rv);
6730		- //gl.glEnd();
6731		- }
6732		- else
6733		- {
6734		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6735		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6736		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6737		-
6738		- }
6739		-
6740		- if (false) // (attributes & WIREFRAME) != 0)
6741		- {
6742		- gl.glDisable(gl.GL_LIGHTING);
6743		-
6744		- gl.glBegin(gl.GL_LINE_LOOP);
6745		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6746		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6747		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6748		- gl.glEnd();
6749		-
6750		- gl.glEnable(gl.GL_LIGHTING);
6751		- }
6752		- }
6753		-
6754	6502	void drawSelf(ClickInfo info, int level, boolean select)
6755	6503	{
6756	6504	if (bRep == null)
..	..	@@ -7322,83 +7070,83 @@
7322	7070	int spotw = spot.x + spot.width;
7323	7071	int spoth = spot.y + spot.height;
7324	7072	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7325		- if (CameraPane.Xmin > spot.x)
7326		- {
7327		- CameraPane.Xmin = spot.x;
7328		- }
7329		- if (CameraPane.Xmax < spotw)
7330		- {
7331		- CameraPane.Xmax = spotw;
7332		- }
7333		- if (CameraPane.Ymin > spot.y)
7334		- {
7335		- CameraPane.Ymin = spot.y;
7336		- }
7337		- if (CameraPane.Ymax < spoth)
7338		- {
7339		- CameraPane.Ymax = spoth;
7340		- }
	7073	+// if (CameraPane.Xmin > spot.x)
	7074	+// {
	7075	+// CameraPane.Xmin = spot.x;
	7076	+// }
	7077	+// if (CameraPane.Xmax < spotw)
	7078	+// {
	7079	+// CameraPane.Xmax = spotw;
	7080	+// }
	7081	+// if (CameraPane.Ymin > spot.y)
	7082	+// {
	7083	+// CameraPane.Ymin = spot.y;
	7084	+// }
	7085	+// if (CameraPane.Ymax < spoth)
	7086	+// {
	7087	+// CameraPane.Ymax = spoth;
	7088	+// }
7341	7089	spot.translate(32, 32);
7342	7090	spotw = spot.x + spot.width;
7343	7091	spoth = spot.y + spot.height;
7344	7092	info.g.setColor(Color.blue);
7345	7093	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7346		- if (CameraPane.Xmin > spot.x)
7347		- {
7348		- CameraPane.Xmin = spot.x;
7349		- }
7350		- if (CameraPane.Xmax < spotw)
7351		- {
7352		- CameraPane.Xmax = spotw;
7353		- }
7354		- if (CameraPane.Ymin > spot.y)
7355		- {
7356		- CameraPane.Ymin = spot.y;
7357		- }
7358		- if (CameraPane.Ymax < spoth)
7359		- {
7360		- CameraPane.Ymax = spoth;
7361		- }
7362		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7363		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7094	+// if (CameraPane.Xmin > spot.x)
	7095	+// {
	7096	+// CameraPane.Xmin = spot.x;
	7097	+// }
	7098	+// if (CameraPane.Xmax < spotw)
	7099	+// {
	7100	+// CameraPane.Xmax = spotw;
	7101	+// }
	7102	+// if (CameraPane.Ymin > spot.y)
	7103	+// {
	7104	+// CameraPane.Ymin = spot.y;
	7105	+// }
	7106	+// if (CameraPane.Ymax < spoth)
	7107	+// {
	7108	+// CameraPane.Ymax = spoth;
	7109	+// }
	7110	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	7111	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7364	7112	spot.translate(0, -32);
7365	7113	info.g.setColor(Color.green);
7366	7114	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7367		- if (CameraPane.Xmin > spot.x)
7368		- {
7369		- CameraPane.Xmin = spot.x;
7370		- }
7371		- if (CameraPane.Xmax < spotw)
7372		- {
7373		- CameraPane.Xmax = spotw;
7374		- }
7375		- if (CameraPane.Ymin > spot.y)
7376		- {
7377		- CameraPane.Ymin = spot.y;
7378		- }
7379		- if (CameraPane.Ymax < spoth)
7380		- {
7381		- CameraPane.Ymax = spoth;
7382		- }
	7115	+// if (CameraPane.Xmin > spot.x)
	7116	+// {
	7117	+// CameraPane.Xmin = spot.x;
	7118	+// }
	7119	+// if (CameraPane.Xmax < spotw)
	7120	+// {
	7121	+// CameraPane.Xmax = spotw;
	7122	+// }
	7123	+// if (CameraPane.Ymin > spot.y)
	7124	+// {
	7125	+// CameraPane.Ymin = spot.y;
	7126	+// }
	7127	+// if (CameraPane.Ymax < spoth)
	7128	+// {
	7129	+// CameraPane.Ymax = spoth;
	7130	+// }
7383	7131	info.g.drawArc(boundary.x, boundary.y,
7384	7132	boundary.width, boundary.height, 0, 360);
7385	7133	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7386		- if (CameraPane.Xmin > boundary.x)
7387		- {
7388		- CameraPane.Xmin = boundary.x;
7389		- }
7390		- if (CameraPane.Xmax < boundary.x + boundary.width)
7391		- {
7392		- CameraPane.Xmax = boundary.x + boundary.width;
7393		- }
7394		- if (CameraPane.Ymin > boundary.y)
7395		- {
7396		- CameraPane.Ymin = boundary.y;
7397		- }
7398		- if (CameraPane.Ymax < boundary.y + boundary.height)
7399		- {
7400		- CameraPane.Ymax = boundary.y + boundary.height;
7401		- }
	7134	+// if (CameraPane.Xmin > boundary.x)
	7135	+// {
	7136	+// CameraPane.Xmin = boundary.x;
	7137	+// }
	7138	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7139	+// {
	7140	+// CameraPane.Xmax = boundary.x + boundary.width;
	7141	+// }
	7142	+// if (CameraPane.Ymin > boundary.y)
	7143	+// {
	7144	+// CameraPane.Ymin = boundary.y;
	7145	+// }
	7146	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7147	+// {
	7148	+// CameraPane.Ymax = boundary.y + boundary.height;
	7149	+// }
7402	7150	return;
7403	7151	}
7404	7152	}
..	..	@@ -7415,7 +7163,7 @@
7415	7163	startX = info.x;
7416	7164	startY = info.y;
7417	7165
7418		- hitSomething = 0;
	7166	+ hitSomething = -1;
7419	7167	cVector origin = new cVector();
7420	7168	//LA.xformPos(origin, toParent, origin);
7421	7169	Rectangle spot = new Rectangle();
..	..	@@ -7448,7 +7196,7 @@
7448	7196	}
7449	7197
7450	7198	//System.out.println("info.modifiers = " + info.modifiers);
7451		- modified = (info.modifiers & CameraPane.META) != 0;
	7199	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7452	7200	//System.out.println("modified = " + modified);
7453	7201	//new Exception().printStackTrace();
7454	7202	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7476,7 +7224,7 @@
7476	7224	return true;
7477	7225	}
7478	7226
7479		- void doEditDrag0(ClickInfo info)
	7227	+ void doEditDrag0(ClickInfo info, boolean opposite)
7480	7228	{
7481	7229	if (hitSomething == 0)
7482	7230	{
..	..	@@ -7491,6 +7239,7 @@
7491	7239	//System.out.println("hitSomething = " + hitSomething);
7492	7240
7493	7241	double scale = 0.005f * info.camera.Distance();
	7242	+
7494	7243	cVector xlate = new cVector();
7495	7244	//cVector xlate2 = new cVector();
7496	7245	switch (hitSomething)
..	..	@@ -7501,9 +7250,9 @@
7501	7250
7502	7251	case hitCenter: // Translate
7503	7252
7504		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7253	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7505	7254
7506		- if (modified)
	7255	+ if (modified \|\| opposite)
7507	7256	{
7508	7257	//assert(false);
7509	7258	/*
..	..	@@ -7549,10 +7298,10 @@
7549	7298	}
7550	7299	LA.xformDir(up, ClickInfo.matbuffer, up);
7551	7300	// if (!CameraPane.LOCALTRANSFORM)
7552		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7301	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7553	7302	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7554	7303	// if (!CameraPane.LOCALTRANSFORM)
7555		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7304	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7556	7305	//LA.vecCross(up, cVector.Z, right2);
7557	7306
7558	7307	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7597,6 +7346,7 @@
7597	7346
7598	7347	if (modified)
7599	7348	{
	7349	+ // Rotate 90 degrees
7600	7350	angle /= (Math.PI / 4);
7601	7351	angle = Math.floor(angle + 0.5);
7602	7352	angle *= (Math.PI / 4);
..	..	@@ -7610,7 +7360,7 @@
7610	7360	}
7611	7361	/**/
7612	7362
7613		- switch (info.pane.renderCamera.viewCode)
	7363	+ switch (info.pane.RenderCamera().viewCode)
7614	7364	{
7615	7365	case 1: // '\001'
7616	7366	LA.matZRotate(toParent, angle);
..	..	@@ -7638,24 +7388,27 @@
7638	7388
7639	7389	case hitScale: // scale
7640	7390	double hScale = (double) (info.x - centerPt.x) / 32;
	7391	+ double sign = 1;
	7392	+ if (hScale < 0)
	7393	+ {
	7394	+ sign = -1;
	7395	+ }
	7396	+ hScale = signMath.pow(signhScale, scale * 50);
7641	7397	if (hScale < 0.01)
7642	7398	{
7643		- hScale = 0.01;
	7399	+ //hScale = 0.01;
7644	7400	}
7645		- hScale = Math.pow(hScale, scale * 50);
7646		- if (hScale < 0.01)
7647		- {
7648		- hScale = 0.01;
7649		- }
	7401	+
7650	7402	double vScale = (double) (info.y - centerPt.y) / 32;
7651		- if (vScale < 0.01)
	7403	+ sign = 1;
	7404	+ if (vScale < 0)
7652	7405	{
7653		- vScale = 0.01;
	7406	+ sign = -1;
7654	7407	}
7655		- vScale = Math.pow(vScale, scale * 50);
	7408	+ vScale = signMath.pow(signvScale, scale * 50);
7656	7409	if (vScale < 0.01)
7657	7410	{
7658		- vScale = 0.01;
	7411	+ //vScale = 0.01;
7659	7412	}
7660	7413	LA.matCopy(startMat, toParent);
7661	7414	/**/
..	..	@@ -7666,17 +7419,24 @@
7666	7419	}
7667	7420	/**/
7668	7421
7669		- switch (info.pane.renderCamera.viewCode)
	7422	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7423	+
	7424	+ if (totalScale < 0.01)
	7425	+ {
	7426	+ totalScale = 0.01;
	7427	+ }
	7428	+
	7429	+ switch (info.pane.RenderCamera().viewCode)
7670	7430	{
7671	7431	case 3: // '\001'
7672	7432	if (modified)
7673	7433	{
7674	7434	//LA.matScale(toParent, 1, hScale, vScale);
7675		- LA.matScale(toParent, vScale, 1, 1);
	7435	+ LA.matScale(toParent, totalScale, 1, 1);
7676	7436	} // vScale, 1);
7677	7437	else
7678	7438	{
7679		- LA.matScale(toParent, vScale, vScale, vScale);
	7439	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7680	7440	} // vScale, 1);
7681	7441	break;
7682	7442
..	..	@@ -7684,10 +7444,10 @@
7684	7444	if (modified)
7685	7445	{
7686	7446	//LA.matScale(toParent, hScale, 1, vScale);
7687		- LA.matScale(toParent, 1, vScale, 1);
	7447	+ LA.matScale(toParent, 1, totalScale, 1);
7688	7448	} else
7689	7449	{
7690		- LA.matScale(toParent, vScale, 1, vScale);
	7450	+ LA.matScale(toParent, totalScale, 1, totalScale);
7691	7451	}
7692	7452	break;
7693	7453
..	..	@@ -7695,10 +7455,10 @@
7695	7455	if (modified)
7696	7456	{
7697	7457	//LA.matScale(toParent, hScale, vScale, 1);
7698		- LA.matScale(toParent, 1, 1, vScale);
	7458	+ LA.matScale(toParent, 1, 1, totalScale);
7699	7459	} else
7700	7460	{
7701		- LA.matScale(toParent, vScale, vScale, 1);
	7461	+ LA.matScale(toParent, totalScale, totalScale, 1);
7702	7462	}
7703	7463	break;
7704	7464	}
..	..	@@ -7719,7 +7479,7 @@
7719	7479	if (parent == null)
7720	7480	{
7721	7481	System.out.println("NULL PARENT");
7722		- new Exception().printStackTrace();
	7482	+ //new Exception().printStackTrace();
7723	7483	} else
7724	7484	{
7725	7485	if (parent instanceof BezierPatch)
..	..	@@ -7735,8 +7495,15 @@
7735	7495	info.pane.repaint();
7736	7496	}
7737	7497
	7498	+ boolean overflow = false;
	7499	+
7738	7500	void TransformToWorld(cVector out) // , cVector out)
7739	7501	{
	7502	+ if (overflow)
	7503	+ return;
	7504	+
	7505	+ overflow = true;
	7506	+
7740	7507	// june 2013 ??? assert (in == out);
7741	7508	cVector in = out;
7742	7509	if (toParent != null && !(this instanceof Texture \|\| this instanceof TextureNode))
..	..	@@ -7753,6 +7520,8 @@
7753	7520	{
7754	7521	(parent!=null?parent:fileparent).TransformToWorld(out); //, out);
7755	7522	}
	7523	+
	7524	+ overflow = false;
7756	7525	}
7757	7526
7758	7527	void TransformToLocal(cVector out) //, cVector out)
..	..	@@ -7822,14 +7591,22 @@
7822	7591	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7823	7592	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7824	7593	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7594	+
	7595	+ String objname;
	7596	+
7825	7597	if (false) //parent != null)
7826	7598	{
7827		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7599	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7828	7600	} else
7829	7601	{
7830		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7602	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7831	7603	} // + super.toString();
7832	7604	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7605	+
	7606	+ if (!Globals.ADVANCED)
	7607	+ return objname;
	7608	+
	7609	+ return objname + " " + System.identityHashCode(this);
7833	7610	}
7834	7611
7835	7612	public int hashCode()
..	..	@@ -7885,6 +7662,7 @@
7885	7662	objectUI.closeUI();
7886	7663	if (editWindow != null)
7887	7664	{
	7665	+ editWindow.ctrlPanel.FlushUI();
7888	7666	editWindow.refreshContents();
7889	7667	} // ? new
7890	7668	objectUI = null;
..	..	@@ -7905,7 +7683,7 @@
7905	7683	/transient/ cVector2[] projectedVertices = new cVector2[0];
7906	7684
7907	7685	Object3D /Composite/ parent;
7908		- Object3D /Composite/ fileparent;
	7686	+ Object3D /Composite/ fileparent; // In the case of FileObject
7909	7687
7910	7688	double[][] toParent; // dynamic matrix
7911	7689	double[][] fromParent;
..	..	@@ -7995,19 +7773,22 @@
7995	7773	max = new cVector();
7996	7774	}
7997	7775
7998		- Object3D sourcenode = GetFileRoot();
7999		-
8000		- if (!sourcenode.name.contains("rclab"))
	7776	+ if (false) // Can crawl!!
8001	7777	{
8002		- getBounds(min, max, true);
	7778	+ Object3D sourcenode = GetFileRoot();
8003	7779
8004		- if (min.y != Double.POSITIVE_INFINITY && min.y > 2)
	7780	+ if (sourcenode != null && !sourcenode.name.contains("rclab"))
8005	7781	{
8006		-// sourcenode.getBounds(min, max, true);
8007		- sourcenode.getBounds(v0, v1, true);
8008		-// sourcenode.toParent = sourcenode.toParent;
8009		-// get(0).toParent = get(0).toParent;
8010		-// sourcenode.GlobalTransform();
	7782	+ getBounds(min, max, true);
	7783	+
	7784	+ if (min.y != Double.POSITIVE_INFINITY && min.y > 2)
	7785	+ {
	7786	+ // sourcenode.getBounds(min, max, true);
	7787	+ sourcenode.getBounds(v0, v1, true);
	7788	+ // sourcenode.toParent = sourcenode.toParent;
	7789	+ // get(0).toParent = get(0).toParent;
	7790	+ // sourcenode.GlobalTransform();
	7791	+ }
8011	7792	}
8012	7793	}
8013	7794
..	..	@@ -8016,7 +7797,8 @@
8016	7797	if (support != null)
8017	7798	{
8018	7799	assert(bRep != null);
8019		- GraphreeD.Assert(support.bRep == bRep.support);
	7800	+ if (!(support instanceof GenericJoint)) // support.bRep != null)
	7801	+ Grafreed.Assert(support.bRep == bRep.support);
8020	7802	}
8021	7803	else
8022	7804	{
..	..	@@ -8065,9 +7847,9 @@
8065	7847	private static cVector edge2 = new cVector();
8066	7848	//private static cVector norm = new cVector();
8067	7849	/transient private/ int hitSomething;
8068		- private static final int hitCenter = 1;
8069		- private static final int hitScale = 2;
8070		- private static final int hitRotate = 3;
	7850	+ static final int hitCenter = 1;
	7851	+ static final int hitScale = 2;
	7852	+ static final int hitRotate = 3;
8071	7853	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8072	7854	/transient/ private Point centerPt;
8073	7855	/transient/ private int startX;
..	..	@@ -8099,6 +7881,8 @@
8099	7881	{
8100	7882	Object3D targ = this;
8101	7883
	7884	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7885	+
8102	7886	if (obj.material != null)
8103	7887	{
8104	7888	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))