izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

MovieGraph: Unify namespaces for new files (UE::MovieGraph)

Browse Source 
#jira UE-205975
#rb chad.williams

[CL 31489198 by matt hoffman in ue5-main branch]
This commit is contained in:
matt hoffman
2024-02-14 15:08:27 -05:00
parent 487ba9f4a3
commit 2112ea15f6
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Engine/Plugins/MovieScene/MovieRenderPipeline/Source/MovieRenderPipelineCore/Private/Graph/MovieGraphConfig.cpp
View File

@@ -15,6 +15,7 @@
#include "Graph/Nodes/MovieGraphSubgraphNode.h"
#include "Graph/Nodes/MovieGraphVariableNode.h"
#include "Graph/Nodes/MovieGraphSelectNode.h"
#include "Graph/MovieGraphUtils.h"
#include "MovieGraphUtils.h"
#include "MoviePipelineQueue.h"
#include "MovieRenderPipelineCoreModule.h"
@@ -667,8 +668,6 @@ RetType* UMovieGraphConfig::AddMember(TArray<TObjectPtr<ArrType>>& InMemberArray
{
static_assert(std::is_base_of_v<UMovieGraphMember, RetType>, "RetType is not derived from UMovieGraphMember");
using namespace UE::MoviePipeline::RenderGraph;
// TODO: This can be replaced with just CreateDefaultSubobject() when AddDefaultMembers() isn't called from PostLoad()
//
// This method will be called in two cases: 1) when default members are being added to a new graph when it is being
@@ -698,7 +697,7 @@ RetType* UMovieGraphConfig::AddMember(TArray<TObjectPtr<ArrType>>& InMemberArray
{
TArray<FString> ExistingMemberNames;
Algo::Transform(InMemberArray, ExistingMemberNames, [](const ArrType* Member) { return Member->GetMemberName(); });
NewMember->SetMemberName(GetUniqueName(ExistingMemberNames, InBaseName.ToString()));
NewMember->SetMemberName(UE::MovieGraph::GetUniqueName(ExistingMemberNames, InBaseName.ToString()));
}
return NewMember;

6
Engine/Plugins/MovieScene/MovieRenderPipeline/Source/MovieRenderPipelineCore/Private/Graph/MovieGraphDefaultAudioRenderer.cpp
View File

@@ -1,4 +1,4 @@
// Copyright Epic Games, Inc. All Rights Reserved.
// Copyright Epic Games, Inc. All Rights Reserved.
#include "Graph/MovieGraphDefaultAudioRenderer.h"
@@ -20,7 +20,7 @@ void UMovieGraphDefaultAudioRenderer::StartAudioRecording()
{
AudioState.bIsRecordingAudio = true;
if (Audio::FMixerDevice* MixerDevice = UE::MoviePipeline::RenderGraph::Audio::GetAudioMixerDeviceFromWorldContext(this))
if (Audio::FMixerDevice* MixerDevice = UE::MovieGraph::Audio::GetAudioMixerDeviceFromWorldContext(this))
{
const TWeakPtr<Audio::FMixerSubmix> MasterSubmix = MixerDevice->GetMasterSubmix();
if (MasterSubmix.Pin())
@@ -58,7 +58,7 @@ void UMovieGraphDefaultAudioRenderer::StopAudioRecording()
void UMovieGraphDefaultAudioRenderer::ProcessAudioTick()
{
// Only supported on the new audio mixer (with the non-realtime device, windows only).
Audio::FMixerDevice* MixerDevice = UE::MoviePipeline::RenderGraph::Audio::GetAudioMixerDeviceFromWorldContext(this);
Audio::FMixerDevice* MixerDevice = UE::MovieGraph::Audio::GetAudioMixerDeviceFromWorldContext(this);
if (!MixerDevice)
{
return;

2
Engine/Plugins/MovieScene/MovieRenderPipeline/Source/MovieRenderPipelineCore/Private/Graph/MovieGraphUtils.cpp
View File

@@ -6,7 +6,7 @@
#include "AudioThread.h"
#include "Engine/Engine.h"
namespace UE::MoviePipeline::RenderGraph
namespace UE::MovieGraph
{
FString GetUniqueName(const TArray<FString>& InExistingNames, const FString& InBaseName)
{

4
Engine/Plugins/MovieScene/MovieRenderPipeline/Source/MovieRenderPipelineCore/Private/Graph/MovieGraphUtils.h
View File

@@ -1,4 +1,4 @@
// Copyright Epic Games, Inc. All Rights Reserved.
// Copyright Epic Games, Inc. All Rights Reserved.
#pragma once
@@ -11,7 +11,7 @@ namespace Audio
class FMixerDevice;
}
namespace UE::MoviePipeline::RenderGraph
namespace UE::MovieGraph
{
/**
* Generate a unique name given a set of existing names and the desired base name. The base name will

2
Engine/Plugins/MovieScene/MovieRenderPipeline/Source/MovieRenderPipelineCore/Private/Graph/Nodes/MovieGraphAudioOutputNode.cpp
View File

@@ -201,7 +201,7 @@ void UMovieGraphAudioOutputNode::GenerateFinalAudioData(TArray<FFinalAudioData>&
void UMovieGraphAudioOutputNode::StartAudioExport()
{
if (!UE::MoviePipeline::RenderGraph::Audio::IsMoviePipelineAudioOutputSupported(CachedPipeline.Get()))
if (!UE::MovieGraph::Audio::IsMoviePipelineAudioOutputSupported(CachedPipeline.Get()))
{
return;
}