From b4f918e15d527e1f70015909189288e9b4313e6c Mon Sep 17 00:00:00 2001 From: jyelon Date: Wed, 2 Apr 2025 19:58:16 -0400 Subject: [PATCH] More work on the Asset Lookup system. --- Content/Characters/Mannequins/Animations/ABP_Manny.uasset | 4 ++-- Content/Luprex/Widgets/lxCrosshairWidget.uasset | 4 ++-- Content/Luprex/lxGameMode.uasset | 4 ++-- Content/StaticMeshes/SM_Cube.uasset | 3 +++ Content/StaticMeshes/SM_Sphere.uasset | 3 +++ Content/TanActor.uasset | 4 ++-- Content/Tangibles/TAN_Character.uasset | 3 +++ Content/Tangibles/TAN_StaticMesh.uasset | 3 +++ Content/Tangibles/TanCharacter.uasset | 3 --- Content/Tangibles/TanStaticMesh.uasset | 3 --- Source/Integration/AssetLookup.cpp | 5 ++--- 11 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 Content/StaticMeshes/SM_Cube.uasset create mode 100644 Content/StaticMeshes/SM_Sphere.uasset create mode 100644 Content/Tangibles/TAN_Character.uasset create mode 100644 Content/Tangibles/TAN_StaticMesh.uasset delete mode 100644 Content/Tangibles/TanCharacter.uasset delete mode 100644 Content/Tangibles/TanStaticMesh.uasset diff --git a/Content/Characters/Mannequins/Animations/ABP_Manny.uasset b/Content/Characters/Mannequins/Animations/ABP_Manny.uasset index 3ecabfe0..68b3a41e 100644 --- a/Content/Characters/Mannequins/Animations/ABP_Manny.uasset +++ b/Content/Characters/Mannequins/Animations/ABP_Manny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eb00a14ddf91ecf60b4254e1017226dbf182cb10090c725d90185723fb6cd5c -size 340015 +oid sha256:85d9d36a8595915fd830563e6a69c0421604f987c76016517016660795e7bd5b +size 339474 diff --git a/Content/Luprex/Widgets/lxCrosshairWidget.uasset b/Content/Luprex/Widgets/lxCrosshairWidget.uasset index 90ebb56d..cd8af778 100644 --- a/Content/Luprex/Widgets/lxCrosshairWidget.uasset +++ b/Content/Luprex/Widgets/lxCrosshairWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca2f1bdb208e3fdf94f879e3b43fba531edadb4f80995249410a49ce3a1eaec6 -size 100225 +oid sha256:6c131585704a5ec24cc11578d548d78e7229c2751f601f717decf012ac75eae0 +size 104498 diff --git a/Content/Luprex/lxGameMode.uasset b/Content/Luprex/lxGameMode.uasset index a3121a89..ce99ec02 100644 --- a/Content/Luprex/lxGameMode.uasset +++ b/Content/Luprex/lxGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:465af1a30451634dfd313f1a3484455553c99c35fcf5619d2809c5a41cbdd516 -size 136099 +oid sha256:51681b12f32255ae3c4f6ab2d896e141158904c8d65ad46b7b3a935d0cef5247 +size 125604 diff --git a/Content/StaticMeshes/SM_Cube.uasset b/Content/StaticMeshes/SM_Cube.uasset new file mode 100644 index 00000000..6bf410cb --- /dev/null +++ b/Content/StaticMeshes/SM_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30ca165d6ac3449a779d7ab1d8aa69b3ec6f99dfa9aa74f5ea5b20d3585afe82 +size 16396 diff --git a/Content/StaticMeshes/SM_Sphere.uasset b/Content/StaticMeshes/SM_Sphere.uasset new file mode 100644 index 00000000..009e4508 --- /dev/null +++ b/Content/StaticMeshes/SM_Sphere.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b456ac2a1c77c0342b542d74f46978f786dd598dcdcac89f39ced0891da136de +size 38132 diff --git a/Content/TanActor.uasset b/Content/TanActor.uasset index 49584960..26a02006 100644 --- a/Content/TanActor.uasset +++ b/Content/TanActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c03b99e03173e391b62b05d3ecc242c3b9c7d38a0f115ac9af6e8e5fcc24243 -size 2318 +oid sha256:ff723d9cf4c28a1b6b81134f0f91bc004362fec105dd1c84bf7e1770ede3e069 +size 2330 diff --git a/Content/Tangibles/TAN_Character.uasset b/Content/Tangibles/TAN_Character.uasset new file mode 100644 index 00000000..c1119f5e --- /dev/null +++ b/Content/Tangibles/TAN_Character.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d7f5406164dee0298ed0a66b5b79d7e21fc5d5968c2e3bcc48085dae41a3c7c +size 317062 diff --git a/Content/Tangibles/TAN_StaticMesh.uasset b/Content/Tangibles/TAN_StaticMesh.uasset new file mode 100644 index 00000000..393582d1 --- /dev/null +++ b/Content/Tangibles/TAN_StaticMesh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35010ca9031afd57c1bc2cbbd132a96a43d7b6c7bc374d89c4d46e7489c380bb +size 168830 diff --git a/Content/Tangibles/TanCharacter.uasset b/Content/Tangibles/TanCharacter.uasset deleted file mode 100644 index be72b8df..00000000 --- a/Content/Tangibles/TanCharacter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:288476de6bd7f908e4bff2ccb1988f7c9d4963718acd5ab1c9ac6d8e8a8c02f8 -size 317046 diff --git a/Content/Tangibles/TanStaticMesh.uasset b/Content/Tangibles/TanStaticMesh.uasset deleted file mode 100644 index dee965a6..00000000 --- a/Content/Tangibles/TanStaticMesh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d50bfd75f52c003358616ea192eb17ec277c2b728923b5ad6cefe343aaf655ce -size 169767 diff --git a/Source/Integration/AssetLookup.cpp b/Source/Integration/AssetLookup.cpp index eb92bdb0..616bfffb 100644 --- a/Source/Integration/AssetLookup.cpp +++ b/Source/Integration/AssetLookup.cpp @@ -36,7 +36,6 @@ void UlxAssetLookup::ScanStaticMeshes() { TArray FoundData; FARFilter AssetFilter; - AssetFilter.PackagePaths.Add(FName(TEXT("/Game/StarterContent/Shapes"))); AssetFilter.PackagePaths.Add(FName(TEXT("/Game/StaticMeshes"))); AssetFilter.ClassPaths.Add(UStaticMesh::StaticClass()->GetClassPathName()); AssetFilter.bIncludeOnlyOnDiskAssets = true; @@ -72,7 +71,7 @@ FString UlxAssetLookup::StaticMeshLoadPath(const FName &AssetName) const UStaticMesh *UlxAssetLookup::GetStaticMeshByName(const UObject *Context, const FString &Name) { ALuprexGameModeBase *mode = ALuprexGameModeBase::FromContext(Context); - FString Path = mode->GetAssetLookup()->StaticMeshLoadPath(FName(Name)); + FString Path = mode->GetAssetLookup()->StaticMeshLoadPath(FName(FString("SM_") + Name)); if (Path.IsEmpty()) { UE_LOG(LogLuprexIntegration, Error, TEXT("Static mesh not on search path: %s"), *Name); @@ -91,7 +90,7 @@ UStaticMesh *UlxAssetLookup::GetStaticMeshByName(const UObject *Context, const F UClass *UlxAssetLookup::GetTangibleClassByName(const UObject *Context, const FString &Name) { ALuprexGameModeBase *mode = ALuprexGameModeBase::FromContext(Context); - FString Path = mode->GetAssetLookup()->TangibleLoadPath(FName(FString("Tan") + Name)); + FString Path = mode->GetAssetLookup()->TangibleLoadPath(FName(FString("TAN_") + Name)); if (Path.IsEmpty()) { UE_LOG(LogLuprexIntegration, Error, TEXT("Tangible not on search path: %s"), *Name);