~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,8 @@
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] == 0) // < 0.001 * v.totalweight)
1944	2002	{
1945	2003	//testweight += v.weights[j-1];
1946	2004	continue;
..	..	@@ -2163,7 +2221,7 @@
2163	2221	// if (slow)
2164	2222	// aout 2013
2165	2223	// sept 2013 merde...
2166		- W = 13;
	2224	+ W = 3; // 13;
2167	2225
2168	2226	// POSERATE
2169	2227	if (CameraPane.tickcount > 0 \|\| CameraPane.SLOWPOSE)
..	..	@@ -2221,6 +2279,8 @@
2221	2279
2222	2280	transient int lastsoundtime;
2223	2281
	2282	+ transient boolean once = false;
	2283	+
2224	2284	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2225	2285	{
2226	2286	if (LA.isIdentity(toRoot))
..	..	@@ -2276,7 +2336,11 @@
2276	2336
2277	2337	if (v.totalweight == 0)
2278	2338	{
2279		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2339	+ if (!once)
	2340	+ {
	2341	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2342	+ once = true;
	2343	+ }
2280	2344	continue;
2281	2345	}
2282	2346
..	..	@@ -2600,7 +2664,7 @@
2600	2664	// if (stepout && !playedonce)
2601	2665	// {
2602	2666	// // sound
2603		-// GraphreeD.wav.play();
	2667	+// GrafreeD.wav.play();
2604	2668	// playedonce = true;
2605	2669	// }
2606	2670	//
..	..	@@ -2635,18 +2699,18 @@
2635	2699	if (false) // slow && stepout && onein)
2636	2700	{
2637	2701	// sound
2638		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	2702	+ cVector eye = Globals.theRenderer.EyeCamera().location;
2639	2703
2640	2704	Vertex v = GetVertex(0);
2641	2705
2642	2706	tmp.set(v);
2643	2707	tmp.sub(eye);
2644	2708
2645		- if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs
	2709	+ if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2646	2710	{
2647		- GraphreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2711	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2648	2712
2649		- lastsoundtime = CameraPane.framecount;
	2713	+ lastsoundtime = Globals.framecount;
2650	2714	}
2651	2715
2652	2716	stepout = false;
..	..	@@ -3072,6 +3136,7 @@
3072	3136	//
3073	3137	// transient VertexCompare[] vertexcompare = null;
3074	3138
	3139	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3075	3140	boolean Contains(Vertex v0, int object)
3076	3141	{
3077	3142	int start = startvertices[object-1];
..	..	@@ -3129,7 +3194,27 @@
3129	3194	*/
3130	3195	}
3131	3196
3132		- void GenUV()
	3197	+ void UnfoldUV()
	3198	+ {
	3199	+ for (int i = 0; i < VertexCount(); i++)
	3200	+ {
	3201	+ Vertex v = GetVertex(i);
	3202	+
	3203	+ v.x = v.s;
	3204	+ v.y = v.t;
	3205	+ v.z = 0;
	3206	+
	3207	+ v.norm.x = 0;
	3208	+ v.norm.y = 0;
	3209	+ v.norm.z = 1;
	3210	+
	3211	+ SetVertex(v, i);
	3212	+ }
	3213	+ }
	3214	+
	3215	+ float power = 2;
	3216	+
	3217	+ void GenUV() // float power)
3133	3218	{
3134	3219	Trim();
3135	3220
..	..	@@ -3193,6 +3278,125 @@
3193	3278	y -= 0.5;
3194	3279	z -= 0.5;
3195	3280
	3281	+ double ax = Math.abs(x);
	3282	+ double ay = Math.abs(y);
	3283	+ double max = ax;
	3284	+ if (max < ay)
	3285	+ {
	3286	+ max = ay;
	3287	+ }
	3288	+
	3289	+ if (max == 0)
	3290	+ {
	3291	+ uvmap[i2] = 0.5f;
	3292	+ uvmap[i2+1] = 0.5f;
	3293	+ continue;
	3294	+ }
	3295	+
	3296	+ x /= max;
	3297	+ y /= max;
	3298	+
	3299	+ double angle = Math.acos(Math.abs(z*2));
	3300	+
	3301	+ double k = angle / Math.PI * 2;
	3302	+
	3303	+ assert(k >= 0);
	3304	+
	3305	+ // k == 0 => uv = 0 (center)
	3306	+ // k == 1 => uv = -1,1 (border)
	3307	+
	3308	+ if (i == 0)
	3309	+ System.out.println("power = " + power);
	3310	+
	3311	+ double length1 = (ax+ay)/max;
	3312	+ double length2 = Math.sqrt(axax + ayay) / max;
	3313	+
	3314	+ double t = k;
	3315	+
	3316	+ t = Math.pow(t, 3);
	3317	+
	3318	+ // Interpolate between k/length2 (center) and k (border)
	3319	+ if (length2 > 0)
	3320	+ k *= (1 - t) / length2 + t;
	3321	+
	3322	+ double u = k*x;
	3323	+ double v = k*y;
	3324	+
	3325	+ u /= 2;
	3326	+ v /= 2;
	3327	+ u += 0.5;
	3328	+ v += 0.5;
	3329	+
	3330	+ uvmap[i2] = (float) u;
	3331	+ uvmap[i2+1] = (float) v;
	3332	+ }
	3333	+ }
	3334	+
	3335	+ void GenUVold(float power)
	3336	+ {
	3337	+ Trim();
	3338	+
	3339	+ cVector boxcenter = null;
	3340	+ cVector minima, maxima;
	3341	+ minima = new cVector();
	3342	+ maxima = new cVector();
	3343	+ minima.x = minima.y = minima.z = Double.MAX_VALUE;
	3344	+ maxima.x = maxima.y = maxima.z = -Double.MAX_VALUE;
	3345	+ for (int i = 0; i < VertexCount(); i++)
	3346	+ {
	3347	+ Vertex v = GetVertex(i);
	3348	+
	3349	+ if (minima.x > v.x)
	3350	+ {
	3351	+ minima.x = v.x;
	3352	+ }
	3353	+ if (minima.y > v.y)
	3354	+ {
	3355	+ minima.y = v.y;
	3356	+ }
	3357	+ if (minima.z > v.z)
	3358	+ {
	3359	+ minima.z = v.z;
	3360	+ }
	3361	+
	3362	+ if (maxima.x < v.x)
	3363	+ {
	3364	+ maxima.x = v.x;
	3365	+ }
	3366	+ if (maxima.y < v.y)
	3367	+ {
	3368	+ maxima.y = v.y;
	3369	+ }
	3370	+ if (maxima.z < v.z)
	3371	+ {
	3372	+ maxima.z = v.z;
	3373	+ }
	3374	+ }
	3375	+
	3376	+ boxcenter = new cVector((maxima.x + minima.x) / 2, (maxima.y + minima.y) / 2, (maxima.z + minima.z) / 2);
	3377	+ int i2 = 0, i3 = 0;
	3378	+ for (int i = 0; i < positions.length/3; i++, i3 += 3, i2 += 2)
	3379	+ {
	3380	+// //uvmap[i2] = (float) normals[i3]*0.5f + 0.5f; // v.x;
	3381	+// //uvmap[i2 + 1] = (float) normals[i3+1]*0.5f + 0.5f; //z;
	3382	+// uvmap[i2] = (float) (positions[i3] - boxcenter.x);
	3383	+// uvmap[i2 + 1] = (float) (positions[i3+2] - boxcenter.z);
	3384	+// uvmap[i2] = (float) Math.atan2(positions[i3+1] - boxcenter.y, positions[i3] - boxcenter.x);
	3385	+// uvmap[i2 + 1] = (float)(positions[i3+2] - boxcenter.z);
	3386	+ // box UV
	3387	+ double x = positions[i3] - minima.x; // - Math.floor(positions[i3]);
	3388	+ double y = positions[i3+1] - minima.y; // - Math.floor(positions[i3+1]);
	3389	+ double z = positions[i3+2] - minima.z; // - Math.floor(positions[i3+2]);
	3390	+
	3391	+ // [-1/2, 1/2]
	3392	+ x /= maxima.x - minima.x;
	3393	+ y /= maxima.y - minima.y;
	3394	+ z /= maxima.z - minima.z;
	3395	+
	3396	+ x -= 0.5;
	3397	+ y -= 0.5;
	3398	+ z -= 0.5;
	3399	+
3196	3400	// x *= 2;
3197	3401	// y *= 2;
3198	3402	// z *= 2;
..	..	@@ -3219,6 +3423,15 @@
3219	3423
3220	3424	z = Math.cos(angle/2);
3221	3425
	3426	+ assert(z >= 0);
	3427	+ assert(z <= 1);
	3428	+
	3429	+ /**/
	3430	+ //z = Math.pow(z, power); //1.08f);
	3431	+
	3432	+ if (i == 0)
	3433	+ System.out.println("power = " + power);
	3434	+
3222	3435	// sqrt(k2x2 + k2z2 + y2) = length
3223	3436	// k2x2 + k2z2 = length2 - y2
3224	3437	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3229,7 +3442,7 @@
3229	3442	k /= xx + yy;
3230	3443	}
3231	3444	else
3232		- GraphreeD.Assert(z == 1);
	3445	+ Grafreed.Assert(z == 1);
3233	3446
3234	3447	if (k < 0)
3235	3448	k = 0;
..	..	@@ -3238,6 +3451,7 @@
3238	3451
3239	3452	x *= k;
3240	3453	y *= k;
	3454	+ /**/
3241	3455
3242	3456	double max = Math.abs(x);
3243	3457	if (max < Math.abs(y))
..	..	@@ -3250,10 +3464,15 @@
3250	3464	}
3251	3465
3252	3466	// max = Math.sqrt(max*2)/2;
	3467	+// double x2 = Math.pow(Math.abs(x), 1/power);
	3468	+// double y2 = Math.pow(Math.abs(y), 1/power);
	3469	+// double z2 = Math.pow(Math.abs(z), 1/power);
	3470	+// max = Math.pow(x2 + y2 + z2, power);
3253	3471
3254	3472	// if (!(max > 0))
3255		- assert(max > 0);
3256		-
	3473	+ //assert(max > 0);
	3474	+ assert(max >= 0);
	3475	+
3257	3476	x /= max;
3258	3477	y /= max;
3259	3478	z /= max;
..	..	@@ -3516,6 +3735,111 @@
3516	3735	*/
3517	3736	}
3518	3737
	3738	+ void GenerateNormals2(boolean crease)
	3739	+ {
	3740	+ cVector tempVector = new cVector();
	3741	+
	3742	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3743	+//
	3744	+//
	3745	+// for (int i=0; i<this.VertexCount(); i++)
	3746	+// {
	3747	+// Vertex v = this.GetVertex(i);
	3748	+//
	3749	+// tempVector.set(v);
	3750	+//
	3751	+// cVector n = tableBase.get(tempVector.ToFloat());
	3752	+//
	3753	+// if (n != null)
	3754	+// {
	3755	+// continue;
	3756	+// }
	3757	+//
	3758	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3759	+// }
	3760	+
	3761	+ BoundaryRep tempSupport = this.support;
	3762	+
	3763	+ this.support = null;
	3764	+
	3765	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3766	+
	3767	+ this.support = tempSupport;
	3768	+
	3769	+ //tempRep.Unstripify();
	3770	+
	3771	+ tempRep.GenerateNormals2(crease);
	3772	+
	3773	+ boolean keepnormal = Vertex.normalmode;
	3774	+ boolean epsequal = Grafreed.epsequal;
	3775	+
	3776	+ Vertex.normalmode = false;
	3777	+ Grafreed.epsequal = false; // A bit strange
	3778	+
	3779	+ // No need to have a match for vertex counts.
	3780	+
	3781	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3782	+
	3783	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3784	+ {
	3785	+ Vertex v = tempRep.GetVertex(i);
	3786	+
	3787	+ cVector n = table.get(tempVector.ToFloat());
	3788	+
	3789	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3790	+ {
	3791	+ //continue;
	3792	+ }
	3793	+
	3794	+ tempVector.set(v);
	3795	+
	3796	+ //cVector nBase = tableBase.get(tempVector);
	3797	+
	3798	+ //if (v.norm.dot(nBase) < 0.9)
	3799	+ //{
	3800	+ // continue;
	3801	+ //}
	3802	+
	3803	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3804	+ {
	3805	+ //continue;
	3806	+ }
	3807	+
	3808	+ if (n != null)
	3809	+ {
	3810	+// if (n.dot(v.norm) < 0)
	3811	+// n.sub(v.norm);
	3812	+// else
	3813	+// n.add(v.norm);
	3814	+//
	3815	+// n.normalize();
	3816	+ continue;
	3817	+ }
	3818	+
	3819	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3820	+ }
	3821	+
	3822	+ for (int i=0; i<this.VertexCount(); i++)
	3823	+ {
	3824	+ Vertex v = this.GetVertex(i);
	3825	+
	3826	+ tempVector.set(v);
	3827	+
	3828	+ cVector n = table.get(tempVector.ToFloat());
	3829	+
	3830	+ //if (n.dot(v.norm) < 0)
	3831	+ if (n == null)
	3832	+ continue;
	3833	+
	3834	+ LA.vecCopy(n, v.norm);
	3835	+
	3836	+ this.SetVertex(v, i);
	3837	+ }
	3838	+
	3839	+ Grafreed.epsequal = epsequal;
	3840	+ Vertex.normalmode = keepnormal;
	3841	+ }
	3842	+
3519	3843	void GenerateNormals(boolean crease)
3520	3844	{
3521	3845	boolean wastrim = trimmed;
..	..	@@ -3531,7 +3855,29 @@
3531	3855	e.printStackTrace();
3532	3856	}
3533	3857
3534		- Trim(wastrim,true,crease,wasstrip,false);
	3858	+ Trim(true/wastrim/,true,crease,wasstrip,false);
	3859	+ }
	3860	+
	3861	+ void GenerateNormalsMesh()
	3862	+ {
	3863	+ if (stripified)
	3864	+ {
	3865	+ Unstripify();
	3866	+ }
	3867	+
	3868	+ if (trimmed)
	3869	+ {
	3870	+ normals = null;
	3871	+ }
	3872	+ else
	3873	+ {
	3874	+ for (int i=VertexCount(); --i>=0;)
	3875	+ {
	3876	+ Vertex v = GetVertex(i);
	3877	+
	3878	+ v.norm = null;
	3879	+ }
	3880	+ }
3535	3881	}
3536	3882
3537	3883	void GenNormalsJME()
..	..	@@ -3656,7 +4002,7 @@
3656	4002	NormalGenerator ng;
3657	4003
3658	4004	if (crease)
3659		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4005	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3660	4006	else
3661	4007	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3662	4008
..	..	@@ -3689,6 +4035,10 @@
3689	4035	{
3690	4036	triangles[i] = i;
3691	4037	}
	4038	+
	4039	+// Untrim();
	4040	+ if (!trimmed)
	4041	+ MergeNormals();
