~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;
..	..	@@ -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
..	..	@@ -796,7 +888,7 @@
796	888
797	889	if (marked && Globals.isLIVE() && live &&
798	890	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	891	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	892	currentframe != Globals.framecount)
801	893	{
802	894	currentframe = Globals.framecount;
..	..	@@ -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)
..	..	@@ -5156,10 +5442,34 @@
5156	5442
5157	5443	// System.out.println("Fullname = " + fullname);
5158	5444
5159		- if (fullname.name.indexOf(":") == -1)
5160		- 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(":"));
5161	5450
5162		- 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];
5163	5473	}
5164	5474
5165	5475	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5478,38 @@
5168	5478	return "";
5169	5479
5170	5480	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- 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];
5175	5513	}
5176	5514
5177	5515	String GetPigmentTexture()
..	..	@@ -5245,7 +5583,7 @@
5245	5583	System.out.print("; textures = " + textures);
5246	5584	System.out.println("; usedtextures = " + usedtextures);
5247	5585
5248		- if (GetTextures() == null)
	5586	+ if (GetTextures() == null) // What is that??
5249	5587	GetTextures().name = ":";
5250	5588
5251	5589	String texname = tex;
..	..	@@ -5276,6 +5614,43 @@
5276	5614	child.ResetPigmentTexture();
5277	5615	blockloop = false;
5278	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;
5279	5654	}
5280	5655
5281	5656	void SetBumpTexture(String tex)
..	..	@@ -5322,11 +5697,23 @@
5322	5697	boolean NeedSupport()
5323	5698	{
5324	5699	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5700	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5701	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5702	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5703	}
5329	5704
	5705	+ static boolean DEBUG_SELECTION = false;
	5706	+
	5707	+ boolean IsLive()
	5708	+ {
	5709	+ if (live)
	5710	+ return true;
	5711	+
	5712	+ if (parent == null)
	5713	+ return false;
	5714	+
	5715	+ return parent.IsLive();
	5716	+ }
5330	5717
5331	5718	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5719	{
..	..	@@ -5338,7 +5725,7 @@
5338	5725	}
5339	5726
5340	5727	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5728	+ (hide \|\| dontselect))
5342	5729	return;
5343	5730
5344	5731	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5752,12 @@
5365	5752	}
5366	5753
5367	5754	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5755	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5756	{
5370	5757	return;
5371	5758	}
5372	5759
5373		- javax.media.opengl.GL gl = display.GetGL();
	5760	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5761
