Compare commits

...

2 Commits

Author SHA1 Message Date
mafiesto4 c328d2b559 Increase maximum window width limit to 8k 2021-08-26 20:22:10 +02:00
mafiesto4 65747c9ddf Fix issue with MapTrack for actors 2021-08-26 20:22:02 +02:00
2 changed files with 6 additions and 5 deletions
@@ -236,23 +236,24 @@ void SceneAnimationPlayer::MapTrack(const StringView& from, const Guid& to)
{ {
const auto trackData = track.GetData<SceneAnimation::ActorTrack::Data>(); const auto trackData = track.GetData<SceneAnimation::ActorTrack::Data>();
_objectsMapping[trackData->ID] = to; _objectsMapping[trackData->ID] = to;
break; return;
} }
case SceneAnimation::Track::Types::Script: case SceneAnimation::Track::Types::Script:
{ {
const auto trackData = track.GetData<SceneAnimation::ScriptTrack::Data>(); const auto trackData = track.GetData<SceneAnimation::ScriptTrack::Data>();
_objectsMapping[trackData->ID] = to; _objectsMapping[trackData->ID] = to;
break; return;
} }
case SceneAnimation::Track::Types::CameraCut: case SceneAnimation::Track::Types::CameraCut:
{ {
const auto trackData = track.GetData<SceneAnimation::CameraCutTrack::Data>(); const auto trackData = track.GetData<SceneAnimation::CameraCutTrack::Data>();
_objectsMapping[trackData->ID] = to; _objectsMapping[trackData->ID] = to;
break; return;
} }
default: ; default: ;
} }
} }
LOG(Warning, "Missing track '{0}' in scene animation '{1}' to map into object ID={2}", from, anim->ToString(), to);
} }
void SceneAnimationPlayer::Restore(SceneAnimation* anim, int32 stateIndexOffset) void SceneAnimationPlayer::Restore(SceneAnimation* anim, int32 stateIndexOffset)
@@ -744,7 +745,7 @@ void SceneAnimationPlayer::Tick(SceneAnimation* anim, float time, float dt, int3
const auto trackData = track.GetData<SceneAnimation::ActorTrack::Data>(); const auto trackData = track.GetData<SceneAnimation::ActorTrack::Data>();
Guid id = trackData->ID; Guid id = trackData->ID;
_objectsMapping.TryGet(id, id); _objectsMapping.TryGet(id, id);
state.Object = Scripting::FindObject<Actor>(trackData->ID); state.Object = Scripting::FindObject<Actor>(id);
if (!state.Object) if (!state.Object)
{ {
LOG(Warning, "Failed to find {3} of ID={0} for track '{1}' in scene animation '{2}'", id, track.Name, anim->ToString(), TEXT("actor")); LOG(Warning, "Failed to find {3} of ID={0} for track '{1}' in scene animation '{2}'", id, track.Name, anim->ToString(), TEXT("actor"));
@@ -61,7 +61,7 @@ DECLARE_SCRIPTING_TYPE_MINIMAL(CreateWindowSettings);
/// <summary> /// <summary>
/// The maximum size. /// The maximum size.
/// </summary> /// </summary>
API_FIELD() Vector2 MaximumSize = Vector2(4096, 4096); API_FIELD() Vector2 MaximumSize = Vector2(8192, 4096);
/// <summary> /// <summary>
/// The start position mode. /// The start position mode.