Changeset 5655

Timestamp:

Aug 17, 2009, 4:41:03 PM (15 years ago)

Author:

rgrieder

Message:

Added static DeclareToluaInterface macro to ease up tolua intefaces for modules.

Location:

code/branches/resource2/src

Files:

• core/Core.cc (modified) (2 diffs)
• core/LuaState.cc (modified) (2 diffs)
• core/LuaState.h (modified) (1 diff)
• core/ToluaInterface.h (added)
• orxonox/Main.cc (modified) (2 diffs)
• orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/resource2/src/core/Core.cc

@@ -78 +78 @@
 #include "TclBind.h"
 #include "TclThreadManager.h"
-#include "ToluaBindCore.h"
 #include "input/InputManager.h"
 
@@ -267 +266 @@
             setThreadAffinity(static_cast<unsigned int>(limitToCPU));
 #endif
-        // Add tolua interface
-        LuaState::addToluaInterface(&tolua_Core_open, "Core");
 
         // Manage ini files and set the default settings file (usually orxonox.ini)

code/branches/resource2/src/core/LuaState.cc

@@ -39 +39 @@
 #include "Core.h"
 #include "Resource.h"
+#include "ToluaBindCore.h"
 
 namespace orxonox
@@ -44 +45 @@
     LuaState::ToluaInterfaceMap LuaState::toluaInterfaces_s;
     std::vector<LuaState*> LuaState::instances_s;
+
+    // Do this after declaring toluaInterfaces_s and instances_s to avoid larger problems
+    DeclareToluaInterface(Core);
 
     LuaState::LuaState()

code/branches/resource2/src/core/LuaState.h

@@ -40 +40 @@
 
 #include "util/ScopeGuard.h"
+#include "ToluaInterface.h"
 
 // tolua_begin

code/branches/resource2/src/orxonox/Main.cc

@@ -48 +48 @@
 #include "core/CommandLine.h"
 #include "core/Game.h"
+#include "core/LuaState.h"
+#include "ToluaBindOrxonox.h"
 
 SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
@@ -55 +57 @@
 SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
 SetCommandLineSwitch(standalone).information("Start in standalone mode");
+
+DeclareToluaInterface(Orxonox);
 
 /*

code/branches/resource2/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "core/LuaState.h"
 #include "network/NetworkFunction.h"
-#include "ToluaBindOrxonox.h"
 #include "tools/Timer.h"
 #include "interfaces/TimeFactorListener.h"
@@ -53 +51 @@
         this->ccSetTimeFactor_ = 0;
         this->ccPause_ = 0;
-
-        // Tell LuaBind about all tolua interfaces
-        LuaState::addToluaInterface(&tolua_Orxonox_open, "Orxonox");
     }