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

Improved splashes

Browse Source
This commit is contained in:
Stiffly
2014-06-04 05:31:05 +02:00
parent e39e1eda89
commit 27b735325a
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 637f866e2d...a6e3f120fd
src/Systems/SoundSystem.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ void Systems::SoundSystem::Initialize()
m_TransformSystem = m_World->GetSystem<Systems::TransformSystem>(); 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, 32, FMOD_INIT_3D_RIGHTHANDED, 0); FMOD_RESULT result = FMOD_System_Init(m_System, 32, FMOD_INIT_3D_RIGHTHANDED | FMOD_INIT_ENABLE_PROFILE, 0);
if(result != FMOD_OK) if(result != FMOD_OK)
{ {
LOG_ERROR("Did initialized load FMOD correctly"); LOG_ERROR("Did initialized load FMOD correctly");
src/Systems/TankSteeringSystem.cpp
+8 -8
View File
@@ -227,30 +227,30 @@ bool Systems::TankSteeringSystem::OnCollision(const Events::Collision &e)
// EventBroker->Publish(e); // EventBroker->Publish(e);
Events::CreateExplosion e; Events::CreateExplosion e;
e.LifeTime = 1; e.LifeTime = 1.5;
e.ParticleScale.push_back(1); e.ParticleScale.push_back(1);
e.ParticleScale.push_back(3); e.ParticleScale.push_back(6);
e.ParticlesToSpawn = 20; e.ParticlesToSpawn = 20;
e.Position = shellTransform->Position; e.Position = shellTransform->Position;
e.SpreadAngle = glm::radians<float>(180) / 4; e.SpreadAngle = glm::radians<float>(180) / 4;
e.RelativeUpOrientation = glm::angleAxis(glm::radians<float>(90), glm::vec3(1,0,0)); e.RelativeUpOrientation = glm::angleAxis(glm::radians<float>(90), glm::vec3(1,0,0));
e.UseGoalVector = true; e.UseGoalVector = true;
e.GoalVelocity = glm::vec3(0,-4,0); e.GoalVelocity = glm::vec3(0,-12,0);
e.Speed = 6; e.Speed = 12;
e.spritePath = "Textures/Sprites/Splash.png"; e.spritePath = "Textures/Sprites/Splash.png";
e.Color = glm::vec4(5.f,5.f,5.f,1); e.Color = glm::vec4(5.f,5.f,5.f,1);
EventBroker->Publish(e); EventBroker->Publish(e);
e.LifeTime = 1; e.LifeTime = 1.5;
e.ParticleScale.push_back(1); e.ParticleScale.push_back(1);
e.ParticleScale.push_back(3); e.ParticleScale.push_back(6);
e.ParticlesToSpawn = 20; e.ParticlesToSpawn = 20;
e.Position = shellTransform->Position; e.Position = shellTransform->Position;
e.SpreadAngle = glm::radians<float>(180)/ 4; e.SpreadAngle = glm::radians<float>(180)/ 4;
e.RelativeUpOrientation = glm::angleAxis(glm::radians<float>(90), glm::vec3(1,0,0)); e.RelativeUpOrientation = glm::angleAxis(glm::radians<float>(90), glm::vec3(1,0,0));
e.UseGoalVector = true; e.UseGoalVector = true;
e.GoalVelocity = glm::vec3(0,-4,0); e.GoalVelocity = glm::vec3(0,-12,0);
e.Speed = 6; e.Speed = 12;
e.spritePath = "Textures/Sprites/Splash.png"; e.spritePath = "Textures/Sprites/Splash.png";
e.Color = glm::vec4(1.f,1.f,1.f,1); e.Color = glm::vec4(1.f,1.f,1.f,1);
EventBroker->Publish(e); EventBroker->Publish(e);