X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fvertexbuilder.h;h=09d9ed602ebdd0ce569527bb194dc129f29ac4ec;hp=82827cb4e56bed2cb10c47d7562354f8812771a6;hb=18fda5b5a13215c500cb402f7d2b081e439a1f0e;hpb=86721a55699193e63c76e8a0a7b0ced0416c1cce diff --git a/source/builders/vertexbuilder.h b/source/builders/vertexbuilder.h index 82827cb4..09d9ed60 100644 --- a/source/builders/vertexbuilder.h +++ b/source/builders/vertexbuilder.h @@ -40,7 +40,7 @@ protected: public: VertexBuilder() { normal(0, 0, 1); } - virtual ~VertexBuilder() { } + virtual ~VertexBuilder() = default; void set_matrix(const Matrix &m) { mtx = m; } @@ -89,12 +89,6 @@ public: void tangent(const Vector3 &t) { attrib(get_attribute_semantic(TANGENT3), mtx*Vector4(t.x, t.y, t.z, 0)); } - DEPRECATED void binormal(float, float, float) - { } - - DEPRECATED void binormal(const Vector3 &) - { } - void texcoord(float s) { texcoord(s, 0, 0, 1); } @@ -138,7 +132,7 @@ public: { color(Color(r, g, b, a)); } void color(const Color &c) - { attrib(get_attribute_semantic(COLOR4_FLOAT), Vector4(c.r, c.g, c.b, c.a)); } + { attrib(get_attribute_semantic(COLOR4), Vector4(c.r, c.g, c.b, c.a)); } void group(int g0) { group(g0, 0, 0, 0); }