~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,7 +15,7 @@
15	15	{
16	16	this(0, 0);
17	17	}
18		-
	18	+
19	19	void SaveSupports()
20	20	{
21	21	transientsupport = support;
..	..	@@ -161,6 +161,7 @@
161	161	\|\| FaceCount() != other.FaceCount()
162	162	\|\| !(indices == null ^ other.indices != null)) // july 2014
163	163	{
	164	+ // The meshes have different structures.
164	165	//new Exception().printStackTrace();
165	166	trimmed = other.trimmed;
166	167	stripified = other.stripified;
..	..	@@ -172,16 +173,16 @@
172	173	bufV = other.bufV;
173	174	bufF = other.bufF;
174	175
175		- positions = (float[]) GraphreeD.clone(other.positions);
176		- normals = (float[]) GraphreeD.clone(other.normals);
177		- colors = (float[]) GraphreeD.clone(other.colors);
178		- uvmap = (float[]) GraphreeD.clone(other.uvmap);
179		- triangles = (int[]) GraphreeD.clone(other.triangles);
	176	+ positions = (float[]) Grafreed.clone(other.positions);
	177	+ normals = (float[]) Grafreed.clone(other.normals);
	178	+ colors = (float[]) Grafreed.clone(other.colors);
	179	+ uvmap = (float[]) Grafreed.clone(other.uvmap);
	180	+ triangles = (int[]) Grafreed.clone(other.triangles);
180	181
181		- indices = (int[]) GraphreeD.clone(other.indices);
	182	+ indices = (int[]) Grafreed.clone(other.indices);
182	183
183		- vertices = (Vector<Vertex>) GraphreeD.clone(other.vertices);
184		- faces = (Vector<Face>) GraphreeD.clone(other.faces);
	184	+ vertices = (Vector<Vertex>) Grafreed.clone(other.vertices);
	185	+ faces = (Vector<Face>) Grafreed.clone(other.faces);
185	186	}
186	187	else
187	188	{
..	..	@@ -239,9 +240,16 @@
239	240	}
240	241	}
241	242
242		- Support[] InitConnections(BoundaryRep other)
	243	+ transient Support[] cachesupports = null;
	244	+
	245	+ Support[] InitConnections()
243	246	{
244		- int n = other.startvertices.length-1;
	247	+ if (cachesupports != null)
	248	+ {
	249	+ return cachesupports;
	250	+ }
	251	+
	252	+ int n = this.startvertices.length-1;
245	253
246	254	Support[] supports = new Support[n];
247	255
..	..	@@ -253,38 +261,60 @@
253	261
254	262	for (int object=1; object<=n; object++)
255	263	{
256		- int start = other.startvertices[object-1];
257		- int end = other.startvertices[object];
	264	+ int start = this.startvertices[object-1];
	265	+ int end = this.startvertices[object];
258	266
259	267	if (start == end)
260	268	continue; // ??
261	269
	270	+ /**
	271	+ Vertex v2 = vertextemp;
	272	+ v2.x = averagepoints[object*3];
	273	+ v2.y = averagepoints[object*3+1];
	274	+ v2.z = averagepoints[object*3+2];
	275	+
	276	+ //v2.set(GetVertex(this.startvertices[subsupport]));
	277	+
	278	+ // projected point
	279	+ Vertex v3 = vertextemp2;
	280	+ //GetVertex(this.startvertices[subsupport]);
	281	+ v3.x = extremepoints[object*3];
	282	+ v3.y = extremepoints[object*3+1];
	283	+ v3.z = extremepoints[object*3+2];
	284	+
	285	+ vect3.set(v3); // "X" axis apex
	286	+ vect3.sub(v2); // origin (center)
	287	+ vect3.normalize();
	288	+ /**/
	289	+
262	290	int linkcount = 0;
263	291
264	292	int objectinlist = -1;
	293	+
	294	+ Support subsupport = supports[object-1];
265	295
266	296	for (int object2=1; object2<=n; object2++)
267	297	{
268	298	for (int i = start; i < end; i++)
269	299	{
270		- Vertex v = other.GetVertex(i);
	300	+ Vertex v = this.GetVertex(i);
271	301
272		- //
273		- if (other.Contains(v, object2))
	302	+ // Check if v is close enough from any vertex of the given subobject.
	303	+ if (this.Contains(v, object2))
274	304	{
275		- if (linkcount == supports[object-1].links.length)
	305	+ if (linkcount == subsupport.links.length)
276	306	break;
277	307
278	308	if (object2 == object)
279	309	objectinlist = linkcount;
280	310
281		- supports[object-1].links[linkcount++] = object2;
	311	+ subsupport.links[linkcount++] = object2;
282	312	break;
283	313	}
284	314	}
285	315	}
286	316
287		- supports[object-1].links[linkcount] = -1;
	317	+ subsupport.links[linkcount] = -1;
288	318
289	319	if (objectinlist == -1)
290	320	assert(objectinlist != -1);
..	..	@@ -293,9 +323,9 @@
293	323	// assert(linkcount > 1);
294	324
295	325	// 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;
	326	+ int first = subsupport.links[0];
	327	+ subsupport.links[0] = subsupport.links[objectinlist];
	328	+ subsupport.links[objectinlist] = first;
299	329	}
300	330
301	331	for (int loop = 0; --loop>=0;)
..	..	@@ -353,7 +383,7 @@
353	383	supports = supports2;
354	384	}
355	385
356		- return supports;
	386	+ return cachesupports = supports;
357	387	}
358	388
359	389	double Distance2(Vertex v, Vertex v2, double dist2beat, double[][] toRoot, int k)
..	..	@@ -497,10 +527,10 @@
497	527	return dist2;
498	528	}
499	529
500		- static Vertex vertextemp = new Vertex();
501		- static Vertex vertextemp2 = new Vertex();
	530	+ static Vertex vertextemp = new Vertex(true);
	531	+ static Vertex vertextemp2 = new Vertex(true);
502	532
503		- static double SEUIL = 0.1; // 0.1 for rag doll; 0.07;
	533	+ static double SEUIL = 0.05f; // 0.1 for rag doll; 0.07;
504	534
505	535	// Compute weight of point w/r to this
506	536	float ComputeWeight(Vertex v, double[][] toRoot, int k)
..	..	@@ -570,8 +600,10 @@
570	600
571	601	if (dot > distmax)
572	602	dot = distmax;
	603	+ //return 0; // patch for strange behavior
573	604	if (dot < -distmax)
574	605	dot = -distmax;
	606	+ //return 0; // patch for strange behavior
575	607
576	608	// v3 = GetVertex(this.startvertices[subsupport] + 16);
577	609	//
..	..	@@ -596,7 +628,7 @@
596	628	// ;
597	629	//
598	630
599		- supportsize = supportsizes[subsupport];
	631	+ supportsize = supportminsize[subsupport];
600	632
601	633	double K = supportsize / distmax;
602	634
..	..	@@ -609,10 +641,12 @@
609	641
610	642	float dist2 = (float)Distance2(v, v2, 1E10, toRoot, k);
611	643
612		- if (dist2 >= 2 * SEUIL*SEUIL) // && !CameraPane.CROWD) // weightmode
	644	+ double seuil = SEUIL * 2;
	645	+
	646	+ if (dist2 >= 2 * seuil*seuil) // && !CameraPane.CROWD) // weightmode
