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

Timestamp:

Oct 27, 2008, 4:08:51 AM (16 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

File:

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

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

@@ -43 +43 @@
     CreateFactory(ControllableEntity);
 
-    ControllableEntity::ControllableEntity()
+    ControllableEntity::ControllableEntity(BaseObject* creator) : WorldEntity(creator)
     {
         RegisterObject(ControllableEntity);
@@ -71 +71 @@
     ControllableEntity::~ControllableEntity()
     {
-        if (this->isInitialized() && this->bControlled_)
-            this->stopLocalControl();
+        if (this->isInitialized())
+        {
+            if (this->bControlled_)
+                this->stopLocalControl();
+
+            if (this->hud_)
+                delete this->hud_;
+
+            if (this->camera_)
+                delete this->camera_;
+        }
     }
 
@@ -92 +101 @@
         this->player_ = player;
         this->playerID_ = player->getObjectID();
-        this->bControlled_ = player->isLocalPlayer();
+        this->bControlled_ = (player->isLocalPlayer() && player->isHumanPlayer());
 
         if (this->bControlled_)
         {
             this->startLocalControl();
-            this->setObjectMode(network::direction::bidirectional);
+
+            if (!Core::isMaster())
+                this->setObjectMode(network::direction::bidirectional);
         }
     }
@@ -115 +126 @@
     }
 
-    void ControllableEntity::updatePlayer()
-    {
+    void ControllableEntity::networkcallback_changedplayerID()
+    {
+        // just do this in case the entity wasn't yet synchronized when the corresponding PlayerInfo got our objectID
         if (this->playerID_ != network::OBJECTID_UNKNOWN)
         {
             this->player_ = dynamic_cast<PlayerInfo*>(network::Synchronisable::getSynchronisable(this->playerID_));
-            if (this->player_ && (this->player_->getPawn() != this))
+            if (this->player_ && (this->player_->getControllableEntity() != this))
                 this->player_->startControl(this);
         }
@@ -128 +140 @@
     {
         std::cout << this->getObjectID() << " ###### start local control" << std::endl;
-        this->camera_ = new Camera();
+        this->camera_ = new Camera(this);
         this->camera_->requestFocus();
         this->attach(this->camera_);
@@ -134 +146 @@
         if (this->hudtemplate_ != "")
         {
-            this->hud_ = new OverlayGroup();
+            this->hud_ = new OverlayGroup(this);
             this->hud_->addTemplate(this->hudtemplate_);
         }
@@ -184 +196 @@
         REGISTERDATA(this->client_overwrite_,   network::direction::toserver);
 
-        REGISTERDATA(this->playerID_, network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::updatePlayer));
+        REGISTERDATA(this->playerID_, network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));
     }