~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,8 @@
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] == 0) // < 0.001 * v.totalweight)
1970	2002	{
1971	2003	//testweight += v.weights[j-1];
1972	2004	continue;
..	..	@@ -2247,6 +2279,8 @@
2247	2279
2248	2280	transient int lastsoundtime;
2249	2281
	2282	+ transient boolean once = false;
	2283	+
2250	2284	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2251	2285	{
2252	2286	if (LA.isIdentity(toRoot))
..	..	@@ -2302,7 +2336,11 @@
2302	2336
2303	2337	if (v.totalweight == 0)
2304	2338	{
2305		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2339	+ if (!once)
	2340	+ {
	2341	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2342	+ once = true;
	2343	+ }
2306	2344	continue;
2307	2345	}
2308	2346
..	..	@@ -2670,7 +2708,7 @@
2670	2708
2671	2709	if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672	2710	{
2673		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2711	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2674	2712
2675	2713	lastsoundtime = Globals.framecount;
2676	2714	}
..	..	@@ -3098,6 +3136,7 @@
3098	3136	//
3099	3137	// transient VertexCompare[] vertexcompare = null;
3100	3138
	3139	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3101	3140	boolean Contains(Vertex v0, int object)
3102	3141	{
3103	3142	int start = startvertices[object-1];
..	..	@@ -3403,7 +3442,7 @@
3403	3442	k /= xx + yy;
3404	3443	}
3405	3444	else
3406		- GrafreeD.Assert(z == 1);
	3445	+ Grafreed.Assert(z == 1);
3407	3446
3408	3447	if (k < 0)
3409	3448	k = 0;
..	..	@@ -3696,6 +3735,111 @@
3696	3735	*/
3697	3736	}
3698	3737
	3738	+ void GenerateNormals2(boolean crease)
	3739	+ {
	3740	+ cVector tempVector = new cVector();
	3741	+
	3742	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3743	+//
	3744	+//
	3745	+// for (int i=0; i<this.VertexCount(); i++)
	3746	+// {
	3747	+// Vertex v = this.GetVertex(i);
	3748	+//
	3749	+// tempVector.set(v);
	3750	+//
	3751	+// cVector n = tableBase.get(tempVector.ToFloat());
	3752	+//
	3753	+// if (n != null)
	3754	+// {
	3755	+// continue;
	3756	+// }
	3757	+//
	3758	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3759	+// }
	3760	+
	3761	+ BoundaryRep tempSupport = this.support;
	3762	+
	3763	+ this.support = null;
	3764	+
	3765	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3766	+
	3767	+ this.support = tempSupport;
	3768	+
	3769	+ //tempRep.Unstripify();
	3770	+
	3771	+ tempRep.GenerateNormals2(crease);
	3772	+
	3773	+ boolean keepnormal = Vertex.normalmode;
	3774	+ boolean epsequal = Grafreed.epsequal;
	3775	+
	3776	+ Vertex.normalmode = false;
	3777	+ Grafreed.epsequal = false; // A bit strange
	3778	+
	3779	+ // No need to have a match for vertex counts.
	3780	+
	3781	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3782	+
	3783	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3784	+ {
	3785	+ Vertex v = tempRep.GetVertex(i);
	3786	+
	3787	+ cVector n = table.get(tempVector.ToFloat());
	3788	+
	3789	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3790	+ {
	3791	+ //continue;
	3792	+ }
	3793	+
	3794	+ tempVector.set(v);
	3795	+
	3796	+ //cVector nBase = tableBase.get(tempVector);
	3797	+
	3798	+ //if (v.norm.dot(nBase) < 0.9)
	3799	+ //{
	3800	+ // continue;
	3801	+ //}
	3802	+
	3803	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3804	+ {
	3805	+ //continue;
	3806	+ }
	3807	+
	3808	+ if (n != null)
	3809	+ {
	3810	+// if (n.dot(v.norm) < 0)
	3811	+// n.sub(v.norm);
	3812	+// else
	3813	+// n.add(v.norm);
	3814	+//
	3815	+// n.normalize();
	3816	+ continue;
	3817	+ }
	3818	+
	3819	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3820	+ }
	3821	+
	3822	+ for (int i=0; i<this.VertexCount(); i++)
	3823	+ {
	3824	+ Vertex v = this.GetVertex(i);
	3825	+
	3826	+ tempVector.set(v);
	3827	+
	3828	+ cVector n = table.get(tempVector.ToFloat());
	3829	+
	3830	+ //if (n.dot(v.norm) < 0)
	3831	+ if (n == null)
	3832	+ continue;
	3833	+
	3834	+ LA.vecCopy(n, v.norm);
	3835	+
	3836	+ this.SetVertex(v, i);
	3837	+ }
	3838	+
	3839	+ Grafreed.epsequal = epsequal;
	3840	+ Vertex.normalmode = keepnormal;
	3841	+ }
	3842	+
3699	3843	void GenerateNormals(boolean crease)
3700	3844	{
3701	3845	boolean wastrim = trimmed;
..	..	@@ -3712,6 +3856,28 @@
3712	3856	}
3713	3857
3714	3858	Trim(true/wastrim/,true,crease,wasstrip,false);
	3859	+ }
	3860	+
	3861	+ void GenerateNormalsMesh()
	3862	+ {
	3863	+ if (stripified)
	3864	+ {
	3865	+ Unstripify();
	3866	+ }
	3867	+
	3868	+ if (trimmed)
	3869	+ {
	3870	+ normals = null;
	3871	+ }
	3872	+ else
	3873	+ {
	3874	+ for (int i=VertexCount(); --i>=0;)
	3875	+ {
	3876	+ Vertex v = GetVertex(i);
	3877	+
	3878	+ v.norm = null;
	3879	+ }
	3880	+ }
3715	3881	}
3716	3882
3717	3883	void GenNormalsJME()
..	..	@@ -3836,7 +4002,7 @@
3836	4002	NormalGenerator ng;
3837	4003
3838	4004	if (crease)
3839		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4005	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3840	4006	else
3841	4007	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3842	4008
..	..	@@ -3869,6 +4035,10 @@
3869	4035	{
3870	4036	triangles[i] = i;
3871	4037	}
	4038	+
	4039	+// Untrim();
	4040	+ if (!trimmed)
	4041	+ MergeNormals();
3872	4042	}
3873	4043	}
3874	4044
..	..	@@ -3929,6 +4099,10 @@
3929	4099	triangles = new int[1];
3930	4100	triangles[0] = 3;
3931	4101	}
	4102	+
	4103	+ //Untrim();
	4104	+ if (!trimmed)
	4105	+ MergeNormals();
3932	4106	}
3933	4107
3934	4108	/*
..	..	@@ -3978,6 +4152,42 @@
3978	4152	}
3979	4153
3980	4154	Vertex.normalmode = false;
	4155	+ }
	4156	+
	4157	+ void MergeNormals()
	4158	+ {
	4159	+ assert(!trimmed);
	4160	+
	4161	+ boolean smooth = Grafreed.smoothmode;
	4162	+ boolean link = Grafreed.linkUV;
	4163	+ Grafreed.smoothmode = true;
	4164	+ Grafreed.linkUV = true;
	4165	+
	4166	+ System.out.println("#Vertex = " + VertexCount());
	4167	+ System.out.println("#Face = " + FaceCount());
	4168	+
	4169	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4170	+
	4171	+ for (int i = 0; i < VertexCount(); i++)
	4172	+ {
	4173	+ Vertex v = GetVertex(i);
	4174	+
	4175	+ if (!table.contains(v))
	4176	+ {
	4177	+ table.add(v);
	4178	+ }
	4179	+ }
	4180	+
	4181	+ Grafreed.smoothmode = smooth;
	4182	+ Grafreed.linkUV = link;
	4183	+
	4184	+// for (int i = 0; i < VertexCount(); i++)
	4185	+// {
	4186	+// Vertex v = GetVertex(i);
	4187	+//
	4188	+// table.add(v);
	4189	+// }
	4190	+
3981	4191	}
3982	4192
3983	4193	static cVector temp1 = new cVector();
..	..	@@ -4752,16 +4962,25 @@
4752	4962	{
4753	4963	i3 = positions.length-3;
4754	4964	i2 = uvmap.length - 2;
4755		- new Exception().printStackTrace();
	4965	+ //new Exception().printStackTrace();
4756	4966	}
4757	4967
4758	4968	v./pos./x = positions[i3];
4759	4969	v./pos./y = positions[i3 + 1];
4760	4970	v./pos./z = positions[i3 + 2];
4761	4971
4762		- v.norm.x = normals[i3];
4763		- v.norm.y = normals[i3 + 1];
4764		- v.norm.z = normals[i3 + 2];
	4972	+ if (normals == null)
	4973	+ {
	4974	+ v.norm.x = 0;
	4975	+ v.norm.y = 0;
	4976	+ v.norm.z = 0;
	4977	+ }
	4978	+ else
	4979	+ {
	4980	+ v.norm.x = normals[i3];
	4981	+ v.norm.y = normals[i3 + 1];
	4982	+ v.norm.z = normals[i3 + 2];
	4983	+ }
4765	4984
4766	4985	v.s = uvmap[i2];
4767	4986	v.t = uvmap[i2 + 1];
..	..	@@ -5476,17 +5695,27 @@
5476	5695
5477	5696	transient int nbbadfaces; // ?? = 1000000;
5478	5697
5479		- int ChooseTriangle()
	5698	+ /*
	5699	+ */
	5700	+ int ChooseTriangle(boolean firstEquilateral)
