X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmodern%2Fmain.c;h=ea1080552e88e2b2fd64e530d7c5adecc43259c4;hb=7ef52b31864696747396945b2ca8892d8796f96c;hp=e511b654e77d1439d9492a0ffa2287c837785dfe;hpb=60ca0807c066028fb144aea33da8e1f9cc94338e;p=retroray

diff --git a/src/modern/main.c b/src/modern/main.c
index e511b65..ea10805 100644
--- a/src/modern/main.c
+++ b/src/modern/main.c
@@ -20,7 +20,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <assert.h>
 #include "miniglut.h"
 #include "app.h"
+#include "logger.h"
 
+static void display(void);
 static void reshape(int x, int y);
 static void keydown(unsigned char key, int x, int y);
 static void keyup(unsigned char key, int x, int y);
@@ -52,7 +54,7 @@ int main(int argc, char **argv)
 	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
 	glutCreateWindow("RetroRay");
 
-	glutDisplayFunc(app_display);
+	glutDisplayFunc(display);
 	glutReshapeFunc(reshape);
 	glutKeyboardFunc(keydown);
 	glutKeyboardUpFunc(keyup);
@@ -77,7 +79,11 @@ int main(int argc, char **argv)
 	wgl_swap_interval_ext = wglGetProcAddress("wglSwapIntervalEXT");
 #endif
 
-	app_reshape(glutGet(GLUT_WINDOW_WIDTH), glutGet(GLUT_WINDOW_HEIGHT));
+	win_width = glutGet(GLUT_WINDOW_WIDTH);
+	win_height = glutGet(GLUT_WINDOW_HEIGHT);
+	win_aspect = (float)win_width / win_height;
+
+	init_logger();
 
 	if(app_init() == -1) {
 		return 1;
@@ -99,6 +105,23 @@ void app_redisplay(void)
 
 void app_swap_buffers(void)
 {
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glRasterPos2i(-1, 1);
+	glPixelZoom(1, -1);
+	glEnable(GL_ALPHA_TEST);
+	glAlphaFunc(GL_GREATER, 0.5f);
+	glDrawPixels(win_width, win_height, GL_BGRA, GL_UNSIGNED_BYTE, framebuf);
+	glDisable(GL_ALPHA_TEST);
+
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+
 	glutSwapBuffers();
 	assert(glGetError() == GL_NO_ERROR);
 }
@@ -156,6 +179,11 @@ void app_vsync(int vsync)
 #endif
 
 
+static void display(void)
+{
+	app_display();
+	app_swap_buffers();
+}
 
 static void reshape(int x, int y)
 {
@@ -215,7 +243,7 @@ static int translate_skey(int key)
 	case GLUT_KEY_PAGE_UP:
 		return KEY_PGUP;
 	case GLUT_KEY_PAGE_DOWN:
-		return KEY_PGDOWN;
+		return KEY_PGDN;
 	case GLUT_KEY_HOME:
 		return KEY_HOME;
 	case GLUT_KEY_END: