Changeset 1993 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

Timestamp:

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

Author:

landauf

Message:

added several new classes

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (5 diffs)

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