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

Escape-the-Dawn/Components/SoundEmitter.h

@@ -10,8 +10,11 @@ namespace Components
 
 struct SoundEmitter : Component
 {
-	float Volume;
-	float MaxRange;
+	float Gain;
+	float MaxDistance;
+	float ReferenceDistance;
+	float Pitch;
+	bool Loop;
 };
 
 }

Escape-the-Dawn/Escape-the-Dawn.vcxproj

@@ -40,7 +40,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\lib\Win32;$(SolutionDir)\Libraries\SOIL\lib\Debug;$(SolutionDir)\Libraries\glew-1.10.0\lib\Debug\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Debug;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\lib\Win32\Debug;$(SolutionDir)\Libraries\SOIL\lib\Debug;$(SolutionDir)\Libraries\glew-1.10.0\lib\Debug\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Debug;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)</TargetName>
@@ -50,7 +50,7 @@
     <IncludePath>$(BOOST_ROOT);$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\include;$(SolutionDir)\Libraries\SOIL\src;$(ProjectDir);$(SolutionDir)\Libraries;$(SolutionDir)\Libraries\glew-1.10.0\include;$(SolutionDir)\Libraries\glfw-3.0.4\include;$(SolutionDir)\Libraries\glm-0.9.5.2;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(SolutionDir)\Libraries\SOIL\lib\Release;$(SolutionDir)\Libraries\glew-1.10.0\lib\Release\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Release;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\lib\Win32\Release;$(SolutionDir)\Libraries\SOIL\lib\Release;$(SolutionDir)\Libraries\glew-1.10.0\lib\Release\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Release;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)</TargetName>
@@ -70,7 +70,7 @@
     <PostBuildEvent />
     <PostBuildEvent />
     <Lib>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;SOIL.lib;glew32sd.lib;glfw3.lib</AdditionalDependencies>
+      <AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32sd.lib;glfw3.lib</AdditionalDependencies>
       <ForceSymbolReferences>
       </ForceSymbolReferences>
     </Lib>
@@ -93,7 +93,7 @@
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;SOIL.lib;glew32s.lib;glfw3.lib;</AdditionalDependencies>
+      <AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32s.lib;glfw3.lib;</AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Escape-the-Dawn/GameWorld.h

@@ -57,7 +57,7 @@ void GameWorld::Initialize()
 	//AddSystem("CollisionSystem");
 	//AddSystem("ParticleSystem");
 	AddSystem("PlayerSystem");
-	//AddSystem("SoundSystem");
+	AddSystem("SoundSystem");
 	AddSystem("RenderSystem");
 
 	std::shared_ptr<Components::Transform> transform;
@@ -70,6 +70,14 @@ void GameWorld::Initialize()
 	transform->Position = glm::vec3(0.f, 0.f, 0.f);
 	model = AddComponent<Components::Model>(ent, "Model");
 	model->ModelFile = "ship.obj";
+	auto soundEmitter = AddComponent<Components::SoundEmitter>(ent, "SoundEmitter");
+	soundEmitter->Gain = 1;
+	soundEmitter->MaxDistance = 10;
+	soundEmitter->Loop = true;
+	soundEmitter->ReferenceDistance = 0.1;
+	soundEmitter->Pitch = 1;
+	GetSystem<Systems::SoundSystem>("SoundSystem")->PlaySound(soundEmitter, "Sounds/hallelujah.wav");
+	
 
 	ent = CreateEntity();
 	SetProperty(ent, "Name", std::string("Camera"));
@@ -90,7 +98,7 @@ void GameWorld::RegisterSystems()
 	//m_SystemFactory.Register("CollisionSystem", [this]() { return new Systems::CollisionSystem(this); });
 	//m_SystemFactory.Register("ParticleSystem", [this]() { return new Systems::ParticleSystem(this); });
 	m_SystemFactory.Register("PlayerSystem", [this]() { return new Systems::PlayerSystem(this); });
-	//m_SystemFactory.Register("SoundSystem", [this]() { return new Systems::SoundSystem(this); });
+	m_SystemFactory.Register("SoundSystem", [this]() { return new Systems::SoundSystem(this); });
 	m_SystemFactory.Register("RenderSystem", [this]() { return new Systems::RenderSystem(this, m_Renderer); });
 }
 

Escape-the-Dawn/Systems/SoundSystem.h

@@ -1,11 +1,15 @@
 #ifndef SoundEmitter_h__
 #define SoundEmitter_h__
 
-#include "AL/al.h"
-#include "AL/alc.h"
-
 #include "System.h"
