~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,12 +14,24 @@
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. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ byte[] versions[] = new byte[100][];
	33	+ int versionindex = -1;
	34	+
22	35	ScriptNode scriptnode;
23	36
24	37	void InitOthers()
..	..	@@ -99,64 +112,178 @@
99	112
100	113	// transient boolean reduced; // for morph reduction
101	114
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	117
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
107	120
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)
	121	+ void SaveSupports()
120	122	{
121		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
122	146	}
123		-
124		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
125	149	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
129	258	blockloop = true;
130		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
131	267	blockloop = false;
132	268	}
133		-}
134	269
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)
	270	+ void RestoreBigData(Object3D o)
146	271	{
147		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
148	286	}
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	287
161	288	// MOCAP SUPPORT
162	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +426,7 @@
299	426	}
300	427
301	428	boolean live = false;
	429	+ boolean dontselect = false;
302	430	boolean hide = false;
303	431	boolean link2master = false; // performs reset support/master at each frame
304	432	boolean marked = false; // animation node
..	..	@@ -430,16 +558,16 @@
430	558	{
431	559	Object3D copy = this;
432	560
433		- Camera parentcam = CameraPane.theRenderer.ManipCamera();
	561	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	562
435		- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
	563	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	564	{
437		- parentcam = CameraPane.theRenderer.Cameras()[1];
	565	+ parentcam = Globals.theRenderer.Cameras()[1];
438	566	}
439	567
440		- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
	568	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	569	{
442		- parentcam = CameraPane.theRenderer.Cameras()[0];
	570	+ parentcam = Globals.theRenderer.Cameras()[0];
443	571	}
444	572
445	573	if (this == parentcam)
..	..	@@ -447,7 +575,7 @@
447	575	//assert(this instanceof Camera);
448	576
449	577	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
	578	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	579	}
452	580
453	581	copy.marked ^= true;
..	..	@@ -467,7 +595,7 @@
467	595	//assert(this instanceof Camera);
468	596
469	597	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
	598	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	599	}
472	600
473	601	copy.Touch(); // display list issue
..	..	@@ -480,12 +608,14 @@
480	608	toParent = LA.newMatrix();
481	609	fromParent = LA.newMatrix();
482	610	}
	611	+
483	612	if (toParentMarked == null)
484	613	{
485	614	if (maxcount != 1)
486	615	{
487	616	new Exception().printStackTrace();
488	617	}
	618	+
489	619	toParentMarked = LA.newMatrix();
490	620	fromParentMarked = LA.newMatrix();
491	621	}
..	..	@@ -773,7 +903,7 @@
773	903	if (step == 0)
774	904	step = 1;
775	905	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	906	+ maxcount = 128; // 2048; // 4;
777	907	// if (acceleration == 0)
778	908	// acceleration = 10;
779	909	if (delay == 0) // serial
..	..	@@ -796,7 +926,7 @@
796	926
797	927	if (marked && Globals.isLIVE() && live &&
798	928	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	929	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	930	currentframe != Globals.framecount)
801	931	{
802	932	currentframe = Globals.framecount;
..	..	@@ -808,7 +938,8 @@
808	938
809	939	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	940
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	941	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	942	+ (step == 1 && changedir))
812	943	{
813	944	countdown = 1;
814	945	delay = speedup?8:1;
..	..	@@ -880,6 +1011,7 @@
880	1011	if (material == null \|\| material.multiply)
881	1012	return true;
882	1013
	1014	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1015	return material.opacity > 0.99;
884	1016	}
885	1017
..	..	@@ -911,6 +1043,11 @@
911	1043	fromParent = null; // LA.newMatrix();
912	1044	bRep = null; // new BoundaryRep();
913	1045
	1046	+ if (oname != null && oname.equals("LeftHand"))
	1047	+ {
	1048	+ name = oname;
	1049	+ }
	1050	+
914	1051	/*
915	1052	float hue = (float)Math.random();
916	1053	Color col;
..	..	@@ -953,7 +1090,7 @@
953	1090
954	1091	public Object clone()
955	1092	{
956		- return GrafreeD.clone(this);
	1093	+ return Grafreed.clone(this);
957	1094	}
958	1095
959	1096	Object3D copyExpand()
..	..	@@ -1275,6 +1412,7 @@
1275	1412	toParent = LA.newMatrix();
1276	1413	fromParent = LA.newMatrix();
1277	1414	}
	1415	+
1278	1416	LA.matCopy(other.toParent, toParent);
1279	1417	LA.matCopy(other.fromParent, fromParent);
1280	1418
..	..	@@ -1469,7 +1607,7 @@
1469	1607	BoundaryRep.SEUIL = other.material.cameralight;
1470	1608
1471	1609	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1610	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1611	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1612	}
1475	1613
..	..	@@ -1728,7 +1866,7 @@
1728	1866	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1867	o.bRep = transientrep;
1730	1868	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1869	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1870	o.CreateMaterial();
1733	1871	o.SetAttributes(this, -1);
1734	1872	//parent
..	..	@@ -1741,7 +1879,7 @@
1741	1879	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1880	o.bRep = bRep;
1743	1881	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1882	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1883	o.CreateMaterial();
1746	1884	//o.overwriteThis(this, -1);
1747	1885	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1966,15 @@
1828	1966	if (obj.name == null)
1829	1967	continue; // can't be a null one
1830	1968
	1969	+ // Try perfect match first.
1831	1970	if (n.equals(obj.name))
1832	1971	{
1833	1972	theobj = obj;
1834	1973	count++;
1835	1974	}
1836	1975	}
	1976	+
	1977	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1978
1838	1979	if (count != 1)
1839	1980	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2434,17 @@
2293	2434	}
2294	2435	*/
2295	2436	}
	2437	+ else
	2438	+ {
	2439	+ //((ObjEditor)editWindow).SetupUI2(null);
	2440	+ }
