Changeset 2824 for code/branches/miniprojects/src/orxonox/objects/worldentities/ControllableEntity.cc

Timestamp:

Mar 23, 2009, 11:26:46 AM (16 years ago)

Author:

landauf

Message:

Added "Pong" minigame

File:

• code/branches/miniprojects/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (1 diff)

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

@@ -144 +144 @@
     void ControllableEntity::addCameraPosition(CameraPosition* position)
     {
-        if (position->getAllowMouseLook())
-            position->attachToNode(this->cameraPositionRootNode_);
+        if (!position->getIsAbsolute())
+        {
+            if (position->getAllowMouseLook())
+                position->attachToNode(this->cameraPositionRootNode_);
+            else
+                this->attach(position);
+        }
         else
-            this->attach(position);
+        {
+            WorldEntity* parent = this->getParent();
+            if (parent)
+                parent->attach(position);
+        }
         this->cameraPositions_.push_back(position);
     }