~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,11 +14,20 @@
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;
	24	+
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo
	28	+ mocap.reader.BVHReader.BVHResult bvh;
	29	+ Object3D skeleton;
	30	+ //
21	31
22	32	ScriptNode scriptnode;
23	33
..	..	@@ -99,64 +109,136 @@
99	109
100	110	// transient boolean reduced; // for morph reduction
101	111
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-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
104	114
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	115	+ transient Object3D transientsupport; // for cloning
	116	+ transient boolean transientlink2master;
107	117
108		-void SaveSupports()
109		-{
110		- if (blockloop)
111		- return;
112		-
113		- transientsupport = support;
114		- transientlink2master = link2master;
115		-
116		- support = null;
117		- link2master = false;
118		-
119		- if (bRep != null)
	118	+ void SaveSupports()
120	119	{
121		- bRep.SaveSupports();
122		- }
123		-
124		- for (int i = 0; i < Size(); i++)
125		- {
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
129		- blockloop = true;
130		- child.SaveSupports();
131		- blockloop = false;
132		- }
133		-}
	120	+ if (blockloop)
	121	+ return;
134	122
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
139	125
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
146		- {
147		- 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	+ }
148	143	}
149		-
150		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
151	146	{
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155		- blockloop = true;
156		- child.RestoreSupports();
157		- 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	+ }
158	169	}
159		-}
	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	+ }
160	242
161	243	// MOCAP SUPPORT
162	244	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +381,7 @@
299	381	}
300	382
301	383	boolean live = false;
	384	+ boolean dontselect = false;
302	385	boolean hide = false;
303	386	boolean link2master = false; // performs reset support/master at each frame
304	387	boolean marked = false; // animation node
..	..	@@ -430,16 +513,16 @@
430	513	{
431	514	Object3D copy = this;
432	515
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	516	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	517
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	518	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	519	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	520	+ parentcam = Globals.theRenderer.Cameras()[1];
438	521	}
439	522
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	523	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	524	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	525	+ parentcam = Globals.theRenderer.Cameras()[0];
443	526	}
444	527
445	528	if (this == parentcam)
..	..	@@ -447,7 +530,7 @@
447	530	//assert(this instanceof Camera);
448	531
449	532	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	533	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	534	}
452	535
453	536	copy.marked ^= true;
..	..	@@ -467,7 +550,7 @@
467	550	//assert(this instanceof Camera);
468	551
469	552	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	553	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	554	}
472	555
473	556	copy.Touch(); // display list issue
..	..	@@ -480,12 +563,14 @@
480	563	toParent = LA.newMatrix();
481	564	fromParent = LA.newMatrix();
482	565	}
	566	+
483	567	if (toParentMarked == null)
484	568	{
485	569	if (maxcount != 1)
486	570	{
487	571	new Exception().printStackTrace();
488	572	}
	573	+
489	574	toParentMarked = LA.newMatrix();
490	575	fromParentMarked = LA.newMatrix();
491	576	}
..	..	@@ -602,7 +687,7 @@
602	687	return;
603	688	}
604	689
605		- if (CameraPane.fromscript)
	690	+ if (Globals.fromscript)
