X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fgrid.cpp;h=f452c438fa5f3932281e919ae9e0c615bcf9c788;hp=3f4d5e2fddb0fa11c9ab99f64f906fc3ecbaeece;hb=18fda5b5a13215c500cb402f7d2b081e439a1f0e;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/builders/grid.cpp b/source/builders/grid.cpp
index 3f4d5e2f..f452c438 100644
--- a/source/builders/grid.cpp
+++ b/source/builders/grid.cpp
@@ -8,62 +8,32 @@ namespace Msp {
 namespace GL {
 
 GridBuilder::GridBuilder(float w, float h, unsigned u, unsigned v):
-	origin(-w/2, -h/2, 0),
-	side1(w, 0, 0),
-	side2(0, h, 0),
-	norm(0, 0, 1),
-	binorm(0, 1, 0),
-	u_div(u),
-	v_div(v)
-{
-	init(false);
-}
+	GridBuilder(Vector3(-w/2, -h/2, 0), Vector3(w, 0, 0), Vector3(0, h, 0), u, v)
+{ }
 
 GridBuilder::GridBuilder(const Vector3 &o, const Vector3 &s, unsigned u, unsigned v):
-	origin(o),
-	u_div(u),
-	v_div(v)
-{
-	if(abs(s.z)<abs(s.x) && abs(s.z)<abs(s.y))
-	{
-		side1 = Vector3(s.x, 0, 0);
-		side2 = Vector3(0, s.y, 0);
-	}
-	else if(abs(s.y)<abs(s.x))
-	{
-		side1 = Vector3(0, 0, s.z);
-		side2 = Vector3(s.x, 0, 0);
-	}
-	else
-	{
-		side1 = Vector3(0, s.y, 0);
-		side2 = Vector3(0, 0, s.z);
-	}
-	init(true);
-}
+	GridBuilder(o, get_side(s, 0), get_side(s, 1), u, v)
+{ }
 
 GridBuilder::GridBuilder(const Vector3 &o, const Vector3 &s1, const Vector3 &s2, unsigned u, unsigned v):
 	origin(o),
 	side1(s1),
 	side2(s2),
-	u_div(u),
-	v_div(v)
+	u_div(max(u, 1U)),
+	v_div(max(v, 1U))
 {
-	init(true);
+	norm = normalize(cross(side1, side2));
+	binorm = normalize(cross(norm, side1));
 }
 
-void GridBuilder::init(bool compute_normals)
+Vector3 GridBuilder::get_side(const Vector3 &size, unsigned index)
 {
-	if(u_div<1)
-		u_div = 1;
-	if(v_div<1)
-		v_div = 1;
-
-	if(compute_normals)
-	{
-		norm = normalize(cross(side1, side2));
-		binorm = normalize(cross(norm, side1));
-	}
+	if(!size.x)
+		return Vector3(0, (index==0 ? size.y : 0), (index==1 ? size.z : 0));
+	else if(!size.y)
+		return Vector3((index==0 ? size.x : 0), 0, (index==1 ? size.z : 0));
+	else
+		return Vector3((index==0 ? size.x : 0), (index==1 ? size.z : 0), 0);
 }
 
 void GridBuilder::build(PrimitiveBuilder &builder) const
@@ -75,11 +45,8 @@ void GridBuilder::build(PrimitiveBuilder &builder) const
 	adjust_texture_scale(u_scale, v_scale, sqrt(l1_sq), l2);
 
 	builder.normal(norm.x, norm.y, norm.z);
-	if(generate_tbn)
-	{
+	if(generate_tan)
 		builder.tangent(side1);
-		builder.binormal(binorm);
-	}
 
 	for(unsigned j=0; j<=v_div; ++j)
 	{