BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into LevelSystemAndSuch

Browse Source
This commit is contained in:
PlatinumSkink
2015-09-22 14:49:50 +02:00
parent dbb04c83af 3f4ede4b7d
commit 2797a0f6c3
4 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Sound/SoundSystem.h
+2 -11
View File
@@ -27,14 +27,7 @@ public:
: System(world, eventBroker) { }
~SoundSystem();
void Initialize() override;
//void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
void Update(double dt) override;
//void OnComponentCreated(std::string type, std::shared_ptr<Component> component) override;
//void OnComponentRemoved(std::string type, Component* component) override;
//void PlaySound(Components::SoundEmitter* emitter, std::string path); // Use if you want to play a temporary .wav file not from component
//void PlaySound(std::shared_ptr<Components::SoundEmitter> emitter); // Use if you want to play .wav file from component
//void StopSound(std::shared_ptr<Components::SoundEmitter> emitter);
@@ -45,13 +38,11 @@ private:
dd::EventRelay<SoundSystem, dd::Events::Contact> m_EContact;
bool OnPlaySFX(const dd::Events::PlaySFX &event);
bool OnContact(const dd::Events::Contact &event);
ALuint LoadFile(std::string fileName);
ALuint CreateSource();
//std::map<Component*, ALuint> m_Sources;
std::map<Component*, ALuint> m_Sources;
//std::list<ALuint>
//Temp
ALuint m_Source;