expose editor texture resources

NyagekiFumenProject · Oct 25, 2024 · 9ca9d4d · 9ca9d4d
1 parent 44dad27
commit 9ca9d4d
Show file tree

Hide file tree

Showing 65 changed files with 539 additions and 1,021 deletions.
diff --git a/...umenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs b/...umenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs
@@ -23,7 +23,7 @@ public DrawPlayerLocationHelper()
         textureDrawing = IoC.Get<ITextureDrawing>();
         arr[0].rotation = 0f;
 
-        texture = ResourceUtils.OpenReadTextureFromResource(@"Modules\FumenVisualEditor\Views\OngekiObjects\playerLoc.png");
+        texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\playerLoc.png");
 
         UpdateProps();
         Properties.EditorGlobalSetting.Default.PropertyChanged += Default_PropertyChanged;

diff --git a/...phics/Drawing/TargetImpl/EditorObjects/Lane/AutoPlayFaderLaneEditorObjectDrawingTarget.cs b/...phics/Drawing/TargetImpl/EditorObjects/Lane/AutoPlayFaderLaneEditorObjectDrawingTarget.cs
@@ -3,20 +3,20 @@
 
 namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
 {
-	[Export(typeof(IFumenEditorDrawingTarget))]
-	internal class AutoPlayFaderLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
-	{
-		public override IEnumerable<string> DrawTargetID { get; } = new[]
-		{
-			"[APFS]",
-		};
+    [Export(typeof(IFumenEditorDrawingTarget))]
+    internal class AutoPlayFaderLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
+    {
+        public override IEnumerable<string> DrawTargetID { get; } = new[]
+        {
+            "[APFS]",
+        };
 
-		public AutoPlayFaderLaneEditorObjectDrawingTarget() : base(
-			LoadTextrueFromDefaultResource("NS.png"),
-			LoadTextrueFromDefaultResource("NN.png"),
-			LoadTextrueFromDefaultResource("NE.png")
-			)
-		{
-		}
-	}
+        public AutoPlayFaderLaneEditorObjectDrawingTarget() : base(
+            LoadTextrueFromDefaultResource("laneStart.png"),
+            LoadTextrueFromDefaultResource("laneNext.png"),
+            LoadTextrueFromDefaultResource("laneEnd.png")
+            )
+        {
+        }
+    }
 }
