Changeset 2824 for code/branches/miniprojects/src/orxonox/objects/worldentities

Timestamp:

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

Author:

landauf

Message:

Added "Pong" minigame

Location:

code/branches/miniprojects/src/orxonox/objects/worldentities

Files:

• CMakeLists.txt (modified) (1 diff)
• CameraPosition.cc (modified) (2 diffs)
• CameraPosition.h (modified) (2 diffs)
• ControllableEntity.cc (modified) (1 diff)
• PongBall.cc (added)
• PongBall.h (added)
• PongBat.cc (added)
• PongBat.h (added)
• PongCenterpoint.cc (added)
• PongCenterpoint.h (added)

code/branches/miniprojects/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -20 +20 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
+  PongCenterpoint.cc
+  PongBall.cc
+  PongBat.cc
 )
 

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

@@ -44 +44 @@
         this->bDrag_ = false;
         this->bAllowMouseLook_ = false;
+        this->bAbsolute_ = false;
 
         this->setObjectMode(0x0);
@@ -58 +59 @@
         XMLPortParam(CameraPosition, "drag", setDrag, getDrag, xmlelement, mode).defaultValues(false);
         XMLPortParam(CameraPosition, "mouselook", setAllowMouseLook, getAllowMouseLook, xmlelement, mode).defaultValues(false);
+        XMLPortParam(CameraPosition, "absolute", setIsAbsolute, getIsAbsolute, xmlelement, mode).defaultValues(false);
     }
 

code/branches/miniprojects/src/orxonox/objects/worldentities/CameraPosition.h

@@ -54 +54 @@
                 { return this->bAllowMouseLook_; }
 
+            inline void setIsAbsolute(bool bAbsolute)
+                { this->bAbsolute_ = bAbsolute; }
+            inline bool getIsAbsolute() const
+                { return this->bAbsolute_; }
+
             void attachCamera(Camera* camera);
 
@@ -59 +64 @@
             bool bDrag_;
             bool bAllowMouseLook_;
+            bool bAbsolute_;
     };
 }

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