+#include "Components/Transform.h"
 #include "Components/SoundEmitter.h"
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <windows.h>
+#include <vector>
+#include <glm/gtc/quaternion.hpp>
+#include <glm/gtx/quaternion.hpp>
 
 namespace Systems
 {
@@ -19,10 +23,23 @@ public:
 	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(std::string fileName);
+	ALuint LoadFile(std::string fileName);
+	ALuint CreateSource();
+
 private:
 	ALCcontext* context;
 
+	//File-info
+	char type[4];
+	DWORD size, chunkSize;
+	short formatType, channels;
+	DWORD sampleRate, avgBytesPerSec;
+	short bytesPerSample, bitsPerSample;
+	DWORD dataSize;
+	
+
+	std::map<Component*, ALuint> m_Source; 
+	std::map<std::string, ALuint> m_BufferCache; // string = fileName
 };
 
 }

Escape-the-Dawn/Systems/SoundsSystem.cpp

@@ -1,19 +1,26 @@
 #include "SoundSystem.h"
 #include "World.h"
-#include <AL/al.h>
-#include <AL/alc.h>
+//#include <fstream>
+
 
 Systems::SoundSystem::SoundSystem(World* world)
 	 : System(world)
 {
-	ALCdevice* Device = alcOpenDevice(nullptr);
+
+	//initialize OpenAL
+	ALCdevice* Device = alcOpenDevice(NULL);
 
 	if(Device)
 	{
-		context = alcCreateContext(Device, nullptr);
+		context = alcCreateContext(Device, NULL);
 		alcMakeContextCurrent(context);
 	}
+	else
+	{
+		LOG_ERROR("OMG OPEN AL FAIL");
+	}
 
+	alGetError();
 
 }
 
@@ -24,18 +31,249 @@ void Systems::SoundSystem::Update(double dt)
 
 void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
 {
-	auto soundEmitter = m_World->GetComponent<Components::SoundEmitter>(entity, "SoundEmitter");
-	if(soundEmitter == nullptr)
+	auto transformComponent = m_World->GetComponent<Components::Transform>(entity, "Transform");
+	if (transformComponent == nullptr)
 		return;
 
+	auto entityName = m_World->GetProperty<std::string>(entity, "Name");
+	if (entityName == "Camera")
+	{
+		glm::vec3 playerPos = transformComponent->Position;
+		ALfloat listenerPos[3] = { playerPos.x, playerPos.y, playerPos.z };
+
+		glm::vec3 playerVel = transformComponent->Velocity;
+		ALfloat listenerVel[3] = { playerVel.x, playerVel.y, playerVel.z };
+
+		glm::fquat playerQuatOri = transformComponent->Orientation;
+		glm::vec3 playerOriFW = glm::rotate(playerQuatOri, glm::vec3(0, 0, -1));
+		glm::vec3 playerOriUP = glm::rotate(playerQuatOri, glm::vec3(0, 1, 0));
+		ALfloat listenerOri[6] = { playerOriFW.x, playerOriFW.y, playerOriFW.z, playerOriUP.x, playerOriUP.y, playerOriUP.z };
+
+		//Listener
+		alListenerfv(AL_POSITION, listenerPos);
+		ALenum error;
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alListenerfv(AL_VELOCITY, listenerVel);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alListenerfv(AL_ORIENTATION, listenerOri);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+	}
+
+	auto soundEmitter = m_World->GetComponent<Components::SoundEmitter>(entity, "SoundEmitter");
+	if(soundEmitter != nullptr)
+	{
+		ALuint source = m_Source[soundEmitter.get()];
+
+		ALenum error;
+		alSourcef(source, AL_GAIN, soundEmitter->Gain); //Volume
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alSourcei(source, AL_MAX_DISTANCE, soundEmitter->MaxDistance);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alSourcei(source, AL_REFERENCE_DISTANCE, soundEmitter->ReferenceDistance);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alSourcef(source, AL_PITCH, soundEmitter->Pitch); 
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alSourcei(source, AL_LOOPING, soundEmitter->Loop);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+
+		glm::vec3 emitterPos = transformComponent->Position;
+		ALfloat sourcePos[3] = { emitterPos.x, emitterPos.y, emitterPos.z };
+
+		glm::vec3 emitterVel= transformComponent->Position;
+		ALfloat sourceVel[3] = { emitterVel.x, emitterVel.y, emitterVel.z };
+
+		alSourcefv(source, AL_POSITION, sourcePos);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+		alSourcefv(source, AL_VELOCITY, sourceVel);
+		if ((error = alGetError()) != AL_NO_ERROR)
+		{
+			LOG_ERROR("AL Error: %d", error);
+		}
+
+		
+	}
 }
 
 void Systems::SoundSystem::PlaySound(std::shared_ptr<Components::SoundEmitter> emitter, std::string fileName)
 {
-	LoadFile(fileName);
+	ALuint buffer = LoadFile(fileName);
+	ALuint source = m_Source[emitter.get()];
+	alSourcei(source, AL_BUFFER, buffer);
+	ALenum error;
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+		exit(EXIT_FAILURE);
+	}
+	alSourcePlay(m_Source[emitter.get()]);
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+		exit(EXIT_FAILURE);
+
+	}
 }
 
