~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,7 +15,7 @@
15	15	{
16	16	this(0, 0);
17	17	}
18		-
	18	+
19	19	void SaveSupports()
20	20	{
21	21	transientsupport = support;
..	..	@@ -172,16 +172,16 @@
172	172	bufV = other.bufV;
173	173	bufF = other.bufF;
174	174
175		- positions = (float[]) GraphreeD.clone(other.positions);
176		- normals = (float[]) GraphreeD.clone(other.normals);
177		- colors = (float[]) GraphreeD.clone(other.colors);
178		- uvmap = (float[]) GraphreeD.clone(other.uvmap);
179		- triangles = (int[]) GraphreeD.clone(other.triangles);
	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);
180	180
181		- indices = (int[]) GraphreeD.clone(other.indices);
	181	+ indices = (int[]) GrafreeD.clone(other.indices);
182	182
183		- vertices = (Vector<Vertex>) GraphreeD.clone(other.vertices);
184		- faces = (Vector<Face>) GraphreeD.clone(other.faces);
	183	+ vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices);
	184	+ faces = (Vector<Face>) GrafreeD.clone(other.faces);
185	185	}
186	186	else
187	187	{
..	..	@@ -497,10 +497,10 @@
497	497	return dist2;
498	498	}
499	499
500		- static Vertex vertextemp = new Vertex();
501		- static Vertex vertextemp2 = new Vertex();
	500	+ static Vertex vertextemp = new Vertex(true);
	501	+ static Vertex vertextemp2 = new Vertex(true);
502	502
503		- static double SEUIL = 0.1; // 0.1 for rag doll; 0.07;
	503	+ static double SEUIL = 0.1f; // 0.1 for rag doll; 0.07;
504	504
505	505	// Compute weight of point w/r to this
506	506	float ComputeWeight(Vertex v, double[][] toRoot, int k)
..	..	@@ -570,8 +570,10 @@
570	570
571	571	if (dot > distmax)
572	572	dot = distmax;
	573	+ //return 0; // patch for strange behavior
573	574	if (dot < -distmax)
574	575	dot = -distmax;
	576	+ //return 0; // patch for strange behavior
575	577
576	578	// v3 = GetVertex(this.startvertices[subsupport] + 16);
577	579	//
..	..	@@ -609,10 +611,12 @@
609	611
610	612	float dist2 = (float)Distance2(v, v2, 1E10, toRoot, k);
611	613
612		- if (dist2 >= 2 * SEUIL*SEUIL) // && !CameraPane.CROWD) // weightmode
	614	+ double seuil = SEUIL * 2;
	615	+
	616	+ if (dist2 >= 2 * seuil*seuil) // && !CameraPane.CROWD) // weightmode
613	617	return 0;
614	618
615		- dist2 /= 2 * SEUIL*SEUIL; // multiplied by two because center of support
	619	+ dist2 /= 2 * seuil*seuil; // multiplied by two because center of support
616	620	// could be far from closest point
617	621
618	622	// dist2 = Math.pow(dist2, 2);
..	..	@@ -786,7 +790,7 @@
786	790	v.weights[k] = other.ComputeWeight(v, toRoot, k); // (float)(supportsize * normalweight * nz / Math.pow(txtx+tyty+tz*tz, 1));
787	791	v.totalweight += v.weights[k];
788	792
789		- if (CameraPane.CROWD)
	793	+ if (Globals.CROWD)
