~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -7,7 +7,8 @@
7	7
8	8	class BoundaryRep implements java.io.Serializable
9	9	{
10		- static final long serialVersionUID = -4852664309425035321L;
	10	+ static final long serialVersionUID = // VERY old 2008 -5762968998168738314L;
	11	+ -4852664309425035321L;
11	12
12	13	transient int displaylist = 0;
13	14
..	..	@@ -161,6 +162,7 @@
161	162	\|\| FaceCount() != other.FaceCount()
162	163	\|\| !(indices == null ^ other.indices != null)) // july 2014
163	164	{
	165	+ // The meshes have different structures.
164	166	//new Exception().printStackTrace();
165	167	trimmed = other.trimmed;
166	168	stripified = other.stripified;
..	..	@@ -172,16 +174,16 @@
172	174	bufV = other.bufV;
173	175	bufF = other.bufF;
174	176
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);
	177	+ positions = (float[]) Grafreed.clone(other.positions);
	178	+ normals = (float[]) Grafreed.clone(other.normals);
	179	+ colors = (float[]) Grafreed.clone(other.colors);
	180	+ uvmap = (float[]) Grafreed.clone(other.uvmap);
	181	+ triangles = (int[]) Grafreed.clone(other.triangles);
180	182
181		- indices = (int[]) GrafreeD.clone(other.indices);
	183	+ indices = (int[]) Grafreed.clone(other.indices);
182	184
183		- vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices);
184		- faces = (Vector<Face>) GrafreeD.clone(other.faces);
	185	+ vertices = (Vector<Vertex>) Grafreed.clone(other.vertices);
	186	+ faces = (Vector<Face>) Grafreed.clone(other.faces);
185	187	}
186	188	else
187	189	{
..	..	@@ -239,9 +241,16 @@
239	241	}
240	242	}
241	243
242		- Support[] InitConnections(BoundaryRep other)
	244	+ transient Support[] cachesupports = null;
	245	+
	246	+ Support[] InitConnections()
243	247	{
244		- int n = other.startvertices.length-1;
	248	+ if (cachesupports != null)
	249	+ {
	250	+ return cachesupports;
	251	+ }
	252	+
	253	+ int n = this.startvertices.length-1;
245	254
246	255	Support[] supports = new Support[n];
247	256
..	..	@@ -253,38 +262,60 @@
253	262
254	263	for (int object=1; object<=n; object++)
255	264	{
256		- int start = other.startvertices[object-1];
257		- int end = other.startvertices[object];
	265	+ int start = this.startvertices[object-1];
	266	+ int end = this.startvertices[object];
258	267
259	268	if (start == end)
260	269	continue; // ??
261	270
	271	+ /**
	272	+ Vertex v2 = vertextemp;
	273	+ v2.x = averagepoints[object*3];
	274	+ v2.y = averagepoints[object*3+1];
	275	+ v2.z = averagepoints[object*3+2];
	276	+
	277	+ //v2.set(GetVertex(this.startvertices[subsupport]));
	278	+
	279	+ // projected point
	280	+ Vertex v3 = vertextemp2;
	281	+ //GetVertex(this.startvertices[subsupport]);
	282	+ v3.x = extremepoints[object*3];
	283	+ v3.y = extremepoints[object*3+1];
	284	+ v3.z = extremepoints[object*3+2];
	285	+
	286	+ vect3.set(v3); // "X" axis apex
	287	+ vect3.sub(v2); // origin (center)
	288	+ vect3.normalize();
	289	+ /**/
	290	+
262	291	int linkcount = 0;
263	292
264	293	int objectinlist = -1;
	294	+
	295	+ Support subsupport = supports[object-1];
265	296
266	297	for (int object2=1; object2<=n; object2++)
267	298	{
268	299	for (int i = start; i < end; i++)
269	300	{
270		- Vertex v = other.GetVertex(i);
	301	+ Vertex v = this.GetVertex(i);
271	302
272		- //
273		- if (other.Contains(v, object2))
	303	+ // Check if v is close enough from any vertex of the given subobject.
	304	+ if (this.Contains(v, object2))
274	305	{
275		- if (linkcount == supports[object-1].links.length)
	306	+ if (linkcount == subsupport.links.length)
276	307	break;
277	308
278	309	if (object2 == object)
279	310	objectinlist = linkcount;
280	311
281		- supports[object-1].links[linkcount++] = object2;
	312	+ subsupport.links[linkcount++] = object2;
282	313	break;
283	314	}
284	315	}
285	316	}
286	317
287		- supports[object-1].links[linkcount] = -1;
	318	+ subsupport.links[linkcount] = -1;
288	319
289	320	if (objectinlist == -1)
290	321	assert(objectinlist != -1);
..	..	@@ -293,9 +324,9 @@
293	324	// assert(linkcount > 1);
294	325
295	326	// 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;
	327	+ int first = subsupport.links[0];
	328	+ subsupport.links[0] = subsupport.links[objectinlist];
	329	+ subsupport.links[objectinlist] = first;
299	330	}
300	331
301	332	for (int loop = 0; --loop>=0;)
..	..	@@ -353,7 +384,7 @@
353	384	supports = supports2;
354	385	}
355	386
356		- return supports;
	387	+ return cachesupports = supports;
