BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/Systems/SoundsSystem.cpp
This commit is contained in:
Adam
2014-03-09 20:10:34 +01:00
parent 5c142d98ec bca46de9e1
commit 6be310d248
8 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/SoundSystem.h
+6 -5
View File
@@ -1,24 +1,25 @@
#ifndef SoundEmitter_h__
#define SoundEmitter_h__
#include "AL/al.h"
#include "AL/alc.h"
#include "System.h"
#include "Components/SoundEmitter.h"
#include <AL/al.h>
#include <AL/alc.h>
#include <windows.h>
namespace System
namespace Systems
{
class SoundSystem : public System
{
public:
SoundSystem(World* world) : System(world)
{
SoundSystem(World* world);
}
void Update(double dt) override;
void Update(double dt, EntityID entity, EntityID parent) override;
void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
void OnComponentCreated(std::string type, std::shared_ptr<Component> component) override;
void PlaySound(std::shared_ptr<Components::SoundEmitter> emitter, std::string fileName);
void LoadFile(const char* fileName);
Escape-the-Dawn/Systems/SoundsSystem.cpp
+5 -4
View File
@@ -3,7 +3,8 @@
//#include <fstream>
System::SoundSystem::SoundSystem(World* world)
Systems::SoundSystem::SoundSystem(World* world)
: System(world)
{
//initialize OpenAL
@@ -18,12 +19,12 @@ System::SoundSystem::SoundSystem(World* world)
}
void System::SoundSystem::Update(double dt)
void Systems::SoundSystem::Update(double dt)
{
}
void System::SoundSystem::Update(double dt, EntityID entity, EntityID parent)
void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
{
auto soundEmitter = m_World->GetComponent<Components::SoundEmitter>(entity, "SoundEmitter");
if(soundEmitter == nullptr)
@@ -32,7 +33,7 @@ void System::SoundSystem::Update(double dt, EntityID entity, EntityID parent)
}
void System::SoundSystem::PlaySound(std::shared_ptr<Components::SoundEmitter> emitter, std::string fileName)
void Systems::SoundSystem::PlaySound(std::shared_ptr<Components::SoundEmitter> emitter, std::string fileName)
{
//LoadFile(fileName);
}