790	794	{
791	795	// System.out.print("weight = " + v.weights[k]);
792	796	// System.out.println("; totalweight = " + v.totalweight);
..	..	@@ -946,7 +950,7 @@
946	950
947	951	int nbsupports;
948	952
949		- SEUIL = 0.1; // aout 2013
	953	+ // sept 2017 SEUIL = 0.1; // aout 2013
950	954
951	955	supports = InitConnections(other);
952	956
..	..	@@ -982,7 +986,7 @@
982	986
983	987	int subsupports = 0;
984	988
985		- SEUIL = 0.1; // aout 2013
	989	+ // sept 2017 SEUIL = 0.1; // aout 2013
986	990
987	991	while (subsupports == 0)
988	992	{
..	..	@@ -1006,6 +1010,26 @@
1006	1010
1007	1011	vect.set(v);
1008	1012	vect.sub(vect2);
	1013	+
	1014	+// vertextemp.x = other.averagepoints[c*3];
	1015	+// vertextemp.y = other.averagepoints[c*3+1];
	1016	+// vertextemp.z = other.averagepoints[c*3+2];
	1017	+//
	1018	+// Vertex v3 = vertextemp2;
	1019	+// v3.x = other.extremepoints[c*3];
	1020	+// v3.y = other.extremepoints[c*3+1];
	1021	+// v3.z = other.extremepoints[c*3+2];
	1022	+//
	1023	+// vect3.set(v3); // "X" axis apex
	1024	+// vect3.sub(vertextemp); // origin (center)
	1025	+//
	1026	+// double distmax = vect3.length();
	1027	+//
	1028	+// vect3.set(v2); // "X" axis apex
	1029	+// vect3.sub(vertextemp); // origin (center)
	1030	+//
	1031	+// if (vect3.length() >= distmax)
	1032	+// continue;
1009	1033
1010	1034	if (mindistance > vect.dot(vect))
1011	1035	{
..	..	@@ -1017,7 +1041,9 @@
1017	1041
1018	1042	subsupports = v.closestsupport==-1 ? 0 : supports[v.closestsupport].Length();
1019	1043
1020		- SEUIL *= 2;
	1044	+ // previously for "contains", now for weights.
	1045	+ assert(subsupports > 0);
	1046	+ //SEUIL *= 2;
1021	1047	}
1022	1048
1023	1049	assert(subsupports > 0);
..	..	@@ -1492,7 +1518,7 @@
1492	1518	InitFaceIndices();
1493	1519	}
1494	1520
1495		- BoundaryRep rep = (BoundaryRep) GraphreeD.clone(this);
	1521	+ BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
1496	1522	//float[] v = new float[100];
1497	1523
1498	1524	for (int loops=1; --loops>=0;)
..	..	@@ -1522,7 +1548,7 @@
1522	1548	InitFaceIndices();
1523	1549	}
1524	1550
1525		- BoundaryRep rep = (BoundaryRep) GraphreeD.clone(this);
	1551	+ BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this);
1526	1552	//float[] v = new float[100];
1527	1553
1528	1554	for (int loops=10; --loops>=0;)
..	..	@@ -2163,7 +2189,7 @@
2163	2189	// if (slow)
2164	2190	// aout 2013
2165	2191	// sept 2013 merde...
2166		- W = 13;
	2192	+ W = 3; // 13;
2167	2193
2168	2194	// POSERATE
2169	2195	if (CameraPane.tickcount > 0 \|\| CameraPane.SLOWPOSE)
..	..	@@ -2600,7 +2626,7 @@
2600	2626	// if (stepout && !playedonce)
2601	2627	// {
2602	2628	// // sound
2603		-// GraphreeD.wav.play();
	2629	+// GrafreeD.wav.play();
2604	2630	// playedonce = true;
2605	2631	// }
2606	2632	//
..	..	@@ -2635,18 +2661,18 @@
2635	2661	if (false) // slow && stepout && onein)
2636	2662	{
2637	2663	// sound
2638		- cVector eye = CameraPane.theRenderer.eyeCamera.location;
	2664	+ cVector eye = Globals.theRenderer.EyeCamera().location;
2639	2665
2640	2666	Vertex v = GetVertex(0);
2641	2667
2642	2668	tmp.set(v);
2643	2669	tmp.sub(eye);
2644	2670
2645		- if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs
	2671	+ if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
2646	2672	{
2647		- GraphreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
	2673	+ GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
2648	2674
2649		- lastsoundtime = CameraPane.framecount;
	2675	+ lastsoundtime = Globals.framecount;
2650	2676	}
2651	2677
2652	2678	stepout = false;
..	..	@@ -3129,7 +3155,27 @@
3129	3155	*/
3130	3156	}
3131	3157
3132		- void GenUV()
	3158	+ void UnfoldUV()
	3159	+ {
	3160	+ for (int i = 0; i < VertexCount(); i++)
	3161	+ {
	3162	+ Vertex v = GetVertex(i);
	3163	+
	3164	+ v.x = v.s;
	3165	+ v.y = v.t;
	3166	+ v.z = 0;
	3167	+
	3168	+ v.norm.x = 0;
	3169	+ v.norm.y = 0;
	3170	+ v.norm.z = 1;
	3171	+
	3172	+ SetVertex(v, i);
	3173	+ }
	3174	+ }
	3175	+
	3176	+ float power = 2;
	3177	+
	3178	+ void GenUV() // float power)
3133	3179	{
3134	3180	Trim();
3135	3181
..	..	@@ -3193,6 +3239,115 @@
3193	3239	y -= 0.5;
3194	3240	z -= 0.5;
3195	3241
	3242	+ double ax = Math.abs(x);
	3243	+ double ay = Math.abs(y);
	3244	+ double max = ax;
	3245	+ if (max < ay)
	3246	+ {
	3247	+ max = ay;
	3248	+ }
	3249	+
	3250	+ x /= max;
	3251	+ y /= max;
	3252	+
	3253	+ double angle = Math.acos(Math.abs(z*2));
	3254	+
	3255	+ double k = angle / Math.PI * 2;
	3256	+
	3257	+ // k == 0 => uv = 0 (center)
	3258	+ // k == 1 => uv = -1,1 (border)
	3259	+
	3260	+ if (i == 0)
	3261	+ System.out.println("power = " + power);
	3262	+
	3263	+ double length1 = (ax+ay)/max;
	3264	+ double length2 = Math.sqrt(axax + ayay) / max;
	3265	+
	3266	+ double t = k;
	3267	+
	3268	+ t = Math.pow(t, 3);
	3269	+
	3270	+ // Interpolate between k/length2 (center) and k (border)
	3271	+ k = k / length2 * (1 - t) + k * t;
	3272	+
	3273	+ double u = k*x;
	3274	+ double v = k*y;
	3275	+
	3276	+ u /= 2;
	3277	+ v /= 2;
	3278	+ u += 0.5;
	3279	+ v += 0.5;
	3280	+
	3281	+ uvmap[i2] = (float) u;
	3282	+ uvmap[i2+1] = (float) v;
	3283	+ }
	3284	+ }
	3285	+
	3286	+ void GenUVold(float power)
	3287	+ {
	3288	+ Trim();
	3289	+
	3290	+ cVector boxcenter = null;
	3291	+ cVector minima, maxima;
	3292	+ minima = new cVector();
	3293	+ maxima = new cVector();
	3294	+ minima.x = minima.y = minima.z = Double.MAX_VALUE;
	3295	+ maxima.x = maxima.y = maxima.z = -Double.MAX_VALUE;
	3296	+ for (int i = 0; i < VertexCount(); i++)
	3297	+ {
	3298	+ Vertex v = GetVertex(i);
	3299	+
	3300	+ if (minima.x > v.x)
	3301	+ {
	3302	+ minima.x = v.x;
	3303	+ }
	3304	+ if (minima.y > v.y)
	3305	+ {
	3306	+ minima.y = v.y;
	3307	+ }
	3308	+ if (minima.z > v.z)
	3309	+ {
	3310	+ minima.z = v.z;
	3311	+ }
	3312	+
	3313	+ if (maxima.x < v.x)
	3314	+ {
	3315	+ maxima.x = v.x;
	3316	+ }
	3317	+ if (maxima.y < v.y)
	3318	+ {
	3319	+ maxima.y = v.y;
	3320	+ }
	3321	+ if (maxima.z < v.z)
	3322	+ {
	3323	+ maxima.z = v.z;
	3324	+ }
	3325	+ }
	3326	+
	3327	+ boxcenter = new cVector((maxima.x + minima.x) / 2, (maxima.y + minima.y) / 2, (maxima.z + minima.z) / 2);
	3328	+ int i2 = 0, i3 = 0;
	3329	+ for (int i = 0; i < positions.length/3; i++, i3 += 3, i2 += 2)
	3330	+ {
	3331	+// //uvmap[i2] = (float) normals[i3]*0.5f + 0.5f; // v.x;
	3332	+// //uvmap[i2 + 1] = (float) normals[i3+1]*0.5f + 0.5f; //z;
	3333	+// uvmap[i2] = (float) (positions[i3] - boxcenter.x);
	3334	+// uvmap[i2 + 1] = (float) (positions[i3+2] - boxcenter.z);
	3335	+// uvmap[i2] = (float) Math.atan2(positions[i3+1] - boxcenter.y, positions[i3] - boxcenter.x);
	3336	+// uvmap[i2 + 1] = (float)(positions[i3+2] - boxcenter.z);
	3337	+ // box UV
	3338	+ double x = positions[i3] - minima.x; // - Math.floor(positions[i3]);
	3339	+ double y = positions[i3+1] - minima.y; // - Math.floor(positions[i3+1]);
	3340	+ double z = positions[i3+2] - minima.z; // - Math.floor(positions[i3+2]);
	3341	+
	3342	+ // [-1/2, 1/2]
	3343	+ x /= maxima.x - minima.x;
	3344	+ y /= maxima.y - minima.y;
	3345	+ z /= maxima.z - minima.z;
	3346	+
	3347	+ x -= 0.5;
	3348	+ y -= 0.5;
	3349	+ z -= 0.5;
	3350	+
3196	3351	// x *= 2;
3197	3352	// y *= 2;
3198	3353	// z *= 2;
..	..	@@ -3219,6 +3374,15 @@
3219	3374
3220	3375	z = Math.cos(angle/2);
3221	3376
	3377	+ assert(z >= 0);
	3378	+ assert(z <= 1);
	3379	+
	3380	+ /**/
	3381	+ //z = Math.pow(z, power); //1.08f);
	3382	+
	3383	+ if (i == 0)
	3384	+ System.out.println("power = " + power);
	3385	+
3222	3386	// sqrt(k2x2 + k2z2 + y2) = length
3223	3387	// k2x2 + k2z2 = length2 - y2
3224	3388	// k2 = (length2 - y2) / (x2 + z2)
..	..	@@ -3229,7 +3393,7 @@
3229	3393	k /= xx + yy;
3230	3394	}
3231	3395	else
3232		- GraphreeD.Assert(z == 1);
	3396	+ GrafreeD.Assert(z == 1);
3233	3397
3234	3398	if (k < 0)
3235	3399	k = 0;
..	..	@@ -3238,6 +3402,7 @@
3238	3402
3239	3403	x *= k;
3240	3404	y *= k;
	3405	+ /**/
3241	3406
3242	3407	double max = Math.abs(x);
3243	3408	if (max < Math.abs(y))
..	..	@@ -3250,10 +3415,15 @@
3250	3415	}
3251	3416
3252	3417	// max = Math.sqrt(max*2)/2;
	3418	+// double x2 = Math.pow(Math.abs(x), 1/power);
	3419	+// double y2 = Math.pow(Math.abs(y), 1/power);
	3420	+// double z2 = Math.pow(Math.abs(z), 1/power);
	3421	+// max = Math.pow(x2 + y2 + z2, power);