357	388	}
358	389
359	390	double Distance2(Vertex v, Vertex v2, double dist2beat, double[][] toRoot, int k)
..	..	@@ -500,7 +531,7 @@
500	531	static Vertex vertextemp = new Vertex(true);
501	532	static Vertex vertextemp2 = new Vertex(true);
502	533
503		- static double SEUIL = 0.1f; // 0.1 for rag doll; 0.07;
	534	+ static double SEUIL = 0.025f; // 0.1 for rag doll; 0.07;
504	535
505	536	// Compute weight of point w/r to this
506	537	float ComputeWeight(Vertex v, double[][] toRoot, int k)
..	..	@@ -598,7 +629,7 @@
598	629	// ;
599	630	//
600	631
601		- supportsize = supportsizes[subsupport];
	632	+ supportsize = supportminsize[subsupport];
602	633
603	634	double K = supportsize / distmax;
604	635
..	..	@@ -650,11 +681,13 @@
650	681	// if (supportsize * fadefactor > 1)
651	682	// return 1;
652	683
653		- return supportsize * fadefactor;
	684	+ return //supportsize *
	685	+ supportsize * fadefactor;
654	686	}
655	687
656	688	void RecomputeBasis(BoundaryRep other, double[][] toRoot, Vertex v)
657	689	{
	690	+ CameraPane.CreateSelectedPoint();
658	691	CameraPane.selectedpoint.
659	692	getAverage(cStatic.point1, true);
660	693
..	..	@@ -952,7 +985,7 @@
952	985
953	986	// sept 2017 SEUIL = 0.1; // aout 2013
954	987
955		- supports = InitConnections(other);
	988	+ supports = other.InitConnections();
956	989
957	990	other.supports = supports; // should be the other way around...
958	991
..	..	@@ -972,6 +1005,7 @@
972	1005
973	1006	v.closestsupport = -1;
974	1007
	1008	+ CameraPane.CreateSelectedPoint();
975	1009	CameraPane.selectedpoint.
976	1010	getAverage(cStatic.point1, true);
977	1011
..	..	@@ -1230,6 +1264,7 @@
1230	1264	for (int wi = v0.weights.length; --wi>=0;)
1231	1265	v[wi] = 0;
1232	1266
	1267	+ CameraPane.CreateSelectedPoint();
1233	1268	CameraPane.selectedpoint.
1234	1269	getAverage(cStatic.point1, true);
1235	1270
..	..	@@ -1367,6 +1402,7 @@
1367	1402	v0.x = v0.y = v0.z = 0;
1368	1403	v0.norm.x = v0.norm.y = v0.norm.z = 0;
1369	1404
	1405	+ CameraPane.CreateSelectedPoint();
1370	1406	CameraPane.selectedpoint.
1371	1407	getAverage(cStatic.point1, true);
1372	1408
..	..	@@ -1518,7 +1554,7 @@
1518	1554	InitFaceIndices();
1519	1555	}
1520	1556
1521		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1557	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1522	1558	//float[] v = new float[100];
1523	1559
1524	1560	for (int loops=1; --loops>=0;)
..	..	@@ -1548,7 +1584,7 @@
1548	1584	InitFaceIndices();
1549	1585	}
1550	1586
1551		- BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
	1587	+ BoundaryRep rep = (BoundaryRep) Grafreed.clone(this);
