Merge pull request #425 from Unity-Technologies/staging

0.0.9 staging -> master
Unity-Technologies · Nov 22, 2017 · 31ff789 · 31ff789
2 parents 9a21258 + 388a759
commit 31ff789
Show file tree

Hide file tree

Showing 824 changed files with 63,665 additions and 72,320 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -26,3 +26,4 @@
 *.ttf	filter=lfs diff=lfs merge=lfs -crlf
 *.wav	filter=lfs diff=lfs merge=lfs -crlf
 *.zip	filter=lfs diff=lfs merge=lfs -crlf
+*.lfs.*	filter=lfs diff=lfs merge=lfs -crlf
diff --git a/Action Maps/ProxyAnimatorInput.asset b/Action Maps/ProxyAnimatorInput.asset
@@ -0,0 +1,237 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24e5bc088c9caeb44bc4283dc321b033, type: 3}
+  m_Name: ProxyAnimatorInput
+  m_EditorClassIdentifier: 
+  m_Actions:
+  - {fileID: 114000013893770434}
+  - {fileID: 114239873159418850}
+  - {fileID: 114666271280023424}
+  - {fileID: 114483350316906194}
+  - {fileID: 114690423600857684}
+  - {fileID: 114637330144854630}
+  - {fileID: 114938083758142960}
+  m_ControlSchemes:
+  - m_Name: VRInputDevice
+    m_DeviceSlots:
+    - m_Key: 1
+      m_Type:
+        m_TypeName: UnityEngine.InputNew.VRInputDevice, Assembly-CSharp, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+      m_TagIndex: -1
+    m_ActionMap: {fileID: 11400000}
+    m_Bindings:
+    - sources:
+      - controlIndex: 2
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+    - sources:
+      - controlIndex: 3
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+    - sources:
+      - controlIndex: 17
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+    - sources:
+      - controlIndex: 18
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+    - sources:
+      - controlIndex: 22
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+    - sources:
+      - controlIndex: 0
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+    - sources:
+      - controlIndex: 1
+        deviceKey: 1
+      deadZone: 0.3
+      buttonAxisSources: []
+      gravity: 1000
+      sensitivity: 1000
+      snap: 1
+      primaryIsButtonAxis: 0
+  m_MapTypeName: ProxyAnimatorInput, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
+    PublicKeyToken=null
+  m_CustomNamespace: 
+--- !u!114 &114000013893770434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: Trigger1
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 0
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: Trigger1
+    defaultValue: 0
+--- !u!114 &114239873159418850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: Trigger2
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 1
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.AxisInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: Trigger2
+    defaultValue: 0
+--- !u!114 &114483350316906194
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: Action2
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 3
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: Action2
+    defaultValue: 0
+--- !u!114 &114637330144854630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: StickX
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 5
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.AxisInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: StickX
+    defaultValue: 0
+--- !u!114 &114666271280023424
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: Action1
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 2
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: Action1
+    defaultValue: 0
+--- !u!114 &114690423600857684
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: StickButton
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 4
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.ButtonInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: StickButton
+    defaultValue: 0
+--- !u!114 &114938083758142960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
+  m_Name: StickY
+  m_EditorClassIdentifier: 
+  m_ActionMap: {fileID: 11400000}
+  m_ActionIndex: 6
+  m_ControlData:
+    componentControlIndices: 
+    controlType:
+      m_TypeName: UnityEngine.InputNew.AxisInputControl, Assembly-CSharp, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+    name: StickY
+    defaultValue: 0
diff --git a/.../MainMenu/Prefabs/MenuFaceTop.prefab.meta → Action Maps/ProxyAnimatorInput.asset.meta b/.../MainMenu/Prefabs/MenuFaceTop.prefab.meta → Action Maps/ProxyAnimatorInput.asset.meta
diff --git a/Action Maps/ProxyAnimatorInput.cs b/Action Maps/ProxyAnimatorInput.cs
@@ -0,0 +1,18 @@
+using UnityEngine;
+using UnityEngine.InputNew;
+
+// GENERATED FILE - DO NOT EDIT MANUALLY
+namespace UnityEngine.InputNew
+{
+	public class ProxyAnimatorInput : ActionMapInput {
+		public ProxyAnimatorInput (ActionMap actionMap) : base (actionMap) { }
+
+		public ButtonInputControl @trigger1 { get { return (ButtonInputControl)this[0]; } }
+		public AxisInputControl @trigger2 { get { return (AxisInputControl)this[1]; } }
+		public ButtonInputControl @action1 { get { return (ButtonInputControl)this[2]; } }
+		public ButtonInputControl @action2 { get { return (ButtonInputControl)this[3]; } }
+		public ButtonInputControl @stickButton { get { return (ButtonInputControl)this[4]; } }
+		public AxisInputControl @stickX { get { return (AxisInputControl)this[5]; } }
+		public AxisInputControl @stickY { get { return (AxisInputControl)this[6]; } }
+	}
+}
diff --git a/Scripts/Helpers/ProxyHelper.cs.meta → Action Maps/ProxyAnimatorInput.cs.meta b/Scripts/Helpers/ProxyHelper.cs.meta → Action Maps/ProxyAnimatorInput.cs.meta
diff --git a/Actions/BaseAction.cs b/Actions/BaseAction.cs
@@ -3,20 +3,20 @@
 
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
-	/// <summary>
-	/// A convenience class for simple action implementations
-	/// </summary>
-	abstract class BaseAction : MonoBehaviour, IAction
-	{
-		public Sprite icon
-		{
-			get { return m_Icon; }
-		}
+    /// <summary>
+    /// A convenience class for simple action implementations
+    /// </summary>
+    abstract class BaseAction : MonoBehaviour, IAction
+    {
+        public Sprite icon
+        {
+            get { return m_Icon; }
+        }
 
-		[SerializeField]
-		Sprite m_Icon;
+        [SerializeField]
+        Sprite m_Icon;
 
-		public abstract void ExecuteAction();
-	}
+        public abstract void ExecuteAction();
+    }
 }
 #endif
diff --git a/Actions/Clone.cs b/Actions/Clone.cs
diff --git a/Actions/Copy.cs b/Actions/Copy.cs
@@ -1,14 +1,14 @@
 #if UNITY_EDITOR
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
-	[ActionMenuItem("Copy", ActionMenuItemAttribute.DefaultActionSectionName, 5)]
-	sealed class Copy : BaseAction
-	{
-		public override void ExecuteAction()
-		{
-			Unsupported.CopyGameObjectsToPasteboard();
-			Paste.SetBufferDistance(Selection.transforms);
-		}
-	}
+    [ActionMenuItem("Copy", ActionMenuItemAttribute.DefaultActionSectionName, 5)]
+    sealed class Copy : BaseAction
+    {
+        public override void ExecuteAction()
+        {
+            Unsupported.CopyGameObjectsToPasteboard();
+            Paste.SetBufferDistance(Selection.transforms);
+        }
+    }
 }
 #endif