From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 24 Aug 2011 15:39:10 +0000 (+0000)
Subject: Switch to higher resolution elevation dataset
X-Git-Tag: v0.5.1~5
X-Git-Url: http://pileus.org/git/?p=grits;a=commitdiff_plain;h=283805f378281e8d3fd0cda01c1dd70f79d21243

Switch to higher resolution elevation dataset

- Tweak perspective so we can zoom in farther
- Use less preference for edge faces for better shading
---

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index b1316fc..9c3af08 100644
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -140,7 +140,7 @@ static gboolean on_configure(GritsOpenGL *opengl, GdkEventConfigure *event, gpoi
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	double ang = atan(height/FOV_DIST);
-	gluPerspective(rad2deg(ang)*2, width/height, 1000, 10*EARTH_R);
+	gluPerspective(rad2deg(ang)*2, width/height, 10, 100*EARTH_R);
 
 #ifndef ROAM_DEBUG
 	g_mutex_lock(opengl->sphere_lock);
diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 57813ab..078fb91 100644
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -32,7 +32,7 @@
 
 #include "elev.h"
 
-#define MAX_RESOLUTION 500
+#define MAX_RESOLUTION 50
 #define TILE_WIDTH     1024
 #define TILE_HEIGHT    512
 #define TILE_SIZE      (TILE_WIDTH*TILE_HEIGHT*sizeof(guint16))
@@ -327,7 +327,7 @@ static void grits_plugin_elev_init(GritsPluginElev *elev)
 	elev->mutex = g_mutex_new();
 	elev->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
 	elev->wms   = grits_wms_new(
-		"http://www.nasa.network.com/elev", "srtm30", "application/bil",
+		"http://www.nasa.network.com/elev", "mergedSrtm", "application/bil",
 		"srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
 }
 static void grits_plugin_elev_dispose(GObject *gobject)
diff --git a/src/roam.c b/src/roam.c
index 6ac1a1e..d8bff62 100644
--- a/src/roam.c
+++ b/src/roam.c
@@ -376,7 +376,7 @@ void roam_triangle_update_errors(RoamTriangle *triangle, RoamSphere *sphere)
 		if (roam_triangle_backface(triangle->t.l, sphere) ||
 		    roam_triangle_backface(triangle->t.b, sphere) ||
 		    roam_triangle_backface(triangle->t.r, sphere))
-			triangle->error *= 500;
+			triangle->error *= 50;
 	}
 }
 
@@ -760,6 +760,7 @@ void roam_sphere_merge_one(RoamSphere *sphere)
 gint roam_sphere_split_merge(RoamSphere *sphere)
 {
 	gint iters = 0, max_iters = 500;
+	//gint target = 20000;
 	//gint target = 4000;
 	gint target = 2000;
 	//gint target = 500;