~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,9 @@
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: a bit faster but dangerous
	2001	+ if (v.weights != null && v.weights[j] == 0)
	2002	+ // < 0.001 * v.totalweight)
1970	2003	{
1971	2004	//testweight += v.weights[j-1];
1972	2005	continue;
..	..	@@ -2247,6 +2280,8 @@
2247	2280
2248	2281	transient int lastsoundtime;
2249	2282
	2283	+ transient boolean once = false;
	2284	+
2250	2285	void setMasterThis0(BoundaryRep other, double[][] toRoot, boolean smooth, boolean marked)
2251	2286	{
2252	2287	if (LA.isIdentity(toRoot))
..	..	@@ -2302,7 +2337,11 @@
2302	2337
2303	2338	if (v.totalweight == 0)
2304	2339	{
2305		- System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2340	+ if (!once)
	2341	+ {
	2342	+ System.err.println("v.totalweight == 0! --> " + this + " : " + other);
	2343	+ once = true;
	2344	+ }
2306	2345	continue;
2307	2346	}
2308	2347
..	..	@@ -2661,7 +2700,7 @@
2661	2700	if (false) // slow && stepout && onein)
2662	2701	{
2663	2702	// sound
2664		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	2703	+ cVector eye = Globals.theRenderer.EyeCamera().location;
2665	2704
2666	2705	Vertex v = GetVertex(0);
2667	2706
..	..	@@ -2670,7 +2709,7 @@
2670	2709
2671	2710	if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2672	2711	{
2673		- GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2712	+ Grafreed.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2674	2713
2675	2714	lastsoundtime = Globals.framecount;
2676	2715	}
..	..	@@ -3098,6 +3137,7 @@
3098	3137	//
3099	3138	// transient VertexCompare[] vertexcompare = null;
3100	3139
	3140	+ // Check if v0 is close enough from any vertex of the given subobject of this.
3101	3141	boolean Contains(Vertex v0, int object)
3102	3142	{
3103	3143	int start = startvertices[object-1];
..	..	@@ -3155,7 +3195,27 @@
3155	3195	*/
3156	3196	}
3157	3197
3158		- void GenUV()
	3198	+ void UnfoldUV()
	3199	+ {
	3200	+ for (int i = 0; i < VertexCount(); i++)
	3201	+ {
	3202	+ Vertex v = GetVertex(i);
	3203	+
	3204	+ v.x = v.s;
	3205	+ v.y = v.t;
	3206	+ v.z = 0;
	3207	+
	3208	+ v.norm.x = 0;
	3209	+ v.norm.y = 0;
	3210	+ v.norm.z = 1;
	3211	+
	3212	+ SetVertex(v, i);
	3213	+ }
	3214	+ }
	3215	+
	3216	+ float power = 2;
	3217	+
	3218	+ void GenUV() // float power)
3159	3219	{
3160	3220	Trim();
3161	3221
..	..	@@ -3219,6 +3279,125 @@
3219	3279	y -= 0.5;
3220	3280	z -= 0.5;
3221	3281
	3282	+ double ax = Math.abs(x);
	3283	+ double ay = Math.abs(y);
	3284	+ double max = ax;
	3285	+ if (max < ay)
	3286	+ {
	3287	+ max = ay;
	3288	+ }
	3289	+
	3290	+ if (max == 0)
	3291	+ {
	3292	+ uvmap[i2] = 0.5f;
	3293	+ uvmap[i2+1] = 0.5f;
	3294	+ continue;
	3295	+ }
	3296	+
	3297	+ x /= max;
	3298	+ y /= max;
	3299	+
	3300	+ double angle = Math.acos(Math.abs(z*2));
	3301	+
	3302	+ double k = angle / Math.PI * 2;
	3303	+
	3304	+ assert(k >= 0);
	3305	+
	3306	+ // k == 0 => uv = 0 (center)
	3307	+ // k == 1 => uv = -1,1 (border)
	3308	+
	3309	+ if (i == 0)
	3310	+ System.out.println("power = " + power);
	3311	+
	3312	+ double length1 = (ax+ay)/max;
	3313	+ double length2 = Math.sqrt(axax + ayay) / max;
	3314	+
	3315	+ double t = k;
	3316	+
	3317	+ t = Math.pow(t, 3);
	3318	+
	3319	+ // Interpolate between k/length2 (center) and k (border)
	3320	+ if (length2 > 0)
	3321	+ k *= (1 - t) / length2 + t;
	3322	+
	3323	+ double u = k*x;
	3324	+ double v = k*y;
	3325	+
	3326	+ u /= 2;
	3327	+ v /= 2;
	3328	+ u += 0.5;
	3329	+ v += 0.5;
	3330	+
	3331	+ uvmap[i2] = (float) u;
	3332	+ uvmap[i2+1] = (float) v;
	3333	+ }
	3334	+ }
	3335	+
	3336	+ void GenUVold(float power)
	3337	+ {
	3338	+ Trim();
	3339	+
	3340	+ cVector boxcenter = null;
	3341	+ cVector minima, maxima;
	3342	+ minima = new cVector();
	3343	+ maxima = new cVector();
	3344	+ minima.x = minima.y = minima.z = Double.MAX_VALUE;
	3345	+ maxima.x = maxima.y = maxima.z = -Double.MAX_VALUE;
	3346	+ for (int i = 0; i < VertexCount(); i++)
	3347	+ {
	3348	+ Vertex v = GetVertex(i);
	3349	+
	3350	+ if (minima.x > v.x)
	3351	+ {
	3352	+ minima.x = v.x;
	3353	+ }
	3354	+ if (minima.y > v.y)
	3355	+ {
	3356	+ minima.y = v.y;
	3357	+ }
	3358	+ if (minima.z > v.z)
	3359	+ {
	3360	+ minima.z = v.z;
	3361	+ }
	3362	+
	3363	+ if (maxima.x < v.x)
	3364	+ {
	3365	+ maxima.x = v.x;
	3366	+ }
	3367	+ if (maxima.y < v.y)
	3368	+ {
	3369	+ maxima.y = v.y;
	3370	+ }
	3371	+ if (maxima.z < v.z)
	3372	+ {
	3373	+ maxima.z = v.z;
	3374	+ }
	3375	+ }
	3376	+
	3377	+ boxcenter = new cVector((maxima.x + minima.x) / 2, (maxima.y + minima.y) / 2, (maxima.z + minima.z) / 2);
	3378	+ int i2 = 0, i3 = 0;
	3379	+ for (int i = 0; i < positions.length/3; i++, i3 += 3, i2 += 2)
	3380	+ {
	3381	+// //uvmap[i2] = (float) normals[i3]*0.5f + 0.5f; // v.x;
	3382	+// //uvmap[i2 + 1] = (float) normals[i3+1]*0.5f + 0.5f; //z;
	3383	+// uvmap[i2] = (float) (positions[i3] - boxcenter.x);
	3384	+// uvmap[i2 + 1] = (float) (positions[i3+2] - boxcenter.z);
	3385	+// uvmap[i2] = (float) Math.atan2(positions[i3+1] - boxcenter.y, positions[i3] - boxcenter.x);
	3386	+// uvmap[i2 + 1] = (float)(positions[i3+2] - boxcenter.z);
	3387	+ // box UV
	3388	+ double x = positions[i3] - minima.x; // - Math.floor(positions[i3]);
	3389	+ double y = positions[i3+1] - minima.y; // - Math.floor(positions[i3+1]);
	3390	+ double z = positions[i3+2] - minima.z; // - Math.floor(positions[i3+2]);
	3391	+
	3392	+ // [-1/2, 1/2]
	3393	+ x /= maxima.x - minima.x;
	3394	+ y /= maxima.y - minima.y;
	3395	+ z /= maxima.z - minima.z;
	3396	+
	3397	+ x -= 0.5;
	3398	+ y -= 0.5;
	3399	+ z -= 0.5;
	3400	+
3222	3401	// x *= 2;
3223	3402	// y *= 2;
3224	3403	// z *= 2;
..	..	@@ -3245,6 +3424,15 @@
3245	3424
3246	3425	z = Math.cos(angle/2);
3247	3426
	3427	+ assert(z >= 0);
	3428	+ assert(z <= 1);
	3429	+
	3430	+ /**/
	3431	+ //z = Math.pow(z, power); //1.08f);
	3432	+
	3433	+ if (i == 0)
	3434	+ System.out.println("power = " + power);
	3435	+
3248	3436	// sqrt(k2x2 + k2z2 + y2) = length
3249	3437	// k2x2 + k2z2 = length2 - y2
3250	3438	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3255,7 +3443,7 @@
3255	3443	k /= xx + yy;
3256	3444	}
3257	3445	else
3258		- GrafreeD.Assert(z == 1);
	3446	+ Grafreed.Assert(z == 1);
3259	3447
3260	3448	if (k < 0)
3261	3449	k = 0;
..	..	@@ -3264,6 +3452,7 @@
3264	3452
3265	3453	x *= k;
3266	3454	y *= k;
	3455	+ /**/
3267	3456
3268	3457	double max = Math.abs(x);
3269	3458	if (max < Math.abs(y))
..	..	@@ -3276,10 +3465,15 @@
3276	3465	}
3277	3466
3278	3467	// max = Math.sqrt(max*2)/2;
	3468	+// double x2 = Math.pow(Math.abs(x), 1/power);
	3469	+// double y2 = Math.pow(Math.abs(y), 1/power);
	3470	+// double z2 = Math.pow(Math.abs(z), 1/power);
	3471	+// max = Math.pow(x2 + y2 + z2, power);
3279	3472
3280	3473	// if (!(max > 0))
3281		- assert(max > 0);
3282		-
	3474	+ //assert(max > 0);
	3475	+ assert(max >= 0);
	3476	+
3283	3477	x /= max;
3284	3478	y /= max;
3285	3479	z /= max;
..	..	@@ -3542,6 +3736,111 @@
3542	3736	*/
3543	3737	}
3544	3738
	3739	+ void GenerateNormals2(boolean crease)
	3740	+ {
	3741	+ cVector tempVector = new cVector();
	3742	+
	3743	+// java.util.HashMap<cVector, cVector> tableBase = new java.util.HashMap<cVector, cVector>();
	3744	+//
	3745	+//
	3746	+// for (int i=0; i<this.VertexCount(); i++)
	3747	+// {
	3748	+// Vertex v = this.GetVertex(i);
	3749	+//
	3750	+// tempVector.set(v);
	3751	+//
	3752	+// cVector n = tableBase.get(tempVector.ToFloat());
	3753	+//
	3754	+// if (n != null)
	3755	+// {
	3756	+// continue;
	3757	+// }
	3758	+//
	3759	+// tableBase.put(new cVector(tempVector), new cVector(v.norm));
	3760	+// }
	3761	+
	3762	+ BoundaryRep tempSupport = this.support;
	3763	+
	3764	+ this.support = null;
	3765	+
	3766	+ BoundaryRep tempRep = (BoundaryRep)Grafreed.clone(this);
	3767	+
	3768	+ this.support = tempSupport;
	3769	+
	3770	+ //tempRep.Unstripify();
	3771	+
	3772	+ tempRep.GenerateNormals2(crease);
	3773	+
	3774	+ boolean keepnormal = Vertex.normalmode;
	3775	+ boolean epsequal = Grafreed.epsequal;
	3776	+
	3777	+ Vertex.normalmode = false;
	3778	+ Grafreed.epsequal = false; // A bit strange
	3779	+
	3780	+ // No need to have a match for vertex counts.
	3781	+
	3782	+ java.util.HashMap<cVector, cVector> table = new java.util.HashMap<cVector, cVector>();
	3783	+
	3784	+ for (int i=0; i<tempRep.VertexCount(); i++)
	3785	+ {
	3786	+ Vertex v = tempRep.GetVertex(i);
	3787	+
	3788	+ cVector n = table.get(tempVector.ToFloat());
	3789	+
	3790	+ if (v.norm.x == 1 && v.norm.y == 0 && v.norm.z == 0)
	3791	+ {
	3792	+ //continue;
	3793	+ }
	3794	+
	3795	+ tempVector.set(v);
	3796	+
	3797	+ //cVector nBase = tableBase.get(tempVector);
	3798	+
	3799	+ //if (v.norm.dot(nBase) < 0.9)
	3800	+ //{
	3801	+ // continue;
	3802	+ //}
	3803	+
	3804	+ if (n != null && n.x == 1 && n.y == 0 && n.z == 0)
	3805	+ {
	3806	+ //continue;
	3807	+ }
	3808	+
	3809	+ if (n != null)
	3810	+ {
	3811	+// if (n.dot(v.norm) < 0)
	3812	+// n.sub(v.norm);
	3813	+// else
	3814	+// n.add(v.norm);
	3815	+//
	3816	+// n.normalize();
	3817	+ continue;
	3818	+ }
	3819	+
	3820	+ table.put(new cVector(tempVector), new cVector(v.norm));
	3821	+ }
	3822	+
	3823	+ for (int i=0; i<this.VertexCount(); i++)
	3824	+ {
	3825	+ Vertex v = this.GetVertex(i);
	3826	+
	3827	+ tempVector.set(v);
	3828	+
	3829	+ cVector n = table.get(tempVector.ToFloat());
	3830	+
	3831	+ //if (n.dot(v.norm) < 0)
	3832	+ if (n == null)
	3833	+ continue;
	3834	+
	3835	+ LA.vecCopy(n, v.norm);
	3836	+
	3837	+ this.SetVertex(v, i);
	3838	+ }
	3839	+
	3840	+ Grafreed.epsequal = epsequal;
	3841	+ Vertex.normalmode = keepnormal;
	3842	+ }
	3843	+
3545	3844	void GenerateNormals(boolean crease)
3546	3845	{
3547	3846	boolean wastrim = trimmed;
..	..	@@ -3558,6 +3857,28 @@
3558	3857	}
3559	3858
3560	3859	Trim(true/wastrim/,true,crease,wasstrip,false);
	3860	+ }
	3861	+
	3862	+ void GenerateNormalsMesh()
	3863	+ {
	3864	+ if (stripified)
	3865	+ {
	3866	+ Unstripify();
	3867	+ }
	3868	+
	3869	+ if (trimmed)
	3870	+ {
	3871	+ normals = null;
	3872	+ }
	3873	+ else
	3874	+ {
	3875	+ for (int i=VertexCount(); --i>=0;)
	3876	+ {
	3877	+ Vertex v = GetVertex(i);
	3878	+
	3879	+ v.norm = null;
	3880	+ }
	3881	+ }
3561	3882	}
3562	3883
3563	3884	void GenNormalsJME()
..	..	@@ -3682,7 +4003,7 @@
3682	4003	NormalGenerator ng;
3683	4004
3684	4005	if (crease)
3685		- ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
	4006	+ ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3686	4007	else
