X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-viewer.h;h=5e84e439157fb991656f76a0a03d4d98d74a5eca;hb=e5da3e49e161851790d35bc8b7267424dea73973;hp=90f13e92a6a03b109a706c0d8e66aa5adcc118ec;hpb=d8271428c9bc9eea6975601ed4be313b64f968a0;p=grits

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 90f13e9..5e84e43 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
@@ -40,15 +40,17 @@ 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;
 	gdouble     location[3];
 	gdouble     rotation[3];
@@ -71,9 +73,6 @@ 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);
 
@@ -85,7 +84,7 @@ struct _GisViewerClass {
 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);
@@ -117,9 +116,6 @@ 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);