Changeset 7199 for code/branches/consolecommands3/src/libraries/core/input

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.

Location:

code/branches/consolecommands3/src/libraries/core/input

Files:

• KeyBinderManager.cc (modified) (2 diffs)
• KeyBinderManager.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

@@ -34 +34 @@
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
+#include "core/LuaState.h"
 #include "core/ScopedSingletonManager.h"
 #include "InputManager.h"
@@ -187 +188 @@
         // else: A key was probably pressed within the same tick, ignore it.
     }
+
+    void KeyBinderManager::registerKeybindCallback(LuaFunctor* function)
+    {
+        this->callbackFunction_ = function;
+    }
 }

code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.h

@@ -99 +99 @@
         void unbind(const std::string& binding); //tolua_export
         void tunbind(const std::string& binding);
-        inline void registerKeybindCallback(const FunctorPtr& function) { this->callbackFunction_ = function; } // tolua//_//export // <-- FIXME
+        void registerKeybindCallback(LuaFunctor* function); //tolua_export
 
     private:
@@ -114 +114 @@
 
         // keybind command related
-        FunctorPtr callbackFunction_;                //! Function to be called when key was pressed after "keybind" command
+        SharedPtr<LuaFunctor> callbackFunction_;     //! Function to be called when key was pressed after "keybind" command
         bool bBinding_;                              //! Tells whether a key binding process is active
         bool bTemporary_;                            //! Stores tkeybind/keybind value