~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,143 @@
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();
	120	+ if (blockloop)
	121	+ return;
	122	+
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
	125	+
	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	+ }
122	143	}
123		-
124		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
125	146	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	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	+ }
	169	+ }
	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("copy of " + this.name);
	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	+ if (blockloop)
	223	+ return;
	224	+
129	225	blockloop = true;
130		- child.SaveSupports();
	226	+
	227	+ Object3D o = hashtable.get(GetUUID());
	228	+
	229	+ RestoreBigData(o);
	230	+
	231	+ //hashtable.remove(GetUUID());
	232	+
	233	+ for (int i=0; i<Size(); i++)
	234	+ {
	235	+ get(i).RestoreBigData(hashtable);
	236	+ }
	237	+
131	238	blockloop = false;
132	239	}
133		-}
134	240
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
139		-
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
	241	+ void RestoreBigData(Object3D o)
146	242	{
147		- bRep.RestoreSupports();
	243	+ this.bRep = o.bRep;
	244	+ if (this.bRep != null)
	245	+ this.bRep.support = o.transientrep;
	246	+ // this.support = o.support;
	247	+ // this.fileparent = o.fileparent;
148	248	}
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155		- blockloop = true;
156		- child.RestoreSupports();
157		- blockloop = false;
158		- }
159		-}
160	249
161	250	// MOCAP SUPPORT
162	251	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +388,7 @@
299	388	}
300	389
301	390	boolean live = false;
	391	+ boolean dontselect = false;
302	392	boolean hide = false;
303	393	boolean link2master = false; // performs reset support/master at each frame
304	394	boolean marked = false; // animation node
..	..	@@ -430,16 +520,16 @@
430	520	{
431	521	Object3D copy = this;
432	522
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	523	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	524
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	525	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	526	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	527	+ parentcam = Globals.theRenderer.Cameras()[1];
438	528	}
439	529
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	530	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	531	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	532	+ parentcam = Globals.theRenderer.Cameras()[0];
443	533	}
444	534
445	535	if (this == parentcam)
..	..	@@ -447,7 +537,7 @@
447	537	//assert(this instanceof Camera);
448	538
449	539	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	540	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	541	}
452	542
453	543	copy.marked ^= true;
..	..	@@ -467,7 +557,7 @@
467	557	//assert(this instanceof Camera);
468	558
469	559	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	560	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	561	}
472	562
473	563	copy.Touch(); // display list issue
..	..	@@ -480,12 +570,14 @@
480	570	toParent = LA.newMatrix();
481	571	fromParent = LA.newMatrix();
482	572	}
	573	+
483	574	if (toParentMarked == null)
484	575	{
485	576	if (maxcount != 1)
486	577	{
487	578	new Exception().printStackTrace();
488	579	}
	580	+
489	581	toParentMarked = LA.newMatrix();
490	582	fromParentMarked = LA.newMatrix();
491	583	}
..	..	@@ -602,7 +694,7 @@
602	694	return;
603	695	}
604	696
605		- if (CameraPane.fromscript)
	697	+ if (Globals.fromscript)
