From 03f3f10983057c3401ef31ebb9dff715be3ddaa9 Mon Sep 17 00:00:00 2001 From: Panakotta00 Date: Sun, 10 Jul 2022 23:21:03 +0200 Subject: [PATCH] Version Bump --- FicsItCam.uplugin | 2 +- Jenkinsfile | 2 +- .../Private/Data/Objects/FICParticleSystem.cpp | 1 + .../FicsItCam/Private/Editor/FICEditorSubsystem.cpp | 12 +++++++----- Source/FicsItCam/Private/Editor/UI/FICViewport.cpp | 2 +- .../FicsItCam/Private/Runtime/FICCaptureCamera.cpp | 4 ++-- .../FicsItCam/Private/Runtime/FICTimelapseCamera.cpp | 2 +- .../Public/Command/Scene/FICCommandCreate.h | 2 +- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/FicsItCam.uplugin b/FicsItCam.uplugin index 668eeec..6f32b5f 100644 --- a/FicsItCam.uplugin +++ b/FicsItCam.uplugin @@ -26,7 +26,7 @@ "Plugins": [ { "Name": "SML", - "SemVersion": "^3.3.0", + "SemVersion": "^3.3.2", "Enabled": true } ] diff --git a/Jenkinsfile b/Jenkinsfile index aec0a60..2d5deb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -118,7 +118,7 @@ pipeline { always { cleanWs() withCredentials([string(credentialsId: 'FINDiscordToken_FicsItCam', variable: 'WEBHOOKURL')]) { - discordSend description: "FIN Build", link: env.BUILD_URL, result: currentBuild.currentResult, title: JOB_NAME, webhookURL: "$WEBHOOKURL" + discordSend description: "FIC Build", link: env.BUILD_URL, result: currentBuild.currentResult, title: JOB_NAME, webhookURL: "$WEBHOOKURL" } } } diff --git a/Source/FicsItCam/Private/Data/Objects/FICParticleSystem.cpp b/Source/FicsItCam/Private/Data/Objects/FICParticleSystem.cpp index 587e697..287d923 100644 --- a/Source/FicsItCam/Private/Data/Objects/FICParticleSystem.cpp +++ b/Source/FicsItCam/Private/Data/Objects/FICParticleSystem.cpp @@ -1,5 +1,6 @@ #include "Data/Objects/FICParticleSystem.h" +#include "FICUtils.h" #include "NiagaraComponent.h" #include "Data/Objects/FICWorldSettings.h" #include "Editor/FICEditorContext.h" diff --git a/Source/FicsItCam/Private/Editor/FICEditorSubsystem.cpp b/Source/FicsItCam/Private/Editor/FICEditorSubsystem.cpp index feec925..14e717b 100644 --- a/Source/FicsItCam/Private/Editor/FICEditorSubsystem.cpp +++ b/Source/FicsItCam/Private/Editor/FICEditorSubsystem.cpp @@ -293,6 +293,9 @@ void AFICEditorSubsystem::CloseEditor() { // Focus back to viewport Character->SetControlView(true); + // Remove Editor UI + GameOverlay->RemoveSlot(EditorWidget.ToSharedRef()); + // Unload loaded Editor Context Context->Unload(); @@ -300,9 +303,8 @@ void AFICEditorSubsystem::CloseEditor() { GetWorld()->GetFirstPlayerController()->Possess(OriginalPlayerCharacter); UFGInputLibrary::UpdateInputMappings(GetWorld()->GetFirstPlayerController()); UFGGameUserSettings::GetFGGameUserSettings()->ApplySettings(false); - - // Remove Editor UI - GameOverlay->RemoveSlot(EditorWidget.ToSharedRef()); + + // Add Game Viewport Back GameOverlay->AddSlot()[ GameViewportContainer.ToSharedRef() ]; @@ -332,10 +334,10 @@ void AFICEditorSubsystem::SetMeshInstanced(UMeshComponent* MeshComp, bool Instan ColoredMeshProxy->mBlockInstancing = !Instanced; ColoredMeshProxy->SetInstanced(Instanced); } else { - auto ProdIndInst = Cast(MeshComp); + /*auto ProdIndInst = Cast(MeshComp); if (ProdIndInst) { ProdIndInst->SetInstanced(Instanced); - } + }*/ } } } diff --git a/Source/FicsItCam/Private/Editor/UI/FICViewport.cpp b/Source/FicsItCam/Private/Editor/UI/FICViewport.cpp index d431036..1bb1496 100644 --- a/Source/FicsItCam/Private/Editor/UI/FICViewport.cpp +++ b/Source/FicsItCam/Private/Editor/UI/FICViewport.cpp @@ -27,7 +27,7 @@ void SFICViewport::OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent if (SceneObjectDrag) { if (!SceneObjectDrag->SceneObject && SceneObjectDrag->bSceneObjectTemp) { UObject* CDO = SceneObjectDrag->SceneObjectClass->GetDefaultObject(); - UObject* SceneObject = Cast(CDO)->CreateNewObject(AFICSubsystem::GetFICSubsystem(Context), Context->GetScene()); + UObject* SceneObject = Cast(CDO)->CreateNewObject(Context->GetScene(), Context->GetScene()); Context->AddSceneObject(SceneObject); SceneObjectDrag->SceneObject = SceneObject; SceneObjectDrag->Context = Context; diff --git a/Source/FicsItCam/Private/Runtime/FICCaptureCamera.cpp b/Source/FicsItCam/Private/Runtime/FICCaptureCamera.cpp index 42930ba..a147e4b 100644 --- a/Source/FicsItCam/Private/Runtime/FICCaptureCamera.cpp +++ b/Source/FicsItCam/Private/Runtime/FICCaptureCamera.cpp @@ -31,9 +31,9 @@ void AFICCaptureCamera::SetCamera(bool bEnabled, bool bCinematic) { } if (bEnabled) { if (bCinematic) { - Camera = NewObject(); + Camera = NewObject(this); } else { - Camera = NewObject(); + Camera = NewObject(this); } Camera->AttachToComponent(RootComponent, FAttachmentTransformRules::KeepRelativeTransform); Camera->PostProcessSettings.VignetteIntensity = 0; diff --git a/Source/FicsItCam/Private/Runtime/FICTimelapseCamera.cpp b/Source/FicsItCam/Private/Runtime/FICTimelapseCamera.cpp index bb41b8b..0802876 100644 --- a/Source/FicsItCam/Private/Runtime/FICTimelapseCamera.cpp +++ b/Source/FicsItCam/Private/Runtime/FICTimelapseCamera.cpp @@ -32,7 +32,7 @@ void AFICTimelapseCamera::OnConstruction(const FTransform& Transform) { void AFICTimelapseCamera::BeginPlay() { Super::BeginPlay(); - UFICRuntimeProcessTimelapseCamera* Process = NewObject(GetWorld()); + UFICRuntimeProcessTimelapseCamera* Process = NewObject(AFICSubsystem::GetFICSubsystem(this)); Process->CameraArgument.CameraSettingsSnapshot = UFICUtils::CreateCameraSettingsSnapshotFromView(this); Process->CameraArgument.CameraSettingsSnapshot.Location = GetActorLocation(); Process->CameraArgument.CameraSettingsSnapshot.Rotation = GetActorRotation(); diff --git a/Source/FicsItCam/Public/Command/Scene/FICCommandCreate.h b/Source/FicsItCam/Public/Command/Scene/FICCommandCreate.h index ce19233..374fbfc 100644 --- a/Source/FicsItCam/Public/Command/Scene/FICCommandCreate.h +++ b/Source/FicsItCam/Public/Command/Scene/FICCommandCreate.h @@ -32,7 +32,7 @@ class UFICCommandCreate : public UFICCommand { Scene->ResolutionHeight = Resolution.Y; Scene->SceneName = InArgs[0]; UFICCamera* CDO = UFICCamera::StaticClass()->GetDefaultObject(); - if (CDO) Scene->AddSceneObject(CDO->CreateNewObject(AFICEditorSubsystem::GetFICEditorSubsystem(InSender), Scene)); + if (CDO) Scene->AddSceneObject(CDO->CreateNewObject(AFICSubsystem::GetFICSubsystem(InSender), Scene)); InSender->SendChatMessage(FString::Printf(TEXT("Scene '%s' created."), *InArgs[0])); return EExecutionStatus::COMPLETED;