Changeset 1341 for code/branches/console/src/orxonox/Orxonox.cc

Timestamp:

May 21, 2008, 1:33:42 AM (16 years ago)

Author:

landauf

Message:

big commit, but not much changes in code:

• put CommandEvaluation into it's own .cc and .h files
• put some basic ConsoleCommands into ConsoleCommandCompilation.cc and .h
• created a new class, ConsoleCommand, inheriting from ExecutorStatic, implementing all command-related features that were located in the Executor until now (at the moment only accessLevel_, but more will come - from reto and me)
• renamed ConsoleCommand-macros to SetConsoleCommand (all related macros were changed the same way)
• added a new command named "killdelays", that kills all delayed commands. helpful to stop disco

File:

• code/branches/console/src/orxonox/Orxonox.cc (modified) (4 diffs)

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

@@ -54 +54 @@
 //#include "util/Sleep.h"
 #include "util/ArgReader.h"
-#include "util/ExprParser.h"
 
 // core
@@ -60 +59 @@
 #include "core/ConsoleCommand.h"
 #include "core/Debug.h"
-#include "core/Factory.h"
 #include "core/Loader.h"
 #include "core/Tickable.h"
-#include "core/InputBuffer.h"
 #include "core/InputManager.h"
 
@@ -74 +71 @@
 
 // objects and tools
-#include "tools/Timer.h"
 #include "hud/HUD.h"
 //#include "console/InGameConsole.h"
@@ -85 +81 @@
 namespace orxonox
 {
-  ConsoleCommand(Orxonox, exit, AccessLevel::None, true);
-  ConsoleCommand(Orxonox, slomo, AccessLevel::Offline, true).setDefaultValue(0, 1.0);
-  ConsoleCommand(Orxonox, setTimeFactor, AccessLevel::Offline, false).setDefaultValue(0, 1.0);
-
-  class Calculator
-  {
-  public:
-    static float 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;
-        return expr.getResult();
-      }
-      else
-      {
-        std::cout << "Cannot calculate expression: Parse error" << std::endl;
-        return 0;
-      }
-    }
-  };
-  ConsoleCommandShortcut(Calculator, calculate, AccessLevel::None);
+  SetConsoleCommand(Orxonox, exit, true);
+  SetConsoleCommand(Orxonox, slomo, true).setDefaultValue(0, 1.0).setAccessLevel(AccessLevel::Offline);
+  SetConsoleCommand(Orxonox, setTimeFactor, false).setDefaultValue(0, 1.0).setAccessLevel(AccessLevel::Offline);
 
   /**