Convert self to real names

[grits] / src / gis-viewer.h

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index b6eb0f7d04ca117e15fade3c961b9bb5fb93be90..fbc9767f080030172082884f3dad07e08f41c38f 100644 (file)
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 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
@@ -18,8 +18,15 @@
 #ifndef __GIS_VIEWER_H__
 #define __GIS_VIEWER_H__
 
+#include <gtk/gtk.h>
 #include <glib-object.h>
 
+/* Rendering levels */
+#define GIS_LEVEL_BACKGROUND -100
+#define GIS_LEVEL_WORLD         0
+#define GIS_LEVEL_OVERLAY     100
+#define GIS_LEVEL_HUD         200
+
 /* Type macros */
 #define GIS_TYPE_VIEWER            (gis_viewer_get_type())
 #define GIS_VIEWER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_VIEWER, GisViewer))
@@ -31,47 +38,87 @@
 typedef struct _GisViewer      GisViewer;
 typedef struct _GisViewerClass GisViewerClass;
 
+typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
+
+#include "gis-plugin.h"
+#include "gis-prefs.h"
+#include "objects/gis-object.h"
+#include "objects/gis-tile.h"
+
 struct _GisViewer {
-       GObject parent_instance;
+       GtkDrawingArea parent_instance;
 
        /* instance members */
-       gchar   *time;
-       gchar   *site;
-       gdouble  location[3];
-       gdouble  rotation[3];
-       gboolean offline;
+       GisPlugins *plugins;
+       GisPrefs   *prefs;
+       gchar      *time;
+       gdouble     location[3];
+       gdouble     rotation[3];
+       gboolean    offline;
+
+       /* For dragging */
+       gint    drag_mode;
+       gdouble drag_x, drag_y;
 };
 
 struct _GisViewerClass {
-       GObjectClass parent_class;
+       GtkDrawingAreaClass parent_class;
 
        /* class members */
+       void (*center_position)  (GisViewer *viewer,
+                                 gdouble lat, gdouble lon, gdouble elev);
+
+       void (*project)          (GisViewer *viewer,
+                                 gdouble lat, gdouble lon, gdouble elev,
+                                 gdouble *px, gdouble *py, gdouble *pz);
+
+       void (*clear_height_func)(GisViewer *viewer);
+       void (*set_height_func)  (GisViewer *viewer, GisTile *tile,
+                                 GisHeightFunc height_func, gpointer user_data,
+                                 gboolean update);
+
+       gpointer (*add)          (GisViewer *viewer, GisObject *object,
+                                 gint level, gboolean sort);
+       GisObject *(*remove)     (GisViewer *viewer, gpointer ref);
 };
 
 GType gis_viewer_get_type(void);
 
 /* Methods */
-GisViewer *gis_viewer_new();
+void gis_viewer_setup(GisViewer *viewer, GisPlugins *plugins, GisPrefs *prefs);
 
 void gis_viewer_set_time(GisViewer *viewer, const gchar *time);
 gchar *gis_viewer_get_time(GisViewer *viewer);
 
 void gis_viewer_set_location(GisViewer *viewer, gdouble  lat, gdouble  lon, gdouble  elev);
 void gis_viewer_get_location(GisViewer *viewer, gdouble *lat, gdouble *lon, gdouble *elev);
-void gis_viewer_pan         (GisViewer *viewer, gdouble  lat, gdouble  lon, gdouble  elev);
-void gis_viewer_zoom        (GisViewer *viewer, gdouble  scale);
+void gis_viewer_pan(GisViewer *viewer, gdouble forward, gdouble sideways, gdouble up);
+void gis_viewer_zoom(GisViewer *viewer, gdouble  scale);
 
 void gis_viewer_set_rotation(GisViewer *viewer, gdouble  x, gdouble  y, gdouble  z);
 void gis_viewer_get_rotation(GisViewer *viewer, gdouble *x, gdouble *y, gdouble *z);
 void gis_viewer_rotate      (GisViewer *viewer, gdouble  x, gdouble  y, gdouble  z);
 
-/* To be deprecated, use {get,set}_location */
-void gis_viewer_set_site(GisViewer *viewer, const gchar *site);
-gchar *gis_viewer_get_site(GisViewer *viewer);
-
 void gis_viewer_refresh(GisViewer *viewer);
 
 void gis_viewer_set_offline(GisViewer *viewer, gboolean offline);
 gboolean gis_viewer_get_offline(GisViewer *viewer);
 
+/* To be implemented by subclasses */
+void gis_viewer_center_position(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev);
+
+void gis_viewer_project(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev,
+               gdouble *px, gdouble *py, gdouble *pz);
+
+void gis_viewer_clear_height_func(GisViewer *viewer);
+void gis_viewer_set_height_func(GisViewer *viewer, GisTile *tile,
+               GisHeightFunc height_func, gpointer user_data,
+               gboolean update);
+
+gpointer gis_viewer_add(GisViewer *viewer, GisObject *object,
+               gint level, gboolean sort);
+GisObject *gis_viewer_remove(GisViewer *viewer, gpointer ref);
+
 #endif