Improve Z-range in OpenGL

[grits] / src / gis-opengl.c

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 9f1940bdfdb5d33d177f5e81114546a81a3345fe..dc32fa8de4e4f188e77d19399ce0b7dd342a84e2 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -178,7 +178,9 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
                if (lat[2] == 90 || lat[2] == -90) xy[2][0] = 0.5;
 
                glEnable(GL_TEXTURE_2D);
+               glEnable(GL_POLYGON_OFFSET_FILL);
                glBindTexture(GL_TEXTURE_2D, *(guint*)tile->data);
+               glPolygonOffset(0, -tile->zindex);
                glBegin(GL_TRIANGLES);
                glNormal3dv(tri->p.r->norm); glTexCoord2dv(xy[0]); glVertex3dv((double*)tri->p.r);
                glNormal3dv(tri->p.m->norm); glTexCoord2dv(xy[1]); glVertex3dv((double*)tri->p.m);
@@ -373,7 +375,7 @@ static gboolean on_configure(GisOpenGL *opengl, GdkEventConfigure *event, gpoint
        glMatrixMode(GL_PROJECTION);
        glLoadIdentity();
        double ang = atan(height/FOV_DIST);
-       gluPerspective(rad2deg(ang)*2, width/height, 1, 10*EARTH_R);
+       gluPerspective(rad2deg(ang)*2, width/height, 1000, 10*EARTH_R);
 
 #ifndef ROAM_DEBUG
        g_mutex_lock(opengl->sphere_lock);
@@ -439,7 +441,9 @@ static gboolean on_expose(GisOpenGL *opengl, GdkEventExpose *event, gpointer _)
        roam_sphere_draw(opengl->sphere);
        //roam_sphere_draw_normals(opengl->sphere);
 #else
+       g_mutex_lock(opengl->objects_lock);
        g_tree_foreach(opengl->objects, _draw_level, opengl);
+       g_mutex_unlock(opengl->objects_lock);
        if (opengl->wireframe) {
                glClear(GL_DEPTH_BUFFER_BIT);
                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
@@ -460,7 +464,6 @@ static gboolean on_key_press(GisOpenGL *opengl, GdkEventKey *event, gpointer _)
                        event->keyval, event->state, GDK_plus);
 
        guint kv = event->keyval;
-       gdk_threads_leave();
        /* Testing */
        if (kv == GDK_w) {
                opengl->wireframe = !opengl->wireframe;
@@ -471,10 +474,7 @@ static gboolean on_key_press(GisOpenGL *opengl, GdkEventKey *event, gpointer _)
        else if (kv == GDK_p) roam_sphere_merge_one(opengl->sphere);
        else if (kv == GDK_r) roam_sphere_split_merge(opengl->sphere);
        else if (kv == GDK_u) roam_sphere_update_errors(opengl->sphere);
-       gdk_threads_enter();
        gtk_widget_queue_draw(GTK_WIDGET(opengl));
-#else
-       gdk_threads_enter();
 #endif
        return FALSE;
 }
@@ -504,12 +504,10 @@ static void on_view_changed(GisOpenGL *opengl,
 static gboolean on_idle(GisOpenGL *opengl)
 {
        //g_debug("GisOpenGL: on_idle");
-       gdk_threads_enter();
        g_mutex_lock(opengl->sphere_lock);
        if (roam_sphere_split_merge(opengl->sphere))
                gtk_widget_queue_draw(GTK_WIDGET(opengl));
        g_mutex_unlock(opengl->sphere_lock);
-       gdk_threads_leave();
        return TRUE;
 }
 
@@ -608,6 +606,7 @@ static gpointer gis_opengl_add(GisViewer *_opengl, GisObject *object,
 {
        g_assert(GIS_IS_OPENGL(_opengl));
        GisOpenGL *opengl = GIS_OPENGL(_opengl);
+       g_mutex_lock(opengl->objects_lock);
        _load_object(opengl, object);
        struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)key);
        if (!level) {
@@ -616,18 +615,22 @@ static gpointer gis_opengl_add(GisViewer *_opengl, GisObject *object,
        }
        GList *list = sort ? &level->sorted : &level->unsorted;
        /* Put the link in the list */
-       GList *next = g_new0(GList, 1);
-       next->data = object;
-       next->prev = list;
-       next->next = list->next;
-       list->next = next;
-       return next;
+       GList *link = g_new0(GList, 1);
+       link->data = object;
+       link->prev = list;
+       link->next = list->next;
+       if (list->next)
+               list->next->prev = link;
+       list->next = link;
+       g_mutex_unlock(opengl->objects_lock);
+       return link;
 }
 
 static GisObject *gis_opengl_remove(GisViewer *_opengl, gpointer _link)
 {
        g_assert(GIS_IS_OPENGL(_opengl));
        GisOpenGL *opengl = GIS_OPENGL(_opengl);
+       g_mutex_lock(opengl->objects_lock);
        GList *link = _link;
        GisObject *object = link->data;
        _unload_object(opengl, object);
@@ -637,6 +640,7 @@ static GisObject *gis_opengl_remove(GisViewer *_opengl, gpointer _link)
                link->next->prev = link->prev;
        g_free(link);
        g_object_unref(object);
+       g_mutex_unlock(opengl->objects_lock);
        return object;
 }
 
@@ -675,6 +679,7 @@ static void gis_opengl_init(GisOpenGL *opengl)
        g_object_unref(glconfig);
 
        opengl->objects = g_tree_new_full(_objects_cmp, NULL, NULL, _objects_free);
+       opengl->objects_lock = g_mutex_new();
        opengl->sphere = roam_sphere_new(opengl);
        opengl->sphere_lock = g_mutex_new();
 
@@ -717,6 +722,7 @@ static void gis_opengl_finalize(GObject *_opengl)
        GisOpenGL *opengl = GIS_OPENGL(_opengl);
        roam_sphere_free(opengl->sphere);
        g_tree_destroy(opengl->objects);
+       g_mutex_free(opengl->objects_lock);
        g_mutex_free(opengl->sphere_lock);
        G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_opengl);
 }