X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmain.cc;h=f0ac0376973b5900d4d03bfb73985a2b20dbd669;hb=ab9fd0ac34f8107ff8067607fad229d08b1c3935;hp=0447748ba0efe61313614f196ecca405e2ff0984;hpb=a88a9ac53952e1bb3768b147a043c19392e3d5d1;p=laserbrain_demo

diff --git a/src/main.cc b/src/main.cc
index 0447748..f0ac037 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -7,178 +7,98 @@
 #else
 #include <GL/glut.h>
 #endif
-#include "machine.h"
-
-bool init();
-void cleanup();
-void display();
-void idle();
-void draw_gears();
-void reshape(int x, int y);
-void keyb(unsigned char key, int x, int y);
-void mouse(int bn, int st, int x, int y);
-void motion(int x, int y);
-
-static float cam_dist = 2;
-static float cam_theta, cam_phi;
-static int prev_mx, prev_my;
-static bool bnstate[8];
-
-static unsigned int start_time, prev_msec;
-static Machine *machine;
+#include "app.h"
+
+static bool init();
+static void display();
+static void idle();
+static void reshape(int x, int y);
+static void key_press(unsigned char key, int x, int y);
+static void key_release(unsigned char key, int x, int y);
+static void mouse(int bn, int st, int x, int y);
+
+static unsigned int start_time;
 
 int main(int argc, char **argv)
 {
 	glutInitWindowSize(1024, 768);
 	glutInit(&argc, argv);
-	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
-	glutCreateWindow("Antikythera");
+	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE | GLUT_MULTISAMPLE);
+	glutCreateWindow("demo");
 
 	glutDisplayFunc(display);
 	glutIdleFunc(idle);
 	glutReshapeFunc(reshape);
-	glutKeyboardFunc(keyb);
+	glutKeyboardFunc(key_press);
+	glutKeyboardUpFunc(key_release);
 	glutMouseFunc(mouse);
-	glutMotionFunc(motion);
+	glutMotionFunc(app_mouse_motion);
+	glutPassiveMotionFunc(app_mouse_motion);
 
 	if(!init()) {
 		return 1;
 	}
-	atexit(cleanup);
+	atexit(app_cleanup);
 
 	glutMainLoop();
 	return 0;
 }
 
-bool init()
+void app_swap_buffers()
 {
-	glewInit();
-
-	glEnable(GL_DEPTH_TEST);
-	glEnable(GL_CULL_FACE);
-	glEnable(GL_LIGHTING);
-	glEnable(GL_LIGHT0);
-	glEnable(GL_NORMALIZE);
-
-	Mesh::use_custom_sdr_attr = false;
-
-	machine = new Machine;
-
-	const float pitch = 10.0f;
-
-	Gear *gear1 = new Gear;
-	gear1->pos = Vec3(-50, 0, 0);
-	gear1->set_teeth(16, pitch);
-	gear1->gen_mesh();
-	machine->add_gear(gear1);
-
-	Gear *gear2 = new Gear;
-	gear2->set_teeth(32, pitch);
-	gear2->pos = gear1->pos + Vec3(gear1->radius + gear2->radius - gear1->teeth_length * 0.75, 0, 0);
-	gear2->thickness = 5;
-	gear2->gen_mesh();
-	machine->add_gear(gear2);
-
-	Gear *gear3 = new Gear;
-	gear3->set_teeth(8, pitch);
-	gear3->pos = gear2->pos + Vec3(0, gear2->radius + gear3->radius - gear2->teeth_length * 0.75, 0);
-	gear3->gen_mesh();
-	machine->add_gear(gear3);
-
-	machine->add_motor(0, 1.0);
-	machine->calc_meshing();
-
-	start_time = glutGet(GLUT_ELAPSED_TIME);
-	return true;
+	glutSwapBuffers();
 }
 
-void cleanup()
+void app_quit()
 {
-	delete machine;
+	exit(0);
 }
 
-void display()
+static bool init()
 {
-	unsigned int msec = glutGet(GLUT_ELAPSED_TIME) - start_time;
-	float dt = (float)(msec - prev_msec) / 1000.0f;
-	prev_msec = msec;
-
-	machine->update(dt);
-
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-	glTranslatef(0, 0, -cam_dist);
-	glRotatef(cam_phi, 1, 0, 0);
-	glRotatef(cam_theta, 0, 1, 0);
+	glewInit();
 
-	draw_gears();
+	if(!app_init()) {
+		return false;
+	}
 
-	glutSwapBuffers();
-	assert(glGetError() == GL_NO_ERROR);
+	start_time = glutGet(GLUT_ELAPSED_TIME);
+	return true;
 }
 
-void idle()
+static void display()
 {
-	glutPostRedisplay();
+	time_msec = glutGet(GLUT_ELAPSED_TIME) - start_time;
+	app_display();
 }
 
-void draw_gears()
+static void idle()
 {
-	/* world scale is in meters, gears are in millimeters, sclae by 1/1000 */
-	glPushMatrix();
-	glScalef(0.001, 0.001, 0.001);
-
-	machine->draw();
-
-	glPopMatrix();
+	glutPostRedisplay();
 }
 
-void reshape(int x, int y)
+static void reshape(int x, int y)
 {
-	glViewport(0, 0, x, y);
+	win_width = x;
+	win_height = y;
 
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	gluPerspective(50.0, (float)x / (float)y, 0.05, 100.0);
+	app_reshape(x, y);
 }
 
-void keyb(unsigned char key, int x, int y)
+static void key_press(unsigned char key, int x, int y)
 {
-	switch(key) {
-	case 27:
-		exit(0);
-	}
+	app_keyboard(key, true);
 }
 
-void mouse(int bn, int st, int x, int y)
+static void key_release(unsigned char key, int x, int y)
 {
-	prev_mx = x;
-	prev_my = y;
-	bnstate[bn - GLUT_LEFT_BUTTON] = st == GLUT_DOWN;
+	app_keyboard(key, false);
 }
 
-void motion(int x, int y)
+static void mouse(int bn, int st, int x, int y)
 {
-	int dx = x - prev_mx;
-	int dy = y - prev_my;
-	prev_mx = x;
-	prev_my = y;
+	int bidx = bn - GLUT_LEFT_BUTTON;
+	bool down = st == GLUT_DOWN;
 
-	if(!dx && !dy) return;
-
-	if(bnstate[0]) {
-		cam_theta += dx * 0.5;
-		cam_phi += dy * 0.5;
-
-		if(cam_phi < -90) cam_phi = -90;
-		if(cam_phi > 90) cam_phi = 90;
-		glutPostRedisplay();
-	}
-	if(bnstate[2]) {
-		cam_dist += dy * 0.05;
-		if(cam_dist < 0.0) cam_dist = 0.0;
-		glutPostRedisplay();
-	}
+	app_mouse_button(bidx, down, x, y);
 }