X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis-opengl.c;h=0352fce0a75ba8713390b46a165052af0fd9a93a;hp=f0ac518586734f5fda07364f002504e827418860;hb=ad940f5d65ed4c95f72cac825244cae53dd6c78d;hpb=ac7156bd84aef88b712f117f7e2f3d847d371719

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index f0ac518..0352fce 100644
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -29,40 +29,28 @@
 
 #include "gis-opengl.h"
 #include "roam.h"
-#include "wms.h"
 
 #define FOV_DIST   2000.0
 #define MPPX(dist) (4*dist/FOV_DIST)
 
-//#define ROAM_DEBUG
+// #define ROAM_DEBUG
 
 /*************
  * ROAM Code *
  *************/
-void roam_queue_draw(WmsCacheNode *node, gpointer _self)
-{
-	gtk_widget_queue_draw(GTK_WIDGET(_self));
-}
-
-static void set_camera(GisOpenGL *self)
+static void set_visuals(GisOpenGL *self)
 {
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
+
+	/* Camera 1 */
 	double lat, lon, elev, rx, ry, rz;
 	gis_view_get_location(self->view, &lat, &lon, &elev);
 	gis_view_get_rotation(self->view, &rx, &ry, &rz);
 	glRotatef(rx, 1, 0, 0);
 	glRotatef(rz, 0, 0, 1);
-	glTranslatef(0, 0, -elev2rad(elev));
-	glRotatef(lat, 1, 0, 0);
-	glRotatef(-lon, 0, 1, 0);
-}
 
-static void set_visuals(GisOpenGL *self)
-{
 	/* Lighting */
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
 #ifdef ROAM_DEBUG
 	float light_ambient[]  = {0.7f, 0.7f, 0.7f, 1.0f};
 	float light_diffuse[]  = {2.0f, 2.0f, 2.0f, 1.0f};
@@ -88,15 +76,16 @@ static void set_visuals(GisOpenGL *self)
 	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_COLOR_MATERIAL);
 
-	/* Camera */
-	set_camera(self);
+	/* Camera 2 */
+	glTranslatef(0, 0, -elev2rad(elev));
+	glRotatef(lat, 1, 0, 0);
+	glRotatef(-lon, 0, 1, 0);
 
 	/* Misc */
-	gdouble lat, lon, elev;
-	gis_view_get_location(self->view, &lat, &lon, &elev);
 	gdouble rg   = MAX(0, 1-(elev/20000));
 	gdouble blue = MAX(0, 1-(elev/50000));
 	glClearColor(MIN(0.65,rg), MIN(0.65,rg), MIN(1,blue), 1.0f);
+	glColor4f(1, 1, 1, 1);
 
 	glDisable(GL_ALPHA_TEST);
 
@@ -116,6 +105,8 @@ static void set_visuals(GisOpenGL *self)
 
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 	//glShadeModel(GL_FLAT);
+
+	roam_sphere_update_view(self->sphere);
 }
 
 
