X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fvertexbuilder.h;h=7fdc15bcab1212624ef1f9bd9885b94b23ed3606;hp=49a20b5cede9fb872506f6b166c6ff84ed541d1f;hb=HEAD;hpb=d493917dbc215cd6ba3f8773a52a289d9f14380d

diff --git a/source/builders/vertexbuilder.h b/source/builders/vertexbuilder.h
index 49a20b5c..7fdc15bc 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; }
@@ -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); }