~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[];
	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,8 @@
299	426	}
300	427
301	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
302	431	boolean hide = false;
303	432	boolean link2master = false; // performs reset support/master at each frame
304	433	boolean marked = false; // animation node
..	..	@@ -480,12 +609,14 @@
480	609	toParent = LA.newMatrix();
481	610	fromParent = LA.newMatrix();
482	611	}
	612	+
483	613	if (toParentMarked == null)
484	614	{
485	615	if (maxcount != 1)
486	616	{
487	617	new Exception().printStackTrace();
488	618	}
	619	+
489	620	toParentMarked = LA.newMatrix();
490	621	fromParentMarked = LA.newMatrix();
491	622	}
..	..	@@ -773,7 +904,7 @@
773	904	if (step == 0)
774	905	step = 1;
775	906	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
777	908	// if (acceleration == 0)
778	909	// acceleration = 10;
779	910	if (delay == 0) // serial
..	..	@@ -796,7 +927,7 @@
796	927
797	928	if (marked && Globals.isLIVE() && live &&
798	929	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	931	currentframe != Globals.framecount)
801	932	{
802	933	currentframe = Globals.framecount;
..	..	@@ -808,7 +939,8 @@
808	939
809	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	941
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
812	944	{
813	945	countdown = 1;
814	946	delay = speedup?8:1;
..	..	@@ -880,6 +1012,7 @@
880	1012	if (material == null \|\| material.multiply)
881	1013	return true;
882	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1016	return material.opacity > 0.99;
884	1017	}
885	1018
..	..	@@ -911,6 +1044,11 @@
911	1044	fromParent = null; // LA.newMatrix();
912	1045	bRep = null; // new BoundaryRep();
913	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
914	1052	/*
915	1053	float hue = (float)Math.random();
916	1054	Color col;
..	..	@@ -953,7 +1091,7 @@
953	1091
954	1092	public Object clone()
955	1093	{
956		- return GrafreeD.clone(this);
	1094	+ return Grafreed.clone(this);
957	1095	}
958	1096
959	1097	Object3D copyExpand()
..	..	@@ -1275,6 +1413,7 @@
1275	1413	toParent = LA.newMatrix();
1276	1414	fromParent = LA.newMatrix();
1277	1415	}
	1416	+
1278	1417	LA.matCopy(other.toParent, toParent);
1279	1418	LA.matCopy(other.fromParent, fromParent);
1280	1419
..	..	@@ -1469,7 +1608,7 @@
1469	1608	BoundaryRep.SEUIL = other.material.cameralight;
1470	1609
1471	1610	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1612	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1613	}
1475	1614
..	..	@@ -1728,7 +1867,7 @@
1728	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1868	o.bRep = transientrep;
1730	1869	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1871	o.CreateMaterial();
1733	1872	o.SetAttributes(this, -1);
1734	1873	//parent
..	..	@@ -1741,7 +1880,7 @@
1741	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1881	o.bRep = bRep;
1743	1882	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1884	o.CreateMaterial();
1746	1885	//o.overwriteThis(this, -1);
1747	1886	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1967,15 @@
1828	1967	if (obj.name == null)
1829	1968	continue; // can't be a null one
1830	1969
	1970	+ // Try perfect match first.
1831	1971	if (n.equals(obj.name))
1832	1972	{
1833	1973	theobj = obj;
1834	1974	count++;
1835	1975	}
1836	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1979
1838	1980	if (count != 1)
1839	1981	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2435,17 @@
2293	2435	}
2294	2436	*/
2295	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2296	2442	}
2297	2443
2298	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2445	{
2300	2446	if (newWindow)
2301	2447	{
	2448	+ new Exception().printStackTrace();
2302	2449	System.exit(0);
2303	2450	if (parent != null)
2304	2451	{
..	..	@@ -2333,6 +2480,14 @@
2333	2480	{
2334	2481	editWindow.refreshContents();
2335	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2336	2491	//if (parent != null)
2337	2492	//parent.refreshEditWindow();
2338	2493	}
..	..	@@ -2475,13 +2630,13 @@
2475	2630	return retval;
2476	2631	}
2477	2632
2478		- void doEditDrag(ClickInfo info)
	2633	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2634	{
2480	2635	switch (doSomething)
2481	2636	{
2482	2637	case 1: // '\001'
2483	2638	//super.
2484		- doEditDrag0(info);
	2639	+ doEditDrag0(info, opposite);
2485	2640	break;
2486	2641
2487	2642	case 2: // '\002'
..	..	@@ -2494,11 +2649,11 @@
2494	2649	{
2495	2650	//sel.hitSomething = childToDrag.hitSomething;
2496	2651	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2652	+ sel.doEditDrag(info, opposite);
2498	2653	} else
2499	2654	{
2500	2655	//super.
2501		- doEditDrag0(info);
	2656	+ doEditDrag0(info, opposite);
2502	2657	}
2503	2658	}
2504	2659	break;
..	..	@@ -2608,6 +2763,18 @@
2608	2763	void GenNormalsS(boolean crease)
2609	2764	{
2610	2765	selection.GenNormals(crease);
	2766	+// for (int i=0; i<selection.size(); i++)
	2767	+// {
	2768	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2769	+// selectee.GenNormals(crease);
	2770	+// }
	2771	+
	2772	+ //Touch();
	2773	+ }
	2774	+
	2775	+ void GenNormalsMeshS()
	2776	+ {
	2777	+ selection.GenNormalsMesh();
2611	2778	// for (int i=0; i<selection.size(); i++)
2612	2779	// {
2613	2780	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2915,24 @@
2748	2915	if (child == null)
2749	2916	continue;
2750	2917	child.GenNormals(crease);
	2918	+// Children().release(i);
	2919	+ }
	2920	+ blockloop = false;
	2921	+ }
	2922	+
	2923	+ void GenNormalsMesh()
	2924	+ {
	2925	+ if (blockloop)
	2926	+ return;
	2927	+
	2928	+ blockloop = true;
	2929	+ GenNormalsMesh0();
	2930	+ for (int i = 0; i < Children().Size(); i++)
	2931	+ {
	2932	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2933	+ if (child == null)
	2934	+ continue;
	2935	+ child.GenNormalsMesh();
2751	2936	// Children().release(i);
2752	2937	}
2753	2938	blockloop = false;
..	..	@@ -2905,7 +3090,8 @@
2905	3090	{
2906	3091	if (bRep != null)
2907	3092	{
2908		- bRep.GenUV();
	3093	+ bRep.GenUV(); //1);
	3094	+ //bRep.UnfoldUV();
2909	3095	Touch();
2910	3096	}
2911	3097	}
..	..	@@ -2919,11 +3105,20 @@
2919	3105	}
2920	3106	}
2921	3107
	3108	+ void GenNormalsMesh0()
	3109	+ {
	3110	+ if (bRep != null)
	3111	+ {
	3112	+ bRep.GenerateNormalsMesh();
	3113	+ Touch();
	3114	+ }
	3115	+ }
	3116	+
2922	3117	void GenNormalsMINE0()
2923	3118	{
2924	3119	if (bRep != null)
2925	3120	{
2926		- bRep.GenerateNormalsMINE();
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3122	Touch();
2928	3123	}
2929	3124	}
..	..	@@ -2980,6 +3175,33 @@
2980	3175	blockloop = false;
2981	3176	}
2982	3177
	3178	+ void TransformChildren()
	3179	+ {
	3180	+ if (toParent != null)
	3181	+ {
	3182	+ for (int i=Size(); --i>=0;)
	3183	+ {
	3184	+ Object3D v = get(i);
	3185	+
	3186	+ if (v.toParent == null)
	3187	+ {
	3188	+ v.toParent = LA.newMatrix();
	3189	+ v.fromParent = LA.newMatrix();
	3190	+ }
	3191	+
	3192	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3193	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3194	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3195	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3196	+ }
	3197	+
	3198	+ toParent = null; // LA.matIdentity(toParent);
	3199	+ fromParent = null; // LA.matIdentity(fromParent);
	3200	+
	3201	+ Touch();
	3202	+ }
	3203	+ }
	3204	+
