X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-opengl.c;h=6b70f14a53c1638946d2d6c263bb8f183881917c;hb=b088e18d9e838064bb264a145ff66e57886ee42a;hp=866eac8c15f67e6dc7ec89a557c11ee8e645ff27;hpb=6ed798102c4b8c630188f1683e040e5d25128370;p=grits diff --git a/src/gis-opengl.c b/src/gis-opengl.c index 866eac8..6b70f14 100644 --- a/src/gis-opengl.c +++ b/src/gis-opengl.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -28,25 +29,127 @@ #include #include "gis-opengl.h" +#include "gis-util.h" +#include "gis-object.h" #include "roam.h" #define FOV_DIST 2000.0 #define MPPX(dist) (4*dist/FOV_DIST) // #define ROAM_DEBUG +/****************** + * Object drawing * + ******************/ +static void _gis_opengl_draw_triangle(GisOpenGL *self, GisTriangle *tri) +{ +} + +static void _gis_opengl_draw_quad(GisOpenGL *self, GisQuad *quad) +{ +} + +static void _gis_opengl_draw_callback(GisOpenGL *self, GisCallback *cb) +{ +} + +static void _gis_opengl_draw_marker(GisOpenGL *self, GisMarker *marker) +{ + GisProjection *proj = (GisProjection*)self->sphere->view; + GisPoint *point = gis_object_center(marker); + gis_point_project(point, proj); + + double width = GTK_WIDGET(self)->allocation.width; + double height = GTK_WIDGET(self)->allocation.height; + + cairo_set_source_rgba(self->canvas, 1, 1, 1, 1); + cairo_arc(self->canvas, point->px, height-point->py, 4, 0, 2*G_PI); + cairo_fill(self->canvas); + cairo_move_to(self->canvas, point->px+4, height-point->py-8); + cairo_set_font_size(self->canvas, 10); + cairo_show_text(self->canvas, marker->label); +} + +static void gis_opengl_draw_object(GisOpenGL *self, GisObject *object) +{ + g_debug("GisOpenGL: draw_object - Drawing object of type %d", object->type); + switch (object->type) { + case GIS_TYPE_TRIANGLE: _gis_opengl_draw_triangle(self, GIS_TRIANGLE(object)); break; + case GIS_TYPE_QUAD : _gis_opengl_draw_quad (self, GIS_QUAD (object)); break; + case GIS_TYPE_CALLBACK: _gis_opengl_draw_callback(self, GIS_CALLBACK(object)); break; + case GIS_TYPE_MARKER : _gis_opengl_draw_marker (self, GIS_MARKER (object)); break; + default: g_warning("GisOpenGL: draw_object - invalid type %d", object->type); + } +} +static void gis_opengl_draw_objects(GisOpenGL *self) +{ + g_debug("GisOpenGL: draw_objects"); + + double width = GTK_WIDGET(self)->allocation.width; + double height = GTK_WIDGET(self)->allocation.height; + cairo_surface_t *surface = cairo_get_target(self->canvas); + int stride = cairo_image_surface_get_stride(surface); + guchar *data = cairo_image_surface_get_data(surface); + memset(data, 0, height*stride); + + /* Draw objects */ + for (GList *cur = GIS_VIEWER(self)->objects; cur; cur = cur->next) + gis_opengl_draw_object(self, cur->data); + + /* Copy canvas to opengl */ + glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); + glDisable(GL_CULL_FACE); + glDisable(GL_DEPTH_TEST); + glDisable(GL_LIGHTING); + glDisable(GL_COLOR_MATERIAL); + glEnable(GL_TEXTURE_2D); + glBindTexture(GL_TEXTURE_2D, self->canvas_tex); + //glTexSubImage2D(GL_TEXTURE_2D, 0, 0,0, width,height, + // GL_RGBA, GL_UNSIGNED_BYTE, data); + glBegin(GL_QUADS); + glTexCoord2d(0, 0); glVertex3f(-1, 1, 1); + glTexCoord2d(1, 0); glVertex3f( 1, 1, 1); + glTexCoord2d(1, 1); glVertex3f( 1, -1, 1); + glTexCoord2d(0, 1); glVertex3f(-1, -1, 1); + glEnd(); + glMatrixMode(GL_PROJECTION); glPopMatrix(); + glMatrixMode(GL_MODELVIEW); glPopMatrix(); +} + + +/*********** + * Helpers * + ***********/ +static void _gis_opengl_begin(GisOpenGL *self) +{ + g_assert(GIS_IS_OPENGL(self)); + + GdkGLContext *glcontext = gtk_widget_get_gl_context(GTK_WIDGET(self)); + GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self)); + + if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) + g_assert_not_reached(); +} + +static void _gis_opengl_end(GisOpenGL *self) +{ + g_assert(GIS_IS_OPENGL(self)); + GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self)); + gdk_gl_drawable_gl_end(gldrawable); +} /************* * ROAM Code * *************/ -static void set_visuals(GisOpenGL *self) +static void _set_visuals(GisOpenGL *self) { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); /* Camera 1 */ double lat, lon, elev, rx, ry, rz; - gis_view_get_location(self->view, &lat, &lon, &elev); - gis_view_get_rotation(self->view, &rx, &ry, &rz); + gis_viewer_get_location(GIS_VIEWER(self), &lat, &lon, &elev); + gis_viewer_get_rotation(GIS_VIEWER(self), &rx, &ry, &rz); glRotatef(rx, 1, 0, 0); glRotatef(rz, 0, 0, 1); @@ -105,6 +208,8 @@ static void set_visuals(GisOpenGL *self) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); //glShadeModel(GL_FLAT); + + roam_sphere_update_view(self->sphere); } @@ -114,34 +219,55 @@ static void set_visuals(GisOpenGL *self) static void on_realize(GisOpenGL *self, gpointer _) { g_debug("GisOpenGL: on_realize"); - set_visuals(self); + _set_visuals(self); roam_sphere_update_errors(self->sphere); } static gboolean on_configure(GisOpenGL *self, GdkEventConfigure *event, gpointer _) { g_debug("GisOpenGL: on_configure"); - gis_opengl_begin(self); + _gis_opengl_begin(self); double width = GTK_WIDGET(self)->allocation.width; double height = GTK_WIDGET(self)->allocation.height; - glViewport(0, 0, width, height); + /* Setup OpenGL Window */ + glViewport(0, 0, width, height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); double ang = atan(height/FOV_DIST); gluPerspective(rad2deg(ang)*2, width/height, 1, 20*EARTH_R); + /* Recreate the canvas */ + if (self->canvas) { + cairo_surface_destroy(cairo_get_target(self->canvas)); + cairo_destroy(self->canvas); + glDeleteTextures(1, &self->canvas_tex); + } + g_message("creating %fx%f canvas", width, height); + cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + self->canvas = cairo_create(surface); + glEnable(GL_TEXTURE_2D); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glPixelStorei(GL_PACK_ALIGNMENT, 1); + glGenTextures(1, &self->canvas_tex); + glBindTexture(GL_TEXTURE_2D, self->canvas_tex); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, + cairo_image_surface_get_data(cairo_get_target(self->canvas))); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + + #ifndef ROAM_DEBUG roam_sphere_update_errors(self->sphere); #endif - gis_opengl_end(self); + _gis_opengl_end(self); return FALSE; } -static void on_expose_plugin(GisPlugin *plugin, gchar *name, GisOpenGL *self) +static void _on_expose_plugin(GisPlugin *plugin, gchar *name, GisOpenGL *self) { - set_visuals(self); + _set_visuals(self); glMatrixMode(GL_PROJECTION); glPushMatrix(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); gis_plugin_expose(plugin); @@ -151,65 +277,48 @@ static void on_expose_plugin(GisPlugin *plugin, gchar *name, GisOpenGL *self) static gboolean on_expose(GisOpenGL *self, GdkEventExpose *event, gpointer _) { g_debug("GisOpenGL: on_expose - begin"); - gis_opengl_begin(self); + _gis_opengl_begin(self); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); #ifndef ROAM_DEBUG - gis_plugins_foreach(self->plugins, G_CALLBACK(on_expose_plugin), self); - + gis_plugins_foreach(GIS_VIEWER(self)->plugins, + G_CALLBACK(_on_expose_plugin), self); + gis_opengl_draw_objects(self); if (self->wireframe) { - set_visuals(self); + _set_visuals(self); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); roam_sphere_draw(self->sphere); } #else - set_visuals(self); + _set_visuals(self); glColor4f(0.0, 0.0, 9.0, 0.6); glDisable(GL_TEXTURE_2D); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); roam_sphere_draw(self->sphere); - //roam_sphere_draw_normals(self->sphere); #endif - set_visuals(self); - gis_opengl_end(self); - gis_opengl_flush(self); + GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self)); + gdk_gl_drawable_swap_buffers(gldrawable); + + _gis_opengl_end(self); g_debug("GisOpenGL: on_expose - end\n"); return FALSE; } -static gboolean on_button_press(GisOpenGL *self, GdkEventButton *event, gpointer _) -{ - g_debug("GisOpenGL: on_button_press - Grabbing focus"); - gtk_widget_grab_focus(GTK_WIDGET(self)); - return TRUE; -} - static gboolean on_key_press(GisOpenGL *self, GdkEventKey *event, gpointer _) { g_debug("GisOpenGL: on_key_press - key=%x, state=%x, plus=%x", event->keyval, event->state, GDK_plus); - double lat, lon, elev, pan; - gis_view_get_location(self->view, &lat, &lon, &elev); - pan = MIN(elev/(EARTH_R/2), 30); guint kv = event->keyval; gdk_threads_leave(); - if (kv == GDK_Left || kv == GDK_h) gis_view_pan(self->view, 0, -pan, 0); - else if (kv == GDK_Down || kv == GDK_j) gis_view_pan(self->view, -pan, 0, 0); - else if (kv == GDK_Up || kv == GDK_k) gis_view_pan(self->view, pan, 0, 0); - else if (kv == GDK_Right || kv == GDK_l) gis_view_pan(self->view, 0, pan, 0); - else if (kv == GDK_minus || kv == GDK_o) gis_view_zoom(self->view, 10./9); - else if (kv == GDK_plus || kv == GDK_i) gis_view_zoom(self->view, 9./10); - else if (kv == GDK_H) gis_view_rotate(self->view, 0, 0, -2); - else if (kv == GDK_J) gis_view_rotate(self->view, 2, 0, 0); - else if (kv == GDK_K) gis_view_rotate(self->view, -2, 0, 0); - else if (kv == GDK_L) gis_view_rotate(self->view, 0, 0, 2); - /* Testing */ - else if (kv == GDK_w) {self->wireframe = !self->wireframe; gtk_widget_queue_draw(GTK_WIDGET(self));} + if (kv == GDK_w) { + self->wireframe = !self->wireframe; + gtk_widget_queue_draw(GTK_WIDGET(self)); + } #ifdef ROAM_DEBUG else if (kv == GDK_n) roam_sphere_split_one(self->sphere); else if (kv == GDK_p) roam_sphere_merge_one(self->sphere); @@ -220,8 +329,7 @@ static gboolean on_key_press(GisOpenGL *self, GdkEventKey *event, gpointer _) #else gdk_threads_enter(); #endif - - return TRUE; + return FALSE; } static gboolean _update_errors_cb(gpointer sphere) @@ -229,19 +337,18 @@ static gboolean _update_errors_cb(gpointer sphere) roam_sphere_update_errors(sphere); return FALSE; } -static void on_view_changed(GisView *view, - gdouble _1, gdouble _2, gdouble _3, GisOpenGL *self) +static void on_view_changed(GisOpenGL *self, + gdouble _1, gdouble _2, gdouble _3) { g_debug("GisOpenGL: on_view_changed"); gdk_threads_enter(); - gis_opengl_begin(self); - set_visuals(self); + _gis_opengl_begin(self); + _set_visuals(self); #ifndef ROAM_DEBUG g_idle_add_full(G_PRIORITY_HIGH_IDLE+30, _update_errors_cb, self->sphere, NULL); //roam_sphere_update_errors(self->sphere); #endif - gis_opengl_redraw(self); - gis_opengl_end(self); + _gis_opengl_end(self); gdk_threads_leave(); } @@ -249,45 +356,51 @@ static gboolean on_idle(GisOpenGL *self) { //g_debug("GisOpenGL: on_idle"); gdk_threads_enter(); - gis_opengl_begin(self); + _gis_opengl_begin(self); if (roam_sphere_split_merge(self->sphere)) - gis_opengl_redraw(self); - gis_opengl_end(self); + gtk_widget_queue_draw(GTK_WIDGET(self)); + _gis_opengl_end(self); gdk_threads_leave(); return TRUE; } -/*********** - * Methods * - ***********/ -GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins) +/********************* + * GisViewer methods * + *********************/ +GisViewer *gis_opengl_new(GisPlugins *plugins) { g_debug("GisOpenGL: new"); - GisOpenGL *self = g_object_new(GIS_TYPE_OPENGL, NULL); - self->world = world; - self->view = view; + GisViewer *self = g_object_new(GIS_TYPE_OPENGL, NULL); self->plugins = plugins; - g_object_ref(world); - g_object_ref(view); - - g_signal_connect(self->view, "location-changed", G_CALLBACK(on_view_changed), self); - g_signal_connect(self->view, "rotation-changed", G_CALLBACK(on_view_changed), self); - - self->sphere = roam_sphere_new(self); - - return g_object_ref(self); + return self; } -void gis_opengl_center_position(GisOpenGL *self, gdouble lat, gdouble lon, gdouble elev) +static void gis_opengl_center_position(GisViewer *_self, gdouble lat, gdouble lon, gdouble elev) { + GisOpenGL *self = GIS_OPENGL(_self); glRotatef(lon, 0, 1, 0); glRotatef(-lat, 1, 0, 0); glTranslatef(0, 0, elev2rad(elev)); } -void gis_opengl_render_tile(GisOpenGL *self, GisTile *tile) +static void gis_opengl_project(GisViewer *_self, + gdouble lat, gdouble lon, gdouble elev, + gdouble *px, gdouble *py, gdouble *pz) { + GisOpenGL *self = GIS_OPENGL(_self); + gdouble x, y, z; + lle2xyz(lat, lon, elev, &x, &y, &z); + gluProject(x, y, z, + self->sphere->view->model, + self->sphere->view->proj, + self->sphere->view->view, + px, py, pz); +} + +static void gis_opengl_render_tile(GisViewer *_self, GisTile *tile) +{ + GisOpenGL *self = GIS_OPENGL(_self); if (!tile || !tile->data) return; GList *triangles = roam_sphere_get_intersect(self->sphere, @@ -334,8 +447,9 @@ void gis_opengl_render_tile(GisOpenGL *self, GisTile *tile) g_list_free(triangles); } -void gis_opengl_render_tiles(GisOpenGL *opengl, GisTile *tile) +static void gis_opengl_render_tiles(GisViewer *_self, GisTile *tile) { + GisOpenGL *self = GIS_OPENGL(_self); /* Only render children if possible */ gboolean has_children = TRUE; GisTile *child; @@ -345,15 +459,16 @@ void gis_opengl_render_tiles(GisOpenGL *opengl, GisTile *tile) if (has_children) /* Only render children */ gis_tile_foreach(tile, child) - gis_opengl_render_tiles(opengl, child); + gis_opengl_render_tiles(_self, child); else /* No children, render this tile */ - gis_opengl_render_tile(opengl, tile); + gis_opengl_render_tile(_self, tile); } -void gis_opengl_set_height_func(GisOpenGL *self, GisTile *tile, +static void gis_opengl_set_height_func(GisViewer *_self, GisTile *tile, RoamHeightFunc height_func, gpointer user_data, gboolean update) { + GisOpenGL *self = GIS_OPENGL(_self); if (!tile) return; /* TODO: get points? */ @@ -384,52 +499,30 @@ static void _gis_opengl_clear_height_func_rec(RoamTriangle *root) _gis_opengl_clear_height_func_rec(root->kids[0]); _gis_opengl_clear_height_func_rec(root->kids[1]); } -void gis_opengl_clear_height_func(GisOpenGL *self) + +static void gis_opengl_clear_height_func(GisViewer *_self) { + GisOpenGL *self = GIS_OPENGL(_self); for (int i = 0; i < G_N_ELEMENTS(self->sphere->roots); i++) _gis_opengl_clear_height_func_rec(self->sphere->roots[i]); } -void gis_opengl_redraw(GisOpenGL *self) +static void gis_opengl_begin(GisViewer *_self) { - g_debug("GisOpenGL: redraw"); - gtk_widget_queue_draw(GTK_WIDGET(self)); + g_assert(GIS_IS_OPENGL(_self)); + _gis_opengl_begin(GIS_OPENGL(_self)); } -void gis_opengl_begin(GisOpenGL *self) -{ - g_assert(GIS_IS_OPENGL(self)); - gdk_threads_enter(); - - GdkGLContext *glcontext = gtk_widget_get_gl_context(GTK_WIDGET(self)); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self)); - - if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) - g_assert_not_reached(); -} -void gis_opengl_end(GisOpenGL *self) +static void gis_opengl_end(GisViewer *_self) { - g_assert(GIS_IS_OPENGL(self)); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self)); - gdk_gl_drawable_gl_end(gldrawable); - gdk_threads_leave(); -} -void gis_opengl_flush(GisOpenGL *self) -{ - g_assert(GIS_IS_OPENGL(self)); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self)); - if (gdk_gl_drawable_is_double_buffered(gldrawable)) - gdk_gl_drawable_swap_buffers(gldrawable); - else - glFlush(); - gdk_gl_drawable_gl_end(gldrawable); + g_assert(GIS_IS_OPENGL(_self)); + _gis_opengl_end(GIS_OPENGL(_self)); } - /**************** * GObject code * ****************/ -G_DEFINE_TYPE(GisOpenGL, gis_opengl, GTK_TYPE_DRAWING_AREA); +G_DEFINE_TYPE(GisOpenGL, gis_opengl, GIS_TYPE_VIEWER); static void gis_opengl_init(GisOpenGL *self) { g_debug("GisOpenGL: init"); @@ -451,25 +544,21 @@ static void gis_opengl_init(GisOpenGL *self) GDK_KEY_PRESS_MASK); g_object_set(self, "can-focus", TRUE, NULL); + self->sphere = roam_sphere_new(self); + #ifndef ROAM_DEBUG self->sm_source[0] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+30, 33, (GSourceFunc)on_idle, self, NULL); self->sm_source[1] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+10, 500, (GSourceFunc)on_idle, self, NULL); #endif - g_signal_connect(self, "realize", G_CALLBACK(on_realize), NULL); - g_signal_connect(self, "configure-event", G_CALLBACK(on_configure), NULL); - g_signal_connect(self, "expose-event", G_CALLBACK(on_expose), NULL); + g_signal_connect(self, "realize", G_CALLBACK(on_realize), NULL); + g_signal_connect(self, "configure-event", G_CALLBACK(on_configure), NULL); + g_signal_connect(self, "expose-event", G_CALLBACK(on_expose), NULL); - g_signal_connect(self, "button-press-event", G_CALLBACK(on_button_press), NULL); - g_signal_connect(self, "enter-notify-event", G_CALLBACK(on_button_press), NULL); - g_signal_connect(self, "key-press-event", G_CALLBACK(on_key_press), NULL); -} -static GObject *gis_opengl_constructor(GType gtype, guint n_properties, - GObjectConstructParam *properties) -{ - g_debug("GisOpengl: constructor"); - GObjectClass *parent_class = G_OBJECT_CLASS(gis_opengl_parent_class); - return parent_class->constructor(gtype, n_properties, properties); + g_signal_connect(self, "key-press-event", G_CALLBACK(on_key_press), NULL); + + g_signal_connect(self, "location-changed", G_CALLBACK(on_view_changed), NULL); + g_signal_connect(self, "rotation-changed", G_CALLBACK(on_view_changed), NULL); } static void gis_opengl_dispose(GObject *_self) { @@ -487,27 +576,32 @@ static void gis_opengl_dispose(GObject *_self) roam_sphere_free(self->sphere); self->sphere = NULL; } - if (self->world) { - g_object_unref(self->world); - self->world = NULL; - } - if (self->view) { - g_object_unref(self->view); - self->view = NULL; - } G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self); } static void gis_opengl_finalize(GObject *_self) { - g_debug("GisOpenGL: finalize"); + g_debug("GisViewer: finalize"); GisOpenGL *self = GIS_OPENGL(_self); + if (self->canvas) { + cairo_surface_destroy(cairo_get_target(self->canvas)); + cairo_destroy(self->canvas); + self->canvas = NULL; + } G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_self); } static void gis_opengl_class_init(GisOpenGLClass *klass) { g_debug("GisOpenGL: class_init"); GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - gobject_class->constructor = gis_opengl_constructor; - gobject_class->dispose = gis_opengl_dispose; - gobject_class->finalize = gis_opengl_finalize; + gobject_class->dispose = gis_opengl_dispose; + + GisViewerClass *viewer_class = GIS_VIEWER_CLASS(klass); + viewer_class->center_position = gis_opengl_center_position; + viewer_class->project = gis_opengl_project; + viewer_class->clear_height_func = gis_opengl_clear_height_func; + viewer_class->set_height_func = gis_opengl_set_height_func; + viewer_class->render_tile = gis_opengl_render_tile; + viewer_class->render_tiles = gis_opengl_render_tiles; + viewer_class->begin = gis_opengl_begin; + viewer_class->end = gis_opengl_end; }