X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Froam.c;h=a3bc847f40a01dbabe957039f737def9f10c4741;hp=de09bceed5b7819bdb5dc58248890e0e8896a213;hb=d2fbd2408edd0a39253b2c30f98dcafefcef508f;hpb=becee285e152746e64b6d3984e2a7229f664062d diff --git a/src/roam.c b/src/roam.c index de09bce..a3bc847 100644 --- a/src/roam.c +++ b/src/roam.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andy Spencer + * Copyright (C) 2009-2010 Andy Spencer * * 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 @@ -22,11 +22,9 @@ #include #include -#include "gis-world.h" - +#include "gis-util.h" #include "roam.h" - /** * TODO: * - Optimize for memory consumption @@ -34,19 +32,6 @@ * - Target polygon count/detail */ -/* Misc */ -RoamView *roam_view_new() -{ - return g_new0(RoamView, 1); -} -void roam_view_update(RoamView *view) -{ - glGetDoublev (GL_MODELVIEW_MATRIX, view->model); - glGetDoublev (GL_PROJECTION_MATRIX, view->proj); - glGetIntegerv(GL_VIEWPORT, view->view); - view->version++; -} - /* For GPQueue comparators */ static gint tri_cmp(RoamTriangle *a, RoamTriangle *b, gpointer data) { @@ -61,17 +46,18 @@ static gint dia_cmp(RoamDiamond *a, RoamDiamond *b, gpointer data) else return 0; } + /************* * RoamPoint * *************/ -RoamPoint *roam_point_new(gdouble x, gdouble y, gdouble z) +RoamPoint *roam_point_new(gdouble lat, gdouble lon, gdouble elev) { RoamPoint *self = g_new0(RoamPoint, 1); - self->x = x; - self->y = y; - self->z = z; + self->lat = lat; + self->lon = lon; + self->elev = elev; /* For get_intersect */ - xyz2ll(x, y, z, &self->lat, &self->lon); + lle2xyz(lat, lon, elev, &self->x, &self->y, &self->z); return self; } RoamPoint *roam_point_dup(RoamPoint *self) @@ -108,13 +94,6 @@ void roam_point_update_height(RoamPoint *self) self->lat, self->lon, self->height_data); lle2xyz(self->lat, self->lon, elev, &self->x, &self->y, &self->z); - } else { - gdouble dist = sqrt(self->x * self->x + - self->y * self->y + - self->z * self->z); - self->x = self->x/dist * EARTH_R; - self->y = self->y/dist * EARTH_R; - self->z = self->z/dist * EARTH_R; } } void roam_point_update_projection(RoamPoint *self, RoamSphere *sphere) @@ -122,7 +101,7 @@ void roam_point_update_projection(RoamPoint *self, RoamSphere *sphere) static int count = 0; static int version = 0; if (version != sphere->view->version) { - g_debug("Projected %d points", count); + g_debug("RoamPoint: Projected %d points", count); count = 0; version = sphere->view->version; } @@ -149,9 +128,11 @@ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) self->p.m = m; self->p.r = r; self->split = roam_point_new( - (l->x + r->x)/2, - (l->y + r->y)/2, - (l->z + r->z)/2); + (l->lat + r->lat)/2, + (ABS(l->lat) == 90 ? r->lon : + ABS(r->lat) == 90 ? l->lon : + lon_avg(l->lon, r->lon)), + (l->elev + r->elev)/2); /* TODO: Move this back to sphere, or actually use the nesting */ self->split->height_func = m->height_func; self->split->height_data = m->height_data; @@ -188,10 +169,7 @@ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) self->norm[2] /= total; /* Store bounding box, for get_intersect */ - RoamPoint *m1 = roam_point_new((l->x+m->x)/2, (l->y+m->y)/2, (l->z+m->z)/2); - RoamPoint *m2 = roam_point_new((m->x+r->x)/2, (m->y+r->y)/2, (m->z+r->z)/2); - RoamPoint *m3 = roam_point_new((r->x+l->x)/2, (r->y+l->y)/2, (r->z+l->z)/2); - RoamPoint *p[] = {l,m,r,m1,m2,m3}; + RoamPoint *p[] = {l,m,r}; self->edge.n = -90; self->edge.s = 90; self->edge.e = -180; self->edge.w = 180; gboolean maxed = FALSE; @@ -213,9 +191,6 @@ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) else self->edge.e = 180; } - g_free(m1); - g_free(m2); - g_free(m3); //g_message("roam_triangle_new: %p", self); return self; @@ -321,6 +296,8 @@ void roam_triangle_split(RoamTriangle *self, RoamSphere *sphere) if (self != self->t.b->t.b) roam_triangle_split(self->t.b, sphere); + if (self != self->t.b->t.b) + g_assert_not_reached(); RoamTriangle *base = self->t.b; @@ -494,12 +471,12 @@ RoamSphere *roam_sphere_new() self->diamonds = g_pqueue_new((GCompareDataFunc)dia_cmp, NULL); RoamPoint *vertexes[] = { - roam_point_new( 0, 1, 0), // 0 - roam_point_new( 0,-1, 0), // 1 - roam_point_new( 0, 0, 1), // 2 - roam_point_new( 1, 0, 0), // 3 - roam_point_new( 0, 0,-1), // 4 - roam_point_new(-1, 0, 0), // 5 + roam_point_new( 90, 0, 0), // 0 (North) + roam_point_new(-90, 0, 0), // 1 (South) + roam_point_new( 0, 0, 0), // 2 (Europe/Africa) + roam_point_new( 0, 90, 0), // 3 (Asia,East) + roam_point_new( 0, 180, 0), // 4 (Pacific) + roam_point_new( 0, -90, 0), // 5 (Americas,West) }; int _triangles[][2][3] = { /*lv mv rv ln, bn, rn */ @@ -535,16 +512,23 @@ RoamSphere *roam_sphere_new() return self; } +void roam_sphere_update_view(RoamSphere *self) +{ + if (!self->view) + self->view = g_new0(RoamView, 1); + glGetDoublev (GL_MODELVIEW_MATRIX, self->view->model); + glGetDoublev (GL_PROJECTION_MATRIX, self->view->proj); + glGetIntegerv(GL_VIEWPORT, self->view->view); + self->view->version++; +} void roam_sphere_update_errors(RoamSphere *self) { g_debug("RoamSphere: update_errors - polys=%d", self->polys); - if (!self->view) - self->view = roam_view_new(); - roam_view_update(self->view); - GPtrArray *tris = g_pqueue_get_array(self->triangles); GPtrArray *dias = g_pqueue_get_array(self->diamonds); + roam_sphere_update_view(self); + for (int i = 0; i < tris->len; i++) { RoamTriangle *tri = tris->pdata[i]; roam_triangle_update_errors(tri, self); @@ -618,18 +602,19 @@ void roam_sphere_draw_normals(RoamSphere *self) g_debug("RoamSphere: draw_normal"); g_pqueue_foreach(self->triangles, (GFunc)roam_triangle_draw_normal, NULL); } -GList *_roam_sphere_get_leaves(RoamTriangle *tri, GList *list) +static GList *_roam_sphere_get_leaves(RoamTriangle *tri, GList *list, gboolean all) { if (tri->kids[0] && tri->kids[1]) { - list = _roam_sphere_get_leaves(tri->kids[0], list); - list = _roam_sphere_get_leaves(tri->kids[1], list); + if (all) list = g_list_prepend(list, tri); + list = _roam_sphere_get_leaves(tri->kids[0], list, all); + list = _roam_sphere_get_leaves(tri->kids[1], list, all); return list; } else { - return g_list_append(list, tri); + return g_list_prepend(list, tri); } } -GList *_roam_sphere_get_intersect_rec(RoamTriangle *tri, GList *list, - gdouble n, gdouble s, gdouble e, gdouble w) +static GList *_roam_sphere_get_intersect_rec(RoamTriangle *tri, GList *list, + gboolean all, gdouble n, gdouble s, gdouble e, gdouble w) { gdouble tn = tri->edge.n; gdouble ts = tri->edge.s; @@ -647,23 +632,28 @@ GList *_roam_sphere_get_intersect_rec(RoamTriangle *tri, GList *list, /* No intersect */ if (debug) g_message("no intersect"); return list; - } else if (tn < n && ts > s && te < e && tw > w) { + } else if (tn <= n && ts >= s && te <= e && tw >= w) { /* Triangle is completely contained */ if (debug) g_message("contained"); - return _roam_sphere_get_leaves(tri, list); + if (all) list = g_list_prepend(list, tri); + return _roam_sphere_get_leaves(tri, list, all); } else if (tri->kids[0] && tri->kids[1]) { /* Paritial intersect with children */ if (debug) g_message("edge w/ child"); - list = _roam_sphere_get_intersect_rec(tri->kids[0], list, n, s, e, w); - list = _roam_sphere_get_intersect_rec(tri->kids[1], list, n, s, e, w); + if (all) list = g_list_prepend(list, tri); + list = _roam_sphere_get_intersect_rec(tri->kids[0], list, all, n, s, e, w); + list = _roam_sphere_get_intersect_rec(tri->kids[1], list, all, n, s, e, w); return list; } else { /* This triangle is an edge case */ if (debug) g_message("edge"); - return g_list_append(list, tri); + return g_list_prepend(list, tri); } } -GList *roam_sphere_get_intersect(RoamSphere *self, +/* Warning: This grabs pointers to triangles which can be changed by other + * calls, e.g. split_merge. If you use this, you need to do some locking to + * prevent the returned list from becomming stale. */ +GList *roam_sphere_get_intersect(RoamSphere *self, gboolean all, gdouble n, gdouble s, gdouble e, gdouble w) { /* I think this is correct.. @@ -673,7 +663,7 @@ GList *roam_sphere_get_intersect(RoamSphere *self, GList *list = NULL; for (int i = 0; i < G_N_ELEMENTS(self->roots); i++) list = _roam_sphere_get_intersect_rec(self->roots[i], - list, n, s, e, w); + list, all, n, s, e, w); return list; } void roam_sphere_free_tri(RoamTriangle *tri) @@ -685,6 +675,7 @@ void roam_sphere_free_tri(RoamTriangle *tri) } void roam_sphere_free(RoamSphere *self) { + g_debug("RoamSphere: free"); /* Slow method, but it should work */ while (self->polys > 8) roam_sphere_merge_one(self);