5375	5762	/*
5376	5763	if (touched)
..	..	@@ -5389,7 +5776,7 @@
5389	5776	support = support;
5390	5777
5391	5778	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5392		- 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);
5393	5780
5394	5781	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5395	5782	{
..	..	@@ -5406,13 +5793,15 @@
5406	5793
5407	5794	boolean compiled = false;
5408	5795
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5796	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5797
5411	5798	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5799	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5800	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched \|\| (bRep != null && bRep.displaylist <= 0)))
5413	5801	{
5414	5802	Globals.lighttouched = true;
5415	5803	} // all panes...
	5804	+
5416	5805	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5417	5806	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5418	5807	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5811,7 @@
5422	5811	//if (displaylist == -1 && usecalllists)
5423	5812	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5813	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5814	+ bRep.displaylist = display.GenList();
5426	5815	assert(bRep.displaylist != 0);
5427	5816	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5817	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5823,16 @@
5434	5823	if (usecalllists)
5435	5824	{
5436	5825	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5826	+ display.NewList(bRep.displaylist);
5438	5827	}
	5828	+
5439	5829	CallList(display, root, selected, blocked);
	5830	+
5440	5831	// compiled = true;
5441	5832	if (usecalllists)
5442	5833	{
5443	5834	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5835	+ display.EndList();
5445	5836	}
5446	5837	//gl.glDrawBuffer(gl.GL_BACK);
5447	5838	// XXX touched = false;
..	..	@@ -5484,12 +5875,12 @@
5484	5875
5485	5876	// frustum culling
5486	5877	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	5878	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	5879	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	5880	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	5881	{
5491	5882	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5883	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	5884	{
5494	5885	//System.out.print("CULLED");
5495	5886	culled = true;
..	..	@@ -5497,7 +5888,7 @@
5497	5888	}
5498	5889	else
5499	5890	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5891	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	5892	culled = true;
5502	5893
5503	5894	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +5924,11 @@
5533	5924
5534	5925
5535	5926	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5927	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	5928	{
5538	5929	if (GetBRep() != null)
5539	5930	{
5540		- CameraPane.NextIndex(this, gl);
	5931	+ display.NextIndex();
5541	5932	// vertex color conflict : gl.glCallList(list);
5542	5933	DrawNode(display, root, selected);
5543	5934	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +5969,28 @@
5578	5969	tex = GetTextures();
5579	5970	}
5580	5971
5581		- 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	+ }
5582	5994
5583	5995	if (!compiled)
5584	5996	{
..	..	@@ -5594,13 +6006,17 @@
5594	6006
5595	6007	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	6008	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	6009	+ display.CallList(bRep.displaylist);
5598	6010	// june 2013 drawSelf(display, root, selected);
5599	6011	}
5600	6012	}
5601	6013	}
5602	6014
5603		- display.ReleaseTextures(tex);
	6015	+ if (!failedBump)
	6016	+ display.ReleaseBumpTexture(tex);
	6017	+
	6018	+ if (!failedPigment)
	6019	+ display.ReleasePigmentTexture(tex);
5604	6020
5605	6021	display.PopMaterial(this, selected);
5606	6022	}
..	..	@@ -5729,6 +6145,9 @@
5729	6145
5730	6146	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6147	{
	6148	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6149	+ return;
	6150	+
5732	6151	if (hide)
5733	6152	return;
5734	6153	// shadow optimisation
..	..	@@ -5854,6 +6273,9 @@
5854	6273	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	6274	return; // no shadow for transparent objects
5856	6275
	6276	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6277	+ return;
	6278	+
5857	6279	if (hide)
5858	6280	return;
5859	6281
..	..	@@ -5894,9 +6316,10 @@
5894	6316	return;
5895	6317	}
5896	6318
	6319	+ //bRep.GenUV(1/material.diffuseness);
5897	6320	// bRep.lock = true;
5898	6321
5899		- javax.media.opengl.GL gl = display.GetGL();
	6322	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6323
5901	6324	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6325	{
..	..	@@ -5913,23 +6336,7 @@
5913	6336
5914	6337	bRep.getMinMax(min, max, 100);
5915	6338
5916		- gl.glBegin(gl.GL_LINES);
5917		-
5918		- gl.glVertex3d(min.x, min.y, min.z);
5919		- gl.glVertex3d(min.x, min.y, max.z);
5920		- gl.glVertex3d(min.x, min.y, min.z);
5921		- gl.glVertex3d(min.x, max.y, min.z);
5922		- gl.glVertex3d(min.x, min.y, min.z);
5923		- gl.glVertex3d(max.x, min.y, min.z);
5924		-
5925		- gl.glVertex3d(max.x, max.y, max.z);
5926		- gl.glVertex3d(min.x, max.y, max.z);
5927		- gl.glVertex3d(max.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, min.y, max.z);
5929		- gl.glVertex3d(max.x, max.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, min.z);
5931		-
5932		- gl.glEnd();
	6339	+ display.DrawBox(min, max);
5933	6340
5934	6341	return;
5935	6342	}
..	..	@@ -5973,7 +6380,7 @@
5973	6380	{
5974	6381	//throw new Error();
5975	6382
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6383	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6384
5978	6385	int[] strips = bRep.getRawIndices();
5979	6386
..	..	@@ -5983,178 +6390,19 @@
5983	6390	new Exception().printStackTrace();
5984	6391	return;
5985	6392	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
	6393	+
	6394	+ if (dontselect)
5989	6395	{
5990		- float[] v = bRep.getRawVertices();
5991		- float[] n = bRep.getRawNormals();
5992		- float[] c = bRep.getRawColors();
5993		- float[] uv = bRep.getRawUVMap();
5994		-
5995		- int count2 = 0;
5996		- int count3 = 0;
5997		-
5998		- if (n.length > 0)
5999		- {
6000		- for (int i = 0; i < strips.length; i++)
6001		- {
6002		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6003		-
6004		- /*
6005		- boolean locked = false;
6006		- float eps = 0.1f;
6007		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6008		-
6009		- int dot = 0;
6010		-
6011		- if ((dot&1) == 0)
6012		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6013		-
6014		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6015		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6016		- else
6017		- {
6018		- locked = true;
6019		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6020		- }
6021		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6022		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6023		- if (hasnorm)
6024		- {
6025		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6026		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6027		- }
6028		-
6029		- if ((dot&4) == 0)
6030		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6031		-
6032		- if (wrap \|\| !locked && (dot&8) != 0)
6033		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6034		- else
6035		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6036		-
6037		- f.dot = dot;
6038		- */
6039		-
6040		- if (!selectmode)
6041		- {
6042		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6043		- {
6044		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6045		- } else
6046		- {
6047		- gl.glNormal3f(0, 0, 1);
6048		- }
6049		-
6050		- if (c != null)
6051		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6052		- {
6053		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6054		- }
6055		- }
6056		- if (flipV)
6057		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6058		- else
6059		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6060		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6061		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6062		-
6063		- count2 += 2;
6064		- count3 += 3;
6065		- if (!selectmode)
6066		- {
6067		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6068		- {
6069		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6070		- } else
6071		- {
6072		- gl.glNormal3f(0, 0, 1);
6073		- }
6074		- if (c != null)
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- for (int j = 0; j < strips[i] - 2; j++)
6089		- {
6090		- //gl.glTexCoord2d(...);
6091		- if (!selectmode)
6092		- {
6093		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6094		- {
6095		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6096		- } else
6097		- {
6098		- gl.glNormal3f(0, 0, 1);
6099		- }
6100		- if (c != null)
6101		- {
6102		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6103		- }
6104		- }
6105		-
6106		- if (flipV)
6107		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6108		- else
6109		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6110		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6111		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6112		- count2 += 2;
6113		- count3 += 3;
6114		- }
6115		-
6116		- gl.glEnd();
6117		- }
6118		- }
6119		-
6120		- assert count3 == v.length;
	6396	+ //bRep.GenerateNormalsMINE();
