1.1 --- a/src/object.h	Wed Aug 21 04:00:22 2013 +0300
     1.2 +++ b/src/object.h	Wed Aug 21 05:52:28 2013 +0300
     1.3 @@ -1,23 +1,15 @@
     1.4  #ifndef OBJECT_H_
     1.5  #define OBJECT_H_
     1.6  
     1.7 -#include "node.h"
     1.8 -#include "mesh.h"
     1.9 -#include "material.h"
    1.10 +#include <string>
    1.11 +#include <vmath/vmath.h>
    1.12  
    1.13 -class Object : public Node {
    1.14 -private:
    1.15 -	Material *material;
    1.16 -	Mesh *mesh;
    1.17 +class Object {
    1.18 +public:
    1.19 +	std::string name;
    1.20  
    1.21 -public:
    1.22 -	Object();
    1.23 -
    1.24 -	void set_mesh(Mesh *mesh);
    1.25 -	Mesh *get_mesh() const;
    1.26 -
    1.27 -	void set_material(Material *mtl);
    1.28 -	Material *get_material() const;
    1.29 +	Vector3 pos;
    1.30 +	Quaternion rot;
    1.31  };
    1.32  
    1.33  #endif	// OBJECT_H_