Added more Error checks
This commit is contained in:
+1
-1
Submodule assets updated: 2991401c31...fe5e9c263f
+14
-14
@@ -342,6 +342,19 @@ void GameWorld::Initialize()
|
|||||||
//transform->Orientation = glm::quat(glm::vec3(glm::pi<float>() / 8.f, 0.f, 0.f));
|
//transform->Orientation = glm::quat(glm::vec3(glm::pi<float>() / 8.f, 0.f, 0.f));
|
||||||
auto cameraComp = AddComponent<Components::Camera>(cameraTower);
|
auto cameraComp = AddComponent<Components::Camera>(cameraTower);
|
||||||
cameraComp->FarClip = 2000.f;
|
cameraComp->FarClip = 2000.f;
|
||||||
|
{
|
||||||
|
auto se1 = CreateEntity(camera);
|
||||||
|
auto transform = AddComponent<Components::Transform>(se1);
|
||||||
|
transform->Position = glm::vec3(0,10,0);
|
||||||
|
transform->Scale = glm::vec3(3);
|
||||||
|
auto emitterComponent = AddComponent<Components::SoundEmitter>(se1);
|
||||||
|
emitterComponent->Path = "Sounds/WUB.mp3";
|
||||||
|
emitterComponent->MinDistance = 100.f;
|
||||||
|
emitterComponent->MaxDistance = 10000.f;
|
||||||
|
emitterComponent->Gain = 1;
|
||||||
|
// auto model = AddComponent<Components::Model>(se1);
|
||||||
|
// model->ModelFile = "Models/PlaceHolders/PhysicsTest/PointLight.obj";
|
||||||
|
}
|
||||||
//auto freeSteering = AddComponent<Components::FreeSteering>(cameraTower);
|
//auto freeSteering = AddComponent<Components::FreeSteering>(cameraTower);
|
||||||
AddComponent<Components::Listener>(tank);
|
AddComponent<Components::Listener>(tank);
|
||||||
}
|
}
|
||||||
@@ -1144,20 +1157,7 @@ void GameWorld::Initialize()
|
|||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
auto se1 = CreateEntity();
|
|
||||||
auto transform = AddComponent<Components::Transform>(se1);
|
|
||||||
transform->Position = glm::vec3(0,-30,0);
|
|
||||||
transform->Scale = glm::vec3(3);
|
|
||||||
auto emitterComponent = AddComponent<Components::SoundEmitter>(se1);
|
|
||||||
emitterComponent->Path = "Sounds/WUB.mp3";
|
|
||||||
emitterComponent->MinDistance = 100.f;
|
|
||||||
emitterComponent->MaxDistance = 1000.f;
|
|
||||||
emitterComponent->Gain = 1;
|
|
||||||
auto model = AddComponent<Components::Model>(se1);
|
|
||||||
model->ModelFile = "Models/PlaceHolders/PhysicsTest/PointLight.obj";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*for (int x = 0; x < 5; x++)
|
/*for (int x = 0; x < 5; x++)
|
||||||
for (int y = 0; y < 5; y++)
|
for (int y = 0; y < 5; y++)
|
||||||
|
|||||||
@@ -45,8 +45,8 @@ void InputManager::Update(double dt)
|
|||||||
if(m_CurrentKeyState[GLFW_KEY_Z])
|
if(m_CurrentKeyState[GLFW_KEY_Z])
|
||||||
{
|
{
|
||||||
Events::PlaySound e;
|
Events::PlaySound e;
|
||||||
e.Resource = "Sounds/BGM/MainMenu.mp3";
|
e.Resource = "Sounds/WUB.mp3";
|
||||||
e.Emitter = 66;
|
e.Emitter = 16;
|
||||||
e.Loop = true;
|
e.Loop = true;
|
||||||
EventBroker->Publish(e);
|
EventBroker->Publish(e);
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-12
@@ -7,17 +7,19 @@ void Systems::SoundSystem::Initialize()
|
|||||||
EVENT_SUBSCRIBE_MEMBER(m_EComponentCreated, &SoundSystem::OnComponentCreated);
|
EVENT_SUBSCRIBE_MEMBER(m_EComponentCreated, &SoundSystem::OnComponentCreated);
|
||||||
EVENT_SUBSCRIBE_MEMBER(m_EPlaySound, &SoundSystem::PlayASound);
|
EVENT_SUBSCRIBE_MEMBER(m_EPlaySound, &SoundSystem::PlayASound);
|
||||||
|
|
||||||
|
m_TransformSystem = m_World->GetSystem<Systems::TransformSystem>();
|
||||||
|
|
||||||
FMOD_System_Create(&m_System);
|
FMOD_System_Create(&m_System);
|
||||||
FMOD_RESULT result = FMOD_System_Init(m_System, 1024, FMOD_INIT_NORMAL, nullptr);
|
FMOD_RESULT result = FMOD_System_Init(m_System, 32, FMOD_INIT_NORMAL, 0);
|
||||||
if(result != FMOD_OK)
|
if(result != FMOD_OK)
|
||||||
{
|
{
|
||||||
LOG_ERROR("Did not load FMOD correctly");
|
LOG_ERROR("Did initialized load FMOD correctly");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOG_INFO("FMOD Initialized");
|
LOG_INFO("FMOD initialized successfully");
|
||||||
}
|
}
|
||||||
FMOD_System_Set3DSettings(m_System, 10.0f, 1.f, 100.f); //dopplerScale, distancefactor, rolloffscale
|
FMOD_System_Set3DSettings(m_System, 10.f, 1.f, 100.f); //dopplerScale, distancefactor, rolloffscale
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,16 +66,16 @@ void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID par
|
|||||||
int lID = std::find(m_Listeners.begin(), m_Listeners.end(), entity) - m_Listeners.begin();
|
int lID = std::find(m_Listeners.begin(), m_Listeners.end(), entity) - m_Listeners.begin();
|
||||||
auto lTransform = m_World->GetComponent<Components::Transform>(entity);
|
auto lTransform = m_World->GetComponent<Components::Transform>(entity);
|
||||||
|
|
||||||
glm::vec3 tPos = lTransform->Position;
|
glm::vec3 tPos = m_TransformSystem->AbsolutePosition(entity);
|
||||||
FMOD_VECTOR lPos = {tPos.x, tPos.y, tPos.z};
|
FMOD_VECTOR lPos = {tPos.x, tPos.y, tPos.z};
|
||||||
|
|
||||||
glm::vec3 tVel = lTransform->Velocity;
|
glm::vec3 tVel = (lTransform->Velocity * 1000.f) / (float)dt;
|
||||||
FMOD_VECTOR lVel = {tVel.x, tVel.y, tVel.z};
|
FMOD_VECTOR lVel = {tVel.x, tVel.y, tVel.z};
|
||||||
|
|
||||||
glm::mat3 tOri = glm::toMat3(lTransform->Orientation);
|
glm::mat3 tOri = glm::toMat3(lTransform->Orientation);
|
||||||
glm::vec3 tUp = tOri[1];
|
glm::vec3 tUp = glm::normalize(tOri[1]);
|
||||||
FMOD_VECTOR lUp = {tUp.x, tUp.y, tUp.z};
|
FMOD_VECTOR lUp = {tUp.x, tUp.y, tUp.z};
|
||||||
glm::vec3 tForward = tOri[2];
|
glm::vec3 tForward = glm::normalize(tOri[2]);
|
||||||
FMOD_VECTOR lForward = {tForward.x, tForward.y, tForward.z};
|
FMOD_VECTOR lForward = {tForward.x, tForward.y, tForward.z};
|
||||||
|
|
||||||
FMOD_System_Set3DListenerAttributes(m_System, lID, (const FMOD_VECTOR*)&lPos, (const FMOD_VECTOR*)&lVel, (const FMOD_VECTOR*)&lForward, (const FMOD_VECTOR*)&lUp);
|
FMOD_System_Set3DListenerAttributes(m_System, lID, (const FMOD_VECTOR*)&lPos, (const FMOD_VECTOR*)&lVel, (const FMOD_VECTOR*)&lForward, (const FMOD_VECTOR*)&lUp);
|
||||||
@@ -86,10 +88,10 @@ void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID par
|
|||||||
FMOD_SOUND* sound = m_Sounds[entity];
|
FMOD_SOUND* sound = m_Sounds[entity];
|
||||||
auto eTransform = m_World->GetComponent<Components::Transform>(entity);
|
auto eTransform = m_World->GetComponent<Components::Transform>(entity);
|
||||||
|
|
||||||
glm::vec3 tPos = eTransform->Position;
|
glm::vec3 tPos = m_TransformSystem->AbsolutePosition(entity);
|
||||||
FMOD_VECTOR ePos = {tPos.x, tPos.y, tPos.z};
|
FMOD_VECTOR ePos = {tPos.x, tPos.y, tPos.z};
|
||||||
|
|
||||||
glm::vec3 tVel = eTransform->Velocity;
|
glm::vec3 tVel = (eTransform->Velocity * 1000.f) / float(dt);
|
||||||
FMOD_VECTOR eVel = {tVel.x, tVel.y, tVel.z};
|
FMOD_VECTOR eVel = {tVel.x, tVel.y, tVel.z};
|
||||||
|
|
||||||
FMOD_Channel_Set3DAttributes(channel, (const FMOD_VECTOR*)&ePos, (const FMOD_VECTOR*)&eVel);
|
FMOD_Channel_Set3DAttributes(channel, (const FMOD_VECTOR*)&ePos, (const FMOD_VECTOR*)&eVel);
|
||||||
@@ -138,13 +140,21 @@ bool Systems::SoundSystem::PlayASound(const Events::PlaySound &event)
|
|||||||
emitter->Path = event.Resource;
|
emitter->Path = event.Resource;
|
||||||
}
|
}
|
||||||
|
|
||||||
PlaySound( m_Channels[event.Emitter], m_Sounds[event.Emitter], 1, event.Loop);
|
PlaySound(m_Channels[event.Emitter], m_Sounds[event.Emitter], 1.0, event.Loop);
|
||||||
|
FMOD_System_Update(m_System);
|
||||||
|
FMOD_BOOL* isPlaying = false;
|
||||||
|
if(!FMOD_Channel_IsPlaying(m_Channels[event.Emitter], isPlaying))
|
||||||
|
LOG_ERROR("FMOD: File %s is not playing", event.Resource.c_str());
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG_INFO("Now playing sound %s", event.Resource.c_str());
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Systems::SoundSystem::LoadSound(FMOD_SOUND* &sound, std::string filePath, float maxDist, float minDist)
|
void Systems::SoundSystem::LoadSound(FMOD_SOUND* &sound, std::string filePath, float maxDist, float minDist)
|
||||||
{
|
{
|
||||||
FMOD_RESULT result = FMOD_System_CreateSound(m_System, filePath.c_str(), FMOD_3D , 0, &sound);
|
FMOD_RESULT result = FMOD_System_CreateSound(m_System, filePath.c_str(), FMOD_3D | FMOD_HARDWARE , 0, &sound);
|
||||||
if (result != FMOD_OK)
|
if (result != FMOD_OK)
|
||||||
{
|
{
|
||||||
LOG_ERROR("FMOD did not load file: %s", filePath.c_str());
|
LOG_ERROR("FMOD did not load file: %s", filePath.c_str());
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "System.h"
|
#include "System.h"
|
||||||
|
#include "Systems/TransformSystem.h"
|
||||||
#include "Components/Transform.h"
|
#include "Components/Transform.h"
|
||||||
#include "Components/SoundEmitter.h"
|
#include "Components/SoundEmitter.h"
|
||||||
#include "Components/Listener.h"
|
#include "Components/Listener.h"
|
||||||
@@ -44,6 +45,7 @@ private:
|
|||||||
std::map<EntityID, FMOD_CHANNEL*> m_DeleteChannels;
|
std::map<EntityID, FMOD_CHANNEL*> m_DeleteChannels;
|
||||||
std::map<EntityID, FMOD_SOUND*> m_Sounds;
|
std::map<EntityID, FMOD_SOUND*> m_Sounds;
|
||||||
std::map<EntityID, FMOD_SOUND*> m_DeleteSounds;
|
std::map<EntityID, FMOD_SOUND*> m_DeleteSounds;
|
||||||
|
std::shared_ptr<Systems::TransformSystem> m_TransformSystem;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user