2983	3205	void TransformGeometry()
2984	3206	{
2985	3207	Object3D obj = this;
..	..	@@ -3201,9 +3423,11 @@
3201	3423
3202	3424	BoundaryRep sup = bRep.support;
3203	3425	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3426	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3427	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3428	+
	3429	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3430	+
3207	3431	bRep = temprep;
3208	3432	bRep.support = sup;
3209	3433	Touch();
..	..	@@ -3340,7 +3564,8 @@
3340	3564	if (blockloop)
3341	3565	return;
3342	3566
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3344	3569	live = h;
3345	3570
3346	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3586,8 @@
3361	3586	return;
3362	3587
3363	3588	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3365	3591	link2master = h;
3366	3592
3367	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3607,8 @@
3381	3607	if (blockloop)
3382	3608	return;
3383	3609
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3385	3612	hide = h;
3386	3613
3387	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3628,7 @@
3401	3628	if (blockloop)
3402	3629	return;
3403	3630
3404		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3405	3632	marked = h;
3406	3633
3407	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3638,46 @@
3411	3638	continue;
3412	3639	blockloop = true;
3413	3640	child.MarkLeaves(h);
	3641	+ blockloop = false;
	3642	+ // release(i);
	3643	+ }
	3644	+ }
	3645	+
	3646	+ void RewindLeaves(boolean h)
	3647	+ {
	3648	+ if (blockloop)
	3649	+ return;
	3650	+
	3651	+ if (bRep != null \|\| material != null) // borderline...
	3652	+ rewind = h;
	3653	+
	3654	+ for (int i = 0; i < Size(); i++)
	3655	+ {
	3656	+ Object3D child = (Object3D) get(i); // reserve(i);
	3657	+ if (child == null)
	3658	+ continue;
	3659	+ blockloop = true;
	3660	+ child.RewindLeaves(h);
	3661	+ blockloop = false;
	3662	+ // release(i);
	3663	+ }
	3664	+ }
	3665	+
	3666	+ void RandomLeaves(boolean h)
	3667	+ {
	3668	+ if (blockloop)
	3669	+ return;
	3670	+
	3671	+ if (bRep != null \|\| material != null) // borderline...
	3672	+ random = h;
	3673	+
	3674	+ for (int i = 0; i < Size(); i++)
	3675	+ {
	3676	+ Object3D child = (Object3D) get(i); // reserve(i);
	3677	+ if (child == null)
	3678	+ continue;
	3679	+ blockloop = true;
	3680	+ child.RandomLeaves(h);
3414	3681	blockloop = false;
3415	3682	// release(i);
3416	3683	}
..	..	@@ -3725,7 +3992,7 @@
3725	3992	if (child == null)
3726	3993	continue;
3727	3994
3728		- if (GrafreeD.RENDERME > 0)
	3995	+ if (Grafreed.RENDERME > 0)
3729	3996	{
3730	3997	if (child instanceof Merge)
3731	3998	((Merge)child).renderme();
..	..	@@ -3876,7 +4143,7 @@
3876	4143	if (child == null)
3877	4144	continue;
3878	4145
3879		- if (GrafreeD.RENDERME > 0)
	4146	+ if (Grafreed.RENDERME > 0)
3880	4147	{
3881	4148	if (child instanceof Merge)
3882	4149	((Merge)child).renderme();
..	..	@@ -4071,7 +4338,7 @@
4071	4338	if (child == null)
4072	4339	continue;
4073	4340
4074		- if (GrafreeD.RENDERME > 0)
	4341	+ if (Grafreed.RENDERME > 0)
4075	4342	{
4076	4343	if (child instanceof Merge)
4077	4344	((Merge)child).renderme();
..	..	@@ -4184,6 +4451,55 @@
4184	4451	{
4185	4452	blockloop = true;
4186	4453	get(i).RepairShadow();
	4454	+ blockloop = false;
	4455	+ }
	4456	+ }
	4457	+
	4458	+ void RepairSOV()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ String texname = this.GetPigmentTexture();
	4464	+
	4465	+ if (texname.startsWith("sov"))
	4466	+ {
	4467	+ String[] s = texname.split("/");
	4468	+
	4469	+ String[] sname = s[1].split("Color.pn");
	4470	+
	4471	+ texname = sname[0];
	4472	+
	4473	+ if (sname.length > 1)
	4474	+ {
	4475	+ texname += "Color.jpg";
	4476	+ }
	4477	+
	4478	+ this.SetPigmentTexture("sov/" + texname);
	4479	+ }
	4480	+
	4481	+ texname = this.GetBumpTexture();
	4482	+
	4483	+ if (texname.startsWith("sov"))
	4484	+ {
	4485	+ String[] s = texname.split("/");
	4486	+
	4487	+ String[] sname = s[1].split("Bump.pn");
	4488	+
	4489	+ texname = sname[0];
	4490	+
	4491	+ if (sname.length > 1)
	4492	+ {
	4493	+ texname += "Bump.jpg";
	4494	+ }
	4495	+
	4496	+ this.SetBumpTexture("sov/" + texname);
	4497	+ }
	4498	+
	4499	+ for (int i=0; i<Size(); i++)
	4500	+ {
	4501	+ blockloop = true;
	4502	+ get(i).RepairSOV();
4187	4503	blockloop = false;
4188	4504	}
4189	4505	}
..	..	@@ -4678,7 +4994,7 @@
4678	4994
4679	4995	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4996	{
4681		- if (hide)
	4997	+ if (hide \|\| dontselect)
4682	4998	return null;
4683	4999
4684	5000	if (count <= 0)
..	..	@@ -4702,9 +5018,17 @@
4702	5018	}
4703	5019	}
4704	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4705	5029	cTreePath Select(int indexcount, boolean deselect)
4706	5030	{
4707		- if (hide)
	5031	+ if (hide \|\| dontselect)
4708	5032	return null;
4709	5033
4710	5034	if (count <= 0)
..	..	@@ -4738,10 +5062,11 @@
4738	5062	if (leaf != null)
4739	5063	{
4740	5064	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4742	5067	{
4743	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4745	5070	}
4746	5071
4747	5072	return tp;
..	..	@@ -4758,6 +5083,7 @@
4758	5083
4759	5084	if (child == null)
4760	5085	continue;
	5086	+
4761	5087	if (child.HasTransparency() && child.size() != 0)
4762	5088	{
4763	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5093,10 @@
4767	5093	if (leaf != null)
4768	5094	{
4769	5095	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4771	5098	{
4772		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4773	5100	}
4774	5101
4775	5102	return tp;
..	..	@@ -5094,6 +5421,51 @@
5094	5421	blockloop = false;
5095	5422	}
5096	5423
	5424	+ void ResetSelectable()
	5425	+ {
	5426	+ if (blockloop)
	5427	+ return;
	5428	+
	5429	+ blockloop = true;
	5430	+
	5431	+ keepdontselect = dontselect;
	5432	+ dontselect = true;
	5433	+
	5434	+ Object3D child;
	5435	+ int nb = Size();
	5436	+ for (int i = 0; i < nb; i++)
	5437	+ {
	5438	+ child = (Object3D) get(i);
	5439	+ if (child == null)
	5440	+ continue;
	5441	+ child.ResetSelectable();
	5442	+ }
	5443	+
	5444	+ blockloop = false;
	5445	+ }
	5446	+
	5447	+ void RestoreSelectable()
	5448	+ {
	5449	+ if (blockloop)
	5450	+ return;
	5451	+
	5452	+ blockloop = true;
	5453	+
	5454	+ dontselect = keepdontselect;
	5455	+
	5456	+ Object3D child;
	5457	+ int nb = Size();
	5458	+ for (int i = 0; i < nb; i++)
	5459	+ {
	5460	+ child = (Object3D) get(i);
	5461	+ if (child == null)
	5462	+ continue;
	5463	+ child.RestoreSelectable();
	5464	+ }
	5465	+
	5466	+ blockloop = false;
	5467	+ }
	5468	+
5097	5469	boolean IsSelected()
5098	5470	{
5099	5471	if (parent == null)
..	..	@@ -5156,10 +5528,34 @@
5156	5528
5157	5529	// System.out.println("Fullname = " + fullname);
5158	5530
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5531	+ // Does not work on Windows due to C:
	5532	+// if (fullname.name.indexOf(":") == -1)
	5533	+// return fullname.name;
	5534	+//
	5535	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5536
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5537	+ String[] split = fullname.name.split(":");
	5538	+
	5539	+ if (split.length == 0)
	5540	+ {
	5541	+ return "";
	5542	+ }
	5543	+
	5544	+ if (split.length <= 2)
	5545	+ {
	5546	+ if (fullname.name.endsWith(":"))
	5547	+ {
	5548	+ // Windows
	5549	+ return fullname.name.substring(0, fullname.name.length()-1);
	5550	+ }
	5551	+
	5552	+ return split[0];
	5553	+ }
	5554	+
	5555	+ // Windows
	5556	+ assert(split.length == 4);
	5557	+
	5558	+ return split[0] + ":" + split[1];
5163	5559	}
5164	5560
5165	5561	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5564,38 @@
5168	5564	return "";
5169	5565
5170	5566	// 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());
	5567	+ // Does not work on Windows due to C:
	5568	+// if (fullname.name.indexOf(":") == -1)
	5569	+// return "";
	5570	+//
	5571	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5572	+ String[] split = fullname.name.split(":");
	5573	+
	5574	+ if (split.length == 0)
	5575	+ {
	5576	+ return "";
	5577	+ }
	5578	+
	5579	+ if (split.length == 1)
	5580	+ {
	5581	+ return "";
	5582	+ }
	5583	+
	5584	+ if (split.length == 2)
	5585	+ {
	5586	+ if (fullname.name.endsWith(":"))
	5587	+ {
	5588	+ // Windows
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ return split[1];
	5593	+ }
	5594	+
	5595	+ // Windows
	5596	+ assert(split.length == 4);
	5597	+
	5598	+ return split[2] + ":" + split[3];
5175	5599	}
5176	5600
5177	5601	String GetPigmentTexture()
..	..	@@ -5245,7 +5669,7 @@
5245	5669	System.out.print("; textures = " + textures);
5246	5670	System.out.println("; usedtextures = " + usedtextures);
5247	5671
5248		- if (GetTextures() == null)
	5672	+ if (GetTextures() == null) // What is that??
5249	5673	GetTextures().name = ":";
5250	5674
5251	5675	String texname = tex;
..	..	@@ -5276,6 +5700,43 @@
5276	5700	child.ResetPigmentTexture();
5277	5701	blockloop = false;
5278	5702	}
	5703	+ }
	5704	+
	5705	+ UUID GetUUID()
	5706	+ {
	5707	+ if (uuid == null)
	5708	+ {
	5709	+ // Serial
	5710	+ uuid = UUID.randomUUID();
	5711	+ }
	5712	+
	5713	+ return uuid;
	5714	+ }
	5715	+
	5716	+ Object3D GetObject(UUID uid)
	5717	+ {
	5718	+ if (blockloop)
	5719	+ return null;
	5720	+
	5721	+ if (GetUUID().equals(uid))
	5722	+ return this;
	5723	+
	5724	+ int nb = Size();
	5725	+ for (int i = 0; i < nb; i++)
	5726	+ {
	5727	+ Object3D child = (Object3D) get(i);
	5728	+
	5729	+ if (child == null)
	5730	+ continue;
	5731	+
	5732	+ blockloop = true;
	5733	+ Object3D obj = child.GetObject(uid);
	5734	+ blockloop = false;
	5735	+ if (obj != null)
	5736	+ return obj;
	5737	+ }
	5738	+
	5739	+ return null;
5279	5740	}
5280	5741
5281	5742	void SetBumpTexture(String tex)
..	..	@@ -5322,12 +5783,23 @@
5322	5783	boolean NeedSupport()
5323	5784	{
5324	5785	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5786	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5787	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5788	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5789	}
5329	5790
5330	5791	static boolean DEBUG_SELECTION = false;
	5792	+
	5793	+ boolean IsLive()
	5794	+ {
	5795	+ if (live)
	5796	+ return true;
	5797	+
	5798	+ if (parent == null)
	5799	+ return false;
	5800	+
	5801	+ return parent.IsLive();
	5802	+ }
5331	5803
5332	5804	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5805	{
..	..	@@ -5339,7 +5811,7 @@
5339	5811	}
5340	5812
5341	5813	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5814	+ (hide \|\| dontselect))
5343	5815	return;
5344	5816
5345	5817	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5843,7 @@
5371	5843	return;
5372	5844	}
5373	5845
5374		- javax.media.opengl.GL gl = display.GetGL();
	5846	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5847
