~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -7,7 +7,8 @@
7	7
8	8	class BoundaryRep implements java.io.Serializable
9	9	{
10		- static final long serialVersionUID = -4852664309425035321L;
	10	+ static final long serialVersionUID = // VERY old 2008 -5762968998168738314L;
	11	+ -4852664309425035321L;
11	12
12	13	transient int displaylist = 0;
13	14
..	..	@@ -15,7 +16,7 @@
15	16	{
16	17	this(0, 0);
17	18	}
18		-
	19	+
19	20	void SaveSupports()
20	21	{
21	22	transientsupport = support;
..	..	@@ -161,6 +162,7 @@
161	162	\|\| FaceCount() != other.FaceCount()
162	163	\|\| !(indices == null ^ other.indices != null)) // july 2014
163	164	{
	165	+ // The meshes have different structures.
164	166	//new Exception().printStackTrace();
165	167	trimmed = other.trimmed;
166	168	stripified = other.stripified;
..	..	@@ -172,16 +174,16 @@
172	174	bufV = other.bufV;
173	175	bufF = other.bufF;
174	176
175		- positions = (float[]) GrafreeD.clone(other.positions);
176		- normals = (float[]) GrafreeD.clone(other.normals);
177		- colors = (float[]) GrafreeD.clone(other.colors);
178		- uvmap = (float[]) GrafreeD.clone(other.uvmap);
179		- triangles = (int[]) GrafreeD.clone(other.triangles);
	177	+ positions = (float[]) Grafreed.clone(other.positions);
	178	+ normals = (float[]) Grafreed.clone(other.normals);
	179	+ colors = (float[]) Grafreed.clone(other.colors);
	180	+ uvmap = (float[]) Grafreed.clone(other.uvmap);
	181	+ triangles = (int[]) Grafreed.clone(other.triangles);
180	182
181		- indices = (int[]) GrafreeD.clone(other.indices);
	183	+ indices = (int[]) Grafreed.clone(other.indices);
182	184
183		- vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices);
184		- faces = (Vector<Face>) GrafreeD.clone(other.faces);
	185	+ vertices = (Vector<Vertex>) Grafreed.clone(other.vertices);
	186	+ faces = (Vector<Face>) Grafreed.clone(other.faces);
185	187	}
186	188	else
187	189	{
..	..	@@ -239,9 +241,16 @@
239	241	}
240	242	}
241	243
242		- Support[] InitConnections(BoundaryRep other)
	244	+ transient Support[] cachesupports = null;
	245	+
	246	+ Support[] InitConnections()
243	247	{
244		- int n = other.startvertices.length-1;
	248	+ if (cachesupports != null)
	249	+ {
	250	+ return cachesupports;
	251	+ }
	252	+
	253	+ int n = this.startvertices.length-1;
245	254
246	255	Support[] supports = new Support[n];
247	256
..	..	@@ -253,38 +262,60 @@
253	262
254	263	for (int object=1; object<=n; object++)
255	264	{
256		- int start = other.startvertices[object-1];
257		- int end = other.startvertices[object];
	265	+ int start = this.startvertices[object-1];
	266	+ int end = this.startvertices[object];
258	267
259	268	if (start == end)
260	269	continue; // ??
261	270
	271	+ /**
	272	+ Vertex v2 = vertextemp;
	273	+ v2.x = averagepoints[object*3];
	274	+ v2.y = averagepoints[object*3+1];
	275	+ v2.z = averagepoints[object*3+2];
	276	+
	277	+ //v2.set(GetVertex(this.startvertices[subsupport]));
	278	+
	279	+ // projected point
	280	+ Vertex v3 = vertextemp2;
	281	+ //GetVertex(this.startvertices[subsupport]);
	282	+ v3.x = extremepoints[object*3];
	283	+ v3.y = extremepoints[object*3+1];
	284	+ v3.z = extremepoints[object*3+2];
	285	+
	286	+ vect3.set(v3); // "X" axis apex
	287	+ vect3.sub(v2); // origin (center)
	288	+ vect3.normalize();
	289	+ /**/
	290	+
262	291	int linkcount = 0;
263	292
264	293	int objectinlist = -1;
	294	+
	295	+ Support subsupport = supports[object-1];
265	296
266	297	for (int object2=1; object2<=n; object2++)
267	298	{
268	299	for (int i = start; i < end; i++)
269	300	{
270		- Vertex v = other.GetVertex(i);
	301	+ Vertex v = this.GetVertex(i);
271	302
272		- //
273		- if (other.Contains(v, object2))
	303	+ // Check if v is close enough from any vertex of the given subobject.
	304	+ if (this.Contains(v, object2))
274	305	{
275		- if (linkcount == supports[object-1].links.length)
	306	+ if (linkcount == subsupport.links.length)
276	307	break;
277	308
278	309	if (object2 == object)
279	310	objectinlist = linkcount;
280	311
281		- supports[object-1].links[linkcount++] = object2;
	312	+ subsupport.links[linkcount++] = object2;
282	313	break;
283	314	}
284	315	}
285	316	}
286	317
287		- supports[object-1].links[linkcount] = -1;
	318	+ subsupport.links[linkcount] = -1;
288	319
289	320	if (objectinlist == -1)
290	321	assert(objectinlist != -1);
..	..	@@ -293,9 +324,9 @@
293	324	// assert(linkcount > 1);
294	325
295	326	// show main support as blue
296		- int first = supports[object-1].links[0];
297		- supports[object-1].links[0] = supports[object-1].links[objectinlist];
298		- supports[object-1].links[objectinlist] = first;
	327	+ int first = subsupport.links[0];
	328	+ subsupport.links[0] = subsupport.links[objectinlist];
	329	+ subsupport.links[objectinlist] = first;
299	330	}
300	331
301	332	for (int loop = 0; --loop>=0;)
..	..	@@ -353,7 +384,7 @@
353	384	supports = supports2;
354	385	}
355	386
356		- return supports;
	387	+ return cachesupports = supports;
357	388	}
358	389
359	390	double Distance2(Vertex v, Vertex v2, double dist2beat, double[][] toRoot, int k)
..	..	@@ -497,10 +528,10 @@
497	528	return dist2;
498	529	}
499	530
500		- static Vertex vertextemp = new Vertex();
501		- static Vertex vertextemp2 = new Vertex();
	531	+ static Vertex vertextemp = new Vertex(true);
	532	+ static Vertex vertextemp2 = new Vertex(true);
502	533
503		- static double SEUIL = 0.1; // 0.1 for rag doll; 0.07;
	534	+ static double SEUIL = 0.025f; // 0.1 for rag doll; 0.07;
504	535
505	536	// Compute weight of point w/r to this
506	537	float ComputeWeight(Vertex v, double[][] toRoot, int k)
..	..	@@ -570,8 +601,10 @@
570	601
571	602	if (dot > distmax)
572	603	dot = distmax;
	604	+ //return 0; // patch for strange behavior
573	605	if (dot < -distmax)
574	606	dot = -distmax;
	607	+ //return 0; // patch for strange behavior
575	608
576	609	// v3 = GetVertex(this.startvertices[subsupport] + 16);
577	610	//
..	..	@@ -596,7 +629,7 @@
596	629	// ;
597	630	//
598	631
599		- supportsize = supportsizes[subsupport];
	632	+ supportsize = supportminsize[subsupport];