6121	6397	}
6122		- else // !trimmed
6123		- {
6124		- int count = 0;
6125		- for (int i = 0; i < strips.length; i++)
6126		- {
6127		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6128		-
6129		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6130		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6131		-
6132		- drawVertex(gl, p, selectmode);
6133		- drawVertex(gl, q, selectmode);
6134		-
6135		- for (int j = 0; j < strips[i] - 2; j++)
6136		- {
6137		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6138		-
6139		-// if (j%2 == 0)
6140		-// drawFace(p, q, r, display, null);
6141		-// else
6142		-// drawFace(p, r, q, display, null);
6143		-
6144		-// p = q;
6145		-// q = r;
6146		- drawVertex(gl, r, selectmode);
6147		- }
6148		-
6149		- gl.glEnd();
6150		- }
6151		- }
	6398	+
	6399	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6400	} else // catch (Error e)
6153	6401	{
6154	6402	// TRIANGLE ARRAY
6155	6403	if (IsOpaque()) // Static())
6156	6404	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6405	+ display.StartTriangles();
6158	6406	int facecount = bRep.FaceCount();
6159	6407	for (int i = 0; i < facecount; i++)
6160	6408	{
..	..	@@ -6219,7 +6467,7 @@
6219	6467
6220	6468	display.DrawFace(this, p, q, r, face);
6221	6469	}
6222		- gl.glEnd();
	6470	+ display.EndTriangles();
6223	6471	}
6224	6472	else
6225	6473	{
..	..	@@ -6248,8 +6496,8 @@
6248	6496	//System.out.println("SORT");
6249	6497
6250	6498	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6499	+
	6500	+ display.StartTriangles();
6253	6501	for (int i = 0; i < facecount; i++)
6254	6502	{
6255	6503	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6511,12 @@
6263	6511
6264	6512	display.DrawFace(this, p, q, r, face);
6265	6513	}
6266		- gl.glEnd();
	6514	+ display.EndTriangles();
6267	6515	}
6268	6516
6269	6517	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6518	{
	6519	+ /*
6271	6520	gl.glDisable(gl.GL_LIGHTING);
6272	6521	float[] colorV = new float[3];
6273	6522
..	..	@@ -6346,6 +6595,7 @@
6346	6595	// gl.glEnd();
6347	6596	}
6348	6597	}
	6598	+ */
6349	6599	}
6350	6600	}
6351	6601
..	..	@@ -6390,7 +6640,7 @@
6390	6640	center.add(r);
6391	6641	center.mul(1.0/3);
6392	6642
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6643	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6644
6395	6645	distance = center.dot(center);
6396	6646	}
..	..	@@ -6404,22 +6654,6 @@
6404	6654	void Print(Vertex v)
6405	6655	{
6406	6656	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6407		- }
6408		-
6409		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6410		- {
6411		- if (!selectmode)
6412		- {
6413		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6414		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6415		-
6416		- if (flipV)
6417		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6418		- else
6419		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6420		- }
6421		-
6422		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6423	6657	}
6424	6658
6425	6659	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6993,83 +7227,84 @@
6993	7227	int spotw = spot.x + spot.width;
6994	7228	int spoth = spot.y + spot.height;
6995	7229	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996		- if (CameraPane.Xmin > spot.x)
6997		- {
6998		- CameraPane.Xmin = spot.x;
6999		- }
7000		- if (CameraPane.Xmax < spotw)
7001		- {
7002		- CameraPane.Xmax = spotw;
7003		- }
7004		- if (CameraPane.Ymin > spot.y)
7005		- {
7006		- CameraPane.Ymin = spot.y;
7007		- }
7008		- if (CameraPane.Ymax < spoth)
7009		- {
7010		- CameraPane.Ymax = spoth;
7011		- }
	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	+// }
