Add string parser to GritsPoly

[grits] / src / objects / grits-poly.c

diff --git a/src/objects/grits-poly.c b/src/objects/grits-poly.c
index 67e39e5acacd3d2b314e0183d8ffb3795c824d0f..da78fba8db901079bac0f1ace9ad69bbbb605bf5 100644 (file)
--- a/src/objects/grits-poly.c
+++ b/src/objects/grits-poly.c
@@ -31,8 +31,6 @@
 static void grits_poly_tess(gdouble (**points)[3])
 {
        //g_debug("GritsPoly: tess");
-
-       /* Tesselate */
        GLUtesselator *tess = gluNewTess();
        gluTessCallback(tess, GLU_TESS_BEGIN,  (_GLUfuncptr)glBegin);
        gluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv);
@@ -49,10 +47,12 @@ static void grits_poly_tess(gdouble (**points)[3])
        }
        gluTessEndPolygon(tess);
        gluDeleteTess(tess);
+}
 
-       /* Outline */
+static void grits_poly_outline(gdouble (**points)[3])
+{
+       //g_debug("GritsPoly: outline");
        for (int pi = 0; points[pi]; pi++) {
-               glColor4d(1,1,1,0.2);
                glBegin(GL_LINE_LOOP);
                for (int ci = 0; points[pi][ci][0]; ci++)
                        glVertex3dv(points[pi][ci]);
@@ -63,10 +63,13 @@ static gboolean grits_poly_genlist(gpointer _poly)
 {
        //g_debug("GritsPoly: genlist");
        GritsPoly *poly = GRITS_POLY(_poly);
-       guint list = glGenLists(1);
-       glNewList(list, GL_COMPILE);
+       guint list = glGenLists(2);
+       glNewList(list+0, GL_COMPILE);
        grits_poly_tess(poly->points);
        glEndList();
+       glNewList(list+1, GL_COMPILE);
+       grits_poly_outline(poly->points);
+       glEndList();
        poly->list = list;
        return FALSE;
 }
@@ -84,8 +87,15 @@ static void grits_poly_draw(GritsObject *_poly, GritsOpenGL *opengl)
        glDisable(GL_ALPHA_TEST);
        glDisable(GL_CULL_FACE);
        glDisable(GL_LIGHTING);
-       glColor4dv(poly->color);
-       glCallList(poly->list);
+       if (poly->color[3]) {
+               glColor4dv(poly->color);
+               glCallList(poly->list+0);
+       }
+       if (poly->border[3]) {
+               glLineWidth(poly->width);
+               glColor4dv(poly->border);
+               glCallList(poly->list+1);
+       }
        glPopAttrib();
 }
 
@@ -107,10 +117,56 @@ GritsPoly *grits_poly_new(gdouble (**points)[3])
        return poly;
 }
 
+GritsPoly *grits_poly_parse(gchar *str,
+               gchar *poly_sep, gchar *point_sep, gchar *coord_sep)
+{
+       /* Split and count polygons */
+       gchar **spolys = g_strsplit(str, poly_sep, -1);
+       int     npolys = g_strv_length(spolys);
+
+       GritsPoint center = {0,0,0};
+       gdouble (**polys)[3] = (gpointer)g_new0(double*, npolys+1);
+       for (int pi = 0; pi < npolys; pi++) {
+               /* Split and count coordinates */
+               gchar **scoords = g_strsplit(spolys[pi], point_sep, -1);
+               int     ncoords = g_strv_length(scoords);
+
+               /* Create binary coords */
+               gdouble (*coords)[3] = (gpointer)g_new0(gdouble, 3*(ncoords+1));
+               for (int ci = 0; ci < ncoords; ci++) {
+                       gdouble lat, lon;
+                       sscanf(scoords[ci], "%lf,%lf", &lat, &lon);
+                       if (ci == 0) {
+                               center.lat  = lat;
+                               center.lon  = lon;
+                               center.elev = 0;
+                       }
+                       lle2xyz(lat, lon, 0,
+                                       &coords[ci][0],
+                                       &coords[ci][1],
+                                       &coords[ci][2]);
+               }
+
+               /* Insert coords into poly array */
+               polys[pi] = coords;
+               g_strfreev(scoords);
+       }
+
+       /* Create GritsPoly */
+       GritsPoly *poly = grits_poly_new(polys);
+       GRITS_OBJECT(poly)->center = center;
+       return poly;
+}
+
 /* GObject code */
 G_DEFINE_TYPE(GritsPoly, grits_poly, GRITS_TYPE_OBJECT);
 static void grits_poly_init(GritsPoly *poly)
 {
+       poly->border[0] = 1;
+       poly->border[1] = 1;
+       poly->border[2] = 1;
+       poly->border[3] = 0.2;
+       poly->width     = 1;
 }
 
 static void grits_poly_finalize(GObject *_poly)