2296	2441	}
2297	2442
2298	2443	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2444	{
2300	2445	if (newWindow)
2301	2446	{
	2447	+ new Exception().printStackTrace();
2302	2448	System.exit(0);
2303	2449	if (parent != null)
2304	2450	{
..	..	@@ -2333,6 +2479,14 @@
2333	2479	{
2334	2480	editWindow.refreshContents();
2335	2481	}
	2482	+ else
	2483	+ {
	2484	+ if (manipWindow != null)
	2485	+ {
	2486	+ manipWindow.refreshContents();
	2487	+ }
	2488	+ }
	2489	+
2336	2490	//if (parent != null)
2337	2491	//parent.refreshEditWindow();
2338	2492	}
..	..	@@ -2475,13 +2629,13 @@
2475	2629	return retval;
2476	2630	}
2477	2631
2478		- void doEditDrag(ClickInfo info)
	2632	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2633	{
2480	2634	switch (doSomething)
2481	2635	{
2482	2636	case 1: // '\001'
2483	2637	//super.
2484		- doEditDrag0(info);
	2638	+ doEditDrag0(info, opposite);
2485	2639	break;
2486	2640
2487	2641	case 2: // '\002'
..	..	@@ -2494,11 +2648,11 @@
2494	2648	{
2495	2649	//sel.hitSomething = childToDrag.hitSomething;
2496	2650	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2651	+ sel.doEditDrag(info, opposite);
2498	2652	} else
2499	2653	{
2500	2654	//super.
2501		- doEditDrag0(info);
	2655	+ doEditDrag0(info, opposite);
2502	2656	}
2503	2657	}
2504	2658	break;
..	..	@@ -2608,6 +2762,18 @@
2608	2762	void GenNormalsS(boolean crease)
2609	2763	{
2610	2764	selection.GenNormals(crease);
	2765	+// for (int i=0; i<selection.size(); i++)
	2766	+// {
	2767	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2768	+// selectee.GenNormals(crease);
	2769	+// }
	2770	+
	2771	+ //Touch();
	2772	+ }
	2773	+
	2774	+ void GenNormalsMeshS()
	2775	+ {
	2776	+ selection.GenNormalsMesh();
2611	2777	// for (int i=0; i<selection.size(); i++)
2612	2778	// {
2613	2779	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2914,24 @@
2748	2914	if (child == null)
2749	2915	continue;
2750	2916	child.GenNormals(crease);
	2917	+// Children().release(i);
	2918	+ }
	2919	+ blockloop = false;
	2920	+ }
	2921	+
	2922	+ void GenNormalsMesh()
	2923	+ {
	2924	+ if (blockloop)
	2925	+ return;
	2926	+
	2927	+ blockloop = true;
	2928	+ GenNormalsMesh0();
	2929	+ for (int i = 0; i < Children().Size(); i++)
	2930	+ {
	2931	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2932	+ if (child == null)
	2933	+ continue;
	2934	+ child.GenNormalsMesh();
2751	2935	// Children().release(i);
2752	2936	}
2753	2937	blockloop = false;
..	..	@@ -2905,7 +3089,8 @@
2905	3089	{
2906	3090	if (bRep != null)
2907	3091	{
2908		- bRep.GenUV();
	3092	+ bRep.GenUV(); //1);
	3093	+ //bRep.UnfoldUV();
2909	3094	Touch();
2910	3095	}
2911	3096	}
..	..	@@ -2919,11 +3104,20 @@
2919	3104	}
2920	3105	}
2921	3106
	3107	+ void GenNormalsMesh0()
	3108	+ {
	3109	+ if (bRep != null)
	3110	+ {
	3111	+ bRep.GenerateNormalsMesh();
	3112	+ Touch();
	3113	+ }
	3114	+ }
	3115	+
2922	3116	void GenNormalsMINE0()
2923	3117	{
2924	3118	if (bRep != null)
2925	3119	{
2926		- bRep.GenerateNormalsMINE();
	3120	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3121	Touch();
2928	3122	}
2929	3123	}
..	..	@@ -2980,6 +3174,33 @@
2980	3174	blockloop = false;
2981	3175	}
2982	3176
	3177	+ void TransformChildren()
	3178	+ {
	3179	+ if (toParent != null)
	3180	+ {
	3181	+ for (int i=Size(); --i>=0;)
	3182	+ {
	3183	+ Object3D v = get(i);
	3184	+
	3185	+ if (v.toParent == null)
	3186	+ {
	3187	+ v.toParent = LA.newMatrix();
	3188	+ v.fromParent = LA.newMatrix();
	3189	+ }
	3190	+
	3191	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3192	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3193	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3194	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3195	+ }
	3196	+
	3197	+ toParent = null; // LA.matIdentity(toParent);
	3198	+ fromParent = null; // LA.matIdentity(fromParent);
	3199	+
	3200	+ Touch();
	3201	+ }
	3202	+ }
	3203	+
