Skip to content

Commit 9903acd

Browse files
committed
fix build error in UE5.5
1 parent 5581790 commit 9903acd

File tree

9 files changed

+41
-7
lines changed

9 files changed

+41
-7
lines changed

Plugins/KawaiiPhysics/KawaiiPhysics.uplugin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
3-
"Version": 1.17,
4-
"VersionName": "1.17.1",
3+
"Version": 1.18,
4+
"VersionName": "1.18.0",
55
"FriendlyName": "KawaiiPhysics",
66
"Description": "",
77
"Category": "Animation",

Plugins/KawaiiPhysics/Source/KawaiiPhysics/AnimNotifies/AnimNotifyState_KawaiiPhysics.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44

55
#include "CoreMinimal.h"
66
#include "GameplayTagContainer.h"
7-
#include "InstancedStruct.h"
87
#include "Animation/AnimNotifies/AnimNotifyState.h"
8+
9+
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5
10+
#include "StructUtils/InstancedStruct.h"
11+
#else
12+
#include "InstancedStruct.h"
13+
#endif
14+
915
#include "AnimNotifyState_KawaiiPhysics.generated.h"
1016

1117
/**

Plugins/KawaiiPhysics/Source/KawaiiPhysics/AnimNotifies/AnimNotify_KawaiiPhysics.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22

33
#include "CoreMinimal.h"
44
#include "GameplayTagContainer.h"
5-
#include "InstancedStruct.h"
65
#include "Animation/AnimNotifies/AnimNotify.h"
6+
7+
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5
8+
#include "StructUtils/InstancedStruct.h"
9+
#else
10+
#include "InstancedStruct.h"
11+
#endif
12+
713
#include "AnimNotify_KawaiiPhysics.generated.h"
814

915
/**

Plugins/KawaiiPhysics/Source/KawaiiPhysics/KawaiiPhysics.Build.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,16 @@ public KawaiiPhysics(ReadOnlyTargetRules Target) : base(Target)
2929
{
3030
"Core",
3131
// ... add other public dependencies that you statically link with here ...
32-
"AnimGraphRuntime", "StructUtils", "GameplayTags"
32+
"AnimGraphRuntime",
33+
"GameplayTags"
3334
}
3435
);
35-
36+
37+
// StructUtils plugin has been integrated into the engine starting from 5.5
38+
if (Target.Version.MajorVersion == 5 && Target.Version.MinorVersion <= 4)
39+
{
40+
PublicDependencyModuleNames.Add("StructUtils");
41+
}
3642

3743
PrivateDependencyModuleNames.AddRange(
3844
new[]

Plugins/KawaiiPhysics/Source/KawaiiPhysics/Private/AnimNode_KawaiiPhysics.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
#include "SceneInterface.h"
1212
#include "PhysicsEngine/PhysicsAsset.h"
1313

14+
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5
15+
#include "PhysicsEngine/SkeletalBodySetup.h"
16+
#endif
17+
1418
#if WITH_EDITOR
1519
#include "UnrealEdGlobals.h"
1620
#include "Editor/UnrealEdEngine.h"

Plugins/KawaiiPhysics/Source/KawaiiPhysics/Private/KawaiiPhysicsExternalForce.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "KawaiiPhysicsExternalForce.h"
22

3+
#include "SceneInterface.h"
34
#include "GameFramework/Character.h"
45
#include "GameFramework/CharacterMovementComponent.h"
56

Plugins/KawaiiPhysics/Source/KawaiiPhysics/Public/AnimNode_KawaiiPhysics.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
#include "BoneContainer.h"
55
#include "BonePose.h"
66
#include "GameplayTagContainer.h"
7-
#include "InstancedStruct.h"
7+
88
#include "BoneControllers/AnimNode_AnimDynamics.h"
99
#include "BoneControllers/AnimNode_SkeletalControlBase.h"
10+
11+
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5
12+
#include "StructUtils/InstancedStruct.h"
13+
#else
14+
#include "InstancedStruct.h"
15+
#endif
16+
1017
#include "AnimNode_KawaiiPhysics.generated.h"
1118

1219
class UKawaiiPhysics_CustomExternalForce;

Plugins/KawaiiPhysics/Source/KawaiiPhysics/Public/KawaiiPhysicsExternalForce.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22
#include "AnimNode_KawaiiPhysics.h"
3+
#include "SceneManagement.h"
34
#include "Curves/CurveVector.h"
45
#include "KawaiiPhysicsExternalForce.generated.h"
56

Plugins/KawaiiPhysics/Source/KawaiiPhysicsEd/Private/AnimGraphNode_KawaiiPhysics.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#include "AnimGraphNode_KawaiiPhysics.h"
22

3+
#include "Subsystems/AssetEditorSubsystem.h"
34
#include "AssetToolsModule.h"
45
#include "DetailCategoryBuilder.h"
56
#include "DetailLayoutBuilder.h"
67
#include "DetailWidgetRow.h"
78
#include "KawaiiPhysicsBoneConstraintsDataAsset.h"
89
#include "KawaiiPhysicsLimitsDataAsset.h"
10+
#include "Widgets/Input/SButton.h"
911
#include "Framework/Notifications/NotificationManager.h"
1012
#include "Selection.h"
13+
#include "Widgets/Text/STextBlock.h"
1114
#include "Widgets/Notifications/SNotificationList.h"
1215
#include "AssetRegistry/AssetRegistryModule.h"
1316
#include "Dialogs/DlgPickAssetPath.h"

0 commit comments

Comments
 (0)