600	633
601	634	double K = supportsize / distmax;
602	635
..	..	@@ -609,10 +642,12 @@
609	642
610	643	float dist2 = (float)Distance2(v, v2, 1E10, toRoot, k);
611	644
612		- if (dist2 >= 2 * SEUIL*SEUIL) // && !CameraPane.CROWD) // weightmode
	645	+ double seuil = SEUIL * 2;
	646	+
	647	+ if (dist2 >= 2 * seuil*seuil) // && !CameraPane.CROWD) // weightmode
613	648	return 0;
614	649
615		- dist2 /= 2 * SEUIL*SEUIL; // multiplied by two because center of support
	650	+ dist2 /= 2 * seuil*seuil; // multiplied by two because center of support
616	651	// could be far from closest point
617	652
618	653	// dist2 = Math.pow(dist2, 2);
..	..	@@ -646,11 +681,13 @@
646	681	// if (supportsize * fadefactor > 1)
647	682	// return 1;
648	683
649		- return supportsize * fadefactor;
	684	+ return //supportsize *
	685	+ supportsize * fadefactor;
650	686	}
651	687
652	688	void RecomputeBasis(BoundaryRep other, double[][] toRoot, Vertex v)
653	689	{
	690	+ CameraPane.CreateSelectedPoint();
654	691	CameraPane.selectedpoint.
655	692	getAverage(cStatic.point1, true);
656	693
..	..	@@ -786,7 +823,7 @@
786	823	v.weights[k] = other.ComputeWeight(v, toRoot, k); // (float)(supportsize * normalweight * nz / Math.pow(txtx+tyty+tz*tz, 1));
787	824	v.totalweight += v.weights[k];
788	825
789		- if (CameraPane.CROWD)
	826	+ if (Globals.CROWD)
790	827	{
791	828	// System.out.print("weight = " + v.weights[k]);
792	829	// System.out.println("; totalweight = " + v.totalweight);
..	..	@@ -946,9 +983,9 @@
946	983
947	984	int nbsupports;
948	985
949		- SEUIL = 0.1; // aout 2013
	986	+ // sept 2017 SEUIL = 0.1; // aout 2013
950	987
951		- supports = InitConnections(other);
	988	+ supports = other.InitConnections();
952	989
953	990	other.supports = supports; // should be the other way around...
954	991
..	..	@@ -968,6 +1005,7 @@
968	1005
969	1006	v.closestsupport = -1;
970	1007
	1008	+ CameraPane.CreateSelectedPoint();
971	1009	CameraPane.selectedpoint.
972	1010	getAverage(cStatic.point1, true);
973	1011
..	..	@@ -982,7 +1020,7 @@
982	1020
983	1021	int subsupports = 0;
984	1022
985		- SEUIL = 0.1; // aout 2013
	1023	+ // sept 2017 SEUIL = 0.1; // aout 2013
986	1024
987	1025	while (subsupports == 0)
988	1026	{
..	..	@@ -1006,6 +1044,26 @@
1006	1044
1007	1045	vect.set(v);
1008	1046	vect.sub(vect2);
	1047	+
	1048	+// vertextemp.x = other.averagepoints[c*3];
	1049	+// vertextemp.y = other.averagepoints[c*3+1];
	1050	+// vertextemp.z = other.averagepoints[c*3+2];
	1051	+//
	1052	+// Vertex v3 = vertextemp2;
	1053	+// v3.x = other.extremepoints[c*3];
	1054	+// v3.y = other.extremepoints[c*3+1];
	1055	+// v3.z = other.extremepoints[c*3+2];
	1056	+//
	1057	+// vect3.set(v3); // "X" axis apex
	1058	+// vect3.sub(vertextemp); // origin (center)
	1059	+//
	1060	+// double distmax = vect3.length();
	1061	+//
	1062	+// vect3.set(v2); // "X" axis apex
	1063	+// vect3.sub(vertextemp); // origin (center)
	1064	+//
	1065	+// if (vect3.length() >= distmax)
	1066	+// continue;
1009	1067
1010	1068	if (mindistance > vect.dot(vect))
1011	1069	{
..	..	@@ -1017,7 +1075,9 @@
1017	1075
1018	1076	subsupports = v.closestsupport==-1 ? 0 : supports[v.closestsupport].Length();
1019	1077
1020		- SEUIL *= 2;
	1078	+ // previously for "contains", now for weights.
	1079	+ assert(subsupports > 0);
	1080	+ //SEUIL *= 2;
1021	1081	}
1022	1082
1023	1083	assert(subsupports > 0);
..	..	@@ -1204,6 +1264,7 @@
1204	1264	for (int wi = v0.weights.length; --wi>=0;)
1205	1265	v[wi] = 0;
1206	1266
	1267	+ CameraPane.CreateSelectedPoint();
1207	1268	CameraPane.selectedpoint.
1208	1269	getAverage(cStatic.point1, true);
1209	1270
..	..	@@ -1341,6 +1402,7 @@
1341	1402	v0.x = v0.y = v0.z = 0;
1342	1403	v0.norm.x = v0.norm.y = v0.norm.z = 0;
1343	1404
	1405	+ CameraPane.CreateSelectedPoint();
1344	1406	CameraPane.selectedpoint.
1345	1407	getAverage(cStatic.point1, true);
1346	1408
..	..	@@ -1492,7 +1554,7 @@
1492	1554	InitFaceIndices();
1493	1555	}
1494	1556
1495		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1557	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1496	1558	//float[] v = new float[100];
1497	1559
1498	1560	for (int loops=1; --loops>=0;)
..	..	@@ -1522,7 +1584,7 @@
1522	1584	InitFaceIndices();
1523	1585	}
1524	1586
1525		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1587	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1526	1588	//float[] v = new float[100];
1527	1589
1528	1590	for (int loops=10; --loops>=0;)
..	..	@@ -1869,7 +1931,7 @@
1869	1931	return;
1870	1932	}
1871	1933
1872		- // System.exit(0);
	1934	+ // System.exit(0);
1873	1935
1874	1936	cVector vect = new cVector();
1875	1937	cVector normal = new cVector();
..	..	@@ -1940,7 +2002,10 @@
1940	2002	if (v.vertexlinks == null)
1941	2003	continue;
1942	2004
1943		- if (v.weights != null && v.weights[j] == 0) // < 0.01 * v.totalweight) // == 0)
	2005	+ // Warning: faster but dangerous
	2006	+ if (v.weights != null && v.weights[j]
	2007	+ == 0)
	2008	+ //< 0.001 * v.totalweight)
