Changeset 7284 for code/trunk/src/modules

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)
• src/modules/notifications/NotificationManager.cc (modified) (1 diff)
• src/modules/objects/triggers/Trigger.cc (modified) (2 diffs)
• src/modules/overlays/OverlaysPrecompiledHeaders.h (modified) (1 diff)
• src/modules/overlays/hud/ChatOverlay.cc (modified) (2 diffs)
• src/modules/overlays/hud/GametypeStatus.cc (modified) (5 diffs)
• src/modules/overlays/hud/GametypeStatus.h (modified) (1 diff)
• src/modules/pickup/PickupManager.cc (modified) (1 diff)
• src/modules/pong/Pong.cc (modified) (1 diff)
• src/modules/questsystem/QuestManager.cc (modified) (1 diff)
• src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) (1 diff)
• src/modules/weapons/MuzzleFlash.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)

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;
             }

code/trunk/src/modules/notifications/NotificationManager.cc

@@ -36 +36 @@
 #include <set>
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
-#include "core/ScopedSingletonManager.h"
 #include "Notification.h"
 #include "interfaces/NotificationListener.h"

code/trunk/src/modules/objects/triggers/Trigger.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
+#include "core/command/ConsoleCommand.h"
 #include "Scene.h"
 
@@ -38 +38 @@
 {
 
-  SetConsoleCommand(Trigger, debugFlares, false).defaultValues(false);
+  SetConsoleCommand("Trigger", "debugFlares", &Trigger::debugFlares).defaultValues(false);
 
   CreateFactory(Trigger);

code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h

@@ -58 +58 @@
 ///////////////////////////////////////////
 
-#include "core/Executor.h"     // 13
+#include "core/command/Executor.h"     // 13
 //#include "network/synchronisable/Synchronisable.h" // 13
 //#include "core/XMLPort.h"    // 9

code/trunk/src/modules/overlays/hud/ChatOverlay.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
 
 #include "tools/Timer.h"
@@ -91 +91 @@
         Timer* timer = new Timer();
         this->timers_.insert(timer); // store the timer in a set to destroy it in the destructor
-        Executor* executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
+        const ExecutorPtr& executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
         executor->setDefaultValues(timer);
         timer->setTimer(this->displayTime_, false, executor, true);

code/trunk/src/modules/overlays/hud/GametypeStatus.cc

@@ -30 +30 @@
 
 #include "util/Convert.h"
-#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
 #include "infos/GametypeInfo.h"
 #include "infos/PlayerInfo.h"
@@ -41 +41 @@
     CreateFactory(GametypeStatus);
 
-    /*static*/ bool GametypeStatus::noCaption_s = false;
-    SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
+    static const std::string __CC_GametypeStatus_name = "GametypeStatus";
+    static const std::string __CC_displayCaption_name = "displayCaption";
+
+    SetConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name, &GametypeStatus::setDisplayCaption);
 
     GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator)
@@ -49 +51 @@
 
         this->owner_ = 0;
+        this->bNoCaption_ = false;
+
+        ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this);
     }
 
     GametypeStatus::~GametypeStatus()
     {
+        ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(0);
     }
 
@@ -64 +70 @@
             ControllableEntity* ce = this->owner_->getControllableEntity();
 
-            if(GametypeStatus::noCaption_s) // No captions are displayed.
+            if (this->bNoCaption_) // No captions are displayed.
             {
                 this->setCaption("");
@@ -105 +111 @@
         If true captions are displayed, if false, not.
     */
-    /*static*/ void GametypeStatus::setGametypeStatus(bool bValue)
+    void GametypeStatus::setDisplayCaption(bool bValue)
     {
-        GametypeStatus::noCaption_s = !bValue;
+        this->bNoCaption_ = !bValue;
     }
 

code/trunk/src/modules/overlays/hud/GametypeStatus.h

@@ -46 +46 @@
             virtual void changedOwner();
 
-            static void setGametypeStatus(bool bValue); //!< Toggles whether the gametype status is displayed.
+            void setDisplayCaption(bool bValue); //!< Toggles whether the gametype status is displayed.
 
         private:
             PlayerInfo* owner_;
-            static bool noCaption_s;
+            bool bNoCaption_;
 
     };

code/trunk/src/modules/pickup/PickupManager.cc

@@ -34 +34 @@
 #include "PickupManager.h"
 
+#include "util/Convert.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
 #include "core/GUIManager.h"
-#include "core/ScopedSingletonManager.h"
 #include "core/Identifier.h"
-#include "util/Convert.h"
 #include "interfaces/PickupCarrier.h"
 #include "infos/PlayerInfo.h"

code/trunk/src/modules/pong/Pong.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
 #include "PongCenterpoint.h"
 #include "PongBall.h"

code/trunk/src/modules/questsystem/QuestManager.cc

@@ -37 +37 @@
 
 #include "util/Exception.h"
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
-#include "core/ConsoleCommand.h"
 #include "core/LuaState.h"
-#include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
 #include "infos/PlayerInfo.h"
 #include "overlays/GUIOverlay.h"

code/trunk/src/modules/questsystem/QuestsystemPrecompiledHeaders.h

@@ -65 +65 @@
 ///////////////////////////////////////////
 
-#include "core/Executor.h"     // 15
+#include "core/command/Executor.h"     // 15
 //#include "core/XMLPort.h"    // 14
 

code/trunk/src/modules/weapons/MuzzleFlash.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
 
 namespace orxonox

code/trunk/src/modules/weapons/projectiles/Projectile.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Executor.h"
 #include "core/GameMode.h"
+#include "core/command/Executor.h"
 #include "objects/collisionshapes/SphereCollisionShape.h"
 #include "worldentities/pawns/Pawn.h"

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/Executor.h"
 #include "core/XMLPort.h"
+#include "core/command/Executor.h"
 #include "graphics/Model.h"
 

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/Executor.h"
 #include "core/XMLPort.h"
+#include "core/command/Executor.h"
 #include "graphics/Model.h"