Compare commits
No commits in common. "94628c554bd83f1b157a33d6ac4b1f3aec9eeed7" and "ff4cff2b5d83f574e242d05c24a4fa59132f210a" have entirely different histories.
94628c554b
...
ff4cff2b5d
22 changed files with 120 additions and 80 deletions
BIN
VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryStruct.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/WB_InventoryWidget.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/BP_MainMenu.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/BP_MainMenu.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset
(Stored with Git LFS)
Binary file not shown.
|
|
@ -30,7 +30,7 @@ namespace UnrealBuildTool.Rules
|
||||||
"Engine",
|
"Engine",
|
||||||
"Core",
|
"Core",
|
||||||
"CoreUObject",
|
"CoreUObject",
|
||||||
"VRExpansionPlugin"
|
"VRExpansionPlugin",
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ public class VRExpansionPlugin : ModuleRules
|
||||||
"AnimGraphRuntime",
|
"AnimGraphRuntime",
|
||||||
"XRBase",
|
"XRBase",
|
||||||
"GameplayTags",
|
"GameplayTags",
|
||||||
"Mover",
|
"Mover"
|
||||||
});
|
});
|
||||||
|
|
||||||
//if(Target.bUseChaos)
|
//if(Target.bUseChaos)
|
||||||
|
|
@ -92,7 +92,7 @@ public class VRExpansionPlugin : ModuleRules
|
||||||
"ApplicationCore",
|
"ApplicationCore",
|
||||||
"RenderCore",
|
"RenderCore",
|
||||||
// "ShaderCore",
|
// "ShaderCore",
|
||||||
"NetworkReplayStreaming",
|
"NetworkReplayStreaming"
|
||||||
//"Renderer",
|
//"Renderer",
|
||||||
// "UtilityShaders"
|
// "UtilityShaders"
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -45,10 +45,6 @@
|
||||||
{
|
{
|
||||||
"Name": "Mover",
|
"Name": "Mover",
|
||||||
"Enabled": true
|
"Enabled": true
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "SPUD",
|
|
||||||
"Enabled": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -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;
|
||||||
|
}
|
||||||
|
|
@ -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"));
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
// Fill out your copyright notice in the Description page of Project Settings.
|
||||||
|
|
||||||
|
|
||||||
|
#include "WidgetHelper.h"
|
||||||
|
|
||||||
|
WidgetHelper::WidgetHelper()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
WidgetHelper::~WidgetHelper()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
@ -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);
|
||||||
|
};
|
||||||
|
|
@ -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;
|
|
||||||
};
|
|
||||||
|
|
@ -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();
|
||||||
|
};
|
||||||
|
|
@ -10,7 +10,7 @@ public class VRExpPluginExample : ModuleRules
|
||||||
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
|
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
|
||||||
// PrivatePCHHeaderFile = "Private/WindowsMixedRealityPrecompiled.h";
|
// 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[] { });
|
PrivateDependencyModuleNames.AddRange(new string[] { });
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,20 @@
|
||||||
"Type": "Runtime",
|
"Type": "Runtime",
|
||||||
"LoadingPhase": "Default",
|
"LoadingPhase": "Default",
|
||||||
"AdditionalDependencies": [
|
"AdditionalDependencies": [
|
||||||
"Engine",
|
"Engine"
|
||||||
"AdvancedSessions"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Plugins": [
|
"Plugins": [
|
||||||
{
|
{
|
||||||
"Name": "OpenXR",
|
"Name": "OpenXR",
|
||||||
"Enabled": true
|
"Enabled": true,
|
||||||
|
"SupportedTargetPlatforms": [
|
||||||
|
"Win64",
|
||||||
|
"Linux",
|
||||||
|
"LinuxArm64",
|
||||||
|
"Android"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name": "VRExpansionPlugin",
|
"Name": "VRExpansionPlugin",
|
||||||
|
|
@ -56,7 +61,13 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name": "OpenXRHandTracking",
|
"Name": "OpenXRHandTracking",
|
||||||
"Enabled": true
|
"Enabled": true,
|
||||||
|
"SupportedTargetPlatforms": [
|
||||||
|
"Win64",
|
||||||
|
"Linux",
|
||||||
|
"LinuxArm64",
|
||||||
|
"Android"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name": "UdpMessaging",
|
"Name": "UdpMessaging",
|
||||||
|
|
@ -101,7 +112,10 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name": "TextureGraph",
|
"Name": "TextureGraph",
|
||||||
"Enabled": true
|
"Enabled": true,
|
||||||
|
"SupportedTargetPlatforms": [
|
||||||
|
"Win64"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name": "Harmonix",
|
"Name": "Harmonix",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue