Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:47:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved selection, just cleaner overall

Browse Source
This commit is contained in:
Braedon
2022-01-17 18:54:25 -05:00
parent 60a4787574
commit ebc5d28e0e
9 changed files with 271 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scripts/LevelEditor/BoxSelection.cs
View File

@ -35,8 +35,11 @@ namespace RhythmHeavenMania.Editor
private void Update()
{
if (Selections.instance.eventsSelected.Count > 0 && Timeline.instance.IsEventsDragging())
if (Selections.instance.eventsSelected.Count > 0 && Timeline.instance.InteractingWithEvents())
{
startPosition = Vector2.zero;
endPosition = Vector2.zero;
DrawVisual();
return;
}
@ -45,7 +48,6 @@ namespace RhythmHeavenMania.Editor
startPosition = Vector2.zero;
endPosition = Vector2.zero;
DrawVisual();
SelectEvents();
return;
}
@ -126,10 +128,12 @@ namespace RhythmHeavenMania.Editor
{
int selected = 0;
if (!Input.GetKeyDown(KeyCode.LeftShift)) Selections.instance.DeselectAll();
for (int i = 0; i < GameManager.instance.Beatmap.entities.Count; i++)
{
TimelineEventObj e = GameManager.instance.Beatmap.entities[i].eventObj;
if (selectionBox.Overlaps(GetWorldRect(e.GetComponent<RectTransform>())))
{
Selections.instance.DragSelect(e);

14
Assets/Scripts/LevelEditor/Selections.cs
View File

@ -30,7 +30,6 @@ namespace RhythmHeavenMania.Editor
{
DeselectAll();
eventsSelected.Add(eventToAdd);
eventToAdd.Select();
}
public void ShiftClickSelect(TimelineEventObj eventToAdd)
@ -38,13 +37,11 @@ namespace RhythmHeavenMania.Editor
if (!eventsSelected.Contains(eventToAdd))
{
eventsSelected.Add(eventToAdd);
eventToAdd.Select();
}
/*else
else
{
eventsSelected.Remove(eventToAdd);
eventToAdd.DeSelect();
}*/
}
}
public void DragSelect(TimelineEventObj eventToAdd)
@ -52,17 +49,11 @@ namespace RhythmHeavenMania.Editor
if (!eventsSelected.Contains(eventToAdd))
{
eventsSelected.Add(eventToAdd);
eventToAdd.Select();
}
}
public void DeselectAll()
{
for (int i = 0; i < eventsSelected.Count; i++)
{
eventsSelected[i].DeSelect();
}
eventsSelected.Clear();
}
@ -71,7 +62,6 @@ namespace RhythmHeavenMania.Editor
if (eventsSelected.Contains(eventToDeselect))
{
eventsSelected.Remove(eventToDeselect);
eventToDeselect.DeSelect();
}
}
}

5
Assets/Scripts/LevelEditor/Selector.cs
View File

@ -14,5 +14,10 @@ namespace RhythmHeavenMania.Editor
{
instance = this;
}
private void Update()
{
}
}
}

7
Assets/Scripts/LevelEditor/Timeline.cs
View File

@ -337,7 +337,6 @@ namespace RhythmHeavenMania.Editor
var mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
g.transform.position = new Vector3(mousePos.x, mousePos.y, 0);
Beatmap.Entity en = new Beatmap.Entity();
en.datamodel = eventName;
en.eventObj = eventObj;
@ -346,7 +345,7 @@ namespace RhythmHeavenMania.Editor
GameManager.instance.SortEventsList();
Selections.instance.ClickSelect(eventObj);
eventObj.isDragging = true;
eventObj.moving = true;
}
else
{
@ -374,9 +373,9 @@ namespace RhythmHeavenMania.Editor
return Timeline.instance.eventObjs.FindAll(c => c.mouseHovering == true).Count > 0;
}
public bool IsEventsDragging()
public bool InteractingWithEvents()
{
return eventObjs.FindAll(c => c.isDragging == true).Count > 0 || eventObjs.FindAll(c => c.resizing == true).Count > 0;
return eventObjs.FindAll(c => c.moving == true).Count > 0 || eventObjs.FindAll(c => c.resizing == true).Count > 0;
}
public float SnapToLayer(float y)

173
Assets/Scripts/LevelEditor/TimelineEventObj.cs
View File

