~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[]) GrafreeD.clone(other.positions);
176		- normals = (float[]) GrafreeD.clone(other.normals);
177		- colors = (float[]) GrafreeD.clone(other.colors);
178		- uvmap = (float[]) GrafreeD.clone(other.uvmap);
179		- triangles = (int[]) GrafreeD.clone(other.triangles);
	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[]) GrafreeD.clone(other.indices);
	182	+ indices = (int[]) Grafreed.clone(other.indices);
182	183
183		- vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices);
184		- faces = (Vector<Face>) GrafreeD.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) GrafreeD.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) GrafreeD.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,7 @@
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	+ if (v.weights != null && v.weights[j] < 0.001 * v.totalweight) // == 0)
1944	2001	{
1945	2002	//testweight += v.weights[j-1];
1946	2003	continue;
..	..	@@ -2163,7 +2220,7 @@
2163	2220	// if (slow)
2164	2221	// aout 2013
2165	2222	// sept 2013 merde...
2166		- W = 13;
	2223	+ W = 3; // 13;
2167	2224
2168	2225	// POSERATE
2169	2226	if (CameraPane.tickcount > 0 \|\| CameraPane.SLOWPOSE)
..	..	@@ -2221,6 +2278,8 @@
2221	2278
2222	2279	transient int lastsoundtime;
2223	2280
	2281	+ transient boolean once = false;
	2282	+
2224	2283	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2225	2284	{
2226	2285	if (LA.isIdentity(toRoot))
..	..	@@ -2276,7 +2335,11 @@
2276	2335
2277	2336	if (v.totalweight == 0)
2278	2337	{
2279		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2338	+ if (!once)
	2339	+ {
	2340	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2341	+ once = true;
	2342	+ }
2280	2343	continue;
2281	2344	}
2282	2345
..	..	@@ -2635,18 +2698,18 @@
2635	2698	if (false) // slow && stepout && onein)
2636	2699	{
2637	2700	// sound
2638		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	2701	+ cVector eye = Globals.theRenderer.EyeCamera().location;
2639	2702
2640	2703	Vertex v = GetVertex(0);
2641	2704
2642	2705	tmp.set(v);
2643	2706	tmp.sub(eye);
2644	2707
2645		- if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs
	2708	+ if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2646	2709	{
2647		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2710	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2648	2711
2649		- lastsoundtime = CameraPane.framecount;
	2712	+ lastsoundtime = Globals.framecount;
2650	2713	}
2651	2714
2652	2715	stepout = false;
..	..	@@ -3072,6 +3135,7 @@
3072	3135	//
3073	3136	// transient VertexCompare[] vertexcompare = null;
3074	3137
	3138	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3075	3139	boolean Contains(Vertex v0, int object)
3076	3140	{
3077	3141	int start = startvertices[object-1];
..	..	@@ -3129,7 +3193,27 @@
3129	3193	*/
3130	3194	}
3131	3195
3132		- void GenUV()
	3196	+ void UnfoldUV()
	3197	+ {
	3198	+ for (int i = 0; i < VertexCount(); i++)
	3199	+ {
	3200	+ Vertex v = GetVertex(i);
	3201	+
	3202	+ v.x = v.s;
	3203	+ v.y = v.t;
	3204	+ v.z = 0;
	3205	+
	3206	+ v.norm.x = 0;
	3207	+ v.norm.y = 0;
	3208	+ v.norm.z = 1;
	3209	+
	3210	+ SetVertex(v, i);
	3211	+ }
	3212	+ }
	3213	+
	3214	+ float power = 2;
	3215	+
	3216	+ void GenUV() // float power)
3133	3217	{
3134	3218	Trim();
3135	3219
..	..	@@ -3193,6 +3277,125 @@
3193	3277	y -= 0.5;
3194	3278	z -= 0.5;
3195	3279
	3280	+ double ax = Math.abs(x);
	3281	+ double ay = Math.abs(y);
	3282	+ double max = ax;
	3283	+ if (max < ay)
	3284	+ {
	3285	+ max = ay;
	3286	+ }
	3287	+
	3288	+ if (max == 0)
	3289	+ {
	3290	+ uvmap[i2] = 0.5f;
	3291	+ uvmap[i2+1] = 0.5f;
	3292	+ continue;
	3293	+ }
	3294	+
	3295	+ x /= max;
	3296	+ y /= max;
	3297	+
	3298	+ double angle = Math.acos(Math.abs(z*2));
	3299	+
	3300	+ double k = angle / Math.PI * 2;
	3301	+
	3302	+ assert(k >= 0);
	3303	+
	3304	+ // k == 0 => uv = 0 (center)
	3305	+ // k == 1 => uv = -1,1 (border)
	3306	+
	3307	+ if (i == 0)
	3308	+ System.out.println("power = " + power);
	3309	+
	3310	+ double length1 = (ax+ay)/max;
	3311	+ double length2 = Math.sqrt(axax + ayay) / max;
	3312	+
	3313	+ double t = k;
	3314	+
	3315	+ t = Math.pow(t, 3);
	3316	+
	3317	+ // Interpolate between k/length2 (center) and k (border)
	3318	+ if (length2 > 0)
	3319	+ k *= (1 - t) / length2 + t;
	3320	+
	3321	+ double u = k*x;
	3322	+ double v = k*y;
	3323	+
	3324	+ u /= 2;
	3325	+ v /= 2;
	3326	+ u += 0.5;
	3327	+ v += 0.5;
	3328	+
	3329	+ uvmap[i2] = (float) u;
	3330	+ uvmap[i2+1] = (float) v;
	3331	+ }
	3332	+ }
	3333	+
	3334	+ void GenUVold(float power)
	3335	+ {
	3336	+ Trim();
	3337	+
	3338	+ cVector boxcenter = null;
	3339	+ cVector minima, maxima;
	3340	+ minima = new cVector();
	3341	+ maxima = new cVector();
	3342	+ minima.x = minima.y = minima.z = Double.MAX_VALUE;
	3343	+ maxima.x = maxima.y = maxima.z = -Double.MAX_VALUE;
	3344	+ for (int i = 0; i < VertexCount(); i++)
	3345	+ {
	3346	+ Vertex v = GetVertex(i);
	3347	+
	3348	+ if (minima.x > v.x)
	3349	+ {
	3350	+ minima.x = v.x;
	3351	+ }
	3352	+ if (minima.y > v.y)
	3353	+ {
	3354	+ minima.y = v.y;
	3355	+ }
	3356	+ if (minima.z > v.z)
	3357	+ {
	3358	+ minima.z = v.z;
	3359	+ }
	3360	+
	3361	+ if (maxima.x < v.x)
	3362	+ {
	3363	+ maxima.x = v.x;
	3364	+ }
	3365	+ if (maxima.y < v.y)
	3366	+ {
	3367	+ maxima.y = v.y;
	3368	+ }
	3369	+ if (maxima.z < v.z)
	3370	+ {
	3371	+ maxima.z = v.z;
	3372	+ }
	3373	+ }
	3374	+
	3375	+ boxcenter = new cVector((maxima.x + minima.x) / 2, (maxima.y + minima.y) / 2, (maxima.z + minima.z) / 2);
	3376	+ int i2 = 0, i3 = 0;
	3377	+ for (int i = 0; i < positions.length/3; i++, i3 += 3, i2 += 2)
	3378	+ {
	3379	+// //uvmap[i2] = (float) normals[i3]*0.5f + 0.5f; // v.x;
	3380	+// //uvmap[i2 + 1] = (float) normals[i3+1]*0.5f + 0.5f; //z;
	3381	+// uvmap[i2] = (float) (positions[i3] - boxcenter.x);
	3382	+// uvmap[i2 + 1] = (float) (positions[i3+2] - boxcenter.z);
	3383	+// uvmap[i2] = (float) Math.atan2(positions[i3+1] - boxcenter.y, positions[i3] - boxcenter.x);
	3384	+// uvmap[i2 + 1] = (float)(positions[i3+2] - boxcenter.z);
	3385	+ // box UV
	3386	+ double x = positions[i3] - minima.x; // - Math.floor(positions[i3]);
	3387	+ double y = positions[i3+1] - minima.y; // - Math.floor(positions[i3+1]);
	3388	+ double z = positions[i3+2] - minima.z; // - Math.floor(positions[i3+2]);
	3389	+
	3390	+ // [-1/2, 1/2]
	3391	+ x /= maxima.x - minima.x;
	3392	+ y /= maxima.y - minima.y;
	3393	+ z /= maxima.z - minima.z;
	3394	+
	3395	+ x -= 0.5;
	3396	+ y -= 0.5;
	3397	+ z -= 0.5;
	3398	+
3196	3399	// x *= 2;
3197	3400	// y *= 2;
3198	3401	// z *= 2;
..	..	@@ -3219,6 +3422,15 @@
3219	3422
3220	3423	z = Math.cos(angle/2);
3221	3424
	3425	+ assert(z >= 0);
	3426	+ assert(z <= 1);
	3427	+
	3428	+ /**/
	3429	+ //z = Math.pow(z, power); //1.08f);
	3430	+
	3431	+ if (i == 0)
	3432	+ System.out.println("power = " + power);
	3433	+
3222	3434	// sqrt(k2x2 + k2z2 + y2) = length
3223	3435	// k2x2 + k2z2 = length2 - y2
3224	3436	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3229,7 +3441,7 @@
3229	3441	k /= xx + yy;
3230	3442	}
3231	3443	else
3232		- GrafreeD.Assert(z == 1);
	3444	+ Grafreed.Assert(z == 1);
3233	3445
3234	3446	if (k < 0)
3235	3447	k = 0;
..	..	@@ -3238,6 +3450,7 @@
3238	3450
3239	3451	x *= k;
3240	3452	y *= k;
	3453	+ /**/
3241	3454
3242	3455	double max = Math.abs(x);
3243	3456	if (max < Math.abs(y))
..	..	@@ -3250,10 +3463,15 @@
3250	3463	}
3251	3464
3252	3465	// max = Math.sqrt(max*2)/2;
	3466	+// double x2 = Math.pow(Math.abs(x), 1/power);
	3467	+// double y2 = Math.pow(Math.abs(y), 1/power);
	3468	+// double z2 = Math.pow(Math.abs(z), 1/power);
	3469	+// max = Math.pow(x2 + y2 + z2, power);
3253	3470
3254	3471	// if (!(max > 0))
3255		- assert(max > 0);
3256		-
	3472	+ //assert(max > 0);
	3473	+ assert(max >= 0);
	3474	+
3257	3475	x /= max;
3258	3476	y /= max;
3259	3477	z /= max;
..	..	@@ -3516,6 +3734,111 @@
3516	3734	*/
3517	3735	}
3518	3736
	3737	+ void GenerateNormals2(boolean crease)
	3738	+ {
	3739	+ cVector tempVector = new cVector();
	3740	+
	3741	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3742	+//
	3743	+//
	3744	+// for (int i=0; i<this.VertexCount(); i++)
	3745	+// {
	3746	+// Vertex v = this.GetVertex(i);
	3747	+//
	3748	+// tempVector.set(v);
	3749	+//
	3750	+// cVector n = tableBase.get(tempVector.ToFloat());
	3751	+//
	3752	+// if (n != null)
	3753	+// {
	3754	+// continue;
	3755	+// }
	3756	+//
	3757	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3758	+// }
	3759	+
	3760	+ BoundaryRep tempSupport = this.support;
	3761	+
	3762	+ this.support = null;
	3763	+
	3764	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3765	+
	3766	+ this.support = tempSupport;
	3767	+
	3768	+ //tempRep.Unstripify();
	3769	+
	3770	+ tempRep.GenerateNormals2(crease);
	3771	+
	3772	+ boolean keepnormal = Vertex.normalmode;
	3773	+ boolean epsequal = Grafreed.epsequal;
	3774	+
	3775	+ Vertex.normalmode = false;
	3776	+ Grafreed.epsequal = false; // A bit strange
	3777	+
	3778	+ // No need to have a match for vertex counts.
	3779	+
	3780	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3781	+
	3782	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3783	+ {
	3784	+ Vertex v = tempRep.GetVertex(i);
	3785	+
	3786	+ cVector n = table.get(tempVector.ToFloat());
	3787	+
	3788	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3789	+ {
	3790	+ //continue;
	3791	+ }
	3792	+
	3793	+ tempVector.set(v);
	3794	+
	3795	+ //cVector nBase = tableBase.get(tempVector);
	3796	+
	3797	+ //if (v.norm.dot(nBase) < 0.9)
	3798	+ //{
	3799	+ // continue;
	3800	+ //}
	3801	+
	3802	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3803	+ {
	3804	+ //continue;
	3805	+ }
	3806	+
	3807	+ if (n != null)
	3808	+ {
	3809	+// if (n.dot(v.norm) < 0)
	3810	+// n.sub(v.norm);
	3811	+// else
	3812	+// n.add(v.norm);
	3813	+//
	3814	+// n.normalize();
	3815	+ continue;
	3816	+ }
	3817	+
	3818	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3819	+ }
	3820	+
	3821	+ for (int i=0; i<this.VertexCount(); i++)
	3822	+ {
	3823	+ Vertex v = this.GetVertex(i);
	3824	+
	3825	+ tempVector.set(v);
	3826	+
	3827	+ cVector n = table.get(tempVector.ToFloat());
	3828	+
	3829	+ //if (n.dot(v.norm) < 0)
	3830	+ if (n == null)
	3831	+ continue;
	3832	+
	3833	+ LA.vecCopy(n, v.norm);
	3834	+
	3835	+ this.SetVertex(v, i);
	3836	+ }
	3837	+
	3838	+ Grafreed.epsequal = epsequal;
	3839	+ Vertex.normalmode = keepnormal;
	3840	+ }
	3841	+
3519	3842	void GenerateNormals(boolean crease)
3520	3843	{
3521	3844	boolean wastrim = trimmed;
..	..	@@ -3532,6 +3855,28 @@
3532	3855	}
3533	3856
3534	3857	Trim(true/wastrim/,true,crease,wasstrip,false);
	3858	+ }
	3859	+
	3860	+ void GenerateNormalsMesh()
	3861	+ {
	3862	+ if (stripified)
	3863	+ {
	3864	+ Unstripify();
	3865	+ }
	3866	+
	3867	+ if (trimmed)
	3868	+ {
	3869	+ normals = null;
	3870	+ }
	3871	+ else
	3872	+ {
	3873	+ for (int i=VertexCount(); --i>=0;)
	3874	+ {
	3875	+ Vertex v = GetVertex(i);
	3876	+
	3877	+ v.norm = null;
	3878	+ }
	3879	+ }
3535	3880	}
3536	3881
3537	3882	void GenNormalsJME()
..	..	@@ -3689,6 +4034,10 @@
3689	4034	{
3690	4035	triangles[i] = i;
3691	4036	}
	4037	+
	4038	+// Untrim();
	4039	+ if (!trimmed)
	4040	+ MergeNormals();
