defender ray fixes

This commit is contained in:
viktorljung
2016-03-13 16:42:07 +01:00
parent 17007a2a41
commit 3cee4e4248
2 changed files with 14 additions and 16 deletions
@@ -393,7 +393,7 @@ void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo&
float yaw = std::atan2(lookVector.x, lookVector.z);
glm::quat orientation = glm::quat(glm::vec3(pitch, yaw, 0));
rayOrientation = glm::eulerAngles(orientation);
rayScale.z(glm::length(muzzleToHit));
rayScale.x(glm::length(muzzleToHit));
}
}
}
@@ -449,8 +449,8 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
}
// Temp hit decal
// EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
// hit["Transform"]["Position"] = pick.Position;
EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
(Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
// Don't let us shoot ourselves in the foot somehow
if (victim == LocalPlayer) {
@@ -472,7 +472,7 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
}
damageSum[victim] += pelletDamage;
// ((glm::vec3&)hit["Model"]["Color"]).b = 1.f;
((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
}
// Deal damage!