X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgrits-opengl.c;h=b2dca5eebab5922e832625d7dc6e85a45cd3369c;hp=172b606a959a9247406178f0a7748be6e8abdc62;hb=536c4ae84ecb423286423bd62bce106dc4a0072d;hpb=420f1ea8e4aea5dd7bddc77325ab643900c34cd5

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 172b606..b2dca5e 100644
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -48,6 +48,7 @@
  * 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 {
+	gint  num;
 	GList unsorted;
 	GList sorted;
 };
@@ -134,52 +135,24 @@ static void _set_visuals(GritsOpenGL *opengl)
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 	//glShadeModel(GL_FLAT);
 
-	g_mutex_lock(opengl->sphere_lock);
+	g_mutex_lock(&opengl->sphere_lock);
 	roam_sphere_update_view(opengl->sphere);
-	g_mutex_unlock(opengl->sphere_lock);
-}
-
-typedef gboolean (*GritsLevelFunc)(GritsObject *obj, gpointer user_data, gint level, gboolean sorted);
-
-static gboolean _foreach_object_cb(gpointer key, gpointer value, gpointer pointers)
-{
-	struct RenderLevel *level = value;
-	GritsLevelFunc user_func = ((gpointer*)pointers)[0];
-	gpointer       user_data = ((gpointer*)pointers)[1];
-	for (GList *cur = level->unsorted.next; cur; cur = cur->next)
-		if (user_func(cur->data, user_data, (gint)key, FALSE))
-			return TRUE;
-	for (GList *cur = level->sorted.next;   cur; cur = cur->next)
-		if (user_func(cur->data, user_data, (gint)key, TRUE))
-			return TRUE;
-	return FALSE;
-}
-
-static void _foreach_object(GritsOpenGL *opengl, GritsLevelFunc func, gpointer user_data)
-{
-	gpointer pointers[2] = {func, user_data};
-	g_tree_foreach(opengl->objects, _foreach_object_cb, pointers);
-}
-
-static gboolean _add_object_world(GritsObject *object, GPtrArray *array, gint level, gboolean sorted)
-{
-	if (level < GRITS_LEVEL_HUD)
-		g_ptr_array_add(array, object);
-	return FALSE;
-}
-
-static gboolean _add_object_ortho(GritsObject *object, GPtrArray *array, gint level, gboolean sorted)
-{
-	if (level >= GRITS_LEVEL_HUD)
-		g_ptr_array_add(array, object);
-	return FALSE;
+	g_mutex_unlock(&opengl->sphere_lock);
 }
 
 static GPtrArray *_objects_to_array(GritsOpenGL *opengl, gboolean ortho)
 {
 	GPtrArray *array = g_ptr_array_new();
-	GritsLevelFunc func = (GritsLevelFunc)(ortho ? _add_object_ortho : _add_object_world);
-	_foreach_object(opengl, func, array);
+	for (GList *i = opengl->objects->head; i; i = i->next) {
+		struct RenderLevel *level = i->data;
+		if ((ortho == TRUE  && level->num <  GRITS_LEVEL_HUD) ||
+		    (ortho == FALSE && level->num >= GRITS_LEVEL_HUD))
+			continue;
+		for (GList *j = level->unsorted.next; j; j = j->next)
+			g_ptr_array_add(array, j->data);
+		for (GList *j = level->sorted.next;   j; j = j->next)
+			g_ptr_array_add(array, j->data);
+	}
 	return array;
 }
 
@@ -192,15 +165,16 @@ static gboolean on_configure(GritsOpenGL *opengl, GdkEventConfigure *event, gpoi
 
 	_set_visuals(opengl);
 #ifndef ROAM_DEBUG
-	g_mutex_lock(opengl->sphere_lock);
+	g_mutex_lock(&opengl->sphere_lock);
 	roam_sphere_update_errors(opengl->sphere);
-	g_mutex_unlock(opengl->sphere_lock);
+	g_mutex_unlock(&opengl->sphere_lock);
 #endif
 
 	return FALSE;
 }
 
