~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,11 +680,13 @@
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)
657	688	{
	689	+ CameraPane.CreateSelectedPoint();
658	690	CameraPane.selectedpoint.
659	691	getAverage(cStatic.point1, true);
660	692
..	..	@@ -952,7 +984,7 @@
952	984
953	985	// sept 2017 SEUIL = 0.1; // aout 2013
954	986
955		- supports = InitConnections(other);
	987	+ supports = other.InitConnections();
956	988
957	989	other.supports = supports; // should be the other way around...
958	990
..	..	@@ -972,6 +1004,7 @@
972	1004
973	1005	v.closestsupport = -1;
974	1006
	1007	+ CameraPane.CreateSelectedPoint();
975	1008	CameraPane.selectedpoint.
976	1009	getAverage(cStatic.point1, true);
977	1010
..	..	@@ -1230,6 +1263,7 @@
1230	1263	for (int wi = v0.weights.length; --wi>=0;)
1231	1264	v[wi] = 0;
1232	1265
	1266	+ CameraPane.CreateSelectedPoint();
1233	1267	CameraPane.selectedpoint.
1234	1268	getAverage(cStatic.point1, true);
1235	1269
..	..	@@ -1367,6 +1401,7 @@
1367	1401	v0.x = v0.y = v0.z = 0;
1368	1402	v0.norm.x = v0.norm.y = v0.norm.z = 0;
1369	1403
	1404	+ CameraPane.CreateSelectedPoint();
1370	1405	CameraPane.selectedpoint.
1371	1406	getAverage(cStatic.point1, true);
1372	1407
..	..	@@ -1518,7 +1553,7 @@
1518	1553	InitFaceIndices();
1519	1554	}
1520	1555
1521		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1556	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1522	1557	//float[] v = new float[100];
1523	1558
1524	1559	for (int loops=1; --loops>=0;)
..	..	@@ -1548,7 +1583,7 @@
1548	1583	InitFaceIndices();
1549	1584	}
1550	1585
1551		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1586	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1552	1587	//float[] v = new float[100];
1553	1588
1554	1589	for (int loops=10; --loops>=0;)
..	..	@@ -1895,7 +1930,7 @@
1895	1930	return;
1896	1931	}
1897	1932
1898		- // System.exit(0);
	1933	+ // System.exit(0);
1899	1934
1900	1935	cVector vect = new cVector();
1901	1936	cVector normal = new cVector();
..	..	@@ -1966,7 +2001,10 @@
1966	2001	if (v.vertexlinks == null)
1967	2002	continue;
1968	2003
1969		- if (v.weights != null && v.weights[j] == 0) // < 0.01 * v.totalweight) // == 0)
	2004	+ // Warning: faster but dangerous
	2005	+ if (v.weights != null && v.weights[j]
	2006	+ // == 0)
	2007	+ < 0.0001 * v.totalweight)
