shapes/Shape.h now including specific shape headers (after base class definition), test/tests.cc fixed compiler warning, main/Scene drawing demo Plane, util/Transform not needlessly re-initializing m_matrix

git-svn-id: svn://anubis/fart/trunk@62 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop committed 2009-01-28 21:41:19 +00:00
1 parent a52b456bfa
commit 9041ec6a1c
4 files changed
+7 -3

No files matched your search

+3 -1
View File
@@ -10,7 +10,6 @@
#include <math.h>
#include "BMP.h"
#include "shapes/Shape.h"
#include "shapes/Sphere.h"
#include "PointLight.h"
using namespace std;
@@ -86,6 +85,9 @@ Scene::~Scene()
void Scene::load(const char * filename)
{
/* TODO: parse file somehow */
Shape * plane = new Plane(0, 0, 1, -2);
m_shapes.push_back(plane);
Shape * shape = new Sphere(1.0);
m_transform.translate(1.0, 5.0, 0.5);
shape->setTransform(m_transform);