Changeset 2851 for code/trunk

Timestamp:

Mar 26, 2009, 11:59:39 AM (16 years ago)

Author:

landauf

Message:

Fixed attachment of "absolute" CameraPosition-Nodes in the Network (this refers to the top-down camera in Pong)

Location:

code/trunk/src/orxonox/objects/worldentities

Files:

• ControllableEntity.cc (modified) (1 diff)
• ControllableEntity.h (modified) (1 diff)
• WorldEntity.cc (modified) (4 diffs)
• WorldEntity.h (modified) (3 diffs)

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -335 +335 @@
     }
 
+    void ControllableEntity::parentChanged()
+    {
+        WorldEntity::parentChanged();
+
+        WorldEntity* parent = this->getParent();
+        if (parent)
+        {
+            for (std::list<CameraPosition*>::iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+                if ((*it)->getIsAbsolute())
+                    parent->attach((*it));
+        }
+    }
+
     void ControllableEntity::tick(float dt)
     {

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -137 +137 @@
             virtual void startLocalHumanControl();
             virtual void stopLocalHumanControl();
+            virtual void parentChanged();
 
             inline void setHudTemplate(const std::string& name)

code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -181 +181 @@
 
         // Attach to parent if necessary
-        registerVariable(this->parentID_,       variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::parentChanged));
+        registerVariable(this->parentID_,       variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::networkcallback_parentChanged));
     }
 
@@ -188 +188 @@
         Network function that object this instance to its correct parent.
     */
-    void WorldEntity::parentChanged()
+    void WorldEntity::networkcallback_parentChanged()
     {
         if (this->parentID_ != OBJECTID_UNKNOWN)
@@ -362 +362 @@
         this->parentID_ = newParent->getObjectID();
 
+        this->parentChanged();
+
         // apply transform to collision shape
         this->collisionShape_->setPosition(this->getPosition());
         this->collisionShape_->setOrientation(this->getOrientation());
         // TODO: Scale
-        
+
         return true;
     }
@@ -406 +408 @@
         this->parent_ = 0;
         this->parentID_ = OBJECTID_UNKNOWN;
+
+        this->parentChanged();
 
         // reset orientation of the collisionShape (cannot be set within a WE usually)

code/trunk/src/orxonox/objects/worldentities/WorldEntity.h

@@ -176 +176 @@
 
         protected:
+            virtual void parentChanged() {}
+
             Ogre::SceneNode* node_;
 
@@ -191 +193 @@
 
             // network callbacks
-            void parentChanged();
+            void networkcallback_parentChanged();
             inline void scaleChanged()
                 { this->setScale3D(this->getScale3D()); }
@@ -269 +271 @@
             @brief
                 Sets how much reaction is applied in a collision.
-                
+
                 Consider two equal spheres colliding with equal velocities:
                 Restitution 1 means that both spheres simply reverse their velocity (no loss of energy)