~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];
..	..	@@ -3247,12 +3288,21 @@
3247	3288	max = ay;
3248	3289	}
3249	3290
	3291	+ if (max == 0)
	3292	+ {
	3293	+ uvmap[i2] = 0.5f;
	3294	+ uvmap[i2+1] = 0.5f;
	3295	+ continue;
	3296	+ }
	3297	+
3250	3298	x /= max;
3251	3299	y /= max;
3252	3300
3253	3301	double angle = Math.acos(Math.abs(z*2));
3254	3302
3255	3303	double k = angle / Math.PI * 2;
	3304	+
	3305	+ assert(k >= 0);
3256	3306
3257	3307	// k == 0 => uv = 0 (center)
3258	3308	// k == 1 => uv = -1,1 (border)
..	..	@@ -3268,7 +3318,8 @@
3268	3318	t = Math.pow(t, 3);
3269	3319
3270	3320	// Interpolate between k/length2 (center) and k (border)
3271		- k = k / length2 * (1 - t) + k * t;
	3321	+ if (length2 > 0)
	3322	+ k *= (1 - t) / length2 + t;
3272	3323
3273	3324	double u = k*x;
3274	3325	double v = k*y;
..	..	@@ -3393,7 +3444,7 @@
3393	3444	k /= xx + yy;
3394	3445	}
3395	3446	else
3396		- GrafreeD.Assert(z == 1);
	3447	+ Grafreed.Assert(z == 1);
3397	3448
3398	3449	if (k < 0)
3399	3450	k = 0;
..	..	@@ -3686,6 +3737,111 @@
3686	3737	*/
3687	3738	}
3688	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	+
3689	3845	void GenerateNormals(boolean crease)
3690	3846	{
3691	3847	boolean wastrim = trimmed;
..	..	@@ -3702,6 +3858,28 @@
3702	3858	}
3703	3859
3704	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	+ }
3705	3883	}
3706	3884
3707	3885	void GenNormalsJME()
..	..	@@ -3826,7 +4004,7 @@
3826	4004	NormalGenerator ng;
3827	4005
3828	4006	if (crease)
3829		- 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);
3830	4008	else
3831	4009	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3832	4010
..	..	@@ -3844,8 +4022,6 @@
3844	4022	//System.out.println("NEW = " + positions.length);
3845	4023	uvmap = new float[ta.getVertexCount() * 2];
3846	4024
3847		- colors = new float[ta.getVertexCount()]; // * 3];
3848		-
3849	4025	ta.getCoordinates(0, positions);
3850	4026	ta.getNormals(0, normals);
3851	4027	// ta.getColors(0, colors);
..	..	@@ -3853,12 +4029,24 @@
3853	4029
3854	4030	System.out.println("UV = " + uvmap[2] + ", " + uvmap[3] + ";");
3855	4031
	4032	+ colors = null;
	4033	+// colors = new float[ta.getVertexCount()]; // * 3];
	4034	+//
	4035	+// for (int i=colors.length; --i>=0;)
	4036	+// {
	4037	+// colors[i] = 1;
	4038	+// }
	4039	+
3856	4040	triangles = new int[ta.getVertexCount()];
3857	4041
3858	4042	for (int i = 0; i < triangles.length; i++)
3859	4043	{
3860	4044	triangles[i] = i;
3861	4045	}
	4046	+
	4047	+// Untrim();
	4048	+ if (!trimmed)
	4049	+ MergeNormals();
3862	4050	}
3863	4051	}
3864	4052
..	..	@@ -3886,12 +4074,18 @@
3886	4074	positions = new float[3 * ga.getVertexCount()];
3887	4075	normals = new float[3 * ga.getVertexCount()];
3888	4076	uvmap = new float[2 * ga.getVertexCount()];
3889		- colors = new float[1 * ga.getVertexCount()];
3890	4077
3891	4078	tsa.getCoordinates(0, positions);
3892	4079	tsa.getNormals(0, normals);
3893	4080	tsa.getTextureCoordinates(0, 0, uvmap);
3894	4081	// tsa.getColors(0, colors);
	4082	+
	4083	+ colors = null;
	4084	+// colors = new float[1 * ga.getVertexCount()];
	4085	+// for (int i=colors.length; --i>=0;)
	4086	+// {
	4087	+// colors[i] = 1;
	4088	+// }