@ -12,7 +12,6 @@ namespace RhythmHeavenMania.Editor
{
private float startPosX;
private float startPosY;
public bool isDragging;
private Vector3 lastPos;
private RectTransform rectTransform;
@ -21,6 +20,9 @@ namespace RhythmHeavenMania.Editor
[SerializeField] private RectTransform PosPreview;
[SerializeField] private RectTransform PosPreviewRef;
[SerializeField] public Image Icon;
[SerializeField] private Image selectedImage;
[SerializeField] private RectTransform outline;
[SerializeField] private RectTransform resizeGraphic;
[Header("Properties")]
private Beatmap.Entity entity;
@ -31,6 +33,7 @@ namespace RhythmHeavenMania.Editor
public bool mouseHovering;
public bool resizable;
public bool resizing;
public bool moving;
[Header("Colors")]
public Color NormalCol;
@ -41,14 +44,13 @@ namespace RhythmHeavenMania.Editor
if (!resizable)
{
Destroy(transform.GetChild(6).gameObject);
Destroy(transform.GetChild(7).gameObject);
Destroy(transform.GetChild(1).gameObject);
Destroy(resizeGraphic.gameObject);
}
}
private void Update()
{
selected = Selections.instance.eventsSelected.Contains(this);
entity = GameManager.instance.Beatmap.entities.Find(a => a.eventObj == this);
mouseHovering = RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Camera.main);
@ -72,6 +74,12 @@ namespace RhythmHeavenMania.Editor
SetColor(GetTrack());
if (Conductor.instance.NotStopped())
{
Cancel();
return;
}
if (selected)
{
if (Input.GetKeyDown(KeyCode.Delete))
@ -80,61 +88,25 @@ namespace RhythmHeavenMania.Editor
Timeline.instance.DestroyEventObject(entity);
}
transform.GetChild(3).gameObject.SetActive(true);
for (int i = 0; i < transform.GetChild(4).childCount; i++)
selectedImage.gameObject.SetActive(true);
for (int i = 0; i < outline.childCount; i++)
{
transform.GetChild(4).GetChild(i).GetComponent<Image>().color = Color.cyan;
}
Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
Vector3[] v = new Vector3[4];
rectTransform.GetWorldCorners(v);
if (mouseHovering)
{
if (mousePos.x > transform.position.x && mousePos.x < transform.position.x + 0.1f)
{
}
else if (mousePos.x > v[3].x - 0.1f && mousePos.x < v[3].x)
{
}
outline.GetChild(i).GetComponent<Image>().color = Color.cyan;
}
}
else
{
transform.GetChild(3).gameObject.SetActive(false);
selectedImage.gameObject.SetActive(false);
for (int i = 0; i < transform.GetChild(4).childCount; i++)
transform.GetChild(4).GetChild(i).GetComponent<Image>().color = new Color32(0, 0, 0, 51);
}
if (Conductor.instance.NotStopped())
{
Cancel();
return;
for (int i = 0; i < outline.childCount; i++)
outline.GetChild(i).GetComponent<Image>().color = new Color32(0, 0, 0, 51);
}
if (!resizing)
{
if (Input.GetMouseButtonDown(0) && Timeline.instance.IsMouseAboveEvents())
if (Input.GetMouseButtonUp(0) && Timeline.instance.CheckIfMouseInTimeline())
{
if (selected)
{
Vector3 mousePos;
mousePos = Input.mousePosition;
mousePos = Camera.main.ScreenToWorldPoint(mousePos);
startPosX = mousePos.x - this.transform.position.x;
startPosY = mousePos.y - this.transform.position.y;
isDragging = true;
}
}
else if (Input.GetMouseButtonUp(0))
{
if (!mouseHovering && !isDragging && !BoxSelection.instance.selecting)
if (!mouseHovering && !moving && !BoxSelection.instance.selecting)
{
if (!Input.GetKey(KeyCode.LeftShift))
{
@ -144,11 +116,9 @@ namespace RhythmHeavenMania.Editor
OnUp();
}
if (isDragging && selected)
if (moving && selected)
{
Vector3 mousePos;
mousePos = Input.mousePosition;
mousePos = Camera.main.ScreenToWorldPoint(mousePos);
Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
this.transform.position = new Vector3(mousePos.x - startPosX, mousePos.y - startPosY - 0.40f, 0);
this.transform.localPosition = new Vector3(Mathf.Clamp(Mathp.Round2Nearest(this.transform.localPosition.x, 0.25f), 0, Mathf.Infinity), Timeline.instance.SnapToLayer(this.transform.localPosition.y));
@ -162,6 +132,53 @@ namespace RhythmHeavenMania.Editor
}
#region ClickEvents
public void OnClick()
{
if (Input.GetKey(KeyCode.LeftShift))
{
Selections.instance.ShiftClickSelect(this);
}
else
{
Selections.instance.ClickSelect(this);
}
}
public void OnDown()
{
if (!selected) return;
Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
startPosX = mousePos.x - this.transform.position.x;
startPosY = mousePos.y - this.transform.position.y;
moving = true;
}
public void OnUp()
{
if (selected)
{
moving = false;
if (eligibleToMove)
{
OnComplete();
}
Cancel();
}
}
private void Cancel()
{
eligibleToMove = false;
}
#endregion
#region ResizeEvents
public void DragEnter()
@ -211,7 +228,6 @@ namespace RhythmHeavenMania.Editor
public void DragRight()
{
if (!resizing) return;
// if (!mouseHovering) return;
Vector2 sizeDelta = rectTransform.sizeDelta;
@ -268,59 +284,8 @@ namespace RhythmHeavenMania.Editor
#endregion
#region ClickEvents
public void OnDown()
{
if (!selected)
{
if (Input.GetKey(KeyCode.LeftShift))
{
Selections.instance.ShiftClickSelect(this);
}
else
{
Selections.instance.ClickSelect(this);
}
// Selector.instance.Click(this);
}
}
public void OnUp()
{
if (selected)
{
isDragging = false;
if (eligibleToMove)
{
OnComplete();
}
Cancel();
}
}
private void Cancel()
{
eligibleToMove = false;
}
#endregion
#region Selection
public void Select()
{
selected = true;
}
public void DeSelect()
{
selected = false;
}
#endregion
#region Extra