Editor bug fixes (#261)

* Spaceball cleanup and small bug fix

* Replace old hit sound in spaceball

* Camera filters

* added 9 new filters, including 3 types of sepia

* oops

* remark

* normalization of fade out and fade in on filters are by 100

* GenerateFilterTypeEnum comments

* Pure black and white filter

* Zooming

* Constant playback bar offset

* Prepare box selector rewrite

* Update icons, finalize

* Bug fixes
This commit is contained in:
Braedon Lewis 2023-02-05 14:48:49 -05:00 committed by GitHub
parent 3a1820c5b9
commit f4580eedfb
13 changed files with 130 additions and 88 deletions

File diff suppressed because one or more lines are too long

View File

@ -82,8 +82,8 @@ Material:
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 0.40007478, g: 0.343046, b: 0.3192805, a: 1}
- _ColorAlpha: {r: 0, g: 0, b: 0, a: 1}
- _ColorBravo: {r: 1, g: 0, b: 0, a: 1}
- _ColorDelta: {r: 0.68267095, g: 0.61040676, b: 0.57526755, a: 1}
- _ColorDelta: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -7023,6 +7023,47 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307892646}
m_CullTransparentMesh: 1
--- !u!1 &311438944
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 311438945}
m_Layer: 5
m_Name: Timeline
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &311438945
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 311438944}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1264012262}
- {fileID: 441876681}
- {fileID: 1980243266}
- {fileID: 1671351975}
- {fileID: 446434229}
- {fileID: 1856185013}
m_Father: {fileID: 1791483803}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 641, y: 15.64502}
m_SizeDelta: {x: 1278, y: -18.721}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &316841411
GameObject:
m_ObjectHideFlags: 0
@ -8369,6 +8410,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
rectTransform: {fileID: 380411594}
raycastRect: {fileID: 1186810249}
moving: 0
hovering: 0
volumeTXT: {fileID: 746356640}
volumeLine: {fileID: 1126835990}
@ -8958,7 +9000,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &423099699
MonoBehaviour:
@ -9321,13 +9363,13 @@ RectTransform:
m_GameObject: {fileID: 441876680}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798}
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 547319783}
- {fileID: 608588498}
- {fileID: 620950453}
- {fileID: 1046888175}
m_Father: {fileID: 1861169746}
m_Father: {fileID: 311438945}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
@ -9431,13 +9473,13 @@ RectTransform:
m_GameObject: {fileID: 446434228}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798}
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 932211467}
- {fileID: 1567318396}
- {fileID: 285804967}
- {fileID: 1993062350}
m_Father: {fileID: 1861169746}
m_Father: {fileID: 311438945}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -12953,7 +12995,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 704039020}
m_Direction: 0
m_Value: 0
m_Size: 0.1051881
m_Size: 0.10518809
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -12972,7 +13014,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -14274,6 +14316,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
rectTransform: {fileID: 666273484}
raycastRect: {fileID: 983551349}
moving: 0
hovering: 0
tempoTXT: {fileID: 499528699}
tempoLine: {fileID: 1287203019}
@ -14876,11 +14919,11 @@ RectTransform:
m_Father: {fileID: 1791483803}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -84, y: -798.1}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -84, y: -128.09998}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &683816223
MonoBehaviour:
m_ObjectHideFlags: 0
@ -19239,7 +19282,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &910102824
GameObject:
@ -19324,7 +19367,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -20688,7 +20731,7 @@ Transform:
- {fileID: 181010488}
- {fileID: 1863600391}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &980091466
MonoBehaviour:
@ -24098,7 +24141,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 129.88583}
m_AnchoredPosition: {x: 0, y: 113.91141}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1154875944
@ -25802,11 +25845,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1264012261}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1861169746}
m_Father: {fileID: 311438945}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
@ -30911,7 +30954,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -42.495026}
m_AnchoredPosition: {x: 0, y: -42.49505}
m_SizeDelta: {x: 1440.022, y: -84.99}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1527251881
@ -31649,6 +31692,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
rectTransform: {fileID: 1542666926}
raycastRect: {fileID: 738028140}
moving: 0
hovering: 0
sectionLabel: {fileID: 297792673}
chartLine: {fileID: 856705695}
@ -32469,7 +32513,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1292844878}
m_HandleRect: {fileID: 1292844877}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -33310,12 +33354,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1671351974}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1906769993}
m_Father: {fileID: 1861169746}
m_Father: {fileID: 311438945}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -34493,7 +34537,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -27.993042}
m_AnchoredPosition: {x: 0, y: -27.993034}
m_SizeDelta: {x: 32, y: -55.985}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1747224097
@ -35373,7 +35417,7 @@ RectTransform:
m_Children:
- {fileID: 202724642}
- {fileID: 2098678240}
- {fileID: 1861169746}
- {fileID: 311438945}
- {fileID: 1110073995}
- {fileID: 1050802356}
- {fileID: 703340359}
@ -35387,7 +35431,7 @@ RectTransform:
- {fileID: 1063174879}
- {fileID: 1090036110}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -36075,7 +36119,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -84.98996}
m_AnchoredPosition: {x: 0, y: -84.989975}
m_SizeDelta: {x: 320, y: -84.99}
m_Pivot: {x: 0, y: 1}
--- !u!1 &1852819572
@ -36203,7 +36247,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1856185012}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -36211,7 +36255,7 @@ RectTransform:
- {fileID: 954835804}
- {fileID: 1511927531}
- {fileID: 284286598}
m_Father: {fileID: 1861169746}
m_Father: {fileID: 311438945}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -36246,20 +36290,14 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1264012262}
- {fileID: 441876681}
- {fileID: 1980243266}
- {fileID: 1671351975}
- {fileID: 446434229}
- {fileID: 1856185013}
m_Father: {fileID: 1791483803}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 641, y: 15.64502}
m_SizeDelta: {x: 1278, y: -18.721}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1861169747
MonoBehaviour:
@ -38793,11 +38831,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980243265}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1861169746}
m_Father: {fileID: 311438945}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -40435,7 +40473,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -42.495026}
m_AnchoredPosition: {x: 0, y: -42.49505}
m_SizeDelta: {x: 1054, y: -84.99}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2066632681