1970	2008	{
1971	2009	//testweight += v.weights[j-1];
1972	2010	continue;
..	..	@@ -2247,6 +2285,8 @@
2247	2285
2248	2286	transient int lastsoundtime;
2249	2287
	2288	+ transient boolean once = false;
	2289	+
2250	2290	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2251	2291	{
2252	2292	if (LA.isIdentity(toRoot))
..	..	@@ -2302,7 +2342,11 @@
2302	2342
2303	2343	if (v.totalweight == 0)
2304	2344	{
2305		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2345	+ if (!once)
	2346	+ {
	2347	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2348	+ once = true;
	2349	+ }
2306	2350	continue;
2307	2351	}
2308	2352
..	..	@@ -2670,7 +2714,7 @@
2670	2714
2671	2715	if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672	2716	{
2673		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2717	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2674	2718
2675	2719	lastsoundtime = Globals.framecount;
2676	2720	}
..	..	@@ -3098,6 +3142,7 @@
3098	3142	//
3099	3143	// transient VertexCompare[] vertexcompare = null;
3100	3144
	3145	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3101	3146	boolean Contains(Vertex v0, int object)
3102	3147	{
3103	3148	int start = startvertices[object-1];
..	..	@@ -3247,12 +3292,21 @@
3247	3292	max = ay;
3248	3293	}
3249	3294
	3295	+ if (max == 0)
	3296	+ {
	3297	+ uvmap[i2] = 0.5f;
	3298	+ uvmap[i2+1] = 0.5f;
	3299	+ continue;
	3300	+ }
	3301	+
3250	3302	x /= max;
3251	3303	y /= max;
3252	3304
3253	3305	double angle = Math.acos(Math.abs(z*2));
3254	3306
3255	3307	double k = angle / Math.PI * 2;
	3308	+
	3309	+ assert(k >= 0);
3256	3310
3257	3311	// k == 0 => uv = 0 (center)
3258	3312	// k == 1 => uv = -1,1 (border)
..	..	@@ -3268,7 +3322,8 @@
3268	3322	t = Math.pow(t, 3);
3269	3323
3270	3324	// Interpolate between k/length2 (center) and k (border)
3271		- k = k / length2 * (1 - t) + k * t;
	3325	+ if (length2 > 0)
	3326	+ k *= (1 - t) / length2 + t;
3272	3327
3273	3328	double u = k*x;
3274	3329	double v = k*y;
..	..	@@ -3393,7 +3448,7 @@
3393	3448	k /= xx + yy;
3394	3449	}
3395	3450	else
3396		- GrafreeD.Assert(z == 1);
	3451	+ Grafreed.Assert(z == 1);
3397	3452
3398	3453	if (k < 0)
3399	3454	k = 0;
..	..	@@ -3686,6 +3741,111 @@
3686	3741	*/
3687	3742	}
3688	3743
	3744	+ void GenerateNormals2(boolean crease)
	3745	+ {
	3746	+ cVector tempVector = new cVector();
	3747	+
	3748	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3749	+//
	3750	+//
	3751	+// for (int i=0; i<this.VertexCount(); i++)
	3752	+// {
	3753	+// Vertex v = this.GetVertex(i);
	3754	+//
	3755	+// tempVector.set(v);
	3756	+//
	3757	+// cVector n = tableBase.get(tempVector.ToFloat());
	3758	+//
	3759	+// if (n != null)
	3760	+// {
	3761	+// continue;
	3762	+// }
	3763	+//
	3764	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3765	+// }
	3766	+
	3767	+ BoundaryRep tempSupport = this.support;
	3768	+
	3769	+ this.support = null;
	3770	+
	3771	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3772	+
	3773	+ this.support = tempSupport;
	3774	+
	3775	+ //tempRep.Unstripify();
	3776	+
	3777	+ tempRep.GenerateNormals2(crease);
	3778	+
	3779	+ boolean keepnormal = Vertex.normalmode;
	3780	+ boolean epsequal = Grafreed.epsequal;
	3781	+
	3782	+ Vertex.normalmode = false;
	3783	+ Grafreed.epsequal = false; // A bit strange
	3784	+
	3785	+ // No need to have a match for vertex counts.
	3786	+
	3787	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3788	+
	3789	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3790	+ {
	3791	+ Vertex v = tempRep.GetVertex(i);
	3792	+
	3793	+ cVector n = table.get(tempVector.ToFloat());
	3794	+
	3795	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3796	+ {
	3797	+ //continue;
	3798	+ }
	3799	+
	3800	+ tempVector.set(v);
	3801	+
	3802	+ //cVector nBase = tableBase.get(tempVector);
	3803	+
	3804	+ //if (v.norm.dot(nBase) < 0.9)
	3805	+ //{
	3806	+ // continue;
	3807	+ //}
	3808	+
	3809	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3810	+ {
	3811	+ //continue;
	3812	+ }
	3813	+
	3814	+ if (n != null)
	3815	+ {
	3816	+// if (n.dot(v.norm) < 0)
	3817	+// n.sub(v.norm);
	3818	+// else
	3819	+// n.add(v.norm);
	3820	+//
	3821	+// n.normalize();
	3822	+ continue;
	3823	+ }
	3824	+
	3825	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3826	+ }
	3827	+
	3828	+ for (int i=0; i<this.VertexCount(); i++)
	3829	+ {
	3830	+ Vertex v = this.GetVertex(i);
	3831	+
	3832	+ tempVector.set(v);
	3833	+
	3834	+ cVector n = table.get(tempVector.ToFloat());
	3835	+
	3836	+ //if (n.dot(v.norm) < 0)
	3837	+ if (n == null)
	3838	+ continue;
	3839	+
	3840	+ LA.vecCopy(n, v.norm);
	3841	+
	3842	+ this.SetVertex(v, i);
	3843	+ }
	3844	+
	3845	+ Grafreed.epsequal = epsequal;
	3846	+ Vertex.normalmode = keepnormal;
	3847	+ }
	3848	+
