Changeset 1993

Timestamp:

Oct 22, 2008, 5:25:01 AM (16 years ago)

Author:

landauf

Message:

added several new classes

Location:

code/branches/objecthierarchy

Files:

• bin/def_keybindings.ini (modified) (6 diffs)
• src/core/BaseObject.cc (modified) (2 diffs)
• src/core/Template.cc (modified) (6 diffs)
• src/core/Template.h (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/objects/Camera.cc (modified) (2 diffs)
• src/orxonox/objects/Camera.h (modified) (1 diff)
• src/orxonox/objects/CameraHandler.h (modified) (1 diff)
• src/orxonox/objects/controllers (added)
• src/orxonox/objects/controllers/Controller.cc (added)
• src/orxonox/objects/controllers/Controller.h (added)
• src/orxonox/objects/controllers/HumanController.cc (added)
• src/orxonox/objects/controllers/HumanController.h (added)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (2 diffs)
• src/orxonox/objects/infos/PlayerInfo.cc (modified) (10 diffs)
• src/orxonox/objects/infos/PlayerInfo.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (5 diffs)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (6 diffs)
• src/orxonox/objects/worldentities/Model.cc (added)
• src/orxonox/objects/worldentities/Model.h (added)
• src/orxonox/objects/worldentities/MovableEntity.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/MovableEntity.h (modified) (1 diff)
• src/orxonox/objects/worldentities/PositionableEntity.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/PositionableEntity.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/WorldEntity.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/pawns (added)
• src/orxonox/objects/worldentities/pawns/Spectator.cc (added)
• src/orxonox/objects/worldentities/pawns/Spectator.h (added)
• src/orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• src/orxonox/overlays/OverlayText.cc (modified) (3 diffs)
• src/orxonox/overlays/OverlayText.h (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• src/orxonox/tools/Mesh.cc (modified) (3 diffs)
• src/orxonox/tools/Mesh.h (modified) (2 diffs)
• src/tinyxml/ticpp.h (modified) (2 diffs)

code/branches/objecthierarchy/bin/def_keybindings.ini

@@ -1 +1 @@
 [Keys]
-KeyA="scale -1 moveLateral"
+KeyA="scale -1 moveRightLeft"
 KeyABNT_C1=
 KeyABNT_C2=
@@ -16 +16 @@
 KeyComma=
 KeyConvert=
-KeyD="scale 1 moveLateral"
+KeyD="scale 1 moveRightLeft"
 KeyDelete=
 KeyDivide=
 KeyDown=
-KeyE="scale -1 moveRoll"
+KeyE="scale -1 rotateRoll"
 KeyEnd=
 KeyEquals=
 KeyEscape="exit"
-KeyF=
+KeyF="scale -1 moveUpDown"
 KeyF1="OverlayGroup toggleVisibility Debug"
 KeyF10=
@@ -105 +105 @@
 KeyPower=
 KeyPreviousTrack=
-KeyQ="scale 1 moveRoll"
-KeyR=
+KeyQ="scale 1 rotateRoll"
+KeyR="scale 1 moveUpDown"
 KeyReturn=
 KeyRight=
@@ -114 +114 @@
 KeyRightShift=
 KeyRightWindows=
-KeyS="scale -1 moveLongitudinal"
+KeyS="scale -1 moveFrontBack"
 KeyScrollLock=
 KeySemicolon=
@@ -132 +132 @@
 KeyVolumeDown=
 KeyVolumeUp=
-KeyW="scale 1 moveLongitudinal"
+KeyW="scale 1 moveFrontBack"
 KeyWake=
 KeyWebBack=
@@ -254 +254 @@
 
 [MouseAxes]
-MouseXNeg="scale 1 moveYaw"
-MouseXPos="scale -1 moveYaw"
-MouseYNeg="scale 1 movePitch"
-MouseYPos="scale -1 movePitch"
+MouseXNeg="scale -1 rotateYaw"
+MouseXPos="scale 1 rotateYaw"
+MouseYNeg="scale 1 rotatePitch"
+MouseYPos="scale -1 rotatePitch"
 

code/branches/objecthierarchy/src/core/BaseObject.cc

@@ -38 +38 @@
 #include "Level.h"
 #include "Template.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -87 +88 @@
     const std::string& BaseObject::getLevelfile() const
     {
-        return this->level_->getFile();
+        if (this->level_)
+            return this->level_->getFile();
+        else
+            return blankString;
     }
 

code/branches/objecthierarchy/src/core/Template.cc

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "util/Debug.h"
+#include "tinyxml/ticpp.h"
 
 namespace orxonox
@@ -38 +39 @@
     CreateFactory(Template);
 
-    Template::Template()
+    Template::Template() : xmlelement_("")
     {
         RegisterObject(Template);
@@ -59 +60 @@
         XMLPortParam(Template, "baseclass", setBaseclass, getBaseclass, xmlelement, mode);
 
-        this->setXMLElement(*xmlelement.FirstChildElement(false));
+        this->setXMLElement(*dynamic_cast<TiXmlElement*>(xmlelement.FirstChildElement(false)->GetTiXmlPointer()));
     }
 
@@ -79 +80 @@
     }
 
-    const Element& Template::getXMLElement() const
+    const TiXmlElement& Template::getXMLElement() const
     {
         if (this->bIsLink_)
@@ -89 +90 @@
                 {
                     this->bIsReturningXMLElement_ = true;
-                    const Element& element = temp->getXMLElement();
+                    const TiXmlElement& element = temp->getXMLElement();
                     this->bIsReturningXMLElement_ = false;
                     return element;
@@ -127 +128 @@
         COUT(4) << object->getLoaderIndentation() << " aplying Template \"" << this->getName() << "\"..." << std::endl;
 
-        Element temp = this->getXMLElement();
+        Element temp = ((TiXmlElement*)&this->getXMLElement());
         object->XMLPort(temp, XMLPort::LoadObject);
     }

code/branches/objecthierarchy/src/core/Template.h

@@ -35 +35 @@
 
 #include "BaseObject.h"
-#include "tinyxml/ticpp.h"
+#include "tinyxml/tinyxml.h"
 
 namespace orxonox
@@ -53 +53 @@
                 { return this->link_; }
 
-            inline void setXMLElement(const Element& xmlelement)
+            inline void setXMLElement(const TiXmlElement& xmlelement)
                 { this->xmlelement_ = xmlelement; }
-            const Element& getXMLElement() const;
+            const TiXmlElement& getXMLElement() const;
 
             void setBaseclass(const std::string& baseclass);
@@ -70 +70 @@
 
         private:
-            Element xmlelement_;
+            TiXmlElement xmlelement_;
             std::string link_;
             std::string baseclass_;

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -47 +47 @@
   objects/worldentities/MovableEntity.cc
   objects/worldentities/ControllableEntity.cc
+
+  objects/worldentities/Model.cc
+
 #  objects/Backlight.cc
   objects/Camera.cc
@@ -59 +62 @@
   objects/Trigger.cc
   objects/DistanceTrigger.cc
+
+  objects/worldentities/pawns/Spectator.cc
+
+  objects/controllers/Controller.cc
+  objects/controllers/HumanController.cc
 
   objects/infos/Info.cc

code/branches/objecthierarchy/src/orxonox/OrxonoxPrereqs.h

@@ -86 +86 @@
     class ControllableEntity;
 
+    class Model;
+
+    class Spectator;
+
+    class Controller;
+    class HumanController;
+
     class Backlight;
     class Camera;

code/branches/objecthierarchy/src/orxonox/objects/Camera.cc

@@ -47 +47 @@
 namespace orxonox
 {
+  CreateUnloadableFactory(Camera);
+
   Camera::Camera()
   {
@@ -68 +70 @@
   void Camera::tick(float dt)
   {
+      SUPER(Camera, tick, dt);
+
       // this stuff here may need some adjustments
       float coeff = (this->bDrag_) ? min(1.0f, 15.0f * dt) : (1.0f);

code/branches/objecthierarchy/src/orxonox/objects/Camera.h

@@ -36 +36 @@
 #include "OrxonoxPrereqs.h"
 #include "objects/worldentities/PositionableEntity.h"
+#include "objects/Tickable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Camera : public PositionableEntity
+    class _OrxonoxExport Camera : public PositionableEntity//, public Tickable
     {
       friend class CameraHandler;
+
       public:
         Camera();
         virtual ~Camera();
 
-        void tick(float dt);
+        virtual void tick(float dt);
         void update();
 

code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h

@@ -44 +44 @@
 #include "core/BaseObject.h"
 
-#include "Camera.h"
-
 namespace orxonox
 {

code/branches/objecthierarchy/src/orxonox/objects/gametypes/Gametype.cc

@@ -33 +33 @@
 #include "core/ConsoleCommand.h"
 #include "objects/infos/PlayerInfo.h"
+#include "objects/worldentities/pawns/Spectator.h"
 
 #include "network/Host.h"
@@ -46 +47 @@
         RegisterObject(Gametype);
 
+        this->defaultPawn_ = Class(Spectator);
         this->getConnectedClients();
 

code/branches/objecthierarchy/src/orxonox/objects/infos/PlayerInfo.cc

@@ -42 +42 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/worldentities/ControllableEntity.h"
+#include "objects/controllers/HumanController.h"
 
 namespace orxonox
@@ -53 +54 @@
         this->ping_ = -1;
         this->clientID_ = network::CLIENTID_UNKNOWN;
-        this->bLocalPlayer_ = Core::isStandalone();
         this->bLocalPlayer_ = false;
         this->bHumanPlayer_ = false;
@@ -60 +60 @@
         this->pawn_ = 0;
         this->pawnID_ = network::OBJECTID_UNKNOWN;
+        this->controller_ = 0;
+        this->setDefaultController(Class(HumanController));
 
         this->setConfigValues();
         this->registerVariables();
-
-//COUT(0) << "created PlayerInfo (" << this->getObjectID() << ")" << std::endl;
     }
 
     PlayerInfo::~PlayerInfo()
     {
-        Gametype* gametype = Gametype::getCurrentGametype();
-        if (gametype)
-            gametype->removePlayer(this);
-//COUT(0) << "destroyed PlayerInfo (" << this->getObjectID() << ")" << std::endl;
+        if (this->isInitialized())
+        {
+            Gametype* gametype = Gametype::getCurrentGametype();
+            if (gametype)
+                gametype->removePlayer(this);
+
+            if (this->controller_)
+                delete this->controller_;
+
+            if (this->pawn_)
+                this->pawn_->removePlayer();
+        }
     }
 
@@ -82 +90 @@
     void PlayerInfo::checkNick()
     {
-//std::cout << "# PI(" << this->getObjectID() << "): checkName: " << this->bLocalPlayer_ << std::endl;
         if (this->bLocalPlayer_)
         {
@@ -94 +101 @@
     void PlayerInfo::changedName()
     {
-//std::cout << "# PI(" << this->getObjectID() << "): changedName to " << this->getName() << std::endl;
         Gametype* gametype = Gametype::getCurrentGametype();
         if (gametype)
@@ -113 +119 @@
     void PlayerInfo::clientChangedName()
     {
-//std::cout << "# PI(" << this->getObjectID() << "): clientChangedName() from " << this->getName() << " to " << this->playerName_ << std::endl;
         this->setName(this->playerName_);
     }
@@ -119 +124 @@
     void PlayerInfo::checkClientID()
     {
-//std::cout << "# PI(" << this->getObjectID() << "): checkClientID()" << std::endl;
         this->bHumanPlayer_ = true;
 
         if (this->clientID_ == network::Host::getPlayerID())
         {
-//std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): it's the client's ID" << std::endl;
-            this->bLocalPlayer_ = true;
-            this->playerName_ = this->nick_;
-//std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): name: " << this->getName() << std::endl;
+            this->takeLocalControl();
 
             if (Core::isClient())
-            {
-//std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): we're on a client: set object mode to bidirectional" << std::endl;
                 this->setObjectMode(network::direction::bidirectional);
-//std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): proposed name: " << this->playerName_ << std::endl;
-            }
             else
             {
-//std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): we're not on a client: finish setup" << std::endl;
                 this->clientChangedName();
                 this->bFinishedSetup_ = true;
@@ -147 +143 @@
     void PlayerInfo::finishedSetup()
     {
-//std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): " << this->bFinishedSetup_ << std::endl;
         if (Core::isClient())
-        {
-//std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a client: finish setup" << std::endl;
             this->bFinishedSetup_ = true;
-        }
         else if (this->bFinishedSetup_)
         {
-//std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a server: add player" << std::endl;
             Gametype* gametype = Gametype::getCurrentGametype();
             if (gametype)
                 gametype->addPlayer(this);
-        }
-        else
-        {
-//std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a server: client not yet finished" << std::endl;
         }
     }
@@ -171 +158 @@
         this->pawn_ = pawn;
         this->pawnID_ = pawn->getObjectID();
+
+        if (this->controller_)
+            this->controller_->setPawn(this->pawn_);
     }
 
@@ -180 +170 @@
     }
 
+    void PlayerInfo::takeLocalControl()
+    {
+        this->bLocalPlayer_ = true;
+        this->playerName_ = this->nick_;
+        this->createController();
+    }
+
+    void PlayerInfo::createController()
+    {
+        this->controller_ = this->defaultController_.fabricate();
+        this->controller_->setPawn(this->pawn_);
+    }
+
     void PlayerInfo::updatePawn()
     {

code/branches/objecthierarchy/src/orxonox/objects/infos/PlayerInfo.h

@@ -33 +33 @@
 
 #include "Info.h"
+#include "core/Identifier.h"
+#include "objects/controllers/Controller.h"
 
 namespace orxonox
@@ -58 +60 @@
                 { return this->bLocalPlayer_; }
 
-            void startControl(ControllableEntity* pawn);
-            void stopControl();
+            virtual void startControl(ControllableEntity* pawn);
+            virtual void stopControl();
 
             inline ControllableEntity* getPawn() const
                 { return this->pawn_; }
+/*
+            inline void setController(Controller* controller)
+                { this->controller_ = controller; }
+            inline Controller* getController() const
+                { return this->controller_; }
+*/
+        protected:
+            inline void setDefaultController(Identifier* identifier)
+                { this->defaultController_ = identifier; }
 
         private:
+            virtual void createController();
+            virtual void takeLocalControl();
+
             void checkClientID();
             void finishedSetup();
@@ -82 +96 @@
             ControllableEntity* pawn_;
             unsigned int pawnID_;
+            Controller* controller_;
+            SubclassIdentifier<Controller> defaultController_;
     };
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -53 +53 @@
         this->hud_ = 0;
         this->camera_ = 0;
-
+        this->bDestroyWhenPlayerLeft_ = false;
 
         this->velocity_ = Vector3::ZERO;
@@ -94 +94 @@
 
         if (this->bControlled_)
+        {
             this->startLocalControl();
+            this->setObjectMode(network::direction::bidirectional);
+        }
     }
 
@@ -105 +108 @@
         this->playerID_ = network::OBJECTID_UNKNOWN;
         this->bControlled_ = false;
+        this->setObjectMode(network::direction::toclient);
+
+        if (this->bDestroyWhenPlayerLeft_)
+            delete this;
     }
 
     void ControllableEntity::updatePlayer()
     {
-        this->player_ = dynamic_cast<PlayerInfo*>(network::Synchronisable::getSynchronisable(this->playerID_));
-        if (this->player_ && (this->player_->getPawn() != this))
-            this->player_->startControl(this);
+        if (this->playerID_ != network::OBJECTID_UNKNOWN)
+        {
+            this->player_ = dynamic_cast<PlayerInfo*>(network::Synchronisable::getSynchronisable(this->playerID_));
+            if (this->player_ && (this->player_->getPawn() != this))
+                this->player_->startControl(this);
+        }
     }
 
     void ControllableEntity::startLocalControl()
     {
+        std::cout << "###### start local control" << std::endl;
         this->camera_ = new Camera();
         this->camera_->requestFocus();
-
-        this->hud_ = new OverlayGroup();
-        this->hud_->addTemplate(this->hudtemplate_);
+        this->attach(this->camera_);
+
+        if (this->hudtemplate_ != "")
+        {
+            this->hud_ = new OverlayGroup();
+            this->hud_->addTemplate(this->hudtemplate_);
+        }
     }
 
     void ControllableEntity::stopLocalControl()
     {
+        std::cout << "###### stop local control" << std::endl;
+        this->detach(this->camera_);
         delete this->camera_;
         this->camera_ = 0;
@@ -137 +154 @@
         {
             this->velocity_ += (dt * this->acceleration_);
-            this->node_->translate(dt * this->velocity_);
+            this->node_->translate(dt * this->velocity_, Ogre::Node::TS_PARENT);
 
             if (Core::isMaster())
@@ -150 +167 @@
             }
         }
-
-//        std::cout << this->getPosition() << std::endl;
     }
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -52 +52 @@
                 { return this->player_; }
 
+            inline void setDestroyWhenPlayerLeft(bool bDestroy)
+                { this->bDestroyWhenPlayerLeft_ = bDestroy; }
+            inline bool getDestroyWhenPlayerLeft() const
+                { return this->bDestroyWhenPlayerLeft_; }
+
             virtual void startLocalControl();
             virtual void stopLocalControl();
@@ -70 +75 @@
             virtual void switchCamera() {}
 
+            inline const Vector3& getVelocity() const
+                { return this->velocity_; }
+            inline const Vector3& getAcceleration() const
+                { return this->acceleration_; }
+            inline const std::string& getHudTemplate() const
+                { return this->hudtemplate_; }
+
         protected:
             using WorldEntity::setPosition;
@@ -75 +87 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;
@@ -91 +106 @@
             inline void setVelocity(float x, float y, float z)
                 { this->velocity_.x = x; this->velocity_.y = y; this->velocity_.z = z; }
-            inline const Vector3& getVelocity() const
-                { return this->velocity_; }
 
             inline void setAcceleration(const Vector3& acceleration)
@@ -98 +111 @@
             inline void setAcceleration(float x, float y, float z)
                 { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
-            inline const Vector3& getAcceleration() const
-                { return this->acceleration_; }
+
+            inline void setHudTemplate(const std::string& name)
+                { this->hudtemplate_ = name; }
 
         private:
-            inline void setHudTemplate(const std::string& name)
-                { this->hudtemplate_ = name; }
-            inline const std::string& getHudTemplate() const
-                { return this->hudtemplate_; }
-
             void overwrite();
             void processOverwrite();
@@ -139 +148 @@
             OverlayGroup* hud_;
             Camera* camera_;
+            bool bDestroyWhenPlayerLeft_;
     };
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -79 +79 @@
             this->node_->rotate(this->rotationAxis_, this->rotationRate_  * dt);
         }
-
-        std::cout << this->getPosition() << std::endl;
     }
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/MovableEntity.h

@@ -52 +52 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc

@@ -57 +57 @@
         REGISTERDATA(this->getOrientation().z, network::direction::toclient);
     }
+
+    void PositionableEntity::tick(float dt)
+    {
+        // I don't know why but this has to be done to update the position if attached to another Entity
+        this->node_->translate(Vector3::ZERO);
+        std::cout << this->getWorldPosition() << std::endl;
+    }
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "WorldEntity.h"
+#include "objects/Tickable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PositionableEntity : public WorldEntity
+    class _OrxonoxExport PositionableEntity : public WorldEntity, public Tickable
     {
         public:
@@ -42 +43 @@
 
             void registerVariables();
+            virtual void tick(float dt);
 
             using WorldEntity::setPosition;
@@ -47 +49 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "util/Convert.h"
 
 #include "GraphicsEngine.h"
@@ -110 +111 @@
         if (object->getParent())
             object->detachFromParent();
+        else
+        {
+            Ogre::Node* parent = object->node_->getParent();
+            if (parent)
+                parent->removeChild(object->node_);
+        }
 
         this->node_->addChild(object->node_);
@@ -123 +130 @@
         object->parent_ = 0;
         object->parentID_ = (unsigned int)-1;
+
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->addChild(object->node_);
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/OverlayGroup.cc

@@ -100 +100 @@
         }
         else
+        {
             hudElements_[element->getName()] = element;
+            element->setVisible(this->isVisible());
+        }
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/OverlayText.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
 
@@ -68 +67 @@
 
         XMLPortParam(OverlayText, "font",     setFont,     getFont,     xmlElement, mode).defaultValues("Monofur");
+        XMLPortParam(OverlayText, "colour",   setColour,   getColour,   xmlElement, mode).defaultValues(ColourValue(1.0, 1.0, 1.0, 1.0));
         XMLPortParam(OverlayText, "caption",  setCaption,  getCaption,  xmlElement, mode).defaultValues("");
         XMLPortParam(OverlayText, "textSize", setTextSize, getTextSize, xmlElement, mode).defaultValues(1.0f);
+        XMLPortParamTemplate(OverlayText, "align", setAlignment, getAlignment, xmlElement, mode, const std::string&).defaultValues("left");
     }
 
@@ -84 +85 @@
         else
             return blankString;
+    }
+
+    void OverlayText::setColour(const ColourValue& colour)
+    {
+        if (this->text_)
+            this->text_->setColour(colour);
+    }
+
+    const ColourValue& OverlayText::getColour() const
+    {
+        if (this->text_)
+            return this->text_->getColour();
+        else
+            return ColourValue::White;
+    }
+
+    void OverlayText::setAlignment(Ogre::TextAreaOverlayElement::Alignment alignment)
+    {
+        if (this->text_)
+            this->text_->setAlignment(alignment);
+    }
+
+    void OverlayText::setAlignment(const std::string& alignment)
+    {
+        if (alignment == "right")
+            this->setAlignment(Ogre::TextAreaOverlayElement::Right);
+        else if (alignment == "center")
+            this->setAlignment(Ogre::TextAreaOverlayElement::Center);
+        else // "left" and default
+            this->setAlignment(Ogre::TextAreaOverlayElement::Left);
+    }
+
+    std::string OverlayText::getAlignment() const
+    {
+        if (this->text_)
+        {
+            Ogre::TextAreaOverlayElement::Alignment alignment = this->text_->getAlignment();
+
+            switch (alignment)
+            {
+                case Ogre::TextAreaOverlayElement::Right:
+                    return "right";
+                case Ogre::TextAreaOverlayElement::Center:
+                    return "center";
+                case Ogre::TextAreaOverlayElement::Left:
+                default:;
+            }
+        }
+        return "left";
+    }
+
+    void OverlayText::setCaption(const std::string& caption)
+    {
+        this->caption_ = caption;
+        this->text_->setCaption(caption);
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/OverlayText.h

@@ -34 +34 @@
 #include <string>
 #include <OgrePrerequisites.h>
+#include <OgreTextAreaOverlayElement.h>
 #include "OrxonoxOverlay.h"
 
@@ -49 +50 @@
         virtual void sizeChanged();
 
-        void setCaption(const std::string& caption) { this->caption_ = caption; }
+        void setCaption(const std::string& caption);
         const std::string& getCaption() const       { return this->caption_; }
 
         void setFont(const std::string& font);
         const std::string& getFont() const;
+
+        void setColour(const ColourValue& colour);
+        const ColourValue& getColour() const;
+
+        void setAlignment(Ogre::TextAreaOverlayElement::Alignment alignment);
+        void setAlignment(const std::string& alignment);
+        std::string getAlignment() const;
 
         void setTextSize(float size) { this->setSize(Vector2(size, size)); }

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -41 +41 @@
 #include "core/XMLPort.h"
 #include "objects/Radar.h"
-#include "objects/CameraHandler.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/orxonox/tools/Mesh.cc

@@ -32 +32 @@
 #include <sstream>
 #include <OgreSceneManager.h>
+
 #include "core/Core.h"
 #include "GraphicsEngine.h"
+#include "util/Convert.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -39 +42 @@
     unsigned int Mesh::meshCounter_s = 0;
 
-    Mesh::Mesh() :
-      entity_(0)
+    Mesh::Mesh()
     {
-    }
-
-    void Mesh::setMesh(const std::string& file)
-    {
-        std::ostringstream name;
-        name << (Mesh::meshCounter_s++);
-        if (Core::showsGraphics())
-            this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + name.str(), file);
+        this->entity_ = 0;
     }
 
@@ -57 +52 @@
             GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
     }
+
+    void Mesh::setMeshSource(const std::string& meshsource)
+    {
+        if (Core::showsGraphics())
+        {
+            if (this->entity_)
+                GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
+            this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + convertToString(Mesh::meshCounter_s++), meshsource);
+        }
+    }
+
+    const std::string& Mesh::getName() const
+    {
+        if (this->entity_)
+            return this->entity_->getName();
+        else
+            return blankString;
+    }
+
+    void Mesh::setVisible(bool bVisible)
+    {
+        if (this->entity_)
+            this->entity_->setVisible(bVisible);
+    }
+
+    bool Mesh::isVisible() const
+    {
+        if (this->entity_)
+            return this->entity_->getVisible();
+        else
+            return false;
+    }
 }

code/branches/objecthierarchy/src/orxonox/tools/Mesh.h

@@ -33 +33 @@
 
 #include <string>
-
 #include <OgreEntity.h>
 
@@ -43 +42 @@
             Mesh();
             ~Mesh();
-            void setMesh(const std::string& file);
+
+            void setMeshSource(const std::string& file);
 
             inline Ogre::Entity* getEntity()
                 { return this->entity_; }
 
-            inline const std::string& getName() const
-                { return this->entity_->getName(); }
+            const std::string& getName() const;
 
-            inline void setVisible(bool visible)
-                { if (this->entity_) this->entity_->setVisible(visible); }
-            inline bool getVisible() const
-                { if (this->entity_) return this->entity_->getVisible(); else return false; }
+            void setVisible(bool bVisible);
+            bool isVisible() const;
 
         private:

code/branches/objecthierarchy/src/tinyxml/ticpp.h

@@ -1184 +1184 @@
                 T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
 
+    public:
                 /**
                 @internal
@@ -1195 +1196 @@
                         return m_tiXmlPointer;
                 }
+    protected:
 
                 /**