Merge branch 'development'

Panakotta00 · Aug 8, 2023 · 382a95d · 382a95d
2 parents 887abc6 + e2a757d
commit 382a95d
Show file tree

Hide file tree

Showing 74 changed files with 418 additions and 384 deletions.
diff --git a/Content/InitGameInstance.uasset b/Content/InitGameInstance.uasset
diff --git a/Content/Input/IA_FIC_Editor_Control.uasset b/Content/Input/IA_FIC_Editor_Control.uasset
diff --git a/Content/Input/IA_FIC_Editor_FOV.uasset b/Content/Input/IA_FIC_Editor_FOV.uasset
diff --git a/Content/Input/IA_FIC_Editor_Frame.uasset b/Content/Input/IA_FIC_Editor_Frame.uasset
diff --git a/Content/Input/IA_FIC_Editor_Grab.uasset b/Content/Input/IA_FIC_Editor_Grab.uasset
diff --git a/Content/Input/IA_FIC_Editor_Movement.uasset b/Content/Input/IA_FIC_Editor_Movement.uasset
diff --git a/Content/Input/IA_FIC_Editor_NextKeyframe.uasset b/Content/Input/IA_FIC_Editor_NextKeyframe.uasset
diff --git a/Content/Input/IA_FIC_Editor_PrevKeyframe.uasset b/Content/Input/IA_FIC_Editor_PrevKeyframe.uasset
diff --git a/Content/Input/IA_FIC_Editor_Redo.uasset b/Content/Input/IA_FIC_Editor_Redo.uasset
diff --git a/Content/Input/IA_FIC_Editor_Rotation.uasset b/Content/Input/IA_FIC_Editor_Rotation.uasset
diff --git a/Content/Input/IA_FIC_Editor_Shift.uasset b/Content/Input/IA_FIC_Editor_Shift.uasset
diff --git a/Content/Input/IA_FIC_Editor_Speed.uasset b/Content/Input/IA_FIC_Editor_Speed.uasset
diff --git a/Content/Input/IA_FIC_Editor_SpeedUp.uasset b/Content/Input/IA_FIC_Editor_SpeedUp.uasset
diff --git a/Content/Input/IA_FIC_Editor_ToggleAllKeyframes.uasset b/Content/Input/IA_FIC_Editor_ToggleAllKeyframes.uasset
diff --git a/Content/Input/IA_FIC_Editor_ToggleAutoKeyframe.uasset b/Content/Input/IA_FIC_Editor_ToggleAutoKeyframe.uasset
diff --git a/Content/Input/IA_FIC_Editor_ToggleCursor.uasset b/Content/Input/IA_FIC_Editor_ToggleCursor.uasset
diff --git a/Content/Input/IA_FIC_Editor_ToggleLockCamera.uasset b/Content/Input/IA_FIC_Editor_ToggleLockCamera.uasset
diff --git a/Content/Input/IA_FIC_Editor_ToggleShowPath.uasset b/Content/Input/IA_FIC_Editor_ToggleShowPath.uasset
diff --git a/Content/Input/IA_FIC_Editor_Undo.uasset b/Content/Input/IA_FIC_Editor_Undo.uasset
diff --git a/Content/Input/IA_FIC_Playback_StopAnimation.uasset b/Content/Input/IA_FIC_Playback_StopAnimation.uasset
diff --git a/Content/Input/IC_FIC_Editor.uasset b/Content/Input/IC_FIC_Editor.uasset
diff --git a/Content/Input/IC_FIC_Playback.uasset b/Content/Input/IC_FIC_Playback.uasset
diff --git a/FicsItCam.uplugin b/FicsItCam.uplugin
@@ -2,7 +2,7 @@
 	"FileVersion": 3,
 	"Version": 0,
 	"VersionName": "0.3",
-	"SemVersion": "0.3.5",
+	"SemVersion": "0.3.6",
 	"AcceptsAnyRemoteVersion": true,
 	"FriendlyName": "FicsIt-Cam",
 	"Description": "This mod allows you to create beautiful camera animations in-game.",
