~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -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)
..	..	@@ -500,7 +530,7 @@
500	530	static Vertex vertextemp = new Vertex(true);
501	531	static Vertex vertextemp2 = new Vertex(true);
502	532
503		- static double SEUIL = 0.1f; // 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)
..	..	@@ -598,7 +628,7 @@
598	628	// ;
599	629	//
600	630
601		- supportsize = supportsizes[subsupport];
	631	+ supportsize = supportminsize[subsupport];
602	632
603	633	double K = supportsize / distmax;
604	634
..	..	@@ -650,7 +680,8 @@
650	680	// if (supportsize * fadefactor > 1)
651	681	// return 1;
652	682
653		- return supportsize * fadefactor;
	683	+ return //supportsize *
	684	+ supportsize * fadefactor;
654	685	}
655	686
656	687	void RecomputeBasis(BoundaryRep other, double[][] toRoot, Vertex v)
..	..	@@ -952,7 +983,7 @@
952	983
953	984	// sept 2017 SEUIL = 0.1; // aout 2013
954	985
955		- supports = InitConnections(other);
	986	+ supports = other.InitConnections();
956	987
957	988	other.supports = supports; // should be the other way around...
958	989
..	..	@@ -1518,7 +1549,7 @@
1518	1549	InitFaceIndices();
1519	1550	}
1520	1551
1521		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1552	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1522	1553	//float[] v = new float[100];
1523	1554
1524	1555	for (int loops=1; --loops>=0;)
..	..	@@ -1548,7 +1579,7 @@
1548	1579	InitFaceIndices();
1549	1580	}
1550	1581
1551		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1582	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1552	1583	//float[] v = new float[100];
1553	1584
1554	1585	for (int loops=10; --loops>=0;)
..	..	@@ -1895,7 +1926,7 @@
1895	1926	return;
1896	1927	}
1897	1928
1898		- // System.exit(0);
	1929	+ // System.exit(0);
1899	1930
1900	1931	cVector vect = new cVector();
1901	1932	cVector normal = new cVector();
..	..	@@ -1966,7 +1997,10 @@
1966	1997	if (v.vertexlinks == null)
1967	1998	continue;
1968	1999
1969		- 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)
1970	2004	{
1971	2005	//testweight += v.weights[j-1];
1972	2006	continue;
..	..	@@ -2247,6 +2281,8 @@
2247	2281
2248	2282	transient int lastsoundtime;
2249	2283
	2284	+ transient boolean once = false;
	2285	+
2250	2286	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2251	2287	{
2252	2288	if (LA.isIdentity(toRoot))
..	..	@@ -2302,7 +2338,11 @@
2302	2338
2303	2339	if (v.totalweight == 0)
2304	2340	{
2305		- 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	+ }
2306	2346	continue;
2307	2347	}
2308	2348
..	..	@@ -2670,7 +2710,7 @@
2670	2710
2671	2711	if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672	2712	{
2673		- GrafreeD.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);
2674	2714
2675	2715	lastsoundtime = Globals.framecount;
2676	2716	}
..	..	@@ -3098,6 +3138,7 @@
3098	3138	//
3099	3139	// transient VertexCompare[] vertexcompare = null;
3100	3140
	3141	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3101	3142	boolean Contains(Vertex v0, int object)
3102	3143	{
3103	3144	int start = startvertices[object-1];
..	..	@@ -3155,7 +3196,27 @@
3155	3196	*/
3156	3197	}
3157	3198
3158		- 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)
3159	3220	{
3160	3221	Trim();
3161	3222
..	..	@@ -3219,6 +3280,125 @@
3219	3280	y -= 0.5;
3220	3281	z -= 0.5;
3221	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	+
3222	3402	// x *= 2;
3223	3403	// y *= 2;
3224	3404	// z *= 2;
..	..	@@ -3245,6 +3425,15 @@
3245	3425
3246	3426	z = Math.cos(angle/2);
3247	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	+
3248	3437	// sqrt(k2x2 + k2z2 + y2) = length
3249	3438	// k2x2 + k2z2 = length2 - y2
3250	3439	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3255,7 +3444,7 @@
3255	3444	k /= xx + yy;
3256	3445	}
3257	3446	else
3258		- GrafreeD.Assert(z == 1);
	3447	+ Grafreed.Assert(z == 1);
3259	3448
3260	3449	if (k < 0)
3261	3450	k = 0;
..	..	@@ -3264,6 +3453,7 @@
3264	3453
3265	3454	x *= k;
3266	3455	y *= k;
	3456	+ /**/