1944	2009	{
1945	2010	//testweight += v.weights[j-1];
1946	2011	continue;
..	..	@@ -2221,6 +2286,8 @@
2221	2286
2222	2287	transient int lastsoundtime;
2223	2288
	2289	+ transient boolean once = false;
	2290	+
2224	2291	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2225	2292	{
2226	2293	if (LA.isIdentity(toRoot))
..	..	@@ -2276,7 +2343,11 @@
2276	2343
2277	2344	if (v.totalweight == 0)
2278	2345	{
2279		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2346	+ if (!once)
	2347	+ {
	2348	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2349	+ once = true;
	2350	+ }
2280	2351	continue;
2281	2352	}
2282	2353
..	..	@@ -2635,18 +2706,18 @@
2635	2706	if (false) // slow && stepout && onein)
2636	2707	{
2637	2708	// sound
2638		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	2709	+ cVector eye = Globals.theRenderer.EyeCamera().location;
2639	2710
2640	2711	Vertex v = GetVertex(0);
2641	2712
2642	2713	tmp.set(v);
2643	2714	tmp.sub(eye);
2644	2715
2645		- if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs
	2716	+ if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2646	2717	{
2647		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2718	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2648	2719
2649		- lastsoundtime = CameraPane.framecount;
	2720	+ lastsoundtime = Globals.framecount;
2650	2721	}
2651	2722
2652	2723	stepout = false;
..	..	@@ -3072,6 +3143,7 @@
3072	3143	//
3073	3144	// transient VertexCompare[] vertexcompare = null;
3074	3145
	3146	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3075	3147	boolean Contains(Vertex v0, int object)
3076	3148	{
3077	3149	int start = startvertices[object-1];
..	..	@@ -3129,7 +3201,27 @@
3129	3201	*/
3130	3202	}
3131	3203
3132		- void GenUV()
	3204	+ void UnfoldUV()
	3205	+ {
	3206	+ for (int i = 0; i < VertexCount(); i++)
	3207	+ {
	3208	+ Vertex v = GetVertex(i);
	3209	+
	3210	+ v.x = v.s;
	3211	+ v.y = v.t;
	3212	+ v.z = 0;
	3213	+
	3214	+ v.norm.x = 0;
	3215	+ v.norm.y = 0;
	3216	+ v.norm.z = 1;
	3217	+
	3218	+ SetVertex(v, i);
	3219	+ }
	3220	+ }
	3221	+
	3222	+ float power = 2;
	3223	+
	3224	+ void GenUV() // float power)
3133	3225	{
3134	3226	Trim();
3135	3227
..	..	@@ -3193,6 +3285,125 @@
3193	3285	y -= 0.5;
3194	3286	z -= 0.5;
3195	3287
	3288	+ double ax = Math.abs(x);
	3289	+ double ay = Math.abs(y);
	3290	+ double max = ax;
	3291	+ if (max < ay)
	3292	+ {
	3293	+ max = ay;
	3294	+ }
	3295	+
	3296	+ if (max == 0)
	3297	+ {
	3298	+ uvmap[i2] = 0.5f;
	3299	+ uvmap[i2+1] = 0.5f;
	3300	+ continue;
	3301	+ }
	3302	+
	3303	+ x /= max;
	3304	+ y /= max;
	3305	+
	3306	+ double angle = Math.acos(Math.abs(z*2));
	3307	+
	3308	+ double k = angle / Math.PI * 2;
	3309	+
	3310	+ assert(k >= 0);
	3311	+
	3312	+ // k == 0 => uv = 0 (center)
	3313	+ // k == 1 => uv = -1,1 (border)
	3314	+
	3315	+ if (i == 0)
	3316	+ System.out.println("power = " + power);
	3317	+
	3318	+ double length1 = (ax+ay)/max;
	3319	+ double length2 = Math.sqrt(axax + ayay) / max;
	3320	+
	3321	+ double t = k;
	3322	+
	3323	+ t = Math.pow(t, 3);
	3324	+
	3325	+ // Interpolate between k/length2 (center) and k (border)
	3326	+ if (length2 > 0)
	3327	+ k *= (1 - t) / length2 + t;
	3328	+
	3329	+ double u = k*x;
	3330	+ double v = k*y;
	3331	+
	3332	+ u /= 2;
	3333	+ v /= 2;
	3334	+ u += 0.5;
	3335	+ v += 0.5;
	3336	+
	3337	+ uvmap[i2] = (float) u;
	3338	+ uvmap[i2+1] = (float) v;
	3339	+ }
	3340	+ }
	3341	+
	3342	+ void GenUVold(float power)
	3343	+ {
	3344	+ Trim();
	3345	+
	3346	+ cVector boxcenter = null;
	3347	+ cVector minima, maxima;
	3348	+ minima = new cVector();
	3349	+ maxima = new cVector();
	3350	+ minima.x = minima.y = minima.z = Double.MAX_VALUE;
	3351	+ maxima.x = maxima.y = maxima.z = -Double.MAX_VALUE;
	3352	+ for (int i = 0; i < VertexCount(); i++)
	3353	+ {
	3354	+ Vertex v = GetVertex(i);
	3355	+
	3356	+ if (minima.x > v.x)
	3357	+ {
	3358	+ minima.x = v.x;
	3359	+ }
	3360	+ if (minima.y > v.y)
	3361	+ {
	3362	+ minima.y = v.y;
	3363	+ }
	3364	+ if (minima.z > v.z)
	3365	+ {
	3366	+ minima.z = v.z;
	3367	+ }
	3368	+
	3369	+ if (maxima.x < v.x)
	3370	+ {
	3371	+ maxima.x = v.x;
	3372	+ }
	3373	+ if (maxima.y < v.y)
	3374	+ {
	3375	+ maxima.y = v.y;
	3376	+ }
	3377	+ if (maxima.z < v.z)
	3378	+ {
	3379	+ maxima.z = v.z;
	3380	+ }
	3381	+ }
	3382	+
	3383	+ boxcenter = new cVector((maxima.x + minima.x) / 2, (maxima.y + minima.y) / 2, (maxima.z + minima.z) / 2);
	3384	+ int i2 = 0, i3 = 0;
	3385	+ for (int i = 0; i < positions.length/3; i++, i3 += 3, i2 += 2)
	3386	+ {
	3387	+// //uvmap[i2] = (float) normals[i3]*0.5f + 0.5f; // v.x;
	3388	+// //uvmap[i2 + 1] = (float) normals[i3+1]*0.5f + 0.5f; //z;
	3389	+// uvmap[i2] = (float) (positions[i3] - boxcenter.x);
	3390	+// uvmap[i2 + 1] = (float) (positions[i3+2] - boxcenter.z);
	3391	+// uvmap[i2] = (float) Math.atan2(positions[i3+1] - boxcenter.y, positions[i3] - boxcenter.x);
	3392	+// uvmap[i2 + 1] = (float)(positions[i3+2] - boxcenter.z);
	3393	+ // box UV
	3394	+ double x = positions[i3] - minima.x; // - Math.floor(positions[i3]);
	3395	+ double y = positions[i3+1] - minima.y; // - Math.floor(positions[i3+1]);
	3396	+ double z = positions[i3+2] - minima.z; // - Math.floor(positions[i3+2]);
	3397	+
	3398	+ // [-1/2, 1/2]
	3399	+ x /= maxima.x - minima.x;
	3400	+ y /= maxima.y - minima.y;
	3401	+ z /= maxima.z - minima.z;
	3402	+
	3403	+ x -= 0.5;
	3404	+ y -= 0.5;
	3405	+ z -= 0.5;
	3406	+
3196	3407	// x *= 2;
3197	3408	// y *= 2;
3198	3409	// z *= 2;
..	..	@@ -3219,6 +3430,15 @@
3219	3430
3220	3431	z = Math.cos(angle/2);
3221	3432
	3433	+ assert(z >= 0);
	3434	+ assert(z <= 1);
	3435	+
	3436	+ /**/
	3437	+ //z = Math.pow(z, power); //1.08f);
	3438	+
	3439	+ if (i == 0)
	3440	+ System.out.println("power = " + power);
	3441	+
3222	3442	// sqrt(k2x2 + k2z2 + y2) = length
3223	3443	// k2x2 + k2z2 = length2 - y2
3224	3444	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3229,7 +3449,7 @@
3229	3449	k /= xx + yy;
3230	3450	}
3231	3451	else
3232		- GrafreeD.Assert(z == 1);
	3452	+ Grafreed.Assert(z == 1);
3233	3453
3234	3454	if (k < 0)
3235	3455	k = 0;
..	..	@@ -3238,6 +3458,7 @@
3238	3458
3239	3459	x *= k;
3240	3460	y *= k;
	3461	+ /**/
3241	3462
3242	3463	double max = Math.abs(x);
3243	3464	if (max < Math.abs(y))
..	..	@@ -3250,10 +3471,15 @@
3250	3471	}
3251	3472
3252	3473	// max = Math.sqrt(max*2)/2;
	3474	+// double x2 = Math.pow(Math.abs(x), 1/power);
	3475	+// double y2 = Math.pow(Math.abs(y), 1/power);
	3476	+// double z2 = Math.pow(Math.abs(z), 1/power);
	3477	+// max = Math.pow(x2 + y2 + z2, power);
3253	3478
3254	3479	// if (!(max > 0))
3255		- assert(max > 0);
3256		-
	3480	+ //assert(max > 0);
	3481	+ assert(max >= 0);
	3482	+
3257	3483	x /= max;
3258	3484	y /= max;
3259	3485	z /= max;
..	..	@@ -3516,6 +3742,114 @@
3516	3742	*/
3517	3743	}
3518	3744
	3745	+ void GenerateNormals2(boolean crease)
	3746	+ {
	3747	+ cVector tempVector = new cVector();
	3748	+
	3749	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3750	+//
	3751	+//
	3752	+// for (int i=0; i<this.VertexCount(); i++)
	3753	+// {
	3754	+// Vertex v = this.GetVertex(i);
	3755	+//
	3756	+// tempVector.set(v);
	3757	+//
	3758	+// cVector n = tableBase.get(tempVector.ToFloat());
	3759	+//
	3760	+// if (n != null)
	3761	+// {
	3762	+// continue;
	3763	+// }
	3764	+//
	3765	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3766	+// }
	3767	+
	3768	+ BoundaryRep tempSupport = this.support;
	3769	+
	3770	+ this.support = null;
	3771	+
	3772	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3773	+
	3774	+ this.support = tempSupport;
	3775	+
	3776	+ //tempRep.Unstripify();
	3777	+
	3778	+ tempRep.GenerateNormals(crease);
	3779	+
	3780	+ boolean keepnormal = Vertex.normalmode;
	3781	+ boolean epsequal = Grafreed.epsequal;
	3782	+
	3783	+ Vertex.normalmode = false;
	3784	+ Grafreed.epsequal = false; // A bit strange
	3785	+
	3786	+ // No need to have a match for vertex counts.
	3787	+
	3788	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3789	+
	3790	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3791	+ {
	3792	+ Vertex v = tempRep.GetVertex(i);
	3793	+
	3794	+ cVector n = table.get(tempVector.ToFloat());
	3795	+
	3796	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3797	+ {
	3798	+ //continue;
	3799	+ }
	3800	+
	3801	+ tempVector.set(v);
	3802	+
	3803	+ //cVector nBase = tableBase.get(tempVector);
	3804	+
	3805	+ //if (v.norm.dot(nBase) < 0.9)
	3806	+ //{
	3807	+ // continue;
	3808	+ //}
	3809	+
	3810	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3811	+ {
	3812	+ //continue;
	3813	+ }
	3814	+
	3815	+ if (n != null)
	3816	+ {
	3817	+// if (n.dot(v.norm) < 0)
	3818	+// n.sub(v.norm);
	3819	+// else
	3820	+// n.add(v.norm);
	3821	+//
	3822	+// n.normalize();
	3823	+ continue;
	3824	+ }
	3825	+
	3826	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3827	+ }
	3828	+
	3829	+ for (int i=0; i<this.VertexCount(); i++)
	3830	+ {
	3831	+ Vertex v = this.GetVertex(i);
	3832	+
	3833	+ tempVector.set(v);
	3834	+
	3835	+ cVector n = table.get(tempVector.ToFloat());
	3836	+
	3837	+ //if (n.dot(v.norm) < 0)
	3838	+ if (n == null)
	3839	+ continue;
	3840	+
	3841	+ if (v.norm == null)
	3842	+ v.norm = new cVector();
	3843	+
	3844	+ LA.vecCopy(n, v.norm);
	3845	+
	3846	+ this.SetVertex(v, i);
	3847	+ }
	3848	+
	3849	+ Grafreed.epsequal = epsequal;
	3850	+ Vertex.normalmode = keepnormal;
	3851	+ }
	3852	+
3519	3853	void GenerateNormals(boolean crease)
3520	3854	{
3521	3855	boolean wastrim = trimmed;
..	..	@@ -3532,6 +3866,28 @@
3532	3866	}
3533	3867
3534	3868	Trim(true/wastrim/,true,crease,wasstrip,false);
	3869	+ }
	3870	+
	3871	+ void GenerateNormalsMesh()
	3872	+ {
	3873	+ if (stripified)
	3874	+ {
	3875	+ Unstripify();
	3876	+ }
	3877	+
	3878	+ if (trimmed)
	3879	+ {
	3880	+ normals = null;
	3881	+ }
	3882	+ else
	3883	+ {
	3884	+ for (int i=VertexCount(); --i>=0;)
	3885	+ {
	3886	+ Vertex v = GetVertex(i);
	3887	+
	3888	+ v.norm = null;
	3889	+ }
	3890	+ }
3535	3891	}
3536	3892
3537	3893	void GenNormalsJME()
..	..	@@ -3656,7 +4012,7 @@
3656	4012	NormalGenerator ng;
3657	4013
3658	4014	if (crease)
3659		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4015	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3660	4016	else
3661	4017	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3662	4018
..	..	@@ -3674,8 +4030,6 @@
3674	4030	//System.out.println("NEW = " + positions.length);
3675	4031	uvmap = new float[ta.getVertexCount() * 2];
3676	4032
3677		- colors = new float[ta.getVertexCount()]; // * 3];
3678		-
3679	4033	ta.getCoordinates(0, positions);
3680	4034	ta.getNormals(0, normals);
3681	4035	// ta.getColors(0, colors);
..	..	@@ -3683,12 +4037,24 @@
3683	4037
3684	4038	System.out.println("UV = " + uvmap[2] + ", " + uvmap[3] + ";");
3685	4039
	4040	+ colors = null;
	4041	+// colors = new float[ta.getVertexCount()]; // * 3];
	4042	+//
	4043	+// for (int i=colors.length; --i>=0;)
	4044	+// {
	4045	+// colors[i] = 1;
	4046	+// }
	4047	+