613	647	return 0;
614	648
615		- dist2 /= 2 * SEUIL*SEUIL; // multiplied by two because center of support
	649	+ dist2 /= 2 * seuil*seuil; // multiplied by two because center of support
616	650	// could be far from closest point
617	651
618	652	// dist2 = Math.pow(dist2, 2);
..	..	@@ -646,7 +680,8 @@
646	680	// if (supportsize * fadefactor > 1)
647	681	// return 1;
648	682
649		- return supportsize * fadefactor;
	683	+ return //supportsize *
	684	+ supportsize * fadefactor;
650	685	}
651	686
652	687	void RecomputeBasis(BoundaryRep other, double[][] toRoot, Vertex v)
..	..	@@ -786,7 +821,7 @@
786	821	v.weights[k] = other.ComputeWeight(v, toRoot, k); // (float)(supportsize * normalweight * nz / Math.pow(txtx+tyty+tz*tz, 1));
787	822	v.totalweight += v.weights[k];
788	823
789		- if (CameraPane.CROWD)
	824	+ if (Globals.CROWD)
790	825	{
791	826	// System.out.print("weight = " + v.weights[k]);
792	827	// System.out.println("; totalweight = " + v.totalweight);
..	..	@@ -946,9 +981,9 @@
946	981
947	982	int nbsupports;
948	983
949		- SEUIL = 0.1; // aout 2013
	984	+ // sept 2017 SEUIL = 0.1; // aout 2013
950	985
951		- supports = InitConnections(other);
	986	+ supports = other.InitConnections();
952	987
953	988	other.supports = supports; // should be the other way around...
954	989
..	..	@@ -982,7 +1017,7 @@
982	1017
983	1018	int subsupports = 0;
984	1019
985		- SEUIL = 0.1; // aout 2013
	1020	+ // sept 2017 SEUIL = 0.1; // aout 2013
986	1021
987	1022	while (subsupports == 0)
988	1023	{
..	..	@@ -1006,6 +1041,26 @@
1006	1041
1007	1042	vect.set(v);
1008	1043	vect.sub(vect2);
	1044	+
	1045	+// vertextemp.x = other.averagepoints[c*3];
	1046	+// vertextemp.y = other.averagepoints[c*3+1];
	1047	+// vertextemp.z = other.averagepoints[c*3+2];
	1048	+//
	1049	+// Vertex v3 = vertextemp2;
	1050	+// v3.x = other.extremepoints[c*3];
	1051	+// v3.y = other.extremepoints[c*3+1];
	1052	+// v3.z = other.extremepoints[c*3+2];
	1053	+//
	1054	+// vect3.set(v3); // "X" axis apex
	1055	+// vect3.sub(vertextemp); // origin (center)
	1056	+//
	1057	+// double distmax = vect3.length();
	1058	+//
	1059	+// vect3.set(v2); // "X" axis apex
	1060	+// vect3.sub(vertextemp); // origin (center)
	1061	+//
	1062	+// if (vect3.length() >= distmax)
	1063	+// continue;
1009	1064
1010	1065	if (mindistance > vect.dot(vect))
1011	1066	{
..	..	@@ -1017,7 +1072,9 @@
1017	1072
1018	1073	subsupports = v.closestsupport==-1 ? 0 : supports[v.closestsupport].Length();
1019	1074
1020		- SEUIL *= 2;
	1075	+ // previously for "contains", now for weights.
	1076	+ assert(subsupports > 0);
	1077	+ //SEUIL *= 2;
1021	1078	}
1022	1079
1023	1080	assert(subsupports > 0);
..	..	@@ -1492,7 +1549,7 @@
1492	1549	InitFaceIndices();
1493	1550	}
1494	1551
1495		- BoundaryRep rep = (BoundaryRep) GraphreeD.clone(this);
	1552	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1496	1553	//float[] v = new float[100];
1497	1554
1498	1555	for (int loops=1; --loops>=0;)
..	..	@@ -1522,7 +1579,7 @@
1522	1579	InitFaceIndices();
1523	1580	}
1524	1581
1525		- BoundaryRep rep = (BoundaryRep) GraphreeD.clone(this);
	1582	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1526	1583	//float[] v = new float[100];
1527	1584
1528	1585	for (int loops=10; --loops>=0;)
..	..	@@ -1869,7 +1926,7 @@
1869	1926	return;
1870	1927	}
1871	1928
1872		- // System.exit(0);
	1929	+ // System.exit(0);
1873	1930
1874	1931	cVector vect = new cVector();
1875	1932	cVector normal = new cVector();
..	..	@@ -1940,7 +1997,10 @@
1940	1997	if (v.vertexlinks == null)
1941	1998	continue;
1942	1999
1943		- if (v.weights != null && v.weights[j] == 0) // < 0.01 * v.totalweight) // == 0)
	2000	+ // Warning: faster but dangerous
	2001	+ if (v.weights != null && v.weights[j]
	2002	+ // == 0)
	2003	+ < 0.001 * v.totalweight)
