Limit rotation to -180 .. 180

[grits] / src / grits-viewer.c

diff --git a/src/grits-viewer.c b/src/grits-viewer.c
index f7d70e9fa427836d79f054f0950e156226d1e60a..79765e12a6933080f5efded6dd20a4ed02fe6e50 100644 (file)
--- a/src/grits-viewer.c
+++ b/src/grits-viewer.c
@@ -61,6 +61,16 @@ static void _grits_viewer_fix_location(GritsViewer *viewer)
        viewer->location[2] = ABS(viewer->location[2]);
 }
 
+static void _grits_viewer_fix_rotation(GritsViewer *viewer)
+{
+       while (viewer->rotation[0] < -180) viewer->rotation[0] += 360;
+       while (viewer->rotation[0] >  180) viewer->rotation[0] -= 360;
+       while (viewer->rotation[1] < -180) viewer->rotation[1] += 360;
+       while (viewer->rotation[1] >  180) viewer->rotation[1] -= 360;
+       while (viewer->rotation[2] < -180) viewer->rotation[2] += 360;
+       while (viewer->rotation[2] >  180) viewer->rotation[2] -= 360;
+}
+
 /* Signal helpers */
 static void _grits_viewer_emit_location_changed(GritsViewer *viewer)
 {
@@ -180,13 +190,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 *
  ***********/
@@ -334,6 +337,7 @@ void grits_viewer_set_rotation(GritsViewer *viewer, gdouble x, gdouble y, gdoubl
        viewer->rotation[0] = x;
        viewer->rotation[1] = y;
        viewer->rotation[2] = z;
+       _grits_viewer_fix_rotation(viewer);
        _grits_viewer_emit_rotation_changed(viewer);
 }
 
@@ -371,6 +375,7 @@ void grits_viewer_rotate(GritsViewer *viewer, gdouble x, gdouble y, gdouble z)
        viewer->rotation[0] += x;
        viewer->rotation[1] += y;
        viewer->rotation[2] += z;
+       _grits_viewer_fix_rotation(viewer);
        _grits_viewer_emit_rotation_changed(viewer);
 }
 
@@ -608,8 +613,6 @@ 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)
 {