-void Systems::SoundSystem::LoadFile(std::string fileName)
+void Systems::SoundSystem::OnComponentCreated(std::string type, std::shared_ptr<Component> component)
 {
-	//loadWavFile()
+	if(type == "SoundEmitter") {
+		ALuint source = CreateSource();
+		m_Source[component.get()] = source;
+	}
+}
+
+ALuint Systems::SoundSystem::LoadFile(std::string fileName)
+{
+	if (m_BufferCache.find(fileName) != m_BufferCache.end())
+		return m_BufferCache[fileName];
+
+	FILE *fp = NULL;
+	fp = fopen(fileName.c_str(), "rb");
+
+	//CHECK FOR VALID WAVE-FILE
+	fread(type, sizeof(char), 4, fp);
+	if(type[0]!='R' || type[1]!='I' || type[2]!='F' || type[3]!='F') {
+		LOG_ERROR("ERROR: No RIFF in WAVE-file");
+		return 0;
+	}
+
+	fread(&size, sizeof(DWORD), 1, fp);
+	fread(type, sizeof(char), 4, fp);
+	if(type[0]!='W' || type[1]!='A' || type[2]!='V' || type[3]!='E') {
+		LOG_ERROR("ERROR: Not WAVE-file");
+		return 0;
+	}
+
+	fread(type, sizeof(char), 4, fp);
+	if(type[0]!='f' || type[1]!='m' || type[2]!='t' || type[3]!=' ') {
+		LOG_ERROR("ERROR: No fmt in WAVE-file");
+		return 0;
+	}
+
+	//READ THE DATA FROM WAVE-FILE
+	fread(&chunkSize, sizeof(DWORD), 1, fp);
+	fread(&formatType, sizeof(short), 1, fp);
+	fread(&channels, sizeof(short), 1, fp);
+	fread(&sampleRate, sizeof(DWORD), 1, fp);
+	fread(&avgBytesPerSec, sizeof(DWORD), 1, fp);
+	fread(&bytesPerSample, sizeof(short), 1, fp);
+	fread(&bitsPerSample, sizeof(short), 1, fp);
+
+	fread(type, sizeof(char), 4, fp);
+	if(type[0]!='d' || type[1]!='a' || type[2]!='t' || type[3]!='a')
+	{
+		LOG_ERROR("ERROR: WAVE-file Missing data");
+		return 0;
+	}
+
+	fread(&dataSize, sizeof(DWORD), 1, fp);
+
+	unsigned char* buf = new unsigned char[dataSize];
+	fread(buf, sizeof(BYTE), dataSize, fp);
+	fclose(fp);
+
+	// Create buffer
+	ALuint format = 0;
+	if(bitsPerSample == 8)
+	{
+		if(channels == 1)
+			format = AL_FORMAT_MONO8;
+		else if(channels == 2)
+			format = AL_FORMAT_STEREO8;
+	}
+	if(bitsPerSample == 16)
+	{
+		if (channels == 1)
+			format = AL_FORMAT_MONO16;
+		else if (channels == 2)
+			format = AL_FORMAT_STEREO16;
+	}
+	ALuint buffer;
+	alGenBuffers(1, &buffer);
+	ALenum error;
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+		exit(EXIT_FAILURE);
+	}
+	alBufferData(buffer, format, buf, dataSize, sampleRate);
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+		exit(EXIT_FAILURE);
+
+	}
+	//delete[] buf;
+
+	m_BufferCache[fileName] = buffer;
+	return buffer;
+}
+
+ALuint Systems::SoundSystem::CreateSource()
+{
+	ALuint source;
+	alGenBuffers((ALuint)1, &source);
+
+	ALenum error;
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+		exit(EXIT_FAILURE);
+
+	}
+
+	alSourcef(source, AL_GAIN, 1); //Volume
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+	}
+	alSourcef(source, AL_PITCH, 1); 
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+	}
+	alSourcei(source, AL_LOOPING, AL_FALSE);
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+	}
+	alSource3f(source, AL_POSITION, 0, 0, 0);
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+	}
+	alSource3f(source, AL_VELOCITY, 0, 0, 0);
+	if ((error = alGetError()) != AL_NO_ERROR)
+	{
+		LOG_ERROR("AL Error: %d", error);
+	}
+
+	return source;
 }

Executable/Executable.vcxproj

@@ -59,6 +59,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">