Fixed 2 warnings.

This commit is contained in:
Relintai 2020-03-31 13:32:06 +02:00
parent f7fd0193ea
commit 599b3eb8ea
2 changed files with 11 additions and 11 deletions

View File

@ -80,17 +80,17 @@ void VoxelWorld::set_use_threads(bool value) {
_use_threads = OS::get_singleton()->can_use_threads() ? value : false; _use_threads = OS::get_singleton()->can_use_threads() ? value : false;
} }
uint32_t VoxelWorld::get_max_concurrent_generations() const { int VoxelWorld::get_max_concurrent_generations() const {
return _max_concurrent_generations; return _max_concurrent_generations;
} }
void VoxelWorld::set_max_concurrent_generations(const uint32_t value) { void VoxelWorld::set_max_concurrent_generations(const int value) {
_max_concurrent_generations = OS::get_singleton()->can_use_threads() ? value : 1; _max_concurrent_generations = OS::get_singleton()->can_use_threads() ? value : 1;
} }
uint32_t VoxelWorld::get_max_frame_chunk_build_steps() const { int VoxelWorld::get_max_frame_chunk_build_steps() const {
return _max_frame_chunk_build_steps; return _max_frame_chunk_build_steps;
} }
void VoxelWorld::set_max_frame_chunk_build_steps(const uint32_t value) { void VoxelWorld::set_max_frame_chunk_build_steps(const int value) {
_max_frame_chunk_build_steps = value; _max_frame_chunk_build_steps = value;
} }

View File

@ -63,11 +63,11 @@ public:
bool get_use_threads(); bool get_use_threads();
void set_use_threads(bool value); void set_use_threads(bool value);
uint32_t get_max_concurrent_generations() const; int get_max_concurrent_generations() const;
void set_max_concurrent_generations(const uint32_t value); void set_max_concurrent_generations(const int value);
uint32_t get_max_frame_chunk_build_steps() const; int get_max_frame_chunk_build_steps() const;
void set_max_frame_chunk_build_steps(const uint32_t value); void set_max_frame_chunk_build_steps(const int value);
Ref<VoxelmanLibrary> get_library(); Ref<VoxelmanLibrary> get_library();
void set_library(const Ref<VoxelmanLibrary> library); void set_library(const Ref<VoxelmanLibrary> library);
@ -196,11 +196,11 @@ private:
Spatial *_player; Spatial *_player;
bool _use_threads; bool _use_threads;
uint32_t _max_concurrent_generations; int _max_concurrent_generations;
Vector<VoxelChunk *> _generation_queue; Vector<VoxelChunk *> _generation_queue;
Vector<VoxelChunk *> _generating; Vector<VoxelChunk *> _generating;
uint32_t _max_frame_chunk_build_steps; int _max_frame_chunk_build_steps;
uint32_t _num_frame_chunk_build_steps; int _num_frame_chunk_build_steps;
}; };
_FORCE_INLINE_ bool operator==(const VoxelWorld::IntPos &a, const VoxelWorld::IntPos &b) { _FORCE_INLINE_ bool operator==(const VoxelWorld::IntPos &a, const VoxelWorld::IntPos &b) {