Remove support for legacy OpenGL features

[libs/gl.git] / source / vertexbuilder.h

diff --git a/source/vertexbuilder.h b/source/vertexbuilder.h
index 7a1c943c9ed18b7f6f2330cdc67b0ebb76bc4197..55f914a31a24b7400b7efbe9b786d32940fa882c 100644 (file)
--- a/source/vertexbuilder.h
+++ b/source/vertexbuilder.h
@@ -21,8 +21,20 @@ data.  Attributes can be read from protected member variables.
 */
 class VertexBuilder
 {
+public:
+       class PushMatrix
+       {
+       private:
+               VertexBuilder &bld;
+               Matrix mtx;
+
+       public:
+               PushMatrix(VertexBuilder &b): bld(b), mtx(bld.mtx) { }
+               ~PushMatrix() { bld.mtx = mtx; }
+       };
+
 protected:
-       MatrixStack mtx;
+       Matrix mtx;
        Vector3 nor;
        Color col;
        std::map<unsigned, Vector4> texc;
@@ -33,7 +45,13 @@ public:
 
        virtual ~VertexBuilder() { }
 
-       MatrixStack &matrix()
+       void set_matrix(const Matrix &m)
+       { mtx = m; }
+
+       void transform(const Matrix &m)
+       { mtx *= m; }
+
+       const Matrix &get_matrix() const
        { return mtx; }
 
        void vertex(float x, float y)
@@ -45,8 +63,11 @@ public:
        void vertex(float x, float y, float z, float w)
        { vertex(Vector4(x, y, z, w)); }
 
+       void vertex(const Vector3 &v)
+       { vertex(Vector4(v.x, v.y, v.z, 1)); }
+
        void vertex(const Vector4 &v)
-       { vertex_(mtx.top()*v); }
+       { vertex_(mtx*v); }
 
 protected:
        virtual void vertex_(const Vector4 &) = 0;
@@ -57,7 +78,7 @@ public:
 
        void normal(const Vector3 &n)
        {
-               Vector4 tn = mtx.top()*Vector4(n.x, n.y, n.z, 0);
+               Vector4 tn = mtx*Vector4(n.x, n.y, n.z, 0);
                nor = Vector3(tn.x, tn.y, tn.z);
        }
 
@@ -66,7 +87,7 @@ public:
 
        void tangent(const Vector3 &t)
        {
-               Vector4 tt = mtx.top()*Vector4(t.x, t.y, t.z, 0);
+               Vector4 tt = mtx*Vector4(t.x, t.y, t.z, 0);
                attrib(get_component_type(TANGENT3), tt);
        }
 
@@ -75,7 +96,7 @@ public:
 
        void binormal(const Vector3 &b)
        {
-               Vector4 tb = mtx.top()*Vector4(b.x, b.y, b.z, 0);
+               Vector4 tb = mtx*Vector4(b.x, b.y, b.z, 0);
                attrib(get_component_type(BINORMAL3), tb);
        }