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

Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

Browse Source 
# Conflicts:
#	resources/Schema/Entities/RayAssaultBlue.xml
This commit is contained in:
viktorljung
2016-03-13 16:45:57 +01:00
parent 3cee4e4248 041050ab2f
commit 0d287ad5d1
14 changed files with 1290 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
+10 -1
View File
@@ -354,7 +354,16 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo& wi, std::vector<glm::vec2> pattern)
{
EntityWrapper muzzle = getRelevantWeaponEntity(wi).FirstChildByName("WeaponMuzzle");
EntityWrapper flashSpawner = getRelevantWeaponEntity(wi).FirstChildByName("WeaponMuzzleFlash");
if (flashSpawner.Valid()) {
std::uniform_real_distribution<float> randomSpreadAngle(0.f, 3.1415f*2);
EntityWrapper flash = SpawnerSystem::Spawn(flashSpawner, flashSpawner);
if (flash.Valid()) {
((Field<glm::vec3>)flash["Transform"]["Orientation"]).z(randomSpreadAngle(m_RandomEngine));
}
}
EntityWrapper muzzle = getRelevantWeaponEntity(wi).FirstChildByName("WeaponMuzzleRay");
if (!muzzle.Valid()) {
return;
}