Updated world texture loading in Lua

2 files changed, 7 insertions, 7 deletions

diff --git a/src/world.cpp b/src/world.cpp
index 1dca763..3fb5b6b 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -144,7 +144,7 @@ void World::generateMesh()
 
                 Texture &t = registry.at(d).texture;
                 glm::vec2& to = t.offset;
-                glm::vec2& ts = t.offsetSize;
+                glm::vec2& ts = t.size;
 
                 mesh += {X  , Y  , Z, to.x     , to.y+ts.y, 1.0};
                 mesh += {X+1, Y  , Z, to.x+ts.x, to.y+ts.y, 1.0};
diff --git a/src/world.hpp b/src/world.hpp
index cea599b..81e5b9d 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -43,13 +43,13 @@ struct WorldMaterial
     Texture normal;
 
     WorldMaterial(sol::table tab) {
-        if (tab["texture"] == sol::type::string) {
-            std::string tex = tab["texture"];
-            texture = Texture(tex);
+        if (tab["texture"] != nullptr) {
+            sol::object t = tab["texture"];
+            texture = Texture(t);
         }
-        if (tab["normal"] == sol::type::string) {
-            std::string nor = tab["normal"];
-            normal = Texture(nor);
+        if (tab["normal"] != nullptr) {
+            sol::object n = tab["normal"];
+            normal = Texture(n);
         }
         if (tab["passable"] == sol::type::boolean) {
             passable = tab["passable"];