5480	5701	{
5481	5702	int chosen = -1;
5482	5703
5483	5704	double minweight = 1E10;
5484	5705
	5706	+ int step = 8; // ?
	5707	+
	5708	+ if (firstEquilateral)
	5709	+ step = 1;
	5710	+
5485	5711	nbbadfaces = 0;
5486		- for (int i=0; i<faces.size(); i+=8)
	5712	+ for (int i=0; i<faces.size(); i+=step)
5487	5713	// for (int i=faces.size(); (i-=8)>=0;)
5488	5714	{
5489	5715	Face face = (Face) faces.get(i);
	5716	+
	5717	+ if (face.used)
	5718	+ continue;
5490	5719
5491	5720	if (!Valid(face))
5492	5721	{
..	..	@@ -5496,6 +5725,15 @@
5496	5725
5497	5726	if (Boundary(face))
5498	5727	continue;
	5728	+
	5729	+// if (Boundary(face.p))
	5730	+// continue;
	5731	+//
	5732	+// if (Boundary(face.q))
	5733	+// continue;
	5734	+//
	5735	+// if (Boundary(face.r))
	5736	+// continue;
5499	5737
5500	5738	if (!ValidValence(face))
5501	5739	continue;
..	..	@@ -5508,22 +5746,55 @@
5508	5746	//?? if (face.weight < 0)
5509	5747	// continue;
5510	5748
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)
	5749	+ if (firstEquilateral)
5518	5750	{
5519		- minweight = weight;
	5751	+ if (OneFaceUsed(links.get(face.p)))
	5752	+ continue;
	5753	+
	5754	+ if (OneFaceUsed(links.get(face.q)))
	5755	+ continue;
	5756	+
	5757	+ if (OneFaceUsed(links.get(face.r)))
	5758	+ continue;
	5759	+
5520	5760	chosen = i;
5521		- if (minweight == 0)
5522		- break;
	5761	+ break;
	5762	+ }
	5763	+ else
	5764	+ {
	5765	+ double K = 1; // 0.01; // .25;
	5766	+
	5767	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5768	+
	5769	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5770	+
	5771	+ if (minweight > weight)
	5772	+ {
	5773	+ minweight = weight;
	5774	+ chosen = i;
	5775	+ if (minweight == 0)
	5776	+ break;
	5777	+ }
5523	5778	}
5524	5779	}
5525	5780
5526	5781	return chosen;
	5782	+ }
	5783	+
	5784	+ private boolean OneFaceUsed(Vector<Face> faces)
	5785	+ {
	5786	+ if (faces.size() != 6)
	5787	+ return true;
	5788	+
	5789	+ for (int i=0; i<6; i+=1)
	5790	+ {
	5791	+ if (faces.get(i).used)
	5792	+ {
	5793	+ return true;
	5794	+ }
	5795	+ }
	5796	+
	5797	+ return false;
5527	5798	}
5528	5799
5529	5800	static boolean remove3valence = true;
..	..	@@ -5559,7 +5830,7 @@
5559	5830	}
5560	5831	else
5561	5832	{
5562		- assert(links.size() == vertices.size());
	5833	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5563	5834
5564	5835	links.setSize(vertices.size());
5565	5836	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5567,6 +5838,7 @@
5567	5838	// linkstouched[i] = false;
5568	5839	if (links.get(i) == null) // ??
5569	5840	{
	5841	+ new Exception().printStackTrace();
5570	5842	links.set(i, new Vector(8));
5571	5843	// linkstouched[i] = true;
5572	5844	}
..	..	@@ -5577,6 +5849,8 @@
5577	5849	}
5578	5850	}
5579	5851
	5852	+ boolean once = false;
	5853	+