3692	4042	}
3693	4043	}
3694	4044
..	..	@@ -3722,6 +4072,11 @@
3722	4072	tsa.getNormals(0, normals);
3723	4073	tsa.getTextureCoordinates(0, 0, uvmap);
3724	4074	// tsa.getColors(0, colors);
	4075	+
	4076	+ for (int i=colors.length; --i>=0;)
	4077	+ {
	4078	+ colors[i] = 1;
	4079	+ }
3725	4080
3726	4081	int stripcount = tsa.getNumStrips();
3727	4082	triangles = new int[stripcount];
..	..	@@ -3744,6 +4099,10 @@
3744	4099	triangles = new int[1];
3745	4100	triangles[0] = 3;
3746	4101	}
	4102	+
	4103	+ //Untrim();
	4104	+ if (!trimmed)
	4105	+ MergeNormals();
3747	4106	}
3748	4107
3749	4108	/*
..	..	@@ -3776,21 +4135,66 @@
3776	4135	for (int i = 0; i < VertexCount(); i++)
3777	4136	{
3778	4137	Vertex v = GetVertex(i);
	4138	+
	4139	+ vertextemp.set(v);
	4140	+
3779	4141	//if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
3780	4142	{
3781		- GenerateNormal(i, v);
3782		- SetVertex(v, i);
	4143	+ if (!GenerateNormal(i, vertextemp))
	4144	+ continue;
	4145	+
	4146	+ if (v.norm.dot(vertextemp.norm) < 0)
	4147	+ vertextemp.norm.mul(-1);
	4148	+
	4149	+ if (v.norm.dot(vertextemp.norm) < 0.9)
	4150	+ SetVertex(vertextemp, i);
3783	4151	}
3784	4152	}
3785	4153
3786	4154	Vertex.normalmode = false;
3787	4155	}
3788	4156
	4157	+ void MergeNormals()
	4158	+ {
	4159	+ assert(!trimmed);
	4160	+
	4161	+ boolean smooth = Grafreed.smoothmode;
	4162	+ boolean link = Grafreed.linkUV;
	4163	+ Grafreed.smoothmode = true;
	4164	+ Grafreed.linkUV = true;
	4165	+
	4166	+ System.out.println("#Vertex = " + VertexCount());
	4167	+ System.out.println("#Face = " + FaceCount());
	4168	+
	4169	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4170	+
	4171	+ for (int i = 0; i < VertexCount(); i++)
	4172	+ {
	4173	+ Vertex v = GetVertex(i);
	4174	+
	4175	+ if (!table.contains(v))
	4176	+ {
	4177	+ table.add(v);
	4178	+ }
	4179	+ }
	4180	+
	4181	+ Grafreed.smoothmode = smooth;
	4182	+ Grafreed.linkUV = link;
	4183	+
	4184	+// for (int i = 0; i < VertexCount(); i++)
	4185	+// {
	4186	+// Vertex v = GetVertex(i);
	4187	+//
	4188	+// table.add(v);
	4189	+// }
	4190	+
	4191	+ }
	4192	+
3789	4193	static cVector temp1 = new cVector();
3790	4194	static cVector temp2 = new cVector();
3791	4195	static cVector temp3 = new cVector();
3792	4196
3793		- void GenerateNormal(int index, Vertex v)
	4197	+ boolean GenerateNormal(int index, Vertex v)
3794	4198	{
3795	4199	//System.out.println("Old normal = " + v.norm);
3796	4200	LA.setVector(v.norm, 0, 0, 0);
..	..	@@ -3819,6 +4223,10 @@
3819	4223	LA.vecSub(p/.pos/, v/.pos/, temp1);
3820	4224	LA.vecSub(q/.pos/, v/.pos/, temp2);
3821	4225	}
	4226	+ else
	4227	+ {
	4228	+ continue;
	4229	+ }
3822	4230
3823	4231	//LA.vecNormalize(temp1);
3824	4232	//LA.vecNormalize(temp2);
..	..	@@ -3829,17 +4237,25 @@
3829	4237	double s = temp3.length();
3830	4238	//double c = temp2.dot(temp1);
3831	4239
	4240	+ if (s == 0)
	4241	+ return false;
	4242	+
3832	4243	float angle = 1; // (float) Math.atan2(s, c);
3833	4244	//if(angle < 0) angle = -angle;
3834	4245
3835	4246	//LA.vecNormalize(temp3);
3836	4247	LA.vecScale(temp3, angle / s);
3837	4248
	4249	+// if (temp3.dot(v.norm) < 0)
	4250	+// assert(temp3.dot(v.norm) >= 0);
	4251	+
3838	4252	LA.vecAdd(temp3, v.norm, v.norm);
3839	4253	}
3840	4254
3841	4255	LA.vecNormalize(v.norm);
3842	4256	//System.out.println("New normal = " + v.norm);
	4257	+
	4258	+ return true;
3843	4259	}
3844	4260
3845	4261	double Arccos(double x)
..	..	@@ -4233,7 +4649,7 @@
4233	4649	int count = VertexCount();
4234	4650
4235	4651	// mars 2014
4236		- while (step >= count)
	4652	+ while (step > count)
4237	4653	step /= 10;
4238	4654
4239	4655	for (int i = 0; i < count; i+=step)
..	..	@@ -4381,7 +4797,7 @@
4381	4797	}
4382	4798	}
4383	4799
4384		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4800	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4385	4801	{
4386	4802	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4387	4803	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4413,14 +4829,14 @@
4413	4829	// june 2014
4414	4830	// Camera parentcam = cam;
4415	4831	//
4416		-// if (cam == CameraPane.theRenderer.cameras[0])
	4832	+// if (cam == Globals.theRenderer.cameras[0])
4417	4833	// {
4418		-// parentcam = CameraPane.theRenderer.cameras[1];
	4834	+// parentcam = Globals.theRenderer.cameras[1];
4419	4835	// }
4420	4836	//
4421		-// if (cam == CameraPane.theRenderer.cameras[1])
	4837	+// if (cam == Globals.theRenderer.cameras[1])
4422	4838	// {
4423		-// parentcam = CameraPane.theRenderer.cameras[0];
	4839	+// parentcam = Globals.theRenderer.cameras[0];
4424	4840	// }
4425	4841
4426	4842	gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..	..	@@ -4546,16 +4962,25 @@
4546	4962	{
4547	4963	i3 = positions.length-3;
4548	4964	i2 = uvmap.length - 2;
4549		- new Exception().printStackTrace();
	4965	+ //new Exception().printStackTrace();
4550	4966	}
4551	4967
4552	4968	v./pos./x = positions[i3];
4553	4969	v./pos./y = positions[i3 + 1];
4554	4970	v./pos./z = positions[i3 + 2];
4555	4971
4556		- v.norm.x = normals[i3];
4557		- v.norm.y = normals[i3 + 1];
4558		- v.norm.z = normals[i3 + 2];
	4972	+ if (normals == null)
	4973	+ {
	4974	+ v.norm.x = 0;
	4975	+ v.norm.y = 0;
	4976	+ v.norm.z = 0;
	4977	+ }
	4978	+ else
	4979	+ {
	4980	+ v.norm.x = normals[i3];
	4981	+ v.norm.y = normals[i3 + 1];
	4982	+ v.norm.z = normals[i3 + 2];
	4983	+ }
4559	4984
4560	4985	v.s = uvmap[i2];
4561	4986	v.t = uvmap[i2 + 1];
..	..	@@ -4846,7 +5271,7 @@
4846	5271	return verticesCopy;
4847	5272	}
4848	5273
4849		- void PreprocessOcclusion(CameraPane cp, double[][] transform)
	5274	+ void PreprocessOcclusion(iCameraPane cp, double[][] transform)
4850	5275	{
4851	5276	if (//!trimmed \|\|
4852	5277	AOdone)
..	..	@@ -4855,80 +5280,7 @@
4855	5280	return;
4856	5281	}
4857	5282
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;
	5283	+ cp.PrepOcclusion(this, transform);
4932	5284
4933	5285	AOdone = true;
4934	5286	}
..	..	@@ -5036,6 +5388,59 @@
5036	5388	}
5037	5389	}
5038	5390	colors = null;
	5391	+ }
	5392	+
	5393	+ void CreateMesh(iHeightField hf, int x, int y)
	5394	+ {
	5395	+ BoundaryRep tmp = new BoundaryRep();
	5396	+
	5397	+ int vc = 0;
	5398	+
	5399	+ Vertex v = new Vertex(true);
	5400	+
	5401	+ for (int i=0; i<x; i++)
	5402	+ {
	5403	+ for (int j=0; j<y; j++)
	5404	+ {
	5405	+// Vertex v = tmp.GetVertex(vc++);
	5406	+
	5407	+ v.s = v.x = i;
	5408	+ v.t = v.z = j;
	5409	+ v.s /= x; v.t /= y;
	5410	+ v.y = hf.f(i,j);
	5411	+
	5412	+ int iu = tmp.AddTableVertex(v);
	5413	+
	5414	+ v.s = v.x = i+1;
	5415	+ v.t = v.z = j;
	5416	+ v.s /= x; v.t /= y;
	5417	+ v.y = hf.f(i+1,j);
	5418	+
	5419	+ int iv = tmp.AddTableVertex(v);
	5420	+
	5421	+ v.s = v.x = i+1;
	5422	+ v.t = v.z = j+1;
	5423	+ v.s /= x; v.t /= y;
	5424	+ v.y = hf.f(i+1,j+1);
	5425	+
	5426	+ int iw = tmp.AddTableVertex(v);
	5427	+
	5428	+ v.s = v.x = i;
	5429	+ v.t = v.z = j+1;
	5430	+ v.s /= x; v.t /= y;
	5431	+ v.y = hf.f(i,j+1);
	5432	+
	5433	+ int ix = tmp.AddTableVertex(v);
	5434	+
	5435	+ tmp.AddFace(iu,iw,iv);
	5436	+ tmp.AddFace(iu,ix,iw);
	5437	+ }
	5438	+ }
	5439	+
	5440	+ Set(tmp);
	5441	+
	5442	+ Trim(true,false,true);
	5443	+ ClearColors();
5039	5444	}
5040	5445
5041	5446	void Stripify()
..	..	@@ -5290,25 +5695,27 @@
5290	5695
5291	5696	transient int nbbadfaces; // ?? = 1000000;
5292	5697
5293		- int ChooseTriangle()
	5698	+ /*
	5699	+ */
	5700	+ int ChooseTriangle(boolean firstEquilateral)
