~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. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
21	31
22	32	ScriptNode scriptnode;
23	33
..	..	@@ -99,64 +109,170 @@
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	+ Object3D o;
	174	+
	175	+ if (hashtable.containsKey(GetUUID()))
	176	+ {
	177	+ o = hashtable.get(GetUUID());
	178	+
	179	+ Grafreed.Assert(this.bRep == o.bRep);
	180	+ //if (this.bRep != null)
	181	+ // assert(this.bRep.support == o.transientrep);
	182	+ if (this.support != null)
	183	+ assert(this.support.bRep == o.transientrep);
	184	+ }
	185	+ else
	186	+ {
	187	+ o = new Object3D("copy of " + this.name);
	188	+
	189	+ hashtable.put(GetUUID(), o);
	190	+ }
	191	+
	192	+ if (!blockloop)
	193	+ {
	194	+ blockloop = true;
	195	+
	196	+ for (int i=0; i<Size(); i++)
	197	+ {
	198	+ get(i).ExtractBigData(hashtable);
	199	+ }
	200	+
	201	+ blockloop = false;
	202	+ }
	203	+
	204	+ ExtractBigData(o);
	205	+ }
	206	+
	207	+ void ExtractBigData(Object3D o)
	208	+ {
	209	+ if (o.bRep != null)
	210	+ Grafreed.Assert(o.bRep == this.bRep);
	211	+
	212	+ o.bRep = this.bRep;
	213	+// July 2019 if (this.bRep != null)
	214	+// {
	215	+// o.transientrep = this.bRep.support;
	216	+// o.bRep.support = null;
	217	+// }
	218	+
	219	+ if (this.support != null)
	220	+ {
	221	+ if (o.transientrep != null)
	222	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	223	+
	224	+ o.transientrep = this.support.bRep;
	225	+ this.support.bRep = null;
	226	+ }
	227	+
	228	+ // o.support = this.support;
	229	+ // o.fileparent = this.fileparent;
	230	+ // if (this.bRep != null)
	231	+ // o.bRep = this.bRep.support;
	232	+
	233	+ this.bRep = null;
	234	+ // if (this.bRep != null)
	235	+ // this.bRep.support = null;
	236	+ // this.support = null;
	237	+ // this.fileparent = null;
	238	+ }
	239	+
	240	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	241	+ {
	242	+ if (!hashtable.containsKey(GetUUID()))
	243	+ return;
	244	+
	245	+ Object3D o = hashtable.get(GetUUID());
	246	+
	247	+ RestoreBigData(o);
	248	+
	249	+ if (blockloop)
	250	+ return;
	251	+
129	252	blockloop = true;
130		- child.SaveSupports();
	253	+
	254	+ //hashtable.remove(GetUUID());
	255	+
	256	+ for (int i=0; i<Size(); i++)
	257	+ {
	258	+ get(i).RestoreBigData(hashtable);
	259	+ }
	260	+
131	261	blockloop = false;
132	262	}
133		-}
134	263
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)
	264	+ void RestoreBigData(Object3D o)
146	265	{
147		- bRep.RestoreSupports();
	266	+ this.bRep = o.bRep;
	267	+ if (this.support != null && o.transientrep != null)
	268	+ {
	269	+ this.support.bRep = o.transientrep;
	270	+ }
	271	+// July 2019 if (this.bRep != null)
	272	+// this.bRep.support = o.transientrep;
	273	+ // this.support = o.support;
	274	+ // this.fileparent = o.fileparent;
148	275	}
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	276
161	277	// MOCAP SUPPORT
162	278	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +415,7 @@
299	415	}
300	416
301	417	boolean live = false;
	418	+ boolean dontselect = false;
302	419	boolean hide = false;
303	420	boolean link2master = false; // performs reset support/master at each frame
304	421	boolean marked = false; // animation node
..	..	@@ -480,12 +597,14 @@
480	597	toParent = LA.newMatrix();
481	598	fromParent = LA.newMatrix();
482	599	}
	600	+
483	601	if (toParentMarked == null)
484	602	{
485	603	if (maxcount != 1)
486	604	{
487	605	new Exception().printStackTrace();
488	606	}
	607	+
489	608	toParentMarked = LA.newMatrix();
490	609	fromParentMarked = LA.newMatrix();
491	610	}
..	..	@@ -773,7 +892,7 @@
773	892	if (step == 0)
774	893	step = 1;
775	894	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	895	+ maxcount = 128; // 2048; // 4;
777	896	// if (acceleration == 0)
778	897	// acceleration = 10;
779	898	if (delay == 0) // serial
..	..	@@ -796,7 +915,7 @@
796	915
797	916	if (marked && Globals.isLIVE() && live &&
798	917	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	918	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	919	currentframe != Globals.framecount)
801	920	{
802	921	currentframe = Globals.framecount;
..	..	@@ -808,7 +927,8 @@
808	927
809	928	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	929
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	930	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	931	+ (step == 1 && changedir))
812	932	{
813	933	countdown = 1;
814	934	delay = speedup?8:1;
..	..	@@ -880,6 +1000,7 @@
880	1000	if (material == null \|\| material.multiply)
881	1001	return true;
882	1002
	1003	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1004	return material.opacity > 0.99;
884	1005	}
885	1006
..	..	@@ -911,6 +1032,11 @@
911	1032	fromParent = null; // LA.newMatrix();
912	1033	bRep = null; // new BoundaryRep();
913	1034
	1035	+ if (oname != null && oname.equals("LeftHand"))
	1036	+ {
	1037	+ name = oname;
	1038	+ }
	1039	+
