X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=blobdiff_plain;f=src%2Fmachine.cc;h=1a78452ccdc47ec54eb3c4615936ac728cc73522;hp=716fc890568810b5e20678d65df950d0ede29e16;hb=84484521a697fe60f63bff077b9ba7475a45e54e;hpb=1716bebf166a5424e4a683897a78883b7733a636

diff --git a/src/machine.cc b/src/machine.cc
index 716fc89..1a78452 100644
--- a/src/machine.cc
+++ b/src/machine.cc
@@ -5,7 +5,6 @@
 #include "machine.h"
 
 static float delta_angle(float a, float b);
-static float signed_delta_angle(float a, float b);
 
 Machine::Machine()
 {
@@ -21,9 +20,7 @@ Machine::~Machine()
 	}
 
 	if(meshing) {
-		for(int i=0; i<ngears; i++) {
-			delete [] meshing[i];
-		}
+		delete [] meshing[0];
 		delete [] meshing;
 	}
 	delete [] visited;
@@ -48,8 +45,10 @@ void Machine::calc_meshing()
 
 	if(!meshing) {
 		meshing = new bool*[ngears];
-		for(int i=0; i<ngears; i++) {
-			meshing[i] = new bool[ngears];
+		meshing[0] = new bool[ngears * ngears];
+
+		for(int i=1; i<ngears; i++) {
+			meshing[i] = meshing[i - 1] + ngears;
 		}
 	}
 
@@ -57,12 +56,43 @@ void Machine::calc_meshing()
 		visited = new bool[ngears];
 	}
 
-	// let's mesh everything together just for shits and giggles
+	// we're going to need the inverse of each gear's matrix, so let's cache it here
+	Mat4 *inv_xform = (Mat4*)alloca(ngears * sizeof *inv_xform);
 	for(int i=0; i<ngears; i++) {
-		for(int j=0; j<ngears; j++) {
-			meshing[i][j] = abs(i - j) & 1 ? true : false;
-			if(meshing[i][j]) {
-				printf("connecting %d - %d\n", i, j);
+		inv_xform[i] = transpose(gears[i]->get_dir_matrix());
+	}
+
+	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(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
+				Vec3 pos_i = inv_xform[i] * gears[i]->get_position();
+				Vec3 pos_j = inv_xform[j] * gears[j]->get_position();
+
+				if(fabs(pos_i.z - pos_j.z) > (gears[i]->thickness + gears[j]->thickness) / 2.0) {
+					continue;
+				}
+				// Z interval match, check distance
+				float dsq = length_sq(pos_i.xy() - pos_j.xy());
+
+				float outer_rad_sum = gears[i]->radius + gears[j]->radius;
+				float inner_rad_sum = outer_rad_sum - gears[i]->teeth_length - gears[j]->teeth_length;
+
+				if(dsq <= outer_rad_sum * outer_rad_sum && dsq >= inner_rad_sum * inner_rad_sum) {
+					printf("connecting co-planar gears %d - %d\n", i, j);
+					meshing[i][j] = meshing[j][i] = true;
+				}
+
+			} else {
+				/* TODO: not co-planar
+				 * - calc line of intersection between the two planes
+				 * - find distance of each gear to that line
+				 * - profit...
+				 */
 			}
 		}
 	}
@@ -74,8 +104,6 @@ void Machine::calc_meshing()
 			if(meshing[i][j]) {
 				assert(i != j);
 
-				float tarc = gears[i]->get_angular_pitch(); // assumed to be the same for meshing gears
-
 				float frac_i = fmod(gears[i]->init_angle / gears[i]->get_angular_pitch() + 1.0, 1.0);
 				float frac_j = fmod(gears[j]->init_angle / gears[j]->get_angular_pitch() + 1.0, 1.0);
 				float delta = frac_j - frac_i;
@@ -97,7 +125,7 @@ void Machine::update_gear(int idx, float angle)
 		return;
 	}
 
-	gears[idx]->angle = angle;
+	gears[idx]->set_angle(angle);
 	visited[idx] = true;
 
 	int ngears = (int)gears.size();
@@ -137,15 +165,3 @@ static float delta_angle(float a, float b)
 	float bpi = fmod(b + M_PI, 2.0 * M_PI);
 	return std::min(fabs(a - b), fabs(api - bpi));
 }
-
-
-static float signed_delta_angle(float a, float b)
-{
-	float api = fmod(a + M_PI, 2.0 * M_PI);
-	float bpi = fmod(b + M_PI, 2.0 * M_PI);
-
-	if(fabs(a - b) < fabs(api - bpi)) {
-		return a - b;
-	}
-	return api - bpi;
-}