@@ -124,12 +115,13 @@ static void set_visuals(GisOpenGL *self)
  *************/
 static void on_realize(GisOpenGL *self, gpointer _)
 {
+	g_debug("GisOpenGL: on_realize");
 	set_visuals(self);
 	roam_sphere_update_errors(self->sphere);
 }
 static gboolean on_configure(GisOpenGL *self, GdkEventConfigure *event, gpointer _)
 {
-	g_debug("GisOpenGL: on_confiure");
+	g_debug("GisOpenGL: on_configure");
 	gis_opengl_begin(self);
 
 	double width  = GTK_WIDGET(self)->allocation.width;
@@ -166,10 +158,13 @@ static gboolean on_expose(GisOpenGL *self, GdkEventExpose *event, gpointer _)
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 #ifndef ROAM_DEBUG
-	set_visuals(self);
-	glEnable(GL_TEXTURE_2D);
-	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-	roam_sphere_draw(self->sphere);
+	gis_plugins_foreach(self->plugins, G_CALLBACK(on_expose_plugin), self);
+
+	if (self->wireframe) {
+		set_visuals(self);
+		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+		roam_sphere_draw(self->sphere);
+	}
 #else
 	set_visuals(self);
 	glColor4f(0.0, 0.0, 9.0, 0.6);
@@ -180,8 +175,6 @@ static gboolean on_expose(GisOpenGL *self, GdkEventExpose *event, gpointer _)
 	//roam_sphere_draw_normals(self->sphere);
 #endif
 
-	gis_plugins_foreach(self->plugins, G_CALLBACK(on_expose_plugin), self);
-
 	set_visuals(self);
 	gis_opengl_end(self);
 	gis_opengl_flush(self);
@@ -205,47 +198,64 @@ static gboolean on_key_press(GisOpenGL *self, GdkEventKey *event, gpointer _)
 	gis_view_get_location(self->view, &lat, &lon, &elev);
 	pan = MIN(elev/(EARTH_R/2), 30);
 	guint kv = event->keyval;
+	gdk_threads_leave();
 	if      (kv == GDK_Left  || kv == GDK_h) gis_view_pan(self->view,  0,  -pan, 0);
 	else if (kv == GDK_Down  || kv == GDK_j) gis_view_pan(self->view, -pan, 0,   0);
 	else if (kv == GDK_Up    || kv == GDK_k) gis_view_pan(self->view,  pan, 0,   0);
 	else if (kv == GDK_Right || kv == GDK_l) gis_view_pan(self->view,  0,   pan, 0);
 	else if (kv == GDK_minus || kv == GDK_o) gis_view_zoom(self->view, 10./9);
 	else if (kv == GDK_plus  || kv == GDK_i) gis_view_zoom(self->view, 9./10);
-	else if (kv == GDK_H) gis_view_rotate(self->view,  0,  0, -10);
-	else if (kv == GDK_J) gis_view_rotate(self->view,  10, 0,  0);
-	else if (kv == GDK_K) gis_view_rotate(self->view, -10, 0,  0);
-	else if (kv == GDK_L) gis_view_rotate(self->view,  0,  0,  10);
+	else if (kv == GDK_H) gis_view_rotate(self->view,  0, 0, -2);
+	else if (kv == GDK_J) gis_view_rotate(self->view,  2, 0,  0);
+	else if (kv == GDK_K) gis_view_rotate(self->view, -2, 0,  0);
+	else if (kv == GDK_L) gis_view_rotate(self->view,  0, 0,  2);
 
 	/* Testing */
+	else if (kv == GDK_w) {self->wireframe = !self->wireframe; gtk_widget_queue_draw(GTK_WIDGET(self));}
 #ifdef ROAM_DEBUG
 	else if (kv == GDK_n) roam_sphere_split_one(self->sphere);
 	else if (kv == GDK_p) roam_sphere_merge_one(self->sphere);
 	else if (kv == GDK_r) roam_sphere_split_merge(self->sphere);
 	else if (kv == GDK_u) roam_sphere_update_errors(self->sphere);
+	gdk_threads_enter();
 	gtk_widget_queue_draw(GTK_WIDGET(self));
+#else
+	gdk_threads_enter();
 #endif
 
 	return TRUE;
 }
 
+static gboolean _update_errors_cb(gpointer sphere)
+{
+	roam_sphere_update_errors(sphere);
+	return FALSE;
+}
 static void on_view_changed(GisView *view,
 		gdouble _1, gdouble _2, gdouble _3, GisOpenGL *self)
 {
+	g_debug("GisOpenGL: on_view_changed");
+	gdk_threads_enter();
 	gis_opengl_begin(self);
 	set_visuals(self);
 #ifndef ROAM_DEBUG
-	roam_sphere_update_errors(self->sphere);
+	g_idle_add_full(G_PRIORITY_HIGH_IDLE+30, _update_errors_cb, self->sphere, NULL);
+	//roam_sphere_update_errors(self->sphere);
 #endif
 	gis_opengl_redraw(self);
 	gis_opengl_end(self);
+	gdk_threads_leave();
 }
 
 static gboolean on_idle(GisOpenGL *self)
 {
+	//g_debug("GisOpenGL: on_idle");
+	gdk_threads_enter();
 	gis_opengl_begin(self);
 	if (roam_sphere_split_merge(self->sphere))
 		gis_opengl_redraw(self);
 	gis_opengl_end(self);
+	gdk_threads_leave();
 	return TRUE;
 }
 