3895	4089
3896	4090	int stripcount = tsa.getNumStrips();
3897	4091	triangles = new int[stripcount];
..	..	@@ -3900,6 +4094,7 @@
3900	4094	stripified = true;
3901	4095	} catch (ClassCastException e)
3902	4096	{
	4097	+ // ??? aug 2019
3903	4098	TriangleArray ta = (TriangleArray) ga;
3904	4099
3905	4100	positions = new float[3 * ga.getVertexCount()];
..	..	@@ -3914,6 +4109,10 @@
3914	4109	triangles = new int[1];
3915	4110	triangles[0] = 3;
3916	4111	}
	4112	+
	4113	+ //Untrim();
	4114	+ if (!trimmed)
	4115	+ MergeNormals();
3917	4116	}
3918	4117
3919	4118	/*
..	..	@@ -3963,6 +4162,42 @@
3963	4162	}
3964	4163
3965	4164	Vertex.normalmode = false;
	4165	+ }
	4166	+
	4167	+ void MergeNormals()
	4168	+ {
	4169	+ assert(!trimmed);
	4170	+
	4171	+ boolean smooth = Grafreed.smoothmode;
	4172	+ boolean link = Grafreed.linkUV;
	4173	+ Grafreed.smoothmode = true;
	4174	+ Grafreed.linkUV = true;
	4175	+
	4176	+ System.out.println("#Vertex = " + VertexCount());
	4177	+ System.out.println("#Face = " + FaceCount());
	4178	+
	4179	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4180	+
	4181	+ for (int i = 0; i < VertexCount(); i++)
	4182	+ {
	4183	+ Vertex v = GetVertex(i);
	4184	+
	4185	+ if (!table.contains(v))
	4186	+ {
	4187	+ table.add(v);
	4188	+ }
	4189	+ }
	4190	+
	4191	+ Grafreed.smoothmode = smooth;
	4192	+ Grafreed.linkUV = link;
	4193	+
	4194	+// for (int i = 0; i < VertexCount(); i++)
	4195	+// {
	4196	+// Vertex v = GetVertex(i);
	4197	+//
	4198	+// table.add(v);
	4199	+// }
	4200	+
3966	4201	}
3967	4202
3968	4203	static cVector temp1 = new cVector();
..	..	@@ -4737,16 +4972,25 @@
4737	4972	{
4738	4973	i3 = positions.length-3;
4739	4974	i2 = uvmap.length - 2;
4740		- new Exception().printStackTrace();
	4975	+ //new Exception().printStackTrace();
4741	4976	}
4742	4977
4743	4978	v./pos./x = positions[i3];
4744	4979	v./pos./y = positions[i3 + 1];
4745	4980	v./pos./z = positions[i3 + 2];
4746	4981
4747		- v.norm.x = normals[i3];
4748		- v.norm.y = normals[i3 + 1];
4749		- v.norm.z = normals[i3 + 2];
	4982	+ if (normals == null)
	4983	+ {
	4984	+ v.norm.x = 0;
	4985	+ v.norm.y = 0;
	4986	+ v.norm.z = 0;
	4987	+ }
	4988	+ else
	4989	+ {
	4990	+ v.norm.x = normals[i3];
	4991	+ v.norm.y = normals[i3 + 1];
	4992	+ v.norm.z = normals[i3 + 2];
	4993	+ }
4750	4994
4751	4995	v.s = uvmap[i2];
4752	4996	v.t = uvmap[i2 + 1];
..	..	@@ -5461,17 +5705,27 @@
5461	5705
5462	5706	transient int nbbadfaces; // ?? = 1000000;
5463	5707
5464		- int ChooseTriangle()
	5708	+ /*
	5709	+ */
	5710	+ int ChooseTriangle(boolean firstEquilateral)
