1 files changed, 80 insertions, 29 deletions

diff --git a/src/world.hpp b/src/world.hpp
index 9314fa6..0c1275e 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -26,14 +26,15 @@
 #include <entityx/entityx.h>
 #include <sol/sol.hpp>
 
+#include <soil/SOIL.h>
+
 #include "texture.hpp"
+#include "events/render.hpp"
+
+#include <components/Position.hpp> // For entity position
+#include <components/Velocity.hpp> // For entity velocity
+#include <components/Physics.hpp>  // For entity hitbox(es)
 
-struct WorldMeshData
-{
-    float posX, posY, posZ;
-    float texX, texY;
-    float transparency;
-}__attribute__((packed));
 
 struct WorldMaterial
 {
@@ -57,6 +58,65 @@ struct WorldMaterial
     }
 };
 
+class Layer
+{
+    friend class World;
+private:
+    Texture texture;
+    Texture normal;
+
+    float drawLayer = 0.0f;
+
+    GLuint layerVBO;
+public:
+
+    Layer(float z, sol::table tab) {
+        drawLayer = z;
+        if (tab["texture"] != nullptr) {
+            sol::object t = tab["texture"];
+            texture = Texture(t);
+        }
+        if (tab["normal"] != nullptr) {
+            sol::object n = tab["normal"];
+            normal = Texture(n);
+        }
+
+        glGenBuffers(1, &layerVBO);
+    }
+};
+
+class SolidLayer : public Layer
+{
+    friend class World;
+private:
+    std::vector<std::vector<bool>> hitbox;
+public:
+    SolidLayer(float z, sol::table tab) : Layer(z, tab) {
+        if (tab["hitbox"] != nullptr) {
+            int width, height, channels;
+            unsigned char* box = 
+                SOIL_load_image(std::string(tab["hitbox"]).c_str(),
+                                &width, &height, &channels,
+                                SOIL_LOAD_RGBA);
+
+            for (int w = 0; w < width*channels; w+=channels) {
+                hitbox.push_back(std::vector<bool>(height));
+                for (int h = 0; h < height; h++) {
+                    unsigned char* c = &box[(w) + (width*h*channels)];
+                    // we want to read the last channel (alpha)
+                    if (c[channels-1]) {
+                        hitbox[w/channels][height-h] = true;
+                    }
+                    else
+                        hitbox[w/channels][height-h] = false;
+                }
+            }
+
+            SOIL_free_image_data(box);
+        }
+    }
+};
+
 class World
 {
     friend class WorldSystem;
@@ -64,19 +124,17 @@ private:
     unsigned int seed;
     unsigned int layers;
 
-    unsigned int height;
-    unsigned int width;
-
-    std::vector<std::vector<std::vector<int>>> data;
+    unsigned int unitSize;
+    std::vector<std::shared_ptr<SolidLayer>> solidLayers;
+    std::vector<std::shared_ptr<Layer>> drawLayers;
 
-    std::unordered_map<std::string, int> string_registry;
-    std::vector<WorldMaterial> registry;
+    std::vector<std::pair<glm::vec2, glm::vec2>>
+        getIntersectingPlanes(glm::vec2 origin, glm::vec2 dir);
 
 protected:
     // RENDER
-    std::basic_string<WorldMeshData> mesh;
+    std::vector<WorldMeshUpdateEvent> meshAdd;
     GLuint worldVBO;
-    bool meshUpdated = false;
 public:
     /* VARS */
     sol::function generate;
@@ -87,27 +145,12 @@ public:
     ~World() {
         registerMat = sol::nil;
         generate = sol::nil;
-        registry.clear();
-        data.clear();
     }
 
-    /* REGISTRY */
-    void registerMaterial(std::string, sol::object);
-
-    /* DATA */
-    void setData(unsigned int, unsigned int, unsigned int, std::string);
-
-    /* SIZE */
-    std::tuple<unsigned int, unsigned int, unsigned int> setSize(unsigned int,
-                                                                 unsigned int,
-                                                                 unsigned int);
     std::tuple<unsigned int, unsigned int, unsigned int> getSize();
 
     /* RENDERING */
     void generateMesh();
-    std::basic_string<WorldMeshData>& getMesh() {return mesh;}
-    GLuint getTexture() {return registry.at(0).texture.tex;}
-    GLuint getNormal() {return registry.at(0).normal.tex;};
 
     /* SEED */
     unsigned int getSeed();
@@ -115,6 +158,14 @@ public:
 
     /* PHYSICS */
     double getHeight(double x, double y, double z);
+    glm::vec3 collide(glm::vec3 &start, glm::vec3 &end, Physics &phys);
+
+    // NEW
+    unsigned int getUnitSize() {return unitSize;}
+    void setUnitSize(unsigned int u) {unitSize = u;}
+
+    void registerLayer(float, sol::object);
+    void registerDecoLayer(float, sol::object);
 };
 
 /**