3689	3849	void GenerateNormals(boolean crease)
3690	3850	{
3691	3851	boolean wastrim = trimmed;
..	..	@@ -3702,6 +3862,28 @@
3702	3862	}
3703	3863
3704	3864	Trim(true/wastrim/,true,crease,wasstrip,false);
	3865	+ }
	3866	+
	3867	+ void GenerateNormalsMesh()
	3868	+ {
	3869	+ if (stripified)
	3870	+ {
	3871	+ Unstripify();
	3872	+ }
	3873	+
	3874	+ if (trimmed)
	3875	+ {
	3876	+ normals = null;
	3877	+ }
	3878	+ else
	3879	+ {
	3880	+ for (int i=VertexCount(); --i>=0;)
	3881	+ {
	3882	+ Vertex v = GetVertex(i);
	3883	+
	3884	+ v.norm = null;
	3885	+ }
	3886	+ }
3705	3887	}
3706	3888
3707	3889	void GenNormalsJME()
..	..	@@ -3826,7 +4008,7 @@
3826	4008	NormalGenerator ng;
3827	4009
3828	4010	if (crease)
3829		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4011	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3830	4012	else
3831	4013	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3832	4014
..	..	@@ -3844,8 +4026,6 @@
3844	4026	//System.out.println("NEW = " + positions.length);
3845	4027	uvmap = new float[ta.getVertexCount() * 2];
3846	4028
3847		- colors = new float[ta.getVertexCount()]; // * 3];
3848		-
3849	4029	ta.getCoordinates(0, positions);
3850	4030	ta.getNormals(0, normals);
3851	4031	// ta.getColors(0, colors);
..	..	@@ -3853,12 +4033,24 @@
3853	4033
3854	4034	System.out.println("UV = " + uvmap[2] + ", " + uvmap[3] + ";");
3855	4035
	4036	+ colors = null;
	4037	+// colors = new float[ta.getVertexCount()]; // * 3];
	4038	+//
	4039	+// for (int i=colors.length; --i>=0;)
	4040	+// {
	4041	+// colors[i] = 1;
	4042	+// }
	4043	+
3856	4044	triangles = new int[ta.getVertexCount()];
3857	4045
3858	4046	for (int i = 0; i < triangles.length; i++)
3859	4047	{
3860	4048	triangles[i] = i;
3861	4049	}
	4050	+
	4051	+// Untrim();
	4052	+ if (!trimmed)
	4053	+ MergeNormals();
3862	4054	}
3863	4055	}
3864	4056
..	..	@@ -3886,12 +4078,18 @@
3886	4078	positions = new float[3 * ga.getVertexCount()];
3887	4079	normals = new float[3 * ga.getVertexCount()];
3888	4080	uvmap = new float[2 * ga.getVertexCount()];
3889		- colors = new float[1 * ga.getVertexCount()];
3890	4081
3891	4082	tsa.getCoordinates(0, positions);
3892	4083	tsa.getNormals(0, normals);
3893	4084	tsa.getTextureCoordinates(0, 0, uvmap);
3894	4085	// tsa.getColors(0, colors);
	4086	+
	4087	+ colors = null;
	4088	+// colors = new float[1 * ga.getVertexCount()];
	4089	+// for (int i=colors.length; --i>=0;)
	4090	+// {
	4091	+// colors[i] = 1;
	4092	+// }
