From a8231f7c86176da9ac009d321e5578aa818363ea Mon Sep 17 00:00:00 2001 From: PopSlime Date: Fri, 19 May 2023 23:17:32 +0800 Subject: [PATCH] Code cleanup. --- Assets/Cryville/Crtr/Browsing/DetailPanel.cs | 3 --- Assets/Cryville/Crtr/ChartHandler.cs | 2 +- Assets/Cryville/Crtr/Components/PolygonSGO.cs | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs b/Assets/Cryville/Crtr/Browsing/DetailPanel.cs index d82e42c..e5a375b 100644 --- a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs +++ b/Assets/Cryville/Crtr/Browsing/DetailPanel.cs @@ -1,5 +1,4 @@ using Cryville.Common; -using Cryville.Common.Unity.UI; using System; using TMPro; using UnityEngine; @@ -16,7 +15,6 @@ namespace Cryville.Crtr.Browsing { ChartDetail _data; GameObject _placeholder; GameObject _outerContent; - DockOccupiedRatioLayoutGroup _outerContentGroup; Transform _content; Image _cover; TMP_Text _title; @@ -26,7 +24,6 @@ namespace Cryville.Crtr.Browsing { base.Awake(); _placeholder = transform.Find("__placeholder__").gameObject; _outerContent = transform.Find("__content__").gameObject; - _outerContentGroup = _outerContent.GetComponent(); _content = _outerContent.transform.Find("__content__"); _cover = _content.Find("Cover").GetComponent(); _title = _content.Find("Texts/Title").GetComponent(); diff --git a/Assets/Cryville/Crtr/ChartHandler.cs b/Assets/Cryville/Crtr/ChartHandler.cs index 54e2280..919b56c 100644 --- a/Assets/Cryville/Crtr/ChartHandler.cs +++ b/Assets/Cryville/Crtr/ChartHandler.cs @@ -7,7 +7,7 @@ namespace Cryville.Crtr { public class ChartHandler : TransformHandler { protected override TransformHandler Parent { get { return null; } } - Chart chart; + readonly Chart chart; readonly List sounds = new List(); public ChartHandler(Chart _chart) { diff --git a/Assets/Cryville/Crtr/Components/PolygonSGO.cs b/Assets/Cryville/Crtr/Components/PolygonSGO.cs index 6a1eb51..582b03e 100644 --- a/Assets/Cryville/Crtr/Components/PolygonSGO.cs +++ b/Assets/Cryville/Crtr/Components/PolygonSGO.cs @@ -140,13 +140,13 @@ namespace Cryville.Crtr.Components { verts = _vertPool.Rent(vc * vcpsec); uvs = _uvPool.Rent(vc * vcpsec); - int i = 0; int t = 0; float l = 0; int m = 0; - if (head.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); } - m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); - if (tail.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); } + int i = 0; int t = 0; float l = 0; + if (head.Frame != null) { GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); } + GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); + if (tail.Frame != null) { GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); } mesh.Mesh.subMeshCount = 3; - m = 0; + int m = 0; mesh.Mesh.SetVertices(verts); mesh.Mesh.SetUVs(0, uvs); mesh.Mesh.SetTriangles(head.Frame == null ? _emptyTris : trih, m++);