Changeset 7199 for code/branches/consolecommands3/src/libraries/core/LuaState.h

Timestamp:

Aug 21, 2010, 10:20:09 PM (14 years ago)

Author:

landauf

Message:

LuaFunctor better doesn't inherit from Functor since it's used completely differently. Saves us the hassle of exporting FunctorPtr to Lua and a bunch of useless functions.

File:

• code/branches/consolecommands3/src/libraries/core/LuaState.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/LuaState.h

@@ -40 +40 @@
 
 #include "util/ScopeGuard.h"
-#include "Functor.h"
 #include "ToluaInterface.h"
 
 namespace orxonox // tolua_export
 { // tolua_export
-    class Functor; // tolua_export
+    class LuaFunctor; // tolua_export
 
-    //! Functor subclass that simply executes code with 0 arguments.
-    class _CoreExport LuaFunctor : public Functor
+    //! callback class that executes lua code
+    class _CoreExport LuaFunctor
     {
         public:
             LuaFunctor(const std::string& code, LuaState* luaState);
-            MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null);
-            void evaluateParam(unsigned int index, MultiType& param) const {}
-
-            Functor::Type::Enum getType() const { return Functor::Type::Lua; } \
-            unsigned int getParamCount() const { return 0; }
-            bool hasReturnvalue() const { return 0; }
-            std::string getTypenameParam(unsigned int param) const { return BLANKSTRING; }
-            std::string getTypenameReturnvalue() const { return BLANKSTRING; }
-
-            const std::type_info& getHeaderIdentifier() const { return typeid(this); }
+            void operator()();
 
         private:
@@ -99 +89 @@
         const shared_ptr<ResourceInfo>& getDefaultResourceInfo() { return this->sourceFileInfo_; }
 
-        Functor* createLuaFunctor(const std::string& code) { return new LuaFunctor(code, this); } // tolua_export
+        LuaFunctor* createLuaFunctor(const std::string& code) { return new LuaFunctor(code, this); } // tolua_export
         //! Tells about whether IOConsole was activated. The Lua debugger only works with a normal console.
         bool usingIOConsole() const; // tolua_export