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 d149a7d029dd17d552c862b35f5e5c3e98094b44..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.
@@ -41,14 +41,10 @@ public:
        private:
                virtual void finish();
 
-               static std::string get_shader_name(const std::string &);
-
                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 &);
@@ -84,7 +80,7 @@ private:
        const Material *material;
        std::string material_slot;
        std::vector<TextureSlot> textures;
-       bool back_faces;
+       CullMode face_cull;
        bool receive_shadows;
        bool image_based_lighting;
 
@@ -105,11 +101,8 @@ public:
        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);