X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Froam.c;h=4bc294c08097c644ab0fa771e9e25c0b60c13218;hb=1ccb2426332856ef04f0bfb35716520a94e0d32c;hp=d25bd3d5b56fb339709b8bcaba15713484530cfa;hpb=7cde9672c505332bcca7b47d94acfdf28c7729fe;p=grits diff --git a/src/roam.c b/src/roam.c index d25bd3d..4bc294c 100644 --- a/src/roam.c +++ b/src/roam.c @@ -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) { @@ -70,6 +55,8 @@ RoamPoint *roam_point_new(gdouble x, gdouble y, gdouble z) self->x = x; self->y = y; self->z = z; + /* For get_intersect */ + xyz2ll(x, y, z, &self->lat, &self->lon); return self; } RoamPoint *roam_point_dup(RoamPoint *self) @@ -99,10 +86,13 @@ void roam_point_remove_triangle(RoamPoint *self, RoamTriangle *triangle) for (int i = 0; i < 3; i++) self->norm[i] /= self->tris; } -void roam_point_update_height(RoamPoint *self, RoamSphere *sphere) +void roam_point_update_height(RoamPoint *self) { - if (sphere->height_func) { - sphere->height_func(self, sphere->user_data); + if (self->height_func) { + gdouble elev = self->height_func( + 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 + @@ -139,6 +129,7 @@ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) { RoamTriangle *self = g_new0(RoamTriangle, 1); + self->error = 0; self->p.l = l; self->p.m = m; self->p.r = r; @@ -146,8 +137,17 @@ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) (l->x + r->x)/2, (l->y + r->y)/2, (l->z + r->z)/2); - - self->error = 0; + /* 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; + roam_point_update_height(self->split); + //if ((float)self->split->lat > 44 && (float)self->split->lat < 46) + // g_debug("RoamTriangle: new - (l,m,r,split).lats = %7.2f %7.2f %7.2f %7.2f", + // l->lat, m->lat, r->lat, self->split->lat); + //if ((float)l->lat == (float)r->lat && + // (float)self->split->lat != (float)l->lat) + // g_warning("RoamTriangle: new - split.lat=%f != (l=r).lat=%f", + // self->split->lat, l->lat); /* Update normal */ double pa[3]; @@ -172,6 +172,36 @@ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) self->norm[1] /= total; 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}; + self->edge.n = -90; self->edge.s = 90; + self->edge.e = -180; self->edge.w = 180; + gboolean maxed = FALSE; + for (int i = 0; i < G_N_ELEMENTS(p); i++) { + self->edge.n = MAX(self->edge.n, p[i]->lat); + self->edge.s = MIN(self->edge.s, p[i]->lat); + if (p[i]->lat == 90 || p[i]->lat == -90) + continue; + if (p[i]->lon == 180) { + maxed = TRUE; + continue; + } + self->edge.e = MAX(self->edge.e, p[i]->lon); + self->edge.w = MIN(self->edge.w, p[i]->lon); + } + if (maxed) { + if (self->edge.e < 0) + self->edge.w = -180; + else + self->edge.e = 180; + } + g_free(m1); + g_free(m2); + g_free(m3); + //g_message("roam_triangle_new: %p", self); return self; } @@ -239,12 +269,12 @@ void roam_triangle_update_errors(RoamTriangle *self, RoamSphere *sphere) roam_point_update_projection(self->p.l, sphere); roam_point_update_projection(self->p.m, sphere); roam_point_update_projection(self->p.r, sphere); - roam_point_update_projection(self->split, sphere); /* Not exactly correct, could be out on both sides (middle in) */ if (!roam_triangle_visible(self, sphere)) { self->error = -1; } else { + roam_point_update_projection(self->split, sphere); RoamPoint *l = self->p.l; RoamPoint *m = self->p.m; RoamPoint *r = self->p.r; @@ -262,6 +292,8 @@ void roam_triangle_update_errors(RoamTriangle *self, RoamSphere *sphere) r->px * (l->py - m->py) ) / 2.0; /* Size < 0 == backface */ + //if (size < 0) + // self->error *= -1; self->error *= size; } } @@ -279,15 +311,10 @@ void roam_triangle_split(RoamTriangle *self, RoamSphere *sphere) /* Add new triangles */ RoamPoint *mid = self->split; - RoamTriangle *sl = roam_triangle_new(self->p.m, mid, self->p.l); // Self Left - RoamTriangle *sr = roam_triangle_new(self->p.r, mid, self->p.m); // Self Right - RoamTriangle *bl = roam_triangle_new(base->p.m, mid, base->p.l); // Base Left - RoamTriangle *br = roam_triangle_new(base->p.r, mid, base->p.m); // Base Right - - roam_point_update_height(sl->split, sphere); - roam_point_update_height(sr->split, sphere); - roam_point_update_height(bl->split, sphere); - roam_point_update_height(br->split, sphere); + RoamTriangle *sl = self->kids[0] = roam_triangle_new(self->p.m, mid, self->p.l); // Self Left + RoamTriangle *sr = self->kids[1] = roam_triangle_new(self->p.r, mid, self->p.m); // Self Right + RoamTriangle *bl = base->kids[0] = roam_triangle_new(base->p.m, mid, base->p.l); // Base Left + RoamTriangle *br = base->kids[1] = roam_triangle_new(base->p.r, mid, base->p.m); // Base Right /* tri,l, base, r, sphere */ roam_triangle_add(sl, sr, self->t.l, br, sphere); @@ -405,6 +432,10 @@ void roam_diamond_merge(RoamDiamond *self, RoamSphere *sphere) roam_triangle_remove(kids[2], sphere); roam_triangle_remove(kids[3], sphere); + /* Clear kids */ + tri->kids[0] = tri->kids[1] = NULL; + base->kids[0] = base->kids[1] = NULL; + /* Add/Remove triangles */ if (tri->t.l->t.l == tri->t.r->t.r && tri->t.l->t.l != tri && tri->parent) { @@ -440,69 +471,72 @@ void roam_diamond_update_errors(RoamDiamond *self, RoamSphere *sphere) /************** * RoamSphere * **************/ -RoamSphere *roam_sphere_new(gpointer user_data) +RoamSphere *roam_sphere_new() { RoamSphere *self = g_new0(RoamSphere, 1); - self->user_data = user_data; - self->polys = 12; + self->polys = 8; self->triangles = g_pqueue_new((GCompareDataFunc)tri_cmp, NULL); self->diamonds = g_pqueue_new((GCompareDataFunc)dia_cmp, NULL); RoamPoint *vertexes[] = { - roam_point_new( 1, 1, 1), // 0 - roam_point_new( 1, 1,-1), // 1 - roam_point_new( 1,-1, 1), // 2 - roam_point_new( 1,-1,-1), // 3 - roam_point_new(-1, 1, 1), // 4 - roam_point_new(-1, 1,-1), // 5 - roam_point_new(-1,-1, 1), // 6 - roam_point_new(-1,-1,-1), // 7 + 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 }; int _triangles[][2][3] = { /*lv mv rv ln, bn, rn */ - {{3,2,0}, {10, 1, 7}}, // 0 - {{0,1,3}, { 9, 0, 2}}, // 1 - {{7,3,1}, {11, 3, 1}}, // 2 - {{1,5,7}, { 8, 2, 4}}, // 3 - {{6,7,5}, {11, 5, 3}}, // 4 - {{5,4,6}, { 8, 4, 6}}, // 5 - {{2,6,4}, {10, 7, 5}}, // 6 - {{4,0,2}, { 9, 6, 0}}, // 7 - {{4,5,1}, { 5, 9, 3}}, // 8 - {{1,0,4}, { 1, 8, 7}}, // 9 - {{6,2,3}, { 6,11, 0}}, // 10 - {{3,7,6}, { 2,10, 4}}, // 11 + {{2,0,3}, {3, 4, 1}}, // 0 + {{3,0,4}, {0, 5, 2}}, // 1 + {{4,0,5}, {1, 6, 3}}, // 2 + {{5,0,2}, {2, 7, 0}}, // 3 + {{3,1,2}, {5, 0, 7}}, // 4 + {{4,1,3}, {6, 1, 4}}, // 5 + {{5,1,4}, {7, 2, 5}}, // 6 + {{2,1,5}, {4, 3, 6}}, // 7 }; - RoamTriangle *triangles[12]; + for (int i = 0; i < 6; i++) + roam_point_update_height(vertexes[i]); for (int i = 0; i < 8; i++) - roam_point_update_height(vertexes[i], self); - for (int i = 0; i < 12; i++) - triangles[i] = roam_triangle_new( + self->roots[i] = roam_triangle_new( vertexes[_triangles[i][0][0]], vertexes[_triangles[i][0][1]], vertexes[_triangles[i][0][2]]); - for (int i = 0; i < 12; i++) - roam_point_update_height(triangles[i]->split, self); - for (int i = 0; i < 12; i++) - roam_triangle_add(triangles[i], - triangles[_triangles[i][1][0]], - triangles[_triangles[i][1][1]], - triangles[_triangles[i][1][2]], + for (int i = 0; i < 8; i++) + roam_triangle_add(self->roots[i], + self->roots[_triangles[i][1][0]], + self->roots[_triangles[i][1][1]], + self->roots[_triangles[i][1][2]], self); + for (int i = 0; i < 8; i++) + g_debug("RoamSphere: new - %p edge=%f,%f,%f,%f", self->roots[i], + self->roots[i]->edge.n, + self->roots[i]->edge.s, + self->roots[i]->edge.e, + self->roots[i]->edge.w); 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); @@ -576,6 +610,64 @@ 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) +{ + 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); + return list; + } else { + return g_list_append(list, tri); + } +} +GList *_roam_sphere_get_intersect_rec(RoamTriangle *tri, GList *list, + gdouble n, gdouble s, gdouble e, gdouble w) +{ + gdouble tn = tri->edge.n; + gdouble ts = tri->edge.s; + gdouble te = tri->edge.e; + gdouble tw = tri->edge.w; + + gboolean debug = FALSE && + n==90 && s==45 && e==-90 && w==-180 && + ts > 44 && ts < 46; + + if (debug) + g_message("t=%p: %f < %f || %f > %f || %f < %f || %f > %f", + tri, tn, s, ts, n, te, w, tw, e); + if (tn < s || ts > n || te < w || tw > e) { + /* No intersect */ + if (debug) g_message("no intersect"); + return list; + } 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); + } 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); + return list; + } else { + /* This triangle is an edge case */ + if (debug) g_message("edge"); + return g_list_append(list, tri); + } +} +GList *roam_sphere_get_intersect(RoamSphere *self, + gdouble n, gdouble s, gdouble e, gdouble w) +{ + /* I think this is correct.. + * i_cost = cost for triangle-rectagnle intersect test + * time = n_tiles * 2*tris_per_tile * i_cost + * time = 30 * 2*333 * i_cost = 20000 * i_cost */ + 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); + return list; +} void roam_sphere_free_tri(RoamTriangle *tri) { if (--tri->p.l->tris == 0) g_free(tri->p.l); @@ -586,7 +678,7 @@ void roam_sphere_free_tri(RoamTriangle *tri) void roam_sphere_free(RoamSphere *self) { /* Slow method, but it should work */ - while (self->polys > 12) + while (self->polys > 8) roam_sphere_merge_one(self); /* TODO: free points */ g_pqueue_foreach(self->triangles, (GFunc)roam_sphere_free_tri, NULL);