Merge branch 'danylo_system' into baw

Author: Erfan-Ahmadi

examples_tests/common/CommonAPI.h

@@ -392,7 +392,13 @@ class CommonAPI
 #ifdef _NBL_PLATFORM_WINDOWS_
 		caller = nbl::core::make_smart_refctd_ptr<nbl::system::CSystemCallerWin32>();
 #endif
-		return nbl::core::make_smart_refctd_ptr<nbl::system::ISystem>(std::move(caller));
+#ifdef _NBL_PLATFORM_WINDOWS_
+		return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemWin32>(std::move(caller));
+#elif defined(_NBL_PLATFORM_ANDROID_)
+		return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller));
+#else
+		return nullptr;
+#endif
 	}
 
 	// Used to help with queue selection

include/nbl/system/CSystemWin32.h

@@ -1,6 +1,8 @@
 #ifndef _NBL_SYSTEM_CSYSTEMWIN32_H_INCLUDED_
 #define _NBL_SYSTEM_CSYSTEMWIN32_H_INCLUDED_
 #ifdef _NBL_PLATFORM_WINDOWS_
+#include <windows.h>
+#include <powerbase.h>
 #include "ISystem.h"
 #include "CFileWin32.h"
 
@@ -22,7 +24,31 @@ class CSystemCallerWin32 final : public ISystemCaller
 
 class CSystemWin32 : public ISystem
 {
+public:
+    CSystemWin32(core::smart_refctd_ptr<ISystemCaller>&& caller) : ISystem(std::move(caller)) {}
+    //LOL the struct definition wasn't added to winapi headers do they ask to declare them yourself
+    typedef struct _PROCESSOR_POWER_INFORMATION {
+        ULONG Number;
+        ULONG MaxMhz;
+        ULONG CurrentMhz;
+        ULONG MhzLimit;
+        ULONG MaxIdleState;
+        ULONG CurrentIdleState;
+    } PROCESSOR_POWER_INFORMATION, * PPROCESSOR_POWER_INFORMATION;
 
+    SystemInfo getSystemInfo() const override
+    {
+        SystemInfo info;
+        LARGE_INTEGER speed;
+        QueryPerformanceFrequency(&speed);
+
+        info.cpuFrequency = speed.QuadPart;
+
+        info.desktopResX = GetSystemMetrics(SM_CXSCREEN);
+        info.desktopResY = GetSystemMetrics(SM_CYSCREEN);
+
+        return info;
+    }
 };
 
 }

include/nbl/system/IApplicationFramework.h

@@ -41,7 +41,35 @@ class IApplicationFramework : public core::IReferenceCounted
         virtual void onAppInitialized_impl() {}
         virtual void onAppTerminated_impl() {}
 
-        system::path localInputCWD, localOutputCWD, sharedInputCWD, sharedOutputCWD;
+        /*
+         ****************** Current Working Directories ********************
+         Each Nabla app has 4 pre-defined working directories. You can change them to your liking.
+         *******************************************************************
+        */
+        
+        
+        /*
+            This is a CWD which is used for reading app-local assets.
+            Do NOT try writing to this path if you wan't your app to work on Android because on Android this CWD is located inside a readonly APK archive.
+
+            To add files to your assets directory, create an "assets" directory in your app's source directory
+        */
+        system::path localInputCWD;
+
+        /*
+            This is a CWD used to output app-local data e.g. screenshots
+        */
+        system::path localOutputCWD;
+
+        /*
+            The CWD for input data that can be shared among apps, like the "examples_tests/media" directory for Nabla examples
+        */
+        system::path sharedInputCWD;
+
+        /*
+            This CWD is used to output data that can be shared between apps e.g. quantization cache
+        */
+        system::path sharedOutputCWD;
 };
 
 }

include/nbl/system/ISystem.h

@@ -521,6 +521,17 @@ class ISystem : public core::IReferenceCounted
 
             return systemMemory;
         }
+
+        struct SystemInfo
+        {
+            uint64_t cpuFrequency;
+            //TODO others
+
+            uint32_t desktopResX;
+            uint32_t desktopResY;
+            std::string OSFullName;
+        };
+        virtual SystemInfo getSystemInfo() const = 0;
 };
 
 template<typename T>

include/nbl/ui/CClipboardManagerWin32.h

