~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	+ Grafreed.Assert(this.bRep == o.bRep);
	178	+ if (this.bRep != null)
	179	+ assert(this.bRep.support == o.transientrep);
	180	+
	181	+ return;
	182	+ }
	183	+
	184	+ Object3D o = new Object3D();
	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;
..	..	@@ -285,8 +380,8 @@
285	380	return parent.GetName() + "#";
286	381	}
287	382
288		- boolean timeline = false;
289	383	boolean live = false;
	384	+ boolean dontselect = false;
290	385	boolean hide = false;
291	386	boolean link2master = false; // performs reset support/master at each frame
292	387	boolean marked = false; // animation node
..	..	@@ -296,6 +391,8 @@
296	391	boolean random = false;
297	392	boolean speedup = false;
298	393	boolean rewind = false;
	394	+
	395	+ float NORMALPUSH = 0;
299	396
300	397	Object3D support;
301	398
..	..	@@ -416,16 +513,16 @@
416	513	{
417	514	Object3D copy = this;
418	515
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	516	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	517
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	518	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	519	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	520	+ parentcam = Globals.theRenderer.Cameras()[1];
424	521	}
425	522
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	523	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	524	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	525	+ parentcam = Globals.theRenderer.Cameras()[0];
429	526	}
430	527
431	528	if (this == parentcam)
..	..	@@ -433,7 +530,7 @@
433	530	//assert(this instanceof Camera);
434	531
435	532	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	533	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	534	}
438	535
439	536	copy.marked ^= true;
..	..	@@ -453,7 +550,7 @@
453	550	//assert(this instanceof Camera);
454	551
455	552	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	553	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	554	}
458	555
459	556	copy.Touch(); // display list issue
..	..	@@ -466,12 +563,14 @@
466	563	toParent = LA.newMatrix();
467	564	fromParent = LA.newMatrix();
468	565	}
	566	+
469	567	if (toParentMarked == null)
470	568	{
471	569	if (maxcount != 1)
472	570	{
473	571	new Exception().printStackTrace();
474	572	}
	573	+
475	574	toParentMarked = LA.newMatrix();
476	575	fromParentMarked = LA.newMatrix();
477	576	}
..	..	@@ -588,7 +687,7 @@
588	687	return;
589	688	}
590	689
591		- if (CameraPane.fromscript)
	690	+ if (Globals.fromscript)
592	691	{
593	692	transformcount = 0;
594	693	return;
..	..	@@ -746,7 +845,7 @@
746	845
747	846	int GetTransformCount()
748	847	{
749		- // marde pour serialization de Texture
	848	+ // patch pour serialization de Texture
750	849	resetmaxcount();
751	850	resettransformcount();
752	851	resetstep();
..	..	@@ -759,7 +858,7 @@
759	858	if (step == 0)
760	859	step = 1;
761	860	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	861	+ maxcount = 128; // 2048; // 4;
763	862	// if (acceleration == 0)
764	863	// acceleration = 10;
765	864	if (delay == 0) // serial
..	..	@@ -780,9 +879,12 @@
780	879	// factor = CameraPane.STEP;
781	880	// }
782	881
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	882	+ if (marked && Globals.isLIVE() && live &&
	883	+ //TEMP21aug2018
	884	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	885	+ currentframe != Globals.framecount)
784	886	{
785		- currentframe = CameraPane.framecount;
	887	+ currentframe = Globals.framecount;
786	888
787	889	// System.err.println("transformcount = " + transformcount);
788	890	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +893,8 @@
791	893
792	894	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	895
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	896	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	897	+ (step == 1 && changedir))
795	898	{
796	899	countdown = 1;
797	900	delay = speedup?8:1;
..	..	@@ -894,6 +997,11 @@
894	997	fromParent = null; // LA.newMatrix();
895	998	bRep = null; // new BoundaryRep();
896	999
	1000	+ if (oname != null && oname.equals("LeftHand"))
	1001	+ {
	1002	+ name = oname;
	1003	+ }
	1004	+
897	1005	/*
898	1006	float hue = (float)Math.random();
899	1007	Color col;
..	..	@@ -936,7 +1044,7 @@
936	1044
937	1045	public Object clone()
938	1046	{
939		- return GrafreeD.clone(this);
	1047	+ return Grafreed.clone(this);
940	1048	}
941	1049
942	1050	Object3D copyExpand()
..	..	@@ -1452,7 +1560,7 @@
1452	1560	BoundaryRep.SEUIL = other.material.cameralight;
1453	1561
1454	1562	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1563	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1564	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1565	}
1458	1566
..	..	@@ -1711,7 +1819,7 @@
1711	1819	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1820	o.bRep = transientrep;
1713	1821	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1822	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1823	o.CreateMaterial();
1716	1824	o.SetAttributes(this, -1);
1717	1825	//parent
..	..	@@ -1724,7 +1832,7 @@
1724	1832	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1833	o.bRep = bRep;
1726	1834	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1835	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1836	o.CreateMaterial();
1729	1837	//o.overwriteThis(this, -1);
1730	1838	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1919,15 @@
1811	1919	if (obj.name == null)
1812	1920	continue; // can't be a null one
1813	1921
	1922	+ // Try perfect match first.
1814	1923	if (n.equals(obj.name))
1815	1924	{
1816	1925	theobj = obj;
1817	1926	count++;
1818	1927	}
1819	1928	}
	1929	+
	1930	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	1931
1821	1932	if (count != 1)
1822	1933	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2242,8 @@
2131	2242	if (/parent != null &&/ material == null)
2132	2243	{
2133	2244	material = new cMaterial(GetMaterial());
2134		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2135		- {
2136		- projectedVertices = new Object3D.cVector2[3];
2137		- }
2138		- for (int i = 0; i < 3; i++)
2139		- {
2140		- projectedVertices[i] = new cVector2(); // Others
2141		- }
2142		- projectedVertices[0].x = 100; // bump
	2245	+
	2246	+ InitOthers();
2143	2247
2144	2248	if (this instanceof Camera)
2145	2249	{
..	..	@@ -2289,6 +2393,7 @@
2289	2393	{
2290	2394	if (newWindow)
2291	2395	{
	2396	+ new Exception().printStackTrace();
2292	2397	System.exit(0);
2293	2398	if (parent != null)
2294	2399	{
..	..	@@ -2465,13 +2570,13 @@
2465	2570	return retval;
2466	2571	}
2467	2572
2468		- void doEditDrag(ClickInfo info)
	2573	+ void doEditDrag(ClickInfo info, boolean opposite)
2469	2574	{
2470	2575	switch (doSomething)
2471	2576	{
2472	2577	case 1: // '\001'
2473	2578	//super.
2474		- doEditDrag0(info);
	2579	+ doEditDrag0(info, opposite);
2475	2580	break;
2476	2581
2477	2582	case 2: // '\002'
..	..	@@ -2484,11 +2589,11 @@
2484	2589	{
2485	2590	//sel.hitSomething = childToDrag.hitSomething;
2486	2591	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2592	+ sel.doEditDrag(info, opposite);
2488	2593	} else
2489	2594	{
2490	2595	//super.
2491		- doEditDrag0(info);
	2596	+ doEditDrag0(info, opposite);
2492	2597	}
2493	2598	}
2494	2599	break;
..	..	@@ -2598,6 +2703,18 @@
2598	2703	void GenNormalsS(boolean crease)
2599	2704	{
2600	2705	selection.GenNormals(crease);
	2706	+// for (int i=0; i<selection.size(); i++)
	2707	+// {
	2708	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2709	+// selectee.GenNormals(crease);
	2710	+// }
	2711	+
	2712	+ //Touch();
	2713	+ }
	2714	+
	2715	+ void GenNormalsMeshS()
	2716	+ {
	2717	+ selection.GenNormalsMesh();
2601	2718	// for (int i=0; i<selection.size(); i++)
2602	2719	// {
2603	2720	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2855,24 @@
2738	2855	if (child == null)
2739	2856	continue;
2740	2857	child.GenNormals(crease);
	2858	+// Children().release(i);
	2859	+ }
	2860	+ blockloop = false;
	2861	+ }
	2862	+
	2863	+ void GenNormalsMesh()
	2864	+ {
	2865	+ if (blockloop)
	2866	+ return;
	2867	+
	2868	+ blockloop = true;
	2869	+ GenNormalsMesh0();
	2870	+ for (int i = 0; i < Children().Size(); i++)
	2871	+ {
	2872	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2873	+ if (child == null)
	2874	+ continue;
	2875	+ child.GenNormalsMesh();
2741	2876	// Children().release(i);
2742	2877	}
2743	2878	blockloop = false;
..	..	@@ -2895,7 +3030,8 @@
2895	3030	{
2896	3031	if (bRep != null)
2897	3032	{
2898		- bRep.GenUV();
	3033	+ bRep.GenUV(); //1);
	3034	+ //bRep.UnfoldUV();
2899	3035	Touch();
2900	3036	}
2901	3037	}
..	..	@@ -2905,6 +3041,15 @@
2905	3041	if (bRep != null)
2906	3042	{
2907	3043	bRep.GenerateNormals(crease);
	3044	+ Touch();
	3045	+ }
	3046	+ }
	3047	+
	3048	+ void GenNormalsMesh0()
	3049	+ {
	3050	+ if (bRep != null)
	3051	+ {
	3052	+ bRep.GenerateNormalsMesh();
2908	3053	Touch();
2909	3054	}
2910	3055	}
..	..	@@ -2970,6 +3115,33 @@
2970	3115	blockloop = false;
2971	3116	}
2972	3117
	3118	+ void TransformChildren()
	3119	+ {
	3120	+ if (toParent != null)
	3121	+ {
	3122	+ for (int i=Size(); --i>=0;)
	3123	+ {
	3124	+ Object3D v = get(i);
	3125	+
	3126	+ if (v.toParent == null)
	3127	+ {
	3128	+ v.toParent = LA.newMatrix();
	3129	+ v.fromParent = LA.newMatrix();
	3130	+ }
	3131	+
	3132	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3133	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3134	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3135	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3136	+ }
	3137	+
	3138	+ toParent = null; // LA.matIdentity(toParent);
	3139	+ fromParent = null; // LA.matIdentity(fromParent);
	3140	+
	3141	+ Touch();
	3142	+ }
	3143	+ }
	3144	+
2973	3145	void TransformGeometry()
2974	3146	{
2975	3147	Object3D obj = this;
..	..	@@ -3191,9 +3363,11 @@
3191	3363
3192	3364	BoundaryRep sup = bRep.support;
3193	3365	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3366	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3367	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3368	+
	3369	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3370	+
3197	3371	bRep = temprep;
3198	3372	bRep.support = sup;
3199	3373	Touch();
..	..	@@ -3330,7 +3504,8 @@
3330	3504	if (blockloop)
3331	3505	return;
3332	3506
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3507	+ if (//marked \|\| // does not make sense
	3508	+ (bRep != null \|\| material != null)) // borderline...
3334	3509	live = h;
3335	3510
3336	3511	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3526,8 @@
3351	3526	return;
3352	3527
3353	3528	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3529	+ if (//marked \|\| // does not make sense
	3530	+ (bRep != null \|\| material != null)) // borderline...
3355	3531	link2master = h;
3356	3532
3357	3533	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3547,8 @@
3371	3547	if (blockloop)
3372	3548	return;
3373	3549
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3550	+ if (//marked \|\| // does not make sense
	3551	+ (bRep != null \|\| material != null)) // borderline...
3375	3552	hide = h;
3376	3553
3377	3554	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3568,7 @@
3391	3568	if (blockloop)
3392	3569	return;
3393	3570
3394		- if (bRep != null && material != null) // borderline...
	3571	+ if (bRep != null \|\| material != null) // borderline...
3395	3572	marked = h;
3396	3573
3397	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3578,46 @@
3401	3578	continue;
3402	3579	blockloop = true;
3403	3580	child.MarkLeaves(h);
	3581	+ blockloop = false;
	3582	+ // release(i);
	3583	+ }
	3584	+ }
	3585	+
	3586	+ void RewindLeaves(boolean h)
	3587	+ {
	3588	+ if (blockloop)
	3589	+ return;
	3590	+
	3591	+ if (bRep != null \|\| material != null) // borderline...
	3592	+ rewind = h;
	3593	+
	3594	+ for (int i = 0; i < Size(); i++)
	3595	+ {
	3596	+ Object3D child = (Object3D) get(i); // reserve(i);
	3597	+ if (child == null)
	3598	+ continue;
	3599	+ blockloop = true;
	3600	+ child.RewindLeaves(h);
	3601	+ blockloop = false;
	3602	+ // release(i);
	3603	+ }
	3604	+ }
	3605	+
	3606	+ void RandomLeaves(boolean h)
	3607	+ {
	3608	+ if (blockloop)
	3609	+ return;
	3610	+
	3611	+ if (bRep != null \|\| material != null) // borderline...
	3612	+ random = h;
	3613	+
	3614	+ for (int i = 0; i < Size(); i++)
	3615	+ {
	3616	+ Object3D child = (Object3D) get(i); // reserve(i);
	3617	+ if (child == null)
	3618	+ continue;
	3619	+ blockloop = true;
	3620	+ child.RandomLeaves(h);
3404	3621	blockloop = false;
3405	3622	// release(i);
3406	3623	}
..	..	@@ -3715,7 +3932,7 @@
3715	3932	if (child == null)
3716	3933	continue;
3717	3934
3718		- if (GrafreeD.RENDERME > 0)
	3935	+ if (Grafreed.RENDERME > 0)
3719	3936	{
3720	3937	if (child instanceof Merge)
3721	3938	((Merge)child).renderme();
..	..	@@ -3866,7 +4083,7 @@
3866	4083	if (child == null)
3867	4084	continue;
3868	4085
3869		- if (GrafreeD.RENDERME > 0)
	4086	+ if (Grafreed.RENDERME > 0)
3870	4087	{
3871	4088	if (child instanceof Merge)
3872	4089	((Merge)child).renderme();
..	..	@@ -4061,7 +4278,7 @@
4061	4278	if (child == null)
4062	4279	continue;
4063	4280
4064		- if (GrafreeD.RENDERME > 0)
	4281	+ if (Grafreed.RENDERME > 0)
4065	4282	{
4066	4283	if (child instanceof Merge)
4067	4284	((Merge)child).renderme();
..	..	@@ -4158,6 +4375,71 @@
4158	4375	}
4159	4376	blockloop = true;
4160	4377	get(i).RepairParent();
	4378	+ blockloop = false;
	4379	+ }
	4380	+ }
	4381	+
	4382	+ void RepairShadow()
	4383	+ {
	4384	+ if (blockloop)
	4385	+ return;
	4386	+
	4387	+ if (this.material != null)
	4388	+ this.InitOthers();
	4389	+
	4390	+ for (int i=0; i<Size(); i++)
	4391	+ {
	4392	+ blockloop = true;
	4393	+ get(i).RepairShadow();
	4394	+ blockloop = false;
	4395	+ }
	4396	+ }
	4397	+
	4398	+ void RepairSOV()
	4399	+ {
	4400	+ if (blockloop)
	4401	+ return;
	4402	+
	4403	+ String texname = this.GetPigmentTexture();
	4404	+
	4405	+ if (texname.startsWith("sov"))
	4406	+ {
	4407	+ String[] s = texname.split("/");
	4408	+
	4409	+ String[] sname = s[1].split("Color.pn");
	4410	+
	4411	+ texname = sname[0];
	4412	+
	4413	+ if (sname.length > 1)
	4414	+ {
	4415	+ texname += "Color.jpg";
	4416	+ }
	4417	+
	4418	+ this.SetPigmentTexture("sov/" + texname);
	4419	+ }
	4420	+
	4421	+ texname = this.GetBumpTexture();
	4422	+
	4423	+ if (texname.startsWith("sov"))
	4424	+ {
	4425	+ String[] s = texname.split("/");
	4426	+
	4427	+ String[] sname = s[1].split("Bump.pn");
	4428	+
	4429	+ texname = sname[0];
	4430	+
	4431	+ if (sname.length > 1)
	4432	+ {
	4433	+ texname += "Bump.jpg";
	4434	+ }
	4435	+
	4436	+ this.SetBumpTexture("sov/" + texname);
	4437	+ }
	4438	+
	4439	+ for (int i=0; i<Size(); i++)
	4440	+ {
	4441	+ blockloop = true;
	4442	+ get(i).RepairSOV();
4161	4443	blockloop = false;
4162	4444	}
4163	4445	}
..	..	@@ -4652,7 +4934,7 @@
4652	4934
4653	4935	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	4936	{
4655		- if (hide)
	4937	+ if (hide \|\| dontselect)
4656	4938	return null;
4657	4939
4658	4940	if (count <= 0)
..	..	@@ -4678,7 +4960,7 @@
4678	4960
4679	4961	cTreePath Select(int indexcount, boolean deselect)
4680	4962	{
4681		- if (hide)
	4963	+ if (hide \|\| dontselect)
4682	4964	return null;
4683	4965
4684	4966	if (count <= 0)
..	..	@@ -4828,7 +5110,7 @@
4828	5110	return globalTransform;
4829	5111	}
4830	5112
4831		- void PreprocessOcclusion(CameraPane cp)
	5113	+ void PreprocessOcclusion(iCameraPane cp)
4832	5114	{
4833	5115	/*
4834	5116	if (AOdone)
..	..	@@ -4975,7 +5257,8 @@
4975	5257	} else //
4976	5258	if (editWindow != null)
4977	5259	{
4978		- editWindow.cameraView.lighttouched = true;
	5260	+ //editWindow.cameraView.lighttouched = true;
	5261	+ Globals.lighttouched = true;
4979	5262	}
4980	5263	}
4981	5264
..	..	@@ -5129,10 +5412,34 @@
5129	5412
5130	5413	// System.out.println("Fullname = " + fullname);
5131	5414
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5415	+ // Does not work on Windows due to C:
	5416	+// if (fullname.name.indexOf(":") == -1)
	5417	+// return fullname.name;
	5418	+//
	5419	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5420
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5421	+ String[] split = fullname.name.split(":");
	5422	+
	5423	+ if (split.length == 0)
	5424	+ {
	5425	+ return "";
	5426	+ }
	5427	+
	5428	+ if (split.length <= 2)
	5429	+ {
	5430	+ if (fullname.name.endsWith(":"))
	5431	+ {
	5432	+ // Windows
	5433	+ return fullname.name.substring(0, fullname.name.length()-1);
	5434	+ }
	5435	+
	5436	+ return split[0];
	5437	+ }
	5438	+
	5439	+ // Windows
	5440	+ assert(split.length == 4);
	5441	+
	5442	+ return split[0] + ":" + split[1];
5136	5443	}
5137	5444
5138	5445	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5448,38 @@
5141	5448	return "";
5142	5449
5143	5450	// System.out.println("Fullname = " + fullname);
5144		- if (fullname.name.indexOf(":") == -1)
5145		- return "";
5146		-
5147		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5451	+ // Does not work on Windows due to C:
	5452	+// if (fullname.name.indexOf(":") == -1)
	5453	+// return "";
	5454	+//
	5455	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5456	+ String[] split = fullname.name.split(":");
	5457	+
	5458	+ if (split.length == 0)
	5459	+ {
	5460	+ return "";
	5461	+ }
	5462	+
	5463	+ if (split.length == 1)
	5464	+ {
	5465	+ return "";
	5466	+ }
	5467	+
	5468	+ if (split.length == 2)
	5469	+ {
	5470	+ if (fullname.name.endsWith(":"))
	5471	+ {
	5472	+ // Windows
	5473	+ return "";
	5474	+ }
	5475	+
	5476	+ return split[1];
	5477	+ }
	5478	+
	5479	+ // Windows
	5480	+ assert(split.length == 4);
	5481	+
	5482	+ return split[2] + ":" + split[3];
5148	5483	}
5149	5484
5150	5485	String GetPigmentTexture()
..	..	@@ -5218,7 +5553,7 @@
5218	5553	System.out.print("; textures = " + textures);
5219	5554	System.out.println("; usedtextures = " + usedtextures);
5220	5555
5221		- if (GetTextures() == null)
	5556	+ if (GetTextures() == null) // What is that??
5222	5557	GetTextures().name = ":";
5223	5558
5224	5559	String texname = tex;
..	..	@@ -5249,6 +5584,43 @@
5249	5584	child.ResetPigmentTexture();
5250	5585	blockloop = false;
5251	5586	}
	5587	+ }
	5588	+
	5589	+ UUID GetUUID()
	5590	+ {
	5591	+ if (uuid == null)
	5592	+ {
	5593	+ // Serial
	5594	+ uuid = UUID.randomUUID();
	5595	+ }
	5596	+
	5597	+ return uuid;
	5598	+ }
	5599	+
	5600	+ Object3D GetObject(UUID uid)
	5601	+ {
	5602	+ if (blockloop)
	5603	+ return null;
	5604	+
	5605	+ if (GetUUID().equals(uid))
	5606	+ return this;
	5607	+
	5608	+ int nb = Size();
	5609	+ for (int i = 0; i < nb; i++)
	5610	+ {
	5611	+ Object3D child = (Object3D) get(i);
	5612	+
	5613	+ if (child == null)
	5614	+ continue;
	5615	+
	5616	+ blockloop = true;
	5617	+ Object3D obj = child.GetObject(uid);
	5618	+ blockloop = false;
	5619	+ if (obj != null)
	5620	+ return obj;
	5621	+ }
	5622	+
	5623	+ return null;
5252	5624	}
5253	5625
5254	5626	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5659,33 @@
5287	5659	}
5288	5660	}
5289	5661
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5662	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5663	{
5292	5664	Draw(display, root, selected, blocked);
5293	5665	}
5294	5666
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5667	boolean NeedSupport()
5300	5668	{
5301	5669	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5670	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5671	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5672	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5673	}
5306	5674
	5675	+ static boolean DEBUG_SELECTION = false;
5307	5676
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5677	+ boolean IsLive()
	5678	+ {
	5679	+ if (live)
	5680	+ return true;
	5681	+
	5682	+ if (parent == null)
	5683	+ return false;
	5684	+
	5685	+ return parent.IsLive();
	5686	+ }
	5687	+
	5688	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5689	{
5310	5690	Invariants(); // june 2013
5311	5691
..	..	@@ -5314,8 +5694,8 @@
5314	5694	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5695	}
5316	5696
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5697	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5698	+ (hide \|\| dontselect))
5319	5699	return;
5320	5700
5321	5701	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5713,7 @@
5333	5713	if (this instanceof Checker)
5334	5714	return;
5335	5715
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5716	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5717	return;
5338	5718
5339	5719	if (count <= 0)
..	..	@@ -5341,13 +5721,13 @@
5341	5721	return;
5342	5722	}
5343	5723
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5724	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5725	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5726	{
5347	5727	return;
5348	5728	}
5349	5729
5350		- javax.media.opengl.GL gl = display.GetGL();
	5730	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5731
5352	5732	/*
5353	5733	if (touched)
..	..	@@ -5366,7 +5746,7 @@
5366	5746	support = support;
5367	5747
5368	5748	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5369		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5749	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5370	5750
5371	5751	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5752	{
..	..	@@ -5383,15 +5763,17 @@
5383	5763
5384	5764	boolean compiled = false;
5385	5765
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5766	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5767
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5768	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5769	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5770	+ (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5390	5771	{
5391		- display.lighttouched = true;
	5772	+ Globals.lighttouched = true;
5392	5773	} // all panes...
5393		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5394		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5774	+
	5775	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5776	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5777	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5778	{
5397	5779	if (!(this instanceof Composite))
..	..	@@ -5399,7 +5781,7 @@
5399	5781	//if (displaylist == -1 && usecalllists)
5400	5782	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5401	5783	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5784	+ bRep.displaylist = display.GenList();
5403	5785	assert(bRep.displaylist != 0);
5404	5786	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5787	//System.out.println("\tgen list " + list);
..	..	@@ -5411,18 +5793,20 @@
5411	5793	if (usecalllists)
5412	5794	{
5413	5795	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5796	+ display.NewList(bRep.displaylist);
5415	5797	}
	5798	+
5416	5799	CallList(display, root, selected, blocked);
	5800	+
5417	5801	// compiled = true;
5418	5802	if (usecalllists)
5419	5803	{
5420	5804	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5805	+ display.EndList();
5422	5806	}
5423	5807	//gl.glDrawBuffer(gl.GL_BACK);
5424	5808	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	5809	+ Globals.lighttouched = true; // all panes...
5426	5810	}
5427	5811
5428	5812	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +5845,12 @@
5461	5845
5462	5846	// frustum culling
5463	5847	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	5848	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	5849	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	5850	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	5851	{
5468	5852	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5853	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	5854	{
5471	5855	//System.out.print("CULLED");
5472	5856	culled = true;
..	..	@@ -5474,7 +5858,7 @@
5474	5858	}
5475	5859	else
5476	5860	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5861	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	5862	culled = true;
5479	5863
5480	5864	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +5894,11 @@
5510	5894
5511	5895
5512	5896	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5897	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	5898	{
5515	5899	if (GetBRep() != null)
5516	5900	{
5517		- CameraPane.NextIndex(this, gl);
	5901	+ display.NextIndex();
5518	5902	// vertex color conflict : gl.glCallList(list);
5519	5903	DrawNode(display, root, selected);
5520	5904	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +5920,7 @@
5536	5920	color[2] /= 2;
5537	5921	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	5922	*/
5539		- if (material != null)
5540		- {
5541		- materialstack[materialdepth] = material;
5542		- selectedstack[materialdepth] = selected;
5543		- cStatic.objectstack[materialdepth++] = this;
5544		- //System.out.println("material " + material);
5545		- //Applet3D.tracein(this, selected);
5546		- display.vector2buffer = projectedVertices;
5547		- if (this instanceof Camera)
5548		- {
5549		- display.options1[0] = material.shift;
5550		- //System.out.println("shift " + material.shift);
5551		- display.options1[1] = material.lightarea;
5552		- display.options1[2] = material.shadowbias;
5553		- display.options1[3] = material.aniso;
5554		- display.options1[4] = material.anisoV;
5555		- display.options2[0] = material.opacity;
5556		- display.options2[1] = material.diffuse;
5557		- display.options2[2] = material.factor;
5558		-
5559		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5560		- display.options4[0] = material.cameralight/0.2f;
5561		- display.options4[1] = material.subsurface;
5562		- display.options4[2] = material.sheen;
5563		-
5564		- // if (display.CURRENTANTIALIAS > 0)
5565		- // display.options3[3] /= 4;
5566		-
5567		- /*
5568		- System.out.println("Focus = " + display.options1[0]);
5569		- System.out.println("Aperture = " + display.options1[1]);
5570		- System.out.println("ShadowBlur = " + display.options1[2]);
5571		- System.out.println("Antialiasing = " + display.options1[3]);
5572		- System.out.println("Fog = " + display.options2[0]);
5573		- System.out.println("Intensity = " + display.options2[1]);
5574		- System.out.println("Elevation = " + display.options2[2]);
5575		- /**/
5576		- } else
5577		- {
5578		- material.Draw(display, selected);
5579		- }
5580		- } else
5581		- {
5582		- if (selected && CameraPane.flash)
5583		- {
5584		- display.modelParams4[1] = 100;
5585		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5586		- }
5587		- }
	5923	+ display.PushMaterial(this, selected);
5588	5924
5589	5925	//System.out.println("call list " + list);
5590	5926	//System.out.println();
..	..	@@ -5603,7 +5939,28 @@
5603	5939	tex = GetTextures();
5604	5940	}
5605	5941
5606		- display.BindTextures(tex, texres);
	5942	+ boolean failedPigment = false;
	5943	+ boolean failedBump = false;
	5944	+
	5945	+ try
	5946	+ {
	5947	+ display.BindPigmentTexture(tex, texres);
	5948	+ }
	5949	+ catch (Exception e)
	5950	+ {
	5951	+ System.err.println("FAILED: " + this);
	5952	+ failedPigment = true;
	5953	+ }
	5954	+
	5955	+ try
	5956	+ {
	5957	+ display.BindBumpTexture(tex, texres);
	5958	+ }
	5959	+ catch (Exception e)
	5960	+ {
	5961	+ //System.err.println("FAILED: " + this);
	5962	+ failedBump = true;
	5963	+ }
5607	5964
5608	5965	if (!compiled)
5609	5966	{
..	..	@@ -5619,30 +5976,19 @@
5619	5976
5620	5977	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	5978	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	5979	+ display.CallList(bRep.displaylist);
5623	5980	// june 2013 drawSelf(display, root, selected);
5624	5981	}
5625	5982	}
5626	5983	}
5627	5984
5628		- display.ReleaseTextures(tex);
5629		-
5630		- //if (parent != null && parent.GetMaterial() != null)
5631		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5632		- if (material != null)
5633		- {
5634		- materialdepth -= 1;
5635		- if (materialdepth > 0)
5636		- {
5637		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5638		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5639		- }
5640		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5641		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5642		- {
5643		- display.modelParams4[1] = GetMaterial().cameralight;
5644		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5645		- }
	5985	+ if (!failedBump)
	5986	+ display.ReleaseBumpTexture(tex);
	5987	+
	5988	+ if (!failedPigment)
	5989	+ display.ReleasePigmentTexture(tex);
	5990	+
	5991	+ display.PopMaterial(this, selected);
5646	5992	}
5647	5993
5648	5994	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6030,7 @@
5684	6030	// resetMasterNode();
5685	6031	}
5686	6032
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6033	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6034	{
5689	6035	if (GetBRep() == null)
5690	6036	{
..	..	@@ -5767,8 +6113,11 @@
5767	6113	boolean flipV = false; // true;
5768	6114	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6115
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6116	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6117	{
	6118	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6119	+ return;
	6120	+
5772	6121	if (hide)
5773	6122	return;
5774	6123	// shadow optimisation
..	..	@@ -5826,16 +6175,7 @@
5826	6175	// // ??????????????????????????? Touch();
5827	6176	// }
5828	6177
5829		- if (material != null)
5830		- {
5831		- materialstack[materialdepth] = material;
5832		- selectedstack[materialdepth] = selected;
5833		- cStatic.objectstack[materialdepth++] = this;
5834		- //System.out.println("material " + material);
5835		- //Applet3D.tracein("selected ", selected);
5836		- display.vector2buffer = projectedVertices;
5837		- material.Draw(display, selected);
5838		- }
	6178	+display.PushMaterial2(this, selected);
5839	6179
5840	6180	Object3D child;
5841	6181	boolean sel;
..	..	@@ -5887,19 +6227,7 @@
5887	6227	*/
5888	6228	//depth += 1;
5889	6229
5890		- if (material != null)
5891		- {
5892		- materialdepth -= 1;
5893		- if (materialdepth > 0)
5894		- {
5895		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5896		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5897		- }
5898		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5899		- //else
5900		- //material.Draw(display, false);
5901		- }
5902		-
	6230	+display.PopMaterial2(this);
5903	6231	/*
5904	6232	display.ReleaseTextures(tex);
5905	6233	*/
..	..	@@ -5910,10 +6238,13 @@
5910	6238
5911	6239	//static cVector min,max;
5912	6240
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6241	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6242	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6243	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6244	return; // no shadow for transparent objects
	6245	+
	6246	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6247	+ return;
5917	6248
5918	6249	if (hide)
5919	6250	return;
..	..	@@ -5955,11 +6286,12 @@
5955	6286	return;
5956	6287	}
5957	6288
	6289	+ //bRep.GenUV(1/material.diffuseness);
5958	6290	// bRep.lock = true;
5959	6291
5960		- javax.media.opengl.GL gl = display.GetGL();
	6292	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6293
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6294	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6295	{
5964	6296	int fc = bRep.FaceCount();
5965	6297	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6306,7 @@
5974	6306
5975	6307	bRep.getMinMax(min, max, 100);
5976	6308
5977		- gl.glBegin(gl.GL_LINES);
5978		-
5979		- gl.glVertex3d(min.x, min.y, min.z);
5980		- gl.glVertex3d(min.x, min.y, max.z);
5981		- gl.glVertex3d(min.x, min.y, min.z);
5982		- gl.glVertex3d(min.x, max.y, min.z);
5983		- gl.glVertex3d(min.x, min.y, min.z);
5984		- gl.glVertex3d(max.x, min.y, min.z);
5985		-
5986		- gl.glVertex3d(max.x, max.y, max.z);
5987		- gl.glVertex3d(min.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, max.y, max.z);
5989		- gl.glVertex3d(max.x, min.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, max.z);
5991		- gl.glVertex3d(max.x, max.y, min.z);
5992		-
5993		- gl.glEnd();
	6309	+ display.DrawBox(min, max);
5994	6310
5995	6311	return;
5996	6312	}
..	..	@@ -6034,7 +6350,7 @@
6034	6350	{
6035	6351	//throw new Error();
6036	6352
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6353	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6354
6039	6355	int[] strips = bRep.getRawIndices();
6040	6356
..	..	@@ -6044,178 +6360,14 @@
6044	6360	new Exception().printStackTrace();
6045	6361	return;
6046	6362	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
6050		- {
6051		- float[] v = bRep.getRawVertices();
6052		- float[] n = bRep.getRawNormals();
6053		- float[] c = bRep.getRawColors();
6054		- float[] uv = bRep.getRawUVMap();
6055		-
6056		- int count2 = 0;
6057		- int count3 = 0;
6058		-
6059		- if (n.length > 0)
6060		- {
6061		- for (int i = 0; i < strips.length; i++)
6062		- {
6063		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6064		-
6065		- /*
6066		- boolean locked = false;
6067		- float eps = 0.1f;
6068		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6069		-
6070		- int dot = 0;
6071		-
6072		- if ((dot&1) == 0)
6073		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6074		-
6075		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6076		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6077		- else
6078		- {
6079		- locked = true;
6080		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6081		- }
6082		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6083		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6084		- if (hasnorm)
6085		- {
6086		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6087		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6088		- }
6089		-
6090		- if ((dot&4) == 0)
6091		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6092		-
6093		- if (wrap \|\| !locked && (dot&8) != 0)
6094		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6095		- else
6096		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6097		-
6098		- f.dot = dot;
6099		- */
6100		-
6101		- if (!selectmode)
6102		- {
6103		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6104		- {
6105		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6106		- } else
6107		- {
6108		- gl.glNormal3f(0, 0, 1);
6109		- }
6110		-
6111		- if (c != null)
6112		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6113		- {
6114		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6115		- }
6116		- }
6117		- if (flipV)
6118		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6119		- else
6120		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6121		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6122		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6123		-
6124		- count2 += 2;
6125		- count3 += 3;
6126		- if (!selectmode)
6127		- {
6128		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6129		- {
6130		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6131		- } else
6132		- {
6133		- gl.glNormal3f(0, 0, 1);
6134		- }
6135		- if (c != null)
6136		- {
6137		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6138		- }
6139		- }
6140		- if (flipV)
6141		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6142		- else
6143		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6144		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6145		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6146		-
6147		- count2 += 2;
6148		- count3 += 3;
6149		- for (int j = 0; j < strips[i] - 2; j++)
6150		- {
6151		- //gl.glTexCoord2d(...);
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		-
6167		- if (flipV)
6168		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6169		- else
6170		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6171		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6172		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6173		- count2 += 2;
6174		- count3 += 3;
6175		- }
6176		-
6177		- gl.glEnd();
6178		- }
6179		- }
6180		-
6181		- assert count3 == v.length;
6182		- }
6183		- else // !trimmed
6184		- {
6185		- int count = 0;
6186		- for (int i = 0; i < strips.length; i++)
6187		- {
6188		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6189		-
6190		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6191		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6192		-
6193		- drawVertex(gl, p, selectmode);
6194		- drawVertex(gl, q, selectmode);
6195		-
6196		- for (int j = 0; j < strips[i] - 2; j++)
6197		- {
6198		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6199		-
6200		-// if (j%2 == 0)
6201		-// drawFace(p, q, r, display, null);
6202		-// else
6203		-// drawFace(p, r, q, display, null);
6204		-
6205		-// p = q;
6206		-// q = r;
6207		- drawVertex(gl, r, selectmode);
6208		- }
6209		-
6210		- gl.glEnd();
6211		- }
6212		- }
	6363	+
	6364	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6365	} else // catch (Error e)
6214	6366	{
6215	6367	// TRIANGLE ARRAY
6216	6368	if (IsOpaque()) // Static())
6217	6369	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6370	+ display.StartTriangles();
6219	6371	int facecount = bRep.FaceCount();
6220	6372	for (int i = 0; i < facecount; i++)
6221	6373	{
..	..	@@ -6278,9 +6430,9 @@
6278	6430	// // r.norm.dot(v3) > -0.5)
6279	6431	// // continue;
6280	6432
6281		- drawFace(p, q, r, display, face);
	6433	+ display.DrawFace(this, p, q, r, face);
6282	6434	}
6283		- gl.glEnd();
	6435	+ display.EndTriangles();
6284	6436	}
6285	6437	else
6286	6438	{
..	..	@@ -6309,8 +6461,8 @@
6309	6461	//System.out.println("SORT");
6310	6462
6311	6463	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6464	+
	6465	+ display.StartTriangles();
6314	6466	for (int i = 0; i < facecount; i++)
6315	6467	{
6316	6468	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6474,14 @@
6322	6474	Vertex q = bRep.GetVertex(face.q);
6323	6475	Vertex r = bRep.GetVertex(face.r);
6324	6476
6325		- drawFace(p, q, r, display, face);
	6477	+ display.DrawFace(this, p, q, r, face);
6326	6478	}
6327		- gl.glEnd();
	6479	+ display.EndTriangles();
6328	6480	}
6329	6481
6330	6482	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6483	{
	6484	+ /*
6332	6485	gl.glDisable(gl.GL_LIGHTING);
6333	6486	float[] colorV = new float[3];
6334	6487
..	..	@@ -6407,6 +6560,7 @@
6407	6560	// gl.glEnd();
6408	6561	}
6409	6562	}
	6563	+ */
6410	6564	}
6411	6565	}
6412	6566
..	..	@@ -6451,7 +6605,7 @@
6451	6605	center.add(r);
6452	6606	center.mul(1.0/3);
6453	6607
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6608	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6609
6456	6610	distance = center.dot(center);
6457	6611	}
..	..	@@ -6462,347 +6616,11 @@
6462	6616
6463	6617	transient FaceCompare[] facescompare = null;
6464	6618
6465		- void SetColor(CameraPane display, Vertex p0)
6466		- {
6467		- if (display.RENDERPROGRAM == 0)
6468		- {
6469		- float r = 0;
6470		- if (bRep != null)
6471		- {
6472		- if (bRep.stripified)
6473		- {
6474		- r = 1;
6475		- }
6476		- }
6477		- float g = 0;
6478		- if (bRep != null)
6479		- {
6480		- if (bRep.trimmed)
6481		- {
6482		- g = 1;
6483		- }
6484		- }
6485		- float b = 0;
6486		- if (support != null && link2master)
6487		- {
6488		- b = 1;
6489		- }
6490		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6491		- return;
6492		- }
6493		-
6494		- if (display.drawMode != CameraPane.SHADOW)
6495		- return;
6496		-
6497		- javax.media.opengl.GL gl = display.GetGL();
6498		-// if (true) return;
6499		-// float ao = p.AO;
6500		-//
6501		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6502		-// // ao = 1;
6503		-//
6504		-// gl.glColor4f(ao, ao, ao, 1);
6505		-
6506		-// CameraPane.selectedpoint.
6507		-// getAverage(cStatic.point1, true);
6508		- if (CameraPane.pointflow == null) // !random) // live)
6509		- {
6510		- return;
6511		- }
6512		-
6513		- cStatic.point1.set(0,0,0);
6514		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6515		-
6516		- cStatic.point1.sub(p0);
6517		-
6518		-
6519		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6520		-// {
6521		-// return;
6522		-// }
6523		-
6524		- //if (true)
6525		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6526		- {
6527		- return;
6528		- }
6529		-
6530		- float[] colorV = new float[3];
6531		-
6532		- if (false) // marked)
6533		- {
6534		- // debug rigging weights
6535		- for (int object = 0; object < p0.vertexlinks.length; object++)
6536		- {
6537		- float weight = p0.weights[object] / p0.totalweight;
6538		-
6539		- // if (weight < 0.1)
6540		- // {
6541		- // assert(weight == 0);
6542		- // continue;
6543		- // }
6544		-
6545		- if (p0.vertexlinks[object] == -1)
6546		- continue;
6547		-
6548		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6549		-
6550		- int color = //1 << object; //
6551		- //p.vertexlinks.length;
6552		- support.bRep.supports[p0.closestsupport].links[object];
6553		- colorV[2] += (color & 1) * weight;
6554		- colorV[1] += ((color & 2) >> 1) * weight;
6555		- colorV[0] += ((color & 4) >> 2) * weight;
6556		- }
6557		- }
6558		- else
6559		- {
6560		- if (drawingstarted)
6561		- {
6562		- // find next point
6563		- if (bRep.GetVertex(0).faceindices == null)
6564		- {
6565		- bRep.InitFaceIndices();
6566		- }
6567		-
6568		- double ymin = p0.y;
6569		-
6570		- Vertex newp = p0;
6571		-
6572		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6573		- {
6574		- int fi = p0.faceindices[fii];
6575		-
6576		- if (fi == -1)
6577		- break;
6578		-
6579		- Face f = bRep.GetFace(fi);
6580		-
6581		- Vertex p = bRep.GetVertex(f.p);
6582		- Vertex q = bRep.GetVertex(f.q);
6583		- Vertex r = bRep.GetVertex(f.r);
6584		-
6585		- int swap = (int)(Math.random()*3);
6586		-
6587		-// for (int s=swap; --s>=0;)
6588		-// {
6589		-// Vertex t = p;
6590		-// p = q;
6591		-// q = r;
6592		-// r = t;
6593		-// }
6594		- if (ymin > p.y)
6595		- {
6596		- ymin = p.y;
6597		- newp = p;
6598		-// break;
6599		- }
6600		- if (ymin > q.y)
6601		- {
6602		- ymin = q.y;
6603		- newp = q;
6604		-// break;
6605		- }
6606		- if (ymin > r.y)
6607		- {
6608		- ymin = r.y;
6609		- newp = r;
6610		-// break;
6611		- }
6612		- }
6613		-
6614		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6615		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6616		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6617		-
6618		- drawingstarted = false;
6619		-
6620		- // return;
6621		- }
6622		-
6623		- if (false) // CameraPane.DRAW
6624		- {
6625		- p0.AO = colorV[0] = 2;
6626		- colorV[1] = 2;
6627		- colorV[2] = 2;
6628		- }
6629		-
6630		- CameraPane.pointflow.add(p0);
6631		- CameraPane.pointflow.Touch();
6632		- }
6633		-
6634		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6635		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6636		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6637		- }
6638		-
6639	6619	void Print(Vertex v)
6640	6620	{
6641	6621	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6622	}
6643	6623
6644		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6645		- {
6646		- if (!selectmode)
6647		- {
6648		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6649		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6650		-
6651		- if (flipV)
6652		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6653		- else
6654		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6655		- }
6656		-
6657		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6658		- }
6659		-
6660		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6661		- CameraPane display, Face face)
6662		- {
6663		- if (pv.y == -10000 \|\|
6664		- qv.y == -10000 \|\|
6665		- rv.y == -10000)
6666		- return;
6667		-
6668		-// float b = f.nbiterations & 1;
6669		-// float g = (f.nbiterations>>1) & 1;
6670		-// float r = (f.nbiterations>>2) & 1;
6671		-//
6672		-// //if (f.weight == 10000)
6673		-// //{
6674		-// // r = 1; g = b = 0;
6675		-// //}
6676		-// //else
6677		-// //{
6678		-// // assert(f.weight < 10000);
6679		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6680		-// if (r<0)
6681		-// assert(r>=0);
6682		-// //}
6683		-
6684		- javax.media.opengl.GL gl = display.GetGL();
6685		-
6686		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6687		-
6688		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6689		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6690		- {
6691		- //gl.glBegin(gl.GL_TRIANGLES);
6692		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6693		- if (!hasnorm)
6694		- {
6695		- // System.out.println("FUCK!!");
6696		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6697		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6698		- LA.vecCross(v0, v1, v2);
6699		- LA.vecNormalize(v2);
6700		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6701		- }
6702		-
6703		- if (hasnorm)
6704		- {
6705		-// if (!pv.norm.normalized())
6706		-// assert(pv.norm.normalized());
6707		-
6708		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6709		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6710		- }
6711		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6712		- SetColor(display, pv);
6713		- //gl.glColor4f(r, g, b, 1);
6714		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6715		- if (flipV)
6716		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6717		- else
6718		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6719		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6720		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6721		-// Print(pv);
6722		- if (hasnorm)
6723		- {
6724		-// assert(qv.norm.normalized());
6725		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6726		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6727		- }
6728		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6729		- // boolean locked = false;
6730		- // float eps = 0.1f;
6731		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6732		-
6733		- // int dot = 0; //*/ (int)f.dot;
6734		-
6735		- // if ((dot&1) == 0)
6736		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6737		-
6738		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6739		- if (flipV)
6740		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6741		- else
6742		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6743		- // else
6744		- // {
6745		- // locked = true;
6746		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6747		- // }
6748		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6749		- SetColor(display, qv);
6750		- //gl.glColor4f(r, g, b, 1);
6751		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6752		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6753		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6754		-// Print(qv);
6755		- if (hasnorm)
6756		- {
6757		-// assert(rv.norm.normalized());
6758		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6759		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6760		- }
6761		-
6762		- // if ((dot&4) == 0)
6763		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6764		-
6765		- // if (wrap \|\| !locked && (dot&8) != 0)
6766		- if (flipV)
6767		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6768		- else
6769		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6770		- // else
6771		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6772		-
6773		- // f.dot = dot;
6774		-
6775		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6776		- SetColor(display, rv);
6777		- //gl.glColor4f(r, g, b, 1);
6778		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6779		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6780		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6781		-// Print(rv);
6782		- //gl.glEnd();
6783		- }
6784		- else
6785		- {
6786		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6787		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6788		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6789		-
6790		- }
6791		-
6792		- if (false) // (attributes & WIREFRAME) != 0)
6793		- {
6794		- gl.glDisable(gl.GL_LIGHTING);
6795		-
6796		- gl.glBegin(gl.GL_LINE_LOOP);
6797		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6798		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6799		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6800		- gl.glEnd();
6801		-
6802		- gl.glEnable(gl.GL_LIGHTING);
6803		- }
6804		- }
6805		-
6806	6624	void drawSelf(ClickInfo info, int level, boolean select)
6807	6625	{
6808	6626	if (bRep == null)
..	..	@@ -7374,83 +7192,84 @@
7374	7192	int spotw = spot.x + spot.width;
7375	7193	int spoth = spot.y + spot.height;
7376	7194	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7377		- if (CameraPane.Xmin > spot.x)
7378		- {
7379		- CameraPane.Xmin = spot.x;
7380		- }
7381		- if (CameraPane.Xmax < spotw)
7382		- {
7383		- CameraPane.Xmax = spotw;
7384		- }
7385		- if (CameraPane.Ymin > spot.y)
7386		- {
7387		- CameraPane.Ymin = spot.y;
7388		- }
7389		- if (CameraPane.Ymax < spoth)
7390		- {
7391		- CameraPane.Ymax = spoth;
7392		- }
	7195	+// if (CameraPane.Xmin > spot.x)
	7196	+// {
	7197	+// CameraPane.Xmin = spot.x;
	7198	+// }
	7199	+// if (CameraPane.Xmax < spotw)
	7200	+// {
	7201	+// CameraPane.Xmax = spotw;
	7202	+// }
	7203	+// if (CameraPane.Ymin > spot.y)
	7204	+// {
	7205	+// CameraPane.Ymin = spot.y;
	7206	+// }
	7207	+// if (CameraPane.Ymax < spoth)
	7208	+// {
	7209	+// CameraPane.Ymax = spoth;
	7210	+// }
7393	7211	spot.translate(32, 32);
7394	7212	spotw = spot.x + spot.width;
7395	7213	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
	7214	+ info.g.setColor(Color.cyan);
7397	7215	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7398		- if (CameraPane.Xmin > spot.x)
7399		- {
7400		- CameraPane.Xmin = spot.x;
7401		- }
7402		- if (CameraPane.Xmax < spotw)
7403		- {
7404		- CameraPane.Xmax = spotw;
7405		- }
7406		- if (CameraPane.Ymin > spot.y)
7407		- {
7408		- CameraPane.Ymin = spot.y;
7409		- }
7410		- if (CameraPane.Ymax < spoth)
7411		- {
7412		- CameraPane.Ymax = spoth;
7413		- }
7414		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7415		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7216	+// if (CameraPane.Xmin > spot.x)
	7217	+// {
	7218	+// CameraPane.Xmin = spot.x;
	7219	+// }
	7220	+// if (CameraPane.Xmax < spotw)
	7221	+// {
	7222	+// CameraPane.Xmax = spotw;
	7223	+// }
	7224	+// if (CameraPane.Ymin > spot.y)
	7225	+// {
	7226	+// CameraPane.Ymin = spot.y;
	7227	+// }
	7228	+// if (CameraPane.Ymax < spoth)
	7229	+// {
	7230	+// CameraPane.Ymax = spoth;
	7231	+// }
	7232	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7233	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7416	7234	spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
	7235	+ info.g.setColor(Color.yellow);
7418	7236	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7419		- if (CameraPane.Xmin > spot.x)
7420		- {
7421		- CameraPane.Xmin = spot.x;
7422		- }
7423		- if (CameraPane.Xmax < spotw)
7424		- {
7425		- CameraPane.Xmax = spotw;
7426		- }
7427		- if (CameraPane.Ymin > spot.y)
7428		- {
7429		- CameraPane.Ymin = spot.y;
7430		- }
7431		- if (CameraPane.Ymax < spoth)
7432		- {
7433		- CameraPane.Ymax = spoth;
7434		- }
	7237	+ info.g.setColor(Color.green);
	7238	+// if (CameraPane.Xmin > spot.x)
	7239	+// {
	7240	+// CameraPane.Xmin = spot.x;
	7241	+// }
	7242	+// if (CameraPane.Xmax < spotw)
	7243	+// {
	7244	+// CameraPane.Xmax = spotw;
	7245	+// }
	7246	+// if (CameraPane.Ymin > spot.y)
	7247	+// {
	7248	+// CameraPane.Ymin = spot.y;
	7249	+// }
	7250	+// if (CameraPane.Ymax < spoth)
	7251	+// {
	7252	+// CameraPane.Ymax = spoth;
	7253	+// }
7435	7254	info.g.drawArc(boundary.x, boundary.y,
7436	7255	boundary.width, boundary.height, 0, 360);
7437	7256	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7438		- if (CameraPane.Xmin > boundary.x)
7439		- {
7440		- CameraPane.Xmin = boundary.x;
7441		- }
7442		- if (CameraPane.Xmax < boundary.x + boundary.width)
7443		- {
7444		- CameraPane.Xmax = boundary.x + boundary.width;
7445		- }
7446		- if (CameraPane.Ymin > boundary.y)
7447		- {
7448		- CameraPane.Ymin = boundary.y;
7449		- }
7450		- if (CameraPane.Ymax < boundary.y + boundary.height)
7451		- {
7452		- CameraPane.Ymax = boundary.y + boundary.height;
7453		- }
	7257	+// if (CameraPane.Xmin > boundary.x)
	7258	+// {
	7259	+// CameraPane.Xmin = boundary.x;
	7260	+// }
	7261	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7262	+// {
	7263	+// CameraPane.Xmax = boundary.x + boundary.width;
	7264	+// }
	7265	+// if (CameraPane.Ymin > boundary.y)
	7266	+// {
	7267	+// CameraPane.Ymin = boundary.y;
	7268	+// }
	7269	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7270	+// {
	7271	+// CameraPane.Ymax = boundary.y + boundary.height;
	7272	+// }
7454	7273	return;
7455	7274	}
7456	7275	}
..	..	@@ -7467,7 +7286,7 @@
7467	7286	startX = info.x;
7468	7287	startY = info.y;
7469	7288
7470		- hitSomething = 0;
	7289	+ hitSomething = -1;