2983	3204	void TransformGeometry()
2984	3205	{
2985	3206	Object3D obj = this;
..	..	@@ -3201,9 +3422,11 @@
3201	3422
3202	3423	BoundaryRep sup = bRep.support;
3203	3424	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3425	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3426	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3427	+
	3428	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3429	+
3207	3430	bRep = temprep;
3208	3431	bRep.support = sup;
3209	3432	Touch();
..	..	@@ -3340,7 +3563,8 @@
3340	3563	if (blockloop)
3341	3564	return;
3342	3565
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3566	+ if (//marked \|\| // does not make sense
	3567	+ (bRep != null \|\| material != null)) // borderline...
3344	3568	live = h;
3345	3569
3346	3570	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3585,8 @@
3361	3585	return;
3362	3586
3363	3587	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3588	+ if (//marked \|\| // does not make sense
	3589	+ (bRep != null \|\| material != null)) // borderline...
3365	3590	link2master = h;
3366	3591
3367	3592	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3606,8 @@
3381	3606	if (blockloop)
3382	3607	return;
3383	3608
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3609	+ if (//marked \|\| // does not make sense
	3610	+ (bRep != null \|\| material != null)) // borderline...
3385	3611	hide = h;
3386	3612
3387	3613	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3627,7 @@
3401	3627	if (blockloop)
3402	3628	return;
3403	3629
3404		- if (bRep != null && material != null) // borderline...
	3630	+ if (bRep != null \|\| material != null) // borderline...
3405	3631	marked = h;
3406	3632
3407	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3637,46 @@
3411	3637	continue;
3412	3638	blockloop = true;
3413	3639	child.MarkLeaves(h);
	3640	+ blockloop = false;
	3641	+ // release(i);
	3642	+ }
	3643	+ }
	3644	+
	3645	+ void RewindLeaves(boolean h)
	3646	+ {
	3647	+ if (blockloop)
	3648	+ return;
	3649	+
	3650	+ if (bRep != null \|\| material != null) // borderline...
	3651	+ rewind = h;
	3652	+
	3653	+ for (int i = 0; i < Size(); i++)
	3654	+ {
	3655	+ Object3D child = (Object3D) get(i); // reserve(i);
	3656	+ if (child == null)
	3657	+ continue;
	3658	+ blockloop = true;
	3659	+ child.RewindLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RandomLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ random = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RandomLeaves(h);
3414	3680	blockloop = false;
3415	3681	// release(i);
3416	3682	}
..	..	@@ -3725,7 +3991,7 @@
3725	3991	if (child == null)
3726	3992	continue;
3727	3993
3728		- if (GrafreeD.RENDERME > 0)
	3994	+ if (Grafreed.RENDERME > 0)
3729	3995	{
3730	3996	if (child instanceof Merge)
3731	3997	((Merge)child).renderme();
..	..	@@ -3876,7 +4142,7 @@
3876	4142	if (child == null)
3877	4143	continue;
3878	4144
3879		- if (GrafreeD.RENDERME > 0)
	4145	+ if (Grafreed.RENDERME > 0)
3880	4146	{
3881	4147	if (child instanceof Merge)
3882	4148	((Merge)child).renderme();
..	..	@@ -4071,7 +4337,7 @@
4071	4337	if (child == null)
4072	4338	continue;
4073	4339
4074		- if (GrafreeD.RENDERME > 0)
	4340	+ if (Grafreed.RENDERME > 0)
4075	4341	{
4076	4342	if (child instanceof Merge)
4077	4343	((Merge)child).renderme();
..	..	@@ -4184,6 +4450,55 @@
4184	4450	{
4185	4451	blockloop = true;
4186	4452	get(i).RepairShadow();
	4453	+ blockloop = false;
	4454	+ }
	4455	+ }
	4456	+
	4457	+ void RepairSOV()
	4458	+ {
	4459	+ if (blockloop)
	4460	+ return;
	4461	+
	4462	+ String texname = this.GetPigmentTexture();
	4463	+
	4464	+ if (texname.startsWith("sov"))
	4465	+ {
	4466	+ String[] s = texname.split("/");
	4467	+
	4468	+ String[] sname = s[1].split("Color.pn");
	4469	+
	4470	+ texname = sname[0];
	4471	+
	4472	+ if (sname.length > 1)
	4473	+ {
	4474	+ texname += "Color.jpg";
	4475	+ }
	4476	+
	4477	+ this.SetPigmentTexture("sov/" + texname);
	4478	+ }
	4479	+
	4480	+ texname = this.GetBumpTexture();
	4481	+
	4482	+ if (texname.startsWith("sov"))
	4483	+ {
	4484	+ String[] s = texname.split("/");
	4485	+
	4486	+ String[] sname = s[1].split("Bump.pn");
	4487	+
	4488	+ texname = sname[0];
	4489	+
	4490	+ if (sname.length > 1)
	4491	+ {
	4492	+ texname += "Bump.jpg";
	4493	+ }
	4494	+
	4495	+ this.SetBumpTexture("sov/" + texname);
	4496	+ }
	4497	+
	4498	+ for (int i=0; i<Size(); i++)
	4499	+ {
	4500	+ blockloop = true;
	4501	+ get(i).RepairSOV();
4187	4502	blockloop = false;
4188	4503	}
4189	4504	}
..	..	@@ -4678,7 +4993,7 @@
4678	4993
4679	4994	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4995	{
4681		- if (hide)
	4996	+ if (hide \|\| dontselect)
4682	4997	return null;
4683	4998
4684	4999	if (count <= 0)
..	..	@@ -4702,9 +5017,17 @@
4702	5017	}
4703	5018	}
4704	5019
	5020	+ ObjEditor GetWindow()
	5021	+ {
	5022	+ if (editWindow != null)
	5023	+ return editWindow;
	5024	+
	5025	+ return manipWindow;
	5026	+ }
	5027	+
4705	5028	cTreePath Select(int indexcount, boolean deselect)
4706	5029	{
4707		- if (hide)
	5030	+ if (hide \|\| dontselect)
4708	5031	return null;
4709	5032
4710	5033	if (count <= 0)
..	..	@@ -4738,10 +5061,11 @@
4738	5061	if (leaf != null)
4739	5062	{
4740	5063	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5064	+ ObjEditor window = GetWindow();
	5065	+ if (window != null)
4742	5066	{
4743	5067	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5068	+ window.Select(tp, deselect, true);
4745	5069	}
4746	5070
4747	5071	return tp;
..	..	@@ -4758,6 +5082,7 @@
4758	5082
4759	5083	if (child == null)
4760	5084	continue;
	5085	+
4761	5086	if (child.HasTransparency() && child.size() != 0)
4762	5087	{
4763	5088	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5092,10 @@
4767	5092	if (leaf != null)
4768	5093	{
4769	5094	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5095	+ ObjEditor window = GetWindow();
	5096	+ if (window != null)
4771	5097	{
4772		- editWindow.Select(tp, deselect, true);
	5098	+ window.Select(tp, deselect, true);
4773	5099	}
4774	5100
4775	5101	return tp;
..	..	@@ -5156,10 +5482,34 @@
5156	5482
5157	5483	// System.out.println("Fullname = " + fullname);
5158	5484
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5485	+ // Does not work on Windows due to C:
	5486	+// if (fullname.name.indexOf(":") == -1)
	5487	+// return fullname.name;
	5488	+//
	5489	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5490
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5491	+ String[] split = fullname.name.split(":");
	5492	+
	5493	+ if (split.length == 0)
	5494	+ {
	5495	+ return "";
	5496	+ }
	5497	+
	5498	+ if (split.length <= 2)
	5499	+ {
	5500	+ if (fullname.name.endsWith(":"))
	5501	+ {
	5502	+ // Windows
	5503	+ return fullname.name.substring(0, fullname.name.length()-1);
	5504	+ }
	5505	+
	5506	+ return split[0];
	5507	+ }
	5508	+
	5509	+ // Windows
	5510	+ assert(split.length == 4);
	5511	+
	5512	+ return split[0] + ":" + split[1];
5163	5513	}
5164	5514
5165	5515	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5518,38 @@
5168	5518	return "";
5169	5519
5170	5520	// 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());
	5521	+ // Does not work on Windows due to C:
	5522	+// if (fullname.name.indexOf(":") == -1)
	5523	+// return "";
	5524	+//
	5525	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5526	+ String[] split = fullname.name.split(":");
	5527	+
	5528	+ if (split.length == 0)
	5529	+ {
	5530	+ return "";
	5531	+ }
	5532	+
	5533	+ if (split.length == 1)
	5534	+ {
	5535	+ return "";
	5536	+ }
	5537	+
	5538	+ if (split.length == 2)
	5539	+ {
	5540	+ if (fullname.name.endsWith(":"))
	5541	+ {
	5542	+ // Windows
	5543	+ return "";
	5544	+ }
	5545	+
	5546	+ return split[1];
	5547	+ }
	5548	+
	5549	+ // Windows
	5550	+ assert(split.length == 4);
	5551	+
	5552	+ return split[2] + ":" + split[3];
5175	5553	}
5176	5554
5177	5555	String GetPigmentTexture()
..	..	@@ -5245,7 +5623,7 @@
5245	5623	System.out.print("; textures = " + textures);
5246	5624	System.out.println("; usedtextures = " + usedtextures);
5247	5625
5248		- if (GetTextures() == null)
	5626	+ if (GetTextures() == null) // What is that??
5249	5627	GetTextures().name = ":";
5250	5628
5251	5629	String texname = tex;
..	..	@@ -5276,6 +5654,43 @@
5276	5654	child.ResetPigmentTexture();
5277	5655	blockloop = false;
5278	5656	}
	5657	+ }
	5658	+
	5659	+ UUID GetUUID()
	5660	+ {
	5661	+ if (uuid == null)
	5662	+ {
	5663	+ // Serial
	5664	+ uuid = UUID.randomUUID();
	5665	+ }
	5666	+
	5667	+ return uuid;
	5668	+ }
	5669	+
	5670	+ Object3D GetObject(UUID uid)
	5671	+ {
	5672	+ if (blockloop)
	5673	+ return null;
	5674	+
	5675	+ if (GetUUID().equals(uid))
	5676	+ return this;
	5677	+
	5678	+ int nb = Size();
	5679	+ for (int i = 0; i < nb; i++)
	5680	+ {
	5681	+ Object3D child = (Object3D) get(i);
	5682	+
	5683	+ if (child == null)
	5684	+ continue;
	5685	+
	5686	+ blockloop = true;
	5687	+ Object3D obj = child.GetObject(uid);
	5688	+ blockloop = false;
	5689	+ if (obj != null)
	5690	+ return obj;
	5691	+ }
	5692	+
	5693	+ return null;
5279	5694	}
5280	5695
5281	5696	void SetBumpTexture(String tex)
..	..	@@ -5322,12 +5737,23 @@
5322	5737	boolean NeedSupport()
5323	5738	{
5324	5739	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5740	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5741	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5742	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5743	}
5329	5744
5330	5745	static boolean DEBUG_SELECTION = false;
	5746	+
	5747	+ boolean IsLive()
	5748	+ {
	5749	+ if (live)
	5750	+ return true;
	5751	+
	5752	+ if (parent == null)
	5753	+ return false;
	5754	+
	5755	+ return parent.IsLive();
	5756	+ }
5331	5757
5332	5758	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5759	{
..	..	@@ -5339,7 +5765,7 @@
5339	5765	}
5340	5766
5341	5767	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5768	+ (hide \|\| dontselect))
5343	5769	return;
5344	5770
5345	5771	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5797,7 @@
5371	5797	return;
5372	5798	}
5373	5799
5374		- javax.media.opengl.GL gl = display.GetGL();
	5800	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5801