5376	5848	/*
5377	5849	if (touched)
..	..	@@ -5390,7 +5862,7 @@
5390	5862	support = support;
5391	5863
5392	5864	//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);
	5865	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394	5866
5395	5867	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5868	{
..	..	@@ -5410,10 +5882,12 @@
5410	5882	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5883
5412	5884	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5885	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5886	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5887	{
5415	5888	Globals.lighttouched = true;
5416	5889	} // all panes...
	5890	+
5417	5891	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5892	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5893	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5423,7 +5897,7 @@
5423	5897	//if (displaylist == -1 && usecalllists)
5424	5898	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5899	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5900	+ bRep.displaylist = display.GenList();
5427	5901	assert(bRep.displaylist != 0);
5428	5902	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5903	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5909,16 @@
5435	5909	if (usecalllists)
5436	5910	{
5437	5911	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5912	+ display.NewList(bRep.displaylist);
5439	5913	}
	5914	+
5440	5915	CallList(display, root, selected, blocked);
	5916	+
5441	5917	// compiled = true;
5442	5918	if (usecalllists)
5443	5919	{
5444	5920	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5921	+ display.EndList();
5446	5922	}
5447	5923	//gl.glDrawBuffer(gl.GL_BACK);
5448	5924	// XXX touched = false;
..	..	@@ -5490,7 +5966,7 @@
5490	5966	if (display.DrawMode() == iCameraPane.SHADOW)
5491	5967	{
5492	5968	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5969	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	5970	{
5495	5971	//System.out.print("CULLED");
5496	5972	culled = true;
..	..	@@ -5498,7 +5974,7 @@
5498	5974	}
5499	5975	else
5500	5976	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5977	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	5978	culled = true;
5503	5979
5504	5980	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6014,8 @@
5538	6014	{
5539	6015	if (GetBRep() != null)
5540	6016	{
5541		- CameraPane.NextIndex(this, gl);
	6017	+ display.NextIndex();
	6018	+
5542	6019	// vertex color conflict : gl.glCallList(list);
5543	6020	DrawNode(display, root, selected);
5544	6021	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6056,28 @@
5579	6056	tex = GetTextures();
5580	6057	}
5581	6058
5582		- display.BindTextures(tex, texres);
	6059	+ boolean failedPigment = false;
	6060	+ boolean failedBump = false;
	6061	+
	6062	+ try
	6063	+ {
	6064	+ display.BindPigmentTexture(tex, texres);
	6065	+ }
	6066	+ catch (Exception e)
	6067	+ {
	6068	+ System.err.println("FAILED: " + this);
	6069	+ failedPigment = true;
	6070	+ }
	6071	+
	6072	+ try
	6073	+ {
	6074	+ display.BindBumpTexture(tex, texres);
	6075	+ }
	6076	+ catch (Exception e)
	6077	+ {
	6078	+ //System.err.println("FAILED: " + this);
	6079	+ failedBump = true;
	6080	+ }
5583	6081
5584	6082	if (!compiled)
5585	6083	{
..	..	@@ -5595,13 +6093,17 @@
5595	6093
5596	6094	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6095	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6096	+ display.CallList(bRep.displaylist);
5599	6097	// june 2013 drawSelf(display, root, selected);
5600	6098	}
5601	6099	}
5602	6100	}
5603	6101
5604		- display.ReleaseTextures(tex);
	6102	+ if (!failedBump)
	6103	+ display.ReleaseBumpTexture(tex);
	6104	+
	6105	+ if (!failedPigment)
	6106	+ display.ReleasePigmentTexture(tex);
5605	6107
5606	6108	display.PopMaterial(this, selected);
5607	6109	}
..	..	@@ -5730,6 +6232,9 @@
5730	6232
5731	6233	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6234	{
	6235	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6236	+ return;
	6237	+
5733	6238	if (hide)
5734	6239	return;
5735	6240	// shadow optimisation
..	..	@@ -5855,6 +6360,9 @@
5855	6360	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6361	return; // no shadow for transparent objects
5857	6362
	6363	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6364	+ return;
	6365	+
5858	6366	if (hide)
5859	6367	return;
5860	6368
..	..	@@ -5895,9 +6403,10 @@
5895	6403	return;
5896	6404	}
5897	6405
	6406	+ //bRep.GenUV(1/material.diffuseness);
5898	6407	// bRep.lock = true;
5899	6408
5900		- javax.media.opengl.GL gl = display.GetGL();
	6409	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6410
5902	6411	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6412	{
..	..	@@ -5914,23 +6423,7 @@
5914	6423
5915	6424	bRep.getMinMax(min, max, 100);
5916	6425
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();
	6426	+ display.DrawBox(min, max);
5934	6427
5935	6428	return;
5936	6429	}
..	..	@@ -5984,178 +6477,19 @@
5984	6477	new Exception().printStackTrace();
5985	6478	return;
5986	6479	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6480	+
	6481	+ if (dontselect)
5990	6482	{
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;
	6483	+ //bRep.GenerateNormalsMINE();
6122	6484	}
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		- }
	6485	+
	6486	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6487	} else // catch (Error e)
6154	6488	{
6155	6489	// TRIANGLE ARRAY
6156	6490	if (IsOpaque()) // Static())
6157	6491	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6492	+ display.StartTriangles();
6159	6493	int facecount = bRep.FaceCount();
6160	6494	for (int i = 0; i < facecount; i++)
6161	6495	{
..	..	@@ -6220,7 +6554,7 @@
6220	6554
6221	6555	display.DrawFace(this, p, q, r, face);
6222	6556	}
6223		- gl.glEnd();
	6557	+ display.EndTriangles();
6224	6558	}
6225	6559	else
6226	6560	{
..	..	@@ -6249,8 +6583,8 @@
6249	6583	//System.out.println("SORT");
6250	6584
6251	6585	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6586	+
	6587	+ display.StartTriangles();
6254	6588	for (int i = 0; i < facecount; i++)
6255	6589	{
6256	6590	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6598,12 @@
6264	6598
6265	6599	display.DrawFace(this, p, q, r, face);
6266	6600	}
6267		- gl.glEnd();
	6601	+ display.EndTriangles();
6268	6602	}
6269	6603
6270	6604	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6605	{
	6606	+ /*
6272	6607	gl.glDisable(gl.GL_LIGHTING);
6273	6608	float[] colorV = new float[3];
6274	6609
..	..	@@ -6347,6 +6682,7 @@
6347	6682	// gl.glEnd();
6348	6683	}
6349	6684	}
	6685	+ */
