diff options
Diffstat (limited to 'src/render.cpp')
| -rw-r--r-- | src/render.cpp | 88 |
1 files changed, 72 insertions, 16 deletions
diff --git a/src/render.cpp b/src/render.cpp index 2a51b70..3eea57b 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -28,6 +28,9 @@ void RenderSystem::configure([[maybe_unused]] entityx::EntityManager& entities, [[maybe_unused]] entityx::EventManager& events) { events.subscribe<NewRenderEvent>(*this); + events.subscribe<WorldMeshUpdateEvent>(*this); + events.subscribe<entityx::ComponentAddedEvent<Player>>(*this); + init(); } @@ -53,7 +56,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, ***********/ glm::mat4 view = glm::lookAt(camPos, // Pos - glm::vec3(0.0f, 0.0f, 0.0f), // Facing + glm::vec3(camPos.x, camPos.y, 0.0f), // Facing glm::vec3(0.0f, 1.0f, 0.0f)); // Up //glm::mat4 projection = glm::perspective(45.0f, @@ -61,16 +64,19 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, // 0.01f, // 2048.0f); - glm::mat4 projection = glm::ortho(-((float)width/2), // Left - ((float)width/2), // Right - -((float)height/2), // Bottom - ((float)height/2), // Top - -10.0f, // zNear - 10.0f // zFar + float scale = 40.0f; + float scaleWidth = static_cast<float>(width) / scale; + float scaleHeight = static_cast<float>(height) / scale; + + glm::mat4 projection = glm::ortho(-(scaleWidth/2), // Left + (scaleWidth/2), // Right + -(scaleHeight/2), // Bottom + (scaleHeight/2), // Top + 10.0f, // zFar + -10.0f // zNear ); glm::mat4 model = glm::mat4(1.0f); - model = glm::scale(model, glm::vec3(20.0f, 20.0f, 1.0f)); glUseProgram(s); @@ -91,10 +97,23 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, GLfloat amb[4] = {1.0f, 1.0f, 1.0f, 0.0f}; glUniform4fv(b, 1, amb); + /************ + * CAMERA * + ************/ + try { + if (player.has_component<Position>()) { + Position *pos = player.component<Position>().get(); + camPos.y = pos->y; + camPos.x = pos->x; + } + } catch (...) { // If the player doesn't exist or anything goes wrong + camPos.y = 0.0f; + camPos.x = 0.0f; + } + /************** * LIGHTING * **************/ - std::vector<glm::vec3> lightPos; std::vector<glm::vec4> lightColor; @@ -103,7 +122,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, entities.each<Light, Position>([&] (entityx::Entity, Light &l, Position &p){ - lightPos.push_back(glm::vec3(p.x, p.y,-10.0)); + lightPos.push_back(glm::vec3(p.x, p.y, 1.0)); lightColor.push_back(glm::vec4(l.r, l.g, l.b, l.strength)); lightNum++; }); @@ -132,8 +151,8 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, // e.component<Scripted>()->updateRender(); //} - float w = r.texture.width/2.0f; - float h = r.texture.height; + float w = 0.5f; + float h = (float)r.texture.height/r.texture.width; GLuint tri_vbo; GLfloat tri_data[] = { @@ -179,9 +198,33 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, 5*sizeof(float), (void*)(3*sizeof(float))); glDrawArrays(GL_TRIANGLES, 0, 6); }); + glUniform1i(f, 0); + + // If we were given a world VBO render it + if (worldVBO) { + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, worldTexture); + glUniform1i(q, 0); + + glActiveTexture(GL_TEXTURE1); + glBindTexture(GL_TEXTURE_2D, worldNormal); + glUniform1i(n, 1); + + glBindBuffer(GL_ARRAY_BUFFER, worldVBO); + //glBufferData(GL_ARRAY_BUFFER, + // wm.size() * sizeof(WorldMeshData), + // &wm.front(), + // GL_STREAM_DRAW); - // Update all given VBOs - for (auto& r : renders) { + glVertexAttribPointer(a, 3, GL_FLOAT, GL_FALSE, + 6*sizeof(float), 0); + glVertexAttribPointer(t, 2, GL_FLOAT, GL_FALSE, + 6*sizeof(float), (void*)(3*sizeof(float))); + glDrawArrays(GL_TRIANGLES, 0, worldVertex); + } + + // Update all UI VBOs + for (auto& r : uiRenders) { auto& render = r.second; glActiveTexture(GL_TEXTURE0); @@ -293,7 +336,20 @@ int RenderSystem::init(void) void RenderSystem::receive(const NewRenderEvent &nre) { - renders.insert_or_assign(nre.vbo, - RenderData(nre.tex, nre.normal, nre.vertex)); + uiRenders.insert_or_assign(nre.vbo, + UIRenderData(nre.tex, nre.normal, nre.vertex)); +} + +void RenderSystem::receive(const WorldMeshUpdateEvent &wmu) +{ + worldVBO = wmu.worldVBO; + worldVertex = wmu.numVertex; + worldTexture = wmu.worldTexture; + worldNormal = wmu.worldNormal; +} + +void RenderSystem::receive(const entityx::ComponentAddedEvent<Player> &cae) +{ + player = cae.entity; } |