3267	3457
3268	3458	double max = Math.abs(x);
3269	3459	if (max < Math.abs(y))
..	..	@@ -3276,10 +3466,15 @@
3276	3466	}
3277	3467
3278	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);
3279	3473
3280	3474	// if (!(max > 0))
3281		- assert(max > 0);
3282		-
	3475	+ //assert(max > 0);
	3476	+ assert(max >= 0);
	3477	+
3283	3478	x /= max;
3284	3479	y /= max;
3285	3480	z /= max;
..	..	@@ -3542,6 +3737,111 @@
3542	3737	*/
3543	3738	}
3544	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	+
3545	3845	void GenerateNormals(boolean crease)
3546	3846	{
3547	3847	boolean wastrim = trimmed;
..	..	@@ -3558,6 +3858,28 @@
3558	3858	}
3559	3859
3560	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	+ }
3561	3883	}
3562	3884
3563	3885	void GenNormalsJME()
..	..	@@ -3682,7 +4004,7 @@
3682	4004	NormalGenerator ng;
3683	4005
3684	4006	if (crease)
3685		- 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);
3686	4008	else
3687	4009	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3688	4010
..	..	@@ -3715,6 +4037,10 @@
3715	4037	{
3716	4038	triangles[i] = i;
3717	4039	}
	4040	+
	4041	+// Untrim();
	4042	+ if (!trimmed)
	4043	+ MergeNormals();
3718	4044	}
3719	4045	}
3720	4046
..	..	@@ -3748,6 +4074,11 @@
3748	4074	tsa.getNormals(0, normals);
3749	4075	tsa.getTextureCoordinates(0, 0, uvmap);
3750	4076	// tsa.getColors(0, colors);
	4077	+
	4078	+ for (int i=colors.length; --i>=0;)
	4079	+ {
	4080	+ colors[i] = 1;
	4081	+ }
3751	4082
3752	4083	int stripcount = tsa.getNumStrips();
3753	4084	triangles = new int[stripcount];
..	..	@@ -3770,6 +4101,10 @@
3770	4101	triangles = new int[1];
3771	4102	triangles[0] = 3;
3772	4103	}
	4104	+
	4105	+ //Untrim();
	4106	+ if (!trimmed)
	4107	+ MergeNormals();
3773	4108	}
3774	4109
3775	4110	/*
..	..	@@ -3819,6 +4154,42 @@
3819	4154	}
3820	4155
3821	4156	Vertex.normalmode = false;
	4157	+ }
	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	+
3822	4193	}
3823	4194
3824	4195	static cVector temp1 = new cVector();
..	..	@@ -4428,7 +4799,7 @@
4428	4799	}
4429	4800	}
4430	4801
4431		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4802	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4432	4803	{
4433	4804	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4434	4805	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4593,16 +4964,25 @@
4593	4964	{
4594	4965	i3 = positions.length-3;
4595	4966	i2 = uvmap.length - 2;
4596		- new Exception().printStackTrace();
	4967	+ //new Exception().printStackTrace();
4597	4968	}
4598	4969
4599	4970	v./pos./x = positions[i3];
4600	4971	v./pos./y = positions[i3 + 1];
4601	4972	v./pos./z = positions[i3 + 2];
4602	4973
4603		- v.norm.x = normals[i3];
4604		- v.norm.y = normals[i3 + 1];
4605		- 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	+ }
4606	4986
4607	4987	v.s = uvmap[i2];
4608	4988	v.t = uvmap[i2 + 1];
..	..	@@ -5317,17 +5697,27 @@
5317	5697
5318	5698	transient int nbbadfaces; // ?? = 1000000;
5319	5699
5320		- int ChooseTriangle()
	5700	+ /*
	5701	+ */
	5702	+ int ChooseTriangle(boolean firstEquilateral)
