~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,7 @@
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	+ if (v.weights != null && v.weights[j] < 0.001 * v.totalweight) // == 0)
1970	2001	{
1971	2002	//testweight += v.weights[j-1];
1972	2003	continue;
..	..	@@ -2247,6 +2278,8 @@
2247	2278
2248	2279	transient int lastsoundtime;
2249	2280
	2281	+ transient boolean once = false;
	2282	+
2250	2283	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2251	2284	{
2252	2285	if (LA.isIdentity(toRoot))
..	..	@@ -2302,7 +2335,11 @@
2302	2335
2303	2336	if (v.totalweight == 0)
2304	2337	{
2305		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2338	+ if (!once)
	2339	+ {
	2340	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2341	+ once = true;
	2342	+ }
2306	2343	continue;
2307	2344	}
2308	2345
..	..	@@ -2670,7 +2707,7 @@
2670	2707
2671	2708	if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672	2709	{
2673		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2710	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2674	2711
2675	2712	lastsoundtime = Globals.framecount;
2676	2713	}
..	..	@@ -3098,6 +3135,7 @@
3098	3135	//
3099	3136	// transient VertexCompare[] vertexcompare = null;
3100	3137
	3138	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3101	3139	boolean Contains(Vertex v0, int object)
3102	3140	{
3103	3141	int start = startvertices[object-1];
..	..	@@ -3403,7 +3441,7 @@
3403	3441	k /= xx + yy;
3404	3442	}
3405	3443	else
3406		- GrafreeD.Assert(z == 1);
	3444	+ Grafreed.Assert(z == 1);
3407	3445
3408	3446	if (k < 0)
3409	3447	k = 0;
..	..	@@ -3696,6 +3734,111 @@
3696	3734	*/
3697	3735	}
3698	3736
	3737	+ void GenerateNormals2(boolean crease)
	3738	+ {
	3739	+ cVector tempVector = new cVector();
	3740	+
	3741	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3742	+//
	3743	+//
	3744	+// for (int i=0; i<this.VertexCount(); i++)
	3745	+// {
	3746	+// Vertex v = this.GetVertex(i);
	3747	+//
	3748	+// tempVector.set(v);
	3749	+//
	3750	+// cVector n = tableBase.get(tempVector.ToFloat());
	3751	+//
	3752	+// if (n != null)
	3753	+// {
	3754	+// continue;
	3755	+// }
	3756	+//
	3757	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3758	+// }
	3759	+
	3760	+ BoundaryRep tempSupport = this.support;
	3761	+
	3762	+ this.support = null;
	3763	+
	3764	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3765	+
	3766	+ this.support = tempSupport;
	3767	+
	3768	+ //tempRep.Unstripify();
	3769	+
	3770	+ tempRep.GenerateNormals2(crease);
	3771	+
	3772	+ boolean keepnormal = Vertex.normalmode;
	3773	+ boolean epsequal = Grafreed.epsequal;
	3774	+
	3775	+ Vertex.normalmode = false;
	3776	+ Grafreed.epsequal = false; // A bit strange
	3777	+
	3778	+ // No need to have a match for vertex counts.
	3779	+
	3780	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3781	+
	3782	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3783	+ {
	3784	+ Vertex v = tempRep.GetVertex(i);
	3785	+
	3786	+ cVector n = table.get(tempVector.ToFloat());
	3787	+
	3788	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3789	+ {
	3790	+ //continue;
	3791	+ }
	3792	+
	3793	+ tempVector.set(v);
	3794	+
	3795	+ //cVector nBase = tableBase.get(tempVector);
	3796	+
	3797	+ //if (v.norm.dot(nBase) < 0.9)
	3798	+ //{
	3799	+ // continue;
	3800	+ //}
	3801	+
	3802	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3803	+ {
	3804	+ //continue;
	3805	+ }
	3806	+
	3807	+ if (n != null)
	3808	+ {
	3809	+// if (n.dot(v.norm) < 0)
	3810	+// n.sub(v.norm);
	3811	+// else
	3812	+// n.add(v.norm);
	3813	+//
	3814	+// n.normalize();
	3815	+ continue;
	3816	+ }
	3817	+
	3818	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3819	+ }
	3820	+
	3821	+ for (int i=0; i<this.VertexCount(); i++)
	3822	+ {
	3823	+ Vertex v = this.GetVertex(i);
	3824	+
	3825	+ tempVector.set(v);
	3826	+
	3827	+ cVector n = table.get(tempVector.ToFloat());
	3828	+
	3829	+ //if (n.dot(v.norm) < 0)
	3830	+ if (n == null)
	3831	+ continue;
	3832	+
	3833	+ LA.vecCopy(n, v.norm);
	3834	+
	3835	+ this.SetVertex(v, i);
	3836	+ }
	3837	+
	3838	+ Grafreed.epsequal = epsequal;
	3839	+ Vertex.normalmode = keepnormal;
	3840	+ }
	3841	+
3699	3842	void GenerateNormals(boolean crease)
3700	3843	{
3701	3844	boolean wastrim = trimmed;
..	..	@@ -3712,6 +3855,28 @@
3712	3855	}
3713	3856
3714	3857	Trim(true/wastrim/,true,crease,wasstrip,false);
	3858	+ }
	3859	+
	3860	+ void GenerateNormalsMesh()
	3861	+ {
	3862	+ if (stripified)
	3863	+ {
	3864	+ Unstripify();
	3865	+ }
	3866	+
	3867	+ if (trimmed)
	3868	+ {
	3869	+ normals = null;
	3870	+ }
	3871	+ else
	3872	+ {
	3873	+ for (int i=VertexCount(); --i>=0;)
	3874	+ {
	3875	+ Vertex v = GetVertex(i);
	3876	+
	3877	+ v.norm = null;
	3878	+ }
	3879	+ }
3715	3880	}
3716	3881
3717	3882	void GenNormalsJME()
..	..	@@ -3869,6 +4034,10 @@
3869	4034	{
3870	4035	triangles[i] = i;
3871	4036	}
	4037	+
	4038	+// Untrim();
	4039	+ if (!trimmed)
	4040	+ MergeNormals();