1552	1588	//float[] v = new float[100];
1553	1589
1554	1590	for (int loops=10; --loops>=0;)
..	..	@@ -1895,7 +1931,7 @@
1895	1931	return;
1896	1932	}
1897	1933
1898		- // System.exit(0);
	1934	+ // System.exit(0);
1899	1935
1900	1936	cVector vect = new cVector();
1901	1937	cVector normal = new cVector();
..	..	@@ -1966,7 +2002,10 @@
1966	2002	if (v.vertexlinks == null)
1967	2003	continue;
1968	2004
1969		- if (v.weights != null && v.weights[j] == 0) // < 0.01 * v.totalweight) // == 0)
	2005	+ // Warning: faster but dangerous
	2006	+ if (v.weights != null && v.weights[j]
	2007	+ == 0)
	2008	+ //< 0.001 * v.totalweight)
1970	2009	{
1971	2010	//testweight += v.weights[j-1];
1972	2011	continue;
..	..	@@ -2247,6 +2286,8 @@
2247	2286
2248	2287	transient int lastsoundtime;
2249	2288
	2289	+ transient boolean once = false;
	2290	+
2250	2291	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2251	2292	{
2252	2293	if (LA.isIdentity(toRoot))
..	..	@@ -2302,7 +2343,11 @@
2302	2343
2303	2344	if (v.totalweight == 0)
2304	2345	{
2305		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2346	+ if (!once)
	2347	+ {
	2348	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2349	+ once = true;
	2350	+ }
2306	2351	continue;
2307	2352	}
2308	2353
..	..	@@ -2670,7 +2715,7 @@
2670	2715
2671	2716	if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672	2717	{
2673		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2718	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2674	2719
2675	2720	lastsoundtime = Globals.framecount;
2676	2721	}
..	..	@@ -3098,6 +3143,7 @@
3098	3143	//
3099	3144	// transient VertexCompare[] vertexcompare = null;
3100	3145
	3146	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3101	3147	boolean Contains(Vertex v0, int object)
3102	3148	{
3103	3149	int start = startvertices[object-1];
..	..	@@ -3403,7 +3449,7 @@
3403	3449	k /= xx + yy;
3404	3450	}
3405	3451	else
3406		- GrafreeD.Assert(z == 1);
	3452	+ Grafreed.Assert(z == 1);
3407	3453
3408	3454	if (k < 0)
3409	3455	k = 0;
..	..	@@ -3696,6 +3742,114 @@
3696	3742	*/
3697	3743	}
3698	3744
	3745	+ void GenerateNormals2(boolean crease)
	3746	+ {
	3747	+ cVector tempVector = new cVector();
	3748	+
	3749	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3750	+//
	3751	+//
	3752	+// for (int i=0; i<this.VertexCount(); i++)
	3753	+// {
	3754	+// Vertex v = this.GetVertex(i);
	3755	+//
	3756	+// tempVector.set(v);
	3757	+//
	3758	+// cVector n = tableBase.get(tempVector.ToFloat());
	3759	+//
	3760	+// if (n != null)
	3761	+// {
	3762	+// continue;
	3763	+// }
	3764	+//
	3765	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3766	+// }
	3767	+
	3768	+ BoundaryRep tempSupport = this.support;
	3769	+
	3770	+ this.support = null;
	3771	+
	3772	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3773	+
	3774	+ this.support = tempSupport;
	3775	+
	3776	+ //tempRep.Unstripify();
	3777	+
	3778	+ tempRep.GenerateNormals(crease);
	3779	+
	3780	+ boolean keepnormal = Vertex.normalmode;
	3781	+ boolean epsequal = Grafreed.epsequal;
	3782	+
	3783	+ Vertex.normalmode = false;
	3784	+ Grafreed.epsequal = false; // A bit strange
	3785	+
	3786	+ // No need to have a match for vertex counts.
	3787	+
	3788	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3789	+
	3790	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3791	+ {
	3792	+ Vertex v = tempRep.GetVertex(i);
	3793	+
	3794	+ cVector n = table.get(tempVector.ToFloat());
	3795	+
	3796	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3797	+ {
	3798	+ //continue;
	3799	+ }
	3800	+
	3801	+ tempVector.set(v);
	3802	+
	3803	+ //cVector nBase = tableBase.get(tempVector);
	3804	+
	3805	+ //if (v.norm.dot(nBase) < 0.9)
	3806	+ //{
	3807	+ // continue;
	3808	+ //}
	3809	+
	3810	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3811	+ {
	3812	+ //continue;
	3813	+ }
	3814	+
	3815	+ if (n != null)
	3816	+ {
	3817	+// if (n.dot(v.norm) < 0)
	3818	+// n.sub(v.norm);
	3819	+// else
	3820	+// n.add(v.norm);
	3821	+//
	3822	+// n.normalize();
	3823	+ continue;
	3824	+ }
	3825	+
	3826	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3827	+ }
	3828	+
	3829	+ for (int i=0; i<this.VertexCount(); i++)
	3830	+ {
	3831	+ Vertex v = this.GetVertex(i);
	3832	+
	3833	+ tempVector.set(v);
	3834	+
	3835	+ cVector n = table.get(tempVector.ToFloat());
	3836	+
	3837	+ //if (n.dot(v.norm) < 0)
	3838	+ if (n == null)
	3839	+ continue;
	3840	+
	3841	+ if (v.norm == null)
	3842	+ v.norm = new cVector();
	3843	+
	3844	+ LA.vecCopy(n, v.norm);
	3845	+
	3846	+ this.SetVertex(v, i);
	3847	+ }
	3848	+
	3849	+ Grafreed.epsequal = epsequal;
	3850	+ Vertex.normalmode = keepnormal;
	3851	+ }
	3852	+
3699	3853	void GenerateNormals(boolean crease)
3700	3854	{
3701	3855	boolean wastrim = trimmed;
..	..	@@ -3712,6 +3866,28 @@
3712	3866	}
3713	3867
3714	3868	Trim(true/wastrim/,true,crease,wasstrip,false);
	3869	+ }
	3870	+
	3871	+ void GenerateNormalsMesh()
	3872	+ {
	3873	+ if (stripified)
	3874	+ {
	3875	+ Unstripify();
	3876	+ }
	3877	+
	3878	+ if (trimmed)
	3879	+ {
	3880	+ normals = null;
	3881	+ }
	3882	+ else
	3883	+ {
	3884	+ for (int i=VertexCount(); --i>=0;)
	3885	+ {
	3886	+ Vertex v = GetVertex(i);
	3887	+
	3888	+ v.norm = null;
	3889	+ }
	3890	+ }
3715	3891	}
3716	3892
3717	3893	void GenNormalsJME()
..	..	@@ -3836,7 +4012,7 @@
3836	4012	NormalGenerator ng;
3837	4013
3838	4014	if (crease)
3839		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4015	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3840	4016	else
3841	4017	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3842	4018
..	..	@@ -3854,8 +4030,6 @@
3854	4030	//System.out.println("NEW = " + positions.length);
3855	4031	uvmap = new float[ta.getVertexCount() * 2];
3856	4032
3857		- colors = new float[ta.getVertexCount()]; // * 3];
3858		-
3859	4033	ta.getCoordinates(0, positions);
3860	4034	ta.getNormals(0, normals);
3861	4035	// ta.getColors(0, colors);
..	..	@@ -3863,12 +4037,24 @@
3863	4037
3864	4038	System.out.println("UV = " + uvmap[2] + ", " + uvmap[3] + ";");
3865	4039
	4040	+ colors = null;
	4041	+// colors = new float[ta.getVertexCount()]; // * 3];
	4042	+//
	4043	+// for (int i=colors.length; --i>=0;)
	4044	+// {
	4045	+// colors[i] = 1;
	4046	+// }
	4047	+
