diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index d0bd284..ab0d0a7 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:427aff8e1a377a4876b8bc392c0b607a2efcad8717f825e55494acab66248c85 -size 605155 +oid sha256:c4ce0cbe247280bd5119cc08b97cbb41f3674946346c50be0e7b0101ec7af15f +size 633146 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index a1fd3c7..11c7900 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f74303fb4b6350222ad286b2d9f4e87422fd71f2b73e8722feaaa7f769f28389 -size 1628208 +oid sha256:3b024a755f2abfc4e2f14a7db839f52261e2aab56e0d4d6be95e801293125700 +size 1623878 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap1_BlockOut.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap1_BlockOut.umap index ae0f7e3..cf139d8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap1_BlockOut.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap1_BlockOut.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc2b74e5097b7a87f4a658af8e9ff50375519dc71bd7978dc2f19d7e19bc2453 -size 668525 +oid sha256:b009147d4760d50916e624a5130dc9f4ba5e198e8823d619aacf5a1586514b56 +size 666854 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index b6d415b..5935fa7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aecde12d22a494e89383505af6511a779d84deb0883f69564d13ad6ff8daae9b -size 118018 +oid sha256:1764fb4712c49de0bab2e2ab229916176c2e315029254d1b925bae7b094dd0c9 +size 116250 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/HandSockets/HandSocketMat.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/HandSockets/HandSocketMat.uasset index 090c979..7eb99c3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/HandSockets/HandSocketMat.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/HandSockets/HandSocketMat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:424be16a355297cd1b42342a82036a3e0cae2e12f525d939e6a136edf50a097a -size 116413 +oid sha256:5483d491b791d2c118196af987f96d3811edb5c2f833ed4525123fff009a66ca +size 12951 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonActor.uasset index ff3b7e7..fd080d6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40335f8e61c839bc7be585c9ffe6d21bf406fff760346e94d67e7c42fe2c7e4c -size 107545 +oid sha256:ab913492adb6fecf20342e061825696c33319832e6a2ca2cf1395d237d89142e +size 108064 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonComponent.uasset index 894caf2..a96c2f1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95bff05325a75be2a611e3470e106230ac6cb2bacc602f184ac6a88ea5e5b11b -size 379820 +oid sha256:e5fdd812636d68d9b39b27eff55316658c87c105929a12ef4fb0c0dfc01491de +size 395521 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset index df22e52..91ec162 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a363196be4ec9a2bc42b9e1cc6c24649b75523ba6d25f4c50e5deadaea0c1ff -size 71731 +oid sha256:1d8f6de5f76dc6346beeb3363050160b2ee89b0d32dbbcba03bd0cace6dd8290 +size 89749 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset index 9532b73..4a7b6d3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bc95add1362fa520dec14ce617d6dd5abd9bcf60c3ea3fbcf3a96ed49f8a5ed -size 328171 +oid sha256:669210a4d77c962cfe3df78cd2c40a1c4dce5aceeee27a9959b1fca2e5c478c4 +size 324065 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index fe7c86f..c1ef6f9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2eaad1c6f5ba51a949ff6fe3d3c43a31e146dd558c23d103c4d22d587b4f0484 -size 5616093 +oid sha256:448adf353eea8c41f0939a1372a37d8b5047dbba6f34c5779974d233d31da39a +size 5645848 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index 866c3be..c2c808c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9904e910e2592cc10d8703e68828e2d89f382b6dd0e2e1309777f9e029ba49d -size 2465480 +oid sha256:6ad9aae4bac1615478f884c95af5e83b65ff45d75226789a84448605d4c615b3 +size 2550622 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 05a315b..7f9e35c 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:a7974d810b222e2aab1ca4372eddb746a130e6e96d294f59095008b62ba81709 -size 259535 +oid sha256:fec7d3355764c125b3a016e8df93ad0ba84f9647b096735b54b534df42ef04fc +size 259424 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/011.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/011.uasset deleted file mode 100644 index 8fad273..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/011.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2749ef9da339dcf69bced206221c6f530b76488bb887c8fe3344018a0716d0f9 -size 77615 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/021.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/021.uasset deleted file mode 100644 index 2e5843b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/021.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb440778142b89bf45511df7753158735a4c2be12790f7bc177808da42573405 -size 171792 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset new file mode 100644 index 0000000..88c118e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b3d53c7e4f8966edc123214b7cea97b32695613b545d2c0949c761cdac7e4d9 +size 75703 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/Cab.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/Cab.uasset new file mode 100644 index 0000000..e347e7d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/Cab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1855f75c3d5ea409e693fe4d329c4ecdb62f29f919c0283b464d87fd962fb9dd +size 100545 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/Draw.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/Draw.uasset new file mode 100644 index 0000000..32743cd --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/Draw.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fcee5408c9e30cae3d3abc1573f3f2754598719323409979eca9337dcd0ce4d +size 77691 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/GlassDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/GlassDoor.uasset new file mode 100644 index 0000000..d266f05 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/GlassDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ac1ce8bcbf872f53ab54d8fd81b922f9e620d23b68828e325c6496d7bc19012 +size 88936 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/LargeDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/LargeDoor.uasset new file mode 100644 index 0000000..252dc71 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/LargeDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b088d0a09acbd696b085179a402c7aca6ce1bcf5858b9229a3b97f9846550cf5 +size 84623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset new file mode 100644 index 0000000..936758a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d36bca23879e0db9904c6c88f95ca4419ef97d64a3870787657532ec572e1e61 +size 14376 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/NormalDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/NormalDoor.uasset new file mode 100644 index 0000000..7a44a75 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/NormalDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81ecbe1ed24b4a946056f01c6437be5903ddfd913a4e4bfe52a34a0139005a04 +size 88801 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/RotatedDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/RotatedDoor.uasset new file mode 100644 index 0000000..556cd92 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/RotatedDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0773e22709bc6a68116ecfd154998f859238af40d8b19ee151726e268eb8632b +size 81106 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/SmallDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/SmallDoor.uasset new file mode 100644 index 0000000..1650a03 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/SmallDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10d4889999091a487e1ae855270c80e174cd16e233f19e762f141d95e64bfab1 +size 83808 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/material_1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/material_1.uasset new file mode 100644 index 0000000..f6fa063 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/material_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06bd516707c10b43bb81f9fd5de967644db1c16aa24deb60eaba03e660ca3a93 +size 56573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Furniture.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Furniture.uasset deleted file mode 100644 index 67e952e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Furniture.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80a32ea97237d304edb70b5fbdbc8be694229928f61c46aa82abef5ff0cf3aa1 -size 81244 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Glass.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Glass.uasset deleted file mode 100644 index 995bcda..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Glass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec6fc2b7e6d2d2610813d6659440bb6efc921c4f83fc0e98a2f2a2fc23a133af -size 46609 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Glass1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Glass1.uasset deleted file mode 100644 index 10bdab6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Glass1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:233a2d2b9d0a89857be55e2aa14abdd66e9a490a15b3f9db2e1963468dec40cd -size 56705 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/WoodCab.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/WoodCab.uasset deleted file mode 100644 index c597552..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/WoodCab.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78f12e1e25ac127df2eb948f7f2f1a1928d3a919f198644a3351b5433b04673a -size 59763 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/material.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/material.uasset deleted file mode 100644 index 63f52c9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/material.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bea600d083d0b3fb1cc961c696d549a1acbc461c5f9b4400e7da3ebe16527ef -size 56129 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/BP_PhysicsChair.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/BP_PhysicsChair.uasset new file mode 100644 index 0000000..6b3e9d7 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/BP_PhysicsChair.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:397291724c742ac139284dc034f6dc4e2dca5cb92ee69828d5f717a38d133928 +size 2686 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/BP_PhysicsChair.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/BP_PhysicsChair.uasset new file mode 100644 index 0000000..b918c1b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/BP_PhysicsChair.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15db729504b9ef9b4c6a8c07e0a52444c18f093e8f9cdce9d56d3f42cb44a507 +size 41863 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset index 818d7d1..84d62fc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12858b023990b42a66a44f2aba62a01dc6be6055d544a2bed8584076f3578ace -size 61103 +oid sha256:a23be8f6b670ec871424b7c4d6baa6d0acf1a3ab2e9eb338a07435f49e2ecaae +size 61158 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset index c590ac7..c28ccce 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ba6fad230f80e37b8366b8954cad8df41bfc46a96a2ec6b9368912d57f33375 -size 24043 +oid sha256:62dd1b229d415702d7fa8b6d605ae5249b7e01f22009cc56a73ca473828c77e0 +size 23446 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/MF/MF_EdgeDetection.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/MF/MF_EdgeDetection.uasset index 85cd1e0..212966c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/MF/MF_EdgeDetection.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/MF/MF_EdgeDetection.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a2901211f6c582fb7abfe948ce45d97548dc818c6f3c326f873409673c1dea0 -size 22127 +oid sha256:8445bb9ba4169660498cdb587872ecb8ac66f29b6416a9d5407fcb622ccccf38 +size 40640 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection1.uasset new file mode 100644 index 0000000..ff944f0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a4d56d08384bcf77533cc61659b1c5eb1d0d2b966f86700bda1256600c787dc +size 34582 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection1_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection1_Inst.uasset new file mode 100644 index 0000000..0c3f4c0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection1_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a464bfade356be6accbc8b93e08612e28c66bcaca36010739955fcf139cdf5 +size 11141 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection2.uasset new file mode 100644 index 0000000..0f7f87c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1744bc2a7f7da1f750d106a15c39d0530e3f5fd582ab94243ef857c238581f9 +size 10652 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection2_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection2_Inst.uasset new file mode 100644 index 0000000..7fe81ea --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_EdgeDetection2_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fe0b17230bbbceebdfc7bf428c0374c5b99646a5c9a567147cb5830931d63b8 +size 8475 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset index 80e6367..c8014db 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e446d3a689fd6adb54832b995673e447c19a1e6b0cd0624b1cb9800c0c9fd24 -size 173755 +oid sha256:a837c35453449d585e6b44b073110e6a7d16b96b1a01b30e6ac01a1e2dbc8bec +size 173559 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset index c72c1bc..9580957 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a1b96b7ac81ffc0f47ebf3b6faa7f8d652ea46f383026dcceb6e3a8399b0615 -size 97774 +oid sha256:efd52af44f0c100ece7fddc1924adc71d3eaf81857943c9f5c1a96e091b015a2 +size 115396 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp index 46b583b..91a775c 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp @@ -693,7 +693,7 @@ void UHandSocketComponent::OnRegister() { if (HandPreviewMaterial) { - HandVisualizerComponent->SetMaterial(0, (UMaterialInterface*)HandPreviewMaterial); + HandVisualizerComponent->SetMaterial(0, HandPreviewMaterial); } HandVisualizerComponent->SetSkinnedAssetAndUpdate(VisualizationMesh); } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp index 82cbd35..602330c 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp @@ -283,6 +283,21 @@ UPrimitiveComponent* FBPActorGripInformation::GetGrippedComponent() const return Cast(GrippedObject); } + +UPrimitiveComponent* FBPActorGripInformation::GetGripPrimitiveComponent() const +{ + UPrimitiveComponent* RootComp = nullptr; + + if (GripTargetType == EGripTargetType::ActorGrip) + { + RootComp = Cast(GetGrippedActor()->GetRootComponent()); + } + else + RootComp = GetGrippedComponent(); + + return RootComp; +} + bool FBPActorGripInformation::operator==(const UPrimitiveComponent* Other) const { if (Other && GrippedObject && GrippedObject == (const UObject*)Other) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp index c634b3b..ad0639d 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp @@ -586,6 +586,11 @@ bool UVRExpansionFunctionLibrary::IsActiveGrip(const FBPActorGripInformation& Gr return Grip.IsActive(); } +UPrimitiveComponent* UVRExpansionFunctionLibrary::GetGripPrimitiveTarget(const FBPActorGripInformation& Grip) +{ + return Grip.GetGripPrimitiveComponent(); +} + FTransform_NetQuantize UVRExpansionFunctionLibrary::MakeTransform_NetQuantize(FVector Translation, FRotator Rotation, FVector Scale) { return FTransform_NetQuantize(Rotation, Translation, Scale); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h index 6073e9c..d3e0ac7 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h @@ -465,7 +465,7 @@ public: #if WITH_EDITORONLY_DATA // Material to apply to the hand UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Hand Visualization") - TObjectPtr HandPreviewMaterial; + TObjectPtr HandPreviewMaterial; #endif }; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h index 5196519..f04ed78 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h @@ -1562,6 +1562,8 @@ public: UPrimitiveComponent* GetGrippedComponent() const; + UPrimitiveComponent* GetGripPrimitiveComponent() const; + //Check if a grip is the same as another, the only things I check for are the actor / component //This is here for the Find() function from TArray FORCEINLINE bool operator==(const FBPActorGripInformation &Other) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h index a7e12a4..918dd74 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h @@ -200,6 +200,10 @@ public: UFUNCTION(BlueprintPure, Category = "VRExpansionFunctions") static bool IsActiveGrip(const FBPActorGripInformation& Grip); + /* Returns the target primitive component if the grip has one (it should always), otherwise it will return invalid */ + UFUNCTION(BlueprintPure, Category = "VRExpansionFunctions") + static UPrimitiveComponent* GetGripPrimitiveTarget(const FBPActorGripInformation& Grip); + /** Make a transform net quantize from location, rotation and scale */ UFUNCTION(BlueprintPure, meta = (Scale = "1,1,1", Keywords = "construct build", NativeMakeFunc), Category = "VRExpansionLibrary|TransformNetQuantize") static FTransform_NetQuantize MakeTransform_NetQuantize(FVector Location, FRotator Rotation, FVector Scale);