606	698	{
607	699	transformcount = 0;
608	700	return;
..	..	@@ -760,7 +852,7 @@
760	852
761	853	int GetTransformCount()
762	854	{
763		- // marde pour serialization de Texture
	855	+ // patch pour serialization de Texture
764	856	resetmaxcount();
765	857	resettransformcount();
766	858	resetstep();
..	..	@@ -773,7 +865,7 @@
773	865	if (step == 0)
774	866	step = 1;
775	867	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	868	+ maxcount = 128; // 2048; // 4;
777	869	// if (acceleration == 0)
778	870	// acceleration = 10;
779	871	if (delay == 0) // serial
..	..	@@ -794,12 +886,12 @@
794	886	// factor = CameraPane.STEP;
795	887	// }
796	888
797		- if (marked && CameraPane.isLIVE() && live &&
	889	+ if (marked && Globals.isLIVE() && live &&
798	890	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	891	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	892	+ currentframe != Globals.framecount)
801	893	{
802		- currentframe = CameraPane.framecount;
	894	+ currentframe = Globals.framecount;
803	895
804	896	// System.err.println("transformcount = " + transformcount);
805	897	// System.err.println("factor = " + factor);
..	..	@@ -808,7 +900,8 @@
808	900
809	901	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	902
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	903	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	904	+ (step == 1 && changedir))
812	905	{
813	906	countdown = 1;
814	907	delay = speedup?8:1;
..	..	@@ -880,6 +973,7 @@
880	973	if (material == null \|\| material.multiply)
881	974	return true;
882	975
	976	+ // Transparent objects are dynamic because we have to sort the triangles.
883	977	return material.opacity > 0.99;
884	978	}
885	979
..	..	@@ -911,6 +1005,11 @@
911	1005	fromParent = null; // LA.newMatrix();
912	1006	bRep = null; // new BoundaryRep();
913	1007
	1008	+ if (oname != null && oname.equals("LeftHand"))
	1009	+ {
	1010	+ name = oname;
	1011	+ }
	1012	+
914	1013	/*
915	1014	float hue = (float)Math.random();
916	1015	Color col;
..	..	@@ -953,7 +1052,7 @@
953	1052
954	1053	public Object clone()
955	1054	{
956		- return GrafreeD.clone(this);
	1055	+ return Grafreed.clone(this);
957	1056	}
958	1057
959	1058	Object3D copyExpand()
..	..	@@ -1469,7 +1568,7 @@
1469	1568	BoundaryRep.SEUIL = other.material.cameralight;
1470	1569
1471	1570	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1571	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1572	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1573	}
1475	1574
..	..	@@ -1728,7 +1827,7 @@
1728	1827	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1828	o.bRep = transientrep;
1730	1829	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1830	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1831	o.CreateMaterial();
1733	1832	o.SetAttributes(this, -1);
1734	1833	//parent
..	..	@@ -1741,7 +1840,7 @@
1741	1840	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1841	o.bRep = bRep;
1743	1842	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1843	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1844	o.CreateMaterial();
1746	1845	//o.overwriteThis(this, -1);
1747	1846	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1927,15 @@
1828	1927	if (obj.name == null)
1829	1928	continue; // can't be a null one
1830	1929
	1930	+ // Try perfect match first.
1831	1931	if (n.equals(obj.name))
1832	1932	{
1833	1933	theobj = obj;
1834	1934	count++;
1835	1935	}
1836	1936	}
	1937	+
	1938	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1939
1838	1940	if (count != 1)
1839	1941	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2395,17 @@
2293	2395	}
2294	2396	*/
2295	2397	}
	2398	+ else
	2399	+ {
	2400	+ //((ObjEditor)editWindow).SetupUI2(null);
	2401	+ }
2296	2402	}
2297	2403
2298	2404	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2405	{
2300	2406	if (newWindow)
2301	2407	{
	2408	+ new Exception().printStackTrace();
2302	2409	System.exit(0);
2303	2410	if (parent != null)
2304	2411	{
..	..	@@ -2333,6 +2440,14 @@
2333	2440	{
2334	2441	editWindow.refreshContents();
2335	2442	}
	2443	+ else
	2444	+ {
	2445	+ if (manipWindow != null)
	2446	+ {
	2447	+ manipWindow.refreshContents();
	2448	+ }
	2449	+ }
	2450	+
2336	2451	//if (parent != null)
2337	2452	//parent.refreshEditWindow();
2338	2453	}
..	..	@@ -2475,13 +2590,13 @@
2475	2590	return retval;
2476	2591	}
2477	2592
2478		- void doEditDrag(ClickInfo info)
	2593	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2594	{
2480	2595	switch (doSomething)
2481	2596	{
2482	2597	case 1: // '\001'
2483	2598	//super.
2484		- doEditDrag0(info);
	2599	+ doEditDrag0(info, opposite);
2485	2600	break;
2486	2601
2487	2602	case 2: // '\002'
..	..	@@ -2494,11 +2609,11 @@
2494	2609	{
2495	2610	//sel.hitSomething = childToDrag.hitSomething;
2496	2611	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2612	+ sel.doEditDrag(info, opposite);
2498	2613	} else
2499	2614	{
2500	2615	//super.
2501		- doEditDrag0(info);
	2616	+ doEditDrag0(info, opposite);
2502	2617	}
2503	2618	}
2504	2619	break;
..	..	@@ -2608,6 +2723,18 @@
2608	2723	void GenNormalsS(boolean crease)
2609	2724	{
2610	2725	selection.GenNormals(crease);
	2726	+// for (int i=0; i<selection.size(); i++)
	2727	+// {
	2728	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2729	+// selectee.GenNormals(crease);
	2730	+// }
	2731	+
	2732	+ //Touch();
	2733	+ }
	2734	+
	2735	+ void GenNormalsMeshS()
	2736	+ {
	2737	+ selection.GenNormalsMesh();
2611	2738	// for (int i=0; i<selection.size(); i++)
2612	2739	// {
2613	2740	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2875,24 @@
2748	2875	if (child == null)
2749	2876	continue;
2750	2877	child.GenNormals(crease);
	2878	+// Children().release(i);
	2879	+ }
	2880	+ blockloop = false;
	2881	+ }
	2882	+
	2883	+ void GenNormalsMesh()
	2884	+ {
	2885	+ if (blockloop)
	2886	+ return;
	2887	+
	2888	+ blockloop = true;
	2889	+ GenNormalsMesh0();
	2890	+ for (int i = 0; i < Children().Size(); i++)
	2891	+ {
	2892	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2893	+ if (child == null)
	2894	+ continue;
	2895	+ child.GenNormalsMesh();
2751	2896	// Children().release(i);
2752	2897	}
2753	2898	blockloop = false;
..	..	@@ -2905,7 +3050,8 @@
2905	3050	{
2906	3051	if (bRep != null)
2907	3052	{
2908		- bRep.GenUV();
	3053	+ bRep.GenUV(); //1);
	3054	+ //bRep.UnfoldUV();
2909	3055	Touch();
2910	3056	}
2911	3057	}
..	..	@@ -2915,6 +3061,15 @@
2915	3061	if (bRep != null)
2916	3062	{
2917	3063	bRep.GenerateNormals(crease);
	3064	+ Touch();
	3065	+ }
	3066	+ }
	3067	+
	3068	+ void GenNormalsMesh0()
	3069	+ {
	3070	+ if (bRep != null)
	3071	+ {
	3072	+ bRep.GenerateNormalsMesh();
2918	3073	Touch();
2919	3074	}
2920	3075	}
..	..	@@ -2980,6 +3135,33 @@
2980	3135	blockloop = false;
2981	3136	}
2982	3137
	3138	+ void TransformChildren()
	3139	+ {
	3140	+ if (toParent != null)
	3141	+ {
	3142	+ for (int i=Size(); --i>=0;)
	3143	+ {
	3144	+ Object3D v = get(i);
	3145	+
	3146	+ if (v.toParent == null)
	3147	+ {
	3148	+ v.toParent = LA.newMatrix();
	3149	+ v.fromParent = LA.newMatrix();
	3150	+ }
	3151	+
	3152	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3153	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3154	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3155	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3156	+ }
	3157	+
	3158	+ toParent = null; // LA.matIdentity(toParent);
	3159	+ fromParent = null; // LA.matIdentity(fromParent);
	3160	+
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2983	3165	void TransformGeometry()
2984	3166	{
2985	3167	Object3D obj = this;
..	..	@@ -3201,9 +3383,11 @@
3201	3383
3202	3384	BoundaryRep sup = bRep.support;
3203	3385	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3386	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3387	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3388	+
	3389	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3390	+
3207	3391	bRep = temprep;
3208	3392	bRep.support = sup;
3209	3393	Touch();
..	..	@@ -3340,7 +3524,8 @@
3340	3524	if (blockloop)
3341	3525	return;
3342	3526
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3527	+ if (//marked \|\| // does not make sense
	3528	+ (bRep != null \|\| material != null)) // borderline...
3344	3529	live = h;
3345	3530
3346	3531	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3546,8 @@
3361	3546	return;
3362	3547
3363	3548	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3549	+ if (//marked \|\| // does not make sense
	3550	+ (bRep != null \|\| material != null)) // borderline...
3365	3551	link2master = h;
3366	3552
3367	3553	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3567,8 @@
3381	3567	if (blockloop)
3382	3568	return;
3383	3569
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3570	+ if (//marked \|\| // does not make sense
	3571	+ (bRep != null \|\| material != null)) // borderline...
3385	3572	hide = h;
3386	3573
3387	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3588,7 @@
3401	3588	if (blockloop)
3402	3589	return;
3403	3590
3404		- if (bRep != null && material != null) // borderline...
	3591	+ if (bRep != null \|\| material != null) // borderline...
3405	3592	marked = h;
3406	3593
3407	3594	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3598,46 @@
3411	3598	continue;
3412	3599	blockloop = true;
3413	3600	child.MarkLeaves(h);
	3601	+ blockloop = false;
	3602	+ // release(i);
	3603	+ }
	3604	+ }
	3605	+
	3606	+ void RewindLeaves(boolean h)
	3607	+ {
	3608	+ if (blockloop)
	3609	+ return;
	3610	+
	3611	+ if (bRep != null \|\| material != null) // borderline...
	3612	+ rewind = 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.RewindLeaves(h);
	3621	+ blockloop = false;
	3622	+ // release(i);
	3623	+ }
	3624	+ }
	3625	+
	3626	+ void RandomLeaves(boolean h)
	3627	+ {
	3628	+ if (blockloop)
	3629	+ return;
	3630	+
	3631	+ if (bRep != null \|\| material != null) // borderline...
	3632	+ random = h;
	3633	+
	3634	+ for (int i = 0; i < Size(); i++)
	3635	+ {
	3636	+ Object3D child = (Object3D) get(i); // reserve(i);
	3637	+ if (child == null)
	3638	+ continue;
	3639	+ blockloop = true;
	3640	+ child.RandomLeaves(h);
3414	3641	blockloop = false;
3415	3642	// release(i);
3416	3643	}
..	..	@@ -3725,7 +3952,7 @@
3725	3952	if (child == null)
3726	3953	continue;
3727	3954
3728		- if (GrafreeD.RENDERME > 0)
	3955	+ if (Grafreed.RENDERME > 0)
3729	3956	{
3730	3957	if (child instanceof Merge)
3731	3958	((Merge)child).renderme();
..	..	@@ -3876,7 +4103,7 @@
3876	4103	if (child == null)
3877	4104	continue;
3878	4105
3879		- if (GrafreeD.RENDERME > 0)
	4106	+ if (Grafreed.RENDERME > 0)
3880	4107	{
3881	4108	if (child instanceof Merge)
3882	4109	((Merge)child).renderme();
..	..	@@ -4071,7 +4298,7 @@
4071	4298	if (child == null)
4072	4299	continue;
4073	4300
4074		- if (GrafreeD.RENDERME > 0)
	4301	+ if (Grafreed.RENDERME > 0)
4075	4302	{
4076	4303	if (child instanceof Merge)
4077	4304	((Merge)child).renderme();
..	..	@@ -4184,6 +4411,55 @@
4184	4411	{
4185	4412	blockloop = true;
4186	4413	get(i).RepairShadow();
	4414	+ blockloop = false;
	4415	+ }
	4416	+ }
	4417	+
	4418	+ void RepairSOV()
	4419	+ {
	4420	+ if (blockloop)
	4421	+ return;
	4422	+
	4423	+ String texname = this.GetPigmentTexture();
	4424	+
	4425	+ if (texname.startsWith("sov"))
	4426	+ {
	4427	+ String[] s = texname.split("/");
	4428	+
	4429	+ String[] sname = s[1].split("Color.pn");
	4430	+
	4431	+ texname = sname[0];
	4432	+
	4433	+ if (sname.length > 1)
	4434	+ {
	4435	+ texname += "Color.jpg";
	4436	+ }
	4437	+
	4438	+ this.SetPigmentTexture("sov/" + texname);
	4439	+ }
	4440	+
	4441	+ texname = this.GetBumpTexture();
	4442	+
	4443	+ if (texname.startsWith("sov"))
	4444	+ {
	4445	+ String[] s = texname.split("/");
	4446	+
	4447	+ String[] sname = s[1].split("Bump.pn");
	4448	+
	4449	+ texname = sname[0];
	4450	+
	4451	+ if (sname.length > 1)
	4452	+ {
	4453	+ texname += "Bump.jpg";
	4454	+ }
	4455	+
	4456	+ this.SetBumpTexture("sov/" + texname);
	4457	+ }
	4458	+
	4459	+ for (int i=0; i<Size(); i++)
	4460	+ {
	4461	+ blockloop = true;
	4462	+ get(i).RepairSOV();
4187	4463	blockloop = false;
4188	4464	}
4189	4465	}
..	..	@@ -4678,7 +4954,7 @@
4678	4954
4679	4955	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4956	{
4681		- if (hide)
	4957	+ if (hide \|\| dontselect)
4682	4958	return null;
4683	4959
4684	4960	if (count <= 0)
..	..	@@ -4702,9 +4978,17 @@
4702	4978	}
4703	4979	}
4704	4980
	4981	+ ObjEditor GetWindow()
	4982	+ {
	4983	+ if (editWindow != null)
	4984	+ return editWindow;
	4985	+
	4986	+ return manipWindow;
	4987	+ }
	4988	+
4705	4989	cTreePath Select(int indexcount, boolean deselect)
4706	4990	{
4707		- if (hide)
	4991	+ if (hide \|\| dontselect)
4708	4992	return null;
4709	4993
4710	4994	if (count <= 0)
..	..	@@ -4738,10 +5022,11 @@
4738	5022	if (leaf != null)
4739	5023	{
4740	5024	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5025	+ ObjEditor window = GetWindow();
	5026	+ if (window != null)
4742	5027	{
4743	5028	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5029	+ window.Select(tp, deselect, true);
4745	5030	}
4746	5031
4747	5032	return tp;
..	..	@@ -4767,9 +5052,10 @@
4767	5052	if (leaf != null)
4768	5053	{
4769	5054	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5055	+ ObjEditor window = GetWindow();
	5056	+ if (window != null)
4771	5057	{
4772		- editWindow.Select(tp, deselect, true);
	5058	+ window.Select(tp, deselect, true);
4773	5059	}
4774	5060
4775	5061	return tp;
..	..	@@ -4854,7 +5140,7 @@
4854	5140	return globalTransform;
4855	5141	}
4856	5142
4857		- void PreprocessOcclusion(CameraPane cp)
	5143	+ void PreprocessOcclusion(iCameraPane cp)
4858	5144	{
4859	5145	/*
4860	5146	if (AOdone)
..	..	@@ -5001,7 +5287,8 @@
5001	5287	} else //
5002	5288	if (editWindow != null)
5003	5289	{
5004		- editWindow.cameraView.lighttouched = true;
	5290	+ //editWindow.cameraView.lighttouched = true;
	5291	+ Globals.lighttouched = true;
5005	5292	}
5006	5293	}
5007	5294
..	..	@@ -5155,10 +5442,34 @@
5155	5442
5156	5443	// System.out.println("Fullname = " + fullname);
5157	5444
5158		- if (fullname.name.indexOf(":") == -1)
5159		- return fullname.name;
	5445	+ // Does not work on Windows due to C:
	5446	+// if (fullname.name.indexOf(":") == -1)
	5447	+// return fullname.name;
	5448	+//
	5449	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5160	5450
5161		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5451	+ String[] split = fullname.name.split(":");
	5452	+
	5453	+ if (split.length == 0)
	5454	+ {
	5455	+ return "";
	5456	+ }
	5457	+
	5458	+ if (split.length <= 2)
	5459	+ {
	5460	+ if (fullname.name.endsWith(":"))
	5461	+ {
	5462	+ // Windows
	5463	+ return fullname.name.substring(0, fullname.name.length()-1);
	5464	+ }
	5465	+
	5466	+ return split[0];
	5467	+ }
	5468	+
	5469	+ // Windows
	5470	+ assert(split.length == 4);
	5471	+
	5472	+ return split[0] + ":" + split[1];
5162	5473	}
5163	5474
5164	5475	static String GetBump(cTexture fullname)
..	..	@@ -5167,10 +5478,38 @@
5167	5478	return "";
5168	5479
5169	5480	// 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());
	5481	+ // Does not work on Windows due to C:
	5482	+// if (fullname.name.indexOf(":") == -1)
	5483	+// return "";
	5484	+//
	5485	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5486	+ String[] split = fullname.name.split(":");
	5487	+
	5488	+ if (split.length == 0)
	5489	+ {
	5490	+ return "";
	5491	+ }
	5492	+
	5493	+ if (split.length == 1)
	5494	+ {
	5495	+ return "";
	5496	+ }
	5497	+
	5498	+ if (split.length == 2)
	5499	+ {
	5500	+ if (fullname.name.endsWith(":"))
	5501	+ {
	5502	+ // Windows
	5503	+ return "";
	5504	+ }
	5505	+
	5506	+ return split[1];
	5507	+ }
	5508	+
	5509	+ // Windows
	5510	+ assert(split.length == 4);
	5511	+
	5512	+ return split[2] + ":" + split[3];
5174	5513	}
5175	5514
5176	5515	String GetPigmentTexture()
..	..	@@ -5244,7 +5583,7 @@
5244	5583	System.out.print("; textures = " + textures);
5245	5584	System.out.println("; usedtextures = " + usedtextures);
5246	5585
5247		- if (GetTextures() == null)
	5586	+ if (GetTextures() == null) // What is that??
5248	5587	GetTextures().name = ":";
5249	5588
5250	5589	String texname = tex;
..	..	@@ -5275,6 +5614,43 @@
5275	5614	child.ResetPigmentTexture();
5276	5615	blockloop = false;
5277	5616	}
	5617	+ }
	5618	+
	5619	+ UUID GetUUID()
	5620	+ {
	5621	+ if (uuid == null)
	5622	+ {
	5623	+ // Serial
	5624	+ uuid = UUID.randomUUID();
	5625	+ }
	5626	+
	5627	+ return uuid;
	5628	+ }
	5629	+
	5630	+ Object3D GetObject(UUID uid)
	5631	+ {
	5632	+ if (blockloop)
	5633	+ return null;
	5634	+
	5635	+ if (GetUUID().equals(uid))
	5636	+ return this;
	5637	+
	5638	+ int nb = Size();
	5639	+ for (int i = 0; i < nb; i++)
	5640	+ {
	5641	+ Object3D child = (Object3D) get(i);
	5642	+
	5643	+ if (child == null)
	5644	+ continue;
	5645	+
	5646	+ blockloop = true;
	5647	+ Object3D obj = child.GetObject(uid);
	5648	+ blockloop = false;
	5649	+ if (obj != null)
	5650	+ return obj;
	5651	+ }
	5652	+
	5653	+ return null;
5278	5654	}
5279	5655
5280	5656	void SetBumpTexture(String tex)
..	..	@@ -5313,25 +5689,33 @@
5313	5689	}
5314	5690	}
5315	5691
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5692	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5693	{
5318	5694	Draw(display, root, selected, blocked);
5319	5695	}
5320	5696
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5697	boolean NeedSupport()
5326	5698	{
5327	5699	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5700	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5329	5701	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5702	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5703	}
5332	5704
	5705	+ static boolean DEBUG_SELECTION = false;
5333	5706
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5707	+ boolean IsLive()
	5708	+ {
	5709	+ if (live)
	5710	+ return true;
	5711	+
	5712	+ if (parent == null)
	5713	+ return false;
	5714	+
	5715	+ return parent.IsLive();
	5716	+ }
	5717	+
	5718	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5719	{
5336	5720	Invariants(); // june 2013
5337	5721
..	..	@@ -5340,8 +5724,8 @@
5340	5724	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5725	}
5342	5726
5343		- if (display.drawMode == CameraPane.SELECTION &&
5344		- hide)
	5727	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5728	+ (hide \|\| dontselect))
5345	5729	return;
5346	5730
5347	5731	if (name != null && name.contains("sclera"))
..	..	@@ -5359,7 +5743,7 @@
5359	5743	if (this instanceof Checker)
5360	5744	return;
5361	5745
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5746	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5747	return;
5364	5748
5365	5749	if (count <= 0)
..	..	@@ -5367,13 +5751,13 @@
5367	5751	return;
5368	5752	}
5369	5753
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5754	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5755	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5756	{
5373	5757	return;
5374	5758	}
5375	5759
5376		- javax.media.opengl.GL gl = display.GetGL();
	5760	+ //javax.media.opengl.GL gl = display.GetGL();
5377	5761
5378	5762	/*
5379	5763	if (touched)
..	..	@@ -5392,7 +5776,7 @@
5392	5776	support = support;
5393	5777
5394	5778	//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);
	5779	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396	5780
5397	5781	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	5782	{
..	..	@@ -5409,15 +5793,17 @@
5409	5793
5410	5794	boolean compiled = false;
5411	5795
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5796	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5797
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
5415		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5798	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5799	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5800	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5801	{
5417		- display.lighttouched = true;
	5802	+ Globals.lighttouched = true;
5418	5803	} // 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 &&
	5804	+
	5805	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5806	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5807	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5808	{
5423	5809	if (!(this instanceof Composite))
..	..	@@ -5425,7 +5811,7 @@
5425	5811	//if (displaylist == -1 && usecalllists)
5426	5812	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5427	5813	{
5428		- bRep.displaylist = gl.glGenLists(1);
	5814	+ bRep.displaylist = display.GenList();
5429	5815	assert(bRep.displaylist != 0);
5430	5816	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	5817	//System.out.println("\tgen list " + list);
..	..	@@ -5437,18 +5823,20 @@
5437	5823	if (usecalllists)
5438	5824	{
5439	5825	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5826	+ display.NewList(bRep.displaylist);
5441	5827	}
	5828	+
5442	5829	CallList(display, root, selected, blocked);
	5830	+
5443	5831	// compiled = true;
5444	5832	if (usecalllists)
5445	5833	{
5446	5834	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	5835	+ display.EndList();
5448	5836	}
5449	5837	//gl.glDrawBuffer(gl.GL_BACK);
5450	5838	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5839	+ Globals.lighttouched = true; // all panes...
5452	5840	}
5453	5841
5454	5842	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5875,12 @@
5487	5875
5488	5876	// frustum culling
5489	5877	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5878	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5879	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5880	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5881	{
5494	5882	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5883	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	5884	{
5497	5885	//System.out.print("CULLED");
5498	5886	culled = true;
..	..	@@ -5500,7 +5888,7 @@
5500	5888	}
5501	5889	else
5502	5890	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5891	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	5892	culled = true;
5505	5893
5506	5894	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +5924,11 @@
5536	5924
5537	5925
5538	5926	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5927	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	5928	{
5541	5929	if (GetBRep() != null)
5542	5930	{
5543		- CameraPane.NextIndex(this, gl);
	5931	+ display.NextIndex();
5544	5932	// vertex color conflict : gl.glCallList(list);
5545	5933	DrawNode(display, root, selected);
5546	5934	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +5950,7 @@
5562	5950	color[2] /= 2;
5563	5951	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	5952	*/
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		- }
	5953	+ display.PushMaterial(this, selected);
5614	5954
5615	5955	//System.out.println("call list " + list);
5616	5956	//System.out.println();
..	..	@@ -5629,7 +5969,28 @@
5629	5969	tex = GetTextures();
5630	5970	}
5631	5971
5632		- display.BindTextures(tex, texres);
	5972	+ boolean failedPigment = false;
	5973	+ boolean failedBump = false;
	5974	+
	5975	+ try
	5976	+ {
	5977	+ display.BindPigmentTexture(tex, texres);
	5978	+ }
	5979	+ catch (Exception e)
	5980	+ {
	5981	+ System.err.println("FAILED: " + this);
	5982	+ failedPigment = true;
	5983	+ }
	5984	+
	5985	+ try
	5986	+ {
	5987	+ display.BindBumpTexture(tex, texres);
	5988	+ }
	5989	+ catch (Exception e)
	5990	+ {
	5991	+ //System.err.println("FAILED: " + this);
	5992	+ failedBump = true;
	5993	+ }
5633	5994
5634	5995	if (!compiled)
5635	5996	{
..	..	@@ -5645,30 +6006,19 @@
5645	6006
5646	6007	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	6008	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	6009	+ display.CallList(bRep.displaylist);
5649	6010	// june 2013 drawSelf(display, root, selected);
5650	6011	}
5651	6012	}
5652	6013	}
5653	6014
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		- }
	6015	+ if (!failedBump)
	6016	+ display.ReleaseBumpTexture(tex);
	6017	+
	6018	+ if (!failedPigment)
	6019	+ display.ReleasePigmentTexture(tex);
	6020	+
	6021	+ display.PopMaterial(this, selected);
5672	6022	}
5673	6023
5674	6024	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +6060,7 @@
5710	6060	// resetMasterNode();
5711	6061	}
5712	6062
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6063	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	6064	{
5715	6065	if (GetBRep() == null)
5716	6066	{
..	..	@@ -5793,8 +6143,11 @@
5793	6143	boolean flipV = false; // true;
5794	6144	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	6145
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6146	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	6147	{
	6148	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6149	+ return;
	6150	+
5798	6151	if (hide)
5799	6152	return;
5800	6153	// shadow optimisation
..	..	@@ -5852,16 +6205,7 @@
5852	6205	// // ??????????????????????????? Touch();
5853	6206	// }
5854	6207
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		- }
	6208	+display.PushMaterial2(this, selected);
5865	6209
5866	6210	Object3D child;
5867	6211	boolean sel;
..	..	@@ -5913,19 +6257,7 @@
5913	6257	*/
5914	6258	//depth += 1;
5915	6259
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		-
	6260	+display.PopMaterial2(this);
5929	6261	/*
5930	6262	display.ReleaseTextures(tex);
5931	6263	*/
..	..	@@ -5936,10 +6268,13 @@
5936	6268
5937	6269	//static cVector min,max;
5938	6270
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6271	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	6272	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6273	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	6274	return; // no shadow for transparent objects
	6275	+
	6276	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6277	+ return;
5943	6278
5944	6279	if (hide)
5945	6280	return;
..	..	@@ -5981,9 +6316,10 @@
5981	6316	return;
5982	6317	}
5983	6318
	6319	+ //bRep.GenUV(1/material.diffuseness);
5984	6320	// bRep.lock = true;
5985	6321
5986		- javax.media.opengl.GL gl = display.GetGL();
	6322	+ //javax.media.opengl.GL gl = display.GetGL();
5987	6323
5988	6324	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	6325	{
..	..	@@ -6000,23 +6336,7 @@
6000	6336
6001	6337	bRep.getMinMax(min, max, 100);
6002	6338
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();
	6339	+ display.DrawBox(min, max);
6020	6340
6021	6341	return;
6022	6342	}
..	..	@@ -6060,7 +6380,7 @@
6060	6380	{
6061	6381	//throw new Error();
6062	6382
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6383	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	6384
6065	6385	int[] strips = bRep.getRawIndices();
6066	6386
..	..	@@ -6070,178 +6390,19 @@
6070	6390	new Exception().printStackTrace();
6071	6391	return;
6072	6392	}
6073		-
6074		- // TRIANGLE STRIP ARRAY
6075		- if (bRep.trimmed)
	6393	+
	6394	+ if (dontselect)
6076	6395	{
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;
	6396	+ //bRep.GenerateNormalsMINE();
6208	6397	}
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		- }
	6398	+
	6399	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	6400	} else // catch (Error e)