5376	5802	/*
5377	5803	if (touched)
..	..	@@ -5390,7 +5816,7 @@
5390	5816	support = support;
5391	5817
5392	5818	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5393		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5819	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394	5820
5395	5821	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5822	{
..	..	@@ -5410,10 +5836,12 @@
5410	5836	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5837
5412	5838	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5839	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5840	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5841	{
5415	5842	Globals.lighttouched = true;
5416	5843	} // all panes...
	5844	+
5417	5845	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5846	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5847	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5423,7 +5851,7 @@
5423	5851	//if (displaylist == -1 && usecalllists)
5424	5852	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5853	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5854	+ bRep.displaylist = display.GenList();
5427	5855	assert(bRep.displaylist != 0);
5428	5856	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5857	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5863,16 @@
5435	5863	if (usecalllists)
5436	5864	{
5437	5865	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5866	+ display.NewList(bRep.displaylist);
5439	5867	}
	5868	+
5440	5869	CallList(display, root, selected, blocked);
	5870	+
5441	5871	// compiled = true;
5442	5872	if (usecalllists)
5443	5873	{
5444	5874	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5875	+ display.EndList();
5446	5876	}
5447	5877	//gl.glDrawBuffer(gl.GL_BACK);
5448	5878	// XXX touched = false;
..	..	@@ -5490,7 +5920,7 @@
5490	5920	if (display.DrawMode() == iCameraPane.SHADOW)
5491	5921	{
5492	5922	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5923	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	5924	{
5495	5925	//System.out.print("CULLED");
5496	5926	culled = true;
..	..	@@ -5498,7 +5928,7 @@
5498	5928	}
5499	5929	else
5500	5930	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5931	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	5932	culled = true;
5503	5933
5504	5934	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +5968,8 @@
5538	5968	{
5539	5969	if (GetBRep() != null)
5540	5970	{
5541		- CameraPane.NextIndex(this, gl);
	5971	+ display.NextIndex();
	5972	+
5542	5973	// vertex color conflict : gl.glCallList(list);
5543	5974	DrawNode(display, root, selected);
5544	5975	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6010,28 @@
5579	6010	tex = GetTextures();
5580	6011	}
5581	6012
5582		- display.BindTextures(tex, texres);
	6013	+ boolean failedPigment = false;
	6014	+ boolean failedBump = false;
	6015	+
	6016	+ try
	6017	+ {
	6018	+ display.BindPigmentTexture(tex, texres);
	6019	+ }
	6020	+ catch (Exception e)
	6021	+ {
	6022	+ System.err.println("FAILED: " + this);
	6023	+ failedPigment = true;
	6024	+ }
	6025	+
	6026	+ try
	6027	+ {
	6028	+ display.BindBumpTexture(tex, texres);
	6029	+ }
	6030	+ catch (Exception e)
	6031	+ {
	6032	+ //System.err.println("FAILED: " + this);
	6033	+ failedBump = true;
	6034	+ }
5583	6035
5584	6036	if (!compiled)
5585	6037	{
..	..	@@ -5595,13 +6047,17 @@
5595	6047
5596	6048	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6049	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6050	+ display.CallList(bRep.displaylist);
5599	6051	// june 2013 drawSelf(display, root, selected);
5600	6052	}
5601	6053	}
5602	6054	}
5603	6055
5604		- display.ReleaseTextures(tex);
	6056	+ if (!failedBump)
	6057	+ display.ReleaseBumpTexture(tex);
	6058	+
	6059	+ if (!failedPigment)
	6060	+ display.ReleasePigmentTexture(tex);
5605	6061
5606	6062	display.PopMaterial(this, selected);
5607	6063	}
..	..	@@ -5730,6 +6186,9 @@
5730	6186
5731	6187	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6188	{
	6189	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6190	+ return;
	6191	+
5733	6192	if (hide)
5734	6193	return;
5735	6194	// shadow optimisation
..	..	@@ -5855,6 +6314,9 @@
5855	6314	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6315	return; // no shadow for transparent objects
5857	6316
	6317	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6318	+ return;
	6319	+
5858	6320	if (hide)
5859	6321	return;
5860	6322
..	..	@@ -5895,9 +6357,10 @@
5895	6357	return;
5896	6358	}
5897	6359
	6360	+ //bRep.GenUV(1/material.diffuseness);
5898	6361	// bRep.lock = true;
5899	6362
5900		- javax.media.opengl.GL gl = display.GetGL();
	6363	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6364
5902	6365	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6366	{
..	..	@@ -5914,23 +6377,7 @@
5914	6377
5915	6378	bRep.getMinMax(min, max, 100);
5916	6379
5917		- gl.glBegin(gl.GL_LINES);
5918		-
5919		- gl.glVertex3d(min.x, min.y, min.z);
5920		- gl.glVertex3d(min.x, min.y, max.z);
5921		- gl.glVertex3d(min.x, min.y, min.z);
5922		- gl.glVertex3d(min.x, max.y, min.z);
5923		- gl.glVertex3d(min.x, min.y, min.z);
5924		- gl.glVertex3d(max.x, min.y, min.z);
5925		-
5926		- gl.glVertex3d(max.x, max.y, max.z);
5927		- gl.glVertex3d(min.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, max.y, max.z);
5929		- gl.glVertex3d(max.x, min.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, max.z);
5931		- gl.glVertex3d(max.x, max.y, min.z);
5932		-
5933		- gl.glEnd();
	6380	+ display.DrawBox(min, max);
5934	6381
5935	6382	return;
5936	6383	}
..	..	@@ -5984,178 +6431,19 @@
5984	6431	new Exception().printStackTrace();
5985	6432	return;
5986	6433	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6434	+
	6435	+ if (dontselect)
5990	6436	{
5991		- float[] v = bRep.getRawVertices();
5992		- float[] n = bRep.getRawNormals();
5993		- float[] c = bRep.getRawColors();
5994		- float[] uv = bRep.getRawUVMap();
5995		-
5996		- int count2 = 0;
5997		- int count3 = 0;
5998		-
5999		- if (n.length > 0)
6000		- {
6001		- for (int i = 0; i < strips.length; i++)
6002		- {
6003		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6004		-
6005		- /*
6006		- boolean locked = false;
6007		- float eps = 0.1f;
6008		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6009		-
6010		- int dot = 0;
6011		-
6012		- if ((dot&1) == 0)
6013		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6014		-
6015		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6016		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6017		- else
6018		- {
6019		- locked = true;
6020		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6021		- }
6022		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6023		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6024		- if (hasnorm)
6025		- {
6026		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6027		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6028		- }
6029		-
6030		- if ((dot&4) == 0)
6031		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6032		-
6033		- if (wrap \|\| !locked && (dot&8) != 0)
6034		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6035		- else
6036		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6037		-
6038		- f.dot = dot;
6039		- */
6040		-
6041		- if (!selectmode)
6042		- {
6043		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6044		- {
6045		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6046		- } else
6047		- {
6048		- gl.glNormal3f(0, 0, 1);
6049		- }
6050		-
6051		- if (c != null)
6052		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6053		- {
6054		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6055		- }
6056		- }
6057		- if (flipV)
6058		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6059		- else
6060		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6061		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6062		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6063		-
6064		- count2 += 2;
6065		- count3 += 3;
6066		- if (!selectmode)
6067		- {
6068		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6069		- {
6070		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6071		- } else
6072		- {
6073		- gl.glNormal3f(0, 0, 1);
6074		- }
6075		- if (c != null)
6076		- {
6077		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6078		- }
6079		- }
6080		- if (flipV)
6081		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6082		- else
6083		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6084		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6085		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6086		-
6087		- count2 += 2;
6088		- count3 += 3;
6089		- for (int j = 0; j < strips[i] - 2; j++)
6090		- {
6091		- //gl.glTexCoord2d(...);
6092		- if (!selectmode)
6093		- {
6094		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6095		- {
6096		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6097		- } else
6098		- {
6099		- gl.glNormal3f(0, 0, 1);
6100		- }
6101		- if (c != null)
6102		- {
6103		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6104		- }
6105		- }
6106		-
6107		- if (flipV)
6108		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6109		- else
6110		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6111		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6112		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6113		- count2 += 2;
6114		- count3 += 3;
6115		- }
6116		-
6117		- gl.glEnd();
6118		- }
6119		- }
6120		-
6121		- assert count3 == v.length;
	6437	+ //bRep.GenerateNormalsMINE();