3687	4008	ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3688	4009
..	..	@@ -3715,6 +4036,10 @@
3715	4036	{
3716	4037	triangles[i] = i;
3717	4038	}
	4039	+
	4040	+// Untrim();
	4041	+ if (!trimmed)
	4042	+ MergeNormals();
3718	4043	}
3719	4044	}
3720	4045
..	..	@@ -3748,6 +4073,11 @@
3748	4073	tsa.getNormals(0, normals);
3749	4074	tsa.getTextureCoordinates(0, 0, uvmap);
3750	4075	// tsa.getColors(0, colors);
	4076	+
	4077	+ for (int i=colors.length; --i>=0;)
	4078	+ {
	4079	+ colors[i] = 1;
	4080	+ }
3751	4081
3752	4082	int stripcount = tsa.getNumStrips();
3753	4083	triangles = new int[stripcount];
..	..	@@ -3770,6 +4100,10 @@
3770	4100	triangles = new int[1];
3771	4101	triangles[0] = 3;
3772	4102	}
	4103	+
	4104	+ //Untrim();
	4105	+ if (!trimmed)
	4106	+ MergeNormals();
3773	4107	}
3774	4108
3775	4109	/*
..	..	@@ -3819,6 +4153,42 @@
3819	4153	}
3820	4154
3821	4155	Vertex.normalmode = false;
	4156	+ }
	4157	+
	4158	+ void MergeNormals()
	4159	+ {
	4160	+ assert(!trimmed);
	4161	+
	4162	+ boolean smooth = Grafreed.smoothmode;
	4163	+ boolean link = Grafreed.linkUV;
	4164	+ Grafreed.smoothmode = true;
	4165	+ Grafreed.linkUV = true;
	4166	+
	4167	+ System.out.println("#Vertex = " + VertexCount());
	4168	+ System.out.println("#Face = " + FaceCount());
	4169	+
	4170	+ java.util.HashSet<Vertex> table = new java.util.HashSet<Vertex>();
	4171	+
	4172	+ for (int i = 0; i < VertexCount(); i++)
	4173	+ {
	4174	+ Vertex v = GetVertex(i);
	4175	+
	4176	+ if (!table.contains(v))
	4177	+ {
	4178	+ table.add(v);
	4179	+ }
	4180	+ }
	4181	+
	4182	+ Grafreed.smoothmode = smooth;
	4183	+ Grafreed.linkUV = link;
	4184	+
	4185	+// for (int i = 0; i < VertexCount(); i++)
	4186	+// {
	4187	+// Vertex v = GetVertex(i);
	4188	+//
	4189	+// table.add(v);
	4190	+// }
	4191	+
3822	4192	}
3823	4193
3824	4194	static cVector temp1 = new cVector();
..	..	@@ -4428,7 +4798,7 @@
4428	4798	}
4429	4799	}
4430	4800
4431		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4801	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4432	4802	{
4433	4803	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4434	4804	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4460,14 +4830,14 @@
4460	4830	// june 2014
4461	4831	// Camera parentcam = cam;
4462	4832	//
4463		-// if (cam == CameraPane.theRenderer.cameras[0])
	4833	+// if (cam == Globals.theRenderer.cameras[0])
4464	4834	// {
4465		-// parentcam = CameraPane.theRenderer.cameras[1];
	4835	+// parentcam = Globals.theRenderer.cameras[1];
4466	4836	// }
4467	4837	//
4468		-// if (cam == CameraPane.theRenderer.cameras[1])
	4838	+// if (cam == Globals.theRenderer.cameras[1])
4469	4839	// {
4470		-// parentcam = CameraPane.theRenderer.cameras[0];
	4840	+// parentcam = Globals.theRenderer.cameras[0];
4471	4841	// }
4472	4842
4473	4843	gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..	..	@@ -4593,16 +4963,25 @@
4593	4963	{
4594	4964	i3 = positions.length-3;
4595	4965	i2 = uvmap.length - 2;
4596		- new Exception().printStackTrace();
	4966	+ //new Exception().printStackTrace();
4597	4967	}
4598	4968
4599	4969	v./pos./x = positions[i3];
4600	4970	v./pos./y = positions[i3 + 1];
4601	4971	v./pos./z = positions[i3 + 2];
4602	4972
4603		- v.norm.x = normals[i3];
4604		- v.norm.y = normals[i3 + 1];
4605		- v.norm.z = normals[i3 + 2];
	4973	+ if (normals == null)
	4974	+ {
	4975	+ v.norm.x = 0;
	4976	+ v.norm.y = 0;
	4977	+ v.norm.z = 0;
	4978	+ }
	4979	+ else
	4980	+ {
	4981	+ v.norm.x = normals[i3];
	4982	+ v.norm.y = normals[i3 + 1];
	4983	+ v.norm.z = normals[i3 + 2];
	4984	+ }
4606	4985
4607	4986	v.s = uvmap[i2];
4608	4987	v.t = uvmap[i2 + 1];
..	..	@@ -5317,17 +5696,27 @@
5317	5696
5318	5697	transient int nbbadfaces; // ?? = 1000000;
5319	5698
5320		- int ChooseTriangle()
	5699	+ /*
	5700	+ */
	5701	+ int ChooseTriangle(boolean firstEquilateral)