3872	4041	}
3873	4042	}
3874	4043
..	..	@@ -3902,6 +4071,11 @@
3902	4071	tsa.getNormals(0, normals);
3903	4072	tsa.getTextureCoordinates(0, 0, uvmap);
3904	4073	// tsa.getColors(0, colors);
	4074	+
	4075	+ for (int i=colors.length; --i>=0;)
	4076	+ {
	4077	+ colors[i] = 1;
	4078	+ }
3905	4079
3906	4080	int stripcount = tsa.getNumStrips();
3907	4081	triangles = new int[stripcount];
..	..	@@ -3924,6 +4098,10 @@
3924	4098	triangles = new int[1];
3925	4099	triangles[0] = 3;
3926	4100	}
	4101	+
	4102	+ //Untrim();
	4103	+ if (!trimmed)
	4104	+ MergeNormals();
3927	4105	}
3928	4106
3929	4107	/*
..	..	@@ -3973,6 +4151,42 @@
3973	4151	}
3974	4152
3975	4153	Vertex.normalmode = false;
	4154	+ }
	4155	+
	4156	+ void MergeNormals()
	4157	+ {
	4158	+ assert(!trimmed);
	4159	+
	4160	+ boolean smooth = Grafreed.smoothmode;
	4161	+ boolean link = Grafreed.linkUV;
	4162	+ Grafreed.smoothmode = true;
	4163	+ Grafreed.linkUV = true;
	4164	+
	4165	+ System.out.println("#Vertex = " + VertexCount());
	4166	+ System.out.println("#Face = " + FaceCount());
	4167	+
	4168	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4169	+
	4170	+ for (int i = 0; i < VertexCount(); i++)
	4171	+ {
	4172	+ Vertex v = GetVertex(i);
	4173	+
	4174	+ if (!table.contains(v))
	4175	+ {
	4176	+ table.add(v);
	4177	+ }
	4178	+ }
	4179	+
	4180	+ Grafreed.smoothmode = smooth;
	4181	+ Grafreed.linkUV = link;
	4182	+
	4183	+// for (int i = 0; i < VertexCount(); i++)
	4184	+// {
	4185	+// Vertex v = GetVertex(i);
	4186	+//
	4187	+// table.add(v);
	4188	+// }
	4189	+
3976	4190	}
3977	4191
3978	4192	static cVector temp1 = new cVector();
..	..	@@ -4747,16 +4961,25 @@
4747	4961	{
4748	4962	i3 = positions.length-3;
4749	4963	i2 = uvmap.length - 2;
4750		- new Exception().printStackTrace();
	4964	+ //new Exception().printStackTrace();
4751	4965	}
4752	4966
4753	4967	v./pos./x = positions[i3];
4754	4968	v./pos./y = positions[i3 + 1];
4755	4969	v./pos./z = positions[i3 + 2];
4756	4970
4757		- v.norm.x = normals[i3];
4758		- v.norm.y = normals[i3 + 1];
4759		- v.norm.z = normals[i3 + 2];
	4971	+ if (normals == null)
	4972	+ {
	4973	+ v.norm.x = 0;
	4974	+ v.norm.y = 0;
	4975	+ v.norm.z = 0;
	4976	+ }
	4977	+ else
	4978	+ {
	4979	+ v.norm.x = normals[i3];
	4980	+ v.norm.y = normals[i3 + 1];
	4981	+ v.norm.z = normals[i3 + 2];
	4982	+ }
4760	4983
4761	4984	v.s = uvmap[i2];
4762	4985	v.t = uvmap[i2 + 1];
..	..	@@ -5471,17 +5694,27 @@
5471	5694
5472	5695	transient int nbbadfaces; // ?? = 1000000;
5473	5696
5474		- int ChooseTriangle()
	5697	+ /*
	5698	+ */
	5699	+ int ChooseTriangle(boolean firstEquilateral)
