X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=blobdiff_plain;f=src%2Fmain.cc;h=5dd28570746a2611803b82e10e067e8ad657e968;hp=f98f1901d1280f36e5d5f63c0899a58a39360977;hb=080d7a779d43f549fc16c44e709cbf5989180fdf;hpb=014fccdee30291407985658e8cefd9be7dc9e9fa

diff --git a/src/main.cc b/src/main.cc
index f98f190..5dd2857 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -67,7 +67,6 @@ static bool init()
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
 	glEnable(GL_LIGHTING);
-	glEnable(GL_LIGHT0);
 	glEnable(GL_NORMALIZE);
 
 	Mesh::use_custom_sdr_attr = false;
@@ -95,6 +94,13 @@ static bool init()
 	gear3->gen_mesh();
 	machine->add_gear(gear3);
 
+	Gear *subgear = new Gear;
+	subgear->set_teeth(10, pitch);
+	subgear->pos = Vec3(0, 0, (gear2->thickness + subgear->thickness) / 2 + 1);
+	subgear->gen_mesh();
+	gear2->attach(subgear);
+	machine->add_gear(subgear);
+
 	machine->add_motor(0, 1.0);
 
 	start_time = glutGet(GLUT_ELAPSED_TIME);
@@ -116,6 +122,18 @@ static void update(float dt)
 	hover_gear = pick_gear(prev_mx, prev_my);
 }
 
+static void set_light(int idx, const Vec3 &pos, const Vec3 &color)
+{
+	unsigned int lt = GL_LIGHT0 + idx;
+	float posv[] = { pos.x, pos.y, pos.z, 1 };
+	float colv[] = { color.x, color.y, color.z, 1 };
+
+	glEnable(lt);
+	glLightfv(lt, GL_POSITION, posv);
+	glLightfv(lt, GL_DIFFUSE, colv);
+	glLightfv(lt, GL_SPECULAR, colv);
+}
+
 static void display()
 {
 	unsigned int msec = glutGet(GLUT_ELAPSED_TIME) - start_time;
@@ -130,6 +148,10 @@ static void display()
 	glRotatef(cam_phi, 1, 0, 0);
 	glRotatef(cam_theta, 0, 1, 0);
 
+	set_light(0, Vec3(-50, 75, 100), Vec3(1.0, 0.8, 0.7) * 0.8);
+	set_light(1, Vec3(100, 0, 30), Vec3(0.6, 0.7, 1.0) * 0.6);
+	set_light(2, Vec3(-10, -10, 60), Vec3(0.8, 1.0, 0.8) * 0.3);
+
 	update(dt);
 
 	draw_gears();
@@ -215,6 +237,14 @@ static void mouse(int bn, int st, int x, int y)
 			sel_gear = 0;
 		}
 	}
+
+	if(bidx == 3 || bidx == 4) {	/* wheel */
+		if(hover_gear) {
+			float dz = bidx == 4 ? 1 : -1;
+			hover_gear->set_position(hover_gear->get_position() + hover_gear->get_axis() * dz);
+			machine->invalidate_meshing();
+		}
+	}
 }
 
 static void motion(int x, int y)