X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fvertexbuilder.h;fp=source%2Fbuilders%2Fvertexbuilder.h;h=6c36057239f0a7f9d402d1bdf3fa48a7e5aa1e41;hp=28fb6be2b797a8929a44cb31b27e24dc91838112;hb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;hpb=7f03ee52e8af5f857e44702b6d1c2822a51c62ef diff --git a/source/builders/vertexbuilder.h b/source/builders/vertexbuilder.h index 28fb6be2..6c360572 100644 --- a/source/builders/vertexbuilder.h +++ b/source/builders/vertexbuilder.h @@ -81,19 +81,19 @@ public: { normal(Vector3(x, y, z)); } void normal(const Vector3 &n) - { attrib(get_component_type(NORMAL3), mtx*Vector4(n.x, n.y, n.z, 0)); } + { attrib(get_attribute_semantic(NORMAL3), mtx*Vector4(n.x, n.y, n.z, 0)); } void tangent(float x, float y, float z) { tangent(Vector3(x, y, z)); } void tangent(const Vector3 &t) - { attrib(get_component_type(TANGENT3), mtx*Vector4(t.x, t.y, t.z, 0)); } + { attrib(get_attribute_semantic(TANGENT3), mtx*Vector4(t.x, t.y, t.z, 0)); } void binormal(float x, float y, float z) { binormal(Vector3(x, y, z)); } void binormal(const Vector3 &b) - { attrib(get_component_type(BINORMAL3), mtx*Vector4(b.x, b.y, b.z, 0)); } + { attrib(get_attribute_semantic(BINORMAL3), mtx*Vector4(b.x, b.y, b.z, 0)); } void texcoord(float s) { texcoord(s, 0, 0, 1); } @@ -123,7 +123,7 @@ public: { multitexcoord(i, Vector4(s, t, r, q)); } void multitexcoord(unsigned i, const Vector4 &t) - { attrib(get_component_type(TEXCOORD4)+i, t); } + { attrib(get_attribute_semantic(TEXCOORD4)+i, t); } void color(unsigned char r, unsigned char g, unsigned char b) { color(r, g, b, 255); } @@ -138,7 +138,7 @@ public: { color(Color(r, g, b, a)); } void color(const Color &c) - { attrib(get_component_type(COLOR4_FLOAT), Vector4(c.r, c.g, c.b, c.a)); } + { attrib(get_attribute_semantic(COLOR4_FLOAT), Vector4(c.r, c.g, c.b, c.a)); } void attrib(unsigned i, float x) { attrib(i, x, 0, 0, 1); }