Bind ProgramData to a Program upon construction

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

diff --git a/source/renderpass.h b/source/renderpass.h
index 10960b3f37cb1b082d0cf26d20404514297982b8..5c1b84520db58ef8d38e894066de2f8f56a2b1f5 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -18,13 +18,17 @@ namespace GL {
 class Material;
 class Program;
 class ProgramData;
+class TexEnv;
 class Texture;
+class Texturing;
 
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
-This includes shader and data for it, material and textures.
+This includes shader and data for it, material and texturing.
+
+XXX Does not delete inline texture from datafiles properly
 */
-class RenderPass: public Bindable<RenderPass>
+class RenderPass
 {
 public:
        class Loader: public DataFile::CollectionObjectLoader<RenderPass>
@@ -35,38 +39,34 @@ public:
 
        private:
                void init();
-               virtual void finish();
-               void material();
+               void material_inline();
                void material(const std::string &);
                void texunit(unsigned);
                void uniforms();
        };
 
 private:
-       struct TextureSlot
+       struct TextureLoader: public DataFile::CollectionObjectLoader<Texturing>
        {
-               class Loader: public DataFile::CollectionObjectLoader<TextureSlot>
-               {
-               public:
-                       Loader(TextureSlot &);
-                       Loader(TextureSlot &, Collection &);
-
-               private:
-                       void init();
-                       void texture(const std::string &);
-                       void texture2d();
-               };
-
+       private:
                unsigned index;
-               RefPtr<const Texture> texture;
+               RefPtr<Texture> tex;
+               RefPtr<TexEnv> env;
+
+       public:
+               TextureLoader(Texturing &, unsigned, Collection *);
+       private:
+               virtual void finish();
 
-               TextureSlot(unsigned);
+               void texenv();
+               void texture(const std::string &);
+               void texture2d();
        };
 
        Program *shprog;
        ProgramData *shdata;
        RefPtr<const Material> material;
-       std::vector<TextureSlot> textures;
+       Texturing *texturing;
 
        RenderPass &operator=(const RenderPass &);
 public:
@@ -74,12 +74,12 @@ public:
        RenderPass(const RenderPass &);
        ~RenderPass();
 
+       const Program *get_shader_program() const { return shprog; }
+       const ProgramData *get_shader_data() const { return shdata; }
        void set_material(const Material *);
+       const Material *get_material() const { return material.get(); }
        void set_texture(unsigned, const Texture *);
-
-       void bind() const;
-
-       static void unbind();
+       const Texturing *get_texturing() const { return texturing; }
 };
 
 } // namespace GL