diff --git a/Volt/Volt/src/Volt/Asset/Animation/AnimationGraphAsset.h b/Volt/Volt/src/Volt/Asset/Animation/AnimationGraphAsset.h index 4fe46e7a8..9daae894d 100644 --- a/Volt/Volt/src/Volt/Asset/Animation/AnimationGraphAsset.h +++ b/Volt/Volt/src/Volt/Asset/Animation/AnimationGraphAsset.h @@ -39,6 +39,7 @@ namespace Volt Ref CreateCopy(EntityID entity = Entity::NullID()); + Ref GetRelevantAnimationNode(); private: friend class AnimationGraphImporter; diff --git a/Volt/Volt/src/Volt/Asset/Asset.h b/Volt/Volt/src/Volt/Asset/Asset.h index 422e14199..3d63c8708 100644 --- a/Volt/Volt/src/Volt/Asset/Asset.h +++ b/Volt/Volt/src/Volt/Asset/Asset.h @@ -52,7 +52,7 @@ namespace Volt NetContract = BIT(24), PostProcessingMaterial = BIT(25), PostProcessingStack = BIT(26), - MotionWeaver = BIT(27), + MotionWeave = BIT(27), }; inline AssetType operator|(AssetType aLhs, AssetType aRhs) diff --git a/Volt/Volt/src/Volt/Vision/TimelinePlayer.cpp b/Volt/Volt/src/Volt/Vision/TimelinePlayer.cpp index d81e5dae0..36d36a7df 100644 --- a/Volt/Volt/src/Volt/Vision/TimelinePlayer.cpp +++ b/Volt/Volt/src/Volt/Vision/TimelinePlayer.cpp @@ -153,7 +153,7 @@ void Volt::TimelinePlayer::PlayTimeline(const float& deltaTime, Scene* scene) if (myCurrentPlaybackTime <= track.clips.at(0).startTime) { - if (vision.GetActiveCamera() != track.clips[0].activeCamera) + if (vision.GetActiveCamera().GetID() != track.clips[0].activeCamera) { vision.SetActiveCamera(track.clips[0].activeCamera, 0, Volt::eBlendType::None); myCurrentPlaybackTime += deltaTime; diff --git a/Volt/Volt/src/Volt/Vision/Vision.cpp b/Volt/Volt/src/Volt/Vision/Vision.cpp index 8a4b957a3..ab1e9c96c 100644 --- a/Volt/Volt/src/Volt/Vision/Vision.cpp +++ b/Volt/Volt/src/Volt/Vision/Vision.cpp @@ -72,7 +72,7 @@ void Volt::Vision::Update(float aDeltaTime) if (myTransitionCamera) { - cams.erase(std::remove(cams.begin(), cams.end(), myTransitionCamera.GetID()), cams.end()); + cams.erase(std::remove(cams.begin(), cams.end(), myTransitionCamera), cams.end()); } if (myVTCams.size() != cams.size())