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

Merge pull request #115 from Caellian/master 

Added missing semicolons on line endings
master
Marc 2020-02-09 02:53:00 +00:00 committed by GitHub
parent ac370f0e71 e67ec6f207
commit a3bfcbc6c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generators/voxel_generator_test.cpp
View File

@ -9,7 +9,7 @@ VoxelGeneratorTest::VoxelGeneratorTest() {
} }
void VoxelGeneratorTest::set_mode(Mode mode) { void VoxelGeneratorTest::set_mode(Mode mode) {
ERR_FAIL_INDEX(mode, MODE_COUNT) ERR_FAIL_INDEX(mode, MODE_COUNT);
_mode = mode; _mode = mode;
} }

2
terrain/voxel_terrain.cpp
View File

@ -206,7 +206,7 @@ int VoxelTerrain::get_view_distance() const {
} }
void VoxelTerrain::set_view_distance(int distance_in_voxels) { void VoxelTerrain::set_view_distance(int distance_in_voxels) {
ERR_FAIL_COND(distance_in_voxels < 0) ERR_FAIL_COND(distance_in_voxels < 0);
int d = distance_in_voxels / _map->get_block_size(); int d = distance_in_voxels / _map->get_block_size();
if (d != _view_distance_blocks) { if (d != _view_distance_blocks) {
print_line(String("View distance changed from ") + String::num(_view_distance_blocks) + String(" blocks to ") + String::num(d)); print_line(String("View distance changed from ") + String::num(_view_distance_blocks) + String(" blocks to ") + String::num(d));

4
util/array_slice.h
View File

@ -46,14 +46,14 @@ public:
inline T &operator[](size_t i) { inline T &operator[](size_t i) {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
CRASH_COND(i >= _size) CRASH_COND(i >= _size);
#endif #endif
return _ptr[i]; return _ptr[i];
} }
inline const T &operator[](size_t i) const { inline const T &operator[](size_t i) const {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
CRASH_COND(i >= _size) CRASH_COND(i >= _size);
#endif #endif
return _ptr[i]; return _ptr[i];
} }

4
voxel_buffer.cpp
View File

@ -40,12 +40,12 @@ uint64_t g_depth_max_values[] = {
}; };
inline uint32_t get_depth_bit_count(VoxelBuffer::Depth d) { inline uint32_t get_depth_bit_count(VoxelBuffer::Depth d) {
CRASH_COND(d < 0 || d >= VoxelBuffer::DEPTH_COUNT) CRASH_COND(d < 0 || d >= VoxelBuffer::DEPTH_COUNT);
return g_depth_bit_counts[d]; return g_depth_bit_counts[d];
} }
inline uint64_t get_max_value_for_depth(VoxelBuffer::Depth d) { inline uint64_t get_max_value_for_depth(VoxelBuffer::Depth d) {
CRASH_COND(d < 0 || d >= VoxelBuffer::DEPTH_COUNT) CRASH_COND(d < 0 || d >= VoxelBuffer::DEPTH_COUNT);
return g_depth_max_values[d]; return g_depth_max_values[d];
} }