Skip to content

Added PlaybackType to FLoadingScreenDescription so movies can loop in… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nlebedenco merged 1 commit into from
Nov 26, 2016
Merged

Added PlaybackType to FLoadingScreenDescription so movies can loop in… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/LoadingScreen/Private/LoadingScreenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "ILoadingScreenModule.h"

#include "LoadingScreenSettings.h"
#include "MoviePlayer.h"

#include "SSimpleLoadingScreen.h"

Expand Down Expand Up @@ -84,7 +83,8 @@ void FLoadingScreenModule::BeginLoadingScreen(const FLoadingScreenDescription& S
LoadingScreen.bMoviesAreSkippable = ScreenDescription.bMoviesAreSkippable;
LoadingScreen.bWaitForManualStop = ScreenDescription.bWaitForManualStop;
LoadingScreen.MoviePaths = ScreenDescription.MoviePaths;

LoadingScreen.PlaybackType = ScreenDescription.PlaybackType;

if ( ScreenDescription.bShowUIOverlay )
{
LoadingScreen.WidgetLoadingScreen = SNew(SSimpleLoadingScreen, ScreenDescription);
Expand Down
5 changes: 5 additions & 0 deletions Source/LoadingScreen/Private/LoadingScreenSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#pragma once

#include "SScaleBox.h"
#include "MoviePlayer.h"

#include "LoadingScreenSettings.generated.h"

Expand All @@ -28,6 +29,10 @@ struct LOADINGSCREEN_API FLoadingScreenDescription
/** If true, movie playback continues until Stop is called. */
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Loading)
bool bWaitForManualStop;

/** Should we just play back, loop, etc. NOTE: if the playback type is MT_LoopLast, then bAutoCompleteWhenLoadingCompletes will be togged on when the last movie is hit*/
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Loading)
TEnumAsByte<EMoviePlaybackType> PlaybackType;

/** Should we show the images/tips/loading text? Generally you'll want to set this to false if you just want to show a movie. */
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Display)
Expand Down