3866	4048	triangles = new int[ta.getVertexCount()];
3867	4049
3868	4050	for (int i = 0; i < triangles.length; i++)
3869	4051	{
3870	4052	triangles[i] = i;
3871	4053	}
	4054	+
	4055	+// Untrim();
	4056	+ if (!trimmed)
	4057	+ MergeNormals();
3872	4058	}
3873	4059	}
3874	4060
..	..	@@ -3896,17 +4082,18 @@
3896	4082	positions = new float[3 * ga.getVertexCount()];
3897	4083	normals = new float[3 * ga.getVertexCount()];
3898	4084	uvmap = new float[2 * ga.getVertexCount()];
3899		- colors = new float[1 * ga.getVertexCount()];
3900	4085
3901	4086	tsa.getCoordinates(0, positions);
3902	4087	tsa.getNormals(0, normals);
3903	4088	tsa.getTextureCoordinates(0, 0, uvmap);
3904	4089	// tsa.getColors(0, colors);
3905		-
3906		- for (int i=colors.length; --i>=0;)
3907		- {
3908		- colors[i] = 1;
3909		- }
	4090	+
	4091	+ colors = null;
	4092	+// colors = new float[1 * ga.getVertexCount()];
	4093	+// for (int i=colors.length; --i>=0;)
	4094	+// {
	4095	+// colors[i] = 1;
	4096	+// }
