Changeset 6412 for code/branches/pickup2/src/orxonox/Scene.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/Scene.h (modified) (2 diffs)

code/branches/pickup2/src/orxonox/Scene.h

@@ -71 +71 @@
                 { return this->bShadows_; }
 
+            inline void setSoundReferenceDistance(float distance)
+                { this->soundReferenceDistance_ = distance; }
+            inline float getSoundReferenceDistance() const
+                { return this->soundReferenceDistance_; }
+
             inline Radar* getRadar()
                 { return this->radar_; }
-            
+
             inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
 
@@ -96 +101 @@
             std::list<BaseObject*>   objects_;
             bool                     bShadows_;
+            float                    soundReferenceDistance_;
             Radar*                   radar_;