From 30932d00e982de7a4ccaeeb3791d90986bdc4e1e Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Tue, 17 Feb 2009 23:40:09 +0000
Subject: [PATCH] Scene::load() calling parse() now

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

diff --git a/main/Scene.cc b/main/Scene.cc
index 58a318b..862639b 100644
--- a/main/Scene.cc
+++ b/main/Scene.cc
@@ -14,6 +14,7 @@
 #include "PointLight.h"
 #include "Lighting.h"
 
+#include "parser/parser.h"
 #include "parser/nodes.h"
 
 using namespace std;
@@ -78,6 +79,8 @@ Scene::~Scene()
 
 void Scene::load(const char * filename)
 {
+    refptr<Node> node = parse(filename);
+
     /* TODO: parse file somehow */
     refptr<Shape> plane = new Plane(0, 0, 1, -2);
     m_shapes.push_back(plane);
diff --git a/main/Scene.h b/main/Scene.h
index 877d7c6..b3845e7 100644
--- a/main/Scene.h
+++ b/main/Scene.h
@@ -11,7 +11,6 @@
 #include "util/Color.h"
 #include "shapes/Shape.h"
 #include "Light.h"
-#include "parser/nodes.h"
 
 #define SCENE_MAX_TRANSPARENT_HITS 8
 #define SCENE_TRANSPARENCY_THRESHOLD 0.01
@@ -46,7 +45,6 @@ class Scene
         void renderPixel(int x, int y, unsigned char * pixel);
         Color traceRay(const Ray & ray);
         std::vector<ShapeDistance> getRayHits(const Ray & ray);
-        void parse(refptr<Node> node);
 
         /* rendering parameters */
         int m_width;