X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fmeshgen.cc;h=ddcd5715cc5ba8a73d77e0da3f564e6b2ba0f9ff;hb=fd601d4218b63fdf92c5e4dfa32eac8adbda82fa;hp=9547ceecc392fe62f13ca9e6483b9d52f1dc9150;hpb=243eb502c5dc70e586a9e81815234069bf623480;p=demo

diff --git a/src/meshgen.cc b/src/meshgen.cc
index 9547cee..ddcd571 100644
--- a/src/meshgen.cc
+++ b/src/meshgen.cc
@@ -119,7 +119,7 @@ void gen_geosphere(Mesh *mesh, float rad, int subdiv, bool hemi)
 	for(int i=0; i<num_verts; i++) {
 		mesh->indices[i] = i;
 	}
-	mesh->update_vertex_data();
+	mesh->invalidate();
 }
 
 // ------ heightfield ------
@@ -129,7 +129,7 @@ static Vec3 hfield_vertex(float u, float v, float h, float xsz,
 {
 	float x = u * xsz - xsz / 2.0;
 	float y = h * height;
-	float z = -(v * ysz - ysz / 2.0);
+	float z = v * ysz - ysz / 2.0;
 
 	return Vec3(x, y, z);
 }
@@ -165,9 +165,9 @@ void gen_heightfield(Mesh *mesh, float xsz, float ysz, float height, int usub,
 	float dv = 1.0 / (float)num_vvertices;
 
 	for(int i=0; i<num_vvertices; i++) {
-		float v = (float)i / (float)num_vvertices;
+		float v = 1 - (float)i / (float)(num_vvertices - 1);
 		for(int j=0; j<num_uvertices; j++) {
-			float u = (float)j / (float)num_uvertices;
+			float u = (float)j / (float)(num_uvertices - 1);
 			Vec3 vtx = hfield_vertex(u, v, calc_height(u, v, ptr), xsz, ysz, height);
 
 			/* calculating normal with forward differences:
@@ -179,7 +179,7 @@ void gen_heightfield(Mesh *mesh, float xsz, float ysz, float height, int usub,
 			Vec3 bitangent = hfield_vertex(u, v + dv, calc_height(u, v + dv, ptr),
 					xsz, ysz, height) - vtx;
 
-			Vec3 normal = normalize(cross(tangent, bitangent));
+			Vec3 normal = normalize(cross(bitangent, tangent));
 
 			mesh->vertices[vidx] = vtx;
 			mesh->normals[vidx] = normal;
@@ -213,5 +213,5 @@ void gen_heightfield(Mesh *mesh, float xsz, float ysz, float height, int usub,
 			*iptr++ = a;
 		}
 	}
-	mesh->update_vertex_data();
+	mesh->invalidate();
 }