goat3d

changeset 12:be15ba7c5483

reverted accidental change in goat3d_impl.h/goat3d.cc
author John Tsiombikas <nuclear@member.fsf.org>
date Mon, 26 Aug 2013 06:08:40 +0300
parents d1cebaf1d5c9
children 798df5111b56
files src/goat3d.cc src/goat3d_impl.h
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line diff
     1.1 --- a/src/goat3d.cc	Mon Aug 26 05:42:30 2013 +0300
     1.2 +++ b/src/goat3d.cc	Mon Aug 26 06:08:40 2013 +0300
     1.3 @@ -1,7 +1,6 @@
     1.4  #include "goat3d.h"
     1.5  #include "goat3d_impl.h"
     1.6  #include "chunk.h"
     1.7 -#include "node.h"
     1.8  
     1.9  Scene::Scene()
    1.10  	: name("unnamed"), ambient(0.05, 0.05, 0.05)
    1.11 @@ -35,10 +34,10 @@
    1.12  	}
    1.13  	cameras.clear();
    1.14  
    1.15 -	for(size_t i=0; i<objects.size(); i++) {
    1.16 -		delete_node_tree(objects[i]);
    1.17 +	for(size_t i=0; i<nodes.size(); i++) {
    1.18 +		delete_node_tree(nodes[i]);
    1.19  	}
    1.20 -	objects.clear();
    1.21 +	nodes.clear();
    1.22  
    1.23  	name = "unnamed";
    1.24  }
     2.1 --- a/src/goat3d_impl.h	Mon Aug 26 05:42:30 2013 +0300
     2.2 +++ b/src/goat3d_impl.h	Mon Aug 26 06:08:40 2013 +0300
     2.3 @@ -8,7 +8,7 @@
     2.4  #include "light.h"
     2.5  #include "camera.h"
     2.6  #include "material.h"
     2.7 -#include "object.h"
     2.8 +#include "node.h"
     2.9  
    2.10  class Scene {
    2.11  private:
    2.12 @@ -19,7 +19,7 @@
    2.13  	std::vector<Mesh*> meshes;
    2.14  	std::vector<Light*> lights;
    2.15  	std::vector<Camera*> cameras;
    2.16 -	std::vector<Object*> objects;
    2.17 +	std::vector<Node*> nodes;
    2.18  
    2.19  public:
    2.20  	Scene();