Ticket #2517: global_components.diff

source/simulation2/system/ComponentManager.cpp

@@ -69 +69 @@
     // these functions, so we skip registering them here in those cases
     if (!skipScriptFunctions)
     {
-        m_ScriptInterface.RegisterFunction<void, int, std::string, CScriptVal, CComponentManager::Script_RegisterComponentType> ("RegisterComponentType");
+        m_ScriptInterface.RegisterFunction<void, int, std::string, CScriptVal, CComponentManager::Script_RegisterNewComponentType> ("RegisterComponentType");
+        m_ScriptInterface.RegisterFunction<void, int, std::string, CScriptVal, CComponentManager::Script_ReRegisterComponentType> ("ReRegisterComponentType");
         m_ScriptInterface.RegisterFunction<void, std::string, CComponentManager::Script_RegisterInterface> ("RegisterInterface");
         m_ScriptInterface.RegisterFunction<void, std::string, CComponentManager::Script_RegisterMessageType> ("RegisterMessageType");
         m_ScriptInterface.RegisterFunction<void, std::string, CScriptVal, CComponentManager::Script_RegisterGlobal> ("RegisterGlobal");
@@ -143 +144 @@
     return ok;
 }
 
-void CComponentManager::Script_RegisterComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor)
+void CComponentManager::Script_RegisterComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor, bool reRegister)
 {
     CComponentManager* componentManager = static_cast<CComponentManager*> (pCxPrivate->pCBData);
     JSContext* cx = componentManager->m_ScriptInterface.GetContext();
@@ -163 +164 @@
     ComponentTypeId cid = componentManager->LookupCID(cname);
     if (cid == CID__Invalid)
     {
+        if (reRegister)
+        {
+            componentManager->m_ScriptInterface.ReportError("ReRegistering component type that was not registered before"); // TODO: report the actual name
+            return;
+        }
         // Allocate a new cid number
         cid = componentManager->m_NextScriptComponentTypeId++;
         componentManager->m_ComponentTypeIdsByName[cname] = cid;
@@ -171 +177 @@
     {
         // Component type is already loaded, so do hotloading:
 
-        if (!componentManager->m_CurrentlyHotloading)
+        if (!componentManager->m_CurrentlyHotloading && !reRegister)
         {
             componentManager->m_ScriptInterface.ReportError("Registering component type with already-registered name"); // TODO: report the actual name
             return;
@@ -182 +188 @@
         // We can only replace scripted component types, not native ones
         if (ctPrevious.type != CT_Script)
         {
-            componentManager->m_ScriptInterface.ReportError("Hotloading script component type with same name as native component");
+            componentManager->m_ScriptInterface.ReportError("Loading script component type with same name as native component");
             return;
         }
 
@@ -303 +309 @@
     }
 }
 
+void CComponentManager::Script_RegisterNewComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor)
+{
+    CComponentManager* componentManager = static_cast<CComponentManager*> (pCxPrivate->pCBData);
+    componentManager->Script_RegisterComponentType(pCxPrivate, iid, cname, ctor, false);
+    componentManager->m_ScriptInterface.SetGlobal(cname.c_str(), ctor, componentManager->m_CurrentlyHotloading);
+}
+
+void CComponentManager::Script_ReRegisterComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor)
+{
+    CComponentManager* componentManager = static_cast<CComponentManager*> (pCxPrivate->pCBData);
+    componentManager->Script_RegisterComponentType(pCxPrivate, iid, cname, ctor, true);
+}
+
 void CComponentManager::Script_RegisterInterface(ScriptInterface::CxPrivate* pCxPrivate, std::string name)
 {
     CComponentManager* componentManager = static_cast<CComponentManager*> (pCxPrivate->pCBData);

source/simulation2/system/ComponentManager.h

@@ -242 +242 @@
 
 private:
     // Implementations of functions exposed to scripts
-    static void Script_RegisterComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor);
+    static void Script_RegisterComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor, bool reRegister);
+    static void Script_ReRegisterComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor);
+    static void Script_RegisterNewComponentType(ScriptInterface::CxPrivate* pCxPrivate, int iid, std::string cname, CScriptVal ctor);
     static void Script_RegisterInterface(ScriptInterface::CxPrivate* pCxPrivate, std::string name);
     static void Script_RegisterMessageType(ScriptInterface::CxPrivate* pCxPrivate, std::string name);
     static void Script_RegisterGlobal(ScriptInterface::CxPrivate* pCxPrivate, std::string name, CScriptVal value);