Misc TestBranch testing

This commit is contained in:
verysecrethero
2016-02-22 17:46:49 +01:00
parent bac23f6e8c
commit 041c409128
10 changed files with 54 additions and 8 deletions
@@ -14,6 +14,8 @@ DamageIndicatorSystem::DamageIndicatorSystem(SystemParams params)
bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
{
LOG_INFO("<- damageindicator");
if (m_CurrentCamera == EntityID_Invalid) {
return false;
}
@@ -28,6 +30,7 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
if (!e.Inflictor.Valid() || !e.Victim.Valid()) {
return false;
}
LOG_INFO("- damageindicator");
//grab players direction
auto playerOrientation = glm::quat((glm::vec3)e.Victim["Transform"]["Orientation"]);
@@ -67,6 +70,8 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
//simply set the rotation z-wise to the angleBetweenVectors
spriteWrapper["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
LOG_INFO("-> damageindicator");
return true;
}