Changeset 947 for code/branches/core2/src/orxonox/objects

Timestamp:

Mar 28, 2008, 10:13:58 PM (17 years ago)

Author:

landauf

Message:

• added CommandExecutor
• added ConsoleCommand macros
• added getTypename to all MultiTypes
• added 2 static maps to Identifier that contain all existing Identifiers with their names and lowercase names respectively.
• added 2 maps to each Identifier that contain all console commands of the Identifier with their names and lowercase names respectively
• using tolower(.) and toupper(.) instead of selfmade hacks in String.h
• added AccessLevel enum
• added some test-console-commands to OutputHandler, Ambient and SpaceShip

Location:

code/branches/core2/src/orxonox/objects

Files:

• Ambient.cc (modified) (2 diffs)
• Ambient.h (modified) (1 diff)
• SpaceShip.cc (modified) (2 diffs)
• SpaceShip.h (modified) (2 diffs)

code/branches/core2/src/orxonox/objects/Ambient.cc

@@ -41 +41 @@
 #include "../Orxonox.h"
 #include "core/XMLPort.h"
+#include "core/ConsoleCommand.h"
 
 #include "Ambient.h"
@@ -46 +47 @@
 namespace orxonox
 {
+    ConsoleCommand(Ambient, setAmbientLightTest, AccessLevel::Offline, false);
+
     CreateFactory(Ambient);
+
+    Ambient* Ambient::instance_s;
 
     Ambient::Ambient()
     {
         RegisterObject(Ambient);
+        Ambient::instance_s = this;
     }
 

code/branches/core2/src/orxonox/objects/Ambient.h

@@ -18 +18 @@
             void setAmbientLight(const ColourValue& colour);
 
+            static void setAmbientLightTest(const ColourValue& colour)
+                { Ambient::instance_s->setAmbientLight(colour); }
+
         private:
-
+            static Ambient* instance_s;
 
     };

code/branches/core2/src/orxonox/objects/SpaceShip.cc

@@ -45 +45 @@
 #include "Projectile.h"
 #include "core/XMLPort.h"
+#include "core/ConsoleCommand.h"
 
 #include "SpaceShip.h"
@@ -50 +51 @@
 namespace orxonox
 {
+    ConsoleCommand(SpaceShip, setMaxSpeedTest, AccessLevel::Debug, false);
+
     CreateFactory(SpaceShip);
 
+    SpaceShip* SpaceShip::instance_s;
+
     SpaceShip::SpaceShip()
     {
         RegisterObject(SpaceShip);
+
+        SpaceShip::instance_s = this;
 
         this->setConfigValues();

code/branches/core2/src/orxonox/objects/SpaceShip.h

@@ -36 +36 @@
             void setRotDamp(float value);
 
+            static void setMaxSpeedTest(float value)
+                { SpaceShip::instance_s->setMaxSpeed(value); }
+
             bool mouseMoved(const OIS::MouseEvent &e);
             bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id);
@@ -42 +45 @@
 
         private:
+            static SpaceShip* instance_s;
+
             Vector3 testvector_;
             bool bInvertYAxis_;