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

Assault tracer fixed

Browse Source
This commit is contained in:
viktorljung
2016-03-13 23:29:50 +01:00
parent 73bcc6e382
commit 4adf7dc507
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/WeaponAssaultBlueView.xml
+2 -2
View File
@@ -92,7 +92,7 @@
<Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource> <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0.120748267" Y="-0.22843127" Z="-0.181454584"/> <Position X="0.120748267" Y="-0.22843127" Z="-0.181454599"/>
<Orientation X="0.0102799674" Y="-0.00312504289" Z="0.0428140014"/> <Orientation X="0.0102799674" Y="-0.00312504289" Z="0.0428140014"/>
</c:Transform> </c:Transform>
</Components> </Components>
@@ -131,7 +131,7 @@
<EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile> <EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile>
</c:Spawner> </c:Spawner>
<c:Transform> <c:Transform>
<Position X="0.00123506912" Y="-0.00209517847" Z="-0.681198895"/> <Position X="0.00123506912" Y="-0.00209517847" Z="-0.0250000004"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
+2 -1
View File
@@ -235,7 +235,8 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
float distance = traceRayDistance(origin, direction); float distance = traceRayDistance(origin, direction);
EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner); EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
if (ray.Valid()) { if (ray.Valid()) {
((Field<glm::vec3>)ray["Transform"]["Scale"]).z(distance); ((Field<glm::vec3>)ray["Transform"]["Scale"]).x(distance);
((Field<glm::vec3>)ray["Transform"]["Position"]).z(-distance/2.f);
} }
} }
//MuzzleFlash //MuzzleFlash
src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
+3 -3
View File
@@ -462,8 +462,8 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
} }
// Temp hit decal // Temp hit decal
EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World); // EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
(Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position; // (Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
// Don't let us shoot ourselves in the foot somehow // Don't let us shoot ourselves in the foot somehow
if (victim == LocalPlayer) { if (victim == LocalPlayer) {
@@ -490,7 +490,7 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
} }
damageSum[victim] += pelletDamage; damageSum[victim] += pelletDamage;
((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f); // ((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
} }
// Deal damage! // Deal damage!