Add Renderable as base class for relevant types in Resources

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index a37496b93771190add82369f87cea33fa6b0ce2c..a0ee5e851e19d62f8e06411478b885f8de84658d 100644 (file)
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -64,10 +64,10 @@ Resources::Resources(bool set_as_global):
                .notify(&set_debug_name<Mesh>);
        add_type<Module>().suffix(".glsl").suffix(".spv")
                .creator([this](const string &n){ return create_module(n); });
-       add_type<Object>().keyword("object");
-       add_type<OccludedScene>().base<Scene>().suffix(".scene")
+       add_type<Object>().base<Renderable>().keyword("object");
+       add_type<OccludedScene>().base<Scene>().base<Renderable>().suffix(".scene")
                .creator([this](const string &n) -> OccludedScene * { create_generic<Scene>(n); return 0; });
-       add_type<OrderedScene>().base<Scene>().suffix(".scene")
+       add_type<OrderedScene>().base<Scene>().base<Renderable>().suffix(".scene")
                .creator([this](const string &n) -> OrderedScene * { create_generic<Scene>(n); return 0; });
        add_type<PbrMaterial>().base<Material>().suffix(".mat")
                .creator([this](const string &n) -> PbrMaterial * { create_generic<Material>(n); return 0; })
@@ -81,7 +81,7 @@ Resources::Resources(bool set_as_global):
                .notify(&set_debug_name<Program>);
        add_type<Sampler>().suffix(".samp").keyword("sampler")
                .notify(&set_debug_name<Sampler>);
-       add_type<SimpleScene>().base<Scene>().suffix(".scene")
+       add_type<SimpleScene>().base<Scene>().base<Renderable>().suffix(".scene")
                .creator([this](const string &n) -> SimpleScene * { create_generic<Scene>(n); return 0; });
        add_type<Technique>().suffix(".tech").keyword("technique")
                .notify(&set_debug_name<Technique>);
@@ -103,7 +103,7 @@ Resources::Resources(bool set_as_global):
        add_type<UnlitMaterial>().base<Material>().suffix(".mat")
                .creator([this](const string &n) -> UnlitMaterial * { create_generic<Material>(n); return 0; })
                .notify(&set_debug_name<Material>);
-       add_type<ZSortedScene>().base<Scene>().suffix(".scene")
+       add_type<ZSortedScene>().base<Scene>().base<Renderable>().suffix(".scene")
                .creator([this](const string &n) -> ZSortedScene * { create_generic<Scene>(n); return 0; });
 
        add_source(get_builtins());