From c9df81d7ae8bb9c4943bfaf3dc8fcb49fec07314 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sat, 22 Dec 2012 16:29:22 -0500
Subject: [PATCH] add main() processing to load a MetadataFile object and pass
 it to ConvertToMeshFile()

---
 src/main.cpp     | 15 ++++++++++-----
 src/meshfile.cpp |  3 ++-
 src/meshfile.h   |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b29eb17..86661c5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,7 @@
 #include <exception>
 
 #include "meshfile.h"
+#include "metadata/metadatafile.h"
 #include "ms3d/ms3d.h"
 
 int main(int argc, char **argv)
@@ -83,19 +84,23 @@ int main(int argc, char **argv)
 	metadataFile.append((".xml"));
 
 	// load the MS3D ...
-	Ms3d *ms3d = new Ms3d();
-	if (!ms3d->Load(file))
+	Ms3d ms3d;
+	if (!ms3d.Load(file))
 	{
 		printf("Error loading MS3D file.\n\n");
 		return 1;
 	}
 	
 	// attempt to load a metadata file
-	// TODO: write this
+	MetadataFile metadata;
+	if (!metadata.Load(metadataFile))
+	{
+		printf("Error loading metadata XML.\n\n");
+		return 1;
+	}
 	
 	// convert to a mesh file
-	// TODO: pass in loaded metadata object
-	if (!ConvertToMeshFile(meshFile, ms3d, scaleFactor))
+	if (!ConvertToMeshFile(meshFile, &ms3d, &metadata, scaleFactor))
 	{
 		printf("Error converting MS3D to MESH.\n\n");
 		return 1;
diff --git a/src/meshfile.cpp b/src/meshfile.cpp
index 69a273b..1bece66 100644
--- a/src/meshfile.cpp
+++ b/src/meshfile.cpp
@@ -1,6 +1,7 @@
 #include "meshfile.h"
 
 #include "animationsequence.h"
+#include "metadata/metadatafile.h"
 #include "ms3d/ms3d.h"
 #include "chunks/animations.h"
 #include "chunks/chunks.h"
@@ -25,7 +26,7 @@
 #include <vector>
 #include <assert.h>
 
-BOOL ConvertToMeshFile(const std::string &meshFilename, const Ms3d *source, float scaleFactor)
+BOOL ConvertToMeshFile(const std::string &meshFilename, const Ms3d *source, const MetadataFile *metadata, float scaleFactor)
 {
 	FILE *fp = fopen(meshFilename.c_str(), "wb");
 	if (fp == NULL)
diff --git a/src/meshfile.h b/src/meshfile.h
index 5591c82..d5427c9 100644
--- a/src/meshfile.h
+++ b/src/meshfile.h
@@ -4,8 +4,9 @@
 #include "common.h"
 #include <string>
 
+class MetadataFile;
 class Ms3d;
 
-BOOL ConvertToMeshFile(const std::string &meshFilename, const Ms3d *source, float scaleFactor);
+BOOL ConvertToMeshFile(const std::string &meshFilename, const Ms3d *source, const MetadataFile *metadata, float scaleFactor);
 
 #endif