X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis-opengl.c;h=e5f64680f4126803f5ada816f71294df0e9381cf;hp=bb2095113d9830d2bc1ad874396b62a946136dea;hb=22408daaad6f0c7b4075c2b0a725802b0659cfbe;hpb=cd2b3c70807c914687f9051b34a8fe029de300ee diff --git a/src/gis-opengl.c b/src/gis-opengl.c index bb20951..e5f6468 100644 --- a/src/gis-opengl.c +++ b/src/gis-opengl.c @@ -40,10 +40,6 @@ #include "gis-util.h" #include "roam.h" -#include "objects/gis-object.h" -#include "objects/gis-marker.h" -#include "objects/gis-callback.h" - // #define ROAM_DEBUG /* Tessellation, "finding intersecting triangles" */ @@ -104,209 +100,20 @@ static void _set_visuals(GisOpenGL *opengl) #ifndef ROAM_DEBUG glCullFace(GL_BACK); glEnable(GL_CULL_FACE); -#endif glClearDepth(1.0); glDepthFunc(GL_LEQUAL); glEnable(GL_DEPTH_TEST); +#endif glEnable(GL_LINE_SMOOTH); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); //glShadeModel(GL_FLAT); + g_mutex_lock(opengl->sphere_lock); roam_sphere_update_view(opengl->sphere); -} - - -/******************** - * Object handleing * - ********************/ -static void _draw_tile(GisOpenGL *opengl, GisTile *tile) -{ - if (!tile || !tile->data) - return; - GList *triangles = roam_sphere_get_intersect(opengl->sphere, FALSE, - tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w); - if (!triangles) - g_warning("GisOpenGL: _draw_tiles - No triangles to draw: edges=%f,%f,%f,%f", - tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w); - //g_message("drawing %4d triangles for tile edges=%7.2f,%7.2f,%7.2f,%7.2f", - // g_list_length(triangles), tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w); - for (GList *cur = triangles; cur; cur = cur->next) { - RoamTriangle *tri = cur->data; - - gdouble lat[3] = {tri->p.r->lat, tri->p.m->lat, tri->p.l->lat}; - gdouble lon[3] = {tri->p.r->lon, tri->p.m->lon, tri->p.l->lon}; - - if (lon[0] < -90 || lon[1] < -90 || lon[2] < -90) { - if (lon[0] > 90) lon[0] -= 360; - if (lon[1] > 90) lon[1] -= 360; - if (lon[2] > 90) lon[2] -= 360; - } - - gdouble n = tile->edge.n; - gdouble s = tile->edge.s; - gdouble e = tile->edge.e; - gdouble w = tile->edge.w; - - gdouble londist = e - w; - gdouble latdist = n - s; - - gdouble xy[3][2] = { - {(lon[0]-w)/londist, 1-(lat[0]-s)/latdist}, - {(lon[1]-w)/londist, 1-(lat[1]-s)/latdist}, - {(lon[2]-w)/londist, 1-(lat[2]-s)/latdist}, - }; - - //if ((lat[0] == 90 && (xy[0][0] < 0 || xy[0][0] > 1)) || - // (lat[1] == 90 && (xy[1][0] < 0 || xy[1][0] > 1)) || - // (lat[2] == 90 && (xy[2][0] < 0 || xy[2][0] > 1))) - // g_message("w,e=%4.f,%4.f " - // "lat,lon,x,y=" - // "%4.1f,%4.0f,%4.2f,%4.2f " - // "%4.1f,%4.0f,%4.2f,%4.2f " - // "%4.1f,%4.0f,%4.2f,%4.2f ", - // w,e, - // lat[0], lon[0], xy[0][0], xy[0][1], - // lat[1], lon[1], xy[1][0], xy[1][1], - // lat[2], lon[2], xy[2][0], xy[2][1]); - - /* Fix poles */ - if (lat[0] == 90 || lat[0] == -90) xy[0][0] = 0.5; - if (lat[1] == 90 || lat[1] == -90) xy[1][0] = 0.5; - if (lat[2] == 90 || lat[2] == -90) xy[2][0] = 0.5; - - glEnable(GL_TEXTURE_2D); - glBindTexture(GL_TEXTURE_2D, *(guint*)tile->data); - 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); - glNormal3dv(tri->p.l->norm); glTexCoord2dv(xy[2]); glVertex3dv((double*)tri->p.l); - glEnd(); - } - g_list_free(triangles); -} - -static void _draw_tiles(GisOpenGL *opengl, GisTile *tile) -{ - /* Only draw children if possible */ - gboolean has_children = TRUE; - GisTile *child; - gis_tile_foreach(tile, child) - if (!child || !child->data) - has_children = FALSE; - if (has_children) - /* Only draw children */ - gis_tile_foreach(tile, child) - _draw_tiles(opengl, child); - else - /* No children, draw this tile */ - _draw_tile(opengl, tile); -} - -static void _draw_marker(GisOpenGL *opengl, GisMarker *marker) -{ - GisPoint *point = gis_object_center(marker); - gdouble px, py, pz; - gis_viewer_project(GIS_VIEWER(opengl), - point->lat, point->lon, point->elev, - &px, &py, &pz); - if (pz > 1) - return; - - //g_debug("GisOpenGL: draw_marker - %s pz=%f ", marker->label, pz); - - cairo_surface_t *surface = cairo_get_target(marker->cairo); - gdouble width = cairo_image_surface_get_width(surface); - gdouble height = cairo_image_surface_get_height(surface); - - glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glOrtho(0, GTK_WIDGET(opengl)->allocation.width, - 0, GTK_WIDGET(opengl)->allocation.height, -1, 1); - glTranslated(px - marker->xoff, - py - marker->yoff, 0); - - glDisable(GL_LIGHTING); - glDisable(GL_COLOR_MATERIAL); - glDisable(GL_DEPTH_TEST); - glEnable(GL_TEXTURE_2D); - glBindTexture(GL_TEXTURE_2D, marker->tex); - glBegin(GL_QUADS); - glTexCoord2f(1, 1); glVertex3f(width, 0 , 0); - glTexCoord2f(1, 0); glVertex3f(width, height, 0); - glTexCoord2f(0, 0); glVertex3f(0 , height, 0); - glTexCoord2f(0, 1); glVertex3f(0 , 0 , 0); - glEnd(); -} - -static void _draw_callback(GisOpenGL *opengl, GisCallback *callback) -{ - callback->callback(callback, callback->user_data); -} - -static void _draw_object(GisOpenGL *opengl, GisObject *object) -{ - //g_debug("GisOpenGL: draw_object"); - /* Skip out of range objects */ - if (object->lod > 0) { - gdouble eye[3], obj[3]; - gis_viewer_get_location(GIS_VIEWER(opengl), &eye[0], &eye[1], &eye[2]); - lle2xyz(eye[0], eye[1], eye[2], &eye[0], &eye[1], &eye[2]); - lle2xyz(object->center.lat, object->center.lon, object->center.elev, - &obj[0], &obj[1], &obj[2]); - gdouble dist = distd(obj, eye); - if (object->lod < dist) - return; - } - - /* Draw */ - glMatrixMode(GL_PROJECTION); glPushMatrix(); - glMatrixMode(GL_MODELVIEW); glPushMatrix(); - glPushAttrib(GL_ALL_ATTRIB_BITS); - if (GIS_IS_MARKER(object)) { - _draw_marker(opengl, GIS_MARKER(object)); - } else if (GIS_IS_CALLBACK(object)) { - _draw_callback(opengl, GIS_CALLBACK(object)); - } else if (GIS_IS_TILE(object)) { - _draw_tiles(opengl, GIS_TILE(object)); - } - glPopAttrib(); - glMatrixMode(GL_PROJECTION); glPopMatrix(); - glMatrixMode(GL_MODELVIEW); glPopMatrix(); -} - -static void _load_object(GisOpenGL *opengl, GisObject *object) -{ - g_debug("GisOpenGL: load_object"); - if (GIS_IS_MARKER(object)) { - GisMarker *marker = GIS_MARKER(object); - cairo_surface_t *surface = cairo_get_target(marker->cairo); - gdouble width = cairo_image_surface_get_width(surface); - gdouble height = cairo_image_surface_get_height(surface); - - glEnable(GL_TEXTURE_2D); - glGenTextures(1, &marker->tex); - glBindTexture(GL_TEXTURE_2D, marker->tex); - - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glPixelStorei(GL_PACK_ALIGNMENT, 1); - glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, - cairo_image_surface_get_data(surface)); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - g_debug("load_texture: %d", marker->tex); - } -} - -static void _unload_object(GisOpenGL *opengl, GisObject *object) -{ - g_debug("GisOpenGL: unload_object"); - if (GIS_IS_MARKER(object)) { - GisMarker *marker = GIS_MARKER(object); - glDeleteTextures(1, &marker->tex); - } + g_mutex_unlock(opengl->sphere_lock); } @@ -321,21 +128,6 @@ struct RenderLevel { GList sorted; }; -static void on_realize(GisOpenGL *opengl, gpointer _) -{ - g_debug("GisOpenGL: on_realize"); - - GdkGLContext *glcontext = gtk_widget_get_gl_context(GTK_WIDGET(opengl)); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(opengl)); - if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) - g_assert_not_reached(); - - _set_visuals(opengl); - g_mutex_lock(opengl->sphere_lock); - roam_sphere_update_errors(opengl->sphere); - g_mutex_unlock(opengl->sphere_lock); -} - static gboolean on_configure(GisOpenGL *opengl, GdkEventConfigure *event, gpointer _) { g_debug("GisOpenGL: on_configure"); @@ -348,7 +140,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); @@ -359,6 +151,19 @@ static gboolean on_configure(GisOpenGL *opengl, GdkEventConfigure *event, gpoint return FALSE; } +static void on_realize(GisOpenGL *opengl, gpointer _) +{ + g_debug("GisOpenGL: on_realize"); + + GdkGLContext *glcontext = gtk_widget_get_gl_context(GTK_WIDGET(opengl)); + GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(opengl)); + if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) + g_assert_not_reached(); + + _set_visuals(opengl); + on_configure(opengl, NULL, NULL); +} + static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data) { g_debug("GisOpenGL: _draw_level - level=%-4d", (int)key); @@ -371,14 +176,14 @@ static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data) glDepthMask(TRUE); glClear(GL_DEPTH_BUFFER_BIT); for (cur = level->unsorted.next; cur; cur = cur->next, nunsorted++) - _draw_object(opengl, GIS_OBJECT(cur->data)); + gis_object_draw( GIS_OBJECT(cur->data), opengl); /* Freeze depth buffer and draw transparent objects sorted */ /* TODO: sorting */ //glDepthMask(FALSE); glAlphaFunc(GL_GREATER, 0.1); for (cur = level->sorted.next; cur; cur = cur->next, nsorted++) - _draw_object(opengl, GIS_OBJECT(cur->data)); + gis_object_draw(GIS_OBJECT(cur->data), opengl); /* TODO: Prune empty levels */ @@ -395,18 +200,22 @@ static gboolean on_expose(GisOpenGL *opengl, GdkEventExpose *event, gpointer _) _set_visuals(opengl); #ifdef ROAM_DEBUG - glColor4f(0.0, 0.0, 9.0, 0.6); + glColor4f(1.0, 1.0, 1.0, 1.0); + glLineWidth(2); glDisable(GL_TEXTURE_2D); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); roam_sphere_draw(opengl->sphere); + (void)_draw_level; //roam_sphere_draw_normals(opengl->sphere); #else + g_mutex_lock(opengl->objects_lock); g_tree_foreach(opengl->objects, _draw_level, opengl); if (opengl->wireframe) { glClear(GL_DEPTH_BUFFER_BIT); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); roam_sphere_draw(opengl->sphere); } + g_mutex_unlock(opengl->objects_lock); #endif GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(opengl)); @@ -422,7 +231,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; @@ -433,17 +241,18 @@ 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; } -static gboolean _update_errors_cb(gpointer sphere) +static gboolean _update_errors_cb(gpointer _opengl) { - roam_sphere_update_errors(sphere); + GisOpenGL *opengl = _opengl; + g_mutex_lock(opengl->sphere_lock); + roam_sphere_update_errors(opengl->sphere); + g_mutex_unlock(opengl->sphere_lock); + opengl->ue_source = 0; return FALSE; } static void on_view_changed(GisOpenGL *opengl, @@ -452,21 +261,22 @@ static void on_view_changed(GisOpenGL *opengl, g_debug("GisOpenGL: on_view_changed"); _set_visuals(opengl); #ifndef ROAM_DEBUG - opengl->ue_source = g_idle_add_full(G_PRIORITY_HIGH_IDLE+30, - _update_errors_cb, opengl->sphere, NULL); + if (!opengl->ue_source) + opengl->ue_source = g_idle_add_full(G_PRIORITY_HIGH_IDLE+30, + _update_errors_cb, opengl, NULL); //roam_sphere_update_errors(opengl->sphere); +#else + (void)_update_errors_cb; #endif } 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; } @@ -493,7 +303,6 @@ GisViewer *gis_opengl_new(GisPlugins *plugins, GisPrefs *prefs) static void gis_opengl_center_position(GisViewer *_opengl, gdouble lat, gdouble lon, gdouble elev) { - GisOpenGL *opengl = GIS_OPENGL(_opengl); glRotatef(lon, 0, 1, 0); glRotatef(-lat, 1, 0, 0); glTranslatef(0, 0, elev2rad(elev)); @@ -513,22 +322,20 @@ static void gis_opengl_project(GisViewer *_opengl, px, py, pz); } -static void gis_opengl_set_height_func(GisViewer *_opengl, GisTile *tile, +static void gis_opengl_set_height_func(GisViewer *_opengl, GisBounds *bounds, RoamHeightFunc height_func, gpointer user_data, gboolean update) { GisOpenGL *opengl = GIS_OPENGL(_opengl); - if (!tile) - return; /* TODO: get points? */ g_mutex_lock(opengl->sphere_lock); GList *triangles = roam_sphere_get_intersect(opengl->sphere, TRUE, - tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w); + bounds->n, bounds->s, bounds->e, bounds->w); for (GList *cur = triangles; cur; cur = cur->next) { RoamTriangle *tri = cur->data; RoamPoint *points[] = {tri->p.l, tri->p.m, tri->p.r, tri->split}; for (int i = 0; i < G_N_ELEMENTS(points); i++) { - if (tile->edge.n >= points[i]->lat && points[i]->lat >= tile->edge.s && - tile->edge.e >= points[i]->lon && points[i]->lon >= tile->edge.w) { + if (bounds->n >= points[i]->lat && points[i]->lat >= bounds->s && + bounds->e >= points[i]->lon && points[i]->lon >= bounds->w) { points[i]->height_func = height_func; points[i]->height_data = user_data; roam_point_update_height(points[i]); @@ -565,7 +372,7 @@ static gpointer gis_opengl_add(GisViewer *_opengl, GisObject *object, { g_assert(GIS_IS_OPENGL(_opengl)); GisOpenGL *opengl = GIS_OPENGL(_opengl); - _load_object(opengl, object); + g_mutex_lock(opengl->objects_lock); struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)key); if (!level) { level = g_new0(struct RenderLevel, 1); @@ -573,27 +380,31 @@ 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); /* Just unlink and free it, link->prev is assured */ link->prev->next = link->next; if (link->next) link->next->prev = link->prev; g_free(link); g_object_unref(object); + g_mutex_unlock(opengl->objects_lock); return object; } @@ -632,12 +443,16 @@ 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(); #ifndef ROAM_DEBUG opengl->sm_source[0] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+30, 33, (GSourceFunc)on_idle, opengl, NULL); opengl->sm_source[1] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+10, 500, (GSourceFunc)on_idle, opengl, NULL); +#else + (void)on_idle; + (void)_update_errors_cb; #endif gtk_widget_add_events(GTK_WIDGET(opengl), GDK_KEY_PRESS_MASK); @@ -674,6 +489,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); }