Use an explicit material slot name in RenderPass

[libs/gl.git] / source / capsule.cpp

diff --git a/source/capsule.cpp b/source/capsule.cpp
index 9553edd36cd3e907449d52425fb0342c07584d8c..65a18eb3e2cbf6e8915d4c239b4a4460dc4b4eb3 100644 (file)
--- a/source/capsule.cpp
+++ b/source/capsule.cpp
@@ -1,3 +1,4 @@
+#define _USE_MATH_DEFINES
 #include <cmath>
 #include "capsule.h"
 #include "primitivebuilder.h"
@@ -42,10 +43,11 @@ void CapsuleBuilder::build(PrimitiveBuilder &builder) const
                        float sc = cos(sa);
                        float ss = sin(sa);
                        builder.normal(rs*sc, rs*ss, -rc);
-                       if(tangent_attr>=0)
-                               builder.attrib(tangent_attr, -ss, sc, 0);
-                       if(binormal_attr>=0)
-                               builder.attrib(binormal_attr, rc*sc, rc*ss, rs);
+                       if(generate_tbn)
+                       {
+                               builder.tangent(-ss, sc, 0);
+                               builder.binormal(rc*sc, rc*ss, rs);
+                       }
                        builder.texcoord(j*u_scale, v);
                        builder.vertex(rs*sc*radius, rs*ss*radius, cz-rc*radius);
                }
@@ -56,7 +58,7 @@ void CapsuleBuilder::build(PrimitiveBuilder &builder) const
 
        for(unsigned i=0; i<segments; ++i)
        {
-               builder.begin(GL::TRIANGLE_STRIP);
+               builder.begin(TRIANGLE_STRIP);
                builder.element(0);
                for(unsigned j=0; j+1<rings; ++j)
                {