1944	2004	{
1945	2005	//testweight += v.weights[j-1];
1946	2006	continue;
..	..	@@ -2163,7 +2223,7 @@
2163	2223	// if (slow)
2164	2224	// aout 2013
2165	2225	// sept 2013 merde...
2166		- W = 13;
	2226	+ W = 3; // 13;
2167	2227
2168	2228	// POSERATE
2169	2229	if (CameraPane.tickcount > 0 \|\| CameraPane.SLOWPOSE)
..	..	@@ -2221,6 +2281,8 @@
2221	2281
2222	2282	transient int lastsoundtime;
2223	2283
	2284	+ transient boolean once = false;
	2285	+
2224	2286	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2225	2287	{
2226	2288	if (LA.isIdentity(toRoot))
..	..	@@ -2276,7 +2338,11 @@
2276	2338
2277	2339	if (v.totalweight == 0)
2278	2340	{
2279		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2341	+ if (!once)
	2342	+ {
	2343	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2344	+ once = true;
	2345	+ }
2280	2346	continue;
2281	2347	}
2282	2348
..	..	@@ -2600,7 +2666,7 @@
2600	2666	// if (stepout && !playedonce)
2601	2667	// {
2602	2668	// // sound
2603		-// GraphreeD.wav.play();
	2669	+// GrafreeD.wav.play();
2604	2670	// playedonce = true;
2605	2671	// }
2606	2672	//
..	..	@@ -2635,18 +2701,18 @@
2635	2701	if (false) // slow && stepout && onein)
2636	2702	{
2637	2703	// sound
2638		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	2704	+ cVector eye = Globals.theRenderer.EyeCamera().location;
2639	2705
2640	2706	Vertex v = GetVertex(0);
2641	2707
2642	2708	tmp.set(v);
2643	2709	tmp.sub(eye);
2644	2710
2645		- if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs
	2711	+ if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2646	2712	{
2647		- GraphreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2713	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2648	2714
2649		- lastsoundtime = CameraPane.framecount;
	2715	+ lastsoundtime = Globals.framecount;
2650	2716	}
2651	2717
2652	2718	stepout = false;
..	..	@@ -3072,6 +3138,7 @@
3072	3138	//
3073	3139	// transient VertexCompare[] vertexcompare = null;
3074	3140
	3141	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3075	3142	boolean Contains(Vertex v0, int object)
3076	3143	{
3077	3144	int start = startvertices[object-1];
..	..	@@ -3129,7 +3196,27 @@
3129	3196	*/
3130	3197	}
3131	3198
3132		- void GenUV()
	3199	+ void UnfoldUV()
	3200	+ {
	3201	+ for (int i = 0; i < VertexCount(); i++)
	3202	+ {
	3203	+ Vertex v = GetVertex(i);
	3204	+
	3205	+ v.x = v.s;
	3206	+ v.y = v.t;
	3207	+ v.z = 0;
	3208	+
	3209	+ v.norm.x = 0;
	3210	+ v.norm.y = 0;
	3211	+ v.norm.z = 1;
	3212	+
	3213	+ SetVertex(v, i);
	3214	+ }
	3215	+ }
	3216	+
	3217	+ float power = 2;
	3218	+
	3219	+ void GenUV() // float power)
3133	3220	{
3134	3221	Trim();
3135	3222
..	..	@@ -3193,6 +3280,125 @@
3193	3280	y -= 0.5;
3194	3281	z -= 0.5;
3195	3282
	3283	+ double ax = Math.abs(x);
	3284	+ double ay = Math.abs(y);
	3285	+ double max = ax;
	3286	+ if (max < ay)
	3287	+ {
	3288	+ max = ay;
	3289	+ }
	3290	+
	3291	+ if (max == 0)
	3292	+ {
	3293	+ uvmap[i2] = 0.5f;
	3294	+ uvmap[i2+1] = 0.5f;
	3295	+ continue;
	3296	+ }
	3297	+
	3298	+ x /= max;
	3299	+ y /= max;
	3300	+
	3301	+ double angle = Math.acos(Math.abs(z*2));
	3302	+
	3303	+ double k = angle / Math.PI * 2;
	3304	+
	3305	+ assert(k >= 0);
	3306	+
	3307	+ // k == 0 => uv = 0 (center)
	3308	+ // k == 1 => uv = -1,1 (border)
	3309	+
	3310	+ if (i == 0)
	3311	+ System.out.println("power = " + power);
	3312	+
	3313	+ double length1 = (ax+ay)/max;
	3314	+ double length2 = Math.sqrt(axax + ayay) / max;
	3315	+
	3316	+ double t = k;
	3317	+
	3318	+ t = Math.pow(t, 3);
	3319	+
	3320	+ // Interpolate between k/length2 (center) and k (border)
	3321	+ if (length2 > 0)
	3322	+ k *= (1 - t) / length2 + t;
	3323	+
	3324	+ double u = k*x;
	3325	+ double v = k*y;
	3326	+
	3327	+ u /= 2;
	3328	+ v /= 2;
	3329	+ u += 0.5;
	3330	+ v += 0.5;
	3331	+
	3332	+ uvmap[i2] = (float) u;
	3333	+ uvmap[i2+1] = (float) v;
	3334	+ }
	3335	+ }
	3336	+
	3337	+ void GenUVold(float power)
	3338	+ {
	3339	+ Trim();
	3340	+
	3341	+ cVector boxcenter = null;
	3342	+ cVector minima, maxima;
	3343	+ minima = new cVector();
	3344	+ maxima = new cVector();
	3345	+ minima.x = minima.y = minima.z = Double.MAX_VALUE;
	3346	+ maxima.x = maxima.y = maxima.z = -Double.MAX_VALUE;
	3347	+ for (int i = 0; i < VertexCount(); i++)
	3348	+ {
	3349	+ Vertex v = GetVertex(i);
	3350	+
	3351	+ if (minima.x > v.x)
	3352	+ {
	3353	+ minima.x = v.x;
	3354	+ }
	3355	+ if (minima.y > v.y)
	3356	+ {
	3357	+ minima.y = v.y;
	3358	+ }
	3359	+ if (minima.z > v.z)
	3360	+ {
	3361	+ minima.z = v.z;
	3362	+ }
	3363	+
	3364	+ if (maxima.x < v.x)
	3365	+ {
	3366	+ maxima.x = v.x;
	3367	+ }
	3368	+ if (maxima.y < v.y)
	3369	+ {
	3370	+ maxima.y = v.y;
	3371	+ }
	3372	+ if (maxima.z < v.z)
	3373	+ {
	3374	+ maxima.z = v.z;
	3375	+ }
	3376	+ }
	3377	+
	3378	+ boxcenter = new cVector((maxima.x + minima.x) / 2, (maxima.y + minima.y) / 2, (maxima.z + minima.z) / 2);
	3379	+ int i2 = 0, i3 = 0;
	3380	+ for (int i = 0; i < positions.length/3; i++, i3 += 3, i2 += 2)
	3381	+ {
	3382	+// //uvmap[i2] = (float) normals[i3]*0.5f + 0.5f; // v.x;
	3383	+// //uvmap[i2 + 1] = (float) normals[i3+1]*0.5f + 0.5f; //z;
	3384	+// uvmap[i2] = (float) (positions[i3] - boxcenter.x);
	3385	+// uvmap[i2 + 1] = (float) (positions[i3+2] - boxcenter.z);
	3386	+// uvmap[i2] = (float) Math.atan2(positions[i3+1] - boxcenter.y, positions[i3] - boxcenter.x);
	3387	+// uvmap[i2 + 1] = (float)(positions[i3+2] - boxcenter.z);
	3388	+ // box UV
	3389	+ double x = positions[i3] - minima.x; // - Math.floor(positions[i3]);
	3390	+ double y = positions[i3+1] - minima.y; // - Math.floor(positions[i3+1]);
	3391	+ double z = positions[i3+2] - minima.z; // - Math.floor(positions[i3+2]);
	3392	+
	3393	+ // [-1/2, 1/2]
	3394	+ x /= maxima.x - minima.x;
	3395	+ y /= maxima.y - minima.y;
	3396	+ z /= maxima.z - minima.z;
	3397	+
	3398	+ x -= 0.5;
	3399	+ y -= 0.5;
	3400	+ z -= 0.5;
	3401	+
3196	3402	// x *= 2;
3197	3403	// y *= 2;
3198	3404	// z *= 2;
..	..	@@ -3219,6 +3425,15 @@
3219	3425
3220	3426	z = Math.cos(angle/2);
3221	3427
	3428	+ assert(z >= 0);
	3429	+ assert(z <= 1);
	3430	+
	3431	+ /**/
	3432	+ //z = Math.pow(z, power); //1.08f);
	3433	+
	3434	+ if (i == 0)
	3435	+ System.out.println("power = " + power);
	3436	+
3222	3437	// sqrt(k2x2 + k2z2 + y2) = length
3223	3438	// k2x2 + k2z2 = length2 - y2
3224	3439	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3229,7 +3444,7 @@
3229	3444	k /= xx + yy;
3230	3445	}
3231	3446	else
3232		- GraphreeD.Assert(z == 1);
	3447	+ Grafreed.Assert(z == 1);
3233	3448
3234	3449	if (k < 0)
3235	3450	k = 0;
..	..	@@ -3238,6 +3453,7 @@
3238	3453
3239	3454	x *= k;
3240	3455	y *= k;
	3456	+ /**/
3241	3457
3242	3458	double max = Math.abs(x);
3243	3459	if (max < Math.abs(y))
..	..	@@ -3250,10 +3466,15 @@
3250	3466	}
3251	3467
3252	3468	// max = Math.sqrt(max*2)/2;
	3469	+// double x2 = Math.pow(Math.abs(x), 1/power);
	3470	+// double y2 = Math.pow(Math.abs(y), 1/power);
	3471	+// double z2 = Math.pow(Math.abs(z), 1/power);
	3472	+// max = Math.pow(x2 + y2 + z2, power);
3253	3473
3254	3474	// if (!(max > 0))
3255		- assert(max > 0);
3256		-
	3475	+ //assert(max > 0);
	3476	+ assert(max >= 0);
	3477	+
3257	3478	x /= max;
3258	3479	y /= max;
3259	3480	z /= max;
..	..	@@ -3516,6 +3737,111 @@
3516	3737	*/
3517	3738	}
3518	3739
	3740	+ void GenerateNormals2(boolean crease)
	3741	+ {
	3742	+ cVector tempVector = new cVector();
	3743	+
	3744	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3745	+//
	3746	+//
	3747	+// for (int i=0; i<this.VertexCount(); i++)
	3748	+// {
	3749	+// Vertex v = this.GetVertex(i);
	3750	+//
	3751	+// tempVector.set(v);
	3752	+//
	3753	+// cVector n = tableBase.get(tempVector.ToFloat());
	3754	+//
	3755	+// if (n != null)
	3756	+// {
	3757	+// continue;
	3758	+// }
	3759	+//
	3760	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3761	+// }
	3762	+
	3763	+ BoundaryRep tempSupport = this.support;
	3764	+
	3765	+ this.support = null;
	3766	+
	3767	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3768	+
	3769	+ this.support = tempSupport;
	3770	+
	3771	+ //tempRep.Unstripify();
	3772	+
	3773	+ tempRep.GenerateNormals2(crease);
	3774	+
	3775	+ boolean keepnormal = Vertex.normalmode;
	3776	+ boolean epsequal = Grafreed.epsequal;
	3777	+
	3778	+ Vertex.normalmode = false;
	3779	+ Grafreed.epsequal = false; // A bit strange
	3780	+
	3781	+ // No need to have a match for vertex counts.
	3782	+
	3783	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3784	+
	3785	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3786	+ {
	3787	+ Vertex v = tempRep.GetVertex(i);
	3788	+
	3789	+ cVector n = table.get(tempVector.ToFloat());
	3790	+
	3791	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3792	+ {
	3793	+ //continue;
	3794	+ }
	3795	+
	3796	+ tempVector.set(v);
	3797	+
	3798	+ //cVector nBase = tableBase.get(tempVector);
	3799	+
	3800	+ //if (v.norm.dot(nBase) < 0.9)
	3801	+ //{
	3802	+ // continue;
	3803	+ //}
	3804	+
	3805	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3806	+ {
	3807	+ //continue;
	3808	+ }
	3809	+
	3810	+ if (n != null)
	3811	+ {
	3812	+// if (n.dot(v.norm) < 0)
	3813	+// n.sub(v.norm);
	3814	+// else
	3815	+// n.add(v.norm);
	3816	+//
	3817	+// n.normalize();
	3818	+ continue;
	3819	+ }
	3820	+
	3821	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3822	+ }
	3823	+
	3824	+ for (int i=0; i<this.VertexCount(); i++)
	3825	+ {
	3826	+ Vertex v = this.GetVertex(i);
	3827	+
	3828	+ tempVector.set(v);
	3829	+
	3830	+ cVector n = table.get(tempVector.ToFloat());
	3831	+
	3832	+ //if (n.dot(v.norm) < 0)
	3833	+ if (n == null)
	3834	+ continue;
	3835	+
	3836	+ LA.vecCopy(n, v.norm);
	3837	+
	3838	+ this.SetVertex(v, i);
	3839	+ }
	3840	+
	3841	+ Grafreed.epsequal = epsequal;
	3842	+ Vertex.normalmode = keepnormal;
	3843	+ }
	3844	+
3519	3845	void GenerateNormals(boolean crease)
3520	3846	{
3521	3847	boolean wastrim = trimmed;
..	..	@@ -3531,7 +3857,29 @@
3531	3857	e.printStackTrace();
3532	3858	}
3533	3859
3534		- Trim(wastrim,true,crease,wasstrip,false);
	3860	+ Trim(true/wastrim/,true,crease,wasstrip,false);
	3861	+ }
	3862	+
	3863	+ void GenerateNormalsMesh()
	3864	+ {
	3865	+ if (stripified)
	3866	+ {
	3867	+ Unstripify();
	3868	+ }
	3869	+
	3870	+ if (trimmed)
	3871	+ {
	3872	+ normals = null;
	3873	+ }
	3874	+ else
	3875	+ {
	3876	+ for (int i=VertexCount(); --i>=0;)
	3877	+ {
	3878	+ Vertex v = GetVertex(i);
	3879	+
	3880	+ v.norm = null;
	3881	+ }
	3882	+ }
3535	3883	}
3536	3884
3537	3885	void GenNormalsJME()
..	..	@@ -3656,7 +4004,7 @@
3656	4004	NormalGenerator ng;
3657	4005
3658	4006	if (crease)
3659		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4007	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3660	4008	else
3661	4009	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3662	4010
..	..	@@ -3689,6 +4037,10 @@
3689	4037	{
3690	4038	triangles[i] = i;
3691	4039	}
	4040	+
	4041	+// Untrim();
	4042	+ if (!trimmed)
	4043	+ MergeNormals();
