Lots of comment updates

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

diff --git a/source/renderer.h b/source/renderer.h
index c06c17e96b4d18be0c61d7d0b8c1af24f67a81b6..dd54ca1691dfaf49233608ff85f2ff5de9e69440 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_
 
 #ifndef MSP_GL_RENDERER_H_
 #define MSP_GL_RENDERER_H_
 


@@ -23,6 +16,7 @@ class ProgramData;
 class Texture;
 class Texturing;
 class VertexArray;
 class Texture;
 class Texturing;
 class VertexArray;

+class WindingTest;

 
 /**
 A class for supervising the rendering process.  While many Renderables (in
 
 /**
 A class for supervising the rendering process.  While many Renderables (in


@@ -30,7 +24,9 @@ particular, Objects and Scenes) can by rendered without a Renderer, using one
 will often be more efficient.  This is especially true for ObjectInstances.
 
 The Renderer works by deferring GL state changes until something is actually
 will often be more efficient.  This is especially true for ObjectInstances.
 
 The Renderer works by deferring GL state changes until something is actually

-being drawn.  This avoids many unnecessary GL calls. */
+being drawn.  This avoids many unnecessary GL calls if consecutive renderables
+use the same resources.
+*/

 class Renderer
 {
 public:
 class Renderer
 {
 public:


@@ -52,11 +48,23 @@ private:
                const Material *material;
                const Program *shprog;
                std::vector<const ProgramData *> shdata;
                const Material *material;
                const Program *shprog;
                std::vector<const ProgramData *> shdata;

+               const WindingTest *winding_test;

 
                State();
        };
 
 
                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;
        bool mtx_changed;
        const Camera *camera;
        std::list<State> state_stack;


@@ -64,12 +72,13 @@ private:
        const VertexArray *vertex_array;
        bool vertex_array_changed;
        const Buffer *element_buffer;
        const VertexArray *vertex_array;
        bool vertex_array_changed;
        const Buffer *element_buffer;

+       bool shdata_changed;

 
 public:
        Renderer(const Camera *);
        ~Renderer();
 
 
 public:
        Renderer(const Camera *);
        ~Renderer();
 

-       MatrixStack &matrix_stack();
+       MatrixStack &matrix_stack() { return mtx_stack; }

 
        const Camera *get_camera() const { return camera; }
 
 
        const Camera *get_camera() const { return camera; }
 


@@ -80,11 +89,14 @@ public:
        void add_shader_data(const ProgramData *);
        void set_vertex_array(const VertexArray *);
        void set_element_buffer(const Buffer *);
        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();
 
 
        void push_state();
        void pop_state();
 

-       /** Prepares for temporarily bypassing the Renderer. */
+       /** Prepares for temporarily bypassing the Renderer by synchronizing the
+       current state with GL.  No additional call is necessary to resume using the
+       Renderer. */

        void escape();
 
        void draw(const Batch &);
        void escape();
 
        void draw(const Batch &);