5475	5700	{
5476	5701	int chosen = -1;
5477	5702
5478	5703	double minweight = 1E10;
5479	5704
	5705	+ int step = 8; // ?
	5706	+
	5707	+ if (firstEquilateral)
	5708	+ step = 1;
	5709	+
5480	5710	nbbadfaces = 0;
5481		- for (int i=0; i<faces.size(); i+=8)
	5711	+ for (int i=0; i<faces.size(); i+=step)
5482	5712	// for (int i=faces.size(); (i-=8)>=0;)
5483	5713	{
5484	5714	Face face = (Face) faces.get(i);
	5715	+
	5716	+ if (face.used)
	5717	+ continue;
5485	5718
5486	5719	if (!Valid(face))
5487	5720	{
..	..	@@ -5491,6 +5724,15 @@
5491	5724
5492	5725	if (Boundary(face))
5493	5726	continue;
	5727	+
	5728	+// if (Boundary(face.p))
	5729	+// continue;
	5730	+//
	5731	+// if (Boundary(face.q))
	5732	+// continue;
	5733	+//
	5734	+// if (Boundary(face.r))
	5735	+// continue;
5494	5736
5495	5737	if (!ValidValence(face))
5496	5738	continue;
..	..	@@ -5503,22 +5745,55 @@
5503	5745	//?? if (face.weight < 0)
5504	5746	// continue;
5505	5747
5506		- double K = 1; // 0.01; // .25;
5507		-
5508		- double factor = (1-K)face.nbiterations + K; //face.weight;
5509		-
5510		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5511		-
5512		- if (minweight > weight)
	5748	+ if (firstEquilateral)
5513	5749	{
5514		- minweight = weight;
	5750	+ if (OneFaceUsed(links.get(face.p)))
	5751	+ continue;
	5752	+
	5753	+ if (OneFaceUsed(links.get(face.q)))
	5754	+ continue;
	5755	+
	5756	+ if (OneFaceUsed(links.get(face.r)))
	5757	+ continue;
	5758	+
5515	5759	chosen = i;
5516		- if (minweight == 0)
5517		- break;
	5760	+ break;
	5761	+ }
	5762	+ else
	5763	+ {
	5764	+ double K = 1; // 0.01; // .25;
	5765	+
	5766	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5767	+
	5768	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5769	+
	5770	+ if (minweight > weight)
	5771	+ {
	5772	+ minweight = weight;
	5773	+ chosen = i;
	5774	+ if (minweight == 0)
	5775	+ break;
	5776	+ }
5518	5777	}
5519	5778	}
5520	5779
5521	5780	return chosen;
	5781	+ }
	5782	+
	5783	+ private boolean OneFaceUsed(Vector<Face> faces)
	5784	+ {
	5785	+ if (faces.size() != 6)
	5786	+ return true;
	5787	+
	5788	+ for (int i=0; i<6; i+=1)
	5789	+ {
	5790	+ if (faces.get(i).used)
	5791	+ {
	5792	+ return true;
	5793	+ }
	5794	+ }
	5795	+
	5796	+ return false;
5522	5797	}
5523	5798
5524	5799	static boolean remove3valence = true;
..	..	@@ -5554,7 +5829,7 @@
5554	5829	}
5555	5830	else
5556	5831	{
5557		- assert(links.size() == vertices.size());
	5832	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5558	5833
5559	5834	links.setSize(vertices.size());
5560	5835	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5562,6 +5837,7 @@
5562	5837	// linkstouched[i] = false;
5563	5838	if (links.get(i) == null) // ??
5564	5839	{
	5840	+ new Exception().printStackTrace();
5565	5841	links.set(i, new Vector(8));
5566	5842	// linkstouched[i] = true;
5567	5843	}
..	..	@@ -5572,6 +5848,8 @@
5572	5848	}
5573	5849	}
5574	5850
	5851	+ boolean once = false;
	5852	+