5321	5703	{
5322	5704	int chosen = -1;
5323	5705
5324	5706	double minweight = 1E10;
5325	5707
	5708	+ int step = 8; // ?
	5709	+
	5710	+ if (firstEquilateral)
	5711	+ step = 1;
	5712	+
5326	5713	nbbadfaces = 0;
5327		- for (int i=0; i<faces.size(); i+=8)
	5714	+ for (int i=0; i<faces.size(); i+=step)
5328	5715	// for (int i=faces.size(); (i-=8)>=0;)
5329	5716	{
5330	5717	Face face = (Face) faces.get(i);
	5718	+
	5719	+ if (face.used)
	5720	+ continue;
5331	5721
5332	5722	if (!Valid(face))
5333	5723	{
..	..	@@ -5337,6 +5727,15 @@
5337	5727
5338	5728	if (Boundary(face))
5339	5729	continue;
	5730	+
	5731	+// if (Boundary(face.p))
	5732	+// continue;
	5733	+//
	5734	+// if (Boundary(face.q))
	5735	+// continue;
	5736	+//
	5737	+// if (Boundary(face.r))
	5738	+// continue;
5340	5739
5341	5740	if (!ValidValence(face))
5342	5741	continue;
..	..	@@ -5349,22 +5748,55 @@
5349	5748	//?? if (face.weight < 0)
5350	5749	// continue;
5351	5750
5352		- double K = 1; // 0.01; // .25;
5353		-
5354		- double factor = (1-K)face.nbiterations + K; //face.weight;
5355		-
5356		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5357		-
5358		- if (minweight > weight)
	5751	+ if (firstEquilateral)
5359	5752	{
5360		- 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	+
5361	5762	chosen = i;
5362		- if (minweight == 0)
5363		- break;
	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	+ }
5364	5780	}
5365	5781	}
5366	5782
5367	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;
5368	5800	}
5369	5801
5370	5802	static boolean remove3valence = true;
..	..	@@ -5400,7 +5832,7 @@
5400	5832	}
5401	5833	else
5402	5834	{
5403		- assert(links.size() == vertices.size());
	5835	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5404	5836
5405	5837	links.setSize(vertices.size());
5406	5838	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5408,6 +5840,7 @@
5408	5840	// linkstouched[i] = false;
5409	5841	if (links.get(i) == null) // ??
5410	5842	{
	5843	+ new Exception().printStackTrace();
5411	5844	links.set(i, new Vector(8));
5412	5845	// linkstouched[i] = true;
5413	5846	}
..	..	@@ -5418,6 +5851,8 @@
5418	5851	}
5419	5852	}
5420	5853
	5854	+ boolean once = false;
	5855	+
5421	5856	for (int i=faces.size(); --i>=0;)
5422	5857	{
5423	5858	Face face = (Face) faces.get(i);
..	..	@@ -5429,6 +5864,9 @@
5429	5864	//if (linkstouched[face.r])
5430	5865	links.get(face.r).add(face);
5431	5866
	5867	+ if (face.used)
	5868	+ once = true;
	5869	+
5432	5870	face.good = 1;
5433	5871	face.boundary = -1;
5434	5872	}
..	..	@@ -6200,6 +6638,7 @@
6200	6638
6201	6639	void InitWeights()
6202	6640	{
	6641	+ new Exception().printStackTrace();
6203	6642	System.exit(0);
6204	6643	int n = 0;
6205	6644	int b = 0;
..	..	@@ -6793,6 +7232,10 @@
6793	7232	return (face.boundary = 1) == 1;
6794	7233	}
6795	7234
	7235	+ // June 2019
	7236	+ if (true)
	7237	+ return (face.boundary = 0) == 1;
	7238	+
