Splitting GIS into a shared library, and a lot more

[grits] / src / gis / gis-opengl.h

diff --git a/src/gis-opengl.h b/src/gis/gis-opengl.h
similarity index 94%
rename from src/gis-opengl.h
rename to src/gis/gis-opengl.h
index aca186fe88cd65a1a8f001a396289663fe022f7d..e8149692af132eaf7f07fb83d2e6b58c07529cb1 100644 (file)
--- a/src/gis-opengl.h
+++ b/src/gis/gis-opengl.h
@@ -23,9 +23,6 @@
 #include <gtk/gtkgl.h>
 #include <glib-object.h>
 
 #include <gtk/gtkgl.h>
 #include <glib-object.h>
 

-#include "gis-view.h"
-#include "gis-world.h"
-

 /* Type macros */
 #define GIS_TYPE_OPENGL            (gis_opengl_get_type())
 #define GIS_OPENGL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_OPENGL, GisOpenGL))
 /* Type macros */
 #define GIS_TYPE_OPENGL            (gis_opengl_get_type())
 #define GIS_OPENGL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_OPENGL, GisOpenGL))


@@ -37,14 +34,21 @@
 typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 
 typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 

+#include "gis-view.h"
+#include "gis-world.h"
+#include "gis-plugin.h"
+
+#define d2r(deg) (((deg)*M_PI)/180.0)
+#define r2d(rad) (((rad)*180.0)/M_PI)
+

 struct _GisOpenGL {
        GObject parent_instance;
 
        /* instance members */
        GisWorld       *world;
        GisView        *view;
 struct _GisOpenGL {
        GObject parent_instance;
 
        /* instance members */
        GisWorld       *world;
        GisView        *view;

+       GisPlugins     *plugins;

        GtkDrawingArea *drawing;
        GtkDrawingArea *drawing;

-       GList          *plugins;

 };
 
 struct _GisOpenGLClass {
 };
 
 struct _GisOpenGLClass {