diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs index a6516c81..c940c3f1 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs @@ -25,7 +25,7 @@ public DrawPlayerLocationHelper() arr[0].rotation = 0f; texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\playerLoc.png"); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("playerLoc", out size, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("playerLoc", out size, out _)) size = new Vector2(48, 48); UpdateProps(); diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/CommonLaneEditorObjectDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/CommonLaneEditorObjectDrawingTarget.cs index 0ee4696d..848e3019 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/CommonLaneEditorObjectDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/CommonLaneEditorObjectDrawingTarget.cs @@ -32,11 +32,11 @@ public CommonLaneEditorObjectDrawingTarget() textureDrawing = IoC.Get(); highlightDrawing = IoC.Get(); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("laneStart", out startSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("laneStart", out startSize, out _)) startSize = new Vector2(16, 16); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("laneNext", out nextSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("laneNext", out nextSize, out _)) nextSize = new Vector2(16, 16); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("laneEnd", out endSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("laneEnd", out endSize, out _)) endSize = new Vector2(16, 16); } diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs index 0305eec2..b67cd635 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs @@ -36,7 +36,7 @@ public class LaneCurvePathControlDrawingTarget : CommonBatchDrawTargetBase(); diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs index 88093d30..f345efbd 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs @@ -31,7 +31,7 @@ public class SvgObjectDrawingTarget : CommonDrawTargetBase, IDisp public SvgObjectDrawingTarget() { texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\commonCircle.png"); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("commonCircle", out size, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("commonCircle", out size, out _)) size = new Vector2(16, 16); cachedSvgRenderDataManager = IoC.Get(); diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BellDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BellDrawingTarget.cs index 856ba8de..48289486 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BellDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BellDrawingTarget.cs @@ -25,7 +25,7 @@ public BellDrawingTarget() { texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\bell.png"); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("bell", out var size, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("bell", out var size, out _)) size = new Vector2(40, 40); sizeNormal = size; sizeLarge = sizeNormal * 1.4f; diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BulletDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BulletDrawingTarget.cs index e3023f92..3fb22627 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BulletDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/BulletBell/BulletDrawingTarget.cs @@ -47,7 +47,7 @@ void SetTexture(BulletDamageType k1, BulletType k2, string rPath, string key, Ve normalDrawList[tex] = new(); selectedDrawList[tex] = new(); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile(key + "Normal", out var cfgSize, out var cfgOrigin)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile(key + "Normal", out var cfgSize, out var cfgOrigin)) { cfgSize = size; cfgOrigin = origOffset; @@ -55,7 +55,7 @@ void SetTexture(BulletDamageType k1, BulletType k2, string rPath, string key, Ve _spritesSize[tex] = cfgSize; _spritesOriginOffset[tex] = cfgOrigin; - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile(key + "Large", out cfgSize, out cfgOrigin)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile(key + "Large", out cfgSize, out cfgOrigin)) { cfgSize = sizeLarge; cfgOrigin = origOffsetLarge; diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/FlickDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/FlickDrawingTarget.cs index 0d237ce3..46f7c591 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/FlickDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/FlickDrawingTarget.cs @@ -37,12 +37,12 @@ public FlickDrawingTarget() : base() texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\flick.png"); exFlickEffTexture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\exflickEffect.png"); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("flick", out var size, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("flick", out var size, out _)) size = new Vector2(104, 69.333f); leftSize = size; rightSize = size * new Vector2(-1, 1); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("exflickEffect", out size, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("exflickEffect", out size, out _)) size = new Vector2(106, 67f); exTapEffSize = size; selectedEffSize = size * 1.05f; diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/TapDrawingTarget.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/TapDrawingTarget.cs index 8d10c5b3..98be2720 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/TapDrawingTarget.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/OngekiObjects/TapDrawingTarget.cs @@ -52,17 +52,17 @@ void init(ref Texture texture, string resourceName) selectTapList[texture] = new(); } - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("tap", out tapSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("tap", out tapSize, out _)) tapSize = new Vector2(40, 16); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("exTapEffect", out exTapEffSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("exTapEffect", out exTapEffSize, out _)) exTapEffSize = new Vector2(70, 30); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("wall", out leftWallSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("wall", out leftWallSize, out _)) leftWallSize = new Vector2(40, 40); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("selectWallTapEffect", out selectWallTapEffSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("selectWallTapEffect", out selectWallTapEffSize, out _)) selectWallTapEffSize = new Vector2(50, 50); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("selectTapEffect", out selectTapEffSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("selectTapEffect", out selectTapEffSize, out _)) selectTapEffSize = tapSize * new Vector2(1.5f, 1.5f); - if (!ResourceUtils.OpenReadTextureSizeOriginByConfigFile("exWallTapEffect", out exWallTapEffSize, out _)) + if (!ResourceUtils.OpenReadTextureSizeAnchorByConfigFile("exWallTapEffect", out exWallTapEffSize, out _)) exWallTapEffSize = new Vector2(43, 43); init(ref redTexture, "redTap.png"); diff --git a/OngekiFumenEditor/OngekiFumenEditor.csproj b/OngekiFumenEditor/OngekiFumenEditor.csproj index d5994fa3..f3197175 100644 --- a/OngekiFumenEditor/OngekiFumenEditor.csproj +++ b/OngekiFumenEditor/OngekiFumenEditor.csproj @@ -415,7 +415,7 @@ PreserveNewest - + PreserveNewest diff --git a/OngekiFumenEditor/Resources/editor/textureSizeOrigin.ini b/OngekiFumenEditor/Resources/editor/textureSizeAnchor.ini similarity index 67% rename from OngekiFumenEditor/Resources/editor/textureSizeOrigin.ini rename to OngekiFumenEditor/Resources/editor/textureSizeAnchor.ini index be1dfc19..95300751 100644 --- a/OngekiFumenEditor/Resources/editor/textureSizeOrigin.ini +++ b/OngekiFumenEditor/Resources/editor/textureSizeAnchor.ini @@ -1,22 +1,22 @@ -[TextureSizeOrigin] +[TextureSizeAnchor] bellSize=40, 40 flickSize=104, 69.333 exflickEffectSize=106, 67 bulletCircleNormalSize=40, 40 -bulletCircleNormalOrigin=0, 0 +bulletCircleNormalAnchor=0, 0 bulletCircleLargeSize=56, 56 -bulletCircleLargeOrigin=0, 0 +bulletCircleLargeAnchor=0, 0 bulletNeedleNormalSize=30, 80 -bulletNeedleNormalOrigin=0, 35 +bulletNeedleNormalAnchor=0, 35 bulletNeedleLargeSize=42, 112 -bulletNeedleLargeOrigin=0, 49 +bulletNeedleLargeAnchor=0, 49 bulletSquareNormalSize=30, 80 -bulletSquareNormalOrigin=0, 35 +bulletSquareNormalAnchor=0, 35 bulletSquareLargeSize=42, 112 -bulletSquareLargeOrigin=0, 49 +bulletSquareLargeAnchor=0, 49 commonCircleSize=16, 16 diff --git a/OngekiFumenEditor/Utils/ResourceUtils.cs b/OngekiFumenEditor/Utils/ResourceUtils.cs index 0e2e687b..776586bc 100644 --- a/OngekiFumenEditor/Utils/ResourceUtils.cs +++ b/OngekiFumenEditor/Utils/ResourceUtils.cs @@ -39,7 +39,7 @@ public static Texture OpenReadTextureFromFile(string path) static ResourceUtils() { - var iniFilePath = Path.GetFullPath(@".\Resources\editor\textureSizeOrigin.ini"); + var iniFilePath = Path.GetFullPath(@".\Resources\editor\textureSizeAnchor.ini"); foreach (var line in File.ReadAllLines(iniFilePath)) { var split = line.Split("="); @@ -50,23 +50,23 @@ static ResourceUtils() } } - public static string ReadTextureSizeOrigin(string key) + public static string ReadTextureSizeAnchor(string key) { if (textureSizeOriginMap.TryGetValue(key, out var val)) return val; return string.Empty; } - public static bool OpenReadTextureSizeOriginByConfigFile(string textureName, out Vector2 size, out Vector2 origin) + public static bool OpenReadTextureSizeAnchorByConfigFile(string textureName, out Vector2 size, out Vector2 anchor) { size = default; - origin = default; + anchor = default; var good = false; try { var key = textureName + "Size"; - var str = ReadTextureSizeOrigin(key); + var str = ReadTextureSizeAnchor(key); if (!string.IsNullOrWhiteSpace(str)) { var split = str.Split(','); @@ -78,16 +78,16 @@ public static bool OpenReadTextureSizeOriginByConfigFile(string textureName, out Log.LogWarn($"size key {key} is not found."); } - key = textureName + "Origin"; - str = ReadTextureSizeOrigin(key); + key = textureName + "Anchor"; + str = ReadTextureSizeAnchor(key); if (!string.IsNullOrWhiteSpace(str)) { var split = str.Split(','); - origin = new(float.Parse(split[0].Trim()), float.Parse(split[1].Trim())); + anchor = new(float.Parse(split[0].Trim()), float.Parse(split[1].Trim())); } else { - //Log.LogWarn($"origin key {key} is not found."); + //Log.LogWarn($"anchor key {key} is not found."); } return good;