diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index e5cca28..f2fa0cf 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:56398aaf934b95b6796ae195070bd8e1b0483e7e2d0dfb577e9774f82c0383b5 -size 5219252 +oid sha256:48545cb1961555a7c12f9ec171d4d57704f2beb43aba296118669e0a720e9055 +size 5233000 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 6e8ade4..2ac4aed 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff02d79af33555851063486c24cd4b77c9e3f94bace129ccf9b3f1d8ca946bd5 -size 1417020 +oid sha256:363edcee30bbe79ab3d3bd9e7d3e6307e117415fd9291145318f0e5054d4b07b +size 1422041 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset index 70a1336..e8d6186 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:496d742a6fad4d6c45f5a6df49a32acdfe6c8fccc9f71224cb97dd6a397c9658 -size 1066723 +oid sha256:8152905b965cf2453b88f7f7041b50a800c5fe15745356b06dc9637441fe7716 +size 973294 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset index 2e348fe..fa2bc01 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de25c5043e952773f8ec94b8b3c1f689dfc7763371bd4bd8d813eb042a518d25 -size 9037 +oid sha256:01c5110001b2cd8ab4214d61387ec9597d7e45bfd921b53dc768c0396afb2959 +size 8162 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset index 2b2bccc..8343bc8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185f62415bef66e065ae63c7cf2f934d3b213d1f805cacda25b004a97fe79b3b -size 363413 +oid sha256:212c1cf85b23c32184b20ad28a9275261c21168d8af31eb59b17a55f4364314a +size 308135 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/BP_MainMenu.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/BP_MainMenu.uasset index 8d2d2a6..2ed5a19 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/BP_MainMenu.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/BP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2360d172ae230eb8f612d0e392b7d8e98aff21a06519d6d183bd10789d87dbd0 -size 827085 +oid sha256:d5a593dd1241963c6f385e261e0890993480e4489920d03542c256251aae89d2 +size 832603 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset index 9138d41..93eaf77 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa179bc469e15e8f6e38e989b8ffc1b22b49862d4f3960e64084df315e98aa93 -size 276291 +oid sha256:ee4669637dc3396d0025b0019ac8f4d00bc6d9730b1581ebfb842bc1b148242a +size 281743 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset index 0366d0d..c9ed7db 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31e68298d0ee9751c1cfb3cd00bb930a93c5906b7400d5308017451eb433212b -size 154466 +oid sha256:c4a563042e7543b81f365a7d855fcbc787190289034d435af0378d2cfbf54918 +size 266176 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index c684693..a90ea9b 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:e2a3347d77507f10e2a9fc49e6884ac47f6809c46ad872a9f5aa3ec7678080f0 -size 929098 +oid sha256:e6e3eac72539ffd4bd7678d6eb4574920a4ae153e8be5cca2ef500853bf896ef +size 930502 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index 55aa885..3d5dff8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3f1e35582490cabbc3cbe46ace908ae79709828ea8a04b3384e6da04189bbd7 -size 147562 +oid sha256:5664a652c6a02e6ba2aee6c97bce9b0211d863c53b5e2c30f45ad0478873a379 +size 121508 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset index 5d3fbbf..5f99cbc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3bc92f552e3576c2d030e00953dba376254759ab8580b4e1174e55c0e0f7725 -size 562222 +oid sha256:6a6622af78da812bcf7e95523a55edd89180685be106d877edef3155f8b21908 +size 537408 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs index b1e872e..92b9300 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs @@ -30,7 +30,7 @@ namespace UnrealBuildTool.Rules "Engine", "Core", "CoreUObject", - "VRExpansionPlugin" + "VRExpansionPlugin", } ); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs index e666362..56a0175 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs @@ -69,7 +69,7 @@ public class VRExpansionPlugin : ModuleRules "AnimGraphRuntime", "XRBase", "GameplayTags", - "Mover", + "Mover" }); //if(Target.bUseChaos) @@ -92,7 +92,7 @@ public class VRExpansionPlugin : ModuleRules "ApplicationCore", "RenderCore", // "ShaderCore", - "NetworkReplayStreaming", + "NetworkReplayStreaming" //"Renderer", // "UtilityShaders" }); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin index a25dd5d..f7e3843 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin @@ -15,22 +15,22 @@ "IsBetaVersion": false, "Installed": true, "SupportedTargetPlatforms": [ - "Win64", - "Linux", - "Android", - "Mac", - "IOS" - ], + "Win64", + "Linux", + "Android", + "Mac", + "IOS" + ], "Modules": [ { "Name": "VRExpansionPlugin", "Type": "RunTime", "LoadingPhase": "Default" }, - { + { "Name": "VRExpansionEditor", "Type": "UnCookedOnly", - "LoadingPhase": "PostEngineInit" + "LoadingPhase": "PostEngineInit" } ], "Plugins": [ @@ -45,10 +45,6 @@ { "Name": "Mover", "Enabled": true - }, - { - "Name": "SPUD", - "Enabled": true } ] -} +} \ No newline at end of file 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/Private/CustomAdvancedFriendsGI.cpp b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CustomAdvancedFriendsGI.cpp deleted file mode 100644 index 14f493b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CustomAdvancedFriendsGI.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "CustomAdvancedFriendsGI.h" -#include "Engine/World.h" -#include "Engine/Engine.h" -#include "SpudSubsystem.h" - -void UCustomAdvancedFriendsGI::Init() -{ - Super::Init(); - - if (GEngine) - { - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, - TEXT("CustomAdvancedFriendsGI::Init() called")); - } - - GetSpudSubsystem(GetWorld())->AddPersistentGlobalObjectWithName(this, TEXT("ExampleGameInstance")); - - -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/WidgetHelper.cpp b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/WidgetHelper.cpp new file mode 100644 index 0000000..27e205b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/WidgetHelper.cpp @@ -0,0 +1,12 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "WidgetHelper.h" + +WidgetHelper::WidgetHelper() +{ +} + +WidgetHelper::~WidgetHelper() +{ +} 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/Source/VRExpPluginExample/Public/CustomAdvancedFriendsGI.h b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CustomAdvancedFriendsGI.h deleted file mode 100644 index 9e0ea5c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CustomAdvancedFriendsGI.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "AdvancedFriendsGameInstance.h" -#include "CustomAdvancedFriendsGI.generated.h" - -/** - * Custom GameInstance that registers itself with SPUD for persistence. - */ -UCLASS() -class VREXPPLUGINEXAMPLE_API UCustomAdvancedFriendsGI : public UAdvancedFriendsGameInstance -{ - GENERATED_BODY() - -public: - virtual void Init() override; -}; \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/WidgetHelper.h b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/WidgetHelper.h new file mode 100644 index 0000000..7bc4133 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/WidgetHelper.h @@ -0,0 +1,15 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" + +/** + * + */ +class VREXPPLUGINEXAMPLE_API WidgetHelper +{ +public: + WidgetHelper(); + ~WidgetHelper(); +}; diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/VRExpPluginExample.Build.cs b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/VRExpPluginExample.Build.cs index e9e143b..c03f5f2 100644 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/VRExpPluginExample.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/VRExpPluginExample.Build.cs @@ -10,7 +10,7 @@ public class VRExpPluginExample : ModuleRules PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; // PrivatePCHHeaderFile = "Private/WindowsMixedRealityPrecompiled.h"; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "AdvancedSessions", "VRExpansionPlugin", "SPUD" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "AdvancedSessions", "VRExpansionPlugin" }); PrivateDependencyModuleNames.AddRange(new string[] { }); diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 145cbc4..350eb11 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -9,15 +9,20 @@ "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ - "Engine", - "AdvancedSessions" + "Engine" ] } ], "Plugins": [ { "Name": "OpenXR", - "Enabled": true + "Enabled": true, + "SupportedTargetPlatforms": [ + "Win64", + "Linux", + "LinuxArm64", + "Android" + ] }, { "Name": "VRExpansionPlugin", @@ -56,7 +61,13 @@ }, { "Name": "OpenXRHandTracking", - "Enabled": true + "Enabled": true, + "SupportedTargetPlatforms": [ + "Win64", + "Linux", + "LinuxArm64", + "Android" + ] }, { "Name": "UdpMessaging", @@ -101,7 +112,10 @@ }, { "Name": "TextureGraph", - "Enabled": true + "Enabled": true, + "SupportedTargetPlatforms": [ + "Win64" + ] }, { "Name": "Harmonix",