Skip to content
Snippets Groups Projects
Commit 686de2b1 authored by Herkenhoff Max's avatar Herkenhoff Max
Browse files

Dumped teleport movement

parent a45e34db
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Assets/SteamVR/InteractionSystem/Core/Prefabs/Player.prefab
+ 37
− 0
View file @ 686de2b1
......@@ -223,6 +223,8 @@ GameObject:
- component: {fileID: 11465950}
- component: {fileID: 5004103365690547399}
- component: {fileID: 6673289487469889140}
- component: {fileID: 7265208507108320156}
- component: {fileID: 5962141157040231414}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
......@@ -317,6 +319,41 @@ MonoBehaviour:
actionPath:
needsReinit: 0
ClimberHandle: {fileID: 6693927878167917549}
--- !u!114 &7265208507108320156
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 107946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f208cb0d51f8bbe469db6ac5a4cd2b91, type: 3}
m_Name:
m_EditorClassIdentifier:
JoystickInput:
actionPath: /actions/default/in/Touchpad
needsReinit: 0
PlayerSpeed: 1
PlayerGravity: 9.81
--- !u!143 &5962141157040231414
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 107946}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 1.5
m_Radius: 0.37
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0.75, z: 0}
--- !u!1 &109154
GameObject:
m_ObjectHideFlags: 0
......
Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs
+ 2
− 34
View file @ 686de2b1
......@@ -25,14 +25,6 @@ namespace Valve.VR
}
}
public virtual SteamVR_Action_Boolean Teleport
{
get
{
return SteamVR_Actions.default_Teleport;
}
}
public virtual SteamVR_Action_Boolean GrabPinch
{
get
......@@ -89,22 +81,6 @@ namespace Valve.VR
}
}
public virtual SteamVR_Action_Boolean SnapTurnLeft
{
get
{
return SteamVR_Actions.default_SnapTurnLeft;
}
}
public virtual SteamVR_Action_Boolean SnapTurnRight
{
get
{
return SteamVR_Actions.default_SnapTurnRight;
}
}
public virtual SteamVR_Action_Boolean ActivateMenu
{
get
......@@ -113,19 +89,11 @@ namespace Valve.VR
}
}
public virtual SteamVR_Action_Boolean Select
{
get
{
return SteamVR_Actions.default_Select;
}
}
public virtual SteamVR_Action_Vector2 MenuSelectionPosition
public virtual SteamVR_Action_Vector2 Touchpad
{
get
{
return SteamVR_Actions.default_MenuSelectionPosition;
return SteamVR_Actions.default_Touchpad;
}
}
......
Assets/SteamVR_Input/SteamVR_Input_Actions.cs
+ 8
− 68
View file @ 686de2b1
......@@ -19,8 +19,6 @@ namespace Valve.VR
private static SteamVR_Action_Boolean p_default_InteractUI;
private static SteamVR_Action_Boolean p_default_Teleport;
private static SteamVR_Action_Boolean p_default_GrabPinch;
private static SteamVR_Action_Boolean p_default_GrabGrip;
......@@ -35,15 +33,9 @@ namespace Valve.VR
private static SteamVR_Action_Boolean p_default_HeadsetOnHead;
private static SteamVR_Action_Boolean p_default_SnapTurnLeft;
private static SteamVR_Action_Boolean p_default_SnapTurnRight;
private static SteamVR_Action_Boolean p_default_ActivateMenu;
private static SteamVR_Action_Boolean p_default_Select;
private static SteamVR_Action_Vector2 p_default_MenuSelectionPosition;
private static SteamVR_Action_Vector2 p_default_Touchpad;
private static SteamVR_Action_Vibration p_default_Haptic;
......@@ -73,14 +65,6 @@ namespace Valve.VR
}
}
public static SteamVR_Action_Boolean default_Teleport
{
get
{
return SteamVR_Actions.p_default_Teleport.GetCopy<SteamVR_Action_Boolean>();
}
}
public static SteamVR_Action_Boolean default_GrabPinch
{
get
......@@ -137,22 +121,6 @@ namespace Valve.VR
}
}
public static SteamVR_Action_Boolean default_SnapTurnLeft
{
get
{
return SteamVR_Actions.p_default_SnapTurnLeft.GetCopy<SteamVR_Action_Boolean>();
}
}
public static SteamVR_Action_Boolean default_SnapTurnRight
{
get
{
return SteamVR_Actions.p_default_SnapTurnRight.GetCopy<SteamVR_Action_Boolean>();
}
}
public static SteamVR_Action_Boolean default_ActivateMenu
{
get
......@@ -161,19 +129,11 @@ namespace Valve.VR
}
}
public static SteamVR_Action_Boolean default_Select
{
get
{
return SteamVR_Actions.p_default_Select.GetCopy<SteamVR_Action_Boolean>();
}
}
public static SteamVR_Action_Vector2 default_MenuSelectionPosition
public static SteamVR_Action_Vector2 default_Touchpad
{
get
{
return SteamVR_Actions.p_default_MenuSelectionPosition.GetCopy<SteamVR_Action_Vector2>();
return SteamVR_Actions.p_default_Touchpad.GetCopy<SteamVR_Action_Vector2>();
}
}
......@@ -261,7 +221,6 @@ namespace Valve.VR
{
Valve.VR.SteamVR_Input.actions = new Valve.VR.SteamVR_Action[] {
SteamVR_Actions.default_InteractUI,
SteamVR_Actions.default_Teleport,
SteamVR_Actions.default_GrabPinch,
SteamVR_Actions.default_GrabGrip,
SteamVR_Actions.default_Pose,
......@@ -269,11 +228,8 @@ namespace Valve.VR
SteamVR_Actions.default_SkeletonRightHand,
SteamVR_Actions.default_Squeeze,
SteamVR_Actions.default_HeadsetOnHead,
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_ActivateMenu,
SteamVR_Actions.default_Select,
SteamVR_Actions.default_MenuSelectionPosition,
SteamVR_Actions.default_Touchpad,
SteamVR_Actions.default_Haptic,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.platformer_Jump,
......@@ -286,7 +242,6 @@ namespace Valve.VR
SteamVR_Actions.vR_Game_WieldedObjectInteract};
Valve.VR.SteamVR_Input.actionsIn = new Valve.VR.ISteamVR_Action_In[] {
SteamVR_Actions.default_InteractUI,
SteamVR_Actions.default_Teleport,
SteamVR_Actions.default_GrabPinch,
SteamVR_Actions.default_GrabGrip,
SteamVR_Actions.default_Pose,
......@@ -294,11 +249,8 @@ namespace Valve.VR
SteamVR_Actions.default_SkeletonRightHand,
SteamVR_Actions.default_Squeeze,
SteamVR_Actions.default_HeadsetOnHead,
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_ActivateMenu,
SteamVR_Actions.default_Select,
SteamVR_Actions.default_MenuSelectionPosition,
SteamVR_Actions.default_Touchpad,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.platformer_Jump,
SteamVR_Actions.buggy_Steering,
......@@ -317,14 +269,10 @@ namespace Valve.VR
SteamVR_Actions.mixedreality_ExternalCamera};
Valve.VR.SteamVR_Input.actionsBoolean = new Valve.VR.SteamVR_Action_Boolean[] {
SteamVR_Actions.default_InteractUI,
SteamVR_Actions.default_Teleport,
SteamVR_Actions.default_GrabPinch,
SteamVR_Actions.default_GrabGrip,
SteamVR_Actions.default_HeadsetOnHead,
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_ActivateMenu,
SteamVR_Actions.default_Select,
SteamVR_Actions.platformer_Jump,
SteamVR_Actions.buggy_Brake,
SteamVR_Actions.buggy_Reset,
......@@ -334,7 +282,7 @@ namespace Valve.VR
SteamVR_Actions.default_Squeeze,
SteamVR_Actions.buggy_Throttle};
Valve.VR.SteamVR_Input.actionsVector2 = new Valve.VR.SteamVR_Action_Vector2[] {
SteamVR_Actions.default_MenuSelectionPosition,
SteamVR_Actions.default_Touchpad,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.buggy_Steering};
Valve.VR.SteamVR_Input.actionsVector3 = new Valve.VR.SteamVR_Action_Vector3[0];
......@@ -343,16 +291,12 @@ namespace Valve.VR
SteamVR_Actions.default_SkeletonRightHand};
Valve.VR.SteamVR_Input.actionsNonPoseNonSkeletonIn = new Valve.VR.ISteamVR_Action_In[] {
SteamVR_Actions.default_InteractUI,
SteamVR_Actions.default_Teleport,
SteamVR_Actions.default_GrabPinch,
SteamVR_Actions.default_GrabGrip,
SteamVR_Actions.default_Squeeze,
SteamVR_Actions.default_HeadsetOnHead,
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_ActivateMenu,
SteamVR_Actions.default_Select,
SteamVR_Actions.default_MenuSelectionPosition,
SteamVR_Actions.default_Touchpad,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.platformer_Jump,
SteamVR_Actions.buggy_Steering,
......@@ -366,7 +310,6 @@ namespace Valve.VR
private static void PreInitActions()
{
SteamVR_Actions.p_default_InteractUI = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/InteractUI")));
SteamVR_Actions.p_default_Teleport = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/Teleport")));
SteamVR_Actions.p_default_GrabPinch = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/GrabPinch")));
SteamVR_Actions.p_default_GrabGrip = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/GrabGrip")));
SteamVR_Actions.p_default_Pose = ((SteamVR_Action_Pose)(SteamVR_Action.Create<SteamVR_Action_Pose>("/actions/default/in/Pose")));
......@@ -374,11 +317,8 @@ namespace Valve.VR
SteamVR_Actions.p_default_SkeletonRightHand = ((SteamVR_Action_Skeleton)(SteamVR_Action.Create<SteamVR_Action_Skeleton>("/actions/default/in/SkeletonRightHand")));
SteamVR_Actions.p_default_Squeeze = ((SteamVR_Action_Single)(SteamVR_Action.Create<SteamVR_Action_Single>("/actions/default/in/Squeeze")));
SteamVR_Actions.p_default_HeadsetOnHead = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/HeadsetOnHead")));
SteamVR_Actions.p_default_SnapTurnLeft = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/SnapTurnLeft")));
SteamVR_Actions.p_default_SnapTurnRight = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/SnapTurnRight")));
SteamVR_Actions.p_default_ActivateMenu = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/ActivateMenu")));
SteamVR_Actions.p_default_Select = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/Select")));
SteamVR_Actions.p_default_MenuSelectionPosition = ((SteamVR_Action_Vector2)(SteamVR_Action.Create<SteamVR_Action_Vector2>("/actions/default/in/MenuSelectionPosition")));
SteamVR_Actions.p_default_Touchpad = ((SteamVR_Action_Vector2)(SteamVR_Action.Create<SteamVR_Action_Vector2>("/actions/default/in/Touchpad")));
SteamVR_Actions.p_default_Haptic = ((SteamVR_Action_Vibration)(SteamVR_Action.Create<SteamVR_Action_Vibration>("/actions/default/out/Haptic")));
SteamVR_Actions.p_platformer_Move = ((SteamVR_Action_Vector2)(SteamVR_Action.Create<SteamVR_Action_Vector2>("/actions/platformer/in/Move")));
SteamVR_Actions.p_platformer_Jump = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/platformer/in/Jump")));
......
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