Refactor Application Framework.

Make the ANSI logger compile, update examples_tests

Author: devshgraphicsprogramming

examples_tests

@@ -6,6 +6,7 @@
 #include "nbl/system/IApplicationFramework.h"
 #include "nbl/system/CStdoutLoggerAndroid.h"
 
+// TODO: move to .cpp file
 #ifdef _NBL_PLATFORM_ANDROID_
 #include <android_native_app_glue.h>
 #include <android/sensor.h>
@@ -15,7 +16,7 @@
 namespace nbl::system
 {
 #ifdef _NBL_PLATFORM_ANDROID_
-
+// TODO: fill rewrite of this thing, also rename to `IApplicationAndroid`
 class CApplicationAndroid : public IApplicationFramework
 {
     public:
@@ -140,6 +141,11 @@ class CApplicationAndroid : public IApplicationFramework
         bool keepPolling() const { return eventPoller.continuePredicate(); }
 };
 
+#define NBL_MAIN_FUNC(AppClass, ...) void android_main(android_app* app) \
+    {\
+		nbl::system::IApplicationFramework::main<AppClass>(app __VA_OPT__(,) __VA_ARGS__);\
+    }
+
 #endif
 }
 

include/nbl/system/CApplicationAndroid.h

@@ -9,10 +9,10 @@ namespace nbl::system
 {
 
 // logging using ANSI escape codes
-class NBL_API2 CColoredStdoutLoggerANSI : public IThreadsafeLogger
+class CColoredStdoutLoggerANSI : public IThreadsafeLogger
 {
   public:
-    CColoredStdoutLoggerANSI(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
+    inline CColoredStdoutLoggerANSI(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
 
   private:
     // more info about how this works: https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797

include/nbl/system/CColoredStdoutLoggerANSI.h

@@ -19,7 +19,7 @@
 namespace nbl::system
 {
 
-class IApplicationFramework
+class IApplicationFramework : public core::IReferenceCounted
 {
 	public:
         // this is safe to call multiple times
@@ -52,13 +52,29 @@ class IApplicationFramework
             #endif
         }
 
+        // we take the derived class as Curiously Recurring Template Parameter
+        template<class CRTP> requires std::is_base_of_v<IApplicationFramework,CRTP>
+        static int main(int argc, char** argv)
+        {
+            path CWD = system::path(argv[0]).parent_path().generic_string() + "/";
+            auto app = core::make_smart_refctd_ptr<CRTP>(CWD/"../../media/",CWD/"../../tmp/",CWD/"../",CWD);
+            for (auto i=0; i<argc; i++)
+                app->argv.emplace_back(argv[i]);
+
+            if (!app->onAppInitialized(nullptr))
+                return -1;
+            while (app->keepRunning())
+                app->workLoopBody();
+           return app->onAppTerminated() ? 0:(-2);
+        }
+
         static nbl::core::smart_refctd_ptr<ISystem> createSystem()
         {
             GlobalsInit();
             #ifdef _NBL_PLATFORM_WINDOWS_
                 return nbl::core::make_smart_refctd_ptr<CSystemWin32>();
             #elif defined(_NBL_PLATFORM_ANDROID_)
-                return nbl::core::make_smart_refctd_ptr<CSystemAndroid>(std::move(caller));
+                return nullptr;
             #endif
             return nullptr;
         }
@@ -73,29 +89,26 @@ class IApplicationFramework
             GlobalsInit();
 		}
 
-        virtual void setSystem(core::smart_refctd_ptr<ISystem>&& system) = 0;
+        // DEPRECATED
+        virtual void setSystem(core::smart_refctd_ptr<ISystem>&& system) {}
 
-        void onAppInitialized()
-        {
-            return onAppInitialized_impl();
-        }
-        void onAppTerminated()
-        {
-            return onAppTerminated_impl();
-        }
+        // Some platforms are weird, and you can't really do anything with the system unless you have some magical object that gets passed to the platform's entry point.
+        // Therefore the specific `CPLATFORMSystem` is uncreatable out of thin air so you need to take an outside provided one
+        virtual bool onAppInitialized(core::smart_refctd_ptr<ISystem>&& system=nullptr) {onAppInitialized_impl(std::move(system)); return true;}
+        virtual bool onAppTerminated() {return true;}
 
         virtual void workLoopBody() = 0;
         virtual bool keepRunning() = 0;
 
-        // TODO: refactor/hide
-        std::vector<std::string> argv;
-
     protected:
         ~IApplicationFramework() {}
 
-        // TODO: why aren't these pure virtual, and why do we even need a `_impl()`suffix?
-        virtual void onAppInitialized_impl() {}
-        virtual void onAppTerminated_impl() {}
+        // DEPRECATED
+        virtual void onAppInitialized_impl(core::smart_refctd_ptr<ISystem>&& system) {assert(false);}
+        virtual void onAppTerminated_impl() {assert(false);}
+
+        // for platforms with cmdline args
+        core::vector<std::string> argv;
 
         /*
          ****************** Current Working Directories ********************
@@ -130,4 +143,14 @@ class IApplicationFramework
 
 }
 
+// get the correct entry point to declate
+#ifdef _NBL_PLATFORM_ANDROID_
+    #include "nbl/system/CApplicationAndroid.h"
+#else
+    #define NBL_MAIN_FUNC(AppClass) int main(int argc, char** argv) \
+    {\
+		return AppClass::main<AppClass>(argc,argv);\
+    }
+#endif
+
 #endif

include/nbl/system/IApplicationFramework.h

@@ -9,22 +9,22 @@ namespace nbl::system
 {
 class IThreadsafeLogger : public ILogger
 {
-	mutable std::mutex m_mutex;
-public:
-	IThreadsafeLogger(core::bitflag<E_LOG_LEVEL> logLevelMask) : ILogger(logLevelMask) {}
-	// Inherited via ILogger
-	void log_impl(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list args) override final
-	{
-		auto l = lock();
-		threadsafeLog_impl(fmtString, logLevel, args);
-	}
-private:
-	virtual void threadsafeLog_impl(const std::string_view&, E_LOG_LEVEL logLevel, va_list args) = 0;
+		mutable std::mutex m_mutex;
+	public:
+		inline IThreadsafeLogger(core::bitflag<E_LOG_LEVEL> logLevelMask) : ILogger(logLevelMask) {}
+		// Inherited via ILogger
+		inline void log_impl(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list args) override final
+		{
+			auto l = lock();
+			threadsafeLog_impl(fmtString, logLevel, args);
+		}
+	private:
+		virtual void threadsafeLog_impl(const std::string_view&, E_LOG_LEVEL logLevel, va_list args) = 0;
 
-	std::unique_lock<std::mutex> lock() const
-	{
-		return std::unique_lock<std::mutex>(m_mutex);
-	}
+		inline std::unique_lock<std::mutex> lock() const
+		{
+			return std::unique_lock<std::mutex>(m_mutex);
+		}
 
 };
 }