Skip to content

Commit 31ff789

Browse files
AndrewTHEManeriAndrewTHEManeri
authored
Merge pull request #425 from Unity-Technologies/staging
0.0.9 staging -> master
2 parents 9a21258 + 388a759 commit 31ff789

824 files changed

Lines changed: 63665 additions & 72320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@
2626
*.ttf filter=lfs diff=lfs merge=lfs -crlf
2727
*.wav filter=lfs diff=lfs merge=lfs -crlf
2828
*.zip filter=lfs diff=lfs merge=lfs -crlf
29+
*.lfs.* filter=lfs diff=lfs merge=lfs -crlf

‎Action Maps/ProxyAnimatorInput.asset‎

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_GameObject: {fileID: 0}
9+
m_Enabled: 1
10+
m_EditorHideFlags: 0
11+
m_Script: {fileID: 11500000, guid: 24e5bc088c9caeb44bc4283dc321b033, type: 3}
12+
m_Name: ProxyAnimatorInput
13+
m_EditorClassIdentifier:
14+
m_Actions:
15+
- {fileID: 114000013893770434}
16+
- {fileID: 114239873159418850}
17+
- {fileID: 114666271280023424}
18+
- {fileID: 114483350316906194}
19+
- {fileID: 114690423600857684}
20+
- {fileID: 114637330144854630}
21+
- {fileID: 114938083758142960}
22+
m_ControlSchemes:
23+
- m_Name: VRInputDevice
24+
m_DeviceSlots:
25+
- m_Key: 1
26+
m_Type:
27+
m_TypeName: UnityEngine.InputNew.VRInputDevice, Assembly-CSharp, Version=0.0.0.0,
28+
Culture=neutral, PublicKeyToken=null
29+
m_TagIndex: -1
30+
m_ActionMap: {fileID: 11400000}
31+
m_Bindings:
32+
- sources:
33+
- controlIndex: 2
34+
deviceKey: 1
35+
deadZone: 0.3
36+
buttonAxisSources: []
37+
gravity: 1000
38+
sensitivity: 1000
39+
snap: 1
40+
primaryIsButtonAxis: 0
41+
- sources:
42+
- controlIndex: 3
43+
deviceKey: 1
44+
deadZone: 0.3
45+
buttonAxisSources: []
46+
gravity: 1000
47+
sensitivity: 1000
48+
snap: 1
49+
primaryIsButtonAxis: 0
50+
- sources:
51+
- controlIndex: 17
52+
deviceKey: 1
53+
deadZone: 0.3
54+
buttonAxisSources: []
55+
gravity: 1000
56+
sensitivity: 1000
57+
snap: 1
58+
primaryIsButtonAxis: 0
59+
- sources:
60+
- controlIndex: 18
61+
deviceKey: 1
62+
deadZone: 0.3
63+
buttonAxisSources: []
64+
gravity: 1000
65+
sensitivity: 1000
66+
snap: 1
67+
primaryIsButtonAxis: 0
68+
- sources:
69+
- controlIndex: 22
70+
deviceKey: 1
71+
deadZone: 0.3
72+
buttonAxisSources: []
73+
gravity: 1000
74+
sensitivity: 1000
75+
snap: 1
76+
primaryIsButtonAxis: 0
77+
- sources:
78+
- controlIndex: 0
79+
deviceKey: 1
80+
deadZone: 0.3
81+
buttonAxisSources: []
82+
gravity: 1000
83+
sensitivity: 1000
84+
snap: 1
85+
primaryIsButtonAxis: 0
86+
- sources:
87+
- controlIndex: 1
88+
deviceKey: 1
89+
deadZone: 0.3
90+
buttonAxisSources: []
91+
gravity: 1000
92+
sensitivity: 1000
93+
snap: 1
94+
primaryIsButtonAxis: 0
95+
m_MapTypeName: ProxyAnimatorInput, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
96+
PublicKeyToken=null
97+
m_CustomNamespace:
98+
--- !u!114 &114000013893770434
99+
MonoBehaviour:
100+
m_ObjectHideFlags: 0
101+
m_PrefabParentObject: {fileID: 0}
102+
m_PrefabInternal: {fileID: 0}
103+
m_GameObject: {fileID: 0}
104+
m_Enabled: 1
105+
m_EditorHideFlags: 0
106+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
107+
m_Name: Trigger1
108+
m_EditorClassIdentifier:
109+
m_ActionMap: {fileID: 11400000}
110+
m_ActionIndex: 0
111+
m_ControlData:
112+
componentControlIndices:
113+
controlType:
114+
m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
115+
Culture=neutral, PublicKeyToken=null
116+
name: Trigger1
117+
defaultValue: 0
118+
--- !u!114 &114239873159418850
119+
MonoBehaviour:
120+
m_ObjectHideFlags: 0
121+
m_PrefabParentObject: {fileID: 0}
122+
m_PrefabInternal: {fileID: 0}
123+
m_GameObject: {fileID: 0}
124+
m_Enabled: 1
125+
m_EditorHideFlags: 0
126+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
127+
m_Name: Trigger2
128+
m_EditorClassIdentifier:
129+
m_ActionMap: {fileID: 11400000}
130+
m_ActionIndex: 1
131+
m_ControlData:
132+
componentControlIndices:
133+
controlType:
134+
m_TypeName: UnityEngine.InputNew.AxisInputControl, Assembly-CSharp, Version=0.0.0.0,
135+
Culture=neutral, PublicKeyToken=null
136+
name: Trigger2
137+
defaultValue: 0
138+
--- !u!114 &114483350316906194
139+
MonoBehaviour:
140+
m_ObjectHideFlags: 0
141+
m_PrefabParentObject: {fileID: 0}
142+
m_PrefabInternal: {fileID: 0}
143+
m_GameObject: {fileID: 0}
144+
m_Enabled: 1
145+
m_EditorHideFlags: 0
146+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
147+
m_Name: Action2
148+
m_EditorClassIdentifier:
149+
m_ActionMap: {fileID: 11400000}
150+
m_ActionIndex: 3
151+
m_ControlData:
152+
componentControlIndices:
153+
controlType:
154+
m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
155+
Culture=neutral, PublicKeyToken=null
156+
name: Action2
157+
defaultValue: 0
158+
--- !u!114 &114637330144854630
159+
MonoBehaviour:
160+
m_ObjectHideFlags: 0
161+
m_PrefabParentObject: {fileID: 0}
162+
m_PrefabInternal: {fileID: 0}
163+
m_GameObject: {fileID: 0}
164+
m_Enabled: 1
165+
m_EditorHideFlags: 0
166+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
167+
m_Name: StickX
168+
m_EditorClassIdentifier:
169+
m_ActionMap: {fileID: 11400000}
170+
m_ActionIndex: 5
171+
m_ControlData:
172+
componentControlIndices:
173+
controlType:
174+
m_TypeName: UnityEngine.InputNew.AxisInputControl, Assembly-CSharp, Version=0.0.0.0,
175+
Culture=neutral, PublicKeyToken=null
176+
name: StickX
177+
defaultValue: 0
178+
--- !u!114 &114666271280023424
179+
MonoBehaviour:
180+
m_ObjectHideFlags: 0
181+
m_PrefabParentObject: {fileID: 0}
182+
m_PrefabInternal: {fileID: 0}
183+
m_GameObject: {fileID: 0}
184+
m_Enabled: 1
185+
m_EditorHideFlags: 0
186+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
187+
m_Name: Action1
188+
m_EditorClassIdentifier:
189+
m_ActionMap: {fileID: 11400000}
190+
m_ActionIndex: 2
191+
m_ControlData:
192+
componentControlIndices:
193+
controlType:
194+
m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
195+
Culture=neutral, PublicKeyToken=null
196+
name: Action1
197+
defaultValue: 0
198+
--- !u!114 &114690423600857684
199+
MonoBehaviour:
200+
m_ObjectHideFlags: 0
201+
m_PrefabParentObject: {fileID: 0}
202+
m_PrefabInternal: {fileID: 0}
203+
m_GameObject: {fileID: 0}
204+
m_Enabled: 1
205+
m_EditorHideFlags: 0
206+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
207+
m_Name: StickButton
208+
m_EditorClassIdentifier:
209+
m_ActionMap: {fileID: 11400000}
210+
m_ActionIndex: 4
211+
m_ControlData:
212+
componentControlIndices:
213+
controlType:
214+
m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
215+
Culture=neutral, PublicKeyToken=null
216+
name: StickButton
217+
defaultValue: 0
218+
--- !u!114 &114938083758142960
219+
MonoBehaviour:
220+
m_ObjectHideFlags: 0
221+
m_PrefabParentObject: {fileID: 0}
222+
m_PrefabInternal: {fileID: 0}
223+
m_GameObject: {fileID: 0}
224+
m_Enabled: 1
225+
m_EditorHideFlags: 0
226+
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
227+
m_Name: StickY
228+
m_EditorClassIdentifier:
229+
m_ActionMap: {fileID: 11400000}
230+
m_ActionIndex: 6
231+
m_ControlData:
232+
componentControlIndices:
233+
controlType:
234+
m_TypeName: UnityEngine.InputNew.AxisInputControl, Assembly-CSharp, Version=0.0.0.0,
235+
Culture=neutral, PublicKeyToken=null
236+
name: StickY
237+
defaultValue: 0

