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

spawning 1 shield on server and one on client

Browse Source
This commit is contained in:
viktorljung
2016-03-14 16:46:03 +01:00
parent f269caafed
commit bdbf864934
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/DefenderShield.xml
+2 -20
View File
@@ -31,17 +31,8 @@
<Components> <Components>
<c:Animation> <c:Animation>
<AnimationName>ActivateShieldU</AnimationName> <AnimationName>ActivateShieldU</AnimationName>
<Loop>false</Loop>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="Idle">
<Components>
<c:Animation>
<AnimationName>ShieldFrontU</AnimationName>
<Play>true</Play> <Play>true</Play>
<Loop>false</Loop>
</c:Animation> </c:Animation>
<c:Transform/> <c:Transform/>
</Components> </Components>
@@ -74,16 +65,7 @@
<Components> <Components>
<c:Animation> <c:Animation>
<AnimationName>ActivateShieldU</AnimationName> <AnimationName>ActivateShieldU</AnimationName>
<Loop>false</Loop> <Play>true</Play>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="Idle">
<Components>
<c:Animation>
<AnimationName>ShieldFrontU</AnimationName>
<Loop>false</Loop> <Loop>false</Loop>
</c:Animation> </c:Animation>
<c:Transform/> <c:Transform/>
src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
+8
View File
@@ -162,6 +162,7 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
SpawnerSystem::Spawn(attachment, attachment); SpawnerSystem::Spawn(attachment, attachment);
/*
EntityWrapper backAttachment = attachment.FirstChildByName("Back"); EntityWrapper backAttachment = attachment.FirstChildByName("Back");
if (backAttachment.Valid()) { if (backAttachment.Valid()) {
@@ -171,7 +172,11 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
eDeployShieldAttachement.Restart = true; eDeployShieldAttachement.Restart = true;
eDeployShieldAttachement.Start = true; eDeployShieldAttachement.Start = true;
m_EventBroker->Publish(eDeployShieldAttachement); m_EventBroker->Publish(eDeployShieldAttachement);
} else {
LOG_ERROR("back shield invalid");
} }
EntityWrapper frontAttachment = attachment.FirstChildByName("Front"); EntityWrapper frontAttachment = attachment.FirstChildByName("Front");
if (frontAttachment.Valid()) { if (frontAttachment.Valid()) {
Events::AutoAnimationBlend eDeployShieldAttachement; Events::AutoAnimationBlend eDeployShieldAttachement;
@@ -181,7 +186,10 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
eDeployShieldAttachement.Start = true; eDeployShieldAttachement.Start = true;
m_EventBroker->Publish(eDeployShieldAttachement); m_EventBroker->Publish(eDeployShieldAttachement);
} else {
LOG_ERROR("front shield invalid");
} }
*/
if (IsClient) { if (IsClient) {
EntityWrapper root = wi.FirstPersonEntity; EntityWrapper root = wi.FirstPersonEntity;