~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,35 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo
	28	+ mocap.reader.BVHReader.BVHResult bvh;
	29	+ Object3D skeleton;
	30	+ //
	31	+
22	32	ScriptNode scriptnode;
	33	+
	34	+ void InitOthers()
	35	+ {
	36	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	37	+ {
	38	+ projectedVertices = new Object3D.cVector2[3];
	39	+ }
	40	+ for (int i = 0; i < 3; i++)
	41	+ {
	42	+ projectedVertices[i] = new cVector2(); // Others
	43	+ }
	44	+ projectedVertices[0].x = 100; // bump
	45	+ }
23	46
24	47	void MinMax(cVector minima, cVector maxima)
25	48	{
..	..	@@ -86,64 +109,136 @@
86	109
87	110	// transient boolean reduced; // for morph reduction
88	111
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	112	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	113	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	114
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	115	+ transient Object3D transientsupport; // for cloning
	116	+ transient boolean transientlink2master;
94	117
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	118	+ void SaveSupports()
107	119	{
108		- bRep.SaveSupports();
109		- }
110		-
111		- for (int i = 0; i < Size(); i++)
112		- {
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
116		- blockloop = true;
117		- child.SaveSupports();
118		- blockloop = false;
119		- }
120		-}
	120	+ if (blockloop)
	121	+ return;
121	122
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
	123	+ transientsupport = support;
	124	+ transientlink2master = link2master;
126	125
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
133		- {
134		- bRep.RestoreSupports();
	126	+ support = null;
	127	+ link2master = false;
	128	+
	129	+ if (bRep != null)
	130	+ {
	131	+ bRep.SaveSupports();
	132	+ }
	133	+
	134	+ for (int i = 0; i < Size(); i++)
	135	+ {
	136	+ Object3D child = (Object3D) get(i);
	137	+ if (child == null)
	138	+ continue;
	139	+ blockloop = true;
	140	+ child.SaveSupports();
	141	+ blockloop = false;
	142	+ }
135	143	}
136		-
137		- for (int i = 0; i < Size(); i++)
	144	+
	145	+ void RestoreSupports()
138	146	{
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142		- blockloop = true;
143		- child.RestoreSupports();
144		- blockloop = false;
	147	+ if (blockloop)
	148	+ return;
	149	+
	150	+ support = transientsupport;
	151	+ link2master = transientlink2master;
	152	+ transientsupport = null;
	153	+ transientlink2master = false;
	154	+
	155	+ if (bRep != null)
	156	+ {
	157	+ bRep.RestoreSupports();
	158	+ }
	159	+
	160	+ for (int i = 0; i < Size(); i++)
	161	+ {
	162	+ Object3D child = (Object3D) get(i);
	163	+ if (child == null)
	164	+ continue;
	165	+ blockloop = true;
	166	+ child.RestoreSupports();
	167	+ blockloop = false;
	168	+ }
145	169	}
146		-}
	170	+
	171	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	172	+ {
	173	+ if (hashtable.containsKey(GetUUID()))
	174	+ {
	175	+ Object3D o = hashtable.get(GetUUID());
	176	+
	177	+ Grafreed.Assert(this.bRep == o.bRep);
	178	+ if (this.bRep != null)
	179	+ assert(this.bRep.support == o.transientrep);
	180	+
	181	+ return;
	182	+ }
	183	+
	184	+ Object3D o = new Object3D();
	185	+
	186	+ hashtable.put(GetUUID(), o);
	187	+
	188	+ for (int i=0; i<Size(); i++)
	189	+ {
	190	+ get(i).ExtractBigData(hashtable);
	191	+ }
	192	+
	193	+ ExtractBigData(o);
	194	+ }
	195	+
	196	+ void ExtractBigData(Object3D o)
	197	+ {
	198	+ o.bRep = this.bRep;
	199	+ if (this.bRep != null)
	200	+ {
	201	+ o.transientrep = this.bRep.support;
	202	+ o.bRep.support = null;
	203	+ }
	204	+
	205	+ // o.support = this.support;
	206	+ // o.fileparent = this.fileparent;
	207	+ // if (this.bRep != null)
	208	+ // o.bRep = this.bRep.support;
	209	+
	210	+ this.bRep = null;
	211	+ // if (this.bRep != null)
	212	+ // this.bRep.support = null;
	213	+ // this.support = null;
	214	+ // this.fileparent = null;
	215	+ }
	216	+
	217	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	218	+ {
	219	+ if (!hashtable.containsKey(GetUUID()))
	220	+ return;
	221	+
	222	+ Object3D o = hashtable.get(GetUUID());
	223	+
	224	+ RestoreBigData(o);
	225	+
	226	+ hashtable.remove(GetUUID());
	227	+
	228	+ for (int i=0; i<Size(); i++)
	229	+ {
	230	+ get(i).RestoreBigData(hashtable);
	231	+ }
	232	+ }
	233	+
	234	+ void RestoreBigData(Object3D o)
	235	+ {
	236	+ this.bRep = o.bRep;
	237	+ if (this.bRep != null)
	238	+ this.bRep.support = o.transientrep;
	239	+ // this.support = o.support;
	240	+ // this.fileparent = o.fileparent;
	241	+ }
147	242
148	243	// MOCAP SUPPORT
149	244	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +381,7 @@
286	381	}
287	382
288	383	boolean live = false;
	384	+ boolean dontselect = false;
289	385	boolean hide = false;
290	386	boolean link2master = false; // performs reset support/master at each frame
291	387	boolean marked = false; // animation node
..	..	@@ -295,6 +391,8 @@
295	391	boolean random = false;
296	392	boolean speedup = false;
297	393	boolean rewind = false;
	394	+
	395	+ float NORMALPUSH = 0;
298	396
299	397	Object3D support;
300	398
..	..	@@ -415,16 +513,16 @@
415	513	{
416	514	Object3D copy = this;
417	515
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	516	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	517
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	518	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	519	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	520	+ parentcam = Globals.theRenderer.Cameras()[1];
423	521	}
424	522
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	523	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	524	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	525	+ parentcam = Globals.theRenderer.Cameras()[0];
428	526	}
429	527
430	528	if (this == parentcam)
..	..	@@ -432,7 +530,7 @@
432	530	//assert(this instanceof Camera);
433	531
434	532	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	533	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	534	}
437	535
438	536	copy.marked ^= true;
..	..	@@ -452,7 +550,7 @@
452	550	//assert(this instanceof Camera);
453	551
454	552	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	553	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	554	}
457	555
458	556	copy.Touch(); // display list issue
..	..	@@ -465,12 +563,14 @@
465	563	toParent = LA.newMatrix();
466	564	fromParent = LA.newMatrix();
467	565	}
	566	+
468	567	if (toParentMarked == null)
469	568	{
470	569	if (maxcount != 1)
471	570	{
472	571	new Exception().printStackTrace();
473	572	}
	573	+
474	574	toParentMarked = LA.newMatrix();
475	575	fromParentMarked = LA.newMatrix();
476	576	}
..	..	@@ -587,7 +687,7 @@
587	687	return;
588	688	}
589	689
590		- if (CameraPane.fromscript)
	690	+ if (Globals.fromscript)