914	1040	/*
915	1041	float hue = (float)Math.random();
916	1042	Color col;
..	..	@@ -953,7 +1079,7 @@
953	1079
954	1080	public Object clone()
955	1081	{
956		- return GrafreeD.clone(this);
	1082	+ return Grafreed.clone(this);
957	1083	}
958	1084
959	1085	Object3D copyExpand()
..	..	@@ -1275,6 +1401,7 @@
1275	1401	toParent = LA.newMatrix();
1276	1402	fromParent = LA.newMatrix();
1277	1403	}
	1404	+
1278	1405	LA.matCopy(other.toParent, toParent);
1279	1406	LA.matCopy(other.fromParent, fromParent);
1280	1407
..	..	@@ -1469,7 +1596,7 @@
1469	1596	BoundaryRep.SEUIL = other.material.cameralight;
1470	1597
1471	1598	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1599	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1600	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1601	}
1475	1602
..	..	@@ -1728,7 +1855,7 @@
1728	1855	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1856	o.bRep = transientrep;
1730	1857	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1858	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1859	o.CreateMaterial();
1733	1860	o.SetAttributes(this, -1);
1734	1861	//parent
..	..	@@ -1741,7 +1868,7 @@
1741	1868	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1869	o.bRep = bRep;
1743	1870	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1871	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1872	o.CreateMaterial();
1746	1873	//o.overwriteThis(this, -1);
1747	1874	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1955,15 @@
1828	1955	if (obj.name == null)
1829	1956	continue; // can't be a null one
1830	1957
	1958	+ // Try perfect match first.
1831	1959	if (n.equals(obj.name))
1832	1960	{
1833	1961	theobj = obj;
1834	1962	count++;
1835	1963	}
1836	1964	}
	1965	+
	1966	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1967
1838	1968	if (count != 1)
1839	1969	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2423,17 @@
2293	2423	}
2294	2424	*/
2295	2425	}
	2426	+ else
	2427	+ {
	2428	+ //((ObjEditor)editWindow).SetupUI2(null);
	2429	+ }
