Fix shadowing warnings from older gcc versions

[libs/gl.git] / source / geometrybuilder.cpp

diff --git a/source/geometrybuilder.cpp b/source/geometrybuilder.cpp
index 018ea44718d880f2d4c18d99ebe95adf8f120e55..729b40facc1709ddecc794aa2637c65ac1bdd391 100644 (file)
--- 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,20 +5,13 @@ namespace Msp {
 namespace GL {
 
 GeometryBuilder::GeometryBuilder():
-       tangent_attr(-1),
-       binormal_attr(-1),
+       generate_tbn(false),
        tex_fit(STRETCH)
 { }
 
-GeometryBuilder &GeometryBuilder::tangent(unsigned t)
-{
-       tangent_attr = t;
-       return *this;
-}
-
-GeometryBuilder &GeometryBuilder::binormal(unsigned b)
+GeometryBuilder &GeometryBuilder::tbn(bool t)
 {
-       binormal_attr = b;
+       generate_tbn = t;
        return *this;
 }
 
@@ -39,7 +25,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;
@@ -49,6 +35,7 @@ void GeometryBuilder::adjust_texture_scale(float &u_scale, float &v_scale, float
 void GeometryBuilder::build(Mesh &mesh) const
 {
        MeshBuilder builder(mesh);
+       builder.auto_offset();
        build(builder);
 }