7012	7246	spot.translate(32, 32);
7013	7247	spotw = spot.x + spot.width;
7014	7248	spoth = spot.y + spot.height;
7015		- info.g.setColor(Color.blue);
	7249	+ info.g.setColor(Color.cyan);
7016	7250	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017		- if (CameraPane.Xmin > spot.x)
7018		- {
7019		- CameraPane.Xmin = spot.x;
7020		- }
7021		- if (CameraPane.Xmax < spotw)
7022		- {
7023		- CameraPane.Xmax = spotw;
7024		- }
7025		- if (CameraPane.Ymin > spot.y)
7026		- {
7027		- CameraPane.Ymin = spot.y;
7028		- }
7029		- if (CameraPane.Ymax < spoth)
7030		- {
7031		- CameraPane.Ymax = spoth;
7032		- }
7033		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034		- 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
7035	7269	spot.translate(0, -32);
7036		- info.g.setColor(Color.green);
	7270	+ info.g.setColor(Color.yellow);
7037	7271	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038		- if (CameraPane.Xmin > spot.x)
7039		- {
7040		- CameraPane.Xmin = spot.x;
7041		- }
7042		- if (CameraPane.Xmax < spotw)
7043		- {
7044		- CameraPane.Xmax = spotw;
7045		- }
7046		- if (CameraPane.Ymin > spot.y)
7047		- {
7048		- CameraPane.Ymin = spot.y;
7049		- }
7050		- if (CameraPane.Ymax < spoth)
7051		- {
7052		- CameraPane.Ymax = spoth;
7053		- }
	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	+// }
7054	7289	info.g.drawArc(boundary.x, boundary.y,
7055	7290	boundary.width, boundary.height, 0, 360);
7056	7291	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057		- if (CameraPane.Xmin > boundary.x)
7058		- {
7059		- CameraPane.Xmin = boundary.x;
7060		- }
7061		- if (CameraPane.Xmax < boundary.x + boundary.width)
7062		- {
7063		- CameraPane.Xmax = boundary.x + boundary.width;
7064		- }
7065		- if (CameraPane.Ymin > boundary.y)
7066		- {
7067		- CameraPane.Ymin = boundary.y;
7068		- }
7069		- if (CameraPane.Ymax < boundary.y + boundary.height)
7070		- {
7071		- CameraPane.Ymax = boundary.y + boundary.height;
7072		- }
	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	+// }
