From ba295ccab77ee3395e1519cb8a28d645ce44756e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 12 Jul 2004 01:01:00 +0000
Subject: [PATCH] Added a more flexible variable on the textured quad
 generation function

---
 include/osg/Geometry | 11 +++++++++--
 src/osg/Geometry.cpp | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/osg/Geometry b/include/osg/Geometry
index de819fe23..8c43c0701 100644
--- a/include/osg/Geometry
+++ b/include/osg/Geometry
@@ -387,8 +387,15 @@ class SG_EXPORT Geometry : public Drawable
 };
 
 /** Convenience function to be used for creating quad geometry with texture coords.
-  * Tex coords go from bottom left (0,0) to top right (1,1).*/
-extern SG_EXPORT Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVec,const Vec3& heightVec, float s=1.0f, float t=1.0f);
+  * Tex coords go from left bottom (l,b) to right top (r,t).*/
+extern SG_EXPORT Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVec,const Vec3& heightVec, float l, float b, float r, float t);
+
+/** Convenience function to be used for creating quad geometry with texture coords.
+  * Tex coords go from bottom left (0,0) to top right (s,t).*/
+inline Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVec,const Vec3& heightVec, float s=1.0f, float t=1.0f)
+{
+    return createTexturedQuadGeometry(corner,widthVec,heightVec, 0.0f, 0.0f, s, t);
+}
 
 
 }
diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp
index cac1c4bce..192678920 100644
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -2644,7 +2644,7 @@ void Geometry::computeInternalOptimizedGeometry()
 }
 
 
-Geometry* osg::createTexturedQuadGeometry(const osg::Vec3& corner,const osg::Vec3& widthVec,const osg::Vec3& heightVec, float s, float t)
+Geometry* osg::createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVec,const Vec3& heightVec, float l, float b, float r, float t)
 {
     Geometry* geom = new Geometry;
 
@@ -2656,10 +2656,10 @@ Geometry* osg::createTexturedQuadGeometry(const osg::Vec3& corner,const osg::Vec
     geom->setVertexArray(coords);
 
     Vec2Array* tcoords = new Vec2Array(4);
-    (*tcoords)[0].set(0.0f,t);
-    (*tcoords)[1].set(0.0f,0.0f);
-    (*tcoords)[2].set(s,0.0f);
-    (*tcoords)[3].set(s,t);
+    (*tcoords)[0].set(l,t);
+    (*tcoords)[1].set(l,b);
+    (*tcoords)[2].set(r,b);
+    (*tcoords)[3].set(r,t);
     geom->setTexCoordArray(0,tcoords);
 
     osg::Vec4Array* colours = new osg::Vec4Array(1);