6122	6438	}
6123		- else // !trimmed
6124		- {
6125		- int count = 0;
6126		- for (int i = 0; i < strips.length; i++)
6127		- {
6128		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6129		-
6130		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6131		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6132		-
6133		- drawVertex(gl, p, selectmode);
6134		- drawVertex(gl, q, selectmode);
6135		-
6136		- for (int j = 0; j < strips[i] - 2; j++)
6137		- {
6138		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6139		-
6140		-// if (j%2 == 0)
6141		-// drawFace(p, q, r, display, null);
6142		-// else
6143		-// drawFace(p, r, q, display, null);
6144		-
6145		-// p = q;
6146		-// q = r;
6147		- drawVertex(gl, r, selectmode);
6148		- }
6149		-
6150		- gl.glEnd();
6151		- }
6152		- }
	6439	+
	6440	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6441	} else // catch (Error e)
6154	6442	{
6155	6443	// TRIANGLE ARRAY
6156	6444	if (IsOpaque()) // Static())
6157	6445	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6446	+ display.StartTriangles();
6159	6447	int facecount = bRep.FaceCount();
6160	6448	for (int i = 0; i < facecount; i++)
6161	6449	{
..	..	@@ -6220,7 +6508,7 @@
6220	6508
6221	6509	display.DrawFace(this, p, q, r, face);
6222	6510	}
6223		- gl.glEnd();
	6511	+ display.EndTriangles();
6224	6512	}
6225	6513	else
6226	6514	{
..	..	@@ -6249,8 +6537,8 @@
6249	6537	//System.out.println("SORT");
6250	6538
6251	6539	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6540	+
	6541	+ display.StartTriangles();
6254	6542	for (int i = 0; i < facecount; i++)
6255	6543	{
6256	6544	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6552,12 @@
6264	6552
6265	6553	display.DrawFace(this, p, q, r, face);
6266	6554	}
6267		- gl.glEnd();
	6555	+ display.EndTriangles();
6268	6556	}
6269	6557
6270	6558	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6559	{
	6560	+ /*
6272	6561	gl.glDisable(gl.GL_LIGHTING);
6273	6562	float[] colorV = new float[3];
6274	6563
..	..	@@ -6347,6 +6636,7 @@
6347	6636	// gl.glEnd();
6348	6637	}
6349	6638	}
	6639	+ */
6350	6640	}
6351	6641	}
6352	6642
..	..	@@ -6391,7 +6681,7 @@
6391	6681	center.add(r);
6392	6682	center.mul(1.0/3);
6393	6683
6394		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6684	+ center.sub(Globals.theRenderer.EyeCamera().location);
6395	6685
6396	6686	distance = center.dot(center);
6397	6687	}
..	..	@@ -6405,22 +6695,6 @@
6405	6695	void Print(Vertex v)
6406	6696	{
6407	6697	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6408		- }
6409		-
6410		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6411		- {
6412		- if (!selectmode)
6413		- {
6414		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6415		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6416		-
6417		- if (flipV)
6418		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6419		- else
6420		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6421		- }
6422		-
6423		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6424	6698	}
6425	6699
6426	6700	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -7013,7 +7287,7 @@
7013	7287	spot.translate(32, 32);
7014	7288	spotw = spot.x + spot.width;
7015	7289	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
	7290	+ info.g.setColor(Color.cyan);