7073	7308	return;
7074	7309	}
7075	7310	}
..	..	@@ -7086,7 +7321,7 @@
7086	7321	startX = info.x;
7087	7322	startY = info.y;
7088	7323
7089		- hitSomething = 0;
	7324	+ hitSomething = -1;
7090	7325	cVector origin = new cVector();
7091	7326	//LA.xformPos(origin, toParent, origin);
7092	7327	Rectangle spot = new Rectangle();
..	..	@@ -7119,7 +7354,7 @@
7119	7354	}
7120	7355
7121	7356	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7357	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7358	//System.out.println("modified = " + modified);
7124	7359	//new Exception().printStackTrace();
7125	7360	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7382,7 @@
7147	7382	return true;
7148	7383	}
7149	7384
7150		- void doEditDrag0(ClickInfo info)
	7385	+ void doEditDrag0(ClickInfo info, boolean opposite)
7151	7386	{
7152	7387	if (hitSomething == 0)
7153	7388	{
..	..	@@ -7162,6 +7397,7 @@
7162	7397	//System.out.println("hitSomething = " + hitSomething);
7163	7398
7164	7399	double scale = 0.005f * info.camera.Distance();
	7400	+
7165	7401	cVector xlate = new cVector();
7166	7402	//cVector xlate2 = new cVector();
7167	7403	switch (hitSomething)
..	..	@@ -7172,9 +7408,9 @@
7172	7408
7173	7409	case hitCenter: // Translate
7174	7410
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7411	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7412
7177		- if (modified)
	7413	+ if (modified \|\| opposite)
7178	7414	{
7179	7415	//assert(false);
7180	7416	/*
..	..	@@ -7220,10 +7456,10 @@
7220	7456	}
7221	7457	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7458	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7459	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7224	7460	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7225	7461	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7462	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7463	//LA.vecCross(up, cVector.Z, right2);
7228	7464
7229	7465	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7268,6 +7504,7 @@
7268	7504
7269	7505	if (modified)
7270	7506	{
	7507	+ // Rotate 90 degrees
7271	7508	angle /= (Math.PI / 4);
7272	7509	angle = Math.floor(angle + 0.5);
7273	7510	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7518,7 @@
7281	7518	}
7282	7519	/**/
7283	7520
7284		- switch (info.pane.renderCamera.viewCode)
	7521	+ switch (info.pane.RenderCamera().viewCode)
7285	7522	{
7286	7523	case 1: // '\001'
7287	7524	LA.matZRotate(toParent, angle);
..	..	@@ -7309,24 +7546,27 @@
7309	7546
7310	7547	case hitScale: // scale
7311	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);
7312	7555	if (hScale < 0.01)
7313	7556	{
7314		- hScale = 0.01;
	7557	+ //hScale = 0.01;
7315	7558	}
7316		- hScale = Math.pow(hScale, scale * 50);
7317		- if (hScale < 0.01)
7318		- {
7319		- hScale = 0.01;
7320		- }
	7559	+
7321	7560	double vScale = (double) (info.y - centerPt.y) / 32;
7322		- if (vScale < 0.01)
	7561	+ sign = 1;
	7562	+ if (vScale < 0)
7323	7563	{
7324		- vScale = 0.01;
	7564	+ sign = -1;
7325	7565	}
7326		- vScale = Math.pow(vScale, scale * 50);
	7566	+ vScale = signMath.pow(signvScale, scale * 50);
7327	7567	if (vScale < 0.01)
7328	7568	{
7329		- vScale = 0.01;
	7569	+ //vScale = 0.01;
7330	7570	}
7331	7571	LA.matCopy(startMat, toParent);
7332	7572	/**/
..	..	@@ -7337,39 +7577,47 @@
7337	7577	}
7338	7578	/**/
7339	7579
7340		- 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)
7341	7588	{
7342	7589	case 3: // '\001'
7343		- if (modified)
	7590	+ if (modified \|\| opposite)
7344	7591	{
7345	7592	//LA.matScale(toParent, 1, hScale, vScale);
7346		- LA.matScale(toParent, vScale, 1, 1);
	7593	+ LA.matScale(toParent, totalScale, 1, 1);
7347	7594	} // vScale, 1);
7348	7595	else
7349	7596	{
7350		- LA.matScale(toParent, vScale, vScale, vScale);
	7597	+ // EXCEPTION!
	7598	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7351	7599	} // vScale, 1);
7352	7600	break;
7353	7601
7354	7602	case 2: // '\002'
7355		- if (modified)
	7603	+ if (modified \|\| opposite)
7356	7604	{
7357	7605	//LA.matScale(toParent, hScale, 1, vScale);
7358		- LA.matScale(toParent, 1, vScale, 1);
	7606	+ LA.matScale(toParent, 1, totalScale, 1);
7359	7607	} else
7360	7608	{
7361		- LA.matScale(toParent, vScale, 1, vScale);
	7609	+ LA.matScale(toParent, totalScale, 1, totalScale);
7362	7610	}
7363	7611	break;
7364	7612
7365	7613	case 1: // '\003'
7366		- if (modified)
	7614	+ if (modified \|\| opposite)
7367	7615	{
7368	7616	//LA.matScale(toParent, hScale, vScale, 1);
7369		- LA.matScale(toParent, 1, 1, vScale);
	7617	+ LA.matScale(toParent, 1, 1, totalScale);
7370	7618	} else
7371	7619	{
7372		- LA.matScale(toParent, vScale, vScale, 1);
	7620	+ LA.matScale(toParent, totalScale, totalScale, 1);
7373	7621	}
7374	7622	break;
7375	7623	}
..	..	@@ -7502,14 +7750,22 @@
7502	7750	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7751	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7752	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7753	+
	7754	+ String objname;
	7755	+
7505	7756	if (false) //parent != null)
7506	7757	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7758	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7759	} else
7509	7760	{
7510		- 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) ":"") / "";
7511	7762	} // + super.toString();
7512	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);
7513	7769	}
7514	7770
7515	7771	public int hashCode()
..	..	@@ -7565,6 +7821,7 @@
7565	7821	objectUI.closeUI();
7566	7822	if (editWindow != null)
7567	7823	{
	7824	+ editWindow.ctrlPanel.FlushUI();
7568	7825	editWindow.refreshContents();
7569	7826	} // ? new
7570	7827	objectUI = null;
..	..	@@ -7573,6 +7830,10 @@
7573	7830	{
7574	7831	editWindow = null;
7575	7832	} // ?
	7833	+ }
	7834	+ else
	7835	+ {
	7836	+ //editWindow.closeUI();
7576	7837	}
7577	7838	}
7578	7839
..	..	@@ -7585,7 +7846,7 @@
7585	7846	/transient/ cVector2[] projectedVertices = new cVector2[0];
7586	7847
7587	7848	Object3D /Composite/ parent;
7588		- Object3D /Composite/ fileparent;
	7849	+ Object3D /Composite/ fileparent; // In the case of FileObject