2296	2430	}
2297	2431
2298	2432	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2433	{
2300	2434	if (newWindow)
2301	2435	{
	2436	+ new Exception().printStackTrace();
2302	2437	System.exit(0);
2303	2438	if (parent != null)
2304	2439	{
..	..	@@ -2333,6 +2468,14 @@
2333	2468	{
2334	2469	editWindow.refreshContents();
2335	2470	}
	2471	+ else
	2472	+ {
	2473	+ if (manipWindow != null)
	2474	+ {
	2475	+ manipWindow.refreshContents();
	2476	+ }
	2477	+ }
	2478	+
2336	2479	//if (parent != null)
2337	2480	//parent.refreshEditWindow();
2338	2481	}
..	..	@@ -2475,13 +2618,13 @@
2475	2618	return retval;
2476	2619	}
2477	2620
2478		- void doEditDrag(ClickInfo info)
	2621	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2622	{
2480	2623	switch (doSomething)
2481	2624	{
2482	2625	case 1: // '\001'
2483	2626	//super.
2484		- doEditDrag0(info);
	2627	+ doEditDrag0(info, opposite);
2485	2628	break;
2486	2629
2487	2630	case 2: // '\002'
..	..	@@ -2494,11 +2637,11 @@
2494	2637	{
2495	2638	//sel.hitSomething = childToDrag.hitSomething;
2496	2639	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2640	+ sel.doEditDrag(info, opposite);
2498	2641	} else
2499	2642	{
2500	2643	//super.
2501		- doEditDrag0(info);
	2644	+ doEditDrag0(info, opposite);
2502	2645	}
2503	2646	}
2504	2647	break;
..	..	@@ -2608,6 +2751,18 @@
2608	2751	void GenNormalsS(boolean crease)
2609	2752	{
2610	2753	selection.GenNormals(crease);
	2754	+// for (int i=0; i<selection.size(); i++)
	2755	+// {
	2756	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2757	+// selectee.GenNormals(crease);
	2758	+// }
	2759	+
	2760	+ //Touch();
	2761	+ }
	2762	+
	2763	+ void GenNormalsMeshS()
	2764	+ {
	2765	+ selection.GenNormalsMesh();
2611	2766	// for (int i=0; i<selection.size(); i++)
2612	2767	// {
2613	2768	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2903,24 @@
2748	2903	if (child == null)
2749	2904	continue;
2750	2905	child.GenNormals(crease);
	2906	+// Children().release(i);
	2907	+ }
	2908	+ blockloop = false;
	2909	+ }
	2910	+
	2911	+ void GenNormalsMesh()
	2912	+ {
	2913	+ if (blockloop)
	2914	+ return;
	2915	+
	2916	+ blockloop = true;
	2917	+ GenNormalsMesh0();
	2918	+ for (int i = 0; i < Children().Size(); i++)
	2919	+ {
	2920	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2921	+ if (child == null)
	2922	+ continue;
	2923	+ child.GenNormalsMesh();
2751	2924	// Children().release(i);
2752	2925	}
2753	2926	blockloop = false;
..	..	@@ -2905,7 +3078,8 @@
2905	3078	{
2906	3079	if (bRep != null)
2907	3080	{
2908		- bRep.GenUV();
	3081	+ bRep.GenUV(); //1);
	3082	+ //bRep.UnfoldUV();
2909	3083	Touch();
2910	3084	}
2911	3085	}
..	..	@@ -2915,6 +3089,15 @@
2915	3089	if (bRep != null)
2916	3090	{
2917	3091	bRep.GenerateNormals(crease);
	3092	+ Touch();
	3093	+ }
	3094	+ }
	3095	+
	3096	+ void GenNormalsMesh0()
	3097	+ {
	3098	+ if (bRep != null)
	3099	+ {
	3100	+ bRep.GenerateNormalsMesh();
2918	3101	Touch();
2919	3102	}
2920	3103	}
..	..	@@ -2980,6 +3163,33 @@
2980	3163	blockloop = false;
2981	3164	}
2982	3165
	3166	+ void TransformChildren()
	3167	+ {
	3168	+ if (toParent != null)
	3169	+ {
	3170	+ for (int i=Size(); --i>=0;)
	3171	+ {
	3172	+ Object3D v = get(i);
	3173	+
	3174	+ if (v.toParent == null)
	3175	+ {
	3176	+ v.toParent = LA.newMatrix();
	3177	+ v.fromParent = LA.newMatrix();
	3178	+ }
	3179	+
	3180	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3181	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3182	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3183	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3184	+ }
	3185	+
	3186	+ toParent = null; // LA.matIdentity(toParent);
	3187	+ fromParent = null; // LA.matIdentity(fromParent);
	3188	+
	3189	+ Touch();
	3190	+ }
	3191	+ }
	3192	+
