Changeset 7930

Timestamp:

Feb 20, 2011, 3:28:18 PM (14 years ago)

Author:

landauf

Message:

• fixed crash when calling toggleGodMode command without controllable entity
• added slightly hacky command "myposition" which prints the current position and orientation of the controllable entity in XML format to the console, as a tool for level creators (note: uses the position of the entity, not the camera - use spectator to be sure)

Location:

code/branches/usability/src/orxonox/controllers

Files:

• HumanController.cc (modified) (2 diffs)
• HumanController.h (modified) (1 diff)

code/branches/usability/src/orxonox/controllers/HumanController.cc

@@ -61 +61 @@
     SetConsoleCommand("HumanController", "cycleNavigationFocus",   &HumanController::cycleNavigationFocus).addShortcut();
     SetConsoleCommand("HumanController", "releaseNavigationFocus", &HumanController::releaseNavigationFocus).addShortcut();
+    SetConsoleCommand("HumanController", "myposition",             &HumanController::myposition    ).addShortcut();
 
     CreateUnloadableFactory(HumanController);
@@ -200 +201 @@
     void HumanController::toggleGodMode()
     {
-        HumanController::getLocalControllerSingleton()->setGodMode( !HumanController::getLocalControllerSingleton()->getGodMode() );
+        if (HumanController::localController_s)
+            HumanController::localController_s->setGodMode(!HumanController::localController_s->getGodMode());
+    }
+
+    void HumanController::myposition()
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        {
+            const Vector3& position = HumanController::localController_s->controllableEntity_->getPosition();
+            const Quaternion& orientation = HumanController::localController_s->controllableEntity_->getOrientation();
+
+            COUT(0) << "position=\"" << position.x << ", " << position.y << ", " << position.z << "\" ";
+            COUT(0) << "orientation=\"" << orientation.w << ", " << orientation.x << ", " << orientation.y << ", " << orientation.z << "\"" << std::endl;
+        }
     }
 

code/branches/usability/src/orxonox/controllers/HumanController.h

@@ -73 +73 @@
             static void suicide();
             static void toggleGodMode();
+            static void myposition();
 
             static void addBots(unsigned int amount);