3692	4044	}
3693	4045	}
3694	4046
..	..	@@ -3722,6 +4074,11 @@
3722	4074	tsa.getNormals(0, normals);
3723	4075	tsa.getTextureCoordinates(0, 0, uvmap);
3724	4076	// tsa.getColors(0, colors);
	4077	+
	4078	+ for (int i=colors.length; --i>=0;)
	4079	+ {
	4080	+ colors[i] = 1;
	4081	+ }
3725	4082
3726	4083	int stripcount = tsa.getNumStrips();
3727	4084	triangles = new int[stripcount];
..	..	@@ -3744,6 +4101,10 @@
3744	4101	triangles = new int[1];
3745	4102	triangles[0] = 3;
3746	4103	}
	4104	+
	4105	+ //Untrim();
	4106	+ if (!trimmed)
	4107	+ MergeNormals();
3747	4108	}
3748	4109
3749	4110	/*
..	..	@@ -3776,21 +4137,66 @@
3776	4137	for (int i = 0; i < VertexCount(); i++)
3777	4138	{
3778	4139	Vertex v = GetVertex(i);
	4140	+
	4141	+ vertextemp.set(v);
	4142	+
3779	4143	//if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
3780	4144	{
3781		- GenerateNormal(i, v);
3782		- SetVertex(v, i);
	4145	+ if (!GenerateNormal(i, vertextemp))
	4146	+ continue;
	4147	+
	4148	+ if (v.norm.dot(vertextemp.norm) < 0)
	4149	+ vertextemp.norm.mul(-1);
	4150	+
	4151	+ if (v.norm.dot(vertextemp.norm) < 0.9)
	4152	+ SetVertex(vertextemp, i);
3783	4153	}
3784	4154	}
3785	4155
3786	4156	Vertex.normalmode = false;
3787	4157	}
3788	4158
	4159	+ void MergeNormals()
	4160	+ {
	4161	+ assert(!trimmed);
	4162	+
	4163	+ boolean smooth = Grafreed.smoothmode;
	4164	+ boolean link = Grafreed.linkUV;
	4165	+ Grafreed.smoothmode = true;
	4166	+ Grafreed.linkUV = true;
	4167	+
	4168	+ System.out.println("#Vertex = " + VertexCount());
	4169	+ System.out.println("#Face = " + FaceCount());
	4170	+
	4171	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4172	+
	4173	+ for (int i = 0; i < VertexCount(); i++)
	4174	+ {
	4175	+ Vertex v = GetVertex(i);
	4176	+
	4177	+ if (!table.contains(v))
	4178	+ {
	4179	+ table.add(v);
	4180	+ }
	4181	+ }
	4182	+
	4183	+ Grafreed.smoothmode = smooth;
	4184	+ Grafreed.linkUV = link;
	4185	+
	4186	+// for (int i = 0; i < VertexCount(); i++)
	4187	+// {
	4188	+// Vertex v = GetVertex(i);
	4189	+//
	4190	+// table.add(v);
	4191	+// }
	4192	+
	4193	+ }
	4194	+
3789	4195	static cVector temp1 = new cVector();
3790	4196	static cVector temp2 = new cVector();
3791	4197	static cVector temp3 = new cVector();
3792	4198
3793		- void GenerateNormal(int index, Vertex v)
	4199	+ boolean GenerateNormal(int index, Vertex v)
3794	4200	{
3795	4201	//System.out.println("Old normal = " + v.norm);
3796	4202	LA.setVector(v.norm, 0, 0, 0);
..	..	@@ -3819,6 +4225,10 @@
3819	4225	LA.vecSub(p/.pos/, v/.pos/, temp1);
3820	4226	LA.vecSub(q/.pos/, v/.pos/, temp2);
3821	4227	}
	4228	+ else
	4229	+ {
	4230	+ continue;
	4231	+ }
3822	4232
3823	4233	//LA.vecNormalize(temp1);
3824	4234	//LA.vecNormalize(temp2);
..	..	@@ -3829,17 +4239,25 @@
3829	4239	double s = temp3.length();
3830	4240	//double c = temp2.dot(temp1);
3831	4241
	4242	+ if (s == 0)
	4243	+ return false;
	4244	+
3832	4245	float angle = 1; // (float) Math.atan2(s, c);
3833	4246	//if(angle < 0) angle = -angle;
3834	4247
3835	4248	//LA.vecNormalize(temp3);
3836	4249	LA.vecScale(temp3, angle / s);
3837	4250
	4251	+// if (temp3.dot(v.norm) < 0)
	4252	+// assert(temp3.dot(v.norm) >= 0);
	4253	+
3838	4254	LA.vecAdd(temp3, v.norm, v.norm);
3839	4255	}
3840	4256
3841	4257	LA.vecNormalize(v.norm);
3842	4258	//System.out.println("New normal = " + v.norm);
	4259	+
	4260	+ return true;
3843	4261	}
3844	4262
3845	4263	double Arccos(double x)
..	..	@@ -4233,7 +4651,7 @@
4233	4651	int count = VertexCount();
4234	4652
4235	4653	// mars 2014
4236		- while (step >= count)
	4654	+ while (step > count)
4237	4655	step /= 10;
4238	4656
4239	4657	for (int i = 0; i < count; i+=step)
..	..	@@ -4381,7 +4799,7 @@
4381	4799	}
4382	4800	}
4383	4801
4384		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4802	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4385	4803	{
4386	4804	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4387	4805	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4413,14 +4831,14 @@
4413	4831	// june 2014
4414	4832	// Camera parentcam = cam;
4415	4833	//
4416		-// if (cam == CameraPane.theRenderer.cameras[0])
	4834	+// if (cam == Globals.theRenderer.cameras[0])
4417	4835	// {
4418		-// parentcam = CameraPane.theRenderer.cameras[1];
	4836	+// parentcam = Globals.theRenderer.cameras[1];
4419	4837	// }
4420	4838	//
4421		-// if (cam == CameraPane.theRenderer.cameras[1])
	4839	+// if (cam == Globals.theRenderer.cameras[1])
4422	4840	// {
4423		-// parentcam = CameraPane.theRenderer.cameras[0];
	4841	+// parentcam = Globals.theRenderer.cameras[0];
4424	4842	// }
4425	4843
4426	4844	gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..	..	@@ -4546,16 +4964,25 @@
4546	4964	{
4547	4965	i3 = positions.length-3;
4548	4966	i2 = uvmap.length - 2;
4549		- new Exception().printStackTrace();
	4967	+ //new Exception().printStackTrace();
4550	4968	}
4551	4969
4552	4970	v./pos./x = positions[i3];
4553	4971	v./pos./y = positions[i3 + 1];
4554	4972	v./pos./z = positions[i3 + 2];
4555	4973
4556		- v.norm.x = normals[i3];
4557		- v.norm.y = normals[i3 + 1];
4558		- v.norm.z = normals[i3 + 2];
	4974	+ if (normals == null)
	4975	+ {
	4976	+ v.norm.x = 0;
	4977	+ v.norm.y = 0;
	4978	+ v.norm.z = 0;
	4979	+ }
	4980	+ else
	4981	+ {
	4982	+ v.norm.x = normals[i3];
	4983	+ v.norm.y = normals[i3 + 1];
	4984	+ v.norm.z = normals[i3 + 2];
	4985	+ }
4559	4986
4560	4987	v.s = uvmap[i2];
4561	4988	v.t = uvmap[i2 + 1];
..	..	@@ -4846,7 +5273,7 @@
4846	5273	return verticesCopy;
4847	5274	}
4848	5275
4849		- void PreprocessOcclusion(CameraPane cp, double[][] transform)
	5276	+ void PreprocessOcclusion(iCameraPane cp, double[][] transform)
4850	5277	{
4851	5278	if (//!trimmed \|\|
4852	5279	AOdone)
..	..	@@ -4855,80 +5282,7 @@
4855	5282	return;
4856	5283	}
4857	5284
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;
	5285	+ cp.PrepOcclusion(this, transform);
4932	5286
4933	5287	AOdone = true;
4934	5288	}
..	..	@@ -5036,6 +5390,59 @@
5036	5390	}
5037	5391	}
5038	5392	colors = null;
	5393	+ }
	5394	+
	5395	+ void CreateMesh(iHeightField hf, int x, int y)
	5396	+ {
	5397	+ BoundaryRep tmp = new BoundaryRep();
	5398	+
	5399	+ int vc = 0;
	5400	+
	5401	+ Vertex v = new Vertex(true);
	5402	+
	5403	+ for (int i=0; i<x; i++)
	5404	+ {
	5405	+ for (int j=0; j<y; j++)
	5406	+ {
	5407	+// Vertex v = tmp.GetVertex(vc++);
	5408	+
	5409	+ v.s = v.x = i;
	5410	+ v.t = v.z = j;
	5411	+ v.s /= x; v.t /= y;
	5412	+ v.y = hf.f(i,j);
	5413	+
	5414	+ int iu = tmp.AddTableVertex(v);
	5415	+
	5416	+ v.s = v.x = i+1;
	5417	+ v.t = v.z = j;
	5418	+ v.s /= x; v.t /= y;
	5419	+ v.y = hf.f(i+1,j);
	5420	+
	5421	+ int iv = tmp.AddTableVertex(v);
	5422	+
	5423	+ v.s = v.x = i+1;
	5424	+ v.t = v.z = j+1;
	5425	+ v.s /= x; v.t /= y;
	5426	+ v.y = hf.f(i+1,j+1);
	5427	+
	5428	+ int iw = tmp.AddTableVertex(v);
	5429	+
	5430	+ v.s = v.x = i;
	5431	+ v.t = v.z = j+1;
	5432	+ v.s /= x; v.t /= y;
	5433	+ v.y = hf.f(i,j+1);
	5434	+
	5435	+ int ix = tmp.AddTableVertex(v);
	5436	+
	5437	+ tmp.AddFace(iu,iw,iv);
	5438	+ tmp.AddFace(iu,ix,iw);
	5439	+ }
	5440	+ }
	5441	+
	5442	+ Set(tmp);
	5443	+
	5444	+ Trim(true,false,true);
	5445	+ ClearColors();
5039	5446	}
5040	5447
5041	5448	void Stripify()
..	..	@@ -5290,25 +5697,27 @@
5290	5697
5291	5698	transient int nbbadfaces; // ?? = 1000000;
5292	5699
5293		- int ChooseTriangle()
	5700	+ /*
	5701	+ */
	5702	+ int ChooseTriangle(boolean firstEquilateral)
