Changeset 1959

Timestamp:

Oct 19, 2008, 11:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged script_trigger branch into objecthierarchy branch.
Also merged changes in Script.cc and Script.h manually to LuaBind.cc and LuaBind.h.

Location:

code/branches/objecthierarchy

Files:

• . (modified) (1 prop)
• src/core/CMakeLists.txt (modified) (2 diffs)
• src/core/Loader.cc (modified) (2 diffs)
• src/core/LuaBind.cc (copied) (copied from code/branches/script_trigger/src/core/LuaBind.cc) (10 diffs, 1 prop)
• src/core/LuaBind.h (copied) (copied from code/branches/script_trigger/src/core/LuaBind.h) (4 diffs, 1 prop)
• src/core/Script.cc (deleted)
• src/core/Script.h (deleted)
• src/core/tolua/tolua.pkg (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/DistanceTrigger.cc (copied) (copied from code/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc) (1 prop)
• src/orxonox/objects/DistanceTrigger.h (copied) (copied from code/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h) (1 prop)
• src/orxonox/objects/Script.cc (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Script.cc) (1 prop)
• src/orxonox/objects/Script.h (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Script.h) (1 prop)
• src/orxonox/objects/Trigger.cc (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Trigger.cc) (1 diff, 1 prop)
• src/orxonox/objects/Trigger.h (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Trigger.h) (1 diff, 1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)

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

@@ -6 +6 @@
   GameState.cc
   Language.cc
+  Luabind.cc
   ObjectListBase.cc
   OrxonoxClass.cc
   RootGameState.cc
-  Script.cc
 
   # command
@@ -62 +62 @@
     tolua_orxonox
     tolua/tolua.pkg
-    Script.h
+    LuaBind.h
     CommandExecutor.h
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib

code/branches/objecthierarchy/src/core/Loader.cc

@@ -34 +34 @@
 #include "ObjectList.h"
 #include "CoreIncludes.h"
-#include "Script.h"
+#include "LuaBind.h"
 #include "Namespace.h"
 #include "util/Debug.h"
@@ -119 +119 @@
 
         // let Lua work this out:
-        //Script* lua;
-        /*Script::loadFile(level->getFile(), true);
-        Script::init(Script::getLuaState());
-        Script::run();*/
-        Script* lua = Script::getInstance();
+        LuaBind* lua = LuaBind::getInstance();
         lua->clearLuaOutput();
         lua->loadFile(level->getFile(), true);

code/branches/objecthierarchy/src/core/LuaBind.cc

@@ -32 +32 @@
 #include <map>
 
-#include "CoreIncludes.h"
-
-extern "C" {
-#include <lualib.h>
-#include <lauxlib.h>
-}
-
+#include "lua/lua.hpp"
 #include "tolua/tolua++.h"
 #include "tolua/tolua_bind.h"
+#include "util/String.h"
+#include "CoreIncludes.h"
 
 namespace orxonox
@@ -60 +56 @@
     luaopen_debug(luaState_);
 #endif
-    tolua_core_open(luaState_);
+    tolua_Core_open(luaState_);
     output_ = "";
     isRunning_ = false;
@@ -68 +64 @@
   {
     output_ += str;
-    COUT(4) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
+//    COUT(4) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
+    COUT(5) << str;
   }
 
@@ -101 +98 @@
 
     if (luaTags) luaSource_ = replaceLuaTags(levelString);
-    COUT(4) << "ParsedSourceCode: " << luaSource_ << std::endl;
+    COUT(5) << "ParsedSourceCode: " << luaSource_ << std::endl;
   }
 
@@ -152 +149 @@
   }
 