5465	5711	{
5466	5712	int chosen = -1;
5467	5713
5468	5714	double minweight = 1E10;
5469	5715
	5716	+ int step = 8; // ?
	5717	+
	5718	+ if (firstEquilateral)
	5719	+ step = 1;
	5720	+
5470	5721	nbbadfaces = 0;
5471		- for (int i=0; i<faces.size(); i+=8)
	5722	+ for (int i=0; i<faces.size(); i+=step)
5472	5723	// for (int i=faces.size(); (i-=8)>=0;)
5473	5724	{
5474	5725	Face face = (Face) faces.get(i);
	5726	+
	5727	+ if (face.used)
	5728	+ continue;
5475	5729
5476	5730	if (!Valid(face))
5477	5731	{
..	..	@@ -5481,6 +5735,15 @@
5481	5735
5482	5736	if (Boundary(face))
5483	5737	continue;
	5738	+
	5739	+// if (Boundary(face.p))
	5740	+// continue;
	5741	+//
	5742	+// if (Boundary(face.q))
	5743	+// continue;
	5744	+//
	5745	+// if (Boundary(face.r))
	5746	+// continue;
5484	5747
5485	5748	if (!ValidValence(face))
5486	5749	continue;
..	..	@@ -5493,22 +5756,55 @@
5493	5756	//?? if (face.weight < 0)
5494	5757	// continue;
5495	5758
5496		- double K = 1; // 0.01; // .25;
5497		-
5498		- double factor = (1-K)face.nbiterations + K; //face.weight;
5499		-
5500		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5501		-
5502		- if (minweight > weight)
	5759	+ if (firstEquilateral)
5503	5760	{
5504		- minweight = weight;
	5761	+ if (OneFaceUsed(links.get(face.p)))
	5762	+ continue;
	5763	+
	5764	+ if (OneFaceUsed(links.get(face.q)))
	5765	+ continue;
	5766	+
	5767	+ if (OneFaceUsed(links.get(face.r)))
	5768	+ continue;
	5769	+
5505	5770	chosen = i;
5506		- if (minweight == 0)
5507		- break;
	5771	+ break;
	5772	+ }
	5773	+ else
	5774	+ {
	5775	+ double K = 1; // 0.01; // .25;
	5776	+
	5777	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5778	+
	5779	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5780	+
	5781	+ if (minweight > weight)
	5782	+ {
	5783	+ minweight = weight;
	5784	+ chosen = i;
	5785	+ if (minweight == 0)
	5786	+ break;
	5787	+ }
5508	5788	}
5509	5789	}
5510	5790
5511	5791	return chosen;
	5792	+ }
	5793	+
	5794	+ private boolean OneFaceUsed(Vector<Face> faces)
	5795	+ {
	5796	+ if (faces.size() != 6)
	5797	+ return true;
	5798	+
	5799	+ for (int i=0; i<6; i+=1)
	5800	+ {
	5801	+ if (faces.get(i).used)
	5802	+ {
	5803	+ return true;
	5804	+ }
	5805	+ }
	5806	+
	5807	+ return false;
5512	5808	}
5513	5809
5514	5810	static boolean remove3valence = true;
..	..	@@ -5544,7 +5840,7 @@
5544	5840	}
5545	5841	else
5546	5842	{
5547		- assert(links.size() == vertices.size());
	5843	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5548	5844
5549	5845	links.setSize(vertices.size());
5550	5846	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5552,6 +5848,7 @@
5552	5848	// linkstouched[i] = false;
5553	5849	if (links.get(i) == null) // ??
5554	5850	{
	5851	+ new Exception().printStackTrace();
5555	5852	links.set(i, new Vector(8));
5556	5853	// linkstouched[i] = true;
5557	5854	}
..	..	@@ -5562,6 +5859,8 @@
5562	5859	}
5563	5860	}
5564	5861
	5862	+ boolean once = false;
	5863	+
5565	5864	for (int i=faces.size(); --i>=0;)
5566	5865	{
5567	5866	Face face = (Face) faces.get(i);
..	..	@@ -5573,6 +5872,9 @@
5573	5872	//if (linkstouched[face.r])
5574	5873	links.get(face.r).add(face);
5575	5874
	5875	+ if (face.used)
	5876	+ once = true;
	5877	+
5576	5878	face.good = 1;
5577	5879	face.boundary = -1;
5578	5880	}
..	..	@@ -6344,6 +6646,7 @@
6344	6646
6345	6647	void InitWeights()
6346	6648	{
	6649	+ new Exception().printStackTrace();
6347	6650	System.exit(0);
6348	6651	int n = 0;
6349	6652	int b = 0;
..	..	@@ -6937,6 +7240,10 @@
6937	7240	return (face.boundary = 1) == 1;
6938	7241	}
6939	7242
	7243	+ // June 2019
	7244	+ if (true)
	7245	+ return (face.boundary = 0) == 1;
	7246	+