5294	5703	{
5295	5704	int chosen = -1;
5296	5705
5297	5706	double minweight = 1E10;
5298	5707
	5708	+ int step = 8; // ?
	5709	+
	5710	+ if (firstEquilateral)
	5711	+ step = 1;
	5712	+
5299	5713	nbbadfaces = 0;
5300		- for (int i=faces.size(); (i-=8)>=0;)
	5714	+ for (int i=0; i<faces.size(); i+=step)
	5715	+// for (int i=faces.size(); (i-=8)>=0;)
5301	5716	{
5302	5717	Face face = (Face) faces.get(i);
5303	5718
5304		- //?? if (face.weight < 0)
5305		- // continue;
5306		-
5307		- double K = 1; // 0.01; // .25;
5308		-
5309		- double factor = (1-K)face.nbiterations + K; //face.weight;
5310		-
5311		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5719	+ if (face.used)
	5720	+ continue;
5312	5721
5313	5722	if (!Valid(face))
5314	5723	{
..	..	@@ -5319,6 +5728,15 @@
5319	5728	if (Boundary(face))
5320	5729	continue;
5321	5730
	5731	+// if (Boundary(face.p))
	5732	+// continue;
	5733	+//
	5734	+// if (Boundary(face.q))
	5735	+// continue;
	5736	+//
	5737	+// if (Boundary(face.r))
	5738	+// continue;
	5739	+
5322	5740	if (!ValidValence(face))
5323	5741	continue;
5324	5742
..	..	@@ -5327,14 +5745,58 @@
5327	5745	!ValidValence(face.r))
5328	5746	continue;
5329	5747
5330		- if (minweight > weight)
	5748	+ //?? if (face.weight < 0)
	5749	+ // continue;
	5750	+
	5751	+ if (firstEquilateral)
5331	5752	{
5332		- minweight = weight;
	5753	+ if (OneFaceUsed(links.get(face.p)))
	5754	+ continue;
	5755	+
	5756	+ if (OneFaceUsed(links.get(face.q)))
	5757	+ continue;
	5758	+
	5759	+ if (OneFaceUsed(links.get(face.r)))
	5760	+ continue;
	5761	+
5333	5762	chosen = i;
	5763	+ break;
	5764	+ }
	5765	+ else
	5766	+ {
	5767	+ double K = 1; // 0.01; // .25;
	5768	+
	5769	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5770	+
	5771	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5772	+
	5773	+ if (minweight > weight)
	5774	+ {
	5775	+ minweight = weight;
	5776	+ chosen = i;
	5777	+ if (minweight == 0)
	5778	+ break;
	5779	+ }
5334	5780	}
5335	5781	}
5336	5782
5337	5783	return chosen;
	5784	+ }
	5785	+
	5786	+ private boolean OneFaceUsed(Vector<Face> faces)
	5787	+ {
	5788	+ if (faces.size() != 6)
	5789	+ return true;
	5790	+
	5791	+ for (int i=0; i<6; i+=1)
	5792	+ {
	5793	+ if (faces.get(i).used)
	5794	+ {
	5795	+ return true;
	5796	+ }
	5797	+ }
	5798	+
	5799	+ return false;
5338	5800	}
5339	5801
5340	5802	static boolean remove3valence = true;
..	..	@@ -5370,7 +5832,7 @@
5370	5832	}
5371	5833	else
5372	5834	{
5373		- assert(links.size() == vertices.size());
	5835	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5374	5836
5375	5837	links.setSize(vertices.size());
5376	5838	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5378,6 +5840,7 @@
5378	5840	// linkstouched[i] = false;
5379	5841	if (links.get(i) == null) // ??
5380	5842	{
	5843	+ new Exception().printStackTrace();
5381	5844	links.set(i, new Vector(8));
5382	5845	// linkstouched[i] = true;
5383	5846	}
..	..	@@ -5388,6 +5851,8 @@
5388	5851	}
5389	5852	}
5390	5853
	5854	+ boolean once = false;
	5855	+