6240	6401	{
6241	6402	// TRIANGLE ARRAY
6242	6403	if (IsOpaque()) // Static())
6243	6404	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	6405	+ display.StartTriangles();
6245	6406	int facecount = bRep.FaceCount();
6246	6407	for (int i = 0; i < facecount; i++)
6247	6408	{
..	..	@@ -6304,9 +6465,9 @@
6304	6465	// // r.norm.dot(v3) > -0.5)
6305	6466	// // continue;
6306	6467
6307		- drawFace(p, q, r, display, face);
	6468	+ display.DrawFace(this, p, q, r, face);
6308	6469	}
6309		- gl.glEnd();
	6470	+ display.EndTriangles();
6310	6471	}
6311	6472	else
6312	6473	{
..	..	@@ -6335,8 +6496,8 @@
6335	6496	//System.out.println("SORT");
6336	6497
6337	6498	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6499	+
	6500	+ display.StartTriangles();
6340	6501	for (int i = 0; i < facecount; i++)
6341	6502	{
6342	6503	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6509,14 @@
6348	6509	Vertex q = bRep.GetVertex(face.q);
6349	6510	Vertex r = bRep.GetVertex(face.r);
6350	6511
6351		- drawFace(p, q, r, display, face);
	6512	+ display.DrawFace(this, p, q, r, face);
6352	6513	}
6353		- gl.glEnd();
	6514	+ display.EndTriangles();
6354	6515	}
6355	6516
6356	6517	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6518	{
	6519	+ /*
6358	6520	gl.glDisable(gl.GL_LIGHTING);
6359	6521	float[] colorV = new float[3];
6360	6522
..	..	@@ -6433,6 +6595,7 @@
6433	6595	// gl.glEnd();
6434	6596	}
6435	6597	}
	6598	+ */
6436	6599	}
6437	6600	}
6438	6601
..	..	@@ -6477,7 +6640,7 @@
6477	6640	center.add(r);
6478	6641	center.mul(1.0/3);
6479	6642
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6643	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6644
6482	6645	distance = center.dot(center);
6483	6646	}
..	..	@@ -6488,390 +6651,11 @@
6488	6651
6489	6652	transient FaceCompare[] facescompare = null;
6490	6653
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	6654	void Print(Vertex v)
6666	6655	{
6667	6656	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6657	}
6669	6658
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	6659	void drawSelf(ClickInfo info, int level, boolean select)
6876	6660	{
6877	6661	if (bRep == null)
..	..	@@ -7443,83 +7227,84 @@
7443	7227	int spotw = spot.x + spot.width;
7444	7228	int spoth = spot.y + spot.height;
7445	7229	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		- }
	7230	+// if (CameraPane.Xmin > spot.x)
	7231	+// {
	7232	+// CameraPane.Xmin = spot.x;
	7233	+// }
	7234	+// if (CameraPane.Xmax < spotw)
	7235	+// {
	7236	+// CameraPane.Xmax = spotw;
	7237	+// }
	7238	+// if (CameraPane.Ymin > spot.y)
	7239	+// {
	7240	+// CameraPane.Ymin = spot.y;
	7241	+// }
	7242	+// if (CameraPane.Ymax < spoth)
	7243	+// {
	7244	+// CameraPane.Ymax = spoth;
	7245	+// }
