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

src/game/engine/greedy_meshing.cpp

@@ -1,7 +1,7 @@
-#include "greedy_merging.hpp"
+#include "greedy_meshing.hpp"
 
 namespace polygun::engine {
-	cuboid_list greedy_merging::merge(world::Chunk& chunk) {
+	cuboid_list greedy_meshing::merge(world::Chunk& chunk) {
 		// create copy of chunk
 		world::Chunk chunk_copy = chunk;
 
@@ -107,7 +107,7 @@ namespace polygun::engine {
 							cuboid_end_x, cuboid_end_y, cuboid_end_z,
 							last_material
 						};
-						cuboids.cuboids.push_back(cuboid_to_append);
+						cuboids.push_back(cuboid_to_append);
 
 
 						// if last cuboid is touching current cuboid, use current position as current cuboid's start position
@@ -124,6 +124,32 @@ namespace polygun::engine {
 		}
 
 		return cuboids;
+	}
+
+	static int faces_indiecies[] = {
+		0, 1, 3, 0, 3, 2, // bottom
+		0, 2, 6, 0, 6, 4, // left
+		0, 4, 5, 0, 5, 1, // back
+		4, 7, 5, 4, 6, 7, // top
+		1, 5, 7, 1, 7, 3, // right
+		2, 7, 6, 2, 3, 7, // front
+	};
+	
+	static int slice_axises_indices[] {
+		0, 3, 2, 5, 1, 4, //  bottom/top face check
+		1, 4, 2, 5, 0, 3, //  left/right face check
+		0, 3, 1, 4, 2, 5 //   back/front face check
+	};
+
+	verticies_indices greedy_meshing::generate_mesh(world::Chunk& chunk) {
+		std::vector<unsigned int> verticies;
+		std::vector<unsigned int> indices;
+
+		cuboid_list cuboids = merge(chunk);
+/*
+		for(cuboid c : cuboids) {
+			
+		}*/
 
 	}
 }

src/game/engine/greedy_meshing.hpp

@@ -26,6 +26,7 @@ SOFTWARE.
 #ifndef POLYGUN_ENGINE_GREEDY_MERGING_HPP
 #define POLYGUN_ENGINE_GREEDY_MERGING_HPP
 
+#include "../core.hpp"
 #include "game/world/chunk.hpp"
 
 namespace polygun::engine {
@@ -33,18 +34,23 @@ namespace polygun::engine {
 		int x1, y1, z1, x2, y2, z2, material;
 	};
 
-	struct cuboid_list {
-		std::vector<cuboid> cuboids;
+	struct verticies_indices {
+		std::vector<unsigned int> verticies;
+		std::vector<unsigned int> indices;
 	};
 
-	class greedy_merging {
-		public:
-			greedy_merging() = default;
-			~greedy_merging() = default;
+	typedef std::vector<cuboid> cuboid_list;
 
-			cuboid_list merge(world::Chunk& chunk);
+	class greedy_meshing {
+		public:
+			greedy_meshing() = default;
+			~greedy_meshing() = default;
+
+			verticies_indices generate_mesh(world::Chunk& chunk);
 
 		private:
+			cuboid_list merge(world::Chunk& chunk);
+
 			const int voxel_count = 32;
 			const int voxel_max_idx = voxel_count - 1;
 
@@ -53,6 +59,8 @@ namespace polygun::engine {
 			int last_material, cuboid_start_x, cuboid_end_x, cuboid_end_z, cuboid_end_y;
 			bool cuboid_ended, invalid_row, invalid_plane;
 
+			int m_cuboid_verticies[3][8];
+
 	};
 }
 

src/game/screens/game_session_screen.cpp

@@ -147,7 +147,25 @@ GameSessionScreen::GameSessionScreen(const std::string& ip, unsigned short port,
 	m_game_state(GameState::GAME_STATE_JOINING),
 	m_texture_atlas()
 {}
+/*
+	class GUIRenderer {
+	public:
+		GUIRenderer(MasterRenderer* master_renderer);
+		virtual ~GUIRenderer();
 
+		void on_viewport_resize(int width, int height);
+
+		virtual void fill_rect(const glm::vec2& pos, const glm::vec2& size, const glm::vec4& color, float angle = 0);
+		virtual void render_texture(const glm::vec2& pos, Texture* texture, const glm::vec2& scale = glm::vec2(1, 1), float angle = 0, const glm::vec4& color = glm::vec4(1, 1, 1, 1)) = 0;
+
+	protected:
+		MasterRenderer* m_master_renderer;
+		Shader* m_textured_shader;
+		Shader* m_solid_shader;
+		Mesh* m_rect_mesh;
+		OrthoCamera m_camera;
+	};
+	*/
 void GameSessionScreen::begin() {
 #if defined(BUILD_SERVER)
 	if(m_start_server) {