5391	5856	for (int i=faces.size(); --i>=0;)
5392	5857	{
5393	5858	Face face = (Face) faces.get(i);
..	..	@@ -5399,6 +5864,9 @@
5399	5864	//if (linkstouched[face.r])
5400	5865	links.get(face.r).add(face);
5401	5866
	5867	+ if (face.used)
	5868	+ once = true;
	5869	+
5402	5870	face.good = 1;
5403	5871	face.boundary = -1;
5404	5872	}
..	..	@@ -6170,6 +6638,7 @@
6170	6638
6171	6639	void InitWeights()
6172	6640	{
	6641	+ new Exception().printStackTrace();
6173	6642	System.exit(0);
6174	6643	int n = 0;
6175	6644	int b = 0;
..	..	@@ -6763,6 +7232,10 @@
6763	7232	return (face.boundary = 1) == 1;
6764	7233	}
6765	7234
	7235	+ // June 2019
	7236	+ if (true)
	7237	+ return (face.boundary = 0) == 1;
	7238	+
6766	7239	// reverse triangle test
6767	7240	q1.set(p);
6768	7241	q2.set(q);
..	..	@@ -7019,6 +7492,7 @@
7019	7492	assert(f2.contains(i));
7020	7493	assert(f3.contains(i));
7021	7494
	7495	+ // when r is the "center", p is along the boundary