diff --git a/...ualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/BeamEditorObjectDrawingTarget.cs b/...ualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/BeamEditorObjectDrawingTarget.cs
@@ -3,21 +3,21 @@
 
 namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
 {
-	[Export(typeof(IFumenEditorDrawingTarget))]
-	internal class BeamEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
-	{
-		public override IEnumerable<string> DrawTargetID { get; } = new[]
-		{
-			"BMS","OBS"
+    [Export(typeof(IFumenEditorDrawingTarget))]
+    internal class BeamEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
+    {
+        public override IEnumerable<string> DrawTargetID { get; } = new[]
+        {
+            "BMS","OBS"
         };
 
-		public BeamEditorObjectDrawingTarget() : base(
-			LoadTextrueFromDefaultResource("NS.png"),
-			LoadTextrueFromDefaultResource("NN.png"),
-			LoadTextrueFromDefaultResource("NE.png")
-			)
-		{
+        public BeamEditorObjectDrawingTarget() : base(
+            LoadTextrueFromDefaultResource("laneStart.png"),
+            LoadTextrueFromDefaultResource("laneNext.png"),
+            LoadTextrueFromDefaultResource("laneEnd.png")
+            )
+        {
 
-		}
-	}
+        }
+    }
 }
diff --git a/...tor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/NormalLaneEditorObjectDrawingTarget.cs b/...tor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/NormalLaneEditorObjectDrawingTarget.cs
@@ -3,20 +3,20 @@
 
 namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
 {
-	[Export(typeof(IFumenEditorDrawingTarget))]
-	internal class NormalLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
-	{
-		public override IEnumerable<string> DrawTargetID { get; } = new[]
-		{
-			"LLS","LCS","LRS","CLS","ENS"
-		};
+    [Export(typeof(IFumenEditorDrawingTarget))]
+    internal class NormalLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
+    {
+        public override IEnumerable<string> DrawTargetID { get; } = new[]
+        {
+            "LLS","LCS","LRS","CLS","ENS"
+        };
 
-		public NormalLaneEditorObjectDrawingTarget() : base(
-			LoadTextrueFromDefaultResource("NS.png"),
-			LoadTextrueFromDefaultResource("NN.png"),
-			LoadTextrueFromDefaultResource("NE.png")
-			)
-		{
-		}
-	}
+        public NormalLaneEditorObjectDrawingTarget() : base(
+            LoadTextrueFromDefaultResource("laneStart.png"),
+            LoadTextrueFromDefaultResource("laneNext.png"),
+            LoadTextrueFromDefaultResource("laneEnd.png")
+            )
+        {
+        }
+    }
 }
diff --git a/...or/Graphics/Drawing/TargetImpl/EditorObjects/Lane/TextureLaneEditorObjectDrawingTarget.cs b/...or/Graphics/Drawing/TargetImpl/EditorObjects/Lane/TextureLaneEditorObjectDrawingTarget.cs
@@ -1,27 +1,27 @@
 using OngekiFumenEditor.Kernel.Graphics.Base;
+using OngekiFumenEditor.Utils;
 using System;
 using System.Drawing;
 
 namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
 {
-	public abstract class TextureLaneEditorObjectDrawingTarget : CommonLaneEditorObjectDrawingTarget
-	{
-		public static Texture LoadTextrueFromDefaultResource(string rPath)
-		{
-			var info = System.Windows.Application.GetResourceStream(new Uri(@"Modules\FumenVisualEditor\Views\OngekiObjects\" + rPath, UriKind.Relative));
-			using var bitmap = Image.FromStream(info.Stream) as Bitmap;
-			return new Texture(bitmap);
-		}
+    public abstract class TextureLaneEditorObjectDrawingTarget : CommonLaneEditorObjectDrawingTarget
+    {
+        public static Texture LoadTextrueFromDefaultResource(string rPath)
+        {
+            var texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\" + rPath);
+            return texture;
+        }
 
-		public override Texture StartEditorTexture { get; }
-		public override Texture NextEditorTexture { get; }
-		public override Texture EndEditorTexture { get; }
+        public override Texture StartEditorTexture { get; }
+        public override Texture NextEditorTexture { get; }
+        public override Texture EndEditorTexture { get; }
 
-		public TextureLaneEditorObjectDrawingTarget(Texture startEditorTexture, Texture nextEditorTexture, Texture endEditorTexture)
-		{
-			StartEditorTexture = startEditorTexture;
-			NextEditorTexture = nextEditorTexture;
-			EndEditorTexture = endEditorTexture;
-		}
-	}
+        public TextureLaneEditorObjectDrawingTarget(Texture startEditorTexture, Texture nextEditorTexture, Texture endEditorTexture)
+        {
+            StartEditorTexture = startEditorTexture;
+            NextEditorTexture = nextEditorTexture;
+            EndEditorTexture = endEditorTexture;
+        }
+    }
 }
diff --git a/...ditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/WallLaneEditorObjectDrawingTarget.cs b/...ditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/WallLaneEditorObjectDrawingTarget.cs
@@ -3,20 +3,20 @@
 
 namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
 {
-	[Export(typeof(IFumenEditorDrawingTarget))]
-	internal class WallLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
-	{
-		public override IEnumerable<string> DrawTargetID { get; } = new[]
-		{
-			"WLS","WRS"
-		};
+    [Export(typeof(IFumenEditorDrawingTarget))]
+    internal class WallLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
+    {
+        public override IEnumerable<string> DrawTargetID { get; } = new[]
+        {
+            "WLS","WRS"
+        };
 
-		public WallLaneEditorObjectDrawingTarget() : base(
-			LoadTextrueFromDefaultResource("WS.png"),
-			LoadTextrueFromDefaultResource("WN.png"),
-			LoadTextrueFromDefaultResource("WE.png")
-			)
-		{
-		}
-	}
+        public WallLaneEditorObjectDrawingTarget() : base(
+            LoadTextrueFromDefaultResource("wallStart.png"),
+            LoadTextrueFromDefaultResource("wallNext.png"),
+            LoadTextrueFromDefaultResource("wallEnd.png")
+            )
+        {
+        }
+    }
 }
diff --git a/...sualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs b/...sualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs
@@ -34,7 +34,7 @@ public class LaneCurvePathControlDrawingTarget : CommonBatchDrawTargetBase<LaneC
 
 		public LaneCurvePathControlDrawingTarget()
 		{
-			texture = ResourceUtils.OpenReadTextureFromResource(@"Modules\FumenVisualEditor\Views\OngekiObjects\CC.png");
+			texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\commonCircle.png");
 			textureDrawing = IoC.Get<IBatchTextureDrawing>();
 			stringDrawing = IoC.Get<IStringDrawing>();
 			highlightDrawing = IoC.Get<IHighlightBatchTextureDrawing>();

diff --git a/...FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs b/...FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs
@@ -29,7 +29,7 @@ public class SvgObjectDrawingTarget : CommonDrawTargetBase<SvgPrefabBase>, IDisp
 
 		public SvgObjectDrawingTarget()
 		{
-			texture = ResourceUtils.OpenReadTextureFromResource(@"Modules\FumenVisualEditor\Views\OngekiObjects\CC.png");
+			texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\commonCircle.png");
 
 			cachedSvgRenderDataManager = IoC.Get<ICachedSvgRenderDataManager>();
 			lineDrawing = IoC.Get<ISimpleLineDrawing>();