6796	7239	// reverse triangle test
6797	7240	q1.set(p);
6798	7241	q2.set(q);
..	..	@@ -7242,7 +7685,7 @@
7242	7685	//InitWeights();
7243	7686	}
7244	7687
7245		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7688	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7246	7689
7247	7690	if (chosen == -1)
7248	7691	{
..	..	@@ -7256,7 +7699,7 @@
7256	7699	//remove3valence = false;
7257	7700	// InitWeights();
7258	7701
7259		- chosen = ChooseTriangle();
	7702	+ chosen = ChooseTriangle(true);
7260	7703	}
7261	7704	}
7262	7705
..	..	@@ -7532,7 +7975,7 @@
7532	7975
7533	7976	// boolean lock;
7534	7977
7535		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7978	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7536	7979	{
7537	7980	if (stripified)
7538	7981	{
..	..	@@ -7569,12 +8012,12 @@
7569	8012	{
7570	8013	System.err.println("EXCEPTION CAUGHT");
7571	8014	e.printStackTrace();
7572		- return;
	8015	+ return false;
7573	8016	} catch (Error e)
7574	8017	{
7575	8018	System.err.println("ERROR CAUGHT");
7576	8019	e.printStackTrace();
7577		- return;
	8020	+ return false;
7578	8021	}
7579	8022
7580	8023	System.out.println("# faces = " + faces.size());
..	..	@@ -7584,6 +8027,7 @@
7584	8027	{
7585	8028	Face face = (Face) faces.get(i);
7586	8029
	8030	+ face.used = false;
7587	8031	face.nbiterations = 1;
7588	8032	face.weight = -1;
7589	8033	face.boundary = -1;
..	..	@@ -7635,6 +8079,11 @@
7635	8079	nbbadfaces = faces.size();
7636	8080	//remove3valence = true;
7637	8081
	8082	+ int count = 2;
	8083	+
	8084	+ if (onlyone)
	8085	+ count = 1;
	8086	+
7638	8087	firstpass = true;
7639	8088
7640	8089	int n = faces.size();
..	..	@@ -7650,8 +8099,9 @@
7650	8099	System.out.print('.');
7651	8100	}
7652	8101	System.out.println();
	8102	+ boolean atleastone = false;
7653	8103	int i = 0;
7654		- while (reduction34 \|\| faces.size() > n/2)
	8104	+ while (true) // reduction34 \|\| faces.size() > n/2)
7655	8105	{
7656	8106	if (i++%100 == 0)
7657	8107	{
..	..	@@ -7673,6 +8123,8 @@
7673	8123	{
7674	8124	if (!RemoveOneTriangle())
7675	8125	break;
	8126	+
	8127	+ atleastone = true;
7676	8128	}
7677	8129	// if (iterationcount == 0)
7678	8130	// break;
..	..	@@ -7683,8 +8135,8 @@
7683	8135	break;
7684	8136	}
7685	8137	firstpass = false;
7686		- if (onlyone)
7687		- break; // one triangle only
	8138	+// if (--count<0 && !reduction34)
	8139	+// break; // one triangle only
7688	8140	}
7689	8141
7690	8142	InitLinks(false); // for further display
..	..	@@ -7700,6 +8152,8 @@
7700	8152	Trim(true,false,false,false,false);
7701	8153
7702	8154	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8155	+
	8156	+ return atleastone;
7703	8157	}
7704	8158
7705	8159	void UpdateIndices(Face face, Face minface)
..	..	@@ -7712,18 +8166,21 @@
7712	8166	face.p = minface.p;
7713	8167	//if (leafweights)
7714	8168	face.good = 0; // false;
	8169	+ face.used = true;
7715	8170	}
7716	8171	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7717	8172	{
7718	8173	face.q = minface.p;
7719	8174	//if (leafweights)
7720	8175	face.good = 0; // false;
	8176	+ face.used = true;
7721	8177	}
7722	8178	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7723	8179	{
7724	8180	face.r = minface.p;
7725	8181	//if (leafweights)
7726	8182	face.good = 0; // false;
	8183	+ face.used = true;
7727	8184	}
7728	8185
7729	8186	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7783,50 +8240,50 @@
7783	8240	if (v == 2)
7784	8241	vert = minface.r;
7785	8242	// Face face = (Face) faces.get(i);
7786		- Vector<Face> vertfaces = links.get(vert);
7787		- for (int i=vertfaces.size(); --i>=0;)
7788		- {
7789		- Face face = (Face) vertfaces.get(i);
7790		-
7791		- // if (face.weight == 10000)
7792		- // continue;
7793		-
7794		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7795		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7796		- 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;)
7797	8245	{
7798		- 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)
7799	8254	{
7800		-// if(minfaceweight <= 0)
7801		-// assert(minfaceweight > 0);
7802		-//
7803		-// //FaceWeight(face);
7804		-// if(face.weight < 0)
7805		-// assert(face.weight >= 0);
7806		-
7807		- face.weight += minfaceweight;
7808		-
7809		-// if (face.weight >= 10000)
7810		-// 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;
7811	8282	}
7812	8283	else
7813		- face.weight = -1;
7814		-
7815		- face.nbiterations += 1;
7816		- face.boundary = -1;
7817		-
7818		- Vertex p = (Vertex)vertices.get(face.p);
7819		- Vertex q = (Vertex)vertices.get(face.q);
7820		- Vertex r = (Vertex)vertices.get(face.r);
7821		-
7822		- p.boundary = -1;
7823		- q.boundary = -1;
7824		- r.boundary = -1;
	8284	+ assert(false);
7825	8285	}
7826		- else
7827		- assert(false);
7828	8286	}
7829		- }
7830	8287
7831	8288	// TouchVertex(minface.p);
7832	8289	// TouchVertex(minface.q);
..	..	@@ -8027,6 +8484,7 @@
8027	8484	for (int i=vertfaces.size(); --i>=0;)
8028	8485	{
8029	8486	Face face = (Face) vertfaces.get(i);
	8487	+ face.used = true;
8030	8488	face.good = 0; // false;
8031	8489	if (leafweights)
8032	8490	face.weight = -1;
..	..	@@ -8073,7 +8531,7 @@
8073	8531	if (!trimmed)
8074	8532	return;
8075	8533
8076		- GrafreeD.linkUV = false;
	8534	+ Grafreed.linkUV = false;
8077	8535
8078	8536	try
8079	8537	{
..	..	@@ -8305,7 +8763,8 @@
8305	8763	int[] startvertices;
8306	8764	float[] averagepoints;
8307	8765	float[] extremepoints;
8308		- float[] supportsizes; // distance of closest point
	8766	+ float[] supportminsize; // distance of closest point
	8767	+ float[] supportmaxsize; // distance of fartest point
8309	8768
8310	8769	transient Hashtable vertextable;
8311	8770	/transient/ private Vertex[] verticesCopy;