Add a new transform API to Renderer.

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

diff --git a/source/renderer.h b/source/renderer.h
index dd9464127d025ee0ae4ba9612084f91617f8ad67..18d3a41a7bf49dcf19737ce53a01f5a08cfc93e3 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -107,15 +107,29 @@ private:
        State *state;
        ProgramData standard_shdata;
        std::vector<const ProgramData *> shdata_stack;
-       const Buffer *element_buffer;
        std::set<const Renderable *> excluded;
 
 public:
        Renderer(const Camera *);
        ~Renderer();
 
+       /** Resets all internal state and restarts rendering.  There must be no
+       unpopped state in the stack.  It is permissible to call begin() multiple
+       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 *);
@@ -135,7 +149,6 @@ public:
        void add_shader_data(const ProgramData &data);
 
        void set_mesh(const Mesh *);
-       void set_element_buffer(const Buffer *);
        void set_winding_test(const WindingTest *);
        void set_reverse_winding(bool);
 
@@ -151,8 +164,9 @@ public:
        Renderer.  DEPRECATED. */
        void escape();
 
-       /** Ends rendering, unbinding all objects and resetting state.  There must
-       be no unpopped state in the stack. */
+       /** Unbinds all objects and resets related state.  There must be no unpopped
+       state in the stack.  Rendering with the same camera can be restarted without
+       an explicit begin() call. */
        void end();
 
        void exclude(const Renderable &);
@@ -163,6 +177,7 @@ public:
 
 private:
        void apply_state();
+       void reset_state();
 };
 
 } // namespace GL