Move blend state from Sequence::Step to RenderMethod

[libs/gl.git] / source / materials / rendermethod.cpp

diff --git a/source/materials/rendermethod.cpp b/source/materials/rendermethod.cpp
index 35c24c1f080cb3e23fc9908d0d11fcc98852900e..3208929cc2a98e1de31d8f18cb4edf12456859d0 100644 (file)
--- a/source/materials/rendermethod.cpp
+++ b/source/materials/rendermethod.cpp
@@ -14,16 +14,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-RenderMethod::RenderMethod():
-       shprog(0),
-       shprog_from_material(false),
-       shdata(0),
-       material(0),
-       face_cull(CULL_BACK),
-       receive_shadows(false),
-       image_based_lighting(false)
-{ }
-
 void RenderMethod::set_material_textures()
 {
        const Tag *material_texture_tags = material->get_texture_tags();
@@ -96,6 +86,11 @@ void RenderMethod::set_face_cull(CullMode fc)
        face_cull = fc;
 }
 
+void RenderMethod::set_blend(const Blend &b)
+{
+       blend = b;
+}
+
 void RenderMethod::set_receive_shadows(bool rs)
 {
        receive_shadows = rs;
@@ -109,6 +104,7 @@ void RenderMethod::apply(Renderer &renderer) const
        if(material)
                renderer.add_shader_data(material->get_shader_data());
        renderer.set_face_cull(face_cull);
+       renderer.set_blend(&blend);
 }
 
 void RenderMethod::set_debug_name(const string &name)
@@ -132,6 +128,8 @@ RenderMethod::Loader::Loader(RenderMethod &p, Collection &c):
 
 void RenderMethod::Loader::init_actions()
 {
+       add("blend", &Loader::blend);
+       add("blend", &Loader::blend_factors);
        add("face_cull", &RenderMethod::face_cull);
        add("shader",   &Loader::shader);
        add("image_based_lighting", &RenderMethod::image_based_lighting);
@@ -156,13 +154,21 @@ void RenderMethod::Loader::finish()
                obj.maybe_create_material_shader();
 }
 
+void RenderMethod::Loader::blend()
+{
+       load_sub(obj.blend);
+}
+
+void RenderMethod::Loader::blend_factors(BlendFactor src, BlendFactor dest)
+{
+       obj.blend = Blend(src, dest);
+}
+
 void RenderMethod::Loader::material_inline()
 {
        Material::GenericLoader ldr(get_collection());
        load_sub_with(ldr);
-       RefPtr<Material> mat = ldr.get_object();
-       get_collection().add(inline_base_name+".mat", mat.get());
-       obj.material = mat.release();
+       obj.material = ldr.store_object(get_collection(), inline_base_name+".mat");
        obj.set_material_textures();
 }