3692	4041	}
3693	4042	}
3694	4043
..	..	@@ -3722,6 +4071,11 @@
3722	4071	tsa.getNormals(0, normals);
3723	4072	tsa.getTextureCoordinates(0, 0, uvmap);
3724	4073	// tsa.getColors(0, colors);
	4074	+
	4075	+ for (int i=colors.length; --i>=0;)
	4076	+ {
	4077	+ colors[i] = 1;
	4078	+ }
3725	4079
3726	4080	int stripcount = tsa.getNumStrips();
3727	4081	triangles = new int[stripcount];
..	..	@@ -3744,6 +4098,10 @@
3744	4098	triangles = new int[1];
3745	4099	triangles[0] = 3;
3746	4100	}
	4101	+
	4102	+ //Untrim();
	4103	+ if (!trimmed)
	4104	+ MergeNormals();
3747	4105	}
3748	4106
3749	4107	/*
..	..	@@ -3776,21 +4134,64 @@
3776	4134	for (int i = 0; i < VertexCount(); i++)
3777	4135	{
3778	4136	Vertex v = GetVertex(i);
	4137	+
	4138	+ vertextemp.set(v);
	4139	+
3779	4140	//if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
3780	4141	{
3781		- GenerateNormal(i, v);
3782		- SetVertex(v, i);
	4142	+ if (!GenerateNormal(i, vertextemp))
	4143	+ continue;
	4144	+
	4145	+ if (v.norm.dot(vertextemp.norm) < 0)
	4146	+ vertextemp.norm.mul(-1);
	4147	+
	4148	+ if (v.norm.dot(vertextemp.norm) < 0.9)
	4149	+ SetVertex(vertextemp, i);
3783	4150	}
3784	4151	}
3785	4152
3786	4153	Vertex.normalmode = false;
3787	4154	}
3788	4155
	4156	+ void MergeNormals()
	4157	+ {
	4158	+ boolean smooth = Grafreed.smoothmode;
	4159	+ boolean link = Grafreed.linkUV;
	4160	+ Grafreed.smoothmode = true;
	4161	+ Grafreed.linkUV = true;
	4162	+
	4163	+ System.out.println("#Vertex = " + VertexCount());
	4164	+ System.out.println("#Face = " + FaceCount());
	4165	+
	4166	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4167	+
	4168	+ for (int i = 0; i < VertexCount(); i++)
	4169	+ {
	4170	+ Vertex v = GetVertex(i);
	4171	+
	4172	+ if (!table.contains(v))
	4173	+ {
	4174	+ table.add(v);
	4175	+ }
	4176	+ }
	4177	+
	4178	+ Grafreed.smoothmode = smooth;
	4179	+ Grafreed.linkUV = link;
	4180	+
	4181	+// for (int i = 0; i < VertexCount(); i++)
	4182	+// {
	4183	+// Vertex v = GetVertex(i);
	4184	+//
	4185	+// table.add(v);
	4186	+// }
	4187	+
	4188	+ }
	4189	+
3789	4190	static cVector temp1 = new cVector();
3790	4191	static cVector temp2 = new cVector();
3791	4192	static cVector temp3 = new cVector();
3792	4193
3793		- void GenerateNormal(int index, Vertex v)
	4194	+ boolean GenerateNormal(int index, Vertex v)
3794	4195	{
3795	4196	//System.out.println("Old normal = " + v.norm);
3796	4197	LA.setVector(v.norm, 0, 0, 0);
..	..	@@ -3819,6 +4220,10 @@
3819	4220	LA.vecSub(p/.pos/, v/.pos/, temp1);
3820	4221	LA.vecSub(q/.pos/, v/.pos/, temp2);
3821	4222	}
	4223	+ else
	4224	+ {
	4225	+ continue;
	4226	+ }
3822	4227
3823	4228	//LA.vecNormalize(temp1);
3824	4229	//LA.vecNormalize(temp2);
..	..	@@ -3829,17 +4234,25 @@
3829	4234	double s = temp3.length();
3830	4235	//double c = temp2.dot(temp1);
3831	4236
	4237	+ if (s == 0)
	4238	+ return false;
	4239	+
3832	4240	float angle = 1; // (float) Math.atan2(s, c);
3833	4241	//if(angle < 0) angle = -angle;
3834	4242
3835	4243	//LA.vecNormalize(temp3);
3836	4244	LA.vecScale(temp3, angle / s);
3837	4245
	4246	+// if (temp3.dot(v.norm) < 0)
	4247	+// assert(temp3.dot(v.norm) >= 0);
	4248	+
3838	4249	LA.vecAdd(temp3, v.norm, v.norm);
3839	4250	}
3840	4251
3841	4252	LA.vecNormalize(v.norm);
3842	4253	//System.out.println("New normal = " + v.norm);
	4254	+
	4255	+ return true;
3843	4256	}
3844	4257
3845	4258	double Arccos(double x)
..	..	@@ -4381,7 +4794,7 @@
4381	4794	}
4382	4795	}
4383	4796
4384		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4797	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4385	4798	{
4386	4799	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4387	4800	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4413,14 +4826,14 @@
4413	4826	// june 2014
4414	4827	// Camera parentcam = cam;
4415	4828	//
4416		-// if (cam == CameraPane.theRenderer.cameras[0])
	4829	+// if (cam == Globals.theRenderer.cameras[0])
4417	4830	// {
4418		-// parentcam = CameraPane.theRenderer.cameras[1];
	4831	+// parentcam = Globals.theRenderer.cameras[1];
4419	4832	// }
4420	4833	//
4421		-// if (cam == CameraPane.theRenderer.cameras[1])
	4834	+// if (cam == Globals.theRenderer.cameras[1])
4422	4835	// {
4423		-// parentcam = CameraPane.theRenderer.cameras[0];
	4836	+// parentcam = Globals.theRenderer.cameras[0];
4424	4837	// }
4425	4838
4426	4839	gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..	..	@@ -4546,16 +4959,25 @@
4546	4959	{
4547	4960	i3 = positions.length-3;
4548	4961	i2 = uvmap.length - 2;
4549		- new Exception().printStackTrace();
	4962	+ //new Exception().printStackTrace();
4550	4963	}
4551	4964
4552	4965	v./pos./x = positions[i3];
4553	4966	v./pos./y = positions[i3 + 1];
4554	4967	v./pos./z = positions[i3 + 2];
4555	4968
4556		- v.norm.x = normals[i3];
4557		- v.norm.y = normals[i3 + 1];
4558		- v.norm.z = normals[i3 + 2];
	4969	+ if (normals == null)
	4970	+ {
	4971	+ v.norm.x = 0;
	4972	+ v.norm.y = 0;
	4973	+ v.norm.z = 0;
	4974	+ }
	4975	+ else
	4976	+ {
	4977	+ v.norm.x = normals[i3];
	4978	+ v.norm.y = normals[i3 + 1];
	4979	+ v.norm.z = normals[i3 + 2];
	4980	+ }
4559	4981
4560	4982	v.s = uvmap[i2];
4561	4983	v.t = uvmap[i2 + 1];
..	..	@@ -4846,7 +5268,7 @@
4846	5268	return verticesCopy;
4847	5269	}
4848	5270
4849		- void PreprocessOcclusion(CameraPane cp, double[][] transform)
	5271	+ void PreprocessOcclusion(iCameraPane cp, double[][] transform)
4850	5272	{
4851	5273	if (//!trimmed \|\|
4852	5274	AOdone)
..	..	@@ -4855,80 +5277,7 @@
4855	5277	return;
4856	5278	}
4857	5279
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;
	5280	+ cp.PrepOcclusion(this, transform);
4932	5281
4933	5282	AOdone = true;
4934	5283	}
..	..	@@ -5343,17 +5692,27 @@
5343	5692
5344	5693	transient int nbbadfaces; // ?? = 1000000;
5345	5694
5346		- int ChooseTriangle()
	5695	+ /*
	5696	+ */
	5697	+ int ChooseTriangle(boolean firstEquilateral)
