#include "gis-object.h"
#include "gis-util.h"
-/* TODO
- * - Manage normals for GisPoint
- */
-
/* GisPoint */
GisPoint *gis_point_new()
{
self->lat = lat;
self->lon = lon;
self->elev = elev;
- lle2xyz(self->lat, self->lon, self->elev,
- &self->x, &self->y, &self->z);
-}
-
-void gis_point_set_xyz(GisPoint *self, gdouble x, gdouble y, gdouble z)
-{
- self->x = x;
- self->y = y;
- self->z = z;
-}
-
-void gis_point_set_coords(GisPoint *self, gdouble x, gdouble y)
-{
- self->cx = x;
- self->cy = y;
-}
-
-void gis_point_project(GisPoint *self, GisProjection *proj)
-{
- gluProject(self->x, self->y, self->z,
- proj->model, proj->proj, proj->view,
- &self->px, &self->py, &self->pz);
-}
-
-GisPoint *gis_point_ref(GisPoint *self)
-{
- self->refs++;
- return self;
-}
-
-void gis_point_unref(GisPoint *self)
-{
- self->refs--;
- if (self->refs <= 0)
- g_free(self);
-}
-
-
-/* GisTriangle */
-GisTriangle *gis_triangle_new(GisPoint *a, GisPoint *b, GisPoint *c, guint tex)
-{
- GisTriangle *self = g_new0(GisTriangle, 1);
- GIS_OBJECT(self)->type = GIS_TYPE_TRIANGLE;
- gis_point_set_xyz(&GIS_OBJECT(self)->center,
- (a->x + b->x + c->x)/3,
- (a->y + b->y + c->y)/3,
- (a->z + b->z + c->z)/3);
- self->verts[0] = gis_point_ref(a);
- self->verts[1] = gis_point_ref(b);
- self->verts[2] = gis_point_ref(c);
- self->tex = tex;
- return self;
}
-void gis_triangle_free(GisTriangle *self)
+void gis_point_free(GisPoint *self)
{
- gis_point_unref(self->verts[0]);
- gis_point_unref(self->verts[1]);
- gis_point_unref(self->verts[2]);
g_free(self);
}
-/* GisQuad */
-GisQuad *gis_quad_new(GisPoint *a, GisPoint *b, GisPoint *c, GisPoint *d, guint tex)
+/* GisMarker */
+GisMarker *gis_marker_new(const gchar *label)
{
- GisQuad *self = g_new0(GisQuad, 1);
- GIS_OBJECT(self)->type = GIS_TYPE_QUAD;
- gis_point_set_xyz(&GIS_OBJECT(self)->center,
- (a->x + b->x + c->x + d->x)/4,
- (a->y + b->y + c->y + d->y)/4,
- (a->z + b->z + c->z + d->z)/4);
- self->verts[0] = gis_point_ref(a);
- self->verts[1] = gis_point_ref(b);
- self->verts[2] = gis_point_ref(c);
- self->verts[3] = gis_point_ref(d);
- self->tex = tex;
+ static const int RADIUS = 4;
+ static const int WIDTH = 100;
+ static const int HEIGHT = 20;
+
+ GisMarker *self = g_new0(GisMarker, 1);
+ GIS_OBJECT(self)->type = GIS_TYPE_MARKER;
+ 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;
}
-void gis_quad_free(GisQuad *self)
+void gis_marker_free(GisMarker *self)
{
- gis_point_unref(self->verts[0]);
- gis_point_unref(self->verts[1]);
- gis_point_unref(self->verts[2]);
- gis_point_unref(self->verts[3]);
+ cairo_surface_destroy(cairo_get_target(self->cairo));
+ cairo_destroy(self->cairo);
+ g_free(self->label);
g_free(self);
}
{
g_free(self);
}
-
-
-/* GisCallback */
-GisMarker *gis_marker_new(const gchar *label)
-{
- GisMarker *self = g_new0(GisMarker, 1);
- GIS_OBJECT(self)->type = GIS_TYPE_MARKER;
- self->label = g_strdup(label);;
- return self;
-}
-
-void gis_marker_free(GisMarker *self)
-{
- g_free(self->label);
- g_free(self);
-}