glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
#ifndef ROAM_DEBUG
+ g_mutex_lock(&opengl->sphere_lock);
roam_sphere_update_errors(opengl->sphere);
roam_sphere_split_merge(opengl->sphere);
+ g_mutex_unlock(&opengl->sphere_lock);
#endif
#ifdef ROAM_DEBUG
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));
if (list->next)
list->next->prev = link;
list->next = link;
+ object->ref = link;
+ g_object_ref(object);
g_mutex_unlock(&opengl->objects_lock);
- return link;
}
-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);
- GList *link = object->ref;
+ if (!object->ref)
+ return;
g_mutex_lock(&opengl->objects_lock);
+ GList *link = object->ref;
/* 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);
+ object->ref = NULL;
g_object_unref(object);
- return object;
+ g_mutex_unlock(&opengl->objects_lock);
}
/****************