5347	5698	{
5348	5699	int chosen = -1;
5349	5700
5350	5701	double minweight = 1E10;
5351	5702
	5703	+ int step = 8; // ?
	5704	+
	5705	+ if (firstEquilateral)
	5706	+ step = 1;
	5707	+
5352	5708	nbbadfaces = 0;
5353		- for (int i=0; i<faces.size(); i+=8)
	5709	+ for (int i=0; i<faces.size(); i+=step)
5354	5710	// for (int i=faces.size(); (i-=8)>=0;)
5355	5711	{
5356	5712	Face face = (Face) faces.get(i);
	5713	+
	5714	+ if (face.used)
	5715	+ continue;
5357	5716
5358	5717	if (!Valid(face))
5359	5718	{
..	..	@@ -5363,6 +5722,15 @@
5363	5722
5364	5723	if (Boundary(face))
5365	5724	continue;
	5725	+
	5726	+// if (Boundary(face.p))
	5727	+// continue;
	5728	+//
	5729	+// if (Boundary(face.q))
	5730	+// continue;
	5731	+//
	5732	+// if (Boundary(face.r))
	5733	+// continue;
5366	5734
5367	5735	if (!ValidValence(face))
5368	5736	continue;
..	..	@@ -5375,22 +5743,55 @@
5375	5743	//?? if (face.weight < 0)
5376	5744	// continue;
5377	5745
5378		- double K = 1; // 0.01; // .25;
5379		-
5380		- double factor = (1-K)face.nbiterations + K; //face.weight;
5381		-
5382		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5383		-
5384		- if (minweight > weight)
	5746	+ if (firstEquilateral)
5385	5747	{
5386		- minweight = weight;
	5748	+ if (OneFaceUsed(links.get(face.p)))
	5749	+ continue;
	5750	+
	5751	+ if (OneFaceUsed(links.get(face.q)))
	5752	+ continue;
	5753	+
	5754	+ if (OneFaceUsed(links.get(face.r)))
	5755	+ continue;
	5756	+
5387	5757	chosen = i;
5388		- if (minweight == 0)
5389		- break;
	5758	+ break;
	5759	+ }
	5760	+ else
	5761	+ {
	5762	+ double K = 1; // 0.01; // .25;
	5763	+
	5764	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5765	+
	5766	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5767	+
	5768	+ if (minweight > weight)
	5769	+ {
	5770	+ minweight = weight;
	5771	+ chosen = i;
	5772	+ if (minweight == 0)
	5773	+ break;
	5774	+ }
5390	5775	}
5391	5776	}
5392	5777
5393	5778	return chosen;
	5779	+ }
	5780	+
	5781	+ private boolean OneFaceUsed(Vector<Face> faces)
	5782	+ {
	5783	+ if (faces.size() != 6)
	5784	+ return true;
	5785	+
	5786	+ for (int i=0; i<6; i+=1)
	5787	+ {
	5788	+ if (faces.get(i).used)
	5789	+ {
	5790	+ return true;
	5791	+ }
	5792	+ }
	5793	+
	5794	+ return false;
5394	5795	}
5395	5796
5396	5797	static boolean remove3valence = true;
..	..	@@ -5426,7 +5827,7 @@
5426	5827	}
5427	5828	else
5428	5829	{
5429		- assert(links.size() == vertices.size());
	5830	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5430	5831
5431	5832	links.setSize(vertices.size());
5432	5833	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5434,6 +5835,7 @@
5434	5835	// linkstouched[i] = false;
5435	5836	if (links.get(i) == null) // ??
5436	5837	{
	5838	+ new Exception().printStackTrace();
5437	5839	links.set(i, new Vector(8));
5438	5840	// linkstouched[i] = true;
5439	5841	}
..	..	@@ -5444,6 +5846,8 @@
5444	5846	}
5445	5847	}
5446	5848
	5849	+ boolean once = false;
	5850	+
