erebus

diff liberebus/src/scene.h @ 2:474a0244f57d

fixed specialization mistake fixed line endings added makefiles
author John Tsiombikas <nuclear@member.fsf.org>
date Mon, 28 Apr 2014 06:31:10 +0300
parents 59a72293f9bd
children 93894c232d65
line diff
     1.1 --- a/liberebus/src/scene.h	Mon Apr 28 05:58:22 2014 +0300
     1.2 +++ b/liberebus/src/scene.h	Mon Apr 28 06:31:10 2014 +0300
     1.3 @@ -1,30 +1,30 @@
     1.4 -#ifndef SCENE_H_
     1.5 -#define SCENE_H_
     1.6 -
     1.7 -#include <vector>
     1.8 -#include "snode.h"
     1.9 -#include "camera.h"
    1.10 -
    1.11 -class Scene {
    1.12 -private:
    1.13 -	std::vector<Object*> objects;
    1.14 -	std::vector<SceneNode*> nodes;
    1.15 -
    1.16 -	Camera *active_cam;
    1.17 -
    1.18 -public:
    1.19 -	Scene();
    1.20 -	~Scene();
    1.21 -
    1.22 -	void add_object(Object *obj);
    1.23 -	int get_object_count() const;
    1.24 -	Object *get_object(int idx) const;
    1.25 -
    1.26 -	void add_node(SceneNode *node);
    1.27 -	int get_node_count() const;
    1.28 -	SceneNode *get_node(int idx) const;
    1.29 -
    1.30 -	bool intersect(const Ray &ray, RayHit *hit) const;
    1.31 -};
    1.32 -
    1.33 -#endif	// SCENE_H_
    1.34 \ No newline at end of file
    1.35 +#ifndef SCENE_H_
    1.36 +#define SCENE_H_
    1.37 +
    1.38 +#include <vector>
    1.39 +#include "snode.h"
    1.40 +#include "camera.h"
    1.41 +
    1.42 +class Scene {
    1.43 +private:
    1.44 +	std::vector<Object*> objects;
    1.45 +	std::vector<SceneNode*> nodes;
    1.46 +
    1.47 +	Camera *active_cam;
    1.48 +
    1.49 +public:
    1.50 +	Scene();
    1.51 +	~Scene();
    1.52 +
    1.53 +	void add_object(Object *obj);
    1.54 +	int get_object_count() const;
    1.55 +	Object *get_object(int idx) const;
    1.56 +
    1.57 +	void add_node(SceneNode *node);
    1.58 +	int get_node_count() const;
    1.59 +	SceneNode *get_node(int idx) const;
    1.60 +
    1.61 +	bool intersect(const Ray &ray, RayHit *hit) const;
    1.62 +};
    1.63 +
    1.64 +#endif	// SCENE_H_