#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"
-#include "wms.h"
#define FOV_DIST 2000.0
#define MPPX(dist) (4*dist/FOV_DIST)
-//#define ROAM_DEBUG
+// #define ROAM_DEBUG
-/*************
- * ROAM Code *
- *************/
-void roam_queue_draw(WmsCacheNode *node, gpointer _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);
+}
+
+
+/********************
+ * Object handleing *
+ ********************/
+static void _draw_marker(GisOpenGL *self, GisMarker *marker)
{
- gtk_widget_queue_draw(GTK_WIDGET(_self));
+ 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);
+
+ g_debug("GisOpenGL: draw_marker - texture=%d", marker->tex);
+
+ 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);
+ g_debug("bind_texture: %d", 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_objects(GisOpenGL *self)
+{
+ g_debug("GisOpenGL: draw_objects");
+ /* Draw objects */
+ for (GList *cur = self->objects; cur; cur = cur->next) {
+ glMatrixMode(GL_PROJECTION); glPushMatrix();
+ glMatrixMode(GL_MODELVIEW); glPushMatrix();
+ GisObject *object = cur->data;
+ switch (object->type) {
+ case GIS_TYPE_MARKER:
+ _draw_marker(self, GIS_MARKER(object));
+ break;
+ default:
+ break;
+ }
+ 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 set_camera(GisOpenGL *self)
+static void _free_object(GisOpenGL *self, GisObject *object)
+{
+ g_debug("GisOpenGL: free_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;
+ }
+}
+
+/*************
+ * ROAM Code *
+ *************/
+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);
- 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};
glDisable(GL_TEXTURE_2D);
glDisable(GL_COLOR_MATERIAL);
- /* Camera */
- set_camera(self);
+ /* Camera 2 */
+ glTranslatef(0, 0, -elev2rad(elev));
+ glRotatef(lat, 1, 0, 0);
+ glRotatef(-lon, 0, 1, 0);
/* 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);
+ glColor4f(1, 1, 1, 1);
glDisable(GL_ALPHA_TEST);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
//glShadeModel(GL_FLAT);
+
+ roam_sphere_update_view(self->sphere);
}
*************/
static void on_realize(GisOpenGL *self, gpointer _)
{
- set_visuals(self);
+ g_debug("GisOpenGL: on_realize");
+ _set_visuals(self);
roam_sphere_update_errors(self->sphere);
}
static gboolean on_configure(GisOpenGL *self, GdkEventConfigure *event, gpointer _)
{
- g_debug("GisOpenGL: on_confiure");
- gis_opengl_begin(self);
+ 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);
+ /* Setup OpenGL Window */
+ glViewport(0, 0, width, height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
double ang = atan(height/FOV_DIST);
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);
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
- set_visuals(self);
- glEnable(GL_TEXTURE_2D);
- glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- roam_sphere_draw(self->sphere);
+ gis_plugins_foreach(GIS_VIEWER(self)->plugins,
+ G_CALLBACK(_on_expose_plugin), self);
+ _draw_objects(self);
+ 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);
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
- gis_plugins_foreach(self->plugins, G_CALLBACK(on_expose_plugin), self);
+ GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self));
+ gdk_gl_drawable_swap_buffers(gldrawable);
- set_visuals(self);
- gis_opengl_end(self);
- gis_opengl_flush(self);
+ _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;
- 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, -10);
- else if (kv == GDK_J) gis_view_rotate(self->view, 10, 0, 0);
- else if (kv == GDK_K) gis_view_rotate(self->view, -10, 0, 0);
- else if (kv == GDK_L) gis_view_rotate(self->view, 0, 0, 10);
-
+ gdk_threads_leave();
/* Testing */
+ 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 if (kv == GDK_r) roam_sphere_split_merge(self->sphere);
else if (kv == GDK_u) roam_sphere_update_errors(self->sphere);
+ gdk_threads_enter();
gtk_widget_queue_draw(GTK_WIDGET(self));
+#else
+ gdk_threads_enter();
#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 sphere)
{
- gis_opengl_begin(self);
- set_visuals(self);
+ roam_sphere_update_errors(sphere);
+ return FALSE;
+}
+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);
#ifndef ROAM_DEBUG
- roam_sphere_update_errors(self->sphere);
+ 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();
}
static gboolean on_idle(GisOpenGL *self)
{
- gis_opengl_begin(self);
+ //g_debug("GisOpenGL: on_idle");
+ gdk_threads_enter();
+ _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);
-
- /* TODO: update point eights sometime later so we have heigh-res heights for them */
- 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)
{
- set_camera(self);
+ GisOpenGL *self = GIS_OPENGL(_self);
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 *_self,
+ gdouble lat, gdouble lon, gdouble elev,
+ gdouble *px, gdouble *py, gdouble *pz)
{
- g_debug("GisOpenGL: gl_redraw");
- gtk_widget_queue_draw(GTK_WIDGET(self));
+ 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);
}
-void gis_opengl_begin(GisOpenGL *self)
+
+static void gis_opengl_render_tile(GisViewer *_self, GisTile *tile)
{
- g_assert(GIS_IS_OPENGL(self));
+ GisOpenGL *self = GIS_OPENGL(_self);
+ if (!tile || !tile->data)
+ return;
+ GList *triangles = roam_sphere_get_intersect(self->sphere,
+ tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
+ if (!triangles)
+ g_warning("GisOpenGL: render_tiles - No triangles to draw: edges=%f,%f,%f,%f",
+ tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
+ //g_message("rendering %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] = {
+ {(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},
+ };
+
+ 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);
+}
- GdkGLContext *glcontext = gtk_widget_get_gl_context(GTK_WIDGET(self));
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self));
+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;
+ gis_tile_foreach(tile, child)
+ if (!child || !child->data)
+ has_children = FALSE;
+ if (has_children)
+ /* Only render children */
+ gis_tile_foreach(tile, child)
+ gis_opengl_render_tiles(_self, child);
+ else
+ /* No children, render this tile */
+ gis_opengl_render_tile(_self, tile);
+}
- if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
- g_assert_not_reached();
+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? */
+ GList *triangles = roam_sphere_get_intersect(self->sphere,
+ tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.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++) {
+ points[i]->height_func = height_func;
+ points[i]->height_data = user_data;
+ roam_point_update_height(points[i]);
+ }
+ }
+ g_list_free(triangles);
}
-void gis_opengl_end(GisOpenGL *self)
+
+static void _gis_opengl_clear_height_func_rec(RoamTriangle *root)
{
- g_assert(GIS_IS_OPENGL(self));
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(self));
- gdk_gl_drawable_gl_end(gldrawable);
+ 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_flush(GisOpenGL *self)
+
+static void gis_opengl_clear_height_func(GisViewer *_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);
+ 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]);
+}
+
+static void gis_opengl_begin(GisViewer *_self)
+{
+ g_assert(GIS_IS_OPENGL(_self));
+ _gis_opengl_begin(GIS_OPENGL(_self));
}
+static void gis_opengl_end(GisViewer *_self)
+{
+ g_assert(GIS_IS_OPENGL(_self));
+ _gis_opengl_end(GIS_OPENGL(_self));
+}
+
+static void gis_opengl_add(GisViewer *_self, GisObject *object)
+{
+ g_assert(GIS_IS_OPENGL(_self));
+ GisOpenGL *self = GIS_OPENGL(_self);
+ _load_object(self, object);
+ self->objects = g_list_prepend(self->objects, object);
+}
+
+static void gis_opengl_remove(GisViewer *_self, GisObject *object)
+{
+ g_assert(GIS_IS_OPENGL(_self));
+ GisOpenGL *self = GIS_OPENGL(_self);
+ _free_object(self, object);
+ self->objects = g_list_remove(self->objects, object);
+}
/****************
* 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");
- self->bmng = wms_info_new_for_bmng(NULL, NULL);
- self->srtm = wms_info_new_for_srtm(NULL, NULL);
-
/* OpenGL setup */
GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(
GDK_GL_MODE_RGBA | GDK_GL_MODE_DEPTH |
GDK_KEY_PRESS_MASK);
g_object_set(self, "can-focus", TRUE, NULL);
+ self->sphere = roam_sphere_new(self);
+
#ifndef ROAM_DEBUG
- self->sm_source = g_timeout_add(10, (GSourceFunc)on_idle, self);
+ 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)
{
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->sm_source[0]) {
+ g_source_remove(self->sm_source[0]);
+ self->sm_source[0] = 0;
+ }
+ if (self->sm_source[1]) {
+ g_source_remove(self->sm_source[1]);
+ self->sm_source[1] = 0;
}
if (self->sphere) {
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);
- wms_info_free(self->bmng);
- wms_info_free(self->srtm);
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;
+ viewer_class->add = gis_opengl_add;
+ viewer_class->remove = gis_opengl_remove;
}
projects / grits / blobdiff