-static gint run_picking(GritsOpenGL *opengl, GdkEvent *event, GPtrArray *objects)
+static gint run_picking(GritsOpenGL *opengl, GdkEvent *event,
+		GPtrArray *objects, GritsObject **top)
 {
 	/* Setup picking buffers */
 	guint buffer[100][4] = {};
@@ -230,6 +204,7 @@ static gint run_picking(GritsOpenGL *opengl, GdkEvent *event, GPtrArray *objects
 		guint        index  = buffer[i][3];
 		GritsObject *object = objects->pdata[index];
 		object->state.picked = TRUE;
+		*top = object;
 	}
 
 	/* Notify objects of pointer movements */
@@ -241,7 +216,7 @@ static gint run_picking(GritsOpenGL *opengl, GdkEvent *event, GPtrArray *objects
 	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;
@@ -261,8 +236,9 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
 	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);
 	GPtrArray *world = _objects_to_array(opengl, FALSE);
 
@@ -270,22 +246,32 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
 	glMatrixMode(GL_PROJECTION); glLoadIdentity();
 	gluPickMatrix(gl_x, gl_y, delta, delta, viewport);
 	glMultMatrixd(projection);
-	gint world_hits = run_picking(opengl, (GdkEvent*)event, world);
+	gint world_hits = run_picking(opengl, (GdkEvent*)event, world, &top);
 
 	/* Run ortho picking */
 	glMatrixMode(GL_PROJECTION); glLoadIdentity();
 	gluPickMatrix(gl_x, gl_y, delta, delta, viewport);
 	glMatrixMode(GL_MODELVIEW);  glLoadIdentity();
 	glOrtho(0, viewport[2], viewport[3], 0, 1000, -1000);
-	gint ortho_hits = run_picking(opengl, (GdkEvent*)event, ortho);
+	gint ortho_hits = run_picking(opengl, (GdkEvent*)event, ortho, &top);
+
+	/* Update cursor */
+	static GdkCursor *cursor = NULL;
+	static GdkWindow *window = NULL;
+	if (!window || !cursor) {
+		cursor = gdk_cursor_new(GDK_FLEUR);
+		window = gtk_widget_get_window(GTK_WIDGET(opengl));
+	}
+	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 */
@@ -303,34 +289,38 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
 	return FALSE;
 }
 