2983	3193	void TransformGeometry()
2984	3194	{
2985	3195	Object3D obj = this;
..	..	@@ -3201,9 +3411,11 @@
3201	3411
3202	3412	BoundaryRep sup = bRep.support;
3203	3413	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3414	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3415	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3416	+
	3417	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3418	+
3207	3419	bRep = temprep;
3208	3420	bRep.support = sup;
3209	3421	Touch();
..	..	@@ -3340,7 +3552,8 @@
3340	3552	if (blockloop)
3341	3553	return;
3342	3554
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3555	+ if (//marked \|\| // does not make sense
	3556	+ (bRep != null \|\| material != null)) // borderline...
3344	3557	live = h;
3345	3558
3346	3559	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3574,8 @@
3361	3574	return;
3362	3575
3363	3576	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3577	+ if (//marked \|\| // does not make sense
	3578	+ (bRep != null \|\| material != null)) // borderline...
3365	3579	link2master = h;
3366	3580
3367	3581	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3595,8 @@
3381	3595	if (blockloop)
3382	3596	return;
3383	3597
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3598	+ if (//marked \|\| // does not make sense
	3599	+ (bRep != null \|\| material != null)) // borderline...
3385	3600	hide = h;
3386	3601
3387	3602	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3616,7 @@
3401	3616	if (blockloop)
3402	3617	return;
3403	3618
3404		- if (bRep != null && material != null) // borderline...
	3619	+ if (bRep != null \|\| material != null) // borderline...
3405	3620	marked = h;
3406	3621
3407	3622	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3626,46 @@
3411	3626	continue;
3412	3627	blockloop = true;
3413	3628	child.MarkLeaves(h);
	3629	+ blockloop = false;
	3630	+ // release(i);
	3631	+ }
	3632	+ }
	3633	+
	3634	+ void RewindLeaves(boolean h)
	3635	+ {
	3636	+ if (blockloop)
	3637	+ return;
	3638	+
	3639	+ if (bRep != null \|\| material != null) // borderline...
	3640	+ rewind = h;
	3641	+
	3642	+ for (int i = 0; i < Size(); i++)
	3643	+ {
	3644	+ Object3D child = (Object3D) get(i); // reserve(i);
	3645	+ if (child == null)
	3646	+ continue;
	3647	+ blockloop = true;
	3648	+ child.RewindLeaves(h);
	3649	+ blockloop = false;
	3650	+ // release(i);
	3651	+ }
	3652	+ }
	3653	+
	3654	+ void RandomLeaves(boolean h)
	3655	+ {
	3656	+ if (blockloop)
	3657	+ return;
	3658	+
	3659	+ if (bRep != null \|\| material != null) // borderline...
	3660	+ random = h;
	3661	+
	3662	+ for (int i = 0; i < Size(); i++)
	3663	+ {
	3664	+ Object3D child = (Object3D) get(i); // reserve(i);
	3665	+ if (child == null)
	3666	+ continue;
	3667	+ blockloop = true;
	3668	+ child.RandomLeaves(h);
3414	3669	blockloop = false;
3415	3670	// release(i);
3416	3671	}
..	..	@@ -3725,7 +3980,7 @@
3725	3980	if (child == null)
3726	3981	continue;
3727	3982
3728		- if (GrafreeD.RENDERME > 0)
	3983	+ if (Grafreed.RENDERME > 0)
3729	3984	{
3730	3985	if (child instanceof Merge)
3731	3986	((Merge)child).renderme();
..	..	@@ -3876,7 +4131,7 @@
3876	4131	if (child == null)
3877	4132	continue;
3878	4133
3879		- if (GrafreeD.RENDERME > 0)
	4134	+ if (Grafreed.RENDERME > 0)
3880	4135	{
3881	4136	if (child instanceof Merge)
3882	4137	((Merge)child).renderme();
..	..	@@ -4071,7 +4326,7 @@
4071	4326	if (child == null)
4072	4327	continue;
4073	4328
4074		- if (GrafreeD.RENDERME > 0)
	4329	+ if (Grafreed.RENDERME > 0)
4075	4330	{
4076	4331	if (child instanceof Merge)
4077	4332	((Merge)child).renderme();
..	..	@@ -4184,6 +4439,55 @@
4184	4439	{
4185	4440	blockloop = true;
4186	4441	get(i).RepairShadow();
	4442	+ blockloop = false;
	4443	+ }
	4444	+ }
	4445	+
	4446	+ void RepairSOV()
	4447	+ {
	4448	+ if (blockloop)
	4449	+ return;
	4450	+
	4451	+ String texname = this.GetPigmentTexture();
	4452	+
	4453	+ if (texname.startsWith("sov"))
	4454	+ {
	4455	+ String[] s = texname.split("/");
	4456	+
	4457	+ String[] sname = s[1].split("Color.pn");
	4458	+
	4459	+ texname = sname[0];
	4460	+
	4461	+ if (sname.length > 1)
	4462	+ {
	4463	+ texname += "Color.jpg";
	4464	+ }
	4465	+
	4466	+ this.SetPigmentTexture("sov/" + texname);
	4467	+ }
	4468	+
	4469	+ texname = this.GetBumpTexture();
	4470	+
	4471	+ if (texname.startsWith("sov"))
	4472	+ {
	4473	+ String[] s = texname.split("/");
	4474	+
	4475	+ String[] sname = s[1].split("Bump.pn");
	4476	+
	4477	+ texname = sname[0];
	4478	+
	4479	+ if (sname.length > 1)
	4480	+ {
	4481	+ texname += "Bump.jpg";
	4482	+ }
	4483	+
	4484	+ this.SetBumpTexture("sov/" + texname);
	4485	+ }
	4486	+
	4487	+ for (int i=0; i<Size(); i++)
	4488	+ {
	4489	+ blockloop = true;
	4490	+ get(i).RepairSOV();
4187	4491	blockloop = false;
4188	4492	}
4189	4493	}
..	..	@@ -4678,7 +4982,7 @@
4678	4982
4679	4983	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4984	{
4681		- if (hide)
	4985	+ if (hide \|\| dontselect)
4682	4986	return null;
4683	4987
4684	4988	if (count <= 0)
..	..	@@ -4702,9 +5006,17 @@
4702	5006	}
4703	5007	}
4704	5008
	5009	+ ObjEditor GetWindow()
	5010	+ {
	5011	+ if (editWindow != null)
	5012	+ return editWindow;
	5013	+
	5014	+ return manipWindow;
	5015	+ }
	5016	+
4705	5017	cTreePath Select(int indexcount, boolean deselect)
4706	5018	{
4707		- if (hide)
	5019	+ if (hide \|\| dontselect)
4708	5020	return null;
4709	5021
4710	5022	if (count <= 0)
..	..	@@ -4738,10 +5050,11 @@
4738	5050	if (leaf != null)
4739	5051	{
4740	5052	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5053	+ ObjEditor window = GetWindow();
	5054	+ if (window != null)
4742	5055	{
4743	5056	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5057	+ window.Select(tp, deselect, true);
4745	5058	}
4746	5059
4747	5060	return tp;
..	..	@@ -4758,6 +5071,7 @@
4758	5071
4759	5072	if (child == null)
4760	5073	continue;
	5074	+
4761	5075	if (child.HasTransparency() && child.size() != 0)
4762	5076	{
4763	5077	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5081,10 @@
4767	5081	if (leaf != null)
4768	5082	{
4769	5083	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4771	5086	{
4772		- editWindow.Select(tp, deselect, true);
	5087	+ window.Select(tp, deselect, true);
4773	5088	}
4774	5089
4775	5090	return tp;
..	..	@@ -5156,10 +5471,34 @@
5156	5471
5157	5472	// System.out.println("Fullname = " + fullname);
5158	5473
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5474	+ // Does not work on Windows due to C:
	5475	+// if (fullname.name.indexOf(":") == -1)
	5476	+// return fullname.name;
	5477	+//
	5478	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5479
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5480	+ String[] split = fullname.name.split(":");
	5481	+
	5482	+ if (split.length == 0)
	5483	+ {
	5484	+ return "";
	5485	+ }
	5486	+
	5487	+ if (split.length <= 2)
	5488	+ {
	5489	+ if (fullname.name.endsWith(":"))
	5490	+ {
	5491	+ // Windows
	5492	+ return fullname.name.substring(0, fullname.name.length()-1);
	5493	+ }
	5494	+
	5495	+ return split[0];
	5496	+ }
	5497	+
	5498	+ // Windows
	5499	+ assert(split.length == 4);
	5500	+
	5501	+ return split[0] + ":" + split[1];
5163	5502	}
5164	5503
5165	5504	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5507,38 @@
5168	5507	return "";
5169	5508
5170	5509	// 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());
	5510	+ // Does not work on Windows due to C:
	5511	+// if (fullname.name.indexOf(":") == -1)
	5512	+// return "";
	5513	+//
	5514	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5515	+ String[] split = fullname.name.split(":");
	5516	+
	5517	+ if (split.length == 0)
	5518	+ {
	5519	+ return "";
	5520	+ }
	5521	+
	5522	+ if (split.length == 1)
	5523	+ {
	5524	+ return "";
	5525	+ }
	5526	+
	5527	+ if (split.length == 2)
	5528	+ {
	5529	+ if (fullname.name.endsWith(":"))
	5530	+ {
	5531	+ // Windows
	5532	+ return "";
	5533	+ }
	5534	+
	5535	+ return split[1];
	5536	+ }
	5537	+
	5538	+ // Windows
	5539	+ assert(split.length == 4);
	5540	+
	5541	+ return split[2] + ":" + split[3];
5175	5542	}
5176	5543
5177	5544	String GetPigmentTexture()
..	..	@@ -5245,7 +5612,7 @@
5245	5612	System.out.print("; textures = " + textures);
5246	5613	System.out.println("; usedtextures = " + usedtextures);
5247	5614
5248		- if (GetTextures() == null)
	5615	+ if (GetTextures() == null) // What is that??
5249	5616	GetTextures().name = ":";
5250	5617
5251	5618	String texname = tex;
..	..	@@ -5276,6 +5643,43 @@
5276	5643	child.ResetPigmentTexture();
5277	5644	blockloop = false;
5278	5645	}
	5646	+ }
	5647	+
	5648	+ UUID GetUUID()
	5649	+ {
	5650	+ if (uuid == null)
	5651	+ {
	5652	+ // Serial
	5653	+ uuid = UUID.randomUUID();
	5654	+ }
	5655	+
	5656	+ return uuid;
	5657	+ }
	5658	+
	5659	+ Object3D GetObject(UUID uid)
	5660	+ {
	5661	+ if (blockloop)
	5662	+ return null;
	5663	+
	5664	+ if (GetUUID().equals(uid))
	5665	+ return this;
	5666	+
	5667	+ int nb = Size();
	5668	+ for (int i = 0; i < nb; i++)
	5669	+ {
	5670	+ Object3D child = (Object3D) get(i);
	5671	+
	5672	+ if (child == null)
	5673	+ continue;
	5674	+
	5675	+ blockloop = true;
	5676	+ Object3D obj = child.GetObject(uid);
	5677	+ blockloop = false;
	5678	+ if (obj != null)
	5679	+ return obj;
	5680	+ }
	5681	+
	5682	+ return null;
5279	5683	}
5280	5684
5281	5685	void SetBumpTexture(String tex)
..	..	@@ -5322,12 +5726,23 @@
5322	5726	boolean NeedSupport()
5323	5727	{
5324	5728	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5729	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5730	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5731	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5732	}
5329	5733
5330	5734	static boolean DEBUG_SELECTION = false;
	5735	+
	5736	+ boolean IsLive()
	5737	+ {
	5738	+ if (live)
	5739	+ return true;
	5740	+
	5741	+ if (parent == null)
	5742	+ return false;
	5743	+
	5744	+ return parent.IsLive();
	5745	+ }
5331	5746
5332	5747	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5748	{
..	..	@@ -5339,7 +5754,7 @@
5339	5754	}
5340	5755
5341	5756	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5757	+ (hide \|\| dontselect))
5343	5758	return;
5344	5759
5345	5760	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5786,7 @@
5371	5786	return;
5372	5787	}
5373	5788
5374		- javax.media.opengl.GL gl = display.GetGL();
	5789	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5790