3686	4048	triangles = new int[ta.getVertexCount()];
3687	4049
3688	4050	for (int i = 0; i < triangles.length; i++)
3689	4051	{
3690	4052	triangles[i] = i;
3691	4053	}
	4054	+
	4055	+// Untrim();
	4056	+ if (!trimmed)
	4057	+ MergeNormals();
3692	4058	}
3693	4059	}
3694	4060
..	..	@@ -3716,12 +4082,18 @@
3716	4082	positions = new float[3 * ga.getVertexCount()];
3717	4083	normals = new float[3 * ga.getVertexCount()];
3718	4084	uvmap = new float[2 * ga.getVertexCount()];
3719		- colors = new float[1 * ga.getVertexCount()];
3720	4085
3721	4086	tsa.getCoordinates(0, positions);
3722	4087	tsa.getNormals(0, normals);
3723	4088	tsa.getTextureCoordinates(0, 0, uvmap);
3724	4089	// tsa.getColors(0, colors);
	4090	+
	4091	+ colors = null;
	4092	+// colors = new float[1 * ga.getVertexCount()];
	4093	+// for (int i=colors.length; --i>=0;)
	4094	+// {
	4095	+// colors[i] = 1;
	4096	+// }
3725	4097
3726	4098	int stripcount = tsa.getNumStrips();
3727	4099	triangles = new int[stripcount];
..	..	@@ -3730,6 +4102,7 @@
3730	4102	stripified = true;
3731	4103	} catch (ClassCastException e)
3732	4104	{
	4105	+ // ??? aug 2019
3733	4106	TriangleArray ta = (TriangleArray) ga;
3734	4107
3735	4108	positions = new float[3 * ga.getVertexCount()];
..	..	@@ -3744,6 +4117,10 @@
3744	4117	triangles = new int[1];
3745	4118	triangles[0] = 3;
3746	4119	}
	4120	+
	4121	+ //Untrim();
	4122	+ if (!trimmed)
	4123	+ MergeNormals();