5321	5702	{
5322	5703	int chosen = -1;
5323	5704
5324	5705	double minweight = 1E10;
5325	5706
	5707	+ int step = 8; // ?
	5708	+
	5709	+ if (firstEquilateral)
	5710	+ step = 1;
	5711	+
5326	5712	nbbadfaces = 0;
5327		- for (int i=0; i<faces.size(); i+=8)
	5713	+ for (int i=0; i<faces.size(); i+=step)
5328	5714	// for (int i=faces.size(); (i-=8)>=0;)
5329	5715	{
5330	5716	Face face = (Face) faces.get(i);
	5717	+
	5718	+ if (face.used)
	5719	+ continue;
5331	5720
5332	5721	if (!Valid(face))
5333	5722	{
..	..	@@ -5337,6 +5726,15 @@
5337	5726
5338	5727	if (Boundary(face))
5339	5728	continue;
	5729	+
	5730	+// if (Boundary(face.p))
	5731	+// continue;
	5732	+//
	5733	+// if (Boundary(face.q))
	5734	+// continue;
	5735	+//
	5736	+// if (Boundary(face.r))
	5737	+// continue;
5340	5738
5341	5739	if (!ValidValence(face))
5342	5740	continue;
..	..	@@ -5349,22 +5747,55 @@
5349	5747	//?? if (face.weight < 0)
5350	5748	// continue;
5351	5749
5352		- double K = 1; // 0.01; // .25;
5353		-
5354		- double factor = (1-K)face.nbiterations + K; //face.weight;
5355		-
5356		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5357		-
5358		- if (minweight > weight)
	5750	+ if (firstEquilateral)
5359	5751	{
5360		- minweight = weight;
	5752	+ if (OneFaceUsed(links.get(face.p)))
	5753	+ continue;
	5754	+
	5755	+ if (OneFaceUsed(links.get(face.q)))
	5756	+ continue;
	5757	+
	5758	+ if (OneFaceUsed(links.get(face.r)))
	5759	+ continue;
	5760	+
5361	5761	chosen = i;
5362		- if (minweight == 0)
5363		- break;
	5762	+ break;
	5763	+ }
	5764	+ else
	5765	+ {
	5766	+ double K = 1; // 0.01; // .25;
	5767	+
	5768	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5769	+
	5770	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5771	+
	5772	+ if (minweight > weight)
	5773	+ {
	5774	+ minweight = weight;
	5775	+ chosen = i;
	5776	+ if (minweight == 0)
	5777	+ break;
	5778	+ }
5364	5779	}
5365	5780	}
5366	5781
5367	5782	return chosen;
	5783	+ }
	5784	+
	5785	+ private boolean OneFaceUsed(Vector<Face> faces)
	5786	+ {
	5787	+ if (faces.size() != 6)
	5788	+ return true;
	5789	+
	5790	+ for (int i=0; i<6; i+=1)
	5791	+ {
	5792	+ if (faces.get(i).used)
	5793	+ {
	5794	+ return true;
	5795	+ }
	5796	+ }
	5797	+
	5798	+ return false;
5368	5799	}
5369	5800
5370	5801	static boolean remove3valence = true;
..	..	@@ -5400,7 +5831,7 @@
5400	5831	}
5401	5832	else
5402	5833	{
5403		- assert(links.size() == vertices.size());
	5834	+ // TODO Grafreed.Assert(links.size() == vertices.size());
5404	5835
5405	5836	links.setSize(vertices.size());
5406	5837	for (int i=vertices.size(); --i>=0;)
..	..	@@ -5408,6 +5839,7 @@
5408	5839	// linkstouched[i] = false;
5409	5840	if (links.get(i) == null) // ??
5410	5841	{
	5842	+ new Exception().printStackTrace();
5411	5843	links.set(i, new Vector(8));
5412	5844	// linkstouched[i] = true;
5413	5845	}
..	..	@@ -5418,6 +5850,8 @@
5418	5850	}
5419	5851	}
5420	5852
	5853	+ boolean once = false;
	5854	+
