Skip to content

Commit

Permalink
Remove now unused bookmark color keybind
Browse files Browse the repository at this point in the history
  • Loading branch information
XAce1337manX committed Jul 5, 2024
1 parent 5f139ca commit 326b3b1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 52 deletions.
30 changes: 0 additions & 30 deletions Assets/Input/Master.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1846,15 +1846,6 @@ public @CMInput()
""processors"": """",
""interactions"": ""Press"",
""initialStateCheck"": false
},
{
""name"": ""Color Bookmark Modifier"",
""type"": ""Button"",
""id"": ""4439bbde-d3c0-49f8-9005-d710ca8202b0"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
Expand Down Expand Up @@ -1890,17 +1881,6 @@ public @CMInput()
""action"": ""Previous Bookmark"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""eaa182da-bc19-4c48-b13e-af966ffe9485"",
""path"": ""<Keyboard>/shift"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Color Bookmark Modifier"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
Expand Down Expand Up @@ -5155,7 +5135,6 @@ public @CMInput()
m_Bookmarks_CreateNewBookmark = m_Bookmarks.FindAction("Create New Bookmark", throwIfNotFound: true);
m_Bookmarks_NextBookmark = m_Bookmarks.FindAction("Next Bookmark", throwIfNotFound: true);
m_Bookmarks_PreviousBookmark = m_Bookmarks.FindAction("Previous Bookmark", throwIfNotFound: true);
m_Bookmarks_ColorBookmarkModifier = m_Bookmarks.FindAction("Color Bookmark Modifier", throwIfNotFound: true);
// Refresh Map
m_RefreshMap = asset.FindActionMap("Refresh Map", throwIfNotFound: true);
m_RefreshMap_RefreshMap = m_RefreshMap.FindAction("Refresh Map", throwIfNotFound: true);
Expand Down Expand Up @@ -6273,15 +6252,13 @@ public void SetCallbacks(ISavingActions instance)
private readonly InputAction m_Bookmarks_CreateNewBookmark;
private readonly InputAction m_Bookmarks_NextBookmark;
private readonly InputAction m_Bookmarks_PreviousBookmark;
private readonly InputAction m_Bookmarks_ColorBookmarkModifier;
public struct BookmarksActions
{
private @CMInput m_Wrapper;
public BookmarksActions(@CMInput wrapper) { m_Wrapper = wrapper; }
public InputAction @CreateNewBookmark => m_Wrapper.m_Bookmarks_CreateNewBookmark;
public InputAction @NextBookmark => m_Wrapper.m_Bookmarks_NextBookmark;
public InputAction @PreviousBookmark => m_Wrapper.m_Bookmarks_PreviousBookmark;
public InputAction @ColorBookmarkModifier => m_Wrapper.m_Bookmarks_ColorBookmarkModifier;
public InputActionMap Get() { return m_Wrapper.m_Bookmarks; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
Expand All @@ -6300,9 +6277,6 @@ public void AddCallbacks(IBookmarksActions instance)
@PreviousBookmark.started += instance.OnPreviousBookmark;
@PreviousBookmark.performed += instance.OnPreviousBookmark;
@PreviousBookmark.canceled += instance.OnPreviousBookmark;
@ColorBookmarkModifier.started += instance.OnColorBookmarkModifier;
@ColorBookmarkModifier.performed += instance.OnColorBookmarkModifier;
@ColorBookmarkModifier.canceled += instance.OnColorBookmarkModifier;
}

private void UnregisterCallbacks(IBookmarksActions instance)
Expand All @@ -6316,9 +6290,6 @@ private void UnregisterCallbacks(IBookmarksActions instance)
@PreviousBookmark.started -= instance.OnPreviousBookmark;
@PreviousBookmark.performed -= instance.OnPreviousBookmark;
@PreviousBookmark.canceled -= instance.OnPreviousBookmark;
@ColorBookmarkModifier.started -= instance.OnColorBookmarkModifier;
@ColorBookmarkModifier.performed -= instance.OnColorBookmarkModifier;
@ColorBookmarkModifier.canceled -= instance.OnColorBookmarkModifier;
}

public void RemoveCallbacks(IBookmarksActions instance)
Expand Down Expand Up @@ -8510,7 +8481,6 @@ public interface IBookmarksActions
void OnCreateNewBookmark(InputAction.CallbackContext context);
void OnNextBookmark(InputAction.CallbackContext context);
void OnPreviousBookmark(InputAction.CallbackContext context);
void OnColorBookmarkModifier(InputAction.CallbackContext context);
}
public interface IRefreshMapActions
{
Expand Down
20 changes: 0 additions & 20 deletions Assets/Input/Master.inputactions
Original file line number Diff line number Diff line change
Expand Up @@ -1824,15 +1824,6 @@
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Color Bookmark Modifier",
"type": "Button",
"id": "4439bbde-d3c0-49f8-9005-d710ca8202b0",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -1868,17 +1859,6 @@
"action": "Previous Bookmark",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "eaa182da-bc19-4c48-b13e-af966ffe9485",
"path": "<Keyboard>/shift",
"interactions": "",
"processors": "",
"groups": "",
"action": "Color Bookmark Modifier",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand Down
2 changes: 0 additions & 2 deletions Assets/__Scripts/MapEditor/UI/UIMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ public class UIMode : MonoBehaviour, CMInput.IUIModeActions
[FormerlySerializedAs("_rotationCallbackController")] [SerializeField] private RotationCallbackController rotationCallbackController;
[SerializeField] private AudioTimeSyncController atsc;

public string Keybind = "CTRL+H";

private readonly List<TextMeshProUGUI> modes = new List<TextMeshProUGUI>();
private readonly List<Renderer> renderers = new List<Renderer>();
private readonly List<Canvas> canvases = new List<Canvas>();
Expand Down

0 comments on commit 326b3b1

Please sign in to comment.