From bc3107d1db6cc8744cf7d24797f74a1d0258c894 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 14 Nov 2023 19:03:46 +0100 Subject: [PATCH] Fix build warnings on the latest XCode --- Source/Engine/Foliage/FoliageType.h | 2 +- Source/Engine/Level/Actor.h | 12 ++++++------ Source/Engine/Physics/Actors/RigidBody.h | 16 ++++++++-------- Source/Engine/Renderer/RenderList.h | 20 ++++++++++---------- Source/Engine/Scripting/Script.h | 16 ++++++++-------- Source/ThirdParty/pugixml/pugixml.cpp | 24 ++++++++++++++++++++++++ 6 files changed, 57 insertions(+), 33 deletions(-) diff --git a/Source/Engine/Foliage/FoliageType.h b/Source/Engine/Foliage/FoliageType.h index 0bc556fc9..4251b6924 100644 --- a/Source/Engine/Foliage/FoliageType.h +++ b/Source/Engine/Foliage/FoliageType.h @@ -46,7 +46,7 @@ API_CLASS(Sealed, NoSpawn) class FLAXENGINE_API FoliageType : public ScriptingOb DECLARE_SCRIPTING_TYPE_NO_SPAWN(FoliageType); friend Foliage; private: - int8 _isReady : 1; + uint8 _isReady : 1; public: /// diff --git a/Source/Engine/Level/Actor.h b/Source/Engine/Level/Actor.h index a1f2dc78f..0ce9a0dbc 100644 --- a/Source/Engine/Level/Actor.h +++ b/Source/Engine/Level/Actor.h @@ -33,12 +33,12 @@ API_CLASS(Abstract) class FLAXENGINE_API Actor : public SceneObject friend Prefab; friend PrefabInstanceData; protected: - int16 _isActive : 1; - int16 _isActiveInHierarchy : 1; - int16 _isPrefabRoot : 1; - int16 _isEnabled : 1; - int16 _drawNoCulling : 1; - int16 _drawCategory : 4; + uint16 _isActive : 1; + uint16 _isActiveInHierarchy : 1; + uint16 _isPrefabRoot : 1; + uint16 _isEnabled : 1; + uint16 _drawNoCulling : 1; + uint16 _drawCategory : 4; byte _layer; StaticFlags _staticFlags; Transform _localTransform; diff --git a/Source/Engine/Physics/Actors/RigidBody.h b/Source/Engine/Physics/Actors/RigidBody.h index e7b929483..2ef50ca7a 100644 --- a/Source/Engine/Physics/Actors/RigidBody.h +++ b/Source/Engine/Physics/Actors/RigidBody.h @@ -30,14 +30,14 @@ protected: Float3 _centerOfMassOffset; RigidbodyConstraints _constraints; - int32 _enableSimulation : 1; - int32 _isKinematic : 1; - int32 _useCCD : 1; - int32 _enableGravity : 1; - int32 _startAwake : 1; - int32 _updateMassWhenScaleChanges : 1; - int32 _overrideMass : 1; - int32 _isUpdatingTransform : 1; + uint32 _enableSimulation : 1; + uint32 _isKinematic : 1; + uint32 _useCCD : 1; + uint32 _enableGravity : 1; + uint32 _startAwake : 1; + uint32 _updateMassWhenScaleChanges : 1; + uint32 _overrideMass : 1; + uint32 _isUpdatingTransform : 1; public: /// diff --git a/Source/Engine/Renderer/RenderList.h b/Source/Engine/Renderer/RenderList.h index 493f80101..a2cd48696 100644 --- a/Source/Engine/Renderer/RenderList.h +++ b/Source/Engine/Renderer/RenderList.h @@ -41,8 +41,8 @@ struct RendererDirectionalLightData StaticFlags StaticFlags; float IndirectLightingIntensity; int16 ShadowDataIndex = -1; - int8 CastVolumetricShadow : 1; - int8 RenderedVolumetricFog : 1; + uint8 CastVolumetricShadow : 1; + uint8 RenderedVolumetricFog : 1; float ShadowsDistance; int32 CascadeCount; @@ -86,9 +86,9 @@ struct RendererSpotLightData StaticFlags StaticFlags; int16 ShadowDataIndex = -1; - int8 CastVolumetricShadow : 1; - int8 RenderedVolumetricFog : 1; - int8 UseInverseSquaredFalloff : 1; + uint8 CastVolumetricShadow : 1; + uint8 RenderedVolumetricFog : 1; + uint8 UseInverseSquaredFalloff : 1; GPUTexture* IESTexture; Guid ID; @@ -124,9 +124,9 @@ struct RendererPointLightData StaticFlags StaticFlags; int16 ShadowDataIndex = -1; - int8 CastVolumetricShadow : 1; - int8 RenderedVolumetricFog : 1; - int8 UseInverseSquaredFalloff : 1; + uint8 CastVolumetricShadow : 1; + uint8 RenderedVolumetricFog : 1; + uint8 UseInverseSquaredFalloff : 1; GPUTexture* IESTexture; Guid ID; @@ -146,8 +146,8 @@ struct RendererSkyLightData float IndirectLightingIntensity; StaticFlags StaticFlags; - int8 CastVolumetricShadow : 1; - int8 RenderedVolumetricFog : 1; + uint8 CastVolumetricShadow : 1; + uint8 RenderedVolumetricFog : 1; CubeTexture* Image; Guid ID; diff --git a/Source/Engine/Scripting/Script.h b/Source/Engine/Scripting/Script.h index 49cba0ec4..8cf1d0670 100644 --- a/Source/Engine/Scripting/Script.h +++ b/Source/Engine/Scripting/Script.h @@ -15,15 +15,15 @@ API_CLASS(Abstract) class FLAXENGINE_API Script : public SceneObject friend SceneTicking; friend class PrefabInstanceData; protected: - int32 _enabled : 1; - int32 _tickFixedUpdate : 1; - int32 _tickUpdate : 1; - int32 _tickLateUpdate : 1; - int32 _tickLateFixedUpdate : 1; - int32 _wasStartCalled : 1; - int32 _wasEnableCalled : 1; + uint16 _enabled : 1; + uint16 _tickFixedUpdate : 1; + uint16 _tickUpdate : 1; + uint16 _tickLateUpdate : 1; + uint16 _tickLateFixedUpdate : 1; + uint16 _wasStartCalled : 1; + uint16 _wasEnableCalled : 1; #if USE_EDITOR - int32 _executeInEditor : 1; + uint16 _executeInEditor : 1; #endif public: diff --git a/Source/ThirdParty/pugixml/pugixml.cpp b/Source/ThirdParty/pugixml/pugixml.cpp index 56860bb90..c4d4ec845 100644 --- a/Source/ThirdParty/pugixml/pugixml.cpp +++ b/Source/ThirdParty/pugixml/pugixml.cpp @@ -3967,7 +3967,11 @@ PUGI__NS_BEGIN PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, int value) { char buf[128]; +#if __APPLE__ + snprintf(buf, sizeof(buf), "%d", value); +#else sprintf(buf, "%d", value); +#endif return set_value_buffer(dest, header, header_mask, buf); } @@ -3975,7 +3979,11 @@ PUGI__NS_BEGIN PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, unsigned int value) { char buf[128]; +#if __APPLE__ + snprintf(buf, sizeof(buf), "%u", value); +#else sprintf(buf, "%u", value); +#endif return set_value_buffer(dest, header, header_mask, buf); } @@ -3983,7 +3991,11 @@ PUGI__NS_BEGIN PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, float value) { char buf[128]; +#if __APPLE__ + snprintf(buf, sizeof(buf), "%.9g", value); +#else sprintf(buf, "%.9g", value); +#endif return set_value_buffer(dest, header, header_mask, buf); } @@ -3991,7 +4003,11 @@ PUGI__NS_BEGIN PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, double value) { char buf[128]; +#if __APPLE__ + snprintf(buf, sizeof(buf), "%.17g", value); +#else sprintf(buf, "%.17g", value); +#endif return set_value_buffer(dest, header, header_mask, buf); } @@ -4005,7 +4021,11 @@ PUGI__NS_BEGIN PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, long long value) { char buf[128]; +#if __APPLE__ + snprintf(buf, sizeof(buf), "%lld", value); +#else sprintf(buf, "%lld", value); +#endif return set_value_buffer(dest, header, header_mask, buf); } @@ -4013,7 +4033,11 @@ PUGI__NS_BEGIN PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, unsigned long long value) { char buf[128]; +#if __APPLE__ + snprintf(buf, sizeof(buf), "%llu", value); +#else sprintf(buf, "%llu", value); +#endif return set_value_buffer(dest, header, header_mask, buf); }