X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fopengl.c;h=c943c796b00a17b52d5beba7fc0b88462352cbf2;hp=94d1cd18a840151469aef70efb31f02fec8407b7;hb=051345150b2fad10610e18b7b4aa268551335a0e;hpb=807100ae8d20f0a22ab3bcf72c88c0c4a03ec112

diff --git a/src/opengl.c b/src/opengl.c
index 94d1cd1..c943c79 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -1,4 +1,5 @@
 #include <config.h>
+#include <math.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
@@ -21,9 +22,9 @@ static gboolean expose_start(GtkWidget *da, GdkEventExpose *event, gpointer user
 /* Plugins run stuff here */
 static gboolean expose_end(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
-	g_message("opengl:expose_end");
+	g_message("opengl:expose_end\n");
 
-	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
+	GdkGLDrawable *gldrawable = gdk_gl_drawable_get_current();
 
 	if (gdk_gl_drawable_is_double_buffered(gldrawable))
 		gdk_gl_drawable_swap_buffers(gldrawable);
@@ -42,29 +43,42 @@ static gboolean configure_start(GtkWidget *da, GdkEventConfigure *event, gpointe
 	if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
 		g_assert_not_reached();
 
-	glViewport(0, 0, da->allocation.width, da->allocation.height);
 
+	double width  = da->allocation.width;
+	double height = da->allocation.height;
+	double dist   = 500*1000; // 500 km
+
+	/* Misc */
+	glViewport(0, 0, width, height);
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glClearColor(0.8f, 0.8f, 1.0f, 0.0f);
+	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+
+	/* Depth test */
+	glClearDepth(1.0);
+	glDepthFunc(GL_LEQUAL);
+	glEnable(GL_DEPTH_TEST);
 
+	/* Perspective */
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-	//glRotatef(0, 0, 2, 45);
-	gluPerspective(45.0f, 1, 0.1f, 10000000.0f);
-	//glFrustum(-1, 1, -1, 1, -1, 1);
+	double rad = atan(height/2*1000.0/dist); // 1px = 1000 meters
+	double deg = (rad*180)/M_PI;
+	gluPerspective(deg*2, width/height, 0.1f, 1000000000.0f);
 
+	/* Camera position? */
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
-	double scale = 500*1000; // 500 km
-	//glOrtho(-scale,scale,-scale,scale,-10000,10000);
-	glTranslatef(0.0, 0.0, -2.5*scale);
-	glRotatef(-45, 1, 0, 0);
+	glTranslatef(0.0, 0.0, -dist);
+	//glRotatef(-45, 1, 0, 0);
+
 
 	return FALSE;
 }
 static gboolean configure_end(GtkWidget *da, GdkEventConfigure *event, gpointer user_data)
 {
-	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
+	GdkGLDrawable *gldrawable = gdk_gl_drawable_get_current();
 	gdk_gl_drawable_gl_end(gldrawable);
 	return FALSE;
 }