606	691	{
607	692	transformcount = 0;
608	693	return;
..	..	@@ -760,7 +845,7 @@
760	845
761	846	int GetTransformCount()
762	847	{
763		- // marde pour serialization de Texture
	848	+ // patch pour serialization de Texture
764	849	resetmaxcount();
765	850	resettransformcount();
766	851	resetstep();
..	..	@@ -773,7 +858,7 @@
773	858	if (step == 0)
774	859	step = 1;
775	860	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	861	+ maxcount = 128; // 2048; // 4;
777	862	// if (acceleration == 0)
778	863	// acceleration = 10;
779	864	if (delay == 0) // serial
..	..	@@ -794,12 +879,12 @@
794	879	// factor = CameraPane.STEP;
795	880	// }
796	881
797		- if (marked && CameraPane.isLIVE() && live &&
	882	+ if (marked && Globals.isLIVE() && live &&
798	883	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	884	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	885	+ currentframe != Globals.framecount)
801	886	{
802		- currentframe = CameraPane.framecount;
	887	+ currentframe = Globals.framecount;
803	888
804	889	// System.err.println("transformcount = " + transformcount);
805	890	// System.err.println("factor = " + factor);
..	..	@@ -808,7 +893,8 @@
808	893
809	894	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	895
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	896	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	897	+ (step == 1 && changedir))
812	898	{
813	899	countdown = 1;
814	900	delay = speedup?8:1;
..	..	@@ -911,6 +997,11 @@
911	997	fromParent = null; // LA.newMatrix();
912	998	bRep = null; // new BoundaryRep();
913	999
	1000	+ if (oname != null && oname.equals("LeftHand"))
	1001	+ {
	1002	+ name = oname;
	1003	+ }
	1004	+
914	1005	/*
915	1006	float hue = (float)Math.random();
916	1007	Color col;
..	..	@@ -953,7 +1044,7 @@
953	1044
954	1045	public Object clone()
955	1046	{
956		- return GrafreeD.clone(this);
	1047	+ return Grafreed.clone(this);
957	1048	}
958	1049
959	1050	Object3D copyExpand()
..	..	@@ -1469,7 +1560,7 @@
1469	1560	BoundaryRep.SEUIL = other.material.cameralight;
1470	1561
1471	1562	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1563	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1564	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1565	}
1475	1566
..	..	@@ -1728,7 +1819,7 @@
1728	1819	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1820	o.bRep = transientrep;
1730	1821	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1822	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1823	o.CreateMaterial();
1733	1824	o.SetAttributes(this, -1);
1734	1825	//parent
..	..	@@ -1741,7 +1832,7 @@
1741	1832	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1833	o.bRep = bRep;
1743	1834	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1835	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1836	o.CreateMaterial();
1746	1837	//o.overwriteThis(this, -1);
1747	1838	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1919,15 @@
1828	1919	if (obj.name == null)
1829	1920	continue; // can't be a null one
1830	1921
	1922	+ // Try perfect match first.
1831	1923	if (n.equals(obj.name))
1832	1924	{
1833	1925	theobj = obj;
1834	1926	count++;
1835	1927	}
1836	1928	}
	1929	+
	1930	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1931
1838	1932	if (count != 1)
1839	1933	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2387,17 @@
2293	2387	}
2294	2388	*/
2295	2389	}
	2390	+ else
	2391	+ {
	2392	+ //((ObjEditor)editWindow).SetupUI2(null);
	2393	+ }
2296	2394	}
2297	2395
2298	2396	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2397	{
2300	2398	if (newWindow)
2301	2399	{
	2400	+ new Exception().printStackTrace();
2302	2401	System.exit(0);
2303	2402	if (parent != null)
2304	2403	{
..	..	@@ -2475,13 +2574,13 @@
2475	2574	return retval;
2476	2575	}
2477	2576
2478		- void doEditDrag(ClickInfo info)
	2577	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2578	{
2480	2579	switch (doSomething)
2481	2580	{
2482	2581	case 1: // '\001'
2483	2582	//super.
2484		- doEditDrag0(info);
	2583	+ doEditDrag0(info, opposite);
2485	2584	break;
2486	2585
2487	2586	case 2: // '\002'
..	..	@@ -2494,11 +2593,11 @@
2494	2593	{
2495	2594	//sel.hitSomething = childToDrag.hitSomething;
2496	2595	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2596	+ sel.doEditDrag(info, opposite);
2498	2597	} else
2499	2598	{
2500	2599	//super.
2501		- doEditDrag0(info);
	2600	+ doEditDrag0(info, opposite);
2502	2601	}
2503	2602	}
2504	2603	break;
..	..	@@ -2608,6 +2707,18 @@
2608	2707	void GenNormalsS(boolean crease)
2609	2708	{
2610	2709	selection.GenNormals(crease);
	2710	+// for (int i=0; i<selection.size(); i++)
	2711	+// {
	2712	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2713	+// selectee.GenNormals(crease);
	2714	+// }
	2715	+
	2716	+ //Touch();
	2717	+ }
	2718	+
	2719	+ void GenNormalsMeshS()
	2720	+ {
	2721	+ selection.GenNormalsMesh();
2611	2722	// for (int i=0; i<selection.size(); i++)
2612	2723	// {
2613	2724	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2859,24 @@
2748	2859	if (child == null)
2749	2860	continue;
2750	2861	child.GenNormals(crease);
	2862	+// Children().release(i);
	2863	+ }
	2864	+ blockloop = false;
	2865	+ }
	2866	+
	2867	+ void GenNormalsMesh()
	2868	+ {
	2869	+ if (blockloop)
	2870	+ return;
	2871	+
	2872	+ blockloop = true;
	2873	+ GenNormalsMesh0();
	2874	+ for (int i = 0; i < Children().Size(); i++)
	2875	+ {
	2876	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2877	+ if (child == null)
	2878	+ continue;
	2879	+ child.GenNormalsMesh();
2751	2880	// Children().release(i);
2752	2881	}
2753	2882	blockloop = false;
..	..	@@ -2905,7 +3034,8 @@
2905	3034	{
2906	3035	if (bRep != null)
2907	3036	{
2908		- bRep.GenUV();
	3037	+ bRep.GenUV(); //1);
	3038	+ //bRep.UnfoldUV();
2909	3039	Touch();
2910	3040	}
2911	3041	}
..	..	@@ -2915,6 +3045,15 @@
2915	3045	if (bRep != null)
2916	3046	{
2917	3047	bRep.GenerateNormals(crease);
	3048	+ Touch();
	3049	+ }
	3050	+ }
	3051	+
	3052	+ void GenNormalsMesh0()
	3053	+ {
	3054	+ if (bRep != null)
	3055	+ {
	3056	+ bRep.GenerateNormalsMesh();
2918	3057	Touch();
2919	3058	}
2920	3059	}
..	..	@@ -2980,6 +3119,33 @@
2980	3119	blockloop = false;
2981	3120	}
2982	3121
	3122	+ void TransformChildren()
	3123	+ {
	3124	+ if (toParent != null)
	3125	+ {
	3126	+ for (int i=Size(); --i>=0;)
	3127	+ {
	3128	+ Object3D v = get(i);
	3129	+
	3130	+ if (v.toParent == null)
	3131	+ {
	3132	+ v.toParent = LA.newMatrix();
	3133	+ v.fromParent = LA.newMatrix();
	3134	+ }
	3135	+
	3136	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3137	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3138	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3139	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3140	+ }
	3141	+
	3142	+ toParent = null; // LA.matIdentity(toParent);
	3143	+ fromParent = null; // LA.matIdentity(fromParent);
	3144	+
	3145	+ Touch();
	3146	+ }
	3147	+ }
	3148	+
2983	3149	void TransformGeometry()
2984	3150	{
2985	3151	Object3D obj = this;
..	..	@@ -3201,9 +3367,11 @@
3201	3367
3202	3368	BoundaryRep sup = bRep.support;
3203	3369	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3370	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3371	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3372	+
	3373	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3374	+
3207	3375	bRep = temprep;
3208	3376	bRep.support = sup;
3209	3377	Touch();
..	..	@@ -3340,7 +3508,8 @@
3340	3508	if (blockloop)
3341	3509	return;
3342	3510
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3511	+ if (//marked \|\| // does not make sense
	3512	+ (bRep != null \|\| material != null)) // borderline...
3344	3513	live = h;
3345	3514
3346	3515	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3530,8 @@
3361	3530	return;
3362	3531
3363	3532	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3533	+ if (//marked \|\| // does not make sense
	3534	+ (bRep != null \|\| material != null)) // borderline...
3365	3535	link2master = h;
3366	3536
3367	3537	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3551,8 @@
3381	3551	if (blockloop)
3382	3552	return;
3383	3553
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3554	+ if (//marked \|\| // does not make sense
	3555	+ (bRep != null \|\| material != null)) // borderline...
3385	3556	hide = h;
3386	3557
3387	3558	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3572,7 @@
3401	3572	if (blockloop)
3402	3573	return;
3403	3574
3404		- if (bRep != null && material != null) // borderline...
	3575	+ if (bRep != null \|\| material != null) // borderline...
3405	3576	marked = h;
3406	3577
3407	3578	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3582,46 @@
3411	3582	continue;
3412	3583	blockloop = true;
3413	3584	child.MarkLeaves(h);
	3585	+ blockloop = false;
	3586	+ // release(i);
	3587	+ }
	3588	+ }
	3589	+
	3590	+ void RewindLeaves(boolean h)
	3591	+ {
	3592	+ if (blockloop)
	3593	+ return;
	3594	+
	3595	+ if (bRep != null \|\| material != null) // borderline...
	3596	+ rewind = h;
	3597	+
	3598	+ for (int i = 0; i < Size(); i++)
	3599	+ {
	3600	+ Object3D child = (Object3D) get(i); // reserve(i);
	3601	+ if (child == null)
	3602	+ continue;
	3603	+ blockloop = true;
	3604	+ child.RewindLeaves(h);
	3605	+ blockloop = false;
	3606	+ // release(i);
	3607	+ }
	3608	+ }
	3609	+
	3610	+ void RandomLeaves(boolean h)
	3611	+ {
	3612	+ if (blockloop)
	3613	+ return;
	3614	+
	3615	+ if (bRep != null \|\| material != null) // borderline...
	3616	+ random = h;
	3617	+
	3618	+ for (int i = 0; i < Size(); i++)
	3619	+ {
	3620	+ Object3D child = (Object3D) get(i); // reserve(i);
	3621	+ if (child == null)
	3622	+ continue;
	3623	+ blockloop = true;
	3624	+ child.RandomLeaves(h);
3414	3625	blockloop = false;
3415	3626	// release(i);
3416	3627	}
..	..	@@ -3725,7 +3936,7 @@
3725	3936	if (child == null)
3726	3937	continue;
3727	3938
3728		- if (GrafreeD.RENDERME > 0)
	3939	+ if (Grafreed.RENDERME > 0)
3729	3940	{
3730	3941	if (child instanceof Merge)
3731	3942	((Merge)child).renderme();
..	..	@@ -3876,7 +4087,7 @@
3876	4087	if (child == null)
3877	4088	continue;
3878	4089
3879		- if (GrafreeD.RENDERME > 0)
	4090	+ if (Grafreed.RENDERME > 0)
3880	4091	{
3881	4092	if (child instanceof Merge)
3882	4093	((Merge)child).renderme();
..	..	@@ -4071,7 +4282,7 @@
4071	4282	if (child == null)
4072	4283	continue;
4073	4284
4074		- if (GrafreeD.RENDERME > 0)
	4285	+ if (Grafreed.RENDERME > 0)
4075	4286	{
4076	4287	if (child instanceof Merge)
4077	4288	((Merge)child).renderme();
..	..	@@ -4184,6 +4395,55 @@
4184	4395	{
4185	4396	blockloop = true;
4186	4397	get(i).RepairShadow();
	4398	+ blockloop = false;
	4399	+ }
	4400	+ }
	4401	+
	4402	+ void RepairSOV()
	4403	+ {
	4404	+ if (blockloop)
	4405	+ return;
	4406	+
	4407	+ String texname = this.GetPigmentTexture();
	4408	+
	4409	+ if (texname.startsWith("sov"))
	4410	+ {
	4411	+ String[] s = texname.split("/");
	4412	+
	4413	+ String[] sname = s[1].split("Color.pn");
	4414	+
	4415	+ texname = sname[0];
	4416	+
	4417	+ if (sname.length > 1)
	4418	+ {
	4419	+ texname += "Color.jpg";
	4420	+ }
	4421	+
	4422	+ this.SetPigmentTexture("sov/" + texname);
	4423	+ }
	4424	+
	4425	+ texname = this.GetBumpTexture();
	4426	+
	4427	+ if (texname.startsWith("sov"))
	4428	+ {
	4429	+ String[] s = texname.split("/");
	4430	+
	4431	+ String[] sname = s[1].split("Bump.pn");
	4432	+
	4433	+ texname = sname[0];
	4434	+
	4435	+ if (sname.length > 1)
	4436	+ {
	4437	+ texname += "Bump.jpg";
	4438	+ }
	4439	+
	4440	+ this.SetBumpTexture("sov/" + texname);
	4441	+ }
	4442	+
	4443	+ for (int i=0; i<Size(); i++)
	4444	+ {
	4445	+ blockloop = true;
	4446	+ get(i).RepairSOV();
4187	4447	blockloop = false;
4188	4448	}
4189	4449	}
..	..	@@ -4678,7 +4938,7 @@
4678	4938
4679	4939	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4940	{
4681		- if (hide)
	4941	+ if (hide \|\| dontselect)
4682	4942	return null;
4683	4943
4684	4944	if (count <= 0)
..	..	@@ -4704,7 +4964,7 @@
4704	4964
4705	4965	cTreePath Select(int indexcount, boolean deselect)
4706	4966	{
4707		- if (hide)
	4967	+ if (hide \|\| dontselect)
4708	4968	return null;
4709	4969
4710	4970	if (count <= 0)
..	..	@@ -4854,7 +5114,7 @@
4854	5114	return globalTransform;
4855	5115	}
4856	5116
4857		- void PreprocessOcclusion(CameraPane cp)
	5117	+ void PreprocessOcclusion(iCameraPane cp)
4858	5118	{
4859	5119	/*
4860	5120	if (AOdone)
..	..	@@ -5001,7 +5261,8 @@
5001	5261	} else //
5002	5262	if (editWindow != null)
5003	5263	{
5004		- editWindow.cameraView.lighttouched = true;
	5264	+ //editWindow.cameraView.lighttouched = true;
	5265	+ Globals.lighttouched = true;
5005	5266	}
5006	5267	}
5007	5268
..	..	@@ -5155,10 +5416,34 @@
5155	5416
5156	5417	// System.out.println("Fullname = " + fullname);
5157	5418
5158		- if (fullname.name.indexOf(":") == -1)
5159		- return fullname.name;
	5419	+ // Does not work on Windows due to C:
	5420	+// if (fullname.name.indexOf(":") == -1)
	5421	+// return fullname.name;
	5422	+//
	5423	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5160	5424
5161		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5425	+ String[] split = fullname.name.split(":");
	5426	+
	5427	+ if (split.length == 0)
	5428	+ {
	5429	+ return "";
	5430	+ }
	5431	+
	5432	+ if (split.length <= 2)
	5433	+ {
	5434	+ if (fullname.name.endsWith(":"))
	5435	+ {
	5436	+ // Windows
	5437	+ return fullname.name.substring(0, fullname.name.length()-1);
	5438	+ }
	5439	+
	5440	+ return split[0];
	5441	+ }
	5442	+
	5443	+ // Windows
	5444	+ assert(split.length == 4);
	5445	+
	5446	+ return split[0] + ":" + split[1];
5162	5447	}
5163	5448
5164	5449	static String GetBump(cTexture fullname)
..	..	@@ -5167,10 +5452,38 @@
5167	5452	return "";
5168	5453
5169	5454	// System.out.println("Fullname = " + fullname);
5170		- if (fullname.name.indexOf(":") == -1)
5171		- return "";
5172		-
5173		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5455	+ // Does not work on Windows due to C:
	5456	+// if (fullname.name.indexOf(":") == -1)
	5457	+// return "";
	5458	+//
	5459	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5460	+ String[] split = fullname.name.split(":");
	5461	+
	5462	+ if (split.length == 0)
	5463	+ {
	5464	+ return "";
	5465	+ }
	5466	+
	5467	+ if (split.length == 1)
	5468	+ {
	5469	+ return "";
	5470	+ }
	5471	+
	5472	+ if (split.length == 2)
	5473	+ {
	5474	+ if (fullname.name.endsWith(":"))
	5475	+ {
	5476	+ // Windows
	5477	+ return "";
	5478	+ }
	5479	+
	5480	+ return split[1];
	5481	+ }
	5482	+
	5483	+ // Windows
	5484	+ assert(split.length == 4);
	5485	+
	5486	+ return split[2] + ":" + split[3];
5174	5487	}
5175	5488
5176	5489	String GetPigmentTexture()
..	..	@@ -5244,7 +5557,7 @@
5244	5557	System.out.print("; textures = " + textures);
5245	5558	System.out.println("; usedtextures = " + usedtextures);
5246	5559
5247		- if (GetTextures() == null)
	5560	+ if (GetTextures() == null) // What is that??
5248	5561	GetTextures().name = ":";
5249	5562
5250	5563	String texname = tex;
..	..	@@ -5275,6 +5588,43 @@
5275	5588	child.ResetPigmentTexture();
5276	5589	blockloop = false;
5277	5590	}
	5591	+ }
	5592	+
	5593	+ UUID GetUUID()
	5594	+ {
	5595	+ if (uuid == null)
	5596	+ {
	5597	+ // Serial
	5598	+ uuid = UUID.randomUUID();
	5599	+ }
	5600	+
	5601	+ return uuid;
	5602	+ }
	5603	+
	5604	+ Object3D GetObject(UUID uid)
	5605	+ {
	5606	+ if (blockloop)
	5607	+ return null;
	5608	+
	5609	+ if (GetUUID().equals(uid))
	5610	+ return this;
	5611	+
	5612	+ int nb = Size();
	5613	+ for (int i = 0; i < nb; i++)
	5614	+ {
	5615	+ Object3D child = (Object3D) get(i);
	5616	+
	5617	+ if (child == null)
	5618	+ continue;
	5619	+
	5620	+ blockloop = true;
	5621	+ Object3D obj = child.GetObject(uid);
	5622	+ blockloop = false;
	5623	+ if (obj != null)
	5624	+ return obj;
	5625	+ }
	5626	+
	5627	+ return null;
5278	5628	}
5279	5629
5280	5630	void SetBumpTexture(String tex)
..	..	@@ -5313,25 +5663,33 @@
5313	5663	}
5314	5664	}
5315	5665
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5666	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5667	{
5318	5668	Draw(display, root, selected, blocked);
5319	5669	}
5320	5670
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5671	boolean NeedSupport()
5326	5672	{
5327	5673	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5674	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5329	5675	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5676	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5677	}
5332	5678
	5679	+ static boolean DEBUG_SELECTION = false;
5333	5680
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5681	+ boolean IsLive()
	5682	+ {
	5683	+ if (live)
	5684	+ return true;
	5685	+
	5686	+ if (parent == null)
	5687	+ return false;
	5688	+
	5689	+ return parent.IsLive();
	5690	+ }
	5691	+
	5692	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5693	{
5336	5694	Invariants(); // june 2013
5337	5695
..	..	@@ -5340,8 +5698,8 @@
5340	5698	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5699	}
5342	5700
5343		- if (display.drawMode == CameraPane.SELECTION &&
5344		- hide)
	5701	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5702	+ (hide \|\| dontselect))
5345	5703	return;
5346	5704
5347	5705	if (name != null && name.contains("sclera"))
..	..	@@ -5359,7 +5717,7 @@
5359	5717	if (this instanceof Checker)
5360	5718	return;
5361	5719
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5720	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5721	return;
5364	5722
5365	5723	if (count <= 0)
..	..	@@ -5367,13 +5725,13 @@
5367	5725	return;
5368	5726	}
5369	5727
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5728	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5729	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5730	{
5373	5731	return;
5374	5732	}
5375	5733
5376		- javax.media.opengl.GL gl = display.GetGL();
	5734	+ //javax.media.opengl.GL gl = display.GetGL();
5377	5735
5378	5736	/*
5379	5737	if (touched)
..	..	@@ -5392,7 +5750,7 @@
5392	5750	support = support;
5393	5751
5394	5752	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5753	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396	5754
5397	5755	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	5756	{
..	..	@@ -5409,15 +5767,17 @@
5409	5767
5410	5768	boolean compiled = false;
5411	5769
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5770	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5771
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
5415		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5772	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5773	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5774	+ (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5416	5775	{
5417		- display.lighttouched = true;
	5776	+ Globals.lighttouched = true;
5418	5777	} // all panes...
5419		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5420		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5778	+
	5779	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5780	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5781	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5782	{
5423	5783	if (!(this instanceof Composite))
..	..	@@ -5425,7 +5785,7 @@
5425	5785	//if (displaylist == -1 && usecalllists)
5426	5786	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5427	5787	{
5428		- bRep.displaylist = gl.glGenLists(1);
	5788	+ bRep.displaylist = display.GenList();
5429	5789	assert(bRep.displaylist != 0);
5430	5790	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	5791	//System.out.println("\tgen list " + list);
..	..	@@ -5437,18 +5797,20 @@
5437	5797	if (usecalllists)
5438	5798	{
5439	5799	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5800	+ display.NewList(bRep.displaylist);
5441	5801	}
	5802	+
5442	5803	CallList(display, root, selected, blocked);
	5804	+
5443	5805	// compiled = true;
5444	5806	if (usecalllists)
5445	5807	{
5446	5808	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	5809	+ display.EndList();
5448	5810	}
5449	5811	//gl.glDrawBuffer(gl.GL_BACK);
5450	5812	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5813	+ Globals.lighttouched = true; // all panes...
5452	5814	}
5453	5815
5454	5816	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5849,12 @@
5487	5849
5488	5850	// frustum culling
5489	5851	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5852	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5853	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5854	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5855	{
5494	5856	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5857	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	5858	{
5497	5859	//System.out.print("CULLED");
5498	5860	culled = true;
..	..	@@ -5500,7 +5862,7 @@
5500	5862	}
5501	5863	else
5502	5864	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5865	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	5866	culled = true;
5505	5867
5506	5868	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +5898,11 @@
5536	5898
5537	5899
5538	5900	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5901	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	5902	{
5541	5903	if (GetBRep() != null)
5542	5904	{
5543		- CameraPane.NextIndex(this, gl);
	5905	+ display.NextIndex();
5544	5906	// vertex color conflict : gl.glCallList(list);
5545	5907	DrawNode(display, root, selected);
5546	5908	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +5924,7 @@
5562	5924	color[2] /= 2;
5563	5925	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	5926	*/
5565		- if (material != null)
5566		- {
5567		- materialstack[materialdepth] = material;
5568		- selectedstack[materialdepth] = selected;
5569		- cStatic.objectstack[materialdepth++] = this;
5570		- //System.out.println("material " + material);
5571		- //Applet3D.tracein(this, selected);
5572		- display.vector2buffer = projectedVertices;
5573		- if (this instanceof Camera)
5574		- {
5575		- display.options1[0] = material.shift;
5576		- //System.out.println("shift " + material.shift);
5577		- display.options1[1] = material.lightarea;
5578		- display.options1[2] = material.shadowbias;
5579		- display.options1[3] = material.aniso;
5580		- display.options1[4] = material.anisoV;
5581		- display.options2[0] = material.opacity;
5582		- display.options2[1] = material.diffuse;
5583		- display.options2[2] = material.factor;
5584		-
5585		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5586		- display.options4[0] = material.cameralight/0.2f;
5587		- display.options4[1] = material.subsurface;
5588		- display.options4[2] = material.sheen;
5589		-
5590		- // if (display.CURRENTANTIALIAS > 0)
5591		- // display.options3[3] /= 4;
5592		-
5593		- /*
5594		- System.out.println("Focus = " + display.options1[0]);
5595		- System.out.println("Aperture = " + display.options1[1]);
5596		- System.out.println("ShadowBlur = " + display.options1[2]);
5597		- System.out.println("Antialiasing = " + display.options1[3]);
5598		- System.out.println("Fog = " + display.options2[0]);
5599		- System.out.println("Intensity = " + display.options2[1]);
5600		- System.out.println("Elevation = " + display.options2[2]);
5601		- /**/
5602		- } else
5603		- {
5604		- material.Draw(display, selected);
5605		- }
5606		- } else
5607		- {
5608		- if (selected && CameraPane.flash)
5609		- {
5610		- display.modelParams4[1] = 100;
5611		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5612		- }
5613		- }
	5927	+ display.PushMaterial(this, selected);
5614	5928
5615	5929	//System.out.println("call list " + list);
5616	5930	//System.out.println();
..	..	@@ -5629,7 +5943,28 @@
5629	5943	tex = GetTextures();
5630	5944	}
5631	5945
5632		- display.BindTextures(tex, texres);
	5946	+ boolean failedPigment = false;
	5947	+ boolean failedBump = false;
	5948	+
	5949	+ try
	5950	+ {
	5951	+ display.BindPigmentTexture(tex, texres);
	5952	+ }
	5953	+ catch (Exception e)
	5954	+ {
	5955	+ System.err.println("FAILED: " + this);
	5956	+ failedPigment = true;
	5957	+ }
	5958	+
	5959	+ try
	5960	+ {
	5961	+ display.BindBumpTexture(tex, texres);
	5962	+ }
	5963	+ catch (Exception e)
	5964	+ {
	5965	+ //System.err.println("FAILED: " + this);
	5966	+ failedBump = true;
	5967	+ }
5633	5968
5634	5969	if (!compiled)
5635	5970	{
..	..	@@ -5645,30 +5980,19 @@
5645	5980
5646	5981	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	5982	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	5983	+ display.CallList(bRep.displaylist);
5649	5984	// june 2013 drawSelf(display, root, selected);
5650	5985	}
5651	5986	}
5652	5987	}
5653	5988
5654		- display.ReleaseTextures(tex);
5655		-
5656		- //if (parent != null && parent.GetMaterial() != null)
5657		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5658		- if (material != null)
5659		- {
5660		- materialdepth -= 1;
5661		- if (materialdepth > 0)
5662		- {
5663		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5664		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5665		- }
5666		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5667		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5668		- {
5669		- display.modelParams4[1] = GetMaterial().cameralight;
5670		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5671		- }
	5989	+ if (!failedBump)
	5990	+ display.ReleaseBumpTexture(tex);
	5991	+
	5992	+ if (!failedPigment)
	5993	+ display.ReleasePigmentTexture(tex);
	5994	+
	5995	+ display.PopMaterial(this, selected);
5672	5996	}
5673	5997
5674	5998	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +6034,7 @@
5710	6034	// resetMasterNode();
5711	6035	}
5712	6036
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6037	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	6038	{
5715	6039	if (GetBRep() == null)
5716	6040	{
..	..	@@ -5793,8 +6117,11 @@
5793	6117	boolean flipV = false; // true;
5794	6118	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	6119
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6120	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	6121	{
	6122	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6123	+ return;
	6124	+
5798	6125	if (hide)
5799	6126	return;
5800	6127	// shadow optimisation
..	..	@@ -5852,16 +6179,7 @@
5852	6179	// // ??????????????????????????? Touch();
5853	6180	// }
5854	6181
5855		- if (material != null)
5856		- {
5857		- materialstack[materialdepth] = material;
5858		- selectedstack[materialdepth] = selected;
5859		- cStatic.objectstack[materialdepth++] = this;
5860		- //System.out.println("material " + material);
5861		- //Applet3D.tracein("selected ", selected);
5862		- display.vector2buffer = projectedVertices;
5863		- material.Draw(display, selected);
5864		- }
	6182	+display.PushMaterial2(this, selected);
5865	6183
5866	6184	Object3D child;
5867	6185	boolean sel;
..	..	@@ -5913,19 +6231,7 @@
5913	6231	*/
5914	6232	//depth += 1;
5915	6233
5916		- if (material != null)
5917		- {
5918		- materialdepth -= 1;
5919		- if (materialdepth > 0)
5920		- {
5921		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5922		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5923		- }
5924		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5925		- //else
5926		- //material.Draw(display, false);
5927		- }
5928		-
	6234	+display.PopMaterial2(this);
5929	6235	/*
5930	6236	display.ReleaseTextures(tex);
5931	6237	*/
..	..	@@ -5936,10 +6242,13 @@
5936	6242
5937	6243	//static cVector min,max;
5938	6244
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6245	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	6246	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6247	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	6248	return; // no shadow for transparent objects
	6249	+
	6250	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6251	+ return;
5943	6252
5944	6253	if (hide)
5945	6254	return;
..	..	@@ -5981,9 +6290,10 @@
5981	6290	return;
5982	6291	}
5983	6292
	6293	+ //bRep.GenUV(1/material.diffuseness);
5984	6294	// bRep.lock = true;
5985	6295
5986		- javax.media.opengl.GL gl = display.GetGL();
	6296	+ //javax.media.opengl.GL gl = display.GetGL();
5987	6297
5988	6298	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	6299	{
..	..	@@ -6000,23 +6310,7 @@
6000	6310
6001	6311	bRep.getMinMax(min, max, 100);
6002	6312
6003		- gl.glBegin(gl.GL_LINES);
6004		-
6005		- gl.glVertex3d(min.x, min.y, min.z);
6006		- gl.glVertex3d(min.x, min.y, max.z);
6007		- gl.glVertex3d(min.x, min.y, min.z);
6008		- gl.glVertex3d(min.x, max.y, min.z);
6009		- gl.glVertex3d(min.x, min.y, min.z);
6010		- gl.glVertex3d(max.x, min.y, min.z);
6011		-
6012		- gl.glVertex3d(max.x, max.y, max.z);
6013		- gl.glVertex3d(min.x, max.y, max.z);
6014		- gl.glVertex3d(max.x, max.y, max.z);
6015		- gl.glVertex3d(max.x, min.y, max.z);
6016		- gl.glVertex3d(max.x, max.y, max.z);
6017		- gl.glVertex3d(max.x, max.y, min.z);
6018		-
6019		- gl.glEnd();
	6313	+ display.DrawBox(min, max);
6020	6314
6021	6315	return;
6022	6316	}
..	..	@@ -6060,7 +6354,7 @@
6060	6354	{
6061	6355	//throw new Error();
6062	6356
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6357	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	6358
6065	6359	int[] strips = bRep.getRawIndices();
6066	6360
..	..	@@ -6070,178 +6364,19 @@
6070	6364	new Exception().printStackTrace();
6071	6365	return;
6072	6366	}
6073		-
6074		- // TRIANGLE STRIP ARRAY
6075		- if (bRep.trimmed)
	6367	+
	6368	+ if (dontselect)
6076	6369	{
6077		- float[] v = bRep.getRawVertices();
6078		- float[] n = bRep.getRawNormals();
6079		- float[] c = bRep.getRawColors();
6080		- float[] uv = bRep.getRawUVMap();
6081		-
6082		- int count2 = 0;
6083		- int count3 = 0;
6084		-
6085		- if (n.length > 0)
6086		- {
6087		- for (int i = 0; i < strips.length; i++)
6088		- {
6089		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6090		-
6091		- /*
6092		- boolean locked = false;
6093		- float eps = 0.1f;
6094		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6095		-
6096		- int dot = 0;
6097		-
6098		- if ((dot&1) == 0)
6099		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6100		-
6101		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6102		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6103		- else
6104		- {
6105		- locked = true;
6106		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6107		- }
6108		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6109		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6110		- if (hasnorm)
6111		- {
6112		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6113		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6114		- }
6115		-
6116		- if ((dot&4) == 0)
6117		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6118		-
6119		- if (wrap \|\| !locked && (dot&8) != 0)
6120		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6121		- else
6122		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6123		-
6124		- f.dot = dot;
6125		- */
6126		-
6127		- if (!selectmode)
6128		- {
6129		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6130		- {
6131		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6132		- } else
6133		- {
6134		- gl.glNormal3f(0, 0, 1);
6135		- }
6136		-
6137		- if (c != null)
6138		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6139		- {
6140		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6141		- }
6142		- }
6143		- if (flipV)
6144		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6145		- else
6146		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6147		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6148		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6149		-
6150		- count2 += 2;
6151		- count3 += 3;
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		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		-
6173		- count2 += 2;
6174		- count3 += 3;
6175		- for (int j = 0; j < strips[i] - 2; j++)
6176		- {
6177		- //gl.glTexCoord2d(...);
6178		- if (!selectmode)
6179		- {
6180		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6181		- {
6182		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6183		- } else
6184		- {
6185		- gl.glNormal3f(0, 0, 1);
6186		- }
6187		- if (c != null)
6188		- {
6189		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6190		- }
6191		- }
6192		-
6193		- if (flipV)
6194		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6195		- else
6196		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6197		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6198		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6199		- count2 += 2;
6200		- count3 += 3;
6201		- }
6202		-
6203		- gl.glEnd();
6204		- }
6205		- }
6206		-
6207		- assert count3 == v.length;
	6370	+ //bRep.GenerateNormalsMINE();
6208	6371	}
6209		- else // !trimmed
6210		- {
6211		- int count = 0;
6212		- for (int i = 0; i < strips.length; i++)
6213		- {
6214		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6215		-
6216		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6217		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6218		-
6219		- drawVertex(gl, p, selectmode);
6220		- drawVertex(gl, q, selectmode);
6221		-
6222		- for (int j = 0; j < strips[i] - 2; j++)
6223		- {
6224		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6225		-
6226		-// if (j%2 == 0)
6227		-// drawFace(p, q, r, display, null);
6228		-// else
6229		-// drawFace(p, r, q, display, null);
6230		-
6231		-// p = q;
6232		-// q = r;
6233		- drawVertex(gl, r, selectmode);
6234		- }
6235		-
6236		- gl.glEnd();
6237		- }
6238		- }
	6372	+
	6373	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	6374	} else // catch (Error e)
6240	6375	{
6241	6376	// TRIANGLE ARRAY
6242	6377	if (IsOpaque()) // Static())
6243	6378	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	6379	+ display.StartTriangles();
6245	6380	int facecount = bRep.FaceCount();
6246	6381	for (int i = 0; i < facecount; i++)
6247	6382	{
..	..	@@ -6304,9 +6439,9 @@
6304	6439	// // r.norm.dot(v3) > -0.5)
6305	6440	// // continue;
6306	6441
6307		- drawFace(p, q, r, display, face);
	6442	+ display.DrawFace(this, p, q, r, face);
6308	6443	}
6309		- gl.glEnd();
	6444	+ display.EndTriangles();
6310	6445	}
6311	6446	else
6312	6447	{
..	..	@@ -6335,8 +6470,8 @@
6335	6470	//System.out.println("SORT");
6336	6471
6337	6472	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6473	+
	6474	+ display.StartTriangles();
6340	6475	for (int i = 0; i < facecount; i++)
6341	6476	{
6342	6477	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6483,14 @@
6348	6483	Vertex q = bRep.GetVertex(face.q);
6349	6484	Vertex r = bRep.GetVertex(face.r);
6350	6485
6351		- drawFace(p, q, r, display, face);
	6486	+ display.DrawFace(this, p, q, r, face);
6352	6487	}
6353		- gl.glEnd();
	6488	+ display.EndTriangles();
6354	6489	}
6355	6490
6356	6491	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6492	{
	6493	+ /*
6358	6494	gl.glDisable(gl.GL_LIGHTING);
6359	6495	float[] colorV = new float[3];
6360	6496
..	..	@@ -6433,6 +6569,7 @@
6433	6569	// gl.glEnd();
6434	6570	}
6435	6571	}
	6572	+ */
6436	6573	}
6437	6574	}
6438	6575
..	..	@@ -6477,7 +6614,7 @@
6477	6614	center.add(r);
6478	6615	center.mul(1.0/3);
6479	6616
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6617	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6618
6482	6619	distance = center.dot(center);
6483	6620	}
..	..	@@ -6488,390 +6625,11 @@
6488	6625
6489	6626	transient FaceCompare[] facescompare = null;
6490	6627
6491		- void SetColor(CameraPane display, Vertex p0)
6492		- {
6493		- if (display.RENDERPROGRAM == 0)
6494		- {
6495		- float r = 0;
6496		- if (bRep != null)
6497		- {
6498		- if (bRep.stripified)
6499		- {
6500		- r = 1;
6501		- }
6502		- }
6503		- float g = 0;
6504		- if (bRep != null)
6505		- {
6506		- if (bRep.trimmed)
6507		- {
6508		- g = 1;
6509		- }
6510		- }
6511		- float b = 0;
6512		- if (support != null && link2master)
6513		- {
6514		- b = 1;
6515		- }
6516		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6517		- return;
6518		- }
6519		-
6520		- if (display.drawMode != CameraPane.SHADOW)
6521		- return;
6522		-
6523		- javax.media.opengl.GL gl = display.GetGL();
6524		-// if (true) return;
6525		-// float ao = p.AO;
6526		-//
6527		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6528		-// // ao = 1;
6529		-//
6530		-// gl.glColor4f(ao, ao, ao, 1);
6531		-
6532		-// CameraPane.selectedpoint.
6533		-// getAverage(cStatic.point1, true);
6534		- if (CameraPane.pointflow == null) // !random) // live)
6535		- {
6536		- return;
6537		- }
6538		-
6539		- cStatic.point1.set(0,0,0);
6540		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6541		-
6542		- cStatic.point1.sub(p0);
6543		-
6544		-
6545		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6546		-// {
6547		-// return;
6548		-// }
6549		-
6550		- //if (true)
6551		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6552		- {
6553		- return;
6554		- }
6555		-
6556		- float[] colorV = new float[3];
6557		-
6558		- if (false) // marked)
6559		- {
6560		- // debug rigging weights
6561		- for (int object = 0; object < p0.vertexlinks.length; object++)
6562		- {
6563		- float weight = p0.weights[object] / p0.totalweight;
6564		-
6565		- // if (weight < 0.1)
6566		- // {
6567		- // assert(weight == 0);
6568		- // continue;
6569		- // }
6570		-
6571		- if (p0.vertexlinks[object] == -1)
6572		- continue;
6573		-
6574		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6575		-
6576		- int color = //1 << object; //
6577		- //p.vertexlinks.length;
6578		- support.bRep.supports[p0.closestsupport].links[object];
6579		- colorV[2] += (color & 1) * weight;
6580		- colorV[1] += ((color & 2) >> 1) * weight;
6581		- colorV[0] += ((color & 4) >> 2) * weight;
6582		- }
6583		- }
6584		- else
6585		- {
6586		- if (drawingstarted)
6587		- {
6588		- // find next point
6589		- if (bRep.GetVertex(0).faceindices == null)
6590		- {
6591		- bRep.InitFaceIndices();
6592		- }
6593		-
6594		- double ymin = p0.y;
6595		-
6596		- Vertex newp = p0;
6597		-
6598		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6599		- {
6600		- int fi = p0.faceindices[fii];
6601		-
6602		- if (fi == -1)
6603		- break;
6604		-
6605		- Face f = bRep.GetFace(fi);
6606		-
6607		- Vertex p = bRep.GetVertex(f.p);
6608		- Vertex q = bRep.GetVertex(f.q);
6609		- Vertex r = bRep.GetVertex(f.r);
6610		-
6611		- int swap = (int)(Math.random()*3);
6612		-
6613		-// for (int s=swap; --s>=0;)
6614		-// {
6615		-// Vertex t = p;
6616		-// p = q;
6617		-// q = r;
6618		-// r = t;
6619		-// }
6620		- if (ymin > p.y)
6621		- {
6622		- ymin = p.y;
6623		- newp = p;
6624		-// break;
6625		- }
6626		- if (ymin > q.y)
6627		- {
6628		- ymin = q.y;
6629		- newp = q;
6630		-// break;
6631		- }
6632		- if (ymin > r.y)
6633		- {
6634		- ymin = r.y;
6635		- newp = r;
6636		-// break;
6637		- }
6638		- }
6639		-
6640		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6641		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6642		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6643		-
6644		- drawingstarted = false;
6645		-
6646		- // return;
6647		- }
6648		-
6649		- if (false) // CameraPane.DRAW
6650		- {
6651		- p0.AO = colorV[0] = 2;
6652		- colorV[1] = 2;
6653		- colorV[2] = 2;
6654		- }
6655		-
6656		- CameraPane.pointflow.add(p0);
6657		- CameraPane.pointflow.Touch();
6658		- }
6659		-
6660		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6661		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6662		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6663		- }
6664		-
6665	6628	void Print(Vertex v)
6666	6629	{
6667	6630	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6631	}
6669	6632
6670		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6671		- {
6672		- if (!selectmode)
6673		- {
6674		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6675		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6676		-
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- }
6682		-
6683		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6684		- }
6685		-
6686		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6687		- CameraPane display, Face face)
6688		- {
6689		- if (pv.y == -10000 \|\|
6690		- qv.y == -10000 \|\|
6691		- rv.y == -10000)
6692		- return;
6693		-
6694		-// float b = f.nbiterations & 1;
6695		-// float g = (f.nbiterations>>1) & 1;
6696		-// float r = (f.nbiterations>>2) & 1;
6697		-//
6698		-// //if (f.weight == 10000)
6699		-// //{
6700		-// // r = 1; g = b = 0;
6701		-// //}
6702		-// //else
6703		-// //{
6704		-// // assert(f.weight < 10000);
6705		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6706		-// if (r<0)
6707		-// assert(r>=0);
6708		-// //}
6709		-
6710		- javax.media.opengl.GL gl = display.GetGL();
6711		-
6712		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6713		-
6714		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6715		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6716		- {
6717		- //gl.glBegin(gl.GL_TRIANGLES);
6718		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6719		- if (!hasnorm)
6720		- {
6721		- // System.out.println("FUCK!!");
6722		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6723		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6724		- LA.vecCross(v0, v1, v2);
6725		- LA.vecNormalize(v2);
6726		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6727		- }
6728		-
6729		- // P
6730		- float x = (float)pv.x;
6731		- float y = (float)pv.y;
6732		- float z = (float)pv.z;
6733		-
6734		- if (hasnorm)
6735		- {
6736		-// if (!pv.norm.normalized())
6737		-// assert(pv.norm.normalized());
6738		-
6739		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6740		- float nx = (float)pv.norm.x;
6741		- float ny = (float)pv.norm.y;
6742		- float nz = (float)pv.norm.z;
6743		-
6744		- x += nx * NORMALPUSH;
6745		- y += ny * NORMALPUSH;
6746		- z += nz * NORMALPUSH;
6747		-
6748		- gl.glNormal3f(nx, ny, nz);
6749		- }
6750		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6751		- SetColor(display, pv);
6752		- //gl.glColor4f(r, g, b, 1);
6753		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6754		- if (flipV)
6755		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6756		- else
6757		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6758		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6759		-
6760		- gl.glVertex3f(x, y, z);
6761		-
6762		- // Q
6763		- x = (float)qv.x;
6764		- y = (float)qv.y;
6765		- z = (float)qv.z;
6766		-
6767		-// Print(pv);
6768		- if (hasnorm)
6769		- {
6770		-// assert(qv.norm.normalized());
6771		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6772		- float nx = (float)qv.norm.x;
6773		- float ny = (float)qv.norm.y;
6774		- float nz = (float)qv.norm.z;
6775		-
6776		- x += nx * NORMALPUSH;
6777		- y += ny * NORMALPUSH;
6778		- z += nz * NORMALPUSH;
6779		-
6780		- gl.glNormal3f(nx, ny, nz);
6781		- }
6782		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6783		- // boolean locked = false;
6784		- // float eps = 0.1f;
6785		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6786		-
6787		- // int dot = 0; //*/ (int)f.dot;
6788		-
6789		- // if ((dot&1) == 0)
6790		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6791		-
6792		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6793		- if (flipV)
6794		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6795		- else
6796		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6797		- // else
6798		- // {
6799		- // locked = true;
6800		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6801		- // }
6802		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6803		- SetColor(display, qv);
6804		-
6805		- gl.glVertex3f(x, y, z);
6806		- //gl.glColor4f(r, g, b, 1);
6807		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6808		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6809		-// Print(qv);
6810		-
6811		- // R
6812		- x = (float)rv.x;
6813		- y = (float)rv.y;
6814		- z = (float)rv.z;
6815		-
6816		- if (hasnorm)
6817		- {
6818		-// assert(rv.norm.normalized());
6819		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6820		- float nx = (float)rv.norm.x;
6821		- float ny = (float)rv.norm.y;
6822		- float nz = (float)rv.norm.z;
6823		-
6824		- x += nx * NORMALPUSH;
6825		- y += ny * NORMALPUSH;
6826		- z += nz * NORMALPUSH;
6827		-
6828		- gl.glNormal3f(nx, ny, nz);
6829		- }
6830		-
6831		- // if ((dot&4) == 0)
6832		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6833		-
6834		- // if (wrap \|\| !locked && (dot&8) != 0)
6835		- if (flipV)
6836		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6837		- else
6838		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6839		- // else
6840		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6841		-
6842		- // f.dot = dot;
6843		-
6844		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6845		- SetColor(display, rv);
6846		- //gl.glColor4f(r, g, b, 1);
6847		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6848		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6849		- gl.glVertex3f(x, y, z);
6850		-// Print(rv);
6851		- //gl.glEnd();
6852		- }
6853		- else
6854		- {
6855		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6856		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6857		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6858		-
6859		- }
6860		-
6861		- if (false) // (attributes & WIREFRAME) != 0)
6862		- {
6863		- gl.glDisable(gl.GL_LIGHTING);
6864		-
6865		- gl.glBegin(gl.GL_LINE_LOOP);
6866		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6867		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6868		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6869		- gl.glEnd();
6870		-
6871		- gl.glEnable(gl.GL_LIGHTING);
6872		- }
6873		- }
6874		-
6875	6633	void drawSelf(ClickInfo info, int level, boolean select)
6876	6634	{
6877	6635	if (bRep == null)
..	..	@@ -7443,83 +7201,84 @@
7443	7201	int spotw = spot.x + spot.width;
7444	7202	int spoth = spot.y + spot.height;
7445	7203	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7446		- if (CameraPane.Xmin > spot.x)
7447		- {
7448		- CameraPane.Xmin = spot.x;
7449		- }
7450		- if (CameraPane.Xmax < spotw)
7451		- {
7452		- CameraPane.Xmax = spotw;
7453		- }
7454		- if (CameraPane.Ymin > spot.y)
7455		- {
7456		- CameraPane.Ymin = spot.y;
7457		- }
7458		- if (CameraPane.Ymax < spoth)
7459		- {
7460		- CameraPane.Ymax = spoth;
7461		- }
	7204	+// if (CameraPane.Xmin > spot.x)
	7205	+// {
	7206	+// CameraPane.Xmin = spot.x;
	7207	+// }
	7208	+// if (CameraPane.Xmax < spotw)
	7209	+// {
	7210	+// CameraPane.Xmax = spotw;
	7211	+// }
	7212	+// if (CameraPane.Ymin > spot.y)
	7213	+// {
	7214	+// CameraPane.Ymin = spot.y;
	7215	+// }
	7216	+// if (CameraPane.Ymax < spoth)
	7217	+// {
	7218	+// CameraPane.Ymax = spoth;
	7219	+// }
7462	7220	spot.translate(32, 32);
7463	7221	spotw = spot.x + spot.width;
7464	7222	spoth = spot.y + spot.height;
7465		- info.g.setColor(Color.blue);
	7223	+ info.g.setColor(Color.cyan);
7466	7224	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7467		- if (CameraPane.Xmin > spot.x)
7468		- {
7469		- CameraPane.Xmin = spot.x;
7470		- }
7471		- if (CameraPane.Xmax < spotw)
7472		- {
7473		- CameraPane.Xmax = spotw;
7474		- }
7475		- if (CameraPane.Ymin > spot.y)
7476		- {
7477		- CameraPane.Ymin = spot.y;
7478		- }
7479		- if (CameraPane.Ymax < spoth)
7480		- {
7481		- CameraPane.Ymax = spoth;
7482		- }
7483		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7484		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7225	+// if (CameraPane.Xmin > spot.x)
	7226	+// {
	7227	+// CameraPane.Xmin = spot.x;
	7228	+// }
	7229	+// if (CameraPane.Xmax < spotw)
	7230	+// {
	7231	+// CameraPane.Xmax = spotw;
	7232	+// }
	7233	+// if (CameraPane.Ymin > spot.y)
	7234	+// {
	7235	+// CameraPane.Ymin = spot.y;
	7236	+// }
	7237	+// if (CameraPane.Ymax < spoth)
	7238	+// {
	7239	+// CameraPane.Ymax = spoth;
	7240	+// }
	7241	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7242	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7485	7243	spot.translate(0, -32);
7486		- info.g.setColor(Color.green);
	7244	+ info.g.setColor(Color.yellow);
7487	7245	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7488		- if (CameraPane.Xmin > spot.x)
7489		- {
7490		- CameraPane.Xmin = spot.x;
7491		- }
7492		- if (CameraPane.Xmax < spotw)
7493		- {
7494		- CameraPane.Xmax = spotw;
7495		- }
7496		- if (CameraPane.Ymin > spot.y)
7497		- {
7498		- CameraPane.Ymin = spot.y;
7499		- }
7500		- if (CameraPane.Ymax < spoth)
7501		- {
7502		- CameraPane.Ymax = spoth;
7503		- }
	7246	+ info.g.setColor(Color.green);
	7247	+// if (CameraPane.Xmin > spot.x)
	7248	+// {
	7249	+// CameraPane.Xmin = spot.x;
	7250	+// }
	7251	+// if (CameraPane.Xmax < spotw)
	7252	+// {
	7253	+// CameraPane.Xmax = spotw;
	7254	+// }
	7255	+// if (CameraPane.Ymin > spot.y)
	7256	+// {
	7257	+// CameraPane.Ymin = spot.y;
	7258	+// }
	7259	+// if (CameraPane.Ymax < spoth)
	7260	+// {
	7261	+// CameraPane.Ymax = spoth;
	7262	+// }
7504	7263	info.g.drawArc(boundary.x, boundary.y,
7505	7264	boundary.width, boundary.height, 0, 360);
7506	7265	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7507		- if (CameraPane.Xmin > boundary.x)
7508		- {
7509		- CameraPane.Xmin = boundary.x;
7510		- }
7511		- if (CameraPane.Xmax < boundary.x + boundary.width)
7512		- {
7513		- CameraPane.Xmax = boundary.x + boundary.width;
7514		- }
7515		- if (CameraPane.Ymin > boundary.y)
7516		- {
7517		- CameraPane.Ymin = boundary.y;
7518		- }
7519		- if (CameraPane.Ymax < boundary.y + boundary.height)
7520		- {
7521		- CameraPane.Ymax = boundary.y + boundary.height;
7522		- }
	7266	+// if (CameraPane.Xmin > boundary.x)
	7267	+// {
	7268	+// CameraPane.Xmin = boundary.x;
	7269	+// }
	7270	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7271	+// {
	7272	+// CameraPane.Xmax = boundary.x + boundary.width;
	7273	+// }
	7274	+// if (CameraPane.Ymin > boundary.y)
	7275	+// {
	7276	+// CameraPane.Ymin = boundary.y;
	7277	+// }
	7278	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7279	+// {
	7280	+// CameraPane.Ymax = boundary.y + boundary.height;
	7281	+// }
7523	7282	return;
7524	7283	}
7525	7284	}
..	..	@@ -7536,7 +7295,7 @@
7536	7295	startX = info.x;
7537	7296	startY = info.y;
7538	7297
7539		- hitSomething = 0;
	7298	+ hitSomething = -1;