5447	5851	for (int i=faces.size(); --i>=0;)
5448	5852	{
5449	5853	Face face = (Face) faces.get(i);
..	..	@@ -5455,6 +5859,9 @@
5455	5859	//if (linkstouched[face.r])
5456	5860	links.get(face.r).add(face);
5457	5861
	5862	+ if (face.used)
	5863	+ once = true;
	5864	+
5458	5865	face.good = 1;
5459	5866	face.boundary = -1;
5460	5867	}
..	..	@@ -6226,6 +6633,7 @@
6226	6633
6227	6634	void InitWeights()
6228	6635	{
	6636	+ new Exception().printStackTrace();
6229	6637	System.exit(0);
6230	6638	int n = 0;
6231	6639	int b = 0;
..	..	@@ -6819,6 +7227,10 @@
6819	7227	return (face.boundary = 1) == 1;
6820	7228	}
6821	7229
	7230	+ // June 2019
	7231	+ if (true)
	7232	+ return (face.boundary = 0) == 1;
	7233	+
6822	7234	// reverse triangle test
6823	7235	q1.set(p);
6824	7236	q2.set(q);
..	..	@@ -7075,6 +7487,7 @@
7075	7487	assert(f2.contains(i));
7076	7488	assert(f3.contains(i));
7077	7489
	7490	+ // when r is the "center", p is along the boundary
