/*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* Tessellation, "finding intersecting triangles" */
-/* http://research.microsoft.com/pubs/70307/tr-2006-81.pdf */
-/* http://www.opengl.org/wiki/Alpha_Blending */
+/**
+ * SECTION:gis-opengl
+ * @short_description: OpenGL based virtual globe
+ *
+ * #GisOpenGL is the core rendering engine used by libgis. Theoretically other
+ * renderers could be writte, but they have not been. GisOpenGL uses the ROAM
+ * algorithm for updating surface mesh the planet. The only thing GisOpenGL can
+ * actually render on it's own is a wireframe of a sphere.
+ *
+ * GisOpenGL relies on #GtkGlExt and requires (at least) OpenGL 2.0.
+ */
#include <config.h>
#include <math.h>
+#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <gtk/gtkgl.h>
#include <GL/glu.h>
#include "gis-opengl.h"
+#include "gis-util.h"
#include "roam.h"
-#include "wms.h"
-
-#define FOV_DIST 2000.0
-#define MPPX(dist) (4*dist/FOV_DIST)
// #define ROAM_DEBUG
-/*************
- * ROAM Code *
- *************/
-void roam_queue_draw(WmsCacheNode *node, gpointer _self)
-{
- gtk_widget_queue_draw(GTK_WIDGET(_self));
-}
+/* Tessellation, "finding intersecting triangles" */
+/* http://research.microsoft.com/pubs/70307/tr-2006-81.pdf */
+/* http://www.opengl.org/wiki/Alpha_Blending */
-static void set_camera(GisOpenGL *self)
+/***********
+ * Helpers *
+ ***********/
+static void _set_visuals(GisOpenGL *opengl)
{
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(opengl), &lat, &lon, &elev);
+ gis_viewer_get_rotation(GIS_VIEWER(opengl), &rx, &ry, &rz);
glRotatef(rx, 1, 0, 0);
glRotatef(rz, 0, 0, 1);
- glTranslatef(0, 0, -elev2rad(elev));
- glRotatef(lat, 1, 0, 0);
- glRotatef(-lon, 0, 1, 0);
-}
-static void set_visuals(GisOpenGL *self)
-{
/* Lighting */
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
#ifdef ROAM_DEBUG
float light_ambient[] = {0.7f, 0.7f, 0.7f, 1.0f};
float light_diffuse[] = {2.0f, 2.0f, 2.0f, 1.0f};
float material_ambient[] = {0.2, 0.2, 0.2, 1.0};
float material_diffuse[] = {0.8, 0.8, 0.8, 1.0};
- float material_specular[] = {0.0, 0.0, 0.0, 1.0};
+ float material_specular[] = {0.1, 0.1, 0.1, 1.0};
float material_emission[] = {0.0, 0.0, 0.0, 1.0};
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, material_ambient);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, material_diffuse);
glDisable(GL_TEXTURE_2D);
glDisable(GL_COLOR_MATERIAL);
- /* Camera */
- set_camera(self);
-
- /* Misc */
- gdouble lat, lon, elev;
- gis_view_get_location(self->view, &lat, &lon, &elev);
- gdouble rg = MAX(0, 1-(elev/20000));
- gdouble blue = MAX(0, 1-(elev/50000));
- glClearColor(MIN(0.65,rg), MIN(0.65,rg), MIN(1,blue), 1.0f);
+ /* Camera 2 */
+ glTranslatef(0, 0, -elev2rad(elev));
+ glRotatef(lat, 1, 0, 0);
+ glRotatef(-lon, 0, 1, 0);
glDisable(GL_ALPHA_TEST);
#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);
+ g_mutex_unlock(opengl->sphere_lock);
}
/*************
* Callbacks *
*************/
-static void on_realize(GisOpenGL *self, gpointer _)
-{
- g_debug("GisOpenGL: on_realize");
- set_visuals(self);
- roam_sphere_update_errors(self->sphere);
-}
-static gboolean on_configure(GisOpenGL *self, GdkEventConfigure *event, gpointer _)
+/* The unsorted/sroted GLists are blank head nodes,
+ * This way us we can remove objects from the level just by fixing up links
+ * I.e. we don't need to do a lookup to remove an object if we have its GList */
+struct RenderLevel {
+ GList unsorted;
+ GList sorted;
+};
+
+static gboolean on_configure(GisOpenGL *opengl, GdkEventConfigure *event, gpointer _)
{
g_debug("GisOpenGL: on_configure");
- gis_opengl_begin(self);
- double width = GTK_WIDGET(self)->allocation.width;
- double height = GTK_WIDGET(self)->allocation.height;
- glViewport(0, 0, width, height);
+ double width = GTK_WIDGET(opengl)->allocation.width;
+ double height = GTK_WIDGET(opengl)->allocation.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);
+ gluPerspective(rad2deg(ang)*2, width/height, 1000, 10*EARTH_R);
#ifndef ROAM_DEBUG
- roam_sphere_update_errors(self->sphere);
+ g_mutex_lock(opengl->sphere_lock);
+ roam_sphere_update_errors(opengl->sphere);
+ g_mutex_unlock(opengl->sphere_lock);
#endif
- gis_opengl_end(self);
return FALSE;
}
-static void on_expose_plugin(GisPlugin *plugin, gchar *name, GisOpenGL *self)
+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)
{
- set_visuals(self);
- glMatrixMode(GL_PROJECTION); glPushMatrix();
- glMatrixMode(GL_MODELVIEW); glPushMatrix();
- gis_plugin_expose(plugin);
- glMatrixMode(GL_PROJECTION); glPopMatrix();
- glMatrixMode(GL_MODELVIEW); glPopMatrix();
+ g_debug("GisOpenGL: _draw_level - level=%-4d", (int)key);
+ GisOpenGL *opengl = user_data;
+ struct RenderLevel *level = value;
+ int nsorted = 0, nunsorted = 0;
+ GList *cur = NULL;
+
+ /* Draw opaque objects without sorting */
+ glDepthMask(TRUE);
+ glClear(GL_DEPTH_BUFFER_BIT);
+ for (cur = level->unsorted.next; cur; cur = cur->next, nunsorted++)
+ 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++)
+ gis_object_draw(GIS_OBJECT(cur->data), opengl);
+
+ /* TODO: Prune empty levels */
+
+ g_debug("GisOpenGL: _draw_level - drew %d,%d objects",
+ nunsorted, nsorted);
+ return FALSE;
}
-static gboolean on_expose(GisOpenGL *self, GdkEventExpose *event, gpointer _)
+
+static gboolean on_expose(GisOpenGL *opengl, GdkEventExpose *event, gpointer _)
{
g_debug("GisOpenGL: on_expose - begin");
- gis_opengl_begin(self);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ glClear(GL_COLOR_BUFFER_BIT);
-#ifndef ROAM_DEBUG
- set_visuals(self);
- glEnable(GL_TEXTURE_2D);
- glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- roam_sphere_draw(self->sphere);
-#else
- set_visuals(self);
- glColor4f(0.0, 0.0, 9.0, 0.6);
+ _set_visuals(opengl);
+#ifdef ROAM_DEBUG
+ 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(self->sphere);
-
- //roam_sphere_draw_normals(self->sphere);
+ 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);
+ g_mutex_unlock(opengl->objects_lock);
+ if (opengl->wireframe) {
+ glClear(GL_DEPTH_BUFFER_BIT);
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ roam_sphere_draw(opengl->sphere);
+ }
#endif
- gis_plugins_foreach(self->plugins, G_CALLBACK(on_expose_plugin), self);
+ GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(opengl));
+ gdk_gl_drawable_swap_buffers(gldrawable);
- set_visuals(self);
- gis_opengl_end(self);
- gis_opengl_flush(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 _)
+static gboolean on_key_press(GisOpenGL *opengl, 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;
- 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 */
+ if (kv == GDK_w) {
+ opengl->wireframe = !opengl->wireframe;
+ gtk_widget_queue_draw(GTK_WIDGET(opengl));
+ }
#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);
- else if (kv == GDK_r) roam_sphere_split_merge(self->sphere);
- else if (kv == GDK_u) roam_sphere_update_errors(self->sphere);
- gtk_widget_queue_draw(GTK_WIDGET(self));
+ else if (kv == GDK_n) roam_sphere_split_one(opengl->sphere);
+ 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);
+ gtk_widget_queue_draw(GTK_WIDGET(opengl));
#endif
-
- return TRUE;
+ return FALSE;
}
-static void on_view_changed(GisView *view,
- gdouble _1, gdouble _2, gdouble _3, GisOpenGL *self)
+static gboolean _update_errors_cb(gpointer _opengl)
+{
+ 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,
+ gdouble _1, gdouble _2, gdouble _3)
{
g_debug("GisOpenGL: on_view_changed");
- gis_opengl_begin(self);
- set_visuals(self);
+ _set_visuals(opengl);
#ifndef ROAM_DEBUG
- roam_sphere_update_errors(self->sphere);
+ 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
- gis_opengl_redraw(self);
- gis_opengl_end(self);
}
-static gboolean on_idle(GisOpenGL *self)
+static gboolean on_idle(GisOpenGL *opengl)
{
//g_debug("GisOpenGL: on_idle");
- gis_opengl_begin(self);
- if (roam_sphere_split_merge(self->sphere))
- gis_opengl_redraw(self);
- gis_opengl_end(self);
+ 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);
return TRUE;
}
-/***********
- * Methods *
- ***********/
-GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins)
+/*********************
+ * GisViewer methods *
+ *********************/
+/**
+ * gis_opengl_new:
+ * @plugins: the plugins store to use
+ * @prefs: the preferences object to use
+ *
+ * Create a new OpenGL renderer.
+ *
+ * Returns: the new #GisOpenGL
+ */
+GisViewer *gis_opengl_new(GisPlugins *plugins, GisPrefs *prefs)
{
g_debug("GisOpenGL: new");
- GisOpenGL *self = g_object_new(GIS_TYPE_OPENGL, NULL);
- self->world = world;
- self->view = view;
- 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);
+ GisViewer *opengl = g_object_new(GIS_TYPE_OPENGL, NULL);
+ gis_viewer_setup(opengl, plugins, prefs);
+ return opengl;
}
-void gis_opengl_center_position(GisOpenGL *self, gdouble lat, gdouble lon, gdouble elev)
+static void gis_opengl_center_position(GisViewer *_opengl, gdouble lat, gdouble lon, gdouble elev)
{
glRotatef(lon, 0, 1, 0);
glRotatef(-lat, 1, 0, 0);
glTranslatef(0, 0, elev2rad(elev));
}
-void gis_opengl_redraw(GisOpenGL *self)
+static void gis_opengl_project(GisViewer *_opengl,
+ gdouble lat, gdouble lon, gdouble elev,
+ gdouble *px, gdouble *py, gdouble *pz)
{
- g_debug("GisOpenGL: redraw");
- gtk_widget_queue_draw(GTK_WIDGET(self));
+ GisOpenGL *opengl = GIS_OPENGL(_opengl);
+ gdouble x, y, z;
+ lle2xyz(lat, lon, elev, &x, &y, &z);
+ gluProject(x, y, z,
+ opengl->sphere->view->model,
+ opengl->sphere->view->proj,
+ opengl->sphere->view->view,
+ px, py, pz);
}
-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));
+static void gis_opengl_set_height_func(GisViewer *_opengl, GisBounds *bounds,
+ RoamHeightFunc height_func, gpointer user_data, gboolean update)
+{
+ GisOpenGL *opengl = GIS_OPENGL(_opengl);
+ /* TODO: get points? */
+ g_mutex_lock(opengl->sphere_lock);
+ GList *triangles = roam_sphere_get_intersect(opengl->sphere, TRUE,
+ 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 (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]);
+ }
+ }
+ }
+ g_list_free(triangles);
+ g_mutex_unlock(opengl->sphere_lock);
+}
- if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
- g_assert_not_reached();
+static void _gis_opengl_clear_height_func_rec(RoamTriangle *root)
+{
+ if (!root)
+ return;
+ RoamPoint *points[] = {root->p.l, root->p.m, root->p.r, root->split};
+ for (int i = 0; i < G_N_ELEMENTS(points); i++) {
+ points[i]->height_func = NULL;
+ points[i]->height_data = NULL;
+ roam_point_update_height(points[i]);
+ }
+ _gis_opengl_clear_height_func_rec(root->kids[0]);
+ _gis_opengl_clear_height_func_rec(root->kids[1]);
}
-void gis_opengl_end(GisOpenGL *self)
+
+static void gis_opengl_clear_height_func(GisViewer *_opengl)
{
- g_assert(GIS_IS_OPENGL(self));
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self));
- gdk_gl_drawable_gl_end(gldrawable);
+ GisOpenGL *opengl = GIS_OPENGL(_opengl);
+ for (int i = 0; i < G_N_ELEMENTS(opengl->sphere->roots); i++)
+ _gis_opengl_clear_height_func_rec(opengl->sphere->roots[i]);
}
-void gis_opengl_flush(GisOpenGL *self)
+
+static gpointer gis_opengl_add(GisViewer *_opengl, GisObject *object,
+ gint key, gboolean sort)
{
- 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(_opengl));
+ GisOpenGL *opengl = GIS_OPENGL(_opengl);
+ g_mutex_lock(opengl->objects_lock);
+ struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)key);
+ if (!level) {
+ level = g_new0(struct RenderLevel, 1);
+ g_tree_insert(opengl->objects, (gpointer)key, level);
+ }
+ GList *list = sort ? &level->sorted : &level->unsorted;
+ /* Put the link in the list */
+ 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;
+ /* 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;
+}
/****************
* GObject code *
****************/
-G_DEFINE_TYPE(GisOpenGL, gis_opengl, GTK_TYPE_DRAWING_AREA);
-static void gis_opengl_init(GisOpenGL *self)
+static int _objects_cmp(gconstpointer _a, gconstpointer _b, gpointer _)
+{
+ gint a = (int)_a, b = (int)_b;
+ return a < b ? -1 :
+ a > b ? 1 : 0;
+}
+static void _objects_free(gpointer value)
+{
+ struct RenderLevel *level = value;
+ if (level->sorted.next)
+ g_list_free(level->sorted.next);
+ if (level->unsorted.next)
+ g_list_free(level->unsorted.next);
+ g_free(level);
+}
+
+G_DEFINE_TYPE(GisOpenGL, gis_opengl, GIS_TYPE_VIEWER);
+static void gis_opengl_init(GisOpenGL *opengl)
{
g_debug("GisOpenGL: init");
/* OpenGL setup */
GDK_GL_MODE_DOUBLE | GDK_GL_MODE_ALPHA);
if (!glconfig)
g_error("Failed to create glconfig");
- if (!gtk_widget_set_gl_capability(GTK_WIDGET(self),
+ if (!gtk_widget_set_gl_capability(GTK_WIDGET(opengl),
glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
g_error("GL lacks required capabilities");
g_object_unref(glconfig);
- gtk_widget_set_size_request(GTK_WIDGET(self), 600, 550);
- gtk_widget_set_events(GTK_WIDGET(self),
- GDK_BUTTON_PRESS_MASK |
- GDK_ENTER_NOTIFY_MASK |
- GDK_KEY_PRESS_MASK);
- g_object_set(self, "can-focus", TRUE, NULL);
+ 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
- self->sm_source = g_timeout_add(10, (GSourceFunc)on_idle, self);
+ 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
- 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);
+ gtk_widget_add_events(GTK_WIDGET(opengl), GDK_KEY_PRESS_MASK);
+ g_signal_connect(opengl, "realize", G_CALLBACK(on_realize), NULL);
+ g_signal_connect(opengl, "configure-event", G_CALLBACK(on_configure), NULL);
+ g_signal_connect(opengl, "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(opengl, "key-press-event", G_CALLBACK(on_key_press), NULL);
+
+ g_signal_connect(opengl, "location-changed", G_CALLBACK(on_view_changed), NULL);
+ g_signal_connect(opengl, "rotation-changed", G_CALLBACK(on_view_changed), NULL);
}
-static void gis_opengl_dispose(GObject *_self)
+static void gis_opengl_dispose(GObject *_opengl)
{
g_debug("GisOpenGL: dispose");
- GisOpenGL *self = GIS_OPENGL(_self);
- if (self->sm_source) {
- g_source_remove(self->sm_source);
- self->sm_source = 0;
- }
- if (self->sphere) {
- roam_sphere_free(self->sphere);
- self->sphere = NULL;
+ GisOpenGL *opengl = GIS_OPENGL(_opengl);
+ if (opengl->sm_source[0]) {
+ g_source_remove(opengl->sm_source[0]);
+ opengl->sm_source[0] = 0;
}
- if (self->world) {
- g_object_unref(self->world);
- self->world = NULL;
+ if (opengl->sm_source[1]) {
+ g_source_remove(opengl->sm_source[1]);
+ opengl->sm_source[1] = 0;
}
- if (self->view) {
- g_object_unref(self->view);
- self->view = NULL;
+ if (opengl->ue_source) {
+ g_source_remove(opengl->ue_source);
+ opengl->ue_source = 0;
}
- G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self);
+ G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_opengl);
}
-static void gis_opengl_finalize(GObject *_self)
+static void gis_opengl_finalize(GObject *_opengl)
{
g_debug("GisOpenGL: finalize");
- GisOpenGL *self = GIS_OPENGL(_self);
- G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_self);
+ 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);
}
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->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->add = gis_opengl_add;
+ viewer_class->remove = gis_opengl_remove;
}
projects / grits / blobdiff