Changeset 2042 for code/branches/objecthierarchy

Timestamp:

Oct 29, 2008, 3:26:55 AM (16 years ago)

Author:

landauf

Message:

added camerapositions

Location:

code/branches/objecthierarchy

Files:

• bin/def_keybindings.ini (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/objects/controllers/Controller.h (modified) (1 diff)
• src/orxonox/objects/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/objects/infos/HumanPlayer.cc (modified) (5 diffs)
• src/orxonox/objects/infos/PlayerInfo.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/CameraPosition.cc (added)
• src/orxonox/objects/worldentities/CameraPosition.h (added)
• src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (7 diffs)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/WorldEntity.cc (modified) (1 diff)
• src/orxonox/overlays/hud/ChatOverlay.cc (modified) (1 diff)

code/branches/objecthierarchy/bin/def_keybindings.ini

@@ -10 +10 @@
 KeyBack=
 KeyBackslash=
-KeyC=
+KeyC=switchCamera
 KeyCalculator=
 KeyCapsLock=

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

@@ -58 +58 @@
   objects/worldentities/Model.cc
   objects/worldentities/Camera.cc
+  objects/worldentities/CameraPosition.cc
   objects/worldentities/SpawnPoint.cc
 #  objects/worldentities/Backlight.cc

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

@@ -98 +98 @@
 
     class Camera;
+    class CameraPosition;
     class SpawnPoint;
 

code/branches/objecthierarchy/src/orxonox/objects/controllers/Controller.h

@@ -48 +48 @@
 
             virtual inline void setControllableEntity(ControllableEntity* entity)
-                { COUT(0) << "HC: start controlling entity" << std::endl; this->controllableEntity_ = entity; }
+                { this->controllableEntity_ = entity; }
             virtual inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }

code/branches/objecthierarchy/src/orxonox/objects/controllers/HumanController.cc

@@ -57 +57 @@
 
         HumanController::localController_s = this;
-
-        COUT(0) << "HumanController created" << std::endl;
     }
 

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

@@ -54 +54 @@
         this->setConfigValues();
         this->registerVariables();
-
-COUT(0) << this->getObjectID() << ": HumanPlayer created" << std::endl;
-        network::Synchronisable* temp = dynamic_cast<network::Synchronisable*>(creator);
-        if (temp)
-        {
-COUT(0) << this->getObjectID() << ": CreatorID: " << temp->getObjectID() << std::endl;
-        }
-        else
-        {
-COUT(0) << this->getObjectID() << ": Creator is no Synchronisable" << std::endl;
-        }
-    unsigned int creatorID = network::OBJECTID_UNKNOWN;
-    searchcreatorID:
-    if (creator)
-    {
-        if (creator->isA(Class(Synchronisable)))
-        {
-            Synchronisable* synchronisable_creator = dynamic_cast<Synchronisable*>(creator);
-            creatorID = synchronisable_creator->getObjectID();
-        }
-        else if (creator != creator->getCreator())
-        {
-            creator = creator->getCreator();
-            goto searchcreatorID;
-        }
-    }
-COUT(0) << this->getObjectID() << ": ### tranmitted creatorID: " << creatorID << std::endl;
     }
 
     HumanPlayer::~HumanPlayer()
     {
-COUT(0) << this->getObjectID() << ": HumanPlayer destroyed" << std::endl;
     }
 
