X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=blobdiff_plain;f=src%2Fmachine.cc;h=313540d18f1b60b567a402e4fe8ce9579c394fae;hp=81aa6f6cfd4a0aa7c9337a215848379179a23599;hb=080d7a779d43f549fc16c44e709cbf5989180fdf;hpb=566e3392b43649dc7015ea7b0954a0efd6727c10

diff --git a/src/machine.cc b/src/machine.cc
index 81aa6f6..313540d 100644
--- a/src/machine.cc
+++ b/src/machine.cc
@@ -30,6 +30,10 @@ Machine::~Machine()
 
 void Machine::add_gear(Gear *g)
 {
+	if(gearidx.find(g) != gearidx.end()) {
+		return;	// already have this gear
+	}
+	gearidx[g] = gears.size();
 	gears.push_back(g);
 	meshing_valid = false;
 }
@@ -67,14 +71,17 @@ void Machine::calc_meshing()
 	// we're going to need the planar position of each gear on its plane, so let's cache it
 	Vec3 *ppos = (Vec3*)alloca(ngears * sizeof *ppos);
 	for(int i=0; i<ngears; i++) {
-		ppos[i] = gears[i]->get_planar_position();
+		ppos[i] = gears[i]->get_position();
 	}
 
 	for(int i=0; i<ngears; i++) {
 		for(int j=i; j<ngears; j++) {
 			meshing[i][j] = meshing[j][i] = false;
 
-			if(i == j) continue;
+			if(i == j || gears[i]->get_super() == gears[j] || gears[j]->get_super() == gears[i]) {
+				// don't attempt meshing if it's the same gear, or they are attached to each other
+				continue;
+			}
 
 			if(1.0 - fabs(dot(gears[i]->axis, gears[j]->axis)) < 1e-5) {
 				// co-planar, just check Z range after inverse-transforming to the XY plane
@@ -105,11 +112,14 @@ void Machine::calc_meshing()
 	// fix the initial angles so that teeth mesh as best as possible
 	// should work in one pass as long as the gear train is not impossible
 	for(int i=0; i<ngears; i++) {
-		gears[i]->init_angle = 0;
+		/*float rnd = gears[i]->angle + gears[i]->get_angular_pitch() / 2.0;
+		float snap = rnd - fmod(rnd, gears[i]->get_angular_pitch());
+		gears[i]->set_angle(snap);*/
+		gears[i]->set_angular_offset(0);
 	}
 
 	for(int i=0; i<ngears; i++) {
-		for(int j=1; j<ngears; j++) {
+		for(int j=i; j<ngears; j++) {
 			if(meshing[i][j]) {
 				assert(i != j);
 
@@ -122,40 +132,61 @@ void Machine::calc_meshing()
 				float delta = frac_j - frac_i;
 
 				float correction = 0.5 - delta;
-				gears[j]->init_angle += correction * gears[j]->get_angular_pitch();
+				float prev_offs = gears[j]->get_angular_offset();
+				gears[j]->set_angular_offset(prev_offs + correction * gears[j]->get_angular_pitch());
 			}
 		}
 	}
 
 	/*
+	printf("meshing graph\n");
 	for(int i=0; i<ngears; i++) {
-		printf("init %d: %f\n", i, gears[i]->init_angle);
+		putchar(' ');
+		for(int j=0; j<ngears; j++) {
+			printf("| %d ", meshing[i][j] ? 1 : 0);
+		}
+		printf("|\n");
 	}
 	*/
 }
 
 void Machine::update_gear(int idx, float angle)
 {
+	Gear *gear = gears[idx];
+
 	if(visited[idx]) {
-		if(delta_angle(angle, gears[idx]->angle) > 0.25 / gears[idx]->nteeth) {
+		if(delta_angle(angle, gear->angle) > 0.25 / gear->nteeth) {
 			fprintf(stderr, "warning: trying to transmit different values to gear %s (%d)\n",
-					gears[idx]->name.c_str(), idx);
-			gears[idx]->angle = 0;
+					gear->name.c_str(), idx);
+			gear->angle = 0;
 		}
 		return;
 	}
 
-	gears[idx]->set_angle(angle);
+	gear->set_angle(angle);
 	visited[idx] = true;
 
+	// propagate to meshing gears (depth-first)
 	int ngears = (int)gears.size();
 	for(int i=0; i<ngears; i++) {
 		if(!meshing[idx][i]) continue;
 		assert(idx != i);
 
-		float ratio = -(float)gears[idx]->nteeth / (float)gears[i]->nteeth;
+		float ratio = -(float)gear->nteeth / (float)gears[i]->nteeth;
 		update_gear(i, angle * ratio);
 	}
+
+	// propagate to rigidly attached gears
+	if(gear->supergear) {
+		int supidx = gearidx[gear->supergear];
+		update_gear(supidx, angle);
+	}
+
+	int nsub = (int)gear->subgears.size();
+	for(int i=0; i<nsub; i++) {
+		int subidx = gearidx[gear->subgears[i]];
+		update_gear(subidx, angle);
+	}
 }
 
 void Machine::update(float dt)