-  unsigned int LuaBind::getNextQuote(const std::string& text, unsigned int start)
-  {
-    unsigned int quote = start - 1;
-
-    while ((quote = text.find('\"', quote + 1)) != std::string::npos)
-    {
-      unsigned int backslash = quote;
-      unsigned int numbackslashes = 0;
-      for (; backslash > 0; backslash--, numbackslashes++)
-        if (text[backslash - 1] != '\\')
-          break;
-
-      if (numbackslashes % 2 == 0)
-        break;
-    }
-
-    return quote;
-  }
-
   std::string LuaBind::replaceLuaTags(const std::string& text)
   {
     // chreate map with all Lua tags
-    std::map<unsigned int, bool> luaTags;
-    {
-      unsigned int pos = 0;
+    std::map<size_t, bool> luaTags;
+    {
+      size_t pos = 0;
       while ((pos = text.find("<?lua", pos)) != std::string::npos)
         luaTags[pos++] = true;
     }
     {
-      unsigned int pos = 0;
+      size_t pos = 0;
       while ((pos = text.find("?>", pos)) != std::string::npos)
         luaTags[pos++] = false;
@@ -188 +166 @@
     // erase all tags from the map that are between two quotes
     {
-      std::map<unsigned int, bool>::iterator it = luaTags.begin();
-      std::map<unsigned int, bool>::iterator it2 = it;
+      std::map<size_t, bool>::iterator it = luaTags.begin();
+      std::map<size_t, bool>::iterator it2 = it;
       bool bBetweenQuotes = false;
-      unsigned int pos = 0;
+      size_t pos = 0;
       while ((pos = getNextQuote(text, pos)) != std::string::npos)
       {
@@ -214 +192 @@
     {
       bool expectedValue = true;
-      for (std::map<unsigned int, bool>::iterator it = luaTags.begin(); it != luaTags.end(); ++it)
-      {
-        if ((*it).second == expectedValue)
+      for (std::map<size_t, bool>::iterator it = luaTags.begin(); it != luaTags.end(); ++it)
+      {
+        if (it->second == expectedValue)
           expectedValue = !expectedValue;
         else
@@ -234 +212 @@
     std::string output;
     {
-      std::map<unsigned int, bool>::iterator it = luaTags.begin();
+      std::map<size_t, bool>::iterator it = luaTags.begin();
       bool bInPrintFunction = true;
-      unsigned int start = 0;
-      unsigned int end = 0;
+      size_t start = 0;
+      size_tend = 0;
 
       do
@@ -253 +231 @@
           std::string temp = text.substr(start, end - start);
           {
-            unsigned int pos = 0;
+            size_t pos = 0;
             while ((pos = temp.find('[', pos)) != std::string::npos)
             {
               unsigned int tempCounter = 1;
-              unsigned int tempPos = pos++;
+              size_t tempPos = pos++;
               while(temp[++tempPos] == '=') {
                 tempCounter++;
@@ -272 +250 @@
           }
           {
-            unsigned int pos = 0;
+            size_t pos = 0;
             while ((pos = temp.find(']', pos)) != std::string::npos)
             {
               unsigned int tempCounter = 1;
-              unsigned int tempPos = pos++;
+              size_t tempPos = pos++;
               while(temp[++tempPos] == '=') {
                 tempCounter++;

code/branches/objecthierarchy/src/core/LuaBind.h

@@ -28 +28 @@
 
 /**
- @file  LuaBind.h
+ @file
  @brief Representation of an interface to lua
  @author Benjamin Knecht <beni_at_orxonox.net>
@@ -39 +39 @@
 
 extern "C" {
-#include <lua.h>
+#include <lua/lua.h>
 }
 
@@ -47 +47 @@
 namespace orxonox // tolua_export
 { // tolua_export
-
-  class _CoreExport LuaBind // tolua_export
-  { // tolua_export
+  class _CoreExport LuaBind
+  {
+  /*
+  class LuaBind { // tolua_export
+  */
     struct LoadS {
       const char *s;
@@ -73 +75 @@
     inline std::string getLuaOutput() { return output_; };
     //inline std::string* getFileString() { return &fileString_; };
+    inline void clearLuaOutput() { output_ = ""; }
 
-    unsigned int getNextQuote(const std::string& text, unsigned int start);
     std::string replaceLuaTags(const std::string& text); // tolua_export
 

code/branches/objecthierarchy/src/core/tolua/tolua.pkg

@@ -1 @@
-$cfile "../../src/core/Script.h"
+$cfile "../../src/core/LuaBind.h"
 $cfile "../../src/core/CommandExecutor.h"

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -54 +54 @@
   objects/Tickable.cc
   objects/Test.cc
+  objects/Script.cc
+  objects/Trigger.cc
+  objects/DistanceTrigger.cc
 
   objects/infos/Info.cc
@@ -74 +77 @@
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
-        
+
+
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 

code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc

@@ -223 +223 @@
     XMLPortParamLoadOnly(Trigger, "stayOn", setStayOn, xmlelement, mode);
     XMLPortParamLoadOnly(Trigger, "activations", setActivations, xmlelement, mode);
+    XMLPortParamLoadOnly(Trigger, "invert", setInvert, xmlelement, mode);
     //XMLPortParamLoadOnlyTemplate(Trigger, "mode", setMode, xmlelement, mode, std::string);
 

code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

@@ -56 +56 @@
       inline bool isActive() { return bActive_; }
       void addTrigger(Trigger* trig);
+      void setInvert(int invert) { bInvertMode_ = invert; }
       const Trigger* getTrigger(unsigned int index) const;
       void setVisibility(bool bVisible);