From 0d3f29cf2fcbd2d2d5d4a18036196d461de0d698 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Sun, 14 Jan 2024 22:49:10 +0100 Subject: [PATCH 1/2] UDIM/Texture Import for Freezing Chamber --- VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini | 4 ++++ .../Content/Materials/ALAS_Bake1_PBR_Alpha.uasset | 3 +++ .../Content/Materials/ALAS_Bake1_PBR_Diffuse.uasset | 3 +++ .../Content/Materials/ALAS_Bake1_PBR_Emission.uasset | 3 +++ .../Content/Materials/ALAS_Bake1_PBR_Metalness.uasset | 3 +++ .../Content/Materials/ALAS_Bake1_PBR_Normal.uasset | 3 +++ .../Content/Materials/ALAS_Bake1_PBR_Roughness.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Materials/Cube.uasset | 3 --- .../Content/Materials/Cylinder.uasset | 3 --- .../Content/Materials/Cylinder_001.uasset | 3 --- .../Content/Materials/Cylinder_002.uasset | 3 --- .../Content/Materials/Cylinder_003.uasset | 3 --- .../Content/Materials/Cylinder_004.uasset | 3 --- .../Content/Materials/Cylinder_005.uasset | 3 --- .../Content/Materials/Cylinder_006.uasset | 3 --- .../Content/Materials/Cylinder_007.uasset | 3 --- .../Content/Materials/Cylinder_008.uasset | 3 --- .../Content/Materials/Cylinder_009.uasset | 3 --- .../Content/Materials/Cylinder_010.uasset | 3 --- .../Content/Materials/Freezing_Chamber_Body_003.uasset | 3 +++ .../Content/Materials/Freezing_Chamber_Door_Left_003.uasset | 3 +++ .../Content/Materials/Freezing_Chamber_Door_Right_003.uasset | 3 +++ VIRTUOS_ExpansionPluginTests/Content/Materials/Image.uasset | 3 --- .../Content/Materials/MI_Manny_02.uasset | 3 --- .../Content/Materials/MI_Manny_02_baseColor.uasset | 3 --- .../Content/Materials/MI_Manny_02_metallicRoughness.uasset | 3 --- .../Content/Materials/MI_Manny_02_normal.uasset | 3 --- .../Content/Materials/M_FreezingChamber.uasset | 3 +++ .../Content/Materials/M_StainedGlass.uasset | 3 --- .../Content/Materials/Material_001.uasset | 3 --- .../Content/Materials/Material_002.uasset | 3 --- .../Content/Materials/Material_003.uasset | 3 --- .../Content/Materials/Material_004.uasset | 3 --- .../Content/Materials/Object_5_001.uasset | 3 --- .../Content/VRE/ExampleMap/MotionControllerMap.umap | 4 ++-- 35 files changed, 36 insertions(+), 71 deletions(-) create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Alpha.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Diffuse.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Emission.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Metalness.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Roughness.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cube.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_001.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_002.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_003.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_004.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_005.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_006.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_007.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_008.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_009.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_010.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Body_003.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Left_003.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Right_003.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Image.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_baseColor.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_metallicRoughness.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_normal.uasset create mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/M_FreezingChamber.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/M_StainedGlass.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Material_001.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Material_002.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Material_003.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Material_004.uasset delete mode 100644 VIRTUOS_ExpansionPluginTests/Content/Materials/Object_5_001.uasset diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index 3b4e772..b7db736 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -97,6 +97,10 @@ vr.VRS.HMDFixedFoveationLevel=0 vr.MobileMultiView=True r.Substrate=False r.MSAACount=8 +r.VirtualTextures=True +r.VirtualTexturedLightmaps=True +r.VT.AnisotropicFiltering=True +bEnableVirtualTextureOpacityMask=True [/Script/NavigationSystem.NavigationSystemV1] bAutoCreateNavigationData=True diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Alpha.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Alpha.uasset new file mode 100644 index 0000000..f49ab18 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Alpha.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ad65f86ce5711bbd99e591840a07eb21099070a9cda0087f4f2b09ff8eea381 +size 698189 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..05ec5fb --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e4efbf9eb3957b3f4df73e4d836f8cfa138137cd0102ceceb242b6e9b60504d +size 14973540 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Emission.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Emission.uasset new file mode 100644 index 0000000..2499356 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Emission.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25dc1f9748d65e76e1103836c4c625f937770d5ca61a9e7318a519a21277e07a +size 15986 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Metalness.uasset new file mode 100644 index 0000000..ea60957 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Metalness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d44206bdafbddf0c0766b93ba8c994a993c2ea2afc5b8d69b6402802fb64e6f +size 739171 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Normal.uasset new file mode 100644 index 0000000..f3bd874 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4adc923d4eaeaf07e47b934ed2b5e51538a4425ddb9ef8335250149805e2c92 +size 145096147 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Roughness.uasset new file mode 100644 index 0000000..089f815 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/ALAS_Bake1_PBR_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:677df8ead79b724f8f831641c66019a19d85442ca1674b188fd4e61234323b7b +size 9386614 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cube.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cube.uasset deleted file mode 100644 index f2ca05a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cube.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d612e863a59a46fde0add214678007406f0e7f3f0c7b5e46c346acc28dd79189 -size 56230 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder.uasset deleted file mode 100644 index 5014937..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b6bb5dc40788e6e2d7362732f11bf680a3db5c00f532688b13cbe4fbe696ab7 -size 44995 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_001.uasset deleted file mode 100644 index 4e01db7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd298ec31ffceb51f8270b251ca0aad028a0c34468eecf21b21cd4b49b9d5e23 -size 95108 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_002.uasset deleted file mode 100644 index a82c2ce..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0981bcc505c73e1ddca0e77778fc1ecda89dafc1ef5384898d4daa66177ad87a -size 43997 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_003.uasset deleted file mode 100644 index 08505c2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c29eab10d19254f5758a18db2828e63c2865ff38f842295f97b8a5bc5c01cb2 -size 65351 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_004.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_004.uasset deleted file mode 100644 index d729e9b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_004.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbb94c3440583aab28b6f0c8e3d15182a7e9f125610af31afb6c66e9d2ba40b7 -size 41376 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_005.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_005.uasset deleted file mode 100644 index fd9ca66..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_005.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e618eac1f3c9994c4937aa70863d549f094f3110b514f3b7a3a66619c934ef1 -size 38714 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_006.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_006.uasset deleted file mode 100644 index d254e88..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_006.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b943520a6b67fe401fad48beae84351f5d0dc22bd90d3e6d0af3a610683bede4 -size 45539 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_007.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_007.uasset deleted file mode 100644 index 6643aea..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_007.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4bb5c58ca93c4893efb525bd11fb4ff0ec4f90d697e49624f7afc6b14f1d1ad -size 41370 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_008.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_008.uasset deleted file mode 100644 index 00b1ff6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_008.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98cfe00112b212359c6fc4caffecded665f18ddcfa745705614b3c32a82f239e -size 38722 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_009.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_009.uasset deleted file mode 100644 index 472b730..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_009.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36ff44362b5adf3443d780b781afba526457353aa1a9933339ac7feb4aa0131a -size 37774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_010.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_010.uasset deleted file mode 100644 index c3981a5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Cylinder_010.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bd88fba2ab5b64ff2124ef71a39ba7aeb486b023c1b3971d100f7ead6145570 -size 37447 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Body_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Body_003.uasset new file mode 100644 index 0000000..ae5b97d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Body_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00cf648e679afb924eb4872286ad566cdd27233ef70e7d6c3d8d19224dcc5a0d +size 115730 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Left_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Left_003.uasset new file mode 100644 index 0000000..6bcef23 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Left_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93616926fc0cdb351fb18a3fce0f58a69d6733d96b5a26958ffccb165614cf9c +size 118385 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Right_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Right_003.uasset new file mode 100644 index 0000000..9b9e4d3 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/Freezing_Chamber_Door_Right_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbb0100c4c1b1997829b492c8c658123a0083b2fd42d50535ca2d8f9e0848235 +size 113871 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Image.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Image.uasset deleted file mode 100644 index a4b7e1a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Image.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc301ccb898195053f1a0d15fdd85b298a37bbfa25a85fc116d7546d2abf13b5 -size 896783 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02.uasset deleted file mode 100644 index 933240e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60920e6643af824f092ad93ee7f04a41c8e961bdba6833156c9fd328d1f6fbb8 -size 56887 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_baseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_baseColor.uasset deleted file mode 100644 index 05d346e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_baseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3211fa88a1b8f7bf20690ec47f2dc306fd30c8f7fbbbc5b06d168ba30c61a053 -size 9508112 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_metallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_metallicRoughness.uasset deleted file mode 100644 index 115c7d1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_metallicRoughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7360570d0a9258c8b1fbcec2565bc06824b2cb41d340f1e71ed3e91c314b9366 -size 5381660 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_normal.uasset deleted file mode 100644 index b391af1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MI_Manny_02_normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a003ad6fda4ee093b12e25a0b5924429c9a9870eeb3d1da66531693e4984526 -size 7316822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/M_FreezingChamber.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/M_FreezingChamber.uasset new file mode 100644 index 0000000..49f91af --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Materials/M_FreezingChamber.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4b2474dcc5b1a9b3e67801f7a83d1d001df9119062420231b3c15364b4f6a11 +size 21774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/M_StainedGlass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/M_StainedGlass.uasset deleted file mode 100644 index ee8ffe4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/M_StainedGlass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c69af6abef747ae6d5acf6f3a8b08e66c7fe404c5d7fd6db51dfc965703493d8 -size 26033 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_001.uasset deleted file mode 100644 index a4317f0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:530575226b1ca3f15e9ab1246a88b1a9ddb8f9e75ab5030573d4a9cbbbf103e6 -size 48124 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_002.uasset deleted file mode 100644 index d3d4895..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2fef03cfd082798ef3747dcb9b3327d6b73a8567c6154a3ebd09f87b5cf07a6 -size 48001 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_003.uasset deleted file mode 100644 index cbdb01d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70c89342e4345f2b149ac234c252e4537bf834513c137649bc14f0421213dba3 -size 56478 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_004.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_004.uasset deleted file mode 100644 index eb88e30..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Material_004.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a400be1ff9ec1eb130e3e991af4ca14a451c9c9f1908466cd611ca4f2bac61de -size 48709 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Object_5_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Object_5_001.uasset deleted file mode 100644 index 39b6d59..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Object_5_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51cf3533c3d52672f2aeb435e839a9a7b156a54f38add63ff74a31af651e4ad2 -size 52755 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap index 0c40e41..6d18a9c 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:7f1db3f11dadba0d866a0919908bcd839c80f787600f7908fe05a2e38f77a088 -size 879451 +oid sha256:d499453240b2def328d16fb518e097ebbf7acc3b7d6818b2449108c8f07d1981 +size 904906 From 6ddb8608d899271a4d755c6ca1fc6799ec667476 Mon Sep 17 00:00:00 2001 From: Simeon Wallrath Date: Thu, 18 Jan 2024 23:52:42 +0100 Subject: [PATCH 2/2] 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": [