5580	5854	for (int i=faces.size(); --i>=0;)
5581	5855	{
5582	5856	Face face = (Face) faces.get(i);
..	..	@@ -5588,6 +5862,9 @@
5588	5862	//if (linkstouched[face.r])
5589	5863	links.get(face.r).add(face);
5590	5864
	5865	+ if (face.used)
	5866	+ once = true;
	5867	+
5591	5868	face.good = 1;
5592	5869	face.boundary = -1;
5593	5870	}
..	..	@@ -6953,6 +7230,10 @@
6953	7230	return (face.boundary = 1) == 1;
6954	7231	}
6955	7232
	7233	+ // June 2019
	7234	+ if (true)
	7235	+ return (face.boundary = 0) == 1;
	7236	+
6956	7237	// reverse triangle test
6957	7238	q1.set(p);
6958	7239	q2.set(q);
..	..	@@ -7402,7 +7683,7 @@
7402	7683	//InitWeights();
7403	7684	}
7404	7685
7405		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7686	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7406	7687
7407	7688	if (chosen == -1)
7408	7689	{
..	..	@@ -7416,7 +7697,7 @@
7416	7697	//remove3valence = false;
7417	7698	// InitWeights();
7418	7699
7419		- chosen = ChooseTriangle();
	7700	+ chosen = ChooseTriangle(true);
7420	7701	}
7421	7702	}
7422	7703
..	..	@@ -7692,7 +7973,7 @@
7692	7973
7693	7974	// boolean lock;
7694	7975
7695		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7976	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7696	7977	{
7697	7978	if (stripified)
7698	7979	{
..	..	@@ -7729,12 +8010,12 @@
7729	8010	{
7730	8011	System.err.println("EXCEPTION CAUGHT");
7731	8012	e.printStackTrace();
7732		- return;
	8013	+ return false;
7733	8014	} catch (Error e)
7734	8015	{
7735	8016	System.err.println("ERROR CAUGHT");
7736	8017	e.printStackTrace();
7737		- return;
	8018	+ return false;
7738	8019	}
7739	8020
7740	8021	System.out.println("# faces = " + faces.size());
..	..	@@ -7744,6 +8025,7 @@
7744	8025	{
7745	8026	Face face = (Face) faces.get(i);
7746	8027
	8028	+ face.used = false;
7747	8029	face.nbiterations = 1;
7748	8030	face.weight = -1;
7749	8031	face.boundary = -1;
..	..	@@ -7795,6 +8077,11 @@
7795	8077	nbbadfaces = faces.size();
7796	8078	//remove3valence = true;
7797	8079
	8080	+ int count = 2;
	8081	+
	8082	+ if (onlyone)
	8083	+ count = 1;
	8084	+
7798	8085	firstpass = true;
7799	8086
7800	8087	int n = faces.size();
..	..	@@ -7810,8 +8097,9 @@
7810	8097	System.out.print('.');
7811	8098	}
7812	8099	System.out.println();
	8100	+ boolean atleastone = false;
7813	8101	int i = 0;
7814		- while (reduction34 \|\| faces.size() > n/2)
	8102	+ while (true) // reduction34 \|\| faces.size() > n/2)
7815	8103	{
7816	8104	if (i++%100 == 0)
7817	8105	{
..	..	@@ -7833,6 +8121,8 @@
7833	8121	{
7834	8122	if (!RemoveOneTriangle())
7835	8123	break;
	8124	+
	8125	+ atleastone = true;
7836	8126	}
7837	8127	// if (iterationcount == 0)
7838	8128	// break;
..	..	@@ -7843,8 +8133,8 @@
7843	8133	break;
7844	8134	}
7845	8135	firstpass = false;
7846		- if (onlyone)
7847		- break; // one triangle only
	8136	+// if (--count<0 && !reduction34)
	8137	+// break; // one triangle only
7848	8138	}
7849	8139
7850	8140	InitLinks(false); // for further display
..	..	@@ -7860,6 +8150,8 @@
7860	8150	Trim(true,false,false,false,false);
7861	8151
7862	8152	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8153	+
	8154	+ return atleastone;
7863	8155	}
7864	8156
7865	8157	void UpdateIndices(Face face, Face minface)
..	..	@@ -7872,18 +8164,21 @@
7872	8164	face.p = minface.p;
7873	8165	//if (leafweights)
7874	8166	face.good = 0; // false;
	8167	+ face.used = true;
7875	8168	}
7876	8169	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7877	8170	{
7878	8171	face.q = minface.p;
7879	8172	//if (leafweights)
7880	8173	face.good = 0; // false;
	8174	+ face.used = true;
7881	8175	}
7882	8176	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7883	8177	{
7884	8178	face.r = minface.p;
7885	8179	//if (leafweights)
7886	8180	face.good = 0; // false;
	8181	+ face.used = true;
7887	8182	}
7888	8183
7889	8184	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7943,50 +8238,50 @@
7943	8238	if (v == 2)
7944	8239	vert = minface.r;
7945	8240	// 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)
	8241	+ Vector<Face> vertfaces = links.get(vert);
	8242	+ for (int i=vertfaces.size(); --i>=0;)
