mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixes 1

Browse source
This commit is contained in:
Braedon Lewis 2023-09-27 12:38:18 -04:00
parent 6bd7a8ca23
commit de31d50efa
13 changed files with 1487 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

1307
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset
View file

File diff suppressed because one or more lines are too long

45
Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

4
Assets/Resources/Prefabs/GameView/GameTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1600
m_Height: 900
m_Width: 1365
m_Height: 768
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92

4
Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 2400
m_Height: 1350
m_Width: 2047
m_Height: 1152
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 92

15
Assets/Scenes/Editor.unity
View file

@ -4719,7 +4719,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -400, y: 0}
m_AnchoredPosition: {x: -399.99994, y: 0}
m_SizeDelta: {x: -800.0001, y: 194}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &195260752
@ -10073,7 +10073,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 177.66986, y: -60.01}
m_AnchoredPosition: {x: 177.66988, y: -60.01}
m_SizeDelta: {x: 42, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &449176922
@ -12015,7 +12015,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding: {x: 0, y: 0, z: 0, w: 0}
m_Padding: {x: 0, y: 0, z: 0, w: -1}
m_Softness: {x: 0, y: 0}
--- !u!1 &552375320
GameObject:
@ -25238,7 +25238,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: 162.32652}
m_AnchoredPosition: {x: 0, y: 135.38774}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@ -30404,7 +30404,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -400, y: 0}
m_AnchoredPosition: {x: -399.99994, y: 0}
m_SizeDelta: {x: -800.0001, y: 194}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1426168094
@ -34283,8 +34283,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
m_Value: 1.0000017
m_Size: 0.9467054
m_Value: 1.0000004
m_Size: 0.72349864
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -37984,6 +37984,7 @@ MonoBehaviour:
snapInterval: 0.25
waveform: {fileID: 743531237}
layerBG: {fileID: 1268674681}
zoomComponent: {fileID: 1702073032}
resizeCursor: {fileID: 0}
PlaybackBeat: 0
TopPanel: {fileID: 861177305}

4
Assets/Scripts/AppInfo.cs
View file

@ -1,8 +1,8 @@
using System;
public static class AppInfo {
public const string Version = "0.0.995";
public static readonly DateTime Date = new DateTime(2023, 09, 27, 06, 41, 29, 567, DateTimeKind.Utc);
public const string Version = "0.0.996";
public static readonly DateTime Date = new DateTime(2023, 09, 27, 07, 19, 01, 343, DateTimeKind.Utc);
}

3
Assets/Scripts/LevelEditor/Selections.cs
View file

@ -78,6 +78,8 @@ namespace HeavenStudio.Editor
public void SelectAll()
{
return;
/*
DeselectAll();
var eventObjs = Timeline.instance.eventObjs;
for (int i = 0; i < eventObjs.Count; i++)
@ -88,6 +90,7 @@ namespace HeavenStudio.Editor
eventsSelected.Add(eventObjs[i]);
}
TimelineBlockManager.Instance.SortMarkers();
*/
}
public void DeselectAll()