7017	7291	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7292	// if (CameraPane.Xmin > spot.x)
7019	7293	// {
..	..	@@ -7031,11 +7305,12 @@
7031	7305	// {
7032	7306	// CameraPane.Ymax = spoth;
7033	7307	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7308	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7309	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7036	7310	spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
	7311	+ info.g.setColor(Color.yellow);
7038	7312	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7313	+ info.g.setColor(Color.green);
7039	7314	// if (CameraPane.Xmin > spot.x)
7040	7315	// {
7041	7316	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,8 +7327,8 @@
7052	7327	// {
7053	7328	// CameraPane.Ymax = spoth;
7054	7329	// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7330	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7331	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7057	7332	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7333	// if (CameraPane.Xmin > boundary.x)
7059	7334	// {
..	..	@@ -7087,7 +7362,7 @@
7087	7362	startX = info.x;
7088	7363	startY = info.y;
7089	7364
7090		- hitSomething = 0;
	7365	+ hitSomething = -1;
7091	7366	cVector origin = new cVector();
7092	7367	//LA.xformPos(origin, toParent, origin);
7093	7368	Rectangle spot = new Rectangle();
..	..	@@ -7120,7 +7395,7 @@
7120	7395	}
7121	7396
7122	7397	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7398	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7399	//System.out.println("modified = " + modified);
7125	7400	//new Exception().printStackTrace();
7126	7401	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7423,7 @@
7148	7423	return true;
7149	7424	}
7150	7425
7151		- void doEditDrag0(ClickInfo info)
	7426	+ void doEditDrag0(ClickInfo info, boolean opposite)