Menus/MainMenu/Prefabs/MenuFaceTop.prefab.meta renamed to Action Maps/ProxyAnimatorInput.asset.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Action Maps/ProxyAnimatorInput.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using UnityEngine;
2+
using UnityEngine.InputNew;
3+
4+
// GENERATED FILE - DO NOT EDIT MANUALLY
5+
namespace UnityEngine.InputNew
6+
{
7+
public class ProxyAnimatorInput : ActionMapInput {
8+
public ProxyAnimatorInput (ActionMap actionMap) : base (actionMap) { }
9+
10+
public ButtonInputControl @trigger1 { get { return (ButtonInputControl)this[0]; } }
11+
public AxisInputControl @trigger2 { get { return (AxisInputControl)this[1]; } }
12+
public ButtonInputControl @action1 { get { return (ButtonInputControl)this[2]; } }
13+
public ButtonInputControl @action2 { get { return (ButtonInputControl)this[3]; } }
14+
public ButtonInputControl @stickButton { get { return (ButtonInputControl)this[4]; } }
15+
public AxisInputControl @stickX { get { return (AxisInputControl)this[5]; } }
16+
public AxisInputControl @stickY { get { return (AxisInputControl)this[6]; } }
17+
}
18+
}

Scripts/Helpers/ProxyHelper.cs.meta renamed to Action Maps/ProxyAnimatorInput.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Actions/BaseAction.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
namespace UnityEditor.Experimental.EditorVR.Actions
55
{
6-
/// <summary>
7-
/// A convenience class for simple action implementations
8-
/// </summary>
9-
abstract class BaseAction : MonoBehaviour, IAction
10-
{
11-
public Sprite icon
12-
{
13-
get { return m_Icon; }
14-
}
6+
/// <summary>
7+
/// A convenience class for simple action implementations
8+
/// </summary>
9+
abstract class BaseAction : MonoBehaviour, IAction
10+
{
11+
public Sprite icon
12+
{
13+
get { return m_Icon; }
14+
}
1515

16-
[SerializeField]
17-
Sprite m_Icon;
16+
[SerializeField]
17+
Sprite m_Icon;
1818

19-
public abstract void ExecuteAction();
20-
}
19+
public abstract void ExecuteAction();
20+
}
2121
}
2222
#endif

‎Actions/Clone.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎Actions/Copy.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#if UNITY_EDITOR
22
namespace UnityEditor.Experimental.EditorVR.Actions
33
{
4-
[ActionMenuItem("Copy", ActionMenuItemAttribute.DefaultActionSectionName, 5)]
5-
sealed class Copy : BaseAction
6-
{
7-
public override void ExecuteAction()
8-
{
9-
Unsupported.CopyGameObjectsToPasteboard();
10-
Paste.SetBufferDistance(Selection.transforms);
11-
}
12-
}
4+
[ActionMenuItem("Copy", ActionMenuItemAttribute.DefaultActionSectionName, 5)]
5+
sealed class Copy : BaseAction
6+
{
7+
public override void ExecuteAction()
8+
{
9+
Unsupported.CopyGameObjectsToPasteboard();
10+
Paste.SetBufferDistance(Selection.transforms);
11+
}
12+
}
1313
}
1414
#endif

0 commit comments

Comments
 (0)