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

Fix GCC initializer list reorder warnings

Browse Source
This commit is contained in:
Marc Gilleron 2022-02-05 17:32:36 +00:00
parent 5aeb6a69e7
commit ff6bd7b82d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/load_block_data_request.cpp
View File

@ -14,14 +14,14 @@ std::atomic_int g_debug_load_block_tasks_count;
LoadBlockDataRequest::LoadBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod, LoadBlockDataRequest::LoadBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod,
uint8_t p_block_size, bool p_request_instances, std::shared_ptr<StreamingDependency> p_stream_dependency, uint8_t p_block_size, bool p_request_instances, std::shared_ptr<StreamingDependency> p_stream_dependency,
PriorityDependency p_priority_dependency) : PriorityDependency p_priority_dependency) :
_volume_id(p_volume_id), _priority_dependency(p_priority_dependency),
_position(p_block_pos), _position(p_block_pos),
_volume_id(p_volume_id),
_lod(p_lod), _lod(p_lod),
_block_size(p_block_size), _block_size(p_block_size),
_request_voxels(true),
_request_instances(p_request_instances), _request_instances(p_request_instances),
_stream_dependency(p_stream_dependency), _request_voxels(true),
_priority_dependency(p_priority_dependency) { _stream_dependency(p_stream_dependency) {
// //
++g_debug_load_block_tasks_count; ++g_debug_load_block_tasks_count;
} }

16
server/save_block_data_request.cpp
View File

@ -14,14 +14,14 @@ std::atomic_int g_debug_save_block_tasks_count;
SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod, SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod,
uint8_t p_block_size, std::shared_ptr<VoxelBufferInternal> p_voxels, uint8_t p_block_size, std::shared_ptr<VoxelBufferInternal> p_voxels,
std::shared_ptr<StreamingDependency> p_stream_dependency) : std::shared_ptr<StreamingDependency> p_stream_dependency) :
_volume_id(p_volume_id), _voxels(p_voxels),
_position(p_block_pos), _position(p_block_pos),
_volume_id(p_volume_id),
_lod(p_lod), _lod(p_lod),
_block_size(p_block_size), _block_size(p_block_size),
_save_voxels(true),
_save_instances(false), _save_instances(false),
_stream_dependency(p_stream_dependency), _save_voxels(true),
_voxels(p_voxels) { _stream_dependency(p_stream_dependency) {
// //
++g_debug_save_block_tasks_count; ++g_debug_save_block_tasks_count;
} }
@ -29,14 +29,14 @@ SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_bloc
SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod, SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod,
uint8_t p_block_size, std::unique_ptr<InstanceBlockData> p_instances, uint8_t p_block_size, std::unique_ptr<InstanceBlockData> p_instances,
std::shared_ptr<StreamingDependency> p_stream_dependency) : std::shared_ptr<StreamingDependency> p_stream_dependency) :
_volume_id(p_volume_id), _instances(std::move(p_instances)),
_position(p_block_pos), _position(p_block_pos),
_volume_id(p_volume_id),
_lod(p_lod), _lod(p_lod),
_block_size(p_block_size), _block_size(p_block_size),
_save_voxels(false),
_save_instances(true), _save_instances(true),
_stream_dependency(p_stream_dependency), _save_voxels(false),
_instances(std::move(p_instances)) { _stream_dependency(p_stream_dependency) {
// //
++g_debug_save_block_tasks_count; ++g_debug_save_block_tasks_count;
} }