0.0.2 staging -> master

Actions/Clone.cs

@@ -14,6 +14,8 @@ sealed class Clone : BaseAction, IUsesSpatialHash
 		public override void ExecuteAction()
 		{
 			var selection = Selection.gameObjects;
+			var clones = new GameObject[selection.Length];
+			var index = 0;
 			var bounds = ObjectUtils.GetBounds(selection);
 			foreach (var s in selection)
 			{
@@ -25,7 +27,9 @@ public override void ExecuteAction()
 				cloneTransform.position = cameraTransform.TransformPoint(Vector3.forward * viewDirection.magnitude)
 					+ cloneTransform.position - bounds.center;
 				addToSpatialHash(clone);
+				clones[index++] = clone;
 			}
+			Selection.objects = clones;
 		}
 	}
 }

Actions/Paste.cs

@@ -39,6 +39,8 @@ public override void ExecuteAction()
 
 			if (buffer != null)
 			{
+				var pastedGameObjects = new GameObject[buffer.Length];
+				var index = 0;
 				var bounds = ObjectUtils.GetBounds(buffer);
 				foreach (var go in buffer)
 				{
@@ -50,7 +52,11 @@ public override void ExecuteAction()
 						+ pastedTransform.position - bounds.center;
 					pasted.SetActive(true);
 					addToSpatialHash(pasted);
+					pastedGameObjects[index++] = pasted;
 				}
+
+				if (pastedGameObjects.Length > 0)
+				    Selection.objects = pastedGameObjects;
 			}
 		}
 	}

Editor/StandardInputFieldEditor.cs

@@ -19,4 +19,4 @@ public override void OnInspectorGUI()
 			base.OnInspectorGUI();
 		}
 	}
-}
+}

Editor/TooltipsEditor.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEditor.Experimental.EditorVR.Utilities;
+using UnityEngine;
+
+namespace UnityEditor.Experimental.EditorVR.UI
+{
+	sealed class TooltipsEditor : EditorWindow
+	{
+		readonly Dictionary<Type, ITooltip> m_TooltipAttributes = new Dictionary<Type, ITooltip>();
+		IEnumerable<Type> m_TooltipClasses;
+		readonly Dictionary<ITooltip, GameObject> m_TooltipsInPrefabs = new Dictionary<ITooltip, GameObject>();
+
+		Vector2 m_Scroll;
+		GUIStyle m_ButtonStyle;
+
+		[MenuItem("Edit/Project Settings/EditorVR/Tooltips")]
+		static void Init()
+		{
+			GetWindow<TooltipsEditor>("Tooltip Editor").Show();
+		}
+
+		void OnEnable()
+		{
+			m_ButtonStyle = new GUIStyle(EditorStyles.miniButton);
+			m_ButtonStyle.alignment = TextAnchor.MiddleLeft;
+			m_TooltipsInPrefabs.Clear();
+
+			foreach (var path in AssetDatabase.GetAllAssetPaths())
+			{
+				if (AssetDatabase.GetMainAssetTypeAtPath(path) == typeof(GameObject))
+				{
+					var asset = AssetDatabase.LoadAssetAtPath<GameObject>(path);
+					foreach (var tooltip in asset.GetComponentsInChildren<ITooltip>(true))
+					{
+						m_TooltipsInPrefabs[tooltip] = asset;
+					}
+				}
+			}
+
+			m_TooltipAttributes.Clear();
+			var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+			foreach (var assembly in assemblies)
+			{
+				foreach (var type in assembly.GetTypes())
+				{
+					CollectTooltipAttributes(type);
+					foreach (var nestedType in type.GetNestedTypes(BindingFlags.NonPublic))
+					{
+						CollectTooltipAttributes(nestedType);
+					}
+				}
+			}
+
+			m_TooltipClasses = ObjectUtils.GetImplementationsOfInterface(typeof(ITooltip));
+		}
+
+		void CollectTooltipAttributes(Type type)
+		{
+			var tooltips = type.GetCustomAttributes(typeof(ITooltip), true);
+			foreach (ITooltip tooltip in tooltips)
+			{
+				m_TooltipAttributes[type] = tooltip;
+			}
+		}
+
+		void OnGUI()
+		{
+			const float columnWidth = 250f;
+			EditorGUIUtility.labelWidth = columnWidth;
+
+			m_Scroll = GUILayout.BeginScrollView(m_Scroll);
+			GUILayout.Label("Tooltips in Prefabs", EditorStyles.boldLabel);
+			foreach (var kvp in m_TooltipsInPrefabs)
+			{
+				GUILayout.BeginHorizontal();
+
+				var tooltip = kvp.Key;
+				var prefab = kvp.Value;
+				var mb = (MonoBehaviour)tooltip;
+
+				var label = string.Format("{0}/{1}", prefab.name, mb.name);
+				if (GUILayout.Button(label, m_ButtonStyle, GUILayout.Width(columnWidth)))
+					EditorGUIUtility.PingObject(prefab);
+
+				try
+				{
+					var textProperty = tooltip.GetType().GetProperty("tooltipText");
+
+					var setter = textProperty.GetSetMethod(true);
+					if (setter != null)
+					{
+						EditorGUI.BeginChangeCheck();
+						setter.Invoke(tooltip, new object[]
+						{
+							GUILayout.TextField(tooltip.tooltipText)
+						});
+
+						if (EditorGUI.EndChangeCheck())
+							EditorUtility.SetDirty(prefab);
+					}
+					else
+					{
+						GUILayout.Label(tooltip.tooltipText);
+					}
+				}
+				catch
+				{
+					GUILayout.Label("Dynamic Text");
+				}
+
+				GUILayout.EndHorizontal();
+			}
+
+			EditorGUILayout.Separator();
+
+			GUILayout.Label("Tooltip Attributes", EditorStyles.boldLabel);
+			foreach (var kvp in m_TooltipAttributes)
+			{
+				EditorGUILayout.LabelField(kvp.Key.Name, kvp.Value.tooltipText);
+			}
+
+			EditorGUILayout.Separator();
+
+			GUILayout.Label("ITooltip Implementers", EditorStyles.boldLabel);
+			foreach (var tooltipClass in m_TooltipClasses)
+			{
+				EditorGUILayout.LabelField(tooltipClass.Name);
+			}
+
+			GUILayout.EndScrollView();
+		}
+	}
+}