6350	6686	}
6351	6687	}
6352	6688
..	..	@@ -6405,22 +6741,6 @@
6405	6741	void Print(Vertex v)
6406	6742	{
6407	6743	//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	6744	}
6425	6745
6426	6746	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -7013,7 +7333,7 @@
7013	7333	spot.translate(32, 32);
7014	7334	spotw = spot.x + spot.width;
7015	7335	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
	7336	+ info.g.setColor(Color.cyan);
7017	7337	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7338	// if (CameraPane.Xmin > spot.x)
7019	7339	// {
..	..	@@ -7031,11 +7351,12 @@
7031	7351	// {
7032	7352	// CameraPane.Ymax = spoth;
7033	7353	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7354	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7355	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7036	7356	spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
	7357	+ info.g.setColor(Color.yellow);
7038	7358	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7359	+ info.g.setColor(Color.green);
7039	7360	// if (CameraPane.Xmin > spot.x)
7040	7361	// {
7041	7362	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,8 +7373,8 @@
7052	7373	// {
7053	7374	// CameraPane.Ymax = spoth;
7054	7375	// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7376	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7377	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7057	7378	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7379	// if (CameraPane.Xmin > boundary.x)
7059	7380	// {
..	..	@@ -7087,7 +7408,7 @@
7087	7408	startX = info.x;
7088	7409	startY = info.y;
7089	7410
7090		- hitSomething = 0;
	7411	+ hitSomething = -1;
7091	7412	cVector origin = new cVector();
7092	7413	//LA.xformPos(origin, toParent, origin);
7093	7414	Rectangle spot = new Rectangle();
..	..	@@ -7120,7 +7441,7 @@
7120	7441	}
7121	7442
7122	7443	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7444	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7445	//System.out.println("modified = " + modified);
7125	7446	//new Exception().printStackTrace();
7126	7447	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7469,7 @@
7148	7469	return true;
7149	7470	}
7150	7471
7151		- void doEditDrag0(ClickInfo info)
	7472	+ void doEditDrag0(ClickInfo info, boolean opposite)