7589	7850
7590	7851	double[][] toParent; // dynamic matrix
7591	7852	double[][] fromParent;
..	..	@@ -7700,7 +7961,7 @@
7700	7961	{
7701	7962	assert(bRep != null);
7702	7963	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	7964	+ Grafreed.Assert(support.bRep == bRep.support);
7704	7965	}
7705	7966	else
7706	7967	{
..	..	@@ -7731,6 +7992,10 @@
7731	7992	}
7732	7993
7733	7994	transient ObjEditor editWindow;
	7995	+ transient ObjEditor manipWindow;
	7996	+
	7997	+ transient boolean pinned;
	7998	+
7734	7999	transient ObjectUI objectUI;
7735	8000	public static int povDepth = 0;
7736	8001	private static cVector tbMin = new cVector();
..	..	@@ -7749,9 +8014,9 @@
7749	8014	private static cVector edge2 = new cVector();
7750	8015	//private static cVector norm = new cVector();
7751	8016	/transient private/ int hitSomething;
7752		- private static final int hitCenter = 1;
7753		- private static final int hitScale = 2;
7754		- private static final int hitRotate = 3;
	8017	+ static final int hitCenter = 1;
	8018	+ static final int hitScale = 2;
	8019	+ static final int hitRotate = 3;
7755	8020	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7756	8021	/transient/ private Point centerPt;
7757	8022	/transient/ private int startX;