From 6eb6f9c2033a556b0c8544a76628a80f34dba5af Mon Sep 17 00:00:00 2001 From: charnet3d Date: Thu, 25 Jan 2024 06:43:56 +0100 Subject: [PATCH] New Character Blueprint based on cpp Character Fixed cooking issue caused by uninitialized value in SSTCharacterMovementComponent in BP_MainCharacter_orig --- Config/DefaultEngine.ini | 21 +++++++++++++------ .../Retargeted_UE4_Manny/ABP_SST.uasset | 4 ++-- .../Blueprints/BP_FunnyPrinceCharacter.uasset | 3 +++ .../Blueprints/BP_FunnyPrinceGameMode.uasset | 4 ++-- .../Blueprints/BP_MainCharacter.uasset | 3 --- FunnyPrince.uproject | 5 +++++ Source/FunnyPrince/FunnyPrinceCharacter.cpp | 14 ++++++++++++- Source/FunnyPrince/FunnyPrinceCharacter.h | 4 +++- Source/FunnyPrince/FunnyPrinceGameMode.cpp | 7 +------ 9 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 Content/SideScroller/Blueprints/BP_FunnyPrinceCharacter.uasset delete mode 100644 Content/SideScroller/Blueprints/BP_MainCharacter.uasset diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index e8ac80e..c7e5214 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,7 +2,7 @@ EditorStartupMap=/Game/SideScroller/Maps/ExampleMap.ExampleMap LocalMapOptions= TransitionMap=None -bUseSplitscreen=True +bUseSplitscreen=False TwoPlayerSplitscreenLayout=Horizontal ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid @@ -63,7 +63,7 @@ r.AllowStaticLighting=True r.NormalMapsForStaticLighting=False r.ForwardShading=False r.VertexFoggingForOpaque=True -r.SeparateTranslucency=True +r.SeparateTranslucency=False r.TranslucentSortPolicy=0 TranslucentSortAxis=(X=0.000000,Y=-1.000000,Z=0.000000) xr.VRS.FoveationLevel=0 @@ -71,8 +71,8 @@ xr.VRS.DynamicFoveation=False r.CustomDepth=1 r.CustomDepthTemporalAAJitter=True r.PostProcessing.PropagateAlpha=0 -r.DefaultFeature.Bloom=True -r.DefaultFeature.AmbientOcclusion=True +r.DefaultFeature.Bloom=False +r.DefaultFeature.AmbientOcclusion=False r.DefaultFeature.AmbientOcclusionStaticFraction=True r.DefaultFeature.AutoExposure=False r.DefaultFeature.AutoExposure.Method=0 @@ -190,8 +190,8 @@ AutoStreamingThreshold=0.000000 SoundCueCookQualityIndex=-1 [/Script/HardwareTargeting.HardwareTargetingSettings] -TargetedHardwareClass=Desktop -AppliedTargetedHardwareClass=Desktop +TargetedHardwareClass=Mobile +AppliedTargetedHardwareClass=Mobile DefaultGraphicsPerformance=Scalable AppliedDefaultGraphicsPerformance=Scalable @@ -215,3 +215,12 @@ ConnectionType=USBOnly bUseManualIPAddress=False ManualIPAddress= +[/Script/Slate.SlateSettings] +bExplicitCanvasChildZOrder=True + +[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings] +PackageName=com.mysticvector.funnyprince +VersionDisplayName=0.1 +InstallLocation=InternalOnly +bPackageDataInsideApk=True + diff --git a/Content/SideScroller/Animations/Retargeted_UE4_Manny/ABP_SST.uasset b/Content/SideScroller/Animations/Retargeted_UE4_Manny/ABP_SST.uasset index 00085a2..dce53cd 100644 --- a/Content/SideScroller/Animations/Retargeted_UE4_Manny/ABP_SST.uasset +++ b/Content/SideScroller/Animations/Retargeted_UE4_Manny/ABP_SST.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d42c288829df766b65a54c31162dcf1fe8dacc5585965cadeb0592d627b25363 -size 571572 +oid sha256:8949eff8da96c001c68c9f88f91099d0486262c909f716420bd549e8093461ef +size 551734 diff --git a/Content/SideScroller/Blueprints/BP_FunnyPrinceCharacter.uasset b/Content/SideScroller/Blueprints/BP_FunnyPrinceCharacter.uasset new file mode 100644 index 0000000..e7213c1 --- /dev/null +++ b/Content/SideScroller/Blueprints/BP_FunnyPrinceCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f954a97f09dad56794f31621f6dc63db5b8da74ab934769b83be29549c61ee1 +size 166401 diff --git a/Content/SideScroller/Blueprints/BP_FunnyPrinceGameMode.uasset b/Content/SideScroller/Blueprints/BP_FunnyPrinceGameMode.uasset index de26149..8858d56 100644 --- a/Content/SideScroller/Blueprints/BP_FunnyPrinceGameMode.uasset +++ b/Content/SideScroller/Blueprints/BP_FunnyPrinceGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0dc61022371a845ebbcff166ba6d79f9953e001a19a8392bfd7afe03209ef3c0 -size 19992 +oid sha256:e1cefd07fd1118725803ead79d618ace3342775ea086db9972ea9c8a7ff70df0 +size 20537 diff --git a/Content/SideScroller/Blueprints/BP_MainCharacter.uasset b/Content/SideScroller/Blueprints/BP_MainCharacter.uasset deleted file mode 100644 index 15dc8b0..0000000 --- a/Content/SideScroller/Blueprints/BP_MainCharacter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:340bd1b8b2e0342fa54fa42d5c5d687ce88f48b222e7e0d6c9fed53d02b9c4a3 -size 180808 diff --git a/FunnyPrince.uproject b/FunnyPrince.uproject index 248fa4e..a271194 100644 --- a/FunnyPrince.uproject +++ b/FunnyPrince.uproject @@ -26,5 +26,10 @@ "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/92a8824c461141ce95f77e454d0c1ba5" } + ], + "TargetPlatforms": [ + "Android", + "Linux", + "Windows" ] } \ No newline at end of file diff --git a/Source/FunnyPrince/FunnyPrinceCharacter.cpp b/Source/FunnyPrince/FunnyPrinceCharacter.cpp index 55c97e7..e06da12 100644 --- a/Source/FunnyPrince/FunnyPrinceCharacter.cpp +++ b/Source/FunnyPrince/FunnyPrinceCharacter.cpp @@ -4,7 +4,7 @@ #include "FunnyPrinceCharacter.h" #include "SSTCharacterMovementComponent.h" -DEFINE_LOG_CATEGORY(LogTemplateCharacter); +DEFINE_LOG_CATEGORY(LogTemplateFunnyPrinceCharacter); ////////////////////////////////////////////////////////////////////////// @@ -29,4 +29,16 @@ void AFunnyPrinceCharacter::BeginPlay() void AFunnyPrinceCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) { Super::SetupPlayerInputComponent(PlayerInputComponent); +} + +bool AFunnyPrinceCharacter::CanJumpInternal_Implementation() const +{ + USSTCharacterMovementComponent* Movement = Cast(GetCharacterMovement()); + + if (Movement) + { + return Super::CanJumpInternal_Implementation() || Movement->CanWalljump(); + } + + return Super::CanJumpInternal_Implementation(); } \ No newline at end of file diff --git a/Source/FunnyPrince/FunnyPrinceCharacter.h b/Source/FunnyPrince/FunnyPrinceCharacter.h index 96b81fa..1a77539 100644 --- a/Source/FunnyPrince/FunnyPrinceCharacter.h +++ b/Source/FunnyPrince/FunnyPrinceCharacter.h @@ -7,7 +7,7 @@ #include "Logging/LogMacros.h" #include "FunnyPrinceCharacter.generated.h" -DECLARE_LOG_CATEGORY_EXTERN(LogTemplateCharacter, Log, All); +DECLARE_LOG_CATEGORY_EXTERN(LogTemplateFunnyPrinceCharacter, Log, All); /** * @@ -27,6 +27,8 @@ protected: // To add mapping context virtual void BeginPlay(); + virtual bool CanJumpInternal_Implementation() const override; + private: public: diff --git a/Source/FunnyPrince/FunnyPrinceGameMode.cpp b/Source/FunnyPrince/FunnyPrinceGameMode.cpp index e0ab0c1..7a23b84 100644 --- a/Source/FunnyPrince/FunnyPrinceGameMode.cpp +++ b/Source/FunnyPrince/FunnyPrinceGameMode.cpp @@ -5,10 +5,5 @@ AFunnyPrinceGameMode::AFunnyPrinceGameMode() { - // set default pawn class to our Blueprinted character - static ConstructorHelpers::FClassFinder PlayerPawnBPClass(TEXT("/Game/SideScroller/Blueprints/BP_MainCharacter")); - if (PlayerPawnBPClass.Class != NULL) - { - DefaultPawnClass = PlayerPawnBPClass.Class; - } + }