#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 "gis-object.h"
#include "roam.h"
#define FOV_DIST 2000.0
// #define ROAM_DEBUG
-/*************
- * ROAM Code *
- *************/
-static void set_visuals(GisOpenGL *self)
+/***********
+ * 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);
+}
+
+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);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
//glShadeModel(GL_FLAT);
+
+ roam_sphere_update_view(self->sphere);
+}
+
+
+/********************
+ * Object handleing *
+ ********************/
+static void _draw_marker(GisOpenGL *self, GisMarker *marker)
+{
+ GisPoint *point = gis_object_center(GIS_OBJECT(marker));
+ gdouble px, py, pz;
+ gis_viewer_project(GIS_VIEWER(self),
+ 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(self)->allocation.width,
+ 0, GTK_WIDGET(self)->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 *self, GisCallback *callback)
+{
+ callback->callback(callback, callback->user_data);
+}
+
+static void _draw_object(GisOpenGL *self, 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(self), &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);
+ switch (object->type) {
+ case GIS_TYPE_MARKER:
+ _draw_marker(self, GIS_MARKER(object));
+ break;
+ case GIS_TYPE_CALLBACK:
+ _draw_callback(self, GIS_CALLBACK(object));
+ break;
+ default:
+ break;
+ }
+ glPopAttrib();
+ glMatrixMode(GL_PROJECTION); glPopMatrix();
+ glMatrixMode(GL_MODELVIEW); glPopMatrix();
+}
+
+static void _load_object(GisOpenGL *self, GisObject *object)
+{
+ g_debug("GisOpenGL: load_object");
+ switch (object->type) {
+ case GIS_TYPE_MARKER: {
+ 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);
+
+ _gis_opengl_begin(self);
+ 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);
+ _gis_opengl_end(self);
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+static void _unload_object(GisOpenGL *self, GisObject *object)
+{
+ g_debug("GisOpenGL: unload_object");
+ switch (object->type) {
+ case GIS_TYPE_MARKER: {
+ GisMarker *marker = GIS_MARKER(object);
+ g_debug("delete_texture: %d", marker->tex);
+ glDeleteTextures(1, &marker->tex);
+ break;
+ }
+ default:
+ break;
+ }
}
/*************
* Callbacks *
*************/
+/* 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 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);
+ gluPerspective(rad2deg(ang)*2, width/height, 1, 10*EARTH_R);
#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 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 *self = 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++)
+ _draw_object(self, GIS_OBJECT(cur->data));
+
+ /* Freeze depth buffer and draw transparent objects sorted */
+ /* TODO: sorting */
+ glDepthMask(FALSE);
+ for (cur = level->sorted.next; cur; cur = cur->next, nsorted++)
+ _draw_object(self, GIS_OBJECT(cur->data));
+
+ /* 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 _)
{
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);
+ glClear(GL_COLOR_BUFFER_BIT);
- if (self->wireframe) {
- set_visuals(self);
- glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- roam_sphere_draw(self->sphere);
- }
-#else
- set_visuals(self);
+ _set_visuals(self);
+#ifdef ROAM_DEBUG
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);
+#else
+ g_tree_foreach(self->objects, _draw_level, self);
+ if (self->wireframe) {
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ roam_sphere_draw(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);
#else
gdk_threads_enter();
#endif
-
- return TRUE;
+ return FALSE;
}
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();
}
{
//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,
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;
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? */
_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();
+ g_assert(GIS_IS_OPENGL(_self));
+ _gis_opengl_end(GIS_OPENGL(_self));
}
-void gis_opengl_flush(GisOpenGL *self)
+
+static gpointer gis_opengl_add(GisViewer *_self, 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(_self));
+ GisOpenGL *self = GIS_OPENGL(_self);
+ _load_object(self, object);
+ struct RenderLevel *level = g_tree_lookup(self->objects, (gpointer)key);
+ if (!level) {
+ level = g_new0(struct RenderLevel, 1);
+ g_tree_insert(self->objects, (gpointer)key, level);
+ }
+ GList *list = sort ? &level->sorted : &level->unsorted;
+ list->next = g_list_prepend(list->next, object);
+ return list->next;
}
+static void gis_opengl_remove(GisViewer *_self, gpointer _link)
+{
+ g_assert(GIS_IS_OPENGL(_self));
+ GList *link = _link;
+ GisOpenGL *self = GIS_OPENGL(_self);
+ _unload_object(self, link->data);
+ /* Just unlink and free it (blowup link to avoid warnings) */
+ link = g_list_delete_link(NULL, link);
+}
/****************
* GObject code *
****************/
-G_DEFINE_TYPE(GisOpenGL, gis_opengl, GTK_TYPE_DRAWING_AREA);
+static int _objects_cmp(gconstpointer _a, gconstpointer _b)
+{
+ gint a = (int)_a, b = (int)_b;
+ return a < b ? -1 :
+ a > b ? 1 : 0;
+}
+
+G_DEFINE_TYPE(GisOpenGL, gis_opengl, GIS_TYPE_VIEWER);
static void gis_opengl_init(GisOpenGL *self)
{
g_debug("GisOpenGL: init");
GDK_KEY_PRESS_MASK);
g_object_set(self, "can-focus", TRUE, NULL);
+ self->objects = g_tree_new(_objects_cmp);
+ 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)
{
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;
- }
+ /* TODO: Cleanup/free objects tree */
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);
G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_self);
}
{
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;
+ viewer_class->add = gis_opengl_add;
+ viewer_class->remove = gis_opengl_remove;
}