7152	7427	{
7153	7428	if (hitSomething == 0)
7154	7429	{
..	..	@@ -7163,6 +7438,7 @@
7163	7438	//System.out.println("hitSomething = " + hitSomething);
7164	7439
7165	7440	double scale = 0.005f * info.camera.Distance();
	7441	+
7166	7442	cVector xlate = new cVector();
7167	7443	//cVector xlate2 = new cVector();
7168	7444	switch (hitSomething)
..	..	@@ -7173,9 +7449,9 @@
7173	7449
7174	7450	case hitCenter: // Translate
7175	7451
7176		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7452	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7453
7178		- if (modified)
	7454	+ if (modified \|\| opposite)
7179	7455	{
7180	7456	//assert(false);
7181	7457	/*
..	..	@@ -7221,10 +7497,10 @@
7221	7497	}
7222	7498	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7499	// if (!CameraPane.LOCALTRANSFORM)
7224		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7500	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225	7501	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7226	7502	// if (!CameraPane.LOCALTRANSFORM)
7227		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7503	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7504	//LA.vecCross(up, cVector.Z, right2);
7229	7505
7230	7506	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7269,6 +7545,7 @@
7269	7545
7270	7546	if (modified)
7271	7547	{
	7548	+ // Rotate 90 degrees
7272	7549	angle /= (Math.PI / 4);
7273	7550	angle = Math.floor(angle + 0.5);
7274	7551	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7559,7 @@
7282	7559	}
7283	7560	/**/
7284	7561
7285		- switch (info.pane.renderCamera.viewCode)
	7562	+ switch (info.pane.RenderCamera().viewCode)
7286	7563	{
7287	7564	case 1: // '\001'
7288	7565	LA.matZRotate(toParent, angle);
..	..	@@ -7310,24 +7587,27 @@
7310	7587
7311	7588	case hitScale: // scale
7312	7589	double hScale = (double) (info.x - centerPt.x) / 32;
	7590	+ double sign = 1;
	7591	+ if (hScale < 0)
	7592	+ {
	7593	+ sign = -1;
	7594	+ }
	7595	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7596	if (hScale < 0.01)
7314	7597	{
7315		- hScale = 0.01;
	7598	+ //hScale = 0.01;
7316	7599	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
7319		- {
7320		- hScale = 0.01;
7321		- }
	7600	+
7322	7601	double vScale = (double) (info.y - centerPt.y) / 32;
7323		- if (vScale < 0.01)
	7602	+ sign = 1;
	7603	+ if (vScale < 0)
7324	7604	{
7325		- vScale = 0.01;
	7605	+ sign = -1;
7326	7606	}
7327		- vScale = Math.pow(vScale, scale * 50);
	7607	+ vScale = signMath.pow(signvScale, scale * 50);
7328	7608	if (vScale < 0.01)
7329	7609	{
7330		- vScale = 0.01;
	7610	+ //vScale = 0.01;
7331	7611	}
7332	7612	LA.matCopy(startMat, toParent);
7333	7613	/**/
..	..	@@ -7338,39 +7618,47 @@
7338	7618	}
7339	7619	/**/
7340	7620
7341		- switch (info.pane.renderCamera.viewCode)
	7621	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7622	+
	7623	+ if (totalScale < 0.01)
	7624	+ {
	7625	+ totalScale = 0.01;
	7626	+ }
	7627	+
	7628	+ switch (info.pane.RenderCamera().viewCode)
7342	7629	{
7343	7630	case 3: // '\001'
7344		- if (modified)
	7631	+ if (modified \|\| opposite)
7345	7632	{
7346	7633	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7634	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7635	} // vScale, 1);
7349	7636	else
7350	7637	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7638	+ // EXCEPTION!
	7639	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7640	} // vScale, 1);
7353	7641	break;
7354	7642
7355	7643	case 2: // '\002'
7356		- if (modified)
	7644	+ if (modified \|\| opposite)
7357	7645	{
7358	7646	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7647	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7648	} else
7361	7649	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7650	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7651	}
7364	7652	break;
7365	7653
7366	7654	case 1: // '\003'
7367		- if (modified)
	7655	+ if (modified \|\| opposite)
7368	7656	{
7369	7657	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7658	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7659	} else
7372	7660	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7661	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7662	}
7375	7663	break;
7376	7664	}
..	..	@@ -7503,14 +7791,22 @@
7503	7791	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7792	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7793	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7794	+
	7795	+ String objname;
	7796	+
7506	7797	if (false) //parent != null)
7507	7798	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7799	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7800	} else
7510	7801	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7802	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	7803	} // + super.toString();
7513	7804	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7805	+
	7806	+ if (!Globals.ADVANCED)
	7807	+ return objname;
	7808	+
	7809	+ return objname + " " + System.identityHashCode(this);