591	691	{
592	692	transformcount = 0;
593	693	return;
..	..	@@ -745,7 +845,7 @@
745	845
746	846	int GetTransformCount()
747	847	{
748		- // marde pour serialization de Texture
	848	+ // patch pour serialization de Texture
749	849	resetmaxcount();
750	850	resettransformcount();
751	851	resetstep();
..	..	@@ -758,7 +858,7 @@
758	858	if (step == 0)
759	859	step = 1;
760	860	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	861	+ maxcount = 128; // 2048; // 4;
762	862	// if (acceleration == 0)
763	863	// acceleration = 10;
764	864	if (delay == 0) // serial
..	..	@@ -779,9 +879,12 @@
779	879	// factor = CameraPane.STEP;
780	880	// }
781	881
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	882	+ if (marked && Globals.isLIVE() && live &&
	883	+ //TEMP21aug2018
	884	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	885	+ currentframe != Globals.framecount)
783	886	{
784		- currentframe = CameraPane.framecount;
	887	+ currentframe = Globals.framecount;
785	888
786	889	// System.err.println("transformcount = " + transformcount);
787	890	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +893,8 @@
790	893
791	894	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	895
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	896	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	897	+ (step == 1 && changedir))
794	898	{
795	899	countdown = 1;
796	900	delay = speedup?8:1;
..	..	@@ -893,6 +997,11 @@
893	997	fromParent = null; // LA.newMatrix();
894	998	bRep = null; // new BoundaryRep();
895	999
	1000	+ if (oname != null && oname.equals("LeftHand"))
	1001	+ {
	1002	+ name = oname;
	1003	+ }
	1004	+
896	1005	/*
897	1006	float hue = (float)Math.random();
898	1007	Color col;
..	..	@@ -935,7 +1044,7 @@
935	1044
936	1045	public Object clone()
937	1046	{
938		- return GrafreeD.clone(this);
	1047	+ return Grafreed.clone(this);
939	1048	}
940	1049
941	1050	Object3D copyExpand()
..	..	@@ -1451,7 +1560,7 @@
1451	1560	BoundaryRep.SEUIL = other.material.cameralight;
1452	1561
1453	1562	// Set default to 0.1
1454		- BoundaryRep.SEUIL /= 2;
	1563	+ BoundaryRep.SEUIL /= 4; // 2;
1455	1564	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1456	1565	}
1457	1566
..	..	@@ -1710,7 +1819,7 @@
1710	1819	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1711	1820	o.bRep = transientrep;
1712	1821	if (clone)
1713		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1822	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1714	1823	o.CreateMaterial();
1715	1824	o.SetAttributes(this, -1);
1716	1825	//parent
..	..	@@ -1723,7 +1832,7 @@
1723	1832	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1724	1833	o.bRep = bRep;
1725	1834	if (clone)
1726		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1835	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1727	1836	o.CreateMaterial();
1728	1837	//o.overwriteThis(this, -1);
1729	1838	o.SetAttributes(this, -1);
..	..	@@ -1810,12 +1919,15 @@
1810	1919	if (obj.name == null)
1811	1920	continue; // can't be a null one
1812	1921
	1922	+ // Try perfect match first.
1813	1923	if (n.equals(obj.name))
1814	1924	{
1815	1925	theobj = obj;
1816	1926	count++;
1817	1927	}
1818	1928	}
	1929	+
	1930	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1819	1931
1820	1932	if (count != 1)
1821	1933	for (int i=Size(); --i>=0;)
..	..	@@ -2130,15 +2242,8 @@
2130	2242	if (/parent != null &&/ material == null)
2131	2243	{
2132	2244	material = new cMaterial(GetMaterial());
2133		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2134		- {
2135		- projectedVertices = new Object3D.cVector2[3];
2136		- }
2137		- for (int i = 0; i < 3; i++)
2138		- {
2139		- projectedVertices[i] = new cVector2(); // Others
2140		- }
2141		- projectedVertices[0].x = 100; // bump
	2245	+
	2246	+ InitOthers();
2142	2247
2143	2248	if (this instanceof Camera)
2144	2249	{
..	..	@@ -2282,12 +2387,17 @@
2282	2387	}
2283	2388	*/
2284	2389	}
	2390	+ else
	2391	+ {
	2392	+ //((ObjEditor)editWindow).SetupUI2(null);
	2393	+ }
2285	2394	}
2286	2395
2287	2396	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2288	2397	{
2289	2398	if (newWindow)
2290	2399	{
	2400	+ new Exception().printStackTrace();
2291	2401	System.exit(0);
2292	2402	if (parent != null)
2293	2403	{
..	..	@@ -2464,13 +2574,13 @@
2464	2574	return retval;
2465	2575	}
2466	2576
2467		- void doEditDrag(ClickInfo info)
	2577	+ void doEditDrag(ClickInfo info, boolean opposite)
2468	2578	{
2469	2579	switch (doSomething)
2470	2580	{
2471	2581	case 1: // '\001'
2472	2582	//super.
2473		- doEditDrag0(info);
	2583	+ doEditDrag0(info, opposite);
2474	2584	break;
2475	2585
2476	2586	case 2: // '\002'
..	..	@@ -2483,11 +2593,11 @@
2483	2593	{
2484	2594	//sel.hitSomething = childToDrag.hitSomething;
2485	2595	//childToDrag.doEditDrag(info);
2486		- sel.doEditDrag(info);
	2596	+ sel.doEditDrag(info, opposite);
2487	2597	} else
2488	2598	{
2489	2599	//super.
2490		- doEditDrag0(info);
	2600	+ doEditDrag0(info, opposite);
2491	2601	}
2492	2602	}
2493	2603	break;
..	..	@@ -2597,6 +2707,18 @@
2597	2707	void GenNormalsS(boolean crease)
2598	2708	{
2599	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();
2600	2722	// for (int i=0; i<selection.size(); i++)
2601	2723	// {
2602	2724	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2737,6 +2859,24 @@
2737	2859	if (child == null)
2738	2860	continue;
2739	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();
2740	2880	// Children().release(i);
2741	2881	}
2742	2882	blockloop = false;
..	..	@@ -2894,7 +3034,8 @@
2894	3034	{
2895	3035	if (bRep != null)
2896	3036	{
2897		- bRep.GenUV();
	3037	+ bRep.GenUV(); //1);
	3038	+ //bRep.UnfoldUV();
2898	3039	Touch();
2899	3040	}
2900	3041	}
..	..	@@ -2904,6 +3045,15 @@
2904	3045	if (bRep != null)
2905	3046	{
2906	3047	bRep.GenerateNormals(crease);
	3048	+ Touch();
	3049	+ }
	3050	+ }
	3051	+
	3052	+ void GenNormalsMesh0()
	3053	+ {
	3054	+ if (bRep != null)
	3055	+ {
	3056	+ bRep.GenerateNormalsMesh();
2907	3057	Touch();
2908	3058	}
2909	3059	}
..	..	@@ -2969,6 +3119,33 @@
2969	3119	blockloop = false;
2970	3120	}
2971	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	+
2972	3149	void TransformGeometry()
2973	3150	{
2974	3151	Object3D obj = this;
..	..	@@ -3190,9 +3367,11 @@
3190	3367
3191	3368	BoundaryRep sup = bRep.support;
3192	3369	bRep.support = null;
3193		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3370	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3194	3371	// bRep.SplitInTwo(onlyone); // thread...
3195		- temprep.SplitInTwo(reduction34, onlyone);
	3372	+
	3373	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3374	+
3196	3375	bRep = temprep;
3197	3376	bRep.support = sup;
3198	3377	Touch();
..	..	@@ -3329,7 +3508,8 @@
3329	3508	if (blockloop)
3330	3509	return;
3331	3510
3332		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3511	+ if (//marked \|\| // does not make sense
	3512	+ (bRep != null \|\| material != null)) // borderline...
3333	3513	live = h;
3334	3514
3335	3515	for (int i = 0; i < Size(); i++)
..	..	@@ -3350,7 +3530,8 @@
3350	3530	return;
3351	3531
3352	3532	//if (bRep != null)
3353		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3533	+ if (//marked \|\| // does not make sense
	3534	+ (bRep != null \|\| material != null)) // borderline...
3354	3535	link2master = h;
3355	3536
3356	3537	for (int i = 0; i < Size(); i++)
..	..	@@ -3370,7 +3551,8 @@
3370	3551	if (blockloop)
3371	3552	return;
3372	3553
3373		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3554	+ if (//marked \|\| // does not make sense
	3555	+ (bRep != null \|\| material != null)) // borderline...
3374	3556	hide = h;
3375	3557
3376	3558	for (int i = 0; i < Size(); i++)
..	..	@@ -3390,7 +3572,7 @@
3390	3572	if (blockloop)
3391	3573	return;
3392	3574
3393		- if (bRep != null && material != null) // borderline...
	3575	+ if (bRep != null \|\| material != null) // borderline...
3394	3576	marked = h;
3395	3577
3396	3578	for (int i = 0; i < Size(); i++)
..	..	@@ -3400,6 +3582,46 @@
3400	3582	continue;
3401	3583	blockloop = true;
3402	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);
3403	3625	blockloop = false;
3404	3626	// release(i);
3405	3627	}
..	..	@@ -3714,7 +3936,7 @@
3714	3936	if (child == null)
3715	3937	continue;
3716	3938
3717		- if (GrafreeD.RENDERME > 0)
	3939	+ if (Grafreed.RENDERME > 0)
3718	3940	{
3719	3941	if (child instanceof Merge)
3720	3942	((Merge)child).renderme();
..	..	@@ -3865,7 +4087,7 @@
3865	4087	if (child == null)
3866	4088	continue;
3867	4089
3868		- if (GrafreeD.RENDERME > 0)
	4090	+ if (Grafreed.RENDERME > 0)
3869	4091	{
3870	4092	if (child instanceof Merge)
3871	4093	((Merge)child).renderme();
..	..	@@ -4060,7 +4282,7 @@
4060	4282	if (child == null)
4061	4283	continue;
4062	4284
4063		- if (GrafreeD.RENDERME > 0)
	4285	+ if (Grafreed.RENDERME > 0)
4064	4286	{
4065	4287	if (child instanceof Merge)
4066	4288	((Merge)child).renderme();
..	..	@@ -4157,6 +4379,71 @@
4157	4379	}
4158	4380	blockloop = true;
4159	4381	get(i).RepairParent();
	4382	+ blockloop = false;
	4383	+ }
	4384	+ }
	4385	+
	4386	+ void RepairShadow()
	4387	+ {
	4388	+ if (blockloop)
	4389	+ return;
	4390	+
	4391	+ if (this.material != null)
	4392	+ this.InitOthers();
	4393	+
	4394	+ for (int i=0; i<Size(); i++)
	4395	+ {
	4396	+ blockloop = true;
	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();
4160	4447	blockloop = false;
4161	4448	}
4162	4449	}
..	..	@@ -4651,7 +4938,7 @@
4651	4938
4652	4939	cTreePath SelectLeaf(int indexcount, boolean deselect)
4653	4940	{
4654		- if (hide)
	4941	+ if (hide \|\| dontselect)
4655	4942	return null;
4656	4943
4657	4944	if (count <= 0)
..	..	@@ -4677,7 +4964,7 @@
4677	4964
4678	4965	cTreePath Select(int indexcount, boolean deselect)
4679	4966	{
4680		- if (hide)
	4967	+ if (hide \|\| dontselect)
4681	4968	return null;
4682	4969
4683	4970	if (count <= 0)
..	..	@@ -4827,7 +5114,7 @@
4827	5114	return globalTransform;
4828	5115	}
4829	5116
4830		- void PreprocessOcclusion(CameraPane cp)
	5117	+ void PreprocessOcclusion(iCameraPane cp)
4831	5118	{
4832	5119	/*
4833	5120	if (AOdone)
..	..	@@ -4974,7 +5261,8 @@
4974	5261	} else //
4975	5262	if (editWindow != null)
4976	5263	{
4977		- editWindow.cameraView.lighttouched = true;
	5264	+ //editWindow.cameraView.lighttouched = true;
	5265	+ Globals.lighttouched = true;
4978	5266	}
4979	5267	}
4980	5268
..	..	@@ -5128,10 +5416,34 @@
5128	5416
5129	5417	// System.out.println("Fullname = " + fullname);
5130	5418
5131		- if (fullname.name.indexOf(":") == -1)
5132		- 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(":"));
5133	5424
5134		- 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];
5135	5447	}
5136	5448
5137	5449	static String GetBump(cTexture fullname)
..	..	@@ -5140,10 +5452,38 @@
5140	5452	return "";
5141	5453
5142	5454	// System.out.println("Fullname = " + fullname);
5143		- if (fullname.name.indexOf(":") == -1)
5144		- return "";
5145		-
5146		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	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];
5147	5487	}
5148	5488
5149	5489	String GetPigmentTexture()
..	..	@@ -5217,7 +5557,7 @@
5217	5557	System.out.print("; textures = " + textures);
5218	5558	System.out.println("; usedtextures = " + usedtextures);
5219	5559
5220		- if (GetTextures() == null)
	5560	+ if (GetTextures() == null) // What is that??
5221	5561	GetTextures().name = ":";
5222	5562
5223	5563	String texname = tex;
..	..	@@ -5248,6 +5588,43 @@
5248	5588	child.ResetPigmentTexture();
5249	5589	blockloop = false;
5250	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;
5251	5628	}
5252	5629
5253	5630	void SetBumpTexture(String tex)
..	..	@@ -5286,25 +5663,33 @@
5286	5663	}
5287	5664	}
5288	5665
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5666	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5667	{
5291	5668	Draw(display, root, selected, blocked);
5292	5669	}
5293	5670
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5671	boolean NeedSupport()
5299	5672	{
5300	5673	return
5301		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5674	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5302	5675	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5676	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5304	5677	}
5305	5678
	5679	+ static boolean DEBUG_SELECTION = false;
5306	5680
5307		- 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)
5308	5693	{
5309	5694	Invariants(); // june 2013
5310	5695
..	..	@@ -5313,8 +5698,8 @@
5313	5698	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5699	}
5315	5700
5316		- if (display.drawMode == CameraPane.SELECTION &&
5317		- hide)
	5701	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5702	+ (hide \|\| dontselect))
5318	5703	return;
5319	5704
5320	5705	if (name != null && name.contains("sclera"))
..	..	@@ -5332,7 +5717,7 @@
5332	5717	if (this instanceof Checker)
5333	5718	return;
5334	5719
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5720	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5721	return;
5337	5722
5338	5723	if (count <= 0)
..	..	@@ -5340,13 +5725,13 @@
5340	5725	return;
5341	5726	}
5342	5727
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5728	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5729	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5730	{
5346	5731	return;
5347	5732	}
5348	5733
5349		- javax.media.opengl.GL gl = display.GetGL();
	5734	+ //javax.media.opengl.GL gl = display.GetGL();
5350	5735
5351	5736	/*
5352	5737	if (touched)
..	..	@@ -5365,7 +5750,7 @@
5365	5750	support = support;
5366	5751
5367	5752	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5368		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5753	+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5369	5754
5370	5755	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5371	5756	{
..	..	@@ -5382,15 +5767,17 @@
5382	5767
5383	5768	boolean compiled = false;
5384	5769
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5770	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5771
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
5388		- (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)))
5389	5775	{
5390		- display.lighttouched = true;
	5776	+ Globals.lighttouched = true;
5391	5777	} // all panes...
5392		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5393		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5778	+
	5779	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5780	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5394	5781	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5782	{
5396	5783	if (!(this instanceof Composite))
..	..	@@ -5398,7 +5785,7 @@
5398	5785	//if (displaylist == -1 && usecalllists)
5399	5786	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5400	5787	{
5401		- bRep.displaylist = gl.glGenLists(1);
	5788	+ bRep.displaylist = display.GenList();
5402	5789	assert(bRep.displaylist != 0);
5403	5790	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5404	5791	//System.out.println("\tgen list " + list);
..	..	@@ -5410,18 +5797,20 @@
5410	5797	if (usecalllists)
5411	5798	{
5412	5799	// System.err.println("new list " + bRep.displaylist + " for " + this);
5413		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5800	+ display.NewList(bRep.displaylist);
5414	5801	}
	5802	+
5415	5803	CallList(display, root, selected, blocked);
	5804	+
5416	5805	// compiled = true;
5417	5806	if (usecalllists)
5418	5807	{
5419	5808	// System.err.println("end list " + bRep.displaylist + " for " + this);
5420		- gl.glEndList();
	5809	+ display.EndList();
5421	5810	}
5422	5811	//gl.glDrawBuffer(gl.GL_BACK);
5423	5812	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	5813	+ Globals.lighttouched = true; // all panes...
5425	5814	}
5426	5815
5427	5816	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +5849,12 @@
5460	5849
5461	5850	// frustum culling
5462	5851	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	5852	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	5853	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	5854	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	5855	{
5467	5856	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5857	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5469	5858	{
5470	5859	//System.out.print("CULLED");
5471	5860	culled = true;
..	..	@@ -5473,7 +5862,7 @@
5473	5862	}
5474	5863	else
5475	5864	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5865	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5477	5866	culled = true;
5478	5867
5479	5868	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,11 +5898,11 @@
5509	5898
5510	5899
5511	5900	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5901	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	5902	{
5514	5903	if (GetBRep() != null)
5515	5904	{
5516		- CameraPane.NextIndex(this, gl);
	5905	+ display.NextIndex();
5517	5906	// vertex color conflict : gl.glCallList(list);
5518	5907	DrawNode(display, root, selected);
5519	5908	if (this instanceof BezierPatch)
..	..	@@ -5535,55 +5924,7 @@
5535	5924	color[2] /= 2;
5536	5925	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	5926	*/
5538		- if (material != null)
5539		- {
5540		- materialstack[materialdepth] = material;
5541		- selectedstack[materialdepth] = selected;
5542		- cStatic.objectstack[materialdepth++] = this;
5543		- //System.out.println("material " + material);
5544		- //Applet3D.tracein(this, selected);
5545		- display.vector2buffer = projectedVertices;
5546		- if (this instanceof Camera)
5547		- {
5548		- display.options1[0] = material.shift;
5549		- //System.out.println("shift " + material.shift);
5550		- display.options1[1] = material.lightarea;
5551		- display.options1[2] = material.shadowbias;
5552		- display.options1[3] = material.aniso;
5553		- display.options1[4] = material.anisoV;
5554		- display.options2[0] = material.opacity;
5555		- display.options2[1] = material.diffuse;
5556		- display.options2[2] = material.factor;
5557		-
5558		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5559		- display.options4[0] = material.cameralight/0.2f;
5560		- display.options4[1] = material.subsurface;
5561		- display.options4[2] = material.sheen;
5562		-
5563		- // if (display.CURRENTANTIALIAS > 0)
5564		- // display.options3[3] /= 4;
5565		-
5566		- /*
5567		- System.out.println("Focus = " + display.options1[0]);
5568		- System.out.println("Aperture = " + display.options1[1]);
5569		- System.out.println("ShadowBlur = " + display.options1[2]);
5570		- System.out.println("Antialiasing = " + display.options1[3]);
5571		- System.out.println("Fog = " + display.options2[0]);
5572		- System.out.println("Intensity = " + display.options2[1]);
5573		- System.out.println("Elevation = " + display.options2[2]);
5574		- /**/
5575		- } else
5576		- {
5577		- material.Draw(display, selected);
5578		- }
5579		- } else
5580		- {
5581		- if (selected && CameraPane.flash)
5582		- {
5583		- display.modelParams4[1] = 100;
5584		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5585		- }
5586		- }
	5927	+ display.PushMaterial(this, selected);
5587	5928
5588	5929	//System.out.println("call list " + list);
5589	5930	//System.out.println();
..	..	@@ -5602,7 +5943,28 @@
5602	5943	tex = GetTextures();
5603	5944	}
5604	5945
5605		- 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	+ }
5606	5968
5607	5969	if (!compiled)
5608	5970	{
..	..	@@ -5618,30 +5980,19 @@
5618	5980
5619	5981	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5620	5982	assert(bRep.displaylist != 0);
5621		- gl.glCallList(bRep.displaylist);
	5983	+ display.CallList(bRep.displaylist);
5622	5984	// june 2013 drawSelf(display, root, selected);
5623	5985	}
5624	5986	}
5625	5987	}
5626	5988
5627		- display.ReleaseTextures(tex);
5628		-
5629		- //if (parent != null && parent.GetMaterial() != null)
5630		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5631		- if (material != null)
5632		- {
5633		- materialdepth -= 1;
5634		- if (materialdepth > 0)
5635		- {
5636		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5637		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5638		- }
5639		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5640		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5641		- {
5642		- display.modelParams4[1] = GetMaterial().cameralight;
5643		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5644		- }
	5989	+ if (!failedBump)
	5990	+ display.ReleaseBumpTexture(tex);
	5991	+
	5992	+ if (!failedPigment)
	5993	+ display.ReleasePigmentTexture(tex);
	5994	+
	5995	+ display.PopMaterial(this, selected);
5645	5996	}
5646	5997
5647	5998	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +6034,7 @@
5683	6034	// resetMasterNode();
5684	6035	}
5685	6036
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6037	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	6038	{
5688	6039	if (GetBRep() == null)
5689	6040	{
..	..	@@ -5766,8 +6117,11 @@
5766	6117	boolean flipV = false; // true;
5767	6118	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	6119
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6120	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	6121	{
	6122	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6123	+ return;
	6124	+
5771	6125	if (hide)
5772	6126	return;
5773	6127	// shadow optimisation
..	..	@@ -5825,16 +6179,7 @@
5825	6179	// // ??????????????????????????? Touch();
5826	6180	// }
5827	6181
5828		- if (material != null)
5829		- {
5830		- materialstack[materialdepth] = material;
5831		- selectedstack[materialdepth] = selected;
5832		- cStatic.objectstack[materialdepth++] = this;
5833		- //System.out.println("material " + material);
5834		- //Applet3D.tracein("selected ", selected);
5835		- display.vector2buffer = projectedVertices;
5836		- material.Draw(display, selected);
5837		- }
	6182	+display.PushMaterial2(this, selected);
5838	6183
5839	6184	Object3D child;
5840	6185	boolean sel;
..	..	@@ -5886,19 +6231,7 @@
5886	6231	*/
5887	6232	//depth += 1;
5888	6233
5889		- if (material != null)
5890		- {
5891		- materialdepth -= 1;
5892		- if (materialdepth > 0)
5893		- {
5894		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5895		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5896		- }
5897		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5898		- //else
5899		- //material.Draw(display, false);
5900		- }
5901		-
	6234	+display.PopMaterial2(this);
5902	6235	/*
5903	6236	display.ReleaseTextures(tex);
5904	6237	*/
..	..	@@ -5909,10 +6242,13 @@
5909	6242
5910	6243	//static cVector min,max;
5911	6244
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6245	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	6246	{
5914		- 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)
5915	6248	return; // no shadow for transparent objects
	6249	+
	6250	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6251	+ return;
5916	6252
5917	6253	if (hide)
5918	6254	return;
..	..	@@ -5954,11 +6290,12 @@
5954	6290	return;
5955	6291	}
5956	6292
	6293	+ //bRep.GenUV(1/material.diffuseness);
5957	6294	// bRep.lock = true;
5958	6295
5959		- javax.media.opengl.GL gl = display.GetGL();
	6296	+ //javax.media.opengl.GL gl = display.GetGL();
5960	6297
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6298	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	6299	{
5963	6300	int fc = bRep.FaceCount();
5964	6301	int vc = bRep.VertexCount();
..	..	@@ -5973,23 +6310,7 @@
5973	6310
5974	6311	bRep.getMinMax(min, max, 100);
5975	6312
5976		- gl.glBegin(gl.GL_LINES);
5977		-
5978		- gl.glVertex3d(min.x, min.y, min.z);
5979		- gl.glVertex3d(min.x, min.y, max.z);
5980		- gl.glVertex3d(min.x, min.y, min.z);
5981		- gl.glVertex3d(min.x, max.y, min.z);
5982		- gl.glVertex3d(min.x, min.y, min.z);
5983		- gl.glVertex3d(max.x, min.y, min.z);
5984		-
5985		- gl.glVertex3d(max.x, max.y, max.z);
5986		- gl.glVertex3d(min.x, max.y, max.z);
5987		- gl.glVertex3d(max.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, min.y, max.z);
5989		- gl.glVertex3d(max.x, max.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, min.z);
5991		-
5992		- gl.glEnd();
	6313	+ display.DrawBox(min, max);
5993	6314
5994	6315	return;
5995	6316	}
..	..	@@ -6033,7 +6354,7 @@
6033	6354	{
6034	6355	//throw new Error();
6035	6356
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6357	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	6358
6038	6359	int[] strips = bRep.getRawIndices();
6039	6360
..	..	@@ -6043,178 +6364,19 @@
6043	6364	new Exception().printStackTrace();
6044	6365	return;
6045	6366	}
6046		-
6047		- // TRIANGLE STRIP ARRAY
6048		- if (bRep.trimmed)
	6367	+
	6368	+ if (dontselect)
6049	6369	{
6050		- float[] v = bRep.getRawVertices();
6051		- float[] n = bRep.getRawNormals();
6052		- float[] c = bRep.getRawColors();
6053		- float[] uv = bRep.getRawUVMap();
6054		-
6055		- int count2 = 0;
6056		- int count3 = 0;
6057		-
6058		- if (n.length > 0)
6059		- {
6060		- for (int i = 0; i < strips.length; i++)
6061		- {
6062		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6063		-
6064		- /*
6065		- boolean locked = false;
6066		- float eps = 0.1f;
6067		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6068		-
6069		- int dot = 0;
6070		-
6071		- if ((dot&1) == 0)
6072		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6073		-
6074		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6075		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6076		- else
6077		- {
6078		- locked = true;
6079		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6080		- }
6081		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6082		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6083		- if (hasnorm)
6084		- {
6085		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6086		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6087		- }
6088		-
6089		- if ((dot&4) == 0)
6090		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6091		-
6092		- if (wrap \|\| !locked && (dot&8) != 0)
6093		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6094		- else
6095		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6096		-
6097		- f.dot = dot;
6098		- */
6099		-
6100		- if (!selectmode)
6101		- {
6102		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6103		- {
6104		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6105		- } else
6106		- {
6107		- gl.glNormal3f(0, 0, 1);
6108		- }
6109		-
6110		- if (c != null)
6111		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6112		- {
6113		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6114		- }
6115		- }
6116		- if (flipV)
6117		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6118		- else
6119		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6120		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6121		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6122		-
6123		- count2 += 2;
6124		- count3 += 3;
6125		- if (!selectmode)
6126		- {
6127		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6128		- {
6129		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6130		- } else
6131		- {
6132		- gl.glNormal3f(0, 0, 1);
6133		- }
6134		- if (c != null)
6135		- {
6136		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6137		- }
6138		- }
6139		- if (flipV)
6140		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6141		- else
6142		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6143		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6144		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6145		-
6146		- count2 += 2;
6147		- count3 += 3;
6148		- for (int j = 0; j < strips[i] - 2; j++)
6149		- {
6150		- //gl.glTexCoord2d(...);
6151		- if (!selectmode)
6152		- {
6153		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6154		- {
6155		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6156		- } else
6157		- {
6158		- gl.glNormal3f(0, 0, 1);
6159		- }
6160		- if (c != null)
6161		- {
6162		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6163		- }
6164		- }
6165		-
6166		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		- count2 += 2;
6173		- count3 += 3;
6174		- }
6175		-
6176		- gl.glEnd();
6177		- }
6178		- }
6179		-
6180		- assert count3 == v.length;
	6370	+ //bRep.GenerateNormalsMINE();
6181	6371	}
6182		- else // !trimmed
6183		- {
6184		- int count = 0;
6185		- for (int i = 0; i < strips.length; i++)
6186		- {
6187		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6188		-
6189		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6190		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6191		-
6192		- drawVertex(gl, p, selectmode);
6193		- drawVertex(gl, q, selectmode);
6194		-
6195		- for (int j = 0; j < strips[i] - 2; j++)
6196		- {
6197		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6198		-
6199		-// if (j%2 == 0)
6200		-// drawFace(p, q, r, display, null);
6201		-// else
6202		-// drawFace(p, r, q, display, null);
6203		-
6204		-// p = q;
6205		-// q = r;
6206		- drawVertex(gl, r, selectmode);
6207		- }
6208		-
6209		- gl.glEnd();
6210		- }
6211		- }
	6372	+
	6373	+ display.DrawGeometry(bRep, flipV, selectmode);
6212	6374	} else // catch (Error e)
6213	6375	{
6214	6376	// TRIANGLE ARRAY
6215	6377	if (IsOpaque()) // Static())
6216	6378	{
6217		- gl.glBegin(gl.GL_TRIANGLES);
	6379	+ display.StartTriangles();
6218	6380	int facecount = bRep.FaceCount();
6219	6381	for (int i = 0; i < facecount; i++)
6220	6382	{
..	..	@@ -6277,9 +6439,9 @@
6277	6439	// // r.norm.dot(v3) > -0.5)
6278	6440	// // continue;
6279	6441
6280		- drawFace(p, q, r, display, face);
	6442	+ display.DrawFace(this, p, q, r, face);
6281	6443	}
6282		- gl.glEnd();
	6444	+ display.EndTriangles();
6283	6445	}
6284	6446	else
6285	6447	{
..	..	@@ -6308,8 +6470,8 @@
6308	6470	//System.out.println("SORT");
6309	6471
6310	6472	java.util.Arrays.sort(facescompare);
6311		-
6312		- gl.glBegin(gl.GL_TRIANGLES);
	6473	+
	6474	+ display.StartTriangles();
6313	6475	for (int i = 0; i < facecount; i++)
6314	6476	{
6315	6477	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6321,13 +6483,14 @@
6321	6483	Vertex q = bRep.GetVertex(face.q);
6322	6484	Vertex r = bRep.GetVertex(face.r);
6323	6485
6324		- drawFace(p, q, r, display, face);
	6486	+ display.DrawFace(this, p, q, r, face);
6325	6487	}
6326		- gl.glEnd();
	6488	+ display.EndTriangles();
6327	6489	}
6328	6490
6329	6491	if (false) // live && support != null && support.bRep != null) // debug weights
6330	6492	{
	6493	+ /*
6331	6494	gl.glDisable(gl.GL_LIGHTING);
6332	6495	float[] colorV = new float[3];
6333	6496
..	..	@@ -6406,6 +6569,7 @@
6406	6569	// gl.glEnd();
6407	6570	}
6408	6571	}
	6572	+ */
6409	6573	}
6410	6574	}
6411	6575
..	..	@@ -6450,7 +6614,7 @@
6450	6614	center.add(r);
6451	6615	center.mul(1.0/3);
6452	6616
6453		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6617	+ center.sub(Globals.theRenderer.EyeCamera().location);
6454	6618
6455	6619	distance = center.dot(center);
6456	6620	}
..	..	@@ -6461,347 +6625,11 @@
6461	6625
6462	6626	transient FaceCompare[] facescompare = null;
6463	6627
6464		- void SetColor(CameraPane display, Vertex p0)
6465		- {
6466		- if (display.RENDERPROGRAM == 0)
6467		- {
6468		- float r = 0;
6469		- if (bRep != null)
6470		- {
6471		- if (bRep.stripified)
6472		- {
6473		- r = 1;
6474		- }
6475		- }
6476		- float g = 0;
6477		- if (bRep != null)
6478		- {
6479		- if (bRep.trimmed)
6480		- {
6481		- g = 1;
6482		- }
6483		- }
6484		- float b = 0;
6485		- if (support != null && link2master)
6486		- {
6487		- b = 1;
6488		- }
6489		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6490		- return;
6491		- }
6492		-
6493		- if (display.drawMode != CameraPane.SHADOW)
6494		- return;
6495		-
6496		- javax.media.opengl.GL gl = display.GetGL();
6497		-// if (true) return;
6498		-// float ao = p.AO;
6499		-//
6500		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6501		-// // ao = 1;
6502		-//
6503		-// gl.glColor4f(ao, ao, ao, 1);
6504		-
6505		-// CameraPane.selectedpoint.
6506		-// getAverage(cStatic.point1, true);
6507		- if (CameraPane.pointflow == null) // !random) // live)
6508		- {
6509		- return;
6510		- }
6511		-
6512		- cStatic.point1.set(0,0,0);
6513		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6514		-
6515		- cStatic.point1.sub(p0);
6516		-
6517		-
6518		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6519		-// {
6520		-// return;
6521		-// }
6522		-
6523		- //if (true)
6524		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6525		- {
6526		- return;
6527		- }
6528		-
6529		- float[] colorV = new float[3];
6530		-
6531		- if (false) // marked)
6532		- {
6533		- // debug rigging weights
6534		- for (int object = 0; object < p0.vertexlinks.length; object++)
6535		- {
6536		- float weight = p0.weights[object] / p0.totalweight;
6537		-
6538		- // if (weight < 0.1)
6539		- // {
6540		- // assert(weight == 0);
6541		- // continue;
6542		- // }
6543		-
6544		- if (p0.vertexlinks[object] == -1)
6545		- continue;
6546		-
6547		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6548		-
6549		- int color = //1 << object; //
6550		- //p.vertexlinks.length;
6551		- support.bRep.supports[p0.closestsupport].links[object];
6552		- colorV[2] += (color & 1) * weight;
6553		- colorV[1] += ((color & 2) >> 1) * weight;
6554		- colorV[0] += ((color & 4) >> 2) * weight;
6555		- }
6556		- }
6557		- else
6558		- {
6559		- if (drawingstarted)
6560		- {
6561		- // find next point
6562		- if (bRep.GetVertex(0).faceindices == null)
6563		- {
6564		- bRep.InitFaceIndices();
6565		- }
6566		-
6567		- double ymin = p0.y;
6568		-
6569		- Vertex newp = p0;
6570		-
6571		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6572		- {
6573		- int fi = p0.faceindices[fii];
6574		-
6575		- if (fi == -1)
6576		- break;
6577		-
6578		- Face f = bRep.GetFace(fi);
6579		-
6580		- Vertex p = bRep.GetVertex(f.p);
6581		- Vertex q = bRep.GetVertex(f.q);
6582		- Vertex r = bRep.GetVertex(f.r);
6583		-
6584		- int swap = (int)(Math.random()*3);
6585		-
6586		-// for (int s=swap; --s>=0;)
6587		-// {
6588		-// Vertex t = p;
6589		-// p = q;
6590		-// q = r;
6591		-// r = t;
6592		-// }
6593		- if (ymin > p.y)
6594		- {
6595		- ymin = p.y;
6596		- newp = p;
6597		-// break;
6598		- }
6599		- if (ymin > q.y)
6600		- {
6601		- ymin = q.y;
6602		- newp = q;
6603		-// break;
6604		- }
6605		- if (ymin > r.y)
6606		- {
6607		- ymin = r.y;
6608		- newp = r;
6609		-// break;
6610		- }
6611		- }
6612		-
6613		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6614		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6615		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6616		-
6617		- drawingstarted = false;
6618		-
6619		- // return;
6620		- }
6621		-
6622		- if (false) // CameraPane.DRAW
6623		- {
6624		- p0.AO = colorV[0] = 2;
6625		- colorV[1] = 2;
6626		- colorV[2] = 2;
6627		- }
6628		-
6629		- CameraPane.pointflow.add(p0);
6630		- CameraPane.pointflow.Touch();
6631		- }
6632		-
6633		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6634		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6635		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6636		- }
6637		-
6638	6628	void Print(Vertex v)
6639	6629	{
6640	6630	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6641	6631	}
6642	6632
6643		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6644		- {
6645		- if (!selectmode)
6646		- {
6647		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6648		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6649		-
6650		- if (flipV)
6651		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6652		- else
6653		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6654		- }
6655		-
6656		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6657		- }
6658		-
6659		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6660		- CameraPane display, Face face)
6661		- {
6662		- if (pv.y == -10000 \|\|
6663		- qv.y == -10000 \|\|
6664		- rv.y == -10000)
6665		- return;
6666		-
6667		-// float b = f.nbiterations & 1;
6668		-// float g = (f.nbiterations>>1) & 1;
6669		-// float r = (f.nbiterations>>2) & 1;
6670		-//
6671		-// //if (f.weight == 10000)
6672		-// //{
6673		-// // r = 1; g = b = 0;
6674		-// //}
6675		-// //else
6676		-// //{
6677		-// // assert(f.weight < 10000);
6678		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6679		-// if (r<0)
6680		-// assert(r>=0);
6681		-// //}
6682		-
6683		- javax.media.opengl.GL gl = display.GetGL();
6684		-
6685		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6686		-
6687		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6688		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6689		- {
6690		- //gl.glBegin(gl.GL_TRIANGLES);
6691		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6692		- if (!hasnorm)
6693		- {
6694		- // System.out.println("FUCK!!");
6695		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6696		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6697		- LA.vecCross(v0, v1, v2);
6698		- LA.vecNormalize(v2);
6699		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6700		- }
6701		-
6702		- if (hasnorm)
6703		- {
6704		-// if (!pv.norm.normalized())
6705		-// assert(pv.norm.normalized());
6706		-
6707		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6708		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6709		- }
6710		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6711		- SetColor(display, pv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6716		- else
6717		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6718		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6719		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6720		-// Print(pv);
6721		- if (hasnorm)
6722		- {
6723		-// assert(qv.norm.normalized());
6724		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6725		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6726		- }
6727		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6728		- // boolean locked = false;
6729		- // float eps = 0.1f;
6730		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6731		-
6732		- // int dot = 0; //*/ (int)f.dot;
6733		-
6734		- // if ((dot&1) == 0)
6735		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6736		-
6737		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6738		- if (flipV)
6739		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6740		- else
6741		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6742		- // else
6743		- // {
6744		- // locked = true;
6745		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6746		- // }
6747		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6748		- SetColor(display, qv);
6749		- //gl.glColor4f(r, g, b, 1);
6750		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6751		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6752		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6753		-// Print(qv);
6754		- if (hasnorm)
6755		- {
6756		-// assert(rv.norm.normalized());
6757		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6758		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6759		- }
6760		-
6761		- // if ((dot&4) == 0)
6762		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6763		-
6764		- // if (wrap \|\| !locked && (dot&8) != 0)
6765		- if (flipV)
6766		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6767		- else
6768		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6769		- // else
6770		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6771		-
6772		- // f.dot = dot;
6773		-
6774		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6775		- SetColor(display, rv);
6776		- //gl.glColor4f(r, g, b, 1);
6777		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6778		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6779		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6780		-// Print(rv);
6781		- //gl.glEnd();
6782		- }
6783		- else
6784		- {
6785		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6786		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6787		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6788		-
6789		- }
6790		-
6791		- if (false) // (attributes & WIREFRAME) != 0)
6792		- {
6793		- gl.glDisable(gl.GL_LIGHTING);
6794		-
6795		- gl.glBegin(gl.GL_LINE_LOOP);
6796		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6797		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6798		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6799		- gl.glEnd();
6800		-
6801		- gl.glEnable(gl.GL_LIGHTING);
6802		- }
6803		- }
6804		-
6805	6633	void drawSelf(ClickInfo info, int level, boolean select)
6806	6634	{
6807	6635	if (bRep == null)
..	..	@@ -7373,83 +7201,84 @@
7373	7201	int spotw = spot.x + spot.width;
7374	7202	int spoth = spot.y + spot.height;
7375	7203	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7376		- if (CameraPane.Xmin > spot.x)
7377		- {
7378		- CameraPane.Xmin = spot.x;
7379		- }
7380		- if (CameraPane.Xmax < spotw)
7381		- {
7382		- CameraPane.Xmax = spotw;
7383		- }
7384		- if (CameraPane.Ymin > spot.y)
7385		- {
7386		- CameraPane.Ymin = spot.y;
7387		- }
7388		- if (CameraPane.Ymax < spoth)
7389		- {
7390		- CameraPane.Ymax = spoth;
7391		- }
	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	+// }
7392	7220	spot.translate(32, 32);
7393	7221	spotw = spot.x + spot.width;
7394	7222	spoth = spot.y + spot.height;
7395		- info.g.setColor(Color.blue);
	7223	+ info.g.setColor(Color.cyan);
7396	7224	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7397		- if (CameraPane.Xmin > spot.x)
7398		- {
7399		- CameraPane.Xmin = spot.x;
7400		- }
7401		- if (CameraPane.Xmax < spotw)
7402		- {
7403		- CameraPane.Xmax = spotw;
7404		- }
7405		- if (CameraPane.Ymin > spot.y)
7406		- {
7407		- CameraPane.Ymin = spot.y;
7408		- }
7409		- if (CameraPane.Ymax < spoth)
7410		- {
7411		- CameraPane.Ymax = spoth;
7412		- }
7413		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7414		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	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
7415	7243	spot.translate(0, -32);
7416		- info.g.setColor(Color.green);
	7244	+ info.g.setColor(Color.yellow);
7417	7245	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7418		- if (CameraPane.Xmin > spot.x)
7419		- {
7420		- CameraPane.Xmin = spot.x;
7421		- }
7422		- if (CameraPane.Xmax < spotw)
7423		- {
7424		- CameraPane.Xmax = spotw;
7425		- }
7426		- if (CameraPane.Ymin > spot.y)
7427		- {
7428		- CameraPane.Ymin = spot.y;
7429		- }
7430		- if (CameraPane.Ymax < spoth)
7431		- {
7432		- CameraPane.Ymax = spoth;
7433		- }
	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	+// }
7434	7263	info.g.drawArc(boundary.x, boundary.y,
7435	7264	boundary.width, boundary.height, 0, 360);
7436	7265	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7437		- if (CameraPane.Xmin > boundary.x)
7438		- {
7439		- CameraPane.Xmin = boundary.x;
7440		- }
7441		- if (CameraPane.Xmax < boundary.x + boundary.width)
7442		- {
7443		- CameraPane.Xmax = boundary.x + boundary.width;
7444		- }
7445		- if (CameraPane.Ymin > boundary.y)
7446		- {
7447		- CameraPane.Ymin = boundary.y;
7448		- }
7449		- if (CameraPane.Ymax < boundary.y + boundary.height)
7450		- {
7451		- CameraPane.Ymax = boundary.y + boundary.height;
7452		- }
	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	+// }
7453	7282	return;
7454	7283	}
7455	7284	}
..	..	@@ -7466,7 +7295,7 @@
7466	7295	startX = info.x;
7467	7296	startY = info.y;
7468	7297
7469		- hitSomething = 0;
	7298	+ hitSomething = -1;