5376	5791	/*
5377	5792	if (touched)
..	..	@@ -5390,7 +5805,7 @@
5390	5805	support = support;
5391	5806
5392	5807	//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);
	5808	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394	5809
5395	5810	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5811	{
..	..	@@ -5410,10 +5825,12 @@
5410	5825	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5826
5412	5827	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5828	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5829	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5830	{
5415	5831	Globals.lighttouched = true;
5416	5832	} // all panes...
	5833	+
5417	5834	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5835	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5836	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5423,7 +5840,7 @@
5423	5840	//if (displaylist == -1 && usecalllists)
5424	5841	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5842	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5843	+ bRep.displaylist = display.GenList();
5427	5844	assert(bRep.displaylist != 0);
5428	5845	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5846	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5852,16 @@
5435	5852	if (usecalllists)
5436	5853	{
5437	5854	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5855	+ display.NewList(bRep.displaylist);
5439	5856	}
	5857	+
5440	5858	CallList(display, root, selected, blocked);
	5859	+
5441	5860	// compiled = true;
5442	5861	if (usecalllists)
5443	5862	{
5444	5863	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5864	+ display.EndList();
5446	5865	}
5447	5866	//gl.glDrawBuffer(gl.GL_BACK);
5448	5867	// XXX touched = false;
..	..	@@ -5490,7 +5909,7 @@
5490	5909	if (display.DrawMode() == iCameraPane.SHADOW)
5491	5910	{
5492	5911	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5912	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	5913	{
5495	5914	//System.out.print("CULLED");
5496	5915	culled = true;
..	..	@@ -5498,7 +5917,7 @@
5498	5917	}
5499	5918	else
5500	5919	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5920	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	5921	culled = true;
5503	5922
5504	5923	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +5957,8 @@
5538	5957	{
5539	5958	if (GetBRep() != null)
5540	5959	{
5541		- CameraPane.NextIndex(this, gl);
	5960	+ display.NextIndex();
	5961	+
5542	5962	// vertex color conflict : gl.glCallList(list);
5543	5963	DrawNode(display, root, selected);
5544	5964	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +5999,28 @@
5579	5999	tex = GetTextures();
5580	6000	}
5581	6001
5582		- display.BindTextures(tex, texres);
	6002	+ boolean failedPigment = false;
	6003	+ boolean failedBump = false;
	6004	+
	6005	+ try
	6006	+ {
	6007	+ display.BindPigmentTexture(tex, texres);
	6008	+ }
	6009	+ catch (Exception e)
	6010	+ {
	6011	+ System.err.println("FAILED: " + this);
	6012	+ failedPigment = true;
	6013	+ }
	6014	+
	6015	+ try
	6016	+ {
	6017	+ display.BindBumpTexture(tex, texres);
	6018	+ }
	6019	+ catch (Exception e)
	6020	+ {
	6021	+ //System.err.println("FAILED: " + this);
	6022	+ failedBump = true;
	6023	+ }
5583	6024
5584	6025	if (!compiled)
5585	6026	{
..	..	@@ -5595,13 +6036,17 @@
5595	6036
5596	6037	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6038	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6039	+ display.CallList(bRep.displaylist);
5599	6040	// june 2013 drawSelf(display, root, selected);
5600	6041	}
5601	6042	}
5602	6043	}
5603	6044
5604		- display.ReleaseTextures(tex);
	6045	+ if (!failedBump)
	6046	+ display.ReleaseBumpTexture(tex);
	6047	+
	6048	+ if (!failedPigment)
	6049	+ display.ReleasePigmentTexture(tex);
5605	6050
5606	6051	display.PopMaterial(this, selected);
5607	6052	}
..	..	@@ -5730,6 +6175,9 @@
5730	6175
5731	6176	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6177	{
	6178	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6179	+ return;
	6180	+
5733	6181	if (hide)
5734	6182	return;
5735	6183	// shadow optimisation
..	..	@@ -5855,6 +6303,9 @@
5855	6303	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6304	return; // no shadow for transparent objects
5857	6305
	6306	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6307	+ return;
	6308	+
5858	6309	if (hide)
5859	6310	return;
5860	6311
..	..	@@ -5895,9 +6346,10 @@
5895	6346	return;
5896	6347	}
5897	6348
	6349	+ //bRep.GenUV(1/material.diffuseness);
5898	6350	// bRep.lock = true;
5899	6351
5900		- javax.media.opengl.GL gl = display.GetGL();
	6352	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6353
5902	6354	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6355	{
..	..	@@ -5914,23 +6366,7 @@
5914	6366
5915	6367	bRep.getMinMax(min, max, 100);
5916	6368
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();
	6369	+ display.DrawBox(min, max);
5934	6370
5935	6371	return;
5936	6372	}
..	..	@@ -5984,178 +6420,19 @@
5984	6420	new Exception().printStackTrace();
5985	6421	return;
5986	6422	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6423	+
	6424	+ if (dontselect)
5990	6425	{
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;
	6426	+ //bRep.GenerateNormalsMINE();
6122	6427	}
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		- }
	6428	+
	6429	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6430	} else // catch (Error e)
6154	6431	{
6155	6432	// TRIANGLE ARRAY
6156	6433	if (IsOpaque()) // Static())
6157	6434	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6435	+ display.StartTriangles();
6159	6436	int facecount = bRep.FaceCount();
6160	6437	for (int i = 0; i < facecount; i++)
6161	6438	{
..	..	@@ -6220,7 +6497,7 @@
6220	6497
6221	6498	display.DrawFace(this, p, q, r, face);
6222	6499	}
6223		- gl.glEnd();
	6500	+ display.EndTriangles();
6224	6501	}
6225	6502	else
6226	6503	{
..	..	@@ -6249,8 +6526,8 @@
6249	6526	//System.out.println("SORT");
6250	6527
6251	6528	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6529	+
	6530	+ display.StartTriangles();
6254	6531	for (int i = 0; i < facecount; i++)
6255	6532	{
6256	6533	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6541,12 @@
6264	6541
6265	6542	display.DrawFace(this, p, q, r, face);
6266	6543	}
6267		- gl.glEnd();
	6544	+ display.EndTriangles();
6268	6545	}
6269	6546
6270	6547	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6548	{
	6549	+ /*
6272	6550	gl.glDisable(gl.GL_LIGHTING);
6273	6551	float[] colorV = new float[3];
6274	6552
..	..	@@ -6347,6 +6625,7 @@
6347	6625	// gl.glEnd();
6348	6626	}
6349	6627	}
	6628	+ */
