Merge pull request #8 from jukibom/master

feat: dragging on timeline now respects beat snap

Author: CircuitLord

Assets/Scripts/Timeline.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -83,7 +83,8 @@ public class Timeline : MonoBehaviour {
 
 		public static float time { get; set; }
 
-		private int beatSnap = 4;
+		public int beatSnap { get; private set; } = 4;
+
 		[HideInInspector] public static int scale = 20;
 		private float targetScale = 0.7f;
 		private float scaleOffset = 0;

Assets/Scripts/Tools/DragSelect/DragSelect.cs

@@ -390,17 +390,26 @@ void Update() {
 						var mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
 						var offsetFromDragPoint = pos - startDragMovePos;
 
-						// Vector3 newPos = NoteGridSnap.SnapToGrid(mousePos, EditorInput.selectedSnappingMode);
+						Vector3 newPos = SnapToBeat(mousePos);
 						// TODO: Snap!
 
-						mousePos += offsetFromDragPoint;
-						intent.target.timelineTargetIcon.transform.localPosition = new Vector3(mousePos.x, pos.y, pos.z);
-						intent.target.gridTargetIcon.transform.localPosition = new Vector3(gridPos.x, gridPos.y, mousePos.x);
+						newPos += offsetFromDragPoint;
+						intent.target.timelineTargetIcon.transform.localPosition = new Vector3(newPos.x, pos.y, pos.z);
+						intent.target.gridTargetIcon.transform.localPosition = new Vector3(gridPos.x, gridPos.y, newPos.x);
 
-						intent.intendedPosition = new Vector3(mousePos.x, pos.y, pos.z);
+						intent.intendedPosition = new Vector3(newPos.x, pos.y, pos.z);
 					}
 				}
 			}
 		}
+
+		private Vector3 SnapToBeat(Vector3 position) {
+			var increments = ((480 / timeline.beatSnap) * 4f) / 480;        // what even is life
+			return new Vector3(
+				Mathf.Round(position.x / increments) * increments,
+				position.y,
+				position.z
+			);
+		}
 	}
 }