Add a new View class to tie up some presentation tasks

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

diff --git a/source/renderer.h b/source/renderer.h
index 10d1fb3f13c0f2c2f8d9b539a5b90d724d72b506..3d561b4fd8f0daea3cc69afa0fc0d1c7b8be86f1 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -13,6 +13,7 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
+class Clipping;
 class Material;
 class Mesh;
 class Lighting;
@@ -69,6 +70,8 @@ private:
                const Material *material;
                const Lighting *lighting;
                Matrix lighting_matrix;
+               const Clipping *clipping;
+               Matrix clipping_matrix;
                const Program *shprog;
                unsigned shdata_count;
                const Mesh *mesh;
@@ -95,7 +98,8 @@ private:
                MODERN_MATRIX = 2,
                MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
                LIGHTING = 4,
-               SHADER_DATA = 8
+               CLIPPING = 8,
+               SHADER_DATA = 16
        };
 
        MtxStack mtx_stack;
@@ -118,8 +122,18 @@ public:
        times without an intervening end(). */
        void begin(const Camera *);
 
+       /** Deprecated as unsafe.  Use set_matrix() or transform() instead. */
        MatrixStack &matrix_stack() { return mtx_stack; }
 
+       /** Replaces the Renderer's modelview matrix. */
+       void set_matrix(const Matrix &);
+
+       /** Applies a transform to the Renderer's modelview matrix. */
+       void transform(const Matrix &);
+
+       /** Returns the current modelview matrix. */
+       const Matrix &get_matrix() const { return mtx_stack.top(); }
+
        const Camera *get_camera() const { return camera; }
 
        void set_texture(const Texture *);
@@ -128,6 +142,7 @@ public:
        void set_material(const Material *);
 
        void set_lighting(const Lighting *);
+       void set_clipping(const Clipping *);
 
        /** Sets the shader program to use.  An initial set of data can be set as
        well, with the same semantics as add_shader_data. */