diff --git a/Landscape.lnk b/Landscape.lnk index 11c1eab..3c1ab98 100644 Binary files a/Landscape.lnk and b/Landscape.lnk differ diff --git a/ViRGiS_Geo_Data/Managed/Assembly-CSharp.dll b/ViRGiS_Geo_Data/Managed/Assembly-CSharp.dll index 9120dc5..6ac8625 100644 Binary files a/ViRGiS_Geo_Data/Managed/Assembly-CSharp.dll and b/ViRGiS_Geo_Data/Managed/Assembly-CSharp.dll differ diff --git a/ViRGiS_Geo_Data/Managed/SteamVR.dll b/ViRGiS_Geo_Data/Managed/SteamVR.dll index 36ecc42..4f323f0 100644 Binary files a/ViRGiS_Geo_Data/Managed/SteamVR.dll and b/ViRGiS_Geo_Data/Managed/SteamVR.dll differ diff --git a/ViRGiS_Geo_Data/Managed/SteamVR_Actions.dll b/ViRGiS_Geo_Data/Managed/SteamVR_Actions.dll index 0696157..c870d6c 100644 Binary files a/ViRGiS_Geo_Data/Managed/SteamVR_Actions.dll and b/ViRGiS_Geo_Data/Managed/SteamVR_Actions.dll differ diff --git a/ViRGiS_Geo_Data/Managed/Unity.XR.OpenVR.dll b/ViRGiS_Geo_Data/Managed/Unity.XR.OpenVR.dll index d0a361d..17041b8 100644 Binary files a/ViRGiS_Geo_Data/Managed/Unity.XR.OpenVR.dll and b/ViRGiS_Geo_Data/Managed/Unity.XR.OpenVR.dll differ diff --git a/ViRGiS_Geo_Data/Managed/Virgis.dll b/ViRGiS_Geo_Data/Managed/Virgis.dll index 13a7757..eea45b7 100644 Binary files a/ViRGiS_Geo_Data/Managed/Virgis.dll and b/ViRGiS_Geo_Data/Managed/Virgis.dll differ diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/actions.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/actions.json new file mode 100644 index 0000000..5e7117c --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/actions.json @@ -0,0 +1,131 @@ +{ + "actions": [ + { + "name": "/actions/default/in/Pose", + "type": "pose" + }, + { + "name": "/actions/default/in/HeadsetOnHead", + "type": "boolean", + "requirement": "optional" + }, + { + "name": "/actions/default/in/Move", + "type": "vector2", + "requirement": "mandatory" + }, + { + "name": "/actions/default/in/PanZoom", + "type": "vector2", + "requirement": "mandatory" + }, + { + "name": "/actions/default/in/LeftTrigger", + "type": "boolean" + }, + { + "name": "/actions/default/in/LeftTriggerPull", + "type": "vector1" + }, + { + "name": "/actions/default/in/RightTrigger", + "type": "boolean" + }, + { + "name": "/actions/default/in/RightTriggerPull", + "type": "vector1", + "requirement": "mandatory" + }, + { + "name": "/actions/default/in/LeftGrip", + "type": "boolean", + "requirement": "optional" + }, + { + "name": "/actions/default/in/RightGrip", + "type": "boolean" + }, + { + "name": "/actions/default/in/Menu", + "type": "boolean", + "requirement": "mandatory" + }, + { + "name": "/actions/default/in/ActionButton", + "type": "boolean", + "requirement": "suggested" + }, + { + "name": "/actions/default/out/Haptic", + "type": "vibration" + } + ], + "action_sets": [ + { + "name": "/actions/default", + "usage": "leftright" + } + ], + "default_bindings": [ + { + "controller_type": "vive_controller", + "binding_url": "bindings_vive_controller.json" + }, + { + "controller_type": "oculus_touch", + "binding_url": "bindings_oculus_touch.json" + }, + { + "controller_type": "knuckles", + "binding_url": "bindings_knuckles.json" + }, + { + "controller_type": "holographic_controller", + "binding_url": "bindings_holographic_controller.json" + }, + { + "controller_type": "vive_cosmos_controller", + "binding_url": "bindings_vive_cosmos_controller.json" + }, + { + "controller_type": "logitech_stylus", + "binding_url": "bindings_logitech_stylus.json" + }, + { + "controller_type": "vive_cosmos", + "binding_url": "binding_vive_cosmos.json" + }, + { + "controller_type": "vive", + "binding_url": "binding_vive.json" + }, + { + "controller_type": "indexhmd", + "binding_url": "binding_index_hmd.json" + }, + { + "controller_type": "vive_pro", + "binding_url": "binding_vive_pro.json" + }, + { + "controller_type": "rift", + "binding_url": "binding_rift.json" + }, + { + "controller_type": "holographic_hmd", + "binding_url": "binding_holographic_hmd.json" + }, + { + "controller_type": "vive_tracker_camera", + "binding_url": "binding_vive_tracker_camera.json" + } + ], + "localization": [ + { + "language_tag": "en_US", + "/actions/default/in/HeadsetOnHead": "Headset on head (proximity sensor)", + "/actions/default/in/Pose": "Pose", + "/actions/default/out/Haptic": "Haptic" + } + ] +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_holographic_hmd.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_holographic_hmd.json new file mode 100644 index 0000000..866c380 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_holographic_hmd.json @@ -0,0 +1,27 @@ +{ + "alias_info" : {}, + "bindings" : { + "/actions/default" : { + "chords" : [], + "haptics" : [], + "poses" : [], + "skeleton" : [], + "sources" : [ + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/headsetonhead" + } + }, + "mode" : "button", + "path" : "/user/head/proximity" + } + ] + } + }, + "controller_type" : "holographic_hmd", + "description" : "", + "name" : "holographic_hmd defaults", + "options" : {}, + "simulated_actions" : [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_index_hmd.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_index_hmd.json new file mode 100644 index 0000000..24b53e2 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_index_hmd.json @@ -0,0 +1,27 @@ +{ + "alias_info": {}, + "bindings": { + "/actions/default": { + "chords": [], + "haptics": [], + "poses": [], + "skeleton": [], + "sources": [ + { + "inputs": { + "click": { + "output": "/actions/default/in/headsetonhead" + } + }, + "mode": "button", + "path": "/user/head/proximity" + } + ] + } + }, + "controller_type": "indexhmd", + "description": "", + "name": "index hmd defaults", + "options": {}, + "simulated_actions": [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_rift.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_rift.json new file mode 100644 index 0000000..4a7bb54 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_rift.json @@ -0,0 +1,27 @@ +{ + "alias_info" : {}, + "bindings" : { + "/actions/default" : { + "chords" : [], + "haptics" : [], + "poses" : [], + "skeleton" : [], + "sources" : [ + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/headsetonhead" + } + }, + "mode" : "button", + "path" : "/user/head/proximity" + } + ] + } + }, + "controller_type" : "rift", + "description" : "", + "name" : "rift defaults", + "options" : {}, + "simulated_actions" : [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive.json new file mode 100644 index 0000000..a4ad342 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive.json @@ -0,0 +1,27 @@ +{ + "alias_info" : {}, + "bindings" : { + "/actions/default" : { + "chords" : [], + "haptics" : [], + "poses" : [], + "skeleton" : [], + "sources" : [ + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/headsetonhead" + } + }, + "mode" : "button", + "path" : "/user/head/proximity" + } + ] + } + }, + "controller_type" : "vive", + "description" : "", + "name" : "vive defaults", + "options" : {}, + "simulated_actions" : [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_cosmos.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_cosmos.json new file mode 100644 index 0000000..36b618f --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_cosmos.json @@ -0,0 +1,27 @@ +{ + "alias_info": {}, + "bindings": { + "/actions/default": { + "chords": [], + "haptics": [], + "poses": [], + "skeleton": [], + "sources": [ + { + "inputs": { + "click": { + "output": "/actions/default/in/headsetonhead" + } + }, + "mode": "button", + "path": "/user/head/proximity" + } + ] + } + }, + "controller_type": "vive_cosmos", + "description": "", + "name": "vive cosmos hmd defaults", + "options": {}, + "simulated_actions": [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_pro.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_pro.json new file mode 100644 index 0000000..43ba0d3 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_pro.json @@ -0,0 +1,27 @@ +{ + "alias_info" : {}, + "bindings" : { + "/actions/default" : { + "chords" : [], + "haptics" : [], + "poses" : [], + "skeleton" : [], + "sources" : [ + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/headsetonhead" + } + }, + "mode" : "button", + "path" : "/user/head/proximity" + } + ] + } + }, + "controller_type" : "vive_pro", + "description" : "", + "name" : "vive_pro defaults", + "options" : {}, + "simulated_actions" : [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_tracker_camera.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_tracker_camera.json new file mode 100644 index 0000000..22f06dc --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/binding_vive_tracker_camera.json @@ -0,0 +1,14 @@ +{ + "bindings": { + "/actions/mixedreality": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + } + }, + "controller_type": "vive_tracker_camera", + "description": "", + "name": "tracker_forcamera" +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_holographic_controller.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_holographic_controller.json new file mode 100644 index 0000000..c6b5ede --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_holographic_controller.json @@ -0,0 +1,46 @@ +{ + "bindings": { + "/actions/buggy": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + }, + "/actions/default": { + "chords": [], + "poses": [ + { + "output": "/actions/default/in/pose", + "path": "/user/hand/left/pose/raw" + }, + { + "output": "/actions/default/in/pose", + "path": "/user/hand/right/pose/raw" + } + ], + "haptics": [ + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/left/output/haptic" + }, + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/right/output/haptic" + } + ], + "sources": [], + "skeleton": [] + }, + "/actions/platformer": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + } + }, + "controller_type": "holographic_controller", + "description": "", + "name": "Default bindings for Windows Mixed Reality Controllers" +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_knuckles.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_knuckles.json new file mode 100644 index 0000000..b694077 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_knuckles.json @@ -0,0 +1,46 @@ +{ + "bindings": { + "/actions/buggy": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + }, + "/actions/default": { + "chords": [], + "poses": [ + { + "output": "/actions/default/in/pose", + "path": "/user/hand/left/pose/raw" + }, + { + "output": "/actions/default/in/pose", + "path": "/user/hand/right/pose/raw" + } + ], + "haptics": [ + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/left/output/haptic" + }, + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/right/output/haptic" + } + ], + "sources": [], + "skeleton": [] + }, + "/actions/platformer": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + } + }, + "controller_type": "knuckles", + "description": "", + "name": "knuckles_default" +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_logitech_stylus.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_logitech_stylus.json new file mode 100644 index 0000000..0fabc23 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_logitech_stylus.json @@ -0,0 +1,46 @@ +{ + "bindings": { + "/actions/buggy": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + }, + "/actions/default": { + "chords": [], + "poses": [ + { + "output": "/actions/default/in/pose", + "path": "/user/hand/left/pose/raw" + }, + { + "output": "/actions/default/in/pose", + "path": "/user/hand/right/pose/raw" + } + ], + "haptics": [ + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/left/output/haptic" + }, + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/right/output/haptic" + } + ], + "sources": [], + "skeleton": [] + }, + "/actions/platformer": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + } + }, + "controller_type": "vive_controller", + "description": "", + "name": "vive_controller" +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_oculus_touch.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_oculus_touch.json new file mode 100644 index 0000000..6698c85 --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_oculus_touch.json @@ -0,0 +1,46 @@ +{ + "bindings": { + "/actions/buggy": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + }, + "/actions/default": { + "chords": [], + "poses": [ + { + "output": "/actions/default/in/pose", + "path": "/user/hand/left/pose/raw" + }, + { + "output": "/actions/default/in/pose", + "path": "/user/hand/right/pose/raw" + } + ], + "haptics": [ + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/left/output/haptic" + }, + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/right/output/haptic" + } + ], + "sources": [], + "skeleton": [] + }, + "/actions/platformer": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + } + }, + "controller_type": "oculus_touch", + "description": "", + "name": "oculus_touch" +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_vive_controller.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_vive_controller.json new file mode 100644 index 0000000..d4c3f4b --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_vive_controller.json @@ -0,0 +1,140 @@ +{ + "action_manifest_version" : 0, + "alias_info" : {}, + "app_key" : "application.generated.unity.virgis_geo.exe", + "bindings" : { + "/actions/buggy" : { + "chords" : [], + "haptics" : [], + "poses" : [], + "skeleton" : [], + "sources" : [] + }, + "/actions/default" : { + "chords" : [], + "haptics" : [ + { + "output" : "/actions/default/out/haptic", + "path" : "/user/hand/left/output/haptic" + }, + { + "output" : "/actions/default/out/haptic", + "path" : "/user/hand/right/output/haptic" + } + ], + "poses" : [ + { + "output" : "/actions/default/in/pose", + "path" : "/user/hand/left/pose/raw" + }, + { + "output" : "/actions/default/in/pose", + "path" : "/user/hand/right/pose/raw" + } + ], + "skeleton" : [], + "sources" : [ + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/leftgrip" + } + }, + "mode" : "button", + "path" : "/user/hand/left/input/grip" + }, + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/rightgrip" + } + }, + "mode" : "button", + "path" : "/user/hand/right/input/grip" + }, + { + "inputs" : { + "position" : { + "output" : "/actions/default/in/panzoom" + } + }, + "mode" : "trackpad", + "path" : "/user/hand/left/input/trackpad" + }, + { + "inputs" : { + "position" : { + "output" : "/actions/default/in/move" + } + }, + "mode" : "trackpad", + "path" : "/user/hand/right/input/trackpad" + }, + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/lefttrigger" + }, + "pull" : { + "output" : "/actions/default/in/lefttriggerpull" + } + }, + "mode" : "trigger", + "path" : "/user/hand/left/input/trigger" + }, + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/righttrigger" + }, + "pull" : { + "output" : "/actions/default/in/righttriggerpull" + } + }, + "mode" : "trigger", + "path" : "/user/hand/right/input/trigger" + }, + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/menu" + } + }, + "mode" : "button", + "path" : "/user/hand/left/input/application_menu" + }, + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/menu" + } + }, + "mode" : "button", + "path" : "/user/hand/left/input/system" + }, + { + "inputs" : { + "click" : { + "output" : "/actions/default/in/actionbutton" + } + }, + "mode" : "button", + "path" : "/user/hand/right/input/application_menu" + } + ] + }, + "/actions/platformer" : { + "chords" : [], + "haptics" : [], + "poses" : [], + "skeleton" : [], + "sources" : [] + } + }, + "category" : "steamvr_input", + "controller_type" : "vive_controller", + "description" : "", + "name" : "vive_controller", + "options" : {}, + "simulated_actions" : [] +} diff --git a/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_vive_cosmos_controller.json b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_vive_cosmos_controller.json new file mode 100644 index 0000000..d244b2e --- /dev/null +++ b/ViRGiS_Geo_Data/StreamingAssets/SteamVR/bindings_vive_cosmos_controller.json @@ -0,0 +1,46 @@ +{ + "bindings": { + "/actions/buggy": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + }, + "/actions/default": { + "chords": [], + "poses": [ + { + "output": "/actions/default/in/pose", + "path": "/user/hand/left/pose/raw" + }, + { + "output": "/actions/default/in/pose", + "path": "/user/hand/right/pose/raw" + } + ], + "haptics": [ + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/left/output/haptic" + }, + { + "output": "/actions/default/out/haptic", + "path": "/user/hand/right/output/haptic" + } + ], + "sources": [], + "skeleton": [] + }, + "/actions/platformer": { + "chords": [], + "poses": [], + "haptics": [], + "sources": [], + "skeleton": [] + } + }, + "controller_type": "vive_cosmos_controller", + "description": "", + "name": "vive_cosmos_controller" +} \ No newline at end of file diff --git a/ViRGiS_Geo_Data/globalgamemanagers b/ViRGiS_Geo_Data/globalgamemanagers index 2a5ce7a..37932e8 100644 Binary files a/ViRGiS_Geo_Data/globalgamemanagers and b/ViRGiS_Geo_Data/globalgamemanagers differ diff --git a/ViRGiS_Geo_Data/globalgamemanagers.assets b/ViRGiS_Geo_Data/globalgamemanagers.assets index caec607..e23b46c 100644 Binary files a/ViRGiS_Geo_Data/globalgamemanagers.assets and b/ViRGiS_Geo_Data/globalgamemanagers.assets differ diff --git a/ViRGiS_Geo_Data/level0 b/ViRGiS_Geo_Data/level0 index 9d89aad..a9628e8 100644 Binary files a/ViRGiS_Geo_Data/level0 and b/ViRGiS_Geo_Data/level0 differ diff --git a/ViRGiS_Geo_Data/resources.assets b/ViRGiS_Geo_Data/resources.assets index cbb3a27..2ac3ab0 100644 Binary files a/ViRGiS_Geo_Data/resources.assets and b/ViRGiS_Geo_Data/resources.assets differ diff --git a/ViRGiS_Geo_Data/sharedassets0.assets b/ViRGiS_Geo_Data/sharedassets0.assets index 7fa7c34..1f01fec 100644 Binary files a/ViRGiS_Geo_Data/sharedassets0.assets and b/ViRGiS_Geo_Data/sharedassets0.assets differ