Make the camera part of changeable Renderer state

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

diff --git a/source/renderer.h b/source/renderer.h
index 18d3a41a7bf49dcf19737ce53a01f5a08cfc93e3..1f4624ce889476370c25fef2e0077db723c8ded1 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;
@@ -63,12 +64,16 @@ public:
 private:
        struct State
        {
+               const Camera *camera;
+               Matrix modelview_matrix;
                const Texture *texture;
                const Texturing *texturing;
                unsigned lowest_effect_texunit;
                const Material *material;
                const Lighting *lighting;
                Matrix lighting_matrix;
+               const Clipping *clipping;
+               Matrix clipping_matrix;
                const Program *shprog;
                unsigned shdata_count;
                const Mesh *mesh;
@@ -78,31 +83,22 @@ private:
                State();
        };
 
-       class MtxStack: public MatrixStack
-       {
-       private:
-               Renderer &renderer;
-
-       public:
-               MtxStack(Renderer &);
-       private:
-               virtual void update();
-       };
-
        enum ChangeMask
        {
                LEGACY_MATRIX = 1,
                MODERN_MATRIX = 2,
                MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-               LIGHTING = 4,
-               SHADER_DATA = 8
+               LEGACY_LIGHTING = 4,
+               LEGACY_CLIPPING = 8,
+               SHADER_DATA = 16,
+               MATERIAL_SHDATA = 32,
+               STANDARD_SHDATA = 64,
+               LEGACY_PROJECTION = 128
        };
 
-       MtxStack mtx_stack;
        unsigned char changed;
        bool matrices_loaded;
        unsigned shdata_applied;
-       const Camera *camera;
        std::vector<State> state_stack;
        State *state;
        ProgramData standard_shdata;
@@ -118,8 +114,11 @@ 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; }
+       /** Sets the camera to render from.  The modelview matrix is reset to the
+       camera's view matrix. */
+       void set_camera(const Camera &);
+
+       const Camera *get_camera() const { return state->camera; }
 
        /** Replaces the Renderer's modelview matrix. */
        void set_matrix(const Matrix &);
@@ -128,9 +127,7 @@ public:
        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; }
+       const Matrix &get_matrix() const { return state->modelview_matrix; }
 
        void set_texture(const Texture *);
        void set_texturing(const Texturing *);
@@ -138,6 +135,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. */