7514	7810	}
7515	7811
7516	7812	public int hashCode()
..	..	@@ -7566,6 +7862,7 @@
7566	7862	objectUI.closeUI();
7567	7863	if (editWindow != null)
7568	7864	{
	7865	+ editWindow.ctrlPanel.FlushUI();
7569	7866	editWindow.refreshContents();
7570	7867	} // ? new
7571	7868	objectUI = null;
..	..	@@ -7574,6 +7871,10 @@
7574	7871	{
7575	7872	editWindow = null;
7576	7873	} // ?
	7874	+ }
	7875	+ else
	7876	+ {
	7877	+ //editWindow.closeUI();
7577	7878	}
7578	7879	}
7579	7880
..	..	@@ -7586,7 +7887,7 @@
7586	7887	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	7888
7588	7889	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	7890	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	7891
7591	7892	double[][] toParent; // dynamic matrix
7592	7893	double[][] fromParent;
..	..	@@ -7701,7 +8002,7 @@
7701	8002	{
7702	8003	assert(bRep != null);
7703	8004	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8005	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8006	}
7706	8007	else
7707	8008	{
..	..	@@ -7732,6 +8033,10 @@
7732	8033	}
7733	8034
7734	8035	transient ObjEditor editWindow;
	8036	+ transient ObjEditor manipWindow;
	8037	+
	8038	+ transient boolean pinned;
	8039	+
7735	8040	transient ObjectUI objectUI;
7736	8041	public static int povDepth = 0;
7737	8042	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8055,9 @@
7750	8055	private static cVector edge2 = new cVector();
7751	8056	//private static cVector norm = new cVector();
7752	8057	/transient private/ int hitSomething;
7753		- private static final int hitCenter = 1;
7754		- private static final int hitScale = 2;
7755		- private static final int hitRotate = 3;
	8058	+ static final int hitCenter = 1;
	8059	+ static final int hitScale = 2;
	8060	+ static final int hitRotate = 3;
7756	8061	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8062	/transient/ private Point centerPt;
7758	8063	/transient/ private int startX;