Changeset 7284 for code/trunk/src/modules/designtools

Timestamp:

Aug 31, 2010, 3:37:40 AM (14 years ago)

Author:

landauf

Message:

merged consolecommands3 branch back to trunk.

note: the console command interface has changed completely, but the documentation is not yet up to date. just copy an existing command and change it to your needs, it's pretty self-explanatory. also the include files related to console commands are now located in core/command/. in the game it should work exactly like before, except for some changes in the auto-completion.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/designtools/ScreenshotManager.cc (modified) (2 diffs)
• src/modules/designtools/SkyboxGenerator.cc (modified) (4 diffs)

code/trunk/src/modules/designtools/ScreenshotManager.cc

@@ -9 +9 @@
 #include <OgreRoot.h>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/GraphicsManager.h"
 #include "core/PathConfig.h"
-#include "core/ScopedSingletonManager.h"
-#include "core/ConsoleCommand.h"
+#include "core/command/ConsoleCommand.h"
 
 #include "CameraManager.h"
@@ -20 +20 @@
 {
     ManageScopedSingleton(ScreenshotManager, ScopeID::Graphics, false);
-    SetConsoleCommandAlias(ScreenshotManager, makeScreenshot_s, "printScreenHD", true);
+    SetConsoleCommand("printScreenHD", &ScreenshotManager::makeScreenshot_s);
 
     ScreenshotManager::ScreenshotManager()

code/trunk/src/modules/designtools/SkyboxGenerator.cc

@@ -34 +34 @@
 #include <OgreCamera.h>
 
-#include "core/ConsoleCommand.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/ScopedSingletonManager.h"
+#include "core/GraphicsManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandExecutor.h"
 #include "controllers/HumanController.h"
 #include "worldentities/CameraPosition.h"
 #include "worldentities/ControllableEntity.h"
-#include "core/GraphicsManager.h"
-#include "core/CommandExecutor.h"
 #include "graphics/Camera.h"
 
@@ -50 +50 @@
 {
 
-    SetConsoleCommand(SkyboxGenerator, createSkybox, true);
+    SetConsoleCommand("SkyboxGenerator", "createSkybox", &SkyboxGenerator::createSkybox).addShortcut();
 
     ManageScopedSingleton(SkyboxGenerator, ScopeID::Graphics, false);
@@ -79 +79 @@
             if(!this->captionsRemoved_)
             {
-                CommandExecutor::execute("setGametypeStatus false");
+                CommandExecutor::execute("GametypeStatus displayCaption false");
                 this->captionsRemoved_ = true;
                 return;
@@ -145 +145 @@
                 takeScreenshot_ = false;
                 CommandExecutor::execute("pause");
-                CommandExecutor::execute("setGametypeStatus true");
+                CommandExecutor::execute("GametypeStatus displayCaption true");
                 this->captionsRemoved_ = false;
             }