5294	5701	{
5295	5702	int chosen = -1;
5296	5703
5297	5704	double minweight = 1E10;
5298	5705
	5706	+ int step = 8; // ?
	5707	+
	5708	+ if (firstEquilateral)
	5709	+ step = 1;
	5710	+
5299	5711	nbbadfaces = 0;
5300		- for (int i=faces.size(); (i-=8)>=0;)
	5712	+ for (int i=0; i<faces.size(); i+=step)
	5713	+// for (int i=faces.size(); (i-=8)>=0;)
5301	5714	{
5302	5715	Face face = (Face) faces.get(i);
5303	5716
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;
	5717	+ if (face.used)
	5718	+ continue;
5312	5719
5313	5720	if (!Valid(face))
5314	5721	{
..	..	@@ -5319,6 +5726,15 @@
5319	5726	if (Boundary(face))
5320	5727	continue;
5321	5728
	5729	+// if (Boundary(face.p))
	5730	+// continue;
	5731	+//
	5732	+// if (Boundary(face.q))
	5733	+// continue;
	5734	+//
	5735	+// if (Boundary(face.r))
	5736	+// continue;
	5737	+
5322	5738	if (!ValidValence(face))
5323	5739	continue;
5324	5740
..	..	@@ -5327,14 +5743,58 @@
5327	5743	!ValidValence(face.r))
5328	5744	continue;
5329	5745
5330		- if (minweight > weight)
	5746	+ //?? if (face.weight < 0)
	5747	+ // continue;
	5748	+
	5749	+ if (firstEquilateral)
5331	5750	{
5332		- minweight = weight;
	5751	+ if (OneFaceUsed(links.get(face.p)))
	5752	+ continue;
	5753	+
	5754	+ if (OneFaceUsed(links.get(face.q)))
	5755	+ continue;
	5756	+
	5757	+ if (OneFaceUsed(links.get(face.r)))
	5758	+ continue;
	5759	+
5333	5760	chosen = i;
	5761	+ break;
	5762	+ }
	5763	+ else
	5764	+ {
	5765	+ double K = 1; // 0.01; // .25;
	5766	+
	5767	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5768	+
	5769	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5770	+
	5771	+ if (minweight > weight)
	5772	+ {
	5773	+ minweight = weight;
	5774	+ chosen = i;
	5775	+ if (minweight == 0)
	5776	+ break;
	5777	+ }
5334	5778	}
5335	5779	}
5336	5780
5337	5781	return chosen;
	5782	+ }
	5783	+
	5784	+ private boolean OneFaceUsed(Vector<Face> faces)
	5785	+ {
	5786	+ if (faces.size() != 6)
	5787	+ return true;
	5788	+
	5789	+ for (int i=0; i<6; i+=1)
	5790	+ {
	5791	+ if (faces.get(i).used)
	5792	+ {
	5793	+ return true;
	5794	+ }
	5795	+ }
	5796	+
	5797	+ return false;
5338	5798	}
5339	5799
5340	5800	static boolean remove3valence = true;
..	..	@@ -5370,7 +5830,7 @@
5370	5830	}
5371	5831	else
5372	5832	{
5373		- assert(links.size() == vertices.size());
	5833	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5374	5834
5375	5835	links.setSize(vertices.size());
5376	5836	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5378,6 +5838,7 @@
5378	5838	// linkstouched[i] = false;
5379	5839	if (links.get(i) == null) // ??
5380	5840	{
	5841	+ new Exception().printStackTrace();
5381	5842	links.set(i, new Vector(8));
5382	5843	// linkstouched[i] = true;
5383	5844	}
..	..	@@ -5388,6 +5849,8 @@
5388	5849	}
5389	5850	}
5390	5851
	5852	+ boolean once = false;
	5853	+
