From e33d94fecd272db4bf542541c069e9e2c168c1d5 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 15 Feb 2019 22:48:41 -0800 Subject: Moved NativeApp to Diligent namespace --- Common/NativeApp/include/Android/AndroidAppBase.h | 12 ++++++-- Common/NativeApp/include/AppBase.h | 8 +++-- Common/NativeApp/include/IOS/IOSAppBase.h | 9 ++++-- Common/NativeApp/include/Linux/LinuxAppBase.h | 7 ++++- Common/NativeApp/include/MacOS/MacOSAppBase.h | 7 ++++- Common/NativeApp/include/NativeAppBase.h | 36 ++++++++++++++++++----- Common/NativeApp/include/UWP/UWPAppBase.h | 5 ++++ Common/NativeApp/include/Win32/Win32AppBase.h | 18 ++++++++++-- 8 files changed, 83 insertions(+), 19 deletions(-) (limited to 'Common/NativeApp/include') diff --git a/Common/NativeApp/include/Android/AndroidAppBase.h b/Common/NativeApp/include/Android/AndroidAppBase.h index eeedf75..43e76ef 100644 --- a/Common/NativeApp/include/Android/AndroidAppBase.h +++ b/Common/NativeApp/include/Android/AndroidAppBase.h @@ -31,19 +31,23 @@ #include "NDKHelper.h" struct android_app; + +namespace Diligent +{ + class AndroidAppBase : public AppBase { public: int InitDisplay(); - void SetState( android_app* state ); + void SetState(android_app* state); void InitSensors(); void ProcessSensors( int32_t id ); void DrawFrame(); bool IsReady(); virtual void TrimMemory() = 0; virtual void TermDisplay() = 0; - static int32_t HandleInput( android_app* app, AInputEvent* event ); - static void HandleCmd( struct android_app* app, int32_t cmd ); + static int32_t HandleInput(android_app* app, AInputEvent* event); + static void HandleCmd(android_app* app, int32_t cmd); bool CheckWindowSizeChanged() { auto new_window_width_ = ANativeWindow_getWidth(app_->window); @@ -102,3 +106,5 @@ private: const ASensor* accelerometer_sensor_ = nullptr; ASensorEventQueue* sensor_event_queue_ = nullptr; }; + +} diff --git a/Common/NativeApp/include/AppBase.h b/Common/NativeApp/include/AppBase.h index fcadd74..e5c4b21 100644 --- a/Common/NativeApp/include/AppBase.h +++ b/Common/NativeApp/include/AppBase.h @@ -23,16 +23,20 @@ #pragma once +namespace Diligent +{ + class AppBase { public: virtual ~AppBase() {} - virtual void ProcessCommandLine(const char *CmdLine) = 0; + virtual void ProcessCommandLine(const char* CmdLine) = 0; virtual const char* GetAppTitle()const = 0; virtual void Update(double CurrTime, double ElapsedTime) {}; - virtual void Render() = 0; + virtual void Render() = 0; virtual void Present() = 0; virtual void WindowResize(int width, int height) = 0; }; +} diff --git a/Common/NativeApp/include/IOS/IOSAppBase.h b/Common/NativeApp/include/IOS/IOSAppBase.h index 181cdf9..2efe4ab 100644 --- a/Common/NativeApp/include/IOS/IOSAppBase.h +++ b/Common/NativeApp/include/IOS/IOSAppBase.h @@ -26,17 +26,22 @@ #include "AppBase.h" #include "Timer.h" +namespace Diligent +{ + class IOSAppBase : public AppBase { public: using AppBase::Update; void Update(); - virtual void OnGLContextCreated(void *eaglLayer) = 0; + virtual void OnGLContextCreated(void* eaglLayer) = 0; virtual void OnTouchBegan(float x, float y){} virtual void OnTouchMoved(float x, float y){} virtual void OnTouchEnded(float x, float y){} protected: - Diligent::Timer timer; + Timer timer; double PrevTime = 0.0; }; + +} diff --git a/Common/NativeApp/include/Linux/LinuxAppBase.h b/Common/NativeApp/include/Linux/LinuxAppBase.h index d2f1cb4..83065d1 100644 --- a/Common/NativeApp/include/Linux/LinuxAppBase.h +++ b/Common/NativeApp/include/Linux/LinuxAppBase.h @@ -44,14 +44,19 @@ #include "AppBase.h" +namespace Diligent +{ + class LinuxAppBase : public AppBase { public: virtual void OnGLContextCreated(Display* display, Window window) = 0; - virtual int HandleXEvent(XEvent *xev){} + virtual int HandleXEvent(XEvent* xev){} #if VULKAN_SUPPORTED virtual void InitVulkan(xcb_connection_t* connection, uint32_t window) = 0; virtual void HandleXCBEvent(xcb_generic_event_t* event){} #endif }; + +} diff --git a/Common/NativeApp/include/MacOS/MacOSAppBase.h b/Common/NativeApp/include/MacOS/MacOSAppBase.h index 6081dd1..d8df9df 100644 --- a/Common/NativeApp/include/MacOS/MacOSAppBase.h +++ b/Common/NativeApp/include/MacOS/MacOSAppBase.h @@ -26,6 +26,9 @@ #include "AppBase.h" #include "Timer.h" +namespace Diligent +{ + class MacOSAppBase : public AppBase { public: @@ -38,6 +41,8 @@ public: virtual void OnKeyPressed(int key){} protected: - Diligent::Timer timer; + Timer timer; double PrevTime = 0.0; }; + +} diff --git a/Common/NativeApp/include/NativeAppBase.h b/Common/NativeApp/include/NativeAppBase.h index 85aa4eb..25d3429 100644 --- a/Common/NativeApp/include/NativeAppBase.h +++ b/Common/NativeApp/include/NativeAppBase.h @@ -25,37 +25,57 @@ #if PLATFORM_WIN32 #include "Win32AppBase.h" - using NativeAppBase = Win32AppBase; + namespace Diligent + { + using NativeAppBase = Win32AppBase; + } #elif PLATFORM_UNIVERSAL_WINDOWS #include "UWPAppBase.h" - using NativeAppBase = UWPAppBase; + namespace Diligent + { + using NativeAppBase = UWPAppBase; + } #elif PLATFORM_LINUX #include "LinuxAppBase.h" - using NativeAppBase = LinuxAppBase; + namespace Diligent + { + using NativeAppBase = LinuxAppBase; + } #elif PLATFORM_ANDROID #include "AndroidAppBase.h" - using NativeAppBase = AndroidAppBase; + namespace Diligent + { + using NativeAppBase = AndroidAppBase; + } #elif PLATFORM_MACOS #include "MacOSAppBase.h" - using NativeAppBase = MacOSAppBase; + namespace Diligent + { + using NativeAppBase = MacOSAppBase; + } #elif PLATFORM_IOS #include "IOSAppBase.h" - using NativeAppBase = IOSAppBase; - + namespace Diligent + { + using NativeAppBase = IOSAppBase; + } #else # error Usnupported paltform #endif -extern NativeAppBase* CreateApplication(); +namespace Diligent +{ + extern NativeAppBase* CreateApplication(); +} \ No newline at end of file diff --git a/Common/NativeApp/include/UWP/UWPAppBase.h b/Common/NativeApp/include/UWP/UWPAppBase.h index dc56b80..cc0c71e 100644 --- a/Common/NativeApp/include/UWP/UWPAppBase.h +++ b/Common/NativeApp/include/UWP/UWPAppBase.h @@ -34,6 +34,9 @@ #include "Common/StepTimer.h" #include "Common/DeviceResources.h" +namespace Diligent +{ + class UWPAppBase : public AppBase { public: @@ -69,3 +72,5 @@ protected: DX::StepTimer m_timer; bool m_bFrameReady = false; }; + +} diff --git a/Common/NativeApp/include/Win32/Win32AppBase.h b/Common/NativeApp/include/Win32/Win32AppBase.h index f5699b3..9999e15 100644 --- a/Common/NativeApp/include/Win32/Win32AppBase.h +++ b/Common/NativeApp/include/Win32/Win32AppBase.h @@ -30,9 +30,23 @@ #include "AppBase.h" +namespace Diligent +{ + class Win32AppBase : public AppBase { public: - virtual void OnWindowCreated(HWND hWnd, LONG WindowWidth, LONG WindowHeight) = 0; - virtual LRESULT HandleWin32Message(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { return 0; } + virtual void OnWindowCreated(HWND hWnd, + LONG WindowWidth, + LONG WindowHeight) = 0; + + virtual LRESULT HandleWin32Message(HWND hWnd, + UINT message, + WPARAM wParam, + LPARAM lParam) + { + return 0; + } }; + +} -- cgit v1.2.3