Changeset 1122

Timestamp:

Apr 21, 2008, 7:42:58 PM (16 years ago)

Author:

rgrieder

Message:

merged trunk into cmake branch

Location:

code/branches/cmake

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/tolua-exec-script (deleted)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (2 diffs)
• src/core/ConfigFileManager.h (modified) (1 diff)
• src/core/Script.cc (modified) (1 diff)
• src/core/tolua (deleted)
• src/orxonox/Orxonox.cc (modified) (6 diffs)
• src/tolua (copied) (copied from code/trunk/src/tolua)
• src/tolua/CMakeLists.txt (copied) (copied from code/trunk/src/tolua/CMakeLists.txt)
• src/tolua/tolua++.h (copied) (copied from code/trunk/src/tolua/tolua++.h)
• src/tolua/tolua.c (copied) (copied from code/trunk/src/tolua/tolua.c)
• src/tolua/tolua.pkg (copied) (copied from code/trunk/src/tolua/tolua.pkg)
• src/tolua/tolua_event.c (copied) (copied from code/trunk/src/tolua/tolua_event.c)
• src/tolua/tolua_event.h (copied) (copied from code/trunk/src/tolua/tolua_event.h)
• src/tolua/tolua_is.c (copied) (copied from code/trunk/src/tolua/tolua_is.c)
• src/tolua/tolua_map.c (copied) (copied from code/trunk/src/tolua/tolua_map.c)
• src/tolua/tolua_push.c (copied) (copied from code/trunk/src/tolua/tolua_push.c)
• src/tolua/tolua_to.c (copied) (copied from code/trunk/src/tolua/tolua_to.c)
• src/tolua/toluabind.c (copied) (copied from code/trunk/src/tolua/toluabind.c)
• src/tolua/toluabind.h (copied) (copied from code/trunk/src/tolua/toluabind.h)
• src/tolua/toluabind_default.h (copied) (copied from code/trunk/src/tolua/toluabind_default.h)
• src/util/CMakeLists.txt (modified) (3 diffs)
• src/util/ExprParser.cc (copied) (copied from code/trunk/src/util/ExprParser.cc)
• src/util/ExprParser.h (copied) (copied from code/trunk/src/util/ExprParser.h)
• src/util/String.cc (modified) (1 diff)
• src/util/tolua (deleted)
• tolua-build (deleted)
• tolua-exec-script.bat (deleted)
• tolua.cmake (deleted)

code/branches/cmake/CMakeLists.txt

@@ -79 +79 @@
   ${ENet_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-  ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}
+  ${OPENAL_INCLUDE_DIR}
+  ${ALUT_INCLUDE_DIR}
+  ${VORBIS_INCLUDE_DIR}
+  ${OGG_INCLUDE_DIR}
   ${Lua_INCLUDE_DIR}
 )
-
-
-################ Source files ###################
-
-#if on a windows box, you have to generate the tolua bind files yourself
-IF(NOT WIN32)
-
-  #At first, build lua
-  MESSAGE(STATUS "\n******************* Building tolua... ******************\n\n")
-  EXECUTE_PROCESS(COMMAND ./tolua-build)
-  MESSAGE(STATUS "\n\n******************* Building tolua done ****************\n")
-
-  #generate lua bind source files
-  EXECUTE_PROCESS(COMMAND bin/./tolua-exec-script)
-
-ENDIF(NOT WIN32)
 
 #add main source dir

code/branches/cmake/src/CMakeLists.txt

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

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

@@ -1 @@
-#get the created files
-AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 
-
-SET( CORE_SRC_FILES
+SET(CORE_SRC_FILES
   OrxonoxClass.cc
   BaseObject.cc
@@ -29 +26 @@
   Tickable.cc
   Script.cc
-  ${TOLUA_BIND_FILES}
 )
 
-ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
+ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( core
+TARGET_LINK_LIBRARIES(core
   util
+  tolualib
   ${Lua_LIBRARIES}
   ${Lua_LIBRARY}

code/branches/cmake/src/core/ConfigFileManager.h

@@ -63 +63 @@
     {
         public:
+            virtual ~ConfigFileEntry() {};
             virtual void setValue(const std::string& value) = 0;
             virtual std::string getValue() const = 0;

code/branches/cmake/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 #include "tolua/tolua_bind.h"
 

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

@@ -54 +54 @@
 //#include "util/Sleep.h"
 #include "util/ArgReader.h"
+#include "util/ExprParser.h"
 
 // core
@@ -123 +124 @@
       InputBuffer* ib_;
   };
+
+  class Calculator
+  {
+  public:
+    static void calculate(const std::string& calculation)
+    {
+      ExprParser expr(calculation);
+      if (expr.getSuccess())
+      {
+        if (expr.getResult() == 42.0)
+          std::cout << "Greetings from the restaurant at the end of the universe." << std::endl;
+        // FIXME: insert modifier to display in full precision
+        std::cout << "Result is: " << expr.getResult() << std::endl;
+        if (expr.getRemains() != "")
+          std::cout << "Warning: Expression could not be parsed to the end! Remains: '"
+              << expr.getRemains() << "'" << std::endl;
+      }
+      else
+        std::cout << "Cannot calculate expression: Parse error" << std::endl;
+    }
+  };
+  ConsoleCommandShortcut(Calculator, calculate, AccessLevel::None);
 
   /**
@@ -410 +433 @@
       return;
     }
+    Ogre::Root& ogreRoot = Ogre::Root::getSingleton();
+
 
     // Contains the times of recently fired events
@@ -429 +454 @@
           {
                   // Pump messages in all registered RenderWindows
+      // This calls the WindowEventListener objects.
       Ogre::WindowEventUtilities::messagePump();
 
@@ -452 +478 @@
       // don't forget to call _fireFrameStarted in ogre to make sure
       // everything goes smoothly
-      Ogre::Root::getSingleton()._fireFrameStarted(evt);
+      ogreRoot._fireFrameStarted(evt);
 
       // server still renders at the moment
       //if (mode_ != SERVER)
-      Ogre::Root::getSingleton()._updateAllRenderTargets(); // only render in non-server mode
+      ogreRoot._updateAllRenderTargets(); // only render in non-server mode
 
       // get current time
@@ -466 +492 @@
 
       // again, just to be sure ogre works fine
-      Ogre::Root::getSingleton()._fireFrameEnded(evt);
+      ogreRoot._fireFrameEnded(evt);
           }
   }

code/branches/cmake/src/util/CMakeLists.txt

@@ -1 +1 @@
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
 
-SET (UTIL_SRC_FILES
+SET(UTIL_SRC_FILES
   ArgReader.cc
   Math.cc
@@ -7 +7 @@
   Clipboard.cc
   SubString.cc
+  ExprParser.cc
   MultiTypePrimitive.cc
   MultiTypeString.cc
   MultiTypeMath.cc
-  tolua/tolua_event.c
-  tolua/tolua_is.c
-  tolua/tolua_map.c
-  tolua/tolua_push.c
-  tolua/tolua_to.c
   ${TINYXML_SRC_FILES}
 )
 
-ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
+ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 
 IF(TESTING_ENABLED)
@@ -24 +20 @@
 ENDIF(TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( util
+TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
 ) 
 

code/branches/cmake/src/util/String.cc

@@ -274 +274 @@
     if (str.size() == 0)
         return str;
+    else if (str.size() == 1)
+    {
+      //TODO: decide whether we need the commented code
+      /*if (str[0] != '\\')
+        return "";
+      else*/
+      return str;
+    }
 
     std::string output = "";