goat3d

diff src/mesh.h @ 15:f1b4c27382ce

blah
author John Tsiombikas <nuclear@member.fsf.org>
date Thu, 26 Sep 2013 14:06:14 +0300
parents cd71f0b92f44
children b35427826b60
line diff
     1.1 --- a/src/mesh.h	Thu Sep 26 04:47:05 2013 +0300
     1.2 +++ b/src/mesh.h	Thu Sep 26 14:06:14 2013 +0300
     1.3 @@ -22,19 +22,19 @@
     1.4  	std::vector<Vector3> vertices;
     1.5  	std::vector<Vector3> normals;
     1.6  	std::vector<Vector3> tangents;
     1.7 -	std::vector<Vector3> texcoords;
     1.8 +	std::vector<Vector2> texcoords;
     1.9  	std::vector<Vector4> skin_weights;
    1.10  	std::vector<Int4> skin_matrices;
    1.11  	std::vector<Vector4> colors;
    1.12 -	std::vector<Node*> bones;
    1.13  	std::vector<Face> faces;
    1.14  
    1.15 +	std::vector<Node*> bones;
    1.16 +
    1.17  	Mesh();
    1.18 -	virtual ~Mesh();
    1.19  
    1.20 -	virtual void set_material(Material *mat);
    1.21 -	virtual Material *get_material();
    1.22 -	virtual const Material *get_material() const;
    1.23 +	void set_material(Material *mat);
    1.24 +	Material *get_material();
    1.25 +	const Material *get_material() const;
    1.26  };
    1.27  
    1.28  #endif	// MESH_H_