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

Sidearm tracer fixed

Browse Source
This commit is contained in:
viktorljung
2016-03-13 23:42:21 +01:00
parent 4adf7dc507
commit 1bf65d896a
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/RayAssaultBlue.xml
-4
View File
@@ -17,10 +17,8 @@
<DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture> <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
<Color A="1" B="2.35294127" G="1.17647064" R="0"/> <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
<KeepRatio>true</KeepRatio> <KeepRatio>true</KeepRatio>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="-0.5"/>
<Orientation X="0" Y="-1.57099998" Z="0"/> <Orientation X="0" Y="-1.57099998" Z="0"/>
<Scale X="1" Y="0.0700000003" Z="0"/> <Scale X="1" Y="0.0700000003" Z="0"/>
</c:Transform> </c:Transform>
@@ -35,10 +33,8 @@
<DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture> <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
<Color A="1" B="2.35294127" G="1.17647064" R="0"/> <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
<KeepRatio>true</KeepRatio> <KeepRatio>true</KeepRatio>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="-0.5"/>
<Orientation X="0" Y="4.71218538" Z="3.14199996"/> <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
<Scale X="1" Y="0.0700000003" Z="0"/> <Scale X="1" Y="0.0700000003" Z="0"/>
</c:Transform> </c:Transform>
resources/Schema/Entities/RaySideArmBlue.xml
+2 -6
View File
@@ -3,10 +3,10 @@
<Components> <Components>
<c:Lifetime> <c:Lifetime>
<Lifetime>0.08</Lifetime> <Lifetime>0.080000000000000002</Lifetime>
</c:Lifetime> </c:Lifetime>
<c:Fade> <c:Fade>
<FadeTime>0.08</FadeTime> <FadeTime>0.080000000000000002</FadeTime>
</c:Fade> </c:Fade>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -20,10 +20,8 @@
<DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture> <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
<Color A="1" B="2.35294127" G="1.17647064" R="0"/> <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
<KeepRatio>true</KeepRatio> <KeepRatio>true</KeepRatio>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="-0.5"/>
<Orientation X="0" Y="-1.57099998" Z="0"/> <Orientation X="0" Y="-1.57099998" Z="0"/>
<Scale X="1" Y="0.0250000004" Z="0"/> <Scale X="1" Y="0.0250000004" Z="0"/>
</c:Transform> </c:Transform>
@@ -38,10 +36,8 @@
<DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture> <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
<Color A="1" B="2.35294127" G="1.17647064" R="0"/> <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
<KeepRatio>true</KeepRatio> <KeepRatio>true</KeepRatio>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="-0.5"/>
<Orientation X="0" Y="4.71218538" Z="3.14199996"/> <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
<Scale X="1" Y="0.0250000004" Z="0"/> <Scale X="1" Y="0.0250000004" Z="0"/>
</c:Transform> </c:Transform>
resources/Schema/Entities/WeaponAssaultBlueView.xml
+1 -1
View File
@@ -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.0250000004"/> <Position X="0.00179657922" Y="-0.00304772682" Z="-0.334699303"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
+4 -3
View File
@@ -189,15 +189,16 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
return; return;
} }
//Tracer // Tracer
EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay"); EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay");
if (tracerSpawner.Valid()) { if (tracerSpawner.Valid()) {
glm::vec3 origin = TransformSystem::AbsolutePosition(tracerSpawner); glm::vec3 origin = TransformSystem::AbsolutePosition(tracerSpawner);
glm::vec3 direction = TransformSystem::AbsoluteOrientation(tracerSpawner) * glm::vec3(0, 0, -1); glm::vec3 direction = glm::quat(TransformSystem::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1);
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);
} }
} }