Merge pull request #380 from Devsh-Graphics-Programming/window_resizing

devshgraphicsprogramming · web-flow · commit 45552f879c5f · 2022-07-11T20:20:24.000+02:00
Add nbl::ui window APIs for win32
diff --git a/include/nbl/asset/IAccelerationStructure.h b/include/nbl/asset/IAccelerationStructure.h
@@ -11,6 +11,7 @@
 #include "nbl/asset/format/EFormat.h"
 #include "aabbox3d.h"
 #define uint uint32_t
+#include <compare>
 #include "nbl/builtin/glsl/utils/acceleration_structures.glsl"
 #undef uint
 
diff --git a/include/nbl/asset/IBuffer.h b/include/nbl/asset/IBuffer.h
@@ -62,14 +62,20 @@ struct NBL_API SBufferBinding
 template<typename BufferType>
 struct NBL_API SBufferRange
 {
+	SBufferRange(const size_t& _offset, const size_t _size, core::smart_refctd_ptr<BufferType>&& _buffer)
+		: offset(_offset), size(_size), buffer(core::smart_refctd_ptr<BufferType>(_buffer)) {}
+
+	SBufferRange() : offset(0ull), size(0ull), buffer(nullptr) {}
+
 	inline bool isValid() const
 	{
 		return buffer && size && (offset+size<=buffer->getSize());
 	}
 
-	size_t offset = 0ull;
-	size_t size = 0ull;
-	core::smart_refctd_ptr<BufferType> buffer = nullptr;
+	size_t offset;
+	size_t size ;
+	core::smart_refctd_ptr<BufferType> buffer;
+
 	inline bool operator==(const SBufferRange<BufferType>& rhs) const { return buffer==rhs.buffer && offset==rhs.offset && size==rhs.size; }
 	inline bool operator!=(const SBufferRange<BufferType>& rhs) const { return !operator==(rhs); }
 };
diff --git a/include/nbl/asset/ICPUAnimationLibrary.h b/include/nbl/asset/ICPUAnimationLibrary.h
@@ -99,7 +99,7 @@ class NBL_API ICPUAnimationLibrary final : public IAnimationLibrary<ICPUBuffer>,
 			SBufferBinding<ICPUBuffer> _keyframeStorageBinding = {m_keyframeStorageBinding.offset,_depth>0u ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_keyframeStorageBinding.buffer->clone(_depth-1u)):m_keyframeStorageBinding.buffer};
 			SBufferBinding<ICPUBuffer> _timestampStorageBinding = {m_timestampStorageBinding.offset,_depth>0u ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_timestampStorageBinding.buffer->clone(_depth-1u)):m_timestampStorageBinding.buffer};
 
-			SBufferRange<ICPUBuffer> _animationStorageRange = {m_animationStorageRange.offset,m_animationStorageRange.size,_depth>0u&&m_animationStorageRange.buffer ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_animationStorageRange.buffer->clone(_depth-1u)):m_animationStorageRange.buffer};
+			SBufferRange<ICPUBuffer> _animationStorageRange = {m_animationStorageRange.offset,m_animationStorageRange.size,_depth>0u&&m_animationStorageRange.buffer ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_animationStorageRange.buffer->clone(_depth-1u)):core::smart_refctd_ptr(m_animationStorageRange.buffer)};
 
  			auto cp = core::make_smart_refctd_ptr<ICPUAnimationLibrary>(std::move(_keyframeStorageBinding),std::move(_timestampStorageBinding),m_keyframeCount,std::move(_animationStorageRange));
 			clone_common(cp.get());
diff --git a/include/nbl/asset/IDescriptorSet.h b/include/nbl/asset/IDescriptorSet.h
@@ -6,6 +6,7 @@
 #define _NBL_ASSET_I_DESCRIPTOR_SET_H_INCLUDED_
 
 #include <algorithm>
+#include <compare>
 
 
 #include "nbl/core/declarations.h"
diff --git a/include/nbl/asset/IImage.h b/include/nbl/asset/IImage.h
@@ -17,6 +17,8 @@
 #include "nbl/asset/ECommonEnums.h"
 #include "nbl/system/ILogger.h"
 
