Skip to content

Commit eb52a21

Browse files
voidprocvoidproc
committed
アセットをリソースへ
1 parent 7754bd9 commit eb52a21

File tree

4 files changed

+71
-22
lines changed

4 files changed

+71
-22
lines changed

‎chocokurei/App/Resource.rc‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,41 +85,67 @@ Resource(engine/texture/box-shadow/8.png)
8585
//
8686
// Fonts
8787
//
88-
Resource(engine/font/mplus/mplus-1p-thin.ttf.zstdcmp)
89-
Resource(engine/font/mplus/mplus-1p-light.ttf.zstdcmp)
88+
//Resource(engine/font/mplus/mplus-1p-thin.ttf.zstdcmp)
89+
//Resource(engine/font/mplus/mplus-1p-light.ttf.zstdcmp)
9090
Resource(engine/font/mplus/mplus-1p-regular.ttf.zstdcmp)
91-
Resource(engine/font/mplus/mplus-1p-medium.ttf.zstdcmp)
92-
Resource(engine/font/mplus/mplus-1p-bold.ttf.zstdcmp)
93-
Resource(engine/font/mplus/mplus-1p-heavy.ttf.zstdcmp)
94-
Resource(engine/font/mplus/mplus-1p-black.ttf.zstdcmp)
95-
Resource(engine/font/noto-cjk/NotoSansCJK-Regular.ttc.zstdcmp)
91+
//Resource(engine/font/mplus/mplus-1p-medium.ttf.zstdcmp)
92+
//Resource(engine/font/mplus/mplus-1p-bold.ttf.zstdcmp)
93+
//Resource(engine/font/mplus/mplus-1p-heavy.ttf.zstdcmp)
94+
//Resource(engine/font/mplus/mplus-1p-black.ttf.zstdcmp)
95+
//Resource(engine/font/noto-cjk/NotoSansCJK-Regular.ttc.zstdcmp)
9696
//Resource(engine/font/noto-cjk/NotoSansJP-Regular.otf.zstdcmp)
9797

9898
//
9999
// Emoji Fonts
100100
//
101-
Resource(engine/font/noto-emoji/NotoColorEmoji.ttf.zstdcmp)
102-
Resource(engine/font/noto-emoji/NotoEmoji-Regular.ttf.zstdcmp)
101+
//Resource(engine/font/noto-emoji/NotoColorEmoji.ttf.zstdcmp)
102+
//Resource(engine/font/noto-emoji/NotoEmoji-Regular.ttf.zstdcmp)
103103

104104
//
105105
// Icons
106106
//
107-
Resource(engine/font/fontawesome/fontawesome-brands.otf.zstdcmp)
108-
Resource(engine/font/fontawesome/fontawesome-solid.otf.zstdcmp)
109-
Resource(engine/font/materialdesignicons/materialdesignicons-webfont.ttf.zstdcmp)
107+
//Resource(engine/font/fontawesome/fontawesome-brands.otf.zstdcmp)
108+
//Resource(engine/font/fontawesome/fontawesome-solid.otf.zstdcmp)
109+
//Resource(engine/font/materialdesignicons/materialdesignicons-webfont.ttf.zstdcmp)
110110

111111
//
112112
// Sound Font
113113
//
114-
Resource(engine/soundfont/GMGSx.sf2.zstdcmp)
114+
//Resource(engine/soundfont/GMGSx.sf2.zstdcmp)
115115

116116
//////////////////////////////////////////////////////
117117
//
118118
// Siv3D App Resources (Your application resources here)
119119
//
120120
//////////////////////////////////////////////////////
121121

122+
Resource(images/balloon.png)
123+
Resource(images/bg.png)
124+
Resource(images/box-3x3.png)
125+
Resource(images/box-3x4.png)
126+
Resource(images/box-4x4.png)
127+
Resource(images/box-4x5.png)
128+
Resource(images/box-4x6.png)
129+
Resource(images/choco0.png)
130+
Resource(images/choco1.png)
131+
Resource(images/choco10.png)
132+
Resource(images/choco11.png)
133+
Resource(images/choco2.png)
134+
Resource(images/choco3.png)
135+
Resource(images/choco4.png)
136+
Resource(images/choco5.png)
137+
Resource(images/choco6.png)
138+
Resource(images/choco7.png)
139+
Resource(images/choco8.png)
140+
Resource(images/choco9.png)
141+
Resource(images/good.png)
142+
Resource(images/miss.png)
143+
Resource(images/next.png)
144+
Resource(images/pronama-chan-fail.png)
145+
Resource(images/pronama-chan.png)
146+
Resource(images/titlebg.png)
122147