3910	4097
3911	4098	int stripcount = tsa.getNumStrips();
3912	4099	triangles = new int[stripcount];
..	..	@@ -3915,6 +4102,7 @@
3915	4102	stripified = true;
3916	4103	} catch (ClassCastException e)
3917	4104	{
	4105	+ // ??? aug 2019
3918	4106	TriangleArray ta = (TriangleArray) ga;
3919	4107
3920	4108	positions = new float[3 * ga.getVertexCount()];
..	..	@@ -3929,6 +4117,10 @@
3929	4117	triangles = new int[1];
3930	4118	triangles[0] = 3;
3931	4119	}
	4120	+
	4121	+ //Untrim();
	4122	+ if (!trimmed)
	4123	+ MergeNormals();
3932	4124	}
3933	4125
3934	4126	/*
..	..	@@ -3978,6 +4170,42 @@
3978	4170	}
3979	4171
3980	4172	Vertex.normalmode = false;
	4173	+ }
	4174	+
	4175	+ void MergeNormals()
	4176	+ {
	4177	+ assert(!trimmed);
	4178	+
	4179	+ boolean smooth = Grafreed.smoothmode;
	4180	+ boolean link = Grafreed.linkUV;
	4181	+ Grafreed.smoothmode = true;
	4182	+ Grafreed.linkUV = true;
	4183	+
	4184	+ System.out.println("#Vertex = " + VertexCount());
	4185	+ System.out.println("#Face = " + FaceCount());
	4186	+
	4187	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4188	+
	4189	+ for (int i = 0; i < VertexCount(); i++)
	4190	+ {
	4191	+ Vertex v = GetVertex(i);
	4192	+
	4193	+ if (!table.contains(v))
	4194	+ {
	4195	+ table.add(v);
	4196	+ }
	4197	+ }
	4198	+
	4199	+ Grafreed.smoothmode = smooth;
	4200	+ Grafreed.linkUV = link;
	4201	+
	4202	+// for (int i = 0; i < VertexCount(); i++)
	4203	+// {
	4204	+// Vertex v = GetVertex(i);
	4205	+//
	4206	+// table.add(v);
	4207	+// }
	4208	+
3981	4209	}
3982	4210
3983	4211	static cVector temp1 = new cVector();
..	..	@@ -4752,16 +4980,25 @@
4752	4980	{
4753	4981	i3 = positions.length-3;
4754	4982	i2 = uvmap.length - 2;
4755		- new Exception().printStackTrace();
	4983	+ //new Exception().printStackTrace();
4756	4984	}
4757	4985
4758	4986	v./pos./x = positions[i3];
4759	4987	v./pos./y = positions[i3 + 1];
4760	4988	v./pos./z = positions[i3 + 2];
4761	4989
4762		- v.norm.x = normals[i3];
4763		- v.norm.y = normals[i3 + 1];
4764		- v.norm.z = normals[i3 + 2];
	4990	+ if (normals == null)
	4991	+ {
	4992	+ v.norm.x = 0;
	4993	+ v.norm.y = 0;
	4994	+ v.norm.z = 0;
	4995	+ }
	4996	+ else
	4997	+ {
	4998	+ v.norm.x = normals[i3];
	4999	+ v.norm.y = normals[i3 + 1];
	5000	+ v.norm.z = normals[i3 + 2];
	5001	+ }
4765	5002
4766	5003	v.s = uvmap[i2];
4767	5004	v.t = uvmap[i2 + 1];
..	..	@@ -5476,17 +5713,27 @@
5476	5713
5477	5714	transient int nbbadfaces; // ?? = 1000000;
5478	5715
5479		- int ChooseTriangle()
	5716	+ /*
	5717	+ */
	5718	+ int ChooseTriangle(boolean firstEquilateral)
