Changeset 9526 for code/trunk/src/modules/portals

Timestamp:

Feb 19, 2013, 10:25:42 AM (12 years ago)

Author:

jo

Message:

Merging presentationHS12 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/portals/PortalEndPoint.cc (modified) (4 diffs)
• src/modules/portals/PortalEndPoint.h (modified) (1 diff)

code/trunk/src/modules/portals/PortalEndPoint.cc

@@ -28 +28 @@
 
 #include "PortalEndPoint.h"
+#include "portals/PortalLink.h"
 
 #include <ctime>
@@ -35 +36 @@
 
 #include "worldentities/MobileEntity.h"
-
 #include "objects/triggers/MultiTriggerContainer.h"
 
-#include "portals/PortalLink.h"
+#include "sound/WorldSound.h"
 
 namespace orxonox
@@ -59 +59 @@
         this->setRadarObjectShape(RadarViewable::Dot);
         this->setRadarVisibility(true);
+        if( GameMode::isMaster() )
+        {
+            this->portalSound_ = new WorldSound(this);
+            this->portalSound_->setLooping(false);
+            this->attach(this->portalSound_);
+            this->portalSound_->setSource("sounds/Weapon_HsW01.ogg"); //TODO: change sound file
+        }
     }
 
@@ -158 +165 @@
         entity->rotate(this->getWorldOrientation());
         entity->setVelocity(this->getWorldOrientation() * entity->getVelocity());
+        //play Sound
+        if( this->portalSound_ && !(this->portalSound_->isPlaying()))
+        {
+            this->portalSound_->play();
+        }
     }
 

code/trunk/src/modules/portals/PortalEndPoint.h

@@ -115 +115 @@
             std::map<MobileEntity *, time_t> jumpOutTimes_;   //!< Stores the time at which a certain MobileEntity @ref jumpOut "jumped out" of this PortalEndPoint
             std::set<MobileEntity *> recentlyJumpedOut_;   //!< Stores the entities witch recently jumped out of this PortalEndPoint and haven't left the activation radius yet. This is needed in order to prevent them from beeing pulled into the PortalEndPoint they have just come out of.
+
+            WorldSound* portalSound_;
     };