Commit c6fc21c1 authored by Geovanny Vera's avatar Geovanny Vera

merge conflict

parents 1adaebb4 6e4fa96d
{
"name": "Default bindings for Gamepads",
"controller_type": "gamepad",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for MixedReality",
"controller_type": "holographic_controller",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "joystick",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabRight"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for Valve Index Headset",
"controller_type": "indexhmd",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for ValveIndex",
"controller_type": "knuckles",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "button",
"path": "/user/hand/right/input/a",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/right/input/thumbstick",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/a",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportLeft"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/left/input/thumbstick",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabRight"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/left/input/thumbstick",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/right/input/thumbstick",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for OculusTouch",
"controller_type": "oculus_touch",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "button",
"path": "/user/hand/right/input/a",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/x",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabRight"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/TriggerRight"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/TriggerLeft"
}
}
},
{
"mode": "button",
"path": "/user/hand/right/input/b",
"inputs":
{
"click":
{
"output": "/actions/main/in/ToggleKeyboard"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/application_menu",
"inputs":
{
"click":
{
"output": "/actions/main/in/ToggleMenu"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"click":
{
"output": "/actions/main/in/ShowUsers"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d"
}
}
},
{
"mode": "joystick",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for Rift Headset",
"controller_type": "rift",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": ""
}
\ No newline at end of file
{
"actions": [
{
"name": "/actions/main/in/controllerleft",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/controllerright",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special1",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special2",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special3",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special4",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special5",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special6",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special7",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/special8",
"type": "pose",
"requirement": "optional"
},
{
"name": "/actions/main/in/skeletonleft",
"type": "skeleton",
"skeleton": "/skeleton/hand/left",
"requirement": "optional"
},
{
"name": "/actions/main/in/skeletonright",
"type": "skeleton",
"skeleton": "/skeleton/hand/right",
"requirement": "optional"
},
{
"name": "/actions/main/out/vibrateleft",
"type": "vibration",
"requirement": "optional"
},
{
"name": "/actions/main/out/vibrateright",
"type": "vibration",
"requirement": "optional"
},
{
"name": "/actions/main/in/open_console",
"type": "boolean",
"requirement": "optional"
},
{
"name": "/actions/main/in/TeleportRight",
"type": "boolean"
},
{
"name": "/actions/main/in/TeleportLeft",
"type": "boolean"
},
{
"name": "/actions/main/in/GrabLeft",
"type": "boolean"
},
{
"name": "/actions/main/in/GrabRight",
"type": "boolean"
},
{
"name": "/actions/main/in/TriggerRight",
"type": "boolean"
},
{
"name": "/actions/main/in/TriggerLeft",
"type": "boolean"
},
{
"name": "/actions/main/in/Jump",
"type": "boolean"
},
{
"name": "/actions/main/in/ResetVR",
"type": "boolean"
},
{
"name": "/actions/main/in/ToggleKeyboard",
"type": "boolean"
},
{
"name": "/actions/main/in/ToggleMenu",
"type": "boolean"
},
{
"name": "/actions/main/in/ShowUsers",
"type": "boolean"
},
{
"name": "/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d",
"type": "vector2"
},
{
"name": "/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d",
"type": "vector2"
},
{
"name": "/actions/main/in/MoveRight axis",
"type": "vector1"
},
{
"name": "/actions/main/in/TurnRate axis",
"type": "vector1"
}
],
"action_sets": [
{
"name": "/actions/main",
"usage": "leftright"
}
],
"default_bindings": [
{
"controller_type": "knuckles",
"binding_url": "knuckles.json"
},
{
"controller_type": "vive_controller",
"binding_url": "vive_controller.json"
},
{
"controller_type": "vive_cosmos_controller",
"binding_url": "vive_cosmos_controller.json"
},
{
"controller_type": "oculus_touch",
"binding_url": "oculus_touch.json"
},
{
"controller_type": "holographic_controller",
"binding_url": "holographic_controller.json"
},
{
"controller_type": "indexhmd",
"binding_url": "indexhmd.json"
},
{
"controller_type": "vive",
"binding_url": "vive.json"
},
{
"controller_type": "vive_pro",
"binding_url": "vive_pro.json"
},
{
"controller_type": "rift",
"binding_url": "rift.json"
},
{
"controller_type": "vive_tracker_camera",
"binding_url": "vive_tracker_camera.json"
},
{
"controller_type": "gamepad",
"binding_url": "gamepad.json"
}
],
"localization": [
{
"language_tag": "en_us",
"/actions/main/in/controllerleft": "Left Controller [Pose]",
"/actions/main/in/controllerright": "Right Controller [Pose]",
"/actions/main/in/special1": "Special 1 [Tracker]",
"/actions/main/in/special2": "Special 2 [Tracker]",
"/actions/main/in/special3": "Special 3 [Tracker]",
"/actions/main/in/special4": "Special 4 [Tracker]",
"/actions/main/in/special5": "Special 5 [Tracker]",
"/actions/main/in/special6": "Special 6 [Tracker]",
"/actions/main/in/special7": "Special 7 [Tracker]",
"/actions/main/in/special8": "Special 8 [Tracker]",
"/actions/main/in/skeletonleft": "Skeleton (Left)",
"/actions/main/in/skeletonright": "Skeleton (Right)",
"/actions/main/out/vibrateleft": "Haptic (Left)",
"/actions/main/out/vibrateright": "Haptic (Right)",
"/actions/main/in/open_console": "Open Console",
"/actions/main/in/TeleportRight": "TeleportRight",
"/actions/main/in/TeleportLeft": "TeleportLeft",
"/actions/main/in/GrabLeft": "GrabLeft",
"/actions/main/in/GrabRight": "GrabRight",
"/actions/main/in/TriggerRight": "TriggerRight",
"/actions/main/in/TriggerLeft": "TriggerLeft",
"/actions/main/in/Jump": "Jump",
"/actions/main/in/ResetVR": "ResetVR",
"/actions/main/in/ToggleKeyboard": "ToggleKeyboard",
"/actions/main/in/ToggleMenu": "ToggleMenu",
"/actions/main/in/ShowUsers": "ShowUsers",
"/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d": "MotionControllerThumbLeft",
"/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d": "MotionControllerThumbRight",
"/actions/main/in/MoveRight axis": "MoveRight",
"/actions/main/in/TurnRate axis": "TurnRate",
"/actions/main": "Main Game Actions"
}
]
}
\ No newline at end of file
{
"name": "Default bindings for Vive Headset",
"controller_type": "vive",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for Vive",
"controller_type": "vive_controller",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "trackpad",
"path": "/user/hand/right/input/trackpad",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "trackpad",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabRight"
}
}
},
{
"mode": "trackpad",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d"
}
}
},
{
"mode": "trackpad",
"path": "/user/hand/right/input/trackpad",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/trackpad",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for Cosmos",
"controller_type": "vive_cosmos_controller",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/joystick",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for Vive Pro Headset",
"controller_type": "vive_pro",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": ""
}
\ No newline at end of file
{
"name": "Default bindings for Vive Trackers",
"controller_type": "vive_tracker_camera",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [
{
"mode": "trackpad",
"path": "/user/hand/right/input/trackpad",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportRight"
}
}
},
{
"mode": "trackpad",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"click":
{
"output": "/actions/main/in/TeleportLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabLeft"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/GrabRight"
}
}
},
{
"mode": "trackpad",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbLeft_X,MotionControllerThumbLeft_Y X Y_axis2d"
}
}
},
{
"mode": "trackpad",
"path": "/user/hand/right/input/trackpad",
"inputs":
{
"position":
{
"output": "/actions/main/in/MotionControllerThumbRight_X,MotionControllerThumbRight_Y X Y_axis2d"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/right/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "trigger",
"path": "/user/hand/left/input/trigger",
"inputs":
{
"click":
{
"output": "/actions/main/in/Jump"
}
}
},
{
"mode": "button",
"path": "/user/hand/left/input/grip",
"inputs":
{
"click":
{
"output": "/actions/main/in/ResetVR"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"value":
{
"output": ""
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/left/input/trackpad",
"inputs":
{
"value":
{
"output": "/actions/main/in/MoveRight axis"
}
}
},
{
"mode": "scalar_constant",
"path": "/user/hand/right/input/trackpad",
"inputs":
{
"value":
{
"output": "/actions/main/in/TurnRate axis"
}
}
}
],
"poses": [
{
"output": "/actions/main/in/special1",
"path": "/user/hand/left/pose/back",
"requirement": "optional"
},
{
"output": "/actions/main/in/special2",
"path": "/user/hand/right/pose/back",
"requirement": "optional"
},
{
"output": "/actions/main/in/special3",
"path": "/user/hand/left/pose/front",
"requirement": "optional"
},
{
"output": "/actions/main/in/special4",
"path": "/user/hand/right/pose/front",
"requirement": "optional"
},
{
"output": "/actions/main/in/special5",
"path": "/user/hand/left/pose/frontandrolled",
"requirement": "optional"
},
{
"output": "/actions/main/in/special6",
"path": "/user/hand/right/pose/frontandrolled",
"requirement": "optional"
},
{
"output": "/actions/main/in/special7",
"path": "/user/hand/left/pose/pistolgrip",
"requirement": "optional"
},
{
"output": "/actions/main/in/special8",
"path": "/user/hand/right/pose/pistolgrip",
"requirement": "optional"
}
]
}
},
"description": ""
}
\ No newline at end of file
{
"source": "UE",
"applications": [
{
"app_key": "application.generated.ue.vrclassroom-0.ue4editor.exe",
"launch_type": "url",
"url": "steam://launch/",
"action_manifest_path": "C:/Users/geova/OneDrive/Documents/Unreal Projects/VRClassroom/src/Config/SteamVRBindings/steamvr_manifest.json",
"strings":
{
"en_us":
{
"name": "VRClassroom-0 [UE Editor]"
}
}
}
]
}
\ No newline at end of file
const config = { const config = {
UE4_PATH: "C:\\UE4-oculus-4.25.4\\Engine\\Binaries\\Win64\\UE4Editor.exe", UE4_PATH: "C:\\VRClassroom-ue4\\Engine\\Binaries\\Win64\\UE4Editor.exe",
PROJECT_PATH: "C:\\Users\\geova\\OneDrive\\Documents\\Unreal Projects\\VRClassroom 4.25\\src\\VRClassroom.uproject", PROJECT_PATH: "C:\\Users\\geova\\OneDrive\\Documents\\Unreal Projects\\VRClassroom\\src\\VRClassroom.uproject",
} }
module.exports = config; module.exports = config;
\ No newline at end of file
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "HttpService.h" #include "HttpService.h"
#include "Runtime/Engine/Classes/Kismet/GameplayStatics.h" #include "Runtime/Engine/Classes/Kismet/GameplayStatics.h"
#include "VRCPlayerState.h" #include "VRCPlayerState.h"
#include "GameFramework/GameSession.h"
#include "VRCGameInstance.h" #include "VRCGameInstance.h"
AVRCGameMode::AVRCGameMode() { AVRCGameMode::AVRCGameMode() {
...@@ -49,6 +50,7 @@ FString AVRCGameMode::InitNewPlayer(APlayerController* NewPlayerController, cons ...@@ -49,6 +50,7 @@ FString AVRCGameMode::InitNewPlayer(APlayerController* NewPlayerController, cons
if (!SUserID.IsEmpty() && !SDisplayName.IsEmpty()) { if (!SUserID.IsEmpty() && !SDisplayName.IsEmpty()) {
NewPlayerState->UserID = FCString::Atoi(*SUserID); NewPlayerState->UserID = FCString::Atoi(*SUserID);
NewPlayerState->DisplayName = SDisplayName; NewPlayerState->DisplayName = SDisplayName;
UE_LOG(LogTemp, Warning, TEXT("UserID: %d, StringID: %s"), NewPlayerState->UserID, *SUserID);
} }
else { else {
NewPlayerState->UserID = 111; NewPlayerState->UserID = 111;
...@@ -60,6 +62,24 @@ FString AVRCGameMode::InitNewPlayer(APlayerController* NewPlayerController, cons ...@@ -60,6 +62,24 @@ FString AVRCGameMode::InitNewPlayer(APlayerController* NewPlayerController, cons
return retString; return retString;
} }
void AVRCGameMode::PreLogin(const FString& Options, const FString& Address, const FUniqueNetIdRepl& UniqueId, FString& ErrorMessage) {
/*if (!IsServer) {
const bool bUniqueIdCheckOk = (!UniqueId.IsValid() || (UniqueId.GetType() == UOnlineEngineInterface::Get()->GetDefaultOnlineSubsystemName()));
if (bUniqueIdCheckOk)
{
ErrorMessage = GameSession->ApproveLogin(Options);
}
else
{
ErrorMessage = TEXT("incompatible_unique_net_id");
}
}
else {
Super::PreLogin(Options, Address, UniqueId, ErrorMessage);
}*/
Super::PreLogin(Options, Address, UniqueId, ErrorMessage);
}
void AVRCGameMode::LoginSeverUser(FString UserName, FString Password) { void AVRCGameMode::LoginSeverUser(FString UserName, FString Password) {
if (Http == NULL) { if (Http == NULL) {
......
...@@ -36,8 +36,13 @@ public: ...@@ -36,8 +36,13 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "API") UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "API")
FString ServerToken; FString ServerToken;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "User")
bool IsServer;
AVRCGameMode(); AVRCGameMode();
virtual void PreLogin(const FString& Options, const FString& Address, const FUniqueNetIdRepl& UniqueId, FString& ErrorMessage) override;
UFUNCTION(BlueprintCallable, Category = "API") UFUNCTION(BlueprintCallable, Category = "API")
void LoginSeverUser(FString UserName, FString Password); void LoginSeverUser(FString UserName, FString Password);
......
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "{BEBB101A-4F07-73A2-8E7E-16AE3FB13F7D}", "EngineAssociation": "{0F24F38B-46CE-7010-39C3-1D8CF1BAD829}",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
"Enabled": true "Enabled": true
}, },
{ {
"Name": "ModelingToolsEditorMode", "Name": "OculusAudio",
"Enabled": true
},
{
"Name": "OculusAvatar",
"Enabled": true "Enabled": true
} }
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment