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

Adjust PR

Browse Source
This commit is contained in:
Cory Petkovsek 2020-02-15 03:46:10 +08:00
parent 24841e9a18
commit 40e3fdc878
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
generators/voxel_generator_test.cpp
View File

@ -44,10 +44,13 @@ void VoxelGeneratorTest::generate_block(VoxelBlockRequest &input) {
generate_block_flat(**input.voxel_buffer, input.origin_in_voxels, input.lod);
break;
default:
case MODE_WAVES:
generate_block_waves(**input.voxel_buffer, input.origin_in_voxels, input.lod);
break;
default:
CRASH_NOW_MSG("Mode is unrecognized.");
break;
}
}

4
meshers/transvoxel/voxel_mesher_transvoxel.cpp
View File

@ -911,7 +911,7 @@ void VoxelMesherTransvoxel::reset_reuse_cells(Vector3i block_size) {
for (unsigned int i = 0; i < _cache.size(); ++i) {
std::vector<ReuseCell> &deck = _cache[i];
deck.resize(deck_area);
for (long unsigned int j = 0; j < deck.size(); ++j) {
for (size_t j = 0; j < deck.size(); ++j) {
deck[j].vertices.fill(-1);
}
}
@ -921,7 +921,7 @@ void VoxelMesherTransvoxel::reset_reuse_cells_2d(Vector3i block_size) {
for (unsigned int i = 0; i < _cache_2d.size(); ++i) {
std::vector<ReuseTransitionCell> &row = _cache_2d[i];
row.resize(block_size.x);
for (long unsigned int j = 0; j < row.size(); ++j) {
for (size_t j = 0; j < row.size(); ++j) {
row[j].vertices.fill(-1);
}
}

2
streams/voxel_stream_region_files.cpp
View File

@ -880,7 +880,7 @@ void VoxelStreamRegionFiles::_convert_files(Meta new_meta) {
int lod;
};
ERR_FAIL_COND(old_stream->load_meta() != (int)OK);
ERR_FAIL_COND(old_stream->load_meta() != VOXEL_FILE_OK);
std::vector<PositionAndLod> old_region_list;
Meta old_meta = old_stream->_meta;

4
terrain/voxel_terrain.cpp
View File

@ -901,11 +901,11 @@ void VoxelTerrain::_process() {
} else {
CRASH_COND(block->voxels.is_null());
int air_type = 0;
uint64_t air_type = 0;
if (
block->voxels->is_uniform(VoxelBuffer::CHANNEL_TYPE) &&
block->voxels->is_uniform(VoxelBuffer::CHANNEL_SDF) &&
block->voxels->get_voxel(0, 0, 0, VoxelBuffer::CHANNEL_TYPE) == (uint64_t)air_type) {
block->voxels->get_voxel(0, 0, 0, VoxelBuffer::CHANNEL_TYPE) == air_type) {
// If we got here, it must have been because of scheduling an update
CRASH_COND(block->get_mesh_state() != VoxelBlock::MESH_UPDATE_NOT_SENT);