Rename miniWorldHasObject to miniWorldRayHasObject; Adjust comment wo…

…rding;

Clean up formatting

Scripts/EditorVR.cs

@@ -191,7 +191,7 @@ private void OnSceneGUI(EditorWindow obj)
 	{
 		if (Event.current.type == EventType.MouseMove)
 		{
-			var miniWorldHasObject = false;
+			var miniWorldRayHasObject = false;
 
 			foreach (var proxy in m_AllProxies)
 			{
@@ -206,13 +206,13 @@ private void OnSceneGUI(EditorWindow obj)
 					miniWorldRay.Value.hoverObject = m_PixelRaycastModule.UpdateRaycast(miniWorldRay.Key, m_EventCamera, GetPointerLength(miniWorldRay.Key));
 
 					if (miniWorldRay.Value.hoverObject || miniWorldRay.Value.dragObject)
-						miniWorldHasObject = true;
+						miniWorldRayHasObject = true;
 				}
 			}
 
 			// If any active miniWorldRay hovers over a selected object, switch to the DirectManipulator
 			if (m_TransformTool != null)
-				m_TransformTool.mode = miniWorldHasObject ? TransformMode.Direct : TransformMode.Standard;
+				m_TransformTool.mode = miniWorldRayHasObject ? TransformMode.Direct : TransformMode.Standard;
 
 			UpdateDefaultProxyRays();
 		}
@@ -996,13 +996,13 @@ private void UpdateMiniWorldRays()
 			var isContained = miniWorld.Contains(originalRayOrigin.position + originalRayOrigin.forward * pointerLength);
 			miniWorldRayOrigin.gameObject.SetActive(isContained);
 
-			// Deactivate ActionMapInput if the ray is not inside a MiniWorld or currently dragging an object
+			// Keep input alive if we are dragging an object, otherwise MultipleRayInputModule will reset our control state
 			ray.Value.uiInput.active = isContained || ray.Value.dragObject;
 
 			var uiInput = (UIActions)ray.Value.uiInput;
 			var hoverObject = ray.Value.hoverObject;
 
-			// Start dragging if we're hoving over a selected object, dragObject is null, and the trigger is held
+			// Instead of using wasJustPressed, use isHeld to allow dragging with a single press
 			if (hoverObject && Selection.gameObjects.Contains(hoverObject) && !ray.Value.dragObject && uiInput.select.isHeld)
 			{
 				//Disable original ray so that it doesn't interrupt dragging by activating its ActionMapInput
@@ -1021,7 +1021,7 @@ private void UpdateMiniWorldRays()
 			if (uiInput.@select.isHeld)
 			{
 				var selectedObjectTransform = ray.Value.dragObject.transform;
-				// If the pointer is inside the MiniWorld, position at an offset from controller positoin
+				// If the pointer is inside the MiniWorld, position at an offset from controller position
 				if (ray.Key.gameObject.activeSelf)
 				{
 					selectedObjectTransform.localScale = ray.Value.dragObjectOriginalScale;
@@ -1031,8 +1031,6 @@ private void UpdateMiniWorldRays()
 				// If the object is outside, attach to controller as a preview
 				else
 				{
-					Selection.objects = new UnityEngine.Object[0];
-
 					m_ObjectPlacementModule.PositionPreview(selectedObjectTransform, GetPreviewOriginForRayOrigin(originalRayOrigin));
 
 					selectedObjectTransform.transform.localScale = Vector3.one;

Tools/TransformTool/TransformTool.cs

@@ -55,7 +55,6 @@ public TransformMode mode
 			}
 		}
 	}
-
 	private TransformMode m_Mode;
 
 	public ActionMapInput actionMapInput { get { return m_TransformInput; } set { m_TransformInput = (TransformInput) value; } }
@@ -92,6 +91,7 @@ void Update()
 	{
 		if (m_Mode == TransformMode.Direct)
 			return;
+
 		if (m_SelectionTransforms != null && m_SelectionTransforms.Length > 0)
 		{
 			if (m_TransformInput.pivotMode.wasJustPressed) // Switching center vs pivot