6350	6629	}
6351	6630	}
6352	6631
..	..	@@ -6405,22 +6684,6 @@
6405	6684	void Print(Vertex v)
6406	6685	{
6407	6686	//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	6687	}
6425	6688
6426	6689	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -7013,7 +7276,7 @@
7013	7276	spot.translate(32, 32);
7014	7277	spotw = spot.x + spot.width;
7015	7278	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
	7279	+ info.g.setColor(Color.cyan);
7017	7280	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7281	// if (CameraPane.Xmin > spot.x)
7019	7282	// {
..	..	@@ -7031,11 +7294,12 @@
7031	7294	// {
7032	7295	// CameraPane.Ymax = spoth;
7033	7296	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7297	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7298	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7036	7299	spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
	7300	+ info.g.setColor(Color.yellow);
7038	7301	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7302	+ info.g.setColor(Color.green);
7039	7303	// if (CameraPane.Xmin > spot.x)
7040	7304	// {
7041	7305	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,8 +7316,8 @@
7052	7316	// {
7053	7317	// CameraPane.Ymax = spoth;
7054	7318	// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7319	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7320	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7057	7321	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7322	// if (CameraPane.Xmin > boundary.x)
7059	7323	// {
..	..	@@ -7087,7 +7351,7 @@
7087	7351	startX = info.x;
7088	7352	startY = info.y;
7089	7353
7090		- hitSomething = 0;
	7354	+ hitSomething = -1;
7091	7355	cVector origin = new cVector();
7092	7356	//LA.xformPos(origin, toParent, origin);
7093	7357	Rectangle spot = new Rectangle();
..	..	@@ -7120,7 +7384,7 @@
7120	7384	}
7121	7385
7122	7386	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7387	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7388	//System.out.println("modified = " + modified);
7125	7389	//new Exception().printStackTrace();
7126	7390	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7412,7 @@
7148	7412	return true;
7149	7413	}
7150	7414
7151		- void doEditDrag0(ClickInfo info)
	7415	+ void doEditDrag0(ClickInfo info, boolean opposite)
