#include "gis-opengl.h"
#include "gis-util.h"
-#include "gis-object.h"
#include "roam.h"
+#include "gis-object.h"
+#include "gis-marker.h"
+#include "gis-callback.h"
+
#define FOV_DIST 2000.0
#define MPPX(dist) (4*dist/FOV_DIST)
#ifndef __GIS_UTIL_H__
#define __GIS_UTIL_H__
+#include <glib.h>
+
#define EARTH_R (6371000)
#define EARTH_C (2*G_PI*EARTH_R)
#define NORTH 90
#include "gis-viewer.h"
#include "gis-opengl.h"
#include "gis-prefs.h"
-
-/* GIS helprs */
#include "gis-util.h"
+
+/* GIS objects */
+#include "gis-object.h"
#include "gis-tile.h"
+#include "gis-marker.h"
+#include "gis-callback.h"
+
+/* GIS data */
#include "gis-wms.h"
#include "gis-data.h"
noinst_LTLIBRARIES = libgis-objects.la
libgis_objects_la_SOURCES = \
- gis-object.c gis-object.h \
- gis-tile.c gis-tile.h
+ gis-object.c gis-object.h \
+ gis-marker.c gis-marker.h \
+ gis-callback.c gis-callback.h \
+ gis-tile.c gis-tile.h
libgis_objects_la_LDFLAGS = -static
MAINTAINERCLEANFILES = Makefile.in
--- /dev/null
+/*
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include "gis-callback.h"
+
+/* GisCallback */
+G_DEFINE_TYPE(GisCallback, gis_callback, GIS_TYPE_OBJECT);
+static void gis_callback_init(GisCallback *self) { }
+static void gis_callback_class_init(GisCallbackClass *klass) { }
+
+GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data)
+{
+ GisCallback *self = g_object_new(GIS_TYPE_CALLBACK, NULL);
+ self->callback = callback;
+ self->user_data = user_data;
+ return self;
+}
--- /dev/null
+/*
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIS_CALLBACK_H__
+#define __GIS_CALLBACK_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include "gis-object.h"
+
+/* 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);
+
+#endif
--- /dev/null
+/*
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include "gis-marker.h"
+
+/* GisMarker */
+G_DEFINE_TYPE(GisMarker, gis_marker, GIS_TYPE_OBJECT);
+static void gis_marker_init(GisMarker *self) { }
+
+static void gis_marker_finalize(GObject *_self);
+static void gis_marker_class_init(GisMarkerClass *klass)
+{
+ G_OBJECT_CLASS(klass)->finalize = gis_marker_finalize;
+}
+
+GisMarker *gis_marker_new(const gchar *label)
+{
+ static const int RADIUS = 4;
+ static const int WIDTH = 100;
+ static const int HEIGHT = 20;
+
+ GisMarker *self = g_object_new(GIS_TYPE_MARKER, NULL);
+ self->xoff = RADIUS;
+ self->yoff = HEIGHT-RADIUS;
+ self->label = g_strdup(label);
+ self->cairo = cairo_create(cairo_image_surface_create(
+ CAIRO_FORMAT_ARGB32, WIDTH, HEIGHT));
+ cairo_set_source_rgba(self->cairo, 1, 1, 1, 1);
+ cairo_arc(self->cairo, self->xoff, self->yoff, RADIUS, 0, 2*G_PI);
+ cairo_fill(self->cairo);
+ cairo_move_to(self->cairo, self->xoff+4, self->yoff-8);
+ cairo_set_font_size(self->cairo, 10);
+ cairo_show_text(self->cairo, self->label);
+ return self;
+}
+
+static void gis_marker_finalize(GObject *_self)
+{
+ GisMarker *self = GIS_MARKER(_self);
+ cairo_surface_destroy(cairo_get_target(self->cairo));
+ cairo_destroy(self->cairo);
+ g_free(self->label);
+ g_free(self);
+}
--- /dev/null
+/*
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIS_MARKER_H__
+#define __GIS_MARKER_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <cairo.h>
+#include "gis-object.h"
+
+/* 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;
+};
+
+struct _GisMarkerClass {
+ GisObjectClass parent_class;
+};
+
+GisMarker *gis_marker_new(const gchar *label);
+
+#endif
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <glib.h>
-#include <GL/glu.h>
-
+#include <config.h>
#include "gis-object.h"
/* GisPoint */
G_DEFINE_TYPE(GisObject, gis_object, G_TYPE_OBJECT);
static void gis_object_init(GisObject *self) { }
static void gis_object_class_init(GisObjectClass *klass) { }
-
-
-/* GisMarker */
-G_DEFINE_TYPE(GisMarker, gis_marker, GIS_TYPE_OBJECT);
-static void gis_marker_init(GisMarker *self) { }
-
-static void gis_marker_finalize(GObject *_self);
-static void gis_marker_class_init(GisMarkerClass *klass)
-{
- G_OBJECT_CLASS(klass)->finalize = gis_marker_finalize;
-}
-
-GisMarker *gis_marker_new(const gchar *label)
-{
- static const int RADIUS = 4;
- static const int WIDTH = 100;
- static const int HEIGHT = 20;
-
- GisMarker *self = g_object_new(GIS_TYPE_MARKER, NULL);
- self->xoff = RADIUS;
- self->yoff = HEIGHT-RADIUS;
- self->label = g_strdup(label);
- self->cairo = cairo_create(cairo_image_surface_create(
- CAIRO_FORMAT_ARGB32, WIDTH, HEIGHT));
- cairo_set_source_rgba(self->cairo, 1, 1, 1, 1);
- cairo_arc(self->cairo, self->xoff, self->yoff, RADIUS, 0, 2*G_PI);
- cairo_fill(self->cairo);
- cairo_move_to(self->cairo, self->xoff+4, self->yoff-8);
- cairo_set_font_size(self->cairo, 10);
- cairo_show_text(self->cairo, self->label);
- return self;
-}
-
-static void gis_marker_finalize(GObject *_self)
-{
- GisMarker *self = GIS_MARKER(_self);
- cairo_surface_destroy(cairo_get_target(self->cairo));
- cairo_destroy(self->cairo);
- g_free(self->label);
- g_free(self);
-}
-
-
-/* GisCallback */
-G_DEFINE_TYPE(GisCallback, gis_callback, GIS_TYPE_OBJECT);
-static void gis_callback_init(GisCallback *self) { }
-static void gis_callback_class_init(GisCallbackClass *klass) { }
-
-GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data)
-{
- GisCallback *self = g_object_new(GIS_TYPE_CALLBACK, NULL);
- self->callback = callback;
- self->user_data = user_data;
- return self;
-}
#include <glib.h>
#include <glib-object.h>
-#include <cairo.h>
-
/* Take that GLib boilerplate! */
#define GOBJECT_HEAD( \
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;
-};
-
-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);
-
#endif
*/
#include <config.h>
-#include <glib.h>
-
-#include "gis-tile.h"
#include "gis-util.h"
+#include "gis-tile.h"
gchar *gis_tile_path_table[2][2] = {
{"00.", "01."},
#define __GIS_TILE_H__
#include <glib.h>
+#include <glib-object.h>
#include "gis-object.h"
#define GIS_TYPE_TILE (gis_tile_get_type())
projects / grits / commitdiff