3747	4124	}
3748	4125
3749	4126	/*
..	..	@@ -3776,21 +4153,66 @@
3776	4153	for (int i = 0; i < VertexCount(); i++)
3777	4154	{
3778	4155	Vertex v = GetVertex(i);
	4156	+
	4157	+ vertextemp.set(v);
	4158	+
3779	4159	//if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
3780	4160	{
3781		- GenerateNormal(i, v);
3782		- SetVertex(v, i);
	4161	+ if (!GenerateNormal(i, vertextemp))
	4162	+ continue;
	4163	+
	4164	+ if (v.norm.dot(vertextemp.norm) < 0)
	4165	+ vertextemp.norm.mul(-1);
	4166	+
	4167	+ if (v.norm.dot(vertextemp.norm) < 0.9)
	4168	+ SetVertex(vertextemp, i);
3783	4169	}
3784	4170	}
3785	4171
3786	4172	Vertex.normalmode = false;
3787	4173	}
3788	4174
	4175	+ void MergeNormals()
	4176	+ {
	4177	+ assert(!trimmed);
	4178	+
	4179	+ boolean smooth = Grafreed.smoothmode;
	4180	+ boolean link = Grafreed.linkUV;
	4181	+ Grafreed.smoothmode = true;
	4182	+ Grafreed.linkUV = true;
	4183	+
	4184	+ System.out.println("#Vertex = " + VertexCount());
	4185	+ System.out.println("#Face = " + FaceCount());
	4186	+
	4187	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4188	+
	4189	+ for (int i = 0; i < VertexCount(); i++)
	4190	+ {
	4191	+ Vertex v = GetVertex(i);
	4192	+
	4193	+ if (!table.contains(v))
	4194	+ {
	4195	+ table.add(v);
	4196	+ }
	4197	+ }
	4198	+
	4199	+ Grafreed.smoothmode = smooth;
	4200	+ Grafreed.linkUV = link;
	4201	+
	4202	+// for (int i = 0; i < VertexCount(); i++)
	4203	+// {
	4204	+// Vertex v = GetVertex(i);
	4205	+//
	4206	+// table.add(v);
	4207	+// }
	4208	+
	4209	+ }
	4210	+
3789	4211	static cVector temp1 = new cVector();
3790	4212	static cVector temp2 = new cVector();
3791	4213	static cVector temp3 = new cVector();
3792	4214
3793		- void GenerateNormal(int index, Vertex v)
	4215	+ boolean GenerateNormal(int index, Vertex v)
3794	4216	{
3795	4217	//System.out.println("Old normal = " + v.norm);
3796	4218	LA.setVector(v.norm, 0, 0, 0);
..	..	@@ -3819,6 +4241,10 @@
3819	4241	LA.vecSub(p/.pos/, v/.pos/, temp1);
3820	4242	LA.vecSub(q/.pos/, v/.pos/, temp2);
3821	4243	}
	4244	+ else
	4245	+ {
	4246	+ continue;
	4247	+ }
3822	4248
3823	4249	//LA.vecNormalize(temp1);
3824	4250	//LA.vecNormalize(temp2);
..	..	@@ -3829,17 +4255,25 @@
3829	4255	double s = temp3.length();
3830	4256	//double c = temp2.dot(temp1);
3831	4257
	4258	+ if (s == 0)
	4259	+ return false;
	4260	+
3832	4261	float angle = 1; // (float) Math.atan2(s, c);
3833	4262	//if(angle < 0) angle = -angle;
3834	4263
3835	4264	//LA.vecNormalize(temp3);
3836	4265	LA.vecScale(temp3, angle / s);
3837	4266
	4267	+// if (temp3.dot(v.norm) < 0)
	4268	+// assert(temp3.dot(v.norm) >= 0);
	4269	+
3838	4270	LA.vecAdd(temp3, v.norm, v.norm);
3839	4271	}
3840	4272
3841	4273	LA.vecNormalize(v.norm);
3842	4274	//System.out.println("New normal = " + v.norm);
	4275	+
	4276	+ return true;
3843	4277	}
3844	4278
3845	4279	double Arccos(double x)
..	..	@@ -4381,7 +4815,7 @@
4381	4815	}
4382	4816	}
4383	4817
4384		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4818	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4385	4819	{
4386	4820	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4387	4821	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4413,14 +4847,14 @@
4413	4847	// june 2014
4414	4848	// Camera parentcam = cam;
4415	4849	//
4416		-// if (cam == CameraPane.theRenderer.cameras[0])
	4850	+// if (cam == Globals.theRenderer.cameras[0])
4417	4851	// {
4418		-// parentcam = CameraPane.theRenderer.cameras[1];
	4852	+// parentcam = Globals.theRenderer.cameras[1];
4419	4853	// }
4420	4854	//
4421		-// if (cam == CameraPane.theRenderer.cameras[1])
	4855	+// if (cam == Globals.theRenderer.cameras[1])
4422	4856	// {
4423		-// parentcam = CameraPane.theRenderer.cameras[0];
	4857	+// parentcam = Globals.theRenderer.cameras[0];
4424	4858	// }
4425	4859
4426	4860	gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..	..	@@ -4546,16 +4980,25 @@
4546	4980	{
4547	4981	i3 = positions.length-3;
4548	4982	i2 = uvmap.length - 2;
4549		- new Exception().printStackTrace();
	4983	+ //new Exception().printStackTrace();
4550	4984	}
4551	4985
4552	4986	v./pos./x = positions[i3];
4553	4987	v./pos./y = positions[i3 + 1];
4554	4988	v./pos./z = positions[i3 + 2];
4555	4989
4556		- v.norm.x = normals[i3];
4557		- v.norm.y = normals[i3 + 1];
4558		- v.norm.z = normals[i3 + 2];
	4990	+ if (normals == null)
	4991	+ {
	4992	+ v.norm.x = 0;
	4993	+ v.norm.y = 0;
	4994	+ v.norm.z = 0;
	4995	+ }
	4996	+ else
	4997	+ {
	4998	+ v.norm.x = normals[i3];
	4999	+ v.norm.y = normals[i3 + 1];
	5000	+ v.norm.z = normals[i3 + 2];
	5001	+ }
4559	5002
4560	5003	v.s = uvmap[i2];
4561	5004	v.t = uvmap[i2 + 1];
..	..	@@ -4846,7 +5289,7 @@
4846	5289	return verticesCopy;
4847	5290	}
4848	5291
4849		- void PreprocessOcclusion(CameraPane cp, double[][] transform)
	5292	+ void PreprocessOcclusion(iCameraPane cp, double[][] transform)
4850	5293	{
4851	5294	if (//!trimmed \|\|
4852	5295	AOdone)
..	..	@@ -4855,80 +5298,7 @@
4855	5298	return;
4856	5299	}
4857	5300
4858		- Camera keep = cp.renderCamera;
4859		- cp.renderCamera = localcamera;
4860		-
4861		- if (trimmed)
4862		- {
4863		- float[] colors = new float[positions.length / 3];
4864		-
4865		- int i3 = 0;
4866		- for (int i = 0; i < positions.length / 3; i++, i3 += 3)
4867		- {
4868		- if (normals[i3] == 0 && normals[i3+1] == 0 && normals[i3+2] == 0)
4869		- continue;
4870		-
4871		- from.set(positions[i3], positions[i3 + 1], positions[i3 + 2]);
4872		- to.set(positions[i3] + normals[i3],
4873		- positions[i3 + 1] + normals[i3 + 1],
4874		- positions[i3 + 2] + normals[i3 + 2]);
4875		- LA.xformPos(from, transform, from);
4876		- LA.xformPos(to, transform, to); // RIGID ONLY
4877		- localcamera.setAim(from, to);
4878		-
4879		- CameraPane.occlusionbuffer.display();
4880		-
4881		- if (CameraPane.DEBUG_OCCLUSION)
4882		- cp.display(); // debug
4883		-
4884		- colors[i] = cp.vertexOcclusion.r;
4885		- //colors[i3 + 1] = cp.vertexOcclusion.g;
4886		- //colors[i3 + 2] = cp.vertexOcclusion.b;
4887		-
4888		- if ((i % 1000) == 0 && i != 0)
4889		- {
4890		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
4891		- //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
4892		- System.out.println((int) (100.0 * i / (positions.length / 3)) + "% (" + i + " of " + (positions.length / 3) + ")");
4893		- }
4894		- }
4895		-
4896		- this.colors = colors;
4897		- }
4898		- else
4899		- {
4900		- for (int i = 0; i < VertexCount(); i++)
4901		- {
4902		- Vertex v = GetVertex(i);
4903		-
4904		- if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
4905		- continue;
4906		-
4907		- from.set(v.x, v.y, v.z);
4908		- to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
4909		- LA.xformPos(from, transform, from);
4910		- LA.xformPos(to, transform, to); // RIGID ONLY
4911		- localcamera.setAim(from, to);
4912		-
4913		- CameraPane.occlusionbuffer.display();
4914		-
4915		- if (CameraPane.DEBUG_OCCLUSION)
4916		- cp.display(); // debug
4917		-
4918		- v.AO = cp.vertexOcclusion.r;
4919		-
4920		- if ((i % 1000) == 0 && i != 0)
4921		- {
4922		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
4923		- //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
4924		- System.out.println((int) (100.0 * i / VertexCount()) + "% (" + i + " of " + VertexCount() + ")");
4925		- }
4926		- }
4927		- }
4928		-
4929		- System.out.println("done.");
4930		-
4931		- cp.renderCamera = keep;
	5301	+ cp.PrepOcclusion(this, transform);
4932	5302
4933	5303	AOdone = true;
4934	5304	}
..	..	@@ -5343,17 +5713,27 @@
5343	5713
5344	5714	transient int nbbadfaces; // ?? = 1000000;
5345	5715
5346		- int ChooseTriangle()
	5716	+ /*
	5717	+ */
	5718	+ int ChooseTriangle(boolean firstEquilateral)
