diff --git a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_01.uasset b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_01.uasset index b562b07d..e5bd399a 100644 --- a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_01.uasset +++ b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:582a1ae4a43e62ce289e421f02b88dd83c48b9dc102d8727c79c9bf3560b0edd -size 220397 +oid sha256:a21667c8194a2b6a5ba728ffbc66c9631bae9339a1e0efa250d263e8f91b2d93 +size 81830 diff --git a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01.uasset b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01.uasset index 08de5449..32019865 100644 --- a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01.uasset +++ b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a1e4c5645a832d45ba92776deac1df2fcdd70214feede311f1f059f1b7f5455 -size 164624 +oid sha256:cb255215bd84ab1229f7871fa076a45756dcdbf4bde10f6205208f566bca96d0 +size 23273 diff --git a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD1.uasset b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD1.uasset index 1fccaada..162079b8 100644 --- a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD1.uasset +++ b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11abbfd10a93d3872bfb2c5248ecec456cf842a04d0b6a1155ca24c85b54a9f0 -size 166753 +oid sha256:5527a42414b15e8aa3539e9edb922f3970b6802a3874cc1126d5efd1cbfa8982 +size 25219 diff --git a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD2.uasset b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD2.uasset index 8d57f571..6ca02710 100644 --- a/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD2.uasset +++ b/Content/KiteDemo/Environments/Foliage/Grass/FieldGrass/M_FieldGrass_Inst_01_LOD2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a98e5cb14ee69f00de00613517a3759cd907f5cec1186500b0e3f7de6dc1bb90 -size 157378 +oid sha256:8892ed8e26f58d19dbde19c054f4c85d12b382c1f82c27230c5ec8f76f7ef4ca +size 22672 diff --git a/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Recovery_Additive.uasset b/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Recovery_Additive.uasset index 78953259..a7fa7df3 100644 --- a/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Recovery_Additive.uasset +++ b/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Recovery_Additive.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f64f001e62943e43344ee87c44124f3dab1a5950af4f0bb38d779a57fad3f3f -size 189467 +oid sha256:ab4055e175426e6aed5d65083e2e2066326a89871c0db8ecd529390280efb3dd +size 567931 diff --git a/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Start.uasset b/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Start.uasset index f6811b4f..29b08832 100644 --- a/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Start.uasset +++ b/Content/ParagonLtBelica/Characters/Heroes/Belica/Animations/Jump_Start.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1eca3bb6807e74b2324a70c44a6aa0ba3201e9acda42807d34531441426b90d0 -size 130479 +oid sha256:3a0765c5fa0f4fc0c4836571f11d9e409cbe1011cc0692b72016560bd5e942cd +size 248895 diff --git a/Content/ParagonProps/Ground/Meshes/SM_Plane_5x5m.uasset b/Content/ParagonProps/Ground/Meshes/SM_Plane_5x5m.uasset index 2792f1fe..f92d28f3 100644 --- a/Content/ParagonProps/Ground/Meshes/SM_Plane_5x5m.uasset +++ b/Content/ParagonProps/Ground/Meshes/SM_Plane_5x5m.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7cd372f800be1cf2275ac6c87207eeb092d9178ce9febfc0a5b49bda899ed0b -size 1818059 +oid sha256:0a73665bab0e3210be2f36e33e03230aa8ab0b214c911551c16fc4210cd450cd +size 210638 diff --git a/Content/_Game/AnimNotifies/FootStepsNotify.uasset b/Content/_Game/AnimNotifies/FootStepsNotify.uasset index bb9fe1aa..8b420d15 100644 --- a/Content/_Game/AnimNotifies/FootStepsNotify.uasset +++ b/Content/_Game/AnimNotifies/FootStepsNotify.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:821b97b99567c9224507c8f4090741b80deb022818e3d6ea1912b521d94c0edb -size 41556 +oid sha256:d5db63cf1680ded53393934b2e5f7cc98fdd6aa663c63e6dbf33d8fc24bff4bd +size 106239 diff --git a/Content/_Game/AnimNotifies/JumpLandNotify.uasset b/Content/_Game/AnimNotifies/JumpLandNotify.uasset new file mode 100644 index 00000000..c7716e6d --- /dev/null +++ b/Content/_Game/AnimNotifies/JumpLandNotify.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26417d4b724aff0906bd9a3e5484d52f0cb1d3093c8c0acd1c954e6fb0aabacf +size 65968 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Footstep_Grass.uasset b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Grass.uasset new file mode 100644 index 00000000..a85ba396 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55b06ddc70bcc8fec0d0905f5309f91f8940aeddff7cc19c9dd4bf4aa03c3629 +size 16023 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Footstep_Metal.uasset b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Metal.uasset new file mode 100644 index 00000000..4be985ef --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:847b0479959a03a081167801b0a050e82127d89abb610e473a160f8a5aec584e +size 16023 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Footstep_Stone.uasset b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Stone.uasset new file mode 100644 index 00000000..e4d9b656 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Stone.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e58a62c9e6900d06d0e4863b975867739360abf536e8bd327108dca04fa641b5 +size 10805 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Footstep_Tile.uasset b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Tile.uasset new file mode 100644 index 00000000..05fd49fe --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Tile.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b46cee8d0b9f36177cf1c9c2f66ffa54ba72f8941c79835443d8dffde4a63ff7 +size 15911 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Footstep_Water.uasset b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Water.uasset new file mode 100644 index 00000000..baf17d7a --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Footstep_Water.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b736480040882666fd0528c8e0f06bfab9a89044c25d14d1399b4b20a7bafe38 +size 8607 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Land_Grass.uasset b/Content/_Game/Assets/Sounds/Footsteps/Land_Grass.uasset new file mode 100644 index 00000000..ae4b8798 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Land_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4b69b9b1949b40b388df6f81013b2ff55166ca687666472e77bbc88ed511989 +size 7726 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Land_Metal.uasset b/Content/_Game/Assets/Sounds/Footsteps/Land_Metal.uasset new file mode 100644 index 00000000..aafbbe19 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Land_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dfd1c9dac2633058f3660d26ff48614896e88b995b2b4a8b77fc00c126af2b6 +size 7726 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Land_Stone.uasset b/Content/_Game/Assets/Sounds/Footsteps/Land_Stone.uasset new file mode 100644 index 00000000..98689953 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Land_Stone.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47b979fe14445b4051bec2d8007badbc0f2dfb13ed5f486e1958b3a7c9e6cd2d +size 7580 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Land_Tile.uasset b/Content/_Game/Assets/Sounds/Footsteps/Land_Tile.uasset new file mode 100644 index 00000000..39a71b25 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Land_Tile.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b44d8d4a34c34b096b16367716985b73c96149da9b9f54e5e280da9354dabbf1 +size 7715 diff --git a/Content/_Game/Assets/Sounds/Footsteps/Land_Water.uasset b/Content/_Game/Assets/Sounds/Footsteps/Land_Water.uasset new file mode 100644 index 00000000..7eb03c02 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Footsteps/Land_Water.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39469af6002659b6bc2e77128214914757fb2b5e2998eb95522f8eac024fe85a +size 4191 diff --git a/Content/_Game/Assets/Sounds/Rifle/Jump_Start.uasset b/Content/_Game/Assets/Sounds/Rifle/Jump_Start.uasset new file mode 100644 index 00000000..c305586e --- /dev/null +++ b/Content/_Game/Assets/Sounds/Rifle/Jump_Start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dad136c2f5cf84f4bc63b49c2fa8fd83cf573ef6f969377203377dbf8ad4d392 +size 4183 diff --git a/Content/_Game/Assets/Sounds/Rifle/sw_Foley_Jump_02_Cue.uasset b/Content/_Game/Assets/Sounds/Rifle/sw_Foley_Jump_02_Cue.uasset deleted file mode 100644 index cdd69633..00000000 --- a/Content/_Game/Assets/Sounds/Rifle/sw_Foley_Jump_02_Cue.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:073d049b4d69ccfeedefd3d87026def8f91a14b77a9281ed2eb1b223ac26fbdf -size 4245 diff --git a/Content/_Game/Character/ShooterAnimBP.uasset b/Content/_Game/Character/ShooterAnimBP.uasset index d7e6da30..8f3f307b 100644 --- a/Content/_Game/Character/ShooterAnimBP.uasset +++ b/Content/_Game/Character/ShooterAnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f089a59b10c2f57af4b10ebc6d2ac8eb3f272cb857aae9a367d3dd4074d44fb -size 1527162 +oid sha256:d684906b6bcc6ab3a7fce6196a9c8d03950f58920366afa7dbf97c0f1cf50456 +size 1527690 diff --git a/Content/_Game/Maps/DefaultMap.umap b/Content/_Game/Maps/DefaultMap.umap index 6ecc0a25..0ad8fe93 100644 --- a/Content/_Game/Maps/DefaultMap.umap +++ b/Content/_Game/Maps/DefaultMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a56b89e2894adfe16b9a2c0ab161c6d1902db04dfa0cc550a5be744394379ab9 -size 164300 +oid sha256:83044a33d6d039f7ad3c86bc7163835e7608b949a489fb9a4fdffc4a99a31e10 +size 188133 diff --git a/Source/Shooter/Shooter.Build.cs b/Source/Shooter/Shooter.Build.cs index 521b8aac..85dec8c2 100644 --- a/Source/Shooter/Shooter.Build.cs +++ b/Source/Shooter/Shooter.Build.cs @@ -8,7 +8,7 @@ public class Shooter : ModuleRules { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "UMG" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "UMG", "PhysicsCore" }); PrivateDependencyModuleNames.AddRange(new string[] { }); diff --git a/Source/Shooter/ShooterCharacter.cpp b/Source/Shooter/ShooterCharacter.cpp index c83d58c7..14c80724 100644 --- a/Source/Shooter/ShooterCharacter.cpp +++ b/Source/Shooter/ShooterCharacter.cpp @@ -17,6 +17,8 @@ #include "Particles/ParticleSystemComponent.h" #include "Sound/SoundCue.h" #include "Ammo.h" +#include "PhysicalMaterials/PhysicalMaterial.h" +#include "Shooter.h" // Sets default values AShooterCharacter::AShooterCharacter() : @@ -469,6 +471,20 @@ void AShooterCharacter::HighlightInventorySlot() } } +EPhysicalSurface AShooterCharacter::GetSurfaceType() +{ + FHitResult HitResult; + const FVector Start{ GetActorLocation() }; + const FVector End{ Start + FVector(0.f, 0.f, -400.f) }; + + FCollisionQueryParams QueryParams; + QueryParams.bReturnPhysicalMaterial = true; + + GetWorld()->LineTraceSingleByChannel(HitResult, Start, End, ECollisionChannel::ECC_Visibility, QueryParams); + + return UPhysicalMaterial::DetermineSurfaceType(HitResult.PhysMaterial.Get()); +} + void AShooterCharacter::UnhighlightInventorySlot() { if (HighlightedSlot != -1) diff --git a/Source/Shooter/ShooterCharacter.h b/Source/Shooter/ShooterCharacter.h index 63e61350..bb0f856f 100644 --- a/Source/Shooter/ShooterCharacter.h +++ b/Source/Shooter/ShooterCharacter.h @@ -216,6 +216,9 @@ protected: void HighlightInventorySlot(); + UFUNCTION(BlueprintCallable) + EPhysicalSurface GetSurfaceType(); + private: UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = true)) USpringArmComponent* CameraBoom;