X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcapsule.cpp;h=65a18eb3e2cbf6e8915d4c239b4a4460dc4b4eb3;hp=9ea19326c7075cde8468097f3c6cdfd942a0e116;hb=4cb33c263a00787a57531dfc41a4128bf34d7bee;hpb=fc503f2996e663e6bea88d95e4b251dd87428161

diff --git a/source/capsule.cpp b/source/capsule.cpp
index 9ea19326..65a18eb3 100644
--- 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);
 		}
@@ -63,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)
 		{