7152	7473	{
7153	7474	if (hitSomething == 0)
7154	7475	{
..	..	@@ -7163,6 +7484,7 @@
7163	7484	//System.out.println("hitSomething = " + hitSomething);
7164	7485
7165	7486	double scale = 0.005f * info.camera.Distance();
	7487	+
7166	7488	cVector xlate = new cVector();
7167	7489	//cVector xlate2 = new cVector();
7168	7490	switch (hitSomething)
..	..	@@ -7175,7 +7497,7 @@
7175	7497
7176	7498	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7499
7178		- if (modified)
	7500	+ if (modified \|\| opposite)
7179	7501	{
7180	7502	//assert(false);
7181	7503	/*
..	..	@@ -7269,6 +7591,7 @@
7269	7591
7270	7592	if (modified)
7271	7593	{
	7594	+ // Rotate 90 degrees
7272	7595	angle /= (Math.PI / 4);
7273	7596	angle = Math.floor(angle + 0.5);
7274	7597	angle *= (Math.PI / 4);
..	..	@@ -7310,24 +7633,27 @@
7310	7633
7311	7634	case hitScale: // scale
7312	7635	double hScale = (double) (info.x - centerPt.x) / 32;
	7636	+ double sign = 1;
	7637	+ if (hScale < 0)
	7638	+ {
	7639	+ sign = -1;
	7640	+ }
	7641	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7642	if (hScale < 0.01)
7314	7643	{
7315		- hScale = 0.01;
	7644	+ //hScale = 0.01;
7316	7645	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
7319		- {
7320		- hScale = 0.01;
7321		- }
	7646	+
7322	7647	double vScale = (double) (info.y - centerPt.y) / 32;
7323		- if (vScale < 0.01)
	7648	+ sign = 1;
	7649	+ if (vScale < 0)
7324	7650	{
7325		- vScale = 0.01;
	7651	+ sign = -1;
7326	7652	}
7327		- vScale = Math.pow(vScale, scale * 50);
	7653	+ vScale = signMath.pow(signvScale, scale * 50);
7328	7654	if (vScale < 0.01)
7329	7655	{
7330		- vScale = 0.01;
	7656	+ //vScale = 0.01;
7331	7657	}
7332	7658	LA.matCopy(startMat, toParent);
7333	7659	/**/
..	..	@@ -7338,39 +7664,47 @@
7338	7664	}
7339	7665	/**/
7340	7666
	7667	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7668	+
	7669	+ if (totalScale < 0.01)
	7670	+ {
	7671	+ totalScale = 0.01;
	7672	+ }
	7673	+
7341	7674	switch (info.pane.RenderCamera().viewCode)
7342	7675	{
7343	7676	case 3: // '\001'
7344		- if (modified)
	7677	+ if (modified \|\| opposite)
7345	7678	{
7346	7679	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7680	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7681	} // vScale, 1);
7349	7682	else
7350	7683	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7684	+ // EXCEPTION!
	7685	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7686	} // vScale, 1);
7353	7687	break;
7354	7688
7355	7689	case 2: // '\002'
7356		- if (modified)
	7690	+ if (modified \|\| opposite)
7357	7691	{
7358	7692	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7693	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7694	} else
7361	7695	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7696	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7697	}
7364	7698	break;
7365	7699
7366	7700	case 1: // '\003'
7367		- if (modified)
	7701	+ if (modified \|\| opposite)
7368	7702	{
7369	7703	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7704	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7705	} else
7372	7706	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7707	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7708	}
7375	7709	break;
7376	7710	}
..	..	@@ -7503,14 +7837,22 @@
7503	7837	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7838	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7839	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7840	+
	7841	+ String objname;
	7842	+
7506	7843	if (false) //parent != null)
7507	7844	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7845	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7846	} else
7510	7847	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7848	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	7849	} // + super.toString();
7513	7850	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7851	+
	7852	+ if (!Globals.ADVANCED)
	7853	+ return objname;
	7854	+
	7855	+ return objname + " " + System.identityHashCode(this);
7514	7856	}
7515	7857
7516	7858	public int hashCode()
..	..	@@ -7566,6 +7908,7 @@
7566	7908	objectUI.closeUI();
7567	7909	if (editWindow != null)
7568	7910	{
	7911	+ editWindow.ctrlPanel.FlushUI();
7569	7912	editWindow.refreshContents();
7570	7913	} // ? new
7571	7914	objectUI = null;
..	..	@@ -7574,6 +7917,10 @@
7574	7917	{
7575	7918	editWindow = null;
7576	7919	} // ?
	7920	+ }
	7921	+ else
	7922	+ {
	7923	+ //editWindow.closeUI();
7577	7924	}
7578	7925	}
7579	7926
..	..	@@ -7586,7 +7933,7 @@
7586	7933	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	7934
7588	7935	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	7936	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	7937
7591	7938	double[][] toParent; // dynamic matrix
7592	7939	double[][] fromParent;
..	..	@@ -7701,7 +8048,7 @@
7701	8048	{
7702	8049	assert(bRep != null);
7703	8050	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8051	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8052	}
7706	8053	else
7707	8054	{
..	..	@@ -7732,6 +8079,10 @@
7732	8079	}
7733	8080
7734	8081	transient ObjEditor editWindow;
	8082	+ transient ObjEditor manipWindow;
	8083	+
	8084	+ transient boolean pinned;
	8085	+
7735	8086	transient ObjectUI objectUI;
7736	8087	public static int povDepth = 0;
7737	8088	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8101,9 @@
7750	8101	private static cVector edge2 = new cVector();
7751	8102	//private static cVector norm = new cVector();
7752	8103	/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;
	8104	+ static final int hitCenter = 1;
	8105	+ static final int hitScale = 2;
	8106	+ static final int hitRotate = 3;
7756	8107	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8108	/transient/ private Point centerPt;
7758	8109	/transient/ private int startX;