X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fridge.c;h=d7c204a713c8b8f1095090c428cb362d2c537950;hp=002970b8fd4baa017f242c5a043915b70c94ddf0;hb=051345150b2fad10610e18b7b4aa268551335a0e;hpb=cfaba64b7e80cd1b969f3c0c8eeabff51deba5ad

diff --git a/src/ridge.c b/src/ridge.c
index 002970b..d7c204a 100644
--- a/src/ridge.c
+++ b/src/ridge.c
@@ -19,11 +19,11 @@ static struct {
 	float z;
 	guint tex;
 } layers[] = {
-	[LAYER_TOPO]     = { "Overlays/" "Topo/"     "Short/" "%s_Topo_Short.jpg",     1.0, 0 },
-	[LAYER_COUNTY]   = { "Overlays/" "County/"   "Short/" "%s_County_Short.gif",   3.0, 0 },
-	[LAYER_RIVERS]   = { "Overlays/" "Rivers/"   "Short/" "%s_Rivers_Short.gif",   4.0, 0 },
-	[LAYER_HIGHWAYS] = { "Overlays/" "Highways/" "Short/" "%s_Highways_Short.gif", 5.0, 0 },
-	[LAYER_CITY]     = { "Overlays/" "Cities/"   "Short/" "%s_City_Short.gif",     6.0, 0 },
+	[LAYER_TOPO]     = { "Overlays/" "Topo/"     "Short/" "%s_Topo_Short.jpg",     1, 0 },
+	[LAYER_COUNTY]   = { "Overlays/" "County/"   "Short/" "%s_County_Short.gif",   3, 0 },
+	[LAYER_RIVERS]   = { "Overlays/" "Rivers/"   "Short/" "%s_Rivers_Short.gif",   4, 0 },
+	[LAYER_HIGHWAYS] = { "Overlays/" "Highways/" "Short/" "%s_Highways_Short.gif", 5, 0 },
+	[LAYER_CITY]     = { "Overlays/" "Cities/"   "Short/" "%s_City_Short.gif",     6, 0 },
 };
 
 static CURL *curl_handle;
@@ -97,12 +97,11 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
 	g_message("ridge:expose");
 	glPushMatrix();
-	//glScaled(500*1000, 500*1000, 0);
-	//glTranslatef(0,50000,5000);
+	glEnable(GL_TEXTURE_2D);
+	glColor3f(1,1,1);
 
 	for (int i = 0; i < LAYER_COUNT; i++) {
 		glBindTexture(GL_TEXTURE_2D, layers[i].tex);
-		glEnable(GL_TEXTURE_2D);
 
 		glBegin(GL_POLYGON);
 		glTexCoord2f(0.0, 0.0); glVertex3f(500*1000*-1.0, 500*1000* 1.0, layers[i].z);