Skip to content

Commit 9ca9d4d

Browse files
MikiraSoraMikiraSora
committed
expose editor texture resources
1 parent 44dad27 commit 9ca9d4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+539
-1021
lines changed

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawPlayerLocationHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public DrawPlayerLocationHelper()
2323
textureDrawing = IoC.Get<ITextureDrawing>();
2424
arr[0].rotation = 0f;
2525

26-
texture = ResourceUtils.OpenReadTextureFromResource(@"Modules\FumenVisualEditor\Views\OngekiObjects\playerLoc.png");
26+
texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\playerLoc.png");
2727

2828
UpdateProps();
2929
Properties.EditorGlobalSetting.Default.PropertyChanged += Default_PropertyChanged;

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/AutoPlayFaderLaneEditorObjectDrawingTarget.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
55
{
6-
[Export(typeof(IFumenEditorDrawingTarget))]
7-
internal class AutoPlayFaderLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8-
{
9-
public override IEnumerable<string> DrawTargetID { get; } = new[]
10-
{
11-
"[APFS]",
12-
};
6+
[Export(typeof(IFumenEditorDrawingTarget))]
7+
internal class AutoPlayFaderLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8+
{
9+
public override IEnumerable<string> DrawTargetID { get; } = new[]
10+
{
11+
"[APFS]",
12+
};
1313

14-
public AutoPlayFaderLaneEditorObjectDrawingTarget() : base(
15-
LoadTextrueFromDefaultResource("NS.png"),
16-
LoadTextrueFromDefaultResource("NN.png"),
17-
LoadTextrueFromDefaultResource("NE.png")
18-
)
19-
{
20-
}
21-
}
14+
public AutoPlayFaderLaneEditorObjectDrawingTarget() : base(
15+
LoadTextrueFromDefaultResource("laneStart.png"),
16+
LoadTextrueFromDefaultResource("laneNext.png"),
17+
LoadTextrueFromDefaultResource("laneEnd.png")
18+
)
19+
{
20+
}
21+
}
2222
}

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/BeamEditorObjectDrawingTarget.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33