@@ -26,7 +26,7 @@
 	"Plugins": [
         {
             "Name": "SML",
-            "SemVersion": "^3.3.2",
+            "SemVersion": "^3.5.0",
             "Enabled": true
         }
     ]

diff --git a/Source/FicsItCam/FicsItCam.Build.cs b/Source/FicsItCam/FicsItCam.Build.cs
@@ -14,25 +14,20 @@ public FicsItCam(ReadOnlyTargetRules Target) : base(Target)
             "Core", "CoreUObject",
             "Engine",
             "InputCore",
-            "OnlineSubsystem", "OnlineSubsystemUtils", "OnlineSubsystemNULL",
-            "SignificanceManager",
-            "PhysX", "APEX", "PhysXVehicles", "ApexDestruction",
-            "AkAudio",
             "ReplicationGraph",
             "UMG",
-            "AIModule",
-            "NavigationSystem",
             "AssetRegistry",
             "GameplayTasks",
-            "AnimGraphRuntime",
             "Slate", "SlateCore",
             "InteractiveToolsFramework",
             "CinematicCamera",
             "RHI",
             "Renderer",
             "RenderCore",
             "ImageWrapper",
-            "Niagara"
+            "Niagara",
+            "EnhancedInput",
+            "GameplayTags"
 		});
 
 		if (Target.Type == TargetRules.TargetType.Editor) {

diff --git a/Source/FicsItCam/Private/Data/Attributes/FICAttribute.cpp b/Source/FicsItCam/Private/Data/Attributes/FICAttribute.cpp
@@ -1,4 +1,6 @@
-#include "FicsItCam/Public/Data/Attributes/FICAttribute.h"
+#include "Data/Attributes/FICAttribute.h"
+
+TSharedRef<FFICEditorAttributeBase> FFICAttribute::CreateEditorAttribute() { checkf(false, TEXT("Not Implemented!")); return MakeShareable<FFICEditorAttributeBase>(nullptr); }
 
 void FFICAttribute::RecalculateAllKeyframes() {
 	TArray<int64> Keys;

diff --git a/Source/FicsItCam/Private/Data/Attributes/FICAttributeFloat.cpp b/Source/FicsItCam/Private/Data/Attributes/FICAttributeFloat.cpp
@@ -1,5 +1,6 @@
 #include "FicsItCam/Public/Data/Attributes/FICAttributeFloat.h"
 
+#include "Editor/Data/FICEditorAttributeBase.h"
 #include "FicsItCam/Public/FICUtils.h"
 
 TMap<FICFrame, TSharedRef<FFICKeyframe>> FFICFloatAttribute::GetKeyframes() {

diff --git a/Source/FicsItCam/Private/Data/Attributes/FICAttributeGroup.cpp b/Source/FicsItCam/Private/Data/Attributes/FICAttributeGroup.cpp
@@ -1,4 +1,4 @@
-#include "FicsItCam/Public/Data/Attributes/FICAttributeGroup.h"
+#include "Data/Attributes/FICAttributeGroup.h"
 
 #include "Editor/Data/FICEditorAttributeGroup.h"
 

diff --git a/Source/FicsItCam/Private/Data/Objects/FICWorldSettings.cpp b/Source/FicsItCam/Private/Data/Objects/FICWorldSettings.cpp
@@ -6,6 +6,7 @@
 #include "FGTimeSubsystem.h"
 #include "FICUtils.h"
 #include "Editor/FICEditorContext.h"
+#include "Editor/Data/FICEditorAttributeBase.h"
 
 UFICWorldSettings::UFICWorldSettings() {
 	RootAttribute.AddChildAttribute(TEXT("Active"), &Active);

diff --git a/Source/FicsItCam/Private/Editor/Data/FICEditorAttributeBase.cpp b/Source/FicsItCam/Private/Editor/Data/FICEditorAttributeBase.cpp
@@ -1,4 +1,4 @@
-#include "FicsItCam/Public/Editor/Data/FICEditorAttributeBase.h"
+#include "Editor/Data/FICEditorAttributeBase.h"
 
 #include "Data/Attributes/FICAttribute.h"
 #include "Editor/UI/FICSequencer.h"

diff --git a/Source/FicsItCam/Private/Editor/Data/FICEditorAttributeBool.cpp b/Source/FicsItCam/Private/Editor/Data/FICEditorAttributeBool.cpp
@@ -26,7 +26,7 @@ void FFICEditorAttributeBool::UpdateValue(FICFrame Time) {
 	SetActiveValue(Attribute->GetValue(Time));
 }
 
-float FFICEditorAttributeBool::GetValue(FICFrame InFrame) const {
+FICValue FFICEditorAttributeBool::GetValue(FICFrame InFrame) const {
 	return Attribute->GetValue(InFrame) ? 1.0 : 0.0;
 }
 

diff --git a/Source/FicsItCam/Private/Editor/Data/FICEditorAttributeGroup.cpp b/Source/FicsItCam/Private/Editor/Data/FICEditorAttributeGroup.cpp
@@ -1,7 +1,6 @@
 #include "Editor/Data/FICEditorAttributeGroup.h"
 
 #include "Data/Attributes/FICAttributeGroup.h"
-#include "Widgets/Layout/SExpandableArea.h"
 
 FFICEditorAttributeGroupBase::FFICEditorAttributeGroupBase(FFICAttributeValueChanged OnValueChanged, FLinearColor GraphColor): FFICEditorAttributeBase(GraphColor) {
 	OnCreateAttributeDetailsWidget.BindLambda([this](UFICEditorContext* Context) {
@@ -47,7 +46,7 @@ void FFICEditorAttributeGroupBase::UpdateValue(FICFrame Time) {
 	}
 }
 
-float FFICEditorAttributeGroupBase::GetValue(FICFrame InFrame) const {
+FICValue FFICEditorAttributeGroupBase::GetValue(FICFrame InFrame) const {
 	float Sum = 0.0f;
 	for (const TTuple<FString, TSharedRef<FFICEditorAttributeBase>>& Attribute : Attributes) {
 		Sum += Attribute.Value->GetValue(InFrame);

diff --git a/Source/FicsItCam/Private/Editor/Data/FICEditorCameraActor.cpp b/Source/FicsItCam/Private/Editor/Data/FICEditorCameraActor.cpp
@@ -1,11 +1,10 @@
 #include "Editor/Data/FICEditorCameraActor.h"
 
-#include "FicsItCamModule.h"
-#include "BaseGizmos/TransformGizmo.h"
 #include "Components/LineBatchComponent.h"
 #include "Components/SceneCaptureComponent2D.h"
 #include "Editor/Data/FICEditorAttributeBool.h"
 #include "Engine/TextureRenderTarget2D.h"
+#include "BaseGizmos/CombinedTransformGizmo.h"
 
 UFICEditorCameraPathComponent::UFICEditorCameraPathComponent() {
 	bAutoActivate = true;
@@ -141,8 +140,8 @@ void AFICEditorCameraActor::Tick(float DeltaSeconds) {
 		}
 
 		CaptureComponent->HiddenActors.Empty();
-		for (TActorIterator<ATransformGizmoActor> Gizmo(GetWorld()); Gizmo; ++Gizmo) {
-			CaptureComponent->HiddenActors.Add(*Gizmo);
+		for (TActorIterator<ACombinedTransformGizmoActor> Gizmo(GetWorld()); Gizmo; ++Gizmo) {
+			CaptureComponent->HiddenActors.Add(TObjectPtr<AActor>((AActor*)*Gizmo));
 		}
 		// TODO: This is a shitty fix for something that would require a big change (layer system to define when what editor stuff needs to get rendered)
 	}