Fix 64-bit warnings

[grits] / src / grits-opengl.c

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 277c11e47ac9092e17bf9a8de0d80529329fc310..59fea09edccd9443b5bb1a25dc47aa29bf20d668 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -142,6 +142,18 @@ static void _foreach_object(GritsOpenGL *opengl, GFunc func, gpointer user_data)
        g_tree_foreach(opengl->objects, _foreach_object_cb, pointers);
 }
 
+static void _add_object(GritsObject *object, GPtrArray *array)
+{
+       g_ptr_array_add(array, object);
+}
+
+static GPtrArray *_objects_to_array(GritsOpenGL *opengl)
+{
+       GPtrArray *array = g_ptr_array_new();
+       _foreach_object(opengl, (GFunc)_add_object, array);
+       return array;
+}
+
 /*************
  * Callbacks *
  *************/
@@ -170,7 +182,7 @@ static gboolean on_configure(GritsOpenGL *opengl, GdkEventConfigure *event, gpoi
 
 static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data)
 {
-       g_debug("GritsOpenGL: _draw_level - level=%-4d", (int)key);
+       g_debug("GritsOpenGL: _draw_level - level=%-4ld", (glong)key);
        GritsOpenGL *opengl = user_data;
        struct RenderLevel *level = value;
        int nsorted = 0, nunsorted = 0;
@@ -255,7 +267,14 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
 
        /* Run picking */
        g_mutex_lock(opengl->objects_lock);
-       _foreach_object(opengl, (GFunc)grits_object_pick_begin, opengl);
+       GPtrArray *objects = _objects_to_array(opengl);
+       for (guint i = 0; i < objects->len; i++) {
+               glPushName(i);
+               GritsObject *object = objects->pdata[i];
+               object->state.picked = FALSE;
+               grits_object_pick(object, opengl);
+               glPopName();
+       }
        int hits = glRenderMode(GL_RENDER);
        g_debug("GritsOpenGL: on_motion_notify - hits=%d ev=%.0lf,%.0lf",
                        hits, gl_x, gl_y);
@@ -265,10 +284,15 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
                //g_debug("\t\tz1:    %f", (float)buffer[i][1]/0x7fffffff);
                //g_debug("\t\tz2:    %f", (float)buffer[i][2]/0x7fffffff);
                //g_debug("\t\tname:  %p", (gpointer)buffer[i][3]);
-               GritsObject *object = GRITS_OBJECT(buffer[i][3]);
-               grits_object_pick_pointer(object, gl_x, gl_y);
+               guint        index  = buffer[i][3];
+               GritsObject *object = objects->pdata[index];
+               object->state.picked = TRUE;
+       }
+       for (guint i = 0; i < objects->len; i++) {
+               GritsObject *object = objects->pdata[i];
+               grits_object_set_pointer(object, object->state.picked);
        }
-       _foreach_object(opengl, (GFunc)grits_object_pick_end, NULL);
+       g_ptr_array_free(objects, TRUE);
        g_mutex_unlock(opengl->objects_lock);
 
        /* Cleanup */
@@ -465,10 +489,10 @@ static gpointer grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
        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)key);
+       struct RenderLevel *level = g_tree_lookup(opengl->objects, (gpointer)(gintptr)key);
        if (!level) {
                level = g_new0(struct RenderLevel, 1);
-               g_tree_insert(opengl->objects, (gpointer)key, level);
+               g_tree_insert(opengl->objects, (gpointer)(gintptr)key, level);
        }
        GList *list = sort ? &level->sorted : &level->unsorted;
        /* Put the link in the list */
@@ -506,7 +530,7 @@ static GritsObject *grits_opengl_remove(GritsViewer *_opengl, GritsObject *objec
  ****************/
 static int _objects_cmp(gconstpointer _a, gconstpointer _b, gpointer _)
 {
-       gint a = (int)_a, b = (int)_b;
+       gintptr a = (gintptr)_a, b = (gintptr)_b;
        return a < b ? -1 :
               a > b ?  1 : 0;
 }