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

diff --git a/source/capsule.cpp b/source/capsule.cpp
index e4c93ae7..9553edd3 100644
--- a/source/capsule.cpp
+++ b/source/capsule.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cmath>
 #include "capsule.h"
 #include "primitivebuilder.h"
@@ -31,15 +24,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 +32,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);