5391	5854	for (int i=faces.size(); --i>=0;)
5392	5855	{
5393	5856	Face face = (Face) faces.get(i);
..	..	@@ -5399,6 +5862,9 @@
5399	5862	//if (linkstouched[face.r])
5400	5863	links.get(face.r).add(face);
5401	5864
	5865	+ if (face.used)
	5866	+ once = true;
	5867	+
5402	5868	face.good = 1;
5403	5869	face.boundary = -1;
5404	5870	}
..	..	@@ -6170,6 +6636,7 @@
6170	6636
6171	6637	void InitWeights()
6172	6638	{
	6639	+ new Exception().printStackTrace();
6173	6640	System.exit(0);
6174	6641	int n = 0;
6175	6642	int b = 0;
..	..	@@ -6763,6 +7230,10 @@
6763	7230	return (face.boundary = 1) == 1;
6764	7231	}
6765	7232
	7233	+ // June 2019
	7234	+ if (true)
	7235	+ return (face.boundary = 0) == 1;
	7236	+
6766	7237	// reverse triangle test
6767	7238	q1.set(p);
6768	7239	q2.set(q);
..	..	@@ -7019,6 +7490,7 @@
7019	7490	assert(f2.contains(i));
7020	7491	assert(f3.contains(i));
7021	7492
	7493	+ // when r is the "center", p is along the boundary