7022	7496	while (f0.r != i)
7023	7497	{
7024	7498	int t = f0.p;
..	..	@@ -7075,59 +7549,90 @@
7075	7549	f0 = f3;
7076	7550	f3 = t;
7077	7551	}
7078		- atleastone = true;
7079	7552
	7553	+ int va = f0.q;
	7554	+ int vb = f0.r;
	7555	+ int vc = -1;
	7556	+
	7557	+ Face toremove1 = null;
	7558	+ Face toremove2 = null;
	7559	+
	7560	+ // f0 is the buffer for the first new triangle,
	7561	+ // and otherf is the other upper one.
7080	7562	Face otherf = null;
7081	7563
7082	7564	if (f1.contains(f0.p))
7083	7565	{
7084	7566	if (f1.p == f0.p)
7085	7567	{
	7568	+ assert(false);
7086	7569	f0.r = f1.q;
7087	7570	}
7088	7571	else
7089	7572	{
7090	7573	assert(f1.q == f0.p);
7091		- f0.r = f1.p;
	7574	+ vc = f1.p;
7092	7575	}
7093	7576
7094	7577	otherf = f2;
7095		- faces.remove(f1);
7096		- faces.remove(f3);
	7578	+ toremove1 = f1;
	7579	+ toremove2 = f3;
7097	7580	}
7098	7581	else
7099	7582	if (f2.contains(f0.p))
7100	7583	{
7101	7584	if (f2.p == f0.p)
7102	7585	{
	7586	+ assert(false);
7103	7587	f0.r = f2.q;
7104	7588	}
7105	7589	else
7106	7590	{
7107	7591	assert(f2.q == f0.p);
7108		- f0.r = f2.p;
	7592	+ vc = f2.p;
7109	7593	}
7110	7594
7111	7595	otherf = f3;
7112		- faces.remove(f1);
7113		- faces.remove(f2);
	7596	+ toremove1 = f1;
	7597	+ toremove2 = f2;
7114	7598	}
7115	7599	if (f3.contains(f0.p))
7116	7600	{
7117	7601	if (f3.p == f0.p)
7118	7602	{
	7603	+// assert(false);
	7604	+ new Exception().printStackTrace();
7119	7605	f0.r = f3.q;
7120	7606	}
7121	7607	else
7122	7608	{
7123	7609	assert(f3.q == f0.p);
7124		- f0.r = f3.p;
	7610	+ vc = f3.p;
7125	7611	}
7126	7612
7127	7613	otherf = f1;
7128		- faces.remove(f2);
7129		- faces.remove(f3);
	7614	+ toremove1 = f2;
	7615	+ toremove2 = f3;
7130	7616	}
	7617	+
	7618	+ vertextemp.set(vertices.get(va));
	7619	+ vertextemp.sub(vertices.get(vb));
	7620	+ vertextemp.normalize();
	7621	+ vertextemp2.set(vertices.get(vc));
	7622	+ vertextemp2.sub(vertices.get(vb));
	7623	+ vertextemp2.normalize();
	7624	+
	7625	+ if (vertextemp.dot(vertextemp2) > -0.95)
	7626	+ {
	7627	+ continue;
	7628	+ }
	7629	+
	7630	+ atleastone = true;
	7631	+
	7632	+ f0.r = vc;
	7633	+
	7634	+ faces.remove(toremove1);
	7635	+ faces.remove(toremove2);
7131	7636
7132	7637	if (!f0.contains(otherf.p))
7133	7638	{
..	..	@@ -7180,7 +7685,7 @@
7180	7685	//InitWeights();
7181	7686	}
7182	7687
7183		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7688	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7184	7689
7185	7690	if (chosen == -1)
7186	7691	{
..	..	@@ -7194,7 +7699,7 @@
7194	7699	//remove3valence = false;
7195	7700	// InitWeights();
7196	7701
7197		- chosen = ChooseTriangle();
	7702	+ chosen = ChooseTriangle(true);
7198	7703	}
7199	7704	}
7200	7705
..	..	@@ -7335,7 +7840,7 @@
7335	7840	Trim();
7336	7841	Untrim();
7337	7842
7338		- BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GraphreeD.clone(this);
	7843	+ BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GrafreeD.clone(this);
7339	7844
7340	7845	double minx = Float.POSITIVE_INFINITY;
7341	7846	double maxx = Float.NEGATIVE_INFINITY;
..	..	@@ -7373,7 +7878,7 @@
7373	7878	if (max < maxz - minz)
7374	7879	max = maxz - minz;
7375	7880
7376		- tmp.THRESHOLD = max/25; // 50;
	7881	+ tmp.THRESHOLD = 0.5; // max/25; // 50;