7471	7290	cVector origin = new cVector();
7472	7291	//LA.xformPos(origin, toParent, origin);
7473	7292	Rectangle spot = new Rectangle();
..	..	@@ -7500,7 +7319,7 @@
7500	7319	}
7501	7320
7502	7321	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7322	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7323	//System.out.println("modified = " + modified);
7505	7324	//new Exception().printStackTrace();
7506	7325	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7347,7 @@
7528	7347	return true;
7529	7348	}
7530	7349
7531		- void doEditDrag0(ClickInfo info)
	7350	+ void doEditDrag0(ClickInfo info, boolean opposite)
7532	7351	{
7533	7352	if (hitSomething == 0)
7534	7353	{
..	..	@@ -7543,6 +7362,7 @@
7543	7362	//System.out.println("hitSomething = " + hitSomething);
7544	7363
7545	7364	double scale = 0.005f * info.camera.Distance();
	7365	+
7546	7366	cVector xlate = new cVector();
7547	7367	//cVector xlate2 = new cVector();
7548	7368	switch (hitSomething)
..	..	@@ -7553,9 +7373,9 @@
7553	7373
7554	7374	case hitCenter: // Translate
7555	7375
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7376	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7377
7558		- if (modified)
	7378	+ if (modified \|\| opposite)
7559	7379	{
7560	7380	//assert(false);
7561	7381	/*
..	..	@@ -7601,10 +7421,10 @@
7601	7421	}
7602	7422	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7423	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7424	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7605	7425	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7606	7426	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7427	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7428	//LA.vecCross(up, cVector.Z, right2);
7609	7429
7610	7430	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7649,6 +7469,7 @@
7649	7469
7650	7470	if (modified)
7651	7471	{
	7472	+ // Rotate 90 degrees
7652	7473	angle /= (Math.PI / 4);
7653	7474	angle = Math.floor(angle + 0.5);
7654	7475	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7483,7 @@
7662	7483	}
7663	7484	/**/
7664	7485
7665		- switch (info.pane.renderCamera.viewCode)
	7486	+ switch (info.pane.RenderCamera().viewCode)
7666	7487	{
7667	7488	case 1: // '\001'
7668	7489	LA.matZRotate(toParent, angle);
..	..	@@ -7690,24 +7511,27 @@
7690	7511
7691	7512	case hitScale: // scale
7692	7513	double hScale = (double) (info.x - centerPt.x) / 32;
	7514	+ double sign = 1;
	7515	+ if (hScale < 0)
	7516	+ {
	7517	+ sign = -1;
	7518	+ }
	7519	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7520	if (hScale < 0.01)
7694	7521	{
7695		- hScale = 0.01;
	7522	+ //hScale = 0.01;
7696	7523	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
7699		- {
7700		- hScale = 0.01;
7701		- }
	7524	+
7702	7525	double vScale = (double) (info.y - centerPt.y) / 32;
7703		- if (vScale < 0.01)
	7526	+ sign = 1;
	7527	+ if (vScale < 0)
7704	7528	{
7705		- vScale = 0.01;
	7529	+ sign = -1;
7706	7530	}
7707		- vScale = Math.pow(vScale, scale * 50);
	7531	+ vScale = signMath.pow(signvScale, scale * 50);
7708	7532	if (vScale < 0.01)
7709	7533	{
7710		- vScale = 0.01;
	7534	+ //vScale = 0.01;
7711	7535	}
7712	7536	LA.matCopy(startMat, toParent);
7713	7537	/**/
..	..	@@ -7718,39 +7542,47 @@
7718	7542	}
7719	7543	/**/
7720	7544
7721		- switch (info.pane.renderCamera.viewCode)
	7545	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7546	+
	7547	+ if (totalScale < 0.01)
	7548	+ {
	7549	+ totalScale = 0.01;
	7550	+ }
	7551	+
	7552	+ switch (info.pane.RenderCamera().viewCode)
7722	7553	{
7723	7554	case 3: // '\001'
7724		- if (modified)
	7555	+ if (modified \|\| opposite)
7725	7556	{
7726	7557	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7558	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7559	} // vScale, 1);
7729	7560	else
7730	7561	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7562	+ // EXCEPTION!
	7563	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7564	} // vScale, 1);
7733	7565	break;
7734	7566
7735	7567	case 2: // '\002'
7736		- if (modified)
	7568	+ if (modified \|\| opposite)
7737	7569	{
7738	7570	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7571	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7572	} else
7741	7573	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7574	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7575	}
7744	7576	break;
7745	7577
7746	7578	case 1: // '\003'
7747		- if (modified)
	7579	+ if (modified \|\| opposite)
7748	7580	{
7749	7581	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7582	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7583	} else
7752	7584	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7585	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7586	}
7755	7587	break;
7756	7588	}
..	..	@@ -7883,14 +7715,22 @@
7883	7715	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7716	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7717	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7718	+
	7719	+ String objname;
	7720	+
7886	7721	if (false) //parent != null)
7887	7722	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7723	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7724	} else
7890	7725	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7726	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7727	} // + super.toString();
7893	7728	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7729	+
	7730	+ if (!Globals.ADVANCED)
	7731	+ return objname;
	7732	+
	7733	+ return objname + " " + System.identityHashCode(this);
