X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fobjects%2Fgis-object.h;h=6763a5fd18a4425763712b27028fa7089cc27585;hp=b823161d656ee4259c4bfe3fbafcabe38d5541e5;hb=6b903c96fdc3552f0133060487293c1b927638c4;hpb=7d7d6ae0531a85361ce0d8b997d988b653282847 diff --git a/src/objects/gis-object.h b/src/objects/gis-object.h index b823161..6763a5f 100644 --- a/src/objects/gis-object.h +++ b/src/objects/gis-object.h @@ -20,18 +20,7 @@ #include #include - -/* 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()) @@ -47,6 +36,7 @@ typedef struct _GisObjectClass GisObjectClass; struct _GisObject { GObject parent_instance; GisPoint center; + gboolean hidden; gdouble lod; }; @@ -56,9 +46,15 @@ struct _GisObjectClass { GType gis_object_get_type(void); -static inline GisPoint *gis_object_center(GisObject *object) -{ - return &GIS_OBJECT(object)->center; -} +/** + * 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