7377	7882
7378	7883	tmp.faces.clear();
7379	7884
..	..	@@ -7470,7 +7975,7 @@
7470	7975
7471	7976	// boolean lock;
7472	7977
7473		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7978	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7474	7979	{
7475	7980	if (stripified)
7476	7981	{
..	..	@@ -7498,7 +8003,7 @@
7498	8003	s3 = new cVector();
7499	8004	}
7500	8005
7501		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8006	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7502	8007
7503	8008	try
7504	8009	{
..	..	@@ -7507,12 +8012,12 @@
7507	8012	{
7508	8013	System.err.println("EXCEPTION CAUGHT");
7509	8014	e.printStackTrace();
7510		- return;
	8015	+ return false;
7511	8016	} catch (Error e)
7512	8017	{
7513	8018	System.err.println("ERROR CAUGHT");
7514	8019	e.printStackTrace();
7515		- return;
	8020	+ return false;
7516	8021	}
7517	8022
7518	8023	System.out.println("# faces = " + faces.size());
..	..	@@ -7522,6 +8027,7 @@
7522	8027	{
7523	8028	Face face = (Face) faces.get(i);
7524	8029
	8030	+ face.used = false;
7525	8031	face.nbiterations = 1;
7526	8032	face.weight = -1;
7527	8033	face.boundary = -1;
..	..	@@ -7573,6 +8079,11 @@
7573	8079	nbbadfaces = faces.size();
7574	8080	//remove3valence = true;
7575	8081
	8082	+ int count = 2;
	8083	+
	8084	+ if (onlyone)
	8085	+ count = 1;
	8086	+
7576	8087	firstpass = true;
7577	8088
7578	8089	int n = faces.size();
..	..	@@ -7588,12 +8099,13 @@
7588	8099	System.out.print('.');
7589	8100	}
7590	8101	System.out.println();
	8102	+ boolean atleastone = false;
7591	8103	int i = 0;
7592		- while (reduction34 \|\| faces.size() > n/2)
	8104	+ while (true) // reduction34 \|\| faces.size() > n/2)
7593	8105	{
7594	8106	if (i++%100 == 0)
7595	8107	{
7596		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8108	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7597	8109	System.out.println("#faces = " + faces.size());
7598	8110	// if (i != 1)
7599	8111	// break;
..	..	@@ -7611,6 +8123,8 @@
7611	8123	{
7612	8124	if (!RemoveOneTriangle())
7613	8125	break;
	8126	+
	8127	+ atleastone = true;
7614	8128	}
7615	8129	// if (iterationcount == 0)
7616	8130	// break;
..	..	@@ -7621,8 +8135,8 @@
7621	8135	break;
7622	8136	}
7623	8137	firstpass = false;
7624		- if (onlyone)
7625		- break; // one triangle only
	8138	+// if (--count<0 && !reduction34)
	8139	+// break; // one triangle only
7626	8140	}
7627	8141
7628	8142	InitLinks(false); // for further display
..	..	@@ -7637,7 +8151,9 @@
7637	8151	//Trim(true,cJME.gennormals,true,false); // doesn't work
7638	8152	Trim(true,false,false,false,false);
7639	8153
7640		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8154	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8155	+
	8156	+ return atleastone;
7641	8157	}
7642	8158
7643	8159	void UpdateIndices(Face face, Face minface)
..	..	@@ -7650,18 +8166,21 @@
7650	8166	face.p = minface.p;
7651	8167	//if (leafweights)
7652	8168	face.good = 0; // false;
	8169	+ face.used = true;
7653	8170	}
7654	8171	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7655	8172	{
7656	8173	face.q = minface.p;
7657	8174	//if (leafweights)
7658	8175	face.good = 0; // false;
	8176	+ face.used = true;
7659	8177	}
7660	8178	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7661	8179	{
7662	8180	face.r = minface.p;
7663	8181	//if (leafweights)
7664	8182	face.good = 0; // false;
	8183	+ face.used = true;
7665	8184	}
7666	8185
7667	8186	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7721,50 +8240,50 @@
7721	8240	if (v == 2)
7722	8241	vert = minface.r;
7723	8242	// Face face = (Face) faces.get(i);
7724		- Vector<Face> vertfaces = links.get(vert);
7725		- for (int i=vertfaces.size(); --i>=0;)
7726		- {
7727		- Face face = (Face) vertfaces.get(i);
7728		-
7729		- // if (face.weight == 10000)
7730		- // continue;
7731		-
7732		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7733		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7734		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8243	+ Vector<Face> vertfaces = links.get(vert);
	8244	+ for (int i=vertfaces.size(); --i>=0;)
7735	8245	{
7736		- if (!leafweights)
	8246	+ Face face = (Face) vertfaces.get(i);
	8247	+
	8248	+ // if (face.weight == 10000)
	8249	+ // continue;
	8250	+
	8251	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8252	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8253	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7737	8254	{
7738		-// if(minfaceweight <= 0)
7739		-// assert(minfaceweight > 0);
7740		-//
7741		-// //FaceWeight(face);
7742		-// if(face.weight < 0)
7743		-// assert(face.weight >= 0);
7744		-
7745		- face.weight += minfaceweight;
7746		-
7747		-// if (face.weight >= 10000)
7748		-// assert(face.weight < 10000);
	8255	+ if (!leafweights)
	8256	+ {
	8257	+ // if(minfaceweight <= 0)
	8258	+ // assert(minfaceweight > 0);
	8259	+ //
	8260	+ // //FaceWeight(face);
	8261	+ // if(face.weight < 0)
	8262	+ // assert(face.weight >= 0);
	8263	+
	8264	+ face.weight += minfaceweight;
	8265	+
	8266	+ // if (face.weight >= 10000)
	8267	+ // assert(face.weight < 10000);
	8268	+ }
	8269	+ else
	8270	+ face.weight = -1;
	8271	+
	8272	+ face.nbiterations += 1;
	8273	+ face.boundary = -1;
	8274	+
	8275	+ Vertex p = (Vertex)vertices.get(face.p);
	8276	+ Vertex q = (Vertex)vertices.get(face.q);
	8277	+ Vertex r = (Vertex)vertices.get(face.r);
	8278	+
	8279	+ p.boundary = -1;
	8280	+ q.boundary = -1;
	8281	+ r.boundary = -1;
7749	8282	}
7750	8283	else
7751		- face.weight = -1;
7752		-
7753		- face.nbiterations += 1;
7754		- face.boundary = -1;
7755		-
7756		- Vertex p = (Vertex)vertices.get(face.p);
7757		- Vertex q = (Vertex)vertices.get(face.q);
7758		- Vertex r = (Vertex)vertices.get(face.r);
7759		-
7760		- p.boundary = -1;
7761		- q.boundary = -1;
7762		- r.boundary = -1;
	8284	+ assert(false);
7763	8285	}
7764		- else
7765		- assert(false);
7766	8286	}
7767		- }
7768	8287
7769	8288	// TouchVertex(minface.p);
7770	8289	// TouchVertex(minface.q);
..	..	@@ -7932,6 +8451,8 @@
7932	8451
7933	8452	minface.q = minface.r = minface.p;
7934	8453
	8454	+ int count = 0;
	8455	+
7935	8456	for (int i=0; i<faces.size(); i++)
7936	8457	{
7937	8458	Face face = (Face) faces.get(i);
..	..	@@ -7943,6 +8464,9 @@
7943	8464	TouchVertex(face.r, true); // , minface.weight);
7944	8465	// assert(!lock);
7945	8466	faces.remove(i--);
	8467	+ count++;
	8468	+ if (count == 4)
	8469	+ break;
7946	8470	}
7947	8471	}
7948	8472
..	..	@@ -7960,6 +8484,7 @@
7960	8484	for (int i=vertfaces.size(); --i>=0;)
7961	8485	{
7962	8486	Face face = (Face) vertfaces.get(i);
	8487	+ face.used = true;
7963	8488	face.good = 0; // false;
7964	8489	if (leafweights)
7965	8490	face.weight = -1;
..	..	@@ -8006,7 +8531,7 @@
8006	8531	if (!trimmed)
8007	8532	return;
8008	8533
8009		- GraphreeD.linkUV = false;
	8534	+ Grafreed.linkUV = false;
8010	8535
8011	8536	try
8012	8537	{
..	..	@@ -8214,9 +8739,6 @@
8214	8739	return "trim = " + trimmed + "; stripped = " + stripified + "; colors = " + colors + "; faces = " + (faces!=null?faces.size():null) + "; triangles = " + (triangles!=null?triangles.length:null) + "; indices = " + indices;
8215	8740	}
8216	8741
8217		- static Camera localcamera = new Camera();
8218		- static cVector from = new cVector();
8219		- static cVector to = new cVector();
8220	8742	boolean trimmed = false;
8221	8743	boolean stripified = false;
8222	8744	transient boolean AOdone = false;
..	..	@@ -8224,8 +8746,10 @@
8224	8746	/transient/ int maxIndexV = 0;
8225	8747	/transient/ int bufV, bufF;
8226	8748	// Raw version
8227		- private float[] positions;
8228		- private float[] normals;
	8749	+ //private
	8750	+ float[] positions;
	8751	+ //private
	8752	+ float[] normals;
8229	8753	float[] colors;
8230	8754	private float[] uvmap;
8231	8755	private int[] triangles;
..	..	@@ -8239,7 +8763,8 @@
8239	8763	int[] startvertices;
8240	8764	float[] averagepoints;
8241	8765	float[] extremepoints;
8242		- float[] supportsizes; // distance of closest point
	8766	+ float[] supportminsize; // distance of closest point
	8767	+ float[] supportmaxsize; // distance of fartest point
8243	8768
8244	8769	transient Hashtable vertextable;
8245	8770	/transient/ private Vertex[] verticesCopy;