-static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data)
+static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpointer _)
 {
-	GritsOpenGL *opengl = user_data;
-	glong lnum = (glong)key;
-	struct RenderLevel *level = value;
+	opengl->mouse_queue = *event;
+	gtk_widget_queue_draw(GTK_WIDGET(opengl));
+	return FALSE;
+}
+
+static void _draw_level(gpointer _level, gpointer _opengl)
+{
+	GritsOpenGL *opengl = _opengl;
+	struct RenderLevel *level = _level;
 
-	g_debug("GritsOpenGL: _draw_level - level=%-4ld", lnum);
+	g_debug("GritsOpenGL: _draw_level - level=%-4d", level->num);
 	int nsorted = 0, nunsorted = 0;
 	GList *cur = NULL;
 
 	/* Configure individual levels */
-	if (lnum < GRITS_LEVEL_WORLD) {
+	if (level->num < GRITS_LEVEL_WORLD) {
 		/* Disable depth for background levels */
 		glDepthMask(FALSE);
 		glDisable(GL_ALPHA_TEST);
-	} else if (lnum < GRITS_LEVEL_OVERLAY) {
+	} else if (level->num < GRITS_LEVEL_OVERLAY) {
 		/* Enable depth and alpha for world levels */
 		glEnable(GL_ALPHA_TEST);
 		glAlphaFunc(GL_GREATER, 0.1);
-		glDepthMask(TRUE);
 	} else {
 		/* Disable depth for Overlay/HUD levels */
-		// This causes rendering glitches not sure why..
-		//glDepthMask(FALSE);
+		glDepthMask(FALSE);
 	}
 
 	/* Start ortho */
-	if (lnum >= GRITS_LEVEL_HUD) {
+	if (level->num >= GRITS_LEVEL_HUD) {
 		glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
 		glMatrixMode(GL_MODELVIEW);  glPushMatrix(); glLoadIdentity();
 		gint win_width  = GTK_WIDGET(opengl)->allocation.width;
@@ -351,16 +341,18 @@ static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data)
 		grits_object_draw(GRITS_OBJECT(cur->data), opengl);
 
 	/* End ortho */
-	if (lnum >= GRITS_LEVEL_HUD) {
+	if (level->num >= GRITS_LEVEL_HUD) {
 		glMatrixMode(GL_PROJECTION); glPopMatrix();
 		glMatrixMode(GL_MODELVIEW);  glPopMatrix();
 	}
 
+	/* Leave depth buffer write enabled */
+	glDepthMask(TRUE);
+
 	/* TODO: Prune empty levels */
 
 	g_debug("GritsOpenGL: _draw_level - drew %d,%d objects",
 			nunsorted, nsorted);
-	return FALSE;
 }
 
 static gboolean on_expose(GritsOpenGL *opengl, GdkEventExpose *event, gpointer _)
@@ -368,7 +360,12 @@ static gboolean on_expose(GritsOpenGL *opengl, GdkEventExpose *event, gpointer _
 	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));
 
@@ -384,11 +381,11 @@ static gboolean on_expose(GritsOpenGL *opengl, GdkEventExpose *event, gpointer _
 	(void)_draw_level;
 	//roam_sphere_draw_normals(opengl->sphere);
 #else
-	g_mutex_lock(opengl->objects_lock);
+	g_mutex_lock(&opengl->objects_lock);
 	if (opengl->wireframe)
 		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-	g_tree_foreach(opengl->objects, _draw_level, opengl);
-	g_mutex_unlock(opengl->objects_lock);
+	g_queue_foreach(opengl->objects, _draw_level, opengl);
+	g_mutex_unlock(&opengl->objects_lock);
 #endif
 
 	gtk_gl_end(GTK_WIDGET(opengl));
@@ -424,16 +421,24 @@ static gboolean on_key_press(GritsOpenGL *opengl, GdkEventKey *event, gpointer _
 
 static gboolean on_chained_event(GritsOpenGL *opengl, GdkEvent *event, gpointer _)
 {
-	_foreach_object(opengl, (GritsLevelFunc)grits_object_event, event);
+	for (GList *i = opengl->objects->tail; i; i = i->prev) {
+		struct RenderLevel *level = i->data;
+		for (GList *j = level->unsorted.next; j; j = j->next)
+			if (grits_object_event(j->data, event))
+				return TRUE;
+		for (GList *j = level->sorted.next;   j; j = j->next)
+			if (grits_object_event(j->data, event))
+				return TRUE;
+	}
 	return FALSE;
 }
 
 static gboolean _update_errors_cb(gpointer _opengl)
 {
 	GritsOpenGL *opengl = _opengl;
-	g_mutex_lock(opengl->sphere_lock);
+	g_mutex_lock(&opengl->sphere_lock);
 	roam_sphere_update_errors(opengl->sphere);
-	g_mutex_unlock(opengl->sphere_lock);
+	g_mutex_unlock(&opengl->sphere_lock);
 	opengl->ue_source = 0;
 	return FALSE;
 }
@@ -455,10 +460,10 @@ static void on_view_changed(GritsOpenGL *opengl,
 static gboolean on_idle(GritsOpenGL *opengl)
 {
 	//g_debug("GritsOpenGL: on_idle");
-	g_mutex_lock(opengl->sphere_lock);
+	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);
+	g_mutex_unlock(&opengl->sphere_lock);
 	return TRUE;
 }
 
@@ -568,7 +573,7 @@ static void grits_opengl_set_height_func(GritsViewer *_opengl, GritsBounds *boun
 {
 	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) {
@@ -584,7 +589,7 @@ static void grits_opengl_set_height_func(GritsViewer *_opengl, GritsBounds *boun
 		}
 	}
 	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)
@@ -608,16 +613,45 @@ static void grits_opengl_clear_height_func(GritsViewer *_opengl)
 		_grits_opengl_clear_height_func_rec(opengl->sphere->roots[i]);
 }
 
+static gint _objects_find(gconstpointer a, gconstpointer b)
+{
+	const struct RenderLevel *level = a;
+	const gint *key = b;
+	return level->num == *key ? 0 : 1;
+}
+
+static gint _objects_sort(gconstpointer _a, gconstpointer _b, gpointer _)
+{
+	const struct RenderLevel *a = _a;
+	const struct RenderLevel *b = _b;
+	return a->num < b->num ? -1 :
+	       a->num > b->num ?  1 : 0;
+}
+
+static void _objects_free(gpointer value, gpointer _)
+{
+	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);
+}
+
 static gpointer grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
-		gint key, gboolean sort)
+		gint num, gboolean sort)
 {
 	g_assert(GRITS_IS_OPENGL(_opengl));
 	GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
-	g_mutex_lock(opengl->objects_lock);
-	struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)(gintptr)key);
-	if (!level) {
+	g_mutex_lock(&opengl->objects_lock);
+	struct RenderLevel *level = NULL;
+	GList *tmp = g_queue_find_custom(opengl->objects, &num, _objects_find);
+	if (tmp) {
+		level = tmp->data;
+	} else {
 		level = g_new0(struct RenderLevel, 1);
-		g_tree_insert(opengl->objects, (gpointer)(gintptr)key, level);
+		level->num = num;
+		g_queue_insert_sorted(opengl->objects, level, _objects_sort, NULL);
 	}
 	GList *list = sort ? &level->sorted : &level->unsorted;
 	/* Put the link in the list */
@@ -628,7 +662,7 @@ static gpointer grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
 	if (list->next)
 		list->next->prev = link;
 	list->next = link;
-	g_mutex_unlock(opengl->objects_lock);
+	g_mutex_unlock(&opengl->objects_lock);
 	return link;
 }
 