7022	7494	while (f0.r != i)
7023	7495	{
7024	7496	int t = f0.p;
..	..	@@ -7075,59 +7547,90 @@
7075	7547	f0 = f3;
7076	7548	f3 = t;
7077	7549	}
7078		- atleastone = true;
7079	7550
	7551	+ int va = f0.q;
	7552	+ int vb = f0.r;
	7553	+ int vc = -1;
	7554	+
	7555	+ Face toremove1 = null;
	7556	+ Face toremove2 = null;
	7557	+
	7558	+ // f0 is the buffer for the first new triangle,
	7559	+ // and otherf is the other upper one.
7080	7560	Face otherf = null;
7081	7561
7082	7562	if (f1.contains(f0.p))
7083	7563	{
7084	7564	if (f1.p == f0.p)
7085	7565	{
	7566	+ assert(false);
7086	7567	f0.r = f1.q;
7087	7568	}
7088	7569	else
7089	7570	{
7090	7571	assert(f1.q == f0.p);
7091		- f0.r = f1.p;
	7572	+ vc = f1.p;
7092	7573	}
7093	7574
7094	7575	otherf = f2;
7095		- faces.remove(f1);
7096		- faces.remove(f3);
	7576	+ toremove1 = f1;
	7577	+ toremove2 = f3;
7097	7578	}
7098	7579	else
7099	7580	if (f2.contains(f0.p))
7100	7581	{
7101	7582	if (f2.p == f0.p)
7102	7583	{
	7584	+ assert(false);
7103	7585	f0.r = f2.q;
7104	7586	}
7105	7587	else
7106	7588	{
7107	7589	assert(f2.q == f0.p);
7108		- f0.r = f2.p;
	7590	+ vc = f2.p;
7109	7591	}
7110	7592
7111	7593	otherf = f3;
7112		- faces.remove(f1);
7113		- faces.remove(f2);
	7594	+ toremove1 = f1;
	7595	+ toremove2 = f2;
7114	7596	}
7115	7597	if (f3.contains(f0.p))
7116	7598	{
7117	7599	if (f3.p == f0.p)
7118	7600	{
	7601	+// assert(false);
	7602	+ new Exception().printStackTrace();
7119	7603	f0.r = f3.q;
7120	7604	}
7121	7605	else
7122	7606	{
7123	7607	assert(f3.q == f0.p);
7124		- f0.r = f3.p;
	7608	+ vc = f3.p;
7125	7609	}
7126	7610
7127	7611	otherf = f1;
7128		- faces.remove(f2);
7129		- faces.remove(f3);
	7612	+ toremove1 = f2;
	7613	+ toremove2 = f3;
7130	7614	}
	7615	+
	7616	+ vertextemp.set(vertices.get(va));
	7617	+ vertextemp.sub(vertices.get(vb));
	7618	+ vertextemp.normalize();
	7619	+ vertextemp2.set(vertices.get(vc));
	7620	+ vertextemp2.sub(vertices.get(vb));
	7621	+ vertextemp2.normalize();
	7622	+
	7623	+ if (vertextemp.dot(vertextemp2) > -0.95)
	7624	+ {
	7625	+ continue;
	7626	+ }
	7627	+
	7628	+ atleastone = true;
	7629	+
	7630	+ f0.r = vc;
	7631	+
	7632	+ faces.remove(toremove1);
	7633	+ faces.remove(toremove2);
