From 534f6f57e930020eb1ad726f4de4e90cf487e584 Mon Sep 17 00:00:00 2001 From: Andy Belle-Isle <drumsetmonkey@gmail.com> Date: Sat, 14 Sep 2019 03:31:40 -0400 Subject: World can now draw --- src/world.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/world.hpp') diff --git a/src/world.hpp b/src/world.hpp index 81e5b9d..5933306 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -33,7 +33,7 @@ struct WorldMeshData float posX, posY, posZ; float texX, texY; float transparency; -}; +}__attribute__((packed)); struct WorldMaterial { @@ -100,6 +100,9 @@ public: /* 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(); @@ -125,6 +128,7 @@ public: } World* addWorld(sol::object); + World* current() {return currentWorld;}; void cleanup() { worlds.clear(); -- cgit v1.2.3