7152	7416	{
7153	7417	if (hitSomething == 0)
7154	7418	{
..	..	@@ -7163,6 +7427,7 @@
7163	7427	//System.out.println("hitSomething = " + hitSomething);
7164	7428
7165	7429	double scale = 0.005f * info.camera.Distance();
	7430	+
7166	7431	cVector xlate = new cVector();
7167	7432	//cVector xlate2 = new cVector();
7168	7433	switch (hitSomething)
..	..	@@ -7175,7 +7440,7 @@
7175	7440
7176	7441	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7442
7178		- if (modified)
	7443	+ if (modified \|\| opposite)
7179	7444	{
7180	7445	//assert(false);
7181	7446	/*
..	..	@@ -7269,6 +7534,7 @@
7269	7534
7270	7535	if (modified)
7271	7536	{
	7537	+ // Rotate 90 degrees
7272	7538	angle /= (Math.PI / 4);
7273	7539	angle = Math.floor(angle + 0.5);
7274	7540	angle *= (Math.PI / 4);
..	..	@@ -7310,24 +7576,27 @@
7310	7576
7311	7577	case hitScale: // scale
7312	7578	double hScale = (double) (info.x - centerPt.x) / 32;
	7579	+ double sign = 1;
	7580	+ if (hScale < 0)
	7581	+ {
	7582	+ sign = -1;
	7583	+ }
	7584	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7585	if (hScale < 0.01)
7314	7586	{
7315		- hScale = 0.01;
	7587	+ //hScale = 0.01;
7316	7588	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
7319		- {
7320		- hScale = 0.01;
7321		- }
	7589	+
7322	7590	double vScale = (double) (info.y - centerPt.y) / 32;
7323		- if (vScale < 0.01)
	7591	+ sign = 1;
	7592	+ if (vScale < 0)
7324	7593	{
7325		- vScale = 0.01;
	7594	+ sign = -1;
7326	7595	}
7327		- vScale = Math.pow(vScale, scale * 50);
	7596	+ vScale = signMath.pow(signvScale, scale * 50);
7328	7597	if (vScale < 0.01)
7329	7598	{
7330		- vScale = 0.01;
	7599	+ //vScale = 0.01;
7331	7600	}
7332	7601	LA.matCopy(startMat, toParent);
7333	7602	/**/
..	..	@@ -7338,39 +7607,47 @@
7338	7607	}
7339	7608	/**/
7340	7609
	7610	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7611	+
	7612	+ if (totalScale < 0.01)
	7613	+ {
	7614	+ totalScale = 0.01;
	7615	+ }
	7616	+
7341	7617	switch (info.pane.RenderCamera().viewCode)
7342	7618	{
7343	7619	case 3: // '\001'
7344		- if (modified)
	7620	+ if (modified \|\| opposite)
7345	7621	{
7346	7622	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7623	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7624	} // vScale, 1);
7349	7625	else
7350	7626	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7627	+ // EXCEPTION!
	7628	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7629	} // vScale, 1);
7353	7630	break;
7354	7631
7355	7632	case 2: // '\002'
7356		- if (modified)
	7633	+ if (modified \|\| opposite)
7357	7634	{
7358	7635	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7636	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7637	} else
7361	7638	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7639	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7640	}
7364	7641	break;
7365	7642
7366	7643	case 1: // '\003'
7367		- if (modified)
	7644	+ if (modified \|\| opposite)
7368	7645	{
7369	7646	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7647	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7648	} else
7372	7649	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7650	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7651	}
7375	7652	break;
7376	7653	}
..	..	@@ -7503,14 +7780,22 @@
7503	7780	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7781	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7782	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7783	+
	7784	+ String objname;
	7785	+