7540	7299	cVector origin = new cVector();
7541	7300	//LA.xformPos(origin, toParent, origin);
7542	7301	Rectangle spot = new Rectangle();
..	..	@@ -7569,7 +7328,7 @@
7569	7328	}
7570	7329
7571	7330	//System.out.println("info.modifiers = " + info.modifiers);
7572		- modified = (info.modifiers & CameraPane.META) != 0;
	7331	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7573	7332	//System.out.println("modified = " + modified);
7574	7333	//new Exception().printStackTrace();
7575	7334	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7597,7 +7356,7 @@
7597	7356	return true;
7598	7357	}
7599	7358
7600		- void doEditDrag0(ClickInfo info)
	7359	+ void doEditDrag0(ClickInfo info, boolean opposite)
7601	7360	{
7602	7361	if (hitSomething == 0)
7603	7362	{
..	..	@@ -7612,6 +7371,7 @@
7612	7371	//System.out.println("hitSomething = " + hitSomething);
7613	7372
7614	7373	double scale = 0.005f * info.camera.Distance();
	7374	+
7615	7375	cVector xlate = new cVector();
7616	7376	//cVector xlate2 = new cVector();
7617	7377	switch (hitSomething)
..	..	@@ -7622,9 +7382,9 @@
7622	7382
7623	7383	case hitCenter: // Translate
7624	7384
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7385	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	7386
7627		- if (modified)
	7387	+ if (modified \|\| opposite)
7628	7388	{
7629	7389	//assert(false);
7630	7390	/*
..	..	@@ -7670,10 +7430,10 @@
7670	7430	}
7671	7431	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7432	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7433	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7674	7434	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7675	7435	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7436	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7437	//LA.vecCross(up, cVector.Z, right2);
7678	7438
7679	7439	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7718,6 +7478,7 @@
7718	7478
7719	7479	if (modified)
7720	7480	{
	7481	+ // Rotate 90 degrees
7721	7482	angle /= (Math.PI / 4);
7722	7483	angle = Math.floor(angle + 0.5);
7723	7484	angle *= (Math.PI / 4);
..	..	@@ -7731,7 +7492,7 @@
7731	7492	}
7732	7493	/**/
7733	7494
7734		- switch (info.pane.renderCamera.viewCode)
	7495	+ switch (info.pane.RenderCamera().viewCode)
7735	7496	{
7736	7497	case 1: // '\001'
7737	7498	LA.matZRotate(toParent, angle);
..	..	@@ -7759,24 +7520,27 @@
7759	7520
7760	7521	case hitScale: // scale
7761	7522	double hScale = (double) (info.x - centerPt.x) / 32;
	7523	+ double sign = 1;
	7524	+ if (hScale < 0)
	7525	+ {
	7526	+ sign = -1;
	7527	+ }
	7528	+ hScale = signMath.pow(signhScale, scale * 50);
7762	7529	if (hScale < 0.01)
7763	7530	{
7764		- hScale = 0.01;
	7531	+ //hScale = 0.01;
7765	7532	}
7766		- hScale = Math.pow(hScale, scale * 50);
7767		- if (hScale < 0.01)
7768		- {
7769		- hScale = 0.01;
7770		- }
	7533	+
7771	7534	double vScale = (double) (info.y - centerPt.y) / 32;
7772		- if (vScale < 0.01)
	7535	+ sign = 1;
	7536	+ if (vScale < 0)
7773	7537	{
7774		- vScale = 0.01;
	7538	+ sign = -1;
7775	7539	}
7776		- vScale = Math.pow(vScale, scale * 50);
	7540	+ vScale = signMath.pow(signvScale, scale * 50);
7777	7541	if (vScale < 0.01)
7778	7542	{
7779		- vScale = 0.01;
	7543	+ //vScale = 0.01;
7780	7544	}
7781	7545	LA.matCopy(startMat, toParent);
7782	7546	/**/
..	..	@@ -7787,39 +7551,47 @@
7787	7551	}
7788	7552	/**/
7789	7553
7790		- switch (info.pane.renderCamera.viewCode)
	7554	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7555	+
	7556	+ if (totalScale < 0.01)
	7557	+ {
	7558	+ totalScale = 0.01;
	7559	+ }
	7560	+
	7561	+ switch (info.pane.RenderCamera().viewCode)
7791	7562	{
7792	7563	case 3: // '\001'
7793		- if (modified)
	7564	+ if (modified \|\| opposite)
7794	7565	{
7795	7566	//LA.matScale(toParent, 1, hScale, vScale);
7796		- LA.matScale(toParent, vScale, 1, 1);
	7567	+ LA.matScale(toParent, totalScale, 1, 1);
7797	7568	} // vScale, 1);
7798	7569	else
7799	7570	{
7800		- LA.matScale(toParent, vScale, vScale, vScale);
	7571	+ // EXCEPTION!
	7572	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7801	7573	} // vScale, 1);
7802	7574	break;
7803	7575
7804	7576	case 2: // '\002'
7805		- if (modified)
	7577	+ if (modified \|\| opposite)
7806	7578	{
7807	7579	//LA.matScale(toParent, hScale, 1, vScale);
7808		- LA.matScale(toParent, 1, vScale, 1);
	7580	+ LA.matScale(toParent, 1, totalScale, 1);
7809	7581	} else
7810	7582	{
7811		- LA.matScale(toParent, vScale, 1, vScale);
	7583	+ LA.matScale(toParent, totalScale, 1, totalScale);
7812	7584	}
7813	7585	break;
7814	7586
7815	7587	case 1: // '\003'
7816		- if (modified)
	7588	+ if (modified \|\| opposite)
7817	7589	{
7818	7590	//LA.matScale(toParent, hScale, vScale, 1);
7819		- LA.matScale(toParent, 1, 1, vScale);
	7591	+ LA.matScale(toParent, 1, 1, totalScale);
7820	7592	} else
7821	7593	{
7822		- LA.matScale(toParent, vScale, vScale, 1);
	7594	+ LA.matScale(toParent, totalScale, totalScale, 1);
7823	7595	}
7824	7596	break;
7825	7597	}
..	..	@@ -7952,14 +7724,22 @@
7952	7724	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7953	7725	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7954	7726	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7727	+
	7728	+ String objname;
	7729	+
7955	7730	if (false) //parent != null)
7956	7731	{
7957		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7732	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7958	7733	} else
7959	7734	{
7960		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7735	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7961	7736	} // + super.toString();
7962	7737	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7738	+
	7739	+ if (!Globals.ADVANCED)
	7740	+ return objname;
	7741	+
	7742	+ return objname + " " + System.identityHashCode(this);
7963	7743	}
7964	7744
7965	7745	public int hashCode()
..	..	@@ -8015,6 +7795,7 @@
8015	7795	objectUI.closeUI();
8016	7796	if (editWindow != null)
8017	7797	{
	7798	+ editWindow.ctrlPanel.FlushUI();
8018	7799	editWindow.refreshContents();
8019	7800	} // ? new
8020	7801	objectUI = null;
..	..	@@ -8023,6 +7804,10 @@
8023	7804	{
8024	7805	editWindow = null;
8025	7806	} // ?
	7807	+ }
	7808	+ else
	7809	+ {
	7810	+ //editWindow.closeUI();
8026	7811	}
8027	7812	}
8028	7813
..	..	@@ -8035,7 +7820,7 @@
8035	7820	/transient/ cVector2[] projectedVertices = new cVector2[0];
8036	7821
8037	7822	Object3D /Composite/ parent;
8038		- Object3D /Composite/ fileparent;
	7823	+ Object3D /Composite/ fileparent; // In the case of FileObject
8039	7824
8040	7825	double[][] toParent; // dynamic matrix
8041	7826	double[][] fromParent;
..	..	@@ -8150,7 +7935,7 @@
8150	7935	{
8151	7936	assert(bRep != null);
8152	7937	if (!(support instanceof GenericJoint)) // support.bRep != null)
8153		- GrafreeD.Assert(support.bRep == bRep.support);
	7938	+ Grafreed.Assert(support.bRep == bRep.support);
8154	7939	}
8155	7940	else
8156	7941	{
..	..	@@ -8199,9 +7984,9 @@
8199	7984	private static cVector edge2 = new cVector();
8200	7985	//private static cVector norm = new cVector();
8201	7986	/transient private/ int hitSomething;
8202		- private static final int hitCenter = 1;
8203		- private static final int hitScale = 2;
8204		- private static final int hitRotate = 3;
	7987	+ static final int hitCenter = 1;
	7988	+ static final int hitScale = 2;
	7989	+ static final int hitRotate = 3;
8205	7990	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8206	7991	/transient/ private Point centerPt;
8207	7992	/transient/ private int startX;