Remove the specialized setters from UniformBlock

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

diff --git a/source/renderer.h b/source/renderer.h
index c06c17e96b4d18be0c61d7d0b8c1af24f67a81b6..501d1db3159667c42f92f3ecdfe2e85cb28fc1c4 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_RENDERER_H_
 #define MSP_GL_RENDERER_H_
 
@@ -23,6 +16,7 @@ class ProgramData;
 class Texture;
 class Texturing;
 class VertexArray;
+class WindingTest;
 
 /**
 A class for supervising the rendering process.  While many Renderables (in
@@ -52,11 +46,23 @@ private:
                const Material *material;
                const Program *shprog;
                std::vector<const ProgramData *> shdata;
+               const WindingTest *winding_test;
 
                State();
        };
 
-       MatrixStack mtx_stack;
+       class MtxStack: public MatrixStack
+       {
+       private:
+               Renderer &renderer;
+
+       public:
+               MtxStack(Renderer &);
+       private:        
+               virtual void update();
+       };
+
+       MtxStack mtx_stack;
        bool mtx_changed;
        const Camera *camera;
        std::list<State> state_stack;
@@ -64,12 +70,13 @@ private:
        const VertexArray *vertex_array;
        bool vertex_array_changed;
        const Buffer *element_buffer;
+       bool shdata_changed;
 
 public:
        Renderer(const Camera *);
        ~Renderer();
 
-       MatrixStack &matrix_stack();
+       MatrixStack &matrix_stack() { return mtx_stack; }
 
        const Camera *get_camera() const { return camera; }
 
@@ -80,6 +87,7 @@ public:
        void add_shader_data(const ProgramData *);
        void set_vertex_array(const VertexArray *);
        void set_element_buffer(const Buffer *);
+       void set_winding_test(const WindingTest *);
 
        void push_state();
        void pop_state();