7506	7786	if (false) //parent != null)
7507	7787	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7788	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7789	} else
7510	7790	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7791	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	7792	} // + super.toString();
7513	7793	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7794	+
	7795	+ if (!Globals.ADVANCED)
	7796	+ return objname;
	7797	+
	7798	+ return objname + " " + System.identityHashCode(this);
7514	7799	}
7515	7800
7516	7801	public int hashCode()
..	..	@@ -7566,6 +7851,7 @@
7566	7851	objectUI.closeUI();
7567	7852	if (editWindow != null)
7568	7853	{
	7854	+ editWindow.ctrlPanel.FlushUI();
7569	7855	editWindow.refreshContents();
7570	7856	} // ? new
7571	7857	objectUI = null;
..	..	@@ -7574,6 +7860,10 @@
7574	7860	{
7575	7861	editWindow = null;
7576	7862	} // ?
	7863	+ }
	7864	+ else
	7865	+ {
	7866	+ //editWindow.closeUI();
7577	7867	}
7578	7868	}
7579	7869
..	..	@@ -7586,7 +7876,7 @@
7586	7876	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	7877
7588	7878	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	7879	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	7880
7591	7881	double[][] toParent; // dynamic matrix
7592	7882	double[][] fromParent;
..	..	@@ -7701,7 +7991,7 @@
7701	7991	{
7702	7992	assert(bRep != null);
7703	7993	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	7994	+ Grafreed.Assert(support.bRep == bRep.support);
7705	7995	}
7706	7996	else
7707	7997	{
..	..	@@ -7732,6 +8022,10 @@
7732	8022	}
7733	8023
7734	8024	transient ObjEditor editWindow;
	8025	+ transient ObjEditor manipWindow;
	8026	+
	8027	+ transient boolean pinned;
	8028	+
7735	8029	transient ObjectUI objectUI;
7736	8030	public static int povDepth = 0;
7737	8031	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8044,9 @@
7750	8044	private static cVector edge2 = new cVector();
7751	8045	//private static cVector norm = new cVector();
7752	8046	/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;
	8047	+ static final int hitCenter = 1;
	8048	+ static final int hitScale = 2;
	8049	+ static final int hitRotate = 3;
7756	8050	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8051	/transient/ private Point centerPt;
7758	8052	/transient/ private int startX;