7131	7634
7132	7635	if (!f0.contains(otherf.p))
7133	7636	{
..	..	@@ -7180,7 +7683,7 @@
7180	7683	//InitWeights();
7181	7684	}
7182	7685
7183		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7686	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7184	7687
7185	7688	if (chosen == -1)
7186	7689	{
..	..	@@ -7194,7 +7697,7 @@
7194	7697	//remove3valence = false;
7195	7698	// InitWeights();
7196	7699
7197		- chosen = ChooseTriangle();
	7700	+ chosen = ChooseTriangle(true);
7198	7701	}
7199	7702	}
7200	7703
..	..	@@ -7335,7 +7838,7 @@
7335	7838	Trim();
7336	7839	Untrim();
7337	7840
7338		- BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GraphreeD.clone(this);
	7841	+ BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GrafreeD.clone(this);
7339	7842
7340	7843	double minx = Float.POSITIVE_INFINITY;
7341	7844	double maxx = Float.NEGATIVE_INFINITY;
..	..	@@ -7373,7 +7876,7 @@
7373	7876	if (max < maxz - minz)
7374	7877	max = maxz - minz;
7375	7878
7376		- tmp.THRESHOLD = max/25; // 50;
	7879	+ tmp.THRESHOLD = 0.5; // max/25; // 50;
