From 8fbc9c8cbdf7bda13ceef34d05a971610904d3ec Mon Sep 17 00:00:00 2001 From: HEJOK254 <90698026+HEJOK254@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:41:59 +0100 Subject: [PATCH 1/3] Rename OnMOuseOver action for readability OnMOuseOver -> OnMouseOverAction --- .../Implementation/Pin/Display/PinNameDisplay.cs | 4 ++-- .../Modules/Interaction System/Implementation/Pin/PinEvent.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs index e6e8d8b..c36fb4a 100644 --- a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs +++ b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Diagnostics.Tracing; using Interaction.Signal; using TMPro; @@ -35,7 +35,7 @@ private void Awake() PinEvent = transform.parent.GetComponentInChildren(); PinEvent.MouseInteraction.MouseExitted += MouseExitHandler; - PinEvent.OnMOuseOver += OverHandler; + PinEvent.OnMouseOverAction += OverHandler; ScalingManager.i.OnScaleChange += UpdateScale; diff --git a/Assets/Modules/Interaction System/Implementation/Pin/PinEvent.cs b/Assets/Modules/Interaction System/Implementation/Pin/PinEvent.cs index 9622657..7fe4719 100644 --- a/Assets/Modules/Interaction System/Implementation/Pin/PinEvent.cs +++ b/Assets/Modules/Interaction System/Implementation/Pin/PinEvent.cs @@ -9,7 +9,7 @@ public class PinEvent : MonoBehaviour { public MouseInteraction MouseInteraction; - public Action OnMOuseOver; + public Action OnMouseOverAction; private void Awake() { @@ -24,6 +24,6 @@ private void Start() private void OnMouseOver() { - OnMOuseOver?.Invoke(); + OnMouseOverAction?.Invoke(); } } \ No newline at end of file From 22fb8f99fc43366bd86c679a54e779c0476cd74a Mon Sep 17 00:00:00 2001 From: HEJOK254 <90698026+HEJOK254@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:51:17 +0100 Subject: [PATCH 2/3] Fix minor typo (MouseExitted) --- .../Implementation/Pin/Display/PinDisplay.cs | 10 +++++----- .../Implementation/Pin/Display/PinNameDisplay.cs | 6 +++--- .../Implementation/Signal/ChipInterfaceEditor.cs | 2 +- .../Implementation/Wire/Display/WireDisplay.cs | 2 +- .../Seb/SebInput/Internal/MouseInteractionListener.cs | 6 +++--- Assets/Plugin/Seb/SebInput/MouseInteraction.cs | 6 +++--- Assets/Plugin/Seb/SebInput/MouseInteractionGroup.cs | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinDisplay.cs b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinDisplay.cs index 1575563..e2865cc 100644 --- a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinDisplay.cs +++ b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinDisplay.cs @@ -20,7 +20,7 @@ private void Awake() { PinRenderer = GetComponent(); } - + private void OnDestroy() { @@ -30,14 +30,14 @@ private void OnDestroy() private void Start() { InteractionPalette = ThemeManager.Palette.interactionPalette; - + var Pin = GetComponent(); // Pin.OnStateChange += UpdateColor; Pin.MouseInteraction.MouseEntered += (_) => SelectionAppearance(); - Pin.MouseInteraction.MouseExitted += (_) => NormalAppearance(); + Pin.MouseInteraction.MouseExited += (_) => NormalAppearance(); ScalingManager.i.OnScaleChange += UpdateScale; - - + + PinRenderer.material.color = InteractionPalette.PinDefaultColor; UpdateScale(); } diff --git a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs index c36fb4a..2e6a42d 100644 --- a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs +++ b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs @@ -26,7 +26,7 @@ private void Awake() var interaction = GetComponentInParent(); if (interaction) { - Interaction =interaction; + Interaction = interaction; IsInteraction = true; Interaction.OnPropertyChange += NameChanged; } @@ -34,12 +34,12 @@ private void Awake() pin = GetComponentInParent(); PinEvent = transform.parent.GetComponentInChildren(); - PinEvent.MouseInteraction.MouseExitted += MouseExitHandler; + PinEvent.MouseInteraction.MouseExited += MouseExitHandler; PinEvent.OnMouseOverAction += OverHandler; ScalingManager.i.OnScaleChange += UpdateScale; - SetMode( ChipEditorOptions.instance.ActiveMode); + SetMode(ChipEditorOptions.instance.ActiveMode); } diff --git a/Assets/Modules/Interaction System/Implementation/Signal/ChipInterfaceEditor.cs b/Assets/Modules/Interaction System/Implementation/Signal/ChipInterfaceEditor.cs index 5926e54..fa6c26f 100644 --- a/Assets/Modules/Interaction System/Implementation/Signal/ChipInterfaceEditor.cs +++ b/Assets/Modules/Interaction System/Implementation/Signal/ChipInterfaceEditor.cs @@ -87,7 +87,7 @@ private void Start() ScalingManager.i.OnScaleChange += UpdateScale; CreateGroup.i.onGroupSizeSettingPressed += OnGroupSizeSettingPressed; InterfaceEvent.mouseInteraction.MouseEntered += (_) => ShowPreviewSignal(true); - InterfaceEvent.mouseInteraction.MouseExitted += (_) => ShowPreviewSignal(false); + InterfaceEvent.mouseInteraction.MouseExited += (_) => ShowPreviewSignal(false); InterfaceEvent.mouseInteraction.LeftMouseDown += (_) => SpawnSignal(); diff --git a/Assets/Modules/Interaction System/Implementation/Wire/Display/WireDisplay.cs b/Assets/Modules/Interaction System/Implementation/Wire/Display/WireDisplay.cs index 84b2cd8..0038018 100644 --- a/Assets/Modules/Interaction System/Implementation/Wire/Display/WireDisplay.cs +++ b/Assets/Modules/Interaction System/Implementation/Wire/Display/WireDisplay.cs @@ -58,7 +58,7 @@ private void RegisterEvent() wire.RequestFocus(); SelectAppearance(); }; - wireEventMouse.MouseInteraction.MouseExitted += (_) => + wireEventMouse.MouseInteraction.MouseExited += (_) => { wire.ReleaseFocus(); NormalAppearance(); diff --git a/Assets/Plugin/Seb/SebInput/Internal/MouseInteractionListener.cs b/Assets/Plugin/Seb/SebInput/Internal/MouseInteractionListener.cs index 3bbe8ff..371b0fe 100644 --- a/Assets/Plugin/Seb/SebInput/Internal/MouseInteractionListener.cs +++ b/Assets/Plugin/Seb/SebInput/Internal/MouseInteractionListener.cs @@ -9,7 +9,7 @@ public class MouseInteractionListener : MonoBehaviour // Called when mouse enters composite collider public event System.Action MouseEntered; // Called when mouse exits composite collider - public event System.Action MouseExitted; + public event System.Action MouseExited; // Called when left mouse is pressed down over composite collider public event System.Action LeftMouseDown; @@ -37,7 +37,7 @@ public void OnMouseEnter() public void OnMouseExit() { - MouseExitted?.Invoke(); + MouseExited?.Invoke(); } public void OnMousePressDown(MouseEventSystem.MouseButton mouseButton) @@ -52,7 +52,7 @@ public void OnMousePressDown(MouseEventSystem.MouseButton mouseButton) break; } } - + public void OnClickCompleted(MouseEventSystem.MouseButton mouseButton) { diff --git a/Assets/Plugin/Seb/SebInput/MouseInteraction.cs b/Assets/Plugin/Seb/SebInput/MouseInteraction.cs index d76483e..5909636 100644 --- a/Assets/Plugin/Seb/SebInput/MouseInteraction.cs +++ b/Assets/Plugin/Seb/SebInput/MouseInteraction.cs @@ -13,7 +13,7 @@ public class MouseInteraction // Called when mouse enters composite collider public event System.Action MouseEntered; // Called when mouse exits composite collider - public event System.Action MouseExitted; + public event System.Action MouseExited; // Called when left mouse is pressed down over composite collider public event System.Action LeftMouseDown; @@ -37,9 +37,9 @@ public MouseInteraction(GameObject listenerTarget, T eventContext) { var listener = listenerTarget.AddComponent(); Context = eventContext; - + listener.MouseEntered += () => { MouseIsOver = true; MouseEntered?.Invoke(eventContext); }; - listener.MouseExitted += () => { MouseIsOver = false; MouseExitted?.Invoke(eventContext); }; + listener.MouseExited += () => { MouseIsOver = false; MouseExited?.Invoke(eventContext); }; listener.LeftMouseDown += () => LeftMouseDown?.Invoke(eventContext); listener.RightMouseDown += () => RightMouseDown?.Invoke(eventContext); listener.LeftMouseReleased += () => LeftMouseReleased?.Invoke(eventContext); diff --git a/Assets/Plugin/Seb/SebInput/MouseInteractionGroup.cs b/Assets/Plugin/Seb/SebInput/MouseInteractionGroup.cs index 5ee9c68..3376fa9 100644 --- a/Assets/Plugin/Seb/SebInput/MouseInteractionGroup.cs +++ b/Assets/Plugin/Seb/SebInput/MouseInteractionGroup.cs @@ -10,7 +10,7 @@ public class MouseInteractionGroup { public event System.Action MouseEntered; - public event System.Action MouseExitted; + public event System.Action MouseExited; public event System.Action LeftMouseDown; public event System.Action RightMouseDown; @@ -23,7 +23,7 @@ public class MouseInteractionGroup public void AddInteractionToGroup(MouseInteraction interaction) { interaction.MouseEntered += (e) => MouseEntered?.Invoke(e); - interaction.MouseExitted += (e) => MouseExitted?.Invoke(e); + interaction.MouseExited += (e) => MouseExited?.Invoke(e); interaction.LeftMouseDown += (e) => LeftMouseDown?.Invoke(e); interaction.RightMouseDown += (e) => RightMouseDown?.Invoke(e); interaction.LeftMouseReleased += (e) => LeftMouseReleased?.Invoke(e); From c53d146947ee6a92c759de588845ba448cd504bd Mon Sep 17 00:00:00 2001 From: HEJOK254 <90698026+HEJOK254@users.noreply.github.com> Date: Wed, 18 Dec 2024 13:14:47 +0100 Subject: [PATCH 3/3] Fix pin name not updating --- .../Implementation/Pin/Display/PinNameDisplay.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs index 2e6a42d..92dee37 100644 --- a/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs +++ b/Assets/Modules/Interaction System/Implementation/Pin/Display/PinNameDisplay.cs @@ -61,7 +61,8 @@ private void OverHandler() //cambiare il metodo d accesso private void Start() { - UpdateScale(); + // NameChanged() calls UpdateScale() automatically + NameChanged(); ChipEditorOptions.instance.OnPinDisplayActionChange += SetMode; }