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

Fix warnings

Browse Source
This commit is contained in:
Marc Gilleron 2021-08-14 18:28:15 +01:00
parent 6da058baf8
commit f9ba660c86
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/vox/vox_mesh_importer.cpp
View File

@ -65,7 +65,7 @@ struct ForEachModelInstanceArgs {
template <typename F>
static Error for_each_model_instance_in_scene_graph(
const vox::Data &data, int node_id, Transform transform, int depth, F &f) {
const vox::Data &data, int node_id, Transform transform, int depth, F f) {
//
ERR_FAIL_COND_V(depth > 10, ERR_INVALID_DATA);
const vox::Node *vox_node = data.get_node(node_id);
@ -106,7 +106,7 @@ static Error for_each_model_instance_in_scene_graph(
}
template <typename F>
void for_each_model_instance(const vox::Data &vox_data, F &f) {
void for_each_model_instance(const vox::Data &vox_data, F f) {
if (vox_data.get_model_count() == 0) {
return;
}

4
storage/funcs.h
View File

@ -210,8 +210,8 @@ Vector3i transform_3d_array_zxy(Span<const T> src_grid, Span<T> dst_grid, Vector
ERR_FAIL_COND_V(!basis.x.is_unit_vector(), src_size);
ERR_FAIL_COND_V(!basis.y.is_unit_vector(), src_size);
ERR_FAIL_COND_V(!basis.z.is_unit_vector(), src_size);
ERR_FAIL_COND_V(src_grid.size() != src_size.volume(), src_size);
ERR_FAIL_COND_V(dst_grid.size() != src_size.volume(), src_size);
ERR_FAIL_COND_V(src_grid.size() != static_cast<size_t>(src_size.volume()), src_size);
ERR_FAIL_COND_V(dst_grid.size() != static_cast<size_t>(src_size.volume()), src_size);
const int xa = basis.x.x != 0 ? 0 : basis.x.y != 0 ? 1 : 2;
const int ya = basis.y.x != 0 ? 0 : basis.y.y != 0 ? 1 : 2;