7462	7246	spot.translate(32, 32);
7463	7247	spotw = spot.x + spot.width;
7464	7248	spoth = spot.y + spot.height;
7465		- info.g.setColor(Color.blue);
	7249	+ info.g.setColor(Color.cyan);
7466	7250	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);
	7251	+// if (CameraPane.Xmin > spot.x)
	7252	+// {
	7253	+// CameraPane.Xmin = spot.x;
	7254	+// }
	7255	+// if (CameraPane.Xmax < spotw)
	7256	+// {
	7257	+// CameraPane.Xmax = spotw;
	7258	+// }
	7259	+// if (CameraPane.Ymin > spot.y)
	7260	+// {
	7261	+// CameraPane.Ymin = spot.y;
	7262	+// }
	7263	+// if (CameraPane.Ymax < spoth)
	7264	+// {
	7265	+// CameraPane.Ymax = spoth;
	7266	+// }
	7267	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7268	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7485	7269	spot.translate(0, -32);
7486		- info.g.setColor(Color.green);
	7270	+ info.g.setColor(Color.yellow);
7487	7271	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		- }
	7272	+ info.g.setColor(Color.green);
	7273	+// if (CameraPane.Xmin > spot.x)
	7274	+// {
	7275	+// CameraPane.Xmin = spot.x;
	7276	+// }
	7277	+// if (CameraPane.Xmax < spotw)
	7278	+// {
	7279	+// CameraPane.Xmax = spotw;
	7280	+// }
	7281	+// if (CameraPane.Ymin > spot.y)
	7282	+// {
	7283	+// CameraPane.Ymin = spot.y;
	7284	+// }
	7285	+// if (CameraPane.Ymax < spoth)
	7286	+// {
	7287	+// CameraPane.Ymax = spoth;
	7288	+// }
