Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RhythmKata
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
13정준영
RhythmKata
Commits
f9ff22e4
Commit
f9ff22e4
authored
Nov 10, 2019
by
13정준영
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix resource issue
parent
674ce48d
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
42 additions
and
1493 deletions
+42
-1493
FairyMeteorSpell.prefab
...sets/PinwheelFantasyEffect/Prefab/FairyMeteorSpell.prefab
+0
-0
Demo.unity
RhythmKata/Assets/PinwheelFantasyEffect/Scene/Demo.unity
+0
-0
Precision Strike.bms
RhythmKata/Assets/Resources/Level/Precision Strike.bms
+26
-26
Tunnel.blend
RhythmKata/Assets/Resources/Models/Tunnel.blend
+0
-0
Tunnel.blend1
RhythmKata/Assets/Resources/Models/Tunnel.blend1
+0
-0
mergescene.unity
RhythmKata/Assets/Scenes/mergescene.unity
+13
-13
Player.meta
RhythmKata/Assets/Scripts/Player.meta
+0
-8
InputTest.cs
RhythmKata/Assets/Scripts/Player/InputTest.cs
+0
-35
InputTest.cs.meta
RhythmKata/Assets/Scripts/Player/InputTest.cs.meta
+0
-11
PlayerInput.inputactions
RhythmKata/Assets/Scripts/Player/PlayerInput.inputactions
+0
-533
PlayerInput.inputactions.meta
...mKata/Assets/Scripts/Player/PlayerInput.inputactions.meta
+0
-14
PlayerInputAction.cs
RhythmKata/Assets/Scripts/Player/PlayerInputAction.cs
+0
-838
PlayerInputAction.cs.meta
RhythmKata/Assets/Scripts/Player/PlayerInputAction.cs.meta
+0
-11
manifest.json
RhythmKata/Packages/manifest.json
+0
-1
ProjectSettings.asset
RhythmKata/ProjectSettings/ProjectSettings.asset
+2
-2
unityProject.vrmanifest
RhythmKata/unityProject.vrmanifest
+1
-1
No files found.
RhythmKata/Assets/PinwheelFantasyEffect/Prefab/FairyMeteorSpell.prefab
View file @
f9ff22e4
No preview for this file type
RhythmKata/Assets/PinwheelFantasyEffect/Scene/Demo.unity
View file @
f9ff22e4
No preview for this file type
RhythmKata/Assets/Resources/Level/Precision Strike.bms
View file @
f9ff22e4
...
...
@@ -127,28 +127,28 @@
#04011:001T000000000000
#04012:0000001T001T0000
#04113:
1T
#04114:
1T
#04113:
E1
#04114:
E3
#04513:
1T0000000000001T
#04514:
1T0000000000001T
#04513:
E1000000000000E1
#04514:
E3000000000000E3
#04613:
1T0000000000001T
#04614:
1T0000000000001T
#04613:
E1000000000000E1
#04614:
E3000000000000E3
#04713:
1T1T
#04714:
1T1T
#04713:
E1E1
#04714:
E3E3
#04811:1T00001T00001T00
#04812:0000001T00000000001T000000000000
#04911:001T0000
#04912:00001T1T
#04913:
1T
#04914:
1T
#04913:
E1
#04914:
E3
#05011:1T1T0000
#05012:00001T1T
...
...
@@ -161,27 +161,27 @@
#05311:00000000000000E00000000000000000
#05312:000000E000000000000000E000000000
#05313:E
0
#05314:E
0
#05313:E
1
#05314:E
3
#05411:0002
#05412:00020002
#05413:
02
#05414:
02
#05413:
E1
#05414:
E3
#05513:
02
#05514:
02
#05513:
E1
#05514:
E3
#05613:
0202
#05614:
0202
#05613:
E1E1
#05614:
E3E3
#05711:02020000
#05712:00000202
#05811:0002001T
#05812:001T0000
#05813:
02
#05814:
02
#05813:
E1
#05814:
E3
#05911:00020200
#05912:001T0002
...
...
@@ -194,8 +194,8 @@
#06211:001T
#06212:0000021T
#06213:00
02
0000
#06214:00
02
0000
#06213:00
E1
0000
#06214:00
E3
0000
#06311:0002001T
#06312:00020200
...
...
@@ -208,8 +208,8 @@
#06611:0002001T
#06612:001T0000
#06613:
02
#06614:
02
#06613:
E1
#06614:
E3
#06711:00020200
#06712:001T0002
...
...
@@ -233,7 +233,7 @@
#07312:000200020002001T
#07411:02
#07413:00
02
0000
#07414:00
02
0000
#07413:00
E1
0000
#07414:00
E3
0000
RhythmKata/Assets/Resources/Models/Tunnel.blend
View file @
f9ff22e4
No preview for this file type
RhythmKata/Assets/Resources/Models/Tunnel.blend1
View file @
f9ff22e4
No preview for this file type
RhythmKata/Assets/Scenes/mergescene.unity
View file @
f9ff22e4
...
...
@@ -145,7 +145,7 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
value
:
-52.3
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
...
...
@@ -170,7 +170,7 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
4
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
...
...
@@ -190,12 +190,12 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_LocalScale.y
value
:
9
value
:
18
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_LocalScale.z
value
:
9
value
:
18
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-1504981713932161579
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
...
...
@@ -229,7 +229,7 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
value
:
-52.3
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
...
...
@@ -254,7 +254,7 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
5
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
...
...
@@ -274,12 +274,12 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_LocalScale.y
value
:
1
0
value
:
2
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
propertyPath
:
m_LocalScale.z
value
:
1
0
value
:
2
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-1504981713932161579
,
guid
:
183d1d3e655e0294c8f38c5b687642a8
,
type
:
3
}
...
...
@@ -380,7 +380,7 @@ RectTransform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
1
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
0
,
y
:
0
}
...
...
@@ -437,7 +437,7 @@ Transform:
m_Children
:
-
{
fileID
:
571765379
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
2
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&1011486258
GameObject
:
...
...
@@ -490,7 +490,7 @@ Transform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
3
m_RootOrder
:
5
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!82
&1011486261
AudioSource
:
...
...
@@ -677,7 +677,7 @@ Transform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
50
,
y
:
-30
,
z
:
0
}
---
!u!1001
&1988354649
PrefabInstance
:
...
...
@@ -720,7 +720,7 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
447954
,
guid
:
dc06161b6d97feb419f45f03b62e14b9
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
1
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
447954
,
guid
:
dc06161b6d97feb419f45f03b62e14b9
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
...
...
RhythmKata/Assets/Scripts/Player.meta
deleted
100644 → 0
View file @
674ce48d
fileFormatVersion: 2
guid: 4bbed903ec8094646b9fc8fb67cd6ec4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
RhythmKata/Assets/Scripts/Player/InputTest.cs
deleted
100644 → 0
View file @
674ce48d
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
using
UnityEngine.InputSystem
;
using
Valve.VR
;
public
class
InputTest
:
MonoBehaviour
{
// a reference to the action
public
SteamVR_Action_Boolean
fire
;
// a reference to the hand
public
SteamVR_Input_Sources
handType
;
public
void
Awake
()
{
fire
.
AddOnStateDownListener
(
OnFireL
,
handType
);
}
public
void
Update
()
{
//for (int i = 0; i < 10000000; i++)
//{
//}
}
public
void
OnFireL
(
SteamVR_Action_Boolean
fromAction
,
SteamVR_Input_Sources
fromSource
)
{
Debug
.
Log
(
string
.
Format
(
"current: {0}\t input: {1}\t rotation:{2}"
,
fromAction
.
changedTime
,
Time
.
time
,
0
));
}
public
void
OnFireR
(
InputAction
.
CallbackContext
context
)
{
}
}
RhythmKata/Assets/Scripts/Player/InputTest.cs.meta
deleted
100644 → 0
View file @
674ce48d
fileFormatVersion: 2
guid: bd75949c0d23a6c4991b02822234669d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
RhythmKata/Assets/Scripts/Player/PlayerInput.inputactions
deleted
100644 → 0
View file @
674ce48d
{
"name": "PlayerInput",
"maps": [
{
"name": "Player",
"id": "4d2c4dbc-fc03-4738-8c83-3e3b367db3b9",
"actions": [
{
"name": "Look",
"type": "Value",
"id": "c5e0f6bc-1c9b-401b-8f5c-17c2b581af1f",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "FireL",
"type": "Button",
"id": "830d81e2-f9fa-4ec7-a648-eb37553e133f",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "FireR",
"type": "Button",
"id": "ac8927d8-7ed1-414e-abd6-5272c0b2e71a",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "MoveL",
"type": "Button",
"id": "1d9c9642-9b4a-4cc2-9276-d1fcd33d4280",
"expectedControlType": "",
"processors": "",
"interactions": ""
}
],
"bindings": [
{
"name": "",
"id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8c8e490b-c610-4785-884f-f04217b23ca4",
"path": "<Pointer>/delta",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse;Touch",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "05f6913d-c316-48b2-a6bb-e225f14c7960",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "FireL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5be3cda1-32cb-477a-a4b3-72d883e8de1d",
"path": "<XRController>{LeftHand}/primaryButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "FireL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d24b8912-488b-49d7-8eaa-7430c2ffa4e1",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "FireR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8c20d3e6-1b83-480c-8a3f-76dbca2620bc",
"path": "<OculusTouchController>/primaryButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "FireR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "30b227dd-6ad0-4241-b607-d6c52c05e58b",
"path": "",
"interactions": "",
"processors": "",
"groups": "",
"action": "MoveL",
"isComposite": false,
"isPartOfComposite": false
}
]
},
{
"name": "UI",
"id": "19beb5ae-13d3-4bb6-b9fd-2d5d4a3bdf4b",
"actions": [
{
"name": "Navigate",
"type": "Value",
"id": "9e3977ef-f031-49b1-8cf1-96a8b51e844f",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Submit",
"type": "Button",
"id": "a3cc0a80-ee8e-4cd9-aa0b-2f5ebcf57bd4",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Cancel",
"type": "Button",
"id": "b8139640-f045-4aa5-bc19-95264db8d644",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Point",
"type": "PassThrough",
"id": "69159df9-57b0-490a-8fc3-fe2990210504",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Click",
"type": "PassThrough",
"id": "14230421-c3a8-4dae-92f0-0b618e3fad2c",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "ScrollWheel",
"type": "PassThrough",
"id": "4649979b-9fad-4716-be66-8c5489e6a3e8",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "MiddleClick",
"type": "PassThrough",
"id": "d292c5ea-210d-4343-a114-d9696c13521d",
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "RightClick",
"type": "PassThrough",
"id": "2ec6e1ac-6a61-46fe-ad04-32ffa7a42dd9",
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "TrackedDevicePosition",
"type": "PassThrough",
"id": "6a53a526-0826-4350-9e9a-e58cd31c0209",
"expectedControlType": "Vector3",
"processors": "",
"interactions": ""
},
{
"name": "TrackedDeviceOrientation",
"type": "PassThrough",
"id": "af55d656-81a4-4dac-9129-285dc4375ef7",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": ""
},
{
"name": "TrackedDeviceSelect",
"type": "PassThrough",
"id": "a5453d71-7626-439e-b216-ebd4f9584d72",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
}
],
"bindings": [
{
"name": "Stick",
"id": "809f371f-c5e2-4e7a-83a1-d867598f40dd",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Navigate",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf",
"path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "2db08d65-c5fb-421b-983f-c71163608d67",
"path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "8ba04515-75aa-45de-966d-393d9bbd1c14",
"path": "<Gamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "fcd248ae-a788-4676-a12e-f4d81205600b",
"path": "<Gamepad>/leftStick/right",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90",
"path": "<Gamepad>/dpad",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "Stick",
"id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Navigate",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "3db53b26-6601-41be-9887-63ac74e79d19",
"path": "<Joystick>/stick/up",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f",
"path": "<Joystick>/stick/down",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "0392d399-f6dd-4c82-8062-c1e9c0d34835",
"path": "<Joystick>/stick/left",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc",
"path": "<Joystick>/stick/right",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc",
"path": "*/{Submit}",
"interactions": "",
"processors": "",
"groups": "",
"action": "Submit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "82627dcc-3b13-4ba9-841d-e4b746d6553e",
"path": "*/{Cancel}",
"interactions": "",
"processors": "",
"groups": "",
"action": "Cancel",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86",
"path": "<Pointer>/position",
"interactions": "",
"processors": "",
"groups": "",
"action": "Point",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5693e57a-238a-46ed-b5ae-e64e6e574302",
"path": "<Touchscreen>/touch*/position",
"interactions": "",
"processors": "",
"groups": "",
"action": "Point",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace",
"path": "<Pen>/tip",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "47c2a644-3ebc-4dae-a106-589b7ca75b59",
"path": "<Touchscreen>/touch*/press",
"interactions": "",
"processors": "",
"groups": "",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "38c99815-14ea-4617-8627-164d27641299",
"path": "<Mouse>/scroll",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "ScrollWheel",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "24066f69-da47-44f3-a07e-0015fb02eb2e",
"path": "<Mouse>/middleButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "MiddleClick",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4c191405-5738-4d4b-a523-c6a301dbf754",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "RightClick",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77",
"path": "<XRController>/devicePosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "TrackedDevicePosition",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "23e01e3a-f935-4948-8d8b-9bcac77714fb",
"path": "<XRController>/deviceRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "TrackedDeviceOrientation",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "932fe797-a0a9-4eef-bd2d-556b362e08d0",
"path": "<XRController>/trigger",
"interactions": "",
"processors": "",
"groups": "",
"action": "TrackedDeviceSelect",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
{
"name": "Keyboard&Mouse",
"bindingGroup": "Keyboard&Mouse",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Touch",
"bindingGroup": "Touch",
"devices": [
{
"devicePath": "<Touchscreen>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Joystick",
"bindingGroup": "Joystick",
"devices": [
{
"devicePath": "<Joystick>",
"isOptional": false,
"isOR": false
}
]
}
]
}
\ No newline at end of file
RhythmKata/Assets/Scripts/Player/PlayerInput.inputactions.meta
deleted
100644 → 0
View file @
674ce48d
fileFormatVersion: 2
guid: 3166109119d3a7a42bbdb7e5dd15df4c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 1
wrapperCodePath: Assets/Scripts/Player/PlayerInputAction.cs
wrapperClassName: PlayerInputAction
wrapperCodeNamespace:
RhythmKata/Assets/Scripts/Player/PlayerInputAction.cs
deleted
100644 → 0
View file @
674ce48d
// GENERATED AUTOMATICALLY FROM 'Assets/Scripts/Player/PlayerInput.inputactions'
using
System
;
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine.InputSystem
;
using
UnityEngine.InputSystem.Utilities
;
public
class
PlayerInputAction
:
IInputActionCollection
,
IDisposable
{
private
InputActionAsset
asset
;
public
PlayerInputAction
()
{
asset
=
InputActionAsset
.
FromJson
(
@"{
""name"": ""PlayerInput"",
""maps"": [
{
""name"": ""Player"",
""id"": ""4d2c4dbc-fc03-4738-8c83-3e3b367db3b9"",
""actions"": [
{
""name"": ""Look"",
""type"": ""Value"",
""id"": ""c5e0f6bc-1c9b-401b-8f5c-17c2b581af1f"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""FireL"",
""type"": ""Button"",
""id"": ""830d81e2-f9fa-4ec7-a648-eb37553e133f"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""FireR"",
""type"": ""Button"",
""id"": ""ac8927d8-7ed1-414e-abd6-5272c0b2e71a"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""MoveL"",
""type"": ""Button"",
""id"": ""1d9c9642-9b4a-4cc2-9276-d1fcd33d4280"",
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
}
],
""bindings"": [
{
""name"": """",
""id"": ""c1f7a91b-d0fd-4a62-997e-7fb9b69bf235"",
""path"": ""<Gamepad>/rightStick"",
""interactions"": """",
""processors"": """",
""groups"": "";Gamepad"",
""action"": ""Look"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""8c8e490b-c610-4785-884f-f04217b23ca4"",
""path"": ""<Pointer>/delta"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse;Touch"",
""action"": ""Look"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""05f6913d-c316-48b2-a6bb-e225f14c7960"",
""path"": ""<Mouse>/leftButton"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""FireL"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""5be3cda1-32cb-477a-a4b3-72d883e8de1d"",
""path"": ""<XRController>{LeftHand}/primaryButton"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""FireL"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""d24b8912-488b-49d7-8eaa-7430c2ffa4e1"",
""path"": ""<Mouse>/rightButton"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""FireR"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""8c20d3e6-1b83-480c-8a3f-76dbca2620bc"",
""path"": ""<OculusTouchController>/primaryButton"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""FireR"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""30b227dd-6ad0-4241-b607-d6c52c05e58b"",
""path"": """",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""MoveL"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
{
""name"": ""UI"",
""id"": ""19beb5ae-13d3-4bb6-b9fd-2d5d4a3bdf4b"",
""actions"": [
{
""name"": ""Navigate"",
""type"": ""Value"",
""id"": ""9e3977ef-f031-49b1-8cf1-96a8b51e844f"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""Submit"",
""type"": ""Button"",
""id"": ""a3cc0a80-ee8e-4cd9-aa0b-2f5ebcf57bd4"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""Cancel"",
""type"": ""Button"",
""id"": ""b8139640-f045-4aa5-bc19-95264db8d644"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""Point"",
""type"": ""PassThrough"",
""id"": ""69159df9-57b0-490a-8fc3-fe2990210504"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""Click"",
""type"": ""PassThrough"",
""id"": ""14230421-c3a8-4dae-92f0-0b618e3fad2c"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""ScrollWheel"",
""type"": ""PassThrough"",
""id"": ""4649979b-9fad-4716-be66-8c5489e6a3e8"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""MiddleClick"",
""type"": ""PassThrough"",
""id"": ""d292c5ea-210d-4343-a114-d9696c13521d"",
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
},
{
""name"": ""RightClick"",
""type"": ""PassThrough"",
""id"": ""2ec6e1ac-6a61-46fe-ad04-32ffa7a42dd9"",
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
},
{
""name"": ""TrackedDevicePosition"",
""type"": ""PassThrough"",
""id"": ""6a53a526-0826-4350-9e9a-e58cd31c0209"",
""expectedControlType"": ""Vector3"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""TrackedDeviceOrientation"",
""type"": ""PassThrough"",
""id"": ""af55d656-81a4-4dac-9129-285dc4375ef7"",
""expectedControlType"": ""Quaternion"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""TrackedDeviceSelect"",
""type"": ""PassThrough"",
""id"": ""a5453d71-7626-439e-b216-ebd4f9584d72"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
}
],
""bindings"": [
{
""name"": ""Stick"",
""id"": ""809f371f-c5e2-4e7a-83a1-d867598f40dd"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Navigate"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf"",
""path"": ""<Gamepad>/leftStick/up"",
""interactions"": """",
""processors"": """",
""groups"": "";Gamepad"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""2db08d65-c5fb-421b-983f-c71163608d67"",
""path"": ""<Gamepad>/leftStick/down"",
""interactions"": """",
""processors"": """",
""groups"": "";Gamepad"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""8ba04515-75aa-45de-966d-393d9bbd1c14"",
""path"": ""<Gamepad>/leftStick/left"",
""interactions"": """",
""processors"": """",
""groups"": "";Gamepad"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""fcd248ae-a788-4676-a12e-f4d81205600b"",
""path"": ""<Gamepad>/leftStick/right"",
""interactions"": """",
""processors"": """",
""groups"": "";Gamepad"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": """",
""id"": ""fb8277d4-c5cd-4663-9dc7-ee3f0b506d90"",
""path"": ""<Gamepad>/dpad"",
""interactions"": """",
""processors"": """",
""groups"": "";Gamepad"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": ""Stick"",
""id"": ""e25d9774-381c-4a61-b47c-7b6b299ad9f9"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Navigate"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""3db53b26-6601-41be-9887-63ac74e79d19"",
""path"": ""<Joystick>/stick/up"",
""interactions"": """",
""processors"": """",
""groups"": ""Joystick"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""0cb3e13e-3d90-4178-8ae6-d9c5501d653f"",
""path"": ""<Joystick>/stick/down"",
""interactions"": """",
""processors"": """",
""groups"": ""Joystick"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""0392d399-f6dd-4c82-8062-c1e9c0d34835"",
""path"": ""<Joystick>/stick/left"",
""interactions"": """",
""processors"": """",
""groups"": ""Joystick"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""942a66d9-d42f-43d6-8d70-ecb4ba5363bc"",
""path"": ""<Joystick>/stick/right"",
""interactions"": """",
""processors"": """",
""groups"": ""Joystick"",
""action"": ""Navigate"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": """",
""id"": ""9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc"",
""path"": ""*/{Submit}"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Submit"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""82627dcc-3b13-4ba9-841d-e4b746d6553e"",
""path"": ""*/{Cancel}"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Cancel"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""c52c8e0b-8179-41d3-b8a1-d149033bbe86"",
""path"": ""<Pointer>/position"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Point"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""5693e57a-238a-46ed-b5ae-e64e6e574302"",
""path"": ""<Touchscreen>/touch*/position"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Point"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""4faf7dc9-b979-4210-aa8c-e808e1ef89f5"",
""path"": ""<Mouse>/leftButton"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""Click"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""8d66d5ba-88d7-48e6-b1cd-198bbfef7ace"",
""path"": ""<Pen>/tip"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""Click"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""47c2a644-3ebc-4dae-a106-589b7ca75b59"",
""path"": ""<Touchscreen>/touch*/press"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Click"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""38c99815-14ea-4617-8627-164d27641299"",
""path"": ""<Mouse>/scroll"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""ScrollWheel"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""24066f69-da47-44f3-a07e-0015fb02eb2e"",
""path"": ""<Mouse>/middleButton"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""MiddleClick"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""4c191405-5738-4d4b-a523-c6a301dbf754"",
""path"": ""<Mouse>/rightButton"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""RightClick"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77"",
""path"": ""<XRController>/devicePosition"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""TrackedDevicePosition"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""23e01e3a-f935-4948-8d8b-9bcac77714fb"",
""path"": ""<XRController>/deviceRotation"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""TrackedDeviceOrientation"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""932fe797-a0a9-4eef-bd2d-556b362e08d0"",
""path"": ""<XRController>/trigger"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""TrackedDeviceSelect"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
}
],
""controlSchemes"": [
{
""name"": ""Keyboard&Mouse"",
""bindingGroup"": ""Keyboard&Mouse"",
""devices"": [
{
""devicePath"": ""<Keyboard>"",
""isOptional"": false,
""isOR"": false
},
{
""devicePath"": ""<Mouse>"",
""isOptional"": false,
""isOR"": false
}
]
},
{
""name"": ""Gamepad"",
""bindingGroup"": ""Gamepad"",
""devices"": [
{
""devicePath"": ""<Gamepad>"",
""isOptional"": false,
""isOR"": false
}
]
},
{
""name"": ""Touch"",
""bindingGroup"": ""Touch"",
""devices"": [
{
""devicePath"": ""<Touchscreen>"",
""isOptional"": false,
""isOR"": false
}
]
},
{
""name"": ""Joystick"",
""bindingGroup"": ""Joystick"",
""devices"": [
{
""devicePath"": ""<Joystick>"",
""isOptional"": false,
""isOR"": false
}
]
}
]
}"
);
// Player
m_Player
=
asset
.
FindActionMap
(
"Player"
,
throwIfNotFound
:
true
);
m_Player_Look
=
m_Player
.
FindAction
(
"Look"
,
throwIfNotFound
:
true
);
m_Player_FireL
=
m_Player
.
FindAction
(
"FireL"
,
throwIfNotFound
:
true
);
m_Player_FireR
=
m_Player
.
FindAction
(
"FireR"
,
throwIfNotFound
:
true
);
m_Player_MoveL
=
m_Player
.
FindAction
(
"MoveL"
,
throwIfNotFound
:
true
);
// UI
m_UI
=
asset
.
FindActionMap
(
"UI"
,
throwIfNotFound
:
true
);
m_UI_Navigate
=
m_UI
.
FindAction
(
"Navigate"
,
throwIfNotFound
:
true
);
m_UI_Submit
=
m_UI
.
FindAction
(
"Submit"
,
throwIfNotFound
:
true
);
m_UI_Cancel
=
m_UI
.
FindAction
(
"Cancel"
,
throwIfNotFound
:
true
);
m_UI_Point
=
m_UI
.
FindAction
(
"Point"
,
throwIfNotFound
:
true
);
m_UI_Click
=
m_UI
.
FindAction
(
"Click"
,
throwIfNotFound
:
true
);
m_UI_ScrollWheel
=
m_UI
.
FindAction
(
"ScrollWheel"
,
throwIfNotFound
:
true
);
m_UI_MiddleClick
=
m_UI
.
FindAction
(
"MiddleClick"
,
throwIfNotFound
:
true
);
m_UI_RightClick
=
m_UI
.
FindAction
(
"RightClick"
,
throwIfNotFound
:
true
);
m_UI_TrackedDevicePosition
=
m_UI
.
FindAction
(
"TrackedDevicePosition"
,
throwIfNotFound
:
true
);
m_UI_TrackedDeviceOrientation
=
m_UI
.
FindAction
(
"TrackedDeviceOrientation"
,
throwIfNotFound
:
true
);
m_UI_TrackedDeviceSelect
=
m_UI
.
FindAction
(
"TrackedDeviceSelect"
,
throwIfNotFound
:
true
);
}
public
void
Dispose
()
{
UnityEngine
.
Object
.
Destroy
(
asset
);
}
public
InputBinding
?
bindingMask
{
get
=>
asset
.
bindingMask
;
set
=>
asset
.
bindingMask
=
value
;
}
public
ReadOnlyArray
<
InputDevice
>?
devices
{
get
=>
asset
.
devices
;
set
=>
asset
.
devices
=
value
;
}
public
ReadOnlyArray
<
InputControlScheme
>
controlSchemes
=>
asset
.
controlSchemes
;
public
bool
Contains
(
InputAction
action
)
{
return
asset
.
Contains
(
action
);
}
public
IEnumerator
<
InputAction
>
GetEnumerator
()
{
return
asset
.
GetEnumerator
();
}
IEnumerator
IEnumerable
.
GetEnumerator
()
{
return
GetEnumerator
();
}
public
void
Enable
()
{
asset
.
Enable
();
}
public
void
Disable
()
{
asset
.
Disable
();
}
// Player
private
readonly
InputActionMap
m_Player
;
private
IPlayerActions
m_PlayerActionsCallbackInterface
;
private
readonly
InputAction
m_Player_Look
;
private
readonly
InputAction
m_Player_FireL
;
private
readonly
InputAction
m_Player_FireR
;
private
readonly
InputAction
m_Player_MoveL
;
public
struct
PlayerActions
{
private
PlayerInputAction
m_Wrapper
;
public
PlayerActions
(
PlayerInputAction
wrapper
)
{
m_Wrapper
=
wrapper
;
}
public
InputAction
@Look
=>
m_Wrapper
.
m_Player_Look
;
public
InputAction
@FireL
=>
m_Wrapper
.
m_Player_FireL
;
public
InputAction
@FireR
=>
m_Wrapper
.
m_Player_FireR
;
public
InputAction
@MoveL
=>
m_Wrapper
.
m_Player_MoveL
;
public
InputActionMap
Get
()
{
return
m_Wrapper
.
m_Player
;
}
public
void
Enable
()
{
Get
().
Enable
();
}
public
void
Disable
()
{
Get
().
Disable
();
}
public
bool
enabled
=>
Get
().
enabled
;
public
static
implicit
operator
InputActionMap
(
PlayerActions
set
)
{
return
set
.
Get
();
}
public
void
SetCallbacks
(
IPlayerActions
instance
)
{
if
(
m_Wrapper
.
m_PlayerActionsCallbackInterface
!=
null
)
{
Look
.
started
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnLook
;
Look
.
performed
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnLook
;
Look
.
canceled
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnLook
;
FireL
.
started
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnFireL
;
FireL
.
performed
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnFireL
;
FireL
.
canceled
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnFireL
;
FireR
.
started
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnFireR
;
FireR
.
performed
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnFireR
;
FireR
.
canceled
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnFireR
;
MoveL
.
started
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnMoveL
;
MoveL
.
performed
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnMoveL
;
MoveL
.
canceled
-=
m_Wrapper
.
m_PlayerActionsCallbackInterface
.
OnMoveL
;
}
m_Wrapper
.
m_PlayerActionsCallbackInterface
=
instance
;
if
(
instance
!=
null
)
{
Look
.
started
+=
instance
.
OnLook
;
Look
.
performed
+=
instance
.
OnLook
;
Look
.
canceled
+=
instance
.
OnLook
;
FireL
.
started
+=
instance
.
OnFireL
;
FireL
.
performed
+=
instance
.
OnFireL
;
FireL
.
canceled
+=
instance
.
OnFireL
;
FireR
.
started
+=
instance
.
OnFireR
;
FireR
.
performed
+=
instance
.
OnFireR
;
FireR
.
canceled
+=
instance
.
OnFireR
;
MoveL
.
started
+=
instance
.
OnMoveL
;
MoveL
.
performed
+=
instance
.
OnMoveL
;
MoveL
.
canceled
+=
instance
.
OnMoveL
;
}
}
}
public
PlayerActions
@Player
=>
new
PlayerActions
(
this
);
// UI
private
readonly
InputActionMap
m_UI
;
private
IUIActions
m_UIActionsCallbackInterface
;
private
readonly
InputAction
m_UI_Navigate
;
private
readonly
InputAction
m_UI_Submit
;
private
readonly
InputAction
m_UI_Cancel
;
private
readonly
InputAction
m_UI_Point
;
private
readonly
InputAction
m_UI_Click
;
private
readonly
InputAction
m_UI_ScrollWheel
;
private
readonly
InputAction
m_UI_MiddleClick
;
private
readonly
InputAction
m_UI_RightClick
;
private
readonly
InputAction
m_UI_TrackedDevicePosition
;
private
readonly
InputAction
m_UI_TrackedDeviceOrientation
;
private
readonly
InputAction
m_UI_TrackedDeviceSelect
;
public
struct
UIActions
{
private
PlayerInputAction
m_Wrapper
;
public
UIActions
(
PlayerInputAction
wrapper
)
{
m_Wrapper
=
wrapper
;
}
public
InputAction
@Navigate
=>
m_Wrapper
.
m_UI_Navigate
;
public
InputAction
@Submit
=>
m_Wrapper
.
m_UI_Submit
;
public
InputAction
@Cancel
=>
m_Wrapper
.
m_UI_Cancel
;
public
InputAction
@Point
=>
m_Wrapper
.
m_UI_Point
;
public
InputAction
@Click
=>
m_Wrapper
.
m_UI_Click
;
public
InputAction
@ScrollWheel
=>
m_Wrapper
.
m_UI_ScrollWheel
;
public
InputAction
@MiddleClick
=>
m_Wrapper
.
m_UI_MiddleClick
;
public
InputAction
@RightClick
=>
m_Wrapper
.
m_UI_RightClick
;
public
InputAction
@TrackedDevicePosition
=>
m_Wrapper
.
m_UI_TrackedDevicePosition
;
public
InputAction
@TrackedDeviceOrientation
=>
m_Wrapper
.
m_UI_TrackedDeviceOrientation
;
public
InputAction
@TrackedDeviceSelect
=>
m_Wrapper
.
m_UI_TrackedDeviceSelect
;
public
InputActionMap
Get
()
{
return
m_Wrapper
.
m_UI
;
}
public
void
Enable
()
{
Get
().
Enable
();
}
public
void
Disable
()
{
Get
().
Disable
();
}
public
bool
enabled
=>
Get
().
enabled
;
public
static
implicit
operator
InputActionMap
(
UIActions
set
)
{
return
set
.
Get
();
}
public
void
SetCallbacks
(
IUIActions
instance
)
{
if
(
m_Wrapper
.
m_UIActionsCallbackInterface
!=
null
)
{
Navigate
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnNavigate
;
Navigate
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnNavigate
;
Navigate
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnNavigate
;
Submit
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnSubmit
;
Submit
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnSubmit
;
Submit
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnSubmit
;
Cancel
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnCancel
;
Cancel
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnCancel
;
Cancel
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnCancel
;
Point
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnPoint
;
Point
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnPoint
;
Point
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnPoint
;
Click
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnClick
;
Click
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnClick
;
Click
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnClick
;
ScrollWheel
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnScrollWheel
;
ScrollWheel
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnScrollWheel
;
ScrollWheel
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnScrollWheel
;
MiddleClick
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnMiddleClick
;
MiddleClick
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnMiddleClick
;
MiddleClick
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnMiddleClick
;
RightClick
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnRightClick
;
RightClick
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnRightClick
;
RightClick
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnRightClick
;
TrackedDevicePosition
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDevicePosition
;
TrackedDevicePosition
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDevicePosition
;
TrackedDevicePosition
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDevicePosition
;
TrackedDeviceOrientation
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDeviceOrientation
;
TrackedDeviceOrientation
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDeviceOrientation
;
TrackedDeviceOrientation
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDeviceOrientation
;
TrackedDeviceSelect
.
started
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDeviceSelect
;
TrackedDeviceSelect
.
performed
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDeviceSelect
;
TrackedDeviceSelect
.
canceled
-=
m_Wrapper
.
m_UIActionsCallbackInterface
.
OnTrackedDeviceSelect
;
}
m_Wrapper
.
m_UIActionsCallbackInterface
=
instance
;
if
(
instance
!=
null
)
{
Navigate
.
started
+=
instance
.
OnNavigate
;
Navigate
.
performed
+=
instance
.
OnNavigate
;
Navigate
.
canceled
+=
instance
.
OnNavigate
;
Submit
.
started
+=
instance
.
OnSubmit
;
Submit
.
performed
+=
instance
.
OnSubmit
;
Submit
.
canceled
+=
instance
.
OnSubmit
;
Cancel
.
started
+=
instance
.
OnCancel
;
Cancel
.
performed
+=
instance
.
OnCancel
;
Cancel
.
canceled
+=
instance
.
OnCancel
;
Point
.
started
+=
instance
.
OnPoint
;
Point
.
performed
+=
instance
.
OnPoint
;
Point
.
canceled
+=
instance
.
OnPoint
;
Click
.
started
+=
instance
.
OnClick
;
Click
.
performed
+=
instance
.
OnClick
;
Click
.
canceled
+=
instance
.
OnClick
;
ScrollWheel
.
started
+=
instance
.
OnScrollWheel
;
ScrollWheel
.
performed
+=
instance
.
OnScrollWheel
;
ScrollWheel
.
canceled
+=
instance
.
OnScrollWheel
;
MiddleClick
.
started
+=
instance
.
OnMiddleClick
;
MiddleClick
.
performed
+=
instance
.
OnMiddleClick
;
MiddleClick
.
canceled
+=
instance
.
OnMiddleClick
;
RightClick
.
started
+=
instance
.
OnRightClick
;
RightClick
.
performed
+=
instance
.
OnRightClick
;
RightClick
.
canceled
+=
instance
.
OnRightClick
;
TrackedDevicePosition
.
started
+=
instance
.
OnTrackedDevicePosition
;
TrackedDevicePosition
.
performed
+=
instance
.
OnTrackedDevicePosition
;
TrackedDevicePosition
.
canceled
+=
instance
.
OnTrackedDevicePosition
;
TrackedDeviceOrientation
.
started
+=
instance
.
OnTrackedDeviceOrientation
;
TrackedDeviceOrientation
.
performed
+=
instance
.
OnTrackedDeviceOrientation
;
TrackedDeviceOrientation
.
canceled
+=
instance
.
OnTrackedDeviceOrientation
;
TrackedDeviceSelect
.
started
+=
instance
.
OnTrackedDeviceSelect
;
TrackedDeviceSelect
.
performed
+=
instance
.
OnTrackedDeviceSelect
;
TrackedDeviceSelect
.
canceled
+=
instance
.
OnTrackedDeviceSelect
;
}
}
}
public
UIActions
@UI
=>
new
UIActions
(
this
);
private
int
m_KeyboardMouseSchemeIndex
=
-
1
;
public
InputControlScheme
KeyboardMouseScheme
{
get
{
if
(
m_KeyboardMouseSchemeIndex
==
-
1
)
m_KeyboardMouseSchemeIndex
=
asset
.
FindControlSchemeIndex
(
"Keyboard&Mouse"
);
return
asset
.
controlSchemes
[
m_KeyboardMouseSchemeIndex
];
}
}
private
int
m_GamepadSchemeIndex
=
-
1
;
public
InputControlScheme
GamepadScheme
{
get
{
if
(
m_GamepadSchemeIndex
==
-
1
)
m_GamepadSchemeIndex
=
asset
.
FindControlSchemeIndex
(
"Gamepad"
);
return
asset
.
controlSchemes
[
m_GamepadSchemeIndex
];
}
}
private
int
m_TouchSchemeIndex
=
-
1
;
public
InputControlScheme
TouchScheme
{
get
{
if
(
m_TouchSchemeIndex
==
-
1
)
m_TouchSchemeIndex
=
asset
.
FindControlSchemeIndex
(
"Touch"
);
return
asset
.
controlSchemes
[
m_TouchSchemeIndex
];
}
}
private
int
m_JoystickSchemeIndex
=
-
1
;
public
InputControlScheme
JoystickScheme
{
get
{
if
(
m_JoystickSchemeIndex
==
-
1
)
m_JoystickSchemeIndex
=
asset
.
FindControlSchemeIndex
(
"Joystick"
);
return
asset
.
controlSchemes
[
m_JoystickSchemeIndex
];
}
}
public
interface
IPlayerActions
{
void
OnLook
(
InputAction
.
CallbackContext
context
);
void
OnFireL
(
InputAction
.
CallbackContext
context
);
void
OnFireR
(
InputAction
.
CallbackContext
context
);
void
OnMoveL
(
InputAction
.
CallbackContext
context
);
}
public
interface
IUIActions
{
void
OnNavigate
(
InputAction
.
CallbackContext
context
);
void
OnSubmit
(
InputAction
.
CallbackContext
context
);
void
OnCancel
(
InputAction
.
CallbackContext
context
);
void
OnPoint
(
InputAction
.
CallbackContext
context
);
void
OnClick
(
InputAction
.
CallbackContext
context
);
void
OnScrollWheel
(
InputAction
.
CallbackContext
context
);
void
OnMiddleClick
(
InputAction
.
CallbackContext
context
);
void
OnRightClick
(
InputAction
.
CallbackContext
context
);
void
OnTrackedDevicePosition
(
InputAction
.
CallbackContext
context
);
void
OnTrackedDeviceOrientation
(
InputAction
.
CallbackContext
context
);
void
OnTrackedDeviceSelect
(
InputAction
.
CallbackContext
context
);
}
}
RhythmKata/Assets/Scripts/Player/PlayerInputAction.cs.meta
deleted
100644 → 0
View file @
674ce48d
fileFormatVersion: 2
guid: 190d47d61be9e5644a8068eccf03e790
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
RhythmKata/Packages/manifest.json
View file @
f9ff22e4
...
...
@@ -4,7 +4,6 @@
"com.unity.ext.nunit"
:
"1.0.0"
,
"com.unity.ide.rider"
:
"1.1.0"
,
"com.unity.ide.vscode"
:
"1.1.0"
,
"com.unity.inputsystem"
:
"1.0.0-preview.1"
,
"com.unity.package-manager-ui"
:
"2.2.0"
,
"com.unity.test-framework"
:
"1.0.13"
,
"com.unity.textmeshpro"
:
"2.0.1"
,
...
...
RhythmKata/ProjectSettings/ProjectSettings.asset
View file @
f9ff22e4
...
...
@@ -648,6 +648,6 @@ PlayerSettings:
projectName
:
RhythmKata
organizationId
:
lokanchung
cloudEnabled
:
0
enableNativePlatformBackendsForNewInputSystem
:
1
disableOldInputManagerSupport
:
1
enableNativePlatformBackendsForNewInputSystem
:
0
disableOldInputManagerSupport
:
0
legacyClampBlendShapeWeights
:
0
RhythmKata/unityProject.vrmanifest
View file @
f9ff22e4
...
...
@@ -5,7 +5,7 @@
"app_key": "application.generated.unity.rhythmkata.exe",
"launch_type": "url",
"url": "steam://launch/",
"action_manifest_path": "D:\\
Git\\rhythmk
ata\\RhythmKata\\Assets\\StreamingAssets\\SteamVR\\actions.json",
"action_manifest_path": "D:\\
git\\RhythmK
ata\\RhythmKata\\Assets\\StreamingAssets\\SteamVR\\actions.json",
"strings": {
"en_us": {
"name": "RhythmKata [Testing]"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment