Removed individual macros and created SUPERNOVA_INIT

Author: eduardodoria

engine/core/Engine.cpp

@@ -93,6 +93,11 @@ FunctionSubscribe<void(int,bool,int)> Engine::onKeyDown;
 FunctionSubscribe<void(int,bool,int)> Engine::onKeyUp;
 FunctionSubscribe<void(wchar_t)> Engine::onCharInput;
 
+FunctionSubscribe<void()>& Engine::getOnInit() {
+    // This static variable is guaranteed to be created the first time this function is called
+    static FunctionSubscribe<void()> onInit;
+    return onInit;
+}
 
 void Engine::setScene(Scene* scene){
     if (asyncThread)
@@ -554,12 +559,14 @@ void Engine::calculateCanvas(){
     }
 }
 
-void Engine::systemInit(int argc, char* argv[]){
+void Engine::systemInit(int argc, char* argv[], System* system){
     #ifndef NO_THREAD_SUPPORT
         size_t maxThreads = std::max(1u, std::thread::hardware_concurrency() - 1);
         ThreadPoolManager::initialize(maxThreads);
     #endif
 
+    System::setSystemInstance(system);
+
     Engine::setCanvasSize(1000,480);
 
     lastTime = 0;
@@ -580,7 +587,7 @@ void Engine::systemInit(int argc, char* argv[]){
     LuaBinding::init();
     #endif
     #ifndef NO_CPP_INIT
-    init();
+    getOnInit().call();
     #endif
 }
 

engine/core/Engine.h

@@ -68,7 +68,16 @@
 #include <atomic>
 #include <unordered_set>
 
-void init();
+#define SUPERNOVA_INIT \
+    void init(); \
+    namespace { \
+        struct InitRegistrar { \
+            InitRegistrar() { \
+                Supernova::Engine::getOnInit().add("user_init", &init); \
+            } \
+        }; \
+        static InitRegistrar _supernova_init_registrar; \
+    }
 
 namespace Supernova {
 
@@ -267,7 +276,7 @@ namespace Supernova {
         static void clearAllSubscriptions(bool includeLifecycle);
 
         //-----Supernova API functions-----
-        static void systemInit(int argc, char* argv[]);
+        static void systemInit(int argc, char* argv[], System* system);
         static void systemViewLoaded();
         static void systemViewChanged();
         static void systemDraw();
@@ -295,6 +304,10 @@ namespace Supernova {
         static void systemCharInput(wchar_t codepoint);
 
         //-----Supernova user events-----
+        // Safe accessor for the Init event
+        static FunctionSubscribe<void()>& getOnInit();
+
+        // Existing events (keep these as they are safe for runtime usage)
         static FunctionSubscribe<void()> onViewLoaded;
         static FunctionSubscribe<void()> onViewChanged;
         static FunctionSubscribe<void()> onViewDestroyed;

engine/core/System.cpp

@@ -10,52 +10,22 @@
 
 using namespace Supernova;
 
-System* System::external = nullptr;
+System* System::systemInstance = nullptr;
 
 #define USERSETTINGS_ROOT "userSettings"
 #define USERSETTINGS_XML_FILE "data://UserSettings.xml"
 
-#ifdef SUPERNOVA_ANDROID
-#include "SupernovaAndroid.h"
-#endif
-#ifdef SUPERNOVA_IOS
-#include "SupernovaIOS.h"
-#endif
-#ifdef SUPERNOVA_WEB
-#include "SupernovaWeb.h"
-#endif
-#ifdef SUPERNOVA_SOKOL
-#include "SupernovaSokol.h"
-#endif
-#ifdef SUPERNOVA_GLFW
-#include "SupernovaGLFW.h"
-#endif
-#ifdef SUPERNOVA_APPLE
-#include "SupernovaApple.h"
-#endif
-
 System& System::instance(){
-#ifdef SUPERNOVA_ANDROID
-    static System* instance = new SupernovaAndroid();
-#elif defined(SUPERNOVA_IOS)
-    static System* instance = new SupernovaIOS();
-#elif defined(SUPERNOVA_WEB)
-    static System* instance = new SupernovaWeb();
-#elif defined(SUPERNOVA_SOKOL)
-    static System* instance = new SupernovaSokol();
-#elif defined(SUPERNOVA_GLFW)
-    static System* instance = new SupernovaGLFW();
-#elif defined(SUPERNOVA_APPLE)
-    static System* instance = new SupernovaApple();
-#else
-    static System* instance = external;
-#endif
+    if (!systemInstance) {
+        Log::error("System instance not set. Engine must call System::setSystemInstance() during initialization.");
+        abort();
+    }
 
-    return *instance;
+    return *systemInstance;
 }
 
-void System::setExternalSystem(System* system){
-    external = system;
+void System::setSystemInstance(System* system){
+    systemInstance = system;
 }
 
 sg_environment System::getSokolEnvironment(){

engine/core/System.h

@@ -18,6 +18,8 @@
 #include "sokol_gfx.h"
 
 namespace Supernova {
+    class Engine;
+
     enum class AdMobRating{
         General,
         ParentalGuidance,
@@ -41,7 +43,12 @@ namespace Supernova {
     class SUPERNOVA_API System {
     private:
 
-        static System* external;
+        friend class Engine;
+
+        static System* systemInstance;
+
+        // Only Engine is allowed to inject an external System implementation.
+        static void setSystemInstance(System* system);
 
     protected:
 
@@ -54,8 +61,6 @@ namespace Supernova {
 
         virtual ~System() {}
 
-        static void setExternalSystem(System* system);
-
         // *******
         // Used for user and Lua
         // *******

platform/android/NativeEngine.cpp

@@ -110,7 +110,7 @@ NativeEngine::NativeEngine(struct android_app *app) {
 
     setupJNI();
 
-    Supernova::Engine::systemInit(0, nullptr);
+    Supernova::Engine::systemInit(0, nullptr, new SupernovaAndroid());
 }
 
 NativeEngine::~NativeEngine() {

platform/apple/Renderer.mm

@@ -43,7 +43,7 @@ -(char**)getArray:(NSArray*)a_array
 
 - (nonnull instancetype)initWithMetalKitView:(nonnull MTKView *)view withArgs:(NSArray*)args;
 {
-    Supernova::Engine::systemInit((int)[args count], [self getArray:args]);
+    Supernova::Engine::systemInit((int)[args count], [self getArray:args], new SupernovaApple());
 
     self = [super init];
     if(self)

platform/emscripten/SupernovaWeb.cpp

@@ -147,7 +147,7 @@ int SupernovaWeb::init(int argc, char **argv){
 		});
 	);
 
-    Supernova::Engine::systemInit(argc, argv);
+    Supernova::Engine::systemInit(argc, argv, new SupernovaWeb());
 
     sampleCount = (antiAlias) ? 4 : 1;
 

platform/glfw/SupernovaGLFW.cpp

@@ -33,7 +33,7 @@ int SupernovaGLFW::init(int argc, char **argv){
 
     sampleCount = 1;
 
-    Supernova::Engine::systemInit(argc, argv);
+    Supernova::Engine::systemInit(argc, argv, new SupernovaGLFW());
 
     /* create window and GL context via GLFW */
     glfwInit();

platform/sokol/main.cpp

@@ -87,7 +87,7 @@ sapp_desc sokol_main(int argc, char* argv[]) {
     app_desc.sample_count = 4;
     app_desc.window_title = "Supernova";
 
-    Supernova::Engine::systemInit(argc, argv);
+    Supernova::Engine::systemInit(argc, argv, new SupernovaSokol());
 
     return app_desc;
 }

project/main.cpp

@@ -6,8 +6,7 @@ using namespace Supernova;
 Scene scene;
 Image image(&scene);
 
-void init(){
-
+SUPERNOVA_INIT void init(){
     image.setAnchorPreset(AnchorPreset::CENTER);
     image.setTexture("supernova.png");