7504	7289	info.g.drawArc(boundary.x, boundary.y,
7505	7290	boundary.width, boundary.height, 0, 360);
7506	7291	//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		- }
	7292	+// if (CameraPane.Xmin > boundary.x)
	7293	+// {
	7294	+// CameraPane.Xmin = boundary.x;
	7295	+// }
	7296	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7297	+// {
	7298	+// CameraPane.Xmax = boundary.x + boundary.width;
	7299	+// }
	7300	+// if (CameraPane.Ymin > boundary.y)
	7301	+// {
	7302	+// CameraPane.Ymin = boundary.y;
	7303	+// }
	7304	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7305	+// {
	7306	+// CameraPane.Ymax = boundary.y + boundary.height;
	7307	+// }
7523	7308	return;
7524	7309	}
7525	7310	}
..	..	@@ -7536,7 +7321,7 @@
7536	7321	startX = info.x;
7537	7322	startY = info.y;
7538	7323
7539		- hitSomething = 0;
	7324	+ hitSomething = -1;
7540	7325	cVector origin = new cVector();
7541	7326	//LA.xformPos(origin, toParent, origin);
7542	7327	Rectangle spot = new Rectangle();
..	..	@@ -7569,7 +7354,7 @@
7569	7354	}
7570	7355
7571	7356	//System.out.println("info.modifiers = " + info.modifiers);
7572		- modified = (info.modifiers & CameraPane.META) != 0;
	7357	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7573	7358	//System.out.println("modified = " + modified);