3895	4093
3896	4094	int stripcount = tsa.getNumStrips();
3897	4095	triangles = new int[stripcount];
..	..	@@ -3900,6 +4098,7 @@
3900	4098	stripified = true;
3901	4099	} catch (ClassCastException e)
3902	4100	{
	4101	+ // ??? aug 2019
3903	4102	TriangleArray ta = (TriangleArray) ga;
3904	4103
3905	4104	positions = new float[3 * ga.getVertexCount()];
..	..	@@ -3914,6 +4113,10 @@
3914	4113	triangles = new int[1];
3915	4114	triangles[0] = 3;
3916	4115	}
	4116	+
	4117	+ //Untrim();
	4118	+ if (!trimmed)
	4119	+ MergeNormals();
3917	4120	}
3918	4121
3919	4122	/*
..	..	@@ -3963,6 +4166,42 @@
3963	4166	}
3964	4167
3965	4168	Vertex.normalmode = false;
	4169	+ }
	4170	+
	4171	+ void MergeNormals()
	4172	+ {
	4173	+ assert(!trimmed);
	4174	+
	4175	+ boolean smooth = Grafreed.smoothmode;
	4176	+ boolean link = Grafreed.linkUV;
	4177	+ Grafreed.smoothmode = true;
	4178	+ Grafreed.linkUV = true;
	4179	+
	4180	+ System.out.println("#Vertex = " + VertexCount());
	4181	+ System.out.println("#Face = " + FaceCount());
	4182	+
	4183	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4184	+
	4185	+ for (int i = 0; i < VertexCount(); i++)
	4186	+ {
	4187	+ Vertex v = GetVertex(i);
	4188	+
	4189	+ if (!table.contains(v))
	4190	+ {
	4191	+ table.add(v);
	4192	+ }
	4193	+ }
	4194	+
	4195	+ Grafreed.smoothmode = smooth;
	4196	+ Grafreed.linkUV = link;
	4197	+
	4198	+// for (int i = 0; i < VertexCount(); i++)
	4199	+// {
	4200	+// Vertex v = GetVertex(i);
	4201	+//
	4202	+// table.add(v);
	4203	+// }
	4204	+
3966	4205	}
3967	4206
3968	4207	static cVector temp1 = new cVector();
..	..	@@ -4737,16 +4976,25 @@
4737	4976	{
4738	4977	i3 = positions.length-3;
4739	4978	i2 = uvmap.length - 2;
4740		- new Exception().printStackTrace();
	4979	+ //new Exception().printStackTrace();
4741	4980	}
4742	4981
4743	4982	v./pos./x = positions[i3];
4744	4983	v./pos./y = positions[i3 + 1];
4745	4984	v./pos./z = positions[i3 + 2];
4746	4985
4747		- v.norm.x = normals[i3];
4748		- v.norm.y = normals[i3 + 1];
4749		- v.norm.z = normals[i3 + 2];
	4986	+ if (normals == null)
	4987	+ {
	4988	+ v.norm.x = 0;
	4989	+ v.norm.y = 0;
	4990	+ v.norm.z = 0;
	4991	+ }
	4992	+ else
	4993	+ {
	4994	+ v.norm.x = normals[i3];
	4995	+ v.norm.y = normals[i3 + 1];
	4996	+ v.norm.z = normals[i3 + 2];
	4997	+ }
4750	4998
4751	4999	v.s = uvmap[i2];
4752	5000	v.t = uvmap[i2 + 1];
..	..	@@ -5461,17 +5709,27 @@
5461	5709
5462	5710	transient int nbbadfaces; // ?? = 1000000;
5463	5711
5464		- int ChooseTriangle()
	5712	+ /*
	5713	+ */
	5714	+ int ChooseTriangle(boolean firstEquilateral)
