1.1 --- a/prototype/src/mesh.h	Tue Aug 14 08:49:38 2012 +0300
     1.2 +++ b/prototype/src/mesh.h	Fri Aug 17 14:29:37 2012 +0300
     1.3 @@ -2,8 +2,8 @@
     1.4  #define MESH_H_
     1.5  
     1.6  #include <string>
     1.7 -#include <assimp/assimp.h>
     1.8 -#include <assimp/aiScene.h>
     1.9 +#include <assimp/scene.h>
    1.10 +#include "vmath.h"
    1.11  
    1.12  enum {
    1.13  	MESH_ATTR_VERTEX,
    1.14 @@ -26,15 +26,21 @@
    1.15  
    1.16  	int tang_loc;
    1.17  
    1.18 +	Matrix4x4 xform;
    1.19 +
    1.20  public:
    1.21  	Mesh();
    1.22  	~Mesh();
    1.23  
    1.24 +	void set_name(const char *name);
    1.25  	const char *get_name() const;
    1.26  
    1.27  	bool create(const aiScene *scn, aiMesh *aim);
    1.28  	void destroy();
    1.29  
    1.30 +	void set_xform(const Matrix4x4 &mat);
    1.31 +	const Matrix4x4 &get_xform() const;
    1.32 +
    1.33  	void set_attrib_location(int attr, int loc);
    1.34  	int get_attrib_location(int attr) const;
    1.35