148+
Resource(fonts/k8x12L.ttf)
123149

124150
/* examples
125151

‎chocokurei/App/images/print_resource.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ls *.png | %{ "Resource(images/$($_.Name))" }

‎chocokurei/App/images/print_textureasset.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ls *.png | %{ "TextureAsset::Register(U`"$($_.BaseName)`", Resource(U`"images/$($_.Name)`"));" }

‎chocokurei/Main.cpp‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,34 @@
66

77
void loadImages()
88
{
9-
for (const auto& file : FileSystem::DirectoryContents(U"images", Recursive::No))
10-
{
11-
if (FileSystem::Extension(file) == U"png")
12-
{
13-
TextureAsset::Register(FileSystem::BaseName(file), file);
14-
}
15-
}
9+
TextureAsset::Register(U"balloon", Resource(U"images/balloon.png"));
10+
TextureAsset::Register(U"bg", Resource(U"images/bg.png"));
11+
TextureAsset::Register(U"box-3x3", Resource(U"images/box-3x3.png"));
12+
TextureAsset::Register(U"box-3x4", Resource(U"images/box-3x4.png"));
13+
TextureAsset::Register(U"box-4x4", Resource(U"images/box-4x4.png"));
14+
TextureAsset::Register(U"box-4x5", Resource(U"images/box-4x5.png"));
15+
TextureAsset::Register(U"box-4x6", Resource(U"images/box-4x6.png"));
16+
TextureAsset::Register(U"choco0", Resource(U"images/choco0.png"));
17+
TextureAsset::Register(U"choco1", Resource(U"images/choco1.png"));
18+
TextureAsset::Register(U"choco10", Resource(U"images/choco10.png"));
19+
TextureAsset::Register(U"choco11", Resource(U"images/choco11.png"));
20+
TextureAsset::Register(U"choco2", Resource(U"images/choco2.png"));
21+
TextureAsset::Register(U"choco3", Resource(U"images/choco3.png"));
22+
TextureAsset::Register(U"choco4", Resource(U"images/choco4.png"));
23+
TextureAsset::Register(U"choco5", Resource(U"images/choco5.png"));
24+
TextureAsset::Register(U"choco6", Resource(U"images/choco6.png"));
25+
TextureAsset::Register(U"choco7", Resource(U"images/choco7.png"));
26+
TextureAsset::Register(U"choco8", Resource(U"images/choco8.png"));
27+
TextureAsset::Register(U"choco9", Resource(U"images/choco9.png"));
28+
TextureAsset::Register(U"good", Resource(U"images/good.png"));
29+
TextureAsset::Register(U"miss", Resource(U"images/miss.png"));
30+
TextureAsset::Register(U"next", Resource(U"images/next.png"));
31+
TextureAsset::Register(U"pronama-chan-fail", Resource(U"images/pronama-chan-fail.png"));
32+
TextureAsset::Register(U"pronama-chan", Resource(U"images/pronama-chan.png"));
33+
TextureAsset::Register(U"titlebg", Resource(U"images/titlebg.png"));
34+
TextureAsset::Register(U"_choco", Resource(U"images/_choco.png"));
35+
TextureAsset::Register(U"_judge", Resource(U"images/_judge.png"));
36+
TextureAsset::Register(U"_layout", Resource(U"images/_layout.png"));
1637
}
1738

1839
void Main()
@@ -33,8 +54,8 @@ void Main()
3354

3455
// アセット
3556

36-
FontAsset::Register(U"main", 12, U"fonts/k8x12L.ttf", FontStyle::Bitmap);
37-
FontAsset::Register(U"mainb", 12, U"fonts/k8x12L.ttf", FontStyle::BoldBitmap);
57+
FontAsset::Register(U"main", 12, Resource(U"fonts/k8x12L.ttf"), FontStyle::Bitmap);
58+
FontAsset::Register(U"mainb", 12, Resource(U"fonts/k8x12L.ttf"), FontStyle::BoldBitmap);
3859

3960
loadImages();
4061

0 commit comments

Comments
 (0)