Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2024-11-14 10:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few of the issues with the cubic mesher.

Browse Source
This commit is contained in:
Relintai 2020-01-12 21:58:14 +01:00
parent a67d0393ca
commit 010b20ee55
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meshers/cubic_mesher/voxel_mesher_cubic.cpp
View File

@ -1,6 +1,6 @@
#include "voxel_mesher_cubic.h" #include "voxel_mesher_cubic.h"
void VoxelMesherCubic::_add_buffer(Node *p_chunk) { void VoxelMesherCubic::_add_chunk(Node *p_chunk) {
VoxelChunk *chunk = Object::cast_to<VoxelChunk>(p_chunk); VoxelChunk *chunk = Object::cast_to<VoxelChunk>(p_chunk);
ERR_FAIL_COND(!ObjectDB::instance_validate(chunk)); ERR_FAIL_COND(!ObjectDB::instance_validate(chunk));
@ -8,8 +8,8 @@ void VoxelMesherCubic::_add_buffer(Node *p_chunk) {
chunk->generate_ao(); chunk->generate_ao();
int x_size = chunk->get_size_x() - 1; int x_size = chunk->get_size_x() - 1;
int y_size = chunk->get_size_x() - 1; int y_size = chunk->get_size_y() - 1;
int z_size = chunk->get_size_x() - 1; int z_size = chunk->get_size_z() - 1;
float lod_size = get_lod_size(); float lod_size = get_lod_size();
float voxel_size = get_lod_size(); float voxel_size = get_lod_size();
@ -58,6 +58,8 @@ void VoxelMesherCubic::_add_buffer(Node *p_chunk) {
Vector3 face_light_direction = cube_points->get_face_light_direction(face); Vector3 face_light_direction = cube_points->get_face_light_direction(face);
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
add_normal(normals[i]);
Color light = cube_points->get_face_point_light_color(face, i); Color light = cube_points->get_face_point_light_color(face, i);
light += base_light; light += base_light;
@ -90,5 +92,5 @@ VoxelMesherCubic::~VoxelMesherCubic() {
} }
void VoxelMesherCubic::_bind_methods() { void VoxelMesherCubic::_bind_methods() {
ClassDB::bind_method(D_METHOD("_add_buffer", "buffer"), &VoxelMesherCubic::_add_buffer); ClassDB::bind_method(D_METHOD("_add_chunk", "buffer"), &VoxelMesherCubic::_add_chunk);
} }

2
meshers/cubic_mesher/voxel_mesher_cubic.h
View File

@ -13,7 +13,7 @@ class VoxelMesherCubic : public VoxelMesher {
GDCLASS(VoxelMesherCubic, VoxelMesher); GDCLASS(VoxelMesherCubic, VoxelMesher);
public: public:
void _add_buffer(Node *p_chunk); void _add_chunk(Node *p_chunk);
VoxelMesherCubic(); VoxelMesherCubic();
~VoxelMesherCubic(); ~VoxelMesherCubic();