From 6ddb8608d899271a4d755c6ca1fc6799ec667476 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 18 Jan 2024 23:52:42 +0100 Subject: [PATCH] Misc --- VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 2 +- .../Content/VRE/ExampleMap/MotionControllerMap.umap | 4 ++-- .../VRE/ExampleMap/MotionControllerMap1_BlockOut.umap | 4 ++-- .../USDTest/Test/Materials/MI_MergedBake_Baked.uasset | 3 +++ .../Test/Materials/MI_MergedBake_Baked_TwoSided.uasset | 3 +++ .../ExampleMap/USDTest/Test/StaticMeshes/SM_root.uasset | 3 +++ .../Test/Textures/T_MergedBake_Bake1_PBR_Diffuse.uasset | 3 +++ .../Textures/T_MergedBake_Bake1_PBR_Metalness.uasset | 3 +++ .../Test/Textures/T_MergedBake_Bake1_PBR_Normal.uasset | 3 +++ .../Textures/T_MergedBake_Bake1_PBR_Roughness.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject | 9 +++++++++ 11 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked_TwoSided.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/StaticMeshes/SM_root.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Metalness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Roughness.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index b7db736..012cdd7 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -33,7 +33,7 @@ ConfiguredInternetSpeed=15000 ConfiguredLanSpeed=20000 [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/VRE/ExampleMap/MotionControllerMap.MotionControllerMap +EditorStartupMap=/Game/VRE/ExampleMap/MotionControllerMap1_BlockOut.MotionControllerMap1_BlockOut LocalMapOptions= TransitionMap= bUseSplitscreen=False diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap index 6d18a9c..9338efa 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d499453240b2def328d16fb518e097ebbf7acc3b7d6818b2449108c8f07d1981 -size 904906 +oid sha256:f4907220dd7468705edf3aea6a15dab70d2b1466d949463ebb834756ebefe9a9 +size 904741 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap1_BlockOut.umap b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap1_BlockOut.umap index 0309e4d..00fe290 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap1_BlockOut.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap1_BlockOut.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b42449d560cfa9d021e8e31d8e3dcf5c2acae6deadb1a1e5a613df7f6c1e6dc8 -size 878122 +oid sha256:2840852255f321ee773b63e0923864c82fbc070b181ad10415713f2131c42b75 +size 858783 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked.uasset new file mode 100644 index 0000000..d2c2819 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13295bc3239989d5f699015cddb0b9f0d51f6f6287610265b13fdde051cbfdc6 +size 21442 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked_TwoSided.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked_TwoSided.uasset new file mode 100644 index 0000000..0116451 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Materials/MI_MergedBake_Baked_TwoSided.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca937a1fbe36cbfb9413de87b093cbf88130e60932e9dc9ff7dd09c2c99fbfd2 +size 33731 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/StaticMeshes/SM_root.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/StaticMeshes/SM_root.uasset new file mode 100644 index 0000000..7e2aca2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/StaticMeshes/SM_root.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:680ef2871eef9858c8ede2a1ba0c9549d8fac435c1f646076b5b670bf9292c80 +size 66611 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..d4f75d8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d770502f1fa1f1f509d044d00b56d2d9b01eabb16d8620f4a4194c06e5b079 +size 11228319 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Metalness.uasset new file mode 100644 index 0000000..3804c88 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Metalness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f940abac69c183725f1b3ce8f0184a23574274d83aba4d4f0c8d5239af15fea6 +size 489118 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..3c83c5a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce95f0bbdbf4eb591162e2a88afdf796775af59c609dd7781eb8e59e3c88d2d2 +size 109984333 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..3ee108f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/USDTest/Test/Textures/T_MergedBake_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b517b2549633fc06e442b24dfdd08cf37c64b638ea12754e3fc0d4287710847 +size 7914307 diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 3355591..09c6c9c 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -68,6 +68,15 @@ "Name": "LowEntryExtStdLib", "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/846c2ad08f164f45b0335ecebf85361e" + }, + { + "Name": "USDImporter", + "Enabled": true, + "SupportedTargetPlatforms": [ + "Win64", + "Mac", + "Linux" + ] } ], "TargetPlatforms": [