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

diff --git a/source/capsule.cpp b/source/capsule.cpp
index e4c93ae7..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"
@@ -31,15 +25,7 @@ void CapsuleBuilder::build(PrimitiveBuilder &builder) const
 {
 	float u_scale = 1.0/segments;
 	float v_scale = 1/(length+radius*M_PI);
-	if(tex_fit!=STRETCH)
-	{
-		float l1 = radius*M_PI*2;
-		float l2 = length+radius*M_PI;
-		if((l1<l2)==(tex_fit==CUT))
-			u_scale *= l1/l2;
-		else
-			v_scale *= l2/l1;
-	}
+	adjust_texture_scale(u_scale, v_scale, radius*M_PI*2, length+radius*M_PI);
 
 	builder.normal(0, 0, -1);
 	builder.texcoord(0.5, 0);
@@ -47,7 +33,7 @@ void CapsuleBuilder::build(PrimitiveBuilder &builder) const
 	for(unsigned i=1; i<rings; ++i)
 	{
 		float cz = length*(i>rings/2 ? 0.5 : -0.5);
-		float v = (i*radius*M_PI/rings+(i>rings/2 ? length : 0))*v_scale;
+		float v = ((i>rings/2 ? i-1 : i)*radius*M_PI/(rings-1)+(i>rings/2 ? length : 0))*v_scale;
 		float ra = (i>rings/2 ? i-1 : i)*M_PI/(rings-1);
 		float rc = cos(ra);
 		float rs = sin(ra);
@@ -57,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);
 		}
@@ -71,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)
 		{