3253	3422
3254	3423	// if (!(max > 0))
3255		- assert(max > 0);
3256		-
	3424	+ //assert(max > 0);
	3425	+ assert(max >= 0);
	3426	+
3257	3427	x /= max;
3258	3428	y /= max;
3259	3429	z /= max;
..	..	@@ -3531,7 +3701,7 @@
3531	3701	e.printStackTrace();
3532	3702	}
3533	3703
3534		- Trim(wastrim,true,crease,wasstrip,false);
	3704	+ Trim(true/wastrim/,true,crease,wasstrip,false);
3535	3705	}
3536	3706
3537	3707	void GenNormalsJME()
..	..	@@ -3776,10 +3946,19 @@
3776	3946	for (int i = 0; i < VertexCount(); i++)
3777	3947	{
3778	3948	Vertex v = GetVertex(i);
	3949	+
	3950	+ vertextemp.set(v);
	3951	+
3779	3952	//if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
3780	3953	{
3781		- GenerateNormal(i, v);
3782		- SetVertex(v, i);
	3954	+ if (!GenerateNormal(i, vertextemp))
	3955	+ continue;
	3956	+
	3957	+ if (v.norm.dot(vertextemp.norm) < 0)
	3958	+ vertextemp.norm.mul(-1);
	3959	+
	3960	+ if (v.norm.dot(vertextemp.norm) < 0.9)
	3961	+ SetVertex(vertextemp, i);
3783	3962	}
3784	3963	}
3785	3964
..	..	@@ -3790,7 +3969,7 @@
3790	3969	static cVector temp2 = new cVector();
3791	3970	static cVector temp3 = new cVector();
3792	3971
3793		- void GenerateNormal(int index, Vertex v)
	3972	+ boolean GenerateNormal(int index, Vertex v)
3794	3973	{
3795	3974	//System.out.println("Old normal = " + v.norm);
3796	3975	LA.setVector(v.norm, 0, 0, 0);
..	..	@@ -3819,6 +3998,10 @@
3819	3998	LA.vecSub(p/.pos/, v/.pos/, temp1);
3820	3999	LA.vecSub(q/.pos/, v/.pos/, temp2);
3821	4000	}
	4001	+ else
	4002	+ {
	4003	+ continue;
	4004	+ }