7574	7359	//new Exception().printStackTrace();
7575	7360	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7597,7 +7382,7 @@
7597	7382	return true;
7598	7383	}
7599	7384
7600		- void doEditDrag0(ClickInfo info)
	7385	+ void doEditDrag0(ClickInfo info, boolean opposite)
7601	7386	{
7602	7387	if (hitSomething == 0)
7603	7388	{
..	..	@@ -7612,6 +7397,7 @@
7612	7397	//System.out.println("hitSomething = " + hitSomething);
7613	7398
7614	7399	double scale = 0.005f * info.camera.Distance();
	7400	+
7615	7401	cVector xlate = new cVector();
7616	7402	//cVector xlate2 = new cVector();
7617	7403	switch (hitSomething)
..	..	@@ -7622,9 +7408,9 @@
7622	7408
7623	7409	case hitCenter: // Translate
7624	7410
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7411	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	7412
7627		- if (modified)
	7413	+ if (modified \|\| opposite)
7628	7414	{
7629	7415	//assert(false);
7630	7416	/*
..	..	@@ -7670,10 +7456,10 @@
7670	7456	}
7671	7457	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7458	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7459	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7674	7460	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7675	7461	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7462	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7463	//LA.vecCross(up, cVector.Z, right2);
7678	7464
7679	7465	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7718,6 +7504,7 @@
7718	7504
7719	7505	if (modified)
7720	7506	{
	7507	+ // Rotate 90 degrees
7721	7508	angle /= (Math.PI / 4);
7722	7509	angle = Math.floor(angle + 0.5);
7723	7510	angle *= (Math.PI / 4);
..	..	@@ -7731,7 +7518,7 @@
7731	7518	}
7732	7519	/**/
7733	7520
7734		- switch (info.pane.renderCamera.viewCode)
	7521	+ switch (info.pane.RenderCamera().viewCode)
7735	7522	{
7736	7523	case 1: // '\001'
7737	7524	LA.matZRotate(toParent, angle);
..	..	@@ -7759,24 +7546,27 @@
7759	7546
7760	7547	case hitScale: // scale
7761	7548	double hScale = (double) (info.x - centerPt.x) / 32;
	7549	+ double sign = 1;
	7550	+ if (hScale < 0)
	7551	+ {
	7552	+ sign = -1;
	7553	+ }
	7554	+ hScale = signMath.pow(signhScale, scale * 50);
7762	7555	if (hScale < 0.01)
7763	7556	{
7764		- hScale = 0.01;
	7557	+ //hScale = 0.01;
7765	7558	}
7766		- hScale = Math.pow(hScale, scale * 50);
7767		- if (hScale < 0.01)
7768		- {
7769		- hScale = 0.01;
7770		- }
	7559	+
7771	7560	double vScale = (double) (info.y - centerPt.y) / 32;
7772		- if (vScale < 0.01)
	7561	+ sign = 1;
	7562	+ if (vScale < 0)
7773	7563	{
7774		- vScale = 0.01;
	7564	+ sign = -1;
7775	7565	}
7776		- vScale = Math.pow(vScale, scale * 50);
	7566	+ vScale = signMath.pow(signvScale, scale * 50);
7777	7567	if (vScale < 0.01)
7778	7568	{
7779		- vScale = 0.01;
	7569	+ //vScale = 0.01;
7780	7570	}
7781	7571	LA.matCopy(startMat, toParent);
7782	7572	/**/
..	..	@@ -7787,39 +7577,47 @@
7787	7577	}
7788	7578	/**/
7789	7579
7790		- switch (info.pane.renderCamera.viewCode)
	7580	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7581	+
	7582	+ if (totalScale < 0.01)
	7583	+ {
	7584	+ totalScale = 0.01;
	7585	+ }
	7586	+
	7587	+ switch (info.pane.RenderCamera().viewCode)
7791	7588	{
7792	7589	case 3: // '\001'
7793		- if (modified)
	7590	+ if (modified \|\| opposite)
7794	7591	{
7795	7592	//LA.matScale(toParent, 1, hScale, vScale);
7796		- LA.matScale(toParent, vScale, 1, 1);
	7593	+ LA.matScale(toParent, totalScale, 1, 1);
7797	7594	} // vScale, 1);
7798	7595	else
7799	7596	{
7800		- LA.matScale(toParent, vScale, vScale, vScale);
	7597	+ // EXCEPTION!
	7598	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7801	7599	} // vScale, 1);
7802	7600	break;
7803	7601
7804	7602	case 2: // '\002'
7805		- if (modified)
	7603	+ if (modified \|\| opposite)
7806	7604	{
7807	7605	//LA.matScale(toParent, hScale, 1, vScale);
7808		- LA.matScale(toParent, 1, vScale, 1);
	7606	+ LA.matScale(toParent, 1, totalScale, 1);
7809	7607	} else
7810	7608	{
7811		- LA.matScale(toParent, vScale, 1, vScale);
	7609	+ LA.matScale(toParent, totalScale, 1, totalScale);
7812	7610	}
7813	7611	break;
7814	7612
7815	7613	case 1: // '\003'
7816		- if (modified)
	7614	+ if (modified \|\| opposite)
7817	7615	{
7818	7616	//LA.matScale(toParent, hScale, vScale, 1);
7819		- LA.matScale(toParent, 1, 1, vScale);
	7617	+ LA.matScale(toParent, 1, 1, totalScale);
7820	7618	} else
7821	7619	{
7822		- LA.matScale(toParent, vScale, vScale, 1);
	7620	+ LA.matScale(toParent, totalScale, totalScale, 1);
7823	7621	}
7824	7622	break;
7825	7623	}
..	..	@@ -7952,14 +7750,22 @@
7952	7750	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7953	7751	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7954	7752	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7753	+
	7754	+ String objname;
	7755	+
7955	7756	if (false) //parent != null)
7956	7757	{
7957		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7758	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7958	7759	} else
7959	7760	{
7960		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7761	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7961	7762	} // + super.toString();
7962	7763	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7764	+
	7765	+ if (!Globals.ADVANCED)
	7766	+ return objname;
	7767	+
	7768	+ return objname + " " + System.identityHashCode(this);
7963	7769	}
7964	7770
7965	7771	public int hashCode()
..	..	@@ -8015,6 +7821,7 @@
8015	7821	objectUI.closeUI();
8016	7822	if (editWindow != null)
8017	7823	{
	7824	+ editWindow.ctrlPanel.FlushUI();
8018	7825	editWindow.refreshContents();
8019	7826	} // ? new
8020	7827	objectUI = null;
..	..	@@ -8023,6 +7830,10 @@
8023	7830	{
8024	7831	editWindow = null;
8025	7832	} // ?
	7833	+ }
	7834	+ else
	7835	+ {
	7836	+ //editWindow.closeUI();
8026	7837	}
8027	7838	}
8028	7839
..	..	@@ -8035,7 +7846,7 @@
8035	7846	/transient/ cVector2[] projectedVertices = new cVector2[0];
8036	7847
8037	7848	Object3D /Composite/ parent;
8038		- Object3D /Composite/ fileparent;
	7849	+ Object3D /Composite/ fileparent; // In the case of FileObject