5465	5715	{
5466	5716	int chosen = -1;
5467	5717
5468	5718	double minweight = 1E10;
5469	5719
	5720	+ int step = 8; // ?
	5721	+
	5722	+ if (firstEquilateral)
	5723	+ step = 1;
	5724	+
5470	5725	nbbadfaces = 0;
5471		- for (int i=0; i<faces.size(); i+=8)
	5726	+ for (int i=0; i<faces.size(); i+=step)
5472	5727	// for (int i=faces.size(); (i-=8)>=0;)
5473	5728	{
5474	5729	Face face = (Face) faces.get(i);
	5730	+
	5731	+ if (face.used)
	5732	+ continue;
5475	5733
5476	5734	if (!Valid(face))
5477	5735	{
..	..	@@ -5481,6 +5739,15 @@
5481	5739
5482	5740	if (Boundary(face))
5483	5741	continue;
	5742	+
	5743	+// if (Boundary(face.p))
	5744	+// continue;
	5745	+//
	5746	+// if (Boundary(face.q))
	5747	+// continue;
	5748	+//
	5749	+// if (Boundary(face.r))
	5750	+// continue;
5484	5751
5485	5752	if (!ValidValence(face))
5486	5753	continue;
..	..	@@ -5493,22 +5760,55 @@
5493	5760	//?? if (face.weight < 0)
5494	5761	// continue;
5495	5762
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)
	5763	+ if (firstEquilateral)
5503	5764	{
5504		- minweight = weight;
	5765	+ if (OneFaceUsed(links.get(face.p)))
	5766	+ continue;
	5767	+
	5768	+ if (OneFaceUsed(links.get(face.q)))
	5769	+ continue;
	5770	+
	5771	+ if (OneFaceUsed(links.get(face.r)))
	5772	+ continue;
	5773	+
5505	5774	chosen = i;
5506		- if (minweight == 0)
5507		- break;
	5775	+ break;
	5776	+ }
	5777	+ else
	5778	+ {
	5779	+ double K = 1; // 0.01; // .25;
	5780	+
	5781	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5782	+
	5783	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5784	+
	5785	+ if (minweight > weight)
	5786	+ {
	5787	+ minweight = weight;
	5788	+ chosen = i;
	5789	+ if (minweight == 0)
	5790	+ break;
	5791	+ }
5508	5792	}
5509	5793	}
5510	5794
5511	5795	return chosen;
	5796	+ }
	5797	+
	5798	+ private boolean OneFaceUsed(Vector<Face> faces)
	5799	+ {
	5800	+ if (faces.size() != 6)
	5801	+ return true;
	5802	+
	5803	+ for (int i=0; i<6; i+=1)
	5804	+ {
	5805	+ if (faces.get(i).used)
	5806	+ {
	5807	+ return true;
	5808	+ }
	5809	+ }
	5810	+
	5811	+ return false;
5512	5812	}
5513	5813
5514	5814	static boolean remove3valence = true;
..	..	@@ -5544,7 +5844,7 @@
5544	5844	}
5545	5845	else
5546	5846	{
5547		- assert(links.size() == vertices.size());
	5847	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5548	5848
5549	5849	links.setSize(vertices.size());
5550	5850	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5552,6 +5852,7 @@
5552	5852	// linkstouched[i] = false;
5553	5853	if (links.get(i) == null) // ??
5554	5854	{
	5855	+ new Exception().printStackTrace();
5555	5856	links.set(i, new Vector(8));
5556	5857	// linkstouched[i] = true;
5557	5858	}
..	..	@@ -5562,6 +5863,8 @@
5562	5863	}
5563	5864	}
5564	5865
	5866	+ boolean once = false;
	5867	+
