X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=blobdiff_plain;f=src%2Fmain.cc;fp=src%2Fmain.cc;h=2aec0a01e46050306267199bc4c1c3b2b09c3bbb;hp=772b63c71f06f6a7d0862ee41fd1e0641080e070;hb=6879b81017c2662b0c5a0b9027df8cf13b10545a;hpb=b27d1ee9fe9f75f2af783e4f9574366879f5e849

diff --git a/src/main.cc b/src/main.cc
index 772b63c..2aec0a0 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,6 +125,7 @@ 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);