7894	7734	}
7895	7735
7896	7736	public int hashCode()
..	..	@@ -7946,6 +7786,7 @@
7946	7786	objectUI.closeUI();
7947	7787	if (editWindow != null)
7948	7788	{
	7789	+ editWindow.ctrlPanel.FlushUI();
7949	7790	editWindow.refreshContents();
7950	7791	} // ? new
7951	7792	objectUI = null;
..	..	@@ -7966,7 +7807,7 @@
7966	7807	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	7808
7968	7809	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	7810	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	7811
7971	7812	double[][] toParent; // dynamic matrix
7972	7813	double[][] fromParent;
..	..	@@ -8081,7 +7922,7 @@
8081	7922	{
8082	7923	assert(bRep != null);
8083	7924	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	7925	+ Grafreed.Assert(support.bRep == bRep.support);
8085	7926	}
8086	7927	else
8087	7928	{
..	..	@@ -8130,9 +7971,9 @@
8130	7971	private static cVector edge2 = new cVector();
8131	7972	//private static cVector norm = new cVector();
8132	7973	/transient private/ int hitSomething;
8133		- private static final int hitCenter = 1;
8134		- private static final int hitScale = 2;
8135		- private static final int hitRotate = 3;
	7974	+ static final int hitCenter = 1;
	7975	+ static final int hitScale = 2;
	7976	+ static final int hitRotate = 3;
8136	7977	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	7978	/transient/ private Point centerPt;
8138	7979	/transient/ private int startX;
..	..	@@ -8164,6 +8005,8 @@
8164	8005	{
8165	8006	Object3D targ = this;
8166	8007
	8008	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8009	+
8167	8010	if (obj.material != null)
8168	8011	{
8169	8012	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))