+#include <compare>
+
 namespace nbl::asset
 {
 
diff --git a/include/nbl/asset/IRenderpass.h b/include/nbl/asset/IRenderpass.h
@@ -9,6 +9,8 @@
 #include "nbl/asset/EImageLayout.h"
 #include "nbl/asset/ECommonEnums.h"
 
+#include <compare>
+
 namespace nbl::asset
 {
 
diff --git a/include/nbl/asset/ISpecializedShader.h b/include/nbl/asset/ISpecializedShader.h
@@ -11,6 +11,7 @@
 
 #include <cstdint>
 #include <filesystem>
+#include <compare>
 
 #include "nbl/asset/ICPUBuffer.h"
 
diff --git a/include/nbl/asset/metadata/IImageMetadata.h b/include/nbl/asset/metadata/IImageMetadata.h
@@ -8,6 +8,8 @@
 #include "nbl/asset/ICPUImage.h"
 #include "nbl/asset/format/EColorSpace.h"
 
+#include <compare>
+
 namespace nbl::asset
 {
 
diff --git a/include/nbl/asset/metadata/IRenderpassIndependentPipelineMetadata.h b/include/nbl/asset/metadata/IRenderpassIndependentPipelineMetadata.h
@@ -12,6 +12,8 @@
 #include "nbl/asset/ICPUImageView.h"
 #include "nbl/asset/ICPURenderpassIndependentPipeline.h"
 
+#include <compare>
+
 //#include "nbl/asset/utils/IBuiltinIncludeLoader.h"
 
 //#include "nbl/asset/asset_utils.h"
diff --git a/include/nbl/ui/CWindowAndroid.h b/include/nbl/ui/CWindowAndroid.h
@@ -27,6 +27,15 @@ class CWindowAndroid : public IWindowAndroid
 		inline const native_handle_t& getNativeHandle() const override { return m_native; }
 		
 		inline void setCaption(const std::string_view& caption) override {}
+		virtual IWindowManager* getManager() override 
+		{
+			/*
+				TODO: this class should have m_windowManager member...
+			*/ 
+
+			assert(false);
+			return nullptr;  
+		}
 
 		// WHY THE FUCK ARE THESE PUBLIC?
 		core::map<uint32_t, core::smart_refctd_ptr<IMouseEventChannel>> m_mouseEventChannels;
diff --git a/include/nbl/ui/CWindowManagerWin32.h b/include/nbl/ui/CWindowManagerWin32.h
@@ -60,6 +60,37 @@ class CWindowManagerWin32 : public IWindowManager
 			return info;
 		}
 
+		inline bool setWindowSize_impl(IWindow* window, const uint32_t width, const uint32_t height) override
+		{
+			auto wnd = static_cast<IWindowWin32*>(window);
+			m_windowThreadManager.setWindowSize(wnd->getNativeHandle(), width, height);
+			return true;
+		}
+		inline bool setWindowPosition_impl(IWindow* window, const int32_t x, const int32_t y) override
+		{
+			auto wnd = static_cast<IWindowWin32*>(window);
+			m_windowThreadManager.setWindowPosition(wnd->getNativeHandle(), x, y);
+			return true;
+		}
+		inline bool setWindowRotation_impl(IWindow* window, const bool landscape) override
+		{
+			return false;
+		}
+		inline bool setWindowVisible_impl(IWindow* window, const bool visible) override
+		{
+			auto wnd = static_cast<IWindowWin32*>(window);
+			if (visible) m_windowThreadManager.showWindow(wnd->getNativeHandle());
+			else m_windowThreadManager.hideWindow(wnd->getNativeHandle());
+			return true;
+		}
+		inline bool setWindowMaximized_impl(IWindow* window, const bool maximized) override
+		{
+			auto wnd = static_cast<IWindowWin32*>(window);
+			if (maximized) m_windowThreadManager.maximizeWindow(wnd->getNativeHandle());
+			else m_windowThreadManager.minimizeWindow(wnd->getNativeHandle());
+			return true;
+		}
+
 	private:
 		inline IWindowWin32::native_handle_t createNativeWindow(int _x, int _y, uint32_t _w, uint32_t _h, IWindow::E_CREATE_FLAGS _flags, const std::string_view& caption)
 		{
@@ -77,7 +108,9 @@ class CWindowManagerWin32 : public IWindowManager
 		{
 			ERT_CREATE_WINDOW,
 			ERT_DESTROY_WINDOW,
-			ERT_CHANGE_CURSOR_VISIBILITY
+			ERT_CHANGE_CURSOR_VISIBILITY,
+			ERT_SET_WINDOW_POS,
+			ERT_SHOW_WINDOW
 		};
 		template <E_REQUEST_TYPE ERT>
 		struct SRequestParamsBase
@@ -104,6 +137,23 @@ class CWindowManagerWin32 : public IWindowManager
 		{
 			bool visible;
 		};
+		struct SRequestParams_SetWindowPos : SRequestParamsBase<ERT_SET_WINDOW_POS>
+		{
+			IWindowWin32::native_handle_t window;
+			int x, y;
+			uint32_t width, height;
+
+			uint32_t ignoreXY : 1 = 0;
+			uint32_t ignoreSize : 1 = 0;
+		};
+		struct SRequestParams_ShowWindow : SRequestParamsBase<ERT_SHOW_WINDOW>
+		{
+			IWindowWin32::native_handle_t window;
+			uint32_t hide : 1 = 0;
+			uint32_t show : 1 = 0;
+			uint32_t minimized : 1 = 0;
+			uint32_t maximized : 1 = 0;
+		};
 		struct SRequest : system::impl::IAsyncQueueDispatcherBase::request_base_t
 		{
 			E_REQUEST_TYPE type;
@@ -112,6 +162,8 @@ class CWindowManagerWin32 : public IWindowManager
 				SRequestParams_CreateWindow createWindowParam;
 				SRequestParams_DestroyWindow destroyWindowParam;
 				SRequestParams_ChangeCursorVisibility changeCursorVisibilityParam;
+				SRequestParams_SetWindowPos setWindowPosParam;
+				SRequestParams_ShowWindow showWindowParam;
 			};
 			SRequest() {}
 			~SRequest() {}
@@ -143,6 +195,58 @@ class CWindowManagerWin32 : public IWindowManager
 					auto& rq = request(params);
 					waitForCompletion(rq);
 				}
+				inline void setWindowSize(IWindowWin32::native_handle_t window, uint32_t width, uint32_t height)
+				{
+					SRequestParams_SetWindowPos params;
+					params.window = window;
+					params.width = width;
+					params.height = height;
+					params.ignoreXY = 1;
+					auto& rq = request(params);
+					waitForCompletion(rq);
+				}
+				inline void setWindowPosition(IWindowWin32::native_handle_t window, int x, int y)
+				{
+					SRequestParams_SetWindowPos params;
+					params.window = window;
+					params.x = x;
+					params.y = y;
+					params.ignoreSize = 1;
+					auto& rq = request(params);
+					waitForCompletion(rq);
+				}
+				inline void hideWindow(IWindowWin32::native_handle_t window)
+				{
+					SRequestParams_ShowWindow params;
+					params.window = window;
+					params.hide = 1;
+					auto& rq = request(params);
+					waitForCompletion(rq);
+				}
+				inline void showWindow(IWindowWin32::native_handle_t window)
+				{
+					SRequestParams_ShowWindow params;
+					params.window = window;
+					params.show = 1;
+					auto& rq = request(params);
+					waitForCompletion(rq);
+				}
+				inline void maximizeWindow(IWindowWin32::native_handle_t window)
+				{
+					SRequestParams_ShowWindow params;
+					params.window = window;
+					params.maximized = 1;
+					auto& rq = request(params);
+					waitForCompletion(rq);
+				}
+				inline void minimizeWindow(IWindowWin32::native_handle_t window)
+				{
+					SRequestParams_ShowWindow params;
+					params.window = window;
+					params.minimized = 1;
+					auto& rq = request(params);
+					waitForCompletion(rq);
+				}
 
 				inline CThreadHandler()
 				{
@@ -314,6 +418,26 @@ class CWindowManagerWin32 : public IWindowManager
 						}
 						break;
 					}
+					case ERT_SET_WINDOW_POS:
+					{
+						auto& params = req.setWindowPosParam;
+						uint32_t flags = SWP_NOACTIVATE | SWP_NOZORDER;
+						if (params.ignoreXY) flags |= SWP_NOMOVE | SWP_NOREPOSITION;
+						if (params.ignoreSize) flags |= SWP_NOSIZE;
+						SetWindowPos(params.window, nullptr, params.x, params.y, params.width, params.height, flags);
+						break;
+					}
+					case ERT_SHOW_WINDOW:
+					{
+						auto& params = req.showWindowParam;
+						int showCmd;
+						if (params.hide) showCmd = SW_HIDE;
+						if (params.show) showCmd = SW_SHOW;
+						if (params.minimized) showCmd = SW_MINIMIZE;
+						if (params.maximized) showCmd = SW_MAXIMIZE;
+						ShowWindow(params.window, showCmd);
+						break;
+					}
 					}
 				}
 