5480	5719	{
5481	5720	int chosen = -1;
5482	5721
5483	5722	double minweight = 1E10;
5484	5723
	5724	+ int step = 8; // ?
	5725	+
	5726	+ if (firstEquilateral)
	5727	+ step = 1;
	5728	+
5485	5729	nbbadfaces = 0;
5486		- for (int i=0; i<faces.size(); i+=8)
	5730	+ for (int i=0; i<faces.size(); i+=step)
5487	5731	// for (int i=faces.size(); (i-=8)>=0;)
5488	5732	{
5489	5733	Face face = (Face) faces.get(i);
	5734	+
	5735	+ if (face.used)
	5736	+ continue;
5490	5737
5491	5738	if (!Valid(face))
5492	5739	{
..	..	@@ -5496,6 +5743,15 @@
5496	5743
5497	5744	if (Boundary(face))
5498	5745	continue;
	5746	+
	5747	+// if (Boundary(face.p))
	5748	+// continue;
	5749	+//
	5750	+// if (Boundary(face.q))
	5751	+// continue;
	5752	+//
	5753	+// if (Boundary(face.r))
	5754	+// continue;
5499	5755
5500	5756	if (!ValidValence(face))
5501	5757	continue;
..	..	@@ -5508,22 +5764,55 @@
5508	5764	//?? if (face.weight < 0)
5509	5765	// continue;
5510	5766
5511		- double K = 1; // 0.01; // .25;
5512		-
5513		- double factor = (1-K)face.nbiterations + K; //face.weight;
5514		-
5515		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5516		-
5517		- if (minweight > weight)
	5767	+ if (firstEquilateral)
5518	5768	{
5519		- minweight = weight;
	5769	+ if (OneFaceUsed(links.get(face.p)))
	5770	+ continue;
	5771	+
	5772	+ if (OneFaceUsed(links.get(face.q)))
	5773	+ continue;
	5774	+
	5775	+ if (OneFaceUsed(links.get(face.r)))
	5776	+ continue;
	5777	+
5520	5778	chosen = i;
5521		- if (minweight == 0)
5522		- break;
	5779	+ break;
	5780	+ }
	5781	+ else
	5782	+ {
	5783	+ double K = 1; // 0.01; // .25;
	5784	+
	5785	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5786	+
	5787	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5788	+
	5789	+ if (minweight > weight)
	5790	+ {
	5791	+ minweight = weight;
	5792	+ chosen = i;
	5793	+ if (minweight == 0)
	5794	+ break;
	5795	+ }
5523	5796	}
5524	5797	}
5525	5798
5526	5799	return chosen;
	5800	+ }
	5801	+
	5802	+ private boolean OneFaceUsed(Vector<Face> faces)
	5803	+ {
	5804	+ if (faces.size() != 6)
	5805	+ return true;
	5806	+
	5807	+ for (int i=0; i<6; i+=1)
	5808	+ {
	5809	+ if (faces.get(i).used)
	5810	+ {
	5811	+ return true;
	5812	+ }
	5813	+ }
	5814	+
	5815	+ return false;
5527	5816	}
5528	5817
5529	5818	static boolean remove3valence = true;
..	..	@@ -5559,7 +5848,7 @@
5559	5848	}
5560	5849	else
5561	5850	{
5562		- assert(links.size() == vertices.size());
	5851	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5563	5852
5564	5853	links.setSize(vertices.size());
5565	5854	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5567,6 +5856,7 @@
5567	5856	// linkstouched[i] = false;
5568	5857	if (links.get(i) == null) // ??
5569	5858	{
	5859	+ new Exception().printStackTrace();
5570	5860	links.set(i, new Vector(8));
5571	5861	// linkstouched[i] = true;
5572	5862	}
..	..	@@ -5577,6 +5867,8 @@
5577	5867	}
5578	5868	}
5579	5869
	5870	+ boolean once = false;
	5871	+
5580	5872	for (int i=faces.size(); --i>=0;)
5581	5873	{
5582	5874	Face face = (Face) faces.get(i);
..	..	@@ -5588,6 +5880,9 @@
5588	5880	//if (linkstouched[face.r])
5589	5881	links.get(face.r).add(face);
5590	5882
	5883	+ if (face.used)
	5884	+ once = true;
	5885	+
5591	5886	face.good = 1;
5592	5887	face.boundary = -1;
5593	5888	}
..	..	@@ -6953,6 +7248,10 @@
6953	7248	return (face.boundary = 1) == 1;
6954	7249	}
6955	7250
	7251	+ // June 2019
	7252	+ if (true)
	7253	+ return (face.boundary = 0) == 1;
	7254	+