7377	7880
7378	7881	tmp.faces.clear();
7379	7882
..	..	@@ -7470,7 +7973,7 @@
7470	7973
7471	7974	// boolean lock;
7472	7975
7473		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7976	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7474	7977	{
7475	7978	if (stripified)
7476	7979	{
..	..	@@ -7498,7 +8001,7 @@
7498	8001	s3 = new cVector();
7499	8002	}
7500	8003
7501		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8004	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7502	8005
7503	8006	try
7504	8007	{
..	..	@@ -7507,12 +8010,12 @@
7507	8010	{
7508	8011	System.err.println("EXCEPTION CAUGHT");
7509	8012	e.printStackTrace();
7510		- return;
	8013	+ return false;
7511	8014	} catch (Error e)
7512	8015	{
7513	8016	System.err.println("ERROR CAUGHT");
7514	8017	e.printStackTrace();
7515		- return;
	8018	+ return false;
7516	8019	}
7517	8020
7518	8021	System.out.println("# faces = " + faces.size());
..	..	@@ -7522,6 +8025,7 @@
7522	8025	{
7523	8026	Face face = (Face) faces.get(i);
7524	8027
	8028	+ face.used = false;
7525	8029	face.nbiterations = 1;
7526	8030	face.weight = -1;
7527	8031	face.boundary = -1;
..	..	@@ -7573,6 +8077,11 @@
7573	8077	nbbadfaces = faces.size();
7574	8078	//remove3valence = true;
7575	8079
	8080	+ int count = 2;
	8081	+
	8082	+ if (onlyone)
	8083	+ count = 1;
	8084	+
7576	8085	firstpass = true;
7577	8086
7578	8087	int n = faces.size();
..	..	@@ -7588,12 +8097,13 @@
7588	8097	System.out.print('.');
7589	8098	}
7590	8099	System.out.println();
	8100	+ boolean atleastone = false;
7591	8101	int i = 0;
7592		- while (reduction34 \|\| faces.size() > n/2)
	8102	+ while (true) // reduction34 \|\| faces.size() > n/2)
7593	8103	{
7594	8104	if (i++%100 == 0)
7595	8105	{
7596		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8106	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7597	8107	System.out.println("#faces = " + faces.size());
7598	8108	// if (i != 1)
7599	8109	// break;
..	..	@@ -7611,6 +8121,8 @@
7611	8121	{
7612	8122	if (!RemoveOneTriangle())
7613	8123	break;
	8124	+
	8125	+ atleastone = true;
7614	8126	}
7615	8127	// if (iterationcount == 0)
7616	8128	// break;
..	..	@@ -7621,8 +8133,8 @@
7621	8133	break;
7622	8134	}
7623	8135	firstpass = false;
7624		- if (onlyone)
7625		- break; // one triangle only
	8136	+// if (--count<0 && !reduction34)
	8137	+// break; // one triangle only
7626	8138	}
7627	8139
7628	8140	InitLinks(false); // for further display
..	..	@@ -7637,7 +8149,9 @@
7637	8149	//Trim(true,cJME.gennormals,true,false); // doesn't work
7638	8150	Trim(true,false,false,false,false);
7639	8151
7640		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8152	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8153	+
	8154	+ return atleastone;
7641	8155	}
7642	8156
7643	8157	void UpdateIndices(Face face, Face minface)
..	..	@@ -7650,18 +8164,21 @@
7650	8164	face.p = minface.p;
7651	8165	//if (leafweights)
7652	8166	face.good = 0; // false;
	8167	+ face.used = true;
7653	8168	}
7654	8169	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7655	8170	{
7656	8171	face.q = minface.p;
7657	8172	//if (leafweights)
7658	8173	face.good = 0; // false;
	8174	+ face.used = true;
7659	8175	}
7660	8176	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7661	8177	{
7662	8178	face.r = minface.p;
7663	8179	//if (leafweights)
7664	8180	face.good = 0; // false;
	8181	+ face.used = true;
7665	8182	}
7666	8183
7667	8184	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7721,50 +8238,50 @@
7721	8238	if (v == 2)
7722	8239	vert = minface.r;
7723	8240	// 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)
	8241	+ Vector<Face> vertfaces = links.get(vert);
	8242	+ for (int i=vertfaces.size(); --i>=0;)
