Remove deprecated interfaces from material and lighting code

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

diff --git a/source/materials/renderpass.h b/source/materials/renderpass.h
index f02303bc8865f91632723bfe160143dd201dabf8..ae9e34b8e76c70228b0caf0fe3ef0085f5bad944 100644 (file)
--- a/source/materials/renderpass.h
+++ b/source/materials/renderpass.h
@@ -3,6 +3,7 @@
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
+#include "cullface.h"
 #include "material.h"
 
 namespace Msp {
@@ -13,7 +14,6 @@ class ProgramData;
 class Renderer;
 class Sampler;
 class Texture;
-class Texturing;
 
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
@@ -25,24 +25,26 @@ public:
        class Loader: public DataFile::CollectionObjectLoader<RenderPass>
        {
        private:
+               std::string inline_base_name;
+
                static ActionMap shared_actions;
 
        public:
                Loader(RenderPass &);
                Loader(RenderPass &, Collection &);
-
        private:
                virtual void init_actions();
-               virtual void finish();
+       
+       public:
+               void set_inline_base_name(const std::string &);
 
-               static std::string get_shader_name(const std::string &);
+       private:
+               virtual void finish();
 
                void material_inline();
                void material(const std::string &);
                void shader(const std::string &);
                void texture(const std::string &);
-               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 &);
@@ -71,40 +73,40 @@ private:
                TextureSlot(Tag t): tag(t), texture(0), sampler(0) { }
        };
 
-       RefPtr<const Program> shprog;
+       const Program *shprog;
        bool shprog_from_material;
        RefPtr<ProgramData> shdata;
        std::map<Tag, Tag> uniform_slots;
-       RefPtr<const Material> material;
+       const Material *material;
        std::string material_slot;
        std::vector<TextureSlot> textures;
-       bool back_faces;
+       CullMode face_cull;
        bool receive_shadows;
+       bool image_based_lighting;
 
 public:
        RenderPass();
 
 private:
-       void maybe_create_material_shader(DataFile::Collection *);
+       void maybe_create_material_shader();
        void set_material_textures();
 
 public:
        void set_shader_program(const Program *, const ProgramData *);
-       const Program *get_shader_program() const { return shprog.get(); }
+       const Program *get_shader_program() const { return shprog; }
        const ProgramData *get_shader_data() const { return shdata.get(); }
        Tag get_slotted_uniform_tag(Tag) const;
-       void set_material(const Material *, DataFile::Collection * = 0);
-       const Material *get_material() const { return material.get(); }
+       void set_material(const Material *);
+       const Material *get_material() const { return material; }
        const std::string &get_material_slot_name() const { return material_slot; }
        void set_texture(Tag, const Texture *, const Sampler * = 0);
        Tag get_texture_tag(const std::string &) const;
-       DEPRECATED void set_texture(unsigned, const Texture *, const Sampler * = 0);
-       DEPRECATED const Texturing *get_texturing() const { return 0; }
-       DEPRECATED int get_texture_index(const std::string &) const;
-       void set_back_faces(bool);
-       bool get_back_faces() const { return back_faces; }
+       void set_face_cull(CullMode);
+       CullMode get_face_cull() const { return face_cull; }
        void set_receive_shadows(bool);
        bool get_receive_shadows() const { return receive_shadows; }
+       void set_image_based_lighting(bool);
+       bool get_image_based_lighting() const { return image_based_lighting; }
 
        void apply(Renderer &) const;