1.1 --- a/prototype/src/mesh.h	Sat Aug 18 03:47:13 2012 +0300
     1.2 +++ b/prototype/src/mesh.h	Sun Aug 19 03:11:36 2012 +0300
     1.3 @@ -4,6 +4,7 @@
     1.4  #include <string>
     1.5  #include <assimp/scene.h>
     1.6  #include "vmath.h"
     1.7 +#include "material.h"
     1.8  
     1.9  enum {
    1.10  	MESH_ATTR_VERTEX,
    1.11 @@ -26,6 +27,7 @@
    1.12  
    1.13  	int tang_loc;
    1.14  
    1.15 +	Material mat;
    1.16  	Matrix4x4 xform;
    1.17  
    1.18  public:
    1.19 @@ -41,6 +43,9 @@
    1.20  	void set_xform(const Matrix4x4 &mat);
    1.21  	const Matrix4x4 &get_xform() const;
    1.22  
    1.23 +	void set_material(const Material &mat);
    1.24 +	const Material &get_material() const;
    1.25 +
    1.26  	void set_attrib_location(int attr, int loc);
    1.27  	int get_attrib_location(int attr) const;
    1.28