Add cursor support to GritsObject

[grits] / src / grits-viewer.c

diff --git a/src/grits-viewer.c b/src/grits-viewer.c
index bb86d6473e5f7c29c21beab9503d9e9cf62350bb..92f6e863617940792d2c532074218ef82110bb1b 100644 (file)
--- a/src/grits-viewer.c
+++ b/src/grits-viewer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -160,11 +160,12 @@ static gboolean on_motion_notify(GritsViewer *viewer, GdkEventMotion *event, gpo
 {
        gdouble x = viewer->drag_x - event->x;
        gdouble y = viewer->drag_y - event->y;
-       gdouble lat, lon, elev, scale;
+       gdouble lat, lon, elev, scale, rx, ry, rz;
        grits_viewer_get_location(GRITS_VIEWER(viewer), &lat, &lon, &elev);
-       scale = elev/EARTH_R/15;
+       grits_viewer_get_rotation(GRITS_VIEWER(viewer), &rx,  &ry,  &rz);
+       scale = (elev/EARTH_R/14.1) * (sin(deg2rad(ABS(rx)))*4+1);
        switch (viewer->drag_mode) {
-       case GRITS_DRAG_PAN:  grits_viewer_pan(viewer, -y*scale, x*scale, 0); break;
+       case GRITS_DRAG_PAN:  grits_viewer_pan(viewer, -y*scale*0.782, x*scale, 0); break;
        case GRITS_DRAG_ZOOM: grits_viewer_zoom(viewer, pow(2, -y/500)); break;
        case GRITS_DRAG_TILT: grits_viewer_rotate(viewer, y/10, 0, x/10); break;
        }
@@ -179,13 +180,6 @@ static void on_view_changed(GritsViewer *viewer,
        gtk_widget_queue_draw(GTK_WIDGET(viewer));
 }
 
-static void on_realize(GritsViewer *viewer)
-{
-       GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR);
-       GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(viewer));
-       gdk_window_set_cursor(window, cursor);
-}
-
 /***********
  * Methods *
  ***********/
@@ -348,7 +342,7 @@ void grits_viewer_set_rotation(GritsViewer *viewer, gdouble x, gdouble y, gdoubl
 void grits_viewer_get_rotation(GritsViewer *viewer, gdouble *x, gdouble *y, gdouble *z)
 {
        g_assert(GRITS_IS_VIEWER(viewer));
-       g_debug("GritsViewer: get_rotation");
+       //g_debug("GritsViewer: get_rotation");
        *x = viewer->rotation[0];
        *y = viewer->rotation[1];
        *z = viewer->rotation[2];
@@ -444,8 +438,8 @@ void grits_viewer_center_position(GritsViewer *viewer,
  * grits_viewer_project:
  * @viewer: the viewer
  * @lat:  the latitude
- * @lon:  the latitude
- * @elev: the latitude
+ * @lon:  the longitude
+ * @elev: the elevation
  * @px:   the project x coordinate
  * @py:   the project y coordinate
  * @pz:   the project z coordinate
@@ -464,6 +458,31 @@ void grits_viewer_project(GritsViewer *viewer,
        klass->project(viewer, lat, lon, elev, px, py, pz);
 }
 
+/**
+ * grits_viewer_unproject:
+ * @viewer: the viewer
+ * @x:    x coordinate in screen space
+ * @y:    y coordinate in screen space
+ * @z:    z coordinate in screen space, or -1 to use the value
+ *        from the depth buffer at x and y as the z value
+ * @lat:  the latitude
+ * @lon:  the longitude
+ * @elev: the elevation
+ *
+ * Project a x, y point in screen space to a latitude, longitude, and elevation
+ * point. Useful for finding the position of the cursor or another on-screen
+ * object in world coordinates.
+ */
+void grits_viewer_unproject(GritsViewer *viewer,
+               gdouble px, gdouble py, gdouble pz,
+               gdouble *lat, gdouble *lon, gdouble *elev)
+{
+       GritsViewerClass *klass = GRITS_VIEWER_GET_CLASS(viewer);
+       if (!klass->unproject)
+               g_warning("GritsViewer: unproject - Unimplemented");
+       klass->unproject(viewer, px, py, pz, lat, lon, elev);
+}
+
 /**
  * grits_viewer_clear_height_func:
  * @viewer: the viewer
@@ -541,15 +560,12 @@ gpointer grits_viewer_add(GritsViewer *viewer, GritsObject *object,
  *
  * Returns: the #GritsObject referenced by the handle
  */
-GritsObject *grits_viewer_remove(GritsViewer *viewer, gpointer _object)
+GritsObject *grits_viewer_remove(GritsViewer *viewer, GritsObject *object)
 {
-       GritsObject *object = _object;
        GritsViewerClass *klass = GRITS_VIEWER_GET_CLASS(viewer);
        if (!klass->remove)
                g_warning("GritsViewer: remove - Unimplemented");
-       klass->remove(viewer, object->ref);
-       object->ref    = NULL;
-       object->viewer = NULL;
+       klass->remove(viewer, object);
        return object;
 }
 
@@ -564,7 +580,7 @@ static void grits_viewer_init(GritsViewer *viewer)
        viewer->time        = time(NULL);
        viewer->location[0] = 40;
        viewer->location[1] = -100;
-       viewer->location[2] = 1.5*EARTH_R;
+       viewer->location[2] = EARTH_R;
        viewer->rotation[0] = 0;
        viewer->rotation[1] = 0;
        viewer->rotation[2] = 0;
@@ -585,13 +601,12 @@ static void grits_viewer_init(GritsViewer *viewer)
 
        g_signal_connect(viewer, "location-changed",     G_CALLBACK(on_view_changed),   NULL);
        g_signal_connect(viewer, "rotation-changed",     G_CALLBACK(on_view_changed),   NULL);
-
-       g_signal_connect(viewer, "realize",              G_CALLBACK(on_realize),        NULL);
 }
 static void grits_viewer_finalize(GObject *gobject)
 {
        g_debug("GritsViewer: finalize");
        G_OBJECT_CLASS(grits_viewer_parent_class)->finalize(gobject);
+       g_debug("GritsViewer: finalize - done");
 }
 static void grits_viewer_class_init(GritsViewerClass *klass)
 {