Manipulators/BaseManipulator.cs

@@ -13,6 +13,7 @@ class BaseManipulator : MonoBehaviour, IManipulator
 		public Action<Vector3> translate { protected get; set; }
 		public Action<Quaternion> rotate { protected get; set; }
 		public Action<Vector3> scale { protected get; set; }
+		public event Action dragStarted;
 
 		protected virtual void OnEnable()
 		{
@@ -39,6 +40,12 @@ public void AdjustScale(Vector3 cameraPosition, Matrix4x4 worldToCameraMatrix)
 			var delta = worldToCameraMatrix.inverse.MultiplyPoint3x4(cameraPosition - manipulatorPosition) - originalCameraPosition;
 			transform.localScale = Vector3.one * delta.magnitude * k_BaseManipulatorSize;
 		}
+
+		protected void OnDragStarted()
+		{
+			if (dragStarted != null)
+				dragStarted();
+		}
 	}
 }
 #endif

Manipulators/DirectManipulator.cs

@@ -27,6 +27,7 @@ public Transform target
 		public Action<Vector3> translate { private get; set; }
 		public Action<Quaternion> rotate { private get; set; }
 		public Action<Vector3> scale { private get; set; }
+		public event Action dragStarted;
 
 		void OnEnable()
 		{
@@ -62,6 +63,9 @@ private void OnHandleDragStarted(BaseHandle handle, HandleEventData eventData)
 			var inverseRotation = Quaternion.Inverse(rayOrigin.rotation);
 			m_PositionOffset = inverseRotation * (target.transform.position - rayOrigin.position);
 			m_RotationOffset = inverseRotation * target.transform.rotation;
+
+			if (dragStarted != null)
+				dragStarted();
 		}
 
 		private void OnHandleDragging(BaseHandle handle, HandleEventData eventData)

Manipulators/ScaleManipulator.cs

@@ -69,6 +69,8 @@ void OnHandleDragStarted(BaseHandle handle, HandleEventData eventData)
 			foreach (var h in m_AllHandles)
 				h.gameObject.SetActive(h == handle);
 
+			OnDragStarted();
+
 			dragging = true;
 		}
 

Manipulators/StandardManipulator.cs

@@ -80,6 +80,8 @@ void OnHandleDragStarted(BaseHandle handle, HandleEventData eventData)
 			foreach (var h in m_AllHandles)
 				h.gameObject.SetActive(h == handle);
 
+			OnDragStarted();
+
 			dragging = true;
 		}
 

Menus/MainMenu/MainMenu.cs

@@ -93,7 +93,7 @@ void Start()
 			UpdateToolButtons();
 		}
 
-		public void ProcessInput(ActionMapInput input, Action<InputControl> consumeControl)
+		public void ProcessInput(ActionMapInput input, ConsumeControlDelegate consumeControl)
 		{
 			var mainMenuInput = (MainMenuInput)input;
 			var rotationInput = -mainMenuInput.rotate.rawValue;

Menus/MainMenu/Materials/AltMenuBase.mat

@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP
   m_LightmapFlags: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 9000
   stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2

Menus/MainMenu/Materials/MenuFaceBorder.mat

@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 4800000, guid: 4706f2caa984a604488fea3e68e21940, type: 3}
   m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP
   m_LightmapFlags: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 9001
   stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2
@@ -76,6 +76,9 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - first:
+        name: _Alpha
+      second: 0.945
     - first:
         name: _BumpScale
       second: 1.5

Menus/MainMenu/Materials/MenuFaceTitleIcon.mat

@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 4800000, guid: 269bee83d6b662e489c098a4f0d9af32, type: 3}
   m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP
   m_LightmapFlags: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 9001
   stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2

Menus/MainMenu/Materials/MenuFacesBlur.mat

@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 4800000, guid: 1bc55feb3f493374ca90e594b518edb9, type: 3}
   m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _METALLICGLOSSMAP
   m_LightmapFlags: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 9002
   stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2

Menus/MainMenu/Materials/MenuFrame.mat

@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 9001
   stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2

Menus/MainMenu/Materials/MenuInputArrows.mat

@@ -10,7 +10,7 @@ Material:
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
   m_LightmapFlags: 1
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: 9001
   stringTagMap:
     RenderType: Transparent
   m_SavedProperties:

Menus/MainMenu/Materials/MenuUIMask.mat

@@ -0,0 +1,49 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: MenuUIMask
+  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_CustomRenderQueue: 9104
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+    - first:
+        name: _MainTex
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - first:
+        name: _ColorMask
+      second: 15
+    - first:
+        name: _Stencil
+      second: 0
+    - first:
+        name: _StencilComp
+      second: 8
+    - first:
+        name: _StencilOp
+      second: 0
+    - first:
+        name: _StencilReadMask
+      second: 255
+    - first:
+        name: _StencilWriteMask
+      second: 255
+    - first:
+        name: _UseUIAlphaClip
+      second: 0
+    m_Colors:
+    - first:
+        name: _Color
+      second: {r: 1, g: 1, b: 1, a: 1}