Add texture coords to tiles

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index fc0c55e05cf6062fcd6a14cc8e137f66fa546cc0..d01a23c29c0fa6289ec865af2e61f7ec59e0570f 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -133,6 +133,17 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
                        tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
        //g_message("drawing %4d triangles for tile edges=%7.2f,%7.2f,%7.2f,%7.2f",
        //              g_list_length(triangles), tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
                        tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
        //g_message("drawing %4d triangles for tile edges=%7.2f,%7.2f,%7.2f,%7.2f",
        //              g_list_length(triangles), tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);

+       gdouble n = tile->edge.n;
+       gdouble s = tile->edge.s;
+       gdouble e = tile->edge.e;
+       gdouble w = tile->edge.w;
+
+       gdouble londist = e - w;
+       gdouble latdist = n - s;
+
+       gdouble xscale = tile->coords.e - tile->coords.w;
+       gdouble yscale = tile->coords.s - tile->coords.n;
+

        for (GList *cur = triangles; cur; cur = cur->next) {
                RoamTriangle *tri = cur->data;
 
        for (GList *cur = triangles; cur; cur = cur->next) {
                RoamTriangle *tri = cur->data;
 


@@ -145,14 +156,6 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
                        if (lon[2] > 90) lon[2] -= 360;
                }
 
                        if (lon[2] > 90) lon[2] -= 360;
                }
 

-               gdouble n = tile->edge.n;
-               gdouble s = tile->edge.s;
-               gdouble e = tile->edge.e;
-               gdouble w = tile->edge.w;
-
-               gdouble londist = e - w;
-               gdouble latdist = n - s;
-

                gdouble xy[3][2] = {
                        {(lon[0]-w)/londist, 1-(lat[0]-s)/latdist},
                        {(lon[1]-w)/londist, 1-(lat[1]-s)/latdist},
                gdouble xy[3][2] = {
                        {(lon[0]-w)/londist, 1-(lat[0]-s)/latdist},
                        {(lon[1]-w)/londist, 1-(lat[1]-s)/latdist},


@@ -177,6 +180,12 @@ static void _draw_tile(GisOpenGL *opengl, GisTile *tile, GList *triangles)
                if (lat[1] == 90 || lat[1] == -90) xy[1][0] = 0.5;
                if (lat[2] == 90 || lat[2] == -90) xy[2][0] = 0.5;
 
                if (lat[1] == 90 || lat[1] == -90) xy[1][0] = 0.5;
                if (lat[2] == 90 || lat[2] == -90) xy[2][0] = 0.5;
 

+               /* Scale to tile coords */
+               for (int i = 0; i < 3; i++) {
+                       xy[i][0] = tile->coords.w + xy[i][0]*xscale;
+                       xy[i][1] = tile->coords.n + xy[i][1]*yscale;
+               }
+

                glEnable(GL_TEXTURE_2D);
                glEnable(GL_POLYGON_OFFSET_FILL);
                glBindTexture(GL_TEXTURE_2D, *(guint*)tile->data);
                glEnable(GL_TEXTURE_2D);
                glEnable(GL_POLYGON_OFFSET_FILL);
                glBindTexture(GL_TEXTURE_2D, *(guint*)tile->data);

diff --git a/src/objects/gis-tile.c b/src/objects/gis-tile.c
index 24214ade125a4434a4871661879c6652c6a27cb0..fbffd6ff0f799d638145230e89f9db1cc9524bee 100644 (file)
--- a/src/objects/gis-tile.c
+++ b/src/objects/gis-tile.c
@@ -58,6 +58,7 @@ GisTile *gis_tile_new(GisTile *parent,
        GisTile *tile = g_object_new(GIS_TYPE_TILE, NULL);
        tile->parent = parent;
        tile->atime  = time(NULL);
        GisTile *tile = g_object_new(GIS_TYPE_TILE, NULL);
        tile->parent = parent;
        tile->atime  = time(NULL);

+       gis_bbox_set_bounds(&tile->coords, 0, 1, 1, 0);

        gis_bbox_set_bounds(&tile->edge, n, s, e, w);
        return tile;
 }
        gis_bbox_set_bounds(&tile->edge, n, s, e, w);
        return tile;
 }

diff --git a/src/objects/gis-tile.h b/src/objects/gis-tile.h
index e2b72524f53d430e4c12cf0746bccb809e905e4e..c912b5a171ef507e67aa02ecae1650a5610c65e8 100644 (file)
--- a/src/objects/gis-tile.h
+++ b/src/objects/gis-tile.h
@@ -38,12 +38,15 @@ struct _GisTile {
        /* Pointer to the tile data */
        gpointer data;
 
        /* Pointer to the tile data */
        gpointer data;
 

-       /* Pointer to the tile data */
+       /* Drawing order */

        gint zindex;
 
        /* North,South,East,West limits */
        GisBBox edge;
 
        gint zindex;
 
        /* North,South,East,West limits */
        GisBBox edge;
 

+       /* Texture mapping coordinates */
+       GisBBox coords;
+

        /* Pointers to parent/child nodes */
        GisTile *parent;
        GisTile *children[2][2];
        /* Pointers to parent/child nodes */
        GisTile *parent;
        GisTile *children[2][2];