5421	5855	for (int i=faces.size(); --i>=0;)
5422	5856	{
5423	5857	Face face = (Face) faces.get(i);
..	..	@@ -5429,6 +5863,9 @@
5429	5863	//if (linkstouched[face.r])
5430	5864	links.get(face.r).add(face);
5431	5865
	5866	+ if (face.used)
	5867	+ once = true;
	5868	+
5432	5869	face.good = 1;
5433	5870	face.boundary = -1;
5434	5871	}
..	..	@@ -6200,6 +6637,7 @@
6200	6637
6201	6638	void InitWeights()
6202	6639	{
	6640	+ new Exception().printStackTrace();
6203	6641	System.exit(0);
6204	6642	int n = 0;
6205	6643	int b = 0;
..	..	@@ -6793,6 +7231,10 @@
6793	7231	return (face.boundary = 1) == 1;
6794	7232	}
6795	7233
	7234	+ // June 2019
	7235	+ if (true)
	7236	+ return (face.boundary = 0) == 1;
	7237	+
6796	7238	// reverse triangle test
6797	7239	q1.set(p);
6798	7240	q2.set(q);
..	..	@@ -7242,7 +7684,7 @@
7242	7684	//InitWeights();
7243	7685	}
7244	7686
7245		- int chosen = ChooseTriangle(); // Best is slow and not really better
	7687	+ int chosen = ChooseTriangle(true); // Best is slow and not really better
