diff --git a/Images/HeightMaps/Rugged Terrain with Rivers/Readme_HeightMaps.pdf b/Images/HeightMaps/Rugged Terrain with Rivers/Readme_HeightMaps.pdf new file mode 100644 index 0000000..6a5a32a Binary files /dev/null and b/Images/HeightMaps/Rugged Terrain with Rivers/Readme_HeightMaps.pdf differ diff --git a/Images/HeightMaps/Rugged Terrain with Rivers/Rugged Terrain Height Map.png b/Images/HeightMaps/Rugged Terrain with Rivers/Rugged Terrain Height Map.png new file mode 100644 index 0000000..3730446 Binary files /dev/null and b/Images/HeightMaps/Rugged Terrain with Rivers/Rugged Terrain Height Map.png differ diff --git a/Models/Decorations/SMA_Window.blend b/Models/Decorations/SMA_Window.blend new file mode 100644 index 0000000..53e7a4e Binary files /dev/null and b/Models/Decorations/SMA_Window.blend differ diff --git a/Models/Decorations/SMA_Window.fbx b/Models/Decorations/SMA_Window.fbx new file mode 100644 index 0000000..df4394b Binary files /dev/null and b/Models/Decorations/SMA_Window.fbx differ diff --git a/UnrealProject/Lost_Edge/Config/DefaultEngine.ini b/UnrealProject/Lost_Edge/Config/DefaultEngine.ini index 930c299..4e91048 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultEngine.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultEngine.ini @@ -215,3 +215,31 @@ Platforms=() [/Script/Engine.AudioSettings] DefaultBaseSoundMix=/Game/Audio/SM_Mixer.SM_Mixer +[/Script/Engine.PhysicsSettings] +PhysicsPrediction=(bEnablePhysicsPrediction=False,bEnablePhysicsHistoryCapture=False,MaxSupportedLatencyPrediction=1000.000000,ResimulationSettings=(bEnableResimulationErrorPositionThreshold=True,ResimulationErrorPositionThreshold=10.000000,bEnableResimulationErrorRotationThreshold=True,ResimulationErrorRotationThreshold=4.000000,bEnableResimulationErrorLinearVelocityThreshold=False,ResimulationErrorLinearVelocityThreshold=5.000000,bEnableResimulationErrorAngularVelocityThreshold=False,ResimulationErrorAngularVelocityThreshold=2.000000)) +PhysicErrorCorrection=(PingExtrapolation=0.100000,PingLimit=100.000000,ErrorPerLinearDifference=1.000000,ErrorPerAngularDifference=1.000000,MaxRestoredStateError=1.000000,MaxLinearHardSnapDistance=400.000000,PositionLerp=0.000000,AngleLerp=0.400000,LinearVelocityCoefficient=100.000000,AngularVelocityCoefficient=10.000000,ErrorAccumulationSeconds=0.500000,ErrorAccumulationDistanceSq=15.000000,ErrorAccumulationSimilarity=100.000000) +DefaultDegreesOfFreedom=Full3D +bSuppressFaceRemapTable=False +bSupportUVFromHitResults=False +bDisableActiveActors=False +bDisableKinematicStaticPairs=False +bDisableKinematicKinematicPairs=False +bDisableCCD=False +AnimPhysicsMinDeltaTime=0.000000 +bSimulateAnimPhysicsAfterReset=False +MinPhysicsDeltaTime=0.000000 +MaxPhysicsDeltaTime=0.033333 +bSubstepping=False +bSubsteppingAsync=False +bTickPhysicsAsync=False +AsyncFixedTimeStepSize=0.033333 +MaxSubstepDeltaTime=0.016667 +MaxSubsteps=6 +SyncSceneSmoothingFactor=0.000000 +InitialAverageFrameRate=0.016667 +PhysXTreeRebuildRate=10 ++PhysicalSurfaces=(Type=SurfaceType1,Name="Grass") +DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,bUseMBPOuterBounds=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=False),MBPOuterBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=False),MBPNumSubdivs=2) +MinDeltaVelocityForHitEvents=0.000000 +ChaosSettings=(DefaultThreadingModel=TaskGraph,DedicatedThreadTickMode=VariableCappedWithTarget,DedicatedThreadBufferMode=Double) + diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset index 8efa787..4885438 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/BP_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb3930a1fcc1e0a639ec3e2d880188bb6cfd24b890d976d8e44c58dc80a23d9b -size 465136 +oid sha256:e9c36972b44158530845ea84b827a845d4cf0f220130c2dd58f0b7bd525b505a +size 501099 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset index 361d78d..076b70c 100644 --- a/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Characters/StoryNPC/BP_StoryNPC_AIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37e533534e30c749c600ebab75cff1cac44a901c5f901fb9c20957d70336a852 -size 84087 +oid sha256:89ec43584089a3c7b3e6fcc2d66e23a93eaf8ce8df0708a8272334a620a3c71d +size 87445 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset new file mode 100644 index 0000000..2d8fbd6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/BP_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bd1af3cac09a91245b2f532103df01b6ebbfb81b3868380fe1e559e97d73a43 +size 85765 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/BP_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/BP_GrassCapture.uasset new file mode 100644 index 0000000..66c6c9f --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/BP_GrassCapture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb9cd1bc5aba6f6d6430a8dbf2d804701af80c5caa7d0c9a39bf847cd8b6943 +size 91568 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MF_GrassCapture_Interaction.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MF_GrassCapture_Interaction.uasset new file mode 100644 index 0000000..1d0c54e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MF_GrassCapture_Interaction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55c8b8b70a2f3df0f7a61f81929688b9335e0e6fb24664d04631cf715d4b53d1 +size 58225 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MPC_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MPC_GrassCapture.uasset new file mode 100644 index 0000000..5a0e929 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/MPC_GrassCapture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:830678c4adf4ab273d9c8a625c82814e4286ce35b224f6a9402a99eb751c48b2 +size 2238 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Background.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Background.uasset new file mode 100644 index 0000000..06b2e82 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Background.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d40107858c65f2bf34f90adb3065a827aff11e7171720e576d154641529addd +size 89640 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Direction.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Direction.uasset new file mode 100644 index 0000000..dc358d7 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/M_GrassCapture_Direction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7fc37397b6a73b72a2e5d4b727575858768f3db2d60bce196ca05c07386218b +size 120171 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/P_GrassCapture_Affector.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/P_GrassCapture_Affector.uasset new file mode 100644 index 0000000..0bad828 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/P_GrassCapture_Affector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21b831255bd94abb4c8c1b073b2a4abeebab0595978fa016b022178e3b088f6c +size 18132 diff --git a/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/RT_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/RT_GrassCapture.uasset new file mode 100644 index 0000000..92aefa5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Blueprints/Decorations/GrassCapture/RT_GrassCapture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b48fc5df89eb89d9743c4509cd0d904bc4b9ee7f999884ea5a80c48f05d1bc4a +size 4650 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_Grass.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_Grass.uasset deleted file mode 100644 index 284fe25..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68033bc2bc7d78aa60b55679ff3b806a478ac539ee37baf8369dc3e3809f977e -size 100012 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel1.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel1.uasset deleted file mode 100644 index 4bacb4b..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18f4f242e6260f98b912688ab5ca9a552b4e0a15f01ad2aed801b7a1bee07cef -size 10405 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel2.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel2.uasset deleted file mode 100644 index da99daa..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiLevel2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:210ec03c54a3bbfc48dd4505d35730366561a4b5b7d3a5c414031c3c1636bc7a -size 102223 diff --git a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiTest.uasset b/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiTest.uasset deleted file mode 100644 index 85e6304..0000000 --- a/UnrealProject/Lost_Edge/Content/Foliages/F_GrassMultiTest.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ac828067ec2a7e42cd91b35fa0b1e99906b450bfe0a1d926a51cae1b58819c3 -size 99005 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset index 6ec1083..8bae4b1 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_CutsceneSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5530cb6a960c071aefacc3a54818c7a20fda963bc5726cdd2f2af57394c2ee9e -size 2182 +oid sha256:d21c4fa2464323a0debd2267e5c7ab3412a93045f251b49a7c827f7a9187d15c +size 2186 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset index 4a5137a..adb58a9 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_DialogueSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ef85bdcad6aa0ab3dfd52f6bd547809fd5fced6a3f4674801d891b81594f3e4 -size 2185 +oid sha256:d30765f060e61baf10e6ab02ad9432a899a243969362faf80fb7e0fa8c975509 +size 2189 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset index b4473ba..9e0c0aa 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_FlyUpDown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66c4ec62162ec4e2fe7ac84ad1887dfb7178a6803ff580c53cbd867762c0594e -size 1653 +oid sha256:abf0ce5459df213cf024eb92b4c47a565ab25953c8d57ffd9cafc0ddfc5e32e2 +size 1657 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset index 0b447b7..da68d08 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Interact.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1722277cfa6fca66dc8f537dfba31de8c55cb9f20e994047add951c052076cc -size 1756 +oid sha256:3dbd402389d50a5a6f8fc1e79ba4cd641c3ae4b4d7dfe89fa6f59f2c47dd9fbe +size 1760 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset index 8ecaa63..b125049 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Journal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:217b10c8af280f0b7ae1d066801af1d21cb20d8a0b318e0d1db7f57af890747d -size 1751 +oid sha256:04583f087a1a1d62103c820ba64ef02046de5989fe73d6a4ba7cb7c1b0b99c44 +size 1755 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset index b3eba99..25ad634 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Jump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e69357b4ac2dab5f8eb40c3677504d18222fcca8b1fb9b98bcc0fb7c6737509 -size 1736 +oid sha256:60d20825d0f617b20f62655512f43a50fc4ddc699f3d84dc87fdc75fd744ab19 +size 1740 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset index 19ebc62..e25d24b 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Look.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f994ec5b3f852e302b3511d03be04245502a689090235896c518227e7d5aa234 -size 1628 +oid sha256:fa95537e8d6ca9fe99b36128fa0386192ee707479c0cdf652ffcfb815a81bad6 +size 1632 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset index 5a73650..4fb14e4 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Move.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d9e126debb3f10f36f1a9bfe99323a0e0b42ba4553fa518dae537723a19c186 -size 1628 +oid sha256:42a74425562841b04f9c9a193e38e6883b8932ce7d5efc9a5b4c9b3d2ba04796 +size 1632 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset index 70aba1b..0e7c00f 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_OpenMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82aeffed04fc214c4627cef694e4ead022d9454235c6777eee4785b0cd539bc1 -size 1756 +oid sha256:aaf3b39c39e428ded34ce2efac079e055fdf105a00a8a5e8a583a607f4eaadc9 +size 1760 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset index ed3ae1c..7da73dc 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_Run.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a629651e43282ce96fc5b46bbd68a7df70307a692e7fbefff4a26382de019ce -size 1728 +oid sha256:fd8605c2d040dc70de732ec1f6a30469a8c01ebe19c2f02e3b088e97d5482db7 +size 1732 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset index 1d2eed8..69e4ac6 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_ShowInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76c27401f5b67464a3757392f6fce308311fc696656d83739a1823edb25597a6 -size 1781 +oid sha256:3e3e8cb60eb6f6f5e794c47f0e1f056227a1cd0a514e653a7aea80e71f46846d +size 1785 diff --git a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset index 383a9bb..d1bb179 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Actions/IA_TurnCameraMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40e8bd4517fde97bc15a53587f9ce41c7ef122e58b0259fead93c28c28265ce4 -size 1786 +oid sha256:459a1016d64fcb39f791fb64e1604208e3da111254ef8cffaf0f0572c825e3aa +size 1790 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset index d775865..97bc973 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b9a86065bc5d032ee723d28748a99f96d3fc9531f717cff27ea2a8db31e7b8b -size 2183 +oid sha256:07a133bbc2a564949780189838fc5345f0f82bcb6d6ed3dcbf1572ea5872fd86 +size 2187 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivateMouse.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivateMouse.uasset new file mode 100644 index 0000000..93a8dc2 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableActivateMouse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a80695274cd92a4e5ce81a409b39a5a4590a84583a7fbc85d0a667c2b4cf1e +size 2222 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset index 71cea09..0f70147 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d2770dc2e2f2da9eb97cb659b4d12335422d859255e59cf495038ca053a82f6 -size 1966 +oid sha256:df004895b1029415d3a878f905ac58c5e2dd0083f7d2fa448c53d0d7ca89959f +size 1970 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset index a34a237..12c0136 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:824587d5943e4903e019ebfbca62481fcc9fb89604bb2b3f9e6a324ac3dbf8bf -size 1971 +oid sha256:ced810ae5495b11f7ece11b323e656b9f17670eb8fd0164bf983b89113ccf57f +size 1975 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset index 857f45a..4e4afa8 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4703cb24d6799dc45a9ab193e76ad6730a203a52df299a2cf8e6bbf8c5301e -size 2275 +oid sha256:a00286f4770c61675197cbad52bd4d5e373c477a5b6ee5de6483ece27ecce4b9 +size 2279 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset index e5ad176..ead52fa 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98aded222662fad54bc858139ff387e4a14ea76b66648b44bbe7b934a06228f3 -size 2221 +oid sha256:f11417059c71b1cf954758c511a944c197e14a2cd434532daa9ee68e88c29dc7 +size 2225 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset index b8d026d..bf32918 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3330a7e28e4c3d7d470f2dfbfd0831561de7c025833d90cce36127b2f4b9663d -size 1838 +oid sha256:b25125d5866c3817d63ffde92b4453ab1bbb03d98097e2d9908828233ea5a748 +size 1842 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset index fe54309..9a06b14 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fcff130b0ee695e29975591155c6f6fcf247443e8023da1450c85de0f20a06a -size 2077 +oid sha256:d2a86645c83a5e52c464cfea0dc66270eb1c42f3f743a6ca31f20b01085fd0e4 +size 2081 diff --git a/UnrealProject/Lost_Edge/Content/Input/Interactables/IMC_InteractableActivateMouse.uasset b/UnrealProject/Lost_Edge/Content/Input/Interactables/IMC_InteractableActivateMouse.uasset new file mode 100644 index 0000000..c0f1aa9 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Input/Interactables/IMC_InteractableActivateMouse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b534a8ca7f5f00ffde6edc8c02056134aa6630a7ba5bc73ea5db6a3396c11f5b +size 2973 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset index 9d3175f..80ff4f5 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e253faa3ef2ab7961a7ceb28376f922c7cbef52a0813210bf7778f2a8156c837 -size 2198 +oid sha256:60eb8af1a78220604da8ec81fb68972732b856a3734dfd0458e1e634b44c3363 +size 2202 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset index 9f84d6c..7f10d07 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7950564e498b3241940d4146daffd56ca1c6a6e8eb1cb7d63e35524a959fac63 -size 2207 +oid sha256:e7489ca4dce05fd4f0aa58bbfb3979780ddbb11f883b9b1cb342173ece706075 +size 2211 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset index e5f6221..3e0599e 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bf73ac7c3ca9d199a3dadb839dee41103d7d13a00352f5d2a2ab85cc3634ff0 -size 2180 +oid sha256:acd4663f628a2865eaf051c0fc8848b0531ef55328fcf5f347ce2c2f6ea905f1 +size 2184 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset index f706d0d..bcd6904 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ddc9b3965c079552707497e4a675e9f9738be4f5db504495e6dc61b9a3496f5 -size 1811 +oid sha256:3eb09c39483c54bf80f74fb2da8a144bcf802d0b59b3c85bb74ebf4f4c16bf42 +size 1815 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset index 5a929bb..d0bf14d 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e6ed511eb9eace0733c6df09838c1884f295f55c3dff4a1cb7e732dc8e639f5 -size 2198 +oid sha256:ade0110138dce853233d6c9c2703dd0db8d0117a830f4bd1bcaaf0da2dc793cf +size 2202 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset index 6dd562b..924d28e 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:103696c1f13750af29a532a4dd858559b28e35a284cc2dbfb6e85e7674d4b8c8 -size 2198 +oid sha256:9240d92bc421be18b5c20dabe093714e13a5bcf962b19526d910e388295c1495 +size 2202 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset index 0e97a76..058415e 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63fb621e476a618d72cebbcc9c979ff22178cf9eb5e2a66ed5f454907aa65c95 -size 2207 +oid sha256:f50b1f36dbc50edf44adc29de8b80ad06ccec267b581c65fff361c8e3c016174 +size 2211 diff --git a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset index 3234765..7fb47ef 100644 --- a/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset +++ b/UnrealProject/Lost_Edge/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28890a90a260fab0a3e6abeca24b7ee0637536d220ecd7aa2fcd6bbc17e2620b -size 2180 +oid sha256:4dd612c7a674ba76a00dc8b5ba1051e3141e7b1d0f75092c2fb6ca45b4731c86 +size 2184 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset index 0ee8c48..aa887c9 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdfb7ddf763a2e21c3dafd11af7fa47b40efd31eca5c08f24baa7188d0acfbcf -size 127289 +oid sha256:e33dd1ef9363ff65695c309e02bdd8bcb2b6ee31389d3f8fe4837411efdb9909 +size 124748 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset deleted file mode 100644 index c1cc68c..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:582ec124241962a25880bd38590965c4ff662bbd3bef78ba18401bebbbdd2312 -size 151498 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset deleted file mode 100644 index d81ae2f..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:659927541590f685eae349e046bbb8e9326e965c5600f96261d31c21836668e3 -size 161210 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset deleted file mode 100644 index 7a6aa93..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4898397db91f8816068fb3931d6944f5e63af8c56446eda5178cc27bc05650d2 -size 150565 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset deleted file mode 100644 index 688b9e1..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5d1ebd96193dce3b535a068a082747a6c3316d12f67c2751ba21ca49b661a99 -size 164693 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset deleted file mode 100644 index 2276df9..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c23b19cdfb69d7031c7035cc21f9f42c301e499f42f50e7d736a4c1c7978f5e2 -size 125774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset deleted file mode 100644 index 66b1de2..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b88f9fe7478a908dac3cb4724366249f907b2affd91c89e17400d43f7cdc670e -size 94029 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset new file mode 100644 index 0000000..f5f75c6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccf2053a79ce97bda00ed3e03c415aefa87395b45ae8f3d42f42fd75eb26c937 +size 39457 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset deleted file mode 100644 index 7b6f960..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0eb8570aec2192cd748fd4a9ed044c126f8bf43b03f46953ceae44e8fee58d07 -size 39944 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_0.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_0.uasset new file mode 100644 index 0000000..3d82099 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_0.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35387fe5f7f2c0a7b039c5ac9c8bfbaf38da317cff550fd8f42adff1551e925e +size 3887768 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_1.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_1.uasset new file mode 100644 index 0000000..e39b821 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b631acd668ab2f6dbdcb0f9f67bddff5f8f804455daf53370478635fd24adf95 +size 3961485 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_2.uasset new file mode 100644 index 0000000..eb0ea23 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Grass/SM_Level2_GrassGenerator_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4a91d6e0c5b2089d4cc8ad66c65f0b4260827337c9a183516299c85e1d26dda +size 776627 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap index 454b64d..84762f8 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd33c41401adb7b2a6bcf7ab487d8281e0f645837a76b9b1ba0cc24b20cdd712 -size 79189415 +oid sha256:12e7852c1bc126fd39b6eba017c638d4349927654a88d85dda39edfab544798b +size 43336100 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset index 2e04d0d..fc2c271 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0172a482e70372fe16dd12f08f575259659588bc3da8de993f28ef8ef93eaffc -size 97191 +oid sha256:922bd2f00b13c5fd0704213d5dd07b17ded1fa9c24e9acffafea456f796653bc +size 8727 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset index 5dacb77..9223adc 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Materials/M_BadPillow2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c0b08df96801bc0e639be156555a64b92a1feeacf7497c68abdecc1370618af -size 94315 +oid sha256:d989b0fc0f47a54460fff5113d939e39ed726a872859ed1f6f69a3a0e384f04e +size 94764 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Grass/SM_Test_GrassGenerator_2.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Grass/SM_Test_GrassGenerator_2.uasset new file mode 100644 index 0000000..2e602b4 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/Grass/SM_Test_GrassGenerator_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35087985c5902dbcb7b27e6bf2aac1c74118e2bf09ffd5534e7b5732b9a9d877 +size 727677 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap index 195fb6d..c45f49a 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ae18e49507e25df07e4f6f8f9b3ba957592b161778c540f8731bb3598507848 -size 2614719 +oid sha256:b6b86418e8fbc29ff211d643b57fd40ebef5b8bc01e5b94905c2b7dc78993786 +size 2889887 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD0_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD0_Test.uasset deleted file mode 100644 index aee097d..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD0_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74bea6c6a601291d5232d5498f9a746a7f7354a0db5b6d3c2e2e431e937c6cbc -size 160189 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD1_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD1_Test.uasset deleted file mode 100644 index 2dc7287..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD1_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18916abd5f386d90387c7d5c630281979ee4a12b91ae7055b310a91e653294c8 -size 159941 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD2_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD2_Test.uasset deleted file mode 100644 index 12f3450..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD2_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab32f019050c0cad7b7e87ca3164fa9a71a5a3ab5e653f6524fd97184d21ffd0 -size 162838 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD3_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD3_Test.uasset deleted file mode 100644 index 8d807b6..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/MI_GrassLOD3_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13608535d9eaf0465fd026a4c64cb7631492b42a7d1aad9c943035c6dc43a2e3 -size 167963 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD4_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD4_Test.uasset deleted file mode 100644 index 4fadd96..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD4_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:953d16cb3b6c9d5ba7936e644f775c96bc4f20455001661b253427deebcbc88b -size 112792 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD5_Test.uasset b/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD5_Test.uasset deleted file mode 100644 index 89ec2d8..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/Materials/M_GrassLOD5_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22395ad365644b49ceb08c91f662a83dda4054493d33cc478d0575cab17de747 -size 112125 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset index a62e27b..cbf8e04 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6435f5368443944a218ff58a9e261b47f4f2082e30e8313549acbdfbc1d2d95 -size 1594 +oid sha256:7004e092b596aca11425e825be11dac5a72ab9dbdeaa590f5795d871ab28979a +size 1875 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset index e4e85c4..9a15492 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84dd2b28d3810d3b1e7bfe91763f9b2a0fab8436b942faa1f3471fab3b3de3c5 -size 73659 +oid sha256:ef73c33d36bf33642f5cb8e87a646abd32f0aa071f0c8e7f94dae7880320d87e +size 78463 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Grass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Grass.uasset new file mode 100644 index 0000000..1ef7e36 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b8a2d2175b1b0a69d64ea19b6be60173a8ee0ebe9d86ca11052c3329fb751b3 +size 27739 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Window.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Window.uasset new file mode 100644 index 0000000..b83da25 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Window.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2282ee97fa5624f9ff0158a35bcfeed24a1dff04d4d052a2de7a1a8c8823b326 +size 21893 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Default.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Default.uasset new file mode 100644 index 0000000..987c7e5 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Default.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afc1ff5935321a49540697b288ff788ca4553aa7f5168e0ef1a33a46b52a09e9 +size 1321 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Grass.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Grass.uasset new file mode 100644 index 0000000..703225d --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/PhysMaterials/PM_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0b72a30bfeb313a5964769aaf04df35ea953675adc38e021105172823c324d4 +size 1455 diff --git a/UnrealProject/Lost_Edge/Content/Misc/Interactables/ST_Interactables_Modificators_CommonDescriptions.uasset b/UnrealProject/Lost_Edge/Content/Misc/Interactables/ST_Interactables_Modificators_CommonDescriptions.uasset new file mode 100644 index 0000000..8594274 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Misc/Interactables/ST_Interactables_Modificators_CommonDescriptions.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea7c2dcbc53d4207b99ae1ee02fc286bb451006cecec2b3776e43efad41bf74d +size 1763 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtain.uasset deleted file mode 100644 index e2e70d6..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtain.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe24b861ef80d09174f3efcbef702bbee2a66591ce86dbc42402d714647e8ee5 -size 88935 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtainRing.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtainRing.uasset deleted file mode 100644 index 9470f7c..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowCurtainRing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:003127bbf72651972ce4a61e8cb30f98e8d4ae1c3909fd955824af4dada30aa1 -size 98092 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowFrame.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowFrame.uasset deleted file mode 100644 index aedfb8b..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/Materials/M_WindowFrame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a199042806633e9e06a93b2d5b48a3b175221376f0e038674fb805c7350067e3 -size 99788 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtain.uasset new file mode 100644 index 0000000..9e17589 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eafd67aaa6003a045123f7f0281fc05d98d32d0278d98eead812d1b484aec577 +size 13742 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtainRing.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtainRing.uasset new file mode 100644 index 0000000..30ee9a1 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowCurtainRing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe2ae60b42b02f6c89b25ee3b31956198ee0e8c822276348f4d61620772ac04a +size 100814 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowFrame.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowFrame.uasset new file mode 100644 index 0000000..571f453 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/Materials/M_WindowFrame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e24f3fac1f2ed516ec6033984e8cedc236d58b37f337ffea6a9a5f6483398b02 +size 102409 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/PA_CurtainDynamic_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/PA_CurtainDynamic_Curtain.uasset new file mode 100644 index 0000000..221313e --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/PA_CurtainDynamic_Curtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c0338499db6b2e93765ef5095a5869daa2b7cb3a1e7a33bd8edc7fc6923fcc8 +size 9331 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SKM_CurtainDynamic_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SKM_CurtainDynamic_Curtain.uasset new file mode 100644 index 0000000..8916096 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SKM_CurtainDynamic_Curtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2744478a3f80ea749329628394c250e6510d3d670ce6411c288e5b9c91f47d4c +size 959312 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SK_CurtainDynamic_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SK_CurtainDynamic_Curtain.uasset new file mode 100644 index 0000000..82d9f72 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SK_CurtainDynamic_Curtain.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:512dac4b9a3b9a987611b7f2e3f76a5a094abe1addd06998066041251002c2d0 +size 8228 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_Curtain.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_Curtain.uasset deleted file mode 100644 index 569cf57..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_Curtain.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1db2b4ec367e3a2937a8b4650ddcf96f74d036fef57c4febacf96e46d3b8303 -size 89900 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamicPinned.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamicPinned.uasset new file mode 100644 index 0000000..cb6aff0 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamicPinned.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7025f2eacc18f7611975d4025a5ad409a58813ddee88f50a4db07c62bd524871 +size 100829 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamic_Plank.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamic_Plank.uasset new file mode 100644 index 0000000..dc5f6e3 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainDynamic_Plank.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74ac5ef1095cee83fc4d5ecb2016dbe90f9b2019312469d276340d8a526ba613 +size 57127 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainStatic.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainStatic.uasset new file mode 100644 index 0000000..4e72076 --- /dev/null +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_CurtainStatic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39b2679e8cfa8d03c120e953987c911b88f5930e9bc28bc3a0668541bb5e539f +size 60469 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowCurtainDynamicPinned.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowCurtainDynamicPinned.uasset deleted file mode 100644 index a8e8b74..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowCurtainDynamicPinned.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddfb9dd9d0eec235a2a18864c166e874f4ed4dd0a05763988e6384851a96645c -size 139328 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset index d8d9b77..479a89f 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowDouble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e112322f40d16555b1594410f8553321689f4a417c4f934d2c06807ccb41677c -size 99688 +oid sha256:b014b21e8a8b493b6867dc2d1df7dbe6391724fccf2a2d5e24237ec541d70af5 +size 63583 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset index bf89f78..c52d7e7 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowFull.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84737e1c7c7532b8e82a38f84f1b9c49d7019a44277cfd90defd6bf20b0b4445 -size 100341 +oid sha256:f2e4bfca9d7c512f2fd7e0cd0ef8a0ed29ce072782662d52518ae0a1240d9fa8 +size 63214 diff --git a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset index 6ee01ea..94abd32 100644 --- a/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset +++ b/UnrealProject/Lost_Edge/Content/Models/Decorations/SMA_Window/SM_WindowQuatro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bb71bfd852b49be62bc319140a67502e785841f7ba85381c02227daa4679363 -size 101100 +oid sha256:0c03920cc1ca9a4730914277558a88fd995ac43943f5713c35d12fb46e8f7815 +size 64087 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/BP_GrassCapture.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/BP_GrassCapture.uasset deleted file mode 100644 index 3a54d70..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/BP_GrassCapture.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67d1a1f8596b3c53d1b3dd7ec2932742c74b69cc98de474ae419929899bdf810 -size 105621 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassMaskUV.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassMaskUV.uasset deleted file mode 100644 index 8d9aab9..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassMaskUV.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23c5413f66df688a2c427eb81dd15bec0710f9dab1f0638f29d445af8b620d03 -size 100038 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassProjection.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassProjection.uasset deleted file mode 100644 index bb38e69..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MF_GrassProjection.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2a0eb371a6472e0dc75b6c1b12dec55540e7f03d2acbd904d4ba656e3e7dbae -size 39149 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassBackground.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassBackground.uasset deleted file mode 100644 index ba6649b..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassBackground.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2552d564d6ea644653539622dc7f1a2752f7d5d7e8ed6bae03a2cd4051a484a -size 86941 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassDirection.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassDirection.uasset deleted file mode 100644 index eabff1c..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MH_GrassDirection.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a241d15058a6e19fc2e5afe0c19e41cde1344dd7fd58f960b6f0416910e812d5 -size 117719 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MPC_Grass.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MPC_Grass.uasset deleted file mode 100644 index 65f7ad0..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/MPC_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95b94bde7e979e7cca58be439b81d3e5b599af4882b3e0178700cb00137780a6 -size 1987 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0.uasset deleted file mode 100644 index 535d323..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:265c1b64763a25e23c273d1c007a136a11b643ee6a435035041a37790706b784 -size 164167 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0Scalling.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0Scalling.uasset deleted file mode 100644 index 5aad8fc..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0Scalling.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc7c5271619bee8c08073469ae1bc24cc2dbc019b2830f047f49ba50fef528d7 -size 114318 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0X.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0X.uasset deleted file mode 100644 index c9a86c7..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD0X.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12a643890a5608135e3a0ec1b65db397ddd7853c17138e85d224dc0a1247cdc2 -size 167657 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD1.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD1.uasset deleted file mode 100644 index 58225c5..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c79135c46f7468e04d7ea38dc5a8bef9521a0d6e9fb519278c7b534fbe862abc -size 163546 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD2X.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD2X.uasset deleted file mode 100644 index c8c078f..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD2X.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef89216286515a35a849dac0599a2439d9b209356216f55b92e11e50df547249 -size 170565 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD3.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD3.uasset deleted file mode 100644 index 5a419d2..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassLOD3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa94f42e7c354e7554d456bf269e9b80cfb3d1260bd7dacd4b45e285896101ed -size 113301 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassMultiLOD2.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassMultiLOD2.uasset deleted file mode 100644 index 3005cf7..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/MI_GrassMultiLOD2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:517650954a747b715eeb1642dffd20b06900130152fa0b0145e43f7116a92046 -size 164362 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD0.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD0.uasset deleted file mode 100644 index 182d71d..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD0.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7732acfae6c5311419c6ac88fa3ff105ecc4e8bf6a476629cd30ab87c0a0b14b -size 69653 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD4.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD4.uasset deleted file mode 100644 index 64c5cd6..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3b52387e03f9a9dcc8836e695e1686f922d3df7d7503982fae935fac1947ba8 -size 159239 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD8.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD8.uasset deleted file mode 100644 index 4f385c9..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Materials/M_GrassLOD8.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:344217464a1e6510a7bd6ceb1bc1b9ab35f270ae755411e3098c3fd965ea804d -size 15531 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/P_GrassAffector.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/P_GrassAffector.uasset deleted file mode 100644 index 0d6c46f..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/P_GrassAffector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a09d162a2a7a3cda264e88b1cf2db01fc92f5ac092406fd0c2cf704caa7b3dbf -size 17517 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/RD2D_Grass.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/RD2D_Grass.uasset deleted file mode 100644 index 63d9603..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/RD2D_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f19a4a38549b9e349089d9b20e8dabd51d9e9a29216e01cdadede966d4a7bbcd -size 3654 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_Grass.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_Grass.uasset deleted file mode 100644 index 02b60af..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_Grass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28f299a593057c9414be924b2721441dbdc42cf2c638a5474f3f7905c8a42a23 -size 113083 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMulti.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMulti.uasset deleted file mode 100644 index ee79f16..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMulti.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:901c063cbb70b66a2ebf813780291631b00df26c91a1621ae7547d774db9546b -size 144551 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMultiShort.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMultiShort.uasset deleted file mode 100644 index 8a7a6f4..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/SM_GrassMultiShort.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f5ca6269fb59a0c041c82d36cee58bca1f5a40a7813ffcdb23ea2139649d00a -size 141012 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass256x384.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass256x384.uasset deleted file mode 100644 index 8325cd5..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass256x384.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de6d93061cffdec66bdfca8fd6dac7c7edf5e83a0fd4135e8da0f622c1ffb684 -size 108619 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass384x576.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass384x576.uasset deleted file mode 100644 index 9348b76..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass384x576.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18b587dc3860066563c6550b42ee16fa38e6b5a253d3f36a00b5e9a3a88eeca3 -size 180952 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass512x768.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass512x768.uasset deleted file mode 100644 index 461228d..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass512x768.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5e1a64a2b62bcb2082cb01123a9af3875062a69cacd05aab54c319bf9470f1e -size 284493 diff --git a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass64x96.uasset b/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass64x96.uasset deleted file mode 100644 index 6b7d4ea..0000000 --- a/UnrealProject/Lost_Edge/Content/Models/Nature/Grass/Textures/T_Grass64x96.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51a3dd682206b50e1f073f9562d42f1ea166769f59c9b198ce69358bf9393730 -size 15787 diff --git a/UnrealProject/Lost_Edge/Lost_Edge.uproject b/UnrealProject/Lost_Edge/Lost_Edge.uproject index bcbf9c6..12e3b2c 100644 --- a/UnrealProject/Lost_Edge/Lost_Edge.uproject +++ b/UnrealProject/Lost_Edge/Lost_Edge.uproject @@ -100,10 +100,6 @@ "Name": "ChaosClothEditor", "Enabled": false }, - { - "Name": "ChaosCloth", - "Enabled": false - }, { "Name": "ChaosNiagara", "Enabled": false @@ -359,6 +355,14 @@ { "Name": "FMODStudioNiagara", "Enabled": true + }, + { + "Name": "ChaosClothAsset", + "Enabled": true + }, + { + "Name": "ChaosClothAssetEditor", + "Enabled": true } ], "TargetPlatforms": [ diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs index b5287de..9bf1e96 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Lost_Edge.Build.cs @@ -11,7 +11,8 @@ public class Lost_Edge : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OpenCV" }); PrivateDependencyModuleNames.AddRange(new string[] { "EnhancedInput", "UMG", "RHI", "RenderCore", "Lost_EdgeShaders", "PakFile", //"TextureCompressor", - "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore" }); // "Slate", "SlateCore" + "LevelSequence", "MovieScene", "HTTP", "Json", "ApplicationCore", "ProceduralMeshComponent", "Landscape", "MeshDescription", "StaticMeshDescription", + "AssetRegistry", "UnrealEd", "LevelEditor" }); // "Slate", "SlateCore" // UE_LOG(LogTemp, Log, TEXT("capture: %s"), (capture ? TEXT("true") : TEXT("false"))); // GEngine->AddOnScreenDebugMessage(-1, 5.0f, FColor::Yellow, TEXT("1")); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp index cc00e34..eb39127 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomPlayerController.cpp @@ -18,7 +18,7 @@ TSet> ACustomPlayerController::contextsBefo void ACustomPlayerController::AppendInputContext(TSoftObjectPtr context) { - if(!context.IsValid()) + if(!context.IsValid() || contexts.Contains(context) || contextsBeforeInit.Contains(context)) return; if(!UCustomGameInstance::Get()) //game settings not initialized yet diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp new file mode 100644 index 0000000..c9137c6 --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.cpp @@ -0,0 +1,234 @@ +// Oleg Petruny proprietary. + +#include "GrassGenerator.h" + +#include "AssetRegistry/AssetRegistryModule.h" +#include "Components/BoxComponent.h" +#include "Editor/EditorEngine.h" +#include "Engine/SkyLight.h" +#include "Engine/StaticMeshActor.h" +#include "Landscape.h" +#include "LandscapeComponent.h" +#include "LevelEditorSubsystem.h" +#include "MeshDescription.h" +#include "PhysicalMaterials/PhysicalMaterial.h" +#include "ProceduralMeshComponent.h" +#include "ProceduralMeshConversion.h" +#include "StaticMeshDescription.h" + +AGrassGenerator::AGrassGenerator() +{ + mesh = CreateDefaultSubobject(TEXT("RootComponent")); + RootComponent = mesh; + + areaBrush = CreateDefaultSubobject(TEXT("AreaBrush")); + areaBrush->SetupAttachment(RootComponent); +} + +void AGrassGenerator::PostLoad() +{ + Super::PostLoad(); + + Update(); +} + +void AGrassGenerator::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) +{ + Super::PostEditChangeProperty(PropertyChangedEvent); + + //if(PropertyChangedEvent.GetPropertyName() == TEXT("Grass Material") + // || PropertyChangedEvent.GetPropertyName() == TEXT("Tile Count") + // || PropertyChangedEvent.GetPropertyName() == TEXT("Tile Size")) + // Update(); +} + +void AGrassGenerator::Generate() +{ + Clear(); + + FVector loc = GetActorLocation(); + int32 hh = tileCount.Y / 2 * grassDensity; + int32 hw = tileCount.X / 2 * grassDensity; + float densedTileSize = tileSize / grassDensity; + auto world = GetWorld(); + FRandomStream randomStream(FMath::Rand()); + int64 verticesCount = hh * 2 * hw * 2 * 3; + + constexpr int32 chunkSize = 2 << 24; + TArray vertices; + vertices.Reserve(chunkSize); + TArray triangles; + triangles.Reserve(chunkSize); + TArray normals; + normals.Reserve(chunkSize); + TArray UVs; + UVs.Reserve(chunkSize); + + TArray lands; + landscape->GetComponents(lands); + TArray> landsWeightMaps; + landsWeightMaps.Reserve(lands.Num()); + + for(int32 y = hh * -1; y < hh; ++y) + { + for(int32 x = hw * -1; x < hw; ++x) + { + FVector pivot = loc + FVector{ x * densedTileSize, y * densedTileSize, 0 }; + + int32 landId = -1; + for(int32 i = 0; i < lands.Num(); ++i) + { + if(lands[i]->Bounds.GetBox().IsInside({ pivot.X, pivot.Y, lands[i]->Bounds.Origin.Z })) + { + landId = i; + + for(int32 m = landsWeightMaps.Num() - 1; m < landId; ++m) + { + landsWeightMaps.Add({}); + } + + if(landsWeightMaps[landId].Num() == 0) + { + FLandscapeComponentDataInterface CDI(lands[landId]); + CDI.GetWeightmapTextureData(grassLayer.LoadSynchronous(), landsWeightMaps[landId]); + } + + break; + } + } + if(landId < 0 || landsWeightMaps[landId].Num() == 0) + continue; + + FVector mapLoc = lands[landId]->GetComponentTransform().InverseTransformPosition(pivot); + if(mapLoc.X < 0 || mapLoc.Y < 0 || mapLoc.X > lands[landId]->ComponentSizeQuads || mapLoc.Y > lands[landId]->ComponentSizeQuads) + continue; + + float weight = 0.0f; + { // copied from ULandscapeComponent::GetLayerWeightAtLocation + int32 X1 = FMath::FloorToInt32(mapLoc.X); + int32 Y1 = FMath::FloorToInt32(mapLoc.Y); + int32 X2 = FMath::CeilToInt32(mapLoc.X); + int32 Y2 = FMath::CeilToInt32(mapLoc.Y); + + int32 Stride = (lands[landId]->SubsectionSizeQuads + 1) * lands[landId]->NumSubsections; + + // Min is to prevent the sampling of the final column from overflowing + int32 IdxX1 = FMath::Min(((X1 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (X1 % lands[landId]->SubsectionSizeQuads), Stride - 1); + int32 IdxY1 = FMath::Min(((Y1 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (Y1 % lands[landId]->SubsectionSizeQuads), Stride - 1); + int32 IdxX2 = FMath::Min(((X2 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (X2 % lands[landId]->SubsectionSizeQuads), Stride - 1); + int32 IdxY2 = FMath::Min(((Y2 / lands[landId]->SubsectionSizeQuads) * (lands[landId]->SubsectionSizeQuads + 1)) + (Y2 % lands[landId]->SubsectionSizeQuads), Stride - 1); + + // sample + float Sample11 = (float)(landsWeightMaps[landId][IdxX1 + Stride * IdxY1]) / 255.0f; + float Sample21 = (float)(landsWeightMaps[landId][IdxX2 + Stride * IdxY1]) / 255.0f; + float Sample12 = (float)(landsWeightMaps[landId][IdxX1 + Stride * IdxY2]) / 255.0f; + float Sample22 = (float)(landsWeightMaps[landId][IdxX2 + Stride * IdxY2]) / 255.0f; + + float LerpX = FMath::Fractional(static_cast(mapLoc.X)); + float LerpY = FMath::Fractional(static_cast(mapLoc.Y)); + + weight = FMath::Lerp( + FMath::Lerp(Sample11, Sample21, LerpX), + FMath::Lerp(Sample12, Sample22, LerpX), + LerpY); + } + + if(weight < minWeight) + continue; + + auto landCollision = lands[landId]->GetCollisionComponent(); + TOptional height = landCollision->GetHeight(mapLoc.X, mapLoc.Y, EHeightfieldSource::Complex); + if(!height.IsSet()) + continue; + pivot -= loc; + pivot.Z = landCollision->GetComponentToWorld().TransformPositionNoScale(FVector{ 0, 0, height.GetValue() }).Z - loc.Z; + pivot += {randomStream.FRand()* densedTileSize, randomStream.FRand()* densedTileSize, 0}; + + triangles.Add(vertices.Num()); + vertices.Add(pivot); + triangles.Add(vertices.Num()); + vertices.Add(pivot + FVector{ 0, 0, randomStream.FRandRange(grassHeight - grassHeightVariation, grassHeight + grassHeightVariation) * weight }); + triangles.Add(vertices.Num()); + vertices.Add(pivot + FVector{ randomStream.FRandRange(grassWidth * -1, grassWidth) * weight, randomStream.FRandRange(0, grassWidth) * weight, 0 }); + + int32 v = vertices.Num() - 1; + FVector normal = FVector::CrossProduct(vertices[v - 1] - vertices[v - 2], vertices[v] - vertices[v - 2]).GetSafeNormal() * -1; + normals.Add(normal); + normals.Add(normal); + normals.Add(normal); + + float Vstart = std::min(1.0f - weight, 1.0f); + UVs.Add({ 0, Vstart }); + UVs.Add({ 0.5, 1 }); + UVs.Add({ 1, Vstart }); + + if(vertices.Num() + 3 > chunkSize) + { + mesh->CreateMeshSection(sectionsCount++, vertices, triangles, normals, UVs, {}, {}, false); + vertices.Empty(); + triangles.Empty(); + normals.Empty(); + UVs.Empty(); + } + } + } + + if(vertices.Num()) + mesh->CreateMeshSection(sectionsCount++, vertices, triangles, normals, UVs, {}, {}, false); + + Update(); +} + +void AGrassGenerator::Clear() +{ + mesh->ClearAllMeshSections(); + sectionsCount = 0; +} + +void AGrassGenerator::Export() +{ + const FString actorName = GetName(); + const FString levelName = GetWorld()->GetMapName().RightChop(2); + const FString levelPath = FPaths::GetPath(GEditor->GetEditorSubsystem()->GetCurrentLevel()->GetPathName()); + const FString assetName = FString::Printf(TEXT("SM_%s_%s"), *levelName, *actorName); + const FString packageName = FString::Printf(TEXT("%s/Grass/%s"), *levelPath, *assetName); + + UPackage* package = CreatePackage(*packageName); + UStaticMesh* smesh = NewObject(package, FName(assetName), RF_Public | RF_Standalone); + smesh->bAllowCPUAccess = true; + smesh->NeverStream = true; + smesh->InitResources(); + smesh->SetLightingGuid(); + + FMeshDescription meshDesc = BuildMeshDescription(mesh); + UStaticMeshDescription* smeshDesc = smesh->CreateStaticMeshDescription(); + smeshDesc->SetMeshDescription(meshDesc); + smesh->BuildFromStaticMeshDescriptions({ smeshDesc }, false, true); + smesh->GetStaticMaterials().Add({ grassMaterial.LoadSynchronous() }); +#if WITH_EDITOR + smesh->PostEditChange(); +#endif + smesh->MarkPackageDirty(); + FAssetRegistryModule::AssetCreated(smesh); + + Clear(); + + AStaticMeshActor* smeshActor = Cast(GEditor->AddActor( + GEditor->GetEditorWorldContext().World()->GetCurrentLevel(), + AStaticMeshActor::StaticClass(), + GetActorTransform() + )); + smeshActor->GetStaticMeshComponent()->SetStaticMesh(smesh); + smeshActor->MarkPackageDirty(); + GEditor->SelectNone(false, true); + GEditor->SelectActor(smeshActor, true, true); + GEditor->RedrawAllViewports(); +} + +void AGrassGenerator::Update() +{ + areaBrush->SetBoxExtent({ tileCount.X * tileSize * 0.5, tileCount.Y * tileSize * 0.5, 200 }, false); + mesh->SetMaterial(0, grassMaterial.LoadSynchronous()); + //for(int32 i = 0; i < sectionsCount; ++i) + // mesh->SetMaterSetMaterial(i, grassMaterial.LoadSynchronous()); +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.h new file mode 100644 index 0000000..d48b296 --- /dev/null +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Graphics/GrassGenerator.h @@ -0,0 +1,66 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "GameFramework/Actor.h" + +#include "GrassGenerator.generated.h" + +/** + * Actor which generates grass on the level. + */ +UCLASS(Blueprintable, MinimalAPI, meta = (PrioritizeCategories = "Grass Generator")) +class AGrassGenerator : public AActor +{ + GENERATED_BODY() + +public: + AGrassGenerator(); + + virtual void PostLoad() override; +#if WITH_EDITOR + virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override; +#endif + + UFUNCTION(CallInEditor, Category = "Grass Generator") + void Generate(); + UFUNCTION(CallInEditor, Category = "Grass Generator") + void Clear(); + UFUNCTION(CallInEditor, Category = "Grass Generator") + void Export(); + +private: + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + TObjectPtr landscape; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + TSoftObjectPtr grassLayer; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float minWeight = 1.0f / 3; + + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + FIntPoint tileCount = { 100, 100 }; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float tileSize = 10; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassDensity = 2; + + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassHeight = 50; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassHeightVariation = 20; + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + float grassWidth = 20; + + UPROPERTY(EditInstanceOnly, Category = "Grass Generator") + TSoftObjectPtr grassMaterial; + + UPROPERTY(VisibleAnywhere) + class UProceduralMeshComponent* mesh; + UPROPERTY() + class UBoxComponent* areaBrush; + + int32 sectionsCount = 0; + + void Update(); +}; + diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp index d2f061a..39369da 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.cpp @@ -2,6 +2,7 @@ #include "InteractableModificator.h" +#include "CustomPlayerController.h" #include "Interactable/Interactable.h" #include "Widgets/InteractableHintWidget.h" @@ -12,12 +13,24 @@ void UInteractableModificator::OnRegister() AInteractable::AppendModificatorClass(GetClass()); } -const TSoftObjectPtr UInteractableModificator::GetMappingContext() const +const TSoftObjectPtr& UInteractableModificator::GetMappingContext() const { return inputMapping; } +const TArray& UInteractableModificator::GetMappingDescription() const +{ + return inputDescription; +} + EActivatorType UInteractableModificator::GetActivatorTypes() const { return static_cast(activatorTypes); } + +void UInteractableModificator::BeginPlay() +{ + Super::BeginPlay(); + + ACustomPlayerController::AppendInputContext(inputMapping); +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h index a765b4c..3a48246 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Interactable/Modificators/InteractableModificator.h @@ -22,7 +22,11 @@ public: /** Returns input mappings assigned in constructor */ UFUNCTION(BlueprintCallable) - const TSoftObjectPtr GetMappingContext() const; + const TSoftObjectPtr& GetMappingContext() const; + + /** Returns input mappings custom descriptions */ + UFUNCTION(BlueprintCallable) + const TArray& GetMappingDescription() const; /** Filters activation type in interractable */ UFUNCTION(BlueprintCallable) @@ -39,9 +43,14 @@ public: virtual void Unbind_Implementation() {} protected: + virtual void BeginPlay() override; + UPROPERTY(EditDefaultsOnly, NoClear) TSoftObjectPtr inputMapping; + UPROPERTY(EditDefaultsOnly) + TArray inputDescription; + UPROPERTY(EditDefaultsOnly, NoClear, meta = (Bitmask, BitmaskEnum = "EActivatorType")) int32 activatorTypes = 0; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp index da185b9..56b8351 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp @@ -34,6 +34,7 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi hints->AddChild(hint); } + const auto& descriptions = modificator->GetMappingDescription(); int32 skipped = 0; for(int32 i = 0; i < mappings.Num(); ++i) { @@ -45,7 +46,10 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi auto hint = Cast(hints->GetChildAt(count++)); hint->keyText->SetText(UCommonFunctions::GetKeyDisplayName(mappings[i].Key)); - hint->descriptionText->SetText(mappings[i].Action->ActionDescription); + if(i < descriptions.Num() && !descriptions[i].IsEmpty()) + hint->descriptionText->SetText(descriptions[i]); + else + hint->descriptionText->SetText(mappings[i].Action->ActionDescription); hint->SetVisibility(ESlateVisibility::Visible); }