diff options
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/src/world.cpp b/src/world.cpp index c20ce17..cd89a22 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -18,6 +18,7 @@ */ #include "world.hpp" +#include "events/render.hpp" #include "events/world.hpp" /***************** @@ -136,7 +137,7 @@ void World::generateMesh() // Preallocate size of vertexes mesh = std::basic_string<WorldMeshData>(); - for (float Z = 0; Z < data.size(); Z++) { + for (float Z = data.size() - 1; Z >= 0; Z--) { for (float X = 0; X < data.at(Z).size(); X++) { for (float Y = 0; Y < data.at(Z).at(X).size(); Y++) { int d = data.at(Z).at(X).at(Y); @@ -148,22 +149,35 @@ void World::generateMesh() glm::vec2& to = t.offset; 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}; - mesh += {X , Y+1, Z, to.x , to.y , 1.0}; + float tr = 1.0f; + + // TODO play with this a bit so it only goes trans + // if player is behind the front layer + try { + if (Z < data.size() - 1 && Z >= 0) { + if (data.at(Z+1).at(X).at(Y) == -1) + tr = 1.0f; + } + } catch (...) { + tr = 1.0f; + } + + mesh += {X , Y , Z, to.x , to.y+ts.y, tr}; + mesh += {X+1, Y , Z, to.x+ts.x, to.y+ts.y, tr}; + mesh += {X , Y+1, Z, to.x , to.y , tr}; - mesh += {X+1, Y , Z, to.x+ts.x, to.y+ts.y, 1.0}; - mesh += {X+1, Y+1, Z, to.x+ts.x, to.y , 1.0}; - mesh += {X , Y+1, Z, to.x , to.y , 1.0}; + mesh += {X+1, Y , Z, to.x+ts.x, to.y+ts.y, tr}; + mesh += {X+1, Y+1, Z, to.x+ts.x, to.y , tr}; + mesh += {X , Y+1, Z, to.x , to.y , tr}; } } } glBindBuffer(GL_ARRAY_BUFFER, worldVBO); glBufferData(GL_ARRAY_BUFFER, - mesh.size() * sizeof(mesh), - &mesh.front(), - GL_STREAM_DRAW); + mesh.size() * sizeof(WorldMeshData), + mesh.data(), + GL_STATIC_DRAW); meshUpdated = true; } @@ -199,7 +213,9 @@ double World::getHeight(double x, double y, double z) } } } catch (...) { // If we get any errors, just let the character - return y; + //return y; + (void)y; + return 0.0; } return Y; @@ -229,7 +245,6 @@ void WorldSystem::update([[maybe_unused]]entityx::EntityManager& entities, if (currentWorld == nullptr) { currentWorld = &(worlds.front()); events.emit<WorldChangeEvent>(currentWorld); - std::cout << "Emitted" << std::endl; } if (currentWorld->meshUpdated) { |