5347	5719	{
5348	5720	int chosen = -1;
5349	5721
5350	5722	double minweight = 1E10;
5351	5723
	5724	+ int step = 8; // ?
	5725	+
	5726	+ if (firstEquilateral)
	5727	+ step = 1;
	5728	+
5352	5729	nbbadfaces = 0;
5353		- for (int i=0; i<faces.size(); i+=8)
	5730	+ for (int i=0; i<faces.size(); i+=step)
5354	5731	// for (int i=faces.size(); (i-=8)>=0;)
5355	5732	{
5356	5733	Face face = (Face) faces.get(i);
	5734	+
	5735	+ if (face.used)
	5736	+ continue;
5357	5737
5358	5738	if (!Valid(face))
5359	5739	{
..	..	@@ -5363,6 +5743,15 @@
5363	5743
5364	5744	if (Boundary(face))
5365	5745	continue;
	5746	+
	5747	+// if (Boundary(face.p))
	5748	+// continue;
	5749	+//
	5750	+// if (Boundary(face.q))
	5751	+// continue;
	5752	+//
	5753	+// if (Boundary(face.r))
	5754	+// continue;
5366	5755
5367	5756	if (!ValidValence(face))
5368	5757	continue;
..	..	@@ -5375,22 +5764,55 @@
5375	5764	//?? if (face.weight < 0)
5376	5765	// continue;
5377	5766
5378		- double K = 1; // 0.01; // .25;
5379		-
5380		- double factor = (1-K)face.nbiterations + K; //face.weight;
5381		-
5382		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5383		-
5384		- if (minweight > weight)
	5767	+ if (firstEquilateral)
5385	5768	{
5386		- minweight = weight;
	5769	+ if (OneFaceUsed(links.get(face.p)))
	5770	+ continue;
	5771	+
	5772	+ if (OneFaceUsed(links.get(face.q)))
	5773	+ continue;
	5774	+
	5775	+ if (OneFaceUsed(links.get(face.r)))
	5776	+ continue;
	5777	+
5387	5778	chosen = i;
5388		- if (minweight == 0)
5389		- break;
	5779	+ break;
	5780	+ }
	5781	+ else
	5782	+ {
	5783	+ double K = 1; // 0.01; // .25;
	5784	+
	5785	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5786	+
	5787	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5788	+
	5789	+ if (minweight > weight)
	5790	+ {
	5791	+ minweight = weight;
	5792	+ chosen = i;
	5793	+ if (minweight == 0)
	5794	+ break;
	5795	+ }
5390	5796	}
5391	5797	}
5392	5798
5393	5799	return chosen;
	5800	+ }
	5801	+
	5802	+ private boolean OneFaceUsed(Vector<Face> faces)
	5803	+ {
	5804	+ if (faces.size() != 6)
	5805	+ return true;
	5806	+
	5807	+ for (int i=0; i<6; i+=1)
	5808	+ {
	5809	+ if (faces.get(i).used)
	5810	+ {
	5811	+ return true;
	5812	+ }
	5813	+ }
	5814	+
	5815	+ return false;
5394	5816	}
5395	5817
5396	5818	static boolean remove3valence = true;
..	..	@@ -5426,7 +5848,7 @@
5426	5848	}
5427	5849	else
5428	5850	{
5429		- assert(links.size() == vertices.size());
	5851	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5430	5852
5431	5853	links.setSize(vertices.size());
5432	5854	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5434,6 +5856,7 @@
5434	5856	// linkstouched[i] = false;
5435	5857	if (links.get(i) == null) // ??
5436	5858	{
	5859	+ new Exception().printStackTrace();
5437	5860	links.set(i, new Vector(8));
5438	5861	// linkstouched[i] = true;
5439	5862	}
..	..	@@ -5444,6 +5867,8 @@
5444	5867	}
5445	5868	}
5446	5869
	5870	+ boolean once = false;
	5871	+
