gui: more xml and lua support

src/delegates.h

@@ -8,5 +8,7 @@ using runnable = std::function<void()>;
 using stringconsumer = std::function<void(const std::string&)>;
 using wstringsupplier = std::function<std::wstring()>;
 using wstringconsumer = std::function<void(const std::wstring&)>;
+using doublesupplier = std::function<double()>;
+using doubleconsumer = std::function<void(double)>;
 
 #endif // DELEGATES_H_

src/engine.cpp

@@ -208,6 +208,10 @@ void Engine::loadAllPacks() {
 	ContentPack::scan(paths, contentPacks);
 }
 
+double Engine::getDelta() const {
+    return delta;
+}
+
 void Engine::setScreen(std::shared_ptr<Screen> screen) {
 	this->screen = screen;
 }

src/engine.h

@@ -63,6 +63,7 @@ public:
     void loadContent();
     void loadWorldContent(const fs::path& folder);
 	void loadAllPacks();
+    double getDelta() const;
 
     std::shared_ptr<Screen> getScreen();
 };

src/frontend/gui/controls.h

@@ -17,9 +17,6 @@ class Batch2D;
 class Assets;
 
 namespace gui {
-    using doublesupplier = std::function<double()>;
-    using doubleconsumer = std::function<void(double)>;
-
     using boolsupplier = std::function<bool()>;
     using boolconsumer = std::function<void(bool)>;
 

src/frontend/gui/gui_xml.cpp

@@ -124,6 +124,13 @@ static std::shared_ptr<UINode> readContainer(UiXmlReader& reader, xml::xmlelemen
     return container;
 }
 
+static std::shared_ptr<UINode> readPanel(UiXmlReader& reader, xml::xmlelement element) {
+    float interval = element->attr("interval", "2").asFloat();
+    auto panel = std::make_shared<Panel>(glm::vec2(), glm::vec4(), interval);
+    _readPanel(reader, element, *panel);
+    return panel;
+}
+
 static std::shared_ptr<UINode> readButton(UiXmlReader& reader, xml::xmlelement element) {
     std::wstring text = readAndProcessInnerText(element);
     auto button = std::make_shared<Button>(text, glm::vec4(0.0f), nullptr);
@@ -156,7 +163,7 @@ static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, xml::xmlelement
         auto consumer = scripting::create_wstring_consumer(
             reader.getEnvironment().getId(),
             element->attr("consumer").getText(),
-            reader.getFilename()+"lua"
+            reader.getFilename()+".lua"
         );
         textbox->textConsumer(consumer);
     }
@@ -171,13 +178,34 @@ static std::shared_ptr<UINode> readImage(UiXmlReader& reader, xml::xmlelement el
     return image;
 }
 
+static std::shared_ptr<UINode> readTrackBar(UiXmlReader& reader, xml::xmlelement element) {
+    float min = element->attr("min", "0.0").asFloat();
+    float max = element->attr("max", "1.0").asFloat();
+    float def = element->attr("value", "0.0").asFloat();
+    float step = element->attr("step", "1.0").asFloat();
+    int trackWidth = element->attr("track-width", "1.0").asInt();
+    auto bar = std::make_shared<TrackBar>(min, max, def, step, trackWidth);
+    _readUINode(element, *bar);
+    if (element->has("consumer")) {
+        auto consumer = scripting::create_number_consumer(
+            reader.getEnvironment().getId(),
+            element->attr("consumer").getText(),
+            reader.getFilename()+".lua"
+        );
+        bar->consumer(consumer);
+    }
+    return bar;
+}
+
 UiXmlReader::UiXmlReader(const scripting::Environment& env, AssetsLoader& assetsLoader) 
 : env(env), assetsLoader(assetsLoader)
 {
     add("image", readImage);
     add("label", readLabel);
+    add("panel", readPanel);
     add("button", readButton);
     add("textbox", readTextBox);
+    add("trackbar", readTrackBar);
     add("container", readContainer);
 }
 

src/logic/scripting/api/api_lua.h

@@ -108,8 +108,14 @@ static int l_time_uptime(lua_State* L) {
     return 1;
 }
 
+static int l_time_delta(lua_State* L) {
+    lua_pushnumber(L, scripting::engine->getDelta());
+    return 1;
+}
+
 static const luaL_Reg timelib [] = {
     {"uptime", l_time_uptime},
+    {"delta", l_time_delta},
     {NULL, NULL}
 };
  

src/logic/scripting/scripting.cpp

@@ -70,21 +70,42 @@ runnable scripting::create_runnable(
     };
 }
 
+static bool processCallback(
+    int env,
+    const std::string& src,
+    const std::string& file
+) {
+    try {
+        return state->eval(env, src, file) != 0;
+    } catch (lua::luaerror err) {
+        std::cerr << err.what() << std::endl;
+        return false;
+    }
+}
+
 wstringconsumer scripting::create_wstring_consumer(
     int env,
     const std::string& src,
     const std::string& file
 ) {
     return [=](const std::wstring& x){
-        try {
-            if (state->eval(env, src, file) == 0)
-                return;
-        } catch (lua::luaerror err) {
-            std::cerr << err.what() << std::endl;
-            return;
+        if (processCallback(env, src, file)) {
+            state->pushstring(util::wstr2str_utf8(x));
+            state->callNoThrow(1);
+        }
+    };
+}
+
+doubleconsumer scripting::create_number_consumer(
+    int env,
+    const std::string& src,
+    const std::string& file
+) {
+    return [=](double x){
+        if (processCallback(env, src, file)) {
+            state->pushnumber(x);
+            state->callNoThrow(1);
         }
-        state->pushstring(util::wstr2str_utf8(x));
-        state->callNoThrow(1);
     };
 }
 
@@ -94,17 +115,12 @@ int_array_consumer scripting::create_int_array_consumer(
     const std::string& file
 ) {
     return [=](const int arr[], size_t len){
-        try {
-            if (state->eval(env, src, file) == 0)
-                return;
-        } catch (lua::luaerror err) {
-            std::cerr << err.what() << std::endl;
-            return;
+        if (processCallback(env, src, file)) {
+            for (uint i = 0; i < len; i++) {
+                state->pushinteger(arr[i]);
+            }
+            state->callNoThrow(len);
         }
-        for (uint i = 0; i < len; i++) {
-            state->pushinteger(arr[i]);
-        }
-        state->callNoThrow(len);
     };
 }
 

src/logic/scripting/scripting.h

@@ -55,6 +55,12 @@ namespace scripting {
         const std::string& file="<string>"
     );
 
+    doubleconsumer create_number_consumer(
+        int env,
+        const std::string& src,
+        const std::string& file="<string>"
+    );
+
     int_array_consumer create_int_array_consumer(
         int env,
         const std::string& src,