X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fterrain.cc;h=ff54f4603b6336af5b611f48a27f4443d7346858;hp=92dce567c51eaa41640475577d3da023f08e574a;hb=fd601d4218b63fdf92c5e4dfa32eac8adbda82fa;hpb=47982b199010496e34eefb95044275fb231cba18

diff --git a/src/terrain.cc b/src/terrain.cc
index 92dce56..ff54f46 100644
--- a/src/terrain.cc
+++ b/src/terrain.cc
@@ -98,13 +98,14 @@ static float calc_height(float u, float v, void *ptr)
 	GenData *data = (GenData*)ptr;
 	const TerrainParams *tp = data->tp;
 
-	// float ufreq = tp->noise_freq / tp->xtiles;
-	// float vfreq = tp->noise_freq / tp->ytiles;
-
 	u = u / tp->xtiles + data->xoffs;
 	v = v / tp->ytiles + data->yoffs;
 
 	float sn = gph::fbm(u * tp->noise_freq, v * tp->noise_freq, tp->num_octaves);
-	/* todo use the image later */
+
+	if(tp->coarse_heightmap) {
+		Vec4 texel = tp->coarse_heightmap->lookup_nearest(u, v);
+		sn *= texel.x;
+	}
 	return sn;
 }
\ No newline at end of file