From 959219ffb8c973fe98e2b3c554251be6eacc324f Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Thu, 22 Jan 2009 02:26:32 +0000
Subject: [PATCH] updated main/Scene to accept std::map of parameters

git-svn-id: svn://anubis/fart/trunk@23 7f9b0f55-74a9-4bce-be96-3c2cd072584d
---
 main/Scene.cc | 19 +++++++++++++++++++
 main/Scene.h  | 12 ++++++++++++
 main/fart.cc  |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/main/Scene.cc b/main/Scene.cc
index 2f4a739..658bc5d 100644
--- a/main/Scene.cc
+++ b/main/Scene.cc
@@ -1,5 +1,24 @@
 
 #include "Scene.h"
+#include <string>
+#include <map>
+using namespace std;
+
+Scene::Scene(map<string, const char *> options,
+             const char * filename)
+{
+    m_width = 800;
+    m_height = 600;
+    m_multisample_level = 1;
+    m_output_file_name = "fart.bmp";
+    m_verbose = false;
+
+    load(filename);
+}
+
+void Scene::load(const char * filename)
+{
+}
 
 void Scene::render()
 {
diff --git a/main/Scene.h b/main/Scene.h
index 98b8c5b..4750fb4 100755
--- a/main/Scene.h
+++ b/main/Scene.h
@@ -2,12 +2,24 @@
 #ifndef SCENE_H
 #define SCENE_H SCENE_H
 
+#include <string>
+#include <map>
+
 class Scene
 {
     public:
+        Scene(std::map<std::string, const char *> options,
+              const char * filename);
         void render();
 
     private:
+        void load(const char * filename);
+
+        int m_width;
+        int m_height;
+        int m_multisample_level;
+        std::string m_output_file_name;
+        bool m_verbose;
 };
 
 #endif
diff --git a/main/fart.cc b/main/fart.cc
index 67e0205..d9583f4 100644
--- a/main/fart.cc
+++ b/main/fart.cc
@@ -24,7 +24,7 @@ int main(int argc, char * argv[])
 {
     int opt;
     int option_index;
-    map<string, char *> scene_options;
+    map<string, const char *> scene_options;
 
     static const struct option long_options[] = {
         { "output-file",    required_argument, NULL, 'o' },