Refresh lighting and culling uniforms if the camera changes in pop_state

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

diff --git a/source/capsule.cpp b/source/capsule.cpp
index 9ea19326c7075cde8468097f3c6cdfd942a0e116..2576f40d99eb66aeda40cf400a2e872654b0a99b 100644 (file)
--- a/source/capsule.cpp
+++ b/source/capsule.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#define _USE_MATH_DEFINES
 #include <cmath>
 #include "capsule.h"
 #include "primitivebuilder.h"
@@ -49,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);
                }