/***********
* Helpers *
***********/
-static void _set_visuals(GritsOpenGL *opengl)
+static void _set_projection(GritsOpenGL *opengl)
{
double lat, lon, elev, rx, ry, rz;
grits_viewer_get_location(GRITS_VIEWER(opengl), &lat, &lon, &elev);
double near = MAX(elev*0.75 - atmos, 50); // View 100km of atmosphere
double far = elev + 2*EARTH_R + atmos; // on both sides of the earth
- grits_viewer_get_location(GRITS_VIEWER(opengl), &lat, &lon, &elev);
glViewport(0, 0, width, height);
gluPerspective(rad2deg(ang), width/height, near, far);
glRotatef(rx, 1, 0, 0);
glRotatef(rz, 0, 0, 1);
+ /* Lighting */
+ float light_position[] = {-13*EARTH_R, 1*EARTH_R, 3*EARTH_R, 1.0f};
+ glLightfv(GL_LIGHT0, GL_POSITION, light_position);
+
+ /* Camera 2 */
+ glTranslatef(0, 0, -elev2rad(elev));
+ glRotatef(lat, 1, 0, 0);
+ glRotatef(-lon, 0, 1, 0);
+
+ /* Update roam view */
+ g_mutex_lock(&opengl->sphere_lock);
+ roam_sphere_update_view(opengl->sphere);
+ g_mutex_unlock(&opengl->sphere_lock);
+}
+
+static void _set_settings(GritsOpenGL *opengl)
+{
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glEnable(GL_BLEND);
+ glDisable(GL_ALPHA_TEST);
+
+ glEnable(GL_LIGHT0);
+ glEnable(GL_LIGHTING);
+
+ glEnable(GL_LINE_SMOOTH);
+
+ glDisable(GL_TEXTURE_2D);
+ glDisable(GL_COLOR_MATERIAL);
+
+ if (opengl->wireframe)
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ else
+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+
/* Lighting */
#ifdef ROAM_DEBUG
float light_ambient[] = {0.7f, 0.7f, 0.7f, 1.0f};
float light_ambient[] = {0.2f, 0.2f, 0.2f, 1.0f};
float light_diffuse[] = {0.8f, 0.8f, 0.8f, 1.0f};
#endif
- float light_position[] = {-13*EARTH_R, 1*EARTH_R, 3*EARTH_R, 1.0f};
glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
- glLightfv(GL_LIGHT0, GL_POSITION, light_position);
- glEnable(GL_LIGHT0);
- glEnable(GL_LIGHTING);
+ /* Materials */
float material_ambient[] = {1.0, 1.0, 1.0, 1.0};
float material_diffuse[] = {1.0, 1.0, 1.0, 1.0};
float material_specular[] = {0.0, 0.0, 0.0, 1.0};
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, material_diffuse);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, material_specular);
glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, material_emission);
- glDisable(GL_TEXTURE_2D);
- glDisable(GL_COLOR_MATERIAL);
-
- /* Camera 2 */
- glTranslatef(0, 0, -elev2rad(elev));
- glRotatef(lat, 1, 0, 0);
- glRotatef(-lon, 0, 1, 0);
-
- glDisable(GL_ALPHA_TEST);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glEnable(GL_BLEND);
-
-#ifndef ROAM_DEBUG
+#ifdef ROAM_DEBUG
+ glColor4f(1.0, 1.0, 1.0, 1.0);
+ glLineWidth(2);
+#else
glCullFace(GL_BACK);
glEnable(GL_CULL_FACE);
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);
}
static GPtrArray *_objects_to_array(GritsOpenGL *opengl, gboolean ortho)
/*************
* Callbacks *
*************/
-static gboolean on_configure(GritsOpenGL *opengl, GdkEventConfigure *event, gpointer _)
-{
- g_debug("GritsOpenGL: on_configure");
-
- _set_visuals(opengl);
-#ifndef ROAM_DEBUG
- g_mutex_lock(opengl->sphere_lock);
- roam_sphere_update_errors(opengl->sphere);
- g_mutex_unlock(opengl->sphere_lock);
-#endif
-
- return FALSE;
-}
static gint run_picking(GritsOpenGL *opengl, GdkEvent *event,
GPtrArray *objects, GritsObject **top)
return hits;
}
-static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpointer _)
+static gboolean run_mouse_move(GritsOpenGL *opengl, GdkEventMotion *event)
{
gdouble height = GTK_WIDGET(opengl)->allocation.height;
gdouble gl_x = event->x;
glMatrixMode(GL_MODELVIEW); glPushMatrix();
glMatrixMode(GL_PROJECTION); glPushMatrix();
- g_mutex_lock(opengl->objects_lock);
+ g_mutex_lock(&opengl->objects_lock);
GritsObject *top = NULL;
GPtrArray *ortho = _objects_to_array(opengl, TRUE);
GdkCursor *topcursor = top && top->cursor ? top->cursor : cursor;
gdk_window_set_cursor(window, topcursor);
- g_debug("GritsOpenGL: on_motion_notify - hits=%d/%d,%d/%d ev=%.0lf,%.0lf",
+ g_debug("GritsOpenGL: run_mouse_move - hits=%d/%d,%d/%d ev=%.0lf,%.0lf",
world_hits, world->len, ortho_hits, ortho->len, gl_x, gl_y);
g_ptr_array_free(world, TRUE);
g_ptr_array_free(ortho, TRUE);
- g_mutex_unlock(opengl->objects_lock);
-
+ g_mutex_unlock(&opengl->objects_lock);
/* Test unproject */
//gdouble lat, lon, elev;
return FALSE;
}
+static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpointer _)
+{
+ opengl->mouse_queue = *event;
+ gtk_widget_queue_draw(GTK_WIDGET(opengl));
+ return FALSE;
+}
+
static void _draw_level(gpointer _level, gpointer _opengl)
{
GritsOpenGL *opengl = _opengl;
g_debug("GritsOpenGL: on_expose - begin");
if (opengl->pickmode)
- return on_motion_notify(opengl, (GdkEventMotion*)event, NULL);
+ return run_mouse_move(opengl, (GdkEventMotion*)event);
+
+ if (opengl->mouse_queue.type != GDK_NOTHING) {
+ run_mouse_move(opengl, &opengl->mouse_queue);
+ opengl->mouse_queue.type = GDK_NOTHING;
+ }
gtk_gl_begin(GTK_WIDGET(opengl));
+ _set_settings(opengl);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- _set_visuals(opengl);
+#ifndef ROAM_DEBUG
+ roam_sphere_update_errors(opengl->sphere);
+ roam_sphere_split_merge(opengl->sphere);
+#endif
+
#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(opengl->sphere);
+ roam_sphere_draw_normals(opengl->sphere);
(void)_draw_level;
- //roam_sphere_draw_normals(opengl->sphere);
#else
- g_mutex_lock(opengl->objects_lock);
- if (opengl->wireframe)
- glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ g_mutex_lock(&opengl->objects_lock);
g_queue_foreach(opengl->objects, _draw_level, opengl);
- g_mutex_unlock(opengl->objects_lock);
+ g_mutex_unlock(&opengl->objects_lock);
#endif
gtk_gl_end(GTK_WIDGET(opengl));
return FALSE;
}
-static gboolean _update_errors_cb(gpointer _opengl)
-{
- GritsOpenGL *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(GritsOpenGL *opengl,
- gdouble _1, gdouble _2, gdouble _3)
-{
- g_debug("GritsOpenGL: on_view_changed");
- _set_visuals(opengl);
-#ifndef ROAM_DEBUG
- 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(GritsOpenGL *opengl)
-{
- //g_debug("GritsOpenGL: on_idle");
- 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;
-}
-
static void on_realize(GritsOpenGL *opengl, gpointer _)
{
g_debug("GritsOpenGL: on_realize");
/* Connect signals and idle functions now that opengl is fully initialized */
gtk_widget_add_events(GTK_WIDGET(opengl), GDK_KEY_PRESS_MASK);
- g_signal_connect(opengl, "configure-event", G_CALLBACK(on_configure), NULL);
+ g_signal_connect(opengl, "configure-event", G_CALLBACK(_set_projection), NULL);
g_signal_connect(opengl, "expose-event", G_CALLBACK(on_expose), NULL);
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);
+ g_signal_connect(opengl, "location-changed", G_CALLBACK(_set_projection), NULL);
+ g_signal_connect(opengl, "rotation-changed", G_CALLBACK(_set_projection), NULL);
g_signal_connect(opengl, "motion-notify-event", G_CALLBACK(on_motion_notify), NULL);
g_signal_connect_after(opengl, "key-press-event", G_CALLBACK(on_chained_event), NULL);
g_signal_connect_after(opengl, "button-release-event", G_CALLBACK(on_chained_event), NULL);
g_signal_connect_after(opengl, "motion-notify-event", G_CALLBACK(on_chained_event), NULL);
-#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
-
/* Re-queue resize incase configure was triggered before realize */
gtk_widget_queue_resize(GTK_WIDGET(opengl));
}
{
GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
/* TODO: get points? */
- g_mutex_lock(opengl->sphere_lock);
+ 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) {
}
}
g_list_free(triangles);
- g_mutex_unlock(opengl->sphere_lock);
+ g_mutex_unlock(&opengl->sphere_lock);
}
static void _grits_opengl_clear_height_func_rec(RoamTriangle *root)
{
struct RenderLevel *level = value;
if (level->sorted.next)
- g_list_free(level->sorted.next);
+ g_list_free_full(level->sorted.next, g_object_unref);
if (level->unsorted.next)
- g_list_free(level->unsorted.next);
+ g_list_free_full(level->unsorted.next, g_object_unref);
g_free(level);
}
-static gpointer grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
+static void grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
gint num, gboolean sort)
{
g_assert(GRITS_IS_OPENGL(_opengl));
GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
- g_mutex_lock(opengl->objects_lock);
+ g_mutex_lock(&opengl->objects_lock);
struct RenderLevel *level = NULL;
GList *tmp = g_queue_find_custom(opengl->objects, &num, _objects_find);
if (tmp) {
if (list->next)
list->next->prev = link;
list->next = link;
- g_mutex_unlock(opengl->objects_lock);
- return link;
+ object->ref = link;
+ g_mutex_unlock(&opengl->objects_lock);
}
-static GritsObject *grits_opengl_remove(GritsViewer *_opengl, GritsObject *object)
+void grits_opengl_remove(GritsViewer *_opengl, GritsObject *object)
{
g_assert(GRITS_IS_OPENGL(_opengl));
GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
+ g_mutex_lock(&opengl->objects_lock);
GList *link = object->ref;
- g_mutex_lock(opengl->objects_lock);
/* Just unlink and free it, link->prev is assured */
link->prev->next = link->next;
if (link->next)
link->next->prev = link->prev;
- g_mutex_unlock(opengl->objects_lock);
- object->ref = NULL;
- object->viewer = NULL;
g_free(link);
- g_object_unref(object);
- return object;
+ g_mutex_unlock(&opengl->objects_lock);
}
/****************
static void grits_opengl_init(GritsOpenGL *opengl)
{
g_debug("GritsOpenGL: init");
- opengl->objects = g_queue_new();
- opengl->objects_lock = g_mutex_new();
- opengl->sphere = roam_sphere_new(opengl);
- opengl->sphere_lock = g_mutex_new();
+ opengl->objects = g_queue_new();
+ opengl->sphere = roam_sphere_new(opengl);
+ g_mutex_init(&opengl->objects_lock);
+ g_mutex_init(&opengl->sphere_lock);
gtk_gl_enable(GTK_WIDGET(opengl));
gtk_widget_add_events(GTK_WIDGET(opengl), GDK_KEY_PRESS_MASK);
g_signal_connect(opengl, "map", G_CALLBACK(on_realize), NULL);
{
g_debug("GritsOpenGL: dispose");
GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
- if (opengl->sm_source[0]) {
- g_source_remove(opengl->sm_source[0]);
- opengl->sm_source[0] = 0;
- }
- if (opengl->sm_source[1]) {
- g_source_remove(opengl->sm_source[1]);
- opengl->sm_source[1] = 0;
- }
- if (opengl->ue_source) {
- g_source_remove(opengl->ue_source);
- opengl->ue_source = 0;
+ if (opengl->objects) {
+ GQueue *objects = opengl->objects;;
+ opengl->objects = NULL;
+ g_mutex_lock(&opengl->objects_lock);
+ g_queue_foreach(objects, _objects_free, NULL);
+ g_queue_free(objects);
+ g_mutex_unlock(&opengl->objects_lock);
}
G_OBJECT_CLASS(grits_opengl_parent_class)->dispose(_opengl);
}
g_debug("GritsOpenGL: finalize");
GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
roam_sphere_free(opengl->sphere);
- g_queue_foreach(opengl->objects, _objects_free, NULL);
- g_queue_free(opengl->objects);
- g_mutex_free(opengl->objects_lock);
- g_mutex_free(opengl->sphere_lock);
+ g_mutex_clear(&opengl->objects_lock);
+ g_mutex_clear(&opengl->sphere_lock);
+ gtk_gl_disable(GTK_WIDGET(opengl));
G_OBJECT_CLASS(grits_opengl_parent_class)->finalize(_opengl);
}
static void grits_opengl_class_init(GritsOpenGLClass *klass)
projects / grits / blobdiff