7470	7299	cVector origin = new cVector();
7471	7300	//LA.xformPos(origin, toParent, origin);
7472	7301	Rectangle spot = new Rectangle();
..	..	@@ -7499,7 +7328,7 @@
7499	7328	}
7500	7329
7501	7330	//System.out.println("info.modifiers = " + info.modifiers);
7502		- modified = (info.modifiers & CameraPane.META) != 0;
	7331	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7503	7332	//System.out.println("modified = " + modified);
7504	7333	//new Exception().printStackTrace();
7505	7334	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7527,7 +7356,7 @@
7527	7356	return true;
7528	7357	}
7529	7358
7530		- void doEditDrag0(ClickInfo info)
	7359	+ void doEditDrag0(ClickInfo info, boolean opposite)
7531	7360	{
7532	7361	if (hitSomething == 0)
7533	7362	{
..	..	@@ -7542,6 +7371,7 @@
7542	7371	//System.out.println("hitSomething = " + hitSomething);
7543	7372
7544	7373	double scale = 0.005f * info.camera.Distance();
	7374	+
7545	7375	cVector xlate = new cVector();
7546	7376	//cVector xlate2 = new cVector();
7547	7377	switch (hitSomething)
..	..	@@ -7552,9 +7382,9 @@
7552	7382
7553	7383	case hitCenter: // Translate
7554	7384
7555		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7385	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7556	7386
7557		- if (modified)
	7387	+ if (modified \|\| opposite)
7558	7388	{
7559	7389	//assert(false);
7560	7390	/*
..	..	@@ -7600,10 +7430,10 @@
7600	7430	}
7601	7431	LA.xformDir(up, ClickInfo.matbuffer, up);
7602	7432	// if (!CameraPane.LOCALTRANSFORM)
7603		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7433	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7604	7434	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7605	7435	// if (!CameraPane.LOCALTRANSFORM)
7606		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7436	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7607	7437	//LA.vecCross(up, cVector.Z, right2);
7608	7438
7609	7439	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7648,6 +7478,7 @@
7648	7478
7649	7479	if (modified)
7650	7480	{
	7481	+ // Rotate 90 degrees
7651	7482	angle /= (Math.PI / 4);
7652	7483	angle = Math.floor(angle + 0.5);
7653	7484	angle *= (Math.PI / 4);
..	..	@@ -7661,7 +7492,7 @@
7661	7492	}
7662	7493	/**/
7663	7494
7664		- switch (info.pane.renderCamera.viewCode)
	7495	+ switch (info.pane.RenderCamera().viewCode)
7665	7496	{
7666	7497	case 1: // '\001'
7667	7498	LA.matZRotate(toParent, angle);
..	..	@@ -7689,24 +7520,27 @@
7689	7520
7690	7521	case hitScale: // scale
7691	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);
7692	7529	if (hScale < 0.01)
7693	7530	{
7694		- hScale = 0.01;
	7531	+ //hScale = 0.01;
7695	7532	}
7696		- hScale = Math.pow(hScale, scale * 50);
7697		- if (hScale < 0.01)
7698		- {
7699		- hScale = 0.01;
7700		- }
	7533	+
7701	7534	double vScale = (double) (info.y - centerPt.y) / 32;
7702		- if (vScale < 0.01)
	7535	+ sign = 1;
	7536	+ if (vScale < 0)
7703	7537	{
7704		- vScale = 0.01;
	7538	+ sign = -1;
7705	7539	}
7706		- vScale = Math.pow(vScale, scale * 50);
	7540	+ vScale = signMath.pow(signvScale, scale * 50);
7707	7541	if (vScale < 0.01)
7708	7542	{
7709		- vScale = 0.01;
	7543	+ //vScale = 0.01;
7710	7544	}
7711	7545	LA.matCopy(startMat, toParent);
7712	7546	/**/
..	..	@@ -7717,39 +7551,47 @@
7717	7551	}
7718	7552	/**/
7719	7553
7720		- 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)
7721	7562	{
7722	7563	case 3: // '\001'
7723		- if (modified)
	7564	+ if (modified \|\| opposite)
7724	7565	{
7725	7566	//LA.matScale(toParent, 1, hScale, vScale);
7726		- LA.matScale(toParent, vScale, 1, 1);
	7567	+ LA.matScale(toParent, totalScale, 1, 1);
7727	7568	} // vScale, 1);
7728	7569	else
7729	7570	{
7730		- LA.matScale(toParent, vScale, vScale, vScale);
	7571	+ // EXCEPTION!
	7572	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7731	7573	} // vScale, 1);
7732	7574	break;
7733	7575
7734	7576	case 2: // '\002'
7735		- if (modified)
	7577	+ if (modified \|\| opposite)
7736	7578	{
7737	7579	//LA.matScale(toParent, hScale, 1, vScale);
7738		- LA.matScale(toParent, 1, vScale, 1);
	7580	+ LA.matScale(toParent, 1, totalScale, 1);
7739	7581	} else
7740	7582	{
7741		- LA.matScale(toParent, vScale, 1, vScale);
	7583	+ LA.matScale(toParent, totalScale, 1, totalScale);
7742	7584	}
7743	7585	break;
7744	7586
7745	7587	case 1: // '\003'
7746		- if (modified)
	7588	+ if (modified \|\| opposite)
7747	7589	{
7748	7590	//LA.matScale(toParent, hScale, vScale, 1);
7749		- LA.matScale(toParent, 1, 1, vScale);
	7591	+ LA.matScale(toParent, 1, 1, totalScale);
7750	7592	} else
7751	7593	{
7752		- LA.matScale(toParent, vScale, vScale, 1);
	7594	+ LA.matScale(toParent, totalScale, totalScale, 1);
7753	7595	}
7754	7596	break;
7755	7597	}
..	..	@@ -7882,14 +7724,22 @@
7882	7724	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7883	7725	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7884	7726	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7727	+
	7728	+ String objname;
	7729	+
7885	7730	if (false) //parent != null)
7886	7731	{
7887		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7732	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7888	7733	} else
7889	7734	{
7890		- 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) ":"") / "";
7891	7736	} // + super.toString();
7892	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);
7893	7743	}
7894	7744
7895	7745	public int hashCode()
..	..	@@ -7945,6 +7795,7 @@
7945	7795	objectUI.closeUI();
7946	7796	if (editWindow != null)
7947	7797	{
	7798	+ editWindow.ctrlPanel.FlushUI();
7948	7799	editWindow.refreshContents();
7949	7800	} // ? new
7950	7801	objectUI = null;
..	..	@@ -7953,6 +7804,10 @@
7953	7804	{
7954	7805	editWindow = null;
7955	7806	} // ?
	7807	+ }
	7808	+ else
	7809	+ {
	7810	+ //editWindow.closeUI();
7956	7811	}
7957	7812	}
7958	7813
..	..	@@ -7965,7 +7820,7 @@
7965	7820	/transient/ cVector2[] projectedVertices = new cVector2[0];
7966	7821
7967	7822	Object3D /Composite/ parent;
7968		- Object3D /Composite/ fileparent;
	7823	+ Object3D /Composite/ fileparent; // In the case of FileObject
