diff --git a/VIRTUOS_ExpansionPluginTests/.ignore b/VIRTUOS_ExpansionPluginTests/.ignore new file mode 100644 index 0000000..a01d5b2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/.ignore @@ -0,0 +1,15 @@ +/.vs +/.vscode +/Content +/DerivedDataCache +/Intermediate +/Saved +/UE4ProjectRenamer +/Plugins/AdvancedSessions/AdvancedSessions/Intermediate +/Plugins/AdvancedSessions/AdvancedSteamSessions/Intermediate +/Plugins/SPUD/doc +/Plugins/SPUD/Intermediate +/Plugins/StevesUEHelpers/doc +/Plugins/StevesUEHelpers/Intermediate +/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Intermediate +/Plugins/VRExpansionPlugin/VRExpansionPlugin/Intermediate diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap index 0d4fbb3..05c5c5f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b633da6ff1c803bf6d86fc39ca1fb64901702afe896cf1bee0e4d14baf55b19 -size 125489 +oid sha256:40908dfa847df4b2fdca95cb0ee9f47161419ce3ef8c725e4e1f05cfb6ee70d5 +size 97737 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 3ed4b58..046c0f6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab655cee8b4b3c15cd8bd6b5e048e6a70c64611cbf5846d6e0e827151f092c17 -size 582439 +oid sha256:f353334faaae375c066d69a46c4ba9d78fd3aaad9882d8120535e731947bb7d8 +size 626794 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index d1c994a..1dced69 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a36a7818f485b94981cabe5474999e79d7cec0b5a7d5fbbec95f8d5684c3158 -size 1771538 +oid sha256:3f7ece54e1e935b50ae80cb598e406bb39ecb65f73d8dfa2fc82527ace2974df +size 1772246 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index 3e14cee..7202eba 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c0a1fd3c0dd4e3e2636913955d33e77201075ef9dccc31e5ff2484ce2bd7aa -size 934654 +oid sha256:fea19b08511ed881cac92581bfdd5069de678009555c1d072c5dbfe423aabc7a +size 934045 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset index b31efe5..f46f5a8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27adec7d65184077043df2657fb805f32299bf6b1f6c255c42e0eade3f1f8f41 -size 615119 +oid sha256:56e61c5ec305541a0a221ba0c62e322860415ed78337a6eb77644d8794924913 +size 606472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset index a0eff47..00a7016 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bbdc156613b44edbbf8e00e98440e3306391f9720918f955033a42e84ed4682 -size 149058 +oid sha256:2377dc436550e674d680dfaa303d2e8964cdf488d7c23d9a3549e904256fc7c3 +size 241334 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset index 6b1fe21..6e978d8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c8139c45c636083ec33d1f38b95555f22d0acef2e17dacaadc48b1f7b91991 -size 615581 +oid sha256:045e1240e36da7bc222b8cadf8cd2f0b445f1ef400b8c172ce0c43562bbed492 +size 615151 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset new file mode 100644 index 0000000..57a4c85 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/aaa/DoorActor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3059bfe30a3df1fc9a59d052c6577c033a6a55931aa633be09e4c9a0598490c +size 622041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset index 7c25756..74e9281 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c737a148e23850e435b08cb29ce2db6d56a5595be8c93c2c0843af4896c9d70c -size 111528 +oid sha256:d0f3bb8fc4e50384a4522ab81ca9c87e07fe97ce7d427f6a6090f8f92b43d7b1 +size 130785 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset index 3da5c9b..da92cad 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19a17bfda002a1c73d6ac459e54003127f54104e453e87f6803bf652b9efda58 -size 44133 +oid sha256:9cca5e3325672472ea7133ff58d35f25789c59d892573f10ebcdf3b6d6c39aa8 +size 127532 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset index dc0c0ca..958accb 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03cb6f765c5e2e67d4412abd352126d771f3ed6c3bfa3aa5349629b5597f45dc -size 102525 +oid sha256:f17e3a5ead0e45e9e149a198ce5bbb3a7489990ba094f975938b25df41fb93ae +size 102851 diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp new file mode 100644 index 0000000..e5a9920 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp @@ -0,0 +1,23 @@ +#include "CodeOnlyFunctionLibrary.h" +#include "GameFramework/Actor.h" +#include "Engine/Level.h" + +FString UCodeOnlyFunctionLibrary::RenameActorUnique(AActor* ActorToRename, const FString& DesiredName, AActor* ReferenceActorForLevel) +{ + if (!ActorToRename || !ReferenceActorForLevel) + { + return FString(); + } + + FString NewName = DesiredName; + + while (!ActorToRename->Rename(*NewName, ReferenceActorForLevel->GetLevel(), REN_Test)) + { + UE_LOG(LogTemp, Warning, TEXT("Rename conflict on drop: %s"), *NewName); + NewName.AppendChar('x'); + } + + ActorToRename->Rename(*NewName, ReferenceActorForLevel->GetLevel()); + + return NewName; +} diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h new file mode 100644 index 0000000..2a6c5bb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h @@ -0,0 +1,16 @@ +#pragma once + +#include "CoreMinimal.h" +#include "Kismet/BlueprintFunctionLibrary.h" +#include "CodeOnlyFunctionLibrary.generated.h" + +UCLASS() +class NO_API UCodeOnlyFunctionLibrary : public UBlueprintFunctionLibrary +{ + GENERATED_BODY() + +public: + + UFUNCTION(BlueprintCallable, Category="Utilities|Actor") + static FString RenameActorUnique(AActor* ActorToRename, const FString& DesiredName, AActor* ReferenceActorForLevel); +}; diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index d6e86c3..679fa9d 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -7,7 +7,10 @@ { "Name": "VRExpPluginExample", "Type": "Runtime", - "LoadingPhase": "Default" + "LoadingPhase": "Default", + "AdditionalDependencies": [ + "Engine" + ] } ], "Plugins": [