5447	5872	for (int i=faces.size(); --i>=0;)
5448	5873	{
5449	5874	Face face = (Face) faces.get(i);
..	..	@@ -5455,6 +5880,9 @@
5455	5880	//if (linkstouched[face.r])
5456	5881	links.get(face.r).add(face);
5457	5882
	5883	+ if (face.used)
	5884	+ once = true;
	5885	+
5458	5886	face.good = 1;
5459	5887	face.boundary = -1;
5460	5888	}
..	..	@@ -6226,6 +6654,7 @@
6226	6654
6227	6655	void InitWeights()
6228	6656	{
	6657	+ new Exception().printStackTrace();
6229	6658	System.exit(0);
6230	6659	int n = 0;
6231	6660	int b = 0;
..	..	@@ -6819,6 +7248,10 @@
6819	7248	return (face.boundary = 1) == 1;
6820	7249	}
6821	7250
	7251	+ // June 2019
	7252	+ if (true)
	7253	+ return (face.boundary = 0) == 1;
	7254	+
6822	7255	// reverse triangle test
6823	7256	q1.set(p);
6824	7257	q2.set(q);
..	..	@@ -7075,6 +7508,7 @@
7075	7508	assert(f2.contains(i));
7076	7509	assert(f3.contains(i));
7077	7510
	7511	+ // when r is the "center", p is along the boundary
7078	7512	while (f0.r != i)
7079	7513	{
7080	7514	int t = f0.p;
..	..	@@ -7131,59 +7565,90 @@
7131	7565	f0 = f3;
7132	7566	f3 = t;
7133	7567	}
7134		- atleastone = true;
7135	7568
	7569	+ int va = f0.q;
	7570	+ int vb = f0.r;
	7571	+ int vc = -1;
	7572	+
	7573	+ Face toremove1 = null;
	7574	+ Face toremove2 = null;
	7575	+
	7576	+ // f0 is the buffer for the first new triangle,
	7577	+ // and otherf is the other upper one.
7136	7578	Face otherf = null;
7137	7579
7138	7580	if (f1.contains(f0.p))
7139	7581	{
7140	7582	if (f1.p == f0.p)
7141	7583	{
	7584	+ assert(false);
7142	7585	f0.r = f1.q;
7143	7586	}
7144	7587	else
7145	7588	{
7146	7589	assert(f1.q == f0.p);
7147		- f0.r = f1.p;
	7590	+ vc = f1.p;
7148	7591	}
7149	7592
7150	7593	otherf = f2;
7151		- faces.remove(f1);
7152		- faces.remove(f3);
	7594	+ toremove1 = f1;
	7595	+ toremove2 = f3;
7153	7596	}
7154	7597	else
7155	7598	if (f2.contains(f0.p))
7156	7599	{
7157	7600	if (f2.p == f0.p)
7158	7601	{
	7602	+ assert(false);
7159	7603	f0.r = f2.q;
7160	7604	}
7161	7605	else
7162	7606	{
7163	7607	assert(f2.q == f0.p);
7164		- f0.r = f2.p;
	7608	+ vc = f2.p;
7165	7609	}
7166	7610
7167	7611	otherf = f3;
7168		- faces.remove(f1);
7169		- faces.remove(f2);
	7612	+ toremove1 = f1;
	7613	+ toremove2 = f2;
7170	7614	}
7171	7615	if (f3.contains(f0.p))
7172	7616	{
7173	7617	if (f3.p == f0.p)
7174	7618	{
	7619	+// assert(false);
	7620	+ new Exception().printStackTrace();
7175	7621	f0.r = f3.q;
7176	7622	}
7177	7623	else
7178	7624	{
7179	7625	assert(f3.q == f0.p);
7180		- f0.r = f3.p;
	7626	+ vc = f3.p;
7181	7627	}
7182	7628
7183	7629	otherf = f1;
7184		- faces.remove(f2);
7185		- faces.remove(f3);
	7630	+ toremove1 = f2;
	7631	+ toremove2 = f3;
7186	7632	}
	7633	+
	7634	+ vertextemp.set(vertices.get(va));
	7635	+ vertextemp.sub(vertices.get(vb));
	7636	+ vertextemp.normalize();
	7637	+ vertextemp2.set(vertices.get(vc));
	7638	+ vertextemp2.sub(vertices.get(vb));
	7639	+ vertextemp2.normalize();
	7640	+
	7641	+ if (vertextemp.dot(vertextemp2) > -0.95)
	7642	+ {
	7643	+ continue;
	7644	+ }
	7645	+
	7646	+ atleastone = true;
	7647	+
	7648	+ f0.r = vc;
	7649	+
	7650	+ faces.remove(toremove1);
	7651	+ faces.remove(toremove2);