7957	8243	{
7958		- if (!leafweights)
	8244	+ Face face = (Face) vertfaces.get(i);
	8245	+
	8246	+ // if (face.weight == 10000)
	8247	+ // continue;
	8248	+
	8249	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8250	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8251	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7959	8252	{
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);
	8253	+ if (!leafweights)
	8254	+ {
	8255	+ // if(minfaceweight <= 0)
	8256	+ // assert(minfaceweight > 0);
	8257	+ //
	8258	+ // //FaceWeight(face);
	8259	+ // if(face.weight < 0)
	8260	+ // assert(face.weight >= 0);
	8261	+
	8262	+ face.weight += minfaceweight;
	8263	+
	8264	+ // if (face.weight >= 10000)
	8265	+ // assert(face.weight < 10000);
	8266	+ }
	8267	+ else
	8268	+ face.weight = -1;
	8269	+
	8270	+ face.nbiterations += 1;
	8271	+ face.boundary = -1;
	8272	+
	8273	+ Vertex p = (Vertex)vertices.get(face.p);
	8274	+ Vertex q = (Vertex)vertices.get(face.q);
	8275	+ Vertex r = (Vertex)vertices.get(face.r);
	8276	+
	8277	+ p.boundary = -1;
	8278	+ q.boundary = -1;
	8279	+ r.boundary = -1;
7971	8280	}
7972	8281	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;
	8282	+ assert(false);
7985	8283	}
7986		- else
7987		- assert(false);
7988	8284	}
7989		- }
7990	8285
7991	8286	// TouchVertex(minface.p);
7992	8287	// TouchVertex(minface.q);
..	..	@@ -8187,6 +8482,7 @@
8187	8482	for (int i=vertfaces.size(); --i>=0;)
8188	8483	{
8189	8484	Face face = (Face) vertfaces.get(i);
	8485	+ face.used = true;
8190	8486	face.good = 0; // false;
8191	8487	if (leafweights)
8192	8488	face.weight = -1;
..	..	@@ -8233,7 +8529,7 @@
8233	8529	if (!trimmed)
8234	8530	return;
8235	8531
8236		- GrafreeD.linkUV = false;
	8532	+ Grafreed.linkUV = false;
8237	8533
8238	8534	try
8239	8535	{
..	..	@@ -8465,7 +8761,8 @@
8465	8761	int[] startvertices;
8466	8762	float[] averagepoints;
8467	8763	float[] extremepoints;
8468		- float[] supportsizes; // distance of closest point
	8764	+ float[] supportminsize; // distance of closest point
	8765	+ float[] supportmaxsize; // distance of fartest point
8469	8766
8470	8767	transient Hashtable vertextable;
8471	8768	/transient/ private Vertex[] verticesCopy;