7078	7491	while (f0.r != i)
7079	7492	{
7080	7493	int t = f0.p;
..	..	@@ -7131,59 +7544,90 @@
7131	7544	f0 = f3;
7132	7545	f3 = t;
7133	7546	}
7134		- atleastone = true;
7135	7547
	7548	+ int va = f0.q;
	7549	+ int vb = f0.r;
	7550	+ int vc = -1;
	7551	+
	7552	+ Face toremove1 = null;
	7553	+ Face toremove2 = null;
	7554	+
	7555	+ // f0 is the buffer for the first new triangle,
	7556	+ // and otherf is the other upper one.
7136	7557	Face otherf = null;
7137	7558
7138	7559	if (f1.contains(f0.p))
7139	7560	{
7140	7561	if (f1.p == f0.p)
7141	7562	{
	7563	+ assert(false);
7142	7564	f0.r = f1.q;
7143	7565	}
7144	7566	else
7145	7567	{
7146	7568	assert(f1.q == f0.p);
7147		- f0.r = f1.p;
	7569	+ vc = f1.p;
7148	7570	}
7149	7571
7150	7572	otherf = f2;
7151		- faces.remove(f1);
7152		- faces.remove(f3);
	7573	+ toremove1 = f1;
	7574	+ toremove2 = f3;
7153	7575	}
7154	7576	else
7155	7577	if (f2.contains(f0.p))
7156	7578	{
7157	7579	if (f2.p == f0.p)
7158	7580	{
	7581	+ assert(false);
7159	7582	f0.r = f2.q;
7160	7583	}
7161	7584	else
7162	7585	{
7163	7586	assert(f2.q == f0.p);
7164		- f0.r = f2.p;
	7587	+ vc = f2.p;
7165	7588	}
7166	7589
7167	7590	otherf = f3;
7168		- faces.remove(f1);
7169		- faces.remove(f2);
	7591	+ toremove1 = f1;
	7592	+ toremove2 = f2;
7170	7593	}
7171	7594	if (f3.contains(f0.p))
7172	7595	{
7173	7596	if (f3.p == f0.p)
7174	7597	{
	7598	+// assert(false);
	7599	+ new Exception().printStackTrace();
7175	7600	f0.r = f3.q;
7176	7601	}
7177	7602	else
7178	7603	{
7179	7604	assert(f3.q == f0.p);
7180		- f0.r = f3.p;
	7605	+ vc = f3.p;
7181	7606	}
7182	7607
7183	7608	otherf = f1;
7184		- faces.remove(f2);
7185		- faces.remove(f3);
	7609	+ toremove1 = f2;
	7610	+ toremove2 = f3;
7186	7611	}
	7612	+
	7613	+ vertextemp.set(vertices.get(va));
	7614	+ vertextemp.sub(vertices.get(vb));
	7615	+ vertextemp.normalize();
	7616	+ vertextemp2.set(vertices.get(vc));
	7617	+ vertextemp2.sub(vertices.get(vb));
	7618	+ vertextemp2.normalize();
	7619	+
	7620	+ if (vertextemp.dot(vertextemp2) > -0.95)
	7621	+ {
	7622	+ continue;
	7623	+ }
	7624	+
	7625	+ atleastone = true;
	7626	+
	7627	+ f0.r = vc;
	7628	+
	7629	+ faces.remove(toremove1);
	7630	+ faces.remove(toremove2);
