Remove an XXX because I no longer remember how to reproduce the issue

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

diff --git a/source/renderpass.h b/source/renderpass.h
index c201eb07c807564a58c1edaa8446d0e83af2e9f6..3b3b54b8569e12936cf6f8ffb04dbe0d8378ed95 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_RENDERPASS_H_
 #define MSP_GL_RENDERPASS_H_
 
@@ -18,7 +11,7 @@ namespace GL {
 class Material;
 class Program;
 class ProgramData;
-class TexEnv;
+class Renderer;
 class Texture;
 class Texturing;
 
@@ -44,6 +37,8 @@ public:
                void texunit(unsigned);
                void texunit_named(unsigned, const std::string &);
                void uniforms();
+               void uniform_slot(const std::string &);
+               void uniform_slot2(const std::string &, const std::string &);
        };
 
 private:
@@ -52,37 +47,45 @@ private:
        private:
                unsigned index;
                RefPtr<Texture> tex;
-               RefPtr<TexEnv> env;
 
        public:
                TextureLoader(Texturing &, unsigned, Collection *);
        private:
                virtual void finish();
 
-               void texenv();
                void texture(const std::string &);
                void texture2d();
        };
 
-       Program *shprog;
-       ProgramData *shdata;
+       const Program *shprog;
+       RefPtr<ProgramData> shdata;
+       std::map<std::string, std::string> uniform_slots;
        RefPtr<const Material> material;
+       std::string material_slot;
        Texturing *texturing;
        std::map<std::string, unsigned> tex_names;
+       bool back_faces;
 
-       RenderPass &operator=(const RenderPass &);
 public:
        RenderPass();
        RenderPass(const RenderPass &);
+       RenderPass &operator=(const RenderPass &);
        ~RenderPass();
 
+       void set_shader_program(const Program *, const ProgramData *);
        const Program *get_shader_program() const { return shprog; }
-       const ProgramData *get_shader_data() const { return shdata; }
+       const ProgramData *get_shader_data() const { return shdata.get(); }
+       const std::string &get_slotted_uniform_name(const std::string &) const;
        void set_material(const Material *);
        const Material *get_material() const { return material.get(); }
+       const std::string &get_material_slot_name() const { return material_slot; }
        void set_texture(unsigned, const Texture *);
        const Texturing *get_texturing() const { return texturing; }
        int get_texture_index(const std::string &) const;
+       void set_back_faces(bool);
+       bool get_back_faces() const { return back_faces; }
+
+       void apply(Renderer &) const;
 };
 
 } // namespace GL