View File

@ -1,8 +1,8 @@
using System;
public static class AppInfo {
public const string Version = "0.0.966";
public static readonly DateTime Date = new DateTime(2023, 02, 04, 20, 32, 48, 156, DateTimeKind.Utc);
public const string Version = "0.0.967";
public static readonly DateTime Date = new DateTime(2023, 02, 05, 02, 49, 33, 317, DateTimeKind.Utc);
}

View File

@ -90,14 +90,14 @@ namespace HeavenStudio.Editor.Track
if (count > 0) transform.GetChild(0).gameObject.SetActive(false);
}
if (scrollRect.content.anchoredPosition.x != lastPosX)
if (rectTransform.anchoredPosition.x != lastPosX)
{
UpdateGridNum();
}
lastContentScale = scrollRect.content.localScale.x;
lastTimelineSize = scrollRect.viewport.rect.size.x;
lastPosX = scrollRect.content.anchoredPosition.x;
lastPosX = rectTransform.anchoredPosition.x;
}
private void UpdateGridNum()

View File

@ -524,6 +524,7 @@ namespace HeavenStudio.Editor
GameManager.instance.OverlayCamera.rect = new Rect(0, 0, 1, 1);
EditorCamera.rect = new Rect(0, 0, 1, 1);
}
Timeline.AutoBtnUpdate();
}
private void UpdateEditorStatus(bool updateTime)

View File