@@ -333,6 +457,14 @@ class CWindowManagerWin32 : public IWindowManager
 					{
 						req.changeCursorVisibilityParam = std::move(params);
 					}
+					else if constexpr (std::is_same_v<RequestParams, SRequestParams_SetWindowPos&>)
+					{
+						req.setWindowPosParam = std::move(params);
+					}
+					else if constexpr (std::is_same_v<RequestParams, SRequestParams_ShowWindow&>)
+					{
+						req.showWindowParam = std::move(params);
+					}
 				}
 
 				inline bool wakeupPredicate() const { return true; }
diff --git a/include/nbl/ui/CWindowWin32.h b/include/nbl/ui/CWindowWin32.h
@@ -25,6 +25,8 @@ class NBL_API2 CWindowWin32 final : public IWindowWin32
 
 	inline const native_handle_t& getNativeHandle() const override { return m_native; }
 	void setCaption(const std::string_view& caption) override;
+	virtual IWindowManager* getManager() override;
+
 	~CWindowWin32() override;
 private:
 	inline CWindowWin32(CWindowManagerWin32* winManager, core::smart_refctd_ptr<system::ISystem>&& sys, SCreationParams&& params);
diff --git a/include/nbl/ui/IWindow.h b/include/nbl/ui/IWindow.h
@@ -13,6 +13,7 @@
 namespace nbl::ui
 {
 
+class IWindowManager;
 class ICursorControl;
 
 class IWindow : public core::IReferenceCounted
@@ -172,16 +173,16 @@ class IWindow : public core::IReferenceCounted
         };
         friend struct IEventCallback;
 