7187	7631
7188	7632	if (!f0.contains(otherf.p))
7189	7633	{
..	..	@@ -7236,7 +7680,7 @@
7236	7680	//InitWeights();
7237	7681	}
7238	7682
7239		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7683	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7240	7684
7241	7685	if (chosen == -1)
7242	7686	{
..	..	@@ -7250,7 +7694,7 @@
7250	7694	//remove3valence = false;
7251	7695	// InitWeights();
7252	7696
7253		- chosen = ChooseTriangle();
	7697	+ chosen = ChooseTriangle(true);
7254	7698	}
7255	7699	}
7256	7700
..	..	@@ -7526,7 +7970,7 @@
7526	7970
7527	7971	// boolean lock;
7528	7972
7529		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7973	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7530	7974	{
7531	7975	if (stripified)
7532	7976	{
..	..	@@ -7554,7 +7998,7 @@
7554	7998	s3 = new cVector();
7555	7999	}
7556	8000
7557		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8001	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7558	8002
7559	8003	try
7560	8004	{
..	..	@@ -7563,12 +8007,12 @@
7563	8007	{
7564	8008	System.err.println("EXCEPTION CAUGHT");
7565	8009	e.printStackTrace();
7566		- return;
	8010	+ return false;
7567	8011	} catch (Error e)
7568	8012	{
7569	8013	System.err.println("ERROR CAUGHT");
7570	8014	e.printStackTrace();
7571		- return;
	8015	+ return false;
7572	8016	}
7573	8017
7574	8018	System.out.println("# faces = " + faces.size());
..	..	@@ -7578,6 +8022,7 @@
7578	8022	{
7579	8023	Face face = (Face) faces.get(i);
7580	8024
	8025	+ face.used = false;
7581	8026	face.nbiterations = 1;
7582	8027	face.weight = -1;
7583	8028	face.boundary = -1;
..	..	@@ -7629,6 +8074,11 @@
7629	8074	nbbadfaces = faces.size();
7630	8075	//remove3valence = true;
7631	8076
	8077	+ int count = 2;
	8078	+
	8079	+ if (onlyone)
	8080	+ count = 1;
	8081	+
7632	8082	firstpass = true;
7633	8083
7634	8084	int n = faces.size();
..	..	@@ -7644,12 +8094,13 @@
7644	8094	System.out.print('.');
7645	8095	}
7646	8096	System.out.println();
	8097	+ boolean atleastone = false;
7647	8098	int i = 0;
7648		- while (reduction34 \|\| faces.size() > n/2)
	8099	+ while (true) // reduction34 \|\| faces.size() > n/2)
7649	8100	{
7650	8101	if (i++%100 == 0)
7651	8102	{
7652		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8103	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7653	8104	System.out.println("#faces = " + faces.size());
7654	8105	// if (i != 1)
7655	8106	// break;
..	..	@@ -7667,6 +8118,8 @@
7667	8118	{
7668	8119	if (!RemoveOneTriangle())
7669	8120	break;
	8121	+
	8122	+ atleastone = true;
7670	8123	}
7671	8124	// if (iterationcount == 0)
7672	8125	// break;
..	..	@@ -7677,8 +8130,8 @@
7677	8130	break;
7678	8131	}
7679	8132	firstpass = false;
7680		- if (onlyone)
7681		- break; // one triangle only
	8133	+// if (--count<0 && !reduction34)
	8134	+// break; // one triangle only
7682	8135	}
7683	8136
7684	8137	InitLinks(false); // for further display
..	..	@@ -7693,7 +8146,9 @@
7693	8146	//Trim(true,cJME.gennormals,true,false); // doesn't work
7694	8147	Trim(true,false,false,false,false);
7695	8148
7696		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8149	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8150	+
	8151	+ return atleastone;
7697	8152	}
7698	8153
7699	8154	void UpdateIndices(Face face, Face minface)
..	..	@@ -7706,18 +8161,21 @@
7706	8161	face.p = minface.p;
7707	8162	//if (leafweights)
7708	8163	face.good = 0; // false;
	8164	+ face.used = true;
7709	8165	}
7710	8166	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7711	8167	{
7712	8168	face.q = minface.p;
7713	8169	//if (leafweights)
7714	8170	face.good = 0; // false;
	8171	+ face.used = true;
7715	8172	}
7716	8173	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7717	8174	{
7718	8175	face.r = minface.p;
7719	8176	//if (leafweights)
7720	8177	face.good = 0; // false;
	8178	+ face.used = true;
7721	8179	}
7722	8180
7723	8181	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7777,50 +8235,50 @@
7777	8235	if (v == 2)
7778	8236	vert = minface.r;
7779	8237	// Face face = (Face) faces.get(i);
7780		- Vector<Face> vertfaces = links.get(vert);
7781		- for (int i=vertfaces.size(); --i>=0;)
7782		- {
7783		- Face face = (Face) vertfaces.get(i);
7784		-
7785		- // if (face.weight == 10000)
7786		- // continue;
7787		-
7788		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7789		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7790		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8238	+ Vector<Face> vertfaces = links.get(vert);
	8239	+ for (int i=vertfaces.size(); --i>=0;)
7791	8240	{
7792		- if (!leafweights)
	8241	+ Face face = (Face) vertfaces.get(i);
	8242	+
	8243	+ // if (face.weight == 10000)
	8244	+ // continue;
	8245	+
	8246	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8247	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8248	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7793	8249	{
7794		-// if(minfaceweight <= 0)
7795		-// assert(minfaceweight > 0);
7796		-//
7797		-// //FaceWeight(face);
7798		-// if(face.weight < 0)
7799		-// assert(face.weight >= 0);
7800		-
7801		- face.weight += minfaceweight;
7802		-
7803		-// if (face.weight >= 10000)
7804		-// assert(face.weight < 10000);
	8250	+ if (!leafweights)
	8251	+ {
	8252	+ // if(minfaceweight <= 0)
	8253	+ // assert(minfaceweight > 0);
	8254	+ //
	8255	+ // //FaceWeight(face);
	8256	+ // if(face.weight < 0)
	8257	+ // assert(face.weight >= 0);
	8258	+
	8259	+ face.weight += minfaceweight;
	8260	+
	8261	+ // if (face.weight >= 10000)
	8262	+ // assert(face.weight < 10000);
	8263	+ }
	8264	+ else
	8265	+ face.weight = -1;
	8266	+
	8267	+ face.nbiterations += 1;
	8268	+ face.boundary = -1;
	8269	+
	8270	+ Vertex p = (Vertex)vertices.get(face.p);
	8271	+ Vertex q = (Vertex)vertices.get(face.q);
	8272	+ Vertex r = (Vertex)vertices.get(face.r);
	8273	+
	8274	+ p.boundary = -1;
	8275	+ q.boundary = -1;
	8276	+ r.boundary = -1;
7805	8277	}
7806	8278	else
7807		- face.weight = -1;
7808		-
7809		- face.nbiterations += 1;
7810		- face.boundary = -1;
7811		-
7812		- Vertex p = (Vertex)vertices.get(face.p);
7813		- Vertex q = (Vertex)vertices.get(face.q);
7814		- Vertex r = (Vertex)vertices.get(face.r);
7815		-
7816		- p.boundary = -1;
7817		- q.boundary = -1;
7818		- r.boundary = -1;
	8279	+ assert(false);
7819	8280	}
7820		- else
7821		- assert(false);
7822	8281	}
7823		- }
7824	8282
7825	8283	// TouchVertex(minface.p);
7826	8284	// TouchVertex(minface.q);
..	..	@@ -8021,6 +8479,7 @@
8021	8479	for (int i=vertfaces.size(); --i>=0;)
8022	8480	{
8023	8481	Face face = (Face) vertfaces.get(i);
	8482	+ face.used = true;
8024	8483	face.good = 0; // false;
8025	8484	if (leafweights)
8026	8485	face.weight = -1;
..	..	@@ -8067,7 +8526,7 @@
8067	8526	if (!trimmed)
8068	8527	return;
8069	8528
8070		- GrafreeD.linkUV = false;
	8529	+ Grafreed.linkUV = false;
8071	8530
8072	8531	try
8073	8532	{
..	..	@@ -8275,9 +8734,6 @@
8275	8734	return "trim = " + trimmed + "; stripped = " + stripified + "; colors = " + colors + "; faces = " + (faces!=null?faces.size():null) + "; triangles = " + (triangles!=null?triangles.length:null) + "; indices = " + indices;
8276	8735	}
8277	8736
8278		- static Camera localcamera = new Camera();
8279		- static cVector from = new cVector();
8280		- static cVector to = new cVector();
8281	8737	boolean trimmed = false;
8282	8738	boolean stripified = false;
8283	8739	transient boolean AOdone = false;
..	..	@@ -8285,8 +8741,10 @@
8285	8741	/transient/ int maxIndexV = 0;
8286	8742	/transient/ int bufV, bufF;
8287	8743	// Raw version
8288		- private float[] positions;
8289		- private float[] normals;
	8744	+ //private
	8745	+ float[] positions;
	8746	+ //private
	8747	+ float[] normals;
8290	8748	float[] colors;
8291	8749	private float[] uvmap;
8292	8750	private int[] triangles;
..	..	@@ -8300,7 +8758,8 @@
8300	8758	int[] startvertices;
8301	8759	float[] averagepoints;
8302	8760	float[] extremepoints;
8303		- float[] supportsizes; // distance of closest point
	8761	+ float[] supportminsize; // distance of closest point
	8762	+ float[] supportmaxsize; // distance of fartest point
8304	8763
8305	8764	transient Hashtable vertextable;
8306	8765	/transient/ private Vertex[] verticesCopy;