Misc OpenGL refactoring and minor updates

[grits] / src / roam.h

diff --git a/src/roam.h b/src/roam.h
index da4f508561194ba4bbccf3fb81fc933b86f92663..815390f2d4616f17816ad684c71962e6d1bc1fae 100644 (file)
--- a/src/roam.h
+++ b/src/roam.h
@@ -48,7 +48,7 @@ struct _RoamPoint {
        gdouble  norm[3];   // Vertex normal
 
        /* For get_intersect */
-       gdouble  lat, lon;
+       gdouble  lat, lon, elev;
 
        /* For terrain */
        RoamHeightFunc height_func;
@@ -71,6 +71,10 @@ struct _RoamTriangle {
        double norm[3];
        double error;
        GPQueueHandle handle;
+
+       /* For get_intersect */
+       struct { gdouble n,s,e,w; } edge;
+       RoamTriangle *kids[2];
 };
 RoamTriangle *roam_triangle_new(RoamPoint *l, RoamPoint *m, RoamPoint *r);
 void roam_triangle_add(RoamTriangle *triangle,
@@ -113,12 +117,15 @@ struct _RoamSphere {
        RoamTriangle *roots[8];
 };
 RoamSphere *roam_sphere_new();
+void roam_sphere_update_view(RoamSphere *sphere);
 void roam_sphere_update_errors(RoamSphere *sphere);
 void roam_sphere_split_one(RoamSphere *sphere);
 void roam_sphere_merge_one(RoamSphere *sphere);
 gint roam_sphere_split_merge(RoamSphere *sphere);
 void roam_sphere_draw(RoamSphere *sphere);
 void roam_sphere_draw_normals(RoamSphere *sphere);
+GList *roam_sphere_get_intersect(RoamSphere *sphere,
+               gdouble n, gdouble s, gdouble e, gdouble w);
 void roam_sphere_free(RoamSphere *sphere);
 
 #endif