GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add support for PrefabObject tracks and automated animation instancing with UsePrefabObjects enabled

Browse Source
This commit is contained in:
Wojtek Figat
2021-12-11 17:27:22 +01:00
parent 77e1ec530b
commit a9aaed6f33
6 changed files with 91 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Animations/SceneAnimations/SceneAnimation.h
View File

@@ -49,6 +49,7 @@ public:
None = 0,
Mute = 1,
Loop = 2,
PrefabObject = 4,
};
/// <summary>
@@ -473,3 +474,5 @@ protected:
void unload(bool isReloading) override;
AssetChunksFlag getChunksToPreload() const override;
};
DECLARE_ENUM_OPERATORS(SceneAnimation::Track::Flags);

25
Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp
View File

@@ -1124,6 +1124,7 @@ void SceneAnimationPlayer::Serialize(SerializeStream& stream, const void* otherO
SERIALIZE(RandomStartTime);
SERIALIZE(RestoreStateOnStop);
SERIALIZE(UpdateMode);
SERIALIZE(UsePrefabObjects);
}
void SceneAnimationPlayer::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
@@ -1140,6 +1141,30 @@ void SceneAnimationPlayer::Deserialize(DeserializeStream& stream, ISerializeModi
DESERIALIZE(RandomStartTime);
DESERIALIZE(RestoreStateOnStop);
DESERIALIZE(UpdateMode);
DESERIALIZE(UsePrefabObjects);
if (UsePrefabObjects && Animation && !Animation->WaitForLoaded())
{
// When loading from prefab automatically map objects from prefab instance into animation tracks with object references
for (auto& track : Animation->Tracks)
{
if (track.Disabled || !(track.Flag & SceneAnimation::Track::Flags::PrefabObject))
continue;
switch (track.Type)
{
case SceneAnimation::Track::Types::Actor:
case SceneAnimation::Track::Types::Script:
case SceneAnimation::Track::Types::CameraCut:
{
const auto trackData = track.GetData<SceneAnimation::ObjectTrack::Data>();
Guid id;
if (modifier->IdsMapping.TryGet(trackData->ID, id))
_objectsMapping[trackData->ID] = id;
break;
}
}
}
}
}
void SceneAnimationPlayer::Collect(RenderContext& renderContext)

6
Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
View File

@@ -128,6 +128,12 @@ public:
API_FIELD(Attributes="EditorDisplay(\"Scene Animation\"), EditorOrder(80), DefaultValue(UpdateModes.EveryUpdate)")
UpdateModes UpdateMode = UpdateModes::EveryUpdate;
/// <summary>
/// Determines whether the scene animation should automatically map prefab objects from scene animation into prefab instances. Useful for reusable animations to automatically link prefab objects.
/// </summary>
API_FIELD(Attributes="EditorDisplay(\"Scene Animation\"), EditorOrder(100)")
bool UsePrefabObjects = false;
public:
/// <summary>