Changeset 1151

Timestamp:

Apr 24, 2008, 12:47:29 AM (17 years ago)

Author:

landauf

Message:

added cpptcl and some first tests

Location:

code/branches/console

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/FindTCL.cmake (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (2 diffs)
• src/core/InputBuffer.cc (modified) (1 diff)
• src/core/InputBuffer.h (modified) (1 diff)
• src/core/TclBind.cc (added)
• src/core/TclBind.h (added)
• src/cpptcl (added)
• src/cpptcl/CMakeLists.txt (added)
• src/cpptcl/CREDITS (added)
• src/cpptcl/CppTcl.cc (added)
• src/cpptcl/CppTcl.h (added)
• src/cpptcl/LICENSE (added)
• src/cpptcl/README (added)
• src/cpptcl/details (added)
• src/cpptcl/details/callbacks.h (added)
• src/cpptcl/details/callbacks_v.h (added)
• src/cpptcl/details/constructors.h (added)
• src/cpptcl/details/conversions.h (added)
• src/cpptcl/details/dispatchers.h (added)
• src/cpptcl/details/metahelpers.h (added)
• src/cpptcl/details/methods.h (added)
• src/cpptcl/details/methods_v.h (added)
• src/orxonox/Orxonox.cc (modified) (2 diffs)

code/branches/console/CMakeLists.txt

@@ -63 +63 @@
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Lua)
+FIND_PACKAGE(TCL)
 
 #Set the search paths for the linking
@@ -72 +73 @@
   ${Boost_LIBRARY_DIRS}
   ${Zlib_LIBRARY_DIR}
+  ${TCL_LIBRARY}
 )
 
@@ -86 +88 @@
   ${OGG_INCLUDE_DIR}
   ${Lua_INCLUDE_DIR}
+  ${TCL_INCLUDE_PATH}
 )
 

code/branches/console/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(orxonox)
-INCLUDE_DIRECTORIES(tolua)
 
 ADD_SUBDIRECTORY(tolua)
+ADD_SUBDIRECTORY(cpptcl)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)

code/branches/console/src/core/CMakeLists.txt

@@ -26 +26 @@
   Tickable.cc
   Script.cc
+  TclBind.cc
 )
 
@@ -33 +34 @@
   util
   tolualib
+  cpptcl
   ${Lua_LIBRARIES}
   ${OIS_LIBRARIES}

code/branches/console/src/core/InputBuffer.cc

@@ -39 +39 @@
     {
         //this->bActivated_ = false;
-        this->allowedChars_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZäöüÄÖÜ0123456789 \\\"().:,;_-+*/=!?<>[|]";
+        this->allowedChars_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZäöüÄÖÜ0123456789 \\\"(){}[]<>.:,;_-+*/=!?|$&%^";
         this->keyboard_ = InputManager::getSingleton().getKeyboard();
         this->buffer_ = "";
 
         //this->keyboard_->setEventCallback(this);
+    }
+
+    InputBuffer::InputBuffer(const std::string allowedChars)
+    {
+        //this->bActivated_ = false;
+        this->allowedChars_ = allowedChars;
+        this->keyboard_ = InputManager::getSingleton().getKeyboard();
+        this->buffer_ = "";
     }
 /*

code/branches/console/src/core/InputBuffer.h

@@ -59 +59 @@
         public:
             InputBuffer();
+            InputBuffer(const std::string allowedChars);
 
             template <class T>

code/branches/console/src/orxonox/Orxonox.cc

@@ -423 +423 @@
     ib->registerListener(console, &Testconsole::listen, true);
     ib->registerListener(console, &Testconsole::execute, '\r', false);
-    ib->registerListener(console, &Testconsole::execute, '\n', false);
     ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
     ib->registerListener(console, &Testconsole::clear, '§', true);
@@ -433 +432 @@
     ib->registerListener(orxonoxConsole_, &InGameConsole::listen, true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::execute, '\r', false);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::execute, '\n', false);
     ib->registerListener(orxonoxConsole_, &InGameConsole::hintandcomplete, '\t', true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::clear, '§', true);