From d33cf1169db61500e1e180e3f7ff84141453c159 Mon Sep 17 00:00:00 2001 From: gered Date: Wed, 27 Apr 2011 13:18:21 -0400 Subject: [PATCH] pass output filename to the convert functions --- AssimpToMesh/src/convert/convert.h | 5 +++-- AssimpToMesh/src/convert/skeletalanimated.cpp | 2 +- AssimpToMesh/src/convert/static.cpp | 2 +- AssimpToMesh/src/main.cpp | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/AssimpToMesh/src/convert/convert.h b/AssimpToMesh/src/convert/convert.h index 1b7aff8..08ecadb 100644 --- a/AssimpToMesh/src/convert/convert.h +++ b/AssimpToMesh/src/convert/convert.h @@ -1,9 +1,10 @@ #ifndef __CONVERT_CONVERT_H_INCLUDED__ #define __CONVERT_CONVERT_H_INCLUDED__ +#include #include -void ConvertStatic(const aiScene *scene); -void ConvertSkeletalAnimated(const aiScene *scene); +void ConvertStatic(const std::string &outfile, const aiScene *scene); +void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene); #endif diff --git a/AssimpToMesh/src/convert/skeletalanimated.cpp b/AssimpToMesh/src/convert/skeletalanimated.cpp index d6c1486..f9bc636 100644 --- a/AssimpToMesh/src/convert/skeletalanimated.cpp +++ b/AssimpToMesh/src/convert/skeletalanimated.cpp @@ -1,5 +1,5 @@ #include "convert.h" -void ConvertSkeletalAnimated(const aiScene *scene) +void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene) { } diff --git a/AssimpToMesh/src/convert/static.cpp b/AssimpToMesh/src/convert/static.cpp index da1de7f..57c0a64 100644 --- a/AssimpToMesh/src/convert/static.cpp +++ b/AssimpToMesh/src/convert/static.cpp @@ -1,5 +1,5 @@ #include "convert.h" -void ConvertStatic(const aiScene *scene) +void ConvertStatic(const std::string &outfile, const aiScene *scene) { } diff --git a/AssimpToMesh/src/main.cpp b/AssimpToMesh/src/main.cpp index e594988..1879796 100644 --- a/AssimpToMesh/src/main.cpp +++ b/AssimpToMesh/src/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) printf("Using static converter.\n"); try { - ConvertStatic(scene); + ConvertStatic(outputFile, scene); } catch (std::exception &ex) { @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) printf("Using skeletal animation converter.\n"); try { - ConvertSkeletalAnimated(scene); + ConvertSkeletalAnimated(outputFile, scene); } catch (std::exception &ex) {