7246	7688
7247	7689	if (chosen == -1)
7248	7690	{
..	..	@@ -7256,7 +7698,7 @@
7256	7698	//remove3valence = false;
7257	7699	// InitWeights();
7258	7700
7259		- chosen = ChooseTriangle();
	7701	+ chosen = ChooseTriangle(true);
7260	7702	}
7261	7703	}
7262	7704
..	..	@@ -7532,7 +7974,7 @@
7532	7974
7533	7975	// boolean lock;
7534	7976
7535		- void SplitInTwo(boolean reduction34, boolean onlyone)
	7977	+ boolean SplitInTwo(boolean reduction34, boolean onlyone)
7536	7978	{
7537	7979	if (stripified)
7538	7980	{
..	..	@@ -7560,7 +8002,7 @@
7560	8002	s3 = new cVector();
7561	8003	}
7562	8004
7563		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8005	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7564	8006
7565	8007	try
7566	8008	{
..	..	@@ -7569,12 +8011,12 @@
7569	8011	{
7570	8012	System.err.println("EXCEPTION CAUGHT");
7571	8013	e.printStackTrace();
7572		- return;
	8014	+ return false;
7573	8015	} catch (Error e)
7574	8016	{
7575	8017	System.err.println("ERROR CAUGHT");
7576	8018	e.printStackTrace();
7577		- return;
	8019	+ return false;
7578	8020	}
7579	8021
7580	8022	System.out.println("# faces = " + faces.size());
..	..	@@ -7584,6 +8026,7 @@
7584	8026	{
7585	8027	Face face = (Face) faces.get(i);
7586	8028
	8029	+ face.used = false;
7587	8030	face.nbiterations = 1;
7588	8031	face.weight = -1;
7589	8032	face.boundary = -1;
..	..	@@ -7635,6 +8078,11 @@
7635	8078	nbbadfaces = faces.size();
7636	8079	//remove3valence = true;
7637	8080
	8081	+ int count = 2;
	8082	+
	8083	+ if (onlyone)
	8084	+ count = 1;
	8085	+
7638	8086	firstpass = true;
7639	8087
7640	8088	int n = faces.size();
..	..	@@ -7650,12 +8098,13 @@
7650	8098	System.out.print('.');
7651	8099	}
7652	8100	System.out.println();
	8101	+ boolean atleastone = false;
7653	8102	int i = 0;
7654		- while (reduction34 \|\| faces.size() > n/2)
	8103	+ while (true) // reduction34 \|\| faces.size() > n/2)
7655	8104	{
7656	8105	if (i++%100 == 0)
7657	8106	{
7658		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	8107	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7659	8108	System.out.println("#faces = " + faces.size());
7660	8109	// if (i != 1)
7661	8110	// break;
..	..	@@ -7673,6 +8122,8 @@
7673	8122	{
7674	8123	if (!RemoveOneTriangle())
7675	8124	break;
	8125	+
	8126	+ atleastone = true;
7676	8127	}
7677	8128	// if (iterationcount == 0)
7678	8129	// break;
..	..	@@ -7683,8 +8134,8 @@
7683	8134	break;
7684	8135	}
7685	8136	firstpass = false;
7686		- if (onlyone)
7687		- break; // one triangle only
	8137	+// if (--count<0 && !reduction34)
	8138	+// break; // one triangle only
7688	8139	}
7689	8140
7690	8141	InitLinks(false); // for further display
..	..	@@ -7699,7 +8150,9 @@
7699	8150	//Trim(true,cJME.gennormals,true,false); // doesn't work
7700	8151	Trim(true,false,false,false,false);
7701	8152
7702		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8153	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	8154	+
	8155	+ return atleastone;
7703	8156	}
7704	8157
7705	8158	void UpdateIndices(Face face, Face minface)
..	..	@@ -7712,18 +8165,21 @@
7712	8165	face.p = minface.p;
7713	8166	//if (leafweights)
7714	8167	face.good = 0; // false;
	8168	+ face.used = true;
7715	8169	}
7716	8170	if (face.q == minface.p \|\| face.q == minface.q \|\| face.q == minface.r)
7717	8171	{
7718	8172	face.q = minface.p;
7719	8173	//if (leafweights)
7720	8174	face.good = 0; // false;
	8175	+ face.used = true;
7721	8176	}
7722	8177	if (face.r == minface.p \|\| face.r == minface.q \|\| face.r == minface.r)
7723	8178	{
7724	8179	face.r = minface.p;
7725	8180	//if (leafweights)
7726	8181	face.good = 0; // false;
	8182	+ face.used = true;
7727	8183	}
7728	8184
7729	8185	if (face.p >/=/ minface.q && face.p < minface.r)
..	..	@@ -7783,50 +8239,50 @@
7783	8239	if (v == 2)
7784	8240	vert = minface.r;
7785	8241	// Face face = (Face) faces.get(i);
7786		- Vector<Face> vertfaces = links.get(vert);
7787		- for (int i=vertfaces.size(); --i>=0;)
7788		- {
7789		- Face face = (Face) vertfaces.get(i);
7790		-
7791		- // if (face.weight == 10000)
7792		- // continue;
7793		-
7794		- if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
7795		- face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
7796		- face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
	8242	+ Vector<Face> vertfaces = links.get(vert);
	8243	+ for (int i=vertfaces.size(); --i>=0;)
7797	8244	{
7798		- if (!leafweights)
	8245	+ Face face = (Face) vertfaces.get(i);
	8246	+
	8247	+ // if (face.weight == 10000)
	8248	+ // continue;
	8249	+
	8250	+ if (face.p == minface.p \|\| face.q == minface.p \|\| face.r == minface.p \|\|
	8251	+ face.p == minface.q \|\| face.q == minface.q \|\| face.r == minface.q \|\|
	8252	+ face.p == minface.r \|\| face.q == minface.r \|\| face.r == minface.r)
7799	8253	{
7800		-// if(minfaceweight <= 0)
7801		-// assert(minfaceweight > 0);
7802		-//
7803		-// //FaceWeight(face);
7804		-// if(face.weight < 0)
7805		-// assert(face.weight >= 0);
7806		-
7807		- face.weight += minfaceweight;
7808		-
7809		-// if (face.weight >= 10000)
7810		-// assert(face.weight < 10000);
	8254	+ if (!leafweights)
	8255	+ {
	8256	+ // if(minfaceweight <= 0)
	8257	+ // assert(minfaceweight > 0);
	8258	+ //
	8259	+ // //FaceWeight(face);
	8260	+ // if(face.weight < 0)
	8261	+ // assert(face.weight >= 0);
	8262	+
	8263	+ face.weight += minfaceweight;
	8264	+
	8265	+ // if (face.weight >= 10000)
	8266	+ // assert(face.weight < 10000);
	8267	+ }
	8268	+ else
	8269	+ face.weight = -1;
	8270	+
	8271	+ face.nbiterations += 1;
	8272	+ face.boundary = -1;
	8273	+
	8274	+ Vertex p = (Vertex)vertices.get(face.p);
	8275	+ Vertex q = (Vertex)vertices.get(face.q);
	8276	+ Vertex r = (Vertex)vertices.get(face.r);
	8277	+
	8278	+ p.boundary = -1;
	8279	+ q.boundary = -1;
	8280	+ r.boundary = -1;
7811	8281	}
7812	8282	else
7813		- face.weight = -1;
7814		-
7815		- face.nbiterations += 1;
7816		- face.boundary = -1;
7817		-
7818		- Vertex p = (Vertex)vertices.get(face.p);
7819		- Vertex q = (Vertex)vertices.get(face.q);
7820		- Vertex r = (Vertex)vertices.get(face.r);
7821		-
7822		- p.boundary = -1;
7823		- q.boundary = -1;
7824		- r.boundary = -1;
	8283	+ assert(false);
7825	8284	}
7826		- else
7827		- assert(false);
7828	8285	}
7829		- }
7830	8286
7831	8287	// TouchVertex(minface.p);
7832	8288	// TouchVertex(minface.q);
..	..	@@ -8027,6 +8483,7 @@
8027	8483	for (int i=vertfaces.size(); --i>=0;)
8028	8484	{
8029	8485	Face face = (Face) vertfaces.get(i);
	8486	+ face.used = true;
8030	8487	face.good = 0; // false;
8031	8488	if (leafweights)
8032	8489	face.weight = -1;
..	..	@@ -8073,7 +8530,7 @@
8073	8530	if (!trimmed)
8074	8531	return;
8075	8532
8076		- GrafreeD.linkUV = false;
	8533	+ Grafreed.linkUV = false;
8077	8534
8078	8535	try
8079	8536	{
..	..	@@ -8305,7 +8762,8 @@
8305	8762	int[] startvertices;
8306	8763	float[] averagepoints;
8307	8764	float[] extremepoints;
8308		- float[] supportsizes; // distance of closest point
	8765	+ float[] supportminsize; // distance of closest point
	8766	+ float[] supportmaxsize; // distance of fartest point
8309	8767
8310	8768	transient Hashtable vertextable;
8311	8769	/transient/ private Vertex[] verticesCopy;