From e33d94fecd272db4bf542541c069e9e2c168c1d5 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Fri, 15 Feb 2019 22:48:41 -0800
Subject: Moved NativeApp to Diligent namespace

---
 Common/NativeApp/src/Android/AndroidAppBase.cpp | 5 +++++
 Common/NativeApp/src/Android/AndroidMain.cpp    | 1 +
 Common/NativeApp/src/IOS/IOSAppBase.cpp         | 4 ++++
 Common/NativeApp/src/MacOS/MacOSAppBase.cpp     | 4 ++++
 Common/NativeApp/src/UWP/App.cpp                | 1 +
 Common/NativeApp/src/UWP/App.h                  | 2 +-
 Common/NativeApp/src/UWP/UWPAppBase.cpp         | 5 +++++
 Common/NativeApp/src/Win32/WinMain.cpp          | 2 ++
 8 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'Common/NativeApp/src')

diff --git a/Common/NativeApp/src/Android/AndroidAppBase.cpp b/Common/NativeApp/src/Android/AndroidAppBase.cpp
index 31e2724..4a1a4e2 100644
--- a/Common/NativeApp/src/Android/AndroidAppBase.cpp
+++ b/Common/NativeApp/src/Android/AndroidAppBase.cpp
@@ -30,6 +30,9 @@
 #include <android/native_window_jni.h>
 //#include <cpu-features.h>
 
+namespace Diligent
+{
+
 int AndroidAppBase::InitDisplay()
 {
     if( !initialized_resources_ )
@@ -258,3 +261,5 @@ void AndroidAppBase::UpdateFPS( float fFPS )
     app_->activity->vm->DetachCurrentThread();
     return;
 }
+
+}
diff --git a/Common/NativeApp/src/Android/AndroidMain.cpp b/Common/NativeApp/src/Android/AndroidMain.cpp
index cc5794c..27fd90c 100644
--- a/Common/NativeApp/src/Android/AndroidMain.cpp
+++ b/Common/NativeApp/src/Android/AndroidMain.cpp
@@ -31,6 +31,7 @@
 
 #define HELPER_CLASS_NAME "com/android/helper/NDKHelper" //Class name of helper function
 
+using namespace Diligent;
 
 // This is the main entry point of a native application that is using
 // android_native_app_glue.  It runs in its own thread, with its own
diff --git a/Common/NativeApp/src/IOS/IOSAppBase.cpp b/Common/NativeApp/src/IOS/IOSAppBase.cpp
index eadbca5..d4defb8 100644
--- a/Common/NativeApp/src/IOS/IOSAppBase.cpp
+++ b/Common/NativeApp/src/IOS/IOSAppBase.cpp
@@ -23,6 +23,9 @@
 
 #include "IOSAppBase.h"
 
+namespace Diligent
+{
+
 void IOSAppBase::Update()
 {
     // Render the scene
@@ -32,3 +35,4 @@ void IOSAppBase::Update()
     Update(CurrTime, ElapsedTime);
 }
 
+}
diff --git a/Common/NativeApp/src/MacOS/MacOSAppBase.cpp b/Common/NativeApp/src/MacOS/MacOSAppBase.cpp
index d4c68a8..f3d0313 100644
--- a/Common/NativeApp/src/MacOS/MacOSAppBase.cpp
+++ b/Common/NativeApp/src/MacOS/MacOSAppBase.cpp
@@ -23,6 +23,9 @@
 
 #include "MacOSAppBase.h"
 
+namespace Diligent
+{
+
 void MacOSAppBase::Update()
 {
     // Render the scene
@@ -32,3 +35,4 @@ void MacOSAppBase::Update()
     Update(CurrTime, ElapsedTime);
 }
 
+}
diff --git a/Common/NativeApp/src/UWP/App.cpp b/Common/NativeApp/src/UWP/App.cpp
index 6147e6d..bf5a523 100644
--- a/Common/NativeApp/src/UWP/App.cpp
+++ b/Common/NativeApp/src/UWP/App.cpp
@@ -37,6 +37,7 @@
 #include <ppltasks.h>
 
 using namespace SampleApp;
+using namespace Diligent;
 
 using namespace concurrency;
 using namespace Windows::ApplicationModel;
diff --git a/Common/NativeApp/src/UWP/App.h b/Common/NativeApp/src/UWP/App.h
index 1b09441..6b3fea2 100644
--- a/Common/NativeApp/src/UWP/App.h
+++ b/Common/NativeApp/src/UWP/App.h
@@ -62,7 +62,7 @@ namespace SampleApp
 
 	private:
         std::shared_ptr<DX::DeviceResources> GetDeviceResources();
-        std::unique_ptr<NativeAppBase> m_Main;
+        std::unique_ptr<Diligent::NativeAppBase> m_Main;
 		std::shared_ptr<DX::DeviceResources> m_deviceResources;
 		bool m_windowClosed = false;
 		bool m_windowVisible = false;
diff --git a/Common/NativeApp/src/UWP/UWPAppBase.cpp b/Common/NativeApp/src/UWP/UWPAppBase.cpp
index db1dd11..346b2bd 100644
--- a/Common/NativeApp/src/UWP/UWPAppBase.cpp
+++ b/Common/NativeApp/src/UWP/UWPAppBase.cpp
@@ -23,6 +23,9 @@
 
 #include "UWPAppBase.h"
 
+namespace Diligent
+{
+
 UWPAppBase::UWPAppBase()
 {
     // TODO: Change the timer settings if you want something other than the default variable timestep mode.
@@ -43,3 +46,5 @@ void UWPAppBase::Update()
         Update(CurrTime, ElapsedTime);
     });
 }
+
+}
diff --git a/Common/NativeApp/src/Win32/WinMain.cpp b/Common/NativeApp/src/Win32/WinMain.cpp
index 30edd53..f82e2c8 100644
--- a/Common/NativeApp/src/Win32/WinMain.cpp
+++ b/Common/NativeApp/src/Win32/WinMain.cpp
@@ -29,6 +29,8 @@
 #include "StringTools.h"
 #include "Timer.h"
 
+using namespace Diligent;
+
 std::unique_ptr<NativeAppBase> g_pTheApp;
 
 LRESULT CALLBACK MessageProc(HWND, UINT, WPARAM, LPARAM);
-- 
cgit v1.2.3