5565	5868	for (int i=faces.size(); --i>=0;)
5566	5869	{
5567	5870	Face face = (Face) faces.get(i);
..	..	@@ -5573,6 +5876,9 @@
5573	5876	//if (linkstouched[face.r])
5574	5877	links.get(face.r).add(face);
5575	5878
	5879	+ if (face.used)
	5880	+ once = true;
	5881	+
5576	5882	face.good = 1;
5577	5883	face.boundary = -1;
5578	5884	}
..	..	@@ -6344,6 +6650,7 @@
6344	6650
6345	6651	void InitWeights()
6346	6652	{
	6653	+ new Exception().printStackTrace();
6347	6654	System.exit(0);
6348	6655	int n = 0;
6349	6656	int b = 0;
..	..	@@ -6937,6 +7244,10 @@
6937	7244	return (face.boundary = 1) == 1;
6938	7245	}
6939	7246
	7247	+ // June 2019
	7248	+ if (true)
	7249	+ return (face.boundary = 0) == 1;
	7250	+
6940	7251	// reverse triangle test
6941	7252	q1.set(p);
6942	7253	q2.set(q);
..	..	@@ -7386,7 +7697,7 @@
7386	7697	//InitWeights();
7387	7698	}
7388	7699
7389		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7700	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7390	7701
7391	7702	if (chosen == -1)
7392	7703	{
..	..	@@ -7400,7 +7711,7 @@
7400	7711	//remove3valence = false;
7401	7712	// InitWeights();
7402	7713
7403		- chosen = ChooseTriangle();
	7714	+ chosen = ChooseTriangle(true);
7404	7715	}
7405	7716	}
7406	7717
..	..	@@ -7676,7 +7987,7 @@
7676	7987
7677	7988	// boolean lock;
7678	7989
7679		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7990	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7680	7991	{
7681	7992	if (stripified)
7682	7993	{
..	..	@@ -7713,12 +8024,12 @@
7713	8024	{
7714	8025	System.err.println("EXCEPTION CAUGHT");
7715	8026	e.printStackTrace();
7716		- return;
	8027	+ return false;
7717	8028	} catch (Error e)
7718	8029	{
7719	8030	System.err.println("ERROR CAUGHT");
7720	8031	e.printStackTrace();
7721		- return;
	8032	+ return false;
7722	8033	}
7723	8034
7724	8035	System.out.println("# faces = " + faces.size());
..	..	@@ -7728,6 +8039,7 @@
7728	8039	{
7729	8040	Face face = (Face) faces.get(i);
7730	8041
	8042	+ face.used = false;
7731	8043	face.nbiterations = 1;
7732	8044	face.weight = -1;
7733	8045	face.boundary = -1;
..	..	@@ -7779,6 +8091,11 @@
7779	8091	nbbadfaces = faces.size();
7780	8092	//remove3valence = true;
7781	8093
	8094	+ int count = 2;
	8095	+
	8096	+ if (onlyone)
	8097	+ count = 1;
	8098	+
7782	8099	firstpass = true;
7783	8100
7784	8101	int n = faces.size();
..	..	@@ -7794,8 +8111,9 @@
7794	8111	System.out.print('.');
7795	8112	}
7796	8113	System.out.println();
	8114	+ boolean atleastone = false;
7797	8115	int i = 0;
7798		- while (reduction34 \|\| faces.size() > n/2)
	8116	+ while (true) // reduction34 \|\| faces.size() > n/2)
7799	8117	{
7800	8118	if (i++%100 == 0)
7801	8119	{
..	..	@@ -7817,6 +8135,8 @@
7817	8135	{
7818	8136	if (!RemoveOneTriangle())
7819	8137	break;
	8138	+
	8139	+ atleastone = true;
7820	8140	}
7821	8141	// if (iterationcount == 0)
7822	8142	// break;
..	..	@@ -7827,8 +8147,8 @@
7827	8147	break;
7828	8148	}
7829	8149	firstpass = false;
7830		- if (onlyone)
7831		- break; // one triangle only
	8150	+// if (--count<0 && !reduction34)
	8151	+// break; // one triangle only
7832	8152	}
7833	8153
7834	8154	InitLinks(false); // for further display
..	..	@@ -7844,6 +8164,8 @@
7844	8164	Trim(true,false,false,false,false);
7845	8165
7846	8166	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8167	+
	8168	+ return atleastone;
7847	8169	}
7848	8170
7849	8171	void UpdateIndices(Face face, Face minface)
..	..	@@ -7856,18 +8178,21 @@
7856	8178	face.p = minface.p;
7857	8179	//if (leafweights)
7858	8180	face.good = 0; // false;
	8181	+ face.used = true;
7859	8182	}
7860	8183	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7861	8184	{
7862	8185	face.q = minface.p;
7863	8186	//if (leafweights)
7864	8187	face.good = 0; // false;
	8188	+ face.used = true;
7865	8189	}
7866	8190	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7867	8191	{
7868	8192	face.r = minface.p;
7869	8193	//if (leafweights)
7870	8194	face.good = 0; // false;
	8195	+ face.used = true;
7871	8196	}
7872	8197
7873	8198	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7927,50 +8252,50 @@
7927	8252	if (v == 2)
7928	8253	vert = minface.r;
7929	8254	// 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)
	8255	+ Vector<Face> vertfaces = links.get(vert);
	8256	+ for (int i=vertfaces.size(); --i>=0;)