@@ -120 +92 @@
     void HumanPlayer::networkcallback_clientIDchanged()
     {
-COUT(0) << this->getObjectID() << ": PI: clientID changed to " << this->clientID_ << std::endl;
         if (this->clientID_ == network::Host::getPlayerID())
         {
-COUT(0) << this->getObjectID() << ": PI: it's my clientID" << std::endl;
             this->bLocalPlayer_ = true;
             this->synchronize_nick_ = this->nick_;
@@ -129 +99 @@
 
             if (!Core::isMaster())
-            {
                 this->setObjectMode(network::direction::bidirectional);
-COUT(0) << this->getObjectID() << ": PI: set objectmode to bidirectional" << std::endl;
-            }
             else
                 this->setName(this->nick_);
@@ -143 +110 @@
     {
         this->client_ready_ = true;
-COUT(0) << this->getObjectID() << ": PI: server ready, client set ready too" << std::endl;
     }
 
     void HumanPlayer::networkcallback_client_ready()
     {
-COUT(0) << this->getObjectID() << ": PI: client ready" << std::endl;
         if (this->getGametype())
-        {
-COUT(0) << this->getObjectID() << ": PI: adding client to gametype" << std::endl;
             this->getGametype()->playerEntered(this);
-        }
     }
 
@@ -173 +135 @@
     void HumanPlayer::setClientID(unsigned int clientID)
     {
-COUT(0) << this->getObjectID() << ": PI: set clientID to " << clientID << std::endl;
         this->clientID_ = clientID;
         this->networkcallback_clientIDchanged();

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

@@ -128 +128 @@
             this->controllableEntityID_ = network::OBJECTID_UNKNOWN;
         }
-COUT(0) << this->getObjectID() << ": PI: start control" << std::endl;
+
         if (this->controller_)
             this->controller_->setControllableEntity(entity);

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

@@ -37 +37 @@
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/Camera.h"
+#include "objects/worldentities/CameraPosition.h"
 #include "overlays/OverlayGroup.h"
 
@@ -92 +93 @@
 
         XMLPortParam(ControllableEntity, "hudtemplate", setHudTemplate, getHudTemplate, xmlelement, mode);
+        XMLPortParam(ControllableEntity, "camerapositiontemplate", setCameraPositionTemplate, getCameraPositionTemkplate, xmlelement, mode);
+
+        XMLPortObject(ControllableEntity, WorldEntity, "camerapositions", addCameraPosition, getCameraPosition, xmlelement, mode);
+    }
+
+    void ControllableEntity::addCameraPosition(CameraPosition* position)
+    {
+        this->attach(position);
+        this->cameraPositions_.push_back(position);
+    }
+
+    CameraPosition* ControllableEntity::getCameraPosition(unsigned int index) const
+    {
+        unsigned int i = 0;
+        for (std::list<CameraPosition*>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+        {
+            if (i == index)
+                return (*it);
+            ++i;
+        }
+        return 0;
+    }
+
+    void ControllableEntity::switchCamera()
+    {
+        if (this->camera_)
+        {
+            if (this->camera_->getParent() == this && this->cameraPositions_.size() > 0)
+            {
+                this->cameraPositions_.front()->attachCamera(this->camera_);
+            }
+            else if (this->cameraPositions_.size() > 0)
+            {
+                for (std::list<CameraPosition*>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+                {
+                    if ((*it) == this->camera_->getParent())
+                    {
+                        ++it;
+                        if (it != this->cameraPositions_.end())
+                            (*it)->attachCamera(this->camera_);
+                        else
+                            (*this->cameraPositions_.begin())->attachCamera(this->camera_);
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                this->attach(this->camera_);
+            }
+        }
     }
 
@@ -105 +157 @@
         this->playerID_ = player->getObjectID();
         this->bControlled_ = (player->isLocalPlayer() && player->isHumanPlayer());
-
         if (this->bControlled_)
         {
@@ -111 +162 @@
 
             if (!Core::isMaster())
+            {
+COUT(0) << "CE: bidirectional synchronization" << std::endl;
                 this->setObjectMode(network::direction::bidirectional);
+            }
         }
     }
@@ -145 +199 @@
         this->camera_ = new Camera(this);
         this->camera_->requestFocus();
-        this->attach(this->camera_);
+        if (this->cameraPositionTemplate_ != "")
+            this->addTemplate(this->cameraPositionTemplate_);
+        if (this->cameraPositions_.size() > 0)
+            this->cameraPositions_.front()->attachCamera(this->camera_);
+        else
+            this->attach(this->camera_);
 
         if (this->hudtemplate_ != "")
@@ -157 +216 @@
     {
         std::cout << "###### stop local control" << std::endl;
-        this->detach(this->camera_);
+        this->camera_->detachFromParent();
         delete this->camera_;
         this->camera_ = 0;
@@ -187 +246 @@
     void ControllableEntity::registerVariables()
     {
+        REGISTERSTRING(this->cameraPositionTemplate_, network::direction::toclient);
+
         REGISTERDATA(this->server_position_,    network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerPosition));
         REGISTERDATA(this->server_velocity_,    network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerVelocity));

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

@@ -70 +70 @@
             virtual void greet() {}
             virtual void use() {}
-            virtual void switchCamera() {}
+            virtual void switchCamera();
 
             inline const Vector3& getVelocity() const
@@ -112 +112 @@
             inline OverlayGroup* getHUD() const
                 { return this->hud_; }
+
+            void addCameraPosition(CameraPosition* position);
+            CameraPosition* getCameraPosition(unsigned int index) const;
+            inline const std::list<CameraPosition*>& getCameraPositions() const
+                { return this->cameraPositions_; }
+
+            inline void setCameraPositionTemplate(const std::string& name)
+                { this->cameraPositionTemplate_ = name; }
+            inline const std::string& getCameraPositionTemkplate() const
+                { return this->cameraPositionTemplate_; }
 
         protected:
@@ -158 +168 @@
             Camera* camera_;
             bool bDestroyWhenPlayerLeft_;
+
+            std::list<CameraPosition*> cameraPositions_;
+            std::string cameraPositionTemplate_;
     };
 }

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

@@ -136 +136 @@
         object->parentID_ = (unsigned int)-1;
 
-        this->getScene()->getRootSceneNode()->addChild(object->node_);
+//        this->getScene()->getRootSceneNode()->addChild(object->node_);
     }
 

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

@@ -96 +96 @@
     void ChatOverlay::dropMessage()
     {
-        this->messages_.pop_front();
+        if (this->messages_.size() > 0)
+            this->messages_.pop_front();
         this->updateOverlayText();
     }