7187	7652
7188	7653	if (!f0.contains(otherf.p))
7189	7654	{
..	..	@@ -7236,7 +7701,7 @@
7236	7701	//InitWeights();
7237	7702	}
7238	7703
7239		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7704	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7240	7705
7241	7706	if (chosen == -1)
7242	7707	{
..	..	@@ -7250,7 +7715,7 @@
7250	7715	//remove3valence = false;
7251	7716	// InitWeights();
7252	7717
7253		- chosen = ChooseTriangle();
	7718	+ chosen = ChooseTriangle(true);
7254	7719	}
7255	7720	}
7256	7721
..	..	@@ -7526,7 +7991,7 @@
7526	7991
7527	7992	// boolean lock;
7528	7993
7529		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7994	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7530	7995	{
7531	7996	if (stripified)
7532	7997	{
..	..	@@ -7554,7 +8019,7 @@
7554	8019	s3 = new cVector();
7555	8020	}
7556	8021
7557		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8022	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7558	8023
7559	8024	try
7560	8025	{
..	..	@@ -7563,12 +8028,12 @@
7563	8028	{
7564	8029	System.err.println("EXCEPTION CAUGHT");
7565	8030	e.printStackTrace();
7566		- return;
	8031	+ return false;
7567	8032	} catch (Error e)
7568	8033	{
7569	8034	System.err.println("ERROR CAUGHT");
7570	8035	e.printStackTrace();
7571		- return;
	8036	+ return false;
7572	8037	}
7573	8038
7574	8039	System.out.println("# faces = " + faces.size());
..	..	@@ -7578,6 +8043,7 @@
7578	8043	{
7579	8044	Face face = (Face) faces.get(i);
7580	8045
	8046	+ face.used = false;
7581	8047	face.nbiterations = 1;
7582	8048	face.weight = -1;
7583	8049	face.boundary = -1;
..	..	@@ -7629,6 +8095,11 @@
7629	8095	nbbadfaces = faces.size();
7630	8096	//remove3valence = true;
7631	8097
	8098	+ int count = 2;
	8099	+
	8100	+ if (onlyone)
	8101	+ count = 1;
	8102	+
7632	8103	firstpass = true;
7633	8104
7634	8105	int n = faces.size();
..	..	@@ -7644,12 +8115,13 @@
7644	8115	System.out.print('.');
7645	8116	}
7646	8117	System.out.println();
	8118	+ boolean atleastone = false;
7647	8119	int i = 0;
7648		- while (reduction34 \|\| faces.size() > n/2)
	8120	+ while (true) // reduction34 \|\| faces.size() > n/2)
7649	8121	{
7650	8122	if (i++%100 == 0)
7651	8123	{
7652		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8124	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7653	8125	System.out.println("#faces = " + faces.size());
7654	8126	// if (i != 1)
7655	8127	// break;
..	..	@@ -7667,6 +8139,8 @@
7667	8139	{
7668	8140	if (!RemoveOneTriangle())
7669	8141	break;
	8142	+
	8143	+ atleastone = true;
7670	8144	}
7671	8145	// if (iterationcount == 0)
7672	8146	// break;
..	..	@@ -7677,8 +8151,8 @@
7677	8151	break;
7678	8152	}
7679	8153	firstpass = false;
7680		- if (onlyone)
7681		- break; // one triangle only
	8154	+// if (--count<0 && !reduction34)
	8155	+// break; // one triangle only
7682	8156	}
7683	8157
7684	8158	InitLinks(false); // for further display
..	..	@@ -7693,7 +8167,9 @@
7693	8167	//Trim(true,cJME.gennormals,true,false); // doesn't work
7694	8168	Trim(true,false,false,false,false);
7695	8169
7696		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8170	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8171	+
	8172	+ return atleastone;
7697	8173	}
7698	8174
7699	8175	void UpdateIndices(Face face, Face minface)
..	..	@@ -7706,18 +8182,21 @@
7706	8182	face.p = minface.p;
7707	8183	//if (leafweights)
7708	8184	face.good = 0; // false;
	8185	+ face.used = true;
7709	8186	}
7710	8187	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7711	8188	{
7712	8189	face.q = minface.p;
7713	8190	//if (leafweights)
7714	8191	face.good = 0; // false;
	8192	+ face.used = true;
7715	8193	}
7716	8194	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7717	8195	{
7718	8196	face.r = minface.p;
7719	8197	//if (leafweights)
7720	8198	face.good = 0; // false;
	8199	+ face.used = true;
7721	8200	}
7722	8201
7723	8202	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7777,50 +8256,50 @@
7777	8256	if (v == 2)
7778	8257	vert = minface.r;
7779	8258	// Face face = (Face) faces.get(i);
7780		- Vector<Face> vertfaces = links.get(vert);
7781		- for (int i=vertfaces.size(); --i>=0;)
7782		- {
7783		- Face face = (Face) vertfaces.get(i);
7784		-
7785		- // if (face.weight == 10000)
7786		- // continue;
7787		-
7788		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7789		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7790		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8259	+ Vector<Face> vertfaces = links.get(vert);
	8260	+ for (int i=vertfaces.size(); --i>=0;)
7791	8261	{
7792		- if (!leafweights)
	8262	+ Face face = (Face) vertfaces.get(i);
	8263	+
	8264	+ // if (face.weight == 10000)
	8265	+ // continue;
	8266	+
	8267	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8268	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8269	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7793	8270	{
7794		-// if(minfaceweight <= 0)
7795		-// assert(minfaceweight > 0);
7796		-//
7797		-// //FaceWeight(face);
7798		-// if(face.weight < 0)
7799		-// assert(face.weight >= 0);
7800		-
7801		- face.weight += minfaceweight;
7802		-
7803		-// if (face.weight >= 10000)
7804		-// assert(face.weight < 10000);
	8271	+ if (!leafweights)
	8272	+ {
	8273	+ // if(minfaceweight <= 0)
	8274	+ // assert(minfaceweight > 0);
	8275	+ //
	8276	+ // //FaceWeight(face);
	8277	+ // if(face.weight < 0)
	8278	+ // assert(face.weight >= 0);
	8279	+
	8280	+ face.weight += minfaceweight;
	8281	+
	8282	+ // if (face.weight >= 10000)
	8283	+ // assert(face.weight < 10000);
	8284	+ }
	8285	+ else
	8286	+ face.weight = -1;
	8287	+
	8288	+ face.nbiterations += 1;
	8289	+ face.boundary = -1;
	8290	+
	8291	+ Vertex p = (Vertex)vertices.get(face.p);
	8292	+ Vertex q = (Vertex)vertices.get(face.q);
	8293	+ Vertex r = (Vertex)vertices.get(face.r);
	8294	+
	8295	+ p.boundary = -1;
	8296	+ q.boundary = -1;
	8297	+ r.boundary = -1;
7805	8298	}
7806	8299	else
7807		- face.weight = -1;
7808		-
7809		- face.nbiterations += 1;
7810		- face.boundary = -1;
7811		-
7812		- Vertex p = (Vertex)vertices.get(face.p);
7813		- Vertex q = (Vertex)vertices.get(face.q);
7814		- Vertex r = (Vertex)vertices.get(face.r);
7815		-
7816		- p.boundary = -1;
7817		- q.boundary = -1;
7818		- r.boundary = -1;
	8300	+ assert(false);
7819	8301	}
7820		- else
7821		- assert(false);
7822	8302	}
7823		- }
7824	8303
7825	8304	// TouchVertex(minface.p);
7826	8305	// TouchVertex(minface.q);
..	..	@@ -8021,6 +8500,7 @@
8021	8500	for (int i=vertfaces.size(); --i>=0;)
8022	8501	{
8023	8502	Face face = (Face) vertfaces.get(i);
	8503	+ face.used = true;
8024	8504	face.good = 0; // false;
8025	8505	if (leafweights)
8026	8506	face.weight = -1;
..	..	@@ -8067,7 +8547,7 @@
8067	8547	if (!trimmed)
8068	8548	return;
8069	8549
8070		- GrafreeD.linkUV = false;
	8550	+ Grafreed.linkUV = false;
8071	8551
8072	8552	try
8073	8553	{
..	..	@@ -8275,9 +8755,6 @@
8275	8755	return "trim = " + trimmed + "; stripped = " + stripified + "; colors = " + colors + "; faces = " + (faces!=null?faces.size():null) + "; triangles = " + (triangles!=null?triangles.length:null) + "; indices = " + indices;
8276	8756	}
8277	8757
8278		- static Camera localcamera = new Camera();
8279		- static cVector from = new cVector();
8280		- static cVector to = new cVector();
8281	8758	boolean trimmed = false;
8282	8759	boolean stripified = false;
8283	8760	transient boolean AOdone = false;
..	..	@@ -8285,8 +8762,10 @@
8285	8762	/transient/ int maxIndexV = 0;
8286	8763	/transient/ int bufV, bufF;
8287	8764	// Raw version
8288		- private float[] positions;
8289		- private float[] normals;
	8765	+ //private
	8766	+ float[] positions;
	8767	+ //private
	8768	+ float[] normals;
8290	8769	float[] colors;
8291	8770	private float[] uvmap;
8292	8771	private int[] triangles;
..	..	@@ -8300,7 +8779,8 @@
8300	8779	int[] startvertices;
8301	8780	float[] averagepoints;
8302	8781	float[] extremepoints;
8303		- float[] supportsizes; // distance of closest point
	8782	+ float[] supportminsize; // distance of closest point
	8783	+ float[] supportmaxsize; // distance of fartest point
8304	8784
8305	8785	transient Hashtable vertextable;
8306	8786	/transient/ private Vertex[] verticesCopy;