44
namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
55
{
6-
[Export(typeof(IFumenEditorDrawingTarget))]
7-
internal class BeamEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8-
{
9-
public override IEnumerable<string> DrawTargetID { get; } = new[]
10-
{
11-
"BMS","OBS"
6+
[Export(typeof(IFumenEditorDrawingTarget))]
7+
internal class BeamEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8+
{
9+
public override IEnumerable<string> DrawTargetID { get; } = new[]
10+
{
11+
"BMS","OBS"
1212
};
1313

14-
public BeamEditorObjectDrawingTarget() : base(
15-
LoadTextrueFromDefaultResource("NS.png"),
16-
LoadTextrueFromDefaultResource("NN.png"),
17-
LoadTextrueFromDefaultResource("NE.png")
18-
)
19-
{
14+
public BeamEditorObjectDrawingTarget() : base(
15+
LoadTextrueFromDefaultResource("laneStart.png"),
16+
LoadTextrueFromDefaultResource("laneNext.png"),
17+
LoadTextrueFromDefaultResource("laneEnd.png")
18+
)
19+
{
2020

21-
}
22-
}
21+
}
22+
}
2323
}

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/NormalLaneEditorObjectDrawingTarget.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
55
{
6-
[Export(typeof(IFumenEditorDrawingTarget))]
7-
internal class NormalLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8-
{
9-
public override IEnumerable<string> DrawTargetID { get; } = new[]
10-
{
11-
"LLS","LCS","LRS","CLS","ENS"
12-
};
6+
[Export(typeof(IFumenEditorDrawingTarget))]
7+
internal class NormalLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8+
{
9+
public override IEnumerable<string> DrawTargetID { get; } = new[]
10+
{
11+
"LLS","LCS","LRS","CLS","ENS"
12+
};
1313

14-
public NormalLaneEditorObjectDrawingTarget() : base(
15-
LoadTextrueFromDefaultResource("NS.png"),
16-
LoadTextrueFromDefaultResource("NN.png"),
17-
LoadTextrueFromDefaultResource("NE.png")
18-
)
19-
{
20-
}
21-
}
14+
public NormalLaneEditorObjectDrawingTarget() : base(
15+
LoadTextrueFromDefaultResource("laneStart.png"),
16+
LoadTextrueFromDefaultResource("laneNext.png"),
17+
LoadTextrueFromDefaultResource("laneEnd.png")
18+
)
19+
{
20+
}
21+
}
2222
}

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/TextureLaneEditorObjectDrawingTarget.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
using OngekiFumenEditor.Kernel.Graphics.Base;
2+
using OngekiFumenEditor.Utils;
23
using System;
34
using System.Drawing;
45

56
namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
67
{
7-
public abstract class TextureLaneEditorObjectDrawingTarget : CommonLaneEditorObjectDrawingTarget
8-
{
9-
public static Texture LoadTextrueFromDefaultResource(string rPath)
10-
{
11-
var info = System.Windows.Application.GetResourceStream(new Uri(@"Modules\FumenVisualEditor\Views\OngekiObjects\" + rPath, UriKind.Relative));
12-
using var bitmap = Image.FromStream(info.Stream) as Bitmap;
13-
return new Texture(bitmap);
14-
}
8+
public abstract class TextureLaneEditorObjectDrawingTarget : CommonLaneEditorObjectDrawingTarget
9+
{
10+
public static Texture LoadTextrueFromDefaultResource(string rPath)
11+
{
12+
var texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\" + rPath);
13+
return texture;
14+
}
1515

16-
public override Texture StartEditorTexture { get; }
17-
public override Texture NextEditorTexture { get; }
18-
public override Texture EndEditorTexture { get; }
16+
public override Texture StartEditorTexture { get; }
17+
public override Texture NextEditorTexture { get; }
18+
public override Texture EndEditorTexture { get; }
1919

20-
public TextureLaneEditorObjectDrawingTarget(Texture startEditorTexture, Texture nextEditorTexture, Texture endEditorTexture)
21-
{
22-
StartEditorTexture = startEditorTexture;
23-
NextEditorTexture = nextEditorTexture;
24-
EndEditorTexture = endEditorTexture;
25-
}
26-
}
20+
public TextureLaneEditorObjectDrawingTarget(Texture startEditorTexture, Texture nextEditorTexture, Texture endEditorTexture)
21+
{
22+
StartEditorTexture = startEditorTexture;
23+
NextEditorTexture = nextEditorTexture;
24+
EndEditorTexture = endEditorTexture;
25+
}
26+
}
2727
}

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/Lane/WallLaneEditorObjectDrawingTarget.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
namespace OngekiFumenEditor.Modules.FumenVisualEditor.Graphics.Drawing.TargetImpl.EditorObjects.Lane
55
{
6-
[Export(typeof(IFumenEditorDrawingTarget))]
7-
internal class WallLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8-
{
9-
public override IEnumerable<string> DrawTargetID { get; } = new[]
10-
{
11-
"WLS","WRS"
12-
};
6+
[Export(typeof(IFumenEditorDrawingTarget))]
7+
internal class WallLaneEditorObjectDrawingTarget : TextureLaneEditorObjectDrawingTarget
8+
{
9+
public override IEnumerable<string> DrawTargetID { get; } = new[]
10+
{
11+
"WLS","WRS"
12+
};
1313

14-
public WallLaneEditorObjectDrawingTarget() : base(
15-
LoadTextrueFromDefaultResource("WS.png"),
16-
LoadTextrueFromDefaultResource("WN.png"),
17-
LoadTextrueFromDefaultResource("WE.png")
18-
)
19-
{
20-
}
21-
}
14+
public WallLaneEditorObjectDrawingTarget() : base(
15+
LoadTextrueFromDefaultResource("wallStart.png"),
16+
LoadTextrueFromDefaultResource("wallNext.png"),
17+
LoadTextrueFromDefaultResource("wallEnd.png")
18+
)
19+
{
20+
}
21+
}
2222
}

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/LaneCurvePathControlDrawingTarget.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class LaneCurvePathControlDrawingTarget : CommonBatchDrawTargetBase<LaneC
3434

3535
public LaneCurvePathControlDrawingTarget()
3636
{
37-
texture = ResourceUtils.OpenReadTextureFromResource(@"Modules\FumenVisualEditor\Views\OngekiObjects\CC.png");
37+
texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\commonCircle.png");
3838
textureDrawing = IoC.Get<IBatchTextureDrawing>();
3939
stringDrawing = IoC.Get<IStringDrawing>();
4040
highlightDrawing = IoC.Get<IHighlightBatchTextureDrawing>();

‎OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/TargetImpl/EditorObjects/SVG/SvgObjectDrawingTarget.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class SvgObjectDrawingTarget : CommonDrawTargetBase<SvgPrefabBase>, IDisp
2929

3030
public SvgObjectDrawingTarget()
3131
{
32-
texture = ResourceUtils.OpenReadTextureFromResource(@"Modules\FumenVisualEditor\Views\OngekiObjects\CC.png");
32+
texture = ResourceUtils.OpenReadTextureFromFile(@".\Resources\editor\commonCircle.png");
3333

3434
cachedSvgRenderDataManager = IoC.Get<ICachedSvgRenderDataManager>();
3535
lineDrawing = IoC.Get<ISimpleLineDrawing>();

0 commit comments

Comments
 (0)