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 b1316fcd958870ef7ac1f4dd58df9c53fd67c8df..9c3af0886ada378819d812e9b0e910c904009ffe 100644 (file)
--- 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 57813abdb63980cd8a253279d4cdbdc70bd39c25..078fb9108738dd7a57be8dc85da838b1be0b1fa5 100644 (file)
--- 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 6ac1a1e8944f33484f80c349673e173f6d3a9a62..d8bff628b33f939151e1def1c2c1f069a76b17d9 100644 (file)
--- 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;