Merge remote-tracking branch 'origin/master' into 1.8
# Conflicts: # Source/Editor/Utilities/EditorUtilities.cpp # Source/Editor/Utilities/EditorUtilities.h
This commit is contained in:
@@ -41,6 +41,10 @@ static_assert(sizeof(bool) == 1, "Invalid bool type size.");
|
||||
static_assert(sizeof(float) == 4, "Invalid float type size.");
|
||||
static_assert(sizeof(double) == 8, "Invalid double type size.");
|
||||
|
||||
// Check configuration
|
||||
static_assert((PLATFORM_THREADS_LIMIT & (PLATFORM_THREADS_LIMIT - 1)) == 0, "Threads limit must be power of two.");
|
||||
static_assert(PLATFORM_THREADS_LIMIT % 4 == 0, "Threads limit must be multiple of 4.");
|
||||
|
||||
float PlatformBase::CustomDpiScale = 1.0f;
|
||||
Array<User*, FixedAllocation<8>> PlatformBase::Users;
|
||||
Delegate<User*> PlatformBase::UserAdded;
|
||||
|
||||
@@ -100,9 +100,6 @@ WindowBase::WindowBase(const CreateWindowSettings& settings)
|
||||
, _dpi(96)
|
||||
, _dpiScale(1.0f)
|
||||
, _trackingMouseOffset(Float2::Zero)
|
||||
, _isUsingMouseOffset(false)
|
||||
, _isTrackingMouse(false)
|
||||
, _isClippingCursor(false)
|
||||
, RenderTask(nullptr)
|
||||
{
|
||||
// Update window location based on start location
|
||||
|
||||
@@ -284,12 +284,12 @@ protected:
|
||||
float _dpiScale;
|
||||
|
||||
Float2 _trackingMouseOffset;
|
||||
bool _isUsingMouseOffset;
|
||||
bool _isUsingMouseOffset = false;
|
||||
Rectangle _mouseOffsetScreenSize;
|
||||
bool _isTrackingMouse;
|
||||
bool _isHorizontalFlippingMouse;
|
||||
bool _isVerticalFlippingMouse;
|
||||
bool _isClippingCursor;
|
||||
bool _isTrackingMouse = false;
|
||||
bool _isHorizontalFlippingMouse = false;
|
||||
bool _isVerticalFlippingMouse = false;
|
||||
bool _isClippingCursor = false;
|
||||
|
||||
explicit WindowBase(const CreateWindowSettings& settings);
|
||||
virtual ~WindowBase();
|
||||
|
||||
Reference in New Issue
Block a user