X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=blobdiff_plain;f=src%2Fmain.cc;h=6a296b91f17f720a660c6b7cd411a6d8b2762c5e;hp=772b63c71f06f6a7d0862ee41fd1e0641080e070;hb=caee16904b985501cff521557c9ab487d2d96a91;hpb=ccc1a688b59e25bb934a0d3e2bbf477960068d4f

diff --git a/src/main.cc b/src/main.cc
index 772b63c..6a296b9 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -13,6 +13,7 @@
 #include "texture.h"
 #include "machine.h"
 #include "meshgen.h"
+#include "mparser.h"
 
 static bool init();
 static void cleanup();
@@ -88,7 +89,12 @@ static bool init()
 	Mesh::use_custom_sdr_attr = false;
 
 	machine = new Machine;
+	if(!parse_machine(machine, "data/test.machine")) {
+		fprintf(stderr, "failed to parse machine\n");
+		return false;
+	}
 
+	/*
 	const float pitch = 10.0f;
 
 	Gear *gear1 = new Gear;
@@ -119,8 +125,9 @@ static bool init()
 	gear2->attach(subgear);
 	machine->add_gear(subgear);
 	subgear->color = Vec3(0.8, 0.7, 0.5);
+	*/
 
-	machine->add_motor(0, 1.0);
+	//machine->add_motor(0, 1.0);
 
 	// shadows
 	init_shadow(2048);