3822	4005
3823	4006	//LA.vecNormalize(temp1);
3824	4007	//LA.vecNormalize(temp2);
..	..	@@ -3829,17 +4012,25 @@
3829	4012	double s = temp3.length();
3830	4013	//double c = temp2.dot(temp1);
3831	4014
	4015	+ if (s == 0)
	4016	+ return false;
	4017	+
3832	4018	float angle = 1; // (float) Math.atan2(s, c);
3833	4019	//if(angle < 0) angle = -angle;
3834	4020
3835	4021	//LA.vecNormalize(temp3);
3836	4022	LA.vecScale(temp3, angle / s);
3837	4023
	4024	+// if (temp3.dot(v.norm) < 0)
	4025	+// assert(temp3.dot(v.norm) >= 0);
	4026	+
3838	4027	LA.vecAdd(temp3, v.norm, v.norm);
3839	4028	}
3840	4029
3841	4030	LA.vecNormalize(v.norm);
3842	4031	//System.out.println("New normal = " + v.norm);
	4032	+
	4033	+ return true;
3843	4034	}
3844	4035
3845	4036	double Arccos(double x)
..	..	@@ -4233,7 +4424,7 @@
4233	4424	int count = VertexCount();
4234	4425
4235	4426	// mars 2014
4236		- while (step >= count)
	4427	+ while (step > count)
4237	4428	step /= 10;
4238	4429
4239	4430	for (int i = 0; i < count; i+=step)
..	..	@@ -4381,7 +4572,7 @@
4381	4572	}
4382	4573	}
4383	4574
4384		- void CullVertex(javax.media.opengl.GL gl, boolean shadow)
	4575	+ void CullVertex(javax.media.opengl.GL glNOTUSED, boolean shadowNOTUSED)
4385	4576	{
4386	4577	CameraPane.glu.gluProject(vect5.x,vect5.y,vect5.z,
4387	4578	CameraPane.tempmat,0, CameraPane.tempmat2,0,
..	..	@@ -4413,14 +4604,14 @@
4413	4604	// june 2014
4414	4605	// Camera parentcam = cam;
4415	4606	//
4416		-// if (cam == CameraPane.theRenderer.cameras[0])
	4607	+// if (cam == Globals.theRenderer.cameras[0])
4417	4608	// {
4418		-// parentcam = CameraPane.theRenderer.cameras[1];
	4609	+// parentcam = Globals.theRenderer.cameras[1];
4419	4610	// }
4420	4611	//
4421		-// if (cam == CameraPane.theRenderer.cameras[1])
	4612	+// if (cam == Globals.theRenderer.cameras[1])
4422	4613	// {
4423		-// parentcam = CameraPane.theRenderer.cameras[0];
	4614	+// parentcam = Globals.theRenderer.cameras[0];
4424	4615	// }
4425	4616
4426	4617	gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, CameraPane.tempmat, 0);
..	..	@@ -4846,7 +5037,7 @@
4846	5037	return verticesCopy;
4847	5038	}
4848	5039
4849		- void PreprocessOcclusion(CameraPane cp, double[][] transform)
	5040	+ void PreprocessOcclusion(iCameraPane cp, double[][] transform)
