X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-viewer.h;h=06378d76d032fdf2c488da741c5df5b9ac222c74;hb=d2fbd2408edd0a39253b2c30f98dcafefcef508f;hp=6b95e1a03f9b66ad5c02a76efa841116c8c49b34;hpb=3ebe95528320be9e3821fe23e39d41fd89b10fdd;p=grits

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 6b95e1a..06378d7 100644
--- 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
@@ -21,6 +21,7 @@
 #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
@@ -39,17 +40,18 @@ typedef struct _GisViewerClass GisViewerClass;
 
 typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
 
-#include "gis-tile.h"
 #include "gis-plugin.h"
-#include "gis-object.h"
+#include "gis-prefs.h"
+#include "objects/gis-object.h"
+#include "objects/gis-tile.h"
 
 struct _GisViewer {
 	GtkDrawingArea parent_instance;
 
 	/* instance members */
 	GisPlugins *plugins;
+	GisPrefs   *prefs;
 	gchar      *time;
-	gchar      *site;
 	gdouble     location[3];
 	gdouble     rotation[3];
 	gboolean    offline;
@@ -71,21 +73,15 @@ struct _GisViewerClass {
 	                          GisHeightFunc height_func, gpointer user_data,
 	                          gboolean update);
 
-	void (*render_tile)      (GisViewer *viewer, GisTile *tile);
-	void (*render_tiles)     (GisViewer *viewer, GisTile *root);
-
-	void (*begin)            (GisViewer *viewer);
-	void (*end)              (GisViewer *viewer);
-
 	gpointer (*add)          (GisViewer *viewer, GisObject *object,
 	                          gint level, gboolean sort);
-	void (*remove)           (GisViewer *viewer, gpointer ref);
+	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);
@@ -99,10 +95,6 @@ void gis_viewer_set_rotation(GisViewer *viewer, gdouble  x, gdouble  y, gdouble
 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);
@@ -121,14 +113,8 @@ void gis_viewer_set_height_func(GisViewer *self, GisTile *tile,
 		GisHeightFunc height_func, gpointer user_data,
 		gboolean update);
 
-void gis_viewer_render_tile (GisViewer *viewer, GisTile *tile);
-void gis_viewer_render_tiles(GisViewer *viewer, GisTile *root);
-
-void gis_viewer_begin(GisViewer *viewer);
-void gis_viewer_end  (GisViewer *viewer);
-
 gpointer gis_viewer_add(GisViewer *self, GisObject *object,
 		gint level, gboolean sort);
-void gis_viewer_remove(GisViewer *self, gpointer ref);
+GisObject *gis_viewer_remove(GisViewer *self, gpointer ref);
 
 #endif