Include only tangent in mesh data and calculate binormal on the fly

[libs/gl.git] / source / builders / cylinder.cpp

diff --git a/source/builders/cylinder.cpp b/source/builders/cylinder.cpp
index 901a0f4b43cf057872a752960e30678a2a980b24..e3a8342ce27e58f60de23827bebbe40f2972cd7e 100644 (file)
--- a/source/builders/cylinder.cpp
+++ b/source/builders/cylinder.cpp
@@ -19,14 +19,12 @@ CylinderBuilder::CylinderBuilder(float r, float l, unsigned s):
 
 void CylinderBuilder::build(PrimitiveBuilder &builder) const
 {
-       if(generate_tbn)
-               builder.binormal(0, 1, 0);
        for(unsigned i=0; i<2; ++i)
        {
                float z = (i-0.5)*length;
                builder.normal(0, 0, i*2.0-1.0);
                builder.texcoord(0.5, 0.5);
-               if(generate_tbn)
+               if(generate_tan)
                        builder.tangent((i ? 1 : -1), 0, 0);
                builder.vertex(0, 0, z);
                for(unsigned j=0; j<segments; ++j)
@@ -43,8 +41,6 @@ void CylinderBuilder::build(PrimitiveBuilder &builder) const
        float v_scale = 1;
        adjust_texture_scale(u_scale, v_scale, radius*M_PI*2, length);
 
-       if(generate_tbn)
-               builder.binormal(0, 0, 1);
        for(unsigned i=0; i<2; ++i)
        {
                float z = (i-0.5)*length;
@@ -55,7 +51,7 @@ void CylinderBuilder::build(PrimitiveBuilder &builder) const
                        float s = sin(a);
                        builder.normal(c, s, 0);
                        builder.texcoord(j*u_scale, i*v_scale);
-                       if(generate_tbn)
+                       if(generate_tan)
                                builder.tangent(-s, c, 0);
                        builder.vertex(radius*c, radius*s, z);
                }