@@ -266,7 +276,6 @@ GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins)
 	g_signal_connect(self->view, "location-changed", G_CALLBACK(on_view_changed), self);
 	g_signal_connect(self->view, "rotation-changed", G_CALLBACK(on_view_changed), self);
 
-	/* TODO: update point eights sometime later so we have heigh-res heights for them */
 	self->sphere = roam_sphere_new(self);
 
 	return g_object_ref(self);
@@ -274,15 +283,131 @@ GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins)
 
 void gis_opengl_center_position(GisOpenGL *self, gdouble lat, gdouble lon, gdouble elev)
 {
-	set_camera(self);
 	glRotatef(lon, 0, 1, 0);
 	glRotatef(-lat, 1, 0, 0);
 	glTranslatef(0, 0, elev2rad(elev));
 }
 
+void gis_opengl_project(GisOpenGL *self,
+		gdouble lat, gdouble lon, gdouble elev,
+		gdouble *px, gdouble *py, gdouble *pz)
+{
+	gdouble x, y, z;
+	lle2xyz(lat, lon, elev, &x, &y, &z);
+	gluProject(x, y, z,
+		self->sphere->view->model,
+		self->sphere->view->proj,
+		self->sphere->view->view,
+		px, py, pz);
+}
+
+void gis_opengl_render_tile(GisOpenGL *self, GisTile *tile)
+{
+	if (!tile || !tile->data)
+		return;
+	GList *triangles = roam_sphere_get_intersect(self->sphere,
+			tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
+	if (!triangles)
+		g_warning("GisOpenGL: render_tiles - No triangles to draw: edges=%f,%f,%f,%f",
+			tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
+	//g_message("rendering %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);
+	for (GList *cur = triangles; cur; cur = cur->next) {
+		RoamTriangle *tri = cur->data;
+
+		gdouble lat[3] = {tri->p.r->lat, tri->p.m->lat, tri->p.l->lat};
+		gdouble lon[3] = {tri->p.r->lon, tri->p.m->lon, tri->p.l->lon};
+
+		if (lon[0] < -90 || lon[1] < -90 || lon[2] < -90) {
+			if (lon[0] > 90) lon[0] -= 360;
+			if (lon[1] > 90) lon[1] -= 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] = {
+			{(lon[0]-w)/londist, 1-(lat[0]-s)/latdist},
+			{(lon[1]-w)/londist, 1-(lat[1]-s)/latdist},
+			{(lon[2]-w)/londist, 1-(lat[2]-s)/latdist},
+		};
+
+		glEnable(GL_TEXTURE_2D);
+		glBindTexture(GL_TEXTURE_2D, *(guint*)tile->data);
+		glBegin(GL_TRIANGLES);
+		glNormal3dv(tri->p.r->norm); glTexCoord2dv(xy[0]); glVertex3dv((double*)tri->p.r);
+		glNormal3dv(tri->p.m->norm); glTexCoord2dv(xy[1]); glVertex3dv((double*)tri->p.m);
+		glNormal3dv(tri->p.l->norm); glTexCoord2dv(xy[2]); glVertex3dv((double*)tri->p.l);
+		glEnd();
+	}
+	g_list_free(triangles);
+}
+
+void gis_opengl_render_tiles(GisOpenGL *opengl, GisTile *tile)
+{
+	/* Only render children if possible */
+	gboolean has_children = TRUE;
+	GisTile *child;
+	gis_tile_foreach(tile, child)
+		if (!child || !child->data)
+			has_children = FALSE;
+	if (has_children)
+		/* Only render children */
+		gis_tile_foreach(tile, child)
+			gis_opengl_render_tiles(opengl, child);
+	else
+		/* No children, render this tile */
+		gis_opengl_render_tile(opengl, tile);
+}
+
+void gis_opengl_set_height_func(GisOpenGL *self, GisTile *tile,
+		RoamHeightFunc height_func, gpointer user_data, gboolean update)
+{
+	if (!tile)
+		return;
+	/* TODO: get points? */
+	GList *triangles = roam_sphere_get_intersect(self->sphere,
+			tile->edge.n, tile->edge.s, tile->edge.e, tile->edge.w);
+	for (GList *cur = triangles; cur; cur = cur->next) {
+		RoamTriangle *tri = cur->data;
+		RoamPoint *points[] = {tri->p.l, tri->p.m, tri->p.r, tri->split};
+		for (int i = 0; i < G_N_ELEMENTS(points); i++) {
+			points[i]->height_func = height_func;
+			points[i]->height_data = user_data;
+			roam_point_update_height(points[i]);
+		}
+	}
+	g_list_free(triangles);
+}
+
+static void _gis_opengl_clear_height_func_rec(RoamTriangle *root)
+{
+	if (!root)
+		return;
+	RoamPoint *points[] = {root->p.l, root->p.m, root->p.r, root->split};
+	for (int i = 0; i < G_N_ELEMENTS(points); i++) {
+		points[i]->height_func = NULL;
+		points[i]->height_data = NULL;
+		roam_point_update_height(points[i]);
+	}
+	_gis_opengl_clear_height_func_rec(root->kids[0]);
+	_gis_opengl_clear_height_func_rec(root->kids[1]);
+}
+void gis_opengl_clear_height_func(GisOpenGL *self)
+{
+	for (int i = 0; i < G_N_ELEMENTS(self->sphere->roots); i++)
+		_gis_opengl_clear_height_func_rec(self->sphere->roots[i]);
+}
+
 void gis_opengl_redraw(GisOpenGL *self)
 {
-	g_debug("GisOpenGL: gl_redraw");
+	g_debug("GisOpenGL: redraw");
 	gtk_widget_queue_draw(GTK_WIDGET(self));
 }
 void gis_opengl_begin(GisOpenGL *self)
@@ -320,9 +445,6 @@ G_DEFINE_TYPE(GisOpenGL, gis_opengl, GTK_TYPE_DRAWING_AREA);
 static void gis_opengl_init(GisOpenGL *self)
 {
 	g_debug("GisOpenGL: init");
-	self->bmng = wms_info_new_for_bmng(NULL, NULL);
-	self->srtm = wms_info_new_for_srtm(NULL, NULL);
-
 	/* OpenGL setup */
 	GdkGLConfig *glconfig = gdk_gl_config_new_by_mode(
 			GDK_GL_MODE_RGBA   | GDK_GL_MODE_DEPTH |
@@ -342,7 +464,8 @@ static void gis_opengl_init(GisOpenGL *self)
 	g_object_set(self, "can-focus", TRUE, NULL);
 
 #ifndef ROAM_DEBUG
-	self->sm_source = g_timeout_add(10, (GSourceFunc)on_idle, self);
+	self->sm_source[0] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+30, 33,  (GSourceFunc)on_idle, self, NULL);
+	self->sm_source[1] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+10, 500, (GSourceFunc)on_idle, self, NULL);
 #endif
 
 	g_signal_connect(self, "realize",            G_CALLBACK(on_realize),      NULL);
@@ -364,9 +487,13 @@ static void gis_opengl_dispose(GObject *_self)
 {
 	g_debug("GisOpenGL: dispose");
 	GisOpenGL *self = GIS_OPENGL(_self);
-	if (self->sm_source) {
-		g_source_remove(self->sm_source);
-		self->sm_source = 0;
+	if (self->sm_source[0]) {
+		g_source_remove(self->sm_source[0]);
+		self->sm_source[0] = 0;
+	}
+	if (self->sm_source[1]) {
+		g_source_remove(self->sm_source[1]);
+		self->sm_source[1] = 0;
 	}
 	if (self->sphere) {
 		roam_sphere_free(self->sphere);
@@ -386,8 +513,6 @@ static void gis_opengl_finalize(GObject *_self)
 {
 	g_debug("GisOpenGL: finalize");
 	GisOpenGL *self = GIS_OPENGL(_self);
-	wms_info_free(self->bmng);
-	wms_info_free(self->srtm);
 	G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_self);
 }
 static void gis_opengl_class_init(GisOpenGLClass *klass)