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

Missing guards, and fixed an ERR_FAIL_INDEX_V.

Browse Source
This commit is contained in:
Relintai 2020-10-12 18:53:35 +02:00
parent e14bc67da8
commit 5a9b99c199
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
world/voxel_chunk.cpp
View File

@ -821,7 +821,7 @@ void VoxelChunk::set_collider_transform(const int index, const Transform &transf
} }
Ref<Shape> VoxelChunk::get_collider_shape(const int index) { Ref<Shape> VoxelChunk::get_collider_shape(const int index) {
ERR_FAIL_INDEX_V(index, _colliders.size(), Ref<MeshDataResource>()); ERR_FAIL_INDEX_V(index, _colliders.size(), Ref<Shape>());
return _colliders[index].shape; return _colliders[index].shape;
} }
@ -973,7 +973,10 @@ VoxelChunk::~VoxelChunk() {
_library.unref(); _library.unref();
} }
#if PROPS_PRESENT
clear_props(); clear_props();
#endif
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
clear_mesh_data_resources(); clear_mesh_data_resources();
#endif #endif
@ -1297,11 +1300,13 @@ void VoxelChunk::_bind_methods() {
//Meshes //Meshes
#if PROPS_PRESENT
ClassDB::bind_method(D_METHOD("add_prop", "prop"), &VoxelChunk::add_prop); ClassDB::bind_method(D_METHOD("add_prop", "prop"), &VoxelChunk::add_prop);
ClassDB::bind_method(D_METHOD("get_prop", "index"), &VoxelChunk::get_prop); ClassDB::bind_method(D_METHOD("get_prop", "index"), &VoxelChunk::get_prop);
ClassDB::bind_method(D_METHOD("get_prop_count"), &VoxelChunk::get_prop_count); ClassDB::bind_method(D_METHOD("get_prop_count"), &VoxelChunk::get_prop_count);
ClassDB::bind_method(D_METHOD("remove_prop", "index"), &VoxelChunk::remove_prop); ClassDB::bind_method(D_METHOD("remove_prop", "index"), &VoxelChunk::remove_prop);
ClassDB::bind_method(D_METHOD("clear_props"), &VoxelChunk::clear_props); ClassDB::bind_method(D_METHOD("clear_props"), &VoxelChunk::clear_props);
#endif
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
ClassDB::bind_method(D_METHOD("add_mesh_data_resourcev", "local_data_pos", "mesh", "texture", "color", "apply_voxel_scale"), &VoxelChunk::add_mesh_data_resourcev, DEFVAL(Ref<Texture>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(true)); ClassDB::bind_method(D_METHOD("add_mesh_data_resourcev", "local_data_pos", "mesh", "texture", "color", "apply_voxel_scale"), &VoxelChunk::add_mesh_data_resourcev, DEFVAL(Ref<Texture>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(true));