6956	7255	// reverse triangle test
6957	7256	q1.set(p);
6958	7257	q2.set(q);
..	..	@@ -7402,7 +7701,7 @@
7402	7701	//InitWeights();
7403	7702	}
7404	7703
7405		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7704	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7406	7705
7407	7706	if (chosen == -1)
7408	7707	{
..	..	@@ -7416,7 +7715,7 @@
7416	7715	//remove3valence = false;
7417	7716	// InitWeights();
7418	7717
7419		- chosen = ChooseTriangle();
	7718	+ chosen = ChooseTriangle(true);
7420	7719	}
7421	7720	}
7422	7721
..	..	@@ -7692,7 +7991,7 @@
7692	7991
7693	7992	// boolean lock;
7694	7993
7695		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7994	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7696	7995	{
7697	7996	if (stripified)
7698	7997	{
..	..	@@ -7729,12 +8028,12 @@
7729	8028	{
7730	8029	System.err.println("EXCEPTION CAUGHT");
7731	8030	e.printStackTrace();
7732		- return;
	8031	+ return false;
7733	8032	} catch (Error e)
7734	8033	{
7735	8034	System.err.println("ERROR CAUGHT");
7736	8035	e.printStackTrace();
7737		- return;
	8036	+ return false;
7738	8037	}
7739	8038
7740	8039	System.out.println("# faces = " + faces.size());
..	..	@@ -7744,6 +8043,7 @@
7744	8043	{
7745	8044	Face face = (Face) faces.get(i);
7746	8045
	8046	+ face.used = false;
7747	8047	face.nbiterations = 1;
7748	8048	face.weight = -1;
7749	8049	face.boundary = -1;
..	..	@@ -7795,6 +8095,11 @@
7795	8095	nbbadfaces = faces.size();
7796	8096	//remove3valence = true;
7797	8097
	8098	+ int count = 2;
	8099	+
	8100	+ if (onlyone)
	8101	+ count = 1;
	8102	+
7798	8103	firstpass = true;
7799	8104
7800	8105	int n = faces.size();
..	..	@@ -7810,8 +8115,9 @@
7810	8115	System.out.print('.');
7811	8116	}
7812	8117	System.out.println();
	8118	+ boolean atleastone = false;
7813	8119	int i = 0;
7814		- while (reduction34 \|\| faces.size() > n/2)
	8120	+ while (true) // reduction34 \|\| faces.size() > n/2)
7815	8121	{
7816	8122	if (i++%100 == 0)
7817	8123	{
..	..	@@ -7833,6 +8139,8 @@
7833	8139	{
7834	8140	if (!RemoveOneTriangle())
7835	8141	break;
	8142	+
	8143	+ atleastone = true;
7836	8144	}
7837	8145	// if (iterationcount == 0)
7838	8146	// break;
..	..	@@ -7843,8 +8151,8 @@
7843	8151	break;
7844	8152	}
7845	8153	firstpass = false;
7846		- if (onlyone)
7847		- break; // one triangle only
	8154	+// if (--count<0 && !reduction34)
	8155	+// break; // one triangle only
7848	8156	}
7849	8157
7850	8158	InitLinks(false); // for further display
..	..	@@ -7860,6 +8168,8 @@
7860	8168	Trim(true,false,false,false,false);
7861	8169
7862	8170	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8171	+
	8172	+ return atleastone;
7863	8173	}
7864	8174
7865	8175	void UpdateIndices(Face face, Face minface)
..	..	@@ -7872,18 +8182,21 @@
7872	8182	face.p = minface.p;
7873	8183	//if (leafweights)
7874	8184	face.good = 0; // false;
	8185	+ face.used = true;
7875	8186	}
7876	8187	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7877	8188	{
7878	8189	face.q = minface.p;
7879	8190	//if (leafweights)
7880	8191	face.good = 0; // false;
	8192	+ face.used = true;
7881	8193	}
7882	8194	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7883	8195	{
7884	8196	face.r = minface.p;
7885	8197	//if (leafweights)
7886	8198	face.good = 0; // false;
	8199	+ face.used = true;
7887	8200	}
7888	8201
7889	8202	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7943,50 +8256,50 @@
7943	8256	if (v == 2)
7944	8257	vert = minface.r;
7945	8258	// Face face = (Face) faces.get(i);
7946		- Vector<Face> vertfaces = links.get(vert);
7947		- for (int i=vertfaces.size(); --i>=0;)
7948		- {
7949		- Face face = (Face) vertfaces.get(i);
7950		-
7951		- // if (face.weight == 10000)
7952		- // continue;
7953		-
7954		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7955		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7956		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8259	+ Vector<Face> vertfaces = links.get(vert);
	8260	+ for (int i=vertfaces.size(); --i>=0;)
7957	8261	{
7958		- if (!leafweights)
	8262	+ Face face = (Face) vertfaces.get(i);
	8263	+
	8264	+ // if (face.weight == 10000)
	8265	+ // continue;
	8266	+
	8267	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8268	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8269	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7959	8270	{
7960		-// if(minfaceweight <= 0)
7961		-// assert(minfaceweight > 0);
7962		-//
7963		-// //FaceWeight(face);
7964		-// if(face.weight < 0)
7965		-// assert(face.weight >= 0);
7966		-
7967		- face.weight += minfaceweight;
7968		-
7969		-// if (face.weight >= 10000)
7970		-// assert(face.weight < 10000);
	8271	+ if (!leafweights)
	8272	+ {
	8273	+ // if(minfaceweight <= 0)
	8274	+ // assert(minfaceweight > 0);
	8275	+ //
	8276	+ // //FaceWeight(face);
	8277	+ // if(face.weight < 0)
	8278	+ // assert(face.weight >= 0);
	8279	+
	8280	+ face.weight += minfaceweight;
	8281	+
	8282	+ // if (face.weight >= 10000)
	8283	+ // assert(face.weight < 10000);
	8284	+ }
	8285	+ else
	8286	+ face.weight = -1;
	8287	+
	8288	+ face.nbiterations += 1;
	8289	+ face.boundary = -1;
	8290	+
	8291	+ Vertex p = (Vertex)vertices.get(face.p);
	8292	+ Vertex q = (Vertex)vertices.get(face.q);
	8293	+ Vertex r = (Vertex)vertices.get(face.r);
	8294	+
	8295	+ p.boundary = -1;
	8296	+ q.boundary = -1;
	8297	+ r.boundary = -1;
7971	8298	}
7972	8299	else
7973		- face.weight = -1;
7974		-
7975		- face.nbiterations += 1;
7976		- face.boundary = -1;
7977		-
7978		- Vertex p = (Vertex)vertices.get(face.p);
7979		- Vertex q = (Vertex)vertices.get(face.q);
7980		- Vertex r = (Vertex)vertices.get(face.r);
7981		-
7982		- p.boundary = -1;
7983		- q.boundary = -1;
7984		- r.boundary = -1;
	8300	+ assert(false);
7985	8301	}
7986		- else
7987		- assert(false);
7988	8302	}
7989		- }
7990	8303
7991	8304	// TouchVertex(minface.p);
7992	8305	// TouchVertex(minface.q);
..	..	@@ -8187,6 +8500,7 @@
8187	8500	for (int i=vertfaces.size(); --i>=0;)
8188	8501	{
8189	8502	Face face = (Face) vertfaces.get(i);
	8503	+ face.used = true;
8190	8504	face.good = 0; // false;
8191	8505	if (leafweights)
8192	8506	face.weight = -1;
..	..	@@ -8233,7 +8547,7 @@
8233	8547	if (!trimmed)
8234	8548	return;
8235	8549
8236		- GrafreeD.linkUV = false;
	8550	+ Grafreed.linkUV = false;
8237	8551
8238	8552	try
8239	8553	{
..	..	@@ -8465,7 +8779,8 @@
8465	8779	int[] startvertices;
8466	8780	float[] averagepoints;
8467	8781	float[] extremepoints;
8468		- float[] supportsizes; // distance of closest point
	8782	+ float[] supportminsize; // distance of closest point
	8783	+ float[] supportmaxsize; // distance of fartest point
8469	8784
8470	8785	transient Hashtable vertextable;
8471	8786	/transient/ private Vertex[] verticesCopy;