6940	7247	// reverse triangle test
6941	7248	q1.set(p);
6942	7249	q2.set(q);
..	..	@@ -7386,7 +7693,7 @@
7386	7693	//InitWeights();
7387	7694	}
7388	7695
7389		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7696	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7390	7697
7391	7698	if (chosen == -1)
7392	7699	{
..	..	@@ -7400,7 +7707,7 @@
7400	7707	//remove3valence = false;
7401	7708	// InitWeights();
7402	7709
7403		- chosen = ChooseTriangle();
	7710	+ chosen = ChooseTriangle(true);
7404	7711	}
7405	7712	}
7406	7713
..	..	@@ -7676,7 +7983,7 @@
7676	7983
7677	7984	// boolean lock;
7678	7985
7679		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7986	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7680	7987	{
7681	7988	if (stripified)
7682	7989	{
..	..	@@ -7713,12 +8020,12 @@
7713	8020	{
7714	8021	System.err.println("EXCEPTION CAUGHT");
7715	8022	e.printStackTrace();
7716		- return;
	8023	+ return false;
7717	8024	} catch (Error e)
7718	8025	{
7719	8026	System.err.println("ERROR CAUGHT");
7720	8027	e.printStackTrace();
7721		- return;
	8028	+ return false;
7722	8029	}
7723	8030
7724	8031	System.out.println("# faces = " + faces.size());
..	..	@@ -7728,6 +8035,7 @@
7728	8035	{
7729	8036	Face face = (Face) faces.get(i);
7730	8037
	8038	+ face.used = false;
7731	8039	face.nbiterations = 1;
7732	8040	face.weight = -1;
7733	8041	face.boundary = -1;
..	..	@@ -7779,6 +8087,11 @@
7779	8087	nbbadfaces = faces.size();
7780	8088	//remove3valence = true;
7781	8089
	8090	+ int count = 2;
	8091	+
	8092	+ if (onlyone)
	8093	+ count = 1;
	8094	+
7782	8095	firstpass = true;
7783	8096
7784	8097	int n = faces.size();
..	..	@@ -7794,8 +8107,9 @@
7794	8107	System.out.print('.');
7795	8108	}
7796	8109	System.out.println();
	8110	+ boolean atleastone = false;
7797	8111	int i = 0;
7798		- while (reduction34 \|\| faces.size() > n/2)
	8112	+ while (true) // reduction34 \|\| faces.size() > n/2)
7799	8113	{
7800	8114	if (i++%100 == 0)
7801	8115	{
..	..	@@ -7817,6 +8131,8 @@
7817	8131	{
7818	8132	if (!RemoveOneTriangle())
7819	8133	break;
	8134	+
	8135	+ atleastone = true;
7820	8136	}
7821	8137	// if (iterationcount == 0)
7822	8138	// break;
..	..	@@ -7827,8 +8143,8 @@
7827	8143	break;
7828	8144	}
7829	8145	firstpass = false;
7830		- if (onlyone)
7831		- break; // one triangle only
	8146	+// if (--count<0 && !reduction34)
	8147	+// break; // one triangle only
7832	8148	}
7833	8149
7834	8150	InitLinks(false); // for further display
..	..	@@ -7844,6 +8160,8 @@
7844	8160	Trim(true,false,false,false,false);
7845	8161
7846	8162	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8163	+
	8164	+ return atleastone;
7847	8165	}
7848	8166
7849	8167	void UpdateIndices(Face face, Face minface)
..	..	@@ -7856,18 +8174,21 @@
7856	8174	face.p = minface.p;
7857	8175	//if (leafweights)
7858	8176	face.good = 0; // false;
	8177	+ face.used = true;
7859	8178	}
7860	8179	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7861	8180	{
7862	8181	face.q = minface.p;
7863	8182	//if (leafweights)
7864	8183	face.good = 0; // false;
	8184	+ face.used = true;
7865	8185	}
7866	8186	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7867	8187	{
7868	8188	face.r = minface.p;
7869	8189	//if (leafweights)
7870	8190	face.good = 0; // false;
	8191	+ face.used = true;
7871	8192	}
7872	8193
7873	8194	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7927,50 +8248,50 @@
7927	8248	if (v == 2)
7928	8249	vert = minface.r;
7929	8250	// Face face = (Face) faces.get(i);
7930		- Vector<Face> vertfaces = links.get(vert);
7931		- for (int i=vertfaces.size(); --i>=0;)
7932		- {
7933		- Face face = (Face) vertfaces.get(i);
7934		-
7935		- // if (face.weight == 10000)
7936		- // continue;
7937		-
7938		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7939		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7940		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8251	+ Vector<Face> vertfaces = links.get(vert);
	8252	+ for (int i=vertfaces.size(); --i>=0;)
7941	8253	{
7942		- if (!leafweights)
	8254	+ Face face = (Face) vertfaces.get(i);
	8255	+
	8256	+ // if (face.weight == 10000)
	8257	+ // continue;
	8258	+
	8259	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8260	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8261	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7943	8262	{
7944		-// if(minfaceweight <= 0)
7945		-// assert(minfaceweight > 0);
7946		-//
7947		-// //FaceWeight(face);
7948		-// if(face.weight < 0)
7949		-// assert(face.weight >= 0);
7950		-
7951		- face.weight += minfaceweight;
7952		-
7953		-// if (face.weight >= 10000)
7954		-// assert(face.weight < 10000);
	8263	+ if (!leafweights)
	8264	+ {
	8265	+ // if(minfaceweight <= 0)
	8266	+ // assert(minfaceweight > 0);
	8267	+ //
	8268	+ // //FaceWeight(face);
	8269	+ // if(face.weight < 0)
	8270	+ // assert(face.weight >= 0);
	8271	+
	8272	+ face.weight += minfaceweight;
	8273	+
	8274	+ // if (face.weight >= 10000)
	8275	+ // assert(face.weight < 10000);
	8276	+ }
	8277	+ else
	8278	+ face.weight = -1;
	8279	+
	8280	+ face.nbiterations += 1;
	8281	+ face.boundary = -1;
	8282	+
	8283	+ Vertex p = (Vertex)vertices.get(face.p);
	8284	+ Vertex q = (Vertex)vertices.get(face.q);
	8285	+ Vertex r = (Vertex)vertices.get(face.r);
	8286	+
	8287	+ p.boundary = -1;
	8288	+ q.boundary = -1;
	8289	+ r.boundary = -1;
7955	8290	}
7956	8291	else
7957		- face.weight = -1;
7958		-
7959		- face.nbiterations += 1;
7960		- face.boundary = -1;
7961		-
7962		- Vertex p = (Vertex)vertices.get(face.p);
7963		- Vertex q = (Vertex)vertices.get(face.q);
7964		- Vertex r = (Vertex)vertices.get(face.r);
7965		-
7966		- p.boundary = -1;
7967		- q.boundary = -1;
7968		- r.boundary = -1;
	8292	+ assert(false);
7969	8293	}
7970		- else
7971		- assert(false);
7972	8294	}
7973		- }
7974	8295
7975	8296	// TouchVertex(minface.p);
7976	8297	// TouchVertex(minface.q);
..	..	@@ -8171,6 +8492,7 @@
8171	8492	for (int i=vertfaces.size(); --i>=0;)
8172	8493	{
8173	8494	Face face = (Face) vertfaces.get(i);
	8495	+ face.used = true;
8174	8496	face.good = 0; // false;
8175	8497	if (leafweights)
8176	8498	face.weight = -1;
..	..	@@ -8217,7 +8539,7 @@
8217	8539	if (!trimmed)
8218	8540	return;
8219	8541
8220		- GrafreeD.linkUV = false;
	8542	+ Grafreed.linkUV = false;
8221	8543
8222	8544	try
8223	8545	{
..	..	@@ -8449,7 +8771,8 @@
8449	8771	int[] startvertices;
8450	8772	float[] averagepoints;
8451	8773	float[] extremepoints;
8452		- float[] supportsizes; // distance of closest point
	8774	+ float[] supportminsize; // distance of closest point
	8775	+ float[] supportmaxsize; // distance of fartest point
8453	8776
8454	8777	transient Hashtable vertextable;
8455	8778	/transient/ private Vertex[] verticesCopy;