Fix Clone / Paste when viewer scale changes

Unity-Technologies · Jun 2, 2017 · f9be5c2 · f9be5c2
1 parent 1c3324e
commit f9be5c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Actions/Clone.cs b/Actions/Clone.cs
@@ -6,7 +6,7 @@
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
 	[ActionMenuItem("Clone", ActionMenuItemAttribute.DefaultActionSectionName, 3)]
-	sealed class Clone : BaseAction, IUsesSpatialHash
+	sealed class Clone : BaseAction, IUsesSpatialHash, IUsesViewerScale
 	{
 		public override void ExecuteAction()
 		{
@@ -21,7 +21,7 @@ public override void ExecuteAction()
 				var cloneTransform = clone.transform;
 				var cameraTransform = CameraUtils.GetMainCamera().transform;
 				var viewDirection = cloneTransform.position - cameraTransform.position;
-				cloneTransform.position = cameraTransform.TransformPoint(Vector3.forward * viewDirection.magnitude)
+				cloneTransform.position = cameraTransform.TransformPoint(Vector3.forward * viewDirection.magnitude / this.GetViewerScale())
 					+ cloneTransform.position - bounds.center;
 				this.AddToSpatialHash(clone);
 				clones[index++] = clone;

diff --git a/Actions/Paste.cs b/Actions/Paste.cs
@@ -6,7 +6,7 @@
 namespace UnityEditor.Experimental.EditorVR.Actions
 {
 	[ActionMenuItem("Paste", ActionMenuItemAttribute.DefaultActionSectionName, 6)]
-	sealed class Paste : BaseAction, IUsesSpatialHash
+	sealed class Paste : BaseAction, IUsesSpatialHash, IUsesViewerScale
 	{
 		public static Transform[] buffer
 		{
@@ -22,7 +22,8 @@ public static Transform[] buffer
 				{
 					var bounds = ObjectUtils.GetBounds(value);
 
-					s_BufferDistance = bounds.size == Vector3.zero ? (bounds.center - CameraUtils.GetMainCamera().transform.position).magnitude : 0f;
+					s_BufferDistance = bounds.size != Vector3.zero ? (bounds.center - CameraUtils.GetMainCamera().transform.position).magnitude : 0f;
+					s_BufferDistance /= IUsesViewerScaleMethods.getViewerScale(); // Normalize this value, so if viewer scale changes when pasted
 				}
 			}
 		}