From 44ba550f68ba3bc36c3db00a805d59035b43a9e8 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Sat, 28 Feb 2009 17:10:20 +0000
Subject: [PATCH] moved sample scene a bit, reset plane color to white, showing
 a Subtract object in the sample scene

git-svn-id: svn://anubis/fart/trunk@162 7f9b0f55-74a9-4bce-be96-3c2cd072584d
---
 main/Scene-load.cc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/Scene-load.cc b/main/Scene-load.cc
index 4327eff..8e55fe1 100644
--- a/main/Scene-load.cc
+++ b/main/Scene-load.cc
@@ -15,12 +15,16 @@ void Scene::load(const char * filename)
 //    processNode(node);
 
 
+    refptr<Material> m = new Material();
+    m->setDiffuseColor(Color::white);
+    m->setAmbientColor(Color::white);
     refptr<Shape> shape = new Plane(0, 0, 1, 2);
     shape->setTransform(m_transform);
+    shape->setMaterial(m);
     m_shapes.push_back(shape);
 
     m_transform.translate(1.0, 5.0, 0.5);
-    refptr<Material> m = new Material();
+    m = new Material();
     m->setDiffuseColor(Color::red);
     m->setAmbientColor(Color::red);
     shape = new Sphere(1.0);
@@ -75,7 +79,7 @@ void Scene::load(const char * filename)
     m_shapes.push_back(shape);
     m_transform.translate(-1, -5, 1.5);
 
-    m_transform.translate(0.2, 6.5, 1.5);
+    m_transform.translate(-0.5, 6.5, 1.5);
     m_transform.rotate(45, 1, 0, 0);
     m = new Material();
     m->setDiffuseColor(Color::cyan);
@@ -85,9 +89,9 @@ void Scene::load(const char * filename)
     shape->setMaterial(m);
     m_shapes.push_back(shape);
     m_transform.rotate(-45, 1, 0, 0);
-    m_transform.translate(-0.2, -6.5, -1.5);
+    m_transform.translate(0.5, -6.5, -1.5);
 
-    m_transform.translate(-1.5, 5.0, 2.5);
+    m_transform.translate(-2.0, 5.0, 1.5);
     m_transform.rotate(45, 0, 0, 1);
     m_transform.rotate(45, 1, 0, 0);
     m = new Material();
@@ -99,7 +103,7 @@ void Scene::load(const char * filename)
     m_shapes.push_back(shape);
     m_transform.rotate(-45, 1, 0, 0);
     m_transform.rotate(-45, 0, 0, 1);
-    m_transform.translate(1.5, -5.0, -2.5);
+    m_transform.translate(2.0, -5.0, -1.5);
 
     refptr<Light> light = new PointLight();
     light->setPosition(Vector(2, -1, 2));