8039	7850
8040	7851	double[][] toParent; // dynamic matrix
8041	7852	double[][] fromParent;
..	..	@@ -8150,7 +7961,7 @@
8150	7961	{
8151	7962	assert(bRep != null);
8152	7963	if (!(support instanceof GenericJoint)) // support.bRep != null)
8153		- GrafreeD.Assert(support.bRep == bRep.support);
	7964	+ Grafreed.Assert(support.bRep == bRep.support);
8154	7965	}
8155	7966	else
8156	7967	{
..	..	@@ -8181,6 +7992,8 @@
8181	7992	}
8182	7993
8183	7994	transient ObjEditor editWindow;
	7995	+ transient ObjEditor manipWindow;
	7996	+
8184	7997	transient ObjectUI objectUI;
8185	7998	public static int povDepth = 0;
8186	7999	private static cVector tbMin = new cVector();
..	..	@@ -8199,9 +8012,9 @@
8199	8012	private static cVector edge2 = new cVector();
8200	8013	//private static cVector norm = new cVector();
8201	8014	/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;
	8015	+ static final int hitCenter = 1;
	8016	+ static final int hitScale = 2;
	8017	+ static final int hitRotate = 3;
8205	8018	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8206	8019	/transient/ private Point centerPt;
8207	8020	/transient/ private int startX;