7941	8257	{
7942		- if (!leafweights)
	8258	+ Face face = (Face) vertfaces.get(i);
	8259	+
	8260	+ // if (face.weight == 10000)
	8261	+ // continue;
	8262	+
	8263	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8264	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8265	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7943	8266	{
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);
	8267	+ if (!leafweights)
	8268	+ {
	8269	+ // if(minfaceweight <= 0)
	8270	+ // assert(minfaceweight > 0);
	8271	+ //
	8272	+ // //FaceWeight(face);
	8273	+ // if(face.weight < 0)
	8274	+ // assert(face.weight >= 0);
	8275	+
	8276	+ face.weight += minfaceweight;
	8277	+
	8278	+ // if (face.weight >= 10000)
	8279	+ // assert(face.weight < 10000);
	8280	+ }
	8281	+ else
	8282	+ face.weight = -1;
	8283	+
	8284	+ face.nbiterations += 1;
	8285	+ face.boundary = -1;
	8286	+
	8287	+ Vertex p = (Vertex)vertices.get(face.p);
	8288	+ Vertex q = (Vertex)vertices.get(face.q);
	8289	+ Vertex r = (Vertex)vertices.get(face.r);
	8290	+
	8291	+ p.boundary = -1;
	8292	+ q.boundary = -1;
	8293	+ r.boundary = -1;
7955	8294	}
7956	8295	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;
	8296	+ assert(false);
7969	8297	}
7970		- else
7971		- assert(false);
7972	8298	}
7973		- }
7974	8299
7975	8300	// TouchVertex(minface.p);
7976	8301	// TouchVertex(minface.q);
..	..	@@ -8171,6 +8496,7 @@
8171	8496	for (int i=vertfaces.size(); --i>=0;)
8172	8497	{
8173	8498	Face face = (Face) vertfaces.get(i);
	8499	+ face.used = true;
8174	8500	face.good = 0; // false;
8175	8501	if (leafweights)
8176	8502	face.weight = -1;
..	..	@@ -8217,7 +8543,7 @@
8217	8543	if (!trimmed)
8218	8544	return;
8219	8545
8220		- GrafreeD.linkUV = false;
	8546	+ Grafreed.linkUV = false;
8221	8547
8222	8548	try
8223	8549	{
..	..	@@ -8449,7 +8775,8 @@
8449	8775	int[] startvertices;
8450	8776	float[] averagepoints;
8451	8777	float[] extremepoints;
8452		- float[] supportsizes; // distance of closest point
	8778	+ float[] supportminsize; // distance of closest point
	8779	+ float[] supportmaxsize; // distance of fartest point
8453	8780
8454	8781	transient Hashtable vertextable;
8455	8782	/transient/ private Vertex[] verticesCopy;