From 6c3ff0041c881fd3cae9a06a38cd75abc66bb26c Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Fri, 12 Feb 2010 21:55:49 +0000 Subject: [PATCH] Add horizon test --- src/data/gis-http.c | 4 ++-- src/gis-opengl.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/data/gis-http.c b/src/data/gis-http.c index 0765415..144168d 100644 --- a/src/data/gis-http.c +++ b/src/data/gis-http.c @@ -117,7 +117,7 @@ static void _chunk_cb(SoupMessage *message, SoupBuffer *chunk, gpointer _info) gchar *gis_http_fetch(GisHttp *http, const gchar *uri, const char *local, GisCacheType mode, GisChunkCallback callback, gpointer user_data) { - g_debug("GisHttp: fetch - %.20s... >> %s/%s mode=%d", + g_debug("GisHttp: fetch - %s... >> %s/%s mode=%d", uri, http->prefix, local, mode); gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE, @@ -130,7 +130,7 @@ gchar *gis_http_fetch(GisHttp *http, const gchar *uri, const char *local, /* Do the cache if necessasairy */ if (!(mode == GIS_ONCE && g_file_test(path, G_FILE_TEST_EXISTS)) && mode != GIS_LOCAL) { - g_debug("GisHttp: do_cache - Caching file %s", local); + g_debug("GisHttp: fetch - Caching file %s", local); /* Open the file for writting */ gchar *part = path; diff --git a/src/gis-opengl.c b/src/gis-opengl.c index 8f03e8d..a70c6a8 100644 --- a/src/gis-opengl.c +++ b/src/gis-opengl.c @@ -233,6 +233,7 @@ static void _draw_marker(GisOpenGL *opengl, GisMarker *marker) gis_viewer_project(GIS_VIEWER(opengl), point->lat, point->lon, point->elev, &px, &py, &pz); + gint win_width = GTK_WIDGET(opengl)->allocation.width; gint win_height = GTK_WIDGET(opengl)->allocation.height; py = win_height - py; @@ -275,14 +276,23 @@ static void _draw_object(GisOpenGL *opengl, GisObject *object) //g_debug("GisOpenGL: draw_object"); /* Skip out of range objects */ if (object->lod > 0) { + /* LOD test */ gdouble eye[3], obj[3]; gis_viewer_get_location(GIS_VIEWER(opengl), &eye[0], &eye[1], &eye[2]); + gdouble elev = eye[2]; lle2xyz(eye[0], eye[1], eye[2], &eye[0], &eye[1], &eye[2]); lle2xyz(object->center.lat, object->center.lon, object->center.elev, &obj[0], &obj[1], &obj[2]); gdouble dist = distd(obj, eye); if (object->lod < dist) return; + + /* Horizon testing */ + gdouble c = EARTH_R+elev; + gdouble a = EARTH_R; + gdouble horizon = sqrt(c*c - a*a); + if (dist > horizon) + return; } /* Draw */ -- 2.43.2