fixed cursor alignment

fielddaylab · Sep 26, 2024 · 42733a5 · 42733a5
1 parent 77fa729
commit 42733a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Assets/Project/Scripts/UI/AbstractDraggable.cs b/Assets/Project/Scripts/UI/AbstractDraggable.cs
@@ -77,7 +77,7 @@ protected virtual void SetDefaultCursor() {
         protected virtual void SetGrabCursor() {
             GameConsts consts = FindObjectOfType<GameConsts>();
 
-            Cursor.SetCursor(consts.GrabCursor, Vector2.zero, CursorMode.Auto);
+            Cursor.SetCursor(consts.GrabCursor, new Vector2(11, 2), CursorMode.Auto);
         }
 
         protected virtual void SetLiftPos(bool lifted) {

diff --git a/Assets/Project/Scripts/UI/PlayerNotations/NotationSystem.cs b/Assets/Project/Scripts/UI/PlayerNotations/NotationSystem.cs
@@ -24,10 +24,12 @@ private void Update()
         {
             if (Input.GetMouseButtonDown(1)) {
                 // On right click, find the overlapping interactive object
-
                 m_CurrPointerData = new PointerEventData(EventSystem.current);
                 m_CurrPointerData.position = Input.mousePosition;
+
+
                 List<RaycastResult> results = new List<RaycastResult>();
+                //EventSystem.current.RaycastAll(m_CurrPointerData, results);
                 m_Raycaster.Raycast(m_CurrPointerData, results);
 
                 if (results.Count > 0) {
@@ -40,7 +42,7 @@ private void Update()
                     if (currObj.GetComponent<PlayerNotation>())
                     {
                         Debug.Log("[Notation] Opening existing notation " + results[0].gameObject.name);
-                        OpenExistingNote();
+                        ClickExistingNote(currObj.GetComponent<PlayerNotation>());
                     }
                     // else create new note
                     else
@@ -55,9 +57,9 @@ private void Update()
 
         #region Helpers
 
-        private void OpenExistingNote()
+        private void ClickExistingNote(PlayerNotation notation)
         {
-
+            notation.Click();
         }
 
         private void CreateNewNote(Transform currObj, Vector3 clickPos)

diff --git a/Assets/Project/Scripts/UI/PlayerNotations/PlayerNotation.cs b/Assets/Project/Scripts/UI/PlayerNotations/PlayerNotation.cs
@@ -22,6 +22,11 @@ public void Init()
             m_DeleteButton.onClick.AddListener(OnDeleteClicked);
         }
 
+        public void Click()
+        {
+            OnMainClicked();
+        }
+
         #region Handlers
 
         private void OnMainClicked()