@@ -637,12 +671,12 @@ static GritsObject *grits_opengl_remove(GritsViewer *_opengl, GritsObject *objec
 	g_assert(GRITS_IS_OPENGL(_opengl));
 	GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
 	GList *link = object->ref;
-	g_mutex_lock(opengl->objects_lock);
+	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);
+	g_mutex_unlock(&opengl->objects_lock);
 	object->ref    = NULL;
 	object->viewer = NULL;
 	g_free(link);
@@ -653,30 +687,14 @@ static GritsObject *grits_opengl_remove(GritsViewer *_opengl, GritsObject *objec
 /****************
  * GObject code *
  ****************/
-static int _objects_cmp(gconstpointer _a, gconstpointer _b, gpointer _)
-{
-	gintptr a = (gintptr)_a, b = (gintptr)_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(GritsOpenGL, grits_opengl, GRITS_TYPE_VIEWER);
 static void grits_opengl_init(GritsOpenGL *opengl)
 {
 	g_debug("GritsOpenGL: init");
-	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();
+	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);
@@ -704,9 +722,10 @@ static void grits_opengl_finalize(GObject *_opengl)
 	g_debug("GritsOpenGL: finalize");
 	GritsOpenGL *opengl = GRITS_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_queue_foreach(opengl->objects, _objects_free, NULL);
+	g_queue_free(opengl->objects);
+	g_mutex_clear(&opengl->objects_lock);
+	g_mutex_clear(&opengl->sphere_lock);
 	G_OBJECT_CLASS(grits_opengl_parent_class)->finalize(_opengl);
 }
 static void grits_opengl_class_init(GritsOpenGLClass *klass)