]> git.tdb.fi Git - libs/gl.git/blobdiff - source/box.cpp
Add capsule and grid builders
[libs/gl.git] / source / box.cpp
index 3d6f15fdc6f422e3259088de7a599b8eba6ba762..21d5f33f984ebfbbcb0411b3dcfa0148c3fe38c3 100644 (file)
@@ -42,22 +42,27 @@ void BoxBuilder::build(PrimitiveBuilder &builder) const
 
 void BoxBuilder::build_face(PrimitiveBuilder &builder, const Vector3 &o, const Vector3 &s1, const Vector3 &s2) const
 {
+       float l1 = 1, l2 = 1;
+       if(tangent_attr>=0 || tex_fit!=STRETCH)
+               l1 = sqrt(s1.x*s1.x+s1.y*s1.y+s1.z*s1.z);
+       if(binormal_attr>=0 || tex_fit!=STRETCH)
+               l2 = sqrt(s2.x*s2.x+s2.y*s2.y+s2.z*s2.z);
+
        if(tangent_attr>=0)
-       {
-               builder.attrib(tangent_attr, s1.x, s1.y, s1.z);
-               builder.attrib(binormal_attr, s2.x, s2.y, s2.z);
-       }
+               builder.attrib(tangent_attr, s1.x/l1, s1.y/l1, s1.z/l1);
+       if(binormal_attr>=0)
+               builder.attrib(binormal_attr, s2.x/l2, s2.y/l2, s2.z/l2);
+
        float u_size = 1;
        float v_size = 1;
        if(tex_fit!=STRETCH)
        {
-               float l1 = sqrt(s1.x*s1.x+s1.y*s1.y+s1.z*s1.z);
-               float l2 = sqrt(s2.x*s2.x+s2.y*s2.y+s2.z*s2.z);
                if((l1<l2)==(tex_fit==CUT))
                        u_size = l1/l2;
                else
                        v_size = l2/l1;
        }
+
        builder.begin(TRIANGLE_STRIP);
        builder.texcoord(0, v_size);
        builder.vertex(o.x+s2.x, o.y+s2.y, o.z+s2.z);