Merge pull request #82 from Milerius/dev

add new event

Author: Milerius

examples/sfml/game_scene.lua

@@ -6,6 +6,8 @@
 -- To change this template use File | Settings | File Templates.
 --
 
+local entities = {}
+
 function update()
     --print("nb entities" .. shiva.entity_registry:nb_entities())
 end
@@ -20,21 +22,29 @@ end
 
 function leave()
     print("leave game scene")
+    for key, value in pairs(entities) do
+        shiva.entity_registry:destroy(value)
+    end
+    shiva.resource_registry:unload_all_resources("game_scene")
+end
+
+function on_after_load_resources(evt)
+    local id, sprite = shiva.entity_registry:create_game_object_with_sprite()
+    sprite:set_texture(shiva.resource_registry:get_texture("game_scene/toto"), false)
+    entities[#entities + 1] = id
+    shiva.entity_registry:add_layer_1_component(id)
 end
 
 function enter()
     print("enter game scene")
     shiva.resource_registry:load_all_resources("game_scene")
     print("should be here")
-
-    --local id, sprite = shiva.entity_registry:create_game_object_with_sprite()
-    --sprite:set_texture(shiva.resource_registry:get_texture("game_scene/toto"), false)
-    --shiva.entity_registry:add_layer_1_component(id)
 end
 
 return {
     on_key_released = on_key_released,
     on_key_pressed = on_key_pressed,
+    on_after_load_resources = on_after_load_resources,
     leave = leave,
     enter = enter,
     update = update,

modules/event/CMakeSources.cmake

@@ -8,6 +8,7 @@ set(MODULE_PUBLIC_HEADERS
         "${MODULE_PATH}/start_game.hpp"
         "${MODULE_PATH}/key_pressed.hpp"
         "${MODULE_PATH}/after_load_systems_plugins.hpp"
+        "${MODULE_PATH}/after_load_resources.hpp"
         "${MODULE_PATH}/all.hpp"
         )
 

modules/event/shiva/event/after_load_resources.hpp

@@ -0,0 +1,25 @@
+//
+// Created by roman Sztergbaum on 21/07/2018.
+//
+
+#pragma once
+
+#include <shiva/reflection/reflection.hpp>
+
+namespace shiva::event
+{
+    struct after_load_resources
+    {
+        reflect_class(after_load_resources)
+
+        static constexpr auto reflected_functions() noexcept
+        {
+            return meta::makeMap();
+        }
+
+        static constexpr auto reflected_members() noexcept
+        {
+            return meta::makeMap();
+        }
+    };
+}

modules/event/shiva/event/all.hpp

@@ -11,9 +11,11 @@
 #include <shiva/event/start_game.hpp>
 #include <shiva/event/key_released.hpp>
 #include <shiva/event/key_pressed.hpp>
+#include <shiva/event/after_load_resources.hpp>
 
 #include <shiva/meta/list.hpp>
 
+
 namespace shiva::event
 {
     template <typename T>
@@ -32,6 +34,7 @@ namespace shiva::event
         quit_game,
         start_game,
         key_pressed,
-        key_released>;
+        key_released,
+        after_load_resources>;
 }
 

modules/scenes/shiva/scenes/scenes_system.lua

@@ -51,6 +51,11 @@ end
 
 function __destructor__()
     print("scene manager destructor")
+    if current_scene.leave ~= nil then
+        current_scene.leave()
+    else
+        print("current scene doesn't have leave callback")
+    end
 end
 
 function internal_update()
@@ -75,6 +80,14 @@ function internal_key_released(evt)
     end
 end
 
+function internal_after_load_resources(evt)
+    if current_scene.on_after_load_resources ~= nil then
+        current_scene.on_after_load_resources(evt)
+    else
+        print("current scene doesn't have on_after_load_resources callback")
+    end
+end
+
 function internal_change_scene(scene_name)
     if scenes_table[scene_name] ~= nil then
         current_scene.leave()
@@ -88,6 +101,7 @@ scenes_system_table = {
     update = internal_update,
     on_key_pressed = internal_key_pressed,
     on_key_released = internal_key_released,
+    on_after_load_resources = internal_after_load_resources,
     on_construct = __constructor__,
     on_destruct = __destructor__,
     current_system_type = system_type.logic_update