Moved NativeApp to Diligent namespace

7 files changed, 30 insertions, 1 deletions

diff --git a/unityplugin/UnityEmulator/include/UnityAppBase.h b/unityplugin/UnityEmulator/include/UnityAppBase.h
index 390e177..9a87a0b 100644
--- a/unityplugin/UnityEmulator/include/UnityAppBase.h
+++ b/unityplugin/UnityEmulator/include/UnityAppBase.h
@@ -35,7 +35,7 @@
 
 typedef void* (*TLoadPluginFunction)(const char *FunctionName);
 
-class UnityAppBase : public NativeAppBase
+class UnityAppBase : public Diligent::NativeAppBase
 {
 public:
     UnityAppBase();
diff --git a/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp b/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp
index 47db464..cdff820 100644
--- a/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp
+++ b/unityplugin/UnityEmulator/src/Android/UnityAppAndroid.cpp
@@ -59,11 +59,16 @@ public:
     }
 };
 
+namespace Diligent
+{
+
 NativeAppBase* CreateApplication()
 {
     return new UnityAppAndroid();
 }
 
+}
+
 // The function must be defined in the plugin
 extern void *LoadPluginFunction(const char *name);
 void* UnityAppBase::LoadPluginFunction(const char* FunctionName)
diff --git a/unityplugin/UnityEmulator/src/IOS/UnityAppIOS.cpp b/unityplugin/UnityEmulator/src/IOS/UnityAppIOS.cpp
index 567e7f6..3dc4f9d 100644
--- a/unityplugin/UnityEmulator/src/IOS/UnityAppIOS.cpp
+++ b/unityplugin/UnityEmulator/src/IOS/UnityAppIOS.cpp
@@ -41,11 +41,16 @@ public:
     }
 };
 
+namespace Diligent
+{
+
 NativeAppBase* CreateApplication()
 {
     return new UnityAppIOS();
 }
 
+}
+
 // The function must be defined in the plugin
 extern void *LoadPluginFunction(const char *name);
 void* UnityAppBase::LoadPluginFunction(const char* FunctionName)
diff --git a/unityplugin/UnityEmulator/src/Linux/UnityAppLinux.cpp b/unityplugin/UnityEmulator/src/Linux/UnityAppLinux.cpp
index 290527c..8176440 100644
--- a/unityplugin/UnityEmulator/src/Linux/UnityAppLinux.cpp
+++ b/unityplugin/UnityEmulator/src/Linux/UnityAppLinux.cpp
@@ -47,11 +47,16 @@ public:
 #endif
 };
 
+namespace Diligent
+{
+
 NativeAppBase* CreateApplication()
 {
     return new UnityAppLinux();
 }
 
+}
+
 // The function must be defined in the plugin
 extern void *LoadPluginFunction(const char *name);
 void* UnityAppBase::LoadPluginFunction(const char* FunctionName)
diff --git a/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp b/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp
index 015efa2..ae5a4b6 100644
--- a/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp
+++ b/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp
@@ -45,11 +45,16 @@ public:
     }
 };
 
+namespace Diligent
+{
+
 NativeAppBase* CreateApplication()
 {
     return new UnityAppMacOS();
 }
 
+}
+
 // The function must be defined in the plugin
 extern void *LoadPluginFunction(const char *name);
 void* UnityAppBase::LoadPluginFunction(const char* FunctionName)
diff --git a/unityplugin/UnityEmulator/src/UWP/UnityAppUWP.cpp b/unityplugin/UnityEmulator/src/UWP/UnityAppUWP.cpp
index 8996e51..c9826c9 100644
--- a/unityplugin/UnityEmulator/src/UWP/UnityAppUWP.cpp
+++ b/unityplugin/UnityEmulator/src/UWP/UnityAppUWP.cpp
@@ -216,12 +216,16 @@ private:
     bool m_SceneInitialized = false;
 };
 
+namespace Diligent
+{
 
 NativeAppBase* CreateApplication()
 {
     return new UnityAppUWP;
 }
 
+}
+
 
 HMODULE g_DLLHandle;
 void* UnityAppBase::LoadPluginFunction(const char* FunctionName)
diff --git a/unityplugin/UnityEmulator/src/Windows/UnityAppWin32.cpp b/unityplugin/UnityEmulator/src/Windows/UnityAppWin32.cpp
index a9b56b3..7a13f8c 100644
--- a/unityplugin/UnityEmulator/src/Windows/UnityAppWin32.cpp
+++ b/unityplugin/UnityEmulator/src/Windows/UnityAppWin32.cpp
@@ -41,11 +41,16 @@ public:
     }
 };
 
+namespace Diligent
+{
+
 NativeAppBase* CreateApplication()
 {
     return new UnityAppWin32();
 }
 
+}
+
 void* UnityAppBase::LoadPluginFunction(const char* FunctionName)
 {
     auto Func = GetProcAddress(g_DLLHandle, FunctionName);