5575	5853	for (int i=faces.size(); --i>=0;)
5576	5854	{
5577	5855	Face face = (Face) faces.get(i);
..	..	@@ -5583,6 +5861,9 @@
5583	5861	//if (linkstouched[face.r])
5584	5862	links.get(face.r).add(face);
5585	5863
	5864	+ if (face.used)
	5865	+ once = true;
	5866	+
5586	5867	face.good = 1;
5587	5868	face.boundary = -1;
5588	5869	}
..	..	@@ -6354,6 +6635,7 @@
6354	6635
6355	6636	void InitWeights()
6356	6637	{
	6638	+ new Exception().printStackTrace();
6357	6639	System.exit(0);
6358	6640	int n = 0;
6359	6641	int b = 0;
..	..	@@ -6947,6 +7229,10 @@
6947	7229	return (face.boundary = 1) == 1;
6948	7230	}
6949	7231
	7232	+ // June 2019
	7233	+ if (true)
	7234	+ return (face.boundary = 0) == 1;
	7235	+
6950	7236	// reverse triangle test
6951	7237	q1.set(p);
6952	7238	q2.set(q);
..	..	@@ -7396,7 +7682,7 @@
7396	7682	//InitWeights();
7397	7683	}
7398	7684
7399		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7685	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7400	7686
7401	7687	if (chosen == -1)
7402	7688	{
..	..	@@ -7410,7 +7696,7 @@
7410	7696	//remove3valence = false;
7411	7697	// InitWeights();
7412	7698
7413		- chosen = ChooseTriangle();
	7699	+ chosen = ChooseTriangle(true);
7414	7700	}
7415	7701	}
7416	7702
..	..	@@ -7686,7 +7972,7 @@
7686	7972
7687	7973	// boolean lock;
7688	7974
7689		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7975	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7690	7976	{
7691	7977	if (stripified)
7692	7978	{
..	..	@@ -7723,12 +8009,12 @@
7723	8009	{
7724	8010	System.err.println("EXCEPTION CAUGHT");
7725	8011	e.printStackTrace();
7726		- return;
	8012	+ return false;
7727	8013	} catch (Error e)
7728	8014	{
7729	8015	System.err.println("ERROR CAUGHT");
7730	8016	e.printStackTrace();
7731		- return;
	8017	+ return false;
7732	8018	}
7733	8019
7734	8020	System.out.println("# faces = " + faces.size());
..	..	@@ -7738,6 +8024,7 @@
7738	8024	{
7739	8025	Face face = (Face) faces.get(i);
7740	8026
	8027	+ face.used = false;
7741	8028	face.nbiterations = 1;
7742	8029	face.weight = -1;
7743	8030	face.boundary = -1;
..	..	@@ -7789,6 +8076,11 @@
7789	8076	nbbadfaces = faces.size();
7790	8077	//remove3valence = true;
7791	8078
	8079	+ int count = 2;
	8080	+
	8081	+ if (onlyone)
	8082	+ count = 1;
	8083	+
7792	8084	firstpass = true;
7793	8085
7794	8086	int n = faces.size();
..	..	@@ -7804,8 +8096,9 @@
7804	8096	System.out.print('.');
7805	8097	}
7806	8098	System.out.println();
	8099	+ boolean atleastone = false;
7807	8100	int i = 0;
7808		- while (reduction34 \|\| faces.size() > n/2)
	8101	+ while (true) // reduction34 \|\| faces.size() > n/2)
7809	8102	{
7810	8103	if (i++%100 == 0)
7811	8104	{
..	..	@@ -7827,6 +8120,8 @@
7827	8120	{
7828	8121	if (!RemoveOneTriangle())
7829	8122	break;
	8123	+
	8124	+ atleastone = true;
7830	8125	}
7831	8126	// if (iterationcount == 0)
7832	8127	// break;
..	..	@@ -7837,8 +8132,8 @@
7837	8132	break;
7838	8133	}
7839	8134	firstpass = false;
7840		- if (onlyone)
7841		- break; // one triangle only
	8135	+// if (--count<0 && !reduction34)
	8136	+// break; // one triangle only
7842	8137	}
7843	8138
7844	8139	InitLinks(false); // for further display
..	..	@@ -7854,6 +8149,8 @@
7854	8149	Trim(true,false,false,false,false);
7855	8150
7856	8151	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8152	+
	8153	+ return atleastone;
7857	8154	}
7858	8155
7859	8156	void UpdateIndices(Face face, Face minface)
..	..	@@ -7866,18 +8163,21 @@
7866	8163	face.p = minface.p;
7867	8164	//if (leafweights)
7868	8165	face.good = 0; // false;
	8166	+ face.used = true;
7869	8167	}
7870	8168	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7871	8169	{
7872	8170	face.q = minface.p;
7873	8171	//if (leafweights)
7874	8172	face.good = 0; // false;
	8173	+ face.used = true;
7875	8174	}
7876	8175	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7877	8176	{
7878	8177	face.r = minface.p;
7879	8178	//if (leafweights)
7880	8179	face.good = 0; // false;
	8180	+ face.used = true;
7881	8181	}
7882	8182
7883	8183	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7937,50 +8237,50 @@
7937	8237	if (v == 2)
7938	8238	vert = minface.r;
7939	8239	// Face face = (Face) faces.get(i);
7940		- Vector<Face> vertfaces = links.get(vert);
7941		- for (int i=vertfaces.size(); --i>=0;)
7942		- {
7943		- Face face = (Face) vertfaces.get(i);
7944		-
7945		- // if (face.weight == 10000)
7946		- // continue;
7947		-
7948		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7949		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7950		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8240	+ Vector<Face> vertfaces = links.get(vert);
	8241	+ for (int i=vertfaces.size(); --i>=0;)
7951	8242	{
7952		- if (!leafweights)
	8243	+ Face face = (Face) vertfaces.get(i);
	8244	+
	8245	+ // if (face.weight == 10000)
	8246	+ // continue;
	8247	+
	8248	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8249	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8250	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7953	8251	{
7954		-// if(minfaceweight <= 0)
7955		-// assert(minfaceweight > 0);
7956		-//
7957		-// //FaceWeight(face);
7958		-// if(face.weight < 0)
7959		-// assert(face.weight >= 0);
7960		-
7961		- face.weight += minfaceweight;
7962		-
7963		-// if (face.weight >= 10000)
7964		-// assert(face.weight < 10000);
	8252	+ if (!leafweights)
	8253	+ {
	8254	+ // if(minfaceweight <= 0)
	8255	+ // assert(minfaceweight > 0);
	8256	+ //
	8257	+ // //FaceWeight(face);
	8258	+ // if(face.weight < 0)
	8259	+ // assert(face.weight >= 0);
	8260	+
	8261	+ face.weight += minfaceweight;
	8262	+
	8263	+ // if (face.weight >= 10000)
	8264	+ // assert(face.weight < 10000);
	8265	+ }
	8266	+ else
	8267	+ face.weight = -1;
	8268	+
	8269	+ face.nbiterations += 1;
	8270	+ face.boundary = -1;
	8271	+
	8272	+ Vertex p = (Vertex)vertices.get(face.p);
	8273	+ Vertex q = (Vertex)vertices.get(face.q);
	8274	+ Vertex r = (Vertex)vertices.get(face.r);
	8275	+
	8276	+ p.boundary = -1;
	8277	+ q.boundary = -1;
	8278	+ r.boundary = -1;
7965	8279	}
7966	8280	else
7967		- face.weight = -1;
7968		-
7969		- face.nbiterations += 1;
7970		- face.boundary = -1;
7971		-
7972		- Vertex p = (Vertex)vertices.get(face.p);
7973		- Vertex q = (Vertex)vertices.get(face.q);
7974		- Vertex r = (Vertex)vertices.get(face.r);
7975		-
7976		- p.boundary = -1;
7977		- q.boundary = -1;
7978		- r.boundary = -1;
	8281	+ assert(false);
7979	8282	}
7980		- else
7981		- assert(false);
7982	8283	}
7983		- }
7984	8284
7985	8285	// TouchVertex(minface.p);
7986	8286	// TouchVertex(minface.q);
..	..	@@ -8181,6 +8481,7 @@
8181	8481	for (int i=vertfaces.size(); --i>=0;)
8182	8482	{
8183	8483	Face face = (Face) vertfaces.get(i);
	8484	+ face.used = true;
8184	8485	face.good = 0; // false;
8185	8486	if (leafweights)
8186	8487	face.weight = -1;
..	..	@@ -8227,7 +8528,7 @@
8227	8528	if (!trimmed)
8228	8529	return;
8229	8530
8230		- GrafreeD.linkUV = false;
	8531	+ Grafreed.linkUV = false;
8231	8532
8232	8533	try
8233	8534	{
..	..	@@ -8459,7 +8760,8 @@
8459	8760	int[] startvertices;
8460	8761	float[] averagepoints;
8461	8762	float[] extremepoints;
8462		- float[] supportsizes; // distance of closest point
	8763	+ float[] supportminsize; // distance of closest point
	8764	+ float[] supportmaxsize; // distance of fartest point
8463	8765
8464	8766	transient Hashtable vertextable;
8465	8767	/transient/ private Vertex[] verticesCopy;