@ -26,6 +26,9 @@ namespace HeavenStudio.Editor
for (int i = 0; i < buggedSelections.Count; i++)
Deselect(buggedSelections[i]);
}
if (Input.GetKey(KeyCode.LeftControl))
if (Input.GetKeyDown(KeyCode.A))
SelectAll();
}
public void ClickSelect(TimelineEventObj eventToAdd)
@ -56,6 +59,14 @@ namespace HeavenStudio.Editor
}
}
public void SelectAll()
{
DeselectAll();
var eventObjs = Timeline.instance.eventObjs;
for (int i = 0; i < eventObjs.Count; i++)
eventsSelected.Add(eventObjs[i]);
}
public void DeselectAll()
{
eventsSelected.Clear();

View File

@ -7,6 +7,7 @@ namespace HeavenStudio.Editor.Track
{
public override void OnBeginDrag(PointerEventData eventData)
{
if (Conductor.instance.isPlaying) return;
if (eventData.button != PointerEventData.InputButton.Middle) return;
eventData.button = PointerEventData.InputButton.Left;
base.OnBeginDrag(eventData);
@ -14,6 +15,7 @@ namespace HeavenStudio.Editor.Track
public override void OnEndDrag(PointerEventData eventData)
{
if (Conductor.instance.isPlaying) return;
if (eventData.button != PointerEventData.InputButton.Middle) return;
eventData.button = PointerEventData.InputButton.Left;
base.OnEndDrag(eventData);
@ -21,6 +23,7 @@ namespace HeavenStudio.Editor.Track
public override void OnDrag(PointerEventData eventData)
{
if (Conductor.instance.isPlaying) return;
if (eventData.button != PointerEventData.InputButton.Middle) return;
eventData.button = PointerEventData.InputButton.Left;
base.OnDrag(eventData);

View File

@ -225,5 +225,10 @@ namespace HeavenStudio.Editor.Track
//auto-open the dialog
sectionTimelineObj.OnRightClick();
}
public bool InteractingWithEvents()
{
return specialTimelineObjs.FindAll(c => c.hovering == true).Count > 0 || specialTimelineObjs.FindAll(c => c.moving == true).Count > 0;
}
}
}

View File

@ -15,11 +15,11 @@ namespace HeavenStudio.Editor.Track
[SerializeField] private RectTransform raycastRect;
private float startPosX;
private bool moving = false;
public bool hovering;
private float lastPosX;
public bool moving = false;
public bool hovering;
private void Start()
{
rectTransform = GetComponent<RectTransform>();

View File

@ -259,11 +259,11 @@ namespace HeavenStudio.Editor.Track
ZoomInBTN.onClick.AddListener(delegate
{
zoomComponent.ZoomIn(3, Vector2.zero);
zoomComponent.ZoomIn(1, Vector2.zero);
});
ZoomOutBTN.onClick.AddListener(delegate
{
zoomComponent.ZoomOut(-3, Vector2.zero);
zoomComponent.ZoomOut(-1, Vector2.zero);
});
ZoomResetBTN.onClick.AddListener(delegate
{
@ -440,13 +440,13 @@ namespace HeavenStudio.Editor.Track
}
float moveSpeed = 750;
if (Input.GetKey(KeyCode.LeftShift)) moveSpeed *= 6;
if (Input.GetKey(KeyCode.LeftArrow) || Input.GetKey(KeyCode.A))
if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)) moveSpeed *= 6;
if (Input.GetKey(KeyCode.LeftArrow) || (!Input.GetKey(KeyCode.LeftControl) && Input.GetKey(KeyCode.A)))
{
TimelineContent.transform.localPosition += new Vector3(moveSpeed * Time.deltaTime, 0);
}
else if (Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.D))
else if (Input.GetKey(KeyCode.RightArrow) || (!Input.GetKey(KeyCode.LeftControl) && Input.GetKey(KeyCode.D)))
{
TimelineContent.transform.localPosition += new Vector3(-moveSpeed * Time.deltaTime, 0);
}

View File

@ -35,11 +35,11 @@ namespace HeavenStudio.Editor.Track
_scaleIncrement = 0.1f * _scale.x;
if (delta > 0 && _scale.x < _maximumScale)
if (delta > 0)
{
ZoomIn(delta, relativeMousePosition);
}
else if (delta < 0 && _scale.x > _minimumScale)
else if (delta < 0)
{
ZoomOut(delta, relativeMousePosition);
}
@ -47,6 +47,9 @@ namespace HeavenStudio.Editor.Track
public void ZoomIn(float delta, Vector2 relativeMousePosition)
{
if (!(_scale.x < _maximumScale)) return;
if (Timeline.instance.InteractingWithEvents() || SpecialTimeline.instance.InteractingWithEvents()) return;
float incre = _scaleIncrement * delta;
var newScale = Mathf.Clamp(_scale.x + incre, _minimumScale, _maximumScale);
@ -58,6 +61,9 @@ namespace HeavenStudio.Editor.Track
public void ZoomOut(float delta, Vector2 relativeMousePosition)
{
if (!(_scale.x > _minimumScale)) return;
if (Timeline.instance.InteractingWithEvents() || SpecialTimeline.instance.InteractingWithEvents()) return;
float incre = _scaleIncrement * -delta;
var newScale = _scale.x - incre;

View File

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.966
bundleVersion: 0.0.967
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -155,11 +155,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.Megaminerzero.HeavenStudio
buildNumber:
Standalone: 966
Standalone: 967
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 966
AndroidBundleVersionCode: 967
AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1