@@ -9,14 +9,11 @@ class CClipboardManagerWin32 final : public IClipboardManager
 {
 	using base_t = IClipboardManager;
 public:
-	CClipboardManagerWin32(core::smart_refctd_ptr<system::ISystem>&& sys) : base_t(std::move(sys))
-	{
-		
-	}
+	CClipboardManagerWin32() = default;
 	virtual std::string getClipboardText() override;
 	virtual bool setClipboardText(const std::string_view& data) override;
-	virtual core::smart_refctd_ptr<asset::ICPUImage> getClipboardImage() override;
-	virtual bool setClipboardImage(asset::ICPUImage* image, asset::ICPUImage::SImageCopy data) override;
+	//virtual core::smart_refctd_ptr<asset::ICPUImage> getClipboardImage() override;
+	//virtual bool setClipboardImage(asset::ICPUImage* image, asset::ICPUImage::SImageCopy data) override;
 private:
 	HGLOBAL* CPUImageToClipboardImage(asset::ICPUImage* image);
 };

include/nbl/ui/CWindowWin32.h

@@ -3,6 +3,7 @@
 
 
 #include "nbl/ui/IWindowWin32.h"
+#include "nbl/ui/CClipboardManagerWin32.h"
 
 #include <queue>
 
@@ -36,6 +37,7 @@ class CWindowWin32 final : public IWindowWin32
 	core::map<HANDLE, core::smart_refctd_ptr<IKeyboardEventChannel>> m_keyboardEventChannels;
 
 	core::smart_refctd_ptr<CCursorControlWin32> m_cursorControl;
+	core::smart_refctd_ptr<CClipboardManagerWin32> m_clipboardManager;
 
 	/* 
 	*  Storing this data is required for the device removal to work properly

include/nbl/ui/IClipboardManager.h

@@ -21,15 +21,13 @@ class IClipboardManager : public core::IReferenceCounted
     };
     virtual std::string getClipboardText() = 0;
     virtual bool setClipboardText(const std::string_view& data) = 0;
-    virtual core::smart_refctd_ptr<asset::ICPUImage> getClipboardImage() = 0;
-    virtual bool setClipboardImage(asset::ICPUImage* image, const SImageClipboardRegion& data) = 0;
+   // virtual core::smart_refctd_ptr<asset::ICPUImage> getClipboardImage() = 0;
+   // virtual bool setClipboardImage(asset::ICPUImage* image, const SImageClipboardRegion& data) = 0;
 
     virtual ~IClipboardManager() = default;
 
 protected:
-    IClipboardManager(core::smart_refctd_ptr<system::ISystem>&& sys) : m_sys(std::move(sys)) {}
-
-    core::smart_refctd_ptr<system::ISystem> m_sys;
+    IClipboardManager() = default;
 };
 
 }

src/nbl/CMakeLists.txt

@@ -193,6 +193,7 @@ set(NBL_UI_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/ui/CWindowWayland.cpp
 	${NBL_ROOT_PATH}/src/nbl/ui/CWaylandCaller.cpp
 	${NBL_ROOT_PATH}/src/nbl/ui/CCursorControlWin32.cpp
+	${NBL_ROOT_PATH}/src/nbl/ui/CClipboardManagerWin32.cpp
 	${NBL_ROOT_PATH}/src/nbl/ui/CWindowManagerAndroid.cpp
 	${NBL_ROOT_PATH}/src/nbl/ui/CGraphicalApplicationAndroid.cpp
 )

src/nbl/system/CSystemWin32.cpp

@@ -0,0 +1,35 @@
+#include "nbl/ui/CClipboardManagerWin32.h"
+#include <Windows.h>
+namespace nbl::ui
+{
+
+    std::string CClipboardManagerWin32::getClipboardText()
+    {
+        int32_t res = OpenClipboard(0);
+        assert(res != 0);
+
+        std::string data = (const char*)GetClipboardData(CF_TEXT);
+
+        CloseClipboard();
+
+        return data;
+    }
+
+    bool CClipboardManagerWin32::setClipboardText(const std::string_view& str)
+    {
+        int32_t res = OpenClipboard(0);
+        if (res == 0) return false;
+
+        EmptyClipboard();
+        const char* data = str.data();
+        const size_t data_size = strlen(data) + 1;
+        HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, data_size);
+        strcpy((char*)GlobalLock(h), LPCSTR(data));
+        GlobalUnlock(h);
+        SetClipboardData(CF_TEXT, h);
+
+        CloseClipboard();
+
+        return true;
+    }
+}