4850	5041	{
4851	5042	if (//!trimmed \|\|
4852	5043	AOdone)
..	..	@@ -4855,80 +5046,7 @@
4855	5046	return;
4856	5047	}
4857	5048
4858		- Camera keep = cp.renderCamera;
4859		- cp.renderCamera = localcamera;
4860		-
4861		- if (trimmed)
4862		- {
4863		- float[] colors = new float[positions.length / 3];
4864		-
4865		- int i3 = 0;
4866		- for (int i = 0; i < positions.length / 3; i++, i3 += 3)
4867		- {
4868		- if (normals[i3] == 0 && normals[i3+1] == 0 && normals[i3+2] == 0)
4869		- continue;
4870		-
4871		- from.set(positions[i3], positions[i3 + 1], positions[i3 + 2]);
4872		- to.set(positions[i3] + normals[i3],
4873		- positions[i3 + 1] + normals[i3 + 1],
4874		- positions[i3 + 2] + normals[i3 + 2]);
4875		- LA.xformPos(from, transform, from);
4876		- LA.xformPos(to, transform, to); // RIGID ONLY
4877		- localcamera.setAim(from, to);
4878		-
4879		- CameraPane.occlusionbuffer.display();
4880		-
4881		- if (CameraPane.DEBUG_OCCLUSION)
4882		- cp.display(); // debug
4883		-
4884		- colors[i] = cp.vertexOcclusion.r;
4885		- //colors[i3 + 1] = cp.vertexOcclusion.g;
4886		- //colors[i3 + 2] = cp.vertexOcclusion.b;
4887		-
4888		- if ((i % 1000) == 0 && i != 0)
4889		- {
4890		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
4891		- //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
4892		- System.out.println((int) (100.0 * i / (positions.length / 3)) + "% (" + i + " of " + (positions.length / 3) + ")");
4893		- }
4894		- }
4895		-
4896		- this.colors = colors;
4897		- }
4898		- else
4899		- {
4900		- for (int i = 0; i < VertexCount(); i++)
4901		- {
4902		- Vertex v = GetVertex(i);
4903		-
4904		- if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
4905		- continue;
4906		-
4907		- from.set(v.x, v.y, v.z);
4908		- to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
4909		- LA.xformPos(from, transform, from);
4910		- LA.xformPos(to, transform, to); // RIGID ONLY
4911		- localcamera.setAim(from, to);
4912		-
4913		- CameraPane.occlusionbuffer.display();
4914		-
4915		- if (CameraPane.DEBUG_OCCLUSION)
4916		- cp.display(); // debug
4917		-
4918		- v.AO = cp.vertexOcclusion.r;
4919		-
4920		- if ((i % 1000) == 0 && i != 0)
4921		- {
4922		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
4923		- //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
4924		- System.out.println((int) (100.0 * i / VertexCount()) + "% (" + i + " of " + VertexCount() + ")");
4925		- }
4926		- }
4927		- }
4928		-
4929		- System.out.println("done.");
4930		-
4931		- cp.renderCamera = keep;
	5049	+ cp.PrepOcclusion(this, transform);
4932	5050
4933	5051	AOdone = true;
4934	5052	}
..	..	@@ -5036,6 +5154,59 @@
5036	5154	}
5037	5155	}
5038	5156	colors = null;
	5157	+ }
	5158	+
	5159	+ void CreateMesh(iHeightField hf, int x, int y)
	5160	+ {
	5161	+ BoundaryRep tmp = new BoundaryRep();
	5162	+
	5163	+ int vc = 0;
	5164	+
	5165	+ Vertex v = new Vertex(true);
	5166	+
	5167	+ for (int i=0; i<x; i++)
	5168	+ {
	5169	+ for (int j=0; j<y; j++)
	5170	+ {
	5171	+// Vertex v = tmp.GetVertex(vc++);
	5172	+
	5173	+ v.s = v.x = i;
	5174	+ v.t = v.z = j;
	5175	+ v.s /= x; v.t /= y;
	5176	+ v.y = hf.f(i,j);
	5177	+
	5178	+ int iu = tmp.AddTableVertex(v);
	5179	+
	5180	+ v.s = v.x = i+1;
	5181	+ v.t = v.z = j;
	5182	+ v.s /= x; v.t /= y;
	5183	+ v.y = hf.f(i+1,j);
	5184	+
	5185	+ int iv = tmp.AddTableVertex(v);
	5186	+
	5187	+ v.s = v.x = i+1;
	5188	+ v.t = v.z = j+1;
	5189	+ v.s /= x; v.t /= y;
	5190	+ v.y = hf.f(i+1,j+1);
	5191	+
	5192	+ int iw = tmp.AddTableVertex(v);
	5193	+
	5194	+ v.s = v.x = i;
	5195	+ v.t = v.z = j+1;
	5196	+ v.s /= x; v.t /= y;
	5197	+ v.y = hf.f(i,j+1);
	5198	+
	5199	+ int ix = tmp.AddTableVertex(v);
	5200	+
	5201	+ tmp.AddFace(iu,iw,iv);
	5202	+ tmp.AddFace(iu,ix,iw);
	5203	+ }
	5204	+ }
	5205	+
	5206	+ Set(tmp);
	5207	+
	5208	+ Trim(true,false,true);
	5209	+ ClearColors();
5039	5210	}
5040	5211
5041	5212	void Stripify()
..	..	@@ -5297,18 +5468,10 @@
5297	5468	double minweight = 1E10;
5298	5469
5299	5470	nbbadfaces = 0;
5300		- for (int i=faces.size(); (i-=8)>=0;)
	5471	+ for (int i=0; i<faces.size(); i+=8)
	5472	+// for (int i=faces.size(); (i-=8)>=0;)
5301	5473	{
5302	5474	Face face = (Face) faces.get(i);
5303		-
5304		- //?? if (face.weight < 0)
5305		- // continue;
5306		-
5307		- double K = 1; // 0.01; // .25;
5308		-
5309		- double factor = (1-K)face.nbiterations + K; //face.weight;
5310		-
5311		- double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
5312	5475
5313	5476	if (!Valid(face))
5314	5477	{
..	..	@@ -5327,10 +5490,21 @@
5327	5490	!ValidValence(face.r))
5328	5491	continue;
5329	5492
	5493	+ //?? if (face.weight < 0)
	5494	+ // continue;
	5495	+
	5496	+ double K = 1; // 0.01; // .25;
	5497	+
	5498	+ double factor = (1-K)face.nbiterations + K; //face.weight;
	5499	+
	5500	+ double weight = FaceWeight(face); // Math.pow(PerimeterMax(face),0.25)factor;
	5501	+
5330	5502	if (minweight > weight)
5331	5503	{
5332	5504	minweight = weight;
5333	5505	chosen = i;
	5506	+ if (minweight == 0)
	5507	+ break;
5334	5508	}
5335	5509	}
5336	5510
..	..	@@ -7019,6 +7193,7 @@
7019	7193	assert(f2.contains(i));
7020	7194	assert(f3.contains(i));
7021	7195
	7196	+ // when r is the "center", p is along the boundary
7022	7197	while (f0.r != i)
7023	7198	{
7024	7199	int t = f0.p;
..	..	@@ -7075,59 +7250,90 @@
7075	7250	f0 = f3;
7076	7251	f3 = t;
7077	7252	}
7078		- atleastone = true;
7079	7253
	7254	+ int va = f0.q;
	7255	+ int vb = f0.r;
	7256	+ int vc = -1;
	7257	+
	7258	+ Face toremove1 = null;
	7259	+ Face toremove2 = null;
	7260	+
	7261	+ // f0 is the buffer for the first new triangle,
	7262	+ // and otherf is the other upper one.
7080	7263	Face otherf = null;
7081	7264
7082	7265	if (f1.contains(f0.p))
7083	7266	{
7084	7267	if (f1.p == f0.p)
7085	7268	{
	7269	+ assert(false);
7086	7270	f0.r = f1.q;
7087	7271	}
7088	7272	else
7089	7273	{
7090	7274	assert(f1.q == f0.p);
7091		- f0.r = f1.p;
	7275	+ vc = f1.p;
7092	7276	}
7093	7277
7094	7278	otherf = f2;
7095		- faces.remove(f1);
7096		- faces.remove(f3);
	7279	+ toremove1 = f1;
	7280	+ toremove2 = f3;
7097	7281	}
7098	7282	else
7099	7283	if (f2.contains(f0.p))
7100	7284	{
7101	7285	if (f2.p == f0.p)
7102	7286	{
	7287	+ assert(false);
7103	7288	f0.r = f2.q;
7104	7289	}
7105	7290	else
7106	7291	{
7107	7292	assert(f2.q == f0.p);
7108		- f0.r = f2.p;
	7293	+ vc = f2.p;
7109	7294	}
7110	7295
7111	7296	otherf = f3;
7112		- faces.remove(f1);
7113		- faces.remove(f2);
	7297	+ toremove1 = f1;
	7298	+ toremove2 = f2;
7114	7299	}
7115	7300	if (f3.contains(f0.p))
7116	7301	{
7117	7302	if (f3.p == f0.p)
7118	7303	{
	7304	+// assert(false);
	7305	+ new Exception().printStackTrace();
7119	7306	f0.r = f3.q;
7120	7307	}
7121	7308	else
7122	7309	{
7123	7310	assert(f3.q == f0.p);
7124		- f0.r = f3.p;
	7311	+ vc = f3.p;
7125	7312	}
7126	7313
7127	7314	otherf = f1;
7128		- faces.remove(f2);
7129		- faces.remove(f3);
	7315	+ toremove1 = f2;
	7316	+ toremove2 = f3;
7130	7317	}
	7318	+
	7319	+ vertextemp.set(vertices.get(va));
	7320	+ vertextemp.sub(vertices.get(vb));
	7321	+ vertextemp.normalize();
	7322	+ vertextemp2.set(vertices.get(vc));
	7323	+ vertextemp2.sub(vertices.get(vb));
	7324	+ vertextemp2.normalize();
	7325	+
	7326	+ if (vertextemp.dot(vertextemp2) > -0.95)
	7327	+ {
	7328	+ continue;
	7329	+ }
	7330	+
	7331	+ atleastone = true;
	7332	+
	7333	+ f0.r = vc;
	7334	+
	7335	+ faces.remove(toremove1);
	7336	+ faces.remove(toremove2);
