X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fgeometrybuilder.cpp;h=729b40facc1709ddecc794aa2637c65ac1bdd391;hp=97c88e06def4cabe37d917d15ebc93ed119668ad;hb=ca52c492bd4f2fa1a1db3a85e50eaf7c43474830;hpb=bbfb79181f716736df413f463b55825866400ed8

diff --git a/source/geometrybuilder.cpp b/source/geometrybuilder.cpp
index 97c88e06..729b40fa 100644
--- a/source/geometrybuilder.cpp
+++ b/source/geometrybuilder.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "geometrybuilder.h"
 #include "meshbuilder.h"
 
@@ -12,32 +5,37 @@ namespace Msp {
 namespace GL {
 
 GeometryBuilder::GeometryBuilder():
-	tangent_attr(-1),
-	binormal_attr(-1),
+	generate_tbn(false),
 	tex_fit(STRETCH)
 { }
 
-GeometryBuilder &GeometryBuilder::tangent(unsigned t)
+GeometryBuilder &GeometryBuilder::tbn(bool t)
 {
-	tangent_attr = t;
+	generate_tbn = t;
 	return *this;
 }
 
-GeometryBuilder &GeometryBuilder::binormal(unsigned b)
+GeometryBuilder &GeometryBuilder::texture_fit(TextureFit tf)
 {
-	binormal_attr = b;
+	tex_fit = tf;
 	return *this;
 }
 
-GeometryBuilder &GeometryBuilder::texture_fit(TextureFit tf)
+void GeometryBuilder::adjust_texture_scale(float &u_scale, float &v_scale, float width, float height) const
 {
-	tex_fit = tf;
-	return *this;
+	if(tex_fit!=STRETCH)
+	{
+		if((width<height)==(tex_fit==CROP))
+			u_scale *= width/height;
+		else
+			v_scale *= height/width;
+	}
 }
 
 void GeometryBuilder::build(Mesh &mesh) const
 {
 	MeshBuilder builder(mesh);
+	builder.auto_offset();
 	build(builder);
 }