PolyGun/PolyGun
6
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PolyGun:de4f8a11fe4000a89e61e1019581aab914333aaa
Branches Tags
PolyGun:master
PolyGun:as
...
compare: PolyGun:1be9c270a13f1dadf01fbd2bc1e2b3d37dfc7741
Branches Tags
PolyGun:as
PolyGun:master

2 Commits
de4f8a11fe ... 1be9c270a1

Author SHA1 Message Date
Looki2000
1be9c270a1 Merge branch 'master' of http://git.cubesoftware.xyz:20524/kacperks/PolyGun 2023-05-09 21:01:41 +02:00
Looki2000
2d6d0b189b greedy meshing finally working! not rendered yet 2023-05-09 21:01:34 +02:00
4 changed files with 64 additions and 31 deletions
Show Stats Expand all files Collapse all files

46
src/game/engine/greedy_meshing.cpp
View File

@ -43,7 +43,7 @@ namespace polygun::engine {
m_cuboid_ended = false;
// if material changed
if (chunk_copy.get_node(glm::vec3(m_z, m_y, m_x)) != m_last_material) {
if (chunk_copy.get_node(glm::vec3(m_x, m_y, m_z)) != m_last_material) {
// if cuboid ended
// material switch NOT from air
if (m_last_material != 0) {
@ -52,17 +52,17 @@ namespace polygun::engine {
}
// if new cuboid just started AND NOT cuboid ended while new one starting
if (chunk_copy.get_node(glm::vec3(m_z, m_y, m_x)) != 0 && !m_cuboid_ended) {
if (chunk_copy.get_node(glm::vec3(m_x, m_y, m_z)) != 0 && !m_cuboid_ended) {
m_cuboid_start_x = m_x;
}
}
// if cuboid ended
// end of map row on NOT air
if (m_x == m_voxel_max_idx && chunk_copy.get_node(glm::vec3(m_z, m_y, m_x)) != 0) {
if (m_x == m_voxel_max_idx && chunk_copy.get_node(glm::vec3(m_x, m_y, m_z)) != 0) {
m_cuboid_end_x = m_x + 1;
m_cuboid_ended = true;
m_last_material = chunk_copy.get_node(glm::vec3(m_z, m_y, m_x));
m_last_material = chunk_copy.get_node(glm::vec3(m_x, m_y, m_z));
}
if (m_cuboid_ended) {
@ -79,7 +79,7 @@ namespace polygun::engine {
// check if all materials in row are the same as the cuboid's material
for (unsigned int m_x_s = m_cuboid_start_x; m_x_s < m_cuboid_end_x; m_x_s++) {
if (chunk_copy.get_node(glm::vec3(m_cuboid_end_z, m_y, m_x_s)) != m_last_material) {
if (chunk_copy.get_node(glm::vec3(m_x_s, m_y, m_cuboid_end_z)) != m_last_material) {
m_invalid_row = true;
break;
}
@ -91,7 +91,7 @@ namespace polygun::engine {
// set all values of next row that will be added to the cuboid to 0 to prevent them from being treated as a new cuboid in the next z loop iteration
for (unsigned int m_x_s = m_cuboid_start_x; m_x_s < m_cuboid_end_x; m_x_s++) {
chunk_copy.add_node(0, glm::vec3(m_cuboid_end_z, m_y, m_x_s));
chunk_copy.add_node(0, glm::vec3(m_x_s, m_y, m_cuboid_end_z));
}
}
@ -109,7 +109,7 @@ namespace polygun::engine {
// check if all materials in a "plane" under the current cuboid are the same as the cuboid's material
for (unsigned int m_z_s = m_z; m_z_s < m_cuboid_end_z; m_z_s++) {
for (unsigned int m_x_s = m_cuboid_start_x; m_x_s < m_cuboid_end_x; m_x_s++) {
if (chunk_copy.get_node(glm::vec3(m_z_s, m_cuboid_end_y, m_x_s)) != m_last_material) {
if (chunk_copy.get_node(glm::vec3(m_x_s, m_cuboid_end_y, m_z_s)) != m_last_material) {
m_invalid_plane = true;
break;
}
@ -123,7 +123,7 @@ namespace polygun::engine {
// set all values of next plane that will be added to the cuboid to 0 to prevent them from being treated as a new cuboid in the next y loop iteration
for (unsigned int m_z_s = m_z; m_z_s < m_cuboid_end_z; m_z_s++) {
for (unsigned int m_x_s = m_cuboid_start_x; m_x_s < m_cuboid_end_x; m_x_s++) {
chunk_copy.add_node(0, glm::vec3(m_z_s, m_cuboid_end_y, m_x_s));
chunk_copy.add_node(0, glm::vec3(m_x_s, m_cuboid_end_y, m_z_s));
}
}
}
@ -139,13 +139,13 @@ namespace polygun::engine {
// if last cuboid is touching current cuboid, use current position as current cuboid's start position
if (chunk_copy.get_node(glm::vec3(m_z, m_y, m_x)) != 0) {
if (chunk_copy.get_node(glm::vec3(m_x, m_y, m_z)) != 0) {
m_cuboid_start_x = m_x;
}
}
m_last_material = chunk_copy.get_node(glm::vec3(m_z, m_y, m_x));
m_last_material = chunk_copy.get_node(glm::vec3(m_x, m_y, m_z));
}
}
@ -155,15 +155,15 @@ namespace polygun::engine {
}
static bool is_face_obstructed(world::Chunk& chunk, unsigned int slice_axis_A_start, unsigned int slice_axis_A_end, unsigned int slice_axis_B_start, unsigned int slice_axis_B_end, unsigned int slice_axis_C, unsigned int face_axis_idx) {
// check if face is covered with any voxels
static bool is_face_covered(world::Chunk& chunk, unsigned int slice_axis_A_start, unsigned int slice_axis_A_end, unsigned int slice_axis_B_start, unsigned int slice_axis_B_end, unsigned int slice_axis_C, unsigned int face_axis_idx) {
// check if face is fully covered with voxels
// bottom/top face check (y axis)
if (face_axis_idx == 0) {
for (unsigned int z = slice_axis_B_start; z < slice_axis_B_end; z++) {
for (unsigned int x = slice_axis_A_start; x < slice_axis_A_end; x++) {
if (chunk.get_node(glm::vec3(z, slice_axis_C, x)) == 0) { // if air, face is not fully covered, stop checking
return true;
return false;
}
}
}
@ -175,7 +175,7 @@ namespace polygun::engine {
for (unsigned int z = slice_axis_B_start; z < slice_axis_B_end; z++) {
for (unsigned int y = slice_axis_A_start; y < slice_axis_A_end; y++) {
if (chunk.get_node(glm::vec3(z, y, slice_axis_C)) == 0) {
return true;
return false;
}
}
}
@ -187,14 +187,14 @@ namespace polygun::engine {
for (unsigned int y = slice_axis_B_start; y < slice_axis_B_end; y++) {
for (unsigned int x = slice_axis_A_start; x < slice_axis_A_end; x++) {
if (chunk.get_node(glm::vec3(slice_axis_C, y, x)) == 0) {
return true;
return false;
}
}
}
}
// none of returns were called, face is NOT visible
return false;
// none of returns were called, face is fully covered and NOT visible
return true;
}
@ -214,7 +214,7 @@ namespace polygun::engine {
};
verticies_indices greedy_meshing::generate_mesh(cuboid_list cuboids, world::Chunk& chunk) {
vertices_indices greedy_meshing::generate_mesh(cuboid_list cuboids, world::Chunk& chunk) {
std::vector<glm::vec3> m_vertices;
std::vector<unsigned int> m_indices;
@ -236,6 +236,8 @@ namespace polygun::engine {
{cur_cuboid.coords[3], cur_cuboid.coords[4], cur_cuboid.coords[5]},
};
m_cuboid_vertices_indices.clear();
// iterate over cuboid vertices
for (const auto& m_vertex : m_cuboid_vertices) {
@ -244,7 +246,7 @@ namespace polygun::engine {
// check if vertex is already in vertices list
for (unsigned int i = 0; i < m_vertices.size(); i++) {
if (m_vertices[i] == glm::vec3(m_vertex[0], m_vertex[1], m_vertex[2])) {
int m_vertex_idx = i;
m_vertex_idx = i;
break;
}
}
@ -256,7 +258,7 @@ namespace polygun::engine {
// if not, add it (vertex) and add its index to m_cuboid_vertices_indices
} else {
m_cuboid_vertices_indices.push_back(m_vertices.size());
m_vertices.push_back(glm::make_vec3(m_vertex));
m_vertices.push_back(glm::vec3(m_vertex[0], m_vertex[1], m_vertex[2]));
}
}
@ -281,7 +283,7 @@ namespace polygun::engine {
unsigned int slice_axis_B_end = cur_cuboid.coords[slice_axises_indices[face_axis_idx][3]];
// check if face is obstructed by any voxels
if (is_face_obstructed(chunk, slice_axis_A_start, slice_axis_A_end, slice_axis_B_start, slice_axis_B_end, slice_axis_C, face_axis_idx)) {
if (is_face_covered(chunk, slice_axis_A_start, slice_axis_A_end, slice_axis_B_start, slice_axis_B_end, slice_axis_C, face_axis_idx)) {
continue;
}
@ -294,7 +296,7 @@ namespace polygun::engine {
}
}
return {m_vertices, m_indices};
}
}

6
src/game/engine/greedy_meshing.hpp
View File

@ -34,8 +34,8 @@ namespace polygun::engine {
unsigned int coords[6], material;
};
struct verticies_indices {
std::vector<glm::vec3> verticies;
struct vertices_indices {
std::vector<glm::vec3> vertices;
std::vector<unsigned int> indices;
};
@ -46,7 +46,7 @@ namespace polygun::engine {
greedy_meshing() = default;
~greedy_meshing() = default;
verticies_indices generate_mesh(cuboid_list cuboids, world::Chunk& chunk);
vertices_indices generate_mesh(cuboid_list cuboids, world::Chunk& chunk);
cuboid_list merge(world::Chunk& chunk);
private:

20
src/game/screens/game_session_screen.cpp
View File

@ -37,6 +37,10 @@ SOFTWARE.
#include "server/server.hpp"
#endif
// greedy meshing debug test
//#include <iostream>
//#include "../engine/greedy_meshing.hpp"
using namespace polygun::screens;
static int x_d, y_d, z_d;
@ -284,6 +288,22 @@ void GameSessionScreen::render() {
if(ImGui::Button("Quit Game"))
m_engine->get_screen_manager().pop_screen();
// greedy meshing debug test
//if(ImGui::Button("greedy meshing")) {
// polygun::engine::greedy_meshing greedy;
// polygun::engine::cuboid_list cuboids = greedy.merge(m_chnk);
//
// polygun::engine::vertices_indices vertices_indices = greedy.generate_mesh(cuboids, m_chnk);
//
// // print obj text
// for (int i = 0; i < vertices_indices.vertices.size(); i++) {
// std::cout << "v " << vertices_indices.vertices[i].x << " " << vertices_indices.vertices[i].y << " " << vertices_indices.vertices[i].z << std::endl;
// }
// for (int i = 0; i < vertices_indices.indices.size(); i+=3) {
// std::cout << "f " << vertices_indices.indices[i]+1 << " " << vertices_indices.indices[i+1]+1 << " " << vertices_indices.indices[i+2]+1 << std::endl;
// }
//}
ImGui::ColorEdit3("clear color", (float*)&clearcolor);
ImGui::End();

23
src/game/world/chunk.cpp
View File

@ -2,25 +2,36 @@
namespace polygun::world {
Chunk::Chunk() {
for (int x = 0; x < CHUNK_SIZE; x++) {
for (int z = 0; z < CHUNK_SIZE; z++) {
for (int y = 0; y < CHUNK_SIZE; y++) {
for (int z = 0; z < CHUNK_SIZE; z++) {
chunk_data[x][y][z] = 0;
for (int x = 0; x < CHUNK_SIZE; x++) {
if (x < 5 && y < 5 && z < 5)
chunk_data[z][y][x] = 1;
else
chunk_data[z][y][x] = 0;
}
}
}
for (int z = 2; z < 10; z++) {
for (int y = 2; y < 8; y++) {
for (int x = 2; x < 6; x++) {
chunk_data[z][y][x] = 2;
}
}
}
}
void Chunk::add_node(int node_to_add, glm::vec3 pos) {
chunk_data[(int)pos.x][(int)pos.y][(int)pos.z] = node_to_add;
chunk_data[(int)pos.z][(int)pos.y][(int)pos.x] = node_to_add;
}
bool Chunk::is_air(glm::vec3 pos) {
return chunk_data[(int)pos.x][(int)pos.y][(int)pos.z] == 0;
return chunk_data[(int)pos.z][(int)pos.y][(int)pos.x] == 0;
}
int Chunk::get_node(glm::vec3 pos) {
return chunk_data[(int)pos.x][(int)pos.y][(int)pos.z];
return chunk_data[(int)pos.z][(int)pos.y][(int)pos.x];
}
bool Chunk::is_neighbour_air(glm::vec3 pos) {