7969	7824
7970	7825	double[][] toParent; // dynamic matrix
7971	7826	double[][] fromParent;
..	..	@@ -8080,7 +7935,7 @@
8080	7935	{
8081	7936	assert(bRep != null);
8082	7937	if (!(support instanceof GenericJoint)) // support.bRep != null)
8083		- GrafreeD.Assert(support.bRep == bRep.support);
	7938	+ Grafreed.Assert(support.bRep == bRep.support);
8084	7939	}
8085	7940	else
8086	7941	{
..	..	@@ -8129,9 +7984,9 @@
8129	7984	private static cVector edge2 = new cVector();
8130	7985	//private static cVector norm = new cVector();
8131	7986	/transient private/ int hitSomething;
8132		- private static final int hitCenter = 1;
8133		- private static final int hitScale = 2;
8134		- private static final int hitRotate = 3;
	7987	+ static final int hitCenter = 1;
	7988	+ static final int hitScale = 2;
	7989	+ static final int hitRotate = 3;
8135	7990	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8136	7991	/transient/ private Point centerPt;
8137	7992	/transient/ private int startX;
..	..	@@ -8163,6 +8018,8 @@
8163	8018	{
8164	8019	Object3D targ = this;
8165	8020
	8021	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8022	+
8166	8023	if (obj.material != null)
8167	8024	{
8168	8025	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))