-        inline bool isFullscreen()      { return (m_flags.value & ECF_FULLSCREEN); }
-        inline bool isHidden()          { return (m_flags.value & ECF_HIDDEN); }
-        inline bool isBorderless()      { return (m_flags.value & ECF_BORDERLESS); }
-        inline bool isResizable()       { return (m_flags.value & ECF_RESIZABLE); }
-        inline bool isMinimized()       { return (m_flags.value & ECF_MINIMIZED); }
-        inline bool isMaximized()       { return (m_flags.value & ECF_MAXIMIZED); }
-        inline bool hasMouseCaptured()  { return (m_flags.value & ECF_MOUSE_CAPTURE); }
-        inline bool hasInputFocus()     { return (m_flags.value & ECF_INPUT_FOCUS); }
-        inline bool hasMouseFocus()     { return (m_flags.value & ECF_MOUSE_FOCUS); }
-        inline bool isAlwaysOnTop()     { return (m_flags.value & ECF_ALWAYS_ON_TOP); }
+        inline bool isFullscreen()        { return (m_flags.value & ECF_FULLSCREEN); }
+        inline bool isHidden()            { return (m_flags.value & ECF_HIDDEN); }
+        inline bool isBorderless()        { return (m_flags.value & ECF_BORDERLESS); }
+        inline bool isResizable()         { return (m_flags.value & ECF_RESIZABLE); }
+        inline bool isMinimized()         { return (m_flags.value & ECF_MINIMIZED); }
+        inline bool isMaximized()         { return (m_flags.value & ECF_MAXIMIZED); }
+        inline bool hasMouseCaptured()    { return (m_flags.value & ECF_MOUSE_CAPTURE); }
+        inline bool hasInputFocus()       { return (m_flags.value & ECF_INPUT_FOCUS); }
+        inline bool hasMouseFocus()       { return (m_flags.value & ECF_MOUSE_FOCUS); }
+        inline bool isAlwaysOnTop()       { return (m_flags.value & ECF_ALWAYS_ON_TOP); }
 
         inline uint32_t getWidth() const { return m_width; }
         inline uint32_t getHeight() const { return m_height; }
@@ -190,6 +191,7 @@ class IWindow : public core::IReferenceCounted
 
         NBL_API2 virtual IClipboardManager* getClipboardManager() = 0;
         NBL_API2 virtual ICursorControl* getCursorControl() = 0;
+        NBL_API2 virtual IWindowManager* getManager() = 0;
 
         inline IEventCallback* getEventCallback() const { return m_cb.get(); }
 
diff --git a/include/nbl/ui/IWindowManager.h b/include/nbl/ui/IWindowManager.h
diff --git a/include/nbl/video/alloc/CAsyncSingleBufferSubAllocator.h b/include/nbl/video/alloc/CAsyncSingleBufferSubAllocator.h
diff --git a/include/nbl/video/alloc/CSingleBufferSubAllocator.h b/include/nbl/video/alloc/CSingleBufferSubAllocator.h
diff --git a/include/nbl/video/utilities/IUtilities.h b/include/nbl/video/utilities/IUtilities.h
diff --git a/src/nbl/asset/interchange/CGLTFLoader.cpp b/src/nbl/asset/interchange/CGLTFLoader.cpp
diff --git a/src/nbl/ui/CWindowWin32.cpp b/src/nbl/ui/CWindowWin32.cpp

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#include "nbl/asset/ECommonEnums.h"`
`18`	`18`	`#include "nbl/system/ILogger.h"`
`19`	`19`
	`20`	`+#include <compare>`
	`21`	`+`
`20`	`22`	`namespace nbl::asset`
`21`	`23`	`{`
`22`	`24`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`#include "nbl/asset/EImageLayout.h"`
`10`	`10`	`#include "nbl/asset/ECommonEnums.h"`
`11`	`11`
	`12`	`+#include <compare>`
	`13`	`+`
`12`	`14`	`namespace nbl::asset`
`13`	`15`	`{`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`#include "nbl/asset/ICPUImage.h"`
`9`	`9`	`#include "nbl/asset/format/EColorSpace.h"`
`10`	`10`
	`11`	`+#include <compare>`
	`12`	`+`
`11`	`13`	`namespace nbl::asset`
`12`	`14`	`{`
`13`	`15`