Some tweaks to vector component handling

[libs/gl.git] / source / builders / vertexbuilder.h

diff --git a/source/builders/vertexbuilder.h b/source/builders/vertexbuilder.h
index 09d9ed602ebdd0ce569527bb194dc129f29ac4ec..7fdc15bcab1212624ef1f9bd9885b94b23ed3606 100644 (file)
--- a/source/builders/vertexbuilder.h
+++ b/source/builders/vertexbuilder.h
@@ -61,7 +61,7 @@ public:
        { vertex(Vector4(x, y, z, w)); }
 
        void vertex(const Vector3 &v)
-       { vertex(Vector4(v.x, v.y, v.z, 1)); }
+       { vertex(compose(v, 1.0f)); }
 
        void vertex(const Vector4 &v)
        { vertex_(mtx*v); }
@@ -81,13 +81,13 @@ public:
        { normal(Vector3(x, y, z)); }
 
        void normal(const Vector3 &n)
-       { attrib(get_attribute_semantic(NORMAL3), mtx*Vector4(n.x, n.y, n.z, 0)); }
+       { attrib(get_attribute_semantic(NORMAL3), mtx*compose(n, 0.0f)); }
 
        void tangent(float x, float y, float z)
        { tangent(Vector3(x, y, z)); }
 
        void tangent(const Vector3 &t)
-       { attrib(get_attribute_semantic(TANGENT3), mtx*Vector4(t.x, t.y, t.z, 0)); }
+       { attrib(get_attribute_semantic(TANGENT3), mtx*compose(t, 0.0f)); }
 
        void texcoord(float s)
        { texcoord(s, 0, 0, 1); }