37
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -21,7 +21,6 @@ namespace HeavenStudio.Editor.Track
[SerializeField] private TMP_Text CurrentTempo;
[Header("Timeline Properties")]
public List<TimelineEventObj> eventObjs = new List<TimelineEventObj>();
private bool lastFrameDrag;
public int LayerCount = 5;
public bool metronomeEnabled;
@ -33,6 +32,7 @@ namespace HeavenStudio.Editor.Track
[Header("Components")]
[SerializeField] private RawImage waveform;
[SerializeField] private Image layerBG;
[SerializeField] private TimelineZoom zoomComponent;
public Texture2D resizeCursor;
public float WidthPerBeat { get; private set; } = 100.0f;
@ -203,13 +203,6 @@ namespace HeavenStudio.Editor.Track
public void LoadRemix()
{
// beatmap entities
for (int i = 0; i < eventObjs.Count; i++)
{
Destroy(eventObjs[i].gameObject);
}
eventObjs.Clear();
/*
for (int i = 0; i < GameManager.instance.Beatmap.Entities.Count; i++)
{
@ -294,15 +287,15 @@ namespace HeavenStudio.Editor.Track
ZoomInBTN.onClick.AddListener(delegate
{
// zoomComponent.ZoomIn(0.015f * TimelineContent.localScale.x, Vector2.zero);
zoomComponent.Zoom(0.25f * zoomComponent.Scale.x, Vector2.zero);
});
ZoomOutBTN.onClick.AddListener(delegate
{
// zoomComponent.ZoomOut(-0.0125f * TimelineContent.localScale.x, Vector2.zero);
zoomComponent.Zoom(-0.2f * zoomComponent.Scale.x, Vector2.zero);
});
ZoomResetBTN.onClick.AddListener(delegate
{
// zoomComponent.ResetZoom();
zoomComponent.ResetZoom();
});
WaveformBTN.onClick.AddListener(delegate
{
@ -952,8 +945,6 @@ namespace HeavenStudio.Editor.Track
entity["track"] = marker.GetTrack();
}
eventObjs.Add(marker);
CommandManager.Instance.AddCommand(new Commands.Place(marker.entity, marker.entity.guid));
return marker;
@ -1104,26 +1095,6 @@ namespace HeavenStudio.Editor.Track
return dup;
}
public void DestroyEventObject(RiqEntity entity)
{
if (EventParameterManager.instance.entity == entity)
EventParameterManager.instance.Disable();
// eventObjs.Remove(entity.eventObj);
foreach (TimelineEventObj e in eventObjs)
{
if (e.entity == entity)
{
Destroy(e.gameObject);
eventObjs.Remove(e);
break;
}
}
GameManager.instance.Beatmap.Entities.Remove(entity);
GameManager.instance.SortEventsList();
}
public float SnapToLayer(float y)
{
float size = LayerHeight();

6
Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
View file

@ -100,6 +100,7 @@ namespace HeavenStudio.Editor.Track
if (gameAction != null)
{
this.resizable = gameAction.resizable;
if (gameAction.resizable == false)
{
rectTransform.sizeDelta = new Vector2(gameAction.defaultLength * Timeline.instance.PixelsPerBeat, Timeline.instance.LayerHeight());
@ -107,7 +108,6 @@ namespace HeavenStudio.Editor.Track
}
else
{
this.resizable = true;
if (entity != null && gameAction.defaultLength != entity.length)
{
rectTransform.sizeDelta = new Vector2(entity.length * Timeline.instance.PixelsPerBeat, Timeline.instance.LayerHeight());
@ -528,10 +528,6 @@ namespace HeavenStudio.Editor.Track
// better safety net than canada's healthcare system
// this is still hilarious
// GameManager.instance.Beatmap.Entities.Remove(GameManager.instance.Beatmap.Entities.Find(c => c.eventObj = this));
// FINALLY, A USE CASE FOR THIS FUNCTION
if (Timeline.instance.eventObjs.Contains(this))
Timeline.instance.eventObjs.Remove(this);
}
#endregion

3
Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs
View file

@ -5,6 +5,8 @@ namespace HeavenStudio.Editor.Track
{
public class TimelineZoom : MonoBehaviour, IScrollHandler
{
public Vector3 Scale => _scale;
[SerializeField] private float minScale = 0.5f;
[SerializeField] private float maxScale => float.MaxValue;
[SerializeField] private Vector2 initialScale = Vector2.one;
@ -77,6 +79,7 @@ namespace HeavenStudio.Editor.Track
{
_scale.Set(1, 1, 1);
rectTransform.localScale = _scale;
Timeline.instance.OnZoom(_scale.x);
}
}
}

45
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View file

File diff suppressed because one or more lines are too long

6
ProjectSettings/ProjectSettings.asset
View file

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.995
bundleVersion: 0.0.996
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
Standalone: 995
Standalone: 996
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 995
AndroidBundleVersionCode: 996
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1