Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clang-format

master
Marc Gilleron 2020-02-06 18:52:18 +00:00
parent 8eae71e1cb
commit b2f7d23f7f
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meshers/blocky/voxel.cpp
View File

@ -178,7 +178,7 @@ void Voxel::set_library(Ref<VoxelLibrary> lib) {
} else { } else {
_library = lib->get_instance_id(); _library = lib->get_instance_id();
} }
if(_geometry_type == GEOMETRY_CUBE) { if (_geometry_type == GEOMETRY_CUBE) {
// Update model UVs because atlas size is defined by the library // Update model UVs because atlas size is defined by the library
update_cube_uv_sides(); update_cube_uv_sides();
} }
@ -197,13 +197,13 @@ VoxelLibrary *Voxel::get_library() const {
void Voxel::set_custom_mesh(Ref<Mesh> mesh) { void Voxel::set_custom_mesh(Ref<Mesh> mesh) {
if(mesh == _custom_mesh) { if (mesh == _custom_mesh) {
return; return;
} }
clear_geometry(); clear_geometry();
if(mesh.is_null()) { if (mesh.is_null()) {
_custom_mesh = Ref<Mesh>(); _custom_mesh = Ref<Mesh>();
return; return;
} }
@ -247,7 +247,7 @@ void Voxel::set_custom_mesh(Ref<Mesh> mesh) {
} }
}; };
if(uvs.size() == 0) { if (uvs.size() == 0) {
// TODO Properly generate UVs if there arent any // TODO Properly generate UVs if there arent any
uvs = PoolVector2Array(); uvs = PoolVector2Array();
uvs.resize(positions.size()); uvs.resize(positions.size());
@ -273,20 +273,20 @@ void Voxel::set_custom_mesh(Ref<Mesh> mesh) {
Cube::SideAxis side2; Cube::SideAxis side2;
if (L::get_side(positions_read[indices_read[i]], side0) && if (L::get_side(positions_read[indices_read[i]], side0) &&
L::get_side(positions_read[indices_read[i + 1]], side1) && L::get_side(positions_read[indices_read[i + 1]], side1) &&
L::get_side(positions_read[indices_read[i + 2]], side2) && L::get_side(positions_read[indices_read[i + 2]], side2) &&
side0 == side1 && side0 == side1 &&
side1 == side2) { side1 == side2) {
// That triangle is on the face // That triangle is on the face
int next_side_index = _model_side_positions[side0].size(); int next_side_index = _model_side_positions[side0].size();
for(int j = 0; j < 3; ++j) { for (int j = 0; j < 3; ++j) {
int src_index = indices_read[i + j]; int src_index = indices_read[i + j];
const int *existing_dst_index = added_side_indices[side0].getptr(src_index); const int *existing_dst_index = added_side_indices[side0].getptr(src_index);
if(existing_dst_index == nullptr) { if (existing_dst_index == nullptr) {
// Add new vertex // Add new vertex
_model_side_indices[side0].push_back(next_side_index); _model_side_indices[side0].push_back(next_side_index);
@ -357,13 +357,13 @@ Ref<Voxel> Voxel::set_cube_geometry(float sy) {
indices[i] = Cube::g_side_quad_triangles[side][i]; indices[i] = Cube::g_side_quad_triangles[side][i];
} }
if(side != Cube::SIDE_POSITIVE_Y || sy == 1.0) { if (side != Cube::SIDE_POSITIVE_Y || sy == 1.0) {
_side_culling_masks[side] = 0xff; _side_culling_masks[side] = 0xff;
} }
} }
_collision_aabbs.clear(); _collision_aabbs.clear();
_collision_aabbs.push_back(AABB(Vector3(0,0,0), Vector3(1,1,1))); _collision_aabbs.push_back(AABB(Vector3(0, 0, 0), Vector3(1, 1, 1)));
return Ref<Voxel>(this); return Ref<Voxel>(this);
} }
@ -466,19 +466,19 @@ void Voxel::_bind_methods() {
Array Voxel::_b_get_collision_aabbs() const { Array Voxel::_b_get_collision_aabbs() const {
Array array; Array array;
array.resize(_collision_aabbs.size()); array.resize(_collision_aabbs.size());
for(int i = 0; i < _collision_aabbs.size(); ++i) { for (int i = 0; i < _collision_aabbs.size(); ++i) {
array[i] = _collision_aabbs[i]; array[i] = _collision_aabbs[i];
} }
return array; return array;
} }
void Voxel::_b_set_collision_aabbs(Array array) { void Voxel::_b_set_collision_aabbs(Array array) {
for(int i = 0; i < array.size(); ++i) { for (int i = 0; i < array.size(); ++i) {
const Variant v = array[i]; const Variant v = array[i];
ERR_FAIL_COND(v.get_type() != Variant::AABB); ERR_FAIL_COND(v.get_type() != Variant::AABB);
} }
_collision_aabbs.resize(array.size()); _collision_aabbs.resize(array.size());
for(int i = 0; i < array.size(); ++i) { for (int i = 0; i < array.size(); ++i) {
const AABB aabb = array[i]; const AABB aabb = array[i];
_collision_aabbs[i] = aabb; _collision_aabbs[i] = aabb;
} }
@ -493,5 +493,3 @@ uint8_t Voxel::_b_get_face_culling_mask(int face_id) const {
ERR_FAIL_INDEX_V(face_id, SIDE_COUNT, 0); ERR_FAIL_INDEX_V(face_id, SIDE_COUNT, 0);
return _side_culling_masks[face_id]; return _side_culling_masks[face_id];
} }

4
meshers/blocky/voxel_mesher_blocky.cpp
View File

@ -19,7 +19,7 @@ const int g_opposite_side[6] = {
Cube::SIDE_POSITIVE_Y, Cube::SIDE_POSITIVE_Y,
Cube::SIDE_NEGATIVE_Y, Cube::SIDE_NEGATIVE_Y,
Cube::SIDE_POSITIVE_Z, Cube::SIDE_POSITIVE_Z,
Cube::SIDE_NEGATIVE_Z, Cube::SIDE_NEGATIVE_Z
}; };
inline bool is_face_visible(const VoxelLibrary &lib, const Voxel &vt, int other_voxel_id, int side) { inline bool is_face_visible(const VoxelLibrary &lib, const Voxel &vt, int other_voxel_id, int side) {
@ -159,7 +159,7 @@ static void generate_blocky_mesh(
const std::vector<Vector3> &side_positions = voxel.get_model_side_positions(side); const std::vector<Vector3> &side_positions = voxel.get_model_side_positions(side);
const unsigned int vertex_count = side_positions.size(); const unsigned int vertex_count = side_positions.size();
if(vertex_count == 0) { if (vertex_count == 0) {
continue; continue;
} }