X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fobjects%2Fgis-object.h;h=6763a5fd18a4425763712b27028fa7089cc27585;hp=acc425506451c0f876c58db9178bbc32405cfd3f;hb=6b903c96fdc3552f0133060487293c1b927638c4;hpb=1edd074095d135767d28f4d30de41bdd0af1a1fb

diff --git a/src/objects/gis-object.h b/src/objects/gis-object.h
index acc4255..6763a5f 100644
--- a/src/objects/gis-object.h
+++ b/src/objects/gis-object.h
@@ -20,71 +20,23 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <cairo.h>
-
-
-/* Take that GLib boilerplate! */
-#define GOBJECT_HEAD( \
-		MAM, BAR, \
-		Mam, Bar, \
-		mam, bar) \
-GType mam##_##bar##_get_type(void); \
-typedef struct _##Mam##Bar Mam##Bar; \
-typedef struct _##Mam##Bar##Class Mam##Bar##Class; \
-static inline Mam##Bar *MAM##_##BAR(gpointer obj) { \
-	return G_TYPE_CHECK_INSTANCE_CAST(obj, MAM##_TYPE_##BAR, Mam##Bar); \
-} \
-static inline gboolean MAM##_IS_##BAR(gpointer obj) { \
-	return G_TYPE_CHECK_INSTANCE_TYPE(obj, MAM##_TYPE_##BAR); \
-} \
-static inline Mam##Bar##Class *MAM##_##BAR##_CLASS(gpointer klass) { \
-	return G_TYPE_CHECK_CLASS_CAST(klass, MAM##_TYPE_##BAR, Mam##Bar##Class); \
-} \
-static inline gboolean MAM##_IS_##BAR##_CLASS(gpointer klass) { \
-	return G_TYPE_CHECK_CLASS_TYPE(klass, MAM##_TYPE_##BAR); \
-} \
-static inline Mam##Bar##Class *MAM##_##BAR##_GET_CLASS(gpointer obj) { \
-	return G_TYPE_INSTANCE_GET_CLASS(obj, MAM##_TYPE_##BAR, Mam##Bar##Class); \
-}
-
-#define GOBJECT_BODY( \
-		parent_type, \
-		MAM, BAR, \
-		Mam, Bar, \
-		mam, bar) \
-G_DEFINE_TYPE(Mam##Bar, mam##_##bar, parent_type); \
-static void mam##_##bar##_init(Mam##Bar *self) { \
-} \
-static void mam##_##bar##_class_init(Mam##Bar##Class *klass) { \
-} \
-static Mam##Bar *mam##_##bar##_new() { \
-	return g_object_new(MAM##_TYPE_##BAR, NULL); \
-}
-
-
-/* GisPoint */
-typedef struct _GisPoint GisPoint;
-
-struct _GisPoint {
-	gdouble lat, lon, elev;
-};
-
-GisPoint *gis_point_new();
-void gis_point_set_lle(GisPoint *point, gdouble lat, gdouble lon, gdouble elev);
-void gis_point_free(GisPoint *point);
-
+#include "gis-util.h"
 
 /* GisObject */
-#define GIS_TYPE_OBJECT (gis_object_get_type())
+#define GIS_TYPE_OBJECT            (gis_object_get_type())
+#define GIS_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_OBJECT, GisObject))
+#define GIS_IS_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_OBJECT))
+#define GIS_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_OBJECT, GisObjectClass))
+#define GIS_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_OBJECT))
+#define GIS_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_OBJECT, GisObjectClass))
 
-GOBJECT_HEAD(
-	GIS, OBJECT,
-	Gis, Object,
-	gis, object);
+typedef struct _GisObject      GisObject;
+typedef struct _GisObjectClass GisObjectClass;
 
 struct _GisObject {
-	GObject parent_instance;
+	GObject  parent_instance;
 	GisPoint center;
+	gboolean hidden;
 	gdouble  lod;
 };
 
@@ -92,55 +44,17 @@ struct _GisObjectClass {
 	GObjectClass parent_class;
 };
 
-static inline GisPoint *gis_object_center(GisObject *object)
-{
-	return &GIS_OBJECT(object)->center;
-}
-
-
-/* GisMarker */
-#define GIS_TYPE_MARKER (gis_marker_get_type())
-
-GOBJECT_HEAD(
-	GIS, MARKER,
-	Gis, Marker,
-	gis, marker);
-
-struct _GisMarker {
-	GisObject  parent_instance;
-	gint       xoff, yoff;
-	gchar     *label;
-	cairo_t   *cairo;
-	guint      tex;
-};
+GType gis_object_get_type(void);
 
-struct _GisMarkerClass {
-	GisObjectClass parent_class;
-};
-
-GisMarker *gis_marker_new(const gchar *label);
-
-
-/* GisCallback */
-#define GIS_TYPE_CALLBACK (gis_callback_get_type())
-
-GOBJECT_HEAD(
-	GIS, CALLBACK,
-	Gis, Callback,
-	gis, callback);
-
-typedef gpointer (*GisCallbackFunc)(GisCallback *callback, gpointer user_data);
-
-struct _GisCallback {
-	GisObject       parent;
-	GisCallbackFunc callback;
-	gpointer        user_data;
-};
-
-struct _GisCallbackClass {
-	GisObjectClass parent_class;
-};
-
-GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data);
+/**
+ * gis_object_center:
+ * @object: The #GisObject to get the center of
+ * 
+ * Get the #GisPoint representing the center of an object
+ *
+ * Returns: the center point
+ */
+#define gis_object_center(object) \
+	(&GIS_OBJECT(object)->center)
 
 #endif