Roll the various changed flags into a single mask

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

diff --git a/source/renderer.h b/source/renderer.h
index 00f970042b9505383fcbd139cf7e0bf9bd1bba75..a3ddaa3bd28f3832ce2a21884384727c897ede5f 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "matrix.h"
+#include "programdata.h"
 #include "tag.h"
 
 namespace Msp {
@@ -13,13 +14,12 @@ class Batch;
 class Buffer;
 class Camera;
 class Material;
+class Mesh;
 class Lighting;
 class Program;
-class ProgramData;
 class Renderable;
 class Texture;
 class Texturing;
-class VertexArray;
 class WindingTest;
 
 /**
@@ -65,11 +65,13 @@ private:
        {
                const Texture *texture;
                const Texturing *texturing;
+               unsigned lowest_effect_texunit;
                const Material *material;
                const Lighting *lighting;
                Matrix lighting_matrix;
                const Program *shprog;
                unsigned shdata_count;
+               const Mesh *mesh;
                const WindingTest *winding_test;
                bool reverse_winding;
 
@@ -83,19 +85,25 @@ private:
 
        public:
                MtxStack(Renderer &);
-       private:        
+       private:
                virtual void update();
        };
 
+       enum ChangeMask
+       {
+               MATRIX = 1,
+               LIGHTING = 4,
+               SHADER_DATA = 8
+       };
+
        MtxStack mtx_stack;
-       bool mtx_changed;
+       unsigned char changed;
+       bool matrices_loaded;
        const Camera *camera;
        std::vector<State> state_stack;
        State *state;
-       bool lighting_changed;
+       ProgramData standard_shdata;
        std::vector<const ProgramData *> shdata_stack;
-       bool shdata_changed;
-       const VertexArray *vertex_array;
        const Buffer *element_buffer;
        std::set<const Renderable *> excluded;
 
@@ -109,6 +117,7 @@ public:
 
        void set_texture(const Texture *);
        void set_texturing(const Texturing *);
+       unsigned allocate_effect_texunit();
        void set_material(const Material *);
 
        void set_lighting(const Lighting *);
@@ -122,9 +131,10 @@ public:
        Renderer state is popped. */
        void add_shader_data(const ProgramData &data);
 
-       void set_vertex_array(const VertexArray *);
+       void set_mesh(const Mesh *);
        void set_element_buffer(const Buffer *);
        void set_winding_test(const WindingTest *);
+       void set_reverse_winding(bool);
 
        /** Saves the current state so it can be restored later. */
        void push_state();
@@ -135,9 +145,13 @@ public:
 
        /** Prepares for temporarily bypassing the Renderer by synchronizing the
        current state with GL.  No additional call is necessary to resume using the
-       Renderer. */
+       Renderer.  DEPRECATED. */
        void escape();
 
+       /** Ends rendering, unbinding all objects and resetting state.  There must
+       be no unpopped state in the stack. */
+       void end();
+
        void exclude(const Renderable &);
        void include(const Renderable &);