X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis-opengl.c;h=8f03e8df4cc9c95f568877dfc2c1d7d7ce7ad625;hp=4803168819d5e7c1c7b9407ebb97bf2cf01249fa;hb=e589cb4bee133b2df34853fbbcc24355e1f2f4c9;hpb=b5fde541db3eec5aa0b2d7f5b7a0725ad524f84c

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 4803168..8f03e8d 100644
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -233,6 +233,9 @@ 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;
 	if (pz > 1)
 		return;
 
@@ -244,8 +247,7 @@ static void _draw_marker(GisOpenGL *opengl, GisMarker *marker)
 
 	glMatrixMode(GL_PROJECTION); glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);  glLoadIdentity();
-	glOrtho(0, GTK_WIDGET(opengl)->allocation.width,
-	        0, GTK_WIDGET(opengl)->allocation.height, -1, 1);
+	glOrtho(0, win_width, win_height, 0, -1, 1);
 	glTranslated(px - marker->xoff,
 	             py - marker->yoff, 0);
 
@@ -254,11 +256,12 @@ static void _draw_marker(GisOpenGL *opengl, GisMarker *marker)
 	glDisable(GL_DEPTH_TEST);
 	glEnable(GL_TEXTURE_2D);
 	glBindTexture(GL_TEXTURE_2D, marker->tex);
+	glDisable(GL_CULL_FACE);
 	glBegin(GL_QUADS);
-	glTexCoord2f(1, 1); glVertex3f(width, 0     , 0);
-	glTexCoord2f(1, 0); glVertex3f(width, height, 0);
-	glTexCoord2f(0, 0); glVertex3f(0    , height, 0);
-	glTexCoord2f(0, 1); glVertex3f(0    , 0     , 0);
+	glTexCoord2f(1, 0); glVertex3f(width, 0     , 0);
+	glTexCoord2f(1, 1); glVertex3f(width, height, 0);
+	glTexCoord2f(0, 1); glVertex3f(0    , height, 0);
+	glTexCoord2f(0, 0); glVertex3f(0    , 0     , 0);
 	glEnd();
 }
 
@@ -344,21 +347,6 @@ struct RenderLevel {
 	GList sorted;
 };
 
-static void on_realize(GisOpenGL *opengl, gpointer _)
-{
-	g_debug("GisOpenGL: on_realize");
-
-	GdkGLContext   *glcontext  = gtk_widget_get_gl_context(GTK_WIDGET(opengl));
-	GdkGLDrawable  *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(opengl));
-	if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
-		g_assert_not_reached();
-
-	_set_visuals(opengl);
-	g_mutex_lock(opengl->sphere_lock);
-	roam_sphere_update_errors(opengl->sphere);
-	g_mutex_unlock(opengl->sphere_lock);
-}
-
 static gboolean on_configure(GisOpenGL *opengl, GdkEventConfigure *event, gpointer _)
 {
 	g_debug("GisOpenGL: on_configure");
@@ -382,6 +370,19 @@ static gboolean on_configure(GisOpenGL *opengl, GdkEventConfigure *event, gpoint
 	return FALSE;
 }
 
+static void on_realize(GisOpenGL *opengl, gpointer _)
+{
+	g_debug("GisOpenGL: on_realize");
+
+	GdkGLContext   *glcontext  = gtk_widget_get_gl_context(GTK_WIDGET(opengl));
+	GdkGLDrawable  *gldrawable = gtk_widget_get_gl_drawable(GTK_WIDGET(opengl));
+	if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
+		g_assert_not_reached();
+
+	_set_visuals(opengl);
+	on_configure(opengl, NULL, NULL);
+}
+
 static gboolean _draw_level(gpointer key, gpointer value, gpointer user_data)
 {
 	g_debug("GisOpenGL: _draw_level - level=%-4d", (int)key);
@@ -464,9 +465,11 @@ static gboolean on_key_press(GisOpenGL *opengl, GdkEventKey *event, gpointer _)
 	return FALSE;
 }
 
-static gboolean _update_errors_cb(gpointer sphere)
+static gboolean _update_errors_cb(gpointer _opengl)
 {
-	roam_sphere_update_errors(sphere);
+	GisOpenGL *opengl = _opengl;
+	roam_sphere_update_errors(opengl->sphere);
+	opengl->ue_source = 0;
 	return FALSE;
 }
 static void on_view_changed(GisOpenGL *opengl,
@@ -475,8 +478,9 @@ static void on_view_changed(GisOpenGL *opengl,
 	g_debug("GisOpenGL: on_view_changed");
 	_set_visuals(opengl);
 #ifndef ROAM_DEBUG
-	opengl->ue_source = g_idle_add_full(G_PRIORITY_HIGH_IDLE+30,
-			_update_errors_cb, opengl->sphere, NULL);
+	if (!opengl->ue_source)
+		opengl->ue_source = g_idle_add_full(G_PRIORITY_HIGH_IDLE+30,
+				_update_errors_cb, opengl, NULL);
 	//roam_sphere_update_errors(opengl->sphere);
 #endif
 }