X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Froam.c;h=5faed389904a6234d16fe536f6c78bb1b08a81cc;hp=4f3bc1de4e4d93a86e1905d04ba8adc0df609b15;hb=cd2b3c70807c914687f9051b34a8fe029de300ee;hpb=ac7156bd84aef88b712f117f7e2f3d847d371719 diff --git a/src/roam.c b/src/roam.c index 4f3bc1d..5faed38 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 @@ -18,10 +18,11 @@ #include #include #include -#include "gpqueue.h" #include #include +#include "gpqueue.h" +#include "gis-util.h" #include "roam.h" /** @@ -31,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) { @@ -58,73 +46,74 @@ static gint dia_cmp(RoamDiamond *a, RoamDiamond *b, gpointer data) else return 0; } + /************* * RoamPoint * *************/ -RoamPoint *roam_point_new(double x, double y, double 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; - return self; + RoamPoint *point = g_new0(RoamPoint, 1); + point->lat = lat; + point->lon = lon; + point->elev = elev; + /* For get_intersect */ + lle2xyz(lat, lon, elev, &point->x, &point->y, &point->z); + return point; } -RoamPoint *roam_point_dup(RoamPoint *self) + +static RoamPoint *roam_point_dup(RoamPoint *point) { - RoamPoint *new = g_memdup(self, sizeof(RoamPoint)); + RoamPoint *new = g_memdup(point, sizeof(RoamPoint)); new->tris = 0; return new; } -void roam_point_add_triangle(RoamPoint *self, RoamTriangle *triangle) +void roam_point_add_triangle(RoamPoint *point, RoamTriangle *triangle) { for (int i = 0; i < 3; i++) { - self->norm[i] *= self->tris; - self->norm[i] += triangle->norm[i]; + point->norm[i] *= point->tris; + point->norm[i] += triangle->norm[i]; } - self->tris++; + point->tris++; for (int i = 0; i < 3; i++) - self->norm[i] /= self->tris; + point->norm[i] /= point->tris; } -void roam_point_remove_triangle(RoamPoint *self, RoamTriangle *triangle) +void roam_point_remove_triangle(RoamPoint *point, RoamTriangle *triangle) { for (int i = 0; i < 3; i++) { - self->norm[i] *= self->tris; - self->norm[i] -= triangle->norm[i]; + point->norm[i] *= point->tris; + point->norm[i] -= triangle->norm[i]; } - self->tris--; - if (self->tris) + point->tris--; + if (point->tris) for (int i = 0; i < 3; i++) - self->norm[i] /= self->tris; + point->norm[i] /= point->tris; } -void roam_point_update_height(RoamPoint *self, RoamSphere *sphere) +void roam_point_update_height(RoamPoint *point) { - if (sphere->height_func) { - sphere->height_func(self, sphere->user_data); - } else { - gdouble dist = sqrt(self->x * self->x + - self->y * self->y + - self->z * self->z); - self->x = self->x/dist * 6371000; - self->y = self->y/dist * 6371000; - self->z = self->z/dist * 6371000; + if (point->height_func) { + gdouble elev = point->height_func( + point->lat, point->lon, point->height_data); + lle2xyz(point->lat, point->lon, elev, + &point->x, &point->y, &point->z); } } -void roam_point_update_projection(RoamPoint *self, RoamSphere *sphere) + +void roam_point_update_projection(RoamPoint *point, RoamView *view) { static int count = 0; static int version = 0; - if (version != sphere->view->version) { - g_debug("Projected %d points", count); + if (version != view->version) { + g_debug("RoamPoint: Projected %d points", count); count = 0; - version = sphere->view->version; + version = view->version; } - if (self->pversion != sphere->view->version) { + if (point->pversion != view->version) { /* Cache projection */ - gluProject(self->x, self->y, self->z, - sphere->view->model, sphere->view->proj, sphere->view->view, - &self->px, &self->py, &self->pz); - self->pversion = sphere->view->version; + gluProject(point->x, point->y, point->z, + view->model, view->proj, view->view, + &point->px, &point->py, &point->pz); + point->pversion = view->version; count++; } } @@ -134,80 +123,116 @@ void roam_point_update_projection(RoamPoint *self, RoamSphere *sphere) ****************/ RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r) { - RoamTriangle *self = g_new0(RoamTriangle, 1); - - self->p.l = l; - 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); - - self->error = 0; + RoamTriangle *triangle = g_new0(RoamTriangle, 1); + + triangle->error = 0; + triangle->p.l = l; + triangle->p.m = m; + triangle->p.r = r; + triangle->split = roam_point_new( + (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 */ + triangle->split->height_func = m->height_func; + triangle->split->height_data = m->height_data; + roam_point_update_height(triangle->split); + //if ((float)triangle->split->lat > 44 && (float)triangle->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, triangle->split->lat); + //if ((float)l->lat == (float)r->lat && + // (float)triangle->split->lat != (float)l->lat) + // g_warning("RoamTriangle: new - split.lat=%f != (l=r).lat=%f", + // triangle->split->lat, l->lat); /* Update normal */ double pa[3]; double pb[3]; - pa[0] = self->p.l->x - self->p.m->x; - pa[1] = self->p.l->y - self->p.m->y; - pa[2] = self->p.l->z - self->p.m->z; - - pb[0] = self->p.r->x - self->p.m->x; - pb[1] = self->p.r->y - self->p.m->y; - pb[2] = self->p.r->z - self->p.m->z; - - self->norm[0] = pa[1] * pb[2] - pa[2] * pb[1]; - self->norm[1] = pa[2] * pb[0] - pa[0] * pb[2]; - self->norm[2] = pa[0] * pb[1] - pa[1] * pb[0]; - - double total = sqrt(self->norm[0] * self->norm[0] + - self->norm[1] * self->norm[1] + - self->norm[2] * self->norm[2]); - - self->norm[0] /= total; - self->norm[1] /= total; - self->norm[2] /= total; + pa[0] = triangle->p.l->x - triangle->p.m->x; + pa[1] = triangle->p.l->y - triangle->p.m->y; + pa[2] = triangle->p.l->z - triangle->p.m->z; + + pb[0] = triangle->p.r->x - triangle->p.m->x; + pb[1] = triangle->p.r->y - triangle->p.m->y; + pb[2] = triangle->p.r->z - triangle->p.m->z; + + triangle->norm[0] = pa[1] * pb[2] - pa[2] * pb[1]; + triangle->norm[1] = pa[2] * pb[0] - pa[0] * pb[2]; + triangle->norm[2] = pa[0] * pb[1] - pa[1] * pb[0]; + + double total = sqrt(triangle->norm[0] * triangle->norm[0] + + triangle->norm[1] * triangle->norm[1] + + triangle->norm[2] * triangle->norm[2]); + + triangle->norm[0] /= total; + triangle->norm[1] /= total; + triangle->norm[2] /= total; + + /* Store bounding box, for get_intersect */ + RoamPoint *p[] = {l,m,r}; + triangle->edge.n = -90; triangle->edge.s = 90; + triangle->edge.e = -180; triangle->edge.w = 180; + gboolean maxed = FALSE; + for (int i = 0; i < G_N_ELEMENTS(p); i++) { + triangle->edge.n = MAX(triangle->edge.n, p[i]->lat); + triangle->edge.s = MIN(triangle->edge.s, p[i]->lat); + if (p[i]->lat == 90 || p[i]->lat == -90) + continue; + if (p[i]->lon == 180) { + maxed = TRUE; + continue; + } + triangle->edge.e = MAX(triangle->edge.e, p[i]->lon); + triangle->edge.w = MIN(triangle->edge.w, p[i]->lon); + } + if (maxed) { + if (triangle->edge.e < 0) + triangle->edge.w = -180; + else + triangle->edge.e = 180; + } - //g_message("roam_triangle_new: %p", self); - return self; + //g_message("roam_triangle_new: %p", triangle); + return triangle; } -void roam_triangle_free(RoamTriangle *self) +void roam_triangle_free(RoamTriangle *triangle) { - g_free(self->split); - g_free(self); + g_free(triangle->split); + g_free(triangle); } -void roam_triangle_add(RoamTriangle *self, +void roam_triangle_add(RoamTriangle *triangle, RoamTriangle *left, RoamTriangle *base, RoamTriangle *right, RoamSphere *sphere) { - self->t.l = left; - self->t.b = base; - self->t.r = right; + triangle->t.l = left; + triangle->t.b = base; + triangle->t.r = right; - roam_point_add_triangle(self->p.l, self); - roam_point_add_triangle(self->p.m, self); - roam_point_add_triangle(self->p.r, self); + roam_point_add_triangle(triangle->p.l, triangle); + roam_point_add_triangle(triangle->p.m, triangle); + roam_point_add_triangle(triangle->p.r, triangle); if (sphere->view) - roam_triangle_update_errors(self, sphere); + roam_triangle_update_errors(triangle, sphere); - self->handle = g_pqueue_push(sphere->triangles, self); + triangle->handle = g_pqueue_push(sphere->triangles, triangle); } -void roam_triangle_remove(RoamTriangle *self, RoamSphere *sphere) +void roam_triangle_remove(RoamTriangle *triangle, RoamSphere *sphere) { /* Update vertex normals */ - roam_point_remove_triangle(self->p.l, self); - roam_point_remove_triangle(self->p.m, self); - roam_point_remove_triangle(self->p.r, self); + roam_point_remove_triangle(triangle->p.l, triangle); + roam_point_remove_triangle(triangle->p.m, triangle); + roam_point_remove_triangle(triangle->p.r, triangle); - g_pqueue_remove(sphere->triangles, self->handle); + g_pqueue_remove(sphere->triangles, triangle->handle); } -void roam_triangle_sync_neighbors(RoamTriangle *new, RoamTriangle *old, RoamTriangle *neigh) +static void roam_triangle_sync_neighbors(RoamTriangle *new, RoamTriangle *old, RoamTriangle *neigh) { if (neigh->t.l == old) neigh->t.l = new; else if (neigh->t.b == old) neigh->t.b = new; @@ -215,51 +240,43 @@ void roam_triangle_sync_neighbors(RoamTriangle *new, RoamTriangle *old, RoamTria else g_assert_not_reached(); } -gboolean roam_point_visible(RoamPoint *self, RoamSphere *sphere) +static gboolean roam_point_visible(RoamPoint *triangle, RoamSphere *sphere) { gint *view = sphere->view->view; - return self->px > view[0] && self->px < view[2] && - self->py > view[1] && self->py < view[3] && - self->pz > 0 && self->pz < 1; - //double x, y, z; - //int view[4] = {0,0,1,1}; - //gluProject(self->x, self->y, self->z, - // sphere->view->model, sphere->view->proj, view, - // &x, &y, &z); - //return !(x < 0 || x > 1 || - // y < 0 || y > 1 || - // z < 0 || z > 1); -} -gboolean roam_triangle_visible(RoamTriangle *self, RoamSphere *sphere) + return triangle->px > view[0] && triangle->px < view[2] && + triangle->py > view[1] && triangle->py < view[3] && + triangle->pz > 0 && triangle->pz < 1; +} +static gboolean roam_triangle_visible(RoamTriangle *triangle, RoamSphere *sphere) { /* Do this with a bounding box */ - return roam_point_visible(self->p.l, sphere) || - roam_point_visible(self->p.m, sphere) || - roam_point_visible(self->p.r, sphere); + return roam_point_visible(triangle->p.l, sphere) || + roam_point_visible(triangle->p.m, sphere) || + roam_point_visible(triangle->p.r, sphere); } -void roam_triangle_update_errors(RoamTriangle *self, RoamSphere *sphere) +void roam_triangle_update_errors(RoamTriangle *triangle, RoamSphere *sphere) { /* Update points */ - 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); + roam_point_update_projection(triangle->p.l, sphere->view); + roam_point_update_projection(triangle->p.m, sphere->view); + roam_point_update_projection(triangle->p.r, sphere->view); /* Not exactly correct, could be out on both sides (middle in) */ - if (!roam_triangle_visible(self, sphere)) { - self->error = -1; + if (!roam_triangle_visible(triangle, sphere)) { + triangle->error = -1; } else { - RoamPoint *l = self->p.l; - RoamPoint *m = self->p.m; - RoamPoint *r = self->p.r; - RoamPoint *split = self->split; + roam_point_update_projection(triangle->split, sphere->view); + RoamPoint *l = triangle->p.l; + RoamPoint *m = triangle->p.m; + RoamPoint *r = triangle->p.r; + RoamPoint *split = triangle->split; /* l-r midpoint projected l-r midpoint */ gdouble pxdist = (l->px + r->px)/2 - split->px; gdouble pydist = (l->py + r->py)/2 - split->py; - self->error = sqrt(pxdist*pxdist + pydist*pydist); + triangle->error = sqrt(pxdist*pxdist + pydist*pydist); /* Multiply by size of triangle */ double size = -( l->px * (m->py - r->py) + @@ -267,78 +284,76 @@ void roam_triangle_update_errors(RoamTriangle *self, RoamSphere *sphere) r->px * (l->py - m->py) ) / 2.0; /* Size < 0 == backface */ - self->error *= size; + //if (size < 0) + // triangle->error *= -1; + triangle->error *= size; } } -void roam_triangle_split(RoamTriangle *self, RoamSphere *sphere) +void roam_triangle_split(RoamTriangle *triangle, RoamSphere *sphere) { - //g_message("roam_triangle_split: %p, e=%f\n", self, self->error); + //g_message("roam_triangle_split: %p, e=%f\n", triangle, triangle->error); sphere->polys += 2; - if (self != self->t.b->t.b) - roam_triangle_split(self->t.b, sphere); - - RoamTriangle *base = self->t.b; + if (triangle != triangle->t.b->t.b) + roam_triangle_split(triangle->t.b, sphere); + if (triangle != triangle->t.b->t.b) + g_assert_not_reached(); + RoamTriangle *base = triangle->t.b; /* 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); - - /* tri,l, base, r, sphere */ - roam_triangle_add(sl, sr, self->t.l, br, sphere); - roam_triangle_add(sr, bl, self->t.r, sl, sphere); + RoamPoint *mid = triangle->split; + RoamTriangle *sl = triangle->kids[0] = roam_triangle_new(triangle->p.m, mid, triangle->p.l); // triangle Left + RoamTriangle *sr = triangle->kids[1] = roam_triangle_new(triangle->p.r, mid, triangle->p.m); // triangle 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 + + /* triangle,l, base, r, sphere */ + roam_triangle_add(sl, sr, triangle->t.l, br, sphere); + roam_triangle_add(sr, bl, triangle->t.r, sl, sphere); roam_triangle_add(bl, br, base->t.l, sr, sphere); roam_triangle_add(br, sl, base->t.r, bl, sphere); - roam_triangle_sync_neighbors(sl, self, self->t.l); - roam_triangle_sync_neighbors(sr, self, self->t.r); + roam_triangle_sync_neighbors(sl, triangle, triangle->t.l); + roam_triangle_sync_neighbors(sr, triangle, triangle->t.r); roam_triangle_sync_neighbors(bl, base, base->t.l); roam_triangle_sync_neighbors(br, base, base->t.r); /* Remove old triangles */ - roam_triangle_remove(self, sphere); + roam_triangle_remove(triangle, sphere); roam_triangle_remove(base, sphere); /* Add/Remove diamonds */ - RoamDiamond *diamond = roam_diamond_new(self, base, sl, sr, bl, br); + RoamDiamond *diamond = roam_diamond_new(triangle, base, sl, sr, bl, br); roam_diamond_update_errors(diamond, sphere); roam_diamond_add(diamond, sphere); - roam_diamond_remove(self->parent, sphere); + roam_diamond_remove(triangle->parent, sphere); roam_diamond_remove(base->parent, sphere); } -void roam_triangle_draw(RoamTriangle *self) +void roam_triangle_draw(RoamTriangle *triangle) { glBegin(GL_TRIANGLES); - glNormal3dv(self->p.r->norm); glVertex3dv((double*)self->p.r); - glNormal3dv(self->p.m->norm); glVertex3dv((double*)self->p.m); - glNormal3dv(self->p.l->norm); glVertex3dv((double*)self->p.l); + glNormal3dv(triangle->p.r->norm); glVertex3dv((double*)triangle->p.r); + glNormal3dv(triangle->p.m->norm); glVertex3dv((double*)triangle->p.m); + glNormal3dv(triangle->p.l->norm); glVertex3dv((double*)triangle->p.l); glEnd(); return; } -void roam_triangle_draw_normal(RoamTriangle *self) +void roam_triangle_draw_normal(RoamTriangle *triangle) { double center[] = { - (self->p.l->x + self->p.m->x + self->p.r->x)/3.0, - (self->p.l->y + self->p.m->y + self->p.r->y)/3.0, - (self->p.l->z + self->p.m->z + self->p.r->z)/3.0, + (triangle->p.l->x + triangle->p.m->x + triangle->p.r->x)/3.0, + (triangle->p.l->y + triangle->p.m->y + triangle->p.r->y)/3.0, + (triangle->p.l->z + triangle->p.m->z + triangle->p.r->z)/3.0, }; double end[] = { - center[0]+self->norm[0]*2000000, - center[1]+self->norm[1]*2000000, - center[2]+self->norm[2]*2000000, + center[0]+triangle->norm[0]*2000000, + center[1]+triangle->norm[1]*2000000, + center[2]+triangle->norm[2]*2000000, }; glBegin(GL_LINES); glVertex3dv(center); @@ -354,54 +369,54 @@ RoamDiamond *roam_diamond_new( RoamTriangle *kid0, RoamTriangle *kid1, RoamTriangle *kid2, RoamTriangle *kid3) { - RoamDiamond *self = g_new0(RoamDiamond, 1); + RoamDiamond *diamond = g_new0(RoamDiamond, 1); - self->kids[0] = kid0; - self->kids[1] = kid1; - self->kids[2] = kid2; - self->kids[3] = kid3; + diamond->kids[0] = kid0; + diamond->kids[1] = kid1; + diamond->kids[2] = kid2; + diamond->kids[3] = kid3; - kid0->parent = self; - kid1->parent = self; - kid2->parent = self; - kid3->parent = self; + kid0->parent = diamond; + kid1->parent = diamond; + kid2->parent = diamond; + kid3->parent = diamond; - self->parents[0] = parent0; - self->parents[1] = parent1; + diamond->parents[0] = parent0; + diamond->parents[1] = parent1; - return self; + return diamond; } -void roam_diamond_add(RoamDiamond *self, RoamSphere *sphere) +void roam_diamond_add(RoamDiamond *diamond, RoamSphere *sphere) { - self->active = TRUE; - self->error = MAX(self->parents[0]->error, self->parents[1]->error); - self->handle = g_pqueue_push(sphere->diamonds, self); + diamond->active = TRUE; + diamond->error = MAX(diamond->parents[0]->error, diamond->parents[1]->error); + diamond->handle = g_pqueue_push(sphere->diamonds, diamond); } -void roam_diamond_remove(RoamDiamond *self, RoamSphere *sphere) +void roam_diamond_remove(RoamDiamond *diamond, RoamSphere *sphere) { - if (self && self->active) { - self->active = FALSE; - g_pqueue_remove(sphere->diamonds, self->handle); + if (diamond && diamond->active) { + diamond->active = FALSE; + g_pqueue_remove(sphere->diamonds, diamond->handle); } } -void roam_diamond_merge(RoamDiamond *self, RoamSphere *sphere) +void roam_diamond_merge(RoamDiamond *diamond, RoamSphere *sphere) { - //g_message("roam_diamond_merge: %p, e=%f\n", self, self->error); + //g_message("roam_diamond_merge: %p, e=%f\n", diamond, diamond->error); sphere->polys -= 2; /* TODO: pick the best split */ - RoamTriangle **kids = self->kids; + RoamTriangle **kids = diamond->kids; /* Create triangles */ - RoamTriangle *tri = self->parents[0]; - RoamTriangle *base = self->parents[1]; + RoamTriangle *triangle = diamond->parents[0]; + RoamTriangle *base = diamond->parents[1]; - roam_triangle_add(tri, kids[0]->t.b, base, kids[1]->t.b, sphere); - roam_triangle_add(base, kids[2]->t.b, tri, kids[3]->t.b, sphere); + roam_triangle_add(triangle, kids[0]->t.b, base, kids[1]->t.b, sphere); + roam_triangle_add(base, kids[2]->t.b, triangle, kids[3]->t.b, sphere); - roam_triangle_sync_neighbors(tri, kids[0], kids[0]->t.b); - roam_triangle_sync_neighbors(tri, kids[1], kids[1]->t.b); + roam_triangle_sync_neighbors(triangle, kids[0], kids[0]->t.b); + roam_triangle_sync_neighbors(triangle, kids[1], kids[1]->t.b); roam_triangle_sync_neighbors(base, kids[2], kids[2]->t.b); roam_triangle_sync_neighbors(base, kids[3], kids[3]->t.b); @@ -411,11 +426,15 @@ void roam_diamond_merge(RoamDiamond *self, RoamSphere *sphere) roam_triangle_remove(kids[2], sphere); roam_triangle_remove(kids[3], sphere); + /* Clear kids */ + triangle->kids[0] = triangle->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) { - roam_diamond_update_errors(tri->parent, sphere); - roam_diamond_add(tri->parent, sphere); + if (triangle->t.l->t.l == triangle->t.r->t.r && + triangle->t.l->t.l != triangle && triangle->parent) { + roam_diamond_update_errors(triangle->parent, sphere); + roam_diamond_add(triangle->parent, sphere); } if (base->t.l->t.l == base->t.r->t.r && @@ -425,168 +444,248 @@ void roam_diamond_merge(RoamDiamond *self, RoamSphere *sphere) } /* Remove and free diamond and child triangles */ - roam_diamond_remove(self, sphere); - g_assert(self->kids[0]->p.m == self->kids[1]->p.m && - self->kids[1]->p.m == self->kids[2]->p.m && - self->kids[2]->p.m == self->kids[3]->p.m); - g_assert(self->kids[0]->p.m->tris == 0); - roam_triangle_free(self->kids[0]); - roam_triangle_free(self->kids[1]); - roam_triangle_free(self->kids[2]); - roam_triangle_free(self->kids[3]); - g_free(self); + roam_diamond_remove(diamond, sphere); + g_assert(diamond->kids[0]->p.m == diamond->kids[1]->p.m && + diamond->kids[1]->p.m == diamond->kids[2]->p.m && + diamond->kids[2]->p.m == diamond->kids[3]->p.m); + g_assert(diamond->kids[0]->p.m->tris == 0); + roam_triangle_free(diamond->kids[0]); + roam_triangle_free(diamond->kids[1]); + roam_triangle_free(diamond->kids[2]); + roam_triangle_free(diamond->kids[3]); + g_free(diamond); } -void roam_diamond_update_errors(RoamDiamond *self, RoamSphere *sphere) +void roam_diamond_update_errors(RoamDiamond *diamond, RoamSphere *sphere) { - roam_triangle_update_errors(self->parents[0], sphere); - roam_triangle_update_errors(self->parents[1], sphere); - self->error = MAX(self->parents[0]->error, self->parents[1]->error); + roam_triangle_update_errors(diamond->parents[0], sphere); + roam_triangle_update_errors(diamond->parents[1], sphere); + diamond->error = MAX(diamond->parents[0]->error, diamond->parents[1]->error); } /************** * 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->triangles = g_pqueue_new((GCompareDataFunc)tri_cmp, NULL); - self->diamonds = g_pqueue_new((GCompareDataFunc)dia_cmp, NULL); + RoamSphere *sphere = g_new0(RoamSphere, 1); + sphere->polys = 8; + sphere->triangles = g_pqueue_new((GCompareDataFunc)tri_cmp, NULL); + sphere->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( 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 */ - {{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( + sphere->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]], - self); + for (int i = 0; i < 8; i++) + roam_triangle_add(sphere->roots[i], + sphere->roots[_triangles[i][1][0]], + sphere->roots[_triangles[i][1][1]], + sphere->roots[_triangles[i][1][2]], + sphere); + for (int i = 0; i < 8; i++) + g_debug("RoamSphere: new - %p edge=%f,%f,%f,%f", sphere->roots[i], + sphere->roots[i]->edge.n, + sphere->roots[i]->edge.s, + sphere->roots[i]->edge.e, + sphere->roots[i]->edge.w); - return self; + return sphere; } -void roam_sphere_update_errors(RoamSphere *self) +void roam_sphere_update_view(RoamSphere *sphere) { - g_debug("RoamSphere: update - polys=%d", self->polys); - if (!self->view) - self->view = roam_view_new(); - roam_view_update(self->view); + if (!sphere->view) + sphere->view = g_new0(RoamView, 1); + glGetDoublev (GL_MODELVIEW_MATRIX, sphere->view->model); + glGetDoublev (GL_PROJECTION_MATRIX, sphere->view->proj); + glGetIntegerv(GL_VIEWPORT, sphere->view->view); + sphere->view->version++; +} +void roam_sphere_update_errors(RoamSphere *sphere) +{ + g_debug("RoamSphere: update_errors - polys=%d", sphere->polys); + GPtrArray *tris = g_pqueue_get_array(sphere->triangles); + GPtrArray *dias = g_pqueue_get_array(sphere->diamonds); - GPtrArray *tris = g_pqueue_get_array(self->triangles); - GPtrArray *dias = g_pqueue_get_array(self->diamonds); + roam_sphere_update_view(sphere); for (int i = 0; i < tris->len; i++) { - RoamTriangle *tri = tris->pdata[i]; - roam_triangle_update_errors(tri, self); - g_pqueue_priority_changed(self->triangles, tri->handle); + RoamTriangle *triangle = tris->pdata[i]; + roam_triangle_update_errors(triangle, sphere); + g_pqueue_priority_changed(sphere->triangles, triangle->handle); } for (int i = 0; i < dias->len; i++) { - RoamDiamond *dia = dias->pdata[i]; - roam_diamond_update_errors(dia, self); - g_pqueue_priority_changed(self->diamonds, dia->handle); + RoamDiamond *diamond = dias->pdata[i]; + roam_diamond_update_errors(diamond, sphere); + g_pqueue_priority_changed(sphere->diamonds, diamond->handle); } g_ptr_array_free(tris, TRUE); g_ptr_array_free(dias, TRUE); } -void roam_sphere_split_one(RoamSphere *self) +void roam_sphere_split_one(RoamSphere *sphere) { - RoamTriangle *to_split = g_pqueue_peek(self->triangles); + RoamTriangle *to_split = g_pqueue_peek(sphere->triangles); if (!to_split) return; - roam_triangle_split(to_split, self); + roam_triangle_split(to_split, sphere); } -void roam_sphere_merge_one(RoamSphere *self) +void roam_sphere_merge_one(RoamSphere *sphere) { - RoamDiamond *to_merge = g_pqueue_peek(self->diamonds); + RoamDiamond *to_merge = g_pqueue_peek(sphere->diamonds); if (!to_merge) return; - roam_diamond_merge(to_merge, self); + roam_diamond_merge(to_merge, sphere); } -gint roam_sphere_split_merge(RoamSphere *self) +gint roam_sphere_split_merge(RoamSphere *sphere) { gint iters = 0, max_iters = 500; - gint target = 4000; + //gint target = 4000; + gint target = 2000; + //gint target = 500; - if (!self->view) + if (!sphere->view) return 0; - if (target - self->polys > 100) - while (self->polys < target && iters++ < max_iters) - roam_sphere_split_one(self); + if (target - sphere->polys > 100) { + //g_debug("RoamSphere: split_merge - Splitting %d - %d > 100", target, sphere->polys); + while (sphere->polys < target && iters++ < max_iters) + roam_sphere_split_one(sphere); + } - if (self->polys - target > 100) - while (self->polys > target && iters++ < max_iters) - roam_sphere_merge_one(self); + if (sphere->polys - target > 100) { + //g_debug("RoamSphere: split_merge - Merging %d - %d > 100", sphere->polys, target); + while (sphere->polys > target && iters++ < max_iters) + roam_sphere_merge_one(sphere); + } - while (((RoamTriangle*)g_pqueue_peek(self->triangles))->error > - ((RoamDiamond *)g_pqueue_peek(self->diamonds ))->error && + while (((RoamTriangle*)g_pqueue_peek(sphere->triangles))->error > + ((RoamDiamond *)g_pqueue_peek(sphere->diamonds ))->error && iters++ < max_iters) { - roam_sphere_merge_one(self); - roam_sphere_split_one(self); + //g_debug("RoamSphere: split_merge - Fixing 1 %f > %f && %d < %d", + // ((RoamTriangle*)g_pqueue_peek(sphere->triangles))->error, + // ((RoamDiamond *)g_pqueue_peek(sphere->diamonds ))->error, + // iters-1, max_iters); + roam_sphere_merge_one(sphere); + roam_sphere_split_one(sphere); } return iters; } -void roam_sphere_draw(RoamSphere *self) +void roam_sphere_draw(RoamSphere *sphere) { - g_message("RoamSphere: draw"); - g_pqueue_foreach(self->triangles, (GFunc)roam_triangle_draw, NULL); + g_debug("RoamSphere: draw"); + g_pqueue_foreach(sphere->triangles, (GFunc)roam_triangle_draw, NULL); } -void roam_sphere_draw_normals(RoamSphere *self) +void roam_sphere_draw_normals(RoamSphere *sphere) { - g_message("RoamSphere: draw_normal"); - g_pqueue_foreach(self->triangles, (GFunc)roam_triangle_draw_normal, NULL); + g_debug("RoamSphere: draw_normal"); + g_pqueue_foreach(sphere->triangles, (GFunc)roam_triangle_draw_normal, NULL); } -void roam_sphere_free_tri(RoamTriangle *tri) +static GList *_roam_sphere_get_leaves(RoamTriangle *triangle, GList *list, gboolean all) +{ + if (triangle->kids[0] && triangle->kids[1]) { + if (all) list = g_list_prepend(list, triangle); + list = _roam_sphere_get_leaves(triangle->kids[0], list, all); + list = _roam_sphere_get_leaves(triangle->kids[1], list, all); + return list; + } else { + return g_list_prepend(list, triangle); + } +} +static GList *_roam_sphere_get_intersect_rec(RoamTriangle *triangle, GList *list, + gboolean all, gdouble n, gdouble s, gdouble e, gdouble w) +{ + gdouble tn = triangle->edge.n; + gdouble ts = triangle->edge.s; + gdouble te = triangle->edge.e; + gdouble tw = triangle->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", + triangle, 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"); + if (all) list = g_list_prepend(list, triangle); + return _roam_sphere_get_leaves(triangle, list, all); + } else if (triangle->kids[0] && triangle->kids[1]) { + /* Paritial intersect with children */ + if (debug) g_message("edge w/ child"); + if (all) list = g_list_prepend(list, triangle); + list = _roam_sphere_get_intersect_rec(triangle->kids[0], list, all, n, s, e, w); + list = _roam_sphere_get_intersect_rec(triangle->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_prepend(list, triangle); + } +} +/* 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 *sphere, gboolean all, + 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(sphere->roots); i++) + list = _roam_sphere_get_intersect_rec(sphere->roots[i], + list, all, n, s, e, w); + return list; +} + +static void roam_sphere_free_tri(RoamTriangle *triangle) { - if (--tri->p.l->tris == 0) g_free(tri->p.l); - if (--tri->p.m->tris == 0) g_free(tri->p.m); - if (--tri->p.r->tris == 0) g_free(tri->p.r); - roam_triangle_free(tri); + if (--triangle->p.l->tris == 0) g_free(triangle->p.l); + if (--triangle->p.m->tris == 0) g_free(triangle->p.m); + if (--triangle->p.r->tris == 0) g_free(triangle->p.r); + roam_triangle_free(triangle); } -void roam_sphere_free(RoamSphere *self) +void roam_sphere_free(RoamSphere *sphere) { + g_debug("RoamSphere: free"); /* Slow method, but it should work */ - while (self->polys > 12) - roam_sphere_merge_one(self); + while (sphere->polys > 8) + roam_sphere_merge_one(sphere); /* TODO: free points */ - g_pqueue_foreach(self->triangles, (GFunc)roam_sphere_free_tri, NULL); - g_pqueue_free(self->triangles); - g_pqueue_free(self->diamonds); - g_free(self); + g_pqueue_foreach(sphere->triangles, (GFunc)roam_sphere_free_tri, NULL); + g_pqueue_free(sphere->triangles); + g_pqueue_free(sphere->diamonds); + g_free(sphere->view); + g_free(sphere); }