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

fixup! Blend duration can now be 0.0

Browse Source 
Commited input test stuff
This commit is contained in:
viktorljung
2016-03-04 02:30:05 +01:00
parent 49802fed91
commit 1ff91a5c5d
2 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/AnimationSystem.h
-2
View File
@@ -28,8 +28,6 @@ private:
EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend; EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e); bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
EventRelay<AnimationSystem, Events::InputCommand> m_EInputCommand;
bool OnInputCommand(const Events::InputCommand& e);
std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues; std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
}; };
src/Engine/Rendering/AnimationSystem.cpp
-40
View File
@@ -4,7 +4,6 @@ AnimationSystem::AnimationSystem(SystemParams params)
: System(params) : System(params)
{ {
EVENT_SUBSCRIBE_MEMBER(m_EAutoAnimationBlend, &AnimationSystem::OnAutoAnimationBlend); EVENT_SUBSCRIBE_MEMBER(m_EAutoAnimationBlend, &AnimationSystem::OnAutoAnimationBlend);
EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &AnimationSystem::OnInputCommand);
} }
void AnimationSystem::Update(double dt) void AnimationSystem::Update(double dt)
@@ -221,42 +220,3 @@ bool AnimationSystem::OnAutoAnimationBlend(Events::AutoAnimationBlend& e)
m_AutoBlendQueues[subTreeRoot].Insert(abj); m_AutoBlendQueues[subTreeRoot].Insert(abj);
return true; return true;
} }
bool AnimationSystem::OnInputCommand(const Events::InputCommand& e)
{
if (e.Value == 1.0f) {
if (e.Command == "Shoot") {
auto blendComponents = m_World->GetComponents("Model");
if (blendComponents == nullptr) {
return false;
}
for (auto& bc : *blendComponents) {
EntityWrapper entity = EntityWrapper(m_World, bc.EntityID);
if (entity.Name() == "Hands") {
{
Events::AutoAnimationBlend aeb;
aeb.Duration = 0.0;
aeb.NodeName = "Fire";
aeb.RootNode = entity;
aeb.Start = true;
aeb.Restart = true;
m_EventBroker->Publish(aeb);
}
{
Events::AutoAnimationBlend aeb;
aeb.Duration = 0.1;
aeb.NodeName = "Idle";
aeb.RootNode = entity;
aeb.Delay = 0.0;
aeb.Start = true;
aeb.Restart = false;
aeb.AnimationEntity = entity.FirstChildByName("PrimaryBlendTree").FirstChildByName("Fire");
m_EventBroker->Publish(aeb);
}
}
}
}
}
}