Merge branch 'master' of http://git.cubesoftware.xyz:20524/kacperks/PolyGun into HEAD

src/game/engine/greedy_meshing.cpp

@@ -25,6 +25,7 @@ SOFTWARE.
 
 
 #include "greedy_meshing.hpp"
+#include "game/world/chunk.hpp"
 
 namespace polygun::engine {
 

src/game/engine/greedy_meshing.hpp

@@ -27,7 +27,10 @@ SOFTWARE.
 #define POLYGUN_ENGINE_GREEDY_MERGING_HPP
 
 #include "../core.hpp"
-#include "game/world/chunk.hpp"
+
+namespace polygun::world {
+	class Chunk;
+}
 
 namespace polygun::engine {
 	struct cuboid {

src/game/screens/game_session_screen.cpp

@@ -252,7 +252,7 @@ void GameSessionScreen::render() {
 				}
 			}
 
-			m_engine->get_gui_renderer()->render_texture(glm::vec2(1,1), m_texture_atlas[id_d+1], glm::vec2(10,10), 0.0f, glm::vec4(1.0f,1.0f,1.0f,1.0f));
+			m_engine->get_gui_renderer()->render_texture(glm::vec2(1,1), m_texture_atlas[id_d], glm::vec2(10,10), 0.0f, glm::vec4(1.0f,1.0f,1.0f,1.0f));
 
 			// imgui
 
@@ -281,7 +281,7 @@ void GameSessionScreen::render() {
 			ImGui::InputFloat("FOV", &m_camera.m_fov);
 
 			if (ImGui::Button("Place Block")) 
-				m_chnk.add_node(id_d+1, glm::vec3(x_d, y_d, z_d));
+				m_chnk.add_node(id_d, glm::vec3(x_d, y_d, z_d));
 			
 			ImGui::NewLine();
 
@@ -376,7 +376,7 @@ void GameSessionScreen::update(double delta) {
 
 			// right mouse button node place
 			if (glfwGetMouseButton(m_engine->get_window(), GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS) {
-				m_chnk.add_node(id_d+1, glm::vec3(x_d, y_d, z_d));
+				m_chnk.add_node(id_d, glm::vec3(x_d, y_d, z_d));
 			}
 
 			// left mouse button node remove (place air)

src/game/screens/game_session_screen.hpp

@@ -87,4 +87,4 @@ namespace polygun::screens {
 	};
 }
 
-#endif // POLYGUN_SCREENS_GAME_SESSION_SCREEN_HPP
+#endif // POLYGUN_SCREENS_GAME_SESSION_SCREEN_HPP

src/game/world/chunk.cpp

@@ -1,5 +1,7 @@
 #include "chunk.hpp"
 
+#include "../engine/greedy_meshing.hpp"
+
 namespace polygun::world { 
 	Chunk::Chunk() {
 		for (int z = 0; z < CHUNK_SIZE; z++) {
@@ -75,4 +77,8 @@ namespace polygun::world {
 
 		return false;
 	}
+
+	engine::verticies_indices Chunk::generate_mesh() {
+		return m_greedy_meshing.generate_mesh(m_greedy_meshing.merge(*this), *this);
+	}
 }

src/game/world/chunk.hpp

@@ -2,6 +2,8 @@
 #define POLYGUN_WORLD_CHUNK_HPP
 
 #include "nodes.hpp"
+#include "../engine/greedy_meshing.hpp"
+#include "../engine/engine.hpp"
 
 namespace polygun::world {
 	class Chunk {
@@ -14,11 +16,14 @@ namespace polygun::world {
 			int get_node(glm::vec3 pos);
 			bool is_neighbour_air(glm::vec3 pos);
 
+			engine::verticies_indices generate_mesh();
+
 			static const int CHUNK_SIZE = 32;
 
 			glm::vec3 chunk_pos;
 
 		private:
+			engine::greedy_meshing m_greedy_meshing;
 			int chunk_data[CHUNK_SIZE][CHUNK_SIZE][CHUNK_SIZE];
 	};
 }