7131	7337
7132	7338	if (!f0.contains(otherf.p))
7133	7339	{
..	..	@@ -7335,7 +7541,7 @@
7335	7541	Trim();
7336	7542	Untrim();
7337	7543
7338		- BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GraphreeD.clone(this);
	7544	+ BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GrafreeD.clone(this);
7339	7545
7340	7546	double minx = Float.POSITIVE_INFINITY;
7341	7547	double maxx = Float.NEGATIVE_INFINITY;
..	..	@@ -7373,7 +7579,7 @@
7373	7579	if (max < maxz - minz)
7374	7580	max = maxz - minz;
7375	7581
7376		- tmp.THRESHOLD = max/25; // 50;
	7582	+ tmp.THRESHOLD = 0.5; // max/25; // 50;
7377	7583
7378	7584	tmp.faces.clear();
7379	7585
..	..	@@ -7498,7 +7704,7 @@
7498	7704	s3 = new cVector();
7499	7705	}
7500	7706
7501		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	7707	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7502	7708
7503	7709	try
7504	7710	{
..	..	@@ -7593,7 +7799,7 @@
7593	7799	{
7594	7800	if (i++%100 == 0)
7595	7801	{
7596		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	7802	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
7597	7803	System.out.println("#faces = " + faces.size());
7598	7804	// if (i != 1)
7599	7805	// break;
..	..	@@ -7637,7 +7843,7 @@
7637	7843	//Trim(true,cJME.gennormals,true,false); // doesn't work
7638	7844	Trim(true,false,false,false,false);
7639	7845
7640		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	7846	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
7641	7847	}
7642	7848
7643	7849	void UpdateIndices(Face face, Face minface)
..	..	@@ -7932,6 +8138,8 @@
7932	8138
7933	8139	minface.q = minface.r = minface.p;
7934	8140
	8141	+ int count = 0;
	8142	+
7935	8143	for (int i=0; i<faces.size(); i++)
7936	8144	{
7937	8145	Face face = (Face) faces.get(i);
..	..	@@ -7943,6 +8151,9 @@
7943	8151	TouchVertex(face.r, true); // , minface.weight);
7944	8152	// assert(!lock);
7945	8153	faces.remove(i--);
	8154	+ count++;
	8155	+ if (count == 4)
	8156	+ break;
7946	8157	}
7947	8158	}
7948	8159
..	..	@@ -8006,7 +8217,7 @@
8006	8217	if (!trimmed)
8007	8218	return;
8008	8219
8009		- GraphreeD.linkUV = false;
	8220	+ GrafreeD.linkUV = false;
8010	8221
8011	8222	try
8012	8223	{
..	..	@@ -8214,9 +8425,6 @@
8214	8425	return "trim = " + trimmed + "; stripped = " + stripified + "; colors = " + colors + "; faces = " + (faces!=null?faces.size():null) + "; triangles = " + (triangles!=null?triangles.length:null) + "; indices = " + indices;
8215	8426	}
8216	8427
8217		- static Camera localcamera = new Camera();
8218		- static cVector from = new cVector();
8219		- static cVector to = new cVector();
8220	8428	boolean trimmed = false;
8221	8429	boolean stripified = false;
8222	8430	transient boolean AOdone = false;
..	..	@@ -8224,8 +8432,10 @@
8224	8432	/transient/ int maxIndexV = 0;
8225	8433	/transient/ int bufV, bufF;
8226	8434	// Raw version
8227		- private float[] positions;
8228		- private float[] normals;
	8435	+ //private
	8436	+ float[] positions;
	8437	+ //private
	8438	+ float[] normals;
8229	8439	float[] colors;
8230	8440	private float[] uvmap;
8231	8441	private int[] triangles;