7735	8243	{
7736		- if (!leafweights)
	8244	+ Face face = (Face) vertfaces.get(i);
	8245	+
	8246	+ // if (face.weight == 10000)
	8247	+ // continue;
	8248	+
	8249	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8250	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8251	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7737	8252	{
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);
	8253	+ if (!leafweights)
	8254	+ {
	8255	+ // if(minfaceweight <= 0)
	8256	+ // assert(minfaceweight > 0);
	8257	+ //
	8258	+ // //FaceWeight(face);
	8259	+ // if(face.weight < 0)
	8260	+ // assert(face.weight >= 0);
	8261	+
	8262	+ face.weight += minfaceweight;
	8263	+
	8264	+ // if (face.weight >= 10000)
	8265	+ // assert(face.weight < 10000);
	8266	+ }
	8267	+ else
	8268	+ face.weight = -1;
	8269	+
	8270	+ face.nbiterations += 1;
	8271	+ face.boundary = -1;
	8272	+
	8273	+ Vertex p = (Vertex)vertices.get(face.p);
	8274	+ Vertex q = (Vertex)vertices.get(face.q);
	8275	+ Vertex r = (Vertex)vertices.get(face.r);
	8276	+
	8277	+ p.boundary = -1;
	8278	+ q.boundary = -1;
	8279	+ r.boundary = -1;
7749	8280	}
7750	8281	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;
	8282	+ assert(false);
7763	8283	}
7764		- else
7765		- assert(false);
7766	8284	}
7767		- }
7768	8285
7769	8286	// TouchVertex(minface.p);
7770	8287	// TouchVertex(minface.q);
..	..	@@ -7932,6 +8449,8 @@
7932	8449
7933	8450	minface.q = minface.r = minface.p;
7934	8451
	8452	+ int count = 0;
	8453	+
7935	8454	for (int i=0; i<faces.size(); i++)
7936	8455	{
7937	8456	Face face = (Face) faces.get(i);
..	..	@@ -7943,6 +8462,9 @@
7943	8462	TouchVertex(face.r, true); // , minface.weight);
7944	8463	// assert(!lock);
7945	8464	faces.remove(i--);
	8465	+ count++;
	8466	+ if (count == 4)
	8467	+ break;
7946	8468	}
7947	8469	}
7948	8470
..	..	@@ -7960,6 +8482,7 @@
7960	8482	for (int i=vertfaces.size(); --i>=0;)
7961	8483	{
7962	8484	Face face = (Face) vertfaces.get(i);
	8485	+ face.used = true;
7963	8486	face.good = 0; // false;
7964	8487	if (leafweights)
7965	8488	face.weight = -1;
..	..	@@ -8006,7 +8529,7 @@
8006	8529	if (!trimmed)
8007	8530	return;
8008	8531
8009		- GraphreeD.linkUV = false;
	8532	+ Grafreed.linkUV = false;
8010	8533
8011	8534	try
8012	8535	{
..	..	@@ -8214,9 +8737,6 @@
8214	8737	return "trim = " + trimmed + "; stripped = " + stripified + "; colors = " + colors + "; faces = " + (faces!=null?faces.size():null) + "; triangles = " + (triangles!=null?triangles.length:null) + "; indices = " + indices;
8215	8738	}
8216	8739
8217		- static Camera localcamera = new Camera();
8218		- static cVector from = new cVector();
8219		- static cVector to = new cVector();
8220	8740	boolean trimmed = false;
8221	8741	boolean stripified = false;
8222	8742	transient boolean AOdone = false;
..	..	@@ -8224,8 +8744,10 @@
8224	8744	/transient/ int maxIndexV = 0;
8225	8745	/transient/ int bufV, bufF;
8226	8746	// Raw version
8227		- private float[] positions;
8228		- private float[] normals;
	8747	+ //private
	8748	+ float[] positions;
	8749	+ //private
	8750	+ float[] normals;
8229	8751	float[] colors;
8230	8752	private float[] uvmap;
8231	8753	private int[] triangles;
..	..	@@ -8239,7 +8761,8 @@
8239	8761	int[] startvertices;
8240	8762	float[] averagepoints;
8241	8763	float[] extremepoints;
8242		- float[] supportsizes; // distance of closest point
	8764	+ float[] supportminsize; // distance of closest point
	8765	+ float[] supportmaxsize; // distance of fartest point
8243	8766
8244	8767	transient Hashtable vertextable;
8245	8768	/transient/ private Vertex[] verticesCopy;