diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index f2fa0cf..150da8e 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:48545cb1961555a7c12f9ec171d4d57704f2beb43aba296118669e0a720e9055 -size 5233000 +oid sha256:8ad446de0c71b95a894d5a79792db5c873eb93c950071aafdaec055ac0aeeaa7 +size 5237052 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset index e8d6186..f480d7e 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:8152905b965cf2453b88f7f7041b50a800c5fe15745356b06dc9637441fe7716 -size 973294 +oid sha256:eaabc58551e708b78ad89d6c9b4b73a936a1abbdd464e0daffc611af8bf5819c +size 1059494 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset index fa2bc01..2e348fe 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:01c5110001b2cd8ab4214d61387ec9597d7e45bfd921b53dc768c0396afb2959 -size 8162 +oid sha256:de25c5043e952773f8ec94b8b3c1f689dfc7763371bd4bd8d813eb042a518d25 +size 9037 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset index 8343bc8..d33dcd8 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:212c1cf85b23c32184b20ad28a9275261c21168d8af31eb59b17a55f4364314a -size 308135 +oid sha256:20fccb839b3e424c0b86821099b6368b1cf014e836a325b51049e3f8e49800cb +size 314316 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset index c9ed7db..2f7072d 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:c4a563042e7543b81f365a7d855fcbc787190289034d435af0378d2cfbf54918 -size 266176 +oid sha256:1b272224b52d8f0a2b11bfe4830f17d44d8cbdcbc8ba179276a39b7426e0a797 +size 284917 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index a90ea9b..c684693 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:e6e3eac72539ffd4bd7678d6eb4574920a4ae153e8be5cca2ef500853bf896ef -size 930502 +oid sha256:e2a3347d77507f10e2a9fc49e6884ac47f6809c46ad872a9f5aa3ec7678080f0 +size 929098 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 3d5dff8..ea7732a 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:5664a652c6a02e6ba2aee6c97bce9b0211d863c53b5e2c30f45ad0478873a379 -size 121508 +oid sha256:5bcdb223340ff4421752bab0e54216973aec997549325eee6696fb969e282846 +size 144802 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs index 92b9300..b1e872e 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 56a0175..e666362 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 f7e3843..a25dd5d 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,6 +45,10 @@ { "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 deleted file mode 100644 index e5a9920..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#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 new file mode 100644 index 0000000..14f493b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CustomAdvancedFriendsGI.cpp @@ -0,0 +1,19 @@ +#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 deleted file mode 100644 index 27e205b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/WidgetHelper.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// 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 deleted file mode 100644 index 2a6c5bb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h +++ /dev/null @@ -1,16 +0,0 @@ -#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 new file mode 100644 index 0000000..9e0ea5c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CustomAdvancedFriendsGI.h @@ -0,0 +1,17 @@ +#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 deleted file mode 100644 index 7bc4133..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/WidgetHelper.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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 c03f5f2..e9e143b 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" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "AdvancedSessions", "VRExpansionPlugin", "SPUD" }); PrivateDependencyModuleNames.AddRange(new string[] { }); diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 350eb11..145cbc4 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -9,20 +9,15 @@ "Type": "Runtime", "LoadingPhase": "Default", "AdditionalDependencies": [ - "Engine" + "Engine", + "AdvancedSessions" ] } ], "Plugins": [ { "Name": "OpenXR", - "Enabled": true, - "SupportedTargetPlatforms": [ - "Win64", - "Linux", - "LinuxArm64", - "Android" - ] + "Enabled": true }, { "Name": "VRExpansionPlugin", @@ -61,13 +56,7 @@ }, { "Name": "OpenXRHandTracking", - "Enabled": true, - "SupportedTargetPlatforms": [ - "Win64", - "Linux", - "LinuxArm64", - "Android" - ] + "Enabled": true }, { "Name": "UdpMessaging", @@ -112,10 +101,7 @@ }, { "Name": "TextureGraph", - "Enabled": true, - "SupportedTargetPlatforms": [ - "Win64" - ] + "Enabled": true }, { "Name": "Harmonix",