]> git.tdb.fi Git - libs/gl.git/blobdiff - source/box.cpp
Avoid some brain damage from Windows headers
[libs/gl.git] / source / box.cpp
index b20f0d04e98c237d6c96a1f99844f1898149d0e9..46f1b48ed7bfc315a23a221134544adcccf5c19e 100644 (file)
@@ -38,14 +38,14 @@ void BoxBuilder::build_face(PrimitiveBuilder &builder, const Vector3 &o, const V
        float l1 = 1, l2 = 1;
        if(generate_tbn || tex_fit!=STRETCH)
        {
-               l1 = sqrt(s1.x*s1.x+s1.y*s1.y+s1.z*s1.z);
-               l2 = sqrt(s2.x*s2.x+s2.y*s2.y+s2.z*s2.z);
+               l1 = s1.norm();
+               l2 = s2.norm();
        }
 
        if(generate_tbn)
        {
-               builder.tangent(s1.x/l1, s1.y/l1, s1.z/l1);
-               builder.binormal(s2.x/l2, s2.y/l2, s2.z/l2);
+               builder.tangent(s1/l1);
+               builder.binormal(s2/l2);
        }
 
        float u_size = 1;
@@ -54,13 +54,13 @@ void BoxBuilder::build_face(PrimitiveBuilder &builder, const Vector3 &o, const V
 
        builder.begin(TRIANGLE_STRIP);
        builder.texcoord(0, v_size);
-       builder.vertex(o.x+s2.x, o.y+s2.y, o.z+s2.z);
+       builder.vertex(o+s2);
        builder.texcoord(0, 0);
-       builder.vertex(o.x, o.y, o.z);
+       builder.vertex(o);
        builder.texcoord(u_size, v_size);
-       builder.vertex(o.x+s1.x+s2.x, o.y+s1.y+s2.y, o.z+s1.z+s2.z);
+       builder.vertex(o+s1+s2);
        builder.texcoord(u_size, 0);
-       builder.vertex(o.x+s1.x, o.y+s1.y, o.z+s1.z);
+       builder.vertex(o+s1);
        builder.end();
 }