add GeneratorScript

src/logic/scripting/lua/lua_custom_types.hpp

@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "lua_commons.hpp"
+#include "maths/Heightmap.hpp"
 
 namespace lua {
     class Userdata {
@@ -27,37 +28,42 @@ namespace lua {
         }
 
         static int createMetatable(lua::State*);
-        inline static std::string TYPENAME = "bytearray";
+        inline static std::string TYPENAME = "Bytearray";
     };
 
-    class Heightmap : public Userdata {
-        std::vector<float> buffer;
-        uint width, height;
+    class LuaHeightmap : public Userdata {
+        std::shared_ptr<Heightmap> map;
     public:
-        Heightmap(uint width, uint height);
-        virtual ~Heightmap();
+        LuaHeightmap(uint width, uint height) 
+        : map(std::make_shared<Heightmap>(width, height)) {}
+
+        virtual ~LuaHeightmap() = default;
 
         uint getWidth() const {
-            return width;
+            return map->getWidth();
         }
 
         uint getHeight() const {
-            return height;
+            return map->getHeight();
+        }
+
+        float* getValues() {
+            return map->getValues();
+        }
+
+        const float* getValues() const {
+            return map->getValues();
         }
 
         const std::string& getTypeName() const override {
             return TYPENAME;
         }
 
-        float* getValues() {
-            return buffer.data();
-        }
-
-        const float* getValues() const {
-            return buffer.data();
+        std::shared_ptr<Heightmap> getHeightmap() const {
+            return map;
         }
 
         static int createMetatable(lua::State*);
-        inline static std::string TYPENAME = "heightmap";
+        inline static std::string TYPENAME = "Heightmap";
     };
 }

src/logic/scripting/lua/lua_engine.cpp

@@ -97,7 +97,7 @@ void lua::initialize() {
     initialize_libs_extends(L);
 
     newusertype<Bytearray, Bytearray::createMetatable>(L, "Bytearray");
-    newusertype<Heightmap, Heightmap::createMetatable>(L, "Heightmap");
+    newusertype<LuaHeightmap, LuaHeightmap::createMetatable>(L, "Heightmap");
 }
 
 void lua::finalize() {

src/logic/scripting/lua/lua_type_heightmap.cpp

@@ -8,6 +8,7 @@
 #include "util/functional_util.hpp"
 #include "maths/FastNoiseLite.h"
 #include "coders/png.hpp"
+#include "files/util.hpp"
 #include "graphics/core/ImageData.hpp"
 #include "lua_util.hpp"
 
@@ -15,16 +16,12 @@ using namespace lua;
 
 static fnl_state noise = fnlCreateState();
 
-Heightmap::Heightmap(uint width, uint height) : width(width), height(height) {
-    buffer.resize(width*height);
-}
-
-Heightmap::~Heightmap() {
-}
-
 static int l_dump(lua::State* L) {
-    if (auto heightmap = touserdata<Heightmap>(L, 1)) {
+    if (auto heightmap = touserdata<LuaHeightmap>(L, 1)) {
         auto filename = tostring(L, 2);
+        if (!files::is_valid_name(filename)) {
+            throw std::runtime_error("invalid file name");
+        }
         uint w = heightmap->getWidth();
         uint h = heightmap->getHeight();
         ImageData image(ImageFormat::rgb888, w, h);
@@ -46,7 +43,7 @@ static int l_dump(lua::State* L) {
 }
 
 static int l_noise(lua::State* L) {
-    if (auto heightmap = touserdata<Heightmap>(L, 1)) {
+    if (auto heightmap = touserdata<LuaHeightmap>(L, 1)) {
         uint w = heightmap->getWidth();
         uint h = heightmap->getHeight();
         auto heights = heightmap->getValues();
@@ -62,13 +59,13 @@ static int l_noise(lua::State* L) {
         if (gettop(L) > 4) {
             multiplier = tonumber(L, 5);
         }
-        const Heightmap* shiftMapX = nullptr;
-        const Heightmap* shiftMapY = nullptr;
+        const LuaHeightmap* shiftMapX = nullptr;
+        const LuaHeightmap* shiftMapY = nullptr;
         if (gettop(L) > 5) {
-            shiftMapX = touserdata<Heightmap>(L, 6);
+            shiftMapX = touserdata<LuaHeightmap>(L, 6);
         }
         if (gettop(L) > 6) {
-            shiftMapY = touserdata<Heightmap>(L, 7);
+            shiftMapY = touserdata<LuaHeightmap>(L, 7);
         }
         for (uint y = 0; y < h; y++) {
             for (uint x = 0; x < w; x++) {
@@ -159,13 +156,13 @@ static int l_meta_meta_call(lua::State* L) {
     if (width <= 0 || height <= 0) {
         throw std::runtime_error("width and height must be greather than 0");
     }
-    return newuserdata<Heightmap>(
+    return newuserdata<LuaHeightmap>(
         L, static_cast<uint>(width), static_cast<uint>(height)
     );
 }
 
 static int l_meta_index(lua::State* L) {
-    auto map = touserdata<Heightmap>(L, 1);
+    auto map = touserdata<LuaHeightmap>(L, 1);
     if (map == nullptr) {
         return 0;
     }
@@ -186,7 +183,7 @@ static int l_meta_index(lua::State* L) {
 }
 
 static int l_meta_tostring(lua::State* L) {
-    auto map = touserdata<Heightmap>(L, 1);
+    auto map = touserdata<LuaHeightmap>(L, 1);
     if (map == nullptr) {
         return 0;
     }
@@ -201,7 +198,7 @@ static int l_meta_tostring(lua::State* L) {
     );
 }
 
-int Heightmap::createMetatable(lua::State* L) {
+int LuaHeightmap::createMetatable(lua::State* L) {
     createtable(L, 0, 2);
     pushcfunction(L, lua::wrap<l_meta_tostring>);
     setfield(L, "__tostring");

src/logic/scripting/lua/lua_util.hpp

@@ -153,6 +153,14 @@ namespace lua {
         return 3;
     }
 
+    template<int n>
+    inline int pushivec_stack(lua::State* L, glm::vec<n, int> vec) {
+        for (int i = 0; i < n; i++) {
+            pushinteger(L, vec[i]);
+        }
+        return n;
+    }
+
     inline int pushivec3_stack(lua::State* L, glm::ivec3 vec) {
         pushinteger(L, vec.x);
         pushinteger(L, vec.y);