X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fmesh.hh;h=cf267fba65d8a437a014301869e24dcf78245d44;hp=1400cdd2f920680cb2b2b06a9046807a581dc37a;hb=c143f7e806766a73cd69dc6e084e977641019ce6;hpb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f diff --git a/src/moof/mesh.hh b/src/moof/mesh.hh index 1400cdd..cf267fb 100644 --- a/src/moof/mesh.hh +++ b/src/moof/mesh.hh @@ -56,42 +56,6 @@ public: }; - //typedef vector3 triangle[3]; - //typedef vector2 triangle_uv[3]; - //typedef vector3 quad[4]; - //typedef vector2 quad_uv[4]; - - //struct triangle - //{ - //vector3 verts[3]; - //vector3& operator [] (int i) { return verts[i]; } - //const vector3& operator [] (int i) const { return verts[i]; } - //}; - - //struct triangle_uv - //{ - //vector2 verts[3]; - //vector2& operator [] (int i) { return verts[i]; } - //const vector2& operator [] (int i) const { return verts[i]; } - //}; - - - //struct quad - //{ - //vector3 verts[4]; - //vector3& operator [] (int i) { return verts[i]; } - //const vector3& operator [] (int i) const { return verts[i]; } - //}; - - - //struct quad_uv - //{ - //vector2 verts[4]; - //vector2& operator [] (int i) { return verts[i]; } - //const vector2& operator [] (int i) const { return verts[i]; } - //}; - - void set_material(int index) const; void set_material(const material& material) const; @@ -99,14 +63,11 @@ public: { material_group() {} - std::vector triangles; - std::vector triangles_uv; - - std::vector quads; - std::vector quads_uv; + void draw(scalar alpha = SCALAR(0.0)) const; - void draw(scalar alpha = SCALAR(0.0)) const; + std::vector triangles; + std::vector triangles_uv; };