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

Renamed free to free_chunk, as it collided with Object's free().

Browse Source
This commit is contained in:
Relintai 2019-08-01 01:05:09 +02:00
parent 9b842c159a
commit a633808274
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
world/voxel_chunk.cpp
View File

@ -590,7 +590,7 @@ void VoxelChunk::free_debug_immediate_geometry() {
} }
} }
void VoxelChunk::free() { void VoxelChunk::free_chunk() {
free_debug_immediate_geometry(); free_debug_immediate_geometry();
free_main_mesh(); free_main_mesh();
remove_colliders(); remove_colliders();
@ -842,7 +842,7 @@ void VoxelChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("create_debug_immediate_geometry"), &VoxelChunk::create_debug_immediate_geometry); ClassDB::bind_method(D_METHOD("create_debug_immediate_geometry"), &VoxelChunk::create_debug_immediate_geometry);
ClassDB::bind_method(D_METHOD("free_debug_immediate_geometry"), &VoxelChunk::free_debug_immediate_geometry); ClassDB::bind_method(D_METHOD("free_debug_immediate_geometry"), &VoxelChunk::free_debug_immediate_geometry);
ClassDB::bind_method(D_METHOD("free"), &VoxelChunk::free); ClassDB::bind_method(D_METHOD("free_chunk"), &VoxelChunk::free_chunk);
ClassDB::bind_method(D_METHOD("draw_cross_voxels", "pos"), &VoxelChunk::draw_cross_voxels); ClassDB::bind_method(D_METHOD("draw_cross_voxels", "pos"), &VoxelChunk::draw_cross_voxels);
ClassDB::bind_method(D_METHOD("draw_cross_voxels_fill", "pos", "fill"), &VoxelChunk::draw_cross_voxels_fill); ClassDB::bind_method(D_METHOD("draw_cross_voxels_fill", "pos", "fill"), &VoxelChunk::draw_cross_voxels_fill);

2
world/voxel_chunk.h
View File

@ -129,7 +129,7 @@ public:
void create_debug_immediate_geometry(); void create_debug_immediate_geometry();
void free_debug_immediate_geometry(); void free_debug_immediate_geometry();
void free(); void free_chunk();
void draw_cross_voxels(Vector3 pos); void draw_cross_voxels(Vector3 pos);
void draw_cross_voxels_fill(Vector3 pos, float fill); void draw_cross_voxels_fill(Vector3 pos, float fill);