From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 6 Mar 2011 01:01:00 +0000 (+0000)
Subject: Rename CUT to CROP in GeometryBuilder
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=fc503f2996e663e6bea88d95e4b251dd87428161;p=libs%2Fgl.git

Rename CUT to CROP in GeometryBuilder
Fix capsule texture coordinates
Use adjust_texture_scale in capsule and box builders
---

diff --git a/source/box.cpp b/source/box.cpp
index 21d5f33f..5347ccc7 100644
--- a/source/box.cpp
+++ b/source/box.cpp
@@ -55,13 +55,7 @@ void BoxBuilder::build_face(PrimitiveBuilder &builder, const Vector3 &o, const V
 
 	float u_size = 1;
 	float v_size = 1;
-	if(tex_fit!=STRETCH)
-	{
-		if((l1<l2)==(tex_fit==CUT))
-			u_size = l1/l2;
-		else
-			v_size = l2/l1;
-	}
+	adjust_texture_scale(u_size, v_size, l1, l2);
 
 	builder.begin(TRIANGLE_STRIP);
 	builder.texcoord(0, v_size);
diff --git a/source/capsule.cpp b/source/capsule.cpp
index e4c93ae7..9ea19326 100644
--- a/source/capsule.cpp
+++ b/source/capsule.cpp
@@ -31,15 +31,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 +39,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);
diff --git a/source/geometrybuilder.cpp b/source/geometrybuilder.cpp
index 018ea447..6ed52ed2 100644
--- a/source/geometrybuilder.cpp
+++ b/source/geometrybuilder.cpp
@@ -39,7 +39,7 @@ void GeometryBuilder::adjust_texture_scale(float &u_scale, float &v_scale, float
 {
 	if(tex_fit!=STRETCH)
 	{
-		if((width<height)==(tex_fit==CUT))
+		if((width<height)==(tex_fit==CROP))
 			u_scale *= width/height;
 		else
 			v_scale *= height/width;
diff --git a/source/geometrybuilder.h b/source/geometrybuilder.h
index 2e5a79fa..e1c877df 100644
--- a/source/geometrybuilder.h
+++ b/source/geometrybuilder.h
@@ -20,7 +20,7 @@ public:
 	enum TextureFit
 	{
 		STRETCH,
-		CUT,
+		CROP,
 		WRAP
 	};